Author: mwringe Date: 2011-03-09 10:21:37 -0500 (Wed, 09 Mar 2011) New Revision: 5984 Added: portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/wss/ portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/wss/JBoss5WSSServiceIntegration.java portal/branches/wsrp-extraction/wsrp-integration/extension-ear/src/main/application/META-INF/gatein-wsse-consumer.xml Modified: portal/branches/wsrp-extraction/packaging/jboss-as5/pkg/pom.xml portal/branches/wsrp-extraction/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/deploy/gatein.ear/META-INF/application.xml portal/branches/wsrp-extraction/wsrp-integration/extension-component/pom.xml portal/branches/wsrp-extraction/wsrp-integration/extension-ear/pom.xml portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/consumers-configuration-nodetypes.xml portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml Log: GTNWSRP-123: update to use jbws configuration files. Add option to enable to dissable wss from the admin gui. Update the pkg-jbossas5 build to work with the new wsrp integration ear. Modified: portal/branches/wsrp-extraction/packaging/jboss-as5/pkg/pom.xml =================================================================== --- portal/branches/wsrp-extraction/packaging/jboss-as5/pkg/pom.xml 2011-03-09 04:29:59 UTC (rev 5983) +++ portal/branches/wsrp-extraction/packaging/jboss-as5/pkg/pom.xml 2011-03-09 15:21:37 UTC (rev 5984) @@ -464,10 +464,6 @@ <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets-core</artifactId> </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> - <artifactId>gatein.portal.component.wsrp</artifactId> - </dependency> <!-- Provided --> <dependency> @@ -773,49 +769,7 @@ <version>1.2.3</version> </dependency> - <!-- WSRP --> <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-producer-lib</artifactId> - <version>${org.gatein.wsrp.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-common</artifactId> - <version>${org.gatein.wsrp.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-wsrp1-ws</artifactId> - <version>${org.gatein.wsrp.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-wsrp2-ws</artifactId> - <version>${org.gatein.wsrp.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-consumer</artifactId> - <version>${org.gatein.wsrp.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-integration-api</artifactId> - <version>${org.gatein.wsrp.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-jcr-impl</artifactId> - <version>${org.gatein.wsrp.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-wss-jboss5</artifactId> - <version>${org.gatein.wsrp.version}</version> - </dependency> - - <dependency> <?context LIB?> <?move jcip-annotations.jar?> <groupId>net.jcip</groupId> @@ -902,21 +856,6 @@ <artifactId>gatein-sample-skin</artifactId> <type>war</type> </dependency> - <dependency> - <?move gatein.ear/wsrp-producer.war?> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-producer</artifactId> - <type>war</type> - <version>${org.gatein.wsrp.version}</version> - </dependency> - <dependency> - <?move gatein.ear/wsrp-admin-gui.war?> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-admin-gui</artifactId> - <type>war</type> - <version>${org.gatein.wsrp.version}</version> - </dependency> - </dependencies> Modified: portal/branches/wsrp-extraction/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/deploy/gatein.ear/META-INF/application.xml =================================================================== --- portal/branches/wsrp-extraction/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/deploy/gatein.ear/META-INF/application.xml 2011-03-09 04:29:59 UTC (rev 5983) +++ portal/branches/wsrp-extraction/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/deploy/gatein.ear/META-INF/application.xml 2011-03-09 15:21:37 UTC (rev 5984) @@ -56,16 +56,4 @@ <context-root>web</context-root> </web> </module> - <module> - <web> - <web-uri>wsrp-admin-gui.war</web-uri> - <context-root>wsrp-admin-gui</context-root> - </web> - </module> - <module> - <web> - <web-uri>wsrp-producer.war</web-uri> - <context-root>wsrp-producer</context-root> - </web> - </module> </application> Modified: portal/branches/wsrp-extraction/wsrp-integration/extension-component/pom.xml =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-component/pom.xml 2011-03-09 04:29:59 UTC (rev 5983) +++ portal/branches/wsrp-extraction/wsrp-integration/extension-component/pom.xml 2011-03-09 15:21:37 UTC (rev 5984) @@ -63,6 +63,11 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wss-jboss5</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.gatein.pc</groupId> <artifactId>pc-api</artifactId> <scope>provided</scope> @@ -97,6 +102,12 @@ <groupId>org.gatein.wci</groupId> <artifactId>wci-wci</artifactId> </dependency> + <dependency> + <groupId>org.jboss.ws.native</groupId> + <artifactId>jbossws-native-core</artifactId> + <version>3.1.2.GA</version> + <scope>provided</scope> + </dependency> <!-- tests --> <dependency> Added: portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/wss/JBoss5WSSServiceIntegration.java =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/wss/JBoss5WSSServiceIntegration.java (rev 0) +++ portal/branches/wsrp-extraction/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/wss/JBoss5WSSServiceIntegration.java 2011-03-09 15:21:37 UTC (rev 5984) @@ -0,0 +1,68 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2011, 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.gatein.portal.wsrp.wss; + +import org.gatein.wsrp.wss.WebServiceSecurityFactory; +import org.picocontainer.Startable; +import org.wsrp.wss.jboss5.handlers.consumer.WSSecurityCredentialHandler; +import org.wsrp.wss.jboss5.handlers.consumer.JBWSSecurityHandlerWrapper; + +/** + * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a> + * @version $Revision$ + */ +public class JBoss5WSSServiceIntegration implements Startable +{ + private final WebServiceSecurityFactory wssFactory; + + private final WSSecurityCredentialHandler WS_CREDENTIAL_HANDLER = new WSSecurityCredentialHandler(); + private final JBWSSecurityHandlerWrapper JBWS_SECURITY_WRAPPER = new JBWSSecurityHandlerWrapper(); + + public JBoss5WSSServiceIntegration() + { + wssFactory = WebServiceSecurityFactory.getInstance(); + } + + public void start() + { + startConsumer(); + } + + public void stop() + { + stopConsumer(); + } + + protected void startConsumer() + { + wssFactory.registerWebServiceSecurityHandler(WS_CREDENTIAL_HANDLER); + wssFactory.registerWebServiceSecurityHandler(JBWS_SECURITY_WRAPPER); + } + + protected void stopConsumer() + { + wssFactory.unregisterWebServiceSecurityHandler(WS_CREDENTIAL_HANDLER); + wssFactory.unregisterWebServiceSecurityHandler(JBWS_SECURITY_WRAPPER); + } +} + Modified: portal/branches/wsrp-extraction/wsrp-integration/extension-ear/pom.xml =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-ear/pom.xml 2011-03-09 04:29:59 UTC (rev 5983) +++ portal/branches/wsrp-extraction/wsrp-integration/extension-ear/pom.xml 2011-03-09 15:21:37 UTC (rev 5984) @@ -97,6 +97,10 @@ <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-wss-jboss5</artifactId> </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wss</artifactId> + </dependency> </dependencies> <build> @@ -175,6 +179,10 @@ <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-wss-jboss5</artifactId> </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wss</artifactId> + </jarModule> </modules> </configuration> </plugin> Added: portal/branches/wsrp-extraction/wsrp-integration/extension-ear/src/main/application/META-INF/gatein-wsse-consumer.xml =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-ear/src/main/application/META-INF/gatein-wsse-consumer.xml (rev 0) +++ portal/branches/wsrp-extraction/wsrp-integration/extension-ear/src/main/application/META-INF/gatein-wsse-consumer.xml 2011-03-09 15:21:37 UTC (rev 5984) @@ -0,0 +1,9 @@ + <jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.com/ws-security/config + http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd"> + + <config> + <username/> + </config> +</jboss-ws-security> Modified: portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/consumers-configuration-nodetypes.xml =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/consumers-configuration-nodetypes.xml 2011-03-09 04:29:59 UTC (rev 5983) +++ portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/consumers-configuration-nodetypes.xml 2011-03-09 15:21:37 UTC (rev 5984) @@ -92,6 +92,10 @@ onParentVersion="COPY" protected="false" multiple="false"> <valueConstraints/> </propertyDefinition> + <propertyDefinition name="enablewss" requiredType="boolean" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> </propertyDefinitions> </nodeType> Modified: portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml =================================================================== --- portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml 2011-03-09 04:29:59 UTC (rev 5983) +++ portal/branches/wsrp-extraction/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml 2011-03-09 15:21:37 UTC (rev 5984) @@ -44,6 +44,12 @@ </init-params> </component> + <!-- TODO: this should be removed to a JBoss5 specific configuration file --> + <component> + <type>org.gatein.portal.wsrp.wss.JBoss5WSSServiceIntegration</type> + </component> + + <external-component-plugins> <target-component>org.exoplatform.services.jcr.RepositoryService</target-component> <component-plugin>