[jboss-cvs] JBossAS SVN: r64137 - in trunk/testsuite: src/main/org/jboss/test/aop/test and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jul 19 10:07:53 EDT 2007
Author: adrian at jboss.org
Date: 2007-07-19 10:07:53 -0400 (Thu, 19 Jul 2007)
New Revision: 64137
Modified:
trunk/testsuite/imports/sections/aop.xml
trunk/testsuite/src/main/org/jboss/test/aop/test/ScopedEarWithClassesInWebInfTestCase.java
trunk/testsuite/src/main/org/jboss/test/aop/test/ScopedUnitTestCase.java
trunk/testsuite/src/resources/aop/earwithwebinf/META-INF/application.xml
trunk/testsuite/src/resources/aop/scoped/ear1/META-INF/application.xml
trunk/testsuite/src/resources/aop/scoped/ear2/META-INF/application.xml
Log:
Fix the war packaging for aop tests
Modified: trunk/testsuite/imports/sections/aop.xml
===================================================================
--- trunk/testsuite/imports/sections/aop.xml 2007-07-19 13:52:31 UTC (rev 64136)
+++ trunk/testsuite/imports/sections/aop.xml 2007-07-19 14:07:53 UTC (rev 64137)
@@ -308,14 +308,12 @@
<include name="META-INF/jboss-aop.xml"/>
</fileset>
</jar>
- <jar destfile="${build.lib}/aop-scopedear1.war">
- <fileset dir="${build.classes}">
+ <war warfile="${build.lib}/aop-scopedear1.war"
+ webxml="${build.resources}/aop/scoped/ear1/WEB-INF/web.xml">
+ <classes dir="${build.classes}">
<include name="org/jboss/test/aop/scoped/ear/servlet/*.class"/>
- </fileset>
- <fileset dir="${build.resources}/aop/scoped/ear1">
- <include name="WEB-INF/web.xml"/>
- </fileset>
- </jar>
+ </classes>
+ </war>
<jar destfile="${build.lib}/aop-scopedear1.ear">
<fileset dir="${build.lib}">
<include name="aop-scopedear1-ejb.jar"/>
@@ -345,14 +343,12 @@
<include name="META-INF/jboss-aop.xml"/>
</fileset>
</jar>
- <jar destfile="${build.lib}/aop-scopedear2.war">
- <fileset dir="${build.classes}">
+ <war warfile="${build.lib}/aop-scopedear2.war"
+ webxml="${build.resources}/aop/scoped/ear2/WEB-INF/web.xml">
+ <classes dir="${build.classes}">
<include name="org/jboss/test/aop/scoped/ear/servlet/*.class"/>
- </fileset>
- <fileset dir="${build.resources}/aop/scoped/ear2">
- <include name="WEB-INF/web.xml"/>
- </fileset>
- </jar>
+ </classes>
+ </war>
<jar destfile="${build.lib}/aop-scopedear2.ear">
<fileset dir="${build.lib}">
<include name="aop-scopedear2-ejb.jar"/>
@@ -547,18 +543,16 @@
<include name="org/jboss/test/aop/earwithwebinf/webinf/lib/*.class"/>
</fileset>
</jar>
- <jar destfile="${build.lib}/aop-classesinwebinf.war">
- <fileset dir="${build.resources}/aop/earwithwebinf/">
- <include name="WEB-INF/web.xml"/>
- </fileset>
- <zipfileset dir="${build.classes}" prefix="WEB-INF/classes">
- <include name="org/jboss/test/aop/earwithwebinf/webinf/classes/*.class"/>
- <include name="org/jboss/test/aop/earwithwebinf/servlet/*.class"/>
- </zipfileset>
- <zipfileset dir="${build.lib}" prefix="WEB-INF/lib">
- <include name="aop-classesinwebinf-lib.jar"/>
- </zipfileset>
- </jar>
+ <war warfile="${build.lib}/aop-classesinwebinf.war"
+ webxml="${build.resources}/aop/earwithwebinf/WEB-INF/web.xml">
+ <classes dir="${build.classes}">
+ <include name="org/jboss/test/aop/earwithwebinf/webinf/classes/*.class"/>
+ <include name="org/jboss/test/aop/earwithwebinf/servlet/*.class"/>
+ </classes>
+ <lib dir="${build.lib}">
+ <include name="aop-classesinwebinf-lib.jar"/>
+ </lib>
+ </war>
<jar destfile="${build.lib}/aop-classesinwebinf-ejb.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/test/aop/earwithwebinf/ejb/*.class"/>
Modified: trunk/testsuite/src/main/org/jboss/test/aop/test/ScopedEarWithClassesInWebInfTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/aop/test/ScopedEarWithClassesInWebInfTestCase.java 2007-07-19 13:52:31 UTC (rev 64136)
+++ trunk/testsuite/src/main/org/jboss/test/aop/test/ScopedEarWithClassesInWebInfTestCase.java 2007-07-19 14:07:53 UTC (rev 64137)
@@ -55,7 +55,7 @@
public void testEar1() throws Exception
{
- URL url = new URL(HttpUtils.getBaseURL() + "classesinwebinf/srv");
+ URL url = new URL(HttpUtils.getBaseURL() + "aop-classesinwebinf/srv");
HttpUtils.accessURL(url);
}
Modified: trunk/testsuite/src/main/org/jboss/test/aop/test/ScopedUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/aop/test/ScopedUnitTestCase.java 2007-07-19 13:52:31 UTC (rev 64136)
+++ trunk/testsuite/src/main/org/jboss/test/aop/test/ScopedUnitTestCase.java 2007-07-19 14:07:53 UTC (rev 64137)
@@ -183,13 +183,13 @@
public void testEar1() throws Exception
{
- URL url = new URL(HttpUtils.getBaseURL() + "ear1/srv");
+ URL url = new URL(HttpUtils.getBaseURL() + "aop-scopedear1/srv");
HttpUtils.accessURL(url);
}
public void testEar2() throws Exception
{
- URL url = new URL(HttpUtils.getBaseURL() + "ear2/srv");
+ URL url = new URL(HttpUtils.getBaseURL() + "aop-scopedear2/srv");
HttpUtils.accessURL(url);
}
Modified: trunk/testsuite/src/resources/aop/earwithwebinf/META-INF/application.xml
===================================================================
--- trunk/testsuite/src/resources/aop/earwithwebinf/META-INF/application.xml 2007-07-19 13:52:31 UTC (rev 64136)
+++ trunk/testsuite/src/resources/aop/earwithwebinf/META-INF/application.xml 2007-07-19 14:07:53 UTC (rev 64137)
@@ -12,7 +12,7 @@
<module>
<web>
<web-uri>aop-classesinwebinf.war</web-uri>
- <context-root>/classesinwebinf</context-root>
+ <context-root>/aop-classesinwebinf</context-root>
</web>
</module>
</application>
Modified: trunk/testsuite/src/resources/aop/scoped/ear1/META-INF/application.xml
===================================================================
--- trunk/testsuite/src/resources/aop/scoped/ear1/META-INF/application.xml 2007-07-19 13:52:31 UTC (rev 64136)
+++ trunk/testsuite/src/resources/aop/scoped/ear1/META-INF/application.xml 2007-07-19 14:07:53 UTC (rev 64137)
@@ -13,7 +13,7 @@
<module>
<web>
<web-uri>aop-scopedear1.war</web-uri>
- <context-root>/ear1</context-root>
+ <context-root>/aop-scopedear1</context-root>
</web>
</module>
</application>
Modified: trunk/testsuite/src/resources/aop/scoped/ear2/META-INF/application.xml
===================================================================
--- trunk/testsuite/src/resources/aop/scoped/ear2/META-INF/application.xml 2007-07-19 13:52:31 UTC (rev 64136)
+++ trunk/testsuite/src/resources/aop/scoped/ear2/META-INF/application.xml 2007-07-19 14:07:53 UTC (rev 64137)
@@ -13,7 +13,7 @@
<module>
<web>
<web-uri>aop-scopedear2.war</web-uri>
- <context-root>/ear2</context-root>
+ <context-root>/aop-scopedear2</context-root>
</web>
</module>
</application>
More information about the jboss-cvs-commits
mailing list