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

[Niels Thykier]

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, master has been updated
       via  ba8cc2f32e4169ef44d9d3dac032847a82a97e0b (commit)
       via  c0d51cdc2ac5f222f1910e4be22291eebc089fe0 (commit)
      from  edaced1e8e924288a085c0612a2d4c4bfaa0fd98 (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 ba8cc2f32e4169ef44d9d3dac032847a82a97e0b
Author: Niels Thykier <niels at thykier.net>
Date:   Sat May 8 17:59:56 2010 +0200

    Prepared snapshot build.

commit c0d51cdc2ac5f222f1910e4be22291eebc089fe0
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

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

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

diff --git a/debian/changelog b/debian/changelog
index 29d08e6..838704b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,26 @@
+eclipse (3.5.2-3~1.gbpc0d51c) UNRELEASED; urgency=low
+
+  ** SNAPSHOT build @c0d51cdc2ac5f222f1910e4be22291eebc089fe0 **
+
+  [ Benjamin Drung ]
+  * Set org.eclipse.swt.browser.XULRunnerPath explicitly. (LP: #546518)
+  * Set MOZILLA_FIVE_HOME instead of LD_LIBRARY_PATH and
+    org.eclipse.swt.browser.XULRunnerPath (LP: #559229, #553779).
+  * Add apport hook to collect more useful data for bug reports.
+
+  [ Niels Thykier ]
+  * Added missing copyright statement about ownership over the Debian
+    packaging.
+  * Made eclipse use version depends on -jdt and -pde to ensure smoother
+    upgrades from older versions.
+  * Added reportbug helpers to eclipse-platform and eclipse.
+  * 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>  Sat, 08 May 2010 17:58:32 +0200
+
 eclipse (3.5.2-2) unstable; urgency=low
 
   [ Niels Thykier ]
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.