svn commit: r561100 - in /incubator/abdera/java/trunk: build/build.xml dependencies/deps.properties

[jm...@apache.org]

Author: jmsnell
Date: Mon Jul 30 12:44:56 2007
New Revision: 561100

URL: http://svn.apache.org/viewvc?view=rev&rev=561100
Log:
Use retroweaver 2.0. we need some jdk1.4 users to help thoroughly test this.

Modified:
    incubator/abdera/java/trunk/build/build.xml
    incubator/abdera/java/trunk/dependencies/deps.properties

Modified: incubator/abdera/java/trunk/build/build.xml
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/build/build.xml?view=diff&rev=561100&r1=561099&r2=561100
==============================================================================
--- incubator/abdera/java/trunk/build/build.xml (original)
+++ incubator/abdera/java/trunk/build/build.xml Mon Jul 30 12:44:56 2007
@@ -400,7 +400,7 @@
         <exclude name="**/${jetty-util.jar}" />
         <exclude name="**/${jetty.jar}" />
         <exclude name="**/${junit.jar}" />
-        <exclude name="**/retroweaver-rt-1.2.3.jar" />
+        <exclude name="**/retroweaver-rt-${retroweaver.version}.jar" />
         <exclude name="**/${xmlsecurity.jar}" unless="do.security" />
       </fileset>
       <fileset dir="${docs}" includes="**/*" />
@@ -517,7 +517,7 @@
 
   <target name="retro" depends="dist">
     <property name="retrozip" value="${basedir}/build/tools/${retroweaver.zip}" />
-    <property name="retro" value="${basedir}/build/tools/retroweaver-1.2.3" />
+    <property name="retro" value="${basedir}/build/tools/retroweaver-${retroweaver.version}" />
     <property name="retro_core.jar" value="${dist}/${ant.project.name}.core.${version}.retro.jar" />
     <property name="retro_parser.jar" value="${dist}/${ant.project.name}.parser.${version}.retro.jar" />
     <property name="retro_protocol.jar" value="${dist}/${ant.project.name}.protocol.${version}.retro.jar" />
@@ -534,26 +534,26 @@
       <fileset dir="${retro}/release" includes="**/*.jar" />
     </path>
     <echo>Retroweaving the Jars...</echo>
-    <java classpathref="jar.retro" classname="com.rc.retroweaver.Weaver" fork="yes">
+    <java classpathref="jar.retro" classname="net.sourceforge.retroweaver.Weaver" fork="yes">
       <arg line="-jar &quot;${core.jar}&quot; &quot;${retro_core.jar}&quot;" />
     </java>
-    <java classpathref="jar.retro" classname="com.rc.retroweaver.Weaver" fork="yes">
+    <java classpathref="jar.retro" classname="net.sourceforge.retroweaver.Weaver" fork="yes">
       <arg line="-jar &quot;${parser.jar}&quot; &quot;${retro_parser.jar}&quot;" />
     </java>
-    <java classpathref="jar.retro" classname="com.rc.retroweaver.Weaver" fork="yes">
+    <java classpathref="jar.retro" classname="net.sourceforge.retroweaver.Weaver" fork="yes">
       <arg line="-jar &quot;${protocol.jar}&quot; &quot;${retro_protocol.jar}&quot;" />
     </java>
-    <java classpathref="jar.retro" classname="com.rc.retroweaver.Weaver" fork="yes">
+    <java classpathref="jar.retro" classname="net.sourceforge.retroweaver.Weaver" fork="yes">
       <arg line="-jar &quot;${server.jar}&quot; &quot;${retro_server.jar}&quot;" />
     </java>
-    <java classpathref="jar.retro" classname="com.rc.retroweaver.Weaver" fork="yes">
+    <java classpathref="jar.retro" classname="net.sourceforge.retroweaver.Weaver" fork="yes">
       <arg line="-jar &quot;${extensions.jar}&quot; &quot;${retro_extensions.jar}&quot;" />
     </java>
-    <java classpathref="jar.retro" classname="com.rc.retroweaver.Weaver" fork="yes">
+    <java classpathref="jar.retro" classname="net.sourceforge.retroweaver.Weaver" fork="yes">
       <arg line="-jar &quot;${client.jar}&quot; &quot;${retro_client.jar}&quot;" />
     </java>
     <antcall target="retro.security" />
-    <copy todir="${dist_lib}" file="${retro}/release/retroweaver-rt-1.2.3.jar" />
+    <copy todir="${dist_lib}" file="${retro}/release/retroweaver-rt-${retroweaver.version}.jar" />
   </target>
 
   <target name="retro.security" if="do.security">

Modified: incubator/abdera/java/trunk/dependencies/deps.properties
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/dependencies/deps.properties?view=diff&rev=561100&r1=561099&r2=561100
==============================================================================
--- incubator/abdera/java/trunk/dependencies/deps.properties (original)
+++ incubator/abdera/java/trunk/dependencies/deps.properties Mon Jul 30 12:44:56 2007
@@ -32,6 +32,7 @@
 geronimo.servlet.dir=http://www.apache.org/dist/java-repository/org.apache.geronimo.specs/jars
 geronimo.servlet.jar=geronimo-servlet_2.4_spec-1.0.jar
 
+retroweaver.version=2.0
 retroweaver.dir=http://people.apache.org/~jmsnell
 retroweaver.zip=retroweaver-2.0.zip