[gatein-commits] gatein SVN: r6957 - in epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon: gatein.ear and 1 other directory.
do-not-reply at jboss.org
do-not-reply at jboss.org
Fri Jul 29 16:25:44 EDT 2011
Author: hfnukal
Date: 2011-07-29 16:25:44 -0400 (Fri, 29 Jul 2011)
New Revision: 6957
Modified:
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/pom.xml
Log:
JBEPP-972 Upgrade WSRP Component to the latest
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2011-07-29 20:24:55 UTC (rev 6956)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2011-07-29 20:25:44 UTC (rev 6957)
@@ -63,29 +63,29 @@
<version>${project.version}</version>
<type>war</type>
</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</artifactId>-->
+ <!--<version>${org.gatein.wsrp.version}</version>-->
+ <!--<type>war</type>-->
+ <!--<exclusions>-->
+ <!--<exclusion>-->
+ <!--<artifactId>jaxws-api</artifactId>-->
+ <!--<groupId>javax.xml.ws</groupId>-->
+ <!--</exclusion>-->
+ <!--<exclusion>-->
+ <!--<artifactId>jbossxb</artifactId>-->
+ <!--<groupId>org.jboss</groupId>-->
+ <!--</exclusion>-->
+ <!--</exclusions>-->
+ <!--</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</artifactId>
- <version>${org.gatein.wsrp.version}</version>
- <type>war</type>
- <exclusions>
- <exclusion>
- <artifactId>jaxws-api</artifactId>
- <groupId>javax.xml.ws</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jbossxb</artifactId>
- <groupId>org.jboss</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>integration</artifactId>
<version>${project.version}</version>
@@ -985,101 +985,101 @@
</dependency>
<!-- wsrp libs -->
+ <!--<dependency>-->
+ <!--<groupId>org.gatein.wsrp</groupId>-->
+ <!--<artifactId>wsrp-producer-lib</artifactId>-->
+ <!--<exclusions>-->
+ <!--<exclusion>-->
+ <!--<artifactId>jaxb-api</artifactId>-->
+ <!--<groupId>javax.xml.bind</groupId>-->
+ <!--</exclusion>-->
+ <!--<exclusion>-->
+ <!--<artifactId>mail</artifactId>-->
+ <!--<groupId>javax.mail</groupId>-->
+ <!--</exclusion>-->
+ <!--<exclusion>-->
+ <!--<artifactId>slf4j-api</artifactId>-->
+ <!--<groupId>org.slf4j</groupId>-->
+ <!--</exclusion>-->
+ <!--<exclusion>-->
+ <!--<artifactId>jaxws-api</artifactId>-->
+ <!--<groupId>javax.xml.ws</groupId>-->
+ <!--</exclusion>-->
+ <!--<exclusion>-->
+ <!--<artifactId>jsr181-api</artifactId>-->
+ <!--<groupId>javax.jws</groupId>-->
+ <!--</exclusion>-->
+ <!--<exclusion>-->
+ <!--<artifactId>saaj-api</artifactId>-->
+ <!--<groupId>javax.xml.soap</groupId>-->
+ <!--</exclusion>-->
+ <!--<exclusion>-->
+ <!--<artifactId>jbossxb</artifactId>-->
+ <!--<groupId>org.jboss</groupId>-->
+ <!--</exclusion>-->
+ <!--<exclusion>-->
+ <!--<artifactId>activation</artifactId>-->
+ <!--<groupId>javax.activation</groupId>-->
+ <!--</exclusion>-->
+ <!--<exclusion>-->
+ <!--<artifactId>jboss-logging-spi</artifactId>-->
+ <!--<groupId>org.jboss.logging</groupId>-->
+ <!--</exclusion>-->
+ <!--<exclusion>-->
+ <!--<artifactId>jaxb-api</artifactId>-->
+ <!--<groupId>sun-jaxb</groupId>-->
+ <!--</exclusion>-->
+ <!--<exclusion>-->
+ <!--<artifactId>xml-apis</artifactId>-->
+ <!--<groupId>apache-xerces</groupId>-->
+ <!--</exclusion>-->
+ <!--</exclusions>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>org.gatein.wsrp</groupId>-->
+ <!--<artifactId>wsrp-consumer</artifactId>-->
+ <!--<exclusions>-->
+ <!--<exclusion>-->
+ <!--<artifactId>mail</artifactId>-->
+ <!--<groupId>javax.mail</groupId>-->
+ <!--</exclusion>-->
+ <!--<exclusion>-->
+ <!--<artifactId>saaj-api</artifactId>-->
+ <!--<groupId>javax.xml.soap</groupId>-->
+ <!--</exclusion>-->
+ <!--<exclusion>-->
+ <!--<artifactId>test-framework</artifactId>-->
+ <!--<groupId>org.gatein.wsrp</groupId>-->
+ <!--</exclusion>-->
+ <!--<exclusion>-->
+ <!--<artifactId>wsdl4j</artifactId>-->
+ <!--<groupId>wsdl4j</groupId>-->
+ <!--</exclusion>-->
+ <!--<exclusion>-->
+ <!--<artifactId>jbossxb</artifactId>-->
+ <!--<groupId>org.jboss</groupId>-->
+ <!--</exclusion>-->
+ <!--<exclusion>-->
+ <!--<artifactId>slf4j-jdk14</artifactId>-->
+ <!--<groupId>org.slf4j</groupId>-->
+ <!--</exclusion>-->
+ <!--<exclusion>-->
+ <!--<artifactId>slf4j-api</artifactId>-->
+ <!--<groupId>org.slf4j</groupId>-->
+ <!--</exclusion>-->
+ <!--</exclusions>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>org.gatein.wsrp</groupId>-->
+ <!--<artifactId>wsrp-integration-api</artifactId>-->
+ <!--<exclusions>-->
+ <!--<exclusion>-->
+ <!--<artifactId>servlet-api</artifactId>-->
+ <!--<groupId>javax.servlet</groupId>-->
+ <!--</exclusion>-->
+ <!--</exclusions>-->
+ <!--</dependency>-->
<dependency>
- <groupId>org.gatein.wsrp</groupId>
- <artifactId>wsrp-producer-lib</artifactId>
- <exclusions>
- <exclusion>
- <artifactId>jaxb-api</artifactId>
- <groupId>javax.xml.bind</groupId>
- </exclusion>
- <exclusion>
- <artifactId>mail</artifactId>
- <groupId>javax.mail</groupId>
- </exclusion>
- <exclusion>
- <artifactId>slf4j-api</artifactId>
- <groupId>org.slf4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jaxws-api</artifactId>
- <groupId>javax.xml.ws</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jsr181-api</artifactId>
- <groupId>javax.jws</groupId>
- </exclusion>
- <exclusion>
- <artifactId>saaj-api</artifactId>
- <groupId>javax.xml.soap</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jbossxb</artifactId>
- <groupId>org.jboss</groupId>
- </exclusion>
- <exclusion>
- <artifactId>activation</artifactId>
- <groupId>javax.activation</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jboss-logging-spi</artifactId>
- <groupId>org.jboss.logging</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jaxb-api</artifactId>
- <groupId>sun-jaxb</groupId>
- </exclusion>
- <exclusion>
- <artifactId>xml-apis</artifactId>
- <groupId>apache-xerces</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.gatein.wsrp</groupId>
- <artifactId>wsrp-consumer</artifactId>
- <exclusions>
- <exclusion>
- <artifactId>mail</artifactId>
- <groupId>javax.mail</groupId>
- </exclusion>
- <exclusion>
- <artifactId>saaj-api</artifactId>
- <groupId>javax.xml.soap</groupId>
- </exclusion>
- <exclusion>
- <artifactId>test-framework</artifactId>
- <groupId>org.gatein.wsrp</groupId>
- </exclusion>
- <exclusion>
- <artifactId>wsdl4j</artifactId>
- <groupId>wsdl4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jbossxb</artifactId>
- <groupId>org.jboss</groupId>
- </exclusion>
- <exclusion>
- <artifactId>slf4j-jdk14</artifactId>
- <groupId>org.slf4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>slf4j-api</artifactId>
- <groupId>org.slf4j</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.gatein.wsrp</groupId>
- <artifactId>wsrp-integration-api</artifactId>
- <exclusions>
- <exclusion>
- <artifactId>servlet-api</artifactId>
- <groupId>javax.servlet</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-api</artifactId>
</dependency>
@@ -1386,13 +1386,13 @@
<contextRoot>dashboard</contextRoot>
<bundleFileName>dashboard.war</bundleFileName>
</webModule>
+ <!--<webModule>-->
+ <!--<groupId>org.gatein.wsrp</groupId>-->
+ <!--<artifactId>wsrp-producer</artifactId>-->
+ <!--<contextRoot>wsrp-producer</contextRoot>-->
+ <!--<bundleFileName>wsrp-producer.war</bundleFileName>-->
+ <!--</webModule>-->
<webModule>
- <groupId>org.gatein.wsrp</groupId>
- <artifactId>wsrp-producer</artifactId>
- <contextRoot>wsrp-producer</contextRoot>
- <bundleFileName>wsrp-producer.war</bundleFileName>
- </webModule>
- <webModule>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet.exoadmin</artifactId>
<contextRoot>exoadmin</contextRoot>
@@ -1423,13 +1423,13 @@
<bundleFileName>integration.war</bundleFileName>
<unpack>true</unpack>
</webModule>
+ <!--<webModule>-->
+ <!--<groupId>org.gatein.wsrp</groupId>-->
+ <!--<artifactId>wsrp-admin-gui</artifactId>-->
+ <!--<contextRoot>wsrp-admin-gui</contextRoot>-->
+ <!--<bundleFileName>wsrp-admin-gui.war</bundleFileName>-->
+ <!--</webModule>-->
<webModule>
- <groupId>org.gatein.wsrp</groupId>
- <artifactId>wsrp-admin-gui</artifactId>
- <contextRoot>wsrp-admin-gui</contextRoot>
- <bundleFileName>wsrp-admin-gui.war</bundleFileName>
- </webModule>
- <webModule>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets-server</artifactId>
<contextRoot>eXoGadgetServer</contextRoot>
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-07-29 20:24:55 UTC (rev 6956)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/pom.xml 2011-07-29 20:25:44 UTC (rev 6957)
@@ -27,7 +27,14 @@
<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>
+
</dependencies>
<build>
More information about the gatein-commits
mailing list