Author: thomas.heute(a)jboss.com Date: 2007-07-11 17:12:42 -0400 (Wed, 11 Jul 2007) New Revision: 7724 Added: branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-jse/ Removed: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/other/ConsumerBeanTestCase.java branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/admin/ branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-jse/WEB-INF/faces-config.xml branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-jse/WEB-INF/jboss-portlet.xml branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-jse/WEB-INF/jsf/ branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-jse/WEB-INF/portlet-instances.xml branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-jse/WEB-INF/portlet.xml branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-jse/WEB-INF/wsrp-object.xml branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-war/ Modified: branches/JBoss_Portal_Branch_2_6/wsrp/build.xml branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-jse/WEB-INF/web.xml branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml Log: Splitted JSF admin and wsrp services Modified: branches/JBoss_Portal_Branch_2_6/wsrp/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/wsrp/build.xml 2007-07-11 21:10:38 UTC (rev 7723) +++ branches/JBoss_Portal_Branch_2_6/wsrp/build.xml 2007-07-11 21:12:42 UTC (rev 7724) @@ -252,6 +252,7 @@ <path refid="jbossas/core.libs.classpath"/> <path refid="dependentmodule.classpath"/> <pathelement path="${build.classes}"/> + <path refid="hibernate.hibernate.classpath"/> </path> <aopc compilerclasspathref="aop.classpath" verbose="true"> @@ -287,26 +288,34 @@ </fileset> <!--<fileset dir="${build.resources}/portal-wsrp-lib-jar"/>--> </jar> - <copy todir="${build.resources}/portal-wsrp-war/lib"> - <!-- For JSF --> - <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"/> - </copy> <jar jarfile="${build.lib}/portal-wsrp-test-lib.jar"> <fileset dir="${build.classes}"> <include name="org/jboss/portal/test/**"/> </fileset> </jar> + <!--copy todir="${build.resources}/portal-wsrp-jse/WEB-INF/lib"> + <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--> + <!--copy todir="${build.resources}/portal-wsrp-jse/WEB-INF/lib"> + <fileset dir="${build.lib}" includes="portal-wsrp-lib.jar"/> + </copy--> <jar jarfile="${build.lib}/portal-wsrp.jse"> - <fileset dir="${build.resources}/portal-wsrp-war"/> + <fileset dir="${build.resources}/portal-wsrp-jse"/> </jar> <copy todir="${build.resources}/portal-wsrp-sar" overwrite="true"> <fileset dir="${build.lib}" includes="portal-wsrp-client.jar"/> - <fileset dir="${build.lib}" includes="portal-wsrp-lib.jar"/> <fileset dir="${build.lib}" includes="portal-wsrp.jse"/> </copy> + <copy todir="${build.resources}/portal-wsrp-sar" overwrite="true"> + <fileset dir="${build.lib}" includes="portal-wsrp-lib.jar"/> + </copy> <jar jarfile="${build.lib}/portal-wsrp.sar"> <fileset dir="${build.resources}/portal-wsrp-sar" includes="**/*"/> </jar> Deleted: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/other/ConsumerBeanTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/other/ConsumerBeanTestCase.java 2007-07-11 21:10:38 UTC (rev 7723) +++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/other/ConsumerBeanTestCase.java 2007-07-11 21:12:42 UTC (rev 7724) @@ -1,95 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2007, Red Hat Middleware, LLC, and individual * - * contributors as indicated 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.portal.test.wsrp.other; - -import junit.framework.TestCase; -import org.jboss.portal.common.NotYetImplemented; -import org.jboss.portal.test.wsrp.framework.support.MockConsumerRegistry; -import org.jboss.portal.wsrp.admin.ui.BeanContext; -import org.jboss.portal.wsrp.admin.ui.ConsumerBean; - -/** - * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> - * @version $Revision$ - * @since 2.6 - */ -public class ConsumerBeanTestCase extends TestCase -{ - private ConsumerBean bean; - - protected void setUp() throws Exception - { - bean = new ConsumerBean(); - bean.setRegistry(new MockConsumerRegistry()); - - // consumer associated with bean is null at this point so it should be loaded from the registry - bean.setId(MockConsumerRegistry.CONSUMER2); - } - - public void testInitialState() - { - assertEquals(MockConsumerRegistry.CONSUMER2, bean.getId()); - assertEquals(MockConsumerRegistry.MOCK_MARKUP, bean.getMarkup()); - assertEquals(MockConsumerRegistry.MOCK_SERVICE_DESCRIPTION, bean.getServiceDescription()); - assertFalse(bean.isModified()); - } - - public void testSetId() - { - String newId = "newId"; - bean.setId(newId); - assertEquals(newId, bean.getId()); - assertTrue(bean.isModified()); - } - - public void testSetCache() - { - bean.setCache(new Integer(300)); - assertEquals(300, bean.getCache().intValue()); - assertTrue(bean.isModified()); - } - - private static class TestBeanContext extends BeanContext - { - protected String getParameter(String key) - { - throw new NotYetImplemented(); - } - - protected void createMessage(String target, String message, Object severity) - { - // ignore for tests - } - - protected Object getErrorSeverity() - { - return null; - } - - protected Object getInfoSeverity() - { - return null; - } - } -} Copied: branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-jse (from rev 7716, branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-war) Deleted: branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-jse/WEB-INF/faces-config.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-war/WEB-INF/faces-config.xml 2007-07-11 06:54:15 UTC (rev 7716) +++ branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-jse/WEB-INF/faces-config.xml 2007-07-11 21:12:42 UTC (rev 7724) @@ -1,89 +0,0 @@ -<?xml version="1.0"?> -<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ~ JBoss, a division of Red Hat ~ - ~ Copyright 2007, Red Hat Middleware, LLC, and individual ~ - ~ contributors as indicated 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. ~ - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> - -<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN" - "http://java.sun.com/dtd/web-facesconfig_1_0.dtd"> - -<faces-config> - - <!-- Facelet portlet view handler--> - <application> - <view-handler>com.sun.facelets.FaceletPortletViewHandler</view-handler> - </application> - - <managed-bean> - <managed-bean-name>beanContext</managed-bean-name> - <managed-bean-class>org.jboss.portal.wsrp.admin.ui.JSFBeanContext</managed-bean-class> - <managed-bean-scope>application</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>consumersMgr</managed-bean-name> - <managed-bean-class>org.jboss.portal.wsrp.admin.ui.ConsumerManagerBean</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - <managed-property> - <property-name>registry</property-name> - <property-class>org.jboss.portal.wsrp.consumer.ConsumerRegistry</property-class> - <value>#{applicationScope.ConsumerRegistry}</value> - </managed-property> - <managed-property> - <property-name>beanContext</property-name> - <property-class>org.jboss.portal.wsrp.admin.ui.BeanContext</property-class> - <value>#{beanContext}</value> - </managed-property> - </managed-bean> - <managed-bean> - <managed-bean-name>consumer</managed-bean-name> - <managed-bean-class>org.jboss.portal.wsrp.admin.ui.ConsumerBean</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - <managed-property> - <property-name>registry</property-name> - <property-class>org.jboss.portal.wsrp.consumer.ConsumerRegistry</property-class> - <value>#{applicationScope.ConsumerRegistry}</value> - </managed-property> - <managed-property> - <property-name>id</property-name> - <value>#{sessionScope.consumerId}</value> - </managed-property> - <managed-property> - <property-name>manager</property-name> - <value>#{consumersMgr}</value> - </managed-property> - <managed-property> - <property-name>beanContext</property-name> - <property-class>org.jboss.portal.wsrp.admin.ui.BeanContext</property-class> - <value>#{beanContext}</value> - </managed-property> - </managed-bean> - - <navigation-rule> - <navigation-case> - <from-outcome>index</from-outcome> - <to-view-id>/WEB-INF/jsf/consumers/consumers.xhtml</to-view-id> - </navigation-case> - <navigation-case> - <from-outcome>configureConsumer</from-outcome> - <to-view-id>/WEB-INF/jsf/consumers/editConsumer.xhtml</to-view-id> - </navigation-case> - </navigation-rule> -</faces-config> Deleted: branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-jse/WEB-INF/jboss-portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-war/WEB-INF/jboss-portlet.xml 2007-07-11 06:54:15 UTC (rev 7716) +++ branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-jse/WEB-INF/jboss-portlet.xml 2007-07-11 21:12:42 UTC (rev 7724) @@ -1,40 +0,0 @@ -<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ~ JBoss, a division of Red Hat ~ - ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~ - ~ contributors as indicated 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. ~ - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> -<!DOCTYPE portlet-app PUBLIC "-//JBoss Portal//DTD JBoss Portlet 2.6//EN" "http://www.jboss.org/portal/dtd/jboss-portlet_2_6.dtd"> -<portlet-app> - <portlet> - <portlet-name>WSRPConsumersConfigurationPortlet</portlet-name> - <transaction> - <trans-attribute>Required</trans-attribute> - </transaction> - <header-content> - <link rel="stylesheet" type="text/css" href="/style.css" media="screen"/> - </header-content> - </portlet> - <service> - <service-name>ConsumerRegistry</service-name> - <service-class>org.jboss.portal.wsrp.consumer.ConsumerRegistry</service-class> - <service-ref>portal.wsrp:service=ConsumerRegistry</service-ref> - </service> -</portlet-app> - Deleted: branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-jse/WEB-INF/portlet-instances.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-war/WEB-INF/portlet-instances.xml 2007-07-11 06:54:15 UTC (rev 7716) +++ branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-jse/WEB-INF/portlet-instances.xml 2007-07-11 21:12:42 UTC (rev 7724) @@ -1,38 +0,0 @@ -<?xml version="1.0" standalone="yes"?> -<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ~ JBoss, a division of Red Hat ~ - ~ Copyright 2007, Red Hat Middleware, LLC, and individual ~ - ~ contributors as indicated 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. ~ - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> - -<deployments> - <deployment> - <instance> - <instance-id>WSRPConsumersConfigurationPortletInstance</instance-id> - <portlet-ref>WSRPConsumersConfigurationPortlet</portlet-ref> - <security-constraint> - <policy-permission> - <role-name>Admin</role-name> - <action-name>view</action-name> - </policy-permission> - </security-constraint> - </instance> - </deployment> -</deployments> \ No newline at end of file Deleted: branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-jse/WEB-INF/portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-war/WEB-INF/portlet.xml 2007-07-11 06:54:15 UTC (rev 7716) +++ branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-jse/WEB-INF/portlet.xml 2007-07-11 21:12:42 UTC (rev 7724) @@ -1,46 +0,0 @@ -<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ~ JBoss, a division of Red Hat ~ - ~ Copyright 2007, Red Hat Middleware, LLC, and individual ~ - ~ contributors as indicated 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. ~ - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> -<portlet-app - xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1... http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" - version="1.0"> - <portlet> - <description>Configuration portlet for WSRP remote producers.</description> - <portlet-name>WSRPConsumersConfigurationPortlet</portlet-name> - <display-name>WSRP Consumers Configuration</display-name> - <portlet-class>org.jboss.portal.faces.portlet.JSFMetaBridgePortlet</portlet-class> - <init-param> - <name>VIEW</name> - <value>/WEB-INF/jsf/consumers/consumers.xhtml</value> - </init-param> - <supports> - <mime-type>text/html</mime-type> - <portlet-mode>VIEW</portlet-mode> - </supports> - <portlet-info> - <title>WSRP Consumers Configuration</title> - <keywords>management,admin,wsrp</keywords> - </portlet-info> - </portlet> -</portlet-app> \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-jse/WEB-INF/web.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-war/WEB-INF/web.xml 2007-07-11 06:54:15 UTC (rev 7716) +++ branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-jse/WEB-INF/web.xml 2007-07-11 21:12:42 UTC (rev 7724) @@ -108,61 +108,6 @@ <servlet-name>PortletManagementService</servlet-name> <url-pattern>/PortletManagementService</url-pattern> </servlet-mapping> - - <!-- MyFaces specific configuration --> - <context-param> - <param-name>org.apache.myfaces.ALLOW_JAVASCRIPT</param-name> - <param-value>true</param-value> - </context-param> - <context-param> - <param-name>org.apache.myfaces.DETECT_JAVASCRIPT</param-name> - <param-value>false</param-value> - </context-param> - <context-param> - <param-name>org.apache.myfaces.AUTO_SCROLL</param-name> - <param-value>false</param-value> - </context-param> - <context-param> - <param-name>org.apache.myfaces.CHECK_EXTENSIONS_FILTER</param-name> - <param-value>false</param-value> - </context-param> - <context-param> - <param-name>org.apache.myfaces.PRETTY_HTML</param-name> - <param-value>true</param-value> - </context-param> - - <!-- Facelet configuration --> - <context-param> - <param-name>facelets.DEVELOPMENT</param-name> - <param-value>true</param-value> - </context-param> - <context-param> - <param-name>facelets.SKIP_COMMENTS</param-name> - <param-value>true</param-value> - </context-param> - - <!-- JSF configuration --> - <context-param> - <param-name>javax.faces.DEFAULT_SUFFIX</param-name> - <param-value>.xhtml</param-value> - </context-param> - <context-param> - <param-name>javax.faces.STATE_SAVING_METHOD</param-name> - <param-value>server</param-value> - </context-param> - - <!-- JSF entry point --> - <servlet> - <servlet-name>Faces Servlet</servlet-name> - <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> - <load-on-startup>1</load-on-startup> - </servlet> - - <!-- The JSF meta bridge bootstrap --> - <listener> - <display-name> Faces Meta Bridge Bootstrap</display-name> - <listener-class>org.jboss.portal.faces.portlet.JSFMetaBridgeBootstrap</listener-class> - </listener> </web-app> Deleted: branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-jse/WEB-INF/wsrp-object.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-war/WEB-INF/wsrp-object.xml 2007-07-11 06:54:15 UTC (rev 7716) +++ branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-jse/WEB-INF/wsrp-object.xml 2007-07-11 21:12:42 UTC (rev 7724) @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ~ JBoss, a division of Red Hat ~ - ~ Copyright 2007, Red Hat Middleware, LLC, and individual ~ - ~ contributors as indicated 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. ~ - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> - -<!DOCTYPE deployments PUBLIC "-//JBoss Portal//DTD Portal Object 2.6//EN" "http://www.jboss.org/portal/dtd/portal-object_2_6.dtd"> - -<deployments> - <deployment> - <parent-ref>admin</parent-ref> - <if-exists>keep</if-exists> - <page> - <page-name>WSRP</page-name> - <security-constraint> - <policy-permission> - <action-name>viewrecursive</action-name> - <role-name>Admin</role-name> - </policy-permission> - </security-constraint> - <window> - <window-name>WSRPConsumersConfigurationPortletWindow</window-name> - <instance-ref>WSRPConsumersConfigurationPortletInstance</instance-ref> - <region>center</region> - <height>0</height> - </window> - </page> - </deployment> -</deployments> Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml 2007-07-11 21:10:38 UTC (rev 7723) +++ branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml 2007-07-11 21:12:42 UTC (rev 7724) @@ -23,7 +23,6 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> <server> - <!-- Producer interceptor stack --> <mbean code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"