[SCM] eclipse - Powerful IDE written in java - Debian package. branch, lucid, updated. bb855b8d9c84065146845c32d8a02b66a9e8fa41

[Benjamin Drung]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "eclipse - Powerful IDE written in java - Debian package.".

The branch, lucid has been updated
       via  bb855b8d9c84065146845c32d8a02b66a9e8fa41 (commit)
       via  d52f41e347aeb740b44bb60170be40a8052c395e (commit)
       via  b897e1e81c54d89aef59211c8520fa1ddaeb32f6 (commit)
      from  02f7ceebea890251f83a3d6e554033fa795aaa2c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bb855b8d9c84065146845c32d8a02b66a9e8fa41
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Sun May 9 00:43:21 2010 +0200

    Release 3.5.2-2ubuntu4.1 to Ubuntu lucid-proposed.

commit d52f41e347aeb740b44bb60170be40a8052c395e
Author: Niels Thykier <niels at thykier.net>
Date:   Sat May 8 17:55:28 2010 +0200

    Added patch to deal with broken help-menu.
    
    Closes: #576106
    LP: #549904

commit b897e1e81c54d89aef59211c8520fa1ddaeb32f6
Author: Niels Thykier <niels at thykier.net>
Date:   Sat May 8 15:31:02 2010 +0200

    Added Recommends on default-jdk | sun-java6-jdk for eclipse-jdt.
    
    LP: #576952

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                                   |    9 ++++
 debian/control                                     |    1 +
 debian/patches/fix-help-contents.patch             |   40 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 .../internal/jsp/jasper/JspClassLoader.java        |   15 +++++++
 5 files changed, 66 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index adc4928..f9097ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+eclipse (3.5.2-2ubuntu4.1) lucid-proposed; urgency=low
+
+  [ Niels Thykier ]
+  * Added Recommends on default-jdk | sun-java6-jdk for eclipse-jdt.
+    (LP: #576952)
+  * Added patch to deal with broken help-menu. (Closes: #576106, LP: #549904)
+
+ -- Benjamin Drung <bdrung at ubuntu.com>  Sun, 09 May 2010 00:39:43 +0200
+
 eclipse (3.5.2-2ubuntu4) lucid; urgency=low
 
   * No source change rebuild to pick up new location of sat4j (LP: #566131).
diff --git a/debian/control b/debian/control
index 1580f7d..d631067 100644
--- a/debian/control
+++ b/debian/control
@@ -74,6 +74,7 @@ Depends: default-jre | java5-runtime | java6-runtime,
          junit4 (>= 4.7-3),
          libhamcrest-java (>= 1.1-4),
          ${misc:Depends}
+Recommends: default-jdk | sun-java6-jdk
 Suggests: eclipse
 Replaces: eclipse-jdt-gcj
 Description: Eclipse Java Development Tools (JDT)
diff --git a/debian/patches/fix-help-contents.patch b/debian/patches/fix-help-contents.patch
new file mode 100644
index 0000000..4e82d43
--- /dev/null
+++ b/debian/patches/fix-help-contents.patch
@@ -0,0 +1,40 @@
+Description: Fixes the problem with the servlet compiler being unable
+ to find the classes it needs.
+ .
+ This problem is Debian specific.
+Author: Niels Thykier <niels at thykier.net>
+Forwarded: not needed
+
+diff --git a/eclipse/plugins/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/internal/jsp/jasper/JspClassLoader.java b/eclipse/plugins/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/internal/jsp/jasper/JspClassLoader.java
+index 3303026..61cb9c0 100644
+--- a/eclipse/plugins/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/internal/jsp/jasper/JspClassLoader.java
++++ b/eclipse/plugins/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/internal/jsp/jasper/JspClassLoader.java
+@@ -20,6 +20,7 @@ import java.util.Enumeration;
+ import java.util.StringTokenizer;
+ 
+ import org.osgi.framework.Bundle;
++import org.osgi.framework.BundleContext;
+ import org.osgi.framework.Constants;
+ 
+ /**
+@@ -75,6 +76,20 @@ public class JspClassLoader extends URLClassLoader {
+ 	private void addBundleClassPathJars(Bundle bundle) {
+ 		Dictionary headers = bundle.getHeaders();
+ 		String classPath = (String) headers.get(Constants.BUNDLE_CLASSPATH);
++		BundleContext context = bundle.getBundleContext();
++		Bundle[] inner = context.getBundles();
++		for(int i = 0 ; i < inner.length ; i++){
++		    String loc = inner[i].getLocation();
++		    if(loc.startsWith("reference:file:plugins/")){
++			String p = loc.replaceFirst("^reference:file:", "file:///usr/lib/eclipse/");
++			try {
++			    URL u = new URL(p);
++			    super.addURL(u);
++			} catch(Exception e){
++			    e.printStackTrace();
++			}
++		    }
++		}
+ 		if (classPath != null) {
+ 			StringTokenizer tokenizer = new StringTokenizer(classPath, ","); //$NON-NLS-1$
+ 			while (tokenizer.hasMoreTokens()) {
diff --git a/debian/patches/series b/debian/patches/series
index e03c268..ae54c0d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@ swt-compile-xpt.patch
 eclipse-build-generatedScripts.patch
 osgi-services-symlink-javax.patch
 ecj-gccmain-java.patch
+fix-help-contents.patch
diff --git a/eclipse/plugins/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/internal/jsp/jasper/JspClassLoader.java b/eclipse/plugins/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/internal/jsp/jasper/JspClassLoader.java
index 3303026..61cb9c0 100644
--- a/eclipse/plugins/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/internal/jsp/jasper/JspClassLoader.java
+++ b/eclipse/plugins/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/internal/jsp/jasper/JspClassLoader.java
@@ -20,6 +20,7 @@ import java.util.Enumeration;
 import java.util.StringTokenizer;
 
 import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 
 /**
@@ -75,6 +76,20 @@ public class JspClassLoader extends URLClassLoader {
 	private void addBundleClassPathJars(Bundle bundle) {
 		Dictionary headers = bundle.getHeaders();
 		String classPath = (String) headers.get(Constants.BUNDLE_CLASSPATH);
+		BundleContext context = bundle.getBundleContext();
+		Bundle[] inner = context.getBundles();
+		for(int i = 0 ; i < inner.length ; i++){
+		    String loc = inner[i].getLocation();
+		    if(loc.startsWith("reference:file:plugins/")){
+			String p = loc.replaceFirst("^reference:file:", "file:///usr/lib/eclipse/");
+			try {
+			    URL u = new URL(p);
+			    super.addURL(u);
+			} catch(Exception e){
+			    e.printStackTrace();
+			}
+		    }
+		}
 		if (classPath != null) {
 			StringTokenizer tokenizer = new StringTokenizer(classPath, ","); //$NON-NLS-1$
 			while (tokenizer.hasMoreTokens()) {


hooks/post-receive
-- 
eclipse - Powerful IDE written in java - Debian package.