[SCM] eclipse - Powerful IDE written in java - Debian package. branch, upstream, updated. 0f4e31bf0c77c1ee364c78b134b331110a5327ea

[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, upstream has been updated
       via  0f4e31bf0c77c1ee364c78b134b331110a5327ea (commit)
      from  afa8bc8bf5bc3ee24eefa2fb86400ece5f08f934 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                                          |   11 +++++++++++
 dependencies.properties                            |    2 +-
 .../linuxtools/eclipsebuild/SymlinkOSGiJars.java   |    2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 928a4fd..ab822ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-03-02  Andrew Overholt  <overholt at redhat.com>
+
+	* dependencies.properties: Fix up Debian jasper JAR location.
+
+2010-03-02  Andrew Overholt  <overholt at redhat.com>
+
+	* dependencies.properties: 
+	* task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkOSGiJars.java
+	(execute): Continue to next potential system JAR instead of failing if the
+	first one doesn't work.
+
 2010-03-01  Andrew Overholt  <overholt at redhat.com>
 
 	* build.xml: Re-symlink to system JARs after p2 director installation.
diff --git a/dependencies.properties b/dependencies.properties
index dcfe9a7..110e638 100644
--- a/dependencies.properties
+++ b/dependencies.properties
@@ -6,7 +6,7 @@ org.apache.commons.codec_1.3.0.v20080530-1600.jar=/usr/share/java/commons-codec.
 org.apache.commons.el_1.0.0.v200806031608.jar=/usr/share/java/commons-el.jar
 org.apache.commons.httpclient_3.1.0.v20080605-1935.jar=/usr/share/java/commons-httpclient.jar
 org.apache.commons.logging_1.0.4.v200904062259.jar=/usr/share/java/commons-logging.jar
-org.apache.jasper_5.5.17.v200903231320.jar=/usr/share/eclipse/plugins/org.apache.jasper_5.5.17.v200706111724.jar:/usr/share/java/jasper.jar
+org.apache.jasper_5.5.17.v200903231320.jar=/usr/share/eclipse/plugins/org.apache.jasper_5.5.17.v200706111724.jar:/usr/share/java/jasper-5.5.26.jar
 org.apache.lucene_1.9.1.v20080530-1600.jar=/usr/share/java/lucene.jar:/usr/share/java/lucene-core.jar
 org.apache.lucene.analysis_1.9.1.v20080530-1600.jar=/usr/share/java/lucene-contrib/lucene-analyzers.jar:/usr/share/java/lucene-analyzers.jar
 org.hamcrest.core_1.1.0.v20090501071000.jar=/usr/share/java/hamcrest/core.jar:/usr/share/java/hamcrest-core.jar
diff --git a/task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkOSGiJars.java b/task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkOSGiJars.java
index 7f34c0f..56a7cff 100644
--- a/task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkOSGiJars.java
+++ b/task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkOSGiJars.java
@@ -54,7 +54,7 @@ public class SymlinkOSGiJars extends Task {
 			for (int i = 0; i < systemLocationList.length; i++) {
 				File systemFile = new File(systemLocationList[i]);
 				if (!systemFile.exists())
-					break;
+					continue;
 				log("Seeing if " + systemFile + " is a suitable match for " + origLocation, Project.MSG_DEBUG);
 
 				JarFile systemJarFile;


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