Author: chris.laprun(a)jboss.com Date: 2011-03-15 13:01:56 -0400 (Tue, 15 Mar 2011) New Revision: 6036 Added: components/wsrp/trunk/ws-security/pom.xml Modified: components/wsrp/trunk/pom.xml components/wsrp/trunk/ws-security/jboss5/pom.xml components/wsrp/trunk/ws-security/wss/pom.xml components/wsrp/trunk/wsrp-producer-war/pom.xml Log: - GTNWSRP-207: Introduced intermediary POM for wss-security module so that Maven 3 will work properly. - GTNWSRP-206: Temporarily reverted to WCI 2.0.2-GA to have a stable build. Modified: components/wsrp/trunk/pom.xml =================================================================== --- components/wsrp/trunk/pom.xml 2011-03-15 15:07:48 UTC (rev 6035) +++ components/wsrp/trunk/pom.xml 2011-03-15 17:01:56 UTC (rev 6036) @@ -49,7 +49,8 @@ <properties> <version.gatein.pc>2.3.0-Beta01</version.gatein.pc> <version.gatein.common>2.0.4-Beta01</version.gatein.common> - <version.gatein.wci>2.1.0-Beta01</version.gatein.wci> + <!--<version.gatein.wci>2.1.0-Beta01</version.gatein.wci>--> + <version.gatein.wci>2.0.2-GA</version.gatein.wci> <version.jsf>1.2_12</version.jsf> <version.servlet>2.5</version.servlet> @@ -209,8 +210,7 @@ <module>wsrp-producer-war</module> <module>hibernate-impl</module> <module>jcr-impl</module> - <module>ws-security/jboss5</module> - <module>ws-security/wss</module> + <module>ws-security</module> </modules> <repositories> Modified: components/wsrp/trunk/ws-security/jboss5/pom.xml =================================================================== --- components/wsrp/trunk/ws-security/jboss5/pom.xml 2011-03-15 15:07:48 UTC (rev 6035) +++ components/wsrp/trunk/ws-security/jboss5/pom.xml 2011-03-15 17:01:56 UTC (rev 6036) @@ -21,10 +21,11 @@ ~ 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/maven-v4_0_0.xsd"> +<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/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-parent</artifactId> + <artifactId>wsrp-wss-parent</artifactId> <version>2.1.0-Alpha02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -63,7 +64,7 @@ <artifactId>pc-federation</artifactId> </dependency> -<!-- <dependency> + <!-- <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-spi</artifactId> <version>1.1.2.GA</version> Added: components/wsrp/trunk/ws-security/pom.xml =================================================================== --- components/wsrp/trunk/ws-security/pom.xml (rev 0) +++ components/wsrp/trunk/ws-security/pom.xml 2011-03-15 17:01:56 UTC (rev 6036) @@ -0,0 +1,44 @@ +<!-- + ~ 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/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <name>GateIn WSRP WS Security Integration</name> + + <parent> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-parent</artifactId> + <version>2.1.0-Alpha02-SNAPSHOT</version> + </parent> + + <artifactId>wsrp-wss-parent</artifactId> + <packaging>pom</packaging> + + <description>GateIn WSRP Integration extension parent</description> + <modules> + <module>wss</module> + <module>jboss5</module> + </modules> +</project> \ No newline at end of file Modified: components/wsrp/trunk/ws-security/wss/pom.xml =================================================================== --- components/wsrp/trunk/ws-security/wss/pom.xml 2011-03-15 15:07:48 UTC (rev 6035) +++ components/wsrp/trunk/ws-security/wss/pom.xml 2011-03-15 17:01:56 UTC (rev 6036) @@ -21,10 +21,11 @@ ~ 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/maven-v4_0_0.xsd"> +<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/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-parent</artifactId> + <artifactId>wsrp-wss-parent</artifactId> <version>2.1.0-Alpha02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -63,7 +64,7 @@ <artifactId>pc-federation</artifactId> </dependency> -<!-- <dependency> + <!-- <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-spi</artifactId> <version>1.1.2.GA</version> Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml =================================================================== --- components/wsrp/trunk/wsrp-producer-war/pom.xml 2011-03-15 15:07:48 UTC (rev 6035) +++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2011-03-15 17:01:56 UTC (rev 6036) @@ -22,7 +22,8 @@ ~ 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"> +<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"> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> @@ -315,6 +316,12 @@ <!-- Producer Sar Test Dependencies --> <!-- TODO: move versioning to the main pom.xml --> + <!--<dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-tomcat6</artifactId> + <scope>test</scope> + <version>${version.gatein.wci}</version> + </dependency>--> <dependency> <groupId>org.gatein.wci</groupId> <artifactId>wci-tomcat</artifactId>