Author: hfnukal Date: 2011-08-13 00:07:17 -0400 (Sat, 13 Aug 2011) New Revision: 7064 Added: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/pom.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/src/ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/src/main/ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/src/main/application/ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/src/main/application/META-INF/ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/src/main/application/META-INF/gatein-wsse-consumer.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/src/main/application/META-INF/jboss-scanning.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/src/main/application/lib/ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/src/main/application/lib/jboss5integration.jar/ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/src/main/application/lib/jboss5integration.jar/conf/ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/src/main/application/lib/jboss5integration.jar/conf/configuration.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/web/portal/src/main/webapp/WEB-INF/conf/admin/admin-configuration.xml Modified: epp/portal/branches/EPP_5_2_Branch/component/ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/pom.xml epp/portal/branches/EPP_5_2_Branch/pom.xml epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/pom.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/WSRPServiceIntegration.java epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProvider.java epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/src/main/resources/conf/wsrp-producer-config.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/src/test/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProviderTestCase.java epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/pom.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/src/main/resources/conf/configuration.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear/src/main/application/META-INF/jboss-scanning.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/configuration.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/consumers-configuration-nodetypes.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/migration-nodetypes.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-configuration-nodetypes.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-registrations-nodetypes.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/web.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/pom.xml Log: JBEPP-972 Upgrade WSRP Component to the latest Property changes on: epp/portal/branches/EPP_5_2_Branch/component ___________________________________________________________________ Modified: svn:mergeinfo - /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component:5868 /portal/branches/branch-GTNPORTAL-1592/component:4894 /portal/branches/branch-GTNPORTAL-1643/component:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700/component:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731/component:5622,5668 /portal/branches/branch-GTNPORTAL-1745/component:5765 /portal/branches/branch-GTNPORTAL-1822/component:5943,5952 /portal/branches/branch-GTNPORTAL-1832/component:6030,6063 /portal/branches/branch-GTNPORTAL-1872/component:6400,6551 /portal/branches/branch-GTNPORTAL-1921/component:6603 /portal/branches/branch-GTNPORTAL-1963/component:6904,6915-6916 /portal/trunk/component:4891,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6437,6440,6449,6452,6573,6783-6784 + /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component:5868 /portal/branches/branch-GTNPORTAL-1592/component:4894 /portal/branches/branch-GTNPORTAL-1643/component:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700/component:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731/component:5622,5668 /portal/branches/branch-GTNPORTAL-1745/component:5765 /portal/branches/branch-GTNPORTAL-1822/component:5943,5952 /portal/branches/branch-GTNPORTAL-1832/component:6030,6063 /portal/branches/branch-GTNPORTAL-1872/component:6400,6551 /portal/branches/branch-GTNPORTAL-1921/component:6603 /portal/branches/branch-GTNPORTAL-1963/component:6904,6915-6916 /portal/trunk/component:4891,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6292,6437,6440,6449,6452,6573,6783-6784 Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/pom.xml 2011-08-13 04:00:59 UTC (rev 7063) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/pom.xml 2011-08-13 04:07:17 UTC (rev 7064) @@ -27,14 +27,15 @@ <version>${project.version}</version> <type>ear</type> </dependency> - <dependency> - <?move gatein-wsrp-integration.ear?> - <groupId>org.gatein.integration</groupId> - <artifactId>extension-ear</artifactId> - <type>ear</type> - <version>${project.version}</version> - </dependency> - + <!-- WSRP extension --> + <dependency> + <?move gatein-wsrp-integration.ear?> + <groupId>org.gatein.integration</groupId> + <artifactId>extension-ear-as5</artifactId> + <type>ear</type> + <version>${project.version}</version> + </dependency> + </dependencies> <build> Modified: epp/portal/branches/EPP_5_2_Branch/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-08-13 04:00:59 UTC (rev 7063) +++ epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-08-13 04:07:17 UTC (rev 7064) @@ -80,10 +80,10 @@ <module>portlet</module> <module>web</module> <module>server</module> - <module>wsrp-integration</module> <module>examples</module> <module>starter</module> <module>packaging</module> + <module>wsrp-integration</module> <module>testsuite</module> <module>distribution</module> </modules> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml 2011-08-13 04:00:59 UTC (rev 7063) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml 2011-08-13 04:07:17 UTC (rev 7064) @@ -27,7 +27,6 @@ <import>war:/conf/common/common-configuration.xml</import> <import>war:/conf/common/resource-compressor-configuration.xml</import> <import>war:/conf/common/portlet-container-configuration.xml</import> - <import profiles="jboss">war:/conf/wsrp/wsrp-configuration.xml</import> <import>war:/conf/common/logs-configuration.xml</import> <import>war:/conf/common/autologin-configuration.xml</import> <import>war:/conf/common/remindpwd-configuration.xml</import> Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/pom.xml 2011-08-13 04:00:59 UTC (rev 7063) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/pom.xml 2011-08-13 04:07:17 UTC (rev 7064) @@ -47,12 +47,6 @@ <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-consumer</artifactId> <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>apache-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.gatein.wsrp</groupId> @@ -62,7 +56,6 @@ <dependency> <groupId>org.gatein.mop</groupId> <artifactId>mop-api</artifactId> - <scope>provided</scope> </dependency> <dependency> <groupId>org.gatein.wsrp</groupId> @@ -75,11 +68,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-wss</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.gatein.pc</groupId> <artifactId>pc-api</artifactId> <scope>provided</scope> @@ -113,19 +101,12 @@ <dependency> <groupId>org.gatein.wci</groupId> <artifactId>wci-wci</artifactId> - <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native-core</artifactId> <version>3.1.2.GA</version> <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>wscommons-policy</groupId> - <artifactId>policy</artifactId> - </exclusion> - </exclusions> </dependency> <!-- tests --> Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/WSRPServiceIntegration.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/WSRPServiceIntegration.java 2011-08-13 04:00:59 UTC (rev 7063) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/WSRPServiceIntegration.java 2011-08-13 04:07:17 UTC (rev 7064) @@ -387,4 +387,4 @@ } } -} \ No newline at end of file +} Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProvider.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProvider.java 2011-08-13 04:00:59 UTC (rev 7063) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProvider.java 2011-08-13 04:07:17 UTC (rev 7064) @@ -272,9 +272,6 @@ public void addWindow(String windowName, String uuid) { - - if(windowName==null) windowName=uuid; - // add suffix in case we have several windows with the same name in the page if (childrenWindows.containsKey(windowName)) { Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/src/main/resources/conf/wsrp-producer-config.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/src/main/resources/conf/wsrp-producer-config.xml 2011-08-13 04:00:59 UTC (rev 7063) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/src/main/resources/conf/wsrp-producer-config.xml 2011-08-13 04:07:17 UTC (rev 7064) @@ -32,4 +32,4 @@ </producer-configuration> <!-- Configuration without registration --> - <!--<producer-configuration/>--> \ No newline at end of file + <!--<producer-configuration/>--> Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/src/test/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProviderTestCase.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/src/test/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProviderTestCase.java 2011-08-13 04:00:59 UTC (rev 7063) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/src/test/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProviderTestCase.java 2011-08-13 04:07:17 UTC (rev 7064) @@ -47,7 +47,8 @@ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision$ */ -public class MOPConsumerStructureProviderTestCase extends TestCase +public class + MOPConsumerStructureProviderTestCase extends TestCase { private MOPConsumerStructureProvider provider; private PortalStructureAccess structureAccess; Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/pom.xml 2011-08-13 04:00:59 UTC (rev 7063) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/pom.xml 2011-08-13 04:07:17 UTC (rev 7064) @@ -38,4 +38,4 @@ <finalName>extension-config</finalName> </build> -</project> \ No newline at end of file +</project> Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/src/main/resources/conf/configuration.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/src/main/resources/conf/configuration.xml 2011-08-13 04:00:59 UTC (rev 7063) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/src/main/resources/conf/configuration.xml 2011-08-13 04:07:17 UTC (rev 7064) @@ -56,4 +56,4 @@ </init-params> </component-plugin> </external-component-plugins> -</configuration> \ No newline at end of file +</configuration> Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear/src/main/application/META-INF/jboss-scanning.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear/src/main/application/META-INF/jboss-scanning.xml 2011-08-13 04:00:59 UTC (rev 7063) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear/src/main/application/META-INF/jboss-scanning.xml 2011-08-13 04:07:17 UTC (rev 7064) @@ -22,4 +22,4 @@ --> <scanning xmlns="urn:jboss:scanning:1.0"> -</scanning> \ No newline at end of file +</scanning> Added: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/pom.xml (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/pom.xml 2011-08-13 04:07:17 UTC (rev 7064) @@ -0,0 +1,198 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ 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. + --> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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> + <groupId>org.gatein.integration</groupId> + <artifactId>gatein-wsrp-integration-parent</artifactId> + <version>5.2.0-epp-DEV02-SNAPSHOT</version> + </parent> + + <artifactId>extension-ear-as5</artifactId> + <packaging>ear</packaging> + + <name>GateIn WSRP Integration extension EAR for JBoss AS 5</name> + + <dependencies> + <dependency> + <groupId>org.gatein.integration</groupId> + <artifactId>extension-config</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.integration</groupId> + <artifactId>extension-war</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.gatein.integration</groupId> + <artifactId>extension-component</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-admin-gui</artifactId> + <version>${org.gatein.wsrp.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-producer-jb5wss</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> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-ear-plugin</artifactId> + <configuration> + <displayName>gatein-wsrp-integration</displayName> + <defaultLibBundleDir>lib</defaultLibBundleDir> + <modules> + <webModule> + <groupId>org.gatein.integration</groupId> + <artifactId>extension-war</artifactId> + <contextRoot>gatein-wsrp-integration</contextRoot> + </webModule> + <webModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-producer-jb5wss</artifactId> + <contextRoot>wsrp-producer</contextRoot> + </webModule> + <webModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-admin-gui</artifactId> + <contextRoot>wsrp-admin-gui</contextRoot> + </webModule> + <jarModule> + <groupId>org.gatein.integration</groupId> + <artifactId>extension-config</artifactId> + <includeInApplicationXml>true</includeInApplicationXml> + <bundleDir>/</bundleDir> + </jarModule> + <jarModule> + <groupId>org.gatein.integration</groupId> + <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> + </plugin> + </plugins> + <finalName>gatein-wsrp-integration</finalName> + </build> + +</project> Added: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/src/main/application/META-INF/gatein-wsse-consumer.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/src/main/application/META-INF/gatein-wsse-consumer.xml (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/src/main/application/META-INF/gatein-wsse-consumer.xml 2011-08-13 04:07:17 UTC (rev 7064) @@ -0,0 +1,8 @@ + <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"> + + <!-- Configuration for the GateIn WSRP Consumer WS-Security --> + +</jboss-ws-security> Added: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/src/main/application/META-INF/jboss-scanning.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/src/main/application/META-INF/jboss-scanning.xml (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/src/main/application/META-INF/jboss-scanning.xml 2011-08-13 04:07:17 UTC (rev 7064) @@ -0,0 +1,25 @@ +<!-- + ~ 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. + --> + +<scanning xmlns="urn:jboss:scanning:1.0"> +</scanning> \ No newline at end of file Added: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/src/main/application/lib/jboss5integration.jar/conf/configuration.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/src/main/application/lib/jboss5integration.jar/conf/configuration.xml (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/src/main/application/lib/jboss5integration.jar/conf/configuration.xml 2011-08-13 04:07:17 UTC (rev 7064) @@ -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: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/configuration.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/configuration.xml 2011-08-13 04:00:59 UTC (rev 7063) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/configuration.xml 2011-08-13 04:07:17 UTC (rev 7064) @@ -28,7 +28,4 @@ xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> <import profiles="jboss">war:/conf/wsrp/wsrp-configuration.xml</import> <import profiles="jboss">war:/conf/wsrp/jcr-configuration.xml</import> - - <!-- Administration improvements --> - <import>war:/conf/admin/admin-configuration.xml</import> </configuration> Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/consumers-configuration-nodetypes.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/consumers-configuration-nodetypes.xml 2011-08-13 04:00:59 UTC (rev 7063) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/consumers-configuration-nodetypes.xml 2011-08-13 04:07:17 UTC (rev 7064) @@ -188,4 +188,4 @@ </propertyDefinitions> </nodeType> -</nodeTypes> \ No newline at end of file +</nodeTypes> Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/migration-nodetypes.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/migration-nodetypes.xml 2011-08-13 04:00:59 UTC (rev 7063) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/migration-nodetypes.xml 2011-08-13 04:07:17 UTC (rev 7064) @@ -111,4 +111,4 @@ </propertyDefinition> </propertyDefinitions> </nodeType> -</nodeTypes> \ No newline at end of file +</nodeTypes> Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-configuration-nodetypes.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-configuration-nodetypes.xml 2011-08-13 04:00:59 UTC (rev 7063) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-configuration-nodetypes.xml 2011-08-13 04:07:17 UTC (rev 7064) @@ -138,4 +138,4 @@ </propertyDefinitions> </nodeType> -</nodeTypes> \ No newline at end of file +</nodeTypes> Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-registrations-nodetypes.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-registrations-nodetypes.xml 2011-08-13 04:00:59 UTC (rev 7063) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-registrations-nodetypes.xml 2011-08-13 04:07:17 UTC (rev 7064) @@ -195,4 +195,4 @@ </propertyDefinitions> </nodeType> -</nodeTypes> \ No newline at end of file +</nodeTypes> Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml 2011-08-13 04:00:59 UTC (rev 7063) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml 2011-08-13 04:07:17 UTC (rev 7064) @@ -44,12 +44,6 @@ </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> Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/web.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/web.xml 2011-08-13 04:00:59 UTC (rev 7063) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/src/main/webapp/WEB-INF/web.xml 2011-08-13 04:07:17 UTC (rev 7064) @@ -35,4 +35,4 @@ <listener> <listener-class>org.exoplatform.container.web.PortalContainerConfigOwner</listener-class> </listener> -</web-app> \ No newline at end of file +</web-app> Added: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/web/portal/src/main/webapp/WEB-INF/conf/admin/admin-configuration.xml =================================================================== Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/pom.xml 2011-08-13 04:00:59 UTC (rev 7063) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/pom.xml 2011-08-13 04:07:17 UTC (rev 7064) @@ -39,68 +39,11 @@ </parent> <description>GateIn WSRP Integration extension parent</description> - - <profiles> - <profile> - <id>default</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <modules> - <module>extension-config</module> - <module>extension-component</module> - <module>extension-war</module> - <module>extension-ear-as5</module> - <module>extension-ear-as6</module> - </modules> - </profile> - <profile> - <id>pkg-tomcat</id> - <modules/> - </profile> - <profile> - <id>pkg-tomcat7</id> - <modules/> - </profile> - <profile> - <id>pkg-jetty</id> - <modules/> - </profile> - <profile> - <id>pkg-jbossas</id> - <modules> - <module>extension-config</module> - <module>extension-component</module> - <module>extension-war</module> - <module>extension-ear-as5</module> - </modules> - </profile> - <profile> - <id>pkg-jbossas6</id> - <modules> - <module>extension-config</module> - <module>extension-component</module> - <module>extension-war</module> - <module>extension-ear-as6</module> - </modules> - </profile> - <profile> - <id>pkg-jbossas5</id> - <modules> - <module>extension-config</module> - <module>extension-component</module> - <module>extension-war</module> - <module>extension-ear-as5</module> - </modules> - </profile> - <profile> - <id>epp-distribution</id> - <modules> - <module>extension-config</module> - <module>extension-component</module> - <module>extension-war</module> - <module>extension-ear</module> - </modules> - </profile> - </profiles> -</project> \ No newline at end of file + <modules> + <module>extension-config</module> + <module>extension-component</module> + <module>extension-war</module> + <module>extension-ear</module> + <module>extension-ear-as5</module> + </modules> +</project>