Changeset 1812

Timestamp:

09/14/07 08:47:18 (15 months ago)

Author:

jmoore

Message:

Removing difference between lib/tools and lib/repository.

The separation was causing problems in the distribution since
it was unclear where things should be put. With the move to
Ivy, the complexity of lib/ was reduced anyway, this just
takes it a step further.

Location:

trunk

Files:

• components/antlib/resources/dependencies.xml (modified) (1 diff)
• lib/readme.txt (deleted)
• lib/repository/ant-1.6.5.jar (moved) (moved from trunk/lib/repository/ant/ant/1.6.5/ant-1.6.5.jar)
• lib/repository/ant-junit-1.6.5.jar (moved) (moved from trunk/lib/tools/ant-junit-1.6.5.jar)
• lib/repository/ant-launcher-1.6.5.jar (moved) (moved from trunk/lib/repository/ant/ant-launcher/1.6.5/ant-launcher-1.6.5.jar)
• lib/repository/ant-nodeps-1.6.5.jar (moved) (moved from trunk/lib/tools/ant-nodeps-1.6.5.jar)
• lib/repository/bsh-2.0b4.jar (moved) (moved from trunk/lib/tools/bsh-2.0b4.jar)
• lib/repository/ivy-2.0.0-alpha2-incubating.jar (moved) (moved from trunk/lib/tools/ivy-2.0.0-alpha2-incubating.jar)
• lib/repository/maven-artifact-ant-2.0.2-dep.jar (moved) (moved from trunk/lib/tools/maven-artifact-ant-2.0.2-dep.jar)
• lib/repository/omero.java (moved) (moved from trunk/lib/tools/omero.java) (1 diff)
• omero.class (modified) (previous)

trunk/components/antlib/resources/dependencies.xml

@@ -33 +33 @@
     -->
   <path id="tools.classpath">
-    <fileset dir="${omero.home}/lib/tools" includes="*.jar"/>
+    <fileset dir="${omero.home}/lib/repository" includes="ivy*.jar"/>
   </path>
   <taskdef resource="org/apache/ivy/ant/antlib.xml"

trunk/lib/repository/omero.java

@@ -192 +192 @@
     {
         File[] jars = new File[6];
-        jars[0] = new File(mavenPath("ant","ant","1.6.5"));
-        jars[1] = new File(mavenPath("ant","ant-launcher","1.6.5"));
-        jars[2] = new File(mavenPath("junit","junit","3.8.1"));
-        jars[3] = new File("lib/tools/ant-junit-1.6.5.jar");
-        jars[4] = new File("lib/tools/ant-nodeps-1.6.5.jar");
-        jars[5] = new File("lib/tools/bsh-2.0b4.jar");
+        jars[0] = new File("lib/repository/junit-3.8.1.jar");
+        jars[1] = new File("lib/repository/ant-1.6.5.jar");
+        jars[2] = new File("lib/repository/ant-launcher-1.6.5.jar");
+        jars[3] = new File("lib/repository/ant-junit-1.6.5.jar");
+        jars[4] = new File("lib/repository/ant-nodeps-1.6.5.jar");
+        jars[5] = new File("lib/repository/bsh-2.0b4.jar");
 
         if (!isJDKToolsAvailable()) {  //Try and grab tools.jar.