[jboss-cvs] JBossAS SVN: r97189 - in projects/jboss-classpool/trunk: src/test/java/org/jboss/test/classpool/jbosscl/test and 3 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Mon Nov 30 19:30:02 EST 2009


Author: flavia.rainone at jboss.com
Date: 2009-11-30 19:30:02 -0500 (Mon, 30 Nov 2009)
New Revision: 97189

Modified:
   projects/jboss-classpool/trunk/pom.xml
   projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTest.java
   projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/support/SupportClasses.java
   projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/test/ClassPoolTest.java
   projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/ucl/test/UclClassPoolTest.java
Log:
[JBREFLECT-74] Moved archives from target to target/archives dir.

Modified: projects/jboss-classpool/trunk/pom.xml
===================================================================
--- projects/jboss-classpool/trunk/pom.xml	2009-11-30 23:30:28 UTC (rev 97188)
+++ projects/jboss-classpool/trunk/pom.xml	2009-12-01 00:30:02 UTC (rev 97189)
@@ -114,109 +114,108 @@
             <configuration>
               <tasks>
                 <property name="test.jar.suffix" value="-test-classpool-"/>
-                <!-- <jar destfile="${project.build.directory}/${artifactId}${test.jar.suffix}a1.jar"
+                <property name="archive.dir" value="${project.build.directory}/archives"/>
+                <mkdir dir="${archive.dir}"/>
+                <jar destfile="${archive.dir}/a1.jar"
                   basedir="${project.build.testOutputDirectory}" 
-                  includes="org/jboss/test/classpool/support/excluded/a/*.class"/> -->
-                <jar destfile="${project.build.directory}/a1.jar"
-                  basedir="${project.build.testOutputDirectory}" 
                   includes="org/jboss/test/classpool/support/excluded/a/*.class"/>
-                <jar destfile="${project.build.directory}/a2.jar"
+                <jar destfile="${archive.dir}/a2.jar"
                   basedir="${project.build.testOutputDirectory}" 
                   includes="org/jboss/test/classpool/support/excluded/a/*.class"/>
-                <jar destfile="${project.build.directory}/b1.jar"
+                <jar destfile="${archive.dir}/b1.jar"
                   basedir="${project.build.testOutputDirectory}" 
                   includes="org/jboss/test/classpool/support/excluded/b/*.class"/>
-                <jar destfile="${project.build.directory}/b2.jar"
+                <jar destfile="${archive.dir}/b2.jar"
                   basedir="${project.build.testOutputDirectory}" 
                   includes="org/jboss/test/classpool/support/excluded/b/*.class"/>
-                <jar destfile="${project.build.directory}/c1.jar"
+                <jar destfile="${archive.dir}/c1.jar"
                   basedir="${project.build.testOutputDirectory}" 
                   includes="org/jboss/test/classpool/support/excluded/c/*.class"/>
-                <jar destfile="${project.build.directory}/c2.jar"
+                <jar destfile="${archive.dir}/c2.jar"
                   basedir="${project.build.testOutputDirectory}" 
                   includes="org/jboss/test/classpool/support/excluded/c/*.class"/>
-                <jar destfile="${project.build.directory}/d.jar"
+                <jar destfile="${archive.dir}/d.jar"
                   basedir="${project.build.testOutputDirectory}" 
                   includes="org/jboss/test/classpool/support/excluded/d/*.class"/>
-                <jar destfile="${project.build.directory}/replacereferences-parent.jar">
+                <jar destfile="${archive.dir}/replacereferences-parent.jar">
                   <fileset dir="${project.build.testOutputDirectory}">
                     <include name="org/jboss/test/classpool/support/excluded/replacereferences/**"/>
                     <exclude name="org/jboss/test/classpool/support/excluded/replacereferences/child/*.class"/>
                   </fileset>
                 </jar>
-                <jar destfile="${project.build.directory}/replacereferences-child.jar">
+                <jar destfile="${archive.dir}/replacereferences-child.jar">
                   <fileset dir="${project.build.testOutputDirectory}">
                     <include name="org/jboss/test/classpool/support/excluded/replacereferences/**"/>
                     <exclude name="org/jboss/test/classpool/support/excluded/replacereferences/parent/ParentCaller.class"/>
                   </fileset>
                 </jar>
                 <!--  ARCHIVES for ARCHIVE TESTS -->
-                <jar destfile="${project.build.directory}/simple.jar">
+                <jar destfile="${archive.dir}/simple.jar">
                   <fileset dir="${project.build.testOutputDirectory}">
                     <include name="org/jboss/test/classpool/support/excluded/jar/**"/>
                   </fileset>
                 </jar>
-                <jar destfile="${project.build.directory}/servlet.jar">
+                <jar destfile="${archive.dir}/servlet.jar">
                   <fileset dir="${project.build.testOutputDirectory}">
                     <include name="org/jboss/test/classpool/support/excluded/web/**"/>
                   </fileset>  
                 </jar>
-                <jar destfile="${project.build.directory}/ui.jar">
+                <jar destfile="${archive.dir}/ui.jar">
                   <fileset dir="${project.build.testOutputDirectory}">
                     <include name="org/jboss/test/classpool/support/excluded/ui/**"/>
                   </fileset>  
                 </jar>
-                <jar destfile="${project.build.directory}/ui_util.jar">
+                <jar destfile="${archive.dir}/ui_util.jar">
                   <fileset dir="${project.build.testOutputDirectory}">
                     <include name="org/jboss/test/classpool/support/excluded/crm/**"/>
                   </fileset>  
                 </jar>
-                <mkdir dir="${project.build.directory}/lib"/>
-                <jar destfile="${project.build.directory}/lib/util.jar">
+                <mkdir dir="${archive.dir}/lib"/>
+                <jar destfile="${archive.dir}/lib/util.jar">
                   <fileset dir="${project.build.testOutputDirectory}">
                     <include name="org/jboss/test/classpool/support/excluded/util/**"/>
                   </fileset>  
                 </jar>
-                <jar destfile="${project.build.directory}/lib/ext.jar">
+                <jar destfile="${archive.dir}/lib/ext.jar">
                   <fileset dir="${project.build.testOutputDirectory}">
                     <include name="org/jboss/test/classpool/support/excluded/ext/**"/>
                   </fileset>  
                 </jar>
-                <jar destfile="${project.build.directory}/simple.sar">
+                <jar destfile="${archive.dir}/simple.sar">
                   <fileset dir="${project.build.testOutputDirectory}">
                     <include name="org/jboss/test/classpool/support/excluded/service/**"/>
                   </fileset>
                   <metainf dir="${project.build.testOutputDirectory}/archive/sar/META-INF"includes="*.xml"/>
                 </jar>
-                <jar destfile="${project.build.directory}/ejbs.jar">
+                <jar destfile="${archive.dir}/ejbs.jar">
                   <fileset dir="${project.build.testOutputDirectory}">
                     <include name="org/jboss/test/classpool/support/excluded/ejb/**"/>
                   </fileset>
                   <metainf dir="${project.build.testOutputDirectory}/archive/ejb-jar/META-INF"includes="*.xml"/>  
                 </jar>
-                <war destfile="${project.build.directory}/simple.war" webxml="${project.build.testOutputDirectory}/archive/war/WEB-INF/web.xml">
+                <war destfile="${archive.dir}/simple.war" webxml="${project.build.testOutputDirectory}/archive/war/WEB-INF/web.xml">
                   <classes dir="${project.build.testOutputDirectory}">
                     <include name="org/jboss/test/classpool/support/excluded/web/**"/>
                   </classes>  
                 </war>
-                <war destfile="${project.build.directory}/simple_ui.war" webxml="${project.build.testOutputDirectory}/archive/war/WEB-INF/web.xml">
+                <war destfile="${archive.dir}/simple_ui.war" webxml="${project.build.testOutputDirectory}/archive/war/WEB-INF/web.xml">
                   <classes dir="${project.build.testOutputDirectory}">
                     <include name="org/jboss/test/classpool/support/excluded/web/**"/>
                   </classes>
-                  <lib dir="${project.build.directory}">
+                  <lib dir="${archive.dir}">
                     <include name="ui.jar"/>
                   </lib>
                 </war>
-                <war destfile="${project.build.directory}/jsfapp.war" webxml="${project.build.testOutputDirectory}/archive/war/WEB-INF/web.xml">
+                <war destfile="${archive.dir}/jsfapp.war" webxml="${project.build.testOutputDirectory}/archive/war/WEB-INF/web.xml">
                   <classes dir="${project.build.testOutputDirectory}">
                     <include name="org/jboss/test/classpool/support/excluded/jsf/**"/>
                   </classes>
-                  <lib dir="${project.build.directory}">
+                  <lib dir="${archive.dir}">
                     <include name="ui_util.jar"/>
                   </lib>
                 </war>
-                <jar destfile="${project.build.directory}/simple.ear">
-                  <fileset dir="${project.build.directory}">
+                <jar destfile="${archive.dir}/simple.ear">
+                  <fileset dir="${archive.dir}">
                     <include name="simple.jar"/>
                     <include name="ejbs.jar"/>
                     <include name="simple_ui.war"/>
@@ -226,43 +225,43 @@
                   </fileset>
                   <metainf dir="${project.build.testOutputDirectory}/archive/ear/META-INF"includes="*.properties"/>
                 </jar>
-                <jar destfile="${project.build.directory}/top-level.ear">
-                  <fileset dir="${project.build.directory}">
+                <jar destfile="${archive.dir}/top-level.ear">
+                  <fileset dir="${archive.dir}">
                     <include name="lib/*"/>  
                   </fileset>
                   <metainf dir="${project.build.testOutputDirectory}/archive/earutil/META-INF"includes="*.properties"/>
                 </jar>
-                <jar destfile="${project.build.directory}/war-in-ear.ear">
-                  <fileset dir="${project.build.directory}">
+                <jar destfile="${archive.dir}/war-in-ear.ear">
+                  <fileset dir="${archive.dir}">
                     <include name="simple.war"/>
                   </fileset>
                   <metainf dir="${project.build.testOutputDirectory}/archive/warinear/META-INF"includes="*.properties"/>
                 </jar>
-                <jar destfile="${project.build.directory}/jar-in-ear.ear">
-                  <fileset dir="${project.build.directory}">
+                <jar destfile="${archive.dir}/jar-in-ear.ear">
+                  <fileset dir="${archive.dir}">
                     <include name="simple.jar"/>
                   </fileset>
                   <metainf dir="${project.build.testOutputDirectory}/archive/jarinear/META-INF"includes="*.properties"/>
                 </jar>
                 
-                <copy file="${project.build.directory}/servlet.jar" tofile="${project.build.directory}/wj1.jar"/>
-                <war destfile="${project.build.directory}/ptd-jsf-1.0-SNAPSHOT.war" webxml="${project.build.testOutputDirectory}/archive/war/WEB-INF/web.xml">
-                  <lib dir="${project.build.directory}">
+                <copy file="${archive.dir}/servlet.jar" tofile="${archive.dir}/wj1.jar"/>
+                <war destfile="${archive.dir}/ptd-jsf-1.0-SNAPSHOT.war" webxml="${project.build.testOutputDirectory}/archive/war/WEB-INF/web.xml">
+                  <lib dir="${archive.dir}">
                     <include name="wj1.jar"/>
                   </lib>
                 </war>
-                <copy file="${project.build.directory}/servlet.jar" tofile="${project.build.directory}/wj2.jar"/>
-                <war destfile="${project.build.directory}/ptd-ws-1.0-SNAPSHOT.war" webxml="${project.build.testOutputDirectory}/archive/war/WEB-INF/web.xml">
-                  <lib dir="${project.build.directory}">
+                <copy file="${archive.dir}/servlet.jar" tofile="${archive.dir}/wj2.jar"/>
+                <war destfile="${archive.dir}/ptd-ws-1.0-SNAPSHOT.war" webxml="${project.build.testOutputDirectory}/archive/war/WEB-INF/web.xml">
+                  <lib dir="${archive.dir}">
                     <include name="wj2.jar"/>
                   </lib>
                 </war>
                 <delete>
-                  <fileset dir="${project.build.directory}/lib" includes="**/*.jar" defaultexcludes="false"/>
+                  <fileset dir="${archive.dir}/lib" includes="**/*.jar" defaultexcludes="false"/>
                 </delete>
-                <copy file="${project.build.directory}/simple.jar" tofile="${project.build.directory}/lib/common.jar"/>
-                <jar destfile="${project.build.directory}/ptd-ear-1.0-SNAPSHOT.ear">
-                  <fileset dir="${project.build.directory}">
+                <copy file="${archive.dir}/simple.jar" tofile="${archive.dir}/lib/common.jar"/>
+                <jar destfile="${archive.dir}/ptd-ear-1.0-SNAPSHOT.ear">
+                  <fileset dir="${archive.dir}">
                     <include name="ptd-jsf-1.0-SNAPSHOT.war"/>
                     <include name="ptd-ws-1.0-SNAPSHOT.war"/>
                     <include name="lib/*"/>  
@@ -276,9 +275,9 @@
                 
                 
                 <delete dir="${project.build.testOutputDirectory}/archive"/>
-                <delete dir="${project.build.directory}/lib"/>
+                <delete dir="${archive.dir}/lib"/>
                 <delete>
-                  <fileset dir="${project.build.directory}">
+                  <fileset dir="${archive.dir}">
                     <include name="*ui*ar"/>
                     <include name="util.jar"/>
                     <include name="ext.jar"/>
@@ -288,13 +287,13 @@
                   </fileset>
                 </delete>
                 
-                <jar destfile="${project.build.directory}/test-weaving-target.jar"
+                <jar destfile="${archive.dir}/test-weaving-target.jar"
                   basedir="${project.build.testOutputDirectory}" 
                   includes="org/jboss/test/aop/classpool/jbosscl/weaving/support/excluded/target/*.class"/>
-                <jar destfile="${project.build.directory}/test-weaving-aspects.jar"
+                <jar destfile="${archive.dir}/test-weaving-aspects.jar"
                   basedir="${project.build.testOutputDirectory}" 
                   includes="org/jboss/test/aop/classpool/jbosscl/weaving/support/excluded/aspects/*.class"/>
-                <jar destfile="${project.build.directory}/test-weaving-interceptions.jar"
+                <jar destfile="${archive.dir}/test-weaving-interceptions.jar"
                   basedir="${project.build.testOutputDirectory}" 
                   includes="org/jboss/test/aop/classpool/jbosscl/weaving/support/excluded/interceptions/*.class"/>
                 <delete dir="${project.build.testOutputDirectory}/org/jboss/test/aop/classpool/jbosscl/weaving/support/excluded"/>

Modified: projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTest.java
===================================================================
--- projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTest.java	2009-11-30 23:30:28 UTC (rev 97188)
+++ projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTest.java	2009-12-01 00:30:02 UTC (rev 97189)
@@ -98,7 +98,7 @@
          URL url = JBossClClassPoolTest.class.getProtectionDomain().getCodeSource().getLocation();
          String location = url.toString();
          int index = location.lastIndexOf("/target/") + "/target/".length();
-         location = location.substring(0, index);
+         location = location.substring(0, index) + "archives/";
          
          location = location + relativePath;
          return new URL(location);

Modified: projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/support/SupportClasses.java
===================================================================
--- projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/support/SupportClasses.java	2009-11-30 23:30:28 UTC (rev 97188)
+++ projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/support/SupportClasses.java	2009-12-01 00:30:02 UTC (rev 97189)
@@ -64,7 +64,7 @@
    public final static String PTD_JSF_WAR_LIB = "ptd-ear-1.0-SNAPSHOT.ear/ptd-jsf-1.0-SNAPSHOT.war/WEB-INF/lib/wj1.jar";
    public final static String PTD_WS_WAR = "ptd-ear-1.0-SNAPSHOT.ear/ptd-ws-1.0-SNAPSHOT.war";
    public final static String PTD_WS_WAR_LIB = "ptd-ear-1.0-SNAPSHOT.ear/ptd-ws-1.0-SNAPSHOT.war/WEB-INF/lib/wj2.jar";
-   public final static String EXCLUDED_CLASSPATH = "test-excluded-classes";
+   public final static String EXCLUDED_CLASSPATH = "../test-excluded-classes";
    // TODO map the url to the corresponding package
    // TODO automatically replace .war by .war/WEB-INF/classes e lib???
    

Modified: projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/test/ClassPoolTest.java
===================================================================
--- projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/test/ClassPoolTest.java	2009-11-30 23:30:28 UTC (rev 97188)
+++ projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/test/ClassPoolTest.java	2009-12-01 00:30:02 UTC (rev 97189)
@@ -63,7 +63,7 @@
          URL url = ClassPoolTest.class.getProtectionDomain().getCodeSource().getLocation();
          String location = url.toString();
          int index = location.lastIndexOf("/target/") + "/target/".length();
-         location = location.substring(0, index);
+         location = location.substring(0, index) + "archives/";
          
          location = location + relativePath;
          return new URL(location);

Modified: projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/ucl/test/UclClassPoolTest.java
===================================================================
--- projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/ucl/test/UclClassPoolTest.java	2009-11-30 23:30:28 UTC (rev 97188)
+++ projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/ucl/test/UclClassPoolTest.java	2009-12-01 00:30:02 UTC (rev 97189)
@@ -115,7 +115,7 @@
          URL url = UclClassPoolTest.class.getProtectionDomain().getCodeSource().getLocation();
          String location = url.toString();
          int index = location.lastIndexOf("/target/") + "/target/".length();
-         location = location.substring(0, index);
+         location = location.substring(0, index) + "archives/";
          
          location = location + relativePath;
          return new URL(location);




More information about the jboss-cvs-commits mailing list