Move -source jars into ext/src

diff --git a/.classpath b/.classpath
index 20d910aa5227964e6cd5f4fab98a6caff6dcbd07..e6a16a83a9b808b3ee3de8166c31284bf137d15d 100644 (file)
--- a/.classpath
+++ b/.classpath
@@ -4,33 +4,33 @@
        <classpathentry kind="src" path="tests"/>
        <classpathentry kind="src" path="resources"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-       <classpathentry kind="lib" path="ext/log4j-1.2.17.jar" sourcepath="ext/log4j-1.2.17-sources.jar"/>
-       <classpathentry kind="lib" path="ext/slf4j-api-1.6.6.jar" sourcepath="ext/slf4j-api-1.6.6-sources.jar"/>
-       <classpathentry kind="lib" path="ext/slf4j-log4j12-1.6.6.jar" sourcepath="ext/slf4j-log4j12-1.6.6-sources.jar"/>
-       <classpathentry kind="lib" path="ext/jcommander-1.17.jar" sourcepath="ext/jcommander-1.17-sources.jar"/>
-       <classpathentry kind="lib" path="ext/bcprov-jdk16-1.46.jar" sourcepath="ext/bcprov-jdk16-1.46-sources.jar"/>
-       <classpathentry kind="lib" path="ext/bcmail-jdk16-1.46.jar" sourcepath="ext/bcmail-jdk16-1.46-sources.jar"/>
-       <classpathentry kind="lib" path="ext/jsch-0.1.44-1.jar" sourcepath="ext/jsch-0.1.44-1-sources.jar"/>
-       <classpathentry kind="lib" path="ext/rome-0.9.jar" sourcepath="ext/rome-0.9-sources.jar"/>
-       <classpathentry kind="lib" path="ext/jdom-1.0.jar" sourcepath="ext/jdom-1.0-sources.jar"/>
+       <classpathentry kind="lib" path="ext/log4j-1.2.17.jar" sourcepath="ext/src/log4j-1.2.17-sources.jar"/>
+       <classpathentry kind="lib" path="ext/slf4j-api-1.6.6.jar" sourcepath="ext/src/slf4j-api-1.6.6-sources.jar"/>
+       <classpathentry kind="lib" path="ext/slf4j-log4j12-1.6.6.jar" sourcepath="ext/src/slf4j-log4j12-1.6.6-sources.jar"/>
+       <classpathentry kind="lib" path="ext/jcommander-1.17.jar" sourcepath="ext/src/jcommander-1.17-sources.jar"/>
+       <classpathentry kind="lib" path="ext/bcprov-jdk16-1.46.jar" sourcepath="ext/src/bcprov-jdk16-1.46-sources.jar"/>
+       <classpathentry kind="lib" path="ext/bcmail-jdk16-1.46.jar" sourcepath="ext/src/bcmail-jdk16-1.46-sources.jar"/>
+       <classpathentry kind="lib" path="ext/jsch-0.1.44-1.jar" sourcepath="ext/src/jsch-0.1.44-1-sources.jar"/>
+       <classpathentry kind="lib" path="ext/rome-0.9.jar" sourcepath="ext/src/rome-0.9-sources.jar"/>
+       <classpathentry kind="lib" path="ext/jdom-1.0.jar" sourcepath="ext/src/jdom-1.0-sources.jar"/>
        <classpathentry kind="lib" path="ext/junit-4.8.2.jar"/>
-       <classpathentry kind="lib" path="ext/jetty-webapp-7.6.5.v20120716.jar" sourcepath="ext/jetty-webapp-7.6.5.v20120716-sources.jar"/>
-       <classpathentry kind="lib" path="ext/gson-1.7.2.jar" sourcepath="ext/gson-1.7.2-sources.jar"/>
-       <classpathentry kind="lib" path="ext/mail-1.4.3.jar" sourcepath="ext/mail-1.4.3-sources.jar"/>
-       <classpathentry kind="lib" path="ext/googlecharts-1.4.20.jar" sourcepath="ext/googlecharts-1.4.20-sources.jar"/>
-       <classpathentry kind="lib" path="ext/javax.servlet-api-3.0.1.jar" sourcepath="ext/javax.servlet-api-3.0.1-sources.jar"/>
-       <classpathentry kind="lib" path="ext/wicket-1.4.20.jar" sourcepath="ext/wicket-1.4.20-sources.jar"/>
-       <classpathentry kind="lib" path="ext/wicket-auth-roles-1.4.20.jar" sourcepath="ext/wicket-auth-roles-1.4.20-sources.jar"/>
-       <classpathentry kind="lib" path="ext/wicket-extensions-1.4.20.jar" sourcepath="ext/wicket-extensions-1.4.20-sources.jar"/>
-       <classpathentry kind="lib" path="ext/groovy-all-1.8.6.jar" sourcepath="ext/groovy-all-1.8.6-sources.jar"/>
-       <classpathentry kind="lib" path="ext/jetty-ajp-7.6.5.v20120716.jar" sourcepath="ext/jetty-ajp-7.6.5.v20120716-sources.jar"/>
-       <classpathentry kind="lib" path="ext/lucene-core-3.6.0.jar" sourcepath="ext/lucene-core-3.6.0-sources.jar"/>
-       <classpathentry kind="lib" path="ext/markdownpapers-core-1.2.7.jar" sourcepath="ext/markdownpapers-core-1.2.7-sources.jar"/>
-       <classpathentry kind="lib" path="ext/org.eclipse.jgit-2.0.0.201206130900-r.jar" sourcepath="ext/org.eclipse.jgit-2.0.0.201206130900-r-sources.jar"/>
-       <classpathentry kind="lib" path="ext/org.eclipse.jgit.http.server-2.0.0.201206130900-r.jar" sourcepath="ext/org.eclipse.jgit.http.server-2.0.0.201206130900-r-sources.jar"/>
-       <classpathentry kind="lib" path="ext/lucene-highlighter-3.6.0.jar" sourcepath="ext/lucene-highlighter-3.6.0-sources.jar"/>
-       <classpathentry kind="lib" path="ext/lucene-memory-3.6.0.jar" sourcepath="ext/lucene-memory-3.6.0-sources.jar"/>
-       <classpathentry kind="lib" path="ext/unboundid-ldapsdk-2.3.0.jar" sourcepath="ext/unboundid-ldapsdk-2.3.0-sources.jar"/>
-       <classpathentry kind="lib" path="ext/ivy-2.2.0.jar" sourcepath="ext/ivy-2.2.0-sources.jar"/>
+       <classpathentry kind="lib" path="ext/jetty-webapp-7.6.5.v20120716.jar" sourcepath="ext/src/jetty-webapp-7.6.5.v20120716-sources.jar"/>
+       <classpathentry kind="lib" path="ext/gson-1.7.2.jar" sourcepath="ext/src/gson-1.7.2-sources.jar"/>
+       <classpathentry kind="lib" path="ext/mail-1.4.3.jar" sourcepath="ext/src/mail-1.4.3-sources.jar"/>
+       <classpathentry kind="lib" path="ext/googlecharts-1.4.20.jar" sourcepath="ext/src/googlecharts-1.4.20-sources.jar"/>
+       <classpathentry kind="lib" path="ext/javax.servlet-api-3.0.1.jar" sourcepath="ext/src/javax.servlet-api-3.0.1-sources.jar"/>
+       <classpathentry kind="lib" path="ext/wicket-1.4.20.jar" sourcepath="ext/src/wicket-1.4.20-sources.jar"/>
+       <classpathentry kind="lib" path="ext/wicket-auth-roles-1.4.20.jar" sourcepath="ext/src/wicket-auth-roles-1.4.20-sources.jar"/>
+       <classpathentry kind="lib" path="ext/wicket-extensions-1.4.20.jar" sourcepath="ext/src/wicket-extensions-1.4.20-sources.jar"/>
+       <classpathentry kind="lib" path="ext/groovy-all-1.8.6.jar" sourcepath="ext/src/groovy-all-1.8.6-sources.jar"/>
+       <classpathentry kind="lib" path="ext/jetty-ajp-7.6.5.v20120716.jar" sourcepath="ext/src/jetty-ajp-7.6.5.v20120716-sources.jar"/>
+       <classpathentry kind="lib" path="ext/lucene-core-3.6.0.jar" sourcepath="ext/src/lucene-core-3.6.0-sources.jar"/>
+       <classpathentry kind="lib" path="ext/markdownpapers-core-1.2.7.jar" sourcepath="ext/src/markdownpapers-core-1.2.7-sources.jar"/>
+       <classpathentry kind="lib" path="ext/org.eclipse.jgit-2.0.0.201206130900-r.jar" sourcepath="ext/src/org.eclipse.jgit-2.0.0.201206130900-r-sources.jar"/>
+       <classpathentry kind="lib" path="ext/org.eclipse.jgit.http.server-2.0.0.201206130900-r.jar" sourcepath="ext/src/org.eclipse.jgit.http.server-2.0.0.201206130900-r-sources.jar"/>
+       <classpathentry kind="lib" path="ext/lucene-highlighter-3.6.0.jar" sourcepath="ext/src/lucene-highlighter-3.6.0-sources.jar"/>
+       <classpathentry kind="lib" path="ext/lucene-memory-3.6.0.jar" sourcepath="ext/src/lucene-memory-3.6.0-sources.jar"/>
+       <classpathentry kind="lib" path="ext/unboundid-ldapsdk-2.3.0.jar" sourcepath="ext/src/unboundid-ldapsdk-2.3.0-sources.jar"/>
+       <classpathentry kind="lib" path="ext/ivy-2.2.0.jar" sourcepath="ext/src/ivy-2.2.0-sources.jar"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/src/com/gitblit/build/Build.java b/src/com/gitblit/build/Build.java
index 78fdb02ec8bb40a798c218e12080fe1f91c00d81..2bb4336f212060ba992c42f1238e27e9cc9cffbc 100644 (file)
--- a/src/com/gitblit/build/Build.java
+++ b/src/com/gitblit/build/Build.java
@@ -360,6 +360,16 @@ public class Build {
                }\r
                for (String jar : jars) {\r
                        File targetFile = mo.getLocalFile("ext", jar);\r
+                       if ("-sources".equals(jar)) {\r
+                               File relocated = new File("ext/src", targetFile.getName());\r
+                               if (targetFile.exists()) {\r
+                                       // move -sources jar to ext/src folder\r
+                                       targetFile.renameTo(relocated);\r
+                               }\r
+                               // -sources jars are located in ext/src\r
+                               targetFile = relocated;\r
+                       }\r
+                       \r
                        if (targetFile.exists()) {\r
                                downloads.add(targetFile);\r
                                continue;\r