Menu
▾
▴
[jboss-cvs] jboss-portal/portlet ...
|
From: Julien V. <ju...@jb...> - 2006-03-12 19:26:55
|
User: julien
Date: 06/03/12 14:26:52
Modified: portlet build.xml
Log:
- make redeploy for portlet tests work (we avoid to embbed portlet test classes in the portlet server)
- remove unnecessary stuff in the test suite that bloats it
- make the request attributes work as expected when we request dispatch from a portlet
Revision Changes Path
1.63 +7 -12 jboss-portal/portlet/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/portlet/build.xml,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- build.xml 11 Mar 2006 14:55:53 -0000 1.62
+++ build.xml 12 Mar 2006 19:26:52 -0000 1.63
@@ -8,7 +8,7 @@
<!ENTITY targets SYSTEM "../tools/etc/buildfragments/targets.ent">
]>
-<!-- $Id: build.xml,v 1.62 2006/03/11 14:55:53 julien Exp $ -->
+<!-- $Id: build.xml,v 1.63 2006/03/12 19:26:52 julien Exp $ -->
<!--+======================================================================+-->
<!--| JBoss Portal (The OpenSource Portal) Build File |-->
@@ -150,7 +150,6 @@
<!-- Portlet lib jar -->
<jar jarfile="${build.lib}/portal-portlet-lib.jar">
<fileset dir="${build.classes}" excludes="org/jboss/portal/test/**"/>
- <fileset dir="${build.classes}" excludes="org/jboss/portal/portlet/test/**"/>
</jar>
<!-- Portlet test lib jar -->
@@ -181,12 +180,6 @@
<fileset dir="${build.resources}/samples-war"/>
</jar>
- <!-- Portlet test jar -->
- <jar jarfile="${build.lib}/portlet-test-lib.jar">
- <fileset dir="${build.classes}" includes="org/jboss/portal/test/portlet/junit/portlet/**"/>
- <fileset dir="${build.classes}" includes="org/jboss/portal/test/portlet/junit/command/**"/>
- </jar>
-
<!-- Test war -->
<jar jarfile="${build.lib}/test.war">
<fileset dir="${build.resources}/test-war"/>
@@ -196,7 +189,6 @@
<copy todir="${build.resources}/test-sar">
<fileset dir="${jboss.portlet-api.root}/lib" includes="portlet-api-lib.jar"/>
<fileset dir="${build.lib}" includes="portal-portlet-lib.jar"/>
- <fileset dir="${build.lib}" includes="portal-portlet-test-lib.jar"/>
<fileset dir="${jboss.portal-test.lib}" includes="portal-test-lib.jar"/>
<fileset dir="${junit.junit.lib}" includes="junit.jar"/>
<fileset dir="${build.lib}" includes="test.war"/>
@@ -287,12 +279,17 @@
<target name="package-test">
<mkdir dir="${build.resources}/test/test-${test}-war/WEB-INF/classes"/>
<copy todir="${build.resources}/test/test-${test}-war/WEB-INF/classes">
- <fileset dir="${build.classes}" includes="org/jboss/portal/test/portlet/${test}/**"/>
+ <fileset dir="${build.classes}" includes="org/jboss/portal/test/portlet/**"/>
</copy>
+
+ <!-- -->
<mkdir dir="${build.resources}/test/test-${test}-war/WEB-INF/lib"/>
+
+<!--
<copy todir="${build.resources}/test/test-${test}-war/WEB-INF/lib">
<fileset dir="${build.lib}" includes="portlet-test-lib.jar"/>
</copy>
+-->
<jar jarfile="${build.lib}/test-${test}.war">
<fileset dir="${build.resources}/test/test-${test}-war"/>
</jar>
@@ -420,7 +417,6 @@
<sysproperty key="test.uri" value="/test/redirect/"/>
-
<!--Converted tests-->
<test name="org.jboss.portal.test.portlet.jsr168.dispatcher.DispatcherTestSuite"/>
<test name="org.jboss.portal.test.portlet.jsr168.portletconfig.PortletConfigTestSuite"/>
@@ -434,7 +430,6 @@
<test name="org.jboss.portal.test.portlet.jsr168.windowstates.WindowStatesTestSuite"/>
<test name="org.jboss.portal.test.portlet.jsr168.portletcontext.PortletContextTestSuite"/>
-
<!--Test Framework test-->
<!--<test name="org.jboss.portal.test.portlet.framework.basic.BasicTestCase"/>-->
|