gatein SVN: r141 - in components/pc/trunk: test and 1 other directories.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2009-08-30 22:20:50 -0400 (Sun, 30 Aug 2009)
New Revision: 141
Modified:
components/pc/trunk/build/pom.xml
components/pc/trunk/test/pom.xml
components/pc/trunk/test/src/test/build.xml
Log:
Update the JBoss Remoting version due to an issue which could cause some remote tests to silently fall when the server fails to restart during a test.
Modified: components/pc/trunk/build/pom.xml
===================================================================
--- components/pc/trunk/build/pom.xml 2009-08-31 01:40:33 UTC (rev 140)
+++ components/pc/trunk/build/pom.xml 2009-08-31 02:20:50 UTC (rev 141)
@@ -31,7 +31,8 @@
<version.apache.tomcat>5.5.12</version.apache.tomcat>
<version.jboss-logging>2.0.4.GA</version.jboss-logging>
<version.jbossxb>2.0.0.GA</version.jbossxb>
- <version.jboss-remoting>2.2.1.GA</version.jboss-remoting>
+ <version.jboss-remoting>2.5.0.GA</version.jboss-remoting>
+ <version.jboss.serialization>1.0.3.GA</version.jboss.serialization>
<version.gatein.common>2.0.0-SNAPSHOT</version.gatein.common>
<version.gatein.wci>2.0.0-SNAPSHOT</version.gatein.wci>
<version.jboss.unit>1.2.3</version.jboss.unit>
@@ -230,10 +231,15 @@
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.remoting</groupId>
<artifactId>jboss-remoting</artifactId>
<version>${version.jboss-remoting}</version>
</dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-serialization</artifactId>
+ <version>${version.jboss.serialization}</version>
+ </dependency>
<dependency>
<groupId>org.jboss.unit</groupId>
Modified: components/pc/trunk/test/pom.xml
===================================================================
--- components/pc/trunk/test/pom.xml 2009-08-31 01:40:33 UTC (rev 140)
+++ components/pc/trunk/test/pom.xml 2009-08-31 02:20:50 UTC (rev 141)
@@ -94,7 +94,7 @@
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss.remoting</groupId>
<artifactId>jboss-remoting</artifactId>
</dependency>
@@ -113,6 +113,11 @@
<artifactId>jboss-reflect</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-serialization</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>jboss</groupId>
@@ -274,7 +279,7 @@
<property name="dependency.jboss-unit-remote.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-remote.jar.path}"/>
<property name="dependency.portal-test.jar" value="${maven.dependency.org.jboss.unit.portal-test.jar.path}"/>
<property name="dependency.portal-test-generic.jar" value="${maven.dependency.org.jboss.unit.portal-test-generic.jar.path}"/>
- <property name="dependency.jboss-remoting.jar" value="${maven.dependency.jboss.jboss-remoting.jar.path}"/>
+ <property name="dependency.jboss-remoting.jar" value="${maven.dependency.org.jboss.remoting.jboss-remoting.jar.path}"/>
<property name="dependency.concurrent.jar" value="${maven.dependency.concurrent.concurrent.jar.path}"/>
<property name="dependency.trove.jar" value="${maven.dependency.trove.trove.jar.path}"/>
@@ -292,6 +297,7 @@
<property name="dependency.xercesImpl.jar" value="${maven.dependency.apache-xerces.xercesImpl.jar.path}"/>
<property name="dependency.xml-apis.jar" value="${maven.dependency.apache-xerces.xml-apis.jar.path}"/>
<property name="dependency.jbossxb.jar" value="${maven.dependency.org.jboss.jbossxb.jar.path}"/>
+ <property name="dependency.jboss-serialization.jar" value="${maven.dependency.jboss.jboss-serialization.jar.path}"/>
<property name="dependency.cargo-core-uberjar.jar" value="${maven.dependency.org.codehaus.cargo.cargo-core-uberjar.jar.path}"/>
<property name="dependency.cargo-ant.jar" value="${maven.dependency.org.codehaus.cargo.cargo-ant.jar.path}"/>
Modified: components/pc/trunk/test/src/test/build.xml
===================================================================
--- components/pc/trunk/test/src/test/build.xml 2009-08-31 01:40:33 UTC (rev 140)
+++ components/pc/trunk/test/src/test/build.xml 2009-08-31 02:20:50 UTC (rev 141)
@@ -160,6 +160,7 @@
<path location="${dependency.activation.jar}"/>
<path location="${dependency.jaxb.jar}"/>
<path location="${dependency.ccpp.jar}"/>
+ <path location="${dependency.jboss-serialization.jar}"/>
</path>
<path id="jetty-6.1">
15 years, 3 months
- 1
- 0
gatein SVN: r140 - in components/pc/trunk: api and 13 other directories.
by do-not-reply＠jboss.org
Author: aheritier
Date: 2009-08-30 21:40:33 -0400 (Sun, 30 Aug 2009)
New Revision: 140
Modified:
components/pc/trunk/api/pom.xml
components/pc/trunk/bridge/pom.xml
components/pc/trunk/build/pom.xml
components/pc/trunk/controller/pom.xml
components/pc/trunk/docs/pom.xml
components/pc/trunk/docs/user-guide/pom.xml
components/pc/trunk/federation/pom.xml
components/pc/trunk/jsr168api/pom.xml
components/pc/trunk/management/pom.xml
components/pc/trunk/mc/pom.xml
components/pc/trunk/pom.xml
components/pc/trunk/portal/pom.xml
components/pc/trunk/portlet/pom.xml
components/pc/trunk/samples/pom.xml
components/pc/trunk/test/pom.xml
Log:
Cleanup (Maven)
Modified: components/pc/trunk/api/pom.xml
===================================================================
--- components/pc/trunk/api/pom.xml 2009-08-31 00:08:50 UTC (rev 139)
+++ components/pc/trunk/api/pom.xml 2009-08-31 01:40:33 UTC (rev 140)
@@ -3,15 +3,14 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>module-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-api</artifactId>
<packaging>jar</packaging>
- <name>portlet-api</name>
- <url>http://maven.apache.org</url>
+ <name>GateIn - Portlet Container (api)</name>
<dependencies>
<dependency>
Modified: components/pc/trunk/bridge/pom.xml
===================================================================
--- components/pc/trunk/bridge/pom.xml 2009-08-31 00:08:50 UTC (rev 139)
+++ components/pc/trunk/bridge/pom.xml 2009-08-31 01:40:33 UTC (rev 140)
@@ -3,13 +3,13 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>module-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-bridge</artifactId>
<packaging>jar</packaging>
- <name>bridge</name>
+ <name>GateIn - Portlet Container (bridge)</name>
<dependencies>
<dependency>
Modified: components/pc/trunk/build/pom.xml
===================================================================
--- components/pc/trunk/build/pom.xml 2009-08-31 00:08:50 UTC (rev 139)
+++ components/pc/trunk/build/pom.xml 2009-08-31 01:40:33 UTC (rev 140)
@@ -18,10 +18,9 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.gatein.pc</groupId>
<artifactId>module-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>JBoss Portal Portlet Module</name>
- <description>JBoss Portal Portlet Module</description>
+ <name>GateIn - Portlet Container (parent)</name>
<properties>
<version.apache.portals.bridges>1.0.4</version.apache.portals.bridges>
@@ -33,8 +32,8 @@
<version.jboss-logging>2.0.4.GA</version.jboss-logging>
<version.jbossxb>2.0.0.GA</version.jbossxb>
<version.jboss-remoting>2.2.1.GA</version.jboss-remoting>
- <version.jboss.portal.common>3.0.0-SNAPSHOT</version.jboss.portal.common>
- <version.jboss.portal.web>3.0.0-SNAPSHOT</version.jboss.portal.web>
+ <version.gatein.common>2.0.0-SNAPSHOT</version.gatein.common>
+ <version.gatein.wci>2.0.0-SNAPSHOT</version.gatein.wci>
<version.jboss.unit>1.2.3</version.jboss.unit>
<version.log4j>1.2.14</version.log4j>
<version.apache.commons-logging>1.1.1</version.apache.commons-logging>
@@ -195,23 +194,23 @@
<dependency>
<groupId>org.gatein.common</groupId>
<artifactId>common-common</artifactId>
- <version>${version.jboss.portal.common}</version>
+ <version>${version.gatein.common}</version>
</dependency>
<dependency>
<groupId>org.gatein.common</groupId>
<artifactId>common-mc</artifactId>
- <version>${version.jboss.portal.common}</version>
+ <version>${version.gatein.common}</version>
</dependency>
<dependency>
<groupId>org.gatein.common</groupId>
<artifactId>common-mc</artifactId>
- <version>${version.jboss.portal.common}</version>
+ <version>${version.gatein.common}</version>
</dependency>
<dependency>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-wci</artifactId>
- <version>${version.jboss.portal.web}</version>
+ <version>${version.gatein.wci}</version>
</dependency>
<dependency>
Modified: components/pc/trunk/controller/pom.xml
===================================================================
--- components/pc/trunk/controller/pom.xml 2009-08-31 00:08:50 UTC (rev 139)
+++ components/pc/trunk/controller/pom.xml 2009-08-31 01:40:33 UTC (rev 140)
@@ -3,13 +3,13 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>module-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-controller</artifactId>
<packaging>jar</packaging>
- <name>Portlet controller</name>
+ <name>GateIn - Portlet Container (controller)</name>
<dependencies>
Modified: components/pc/trunk/docs/pom.xml
===================================================================
--- components/pc/trunk/docs/pom.xml 2009-08-31 00:08:50 UTC (rev 139)
+++ components/pc/trunk/docs/pom.xml 2009-08-31 01:40:33 UTC (rev 140)
@@ -4,14 +4,12 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>module-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<artifactId>docs-aggregator</artifactId>
<packaging>pom</packaging>
- <name>JBoss Portal Portlet Docs Aggregator</name>
- <version>3.0.0-SNAPSHOT</version>
- <url>http://labs.jboss.com/jbossportal</url>
+ <name>GateIn - Portlet Container (docs-aggregator)</name>
<modules>
<module>user-guide</module>
Modified: components/pc/trunk/docs/user-guide/pom.xml
===================================================================
--- components/pc/trunk/docs/user-guide/pom.xml 2009-08-31 00:08:50 UTC (rev 139)
+++ components/pc/trunk/docs/user-guide/pom.xml 2009-08-31 01:40:33 UTC (rev 140)
@@ -11,9 +11,9 @@
</parent>
<groupId>org.gatein.pc</groupId>
<artifactId>user-guide-${translation}</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<packaging>jdocbook</packaging>
- <name>User_Guide_(${translation})</name>
+ <name>GateIn - Portlet Container (User Guide ${translation})</name>
<repositories>
Modified: components/pc/trunk/federation/pom.xml
===================================================================
--- components/pc/trunk/federation/pom.xml 2009-08-31 00:08:50 UTC (rev 139)
+++ components/pc/trunk/federation/pom.xml 2009-08-31 01:40:33 UTC (rev 140)
@@ -3,13 +3,13 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>module-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-federation</artifactId>
<packaging>jar</packaging>
- <name>federation</name>
+ <name>GateIn - Portlet Container (federation)</name>
<dependencies>
<dependency>
@@ -31,7 +31,7 @@
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
- </dependency>
+ </dependency>
</dependencies>
<build>
<plugins>
Modified: components/pc/trunk/jsr168api/pom.xml
===================================================================
--- components/pc/trunk/jsr168api/pom.xml 2009-08-31 00:08:50 UTC (rev 139)
+++ components/pc/trunk/jsr168api/pom.xml 2009-08-31 01:40:33 UTC (rev 140)
@@ -3,13 +3,13 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>module-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-jsr168api</artifactId>
<packaging>jar</packaging>
- <name>JSR 168 API</name>
+ <name>GateIn - Portlet Container (JSR 168 API)</name>
<dependencies>
Modified: components/pc/trunk/management/pom.xml
===================================================================
--- components/pc/trunk/management/pom.xml 2009-08-31 00:08:50 UTC (rev 139)
+++ components/pc/trunk/management/pom.xml 2009-08-31 01:40:33 UTC (rev 140)
@@ -3,13 +3,13 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>module-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-management</artifactId>
<packaging>jar</packaging>
- <name>management</name>
+ <name>GateIn - Portlet Container (management)</name>
<dependencies>
<dependency>
Modified: components/pc/trunk/mc/pom.xml
===================================================================
--- components/pc/trunk/mc/pom.xml 2009-08-31 00:08:50 UTC (rev 139)
+++ components/pc/trunk/mc/pom.xml 2009-08-31 01:40:33 UTC (rev 140)
@@ -3,13 +3,13 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>module-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-mc</artifactId>
<packaging>jar</packaging>
- <name>Portlet Container / JBoss MC integration</name>
+ <name>GateIn - Portlet Container (mc)</name>
<dependencies>
<dependency>
Modified: components/pc/trunk/pom.xml
===================================================================
--- components/pc/trunk/pom.xml 2009-08-31 00:08:50 UTC (rev 139)
+++ components/pc/trunk/pom.xml 2009-08-31 01:40:33 UTC (rev 140)
@@ -4,12 +4,9 @@
<groupId>org.gatein.pc</groupId>
<artifactId>module-aggregator</artifactId>
<packaging>pom</packaging>
- <name>JBoss Portal Portlet Module Aggregator</name>
- <version>3.0.0-SNAPSHOT</version>
- <url>http://labs.jboss.com/jbossportal</url>
+ <name>GateIn - Portlet Container (aggregator)</name>
+ <version>2.1.0-SNAPSHOT</version>
- <dependencies/>
-
<distributionManagement>
<repository>
<!-- Copy the distribution jar file to a local checkout of the maven repository -->
Modified: components/pc/trunk/portal/pom.xml
===================================================================
--- components/pc/trunk/portal/pom.xml 2009-08-31 00:08:50 UTC (rev 139)
+++ components/pc/trunk/portal/pom.xml 2009-08-31 01:40:33 UTC (rev 140)
@@ -3,13 +3,13 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>module-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-portal</artifactId>
<packaging>jar</packaging>
- <name>Portlet Container Simple Portal</name>
+ <name>GateIn - Portlet Container (portal)</name>
<dependencies>
Modified: components/pc/trunk/portlet/pom.xml
===================================================================
--- components/pc/trunk/portlet/pom.xml 2009-08-31 00:08:50 UTC (rev 139)
+++ components/pc/trunk/portlet/pom.xml 2009-08-31 01:40:33 UTC (rev 140)
@@ -3,13 +3,13 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>module-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-portlet</artifactId>
<packaging>jar</packaging>
- <name>portlet</name>
+ <name>GateIn - Portlet Container (pc)</name>
<dependencies>
<!--
Modified: components/pc/trunk/samples/pom.xml
===================================================================
--- components/pc/trunk/samples/pom.xml 2009-08-31 00:08:50 UTC (rev 139)
+++ components/pc/trunk/samples/pom.xml 2009-08-31 01:40:33 UTC (rev 140)
@@ -3,13 +3,13 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>module-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-samples</artifactId>
<packaging>jar</packaging>
- <name>Portlet Samples</name>
+ <name>GateIn - Portlet Container (samples)</name>
<dependencies>
<dependency>
Modified: components/pc/trunk/test/pom.xml
===================================================================
--- components/pc/trunk/test/pom.xml 2009-08-31 00:08:50 UTC (rev 139)
+++ components/pc/trunk/test/pom.xml 2009-08-31 01:40:33 UTC (rev 140)
@@ -3,13 +3,13 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>module-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test</artifactId>
<packaging>jar</packaging>
- <name>Portlet container test</name>
+ <name>GateIn - Portlet Container (test)</name>
<dependencies>
15 years, 3 months
- 1
- 0
gatein SVN: r139 - in components/pc/trunk/test/src/test: resources/jboss-5.0 and 1 other directories.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2009-08-30 20:08:50 -0400 (Sun, 30 Aug 2009)
New Revision: 139
Added:
components/pc/trunk/test/src/test/resources/jboss-5.0/config/
components/pc/trunk/test/src/test/resources/jboss-5.0/config/context.xml
Modified:
components/pc/trunk/test/src/test/build.xml
Log:
Fix for JBoss AS5 test failures by setting the SessionCookie path in the context.xml file.
Fix issue with the Tomcat manager sometimes not being deployed.
Modified: components/pc/trunk/test/src/test/build.xml
===================================================================
--- components/pc/trunk/test/src/test/build.xml 2009-08-30 23:26:59 UTC (rev 138)
+++ components/pc/trunk/test/src/test/build.xml 2009-08-31 00:08:50 UTC (rev 139)
@@ -585,6 +585,8 @@
<!-- Strip cargo manager war filename-->
<copy file="${dependency.cargo-manager.war}" tofile="${test.temp.lib}/manager.war"/>
+ <!-- unjar the war -->
+ <unzip src="${test.temp.lib}/manager.war" dest="${test.temp.lib}/manager"/>
</target>
@@ -747,6 +749,7 @@
<property name="cargo.rmi.port" value="1099"/>
<property name="cargo.jvmargs" value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n"/>
<deployable type="war" file="${test.temp.lib}/jboss-5.0/portlet-test.war"/>
+ <file file="${target}/test-classes/jboss-5.0/config/context.xml" tofile="deploy/jbossweb.sar/context.xml" overwrite="true"/>
</configuration>
</cargo>
</target>
@@ -838,6 +841,7 @@
<property name="cargo.logging" value="high"/>
<!-- <property name="cargo.jvmargs" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=9000"/> -->
<deployable type="war" file="${test.temp.lib}/manager.war"/>
+ <file file="${test.temp.lib}/manager" todir="webapps/manager"/>
<deployable type="war" file="${test.temp.lib}/tomcat-6.0/portlet-test.war"/>
</configuration>
</cargo>
Added: components/pc/trunk/test/src/test/resources/jboss-5.0/config/context.xml
===================================================================
--- components/pc/trunk/test/src/test/resources/jboss-5.0/config/context.xml (rev 0)
+++ components/pc/trunk/test/src/test/resources/jboss-5.0/config/context.xml 2009-08-31 00:08:50 UTC (rev 139)
@@ -0,0 +1,20 @@
+<!-- The contents of this file will be loaded for each web application -->
+<Context cookies="true" crossContext="true">
+ <!-- Session persistence is disable by default. To enable for all web
+ apps set the pathname to a non-empty value:
+ <Manager pathname="SESSIONS.ser" />
+
+ To enable session persistence for a single web app, add a
+ WEB-INF/context.xml
+ -->
+ <Manager pathname="" />
+
+ <!-- Install an InstanceListener to handle the establishment of the run-as
+ role for servlet init/destroy events.
+ -->
+ <InstanceListener>org.jboss.web.tomcat.security.RunAsListener</InstanceListener>
+
+ <!-- Needed for portal session paths -->
+ <SessionCookie path="/"/>
+
+</Context>
15 years, 3 months
- 1
- 0
gatein SVN: r138 - in components/wci/trunk: build and 1 other directories.
by do-not-reply＠jboss.org
Author: aheritier
Date: 2009-08-30 19:26:59 -0400 (Sun, 30 Aug 2009)
New Revision: 138
Modified:
components/wci/trunk/build/pom.xml
components/wci/trunk/pom.xml
components/wci/trunk/wci/pom.xml
Log:
Cleanup (Maven)
Modified: components/wci/trunk/build/pom.xml
===================================================================
--- components/wci/trunk/build/pom.xml 2009-08-30 22:29:40 UTC (rev 137)
+++ components/wci/trunk/build/pom.xml 2009-08-30 23:26:59 UTC (rev 138)
@@ -18,21 +18,19 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.gatein.wci</groupId>
<artifactId>module-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>JBoss Portal Test Module</name>
- <url>http://www.jboss.com/products/jbossmc</url>
- <description>JBoss Portal Web Module</description>
+ <name>GateIn - Web Container Integration component (parent)</name>
<properties>
<version.concurrent>1.3.4</version.concurrent>
- <version.sun.servlet>2.5</version.sun.servlet>
+ <version.servlet.api>2.5</version.servlet.api>
<version.apache.tomcat>6.0.16</version.apache.tomcat>
<version.jetty>6.1.7</version.jetty>
<version.jboss-logging>2.0.4.GA</version.jboss-logging>
<version.apache.log4j>1.2.14</version.apache.log4j>
<version.jboss-remoting>2.5.0.GA</version.jboss-remoting>
- <version.jboss.portal.common>3.0.0-SNAPSHOT</version.jboss.portal.common>
+ <version.gatein.common>2.0.0-SNAPSHOT</version.gatein.common>
<version.jboss.unit>1.2.2</version.jboss.unit>
<version.jboss-reflect>2.0.2.GA</version.jboss-reflect>
<version.apache.commons-logging>1.1.0.jboss</version.apache.commons-logging>
@@ -117,17 +115,17 @@
<dependency>
<groupId>org.gatein.common</groupId>
<artifactId>common-common</artifactId>
- <version>${version.jboss.portal.common}</version>
+ <version>${version.gatein.common}</version>
</dependency>
<dependency>
<groupId>org.gatein.common</groupId>
<artifactId>common-mc</artifactId>
- <version>${version.jboss.portal.common}</version>
+ <version>${version.gatein.common}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>${version.sun.servlet}</version>
+ <version>${version.servlet.api}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
Modified: components/wci/trunk/pom.xml
===================================================================
--- components/wci/trunk/pom.xml 2009-08-30 22:29:40 UTC (rev 137)
+++ components/wci/trunk/pom.xml 2009-08-30 23:26:59 UTC (rev 138)
@@ -1,21 +1,20 @@
-<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">
<modelVersion>4.0.0</modelVersion>
<groupId>org.gatein.wci</groupId>
<artifactId>module-aggregator</artifactId>
<packaging>pom</packaging>
- <name>JBoss Portal Web Module</name>
- <version>3.0.0-SNAPSHOT</version>
+ <name>GateIn - Web Container Integration component (aggregator)</name>
+ <version>2.0.0-SNAPSHOT</version>
<url>http://labs.jboss.com/jbossportal</url>
- <dependencies/>
+ <dependencies />
<distributionManagement>
<repository>
- <!-- Copy the distribution jar file to a local checkout of the maven repository -->
- <!-- This variable can be set in $MAVEN_HOME/conf/settings.xml -->
- <id>repository.jboss.org</id>
- <url>file://${jboss.repository.root}</url>
+ <!-- Copy the distribution jar file to a local checkout of the maven repository -->
+ <!-- This variable can be set in $MAVEN_HOME/conf/settings.xml -->
+ <id>repository.jboss.org</id>
+ <url>file://${jboss.repository.root}</url>
</repository>
<snapshotRepository>
<id>snapshots.jboss.org</id>
@@ -33,38 +32,38 @@
<reporting>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <aggregate>true</aggregate>
- </configuration>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <aggregate>true</aggregate>
+ </configuration>
</plugin>
</plugins>
- </reporting>
+ </reporting>
-<build>
-<plugins>
-<plugin>
-<groupId>org.apache.maven.plugins</groupId>
-<artifactId>maven-surefire-plugin</artifactId>
-</plugin>
-<plugin>
-<groupId>org.apache.maven.plugins</groupId>
-<artifactId>maven-surefire-report-plugin</artifactId>
-<configuration>
-<!--<outputDirectory>/data/reports</outputDirectory>-->
-<aggregate>true</aggregate>
-</configuration>
-<executions>
-<execution>
-<phase>test</phase>
-<goals>
-<goal>report-only</goal>
-</goals>
-</execution>
-</executions>
-</plugin>
-</plugins>
-</build>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <configuration>
+ <!--<outputDirectory>/data/reports</outputDirectory>-->
+ <aggregate>true</aggregate>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>test</phase>
+ <goals>
+ <goal>report-only</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: components/wci/trunk/wci/pom.xml
===================================================================
--- components/wci/trunk/wci/pom.xml 2009-08-30 22:29:40 UTC (rev 137)
+++ components/wci/trunk/wci/pom.xml 2009-08-30 23:26:59 UTC (rev 138)
@@ -3,13 +3,13 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>module-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-wci</artifactId>
<packaging>jar</packaging>
- <name>JBoss Unit</name>
+ <name>GateIn - Web Container Integration component (wci)</name>
<dependencies>
@@ -35,6 +35,12 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>catalina</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
@@ -228,7 +234,7 @@
<property name="dependency.junit.jar" value="${maven.dependency.junit.junit.jar.path}"/>
<property name="dependency.cargo-manager.war" value="${maven.dependency.cargo.cargo-manager.war.path}"/>
- <!-- JBoss Portal -->
+ <!-- GateIn -->
<property name="dependency.gatein-common-common.jar" value="${maven.dependency.org.gatein.common.common-common.jar.path}"/>
<property name="dependency.gatein-common-mc.jar" value="${maven.dependency.org.gatein.common.common-mc.jar.path}"/>
15 years, 3 months
- 1
- 0
gatein SVN: r137 - in components/wci/trunk/wci/src: test/resources/spi/generic/app-war/WEB-INF and 4 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2009-08-30 18:29:40 -0400 (Sun, 30 Aug 2009)
New Revision: 137
Added:
components/wci/trunk/wci/src/main/java/org/gatein/wci/api/GateInServlet.java
Removed:
components/wci/trunk/wci/src/main/java/org/gatein/wci/api/BootstrapServlet.java
Modified:
components/wci/trunk/wci/src/test/resources/spi/generic/app-war/WEB-INF/web.xml
components/wci/trunk/wci/src/test/resources/support/jboss-4.2-generic/server-war/WEB-INF/web.xml
components/wci/trunk/wci/src/test/resources/support/jboss-5.0-generic/server-war/WEB-INF/web.xml
components/wci/trunk/wci/src/test/resources/support/jetty-6.1-generic/server-war/WEB-INF/web.xml
components/wci/trunk/wci/src/test/resources/support/tomcat-6.0-generic/server-war/WEB-INF/web.xml
Log:
Rename bootstrap servlet into GateInServlet as bootstrap is misleading name
Deleted: components/wci/trunk/wci/src/main/java/org/gatein/wci/api/BootstrapServlet.java
===================================================================
--- components/wci/trunk/wci/src/main/java/org/gatein/wci/api/BootstrapServlet.java 2009-08-30 22:14:11 UTC (rev 136)
+++ components/wci/trunk/wci/src/main/java/org/gatein/wci/api/BootstrapServlet.java 2009-08-30 22:29:40 UTC (rev 137)
@@ -1,70 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2006, 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.wci.api;
-
-import org.gatein.wci.command.CommandServlet;
-
-import javax.servlet.ServletException;
-import javax.servlet.ServletContext;
-import java.lang.reflect.Method;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 1.1 $
- */
-public class BootstrapServlet extends CommandServlet
-{
-
- /** . */
- private String contextPath;
-
- public void init() throws ServletException
- {
- try
- {
- Method m = ServletContext.class.getMethod("getContextPath", new Class[0]);
- ServletContext servletContext = getServletContext();
-
- //
- String contextPath = (String)m.invoke(servletContext, new Object[0]);
- ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
- GenericWebAppContext webAppContext = new GenericWebAppContext(servletContext, contextPath, classLoader);
-
- //
- GenericServletContainerContext.instance.register(webAppContext);
- this.contextPath = contextPath;
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
- }
-
- public void destroy()
- {
- if (contextPath != null)
- {
- GenericServletContainerContext.instance.unregister(contextPath);
- }
- }
-}
\ No newline at end of file
Copied: components/wci/trunk/wci/src/main/java/org/gatein/wci/api/GateInServlet.java (from rev 136, components/wci/trunk/wci/src/main/java/org/gatein/wci/api/BootstrapServlet.java)
===================================================================
--- components/wci/trunk/wci/src/main/java/org/gatein/wci/api/GateInServlet.java (rev 0)
+++ components/wci/trunk/wci/src/main/java/org/gatein/wci/api/GateInServlet.java 2009-08-30 22:29:40 UTC (rev 137)
@@ -0,0 +1,70 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, 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.wci.api;
+
+import org.gatein.wci.command.CommandServlet;
+
+import javax.servlet.ServletException;
+import javax.servlet.ServletContext;
+import java.lang.reflect.Method;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public class GateInServlet extends CommandServlet
+{
+
+ /** . */
+ private String contextPath;
+
+ public void init() throws ServletException
+ {
+ try
+ {
+ Method m = ServletContext.class.getMethod("getContextPath", new Class[0]);
+ ServletContext servletContext = getServletContext();
+
+ //
+ String contextPath = (String)m.invoke(servletContext, new Object[0]);
+ ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+ GenericWebAppContext webAppContext = new GenericWebAppContext(servletContext, contextPath, classLoader);
+
+ //
+ GenericServletContainerContext.instance.register(webAppContext);
+ this.contextPath = contextPath;
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ }
+
+ public void destroy()
+ {
+ if (contextPath != null)
+ {
+ GenericServletContainerContext.instance.unregister(contextPath);
+ }
+ }
+}
\ No newline at end of file
Modified: components/wci/trunk/wci/src/test/resources/spi/generic/app-war/WEB-INF/web.xml
===================================================================
--- components/wci/trunk/wci/src/test/resources/spi/generic/app-war/WEB-INF/web.xml 2009-08-30 22:14:11 UTC (rev 136)
+++ components/wci/trunk/wci/src/test/resources/spi/generic/app-war/WEB-INF/web.xml 2009-08-30 22:29:40 UTC (rev 137)
@@ -27,12 +27,12 @@
"http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
<servlet>
- <servlet-name>BootstrapServlet</servlet-name>
- <servlet-class>org.gatein.wci.api.BootstrapServlet</servlet-class>
+ <servlet-name>GateInServlet</servlet-name>
+ <servlet-class>org.gatein.wci.api.GateInServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
- <servlet-name>BootstrapServlet</servlet-name>
+ <servlet-name>GateInServlet</servlet-name>
<url-pattern>/gateinservlet</url-pattern>
</servlet-mapping>
</web-app>
Modified: components/wci/trunk/wci/src/test/resources/support/jboss-4.2-generic/server-war/WEB-INF/web.xml
===================================================================
--- components/wci/trunk/wci/src/test/resources/support/jboss-4.2-generic/server-war/WEB-INF/web.xml 2009-08-30 22:14:11 UTC (rev 136)
+++ components/wci/trunk/wci/src/test/resources/support/jboss-4.2-generic/server-war/WEB-INF/web.xml 2009-08-30 22:29:40 UTC (rev 137)
@@ -43,8 +43,8 @@
<load-on-startup>0</load-on-startup>
</servlet>
<servlet>
- <servlet-name>BootstrapServlet</servlet-name>
- <servlet-class>org.gatein.wci.api.BootstrapServlet</servlet-class>
+ <servlet-name>GateInServlet</servlet-name>
+ <servlet-class>org.gatein.wci.api.GateInServlet</servlet-class>
<load-on-startup>0</load-on-startup>
</servlet>
<servlet-mapping>
@@ -52,7 +52,7 @@
<url-pattern>/</url-pattern>
</servlet-mapping>
<servlet-mapping>
- <servlet-name>BootstrapServlet</servlet-name>
+ <servlet-name>GateInServlet</servlet-name>
<url-pattern>/gateinservlet</url-pattern>
</servlet-mapping>
</web-app>
Modified: components/wci/trunk/wci/src/test/resources/support/jboss-5.0-generic/server-war/WEB-INF/web.xml
===================================================================
--- components/wci/trunk/wci/src/test/resources/support/jboss-5.0-generic/server-war/WEB-INF/web.xml 2009-08-30 22:14:11 UTC (rev 136)
+++ components/wci/trunk/wci/src/test/resources/support/jboss-5.0-generic/server-war/WEB-INF/web.xml 2009-08-30 22:29:40 UTC (rev 137)
@@ -43,8 +43,8 @@
<load-on-startup>1</load-on-startup>
</servlet>
<servlet>
- <servlet-name>BootstrapServlet</servlet-name>
- <servlet-class>org.gatein.wci.api.BootstrapServlet</servlet-class>
+ <servlet-name>GateInServlet</servlet-name>
+ <servlet-class>org.gatein.wci.api.GateInServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
@@ -52,7 +52,7 @@
<url-pattern>/</url-pattern>
</servlet-mapping>
<servlet-mapping>
- <servlet-name>BootstrapServlet</servlet-name>
+ <servlet-name>GateInServlet</servlet-name>
<url-pattern>/gateinservlet</url-pattern>
</servlet-mapping>
</web-app>
Modified: components/wci/trunk/wci/src/test/resources/support/jetty-6.1-generic/server-war/WEB-INF/web.xml
===================================================================
--- components/wci/trunk/wci/src/test/resources/support/jetty-6.1-generic/server-war/WEB-INF/web.xml 2009-08-30 22:14:11 UTC (rev 136)
+++ components/wci/trunk/wci/src/test/resources/support/jetty-6.1-generic/server-war/WEB-INF/web.xml 2009-08-30 22:29:40 UTC (rev 137)
@@ -43,8 +43,8 @@
<load-on-startup>0</load-on-startup>
</servlet>
<servlet>
- <servlet-name>BootstrapServlet</servlet-name>
- <servlet-class>org.gatein.wci.api.BootstrapServlet</servlet-class>
+ <servlet-name>GateInServlet</servlet-name>
+ <servlet-class>org.gatein.wci.api.GateInServlet</servlet-class>
<load-on-startup>0</load-on-startup>
</servlet>
<servlet-mapping>
@@ -52,7 +52,7 @@
<url-pattern>/</url-pattern>
</servlet-mapping>
<servlet-mapping>
- <servlet-name>BootstrapServlet</servlet-name>
+ <servlet-name>GateInServlet</servlet-name>
<url-pattern>/gateinservlet</url-pattern>
</servlet-mapping>
</web-app>
Modified: components/wci/trunk/wci/src/test/resources/support/tomcat-6.0-generic/server-war/WEB-INF/web.xml
===================================================================
--- components/wci/trunk/wci/src/test/resources/support/tomcat-6.0-generic/server-war/WEB-INF/web.xml 2009-08-30 22:14:11 UTC (rev 136)
+++ components/wci/trunk/wci/src/test/resources/support/tomcat-6.0-generic/server-war/WEB-INF/web.xml 2009-08-30 22:29:40 UTC (rev 137)
@@ -43,8 +43,8 @@
<load-on-startup>0</load-on-startup>
</servlet>
<servlet>
- <servlet-name>BootstrapServlet</servlet-name>
- <servlet-class>org.gatein.wci.api.BootstrapServlet</servlet-class>
+ <servlet-name>GateInServlet</servlet-name>
+ <servlet-class>org.gatein.wci.api.GateInServlet</servlet-class>
<load-on-startup>0</load-on-startup>
</servlet>
<servlet-mapping>
@@ -52,7 +52,7 @@
<url-pattern>/</url-pattern>
</servlet-mapping>
<servlet-mapping>
- <servlet-name>BootstrapServlet</servlet-name>
+ <servlet-name>GateInServlet</servlet-name>
<url-pattern>/gateinservlet</url-pattern>
</servlet-mapping>
</web-app>
15 years, 3 months
- 1
- 0
gatein SVN: r136 - in components/wci/trunk/wci/src: main/java/org/gatein/wci/api and 8 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2009-08-30 18:14:11 -0400 (Sun, 30 Aug 2009)
New Revision: 136
Added:
components/wci/trunk/wci/src/main/java/org/gatein/wci/api/
components/wci/trunk/wci/src/main/java/org/gatein/wci/api/BootstrapServlet.java
components/wci/trunk/wci/src/main/java/org/gatein/wci/api/GenericServletContainerContext.java
components/wci/trunk/wci/src/main/java/org/gatein/wci/api/GenericWebAppContext.java
Removed:
components/wci/trunk/wci/src/main/java/org/gatein/wci/impl/generic/
Modified:
components/wci/trunk/wci/src/main/java/org/gatein/wci/command/CommandServlet.java
components/wci/trunk/wci/src/main/java/org/gatein/wci/impl/tomcat/TC6WebAppContext.java
components/wci/trunk/wci/src/test/resources/spi/generic/app-war/WEB-INF/web.xml
components/wci/trunk/wci/src/test/resources/support/jboss-4.2-generic/server-war/WEB-INF/web.xml
components/wci/trunk/wci/src/test/resources/support/jboss-5.0-generic/server-war/WEB-INF/web.xml
components/wci/trunk/wci/src/test/resources/support/jetty-6.1-generic/server-war/WEB-INF/web.xml
components/wci/trunk/wci/src/test/resources/support/tomcat-6.0-generic/server-war/WEB-INF/web.xml
Log:
GTNWCI-2 : Provide public api bootstrap servlet
Added: components/wci/trunk/wci/src/main/java/org/gatein/wci/api/BootstrapServlet.java
===================================================================
--- components/wci/trunk/wci/src/main/java/org/gatein/wci/api/BootstrapServlet.java (rev 0)
+++ components/wci/trunk/wci/src/main/java/org/gatein/wci/api/BootstrapServlet.java 2009-08-30 22:14:11 UTC (rev 136)
@@ -0,0 +1,70 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, 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.wci.api;
+
+import org.gatein.wci.command.CommandServlet;
+
+import javax.servlet.ServletException;
+import javax.servlet.ServletContext;
+import java.lang.reflect.Method;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public class BootstrapServlet extends CommandServlet
+{
+
+ /** . */
+ private String contextPath;
+
+ public void init() throws ServletException
+ {
+ try
+ {
+ Method m = ServletContext.class.getMethod("getContextPath", new Class[0]);
+ ServletContext servletContext = getServletContext();
+
+ //
+ String contextPath = (String)m.invoke(servletContext, new Object[0]);
+ ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+ GenericWebAppContext webAppContext = new GenericWebAppContext(servletContext, contextPath, classLoader);
+
+ //
+ GenericServletContainerContext.instance.register(webAppContext);
+ this.contextPath = contextPath;
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ }
+
+ public void destroy()
+ {
+ if (contextPath != null)
+ {
+ GenericServletContainerContext.instance.unregister(contextPath);
+ }
+ }
+}
\ No newline at end of file
Added: components/wci/trunk/wci/src/main/java/org/gatein/wci/api/GenericServletContainerContext.java
===================================================================
--- components/wci/trunk/wci/src/main/java/org/gatein/wci/api/GenericServletContainerContext.java (rev 0)
+++ components/wci/trunk/wci/src/main/java/org/gatein/wci/api/GenericServletContainerContext.java 2009-08-30 22:14:11 UTC (rev 136)
@@ -0,0 +1,92 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, 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.wci.api;
+
+import org.gatein.wci.RequestDispatchCallback;
+import org.gatein.wci.impl.DefaultServletContainerFactory;
+import org.gatein.wci.spi.ServletContainerContext;
+import org.gatein.wci.command.CommandDispatcher;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+class GenericServletContainerContext implements ServletContainerContext
+{
+
+ /** . */
+ static final GenericServletContainerContext instance = new GenericServletContainerContext();
+
+ /** . */
+ private Registration registration;
+
+ static
+ {
+ DefaultServletContainerFactory.registerContext(instance);
+ }
+
+ void register(GenericWebAppContext webAppContext)
+ {
+ if (registration != null)
+ {
+ registration.registerWebApp(webAppContext);
+ }
+ }
+
+ void unregister(String webAppId)
+ {
+ if (registration != null)
+ {
+ registration.unregisterWebApp(webAppId);
+ }
+ }
+
+ /** . */
+ private final CommandDispatcher dispatcher = new CommandDispatcher();
+
+ public Object include(
+ ServletContext targetServletContext,
+ HttpServletRequest request,
+ HttpServletResponse response,
+ RequestDispatchCallback callback,
+ Object handback) throws ServletException, IOException
+ {
+ return dispatcher.include(targetServletContext, request, response, callback, handback);
+ }
+
+ public void setCallback(Registration registration)
+ {
+ this.registration = registration;
+ }
+
+ public void unsetCallback(Registration registration)
+ {
+ this.registration = null;
+ }
+}
\ No newline at end of file
Added: components/wci/trunk/wci/src/main/java/org/gatein/wci/api/GenericWebAppContext.java
===================================================================
--- components/wci/trunk/wci/src/main/java/org/gatein/wci/api/GenericWebAppContext.java (rev 0)
+++ components/wci/trunk/wci/src/main/java/org/gatein/wci/api/GenericWebAppContext.java 2009-08-30 22:14:11 UTC (rev 136)
@@ -0,0 +1,81 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, 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.wci.api;
+
+import org.gatein.wci.spi.WebAppContext;
+
+import javax.servlet.ServletContext;
+import java.io.InputStream;
+import java.io.IOException;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+class GenericWebAppContext implements WebAppContext
+{
+
+ /** . */
+ private final ServletContext servletContext;
+
+ /** . */
+ private final String contextPath;
+
+ /** . */
+ private final ClassLoader classLoader;
+
+ public GenericWebAppContext(ServletContext servletContext, String contextPath, ClassLoader classLoader)
+ {
+ this.servletContext = servletContext;
+ this.contextPath = contextPath;
+ this.classLoader = classLoader;
+ }
+
+ public void start() throws Exception
+ {
+ }
+
+ public void stop()
+ {
+ }
+
+ public ServletContext getServletContext()
+ {
+ return servletContext;
+ }
+
+ public ClassLoader getClassLoader()
+ {
+ return classLoader;
+ }
+
+ public String getContextPath()
+ {
+ return contextPath;
+ }
+
+ public boolean importFile(String parentDirRelativePath, String name, InputStream source, boolean overwrite) throws IOException
+ {
+ return false;
+ }
+}
\ No newline at end of file
Modified: components/wci/trunk/wci/src/main/java/org/gatein/wci/command/CommandServlet.java
===================================================================
--- components/wci/trunk/wci/src/main/java/org/gatein/wci/command/CommandServlet.java 2009-08-30 22:01:59 UTC (rev 135)
+++ components/wci/trunk/wci/src/main/java/org/gatein/wci/command/CommandServlet.java 2009-08-30 22:14:11 UTC (rev 136)
@@ -75,7 +75,7 @@
try
{
localCmd.set(callback);
- RequestDispatcher switcher = targetContext.getRequestDispatcher("/jbossportlet");
+ RequestDispatcher switcher = targetContext.getRequestDispatcher("/gateinservlet");
switcher.include(request, response);
//
Modified: components/wci/trunk/wci/src/main/java/org/gatein/wci/impl/tomcat/TC6WebAppContext.java
===================================================================
--- components/wci/trunk/wci/src/main/java/org/gatein/wci/impl/tomcat/TC6WebAppContext.java 2009-08-30 22:01:59 UTC (rev 135)
+++ components/wci/trunk/wci/src/main/java/org/gatein/wci/impl/tomcat/TC6WebAppContext.java 2009-08-30 22:14:11 UTC (rev 136)
@@ -75,11 +75,11 @@
try
{
commandServlet = context.createWrapper();
- commandServlet.setName("JBossServlet");
+ commandServlet.setName("GateInServlet");
commandServlet.setLoadOnStartup(0);
commandServlet.setServletClass(CommandServlet.class.getName());
context.addChild(commandServlet);
- context.addServletMapping("/jbossportlet", "JBossServlet");
+ context.addServletMapping("/gateinservlet", "GateInServlet");
}
catch (Exception e)
{
@@ -99,7 +99,7 @@
{
try
{
- context.removeServletMapping("jbossportlet");
+ context.removeServletMapping("gateinservlet");
context.removeChild(commandServlet);
}
catch (Exception e)
Modified: components/wci/trunk/wci/src/test/resources/spi/generic/app-war/WEB-INF/web.xml
===================================================================
--- components/wci/trunk/wci/src/test/resources/spi/generic/app-war/WEB-INF/web.xml 2009-08-30 22:01:59 UTC (rev 135)
+++ components/wci/trunk/wci/src/test/resources/spi/generic/app-war/WEB-INF/web.xml 2009-08-30 22:14:11 UTC (rev 136)
@@ -28,11 +28,11 @@
<web-app>
<servlet>
<servlet-name>BootstrapServlet</servlet-name>
- <servlet-class>org.gatein.wci.impl.generic.GenericBootstrapServlet</servlet-class>
+ <servlet-class>org.gatein.wci.api.BootstrapServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
<servlet-name>BootstrapServlet</servlet-name>
- <url-pattern>/jbossportlet</url-pattern>
+ <url-pattern>/gateinservlet</url-pattern>
</servlet-mapping>
</web-app>
Modified: components/wci/trunk/wci/src/test/resources/support/jboss-4.2-generic/server-war/WEB-INF/web.xml
===================================================================
--- components/wci/trunk/wci/src/test/resources/support/jboss-4.2-generic/server-war/WEB-INF/web.xml 2009-08-30 22:01:59 UTC (rev 135)
+++ components/wci/trunk/wci/src/test/resources/support/jboss-4.2-generic/server-war/WEB-INF/web.xml 2009-08-30 22:14:11 UTC (rev 136)
@@ -44,7 +44,7 @@
</servlet>
<servlet>
<servlet-name>BootstrapServlet</servlet-name>
- <servlet-class>org.gatein.wci.impl.generic.GenericBootstrapServlet</servlet-class>
+ <servlet-class>org.gatein.wci.api.BootstrapServlet</servlet-class>
<load-on-startup>0</load-on-startup>
</servlet>
<servlet-mapping>
@@ -53,6 +53,6 @@
</servlet-mapping>
<servlet-mapping>
<servlet-name>BootstrapServlet</servlet-name>
- <url-pattern>/jbossportlet</url-pattern>
+ <url-pattern>/gateinservlet</url-pattern>
</servlet-mapping>
</web-app>
Modified: components/wci/trunk/wci/src/test/resources/support/jboss-5.0-generic/server-war/WEB-INF/web.xml
===================================================================
--- components/wci/trunk/wci/src/test/resources/support/jboss-5.0-generic/server-war/WEB-INF/web.xml 2009-08-30 22:01:59 UTC (rev 135)
+++ components/wci/trunk/wci/src/test/resources/support/jboss-5.0-generic/server-war/WEB-INF/web.xml 2009-08-30 22:14:11 UTC (rev 136)
@@ -44,7 +44,7 @@
</servlet>
<servlet>
<servlet-name>BootstrapServlet</servlet-name>
- <servlet-class>org.gatein.wci.impl.generic.PortletContainerBootstrapServlet</servlet-class>
+ <servlet-class>org.gatein.wci.api.BootstrapServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
@@ -53,6 +53,6 @@
</servlet-mapping>
<servlet-mapping>
<servlet-name>BootstrapServlet</servlet-name>
- <url-pattern>/jbossportlet</url-pattern>
+ <url-pattern>/gateinservlet</url-pattern>
</servlet-mapping>
</web-app>
Modified: components/wci/trunk/wci/src/test/resources/support/jetty-6.1-generic/server-war/WEB-INF/web.xml
===================================================================
--- components/wci/trunk/wci/src/test/resources/support/jetty-6.1-generic/server-war/WEB-INF/web.xml 2009-08-30 22:01:59 UTC (rev 135)
+++ components/wci/trunk/wci/src/test/resources/support/jetty-6.1-generic/server-war/WEB-INF/web.xml 2009-08-30 22:14:11 UTC (rev 136)
@@ -44,7 +44,7 @@
</servlet>
<servlet>
<servlet-name>BootstrapServlet</servlet-name>
- <servlet-class>org.gatein.wci.impl.generic.PortletContainerBootstrapServlet</servlet-class>
+ <servlet-class>org.gatein.wci.api.BootstrapServlet</servlet-class>
<load-on-startup>0</load-on-startup>
</servlet>
<servlet-mapping>
@@ -53,6 +53,6 @@
</servlet-mapping>
<servlet-mapping>
<servlet-name>BootstrapServlet</servlet-name>
- <url-pattern>/jbossportlet</url-pattern>
+ <url-pattern>/gateinservlet</url-pattern>
</servlet-mapping>
</web-app>
Modified: components/wci/trunk/wci/src/test/resources/support/tomcat-6.0-generic/server-war/WEB-INF/web.xml
===================================================================
--- components/wci/trunk/wci/src/test/resources/support/tomcat-6.0-generic/server-war/WEB-INF/web.xml 2009-08-30 22:01:59 UTC (rev 135)
+++ components/wci/trunk/wci/src/test/resources/support/tomcat-6.0-generic/server-war/WEB-INF/web.xml 2009-08-30 22:14:11 UTC (rev 136)
@@ -44,7 +44,7 @@
</servlet>
<servlet>
<servlet-name>BootstrapServlet</servlet-name>
- <servlet-class>org.gatein.wci.impl.generic.GenericBootstrapServlet</servlet-class>
+ <servlet-class>org.gatein.wci.api.BootstrapServlet</servlet-class>
<load-on-startup>0</load-on-startup>
</servlet>
<servlet-mapping>
@@ -53,6 +53,6 @@
</servlet-mapping>
<servlet-mapping>
<servlet-name>BootstrapServlet</servlet-name>
- <url-pattern>/jbossportlet</url-pattern>
+ <url-pattern>/gateinservlet</url-pattern>
</servlet-mapping>
</web-app>
15 years, 3 months
- 1
- 0
gatein SVN: r134 - in components/pc/trunk: portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168 and 1 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2009-08-30 17:20:59 -0400 (Sun, 30 Aug 2009)
New Revision: 134
Modified:
components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/PortletApplicationDeployer.java
components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/ContainerInfoBuilderContextImpl.java
components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/PortletApplication10MetaData.java
Log:
GTNPC-6 : Add resource bundle factory plugin via portlet application metadata mechanism
Modified: components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/PortletApplicationDeployer.java
===================================================================
--- components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/PortletApplicationDeployer.java 2009-08-30 12:32:29 UTC (rev 133)
+++ components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/PortletApplicationDeployer.java 2009-08-30 21:20:59 UTC (rev 134)
@@ -268,7 +268,7 @@
broadcaster = null;
}
- private PortletApplication10MetaData buildPortletApplicationMetaData(WebApp webApp)
+ protected PortletApplication10MetaData buildPortletApplicationMetaData(WebApp webApp)
{
try
{
Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/ContainerInfoBuilderContextImpl.java
===================================================================
--- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/ContainerInfoBuilderContextImpl.java 2009-08-30 12:32:29 UTC (rev 133)
+++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/ContainerInfoBuilderContextImpl.java 2009-08-30 21:20:59 UTC (rev 134)
@@ -33,6 +33,7 @@
import java.util.Map;
import java.util.HashMap;
+import java.lang.reflect.Constructor;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -85,8 +86,33 @@
ResourceBundleManager bundleMgr = portletBundleMgrs.get(portletMD.getPortletName());
if (bundleMgr == null)
{
- String baseName = portletMD.getResourceBundle();
- ResourceBundleFactory rbf = new SimpleResourceBundleFactory(webApp.getClassLoader(), baseName);
+ ResourceBundleFactory rbf = null;
+ String rbfName = metaData.getResourceBundleFactoryName();
+ if (rbfName != null)
+ {
+ try
+ {
+ Class<?> tmpClass = webApp.getClassLoader().loadClass(rbfName);
+ if (ResourceBundleFactory.class.isAssignableFrom(tmpClass))
+ {
+ Class<? extends ResourceBundleFactory> rbfClass = tmpClass.asSubclass(ResourceBundleFactory.class);
+ Constructor<? extends ResourceBundleFactory> rbfCtor = rbfClass.getConstructor(ClassLoader.class, String.class);
+ rbf = rbfCtor.newInstance(webApp.getClassLoader(), portletMD.getResourceBundle());
+ }
+ }
+ catch (Exception e)
+ {
+ // Need to log
+ }
+ }
+
+ //
+ if (rbf == null)
+ {
+ rbf = new SimpleResourceBundleFactory(webApp.getClassLoader(), portletMD.getResourceBundle());
+ }
+
+ //
bundleMgr = new ResourceBundleManager(null, rbf);
portletBundleMgrs.put(portletMD.getPortletName(), bundleMgr);
}
Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/PortletApplication10MetaData.java
===================================================================
--- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/PortletApplication10MetaData.java 2009-08-30 12:32:29 UTC (rev 133)
+++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/metadata/PortletApplication10MetaData.java 2009-08-30 21:20:59 UTC (rev 134)
@@ -75,6 +75,9 @@
/** The security constraints */
private List<SecurityConstraintMetaData> securityConstraints;
+ /** The resource bundle factory class name. */
+ private String resourceBundleFactoryName;
+
@XmlAttribute(name = "id")
public String getId()
{
@@ -217,4 +220,14 @@
}
this.securityConstraints.add(securityConstraint);
}
+
+ public String getResourceBundleFactoryName()
+ {
+ return resourceBundleFactoryName;
+ }
+
+ public void setResourceBundleFactoryName(String resourceBundleFactoryName)
+ {
+ this.resourceBundleFactoryName = resourceBundleFactoryName;
+ }
}
15 years, 3 months
- 1
- 0
gatein SVN: r133 - in components/mop/trunk: api and 2 other directories.
by do-not-reply＠jboss.org
Author: aheritier
Date: 2009-08-30 08:32:29 -0400 (Sun, 30 Aug 2009)
New Revision: 133
Modified:
components/mop/trunk/api/pom.xml
components/mop/trunk/core/pom.xml
components/mop/trunk/pom.xml
components/mop/trunk/spi/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: components/mop/trunk/api/pom.xml
===================================================================
--- components/mop/trunk/api/pom.xml 2009-08-30 12:32:17 UTC (rev 132)
+++ components/mop/trunk/api/pom.xml 2009-08-30 12:32:29 UTC (rev 133)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.0-Beta03</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<!-- ****************** -->
Modified: components/mop/trunk/core/pom.xml
===================================================================
--- components/mop/trunk/core/pom.xml 2009-08-30 12:32:17 UTC (rev 132)
+++ components/mop/trunk/core/pom.xml 2009-08-30 12:32:29 UTC (rev 133)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.0-Beta03</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<!-- ****************** -->
@@ -51,13 +51,13 @@
<dependency>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-api</artifactId>
- <version>1.0.0-Beta03</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-spi</artifactId>
- <version>1.0.0-Beta03</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
Modified: components/mop/trunk/pom.xml
===================================================================
--- components/mop/trunk/pom.xml 2009-08-30 12:32:17 UTC (rev 132)
+++ components/mop/trunk/pom.xml 2009-08-30 12:32:29 UTC (rev 133)
@@ -34,7 +34,7 @@
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.0-Beta03</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>MOP</name>
@@ -54,9 +54,9 @@
</licenses>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/tags/1.0.0-B...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/tags/1.0.0-Beta03</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/mop/tags/1.0.0-Beta03</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/trunk/</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/trunk/</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/mop/trunk/</url>
</scm>
<!-- Required to download Parent -->
Modified: components/mop/trunk/spi/pom.xml
===================================================================
--- components/mop/trunk/spi/pom.xml 2009-08-30 12:32:17 UTC (rev 132)
+++ components/mop/trunk/spi/pom.xml 2009-08-30 12:32:29 UTC (rev 133)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.0-Beta03</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<!-- ****************** -->
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-api</artifactId>
- <version>1.0.0-Beta03</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
15 years, 3 months
- 1
- 0
gatein SVN: r132 - components/mop/tags.
by do-not-reply＠jboss.org
Author: aheritier
Date: 2009-08-30 08:32:17 -0400 (Sun, 30 Aug 2009)
New Revision: 132
Added:
components/mop/tags/1.0.0-Beta03/
Log:
[maven-scm] copy for tag 1.0.0-Beta03
Copied: components/mop/tags/1.0.0-Beta03 (from rev 131, components/mop/trunk)
15 years, 3 months
- 1
- 0
gatein SVN: r131 - in components/mop/trunk: api and 2 other directories.
by do-not-reply＠jboss.org
Author: aheritier
Date: 2009-08-30 08:31:57 -0400 (Sun, 30 Aug 2009)
New Revision: 131
Modified:
components/mop/trunk/api/pom.xml
components/mop/trunk/core/pom.xml
components/mop/trunk/pom.xml
components/mop/trunk/spi/pom.xml
Log:
[maven-release-plugin] prepare release 1.0.0-Beta03
Modified: components/mop/trunk/api/pom.xml
===================================================================
--- components/mop/trunk/api/pom.xml 2009-08-30 12:15:06 UTC (rev 130)
+++ components/mop/trunk/api/pom.xml 2009-08-30 12:31:57 UTC (rev 131)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-Beta03</version>
</parent>
<!-- ****************** -->
Modified: components/mop/trunk/core/pom.xml
===================================================================
--- components/mop/trunk/core/pom.xml 2009-08-30 12:15:06 UTC (rev 130)
+++ components/mop/trunk/core/pom.xml 2009-08-30 12:31:57 UTC (rev 131)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-Beta03</version>
</parent>
<!-- ****************** -->
@@ -51,13 +51,13 @@
<dependency>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-api</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-Beta03</version>
</dependency>
<dependency>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-spi</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-Beta03</version>
</dependency>
<dependency>
Modified: components/mop/trunk/pom.xml
===================================================================
--- components/mop/trunk/pom.xml 2009-08-30 12:15:06 UTC (rev 130)
+++ components/mop/trunk/pom.xml 2009-08-30 12:31:57 UTC (rev 131)
@@ -34,7 +34,7 @@
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-Beta03</version>
<packaging>pom</packaging>
<name>MOP</name>
@@ -54,9 +54,9 @@
</licenses>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/trunk/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/trunk/</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/mop/trunk/</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/tags/1.0.0-B...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/tags/1.0.0-Beta03</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/mop/tags/1.0.0-Beta03</url>
</scm>
<!-- Required to download Parent -->
Modified: components/mop/trunk/spi/pom.xml
===================================================================
--- components/mop/trunk/spi/pom.xml 2009-08-30 12:15:06 UTC (rev 130)
+++ components/mop/trunk/spi/pom.xml 2009-08-30 12:31:57 UTC (rev 131)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-Beta03</version>
</parent>
<!-- ****************** -->
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-api</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-Beta03</version>
</dependency>
</dependencies>
15 years, 3 months
- 1
- 0