Author: mwringe Date: 2011-04-19 13:07:55 -0400 (Tue, 19 Apr 2011) New Revision: 6292 Added: portal/trunk/wsrp-integration/extension-ear-as5/src/main/application/lib/ portal/trunk/wsrp-integration/extension-ear-as5/src/main/application/lib/jboss5integration.jar/ portal/trunk/wsrp-integration/extension-ear-as5/src/main/application/lib/jboss5integration.jar/conf/ portal/trunk/wsrp-integration/extension-ear-as5/src/main/application/lib/jboss5integration.jar/conf/configuration.xml Modified: portal/trunk/packaging/jboss-as6/pkg/pom.xml portal/trunk/wsrp-integration/extension-ear-as5/pom.xml portal/trunk/wsrp-integration/extension-ear-as6/pom.xml portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml Log: GTNWSRP-219: update the AS6 build so that it will work better with WSRP and ws-security. Needs a newer WSRP release for ws-security to fully function. Modified: portal/trunk/packaging/jboss-as6/pkg/pom.xml =================================================================== --- portal/trunk/packaging/jboss-as6/pkg/pom.xml 2011-04-19 15:20:35 UTC (rev 6291) +++ portal/trunk/packaging/jboss-as6/pkg/pom.xml 2011-04-19 17:07:55 UTC (rev 6292) @@ -795,60 +795,7 @@ <version>0.7</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> - <exclusions> - <exclusion> - <groupId>apache-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - </exclusion> - </exclusions> - </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</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> @@ -944,21 +891,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> <build> Modified: portal/trunk/wsrp-integration/extension-ear-as5/pom.xml =================================================================== --- portal/trunk/wsrp-integration/extension-ear-as5/pom.xml 2011-04-19 15:20:35 UTC (rev 6291) +++ portal/trunk/wsrp-integration/extension-ear-as5/pom.xml 2011-04-19 17:07:55 UTC (rev 6292) @@ -26,8 +26,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>gatein-wsrp-integration-parent</artifactId> <groupId>org.gatein.integration</groupId> + <artifactId>gatein-wsrp-integration-parent</artifactId> <version>3.2.0-Beta01-SNAPSHOT</version> </parent> @@ -61,7 +61,9 @@ </dependency> <dependency> <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-producer</artifactId> + <!--<artifactId>wsrp-producer-jb5wss</artifactId> +--> + <artifactId>wsrp-producer</artifactId> <version>${org.gatein.wsrp.version}</version> <type>war</type> </dependency> @@ -133,7 +135,9 @@ </webModule> <webModule> <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-producer</artifactId> + <artifactId>wsrp-producer</artifactId> + <!--<artifactId>wsrp-producer-jb5wss</artifactId> +--> <contextRoot>wsrp-producer</contextRoot> </webModule> <webModule> Added: portal/trunk/wsrp-integration/extension-ear-as5/src/main/application/lib/jboss5integration.jar/conf/configuration.xml =================================================================== --- portal/trunk/wsrp-integration/extension-ear-as5/src/main/application/lib/jboss5integration.jar/conf/configuration.xml (rev 0) +++ portal/trunk/wsrp-integration/extension-ear-as5/src/main/application/lib/jboss5integration.jar/conf/configuration.xml 2011-04-19 17:07:55 UTC (rev 6292) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + ~ 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. + --> + +<configuration + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> + + <component> + <type>org.gatein.integration.wsrp.wss.JBoss5WSSServiceIntegration</type> + </component> + +</configuration> Modified: portal/trunk/wsrp-integration/extension-ear-as6/pom.xml =================================================================== --- portal/trunk/wsrp-integration/extension-ear-as6/pom.xml 2011-04-19 15:20:35 UTC (rev 6291) +++ portal/trunk/wsrp-integration/extension-ear-as6/pom.xml 2011-04-19 17:07:55 UTC (rev 6292) @@ -34,11 +34,10 @@ <version>3.2.0-Beta01-SNAPSHOT</version> </parent> - <groupId>org.gatein.integration</groupId> <artifactId>extension-ear-as6</artifactId> + <packaging>ear</packaging> <name>GateIn WSRP Integration extension EAR for JBoss AS 6</name> - <packaging>ear</packaging> <dependencies> <dependency> @@ -68,6 +67,48 @@ <artifactId>wsrp-producer</artifactId> <version>${org.gatein.wsrp.version}</version> <type>war</type> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-producer-lib</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-consumer</artifactId> + <exclusions> + <exclusion> + <groupId>apache-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-jcr-impl</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-common</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wsrp1-ws</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wsrp2-ws</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-integration-api</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wss-jboss5</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wss</artifactId> </dependency> </dependencies> @@ -86,7 +127,7 @@ <artifactId>maven-ear-plugin</artifactId> <configuration> <displayName>gatein-wsrp-integration</displayName> - <!--<defaultLibBundleDir>lib</defaultLibBundleDir>--> + <defaultLibBundleDir>lib</defaultLibBundleDir> <modules> <webModule> <groupId>org.gatein.integration</groupId> @@ -114,6 +155,42 @@ <artifactId>extension-component</artifactId> <includeInApplicationXml>true</includeInApplicationXml> <bundleDir>/</bundleDir> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-producer-lib</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-consumer</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-jcr-impl</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-common</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wsrp1-ws</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wsrp2-ws</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-integration-api</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wss-jboss5</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wss</artifactId> </jarModule> </modules> </configuration> @@ -122,4 +199,4 @@ <finalName>gatein-wsrp-integration</finalName> </build> -</project> \ No newline at end of file +</project> Modified: portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml =================================================================== --- portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml 2011-04-19 15:20:35 UTC (rev 6291) +++ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml 2011-04-19 17:07:55 UTC (rev 6292) @@ -44,12 +44,6 @@ </init-params> </component> - <!-- TODO: this should be removed to a JBoss5 specific configuration file --> - <component> - <type>org.gatein.integration.wsrp.wss.JBoss5WSSServiceIntegration</type> - </component> - - <external-component-plugins> <target-component>org.exoplatform.services.jcr.RepositoryService</target-component> <component-plugin>