gatein SVN: r8498 - in components/wsrp/branches/2.1.x: admin-gui and 14 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2012-02-29 14:32:37 -0500 (Wed, 29 Feb 2012)
New Revision: 8498
Modified:
components/wsrp/branches/2.1.x/admin-gui/pom.xml
components/wsrp/branches/2.1.x/api/pom.xml
components/wsrp/branches/2.1.x/common/pom.xml
components/wsrp/branches/2.1.x/consumer/pom.xml
components/wsrp/branches/2.1.x/hibernate-impl/pom.xml
components/wsrp/branches/2.1.x/jcr-impl/pom.xml
components/wsrp/branches/2.1.x/pom.xml
components/wsrp/branches/2.1.x/producer/pom.xml
components/wsrp/branches/2.1.x/test/pom.xml
components/wsrp/branches/2.1.x/ws-security/jboss5/pom.xml
components/wsrp/branches/2.1.x/ws-security/pom.xml
components/wsrp/branches/2.1.x/ws-security/wsrp-producer-jb5wss-producer-war/pom.xml
components/wsrp/branches/2.1.x/ws-security/wss/pom.xml
components/wsrp/branches/2.1.x/wsrp-producer-war/pom.xml
components/wsrp/branches/2.1.x/wsrp1-ws/pom.xml
components/wsrp/branches/2.1.x/wsrp2-ws/pom.xml
Log:
[maven-release-plugin] prepare release 2.1.1-CR02
Modified: components/wsrp/branches/2.1.x/admin-gui/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/admin-gui/pom.xml 2012-02-29 19:24:22 UTC (rev 8497)
+++ components/wsrp/branches/2.1.x/admin-gui/pom.xml 2012-02-29 19:32:37 UTC (rev 8498)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-CR02-SNAPSHOT</version>
+ <version>2.1.1-CR02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-admin-gui</artifactId>
Modified: components/wsrp/branches/2.1.x/api/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/api/pom.xml 2012-02-29 19:24:22 UTC (rev 8497)
+++ components/wsrp/branches/2.1.x/api/pom.xml 2012-02-29 19:32:37 UTC (rev 8498)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-CR02-SNAPSHOT</version>
+ <version>2.1.1-CR02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-integration-api</artifactId>
Modified: components/wsrp/branches/2.1.x/common/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/common/pom.xml 2012-02-29 19:24:22 UTC (rev 8497)
+++ components/wsrp/branches/2.1.x/common/pom.xml 2012-02-29 19:32:37 UTC (rev 8498)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-CR02-SNAPSHOT</version>
+ <version>2.1.1-CR02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-common</artifactId>
Modified: components/wsrp/branches/2.1.x/consumer/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/consumer/pom.xml 2012-02-29 19:24:22 UTC (rev 8497)
+++ components/wsrp/branches/2.1.x/consumer/pom.xml 2012-02-29 19:32:37 UTC (rev 8498)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-CR02-SNAPSHOT</version>
+ <version>2.1.1-CR02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-consumer</artifactId>
Modified: components/wsrp/branches/2.1.x/hibernate-impl/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/hibernate-impl/pom.xml 2012-02-29 19:24:22 UTC (rev 8497)
+++ components/wsrp/branches/2.1.x/hibernate-impl/pom.xml 2012-02-29 19:32:37 UTC (rev 8498)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-CR02-SNAPSHOT</version>
+ <version>2.1.1-CR02</version>
</parent>
<groupId>org.gatein.wsrp</groupId>
Modified: components/wsrp/branches/2.1.x/jcr-impl/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/jcr-impl/pom.xml 2012-02-29 19:24:22 UTC (rev 8497)
+++ components/wsrp/branches/2.1.x/jcr-impl/pom.xml 2012-02-29 19:32:37 UTC (rev 8498)
@@ -26,7 +26,7 @@
<parent>
<artifactId>wsrp-parent</artifactId>
<groupId>org.gatein.wsrp</groupId>
- <version>2.1.1-CR02-SNAPSHOT</version>
+ <version>2.1.1-CR02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/branches/2.1.x/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/pom.xml 2012-02-29 19:24:22 UTC (rev 8497)
+++ components/wsrp/branches/2.1.x/pom.xml 2012-02-29 19:32:37 UTC (rev 8498)
@@ -36,7 +36,7 @@
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-CR02-SNAPSHOT</version>
+ <version>2.1.1-CR02</version>
<packaging>pom</packaging>
@@ -47,9 +47,9 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/branches/2....</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/branches/2.1.x/</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/branches/2.1.x/</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/tags/2.1.1-...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/tags/2.1.1-CR02</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/tags/2.1.1-CR02</url>
</scm>
<properties>
Modified: components/wsrp/branches/2.1.x/producer/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/producer/pom.xml 2012-02-29 19:24:22 UTC (rev 8497)
+++ components/wsrp/branches/2.1.x/producer/pom.xml 2012-02-29 19:32:37 UTC (rev 8498)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-CR02-SNAPSHOT</version>
+ <version>2.1.1-CR02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-producer-lib</artifactId>
Modified: components/wsrp/branches/2.1.x/test/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/test/pom.xml 2012-02-29 19:24:22 UTC (rev 8497)
+++ components/wsrp/branches/2.1.x/test/pom.xml 2012-02-29 19:32:37 UTC (rev 8498)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-CR02-SNAPSHOT</version>
+ <version>2.1.1-CR02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/branches/2.1.x/ws-security/jboss5/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/ws-security/jboss5/pom.xml 2012-02-29 19:24:22 UTC (rev 8497)
+++ components/wsrp/branches/2.1.x/ws-security/jboss5/pom.xml 2012-02-29 19:32:37 UTC (rev 8498)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-wss-parent</artifactId>
- <version>2.1.1-CR02-SNAPSHOT</version>
+ <version>2.1.1-CR02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wss-jboss5</artifactId>
Modified: components/wsrp/branches/2.1.x/ws-security/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/ws-security/pom.xml 2012-02-29 19:24:22 UTC (rev 8497)
+++ components/wsrp/branches/2.1.x/ws-security/pom.xml 2012-02-29 19:32:37 UTC (rev 8498)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-CR02-SNAPSHOT</version>
+ <version>2.1.1-CR02</version>
</parent>
<artifactId>wsrp-wss-parent</artifactId>
Modified: components/wsrp/branches/2.1.x/ws-security/wsrp-producer-jb5wss-producer-war/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/ws-security/wsrp-producer-jb5wss-producer-war/pom.xml 2012-02-29 19:24:22 UTC (rev 8497)
+++ components/wsrp/branches/2.1.x/ws-security/wsrp-producer-jb5wss-producer-war/pom.xml 2012-02-29 19:32:37 UTC (rev 8498)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-wss-parent</artifactId>
- <version>2.1.1-CR02-SNAPSHOT</version>
+ <version>2.1.1-CR02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-producer-jb5wss</artifactId>
Modified: components/wsrp/branches/2.1.x/ws-security/wss/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/ws-security/wss/pom.xml 2012-02-29 19:24:22 UTC (rev 8497)
+++ components/wsrp/branches/2.1.x/ws-security/wss/pom.xml 2012-02-29 19:32:37 UTC (rev 8498)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-wss-parent</artifactId>
- <version>2.1.1-CR02-SNAPSHOT</version>
+ <version>2.1.1-CR02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wss</artifactId>
Modified: components/wsrp/branches/2.1.x/wsrp-producer-war/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/wsrp-producer-war/pom.xml 2012-02-29 19:24:22 UTC (rev 8497)
+++ components/wsrp/branches/2.1.x/wsrp-producer-war/pom.xml 2012-02-29 19:32:37 UTC (rev 8498)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-CR02-SNAPSHOT</version>
+ <version>2.1.1-CR02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/branches/2.1.x/wsrp1-ws/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/wsrp1-ws/pom.xml 2012-02-29 19:24:22 UTC (rev 8497)
+++ components/wsrp/branches/2.1.x/wsrp1-ws/pom.xml 2012-02-29 19:32:37 UTC (rev 8498)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-CR02-SNAPSHOT</version>
+ <version>2.1.1-CR02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp1-ws</artifactId>
Modified: components/wsrp/branches/2.1.x/wsrp2-ws/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/wsrp2-ws/pom.xml 2012-02-29 19:24:22 UTC (rev 8497)
+++ components/wsrp/branches/2.1.x/wsrp2-ws/pom.xml 2012-02-29 19:32:37 UTC (rev 8498)
@@ -26,7 +26,7 @@
<parent>
<artifactId>wsrp-parent</artifactId>
<groupId>org.gatein.wsrp</groupId>
- <version>2.1.1-CR02-SNAPSHOT</version>
+ <version>2.1.1-CR02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp2-ws</artifactId>
12 years, 10 months
- 1
- 0
gatein SVN: r8497 - in components/wsrp/branches/2.1.x: admin-gui and 14 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2012-02-29 14:24:22 -0500 (Wed, 29 Feb 2012)
New Revision: 8497
Modified:
components/wsrp/branches/2.1.x/admin-gui/pom.xml
components/wsrp/branches/2.1.x/api/pom.xml
components/wsrp/branches/2.1.x/common/pom.xml
components/wsrp/branches/2.1.x/consumer/pom.xml
components/wsrp/branches/2.1.x/hibernate-impl/pom.xml
components/wsrp/branches/2.1.x/jcr-impl/pom.xml
components/wsrp/branches/2.1.x/pom.xml
components/wsrp/branches/2.1.x/producer/pom.xml
components/wsrp/branches/2.1.x/test/pom.xml
components/wsrp/branches/2.1.x/ws-security/jboss5/pom.xml
components/wsrp/branches/2.1.x/ws-security/pom.xml
components/wsrp/branches/2.1.x/ws-security/wsrp-producer-jb5wss-producer-war/pom.xml
components/wsrp/branches/2.1.x/ws-security/wss/pom.xml
components/wsrp/branches/2.1.x/wsrp-producer-war/pom.xml
components/wsrp/branches/2.1.x/wsrp1-ws/pom.xml
components/wsrp/branches/2.1.x/wsrp2-ws/pom.xml
Log:
-Changed version to 2.1.1-CR02-SNAPSHOT.
Modified: components/wsrp/branches/2.1.x/admin-gui/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/admin-gui/pom.xml 2012-02-29 15:59:30 UTC (rev 8496)
+++ components/wsrp/branches/2.1.x/admin-gui/pom.xml 2012-02-29 19:24:22 UTC (rev 8497)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-GA-SNAPSHOT</version>
+ <version>2.1.1-CR02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-admin-gui</artifactId>
Modified: components/wsrp/branches/2.1.x/api/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/api/pom.xml 2012-02-29 15:59:30 UTC (rev 8496)
+++ components/wsrp/branches/2.1.x/api/pom.xml 2012-02-29 19:24:22 UTC (rev 8497)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-GA-SNAPSHOT</version>
+ <version>2.1.1-CR02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-integration-api</artifactId>
Modified: components/wsrp/branches/2.1.x/common/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/common/pom.xml 2012-02-29 15:59:30 UTC (rev 8496)
+++ components/wsrp/branches/2.1.x/common/pom.xml 2012-02-29 19:24:22 UTC (rev 8497)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-GA-SNAPSHOT</version>
+ <version>2.1.1-CR02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-common</artifactId>
Modified: components/wsrp/branches/2.1.x/consumer/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/consumer/pom.xml 2012-02-29 15:59:30 UTC (rev 8496)
+++ components/wsrp/branches/2.1.x/consumer/pom.xml 2012-02-29 19:24:22 UTC (rev 8497)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-GA-SNAPSHOT</version>
+ <version>2.1.1-CR02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-consumer</artifactId>
Modified: components/wsrp/branches/2.1.x/hibernate-impl/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/hibernate-impl/pom.xml 2012-02-29 15:59:30 UTC (rev 8496)
+++ components/wsrp/branches/2.1.x/hibernate-impl/pom.xml 2012-02-29 19:24:22 UTC (rev 8497)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-GA-SNAPSHOT</version>
+ <version>2.1.1-CR02-SNAPSHOT</version>
</parent>
<groupId>org.gatein.wsrp</groupId>
Modified: components/wsrp/branches/2.1.x/jcr-impl/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/jcr-impl/pom.xml 2012-02-29 15:59:30 UTC (rev 8496)
+++ components/wsrp/branches/2.1.x/jcr-impl/pom.xml 2012-02-29 19:24:22 UTC (rev 8497)
@@ -26,7 +26,7 @@
<parent>
<artifactId>wsrp-parent</artifactId>
<groupId>org.gatein.wsrp</groupId>
- <version>2.1.1-GA-SNAPSHOT</version>
+ <version>2.1.1-CR02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/branches/2.1.x/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/pom.xml 2012-02-29 15:59:30 UTC (rev 8496)
+++ components/wsrp/branches/2.1.x/pom.xml 2012-02-29 19:24:22 UTC (rev 8497)
@@ -36,7 +36,7 @@
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-GA-SNAPSHOT</version>
+ <version>2.1.1-CR02-SNAPSHOT</version>
<packaging>pom</packaging>
Modified: components/wsrp/branches/2.1.x/producer/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/producer/pom.xml 2012-02-29 15:59:30 UTC (rev 8496)
+++ components/wsrp/branches/2.1.x/producer/pom.xml 2012-02-29 19:24:22 UTC (rev 8497)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-GA-SNAPSHOT</version>
+ <version>2.1.1-CR02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-producer-lib</artifactId>
Modified: components/wsrp/branches/2.1.x/test/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/test/pom.xml 2012-02-29 15:59:30 UTC (rev 8496)
+++ components/wsrp/branches/2.1.x/test/pom.xml 2012-02-29 19:24:22 UTC (rev 8497)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-GA-SNAPSHOT</version>
+ <version>2.1.1-CR02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/branches/2.1.x/ws-security/jboss5/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/ws-security/jboss5/pom.xml 2012-02-29 15:59:30 UTC (rev 8496)
+++ components/wsrp/branches/2.1.x/ws-security/jboss5/pom.xml 2012-02-29 19:24:22 UTC (rev 8497)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-wss-parent</artifactId>
- <version>2.1.1-GA-SNAPSHOT</version>
+ <version>2.1.1-CR02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wss-jboss5</artifactId>
Modified: components/wsrp/branches/2.1.x/ws-security/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/ws-security/pom.xml 2012-02-29 15:59:30 UTC (rev 8496)
+++ components/wsrp/branches/2.1.x/ws-security/pom.xml 2012-02-29 19:24:22 UTC (rev 8497)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-GA-SNAPSHOT</version>
+ <version>2.1.1-CR02-SNAPSHOT</version>
</parent>
<artifactId>wsrp-wss-parent</artifactId>
Modified: components/wsrp/branches/2.1.x/ws-security/wsrp-producer-jb5wss-producer-war/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/ws-security/wsrp-producer-jb5wss-producer-war/pom.xml 2012-02-29 15:59:30 UTC (rev 8496)
+++ components/wsrp/branches/2.1.x/ws-security/wsrp-producer-jb5wss-producer-war/pom.xml 2012-02-29 19:24:22 UTC (rev 8497)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-wss-parent</artifactId>
- <version>2.1.1-GA-SNAPSHOT</version>
+ <version>2.1.1-CR02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-producer-jb5wss</artifactId>
Modified: components/wsrp/branches/2.1.x/ws-security/wss/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/ws-security/wss/pom.xml 2012-02-29 15:59:30 UTC (rev 8496)
+++ components/wsrp/branches/2.1.x/ws-security/wss/pom.xml 2012-02-29 19:24:22 UTC (rev 8497)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-wss-parent</artifactId>
- <version>2.1.1-GA-SNAPSHOT</version>
+ <version>2.1.1-CR02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wss</artifactId>
Modified: components/wsrp/branches/2.1.x/wsrp-producer-war/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/wsrp-producer-war/pom.xml 2012-02-29 15:59:30 UTC (rev 8496)
+++ components/wsrp/branches/2.1.x/wsrp-producer-war/pom.xml 2012-02-29 19:24:22 UTC (rev 8497)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-GA-SNAPSHOT</version>
+ <version>2.1.1-CR02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/branches/2.1.x/wsrp1-ws/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/wsrp1-ws/pom.xml 2012-02-29 15:59:30 UTC (rev 8496)
+++ components/wsrp/branches/2.1.x/wsrp1-ws/pom.xml 2012-02-29 19:24:22 UTC (rev 8497)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-GA-SNAPSHOT</version>
+ <version>2.1.1-CR02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp1-ws</artifactId>
Modified: components/wsrp/branches/2.1.x/wsrp2-ws/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/wsrp2-ws/pom.xml 2012-02-29 15:59:30 UTC (rev 8496)
+++ components/wsrp/branches/2.1.x/wsrp2-ws/pom.xml 2012-02-29 19:24:22 UTC (rev 8497)
@@ -26,7 +26,7 @@
<parent>
<artifactId>wsrp-parent</artifactId>
<groupId>org.gatein.wsrp</groupId>
- <version>2.1.1-GA-SNAPSHOT</version>
+ <version>2.1.1-CR02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp2-ws</artifactId>
12 years, 10 months
- 1
- 0
gatein SVN: r8496 - in components/pc/trunk: api and 19 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2012-02-29 10:59:30 -0500 (Wed, 29 Feb 2012)
New Revision: 8496
Modified:
components/pc/trunk/api/pom.xml
components/pc/trunk/bridge/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/pom.xml
components/pc/trunk/portal/pom.xml
components/pc/trunk/portlet/pom.xml
components/pc/trunk/samples/pom.xml
components/pc/trunk/test/core/pom.xml
components/pc/trunk/test/pom.xml
components/pc/trunk/test/servers/jboss42/pom.xml
components/pc/trunk/test/servers/jboss51/pom.xml
components/pc/trunk/test/servers/jboss6/pom.xml
components/pc/trunk/test/servers/jetty6/pom.xml
components/pc/trunk/test/servers/pom.xml
components/pc/trunk/test/servers/tomcat6/pom.xml
components/pc/trunk/test/servers/tomcat7/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: components/pc/trunk/api/pom.xml
===================================================================
--- components/pc/trunk/api/pom.xml 2012-02-29 15:59:08 UTC (rev 8495)
+++ components/pc/trunk/api/pom.xml 2012-02-29 15:59:30 UTC (rev 8496)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.1-GA</version>
+ <version>2.3.2-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.gatein.pc</groupId>
Modified: components/pc/trunk/bridge/pom.xml
===================================================================
--- components/pc/trunk/bridge/pom.xml 2012-02-29 15:59:08 UTC (rev 8495)
+++ components/pc/trunk/bridge/pom.xml 2012-02-29 15:59:30 UTC (rev 8496)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.1-GA</version>
+ <version>2.3.2-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-bridge</artifactId>
Modified: components/pc/trunk/controller/pom.xml
===================================================================
--- components/pc/trunk/controller/pom.xml 2012-02-29 15:59:08 UTC (rev 8495)
+++ components/pc/trunk/controller/pom.xml 2012-02-29 15:59:30 UTC (rev 8496)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.1-GA</version>
+ <version>2.3.2-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-controller</artifactId>
Modified: components/pc/trunk/docs/pom.xml
===================================================================
--- components/pc/trunk/docs/pom.xml 2012-02-29 15:59:08 UTC (rev 8495)
+++ components/pc/trunk/docs/pom.xml 2012-02-29 15:59:30 UTC (rev 8496)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.1-GA</version>
+ <version>2.3.2-GA-SNAPSHOT</version>
</parent>
<artifactId>docs-aggregator</artifactId>
<packaging>pom</packaging>
Modified: components/pc/trunk/docs/user-guide/pom.xml
===================================================================
--- components/pc/trunk/docs/user-guide/pom.xml 2012-02-29 15:59:08 UTC (rev 8495)
+++ components/pc/trunk/docs/user-guide/pom.xml 2012-02-29 15:59:30 UTC (rev 8496)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>docs-aggregator</artifactId>
- <version>2.3.1-GA</version>
+ <version>2.3.2-GA-SNAPSHOT</version>
</parent>
<groupId>org.gatein.pc</groupId>
<artifactId>user-guide-${translation}</artifactId>
Modified: components/pc/trunk/federation/pom.xml
===================================================================
--- components/pc/trunk/federation/pom.xml 2012-02-29 15:59:08 UTC (rev 8495)
+++ components/pc/trunk/federation/pom.xml 2012-02-29 15:59:30 UTC (rev 8496)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.1-GA</version>
+ <version>2.3.2-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-federation</artifactId>
Modified: components/pc/trunk/jsr168api/pom.xml
===================================================================
--- components/pc/trunk/jsr168api/pom.xml 2012-02-29 15:59:08 UTC (rev 8495)
+++ components/pc/trunk/jsr168api/pom.xml 2012-02-29 15:59:30 UTC (rev 8496)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.1-GA</version>
+ <version>2.3.2-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-jsr168api</artifactId>
Modified: components/pc/trunk/management/pom.xml
===================================================================
--- components/pc/trunk/management/pom.xml 2012-02-29 15:59:08 UTC (rev 8495)
+++ components/pc/trunk/management/pom.xml 2012-02-29 15:59:30 UTC (rev 8496)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.1-GA</version>
+ <version>2.3.2-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-management</artifactId>
Modified: components/pc/trunk/pom.xml
===================================================================
--- components/pc/trunk/pom.xml 2012-02-29 15:59:08 UTC (rev 8495)
+++ components/pc/trunk/pom.xml 2012-02-29 15:59:30 UTC (rev 8496)
@@ -33,7 +33,7 @@
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.1-GA</version>
+ <version>2.3.2-GA-SNAPSHOT</version>
<packaging>pom</packaging>
<name>GateIn - Portlet Container</name>
@@ -49,9 +49,9 @@
</issueManagement>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/pc/tags/2.3.1-GA</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/pc/tags/2.3.1-GA</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/pc/tags/2.3.1-GA</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/pc/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/pc/trunk</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/pc/trunk</url>
</scm>
<properties>
Modified: components/pc/trunk/portal/pom.xml
===================================================================
--- components/pc/trunk/portal/pom.xml 2012-02-29 15:59:08 UTC (rev 8495)
+++ components/pc/trunk/portal/pom.xml 2012-02-29 15:59:30 UTC (rev 8496)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.1-GA</version>
+ <version>2.3.2-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-portal</artifactId>
Modified: components/pc/trunk/portlet/pom.xml
===================================================================
--- components/pc/trunk/portlet/pom.xml 2012-02-29 15:59:08 UTC (rev 8495)
+++ components/pc/trunk/portlet/pom.xml 2012-02-29 15:59:30 UTC (rev 8496)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.1-GA</version>
+ <version>2.3.2-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-portlet</artifactId>
Modified: components/pc/trunk/samples/pom.xml
===================================================================
--- components/pc/trunk/samples/pom.xml 2012-02-29 15:59:08 UTC (rev 8495)
+++ components/pc/trunk/samples/pom.xml 2012-02-29 15:59:30 UTC (rev 8496)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.1-GA</version>
+ <version>2.3.2-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-samples</artifactId>
Modified: components/pc/trunk/test/core/pom.xml
===================================================================
--- components/pc/trunk/test/core/pom.xml 2012-02-29 15:59:08 UTC (rev 8495)
+++ components/pc/trunk/test/core/pom.xml 2012-02-29 15:59:30 UTC (rev 8496)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test</artifactId>
- <version>2.3.1-GA</version>
+ <version>2.3.2-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-core</artifactId>
Modified: components/pc/trunk/test/pom.xml
===================================================================
--- components/pc/trunk/test/pom.xml 2012-02-29 15:59:08 UTC (rev 8495)
+++ components/pc/trunk/test/pom.xml 2012-02-29 15:59:30 UTC (rev 8496)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.1-GA</version>
+ <version>2.3.2-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test</artifactId>
Modified: components/pc/trunk/test/servers/jboss42/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jboss42/pom.xml 2012-02-29 15:59:08 UTC (rev 8495)
+++ components/pc/trunk/test/servers/jboss42/pom.xml 2012-02-29 15:59:30 UTC (rev 8496)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.1-GA</version>
+ <version>2.3.2-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-jboss42</artifactId>
Modified: components/pc/trunk/test/servers/jboss51/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jboss51/pom.xml 2012-02-29 15:59:08 UTC (rev 8495)
+++ components/pc/trunk/test/servers/jboss51/pom.xml 2012-02-29 15:59:30 UTC (rev 8496)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.1-GA</version>
+ <version>2.3.2-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-jboss51</artifactId>
Modified: components/pc/trunk/test/servers/jboss6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jboss6/pom.xml 2012-02-29 15:59:08 UTC (rev 8495)
+++ components/pc/trunk/test/servers/jboss6/pom.xml 2012-02-29 15:59:30 UTC (rev 8496)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.1-GA</version>
+ <version>2.3.2-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-jboss6</artifactId>
Modified: components/pc/trunk/test/servers/jetty6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jetty6/pom.xml 2012-02-29 15:59:08 UTC (rev 8495)
+++ components/pc/trunk/test/servers/jetty6/pom.xml 2012-02-29 15:59:30 UTC (rev 8496)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.1-GA</version>
+ <version>2.3.2-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-jetty6</artifactId>
Modified: components/pc/trunk/test/servers/pom.xml
===================================================================
--- components/pc/trunk/test/servers/pom.xml 2012-02-29 15:59:08 UTC (rev 8495)
+++ components/pc/trunk/test/servers/pom.xml 2012-02-29 15:59:30 UTC (rev 8496)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test</artifactId>
- <version>2.3.1-GA</version>
+ <version>2.3.2-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-servers</artifactId>
Modified: components/pc/trunk/test/servers/tomcat6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat6/pom.xml 2012-02-29 15:59:08 UTC (rev 8495)
+++ components/pc/trunk/test/servers/tomcat6/pom.xml 2012-02-29 15:59:30 UTC (rev 8496)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.1-GA</version>
+ <version>2.3.2-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-tomcat6</artifactId>
Modified: components/pc/trunk/test/servers/tomcat7/pom.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat7/pom.xml 2012-02-29 15:59:08 UTC (rev 8495)
+++ components/pc/trunk/test/servers/tomcat7/pom.xml 2012-02-29 15:59:30 UTC (rev 8496)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.1-GA</version>
+ <version>2.3.2-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-tomcat7</artifactId>
12 years, 10 months
- 1
- 0
gatein SVN: r8495 - components/pc/tags.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2012-02-29 10:59:08 -0500 (Wed, 29 Feb 2012)
New Revision: 8495
Added:
components/pc/tags/2.3.1-GA/
Log:
[maven-release-plugin] copy for tag 2.3.1-GA
12 years, 10 months
- 1
- 0
gatein SVN: r8494 - in components/pc/trunk: api and 19 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2012-02-29 10:58:54 -0500 (Wed, 29 Feb 2012)
New Revision: 8494
Modified:
components/pc/trunk/api/pom.xml
components/pc/trunk/bridge/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/pom.xml
components/pc/trunk/portal/pom.xml
components/pc/trunk/portlet/pom.xml
components/pc/trunk/samples/pom.xml
components/pc/trunk/test/core/pom.xml
components/pc/trunk/test/pom.xml
components/pc/trunk/test/servers/jboss42/pom.xml
components/pc/trunk/test/servers/jboss51/pom.xml
components/pc/trunk/test/servers/jboss6/pom.xml
components/pc/trunk/test/servers/jetty6/pom.xml
components/pc/trunk/test/servers/pom.xml
components/pc/trunk/test/servers/tomcat6/pom.xml
components/pc/trunk/test/servers/tomcat7/pom.xml
Log:
[maven-release-plugin] prepare release 2.3.1-GA
Modified: components/pc/trunk/api/pom.xml
===================================================================
--- components/pc/trunk/api/pom.xml 2012-02-29 15:46:48 UTC (rev 8493)
+++ components/pc/trunk/api/pom.xml 2012-02-29 15:58:54 UTC (rev 8494)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.1-Beta03-SNAPSHOT</version>
+ <version>2.3.1-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.gatein.pc</groupId>
Modified: components/pc/trunk/bridge/pom.xml
===================================================================
--- components/pc/trunk/bridge/pom.xml 2012-02-29 15:46:48 UTC (rev 8493)
+++ components/pc/trunk/bridge/pom.xml 2012-02-29 15:58:54 UTC (rev 8494)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.1-Beta03-SNAPSHOT</version>
+ <version>2.3.1-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-bridge</artifactId>
Modified: components/pc/trunk/controller/pom.xml
===================================================================
--- components/pc/trunk/controller/pom.xml 2012-02-29 15:46:48 UTC (rev 8493)
+++ components/pc/trunk/controller/pom.xml 2012-02-29 15:58:54 UTC (rev 8494)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.1-Beta03-SNAPSHOT</version>
+ <version>2.3.1-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-controller</artifactId>
Modified: components/pc/trunk/docs/pom.xml
===================================================================
--- components/pc/trunk/docs/pom.xml 2012-02-29 15:46:48 UTC (rev 8493)
+++ components/pc/trunk/docs/pom.xml 2012-02-29 15:58:54 UTC (rev 8494)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.1-Beta03-SNAPSHOT</version>
+ <version>2.3.1-GA</version>
</parent>
<artifactId>docs-aggregator</artifactId>
<packaging>pom</packaging>
Modified: components/pc/trunk/docs/user-guide/pom.xml
===================================================================
--- components/pc/trunk/docs/user-guide/pom.xml 2012-02-29 15:46:48 UTC (rev 8493)
+++ components/pc/trunk/docs/user-guide/pom.xml 2012-02-29 15:58:54 UTC (rev 8494)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>docs-aggregator</artifactId>
- <version>2.3.1-Beta03-SNAPSHOT</version>
+ <version>2.3.1-GA</version>
</parent>
<groupId>org.gatein.pc</groupId>
<artifactId>user-guide-${translation}</artifactId>
Modified: components/pc/trunk/federation/pom.xml
===================================================================
--- components/pc/trunk/federation/pom.xml 2012-02-29 15:46:48 UTC (rev 8493)
+++ components/pc/trunk/federation/pom.xml 2012-02-29 15:58:54 UTC (rev 8494)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.1-Beta03-SNAPSHOT</version>
+ <version>2.3.1-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-federation</artifactId>
Modified: components/pc/trunk/jsr168api/pom.xml
===================================================================
--- components/pc/trunk/jsr168api/pom.xml 2012-02-29 15:46:48 UTC (rev 8493)
+++ components/pc/trunk/jsr168api/pom.xml 2012-02-29 15:58:54 UTC (rev 8494)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.1-Beta03-SNAPSHOT</version>
+ <version>2.3.1-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-jsr168api</artifactId>
Modified: components/pc/trunk/management/pom.xml
===================================================================
--- components/pc/trunk/management/pom.xml 2012-02-29 15:46:48 UTC (rev 8493)
+++ components/pc/trunk/management/pom.xml 2012-02-29 15:58:54 UTC (rev 8494)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.1-Beta03-SNAPSHOT</version>
+ <version>2.3.1-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-management</artifactId>
Modified: components/pc/trunk/pom.xml
===================================================================
--- components/pc/trunk/pom.xml 2012-02-29 15:46:48 UTC (rev 8493)
+++ components/pc/trunk/pom.xml 2012-02-29 15:58:54 UTC (rev 8494)
@@ -33,7 +33,7 @@
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.1-Beta03-SNAPSHOT</version>
+ <version>2.3.1-GA</version>
<packaging>pom</packaging>
<name>GateIn - Portlet Container</name>
@@ -49,9 +49,9 @@
</issueManagement>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/pc/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/pc/trunk</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/pc/trunk</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/pc/tags/2.3.1-GA</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/pc/tags/2.3.1-GA</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/pc/tags/2.3.1-GA</url>
</scm>
<properties>
Modified: components/pc/trunk/portal/pom.xml
===================================================================
--- components/pc/trunk/portal/pom.xml 2012-02-29 15:46:48 UTC (rev 8493)
+++ components/pc/trunk/portal/pom.xml 2012-02-29 15:58:54 UTC (rev 8494)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.1-Beta03-SNAPSHOT</version>
+ <version>2.3.1-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-portal</artifactId>
Modified: components/pc/trunk/portlet/pom.xml
===================================================================
--- components/pc/trunk/portlet/pom.xml 2012-02-29 15:46:48 UTC (rev 8493)
+++ components/pc/trunk/portlet/pom.xml 2012-02-29 15:58:54 UTC (rev 8494)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.1-Beta03-SNAPSHOT</version>
+ <version>2.3.1-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-portlet</artifactId>
Modified: components/pc/trunk/samples/pom.xml
===================================================================
--- components/pc/trunk/samples/pom.xml 2012-02-29 15:46:48 UTC (rev 8493)
+++ components/pc/trunk/samples/pom.xml 2012-02-29 15:58:54 UTC (rev 8494)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.1-Beta03-SNAPSHOT</version>
+ <version>2.3.1-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-samples</artifactId>
Modified: components/pc/trunk/test/core/pom.xml
===================================================================
--- components/pc/trunk/test/core/pom.xml 2012-02-29 15:46:48 UTC (rev 8493)
+++ components/pc/trunk/test/core/pom.xml 2012-02-29 15:58:54 UTC (rev 8494)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test</artifactId>
- <version>2.3.1-Beta03-SNAPSHOT</version>
+ <version>2.3.1-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-core</artifactId>
Modified: components/pc/trunk/test/pom.xml
===================================================================
--- components/pc/trunk/test/pom.xml 2012-02-29 15:46:48 UTC (rev 8493)
+++ components/pc/trunk/test/pom.xml 2012-02-29 15:58:54 UTC (rev 8494)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.1-Beta03-SNAPSHOT</version>
+ <version>2.3.1-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test</artifactId>
Modified: components/pc/trunk/test/servers/jboss42/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jboss42/pom.xml 2012-02-29 15:46:48 UTC (rev 8493)
+++ components/pc/trunk/test/servers/jboss42/pom.xml 2012-02-29 15:58:54 UTC (rev 8494)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.1-Beta03-SNAPSHOT</version>
+ <version>2.3.1-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-jboss42</artifactId>
Modified: components/pc/trunk/test/servers/jboss51/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jboss51/pom.xml 2012-02-29 15:46:48 UTC (rev 8493)
+++ components/pc/trunk/test/servers/jboss51/pom.xml 2012-02-29 15:58:54 UTC (rev 8494)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.1-Beta03-SNAPSHOT</version>
+ <version>2.3.1-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-jboss51</artifactId>
Modified: components/pc/trunk/test/servers/jboss6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jboss6/pom.xml 2012-02-29 15:46:48 UTC (rev 8493)
+++ components/pc/trunk/test/servers/jboss6/pom.xml 2012-02-29 15:58:54 UTC (rev 8494)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.1-Beta03-SNAPSHOT</version>
+ <version>2.3.1-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-jboss6</artifactId>
Modified: components/pc/trunk/test/servers/jetty6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jetty6/pom.xml 2012-02-29 15:46:48 UTC (rev 8493)
+++ components/pc/trunk/test/servers/jetty6/pom.xml 2012-02-29 15:58:54 UTC (rev 8494)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.1-Beta03-SNAPSHOT</version>
+ <version>2.3.1-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-jetty6</artifactId>
Modified: components/pc/trunk/test/servers/pom.xml
===================================================================
--- components/pc/trunk/test/servers/pom.xml 2012-02-29 15:46:48 UTC (rev 8493)
+++ components/pc/trunk/test/servers/pom.xml 2012-02-29 15:58:54 UTC (rev 8494)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test</artifactId>
- <version>2.3.1-Beta03-SNAPSHOT</version>
+ <version>2.3.1-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-servers</artifactId>
Modified: components/pc/trunk/test/servers/tomcat6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat6/pom.xml 2012-02-29 15:46:48 UTC (rev 8493)
+++ components/pc/trunk/test/servers/tomcat6/pom.xml 2012-02-29 15:58:54 UTC (rev 8494)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.1-Beta03-SNAPSHOT</version>
+ <version>2.3.1-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-tomcat6</artifactId>
Modified: components/pc/trunk/test/servers/tomcat7/pom.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat7/pom.xml 2012-02-29 15:46:48 UTC (rev 8493)
+++ components/pc/trunk/test/servers/tomcat7/pom.xml 2012-02-29 15:58:54 UTC (rev 8494)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.1-Beta03-SNAPSHOT</version>
+ <version>2.3.1-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-tomcat7</artifactId>
12 years, 10 months
- 1
- 0
gatein SVN: r8493 - components/pc/trunk.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2012-02-29 10:46:48 -0500 (Wed, 29 Feb 2012)
New Revision: 8493
Modified:
components/pc/trunk/pom.xml
Log:
GTNPC-81 : Update WCI to 2.1.1-GA
Modified: components/pc/trunk/pom.xml
===================================================================
--- components/pc/trunk/pom.xml 2012-02-29 14:34:46 UTC (rev 8492)
+++ components/pc/trunk/pom.xml 2012-02-29 15:46:48 UTC (rev 8493)
@@ -56,7 +56,7 @@
<properties>
<version.gatein.common>2.0.4-GA</version.gatein.common>
- <version.gatein.wci>2.1.1-Beta02</version.gatein.wci>
+ <version.gatein.wci>2.1.1-GA</version.gatein.wci>
<version.apache.portals.bridges>1.0.4</version.apache.portals.bridges>
<version.apache.taglibs>1.1.2</version.apache.taglibs>
<version.apache.log4j>1.2.14</version.apache.log4j>
12 years, 10 months
- 1
- 0
gatein SVN: r8492 - portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2012-02-29 09:34:46 -0500 (Wed, 29 Feb 2012)
New Revision: 8492
Added:
portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInCleanupDeploymentProcessor.java
Log:
GTNPORTAL-2154 Support for JBoss AS7
- fixed broken build
Added: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInCleanupDeploymentProcessor.java
===================================================================
--- portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInCleanupDeploymentProcessor.java (rev 0)
+++ portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInCleanupDeploymentProcessor.java 2012-02-29 14:34:46 UTC (rev 8492)
@@ -0,0 +1,55 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.integration.jboss.as7;
+
+import org.gatein.integration.jboss.as7.deployment.GateInConfigurationKey;
+import org.gatein.integration.jboss.as7.deployment.GateInEarKey;
+import org.gatein.integration.jboss.as7.deployment.GateInExtKey;
+import org.gatein.integration.jboss.as7.deployment.PortletWarKey;
+import org.jboss.as.server.deployment.DeploymentPhaseContext;
+import org.jboss.as.server.deployment.DeploymentUnit;
+import org.jboss.as.server.deployment.DeploymentUnitProcessingException;
+import org.jboss.as.server.deployment.DeploymentUnitProcessor;
+
+/**
+ * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a>
+ */
+public class GateInCleanupDeploymentProcessor implements DeploymentUnitProcessor
+{
+ @Override
+ public void deploy(DeploymentPhaseContext phaseContext) throws DeploymentUnitProcessingException
+ {
+ final DeploymentUnit du = phaseContext.getDeploymentUnit();
+ Object config = du.removeAttachment(GateInConfigurationKey.KEY);
+ if (config != null)
+ {
+ du.removeAttachment(PortletWarKey.INSTANCE);
+ du.removeAttachment(GateInEarKey.KEY);
+ du.removeAttachment(GateInExtKey.KEY);
+ }
+ }
+
+ @Override
+ public void undeploy(DeploymentUnit context)
+ {
+ }
+}
12 years, 10 months
- 1
- 0
gatein SVN: r8491 - in portal/trunk/packaging/jboss-as7: extension/src/main/java/org/gatein/integration/jboss/as7 and 3 other directories.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2012-02-29 09:28:14 -0500 (Wed, 29 Feb 2012)
New Revision: 8491
Added:
portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInConfiguration.java
portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/PortletWarDependencyAdd.java
portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/PortletWarDependencyDefinition.java
portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/GateInConfigurationKey.java
Removed:
portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInExtensionConfiguration.java
portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/PortletWarDependancyAdd.java
portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/PortletWarDependancyDefinition.java
Modified:
portal/trunk/packaging/jboss-as7/README.txt
portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/Constants.java
portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/DeploymentArchiveAdd.java
portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/DeploymentArchiveDefinition.java
portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInExtension.java
portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInPortalAdd.java
portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInPortalDefinition.java
portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemAdd.java
portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDefinition.java
portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemParser.java
portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/GateInDependenciesDeploymentProcessor.java
portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/GateInInitDeploymentProcessor.java
portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/GateInStarterDeploymentProcessor.java
portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/GateInStructureDeploymentProcessor.java
portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarClassloadingDependencyProcessor.java
portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarDeploymentInitializingProcessor.java
portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/WarDependenciesDeploymentProcessor.java
portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/web/InitService.java
portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/standalone/configuration/standalone.xml
Log:
GTNPORTAL-2154 Support for JBoss AS7
- fixed 'standalone.xml configuration ignored' problem
- added Customizing section to README.txt
Modified: portal/trunk/packaging/jboss-as7/README.txt
===================================================================
--- portal/trunk/packaging/jboss-as7/README.txt 2012-02-29 08:12:34 UTC (rev 8490)
+++ portal/trunk/packaging/jboss-as7/README.txt 2012-02-29 14:28:14 UTC (rev 8491)
@@ -35,7 +35,6 @@
- <distributable/> is not yet supported
- Sample ears have been repackaged as their current default packaging is not supported
- Exception occurs, and is ignored when logging out (EXOJCR-1619)
-- 'gatein' subsystem configuration in standalone.xml is ignored
@@ -88,7 +87,41 @@
+Customizing
+===========
+Packaging deploys a basic GateIn portal (gatein.ear), but also a sample portal extension, a sample portal site bound to a separate context, and a sample skin.
+
+Samples archives can be removed, and custom portal extension archives can be added. Currently GateIn subsystem has to know about extensions in advance.
+This is configured via JBOSS_HOME/standalone/configuration/standalone.xml which contains the following default configuration:
+
+ <subsystem xmlns="urn:jboss:domain:gatein:1.0">
+ <deployment-archives>
+ <archive name="gatein.ear" main="true"/>
+ <archive name="gatein-sample-extension.ear"/>
+ <archive name="gatein-sample-portal.ear"/>
+ <archive name="gatein-sample-skin.war"/>
+ </deployment-archives>
+ <portlet-war-dependencies>
+ <dependency name="org.gatein.wci"/>
+ <dependency name="org.gatein.pc"/>
+ <dependency name="javax.portlet.api"/>
+ </portlet-war-dependencies>
+ </subsystem>
+
+The <deployment-archives> section contains a list of GateIn portal extensions. These are archives constructed specifically to 'plug into' GateIn portal. To that end they contain a special configuration.
+
+The archives in the list have to be deployed in JBOSS_HOME/standalone/deployments, otherwise GateIn portal won't start. So, if you want to remove some or all of the samples, it's not enough to just remove the archives from 'deployments' directory. Archive references also have to be removed from <deployment-archives> section of standalone.xml.
+
+Similarly, when deploying any additional GateIn portal extension archive it has to be referenced via <archive> entry in <deployment-archives> section in standalone.xml.
+
+On the other hand, user applications that only provide portlets, can simply be deployed as any web archive by dropping them into 'deployments' directory WITHOUT having to reference them in 'gatein' subsystem section of standalone.xml.
+
+
+Portlet-war-dependency section allows customizing which modules are automatically made available to portlet archives (.war arhives containing portlet.xml), so that they can be deployed without any explicit JBoss modules configuration (i.e. Dependencies attribute in MANIFEST.MF, or jboss-deployment-structure.xml)
+
+
+
Help
====
Modified: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/Constants.java
===================================================================
--- portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/Constants.java 2012-02-29 08:12:34 UTC (rev 8490)
+++ portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/Constants.java 2012-02-29 14:28:14 UTC (rev 8491)
@@ -39,4 +39,5 @@
// MDR operations constants
String DEPLOYMENT_ARCHIVE = "deployment-archive";
String PORTLET_WAR_DEPENDENCY = "portlet-war-dependency";
+ String TRUE = "true";
}
Modified: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/DeploymentArchiveAdd.java
===================================================================
--- portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/DeploymentArchiveAdd.java 2012-02-29 08:12:34 UTC (rev 8490)
+++ portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/DeploymentArchiveAdd.java 2012-02-29 14:28:14 UTC (rev 8491)
@@ -22,18 +22,27 @@
package org.gatein.integration.jboss.as7;
import org.jboss.as.controller.AbstractAddStepHandler;
+import org.jboss.as.controller.OperationContext;
import org.jboss.as.controller.OperationFailedException;
+import org.jboss.as.controller.ServiceVerificationHandler;
import org.jboss.dmr.ModelNode;
+import org.jboss.dmr.Property;
+import org.jboss.msc.service.ServiceController;
+import java.util.List;
+
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR;
+
/**
* @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a>
*/
public class DeploymentArchiveAdd extends AbstractAddStepHandler
{
- public static final DeploymentArchiveAdd INSTANCE = new DeploymentArchiveAdd();
+ private GateInConfiguration config;
- private DeploymentArchiveAdd()
+ DeploymentArchiveAdd(GateInConfiguration config)
{
+ this.config = config;
}
@Override
@@ -41,4 +50,19 @@
{
DeploymentArchiveDefinition.MAIN.validateAndSet(operation,model);
}
+
+ @Override
+ protected void performRuntime(OperationContext context, ModelNode operation, ModelNode model, ServiceVerificationHandler verificationHandler, List<ServiceController<?>> newControllers) throws OperationFailedException
+ {
+ ModelNode addr = operation.get(OP_ADDR);
+ if (!addr.hasDefined(1))
+ throw new IllegalArgumentException("Invalid submodel address: " + addr);
+
+ Property prop = addr.get(1).asProperty();
+ if (!Constants.DEPLOYMENT_ARCHIVE.equals(prop.getName()))
+ throw new IllegalArgumentException("Invalid submodel address: " + addr);
+
+ ModelNode main = operation.get(Constants.MAIN);
+ config.addDeploymentArchive(prop.getValue().asString(), main.isDefined() && main.asBoolean());
+ }
}
Modified: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/DeploymentArchiveDefinition.java
===================================================================
--- portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/DeploymentArchiveDefinition.java 2012-02-29 08:12:34 UTC (rev 8490)
+++ portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/DeploymentArchiveDefinition.java 2012-02-29 14:28:14 UTC (rev 8491)
@@ -36,8 +36,6 @@
*/
public class DeploymentArchiveDefinition extends SimpleResourceDefinition
{
- protected static final DeploymentArchiveDefinition INSTANCE = new DeploymentArchiveDefinition();
-
protected static final SimpleAttributeDefinition MAIN =
new SimpleAttributeDefinitionBuilder(Constants.MAIN, ModelType.BOOLEAN, true)
.setAllowExpression(false)
@@ -46,11 +44,11 @@
.setFlags(AttributeAccess.Flag.RESTART_ALL_SERVICES)
.build();
- private DeploymentArchiveDefinition()
+ DeploymentArchiveDefinition(GateInConfiguration config)
{
super(PathElement.pathElement(Constants.DEPLOYMENT_ARCHIVE),
GateInExtension.getResourceDescriptionResolver(Constants.DEPLOYMENT_ARCHIVE),
- DeploymentArchiveAdd.INSTANCE, new ReloadRequiredRemoveStepHandler());
+ new DeploymentArchiveAdd(config), new ReloadRequiredRemoveStepHandler());
}
@Override
Copied: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInConfiguration.java (from rev 8475, portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInExtensionConfiguration.java)
===================================================================
--- portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInConfiguration.java (rev 0)
+++ portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInConfiguration.java 2012-02-29 14:28:14 UTC (rev 8491)
@@ -0,0 +1,144 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.integration.jboss.as7;
+
+import org.gatein.integration.jboss.as7.deployment.GateInEarKey;
+import org.gatein.integration.jboss.as7.deployment.GateInExtKey;
+import org.gatein.integration.jboss.as7.deployment.PortletWarKey;
+import org.jboss.as.server.deployment.DeploymentUnit;
+import org.jboss.as.server.deployment.module.ModuleDependency;
+import org.jboss.dmr.ModelNode;
+import org.jboss.dmr.Property;
+import org.jboss.modules.Module;
+import org.jboss.modules.ModuleIdentifier;
+import org.jboss.modules.ModuleLoader;
+import org.jboss.msc.service.ServiceName;
+
+import java.util.*;
+
+/**
+ * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a>
+ */
+public class GateInConfiguration
+{
+ private Set<ModuleIdentifier> extModules = new HashSet<ModuleIdentifier>();
+
+ private Set<ModuleDependency> portletWarDependencies = new LinkedHashSet<ModuleDependency>();
+
+ private ModuleIdentifier earModule;
+
+ private final List<ServiceName> childWars = new ArrayList<ServiceName>();
+
+ private final List<ServiceName> childSubUnits = new ArrayList<ServiceName>();
+
+ final ModuleLoader moduleLoader = Module.getBootModuleLoader();
+
+ GateInConfiguration()
+ {
+ }
+
+ public synchronized void addDeploymentArchive(String archive, boolean main)
+ {
+ String moduleId = "deployment." + archive;
+ extModules.add(ModuleIdentifier.create(moduleId));
+ if (main)
+ earModule = ModuleIdentifier.create(moduleId);
+ }
+
+ public synchronized void addPortletWarDependency(String dependency, boolean importSvcs)
+ {
+ String [] parts = parseNameSlotPair(dependency);
+ portletWarDependencies.add(new ModuleDependency(moduleLoader, ModuleIdentifier.create(parts[0], parts[1]), false, false, importSvcs, true));
+ }
+
+ public synchronized Set<ModuleIdentifier> getGateInExtModules()
+ {
+ return Collections.unmodifiableSet(new HashSet<ModuleIdentifier>(extModules));
+ }
+
+ public synchronized Set<ModuleDependency> getPortletWarDependencies()
+ {
+ return Collections.unmodifiableSet(new LinkedHashSet<ModuleDependency>(portletWarDependencies));
+ }
+
+ public ModuleIdentifier getGateInEarModule()
+ {
+ return earModule;
+ }
+
+ public synchronized List<ServiceName> getChildWars()
+ {
+ return Collections.unmodifiableList(new ArrayList(childWars));
+ }
+
+ public synchronized void addChildWar(ServiceName deploymentServiceName) {
+ childWars.add(deploymentServiceName);
+ }
+
+ public synchronized List<ServiceName> getChildSubUnits()
+ {
+ return Collections.unmodifiableList(new ArrayList(childSubUnits));
+ }
+
+ public synchronized List<String> getChildSubUnitComponentPrefixes()
+ {
+ LinkedList<String> ret = new LinkedList<String>();
+ for (ServiceName name : childSubUnits)
+ {
+ ret.add(name.getCanonicalName() + ".component.");
+ }
+ return ret;
+ }
+
+ public synchronized void addChildSubUnit(ServiceName serviceName) {
+ childSubUnits.add(serviceName);
+ }
+
+ private static String[] parseNameSlotPair(String name)
+ {
+ String [] parts = name.split(":");
+ if (parts.length == 2)
+ return parts;
+ return new String[] {parts[0], null};
+ }
+
+ public static boolean isGateInArchive(DeploymentUnit du)
+ {
+ return du.getAttachment(GateInEarKey.KEY) != null
+ || du.getAttachment(GateInExtKey.KEY) != null;
+ }
+
+ public static boolean isPortletArchive(DeploymentUnit du)
+ {
+ return du.getAttachment(PortletWarKey.INSTANCE) != null;
+ }
+
+ public static boolean isNonGateInPortletArchive(DeploymentUnit du)
+ {
+ return !isGateInArchive(du) && isPortletArchive(du);
+ }
+
+ public static boolean isGateInOrPortletArchive(DeploymentUnit du)
+ {
+ return isGateInArchive(du) || isPortletArchive(du);
+ }
+}
Modified: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInExtension.java
===================================================================
--- portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInExtension.java 2012-02-29 08:12:34 UTC (rev 8490)
+++ portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInExtension.java 2012-02-29 14:28:14 UTC (rev 8491)
@@ -70,12 +70,14 @@
{
log.debug("Activating GateIn Extension");
final SubsystemRegistration subsystem = context.registerSubsystem(SUBSYSTEM_NAME);
- final ManagementResourceRegistration registration = subsystem.registerSubsystemModel(GateInSubsystemDefinition.INSTANCE);
+ final GateInConfiguration config = new GateInConfiguration();
+ final ManagementResourceRegistration registration = subsystem.registerSubsystemModel(new GateInSubsystemDefinition(config));
registration.registerOperationHandler(DESCRIBE, GenericSubsystemDescribeHandler.INSTANCE, GenericSubsystemDescribeHandler.INSTANCE, false, OperationEntry.EntryType.PRIVATE);
- registration.registerSubModel(DeploymentArchiveDefinition.INSTANCE);
- registration.registerSubModel(PortletWarDependancyDefinition.INSTANCE);
- registration.registerSubModel(new GateInPortalDefinition(DEFAULT_PORTAL_NAME));
+ registration.registerSubModel(new DeploymentArchiveDefinition(config));
+ registration.registerSubModel(new PortletWarDependencyDefinition(config));
+ registration.registerSubModel(new GateInPortalDefinition(config, DEFAULT_PORTAL_NAME));
+
subsystem.registerXMLElementWriter(GateInSubsystemParser.getInstance());
}
Deleted: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInExtensionConfiguration.java
===================================================================
--- portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInExtensionConfiguration.java 2012-02-29 08:12:34 UTC (rev 8490)
+++ portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInExtensionConfiguration.java 2012-02-29 14:28:14 UTC (rev 8491)
@@ -1,199 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat, Inc., and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.integration.jboss.as7;
-
-import org.gatein.integration.jboss.as7.deployment.GateInEarKey;
-import org.gatein.integration.jboss.as7.deployment.GateInExtKey;
-import org.gatein.integration.jboss.as7.deployment.PortletWarKey;
-import org.jboss.as.server.deployment.DeploymentUnit;
-import org.jboss.as.server.deployment.module.ModuleDependency;
-import org.jboss.dmr.ModelNode;
-import org.jboss.dmr.Property;
-import org.jboss.modules.Module;
-import org.jboss.modules.ModuleIdentifier;
-import org.jboss.modules.ModuleLoader;
-import org.jboss.msc.service.ServiceName;
-
-import java.util.*;
-
-/**
- * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a>
- */
-public class GateInExtensionConfiguration
-{
- public static final GateInExtensionConfiguration INSTANCE = new GateInExtensionConfiguration();
-
- private Set<ModuleIdentifier> extModules;
-
- private Set<ModuleDependency> portletWarDependencies;
-
- private ModuleIdentifier earModule = ModuleIdentifier.create("deployment.gatein.ear");
-
- private final List<ServiceName> childWars = new LinkedList<ServiceName>();
-
- private final List<ServiceName> childSubUnits = new LinkedList<ServiceName>();
-
- final ModuleLoader moduleLoader = Module.getBootModuleLoader();
-
- private GateInExtensionConfiguration()
- {
- Set<ModuleIdentifier> set = new LinkedHashSet<ModuleIdentifier>();
- set.add(ModuleIdentifier.create("deployment.gatein-sample-extension.ear"));
- set.add(ModuleIdentifier.create("deployment.gatein-sample-portal.ear"));
- set.add(ModuleIdentifier.create("deployment.gatein-sample-skin.war"));
- //set.add(ModuleIdentifier.create("deployment.gatein-wsrp-integration.ear"));
- extModules = Collections.unmodifiableSet(set);
-
- Set<ModuleDependency> dset = new LinkedHashSet<ModuleDependency>();
- dset.add(new ModuleDependency(moduleLoader, ModuleIdentifier.create("org.gatein.wci"), false, false, false, false));
- dset.add(new ModuleDependency(moduleLoader, ModuleIdentifier.create("org.gatein.pc"), false, false, false, false));
- dset.add(new ModuleDependency(moduleLoader, ModuleIdentifier.create("javax.portlet.api"), false, false, false, false));
- portletWarDependencies = Collections.unmodifiableSet(dset);
- }
-
- public Set<ModuleIdentifier> getGateInExtModules()
- {
- return extModules;
- }
-
- public Set<ModuleDependency> getPortletWarDependencies()
- {
- return portletWarDependencies;
- }
-
- public ModuleIdentifier getGateInEarModule()
- {
- return earModule;
- }
-
- public void setGateInEarModule(ModuleIdentifier modules)
- {
- this.earModule = modules;
- }
-
- public synchronized List<ServiceName> getChildWars()
- {
- return Collections.unmodifiableList(childWars);
- }
-
- public synchronized void addChildWar(ServiceName deploymentServiceName) {
- childWars.add(deploymentServiceName);
- }
-
- public synchronized List<ServiceName> getChildSubUnits()
- {
- return Collections.unmodifiableList(childSubUnits);
- }
-
- public synchronized List<String> getChildSubUnitComponentPrefixes()
- {
- LinkedList<String> ret = new LinkedList<String>();
- for (ServiceName name : childSubUnits)
- {
- ret.add(name.getCanonicalName() + ".component.");
- }
- return ret;
- }
-
- public synchronized void addChildSubUnit(ServiceName serviceName) {
- childSubUnits.add(serviceName);
- }
-
- public void setConfigurationFromModel(ModelNode model)
- {
- ModelNode archives = model.get(Constants.DEPLOYMENT_ARCHIVES);
- if (archives.isDefined())
- {
- Set<ModuleIdentifier> set = new LinkedHashSet<ModuleIdentifier>();
-
- for (Property p: archives.asPropertyList())
- {
- boolean isMain = false;
- if (p.getValue().isDefined())
- {
- for (Property attr: p.getValue().asPropertyList())
- {
- if (Constants.MAIN.equals(attr.getName()))
- isMain = true;
- }
- }
- if (isMain)
- earModule = ModuleIdentifier.create("deployment." + p.getName());
- else
- set.add(ModuleIdentifier.create("deployment." + p.getName()));
- }
- extModules = Collections.unmodifiableSet(set);
- }
-
- ModelNode deps = model.get(Constants.PORTLET_WAR_DEPENDENCIES);
- if (deps.isDefined())
- {
- Set<ModuleDependency> dset = new LinkedHashSet<ModuleDependency>();
-
- for (Property p: deps.asPropertyList())
- {
- boolean importSvcs = false;
- if (p.getValue().isDefined())
- {
- for (Property attr: p.getValue().asPropertyList())
- {
- if (Constants.IMPORT_SERVICES.equals(attr.getName()))
- importSvcs = true;
- }
- }
- String [] parts = parseNameSlotPair(p.getName());
- dset.add(new ModuleDependency(moduleLoader, ModuleIdentifier.create(parts[0], parts[1]), false, false, importSvcs, true));
- // TODO: add optional, and exports
- }
- portletWarDependencies = Collections.unmodifiableSet(dset);
- }
- }
-
- private String[] parseNameSlotPair(String name)
- {
- String [] parts = name.split(":");
- if (parts.length == 2)
- return parts;
- return new String[] {parts[0], null};
- }
-
- public boolean isGateInArchive(DeploymentUnit du)
- {
- return du.getAttachment(GateInEarKey.KEY) != null
- || du.getAttachment(GateInExtKey.KEY) != null;
- }
-
- public boolean isPortletArchive(DeploymentUnit du)
- {
- return du.getAttachment(PortletWarKey.INSTANCE) != null;
- }
-
- public boolean isNonGateInPortletArchive(DeploymentUnit du)
- {
- return !isGateInArchive(du) && isPortletArchive(du);
- }
-
- public boolean isGateInOrPortletArchive(DeploymentUnit du)
- {
- return isGateInArchive(du) || isPortletArchive(du);
- }
-}
Modified: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInPortalAdd.java
===================================================================
--- portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInPortalAdd.java 2012-02-29 08:12:34 UTC (rev 8490)
+++ portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInPortalAdd.java 2012-02-29 14:28:14 UTC (rev 8491)
@@ -25,6 +25,7 @@
import org.jboss.as.controller.OperationContext;
import org.jboss.as.controller.OperationFailedException;
import org.jboss.as.controller.ServiceVerificationHandler;
+import org.jboss.as.controller.registry.Resource;
import org.jboss.dmr.ModelNode;
import org.jboss.msc.service.ServiceController;
@@ -35,22 +36,17 @@
*/
public class GateInPortalAdd extends AbstractAddStepHandler
{
- protected static final GateInPortalAdd INSTANCE = new GateInPortalAdd();
+ private GateInConfiguration config;
- private GateInPortalAdd()
+ GateInPortalAdd(GateInConfiguration config)
{
+ this.config = config;
}
@Override
protected void populateModel(ModelNode operation, ModelNode model) throws OperationFailedException
{
- /* noop */
+ // DO NOTHING
}
-
- @Override
- protected void performRuntime(OperationContext context, ModelNode operation, ModelNode model, ServiceVerificationHandler verificationHandler, List<ServiceController<?>> newControllers) throws OperationFailedException
- {
- super.performRuntime(context, operation, model, verificationHandler, newControllers);
- }
}
Modified: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInPortalDefinition.java
===================================================================
--- portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInPortalDefinition.java 2012-02-29 08:12:34 UTC (rev 8490)
+++ portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInPortalDefinition.java 2012-02-29 14:28:14 UTC (rev 8491)
@@ -31,11 +31,11 @@
public class GateInPortalDefinition extends SimpleResourceDefinition
{
- protected GateInPortalDefinition(String portalName)
+ GateInPortalDefinition(GateInConfiguration config, String portalName)
{
super(PathElement.pathElement(Constants.PORTAL, portalName),
GateInExtension.getResourceDescriptionResolver(Constants.PORTAL),
- GateInPortalAdd.INSTANCE, new ReloadRequiredRemoveStepHandler()
+ new GateInPortalAdd(config), new ReloadRequiredRemoveStepHandler()
);
}
}
Modified: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemAdd.java
===================================================================
--- portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemAdd.java 2012-02-29 08:12:34 UTC (rev 8490)
+++ portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemAdd.java 2012-02-29 14:28:14 UTC (rev 8491)
@@ -53,14 +53,18 @@
static final int INSTALL_GATEIN_CHILD_WARS = 0x4000;
static final int INSTALL_GATEIN_START = 0x4000;
static final int MANIFEST_DEPENDENCIES_GATEIN = 0x4000;
+ static final int CLEANUP_ATTACHMENTS = 0x4000;
- protected GateInSubsystemAdd()
+ private GateInConfiguration config;
+
+ protected GateInSubsystemAdd(GateInConfiguration config)
{
+ this.config = config;
}
protected void populateModel(ModelNode operation, ModelNode model)
{
- /* noop */
+ // DO NOTHING
}
protected void performBoottime(OperationContext context, ModelNode operation, ModelNode model,
@@ -73,14 +77,15 @@
{
final SharedPortletTldsMetaDataBuilder tldsBuilder = new SharedPortletTldsMetaDataBuilder();
- processorTarget.addDeploymentProcessor(Phase.STRUCTURE, STRUCTURE_GATEIN, new GateInStructureDeploymentProcessor());
- processorTarget.addDeploymentProcessor(Phase.PARSE, STRUCTURE_PORTLET_WAR_DEPLOYMENT_INIT, new PortletWarDeploymentInitializingProcessor());
+ processorTarget.addDeploymentProcessor(Phase.STRUCTURE, STRUCTURE_GATEIN, new GateInStructureDeploymentProcessor(config));
+ processorTarget.addDeploymentProcessor(Phase.PARSE, STRUCTURE_PORTLET_WAR_DEPLOYMENT_INIT, new PortletWarDeploymentInitializingProcessor(config));
processorTarget.addDeploymentProcessor(Phase.PARSE, MANIFEST_DEPENDENCIES_GATEIN, new GateInDependenciesDeploymentProcessor());
processorTarget.addDeploymentProcessor(Phase.PARSE, INSTALL_GATEIN_CHILD_WARS, new WarDependenciesDeploymentProcessor());
processorTarget.addDeploymentProcessor(Phase.DEPENDENCIES, DEPENDENCIES_PORTLET_MODULE, new PortletWarClassloadingDependencyProcessor(tldsBuilder.create()));
processorTarget.addDeploymentProcessor(Phase.POST_MODULE, POST_MODULE_GATEIN_INIT, new GateInInitDeploymentProcessor());
processorTarget.addDeploymentProcessor(Phase.INSTALL, INSTALL_GATEIN_START, new GateInStarterDeploymentProcessor());
+ processorTarget.addDeploymentProcessor(Phase.CLEANUP, CLEANUP_ATTACHMENTS, new GateInCleanupDeploymentProcessor());
}
}, OperationContext.Stage.RUNTIME);
}
Modified: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDefinition.java
===================================================================
--- portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDefinition.java 2012-02-29 08:12:34 UTC (rev 8490)
+++ portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDefinition.java 2012-02-29 14:28:14 UTC (rev 8491)
@@ -42,19 +42,20 @@
*/
public class GateInSubsystemDefinition extends SimpleResourceDefinition
{
- protected static GateInSubsystemDefinition INSTANCE = new GateInSubsystemDefinition();
+ private GateInConfiguration config;
- private GateInSubsystemDefinition()
+ GateInSubsystemDefinition(GateInConfiguration config)
{
super(PathElement.pathElement(ModelDescriptionConstants.SUBSYSTEM, GateInExtension.SUBSYSTEM_NAME),
GateInExtension.getResourceDescriptionResolver(GateInExtension.SUBSYSTEM_NAME));
+ this.config = config;
}
@Override
public void registerOperations(final ManagementResourceRegistration registration)
{
- final GateInSubsystemAdd subsystemAdd = new GateInSubsystemAdd();
- final ResourceDescriptionResolver rootResolver = GateInSubsystemDefinition.INSTANCE.getResourceDescriptionResolver();
+ final GateInSubsystemAdd subsystemAdd = new GateInSubsystemAdd(config);
+ final ResourceDescriptionResolver rootResolver = getResourceDescriptionResolver();
final DescriptionProvider subsystemAddDescription = new DefaultResourceAddDescriptionProvider(registration, rootResolver);
registration.registerOperationHandler(ADD, subsystemAdd, subsystemAddDescription, EnumSet.of(OperationEntry.Flag.RESTART_ALL_SERVICES));
registration.registerOperationHandler(REMOVE, ReloadRequiredRemoveStepHandler.INSTANCE, new DefaultResourceRemoveDescriptionProvider(rootResolver), EnumSet.of(OperationEntry.Flag.RESTART_ALL_SERVICES));
Modified: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemParser.java
===================================================================
--- portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemParser.java 2012-02-29 08:12:34 UTC (rev 8490)
+++ portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemParser.java 2012-02-29 14:28:14 UTC (rev 8491)
@@ -108,7 +108,7 @@
writer.writeStartElement(Element.DEPENDENCY.getLocalName());
writer.writeAttribute(Attribute.NAME.getLocalName(), dependency.getName());
ModelNode model = dependency.getValue();
- PortletWarDependancyDefinition.IMPORT_SERVICES.marshallAsAttribute(model, false, writer);
+ PortletWarDependencyDefinition.IMPORT_SERVICES.marshallAsAttribute(model, false, writer);
writer.writeEndElement();
}
writer.writeEndElement();
@@ -142,6 +142,9 @@
}
list.add(subsystem);
+ boolean hasArchives = false;
+ boolean hasDependencies = false;
+
// elements
while (reader.hasNext() && reader.nextTag() != END_ELEMENT)
{
@@ -153,11 +156,13 @@
case DEPLOYMENT_ARCHIVES:
{
parseDeploymentArchives(reader, address, list);
+ hasArchives = true;
break;
}
case PORTLET_WAR_DEPENDENCIES:
{
parsePortletWarDependencies(reader, address, list);
+ hasDependencies = true;
break;
}
default:
@@ -170,13 +175,21 @@
throw unexpectedElement(reader);
}
}
+
+ if (!hasArchives)
+ addDefaultDeploymentArchivesOperations(reader, address, list);
+
+ if (!hasDependencies)
+ addDefaultPortletWarDependencies(reader, address, list);
}
static void parseDeploymentArchives(XMLExtendedStreamReader reader, ModelNode parent, List<ModelNode> operations) throws XMLStreamException
{
-
// no attributes
requireNoAttributes(reader);
+
+ boolean gotArchives = false;
+
// elements
while (reader.hasNext() && reader.nextTag() != END_ELEMENT)
{
@@ -186,29 +199,23 @@
case ARCHIVE:
{
parseArchive(reader, parent, operations);
+ gotArchives = true;
break;
}
default:
throw unexpectedElement(reader);
}
}
+
+ if (!gotArchives)
+ addDefaultDeploymentArchivesOperations(reader, parent, operations);
+ }
- // validate archives
- //TODO: this must go in DeploymentArchiveAdd
- /*int mainCount = 0;
- for (Property p : model.asPropertyList()) {
- if (p.getValue().isDefined()) {
- List<Property> props = p.getValue().asPropertyList();
- if (props.size() > 0 && MAIN.equals(props.get(0).getName())) {
- mainCount++;
- }
- }
- }
-
- if (mainCount != 1) {
- throw new RuntimeException("Exactly one archive has to be marked as a main archive (found: " + mainCount + ")");
- } */
-
+ private static void addDefaultDeploymentArchivesOperations(XMLExtendedStreamReader reader, ModelNode parent, List<ModelNode> operations) throws XMLStreamException
+ {
+ ModelNode model = new ModelNode();
+ DeploymentArchiveDefinition.MAIN.parseAndSetParameter(Constants.TRUE, model, reader);
+ addDeploymentArchiveOperation(parent, model, "gatein.ear", operations);
}
static void parseArchive(XMLExtendedStreamReader reader, ModelNode parent, List<ModelNode> operations) throws XMLStreamException
@@ -246,21 +253,29 @@
+ "' of '" + Element.ARCHIVE.getLocalName() + "' element can not be null!");
}
+ addDeploymentArchiveOperation(parent, model, name, operations);
+
+ requireNoContent(reader);
+ }
+
+ private static void addDeploymentArchiveOperation(ModelNode parent, ModelNode model, String name, List<ModelNode> operations)
+ {
ModelNode address = parent.clone();
address.add(Constants.DEPLOYMENT_ARCHIVE, name);
model.get(OP).set(ADD);
model.get(OP_ADDR).set(address);
operations.add(model);
-
- requireNoContent(reader);
}
static void parsePortletWarDependencies(XMLExtendedStreamReader reader, ModelNode parent, List<ModelNode> operations) throws XMLStreamException
{
// no attributes
requireNoAttributes(reader);
- // elements
+
+ boolean gotDependencies = false;
+
+ // elements
while (reader.hasNext() && reader.nextTag() != END_ELEMENT)
{
final Element element = Element.forName(reader.getLocalName());
@@ -269,14 +284,25 @@
case DEPENDENCY:
{
parseDependency(reader, parent, operations);
+ gotDependencies = true;
break;
}
default:
throw unexpectedElement(reader);
}
}
+
+ if (!gotDependencies)
+ addDefaultPortletWarDependencies(reader, parent, operations);
}
+ private static void addDefaultPortletWarDependencies(XMLExtendedStreamReader reader, ModelNode parent, List<ModelNode> operations) throws XMLStreamException
+ {
+ addPortletWarDependencyOperation(parent, new ModelNode(), "org.gatein.wci", operations);
+ addPortletWarDependencyOperation(parent, new ModelNode(), "org.gatein.pc", operations);
+ addPortletWarDependencyOperation(parent, new ModelNode(), "javax.portlet.api", operations);
+ }
+
static void parseDependency(XMLExtendedStreamReader reader, ModelNode parent, List<ModelNode> operations) throws XMLStreamException
{
@@ -298,9 +324,7 @@
}
case IMPORT_SERVICES:
{
- PortletWarDependancyDefinition.IMPORT_SERVICES.parseAndSetParameter(value, model, reader);
- /*requireTrueOrFalse(value);
- importSvcs = Boolean.parseBoolean(value);*/
+ PortletWarDependencyDefinition.IMPORT_SERVICES.parseAndSetParameter(value, model, reader);
break;
}
default:
@@ -313,13 +337,18 @@
throw ParseUtils.missingRequired(reader, EnumSet.of(Attribute.NAME));
}
+ addPortletWarDependencyOperation(parent, model, name, operations);
+
+ requireNoContent(reader);
+ }
+
+ private static void addPortletWarDependencyOperation(ModelNode parent, ModelNode model, String name, List<ModelNode> operations)
+ {
ModelNode address = parent.clone();
address.add(Constants.PORTLET_WAR_DEPENDENCY, name);
model.get(OP).set(ADD);
model.get(OP_ADDR).set(address);
operations.add(model);
-
- requireNoContent(reader);
}
}
Deleted: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/PortletWarDependancyAdd.java
===================================================================
--- portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/PortletWarDependancyAdd.java 2012-02-29 08:12:34 UTC (rev 8490)
+++ portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/PortletWarDependancyAdd.java 2012-02-29 14:28:14 UTC (rev 8491)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat, Inc., and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.integration.jboss.as7;
-
-import org.jboss.as.controller.AbstractAddStepHandler;
-import org.jboss.as.controller.OperationFailedException;
-import org.jboss.dmr.ModelNode;
-
-/**
- * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a>
- */
-public class PortletWarDependancyAdd extends AbstractAddStepHandler {
- public static final PortletWarDependancyAdd INSTANCE = new PortletWarDependancyAdd();
-
- private PortletWarDependancyAdd() {
- }
-
- @Override
- protected void populateModel(ModelNode operation, ModelNode model) throws OperationFailedException {
- PortletWarDependancyDefinition.IMPORT_SERVICES.validateAndSet(operation,model);
- }
-}
Deleted: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/PortletWarDependancyDefinition.java
===================================================================
--- portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/PortletWarDependancyDefinition.java 2012-02-29 08:12:34 UTC (rev 8490)
+++ portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/PortletWarDependancyDefinition.java 2012-02-29 14:28:14 UTC (rev 8491)
@@ -1,61 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2012, Red Hat, Inc., and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.integration.jboss.as7;
-
-import org.jboss.as.controller.PathElement;
-import org.jboss.as.controller.ReloadRequiredRemoveStepHandler;
-import org.jboss.as.controller.SimpleAttributeDefinition;
-import org.jboss.as.controller.SimpleAttributeDefinitionBuilder;
-import org.jboss.as.controller.SimpleResourceDefinition;
-import org.jboss.as.controller.registry.AttributeAccess;
-import org.jboss.as.controller.registry.ManagementResourceRegistration;
-import org.jboss.dmr.ModelNode;
-import org.jboss.dmr.ModelType;
-
-/**
- * @author Tomaz Cerar
- */
-public class PortletWarDependancyDefinition extends SimpleResourceDefinition
-{
- protected static final PortletWarDependancyDefinition INSTANCE = new PortletWarDependancyDefinition();
-
- protected static final SimpleAttributeDefinition IMPORT_SERVICES =
- new SimpleAttributeDefinitionBuilder(Constants.IMPORT_SERVICES, ModelType.BOOLEAN, true)
- .setAllowExpression(false)
- .setDefaultValue(new ModelNode(false))
- .setXmlName(Constants.IMPORT_SERVICES)
- .setFlags(AttributeAccess.Flag.RESTART_ALL_SERVICES)
- .build();
-
- private PortletWarDependancyDefinition()
- {
- super(PathElement.pathElement(Constants.PORTLET_WAR_DEPENDENCY), GateInExtension.getResourceDescriptionResolver(Constants.PORTLET_WAR_DEPENDENCY),
- PortletWarDependancyAdd.INSTANCE, new ReloadRequiredRemoveStepHandler()
- );
- }
-
- @Override
- public void registerAttributes(ManagementResourceRegistration resourceRegistration)
- {
- resourceRegistration.registerReadOnlyAttribute(IMPORT_SERVICES, null);
- }
-}
Copied: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/PortletWarDependencyAdd.java (from rev 8475, portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/PortletWarDependancyAdd.java)
===================================================================
--- portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/PortletWarDependencyAdd.java (rev 0)
+++ portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/PortletWarDependencyAdd.java 2012-02-29 14:28:14 UTC (rev 8491)
@@ -0,0 +1,68 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.integration.jboss.as7;
+
+import org.jboss.as.controller.AbstractAddStepHandler;
+import org.jboss.as.controller.OperationContext;
+import org.jboss.as.controller.OperationFailedException;
+import org.jboss.as.controller.ServiceVerificationHandler;
+import org.jboss.dmr.ModelNode;
+import org.jboss.dmr.Property;
+import org.jboss.msc.service.ServiceController;
+
+import java.util.List;
+
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR;
+
+/**
+ * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a>
+ */
+public class PortletWarDependencyAdd extends AbstractAddStepHandler
+{
+ private GateInConfiguration config;
+
+ PortletWarDependencyAdd(GateInConfiguration config)
+ {
+ this.config = config;
+ }
+
+ @Override
+ protected void populateModel(ModelNode operation, ModelNode model) throws OperationFailedException
+ {
+ PortletWarDependencyDefinition.IMPORT_SERVICES.validateAndSet(operation, model);
+ }
+
+ @Override
+ protected void performRuntime(OperationContext context, ModelNode operation, ModelNode model, ServiceVerificationHandler verificationHandler, List<ServiceController<?>> newControllers) throws OperationFailedException
+ {
+ ModelNode addr = operation.get(OP_ADDR);
+ if (!addr.hasDefined(1))
+ throw new IllegalArgumentException("Invalid submodel address: " + addr);
+
+ Property prop = addr.get(1).asProperty();
+ if (!Constants.PORTLET_WAR_DEPENDENCY.equals(prop.getName()))
+ throw new IllegalArgumentException("Invalid submodel address: " + addr);
+
+ ModelNode importSvcs = operation.get(Constants.IMPORT_SERVICES);
+ config.addPortletWarDependency(prop.getValue().asString(), importSvcs.isDefined() && importSvcs.asBoolean());
+ }
+}
Property changes on: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/PortletWarDependencyAdd.java
___________________________________________________________________
Added: svn:executable
+ *
Copied: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/PortletWarDependencyDefinition.java (from rev 8472, portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/PortletWarDependancyDefinition.java)
===================================================================
--- portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/PortletWarDependencyDefinition.java (rev 0)
+++ portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/PortletWarDependencyDefinition.java 2012-02-29 14:28:14 UTC (rev 8491)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.integration.jboss.as7;
+
+import org.jboss.as.controller.PathElement;
+import org.jboss.as.controller.ReloadRequiredRemoveStepHandler;
+import org.jboss.as.controller.SimpleAttributeDefinition;
+import org.jboss.as.controller.SimpleAttributeDefinitionBuilder;
+import org.jboss.as.controller.SimpleResourceDefinition;
+import org.jboss.as.controller.registry.AttributeAccess;
+import org.jboss.as.controller.registry.ManagementResourceRegistration;
+import org.jboss.dmr.ModelNode;
+import org.jboss.dmr.ModelType;
+
+/**
+ * @author Tomaz Cerar
+ */
+public class PortletWarDependencyDefinition extends SimpleResourceDefinition
+{
+ protected static final SimpleAttributeDefinition IMPORT_SERVICES =
+ new SimpleAttributeDefinitionBuilder(Constants.IMPORT_SERVICES, ModelType.BOOLEAN, true)
+ .setAllowExpression(false)
+ .setDefaultValue(new ModelNode(false))
+ .setXmlName(Constants.IMPORT_SERVICES)
+ .setFlags(AttributeAccess.Flag.RESTART_ALL_SERVICES)
+ .build();
+
+ PortletWarDependencyDefinition(GateInConfiguration config)
+ {
+ super(PathElement.pathElement(Constants.PORTLET_WAR_DEPENDENCY), GateInExtension.getResourceDescriptionResolver(Constants.PORTLET_WAR_DEPENDENCY),
+ new PortletWarDependencyAdd(config), new ReloadRequiredRemoveStepHandler()
+ );
+ }
+
+ @Override
+ public void registerAttributes(ManagementResourceRegistration resourceRegistration)
+ {
+ resourceRegistration.registerReadOnlyAttribute(IMPORT_SERVICES, null);
+ }
+}
Property changes on: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/PortletWarDependencyDefinition.java
___________________________________________________________________
Added: svn:executable
+ *
Added: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/GateInConfigurationKey.java
===================================================================
--- portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/GateInConfigurationKey.java (rev 0)
+++ portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/GateInConfigurationKey.java 2012-02-29 14:28:14 UTC (rev 8491)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.integration.jboss.as7.deployment;
+
+import org.gatein.integration.jboss.as7.GateInConfiguration;
+import org.jboss.as.server.deployment.AttachmentKey;
+
+/**
+ * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a>
+ */
+public class GateInConfigurationKey
+{
+ public static final AttachmentKey<GateInConfiguration> KEY = AttachmentKey.create(GateInConfiguration.class);
+ public static final GateInConfigurationKey INSTANCE = new GateInConfigurationKey();
+}
Modified: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/GateInDependenciesDeploymentProcessor.java
===================================================================
--- portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/GateInDependenciesDeploymentProcessor.java 2012-02-29 08:12:34 UTC (rev 8490)
+++ portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/GateInDependenciesDeploymentProcessor.java 2012-02-29 14:28:14 UTC (rev 8491)
@@ -21,7 +21,7 @@
*/
package org.gatein.integration.jboss.as7.deployment;
-import org.gatein.integration.jboss.as7.GateInExtensionConfiguration;
+import org.gatein.integration.jboss.as7.GateInConfiguration;
import org.jboss.as.server.deployment.Attachments;
import org.jboss.as.server.deployment.DeploymentPhaseContext;
import org.jboss.as.server.deployment.DeploymentUnit;
@@ -42,13 +42,11 @@
final ModuleIdentifier gateInLibId = ModuleIdentifier.fromString("org.gatein.lib");
- private GateInExtensionConfiguration config =GateInExtensionConfiguration.INSTANCE;
-
public void deploy(final DeploymentPhaseContext phaseContext) throws DeploymentUnitProcessingException
{
final DeploymentUnit du = phaseContext.getDeploymentUnit();
- if (config.isGateInOrPortletArchive(du))
+ if (GateInConfiguration.isGateInOrPortletArchive(du))
{
// add dependency on org.gatein.lib
List<ModuleDependency> dependencies = du.getAttachmentList(Attachments.MANIFEST_DEPENDENCIES);
@@ -62,8 +60,9 @@
// add gatein deployment modules cross-dependencies
ModuleIdentifier moduleId = du.getAttachment(Attachments.MODULE_IDENTIFIER);
- if (config.isGateInArchive(du))
+ if (GateInConfiguration.isGateInArchive(du))
{
+ final GateInConfiguration config = du.getAttachment(GateInConfigurationKey.KEY);
final ServiceModuleLoader deploymentModuleLoader = du.getAttachment(Attachments.SERVICE_MODULE_LOADER);
if (!moduleId.equals(config.getGateInEarModule()))
Modified: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/GateInInitDeploymentProcessor.java
===================================================================
--- portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/GateInInitDeploymentProcessor.java 2012-02-29 08:12:34 UTC (rev 8490)
+++ portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/GateInInitDeploymentProcessor.java 2012-02-29 14:28:14 UTC (rev 8491)
@@ -22,7 +22,7 @@
package org.gatein.integration.jboss.as7.deployment;
import org.gatein.integration.jboss.as7.GateInExtension;
-import org.gatein.integration.jboss.as7.GateInExtensionConfiguration;
+import org.gatein.integration.jboss.as7.GateInConfiguration;
import org.gatein.integration.jboss.as7.web.InitService;
import org.jboss.as.server.deployment.Attachments;
import org.jboss.as.server.deployment.DeploymentPhaseContext;
@@ -44,25 +44,24 @@
{
private final Logger log = Logger.getLogger(GateInInitDeploymentProcessor.class);
- private GateInExtensionConfiguration config = GateInExtensionConfiguration.INSTANCE;
-
@Override
public void deploy(DeploymentPhaseContext phaseContext) throws DeploymentUnitProcessingException
{
final DeploymentUnit du = phaseContext.getDeploymentUnit();
- if (config.isGateInArchive(du))
+ if (GateInConfiguration.isGateInArchive(du))
{
log.info("Module is on GateIn Extension modules list");
+ final GateInConfiguration config = du.getAttachment(GateInConfigurationKey.KEY);
- ServiceName initSvcName = GateInExtension.deploymentUnitName(config.getGateInEarModule(), "gatein", "init");
- ServiceTarget target = phaseContext.getServiceTarget();
+ final ServiceName initSvcName = GateInExtension.deploymentUnitName(config.getGateInEarModule(), "gatein", "init");
+ final ServiceTarget target = phaseContext.getServiceTarget();
if (du.getAttachment(GateInEarKey.KEY) != null)
{
- // install InitService with dependency on all the deployment modules reaching POST_MODULE
+ // Install InitService with dependency on all the deployment modules reaching POST_MODULE
// TODO: we are starting up InitService before child modules (jboss.deployment.subunit.*) have gone through POST_MODULE
- ServiceBuilder<InitService> builder = target.addService(initSvcName, new InitService())
+ final ServiceBuilder<InitService> builder = target.addService(initSvcName, new InitService(config))
.addDependency(GateInExtension.deploymentUnitName(config.getGateInEarModule(), Phase.POST_MODULE));
for (ModuleIdentifier module : config.getGateInExtModules())
Modified: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/GateInStarterDeploymentProcessor.java
===================================================================
--- portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/GateInStarterDeploymentProcessor.java 2012-02-29 08:12:34 UTC (rev 8490)
+++ portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/GateInStarterDeploymentProcessor.java 2012-02-29 14:28:14 UTC (rev 8491)
@@ -22,7 +22,7 @@
package org.gatein.integration.jboss.as7.deployment;
import org.gatein.integration.jboss.as7.GateInExtension;
-import org.gatein.integration.jboss.as7.GateInExtensionConfiguration;
+import org.gatein.integration.jboss.as7.GateInConfiguration;
import org.gatein.integration.jboss.as7.web.StartupService;
import org.jboss.as.server.deployment.Attachments;
import org.jboss.as.server.deployment.DeploymentPhaseContext;
@@ -42,19 +42,24 @@
*/
public class GateInStarterDeploymentProcessor implements DeploymentUnitProcessor
{
- private ConcurrentHashMap<ModuleIdentifier, ModuleIdentifier> deploymentModules;
+ private volatile ConcurrentHashMap<ModuleIdentifier, ModuleIdentifier> deploymentModules;
- private GateInExtensionConfiguration config = GateInExtensionConfiguration.INSTANCE;
-
- private synchronized ConcurrentHashMap<ModuleIdentifier, ModuleIdentifier> getDeploymentModules()
+ private ConcurrentHashMap<ModuleIdentifier, ModuleIdentifier> getDeploymentModules(GateInConfiguration config)
{
if (deploymentModules == null)
{
- deploymentModules = new ConcurrentHashMap<ModuleIdentifier, ModuleIdentifier>();
- deploymentModules.put(config.getGateInEarModule(), config.getGateInEarModule());
- for (ModuleIdentifier id : config.getGateInExtModules())
+ synchronized (this)
{
- deploymentModules.put(id, id);
+ if (deploymentModules == null)
+ {
+ final ConcurrentHashMap<ModuleIdentifier, ModuleIdentifier> dms = new ConcurrentHashMap<ModuleIdentifier, ModuleIdentifier>();
+ dms.put(config.getGateInEarModule(), config.getGateInEarModule());
+ for (ModuleIdentifier id : config.getGateInExtModules())
+ {
+ dms.put(id, id);
+ }
+ this.deploymentModules = dms;
+ }
}
}
return deploymentModules;
@@ -63,23 +68,25 @@
@Override
public void deploy(DeploymentPhaseContext phaseContext) throws DeploymentUnitProcessingException
{
- DeploymentUnit du = phaseContext.getDeploymentUnit();
+ final DeploymentUnit du = phaseContext.getDeploymentUnit();
// Wait to the last GateIn archive deployment unit install
// Then enumerate all the child components which should all be scheduled for startup at that point
// to get the dependencies for StartupService
- if (config.isGateInArchive(du))
+ if (GateInConfiguration.isGateInArchive(du))
{
- ModuleIdentifier moduleId = du.getAttachment(Attachments.MODULE_IDENTIFIER);
- getDeploymentModules().remove(moduleId);
+ final GateInConfiguration config = du.getAttachment(GateInConfigurationKey.KEY);
+ final ModuleIdentifier moduleId = du.getAttachment(Attachments.MODULE_IDENTIFIER);
+ getDeploymentModules(config).remove(moduleId);
+
if (deploymentModules.size() == 0)
{
- StartupService startup = new StartupService();
+ final StartupService startup = new StartupService();
startup.setGateInModule(du.getAttachment(Attachments.MODULE));
- ServiceBuilder<StartupService> builder = phaseContext.getServiceTarget()
+ final ServiceBuilder<StartupService> builder = phaseContext.getServiceTarget()
.addService(StartupService.SERVICE_NAME, startup);
builder.addDependency(GateInExtension.deploymentUnitName(config.getGateInEarModule(), Phase.CLEANUP));
Modified: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/GateInStructureDeploymentProcessor.java
===================================================================
--- portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/GateInStructureDeploymentProcessor.java 2012-02-29 08:12:34 UTC (rev 8490)
+++ portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/GateInStructureDeploymentProcessor.java 2012-02-29 14:28:14 UTC (rev 8491)
@@ -21,8 +21,8 @@
*/
package org.gatein.integration.jboss.as7.deployment;
+import org.gatein.integration.jboss.as7.GateInConfiguration;
import org.gatein.integration.jboss.as7.GateInExtension;
-import org.gatein.integration.jboss.as7.GateInExtensionConfiguration;
import org.jboss.as.server.deployment.Attachments;
import org.jboss.as.server.deployment.DeploymentPhaseContext;
import org.jboss.as.server.deployment.DeploymentUnit;
@@ -67,17 +67,17 @@
}
};
+ private GateInConfiguration config;
- private GateInExtensionConfiguration config = GateInExtensionConfiguration.INSTANCE;
-
- public GateInStructureDeploymentProcessor()
+ public GateInStructureDeploymentProcessor(GateInConfiguration config)
{
+ this.config = config;
}
@Override
public void deploy(DeploymentPhaseContext phaseContext) throws DeploymentUnitProcessingException
{
- DeploymentUnit du = phaseContext.getDeploymentUnit();
+ final DeploymentUnit du = phaseContext.getDeploymentUnit();
log.debug("Deploy: " + du.getName() + " [" + phaseContext.getPhase() + "]");
if (du.getParent() != null)
{
@@ -85,11 +85,12 @@
}
else
{
- ModuleIdentifier moduleId = du.getAttachment(Attachments.MODULE_IDENTIFIER);
+ final ModuleIdentifier moduleId = du.getAttachment(Attachments.MODULE_IDENTIFIER);
if (config.getGateInEarModule().equals(moduleId))
{
log.debugf("Recognized %s as main GateIn deployment archive", moduleId);
du.putAttachment(GateInEarKey.KEY, GateInEarKey.INSTANCE);
+ du.putAttachment(GateInConfigurationKey.KEY, config);
if (log.isTraceEnabled())
{
installListener(phaseContext, moduleId);
@@ -99,6 +100,7 @@
{
log.debugf("Recognized %s as part of GateIn deployment", moduleId);
du.putAttachment(GateInExtKey.KEY, GateInExtKey.INSTANCE);
+ du.putAttachment(GateInConfigurationKey.KEY, config);
if (log.isTraceEnabled())
{
installListener(phaseContext, moduleId);
@@ -111,12 +113,13 @@
{
DeploymentUnit du = phaseContext.getDeploymentUnit();
DeploymentUnit parent = du.getParent();
- if (config.isGateInArchive(parent))
+ if (GateInConfiguration.isGateInArchive(parent))
{
//if (DeploymentTypeMarker.isType(DeploymentType.WAR, du))
//{
// config.getChildWars().add(WebSubsystemServices.JBOSS_WEB.append(du.getName()));
//}
+ du.putAttachment(GateInConfigurationKey.KEY, config);
config.addChildSubUnit(Services.deploymentUnitName(parent.getName(), du.getName()));
}
}
Modified: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarClassloadingDependencyProcessor.java
===================================================================
--- portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarClassloadingDependencyProcessor.java 2012-02-29 08:12:34 UTC (rev 8490)
+++ portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarClassloadingDependencyProcessor.java 2012-02-29 14:28:14 UTC (rev 8491)
@@ -21,7 +21,7 @@
*/
package org.gatein.integration.jboss.as7.deployment;
-import org.gatein.integration.jboss.as7.GateInExtensionConfiguration;
+import org.gatein.integration.jboss.as7.GateInConfiguration;
import org.jboss.as.server.deployment.Attachments;
import org.jboss.as.server.deployment.DeploymentPhaseContext;
import org.jboss.as.server.deployment.DeploymentUnit;
@@ -43,8 +43,6 @@
private List<TldMetaData> tldMetas;
- private GateInExtensionConfiguration conf = GateInExtensionConfiguration.INSTANCE;
-
public PortletWarClassloadingDependencyProcessor(List<TldMetaData> tldMetaData)
{
this.tldMetas = tldMetaData;
@@ -54,15 +52,19 @@
public void deploy(DeploymentPhaseContext phaseContext) throws DeploymentUnitProcessingException
{
final DeploymentUnit du = phaseContext.getDeploymentUnit();
- if (!conf.isPortletArchive(du))
+
+ if (!GateInConfiguration.isPortletArchive(du))
{
return; // Skip non portlet deployments
}
final ModuleSpecification moduleSpecification = du.getAttachment(Attachments.MODULE_SPECIFICATION);
+
+ GateInConfiguration config = du.getAttachment(GateInConfigurationKey.KEY);
+
// Add module dependencies
- for (ModuleDependency dep: conf.getPortletWarDependencies())
+ for (ModuleDependency dep: config.getPortletWarDependencies())
{
moduleSpecification.addSystemDependency(dep);
}
Modified: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarDeploymentInitializingProcessor.java
===================================================================
--- portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarDeploymentInitializingProcessor.java 2012-02-29 08:12:34 UTC (rev 8490)
+++ portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarDeploymentInitializingProcessor.java 2012-02-29 14:28:14 UTC (rev 8491)
@@ -21,6 +21,7 @@
*/
package org.gatein.integration.jboss.as7.deployment;
+import org.gatein.integration.jboss.as7.GateInConfiguration;
import org.jboss.as.ee.structure.DeploymentType;
import org.jboss.as.ee.structure.DeploymentTypeMarker;
import org.jboss.as.server.deployment.Attachments;
@@ -38,21 +39,27 @@
{
private static final String PORTLET_XML = "WEB-INF/portlet.xml";
+ private GateInConfiguration config;
+ public PortletWarDeploymentInitializingProcessor(GateInConfiguration config) {
+ this.config = config;
+ }
+
@Override
public void deploy(DeploymentPhaseContext phaseContext) throws DeploymentUnitProcessingException
{
- final DeploymentUnit deploymentUnit = phaseContext.getDeploymentUnit();
- if (!DeploymentTypeMarker.isType(DeploymentType.WAR, deploymentUnit))
+ final DeploymentUnit du = phaseContext.getDeploymentUnit();
+ if (!DeploymentTypeMarker.isType(DeploymentType.WAR, du))
{
return; // Skip non web deployments
}
- final ResourceRoot deploymentRoot = deploymentUnit.getAttachment(Attachments.DEPLOYMENT_ROOT);
+ final ResourceRoot deploymentRoot = du.getAttachment(Attachments.DEPLOYMENT_ROOT);
final VirtualFile portletXml = deploymentRoot.getRoot().getChild(PORTLET_XML);
if (portletXml.exists())
{
// we don't care about the contents, its existence is enough to mark it as a portlet app
- deploymentUnit.putAttachment(PortletWarKey.INSTANCE, Boolean.TRUE);
+ du.putAttachment(PortletWarKey.INSTANCE, Boolean.TRUE);
+ du.putAttachment(GateInConfigurationKey.KEY, config);
}
}
Modified: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/WarDependenciesDeploymentProcessor.java
===================================================================
--- portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/WarDependenciesDeploymentProcessor.java 2012-02-29 08:12:34 UTC (rev 8490)
+++ portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/WarDependenciesDeploymentProcessor.java 2012-02-29 14:28:14 UTC (rev 8491)
@@ -21,7 +21,7 @@
*/
package org.gatein.integration.jboss.as7.deployment;
-import org.gatein.integration.jboss.as7.GateInExtensionConfiguration;
+import org.gatein.integration.jboss.as7.GateInConfiguration;
import org.jboss.as.server.deployment.DeploymentPhaseContext;
import org.jboss.as.server.deployment.DeploymentUnit;
import org.jboss.as.server.deployment.DeploymentUnitProcessingException;
@@ -39,7 +39,6 @@
*/
public class WarDependenciesDeploymentProcessor implements DeploymentUnitProcessor
{
- private GateInExtensionConfiguration config = GateInExtensionConfiguration.INSTANCE;
private void processWarDeployment(DeploymentUnit du)
{
@@ -66,7 +65,9 @@
}
}
- final ServiceName deploymentServiceName = WebSubsystemServices.deploymentServiceName("default-host", pathName);
+ GateInConfiguration config = du.getAttachment(GateInConfigurationKey.KEY);
+ ServiceName deploymentServiceName = WebSubsystemServices.deploymentServiceName("default-host", pathName);
+
config.addChildWar(deploymentServiceName);
}
@@ -78,12 +79,12 @@
if (parent != null)
{
- if (config.isGateInArchive(parent))
+ if (GateInConfiguration.isGateInArchive(parent))
{
processWarDeployment(du);
}
}
- else if (config.isGateInArchive(du))
+ else if (GateInConfiguration.isGateInArchive(du))
{
processWarDeployment(du);
}
Modified: portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/web/InitService.java
===================================================================
--- portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/web/InitService.java 2012-02-29 08:12:34 UTC (rev 8490)
+++ portal/trunk/packaging/jboss-as7/extension/src/main/java/org/gatein/integration/jboss/as7/web/InitService.java 2012-02-29 14:28:14 UTC (rev 8491)
@@ -22,8 +22,7 @@
package org.gatein.integration.jboss.as7.web;
import org.exoplatform.container.RootContainer;
-import org.gatein.integration.jboss.as7.GateInExtension;
-import org.gatein.integration.jboss.as7.GateInExtensionConfiguration;
+import org.gatein.integration.jboss.as7.GateInConfiguration;
import org.jboss.as.server.moduleservice.ModuleLoadService;
import org.jboss.as.server.moduleservice.ServiceModuleLoader;
import org.jboss.modules.Module;
@@ -39,7 +38,12 @@
public class InitService implements Service<InitService>
{
- private GateInExtensionConfiguration config = GateInExtensionConfiguration.INSTANCE;
+ private GateInConfiguration config;
+
+ public InitService(GateInConfiguration config)
+ {
+ this.config = config;
+ }
@Override
public void start(StartContext context) throws StartException
Modified: portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/standalone/configuration/standalone.xml
===================================================================
--- portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/standalone/configuration/standalone.xml 2012-02-29 08:12:34 UTC (rev 8490)
+++ portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/standalone/configuration/standalone.xml 2012-02-29 14:28:14 UTC (rev 8491)
@@ -320,8 +320,9 @@
<archive name="gatein-sample-skin.war"/>
</deployment-archives>
<portlet-war-dependencies>
- <dependency name="org.gatein.lib" import-services="true"/>
+ <!--dependency name="org.gatein.lib" import-services="true"/-->
<dependency name="org.gatein.wci"/>
+ <dependency name="org.gatein.pc"/>
<dependency name="javax.portlet.api"/>
</portlet-war-dependencies>
</subsystem>
12 years, 10 months
- 1
- 0
gatein SVN: r8490 - in portal/trunk: docs/reference-guide and 5 other directories.
by do-not-reply＠jboss.org
Author: bdaw
Date: 2012-02-29 03:12:34 -0500 (Wed, 29 Feb 2012)
New Revision: 8490
Modified:
portal/trunk/docs/pom.xml
portal/trunk/docs/reference-guide/pom.xml
portal/trunk/docs/user-guide/pom.xml
portal/trunk/packaging/jboss-as7/extension/pom.xml
portal/trunk/packaging/jboss-as7/modules/pom.xml
portal/trunk/packaging/jboss-as7/pkg/pom.xml
portal/trunk/packaging/jboss-as7/pom.xml
Log:
post release pom switch
Modified: portal/trunk/docs/pom.xml
===================================================================
--- portal/trunk/docs/pom.xml 2012-02-29 04:39:06 UTC (rev 8489)
+++ portal/trunk/docs/pom.xml 2012-02-29 08:12:34 UTC (rev 8490)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-GA</version>
+ <version>3.3.0.Alpha01</version>
</parent>
<groupId>org.gatein.doc</groupId>
Modified: portal/trunk/docs/reference-guide/pom.xml
===================================================================
--- portal/trunk/docs/reference-guide/pom.xml 2012-02-29 04:39:06 UTC (rev 8489)
+++ portal/trunk/docs/reference-guide/pom.xml 2012-02-29 08:12:34 UTC (rev 8490)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.gatein.doc</groupId>
<artifactId>docs-aggregator</artifactId>
- <version>3.2.0-GA</version>
+ <version>3.3.0.Alpha01</version>
</parent>
<groupId>org.gatein.doc</groupId>
Modified: portal/trunk/docs/user-guide/pom.xml
===================================================================
--- portal/trunk/docs/user-guide/pom.xml 2012-02-29 04:39:06 UTC (rev 8489)
+++ portal/trunk/docs/user-guide/pom.xml 2012-02-29 08:12:34 UTC (rev 8490)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.gatein.doc</groupId>
<artifactId>docs-aggregator</artifactId>
- <version>3.2.0-GA</version>
+ <version>3.3.0.Alpha01</version>
</parent>
<artifactId>gatein-user-guide-en</artifactId>
Modified: portal/trunk/packaging/jboss-as7/extension/pom.xml
===================================================================
--- portal/trunk/packaging/jboss-as7/extension/pom.xml 2012-02-29 04:39:06 UTC (rev 8489)
+++ portal/trunk/packaging/jboss-as7/extension/pom.xml 2012-02-29 08:12:34 UTC (rev 8490)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.packaging.jboss7</artifactId>
- <version>3.2.0-GA</version>
+ <version>3.3.0.Alpha01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/packaging/jboss-as7/modules/pom.xml
===================================================================
--- portal/trunk/packaging/jboss-as7/modules/pom.xml 2012-02-29 04:39:06 UTC (rev 8489)
+++ portal/trunk/packaging/jboss-as7/modules/pom.xml 2012-02-29 08:12:34 UTC (rev 8490)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.packaging.jboss7</artifactId>
- <version>3.2.0-GA</version>
+ <version>3.3.0.Alpha01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/packaging/jboss-as7/pkg/pom.xml
===================================================================
--- portal/trunk/packaging/jboss-as7/pkg/pom.xml 2012-02-29 04:39:06 UTC (rev 8489)
+++ portal/trunk/packaging/jboss-as7/pkg/pom.xml 2012-02-29 08:12:34 UTC (rev 8490)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.packaging.jboss7</artifactId>
- <version>3.2.0-GA</version>
+ <version>3.3.0.Alpha01</version>
</parent>
<artifactId>exo.portal.packaging.jboss7.pkg</artifactId>
Modified: portal/trunk/packaging/jboss-as7/pom.xml
===================================================================
--- portal/trunk/packaging/jboss-as7/pom.xml 2012-02-29 04:39:06 UTC (rev 8489)
+++ portal/trunk/packaging/jboss-as7/pom.xml 2012-02-29 08:12:34 UTC (rev 8490)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.packaging</artifactId>
- <version>3.2.0-GA</version>
+ <version>3.3.0.Alpha01</version>
</parent>
<artifactId>exo.portal.packaging.jboss7</artifactId>
12 years, 10 months
- 1
- 0
gatein SVN: r8489 - epp/docs/branches/5.2/Installation_Guide/en-US.
by do-not-reply＠jboss.org
Author: jaredmorgs
Date: 2012-02-28 23:39:06 -0500 (Tue, 28 Feb 2012)
New Revision: 8489
Modified:
epp/docs/branches/5.2/Installation_Guide/en-US/Author_Group.xml
epp/docs/branches/5.2/Installation_Guide/en-US/Book_Info.xml
epp/docs/branches/5.2/Installation_Guide/en-US/DatabaseConfiguration.xml
epp/docs/branches/5.2/Installation_Guide/en-US/Revision_History.xml
epp/docs/branches/5.2/Installation_Guide/en-US/Test_Your_Installation.xml
epp/docs/branches/5.2/Installation_Guide/en-US/Uninstall_JBoss.xml
Log:
Improved MySQL IDM and JCR chapter, and Test Your Installation chapter
Modified: epp/docs/branches/5.2/Installation_Guide/en-US/Author_Group.xml
===================================================================
--- epp/docs/branches/5.2/Installation_Guide/en-US/Author_Group.xml 2012-02-29 02:48:07 UTC (rev 8488)
+++ epp/docs/branches/5.2/Installation_Guide/en-US/Author_Group.xml 2012-02-29 04:39:06 UTC (rev 8489)
@@ -6,20 +6,20 @@
%BOOK_ENTITIES;
]>
<authorgroup>
- <editor>
- <firstname>Scott</firstname>
- <surname>Mumford</surname>
+ <author>
+ <firstname>Jared</firstname>
+ <surname>Morgan</surname>
<affiliation>
<shortaffil>Red Hat</shortaffil>
<orgdiv>Engineering Content Services</orgdiv>
</affiliation>
- </editor>
+ </author>
<editor>
- <firstname>Luc</firstname>
- <surname>Texier</surname>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
<affiliation>
<shortaffil>Red Hat</shortaffil>
- <orgdiv>JBoss Engineering</orgdiv>
+ <orgdiv>Engineering Content Services</orgdiv>
</affiliation>
</editor>
<editor>
@@ -39,6 +39,6 @@
</emphasis></orgname>
<orgdiv>Documentation Teams</orgdiv>
</affiliation>
- <contrib>Original product documentation by:</contrib>
+ <contrib>Original project documentation by:</contrib>
</othercredit>
</authorgroup>
Modified: epp/docs/branches/5.2/Installation_Guide/en-US/Book_Info.xml
===================================================================
--- epp/docs/branches/5.2/Installation_Guide/en-US/Book_Info.xml 2012-02-29 02:48:07 UTC (rev 8488)
+++ epp/docs/branches/5.2/Installation_Guide/en-US/Book_Info.xml 2012-02-29 04:39:06 UTC (rev 8489)
@@ -9,10 +9,10 @@
<productname>JBoss Enterprise Portal Platform</productname>
<productnumber>5.2</productnumber>
<edition>5.2.1</edition>
- <pubsnumber>4</pubsnumber>
+ <pubsnumber>7</pubsnumber>
<abstract>
<para>
- This book provides information about obtaining, installing and running JBoss Enterprise Portal Platform. It forms part of the complete document suite along with the <emphasis role="bold">User Guide</emphasis> and <emphasis role="bold">Reference Guide</emphasis> available at <ulink url="http://docs.redhat.com/docs/en-US/JBoss_Enterprise_Portal_Platform/index...." type="http"/>.
+ This book provides information about obtaining, installing and running JBoss Enterprise Portal Platform. It forms part of the complete document suite along with the <citetitle>User Guide</citetitle> and <citetitle>Reference Guide</citetitle> available at <ulink url="http://docs.redhat.com/docs/en-US/JBoss_Enterprise_Portal_Platform/index...." type="http"/>.
</para>
</abstract>
<corpauthor>
Modified: epp/docs/branches/5.2/Installation_Guide/en-US/DatabaseConfiguration.xml
===================================================================
--- epp/docs/branches/5.2/Installation_Guide/en-US/DatabaseConfiguration.xml 2012-02-29 02:48:07 UTC (rev 8488)
+++ epp/docs/branches/5.2/Installation_Guide/en-US/DatabaseConfiguration.xml 2012-02-29 04:39:06 UTC (rev 8489)
@@ -375,73 +375,89 @@
<para>Before starting the server for the first time, continue to <xref linkend="sect-Reference_Guide-EMail_Service_Configuration"/> for the next mandatory configuration requirement.</para>
</section>
<section>
- <title><remark>BZ#794386 </remark>Example with MySQL Server 5.1</title>
+ <title><remark>BZ#794386 and BZ#794687 </remark>MySQL Server 5.1 JCR and IDM Example</title>
<para>This section describes an example how to configure MySQL to work with a single portal container. Refer to <xref linkend="Multiple_Portal_JRC_IDM"/> if you need to configure multiple portal containers in your installation, or intend to use Site Publisher. </para>
<para>More information about setting up other datasources can be found in the JBoss Enterprise Application Platform <citetitle>Getting Started Guide</citetitle>, in the <citetitle>Using Other Databases</citetitle> chapter. </para>
- <formalpara id="form-Portal_EAP-Using_a_MySQL_Database-Installing_the_MySQL_RDBMS_JDBC_connector">
- <title>Installing the MySQL JDBC connector</title>
- <para>The MySQL JDBC connector is required for EPP to use a <application>MySQL</application> database:</para>
- </formalpara>
- <para>
- The <literal>mysql-java-connector</literal> package is available through <ulink url="https://www.redhat.com/wapps/sso/rhn/login.html?redirect=http%3A%2F%2Frhn..." type="http">Red Hat Network</ulink>. This is the recommended installation method.
- </para>
- <para>
- For users who are not able to access the Red Hat Network, <application>MySQL</application> is available directly from <ulink url="http://www.mysql.com/downloads/connector/j/" type="http">http://www.mysql.com</ulink>. You should download a version listed in the Certified Configurations table available on the <ulink url="http://www.jboss.com/products/platforms/portals/testedconfigurations/">JBoss Enterprise Portal Platform</ulink> JBoss website.
- </para>
- <formalpara id="form-Portal_EAP-Using_a_MySQL_Database-Creating_a_MySQL_Database">
- <title>Creating a MySQL Database</title>
+ <important>
+ <title>Important</title>
<para>
- If you have just installed MySQL, make sure the MySQL server is running, and then run the following command to set the root user password:
+ Some underlying JBoss Enterprise Application Platform services may still be using Hypersonic which is an in-VM database server loaded in the same memory space. To connect these services to another RDBMS, or disable them, refer to the JBoss Enterprise Application Platform documentation, or contact JBoss Support for assistance.
</para>
- </formalpara>
- <para>
-<screen>
-mysqladmin -u root password '<replaceable>new-root-user-password</replaceable>'
-</screen>
- </para>
- <orderedlist>
- <listitem>
+ </important>
+ <task id="task-Create_a_MySQL_Database">
+ <title>Task: Create a MySQL Database</title>
+ <tasksummary>
+ <para>Complete this task to configure MySQL with the required database tables and user information for a single portal instance.</para>
+ <para>The MySQL JDBC connector is required to use a <application>MySQL</application> database.</para>
<para>
+ The <literal>mysql-java-connector</literal> package is available through <ulink url="https://www.redhat.com/wapps/sso/rhn/login.html?redirect=http%3A%2F%2Frhn..." type="http">Red Hat Network</ulink>. </para>
+ <note>
+ <title>Note: Database Names</title>
+ <para>The configuration examples that follow assume the database names to be <replaceable>gateinjcr</replaceable> and <replaceable>gateinidm</replaceable>. If you change the database names, update the <filename>gatein-ds.xml</filename> datasource descriptor file accordingly (for each server configuration used).
+ </para>
+ </note>
+ </tasksummary>
+ <taskprerequisites>
+ <title>Prerequisites</title>
+ <itemizedlist>
+ <listitem>
+ <para>Complete <xref linkend="task-Create_Production_Database"/> to install the <literal>mysql-java-connector</literal> package mentioned in the task summary.</para>
+ </listitem>
+ <listitem>
+ <para>Read and understand the basics of IDM and JCR provisioning in <xref linkend="Single_Portal_JCR_IDM"/></para>
+ </listitem>
+ <listitem>
+ <para>Be familiar with MySQL commands.</para>
+ </listitem>
+ </itemizedlist>
+ </taskprerequisites>
+ <procedure>
+ <step>
+ <para>
+ If you have just installed MySQL, make sure the MySQL server is running, and then run the following command to set the root user password:
+ </para>
+ <programlisting>mysqladmin -u root password '<replaceable>new-root-user-password</replaceable>'</programlisting>
+ </step>
+ <step>
+ <para>
Run the following command to log in to MySQL. Enter the root user password when prompted:
</para>
- <para>
-<screen>
-mysql -u root -p
-</screen>
+ <programlisting>mysql -u root -p</programlisting>
+ </step>
+ <step>
+ <para>
+ Use the <command>CREATE DATABASE</command> command to create a new <replaceable>gateinjcr</replaceable> database.
</para>
- </listitem>
- <listitem>
- <para>
- Use the <command>CREATE DATABASE</command> command to create a new gateinjcr database.
+ <warning>
+ <para>MyISAM storage engine is not supported in JBoss Enterprise Portal Platform, and may lead to data corruption if used. </para>
+ </warning>
+ <programlisting>mysql> CREATE DATABASE gateinjcr;</programlisting>
+ <formalpara>
+ <title>Result</title>
+ <para>
+ The database is created, and MySQL returns a status similar to the following:
</para>
- <note>
- <title>Note: Database names</title>
- <para>
- The remainder of this guide, and the configuration examples that follow assume the database names to be gateinjcr and gateinidm. If you change the database names, please update <filename>gatein-ds.xml</filename> accordingly (for each server configuration used).
- </para>
- </note>
- <para>
-<screen>
-mysql> CREATE DATABASE gateinjcr;
-</screen>
+ </formalpara>
+ <screen>Query OK, 1 row affected (0.00 sec)</screen>
+ </step>
+ <step>
+ <para>
+ Use the <command>CREATE DATABASE</command> command to create a new <replaceable>gateinidm</replaceable> database.
</para>
- <para>
- The output should be similar to the following:
+ <programlisting>mysql> CREATE DATABASE gateinidm;</programlisting>
+ <formalpara>
+ <title>Result</title>
+ <para>
+ The database is created, and MySQL returns a status similar to the following:
</para>
- <screen>
-Query OK, 1 row affected (0.00 sec)
-</screen>
- <para>
- Then repeat with:
- </para>
- <screen>mysql> CREATE DATABASE gateinidm;
-</screen>
- <para>
- At this point, the <command>SHOW DATABASES;</command> command should display the <command>gatein</command> databases:
+ </formalpara>
+ <screen>Query OK, 1 row affected (0.00 sec)</screen>
+ </step>
+ <step>
+ <para>Execute the <command>SHOW DATABASES;</command> command to display and verify the <replaceable>gatein</replaceable> databases:
</para>
- <para>
-<screen>
-mysql> SHOW DATABASES;
+ <para>
+<screen>mysql> SHOW DATABASES;
+--------------------+
| Database |
+--------------------+
@@ -450,110 +466,70 @@
| gateinidm |
| mysql |
+--------------------+
-4 rows in set (0.00 sec)
-</screen>
+4 rows in set (0.00 sec)</screen>
</para>
- <para>
- It is safe to ignore the other databases.
+ <note>
+ <para>
+ It is safe to ignore the other databases for the purposes of this procedure.
</para>
- </listitem>
- <listitem>
- <para>
- Add a new user and give that user access to the gatein databases. The following example adds a new user named <computeroutput>gateinuser</computeroutput>, with the password <computeroutput>gateinpassword</computeroutput>. It is recommended that you choose a different password to the one supplied here by changing <replaceable>gateinpassword</replaceable> to some other password:
+ </note>
+ </step>
+ <step>
+ <para>Add a new user. </para>
+ <para>The following example adds a new user named <literal>gateinuser</literal>, with the password <literal>gateinpassword</literal>. Choose a different password to the one supplied here by changing <replaceable>gateinpassword</replaceable> to a unique value:
</para>
- <screen>CREATE USER 'gateinuser'@'localhost' IDENTIFIED BY 'gateinpassword';</screen>
- </listitem>
- <listitem>
- <para>
- Grant the necessary privileges to the user:
+ <programlisting>CREATE USER '<replaceable>gateinuser</replaceable>'@'localhost' IDENTIFIED BY '<replaceable>gateinpassword</replaceable>';</programlisting>
+ </step>
+ <step>
+ <para>
+ Grant read/write privileges to the user on both databases:
</para>
- <para>
-<screen>
-mysql> GRANT ALL PRIVILEGES ON gateinjcr.* TO '<replaceable>gateinuser</replaceable>'@'localhost'
+ <programlisting>mysql> GRANT ALL PRIVILEGES ON gateinjcr.* TO '<replaceable>gateinuser</replaceable>'@'localhost'
IDENTIFIED BY '<replaceable>gateinpassword</replaceable>' WITH GRANT OPTION;
-</screen>
-<screen>
+
mysql> GRANT ALL PRIVILEGES ON gateinidm.* TO '<replaceable>gateinuser</replaceable>'@'localhost'
-IDENTIFIED BY '<replaceable>gateinpassword</replaceable>' WITH GRANT OPTION;
-</screen>
- </para>
-<!--
- <note><title>Note: Changed password?</title>
- <para>
- If you changed the portal user's password, remember to also change the password in the MySQL Datasource descriptor.
- </para>
- </note>
---> </listitem>
- </orderedlist>
- <formalpara id="form-Portal_EAP-Using_a_MySQL_Database-MySQL_Datasource_Descriptor">
- <title>MySQL Datasource Descriptor</title>
- <para>
- You now need to change the portal database descriptor
+IDENTIFIED BY '<replaceable>gateinpassword</replaceable>' WITH GRANT OPTION;</programlisting>
+ </step>
+ <step>
+ <formalpara>
+ <title>Result</title>
+ <para>You have created a common user for all required database tables, and granted the user the correct permissions to make changes to the tables on behalf of the portal instance.</para>
+ </formalpara>
+ </step>
+ </procedure>
+ </task>
+ <para>Now the database has been provisioned correctly, the user and database information needs to be defined in the portal container's datasource descriptor.
</para>
- </formalpara>
- <orderedlist>
- <listitem>
- <para>
- Edit the file located at <filename><replaceable>JBOSS_HOME</replaceable>/server/<replaceable>PROFILE</replaceable>/deploy/gatein-ds.xml</filename>.
+ <task>
+ <title>Task: Edit Portal Datasource Descriptor</title>
+ <tasksummary>
+ <para>Complete this task to define the database and database user credentials the portal instance will use to communicate with the MySQL database.</para>
+ </tasksummary>
+ <taskprerequisites>
+ <title>Prerequisites</title>
+ <itemizedlist>
+ <listitem>
+ <para>Complete all requirements in <xref linkend="task-Create_a_MySQL_Database"/></para>
+ </listitem>
+ </itemizedlist>
+ </taskprerequisites>
+ <procedure>
+ <title>Edit Datasource Descriptor</title>
+ <step>
+ <para>Edit the file located at <filename><replaceable>JBOSS_HOME</replaceable>/server/<replaceable>PROFILE</replaceable>/deploy/gatein-ds.xml</filename>.
</para>
- </listitem>
- <listitem>
- <para>
- Update the following lines in the Datasource descriptor to reflect the correct database, username and password respectively:
- <itemizedlist>
- <listitem>
- <para>
- <computeroutput><connection-url>jdbc:mysql://mysql-hostname:3306/<replaceable>DATABASE</replaceable></connection-url></computeroutput>;
- <itemizedlist>
- <listitem>
- <para>
- In this example the database name is <literal>gateinjcr</literal> for the first datasource listed in <filename>gatein-ds.xml</filename>.
- </para>
- </listitem>
- <listitem>
- <para>
- The database name for the second datasource is <literal>gateinidm</literal>. See the example <filename>gatein-ds.xml</filename> file provided.
- </para>
- </listitem>
- </itemizedlist>
- </para>
- </listitem>
- <listitem>
- <para>
- <computeroutput><user-name><replaceable>USER-NAME</replaceable></user-name></computeroutput>;
- <itemizedlist>
- <listitem>
- <para>
- The user-name for this example is <literal>gateinuser</literal>.
- </para>
- </listitem>
- </itemizedlist>
- </para>
- </listitem>
- <listitem>
- <para>
- <computeroutput><password><replaceable>PASSWORD</replaceable></password></computeroutput>;
- <itemizedlist>
- <listitem>
- <para>
- This example uses the <literal>gateinpassword</literal> password. Enter this or the password chosen at <xref linkend="form-Portal_EAP-Using_a_MySQL_Database-Creating_a_MySQL_Database"/>.
- </para>
- </listitem>
- </itemizedlist>
- </para>
- </listitem>
- </itemizedlist>
+ </step>
+ <step>
+ <para>Update following lines in the Datasource descriptor to reflect the correct database, username and password respectively.
+
</para>
- </listitem>
- </orderedlist>
- <para><filename>gatein-ds.xml</filename> will then look like:</para>
- <programlisting language="XML"><![CDATA[<datasources>
+ <programlisting language="XML"><![CDATA[<datasources>
<no-tx-datasource>
- <jndi-name>gatein-idm</jndi-name>
- <connection-url>jdbc:mysql://mysql-hostname:3306/gateinidm</connection-url>
+ <jndi-name><replaceable>gatein-idm</replaceable></jndi-name>
+ <connection-url>jdbc:mysql://mysql-hostname:3306/<replaceable>gateinidm</replaceable></connection-url>
<driver-class>com.mysql.jdbc.Driver</driver-class>
- <user-name>gateinuser</user-name>
- <password>gateinpassword</password>
+ <user-name><replaceable>gateinuser</replaceable></user-name>
+ <password><replaceable>gateinpassword</replaceable></password>
<min-pool-size>5</min-pool-size>
<max-pool-size>20</max-pool-size>
@@ -562,24 +538,26 @@
</no-tx-datasource>
<local-tx-datasource>
- <jndi-name>gatein-jcr</jndi-name>
- <connection-url>jdbc:mysql://mysql-hostname:3306/gateinjcr</connection-url>
+ <jndi-name><replaceable>gatein-jcr</replaceable></jndi-name>
+ <connection-url>jdbc:mysql://mysql-hostname:3306/<replaceable>gateinjcr</replaceable></connection-url>
<driver-class>com.mysql.jdbc.Driver</driver-class>
- <user-name>gateinuser</user-name>
- <password>gateinpassword</password>
+ <user-name><replaceable>gateinuser</replaceable></user-name>
+ <password><replaceable>gateinpassword</replaceable></password>
<min-pool-size>5</min-pool-size>
<max-pool-size>20</max-pool-size>
<idle-timeout-minutes>0</idle-timeout-minutes>
<prepared-statement-cache-size>32</prepared-statement-cache-size>
</local-tx-datasource>
-</datasources>]]>
-</programlisting>
- <important>
- <title>Important</title>
- <para>
- Some underlying JBoss Enterprise Application Platform services might still be using Hypersonic which is an in-VM database server loaded in the same memory space. To connect these services to another RDBMS or disable them please refer to the JBoss Enterprise Application Platform documentation, or contact JBoss Support for assistance.
- </para>
- </important>
+</datasources>]]></programlisting>
+ </step>
+ <step>
+ <formalpara>
+ <title>Result</title>
+ <para>You have specified the databases, driver class, and user credentials the portal instance requires to communicate using JDBC. </para>
+ </formalpara>
+ </step>
+ </procedure>
+ </task>
</section>
</section>
Modified: epp/docs/branches/5.2/Installation_Guide/en-US/Revision_History.xml
===================================================================
--- epp/docs/branches/5.2/Installation_Guide/en-US/Revision_History.xml 2012-02-29 02:48:07 UTC (rev 8488)
+++ epp/docs/branches/5.2/Installation_Guide/en-US/Revision_History.xml 2012-02-29 04:39:06 UTC (rev 8489)
@@ -9,6 +9,20 @@
<simpara>
<revhistory>
<revision>
+ <revnumber>5.2.1-7</revnumber>
+ <date>Wed Feb 29 2012</date>
+ <author>
+ <firstname>Jared</firstname>
+ <surname>Morgan</surname>
+ <email/>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Incorporated https://bugzilla.redhat.com/show_bug.cgi?id=794687 by adding a Warning to the SQL database example chapter (and completely reworking the section into task-based format). </member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <revision>
<revnumber>5.2.1-4</revnumber>
<date>Tue Feb 28 2012</date>
<author>
Modified: epp/docs/branches/5.2/Installation_Guide/en-US/Test_Your_Installation.xml
===================================================================
--- epp/docs/branches/5.2/Installation_Guide/en-US/Test_Your_Installation.xml 2012-02-29 02:48:07 UTC (rev 8488)
+++ epp/docs/branches/5.2/Installation_Guide/en-US/Test_Your_Installation.xml 2012-02-29 04:39:06 UTC (rev 8489)
@@ -4,44 +4,44 @@
%BOOK_ENTITIES;
]>
<chapter id="Test_your_Installation">
- <title>Test your Installation</title>
- <para>
- After you have installed the JBoss Enterprise Portal Platform, it is wise to perform a simple start up test to validate that there are no major problems with your Java VM/operating system combination. Make sure you have set the <literal>JBOSS_HOME</literal> environment variables as explained in <xref linkend="Post_Installation_Configuration"/>.
+ <title><remark>BZ#794687 </remark>Test your Installation</title>
+ <para>After you have installed the JBoss Enterprise Portal Platform, it is wise to perform a simple start up test to validate that there are no major problems with your Java VM/operating system combination. Ensure you have set the <literal>JBOSS_HOME</literal> environment variables as explained in <xref linkend="Post_Installation_Configuration"/>.
</para>
- <warning>
- <title>Warning: Sybase Requirements</title>
- <para>Sybase requires a particular configuration of JBoss Enterprise Portal Platform, to switch on that configuration, it is
+ <task>
+ <title>Task: Test Your Installation</title>
+ <tasksummary>
+ <para>Complete this task to verify your server starts, and navigate to the Portal management console.</para>
+ <warning>
+ <title>Warning: Sybase Requirements</title>
+ <para>Sybase requires a particular configuration of JBoss Enterprise Portal Platform, to switch on that configuration, it is
mandatory to run the portal with the extra <literal>sybase</literal> profile. This would
mean to run the application server with <literal>sh run.sh -Dexo.profiles=sybase</literal> in a single node
and <literal>sh run.sh -Dexo.profiles=sybase,cluster</literal> for a cluster node.</para>
- </warning>
- <para>
- To test your installation:
- <itemizedlist>
- <listitem>
- <para>
- move to the <filename><replaceable>JBOSS_HOME</replaceable>/bin</filename> directory;
+ </warning>
+ </tasksummary>
+ <taskprerequisites>
+ <title>Prerequisites</title>
+ <itemizedlist>
+ <listitem>
+ <para>Complete all previous tasks and procedures in this user guide, or assess each task for relevance to your installation.</para>
+ </listitem>
+ </itemizedlist>
+ </taskprerequisites>
+ <procedure>
+ <step>
+ <para>Move to the <filename><replaceable>JBOSS_HOME</replaceable>/bin</filename> directory.
</para>
- </listitem>
- <listitem>
- <para>
- execute the <filename>run.bat</filename> (for Windows) or <filename>run.sh</filename> (for Linux) script, as appropriate for your operating system;
- <itemizedlist>
- <listitem>
- <para>
- Ensure that you run the configuration corresponding to the <filename><replaceable>JBOSS_HOME</replaceable>/server/<replaceable>PROFILE</replaceable>/</filename> chosen in <xref linkend="form-Portal_EAP-Using_a_MySQL_Database-Creating_a_MySQL_Database"/>
- </para>
- </listitem>
- </itemizedlist>
+ </step>
+ <step>
+ <para>Execute the <filename>run.bat</filename> (for Windows) or <filename>run.sh</filename> (for Linux) script, with the name of the server profile you have configured as part of the tasks in this guide.
+
</para>
- </listitem>
- </itemizedlist>
- </para>
- <para>
+ <example>
+ <title>Sample Server Output using Production</title>
+ <para>
The example below uses the production configuration. Your output should look like the following (accounting for installation directory differences and version numbers) and should not contain any error or exception messages:
</para>
- <programlisting>
-[user@localhost bin]$ ./run.sh -c production
+ <programlisting>[user@localhost bin]$ ./run.sh -c production
=========================================================================
JBoss Bootstrap Environment
@@ -70,35 +70,47 @@
...
23:27:32,061 INFO [JMXKernel] Legacy JMX core initialized
</programlisting>
- <note>
- <title>Note: Production server log file</title>
- <para>
+ </example>
+ <note>
+ <title>Note: Production server log file</title>
+ <para>
There is no "Server Started" message shown at the console when the server is started using the <literal>production</literal> profile. This message may be observed in the <filename>server.log</filename> file located in the <filename><replaceable>JBOSS_HOME</replaceable>/server/production/log</filename> subdirectory.
</para>
- </note>
- <para>
- Ensure that port 8080 is not already in use and open <literal>http://localhost:8080/portal</literal> in your web browser.
- <note>
- <para>
- On some machines, the name localhost won’t resolve properly and you should use the local loopback address <uri>127.0.0.1</uri> instead.
+ </note>
+ </step>
+ <step>
+ <para>Open <literal>http://localhost:8080/portal</literal> in your web browser.
+ </para>
+ <para>If you have secured your portal for production use by following <xref linkend="sect-Installation_Guide-HTTPS_Configuration"/>, open <literal>https://localhost:8443/portal</literal><note>
+ <para>On some machines, the name <literal>localhost</literal> will not resolve correctly and you should use the local loopback address 127.0.0.1 instead.
+ </para>
+ </note>
+ </para>
+ </step>
+ <step>
+ <formalpara>
+ <title>Result</title>
+ <para>The contents of your page should look similar to <xref linkend="Test_your_Installation-Test_your_Installation"/>.
</para>
- </note>
- The contents of your page should look similar to this: <xref linkend="Test_your_Installation-Test_your_Installation"/>.
+ </formalpara>
+ <para>
+ You are now ready to use JBoss Enterprise Portal Platform. Refer to the <citetitle>User Guide</citetitle> and <citetitle>Reference Guide</citetitle> for more information about the product's feature set and example applications showcasing JBoss Enterprise Portal Platform in action.
</para>
- <para>
<figure id="Test_your_Installation-Test_your_Installation">
- <title>Test your Installation</title>
- <mediaobject>
- <imageobject role="html">
- <imagedata fileref="images/test_install.png" format="PNG" align="center" scale="100"/>
- </imageobject>
- <imageobject role="fo">
- <imagedata fileref="images/test_install.png" format="PNG" align="center" contentwidth="444px"/>
- </imageobject>
- </mediaobject>
- </figure>
- </para>
+ <title>Test your Installation</title>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata fileref="images/test_install.png" format="PNG" align="center" scale="100"/>
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/test_install.png" format="PNG" align="center" contentwidth="444px"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ </step>
+ </procedure>
+ </task>
<para>
- You are now ready to use JBoss Enterprise Portal Platform. Refer to the User Guide and Reference Guide for more information about the product's feature set and example applications showcasing JBoss Enterprise Portal Platform in action.
+
</para>
</chapter>
Modified: epp/docs/branches/5.2/Installation_Guide/en-US/Uninstall_JBoss.xml
===================================================================
--- epp/docs/branches/5.2/Installation_Guide/en-US/Uninstall_JBoss.xml 2012-02-29 02:48:07 UTC (rev 8488)
+++ epp/docs/branches/5.2/Installation_Guide/en-US/Uninstall_JBoss.xml 2012-02-29 04:39:06 UTC (rev 8489)
@@ -4,8 +4,7 @@
%BOOK_ENTITIES;
]>
<chapter id="Uninstall_JBoss">
- <title>Uninstall JBoss Enterprise Portal Platform</title>
- <para>
- As JBoss Enterprise Portal Platform is installed from a Zip file, you can remove it by deleting the JBoss Enterprise Portal Platform directory installed on your system.
+ <title>Remove the Platform</title>
+ <para>You can remove the platform by deleting the JBoss Enterprise Portal Platform directory installed on your system.
</para>
</chapter>
12 years, 10 months
- 1
- 0