Author: chris.laprun(a)jboss.com Date: 2008-02-12 18:09:19 -0500 (Tue, 12 Feb 2008) New Revision: 9948 Removed: modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/ Modified: modules/portlet/trunk/test/src/test/build.xml modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/web.xml Log: - Added missing libraries for Tomcat. - Fixed improper packaging of portlets (was fine with AS but not Tomcat). - Removed useless SimplePortalServlet. Modified: modules/portlet/trunk/test/src/test/build.xml =================================================================== --- modules/portlet/trunk/test/src/test/build.xml 2008-02-12 22:18:31 UTC (rev 9947) +++ modules/portlet/trunk/test/src/test/build.xml 2008-02-12 23:09:19 UTC (rev 9948) @@ -753,10 +753,6 @@ <path refid="mc.jboss_microcontainer"/> </copy> - <copy todir="${test.temp.dir}/simple-portal-war/WEB-INF/classes"> - <fileset dir="${target}/classes" includes="org/jboss/portal/simple/**"/> - </copy> - <!-- AS 4.2 --> <generic-package-simple-portal server="${simple.as42.dir}"/> @@ -768,7 +764,8 @@ <pathelement path="${dependency.activation.jar}"/> <pathelement path="${dependency.apache-jstl.jar}"/> <pathelement path="${dependency.apache-standard.jar}"/> - <!--<pathelement path="${dependency.xercesImpl.jar}"/>--> + <pathelement path="${dependency.concurrent.jar}"/> + <path refid="mc.jaxb-api"/> </path> </copy> <jar jarfile="${simple.tomcat.dir}/simple-portal.war"> @@ -794,6 +791,8 @@ <copy todir="${samples.tmp.dir}/samples-google-map-portlet-war"> <fileset dir="src/test/resources/portal/samples/google-map-portlet-war"/> + </copy> + <copy todir="${samples.tmp.dir}/samples-google-map-portlet-war/WEB-INF/classes"> <fileset dir="${target}/classes" includes="org/jboss/portal/portlet/portal/samples/GoogleClippingPortlet.class"/> </copy> @@ -803,14 +802,19 @@ <copy todir="${samples.tmp.dir}/samples-google-weather-portlet-war"> <fileset dir="src/test/resources/portal/samples/google-weather-portlet-war"/> - <fileset dir="${target}/classes" includes="org/jboss/portal/portlet/portal/samples/*.class"/> </copy> + <copy todir="${samples.tmp.dir}/samples-google-weather-portlet-war/WEB-INF/classes"> + <fileset dir="${target}/classes" includes="org/jboss/portal/portlet/portal/samples/*.class" + excludes="org/jboss/portal/portlet/portal/samples/RemoteControlResourcePortlet.class"/> + </copy> <jar jarfile="${samples.target.dir}/samples-google-weather-portlet.war"> <fileset dir="${samples.tmp.dir}/samples-google-weather-portlet-war"/> </jar> <copy todir="${samples.tmp.dir}/samples-remotecontrol-portlet-war"> <fileset dir="src/test/resources/portal/samples/remotecontrol-portlet-war"/> + </copy> + <copy todir="${samples.tmp.dir}/samples-remotecontrol-portlet-war/WEB-INF/classes"> <fileset dir="${target}/classes" includes="org/jboss/portal/portlet/portal/samples/RemoteControlResourcePortlet.class"/> </copy> @@ -820,6 +824,8 @@ <copy todir="${samples.tmp.dir}/samples-cart-event-portlet-war"> <fileset dir="src/test/resources/portal/samples/cart-event-portlet-war"/> + </copy> + <copy todir="${samples.tmp.dir}/samples-cart-event-portlet-war/WEB-INF/classes"> <fileset dir="${target}/classes" includes="org/jboss/portal/portlet/portal/samples/event/*.class"/> </copy> <jar jarfile="${samples.target.dir}/samples-cart-event-portlet.war"> @@ -828,6 +834,8 @@ <copy todir="${samples.tmp.dir}/samples-basic-war"> <fileset dir="src/test/resources/portal/samples/basic-war"/> + </copy> + <copy todir="${samples.tmp.dir}/samples-basic-war/WEB-INF/classes"> <fileset dir="${target}/classes" includes="org/jboss/portal/portlet/portal/samples/basic/**"/> </copy> <jar jarfile="${samples.target.dir}/samples-basic.war"> Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/web.xml =================================================================== --- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/web.xml 2008-02-12 22:18:31 UTC (rev 9947) +++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/web.xml 2008-02-12 23:09:19 UTC (rev 9948) @@ -42,12 +42,4 @@ <servlet-class>org.jboss.portal.web.impl.tomcat.TC6ContainerServlet</servlet-class> <load-on-startup>0</load-on-startup> </servlet> - <servlet> - <servlet-name>PortalServlet</servlet-name> - <servlet-class>org.jboss.portal.simple.SimplePortalServlet</servlet-class> - </servlet> - <servlet-mapping> - <servlet-name>PortalServlet</servlet-name> - <url-pattern>/simple-portal</url-pattern> - </servlet-mapping> </web-app>