[jboss-cvs] JBossAS SVN: r57730 - in projects/microcontainer/trunk/container: . src src/tests-support src/tests-support/org src/tests-support/org/jboss src/tests-support/org/jboss/test src/tests-support/org/jboss/test/vfs src/tests-support/org/jboss/test/vfs/support src/tests-support/org/jboss/test/vfs/support/jar1 src/tests-support/org/jboss/test/vfs/support/jar2
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Oct 19 13:33:36 EDT 2006
Author: scott.stark at jboss.org
Date: 2006-10-19 13:33:33 -0400 (Thu, 19 Oct 2006)
New Revision: 57730
Added:
projects/microcontainer/trunk/container/src/tests-support/
projects/microcontainer/trunk/container/src/tests-support/org/
projects/microcontainer/trunk/container/src/tests-support/org/jboss/
projects/microcontainer/trunk/container/src/tests-support/org/jboss/test/
projects/microcontainer/trunk/container/src/tests-support/org/jboss/test/vfs/
projects/microcontainer/trunk/container/src/tests-support/org/jboss/test/vfs/support/
projects/microcontainer/trunk/container/src/tests-support/org/jboss/test/vfs/support/CommonClass.java
projects/microcontainer/trunk/container/src/tests-support/org/jboss/test/vfs/support/jar1/
projects/microcontainer/trunk/container/src/tests-support/org/jboss/test/vfs/support/jar1/ClassInJar1.java
projects/microcontainer/trunk/container/src/tests-support/org/jboss/test/vfs/support/jar2/
projects/microcontainer/trunk/container/src/tests-support/org/jboss/test/vfs/support/jar2/ClassInJar2.java
Modified:
projects/microcontainer/trunk/container/build-test.xml
Log:
Add the source for the resources/tests jars and update the build-test.xml to create them
Modified: projects/microcontainer/trunk/container/build-test.xml
===================================================================
--- projects/microcontainer/trunk/container/build-test.xml 2006-10-19 16:17:58 UTC (rev 57729)
+++ projects/microcontainer/trunk/container/build-test.xml 2006-10-19 17:33:33 UTC (rev 57730)
@@ -40,6 +40,16 @@
<!-- Configuration -->
<!-- ================================================================== -->
+ <property name="source.java" value="src/tests"/>
+ <property name="source.java.support" value="src/tests-support"/>
+ <property name="source.resources" value="src/resources/tests"/>
+ <property name="javac.target" value="1.5"/>
+ <property name="javac.source" value="1.5"/>
+ <property name="build.classes" value="output/classes-tests"/>
+ <property name="build.classes.support" value="output/classes-tests-support"/>
+ <property name="build.testlog" value="output/log"/>
+ <property name="build-bypass.disabled" value="true"/>
+
<!--
| Configure the build system.
|
@@ -94,13 +104,6 @@
<!-- Tasks -->
<!-- ===== -->
- <property name="source.java" value="${module.source}/tests"/>
- <property name="javac.target" value="1.5"/>
- <property name="javac.source" value="1.5"/>
- <property name="build.classes" value="${module.output}/classes-tests"/>
- <property name="build.testlog" value="${module.output}/log"/>
- <property name="build-bypass.disabled" value="true"/>
-
<call target="_default:task-init"/>
<path id="thirdparty.classpath">
@@ -134,9 +137,15 @@
<target name="compile"
description="Compile all source files."
- depends="_default:compile-classes"
+ depends="_default:compile-classes, compile-tests-support"
/>
-
+ <target name="compile-tests-support" description="Compile the tests-support tree">
+ <antcall target="_default:compile-classes">
+ <param name="build.classes" value="${build.classes.support}"/>
+ <param name="source.java" value="${source.java.support}"/>
+ </antcall>
+ </target>
+
<!-- ================================================================== -->
<!-- Archives -->
<!-- ================================================================== -->
@@ -146,11 +155,61 @@
-->
<target name="module-jars" depends="init">
- <jar jarfile="${build.lib}/jboss-container-test.jar" manifest="${build.etc}/default.mf">
+ <jar destfile="${build.lib}/jboss-container-test.jar" manifest="${build.etc}/default.mf">
<fileset dir="${build.classes}"/>
</jar>
+
</target>
+ <target name="test-resource-jars" depends="compile-tests-support"
+ description="Rebuild the src/resources/tests jars">
+ <!-- src/resources/tests/vfs/test/jar1.jar -->
+ <jar destfile="${source.resources}/vfs/test/jar1.jar">
+ <fileset dir="${build.classes.support}">
+ <include name="org/jboss/test/vfs/support/jar1/**"/>
+ </fileset>
+ </jar>
+ <!-- src/resources/tests/vfs/test/jar1-filesonly.jar -->
+ <zip destfile="${source.resources}/vfs/test/jar1-filesonly.jar"
+ filesonly="true">
+ <zipfileset dir="${source.resources}/vfs/test" fullpath="META-INF/MANIFEST.MF">
+ <include name="jar1-filesonly.mf"/>
+ </zipfileset>
+ <fileset dir="${build.classes.support}">
+ <include name="org/jboss/test/vfs/support/jar1/**"/>
+ </fileset>
+ </zip>
+ <!-- src/resources/tests/vfs/test/jar2.jar -->
+ <jar destfile="${source.resources}/vfs/test/jar2.jar">
+ <fileset dir="${build.classes.support}">
+ <include name="org/jboss/test/vfs/support/jar2/**"/>
+ </fileset>
+ </jar>
+ <!-- src/resources/tests/vfs/test/outer.jar -->
+ <jar destfile="${source.resources}/vfs/test/outer.jar">
+ <fileset dir="${build.classes.support}">
+ <include name="org/jboss/test/vfs/support/*"/>
+ </fileset>
+ <fileset dir="${source.resources}/vfs/test/">
+ <include name="jar1.jar" />
+ <include name="jar2.jar" />
+ </fileset>
+ </jar>
+ <!-- src/resources/tests/vfs/test/p0.jar -->
+ <jar destfile="${source.resources}/vfs/test/p0.jar">
+ <manifest>
+ <attribute name="Created-By" value="${java.runtime.version} (${java.vendor})"/>
+ <attribute name="Specification-Title" value="profile0-jar"/>
+ <attribute name="Specification-Version" value="1.0.0.GA"/>
+ <attribute name="Specification-Vendor" value="JBoss Inc."/>
+ <attribute name="Implementation-Title" value="p0-jar-test"/>
+ <attribute name="Implementation-URL" value="http://www.jboss.org"/>
+ <attribute name="Implementation-Version" value="1.0.0.GA-jboss"/>
+ <attribute name="Implementation-Vendor" value="JBoss Inc."/>
+ </manifest>
+ </jar>
+ </target>
+
<!-- ================================================================== -->
<!-- Tests -->
<!-- ================================================================== -->
Added: projects/microcontainer/trunk/container/src/tests-support/org/jboss/test/vfs/support/CommonClass.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests-support/org/jboss/test/vfs/support/CommonClass.java 2006-10-19 16:17:58 UTC (rev 57729)
+++ projects/microcontainer/trunk/container/src/tests-support/org/jboss/test/vfs/support/CommonClass.java 2006-10-19 17:33:33 UTC (rev 57730)
@@ -0,0 +1,31 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.vfs.support;
+
+/**
+ * @author Scott.Stark at jboss.org
+ * @version $Revision:$
+ */
+public class CommonClass
+{
+
+}
Added: projects/microcontainer/trunk/container/src/tests-support/org/jboss/test/vfs/support/jar1/ClassInJar1.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests-support/org/jboss/test/vfs/support/jar1/ClassInJar1.java 2006-10-19 16:17:58 UTC (rev 57729)
+++ projects/microcontainer/trunk/container/src/tests-support/org/jboss/test/vfs/support/jar1/ClassInJar1.java 2006-10-19 17:33:33 UTC (rev 57730)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.vfs.support.jar1;
+
+/**
+ * @author Scott.Stark at jboss.org
+ * @version $Revision:$
+ */
+public class ClassInJar1
+{
+ public static final java.lang.String VERSION = "1.0.0";
+
+ private int i;
+
+ class InnerClass
+ {
+
+ }
+}
Added: projects/microcontainer/trunk/container/src/tests-support/org/jboss/test/vfs/support/jar2/ClassInJar2.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests-support/org/jboss/test/vfs/support/jar2/ClassInJar2.java 2006-10-19 16:17:58 UTC (rev 57729)
+++ projects/microcontainer/trunk/container/src/tests-support/org/jboss/test/vfs/support/jar2/ClassInJar2.java 2006-10-19 17:33:33 UTC (rev 57730)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.vfs.support.jar2;
+
+/**
+ * @author Scott.Stark at jboss.org
+ * @version $Revision:$
+ */
+public class ClassInJar2
+{
+ public static final java.lang.String VERSION = "1.0.0";
+
+ private int i;
+
+}
More information about the jboss-cvs-commits
mailing list