gatein SVN: r4785 - in components/mop/trunk: api and 2 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-10-22 15:06:21 -0400 (Fri, 22 Oct 2010)
New Revision: 4785
Modified:
components/mop/trunk/api/pom.xml
components/mop/trunk/core/pom.xml
components/mop/trunk/pom.xml
components/mop/trunk/spi/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: components/mop/trunk/api/pom.xml
===================================================================
--- components/mop/trunk/api/pom.xml 2010-10-22 19:06:06 UTC (rev 4784)
+++ components/mop/trunk/api/pom.xml 2010-10-22 19:06:21 UTC (rev 4785)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.4-GA</version>
+ <version>1.0.5-GA-SNAPSHOT</version>
</parent>
<!-- ****************** -->
Modified: components/mop/trunk/core/pom.xml
===================================================================
--- components/mop/trunk/core/pom.xml 2010-10-22 19:06:06 UTC (rev 4784)
+++ components/mop/trunk/core/pom.xml 2010-10-22 19:06:21 UTC (rev 4785)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.4-GA</version>
+ <version>1.0.5-GA-SNAPSHOT</version>
</parent>
<!-- ****************** -->
Modified: components/mop/trunk/pom.xml
===================================================================
--- components/mop/trunk/pom.xml 2010-10-22 19:06:06 UTC (rev 4784)
+++ components/mop/trunk/pom.xml 2010-10-22 19:06:21 UTC (rev 4785)
@@ -34,16 +34,16 @@
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.4-GA</version>
+ <version>1.0.5-GA-SNAPSHOT</version>
<packaging>pom</packaging>
<name>GateIn - MOP</name>
<description>Model Object for Portal</description>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/tags/1.0.4-GA</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/tags/1.0.4-GA</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/mop/tags/1.0.4-GA</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/trunk/</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/trunk/</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/mop/trunk/</url>
</scm>
<dependencyManagement>
Modified: components/mop/trunk/spi/pom.xml
===================================================================
--- components/mop/trunk/spi/pom.xml 2010-10-22 19:06:06 UTC (rev 4784)
+++ components/mop/trunk/spi/pom.xml 2010-10-22 19:06:21 UTC (rev 4785)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.4-GA</version>
+ <version>1.0.5-GA-SNAPSHOT</version>
</parent>
<!-- ****************** -->
14 years, 2 months
gatein SVN: r4784 - components/mop/tags.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-10-22 15:06:06 -0400 (Fri, 22 Oct 2010)
New Revision: 4784
Added:
components/mop/tags/1.0.4-GA/
Log:
[maven-scm] copy for tag 1.0.4-GA
Copied: components/mop/tags/1.0.4-GA (from rev 4783, components/mop/trunk)
14 years, 2 months
gatein SVN: r4783 - in components/mop/trunk: api and 2 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-10-22 15:05:42 -0400 (Fri, 22 Oct 2010)
New Revision: 4783
Modified:
components/mop/trunk/api/pom.xml
components/mop/trunk/core/pom.xml
components/mop/trunk/pom.xml
components/mop/trunk/spi/pom.xml
Log:
[maven-release-plugin] prepare release 1.0.4-GA
Modified: components/mop/trunk/api/pom.xml
===================================================================
--- components/mop/trunk/api/pom.xml 2010-10-22 19:04:01 UTC (rev 4782)
+++ components/mop/trunk/api/pom.xml 2010-10-22 19:05:42 UTC (rev 4783)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.4-GA-SNAPSHOT</version>
+ <version>1.0.4-GA</version>
</parent>
<!-- ****************** -->
Modified: components/mop/trunk/core/pom.xml
===================================================================
--- components/mop/trunk/core/pom.xml 2010-10-22 19:04:01 UTC (rev 4782)
+++ components/mop/trunk/core/pom.xml 2010-10-22 19:05:42 UTC (rev 4783)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.4-GA-SNAPSHOT</version>
+ <version>1.0.4-GA</version>
</parent>
<!-- ****************** -->
Modified: components/mop/trunk/pom.xml
===================================================================
--- components/mop/trunk/pom.xml 2010-10-22 19:04:01 UTC (rev 4782)
+++ components/mop/trunk/pom.xml 2010-10-22 19:05:42 UTC (rev 4783)
@@ -34,16 +34,16 @@
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.4-GA-SNAPSHOT</version>
+ <version>1.0.4-GA</version>
<packaging>pom</packaging>
<name>GateIn - MOP</name>
<description>Model Object for Portal</description>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/trunk/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/trunk/</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/mop/trunk/</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/tags/1.0.4-GA</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/tags/1.0.4-GA</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/mop/tags/1.0.4-GA</url>
</scm>
<dependencyManagement>
Modified: components/mop/trunk/spi/pom.xml
===================================================================
--- components/mop/trunk/spi/pom.xml 2010-10-22 19:04:01 UTC (rev 4782)
+++ components/mop/trunk/spi/pom.xml 2010-10-22 19:05:42 UTC (rev 4783)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.4-GA-SNAPSHOT</version>
+ <version>1.0.4-GA</version>
</parent>
<!-- ****************** -->
14 years, 2 months
gatein SVN: r4782 - components/mop/trunk.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-10-22 15:04:01 -0400 (Fri, 22 Oct 2010)
New Revision: 4782
Modified:
components/mop/trunk/pom.xml
Log:
GTNMOP-28 : Dependency update
Modified: components/mop/trunk/pom.xml
===================================================================
--- components/mop/trunk/pom.xml 2010-10-22 17:21:42 UTC (rev 4781)
+++ components/mop/trunk/pom.xml 2010-10-22 19:04:01 UTC (rev 4782)
@@ -127,7 +127,7 @@
<!-- maven-enforcer-plugin -->
<jdk.min.version>1.6</jdk.min.version>
- <org.chromattic.version>1.0.3</org.chromattic.version>
+ <org.chromattic.version>1.0.4</org.chromattic.version>
</properties>
14 years, 2 months
gatein SVN: r4781 - in components/wsrp/trunk: admin-gui and 9 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-10-22 13:21:42 -0400 (Fri, 22 Oct 2010)
New Revision: 4781
Modified:
components/wsrp/trunk/admin-gui/pom.xml
components/wsrp/trunk/api/pom.xml
components/wsrp/trunk/common/pom.xml
components/wsrp/trunk/consumer/pom.xml
components/wsrp/trunk/hibernate-impl/pom.xml
components/wsrp/trunk/pom.xml
components/wsrp/trunk/producer/pom.xml
components/wsrp/trunk/test/pom.xml
components/wsrp/trunk/wsrp-producer-war/pom.xml
components/wsrp/trunk/wsrp1-ws/pom.xml
components/wsrp/trunk/wsrp2-ws/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: components/wsrp/trunk/admin-gui/pom.xml
===================================================================
--- components/wsrp/trunk/admin-gui/pom.xml 2010-10-22 17:21:21 UTC (rev 4780)
+++ components/wsrp/trunk/admin-gui/pom.xml 2010-10-22 17:21:42 UTC (rev 4781)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta04</version>
+ <version>2.0.0-CR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-admin-gui</artifactId>
Modified: components/wsrp/trunk/api/pom.xml
===================================================================
--- components/wsrp/trunk/api/pom.xml 2010-10-22 17:21:21 UTC (rev 4780)
+++ components/wsrp/trunk/api/pom.xml 2010-10-22 17:21:42 UTC (rev 4781)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta04</version>
+ <version>2.0.0-CR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-integration-api</artifactId>
Modified: components/wsrp/trunk/common/pom.xml
===================================================================
--- components/wsrp/trunk/common/pom.xml 2010-10-22 17:21:21 UTC (rev 4780)
+++ components/wsrp/trunk/common/pom.xml 2010-10-22 17:21:42 UTC (rev 4781)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta04</version>
+ <version>2.0.0-CR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-common</artifactId>
Modified: components/wsrp/trunk/consumer/pom.xml
===================================================================
--- components/wsrp/trunk/consumer/pom.xml 2010-10-22 17:21:21 UTC (rev 4780)
+++ components/wsrp/trunk/consumer/pom.xml 2010-10-22 17:21:42 UTC (rev 4781)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta04</version>
+ <version>2.0.0-CR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-consumer</artifactId>
Modified: components/wsrp/trunk/hibernate-impl/pom.xml
===================================================================
--- components/wsrp/trunk/hibernate-impl/pom.xml 2010-10-22 17:21:21 UTC (rev 4780)
+++ components/wsrp/trunk/hibernate-impl/pom.xml 2010-10-22 17:21:42 UTC (rev 4781)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta04</version>
+ <version>2.0.0-CR01-SNAPSHOT</version>
</parent>
<groupId>org.gatein.wsrp</groupId>
Modified: components/wsrp/trunk/pom.xml
===================================================================
--- components/wsrp/trunk/pom.xml 2010-10-22 17:21:21 UTC (rev 4780)
+++ components/wsrp/trunk/pom.xml 2010-10-22 17:21:42 UTC (rev 4781)
@@ -29,7 +29,7 @@
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta04</version>
+ <version>2.0.0-CR01-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -40,9 +40,9 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/tags/2.0.0-...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/tags/2.0.0-Beta04</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/tags/2.0.0-Beta04</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/trunk/</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/trunk/</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/trunk/</url>
</scm>
<properties>
Modified: components/wsrp/trunk/producer/pom.xml
===================================================================
--- components/wsrp/trunk/producer/pom.xml 2010-10-22 17:21:21 UTC (rev 4780)
+++ components/wsrp/trunk/producer/pom.xml 2010-10-22 17:21:42 UTC (rev 4781)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta04</version>
+ <version>2.0.0-CR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-producer-lib</artifactId>
Modified: components/wsrp/trunk/test/pom.xml
===================================================================
--- components/wsrp/trunk/test/pom.xml 2010-10-22 17:21:21 UTC (rev 4780)
+++ components/wsrp/trunk/test/pom.xml 2010-10-22 17:21:42 UTC (rev 4781)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta04</version>
+ <version>2.0.0-CR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-10-22 17:21:21 UTC (rev 4780)
+++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-10-22 17:21:42 UTC (rev 4781)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta04</version>
+ <version>2.0.0-CR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/wsrp1-ws/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp1-ws/pom.xml 2010-10-22 17:21:21 UTC (rev 4780)
+++ components/wsrp/trunk/wsrp1-ws/pom.xml 2010-10-22 17:21:42 UTC (rev 4781)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta04</version>
+ <version>2.0.0-CR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp1-ws</artifactId>
Modified: components/wsrp/trunk/wsrp2-ws/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp2-ws/pom.xml 2010-10-22 17:21:21 UTC (rev 4780)
+++ components/wsrp/trunk/wsrp2-ws/pom.xml 2010-10-22 17:21:42 UTC (rev 4781)
@@ -26,7 +26,7 @@
<parent>
<artifactId>wsrp-parent</artifactId>
<groupId>org.gatein.wsrp</groupId>
- <version>2.0.0-Beta04</version>
+ <version>2.0.0-CR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp2-ws</artifactId>
14 years, 2 months
gatein SVN: r4780 - components/wsrp/tags.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-10-22 13:21:21 -0400 (Fri, 22 Oct 2010)
New Revision: 4780
Added:
components/wsrp/tags/2.0.0-Beta04/
Log:
[maven-scm] copy for tag 2.0.0-Beta04
Copied: components/wsrp/tags/2.0.0-Beta04 (from rev 4779, components/wsrp/trunk)
14 years, 2 months
gatein SVN: r4779 - in components/wsrp/trunk: admin-gui and 9 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-10-22 13:21:01 -0400 (Fri, 22 Oct 2010)
New Revision: 4779
Modified:
components/wsrp/trunk/admin-gui/pom.xml
components/wsrp/trunk/api/pom.xml
components/wsrp/trunk/common/pom.xml
components/wsrp/trunk/consumer/pom.xml
components/wsrp/trunk/hibernate-impl/pom.xml
components/wsrp/trunk/pom.xml
components/wsrp/trunk/producer/pom.xml
components/wsrp/trunk/test/pom.xml
components/wsrp/trunk/wsrp-producer-war/pom.xml
components/wsrp/trunk/wsrp1-ws/pom.xml
components/wsrp/trunk/wsrp2-ws/pom.xml
Log:
[maven-release-plugin] prepare release 2.0.0-Beta04
Modified: components/wsrp/trunk/admin-gui/pom.xml
===================================================================
--- components/wsrp/trunk/admin-gui/pom.xml 2010-10-22 17:15:30 UTC (rev 4778)
+++ components/wsrp/trunk/admin-gui/pom.xml 2010-10-22 17:21:01 UTC (rev 4779)
@@ -21,12 +21,11 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta04-SNAPSHOT</version>
+ <version>2.0.0-Beta04</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-admin-gui</artifactId>
Modified: components/wsrp/trunk/api/pom.xml
===================================================================
--- components/wsrp/trunk/api/pom.xml 2010-10-22 17:15:30 UTC (rev 4778)
+++ components/wsrp/trunk/api/pom.xml 2010-10-22 17:21:01 UTC (rev 4779)
@@ -21,12 +21,11 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta04-SNAPSHOT</version>
+ <version>2.0.0-Beta04</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-integration-api</artifactId>
Modified: components/wsrp/trunk/common/pom.xml
===================================================================
--- components/wsrp/trunk/common/pom.xml 2010-10-22 17:15:30 UTC (rev 4778)
+++ components/wsrp/trunk/common/pom.xml 2010-10-22 17:21:01 UTC (rev 4779)
@@ -20,12 +20,11 @@
~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta04-SNAPSHOT</version>
+ <version>2.0.0-Beta04</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-common</artifactId>
Modified: components/wsrp/trunk/consumer/pom.xml
===================================================================
--- components/wsrp/trunk/consumer/pom.xml 2010-10-22 17:15:30 UTC (rev 4778)
+++ components/wsrp/trunk/consumer/pom.xml 2010-10-22 17:21:01 UTC (rev 4779)
@@ -21,12 +21,11 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta04-SNAPSHOT</version>
+ <version>2.0.0-Beta04</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-consumer</artifactId>
Modified: components/wsrp/trunk/hibernate-impl/pom.xml
===================================================================
--- components/wsrp/trunk/hibernate-impl/pom.xml 2010-10-22 17:15:30 UTC (rev 4778)
+++ components/wsrp/trunk/hibernate-impl/pom.xml 2010-10-22 17:21:01 UTC (rev 4779)
@@ -22,14 +22,13 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta04-SNAPSHOT</version>
+ <version>2.0.0-Beta04</version>
</parent>
<groupId>org.gatein.wsrp</groupId>
Modified: components/wsrp/trunk/pom.xml
===================================================================
--- components/wsrp/trunk/pom.xml 2010-10-22 17:15:30 UTC (rev 4778)
+++ components/wsrp/trunk/pom.xml 2010-10-22 17:21:01 UTC (rev 4779)
@@ -21,8 +21,7 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -30,7 +29,7 @@
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta04-SNAPSHOT</version>
+ <version>2.0.0-Beta04</version>
<packaging>pom</packaging>
@@ -41,9 +40,9 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/trunk/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/trunk/</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/trunk/</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/tags/2.0.0-...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/tags/2.0.0-Beta04</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/tags/2.0.0-Beta04</url>
</scm>
<properties>
Modified: components/wsrp/trunk/producer/pom.xml
===================================================================
--- components/wsrp/trunk/producer/pom.xml 2010-10-22 17:15:30 UTC (rev 4778)
+++ components/wsrp/trunk/producer/pom.xml 2010-10-22 17:21:01 UTC (rev 4779)
@@ -21,12 +21,11 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta04-SNAPSHOT</version>
+ <version>2.0.0-Beta04</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-producer-lib</artifactId>
Modified: components/wsrp/trunk/test/pom.xml
===================================================================
--- components/wsrp/trunk/test/pom.xml 2010-10-22 17:15:30 UTC (rev 4778)
+++ components/wsrp/trunk/test/pom.xml 2010-10-22 17:21:01 UTC (rev 4779)
@@ -22,12 +22,11 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta04-SNAPSHOT</version>
+ <version>2.0.0-Beta04</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-10-22 17:15:30 UTC (rev 4778)
+++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-10-22 17:21:01 UTC (rev 4779)
@@ -22,12 +22,11 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta04-SNAPSHOT</version>
+ <version>2.0.0-Beta04</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/wsrp1-ws/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp1-ws/pom.xml 2010-10-22 17:15:30 UTC (rev 4778)
+++ components/wsrp/trunk/wsrp1-ws/pom.xml 2010-10-22 17:21:01 UTC (rev 4779)
@@ -21,12 +21,11 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta04-SNAPSHOT</version>
+ <version>2.0.0-Beta04</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp1-ws</artifactId>
Modified: components/wsrp/trunk/wsrp2-ws/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp2-ws/pom.xml 2010-10-22 17:15:30 UTC (rev 4778)
+++ components/wsrp/trunk/wsrp2-ws/pom.xml 2010-10-22 17:21:01 UTC (rev 4779)
@@ -22,12 +22,11 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>wsrp-parent</artifactId>
<groupId>org.gatein.wsrp</groupId>
- <version>2.0.0-Beta04-SNAPSHOT</version>
+ <version>2.0.0-Beta04</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp2-ws</artifactId>
14 years, 2 months
gatein SVN: r4778 - components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-10-22 13:15:30 -0400 (Fri, 22 Oct 2010)
New Revision: 4778
Removed:
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/ServiceWrapper.java
Modified:
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/SOAPServiceFactory.java
Log:
- Removed now unneeded ServiceWrapper class as the ports were actually not wrapped anymore.
- Moved setTimeout and getServiceWrapper (which has been more appropriately renamed to customizePort) methods and related constants to SOAPServiceFactory.
- Made logger static (no need to create one per instance).
Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/SOAPServiceFactory.java
===================================================================
--- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/SOAPServiceFactory.java 2010-10-22 17:07:13 UTC (rev 4777)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/SOAPServiceFactory.java 2010-10-22 17:15:30 UTC (rev 4778)
@@ -25,6 +25,7 @@
import org.gatein.common.util.ParameterValidation;
import org.gatein.common.util.Version;
+import org.gatein.wsrp.handler.RequestHeaderClientHandler;
import org.gatein.wsrp.services.v1.V1MarkupService;
import org.gatein.wsrp.services.v1.V1PortletManagementService;
import org.gatein.wsrp.services.v1.V1RegistrationService;
@@ -50,11 +51,15 @@
import javax.wsdl.factory.WSDLFactory;
import javax.wsdl.xml.WSDLReader;
import javax.xml.namespace.QName;
+import javax.xml.ws.Binding;
import javax.xml.ws.BindingProvider;
import javax.xml.ws.Service;
+import javax.xml.ws.handler.Handler;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Map;
/**
@@ -63,8 +68,19 @@
*/
public class SOAPServiceFactory implements ManageableServiceFactory
{
- private final Logger log = LoggerFactory.getLogger(getClass());
+ /**
+ * HTTP request timeout property. JAX-WS doesn't standardize that value, so needs to be adapted per used
+ * implementation
+ */
+ static final String JBOSS_WS_TIMEOUT = "org.jboss.ws.timeout";
+ static final String SUN_WS_TIMEOUT = "com.sun.xml.ws.request.timeout";
+ static final String IBM_WS_TIMEOUT = "com.ibm.SOAP.requestTimeout";
+ static final RequestHeaderClientHandler REQUEST_HEADER_CLIENT_HANDLER = new RequestHeaderClientHandler();
+ static final String JBOSS_WS_STUBEXT_PROPERTY_CHUNKED_ENCODING_SIZE = "http://org.jboss.ws/http#chunksize";
+
+ private static final Logger log = LoggerFactory.getLogger(SOAPServiceFactory.class);
+
private String wsdlDefinitionURL;
private boolean isV2 = false;
@@ -83,6 +99,53 @@
private boolean available;
private int msBeforeTimeOut = DEFAULT_TIMEOUT_MS;
+ private void setTimeout(Map<String, Object> requestContext)
+ {
+ int timeout = getWSOperationTimeOut();
+ requestContext.put(JBOSS_WS_TIMEOUT, timeout);
+ requestContext.put(SUN_WS_TIMEOUT, timeout);
+ requestContext.put(IBM_WS_TIMEOUT, timeout);
+ }
+
+ private <T> T customizePort(Class<T> expectedServiceInterface, Object service, String portAddress)
+ {
+ BindingProvider bindingProvider = (BindingProvider)service;
+ Map<String, Object> requestContext = bindingProvider.getRequestContext();
+
+ // set timeout
+ setTimeout(requestContext);
+
+ // set port address
+ requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, portAddress);
+
+ // Set org.jboss.ws.core.StubExt.PROPERTY_CHUNKED_ENCODING_SIZE to 0 to deactive chunked encoding for
+ // better interoperability as Oracle's producer doesn't support it, for example.
+ // See https://jira.jboss.org/jira/browse/JBWS-2884 and
+ // http://community.jboss.org/wiki/JBossWS-NativeUserGuide#Chunked_encoding_...
+ requestContext.put(JBOSS_WS_STUBEXT_PROPERTY_CHUNKED_ENCODING_SIZE, "0");
+
+ // Add client side handler via JAX-WS API
+ Binding binding = bindingProvider.getBinding();
+ List<Handler> handlerChain = binding.getHandlerChain();
+ if (handlerChain != null)
+ {
+ // if we already have a handler chain, just add the request hearder handler if it's not already in there
+ if (!handlerChain.contains(REQUEST_HEADER_CLIENT_HANDLER))
+ {
+ handlerChain.add(REQUEST_HEADER_CLIENT_HANDLER);
+ }
+ }
+ else
+ {
+ // otherwise, create a handler chain and add our handler to it
+ handlerChain = new ArrayList<Handler>(1);
+ handlerChain.add(REQUEST_HEADER_CLIENT_HANDLER);
+ }
+ binding.setHandlerChain(handlerChain);
+
+ return expectedServiceInterface.cast(service);
+ }
+
public <T> T getService(Class<T> clazz) throws Exception
{
// todo: clean up!
@@ -137,7 +200,7 @@
log.debug("Setting the end point to: " + portAddress);
}
- T result = ServiceWrapper.getServiceWrapper(clazz, service, portAddress, this);
+ T result = customizePort(clazz, service, portAddress);
// if we managed to retrieve a service, we're probably available
setFailed(false);
Deleted: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/ServiceWrapper.java
===================================================================
--- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/ServiceWrapper.java 2010-10-22 17:07:13 UTC (rev 4777)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/ServiceWrapper.java 2010-10-22 17:15:30 UTC (rev 4778)
@@ -1,147 +0,0 @@
-/*
- * JBoss, a division of Red Hat
- * Copyright 2010, Red Hat Middleware, LLC, and individual
- * contributors as indicated by the @authors tag. See the
- * copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.gatein.wsrp.services;
-
-import org.gatein.wsrp.handler.RequestHeaderClientHandler;
-
-import javax.xml.ws.Binding;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.handler.Handler;
-import javax.xml.ws.soap.SOAPFaultException;
-import java.lang.reflect.ParameterizedType;
-import java.rmi.RemoteException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Wraps endpoints to be able to intercept RemoteExceptions on WSRP calls and fail the associated service factory if the
- * error is not a business exception.
- *
- * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
- * @version $Revision$
- */
-public class ServiceWrapper<T>
-{
- protected T service;
- protected ManageableServiceFactory parentFactory;
-
- /**
- * HTTP request timeout property. JAX-WS doesn't standardize that value, so needs to be adapted per used
- * implementation
- */
- private static final String JBOSS_WS_TIMEOUT = "org.jboss.ws.timeout";
- private static final String SUN_WS_TIMEOUT = "com.sun.xml.ws.request.timeout";
- private static final String IBM_WS_TIMEOUT = "com.ibm.SOAP.requestTimeout";
-
- private static final RequestHeaderClientHandler REQUEST_HEADER_CLIENT_HANDLER = new RequestHeaderClientHandler();
- private static final String JBOSS_WS_STUBEXT_PROPERTY_CHUNKED_ENCODING_SIZE = "http://org.jboss.ws/http#chunksize";
-
- protected ServiceWrapper(Object service, ManageableServiceFactory parentFactory)
- {
- if (service == null)
- {
- throw new IllegalArgumentException("Cannot create a ServiceWrapper without a valid service!");
- }
-
- Class serviceClass = service.getClass();
-
- // set timeout properties for different WS stacks
- BindingProvider bindingProvider = (BindingProvider)service;
- setTimeout(bindingProvider.getRequestContext(), parentFactory);
-
-
- checkAssigmentValidity(this, serviceClass);
- this.service = (T)service;
- this.parentFactory = parentFactory;
- }
-
- public static void checkAssigmentValidity(ServiceWrapper assignee, Class expectedImplementedInterface)
- {
- Class tClass = (Class)((ParameterizedType)assignee.getClass().getGenericSuperclass()).getActualTypeArguments()[0];
- if (!tClass.isAssignableFrom(expectedImplementedInterface))
- {
- throw new IllegalArgumentException(assignee + " is not an instance of " + tClass.getSimpleName());
- }
- }
-
- private static void setTimeout(Map<String, Object> requestContext, ManageableServiceFactory parentFactory)
- {
- int timeout = parentFactory.getWSOperationTimeOut();
- requestContext.put(JBOSS_WS_TIMEOUT, timeout);
- requestContext.put(SUN_WS_TIMEOUT, timeout);
- requestContext.put(IBM_WS_TIMEOUT, timeout);
- }
-
- public static <T> T getServiceWrapper(Class<T> expectedServiceInterface, Object service, String portAddress, ManageableServiceFactory parentFactory)
- {
- BindingProvider bindingProvider = (BindingProvider)service;
- Map<String, Object> requestContext = bindingProvider.getRequestContext();
-
- // set timeout
- setTimeout(requestContext, parentFactory);
-
- // set port address
- requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, portAddress);
-
- // Set org.jboss.ws.core.StubExt.PROPERTY_CHUNKED_ENCODING_SIZE to 0 to deactive chunked encoding for
- // better interoperability as Oracle's producer doesn't support it, for example.
- // See https://jira.jboss.org/jira/browse/JBWS-2884 and
- // http://community.jboss.org/wiki/JBossWS-NativeUserGuide#Chunked_encoding_...
- requestContext.put(JBOSS_WS_STUBEXT_PROPERTY_CHUNKED_ENCODING_SIZE, "0");
-
- // Add client side handler via JAX-WS API
- Binding binding = bindingProvider.getBinding();
- List<Handler> handlerChain = binding.getHandlerChain();
- if (handlerChain != null)
- {
- // if we already have a handler chain, just add the request hearder handler if it's not already in there
- if (!handlerChain.contains(REQUEST_HEADER_CLIENT_HANDLER))
- {
- handlerChain.add(REQUEST_HEADER_CLIENT_HANDLER);
- }
- }
- else
- {
- // otherwise, create a handler chain and add our handler to it
- handlerChain = new ArrayList<Handler>(1);
- handlerChain.add(REQUEST_HEADER_CLIENT_HANDLER);
- }
- binding.setHandlerChain(handlerChain);
-
- return expectedServiceInterface.cast(service);
- }
-
- protected void handleRemoteException(RemoteException e) throws RemoteException
- {
- // if the remote exception happens to be a SOAPFaultException, this is a business exception, do NOT fail the factory in this case
- // todo: not sure if this is still needed, will need testing
- if (!(e.getCause() instanceof SOAPFaultException))
- {
- parentFactory.setAvailable(false);
- }
-
- throw e;
- }
-}
14 years, 2 months
gatein SVN: r4777 - in components/wsrp/trunk: admin-gui and 9 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-10-22 13:07:13 -0400 (Fri, 22 Oct 2010)
New Revision: 4777
Modified:
components/wsrp/trunk/admin-gui/pom.xml
components/wsrp/trunk/api/pom.xml
components/wsrp/trunk/common/pom.xml
components/wsrp/trunk/consumer/pom.xml
components/wsrp/trunk/hibernate-impl/pom.xml
components/wsrp/trunk/pom.xml
components/wsrp/trunk/producer/pom.xml
components/wsrp/trunk/test/pom.xml
components/wsrp/trunk/wsrp-producer-war/pom.xml
components/wsrp/trunk/wsrp1-ws/pom.xml
components/wsrp/trunk/wsrp2-ws/pom.xml
Log:
- Moved version to 2.0.0-Beta04 instead of CR01 since some issues still remain with PBR and RF over WSRP. :(
- Upgraded to use PC 2.2.0-CR01.
- Minor clean-ups and notes to investigate parallel "computer" to run tests in parallel. See: http://github.com/krosenvold/configurable-parallel-computer
Modified: components/wsrp/trunk/admin-gui/pom.xml
===================================================================
--- components/wsrp/trunk/admin-gui/pom.xml 2010-10-22 16:32:16 UTC (rev 4776)
+++ components/wsrp/trunk/admin-gui/pom.xml 2010-10-22 17:07:13 UTC (rev 4777)
@@ -21,11 +21,12 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-CR01-SNAPSHOT</version>
+ <version>2.0.0-Beta04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-admin-gui</artifactId>
Modified: components/wsrp/trunk/api/pom.xml
===================================================================
--- components/wsrp/trunk/api/pom.xml 2010-10-22 16:32:16 UTC (rev 4776)
+++ components/wsrp/trunk/api/pom.xml 2010-10-22 17:07:13 UTC (rev 4777)
@@ -21,11 +21,12 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-CR01-SNAPSHOT</version>
+ <version>2.0.0-Beta04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-integration-api</artifactId>
Modified: components/wsrp/trunk/common/pom.xml
===================================================================
--- components/wsrp/trunk/common/pom.xml 2010-10-22 16:32:16 UTC (rev 4776)
+++ components/wsrp/trunk/common/pom.xml 2010-10-22 17:07:13 UTC (rev 4777)
@@ -20,11 +20,12 @@
~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-CR01-SNAPSHOT</version>
+ <version>2.0.0-Beta04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-common</artifactId>
@@ -101,6 +102,14 @@
<useDefaultDelimiters>false</useDefaultDelimiters>
</configuration>
</plugin>
+ <!--<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <parallel>classes</parallel>
+ <threadCount>2</threadCount>
+ </configuration>
+ </plugin>-->
</plugins>
</build>
</project>
Modified: components/wsrp/trunk/consumer/pom.xml
===================================================================
--- components/wsrp/trunk/consumer/pom.xml 2010-10-22 16:32:16 UTC (rev 4776)
+++ components/wsrp/trunk/consumer/pom.xml 2010-10-22 17:07:13 UTC (rev 4777)
@@ -21,11 +21,12 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-CR01-SNAPSHOT</version>
+ <version>2.0.0-Beta04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-consumer</artifactId>
@@ -102,7 +103,7 @@
</dependency>
</dependencies>
- <!-- Ignore all classes in the org.gatein.wsrp.test packages are they are not tests -->
+ <!-- Ignore all classes in the org.gatein.wsrp.test packages as they are not tests -->
<build>
<plugins>
<plugin>
@@ -112,6 +113,8 @@
<excludes>
<exclude>org/gatein/wsrp/test/**</exclude>
</excludes>
+ <!--<parallel>classes</parallel>
+ <threadCount>2</threadCount>-->
</configuration>
</plugin>
<plugin>
Modified: components/wsrp/trunk/hibernate-impl/pom.xml
===================================================================
--- components/wsrp/trunk/hibernate-impl/pom.xml 2010-10-22 16:32:16 UTC (rev 4776)
+++ components/wsrp/trunk/hibernate-impl/pom.xml 2010-10-22 17:07:13 UTC (rev 4777)
@@ -22,13 +22,14 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-CR01-SNAPSHOT</version>
+ <version>2.0.0-Beta04-SNAPSHOT</version>
</parent>
<groupId>org.gatein.wsrp</groupId>
Modified: components/wsrp/trunk/pom.xml
===================================================================
--- components/wsrp/trunk/pom.xml 2010-10-22 16:32:16 UTC (rev 4776)
+++ components/wsrp/trunk/pom.xml 2010-10-22 17:07:13 UTC (rev 4777)
@@ -21,7 +21,8 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -29,7 +30,7 @@
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-CR01-SNAPSHOT</version>
+ <version>2.0.0-Beta04-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -46,7 +47,7 @@
</scm>
<properties>
- <version.gatein.pc>2.2.0-Beta06</version.gatein.pc>
+ <version.gatein.pc>2.2.0-CR01</version.gatein.pc>
<version.gatein.common>2.0.3-GA</version.gatein.common>
<version.gatein.wci>2.0.2-GA</version.gatein.wci>
@@ -159,6 +160,15 @@
<artifactId>google-collections</artifactId>
<version>${version.google-collections}</version>
</dependency>
+
+ <!--
+ TODO: Need to investigate this plugin to speed up tests
+ <dependency>
+ <groupId>org.jdogma.junit</groupId>
+ <artifactId>configurable-parallel-computer</artifactId>
+ <version>1.5</version>
+ <scope>test</scope>
+ </dependency>-->
</dependencies>
</dependencyManagement>
Modified: components/wsrp/trunk/producer/pom.xml
===================================================================
--- components/wsrp/trunk/producer/pom.xml 2010-10-22 16:32:16 UTC (rev 4776)
+++ components/wsrp/trunk/producer/pom.xml 2010-10-22 17:07:13 UTC (rev 4777)
@@ -21,11 +21,12 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-CR01-SNAPSHOT</version>
+ <version>2.0.0-Beta04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-producer-lib</artifactId>
@@ -94,16 +95,14 @@
</dependency>
</dependencies>
- <!-- Disable some tests for now until we can find some time to work on migrating them -->
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <excludes>
- <exclude>org/gatein/wsrp/protocol/v1/*</exclude>
- </excludes>
+ <!--<parallel>classes</parallel>
+ <threadCount>2</threadCount>-->
</configuration>
</plugin>
</plugins>
Modified: components/wsrp/trunk/test/pom.xml
===================================================================
--- components/wsrp/trunk/test/pom.xml 2010-10-22 16:32:16 UTC (rev 4776)
+++ components/wsrp/trunk/test/pom.xml 2010-10-22 17:07:13 UTC (rev 4777)
@@ -22,11 +22,12 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-CR01-SNAPSHOT</version>
+ <version>2.0.0-Beta04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-10-22 16:32:16 UTC (rev 4776)
+++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-10-22 17:07:13 UTC (rev 4777)
@@ -22,11 +22,12 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-CR01-SNAPSHOT</version>
+ <version>2.0.0-Beta04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -412,6 +413,8 @@
<excludes>
<exclude>org/gatein/wsrp/protocol/v1/*</exclude>
</excludes>
+ <!--<parallel>classes</parallel>
+ <threadCount>2</threadCount>-->
</configuration>
<executions>
<execution>
Modified: components/wsrp/trunk/wsrp1-ws/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp1-ws/pom.xml 2010-10-22 16:32:16 UTC (rev 4776)
+++ components/wsrp/trunk/wsrp1-ws/pom.xml 2010-10-22 17:07:13 UTC (rev 4777)
@@ -21,11 +21,12 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-CR01-SNAPSHOT</version>
+ <version>2.0.0-Beta04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp1-ws</artifactId>
Modified: components/wsrp/trunk/wsrp2-ws/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp2-ws/pom.xml 2010-10-22 16:32:16 UTC (rev 4776)
+++ components/wsrp/trunk/wsrp2-ws/pom.xml 2010-10-22 17:07:13 UTC (rev 4777)
@@ -22,11 +22,12 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>wsrp-parent</artifactId>
<groupId>org.gatein.wsrp</groupId>
- <version>2.0.0-CR01-SNAPSHOT</version>
+ <version>2.0.0-Beta04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp2-ws</artifactId>
14 years, 2 months
gatein SVN: r4776 - components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-10-22 12:32:16 -0400 (Fri, 22 Oct 2010)
New Revision: 4776
Modified:
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/SOAPServiceFactory.java
Log:
- GTNWSRP-107: Port handling was not thread-safe.
Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/SOAPServiceFactory.java
===================================================================
--- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/SOAPServiceFactory.java 2010-10-22 16:32:04 UTC (rev 4775)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/SOAPServiceFactory.java 2010-10-22 16:32:16 UTC (rev 4776)
@@ -56,7 +56,6 @@
import java.net.URI;
import java.net.URL;
import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
/**
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
@@ -69,13 +68,13 @@
private String wsdlDefinitionURL;
private boolean isV2 = false;
+ private Service wsService;
private static final String WSRP_V1_URN = "urn:oasis:names:tc:wsrp:v1:wsdl";
private static final String WSRP_V1_BINDING = "urn:oasis:names:tc:wsrp:v1:bind";
private static final String WSRP_V2_URN = "urn:oasis:names:tc:wsrp:v2:wsdl";
private static final String WSRP_V2_BINDING = "urn:oasis:names:tc:wsrp:v2:bind";
- private Map<Class, Object> services = new ConcurrentHashMap<Class, Object>();
private String markupURL;
private String serviceDescriptionURL;
private String portletManagementURL;
@@ -99,7 +98,7 @@
start();
}
- Object service = services.get(clazz);
+ Object service = wsService.getPort(clazz);
//
String portAddress = null;
@@ -233,25 +232,20 @@
// try to get v2 of service if possible, first
QName wsrp2 = wsdlInfo.getWSRP2ServiceQName();
QName wsrp1 = wsdlInfo.getWSRP1ServiceQName();
- Service service;
if (wsrp2 != null)
{
- service = Service.create(wsdlURL, wsrp2);
+ wsService = Service.create(wsdlURL, wsrp2);
- WSRPV2MarkupPortType markupPortType = service.getPort(WSRPV2MarkupPortType.class);
- services.put(WSRPV2MarkupPortType.class, markupPortType);
+ WSRPV2MarkupPortType markupPortType = wsService.getPort(WSRPV2MarkupPortType.class);
markupURL = (String)((BindingProvider)markupPortType).getRequestContext().get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY);
- WSRPV2ServiceDescriptionPortType sdPort = service.getPort(WSRPV2ServiceDescriptionPortType.class);
- services.put(WSRPV2ServiceDescriptionPortType.class, sdPort);
+ WSRPV2ServiceDescriptionPortType sdPort = wsService.getPort(WSRPV2ServiceDescriptionPortType.class);
serviceDescriptionURL = (String)((BindingProvider)sdPort).getRequestContext().get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY);
- WSRPV2PortletManagementPortType managementPortType = service.getPort(WSRPV2PortletManagementPortType.class);
- services.put(WSRPV2PortletManagementPortType.class, managementPortType);
+ WSRPV2PortletManagementPortType managementPortType = wsService.getPort(WSRPV2PortletManagementPortType.class);
portletManagementURL = (String)((BindingProvider)managementPortType).getRequestContext().get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY);
- WSRPV2RegistrationPortType registrationPortType = service.getPort(WSRPV2RegistrationPortType.class);
- services.put(WSRPV2RegistrationPortType.class, registrationPortType);
+ WSRPV2RegistrationPortType registrationPortType = wsService.getPort(WSRPV2RegistrationPortType.class);
registrationURL = (String)((BindingProvider)registrationPortType).getRequestContext().get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY);
setFailed(false);
@@ -260,22 +254,18 @@
}
else if (wsrp1 != null)
{
- service = Service.create(wsdlURL, wsrp1);
+ wsService = Service.create(wsdlURL, wsrp1);
- WSRPV1MarkupPortType markupPortType = service.getPort(WSRPV1MarkupPortType.class);
- services.put(WSRPV1MarkupPortType.class, markupPortType);
+ WSRPV1MarkupPortType markupPortType = wsService.getPort(WSRPV1MarkupPortType.class);
markupURL = (String)((BindingProvider)markupPortType).getRequestContext().get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY);
- WSRPV1ServiceDescriptionPortType sdPort = service.getPort(WSRPV1ServiceDescriptionPortType.class);
- services.put(WSRPV1ServiceDescriptionPortType.class, sdPort);
+ WSRPV1ServiceDescriptionPortType sdPort = wsService.getPort(WSRPV1ServiceDescriptionPortType.class);
serviceDescriptionURL = (String)((BindingProvider)sdPort).getRequestContext().get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY);
- WSRPV1PortletManagementPortType managementPortType = service.getPort(WSRPV1PortletManagementPortType.class);
- services.put(WSRPV1PortletManagementPortType.class, managementPortType);
+ WSRPV1PortletManagementPortType managementPortType = wsService.getPort(WSRPV1PortletManagementPortType.class);
portletManagementURL = (String)((BindingProvider)managementPortType).getRequestContext().get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY);
- WSRPV1RegistrationPortType registrationPortType = service.getPort(WSRPV1RegistrationPortType.class);
- services.put(WSRPV1RegistrationPortType.class, registrationPortType);
+ WSRPV1RegistrationPortType registrationPortType = wsService.getPort(WSRPV1RegistrationPortType.class);
registrationURL = (String)((BindingProvider)registrationPortType).getRequestContext().get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY);
setFailed(false);
14 years, 2 months