Author: thomas.heute(a)jboss.com Date: 2007-07-12 09:26:23 -0400 (Thu, 12 Jul 2007) New Revision: 7735 Modified: branches/JBoss_Portal_Branch_2_6/build/distrib.xml branches/JBoss_Portal_Branch_2_6/core-wsrp/ branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/portlet.xml branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/web.xml Log: Use the Servlet wrapper on core-wsrp Modified: branches/JBoss_Portal_Branch_2_6/build/distrib.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/distrib.xml 2007-07-12 13:13:27 UTC (rev 7734) +++ branches/JBoss_Portal_Branch_2_6/build/distrib.xml 2007-07-12 13:26:23 UTC (rev 7735) @@ -239,6 +239,10 @@ <copy todir="${portal.build.normal.bin}/jboss-portal.sar/portal-wsrp.sar"> <fileset dir="${source.dir}/wsrp/output/lib/portal-wsrp-exploded.sar"/> </copy> + <mkdir dir="${portal.build.normal.bin}/jboss-portal.sar/portal-wsrp-admin.sar"/> + <copy todir="${portal.build.normal.bin}/jboss-portal.sar/portal-wsrp-admin.sar"> + <fileset dir="${source.dir}/core-wsrp/output/resources" includes="portal-wsrp-admin.sar/**"/> + </copy> </target> <!-- @@ -269,6 +273,10 @@ <copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar/portal-wsrp.sar"> <fileset dir="${source.dir}/wsrp/output/lib/portal-wsrp-exploded.sar"/> </copy> + <mkdir dir="${portal.build.normal.bin}/jboss-portal.sar/portal-wsrp-admin.sar"/> + <copy todir="${portal.build.normal.bin}/jboss-portal.sar/portal-wsrp-admin.sar"> + <fileset dir="${source.dir}/core-wsrp/output/resources" includes="portal-wsrp-admin.sar/**"/> + </copy> <copy file="${docs.dir}/readmeFiles/jboss-portal-ha-bin.README" todir="${portal.build.ha.bin}"/> </target> Property changes on: branches/JBoss_Portal_Branch_2_6/core-wsrp ___________________________________________________________________ Name: svn:ignore + output Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml 2007-07-12 13:13:27 UTC (rev 7734) +++ branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml 2007-07-12 13:26:23 UTC (rev 7735) @@ -196,35 +196,39 @@ </fileset> </jar> + <!-- portal-admin.war --> + <copy todir="${build.resources}/portal-wsrp-admin-war/WEB-INF/lib2"> + <fileset dir="${apache.myfaces.lib}" includes="myfaces-api.jar,myfaces-impl.jar,jstl.jar"/> + <fileset dir="${build.lib}" includes="portal-wsrp-admin-lib.jar"/> + <fileset dir="${jboss.portal-faces.root}/lib" includes="portal-faces-lib.jar"/> + <fileset dir="../core-admin/src/etc/sun-jsf" includes="jsf-example.jar"/> + <fileset dir="${facelets.facelets.lib}" includes="jsf-facelets.jar"/> + <fileset dir="${el.el.lib}" includes="el-api.jar,el-ri.jar"/> + <fileset dir="${portals.bridges/jsf.portlet.lib}" includes="jsf-portlet.jar"/> + </copy> - <jar jarfile="${build.lib}/portal-wsrp-admin.war"> - <fileset dir="${build.resources}/portal-wsrp-admin-war"/> - </jar> + <jar jarfile="${build.lib}/portal-wsrp-admin.war"> + <fileset dir="${build.resources}/portal-wsrp-admin-war"/> + </jar> - <!-- portal-wsrp-admin.sar --> + <!-- portal-wsrp-admin.sar --> <copy todir="${build.resources}/portal-wsrp-admin-sar/lib"> - <fileset dir="${build.lib}" includes="portal-wsrp-admin-lib.jar"/> - + <fileset dir="${jboss.portal-faces.root}/lib" includes="portal-faces-loader-lib.jar"/> <!-- For JSF --> - <fileset dir="${jboss.portal-faces.root}/lib" includes="portal-faces-lib.jar"/> - <fileset dir="${apache.myfaces.lib}" includes="myfaces-api.jar, myfaces-impl.jar, jstl.jar"/> <fileset dir="${commons.el.lib}" includes="commons-el.jar"/> <fileset dir="${apache.beanutils.lib}" includes="commons-beanutils.jar"/> <fileset dir="${apache.digester.lib}" includes="commons-digester.jar"/> - <fileset dir="${el.el.lib}" includes="el-api.jar, el-ri.jar"/> - <fileset dir="${facelets.facelets.lib}" includes="jsf-facelets.jar"/> - <fileset dir="../core-admin/src/etc/sun-jsf" includes="jsf-example.jar"/> </copy> - <!-- portal-wsrp-admin.sar --> + <!-- portal-wsrp-admin.sar --> <copy todir="${build.resources}/portal-wsrp-admin-sar"> <fileset dir="${build.lib}" includes="portal-wsrp-admin.war"/> </copy> - <jar jarfile="${build.lib}/portal-wsrp-admin.sar"> - <fileset dir="${build.resources}/portal-wsrp-admin-sar" includes="**/*"/> - </jar> + <jar jarfile="${build.lib}/portal-wsrp-admin.sar"> + <fileset dir="${build.resources}/portal-wsrp-admin-sar" includes="**/*"/> + </jar> </target> Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/portlet.xml 2007-07-12 13:13:27 UTC (rev 7734) +++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/portlet.xml 2007-07-12 13:26:23 UTC (rev 7735) @@ -29,7 +29,7 @@ <description>Configuration portlet for WSRP remote producers.</description> <portlet-name>WSRPConsumersConfigurationPortlet</portlet-name> <display-name>WSRP Consumers Configuration</display-name> - <portlet-class>org.apache.myfaces.portlet.MyFacesGenericPortlet</portlet-class> + <portlet-class>org.jboss.portal.faces.loader.FacesPortlet</portlet-class> <init-param> <name>default-view</name> <value>/WEB-INF/jsf/consumers/consumers.xhtml</value> Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/web.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/web.xml 2007-07-12 13:13:27 UTC (rev 7734) +++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/web.xml 2007-07-12 13:26:23 UTC (rev 7735) @@ -72,19 +72,10 @@ <!-- JSF entry point --> <servlet> <servlet-name>Faces Servlet</servlet-name> - <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <servlet-class>org.jboss.portal.faces.loader.FacesLoaderServlet</servlet-class> <load-on-startup>1</load-on-startup> </servlet> - <context-param> - <param-name>org.jboss.jbossfaces.WAR_BUNDLES_JSF_IMPL</param-name> - <param-value>true</param-value> - </context-param> - - <listener> - <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class> - </listener> - </web-app>