[jboss-cvs] JBossAS SVN: r97801 - in projects/jboss-classpool/trunk/jbosscl: src/test/java/org/jboss/test/classpool/jbosscl/support and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Dec 14 14:06:23 EST 2009
Author: flavia.rainone at jboss.com
Date: 2009-12-14 14:06:22 -0500 (Mon, 14 Dec 2009)
New Revision: 97801
Added:
projects/jboss-classpool/trunk/jbosscl/src/test/resources/archives/
projects/jboss-classpool/trunk/jbosscl/src/test/resources/archives/a.jar
projects/jboss-classpool/trunk/jbosscl/src/test/resources/archives/b.jar
projects/jboss-classpool/trunk/jbosscl/src/test/resources/archives/c.jar
projects/jboss-classpool/trunk/jbosscl/src/test/resources/archives/d.jar
projects/jboss-classpool/trunk/jbosscl/src/test/resources/archives/ejbs.jar
projects/jboss-classpool/trunk/jbosscl/src/test/resources/archives/jar-in-ear.ear
projects/jboss-classpool/trunk/jbosscl/src/test/resources/archives/ptd-ear-1.0-SNAPSHOT.ear
projects/jboss-classpool/trunk/jbosscl/src/test/resources/archives/replacereferences-child.jar
projects/jboss-classpool/trunk/jbosscl/src/test/resources/archives/replacereferences-parent.jar
projects/jboss-classpool/trunk/jbosscl/src/test/resources/archives/servlet.jar
projects/jboss-classpool/trunk/jbosscl/src/test/resources/archives/simple.ear
projects/jboss-classpool/trunk/jbosscl/src/test/resources/archives/simple.jar
projects/jboss-classpool/trunk/jbosscl/src/test/resources/archives/simple.sar
projects/jboss-classpool/trunk/jbosscl/src/test/resources/archives/simple.war
projects/jboss-classpool/trunk/jbosscl/src/test/resources/archives/top-level.ear
projects/jboss-classpool/trunk/jbosscl/src/test/resources/archives/war-in-ear.ear
Removed:
projects/jboss-classpool/trunk/jbosscl/src/test/resources/archive/
Modified:
projects/jboss-classpool/trunk/jbosscl/pom.xml
projects/jboss-classpool/trunk/jbosscl/src/test/java/org/jboss/test/classpool/jbosscl/support/SupportArchives.java
Log:
[JBREFLECT-86] Moved test archives to test/resources. Removed script from pom that creates those archives.
Modified: projects/jboss-classpool/trunk/jbosscl/pom.xml
===================================================================
--- projects/jboss-classpool/trunk/jbosscl/pom.xml 2009-12-14 18:38:38 UTC (rev 97800)
+++ projects/jboss-classpool/trunk/jbosscl/pom.xml 2009-12-14 19:06:22 UTC (rev 97801)
@@ -32,182 +32,6 @@
</excludes>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
- <executions>
- <execution>
- <id>create-test-jars</id>
- <goals>
- <goal>run</goal>
- </goals>
- <phase>process-test-classes</phase>
- <configuration>
- <tasks>
- <property name="test.jar.suffix" value="-test-classpool-"/>
- <property name="archive.dir" value="${project.build.directory}/archives"/>
- <mkdir dir="${archive.dir}"/>
- <jar destfile="${archive.dir}/a.jar"
- basedir="${project.build.testOutputDirectory}"
- includes="org/jboss/test/classpool/jbosscl/support/excluded/a/*.class"/>
- <jar destfile="${archive.dir}/b.jar"
- basedir="${project.build.testOutputDirectory}"
- includes="org/jboss/test/classpool/jbosscl/support/excluded/b/*.class"/>
- <jar destfile="${archive.dir}/c.jar"
- basedir="${project.build.testOutputDirectory}"
- includes="org/jboss/test/classpool/jbosscl/support/excluded/c/*.class"/>
- <jar destfile="${archive.dir}/d.jar"
- basedir="${project.build.testOutputDirectory}"
- includes="org/jboss/test/classpool/jbosscl/support/excluded/d/*.class"/>
- <jar destfile="${archive.dir}/replacereferences-parent.jar">
- <fileset dir="${project.build.testOutputDirectory}">
- <include name="org/jboss/test/classpool/jbosscl/support/excluded/replacereferences/**"/>
- <exclude name="org/jboss/test/classpool/jbosscl/support/excluded/replacereferences/child/*.class"/>
- </fileset>
- </jar>
- <jar destfile="${archive.dir}/replacereferences-child.jar">
- <fileset dir="${project.build.testOutputDirectory}">
- <include name="org/jboss/test/classpool/jbosscl/support/excluded/replacereferences/**"/>
- <exclude name="org/jboss/test/classpool/jbosscl/support/excluded/replacereferences/parent/ParentCaller.class"/>
- </fileset>
- </jar>
- <!-- ARCHIVES for ARCHIVE TESTS -->
- <jar destfile="${archive.dir}/simple.jar">
- <fileset dir="${project.build.testOutputDirectory}">
- <include name="org/jboss/test/classpool/jbosscl/support/excluded/jar/**"/>
- </fileset>
- </jar>
- <jar destfile="${archive.dir}/servlet.jar">
- <fileset dir="${project.build.testOutputDirectory}">
- <include name="org/jboss/test/classpool/jbosscl/support/excluded/web/**"/>
- </fileset>
- </jar>
- <jar destfile="${archive.dir}/ui.jar">
- <fileset dir="${project.build.testOutputDirectory}">
- <include name="org/jboss/test/classpool/jbosscl/support/excluded/ui/**"/>
- </fileset>
- </jar>
- <jar destfile="${archive.dir}/ui_util.jar">
- <fileset dir="${project.build.testOutputDirectory}">
- <include name="org/jboss/test/classpool/jbosscl/support/excluded/crm/**"/>
- </fileset>
- </jar>
- <mkdir dir="${archive.dir}/lib"/>
- <jar destfile="${archive.dir}/lib/util.jar">
- <fileset dir="${project.build.testOutputDirectory}">
- <include name="org/jboss/test/classpool/jbosscl/support/excluded/util/**"/>
- </fileset>
- </jar>
- <jar destfile="${archive.dir}/lib/ext.jar">
- <fileset dir="${project.build.testOutputDirectory}">
- <include name="org/jboss/test/classpool/jbosscl/support/excluded/ext/**"/>
- </fileset>
- </jar>
- <jar destfile="${archive.dir}/simple.sar">
- <fileset dir="${project.build.testOutputDirectory}">
- <include name="org/jboss/test/classpool/jbosscl/support/excluded/service/**"/>
- </fileset>
- <metainf dir="${project.build.testOutputDirectory}/archive/sar/META-INF"includes="*.xml"/>
- </jar>
- <jar destfile="${archive.dir}/ejbs.jar">
- <fileset dir="${project.build.testOutputDirectory}">
- <include name="org/jboss/test/classpool/jbosscl/support/excluded/ejb/**"/>
- </fileset>
- <metainf dir="${project.build.testOutputDirectory}/archive/ejb-jar/META-INF"includes="*.xml"/>
- </jar>
- <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/jbosscl/support/excluded/web/**"/>
- </classes>
- </war>
- <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/jbosscl/support/excluded/web/**"/>
- </classes>
- <lib dir="${archive.dir}">
- <include name="ui.jar"/>
- </lib>
- </war>
- <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/jbosscl/support/excluded/jsf/**"/>
- </classes>
- <lib dir="${archive.dir}">
- <include name="ui_util.jar"/>
- </lib>
- </war>
- <jar destfile="${archive.dir}/simple.ear">
- <fileset dir="${archive.dir}">
- <include name="simple.jar"/>
- <include name="ejbs.jar"/>
- <include name="simple_ui.war"/>
- <include name="jsfapp.war"/>
- <include name="simple.sar"/>
- <include name="lib/*"/>
- </fileset>
- <metainf dir="${project.build.testOutputDirectory}/archive/ear/META-INF"includes="*.properties"/>
- </jar>
- <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="${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="${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="${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="${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="${archive.dir}/lib" includes="**/*.jar" defaultexcludes="false"/>
- </delete>
- <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/*"/>
- </fileset>
- <metainf dir="${project.build.testOutputDirectory}/archive/ear2war/META-INF"includes="*.properties"/>
- </jar>
-
- <delete dir="${archive.dir}/lib"/>
- <delete>
- <fileset dir="${archive.dir}">
- <include name="*ui*ar"/>
- <include name="util.jar"/>
- <include name="ext.jar"/>
- <include name="wj*.jar"/>
- <include name="ptd*.war"/>
- <include name="jsfapp.war"/>
- </fileset>
- </delete>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
Modified: projects/jboss-classpool/trunk/jbosscl/src/test/java/org/jboss/test/classpool/jbosscl/support/SupportArchives.java
===================================================================
--- projects/jboss-classpool/trunk/jbosscl/src/test/java/org/jboss/test/classpool/jbosscl/support/SupportArchives.java 2009-12-14 18:38:38 UTC (rev 97800)
+++ projects/jboss-classpool/trunk/jbosscl/src/test/java/org/jboss/test/classpool/jbosscl/support/SupportArchives.java 2009-12-14 19:06:22 UTC (rev 97801)
@@ -76,7 +76,7 @@
public final static String PTD_WS_WAR_LIB = PTD_WS_WAR + "/WEB-INF/lib/wj2.jar";
public final static String PARENT_JAR = "replacereferences-parent.jar";
public final static String CHILD_JAR = "replacereferences-child.jar";
- public final static String EXCLUDED_CLASSPATH = "../test-classes";
+ public final static String EXCLUDED_CLASSPATH = "../";
/************ CLASSPATH URLS ************************************************************/
@@ -120,12 +120,9 @@
try
{
URL url = SupportArchives.class.getProtectionDomain().getCodeSource().getLocation();
- String location = url.toString();
- int index = location.lastIndexOf("/target/") + "/target/".length();
- location = location.substring(0, index) + "archives/";
-
- location = location + relativePath;
+ String location = url.toString() + "archives/" + relativePath;
return new URL(location);
+ //throw new RuntimeException("URL: " + url);
}
catch (MalformedURLException e)
{
Added: projects/jboss-classpool/trunk/jbosscl/src/test/resources/archives/a.jar
===================================================================
(Binary files differ)
Property changes on: projects/jboss-classpool/trunk/jbosscl/src/test/resources/archives/a.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: projects/jboss-classpool/trunk/jbosscl/src/test/resources/archives/b.jar
===================================================================
(Binary files differ)
Property changes on: projects/jboss-classpool/trunk/jbosscl/src/test/resources/archives/b.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: projects/jboss-classpool/trunk/jbosscl/src/test/resources/archives/c.jar
===================================================================
(Binary files differ)
Property changes on: projects/jboss-classpool/trunk/jbosscl/src/test/resources/archives/c.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: projects/jboss-classpool/trunk/jbosscl/src/test/resources/archives/d.jar
===================================================================
(Binary files differ)
Property changes on: projects/jboss-classpool/trunk/jbosscl/src/test/resources/archives/d.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: projects/jboss-classpool/trunk/jbosscl/src/test/resources/archives/ejbs.jar
===================================================================
(Binary files differ)
Property changes on: projects/jboss-classpool/trunk/jbosscl/src/test/resources/archives/ejbs.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: projects/jboss-classpool/trunk/jbosscl/src/test/resources/archives/jar-in-ear.ear
===================================================================
(Binary files differ)
Property changes on: projects/jboss-classpool/trunk/jbosscl/src/test/resources/archives/jar-in-ear.ear
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: projects/jboss-classpool/trunk/jbosscl/src/test/resources/archives/ptd-ear-1.0-SNAPSHOT.ear
===================================================================
(Binary files differ)
Property changes on: projects/jboss-classpool/trunk/jbosscl/src/test/resources/archives/ptd-ear-1.0-SNAPSHOT.ear
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: projects/jboss-classpool/trunk/jbosscl/src/test/resources/archives/replacereferences-child.jar
===================================================================
(Binary files differ)
Property changes on: projects/jboss-classpool/trunk/jbosscl/src/test/resources/archives/replacereferences-child.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: projects/jboss-classpool/trunk/jbosscl/src/test/resources/archives/replacereferences-parent.jar
===================================================================
(Binary files differ)
Property changes on: projects/jboss-classpool/trunk/jbosscl/src/test/resources/archives/replacereferences-parent.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: projects/jboss-classpool/trunk/jbosscl/src/test/resources/archives/servlet.jar
===================================================================
(Binary files differ)
Property changes on: projects/jboss-classpool/trunk/jbosscl/src/test/resources/archives/servlet.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: projects/jboss-classpool/trunk/jbosscl/src/test/resources/archives/simple.ear
===================================================================
(Binary files differ)
Property changes on: projects/jboss-classpool/trunk/jbosscl/src/test/resources/archives/simple.ear
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: projects/jboss-classpool/trunk/jbosscl/src/test/resources/archives/simple.jar
===================================================================
(Binary files differ)
Property changes on: projects/jboss-classpool/trunk/jbosscl/src/test/resources/archives/simple.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: projects/jboss-classpool/trunk/jbosscl/src/test/resources/archives/simple.sar
===================================================================
(Binary files differ)
Property changes on: projects/jboss-classpool/trunk/jbosscl/src/test/resources/archives/simple.sar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: projects/jboss-classpool/trunk/jbosscl/src/test/resources/archives/simple.war
===================================================================
(Binary files differ)
Property changes on: projects/jboss-classpool/trunk/jbosscl/src/test/resources/archives/simple.war
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: projects/jboss-classpool/trunk/jbosscl/src/test/resources/archives/top-level.ear
===================================================================
(Binary files differ)
Property changes on: projects/jboss-classpool/trunk/jbosscl/src/test/resources/archives/top-level.ear
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: projects/jboss-classpool/trunk/jbosscl/src/test/resources/archives/war-in-ear.ear
===================================================================
(Binary files differ)
Property changes on: projects/jboss-classpool/trunk/jbosscl/src/test/resources/archives/war-in-ear.ear
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
More information about the jboss-cvs-commits
mailing list