gatein SVN: r8387 - components/wsrp/tags.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2012-02-03 08:32:02 -0500 (Fri, 03 Feb 2012)
New Revision: 8387
Removed:
components/wsrp/tags/2.1.1-CR01/
Log:
- Deleting improper tag.
12 years, 4 months
- 1
- 0
gatein SVN: r8386 - 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-03 07:31:12 -0500 (Fri, 03 Feb 2012)
New Revision: 8386
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 for next development iteration
Modified: components/wsrp/branches/2.1.x/admin-gui/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/admin-gui/pom.xml 2012-02-03 12:30:51 UTC (rev 8385)
+++ components/wsrp/branches/2.1.x/admin-gui/pom.xml 2012-02-03 12:31:12 UTC (rev 8386)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-CR01</version>
+ <version>2.1.1-GA-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-03 12:30:51 UTC (rev 8385)
+++ components/wsrp/branches/2.1.x/api/pom.xml 2012-02-03 12:31:12 UTC (rev 8386)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-CR01</version>
+ <version>2.1.1-GA-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-03 12:30:51 UTC (rev 8385)
+++ components/wsrp/branches/2.1.x/common/pom.xml 2012-02-03 12:31:12 UTC (rev 8386)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-CR01</version>
+ <version>2.1.1-GA-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-03 12:30:51 UTC (rev 8385)
+++ components/wsrp/branches/2.1.x/consumer/pom.xml 2012-02-03 12:31:12 UTC (rev 8386)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-CR01</version>
+ <version>2.1.1-GA-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-03 12:30:51 UTC (rev 8385)
+++ components/wsrp/branches/2.1.x/hibernate-impl/pom.xml 2012-02-03 12:31:12 UTC (rev 8386)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-CR01</version>
+ <version>2.1.1-GA-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-03 12:30:51 UTC (rev 8385)
+++ components/wsrp/branches/2.1.x/jcr-impl/pom.xml 2012-02-03 12:31:12 UTC (rev 8386)
@@ -26,7 +26,7 @@
<parent>
<artifactId>wsrp-parent</artifactId>
<groupId>org.gatein.wsrp</groupId>
- <version>2.1.1-CR01</version>
+ <version>2.1.1-GA-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-03 12:30:51 UTC (rev 8385)
+++ components/wsrp/branches/2.1.x/pom.xml 2012-02-03 12:31:12 UTC (rev 8386)
@@ -36,7 +36,7 @@
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-CR01</version>
+ <version>2.1.1-GA-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -47,9 +47,9 @@
</parent>
<scm>
- <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-CR01</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/tags/2.1.1-CR01</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/branches/2.1.x/producer/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/producer/pom.xml 2012-02-03 12:30:51 UTC (rev 8385)
+++ components/wsrp/branches/2.1.x/producer/pom.xml 2012-02-03 12:31:12 UTC (rev 8386)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-CR01</version>
+ <version>2.1.1-GA-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-03 12:30:51 UTC (rev 8385)
+++ components/wsrp/branches/2.1.x/test/pom.xml 2012-02-03 12:31:12 UTC (rev 8386)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-CR01</version>
+ <version>2.1.1-GA-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-03 12:30:51 UTC (rev 8385)
+++ components/wsrp/branches/2.1.x/ws-security/jboss5/pom.xml 2012-02-03 12:31:12 UTC (rev 8386)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-wss-parent</artifactId>
- <version>2.1.1-CR01</version>
+ <version>2.1.1-GA-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-03 12:30:51 UTC (rev 8385)
+++ components/wsrp/branches/2.1.x/ws-security/pom.xml 2012-02-03 12:31:12 UTC (rev 8386)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-CR01</version>
+ <version>2.1.1-GA-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-03 12:30:51 UTC (rev 8385)
+++ components/wsrp/branches/2.1.x/ws-security/wsrp-producer-jb5wss-producer-war/pom.xml 2012-02-03 12:31:12 UTC (rev 8386)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-wss-parent</artifactId>
- <version>2.1.1-CR01</version>
+ <version>2.1.1-GA-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-03 12:30:51 UTC (rev 8385)
+++ components/wsrp/branches/2.1.x/ws-security/wss/pom.xml 2012-02-03 12:31:12 UTC (rev 8386)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-wss-parent</artifactId>
- <version>2.1.1-CR01</version>
+ <version>2.1.1-GA-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-03 12:30:51 UTC (rev 8385)
+++ components/wsrp/branches/2.1.x/wsrp-producer-war/pom.xml 2012-02-03 12:31:12 UTC (rev 8386)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-CR01</version>
+ <version>2.1.1-GA-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-03 12:30:51 UTC (rev 8385)
+++ components/wsrp/branches/2.1.x/wsrp1-ws/pom.xml 2012-02-03 12:31:12 UTC (rev 8386)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-CR01</version>
+ <version>2.1.1-GA-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-03 12:30:51 UTC (rev 8385)
+++ components/wsrp/branches/2.1.x/wsrp2-ws/pom.xml 2012-02-03 12:31:12 UTC (rev 8386)
@@ -26,7 +26,7 @@
<parent>
<artifactId>wsrp-parent</artifactId>
<groupId>org.gatein.wsrp</groupId>
- <version>2.1.1-CR01</version>
+ <version>2.1.1-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp2-ws</artifactId>
12 years, 4 months
- 1
- 0
gatein SVN: r8385 - components/wsrp/tags.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2012-02-03 07:30:51 -0500 (Fri, 03 Feb 2012)
New Revision: 8385
Added:
components/wsrp/tags/2.1.1-CR01/
Log:
[maven-release-plugin] copy for tag 2.1.1-CR01
12 years, 4 months
- 1
- 0
gatein SVN: r8384 - 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-03 07:30:39 -0500 (Fri, 03 Feb 2012)
New Revision: 8384
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-CR01
Modified: components/wsrp/branches/2.1.x/admin-gui/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/admin-gui/pom.xml 2012-02-03 12:23:44 UTC (rev 8383)
+++ components/wsrp/branches/2.1.x/admin-gui/pom.xml 2012-02-03 12:30:39 UTC (rev 8384)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-CR01-SNAPSHOT</version>
+ <version>2.1.1-CR01</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-03 12:23:44 UTC (rev 8383)
+++ components/wsrp/branches/2.1.x/api/pom.xml 2012-02-03 12:30:39 UTC (rev 8384)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-CR01-SNAPSHOT</version>
+ <version>2.1.1-CR01</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-03 12:23:44 UTC (rev 8383)
+++ components/wsrp/branches/2.1.x/common/pom.xml 2012-02-03 12:30:39 UTC (rev 8384)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-CR01-SNAPSHOT</version>
+ <version>2.1.1-CR01</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-03 12:23:44 UTC (rev 8383)
+++ components/wsrp/branches/2.1.x/consumer/pom.xml 2012-02-03 12:30:39 UTC (rev 8384)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-CR01-SNAPSHOT</version>
+ <version>2.1.1-CR01</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-03 12:23:44 UTC (rev 8383)
+++ components/wsrp/branches/2.1.x/hibernate-impl/pom.xml 2012-02-03 12:30:39 UTC (rev 8384)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-CR01-SNAPSHOT</version>
+ <version>2.1.1-CR01</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-03 12:23:44 UTC (rev 8383)
+++ components/wsrp/branches/2.1.x/jcr-impl/pom.xml 2012-02-03 12:30:39 UTC (rev 8384)
@@ -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.1.1-CR01-SNAPSHOT</version>
+ <version>2.1.1-CR01</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-03 12:23:44 UTC (rev 8383)
+++ components/wsrp/branches/2.1.x/pom.xml 2012-02-03 12:30:39 UTC (rev 8384)
@@ -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>
@@ -37,7 +36,7 @@
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-CR01-SNAPSHOT</version>
+ <version>2.1.1-CR01</version>
<packaging>pom</packaging>
@@ -48,9 +47,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.1.1-...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/tags/2.1.1-CR01</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/tags/2.1.1-CR01</url>
</scm>
<properties>
Modified: components/wsrp/branches/2.1.x/producer/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/producer/pom.xml 2012-02-03 12:23:44 UTC (rev 8383)
+++ components/wsrp/branches/2.1.x/producer/pom.xml 2012-02-03 12:30:39 UTC (rev 8384)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-CR01-SNAPSHOT</version>
+ <version>2.1.1-CR01</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-03 12:23:44 UTC (rev 8383)
+++ components/wsrp/branches/2.1.x/test/pom.xml 2012-02-03 12:30:39 UTC (rev 8384)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-CR01-SNAPSHOT</version>
+ <version>2.1.1-CR01</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-03 12:23:44 UTC (rev 8383)
+++ components/wsrp/branches/2.1.x/ws-security/jboss5/pom.xml 2012-02-03 12:30:39 UTC (rev 8384)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-wss-parent</artifactId>
- <version>2.1.1-CR01-SNAPSHOT</version>
+ <version>2.1.1-CR01</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-03 12:23:44 UTC (rev 8383)
+++ components/wsrp/branches/2.1.x/ws-security/pom.xml 2012-02-03 12:30:39 UTC (rev 8384)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-CR01-SNAPSHOT</version>
+ <version>2.1.1-CR01</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-03 12:23:44 UTC (rev 8383)
+++ components/wsrp/branches/2.1.x/ws-security/wsrp-producer-jb5wss-producer-war/pom.xml 2012-02-03 12:30:39 UTC (rev 8384)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-wss-parent</artifactId>
- <version>2.1.1-CR01-SNAPSHOT</version>
+ <version>2.1.1-CR01</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-03 12:23:44 UTC (rev 8383)
+++ components/wsrp/branches/2.1.x/ws-security/wss/pom.xml 2012-02-03 12:30:39 UTC (rev 8384)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-wss-parent</artifactId>
- <version>2.1.1-CR01-SNAPSHOT</version>
+ <version>2.1.1-CR01</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-03 12:23:44 UTC (rev 8383)
+++ components/wsrp/branches/2.1.x/wsrp-producer-war/pom.xml 2012-02-03 12:30:39 UTC (rev 8384)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-CR01-SNAPSHOT</version>
+ <version>2.1.1-CR01</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-03 12:23:44 UTC (rev 8383)
+++ components/wsrp/branches/2.1.x/wsrp1-ws/pom.xml 2012-02-03 12:30:39 UTC (rev 8384)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-CR01-SNAPSHOT</version>
+ <version>2.1.1-CR01</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-03 12:23:44 UTC (rev 8383)
+++ components/wsrp/branches/2.1.x/wsrp2-ws/pom.xml 2012-02-03 12:30:39 UTC (rev 8384)
@@ -26,7 +26,7 @@
<parent>
<artifactId>wsrp-parent</artifactId>
<groupId>org.gatein.wsrp</groupId>
- <version>2.1.1-CR01-SNAPSHOT</version>
+ <version>2.1.1-CR01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp2-ws</artifactId>
12 years, 4 months
- 1
- 0
gatein SVN: r8383 - 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-03 07:23:44 -0500 (Fri, 03 Feb 2012)
New Revision: 8383
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-CR01-SNAPSHOT.
Modified: components/wsrp/branches/2.1.x/admin-gui/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/admin-gui/pom.xml 2012-02-03 11:55:40 UTC (rev 8382)
+++ components/wsrp/branches/2.1.x/admin-gui/pom.xml 2012-02-03 12:23:44 UTC (rev 8383)
@@ -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-CR01-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-03 11:55:40 UTC (rev 8382)
+++ components/wsrp/branches/2.1.x/api/pom.xml 2012-02-03 12:23:44 UTC (rev 8383)
@@ -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-CR01-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-03 11:55:40 UTC (rev 8382)
+++ components/wsrp/branches/2.1.x/common/pom.xml 2012-02-03 12:23:44 UTC (rev 8383)
@@ -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-CR01-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-03 11:55:40 UTC (rev 8382)
+++ components/wsrp/branches/2.1.x/consumer/pom.xml 2012-02-03 12:23:44 UTC (rev 8383)
@@ -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-CR01-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-03 11:55:40 UTC (rev 8382)
+++ components/wsrp/branches/2.1.x/hibernate-impl/pom.xml 2012-02-03 12:23:44 UTC (rev 8383)
@@ -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-CR01-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-03 11:55:40 UTC (rev 8382)
+++ components/wsrp/branches/2.1.x/jcr-impl/pom.xml 2012-02-03 12:23:44 UTC (rev 8383)
@@ -27,7 +27,7 @@
<parent>
<artifactId>wsrp-parent</artifactId>
<groupId>org.gatein.wsrp</groupId>
- <version>2.1.1-GA-SNAPSHOT</version>
+ <version>2.1.1-CR01-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-03 11:55:40 UTC (rev 8382)
+++ components/wsrp/branches/2.1.x/pom.xml 2012-02-03 12:23:44 UTC (rev 8383)
@@ -37,7 +37,7 @@
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.1-GA-SNAPSHOT</version>
+ <version>2.1.1-CR01-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-03 11:55:40 UTC (rev 8382)
+++ components/wsrp/branches/2.1.x/producer/pom.xml 2012-02-03 12:23:44 UTC (rev 8383)
@@ -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-CR01-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-03 11:55:40 UTC (rev 8382)
+++ components/wsrp/branches/2.1.x/test/pom.xml 2012-02-03 12:23:44 UTC (rev 8383)
@@ -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-CR01-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-03 11:55:40 UTC (rev 8382)
+++ components/wsrp/branches/2.1.x/ws-security/jboss5/pom.xml 2012-02-03 12:23:44 UTC (rev 8383)
@@ -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-CR01-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-03 11:55:40 UTC (rev 8382)
+++ components/wsrp/branches/2.1.x/ws-security/pom.xml 2012-02-03 12:23:44 UTC (rev 8383)
@@ -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-CR01-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-03 11:55:40 UTC (rev 8382)
+++ components/wsrp/branches/2.1.x/ws-security/wsrp-producer-jb5wss-producer-war/pom.xml 2012-02-03 12:23:44 UTC (rev 8383)
@@ -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-CR01-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-03 11:55:40 UTC (rev 8382)
+++ components/wsrp/branches/2.1.x/ws-security/wss/pom.xml 2012-02-03 12:23:44 UTC (rev 8383)
@@ -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-CR01-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-03 11:55:40 UTC (rev 8382)
+++ components/wsrp/branches/2.1.x/wsrp-producer-war/pom.xml 2012-02-03 12:23:44 UTC (rev 8383)
@@ -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-CR01-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-03 11:55:40 UTC (rev 8382)
+++ components/wsrp/branches/2.1.x/wsrp1-ws/pom.xml 2012-02-03 12:23:44 UTC (rev 8383)
@@ -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-CR01-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-03 11:55:40 UTC (rev 8382)
+++ components/wsrp/branches/2.1.x/wsrp2-ws/pom.xml 2012-02-03 12:23:44 UTC (rev 8383)
@@ -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-CR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp2-ws</artifactId>
12 years, 4 months
- 1
- 0
gatein SVN: r8382 - components/wsrp/branches/2.1.x.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2012-02-03 06:55:40 -0500 (Fri, 03 Feb 2012)
New Revision: 8382
Modified:
components/wsrp/branches/2.1.x/pom.xml
Log:
- Upgraded to latest versions of PC and WCI.
Modified: components/wsrp/branches/2.1.x/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/pom.xml 2012-02-03 09:35:22 UTC (rev 8381)
+++ components/wsrp/branches/2.1.x/pom.xml 2012-02-03 11:55:40 UTC (rev 8382)
@@ -54,9 +54,9 @@
</scm>
<properties>
- <org.gatein.pc.version>2.3.0-GA</org.gatein.pc.version>
+ <org.gatein.pc.version>2.3.1-Beta02</org.gatein.pc.version>
<org.gatein.common.version>2.0.4-GA</org.gatein.common.version>
- <org.gatein.wci.version>2.1.0-GA</org.gatein.wci.version>
+ <org.gatein.wci.version>2.1.1-Beta02</org.gatein.wci.version>
<jsf.version>1.2_12</jsf.version>
<javax.xml.ws.version>2.1</javax.xml.ws.version>
12 years, 4 months
- 1
- 0
gatein SVN: r8381 - in components/wsrp/branches/2.1.x/ws-security: jboss5/src/main/java/org/wsrp/wss/jboss5/handlers/consumer and 2 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2012-02-03 04:35:22 -0500 (Fri, 03 Feb 2012)
New Revision: 8381
Added:
components/wsrp/branches/2.1.x/ws-security/wss/src/main/java/org/gatein/wsrp/wss/credentials/
components/wsrp/branches/2.1.x/ws-security/wss/src/main/java/org/gatein/wsrp/wss/credentials/CredentialsAccessor.java
components/wsrp/branches/2.1.x/ws-security/wss/src/main/java/org/gatein/wsrp/wss/credentials/HTTPSessionCredentialsAccessor.java
Modified:
components/wsrp/branches/2.1.x/ws-security/jboss5/pom.xml
components/wsrp/branches/2.1.x/ws-security/jboss5/src/main/java/org/wsrp/wss/jboss5/handlers/consumer/WSSecurityCredentialHandler.java
Log:
- GTNWSRP-268: Applied patch from mposolda.
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-03 09:22:07 UTC (rev 8380)
+++ components/wsrp/branches/2.1.x/ws-security/jboss5/pom.xml 2012-02-03 09:35:22 UTC (rev 8381)
@@ -45,6 +45,10 @@
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-wsrp2-ws</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.gatein.wsrp</groupId>
+ <artifactId>wsrp-wss</artifactId>
+ </dependency>
<dependency>
<groupId>org.gatein.common</groupId>
Modified: components/wsrp/branches/2.1.x/ws-security/jboss5/src/main/java/org/wsrp/wss/jboss5/handlers/consumer/WSSecurityCredentialHandler.java
===================================================================
--- components/wsrp/branches/2.1.x/ws-security/jboss5/src/main/java/org/wsrp/wss/jboss5/handlers/consumer/WSSecurityCredentialHandler.java 2012-02-03 09:22:07 UTC (rev 8380)
+++ components/wsrp/branches/2.1.x/ws-security/jboss5/src/main/java/org/wsrp/wss/jboss5/handlers/consumer/WSSecurityCredentialHandler.java 2012-02-03 09:35:22 UTC (rev 8381)
@@ -1,42 +1,40 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2011, Red Hat Middleware, LLC, and individual *
- * contributors as indicated by the @authors tag. See the *
- * copyright.txt in the distribution for a full listing of *
- * individual contributors. *
- * *
- * This is free software; you can redistribute it and/or modify it *
- * under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation; either version 2.1 of *
- * the License, or (at your option) any later version. *
- * *
- * This software is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
- * Lesser General Public License for more details. *
- * *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this software; if not, write to the Free *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
- ******************************************************************************/
+/*
+ * JBoss, a division of Red Hat
+ * Copyright 2012, 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.wsrp.wss.jboss5.handlers.consumer;
-import java.util.Set;
+import org.gatein.wci.security.Credentials;
+import org.gatein.wsrp.wss.credentials.CredentialsAccessor;
+import org.jboss.ws.core.CommonMessageContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-import javax.servlet.http.HttpServletRequest;
import javax.xml.namespace.QName;
import javax.xml.ws.BindingProvider;
import javax.xml.ws.handler.MessageContext;
import javax.xml.ws.handler.soap.SOAPHandler;
import javax.xml.ws.handler.soap.SOAPMessageContext;
+import java.util.Set;
-import org.gatein.wci.security.Credentials;
-import org.gatein.wsrp.servlet.ServletAccess;
-import org.jboss.ws.core.CommonMessageContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
/**
* @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a>
* @version $Revision$
@@ -45,6 +43,13 @@
{
private static Logger log = LoggerFactory.getLogger(WSSecurityCredentialHandler.class);
+ private CredentialsAccessor credentialsAccessor;
+
+ public WSSecurityCredentialHandler(CredentialsAccessor credentialsAccessor)
+ {
+ this.credentialsAccessor = credentialsAccessor;
+ }
+
public void close(MessageContext arg0)
{
//Nothing to do for now
@@ -74,26 +79,18 @@
log.debug("Attempting to convert security context to WS-Security header");
- CommonMessageContext ctx = (CommonMessageContext) soapMessageContext;
-
- HttpServletRequest request = ServletAccess.getRequest();
- if (request != null && request.getSession() != null)
+ CommonMessageContext ctx = (CommonMessageContext)soapMessageContext;
+
+ Credentials credentials = credentialsAccessor.getCredentials();
+
+ if (credentials != null)
{
- Credentials credentials = (Credentials)request.getSession().getAttribute(Credentials.CREDENTIALS);
- if (credentials != null)
- {
- ctx.put(BindingProvider.USERNAME_PROPERTY, credentials.getUsername());
- ctx.put(BindingProvider.PASSWORD_PROPERTY, credentials.getPassword());
- }
- else
- {
- log.debug("Could not find credentials to put in WS-Security header");
- return true;
- }
+ ctx.put(BindingProvider.USERNAME_PROPERTY, credentials.getUsername());
+ ctx.put(BindingProvider.PASSWORD_PROPERTY, credentials.getPassword());
}
else
{
- log.debug("Could not get current HttpServletRequest, cannot login.");
+ log.debug("Could not find credentials to put in WS-Security header");
}
}
catch (Exception e)
Added: components/wsrp/branches/2.1.x/ws-security/wss/src/main/java/org/gatein/wsrp/wss/credentials/CredentialsAccessor.java
===================================================================
--- components/wsrp/branches/2.1.x/ws-security/wss/src/main/java/org/gatein/wsrp/wss/credentials/CredentialsAccessor.java (rev 0)
+++ components/wsrp/branches/2.1.x/ws-security/wss/src/main/java/org/gatein/wsrp/wss/credentials/CredentialsAccessor.java 2012-02-03 09:35:22 UTC (rev 8381)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, a division of Red Hat
+ * Copyright 2012, 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.wss.credentials;
+
+import org.gatein.wci.security.Credentials;
+
+/**
+ * Accessor for obtaining credentials of current user.
+ *
+ * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
+ */
+public interface CredentialsAccessor
+{
+
+ /** @return {@link org.gatein.wci.security.Credentials} of current user. */
+ public Credentials getCredentials();
+
+}
Added: components/wsrp/branches/2.1.x/ws-security/wss/src/main/java/org/gatein/wsrp/wss/credentials/HTTPSessionCredentialsAccessor.java
===================================================================
--- components/wsrp/branches/2.1.x/ws-security/wss/src/main/java/org/gatein/wsrp/wss/credentials/HTTPSessionCredentialsAccessor.java (rev 0)
+++ components/wsrp/branches/2.1.x/ws-security/wss/src/main/java/org/gatein/wsrp/wss/credentials/HTTPSessionCredentialsAccessor.java 2012-02-03 09:35:22 UTC (rev 8381)
@@ -0,0 +1,64 @@
+/*
+ * JBoss, a division of Red Hat
+ * Copyright 2012, 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.wss.credentials;
+
+import org.gatein.wci.security.Credentials;
+import org.gatein.wsrp.servlet.ServletAccess;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * Obtaining credentials from HTTP session.
+ *
+ * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
+ */
+public class HTTPSessionCredentialsAccessor implements CredentialsAccessor
+{
+
+ private static Logger log = LoggerFactory.getLogger(HTTPSessionCredentialsAccessor.class);
+
+ /**
+ * Return credentials from HTTP session. It assumes that Credentials are in HTTP session in attribute
+ * {@link org.gatein.wci.security.Credentials#CREDENTIALS} and current HTTP request is bound to {@link
+ * org.gatein.wsrp.servlet.ServletAccess} thread-local.
+ *
+ * @return credentials
+ */
+ @Override
+ public Credentials getCredentials()
+ {
+ HttpServletRequest request = ServletAccess.getRequest();
+ if (request != null && request.getSession() != null)
+ {
+ return (Credentials)request.getSession().getAttribute(Credentials.CREDENTIALS);
+ }
+ else
+ {
+ log.debug("Could not get current HttpServletRequest, cannot obtain credentials from HTTP session.");
+ return null;
+ }
+ }
+}
12 years, 4 months
- 1
- 0
gatein SVN: r8380 - components/wsrp/branches/2.1.x.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2012-02-03 04:22:07 -0500 (Fri, 03 Feb 2012)
New Revision: 8380
Modified:
components/wsrp/branches/2.1.x/pom.xml
Log:
- Upgraded Chromattic to 1.1.2.
Modified: components/wsrp/branches/2.1.x/pom.xml
===================================================================
--- components/wsrp/branches/2.1.x/pom.xml 2012-02-03 07:58:09 UTC (rev 8379)
+++ components/wsrp/branches/2.1.x/pom.xml 2012-02-03 09:22:07 UTC (rev 8380)
@@ -61,7 +61,7 @@
<jsf.version>1.2_12</jsf.version>
<javax.xml.ws.version>2.1</javax.xml.ws.version>
<javax.xml.soap.saaj.version>1.3</javax.xml.soap.saaj.version>
- <org.chromattic.version>1.1.1</org.chromattic.version>
+ <org.chromattic.version>1.1.2</org.chromattic.version>
<org.jboss.arquillian.version>1.0.0.Alpha2</org.jboss.arquillian.version>
<org.mockito.version>1.8.5</org.mockito.version>
</properties>
12 years, 4 months
- 1
- 0
gatein SVN: r8379 - in portal/trunk/gadgets/server: src and 11 other directories.
by do-not-reply＠jboss.org
Author: kien_nguyen
Date: 2012-02-03 02:58:09 -0500 (Fri, 03 Feb 2012)
New Revision: 8379
Added:
portal/trunk/gadgets/server/src/test/
portal/trunk/gadgets/server/src/test/java/
portal/trunk/gadgets/server/src/test/java/org/
portal/trunk/gadgets/server/src/test/java/org/exoplatform/
portal/trunk/gadgets/server/src/test/java/org/exoplatform/portal/
portal/trunk/gadgets/server/src/test/java/org/exoplatform/portal/gadget/
portal/trunk/gadgets/server/src/test/java/org/exoplatform/portal/gadget/server/
portal/trunk/gadgets/server/src/test/java/org/exoplatform/portal/gadget/server/EndToEndServer.java
portal/trunk/gadgets/server/src/test/java/org/exoplatform/portal/gadget/server/EndToEndTest.java
portal/trunk/gadgets/server/src/test/resources/
portal/trunk/gadgets/server/src/test/resources/conf/
portal/trunk/gadgets/server/src/test/resources/conf/gadgets/
portal/trunk/gadgets/server/src/test/resources/conf/gadgets/key.txt
portal/trunk/gadgets/server/src/test/resources/endtoend/
portal/trunk/gadgets/server/src/test/resources/endtoend/coreFeatures.xml
portal/trunk/gadgets/server/src/test/resources/endtoend/hello.xml
portal/trunk/gadgets/server/src/test/resources/endtoend/messages.xml
portal/trunk/gadgets/server/src/test/resources/endtoend/messages_ar.xml
portal/trunk/gadgets/server/src/test/resources/endtoend/test.json
portal/trunk/gadgets/server/src/test/resources/endtoend/testframework.js
Modified:
portal/trunk/gadgets/server/pom.xml
Log:
GTNPORTAL-2346 Integrate testcases for Gadget Server
Modified: portal/trunk/gadgets/server/pom.xml
===================================================================
--- portal/trunk/gadgets/server/pom.xml 2012-02-03 01:32:36 UTC (rev 8378)
+++ portal/trunk/gadgets/server/pom.xml 2012-02-03 07:58:09 UTC (rev 8379)
@@ -42,7 +42,15 @@
<dependentWarExcludes>WEB-INF/web**</dependentWarExcludes>
</configuration>
</plugin>
- </plugins>
+ </plugins>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ </testResource>
+ <testResource>
+ <directory>src/main/webapp</directory>
+ </testResource>
+ </testResources>
</build>
<dependencies>
@@ -118,5 +126,47 @@
<artifactId>commons-digester</artifactId>
<scope>provided</scope>
</dependency>
+
+ <!-- Test scope -->
+ <dependency>
+ <groupId>org.gatein.shindig</groupId>
+ <artifactId>shindig-common</artifactId>
+ <version>${org.shindig.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.gadgets-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.component.test.core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.component.portal</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>6.1.25</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.htmlunit</groupId>
+ <artifactId>htmlunit</artifactId>
+ <version>2.8</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Added: portal/trunk/gadgets/server/src/test/java/org/exoplatform/portal/gadget/server/EndToEndServer.java
===================================================================
--- portal/trunk/gadgets/server/src/test/java/org/exoplatform/portal/gadget/server/EndToEndServer.java (rev 0)
+++ portal/trunk/gadgets/server/src/test/java/org/exoplatform/portal/gadget/server/EndToEndServer.java 2012-02-03 07:58:09 UTC (rev 8379)
@@ -0,0 +1,171 @@
+/**
+ * Copyright (C) 2012 eXo Platform SAS.
+ *
+ * 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.exoplatform.portal.gadget.server;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.shindig.common.PropertiesModule;
+import org.apache.shindig.common.cache.ehcache.EhCacheModule;
+import org.apache.shindig.gadgets.DefaultGuiceModule;
+import org.apache.shindig.gadgets.servlet.AuthenticationModule;
+import org.apache.shindig.gadgets.servlet.ConcatProxyServlet;
+import org.apache.shindig.gadgets.servlet.GadgetRenderingServlet;
+import org.apache.shindig.gadgets.servlet.JsServlet;
+import org.apache.shindig.gadgets.servlet.MakeRequestServlet;
+import org.exoplatform.portal.gadget.core.ExoModule;
+import org.exoplatform.portal.gadget.core.ExoOAuthModule;
+import org.exoplatform.portal.gadget.core.GateInGuiceServletContextListener;
+import org.mortbay.jetty.Server;
+import org.mortbay.jetty.handler.ResourceHandler;
+import org.mortbay.jetty.servlet.Context;
+import org.mortbay.jetty.servlet.ServletHolder;
+import org.mortbay.resource.Resource;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.Map;
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.google.common.base.Joiner;
+import com.google.common.collect.Maps;
+
+/**
+ * Suite for running the end-to-end tests. The suite is responsible for starting up and shutting
+ * down the server.
+ *
+ * @author <a href="kienna(a)exoplatform.com">Kien Nguyen</a>
+ * @version $Revision$
+ */
+public class EndToEndServer
+{
+ private static final int JETTY_PORT = 9003;
+
+ private static final String GADGET_BASE = "/eXoGadgetServer/gadgets/ifr";
+
+ private static final String CONCAT_BASE = "/eXoGadgetServer/gadgets/concat";
+
+ private static final String JS_BASE = "/eXoGadgetServer/gadgets/js/*";
+
+ private static final String MAKE_REQUEST_BASE = "/eXoGadgetServer/gadgets/makeRequest";
+
+ public static final String SERVER_URL = "http://localhost:" + JETTY_PORT;
+
+ public static final String GADGET_BASEURL = SERVER_URL + GADGET_BASE;
+
+ private final Server server;
+
+ /** Fake error code for data service servlet request */
+ protected int errorCode;
+
+ /** Fake error message for data service servlet request */
+ protected String errorMessage;
+
+ public EndToEndServer() throws Exception
+ {
+ server = createServer(JETTY_PORT);
+ }
+
+ public void start() throws Exception
+ {
+ server.start();
+ }
+
+ public void stop() throws Exception
+ {
+ server.stop();
+ }
+
+ public void clearDataServiceError()
+ {
+ errorCode = 0;
+ }
+
+ public void setDataServiceError(int errorCode, String errorMessage)
+ {
+ this.errorCode = errorCode;
+ this.errorMessage = errorMessage;
+ }
+
+ /**
+ * Create the server for end-to-end tests.
+ */
+ private Server createServer(int port) throws Exception
+ {
+ System.setProperty("shindig.port", String.valueOf(port));
+ System.setProperty("jetty.port", String.valueOf(port));
+ System.setProperty("gatein.gadgets.securitytokenkeyfile", "src/test/resources/conf/gadgets/key.txt");
+
+ Server newServer = new Server(port);
+
+ // Attach the test resources in /endtoend as static content for the test
+ ResourceHandler resources = new ResourceHandler();
+ URL resource = EndToEndTest.class.getResource("/endtoend");
+ resources.setBaseResource(Resource.newResource(resource));
+ newServer.addHandler(resources);
+
+ Context context = new Context(newServer, "/", Context.SESSIONS);
+ context.addEventListener(new GateInGuiceServletContextListener());
+
+ Map<String, String> initParams = Maps.newHashMap();
+ String modules =
+ Joiner.on(":").join(ExoModule.class.getName(), ExoOAuthModule.class.getName(),
+ DefaultGuiceModule.class.getName(), AuthenticationModule.class.getName(), PropertiesModule.class.getName(),
+ EhCacheModule.class.getName());
+
+ initParams.put(GateInGuiceServletContextListener.MODULES_ATTRIBUTE, modules);
+ context.setInitParams(initParams);
+
+ // Attach the gadget rendering servlet
+ ServletHolder gadgetServletHolder = new ServletHolder(new GadgetRenderingServlet());
+ context.addServlet(gadgetServletHolder, GADGET_BASE);
+
+ // Attach the ConcatProxyServlet - needed for rewritten JS
+ ServletHolder concatHolder = new ServletHolder(new ConcatProxyServlet());
+ context.addServlet(concatHolder, CONCAT_BASE);
+
+ // Attach the JsServlet - needed for rewritten JS
+ ServletHolder jsHolder = new ServletHolder(new JsServlet());
+ context.addServlet(jsHolder, JS_BASE);
+
+ // Attach MakeRequestServlet
+ ServletHolder makeRequestHolder = new ServletHolder(new MakeRequestServlet());
+ context.addServlet(makeRequestHolder, MAKE_REQUEST_BASE);
+
+ // Attach an EchoServlet, used to test proxied rendering
+ ServletHolder echoHolder = new ServletHolder(new EchoServlet());
+ context.addServlet(echoHolder, "/echo");
+
+ return newServer;
+ }
+
+ static private class EchoServlet extends HttpServlet
+ {
+
+ @Override
+ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException
+ {
+ req.setCharacterEncoding("UTF-8");
+ resp.setContentType(req.getContentType());
+
+ IOUtils.copy(req.getReader(), resp.getWriter());
+ }
+ }
+}
Added: portal/trunk/gadgets/server/src/test/java/org/exoplatform/portal/gadget/server/EndToEndTest.java
===================================================================
--- portal/trunk/gadgets/server/src/test/java/org/exoplatform/portal/gadget/server/EndToEndTest.java (rev 0)
+++ portal/trunk/gadgets/server/src/test/java/org/exoplatform/portal/gadget/server/EndToEndTest.java 2012-02-03 07:58:09 UTC (rev 8379)
@@ -0,0 +1,165 @@
+/**
+ * Copyright (C) 2012 eXo Platform SAS.
+ *
+ * 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.exoplatform.portal.gadget.server;
+
+import org.apache.shindig.auth.BasicSecurityToken;
+import org.apache.shindig.auth.BasicSecurityTokenCodec;
+import org.apache.shindig.auth.SecurityToken;
+import org.apache.shindig.common.crypto.BlobCrypterException;
+import org.exoplatform.portal.AbstractPortalTest;
+
+import com.gargoylesoftware.htmlunit.CollectingAlertHandler;
+import com.gargoylesoftware.htmlunit.NicelyResynchronizingAjaxController;
+import com.gargoylesoftware.htmlunit.Page;
+import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.gargoylesoftware.htmlunit.html.HTMLParserListener;
+
+import java.io.IOException;
+import java.net.URLEncoder;
+
+/**
+ * Base class for end-to-end tests.
+ *
+ * @author <a href="kienna(a)exoplatform.com">Kien Nguyen</a>
+ * @version $Revision$
+ */
+public class EndToEndTest extends AbstractPortalTest
+{
+ private static final String[] EXPECTED_RESOURCES = {"hello.xml", "coreFeatures.xml", "testframework.js"};
+
+ static private EndToEndServer server = null;
+
+ private WebClient webClient;
+
+ private CollectingAlertHandler alertHandler;
+
+ private SecurityToken token;
+
+ private String language;
+
+ public void testCheckResources() throws Exception
+ {
+ for (String resource : EXPECTED_RESOURCES)
+ {
+ String url = EndToEndServer.SERVER_URL + '/' + resource;
+ Page p = webClient.getPage(url);
+ assertEquals("Failed to load test resource " + url, 200, p.getWebResponse().getStatusCode());
+ }
+ }
+
+ public void testHelloWorld() throws Exception
+ {
+ HtmlPage page = executeAllPageTests("hello");
+ final String pageAsText = page.asText();
+ assertTrue(pageAsText.contains("Hello, world!"));
+ }
+
+ public void testCoreFeature() throws Exception
+ {
+ HtmlPage page = executeAllPageTests("coreFeatures");
+ final String pageAsText = page.asText();
+ assertTrue(pageAsText.contains("Core Features Test Cases!"));
+ }
+
+ @Override
+ public void tearDown() throws Exception
+ {
+ server.stop();
+ }
+
+ @Override
+ public void setUp() throws Exception
+ {
+ server = new EndToEndServer();
+ server.start();
+
+ webClient = new WebClient();
+ // NicelyResynchronizingAjaxController changes XHR calls from asynchronous
+ // to synchronous, saving the test from needing to wait or sleep for XHR
+ // completion.
+ webClient.setAjaxController(new NicelyResynchronizingAjaxController());
+ webClient.waitForBackgroundJavaScript(2000);
+ webClient.setHTMLParserListener(HTMLParserListener.LOG_REPORTER);
+ webClient.setTimeout(3000);
+
+ alertHandler = new CollectingAlertHandler();
+ webClient.setAlertHandler(alertHandler);
+ token = createToken("canonical", "john.doe");
+ language = null;
+ server.clearDataServiceError();
+ }
+
+ /**
+ * Executes a page test by loading the HTML page.
+ * @param testName name of the test, which must match a gadget XML file
+ * name in test/resources/endtoend (minus .xml).
+ * @param testMethod name of the javascript method to execute
+ * @return the parsed HTML page
+ */
+ private HtmlPage executePageTest(String testName, String testMethod, boolean caja) throws IOException
+ {
+ if (!testName.endsWith(".xml"))
+ {
+ testName = testName + ".xml";
+ }
+
+ String gadgetUrl = EndToEndServer.SERVER_URL + '/' + testName;
+ String url = EndToEndServer.GADGET_BASEURL + "?url=" + URLEncoder.encode(gadgetUrl, "UTF-8");
+ BasicSecurityTokenCodec codec = new BasicSecurityTokenCodec();
+ url += "&st=" + URLEncoder.encode(codec.encodeToken(token), "UTF-8");
+ if (testMethod != null)
+ {
+ url += "&testMethod=" + URLEncoder.encode(testMethod, "UTF-8");
+ }
+ if (caja)
+ {
+ url += "&caja=1&libs=caja";
+ }
+
+ url += "&nocache=1";
+ if (language != null)
+ {
+ url += "&lang=" + language;
+ }
+ Page page = webClient.getPage(url);
+ if (!(page instanceof HtmlPage))
+ {
+ fail("Got wrong page type. Was: " + page.getWebResponse().getContentType());
+ }
+ webClient.waitForBackgroundJavaScript(3000);
+ return (HtmlPage)page;
+ }
+
+ /**
+ * Executes all page test in a single XML file.
+ * @param testName name of the test, which must match a gadget XML file
+ * name in test/resources/endtoend (minus .xml).
+ * @throws IOException
+ */
+ private HtmlPage executeAllPageTests(String testName) throws IOException
+ {
+ return executePageTest(testName, "all", false);
+ }
+
+ private BasicSecurityToken createToken(String owner, String viewer) throws BlobCrypterException
+ {
+ return new BasicSecurityToken(owner, viewer, "test", "domain", "appUrl", "1", "default", null, null);
+ }
+}
\ No newline at end of file
Added: portal/trunk/gadgets/server/src/test/resources/conf/gadgets/key.txt
===================================================================
--- portal/trunk/gadgets/server/src/test/resources/conf/gadgets/key.txt (rev 0)
+++ portal/trunk/gadgets/server/src/test/resources/conf/gadgets/key.txt 2012-02-03 07:58:09 UTC (rev 8379)
@@ -0,0 +1 @@
+XeQtHqy4StAWBXggc4pQx/5fxBsDYUUNhk8U08lgCoA=
Added: portal/trunk/gadgets/server/src/test/resources/endtoend/coreFeatures.xml
===================================================================
--- portal/trunk/gadgets/server/src/test/resources/endtoend/coreFeatures.xml (rev 0)
+++ portal/trunk/gadgets/server/src/test/resources/endtoend/coreFeatures.xml 2012-02-03 07:58:09 UTC (rev 8379)
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Module>
+ <ModulePrefs title="EndToEndTest">
+ <Locale messages="messages.xml"/>
+ <Locale lang="ar" messages="messages_ar.xml" language_direction="rtl"/>
+ </ModulePrefs>
+ <Content type="html">
+ <![CDATA[
+ /** For test message bundle */
+ <span id="substituteHere">__MSG_TEST__</span>
+ <span id="bidi">__BIDI_DIR__</span>
+
+ /** Script test framework */
+ <script type="text/javascript" src="/testframework.js"></script>
+
+ /** Test cases */
+ <script type="text/javascript">
+
+ var tests = {
+ /** Test json feature */
+ jsonTest: function() {
+ var val = {foo: 1, bar: [0, 1, 2], baz: {key: 'value'}};
+ var str = gadgets.json.stringify(val);
+ assertTrue("Serialization missing scalar value", /"foo":1/.test(str));
+ assertTrue("Serialization missing array value", /"bar":\[0,1,2\]/.test(str));
+ assertTrue("Serialization missing literal value", /"baz":\{"key":"value"\}/.test(str));
+ finished();
+ },
+
+ /** Test fetching a makeRequest proxied call */
+ makeRequestTest: function() {
+ function receivedData(response) {
+ assertEquals('Text property not set', '{"key": "value"}', response.text);
+ assertEquals('Data property not set', '{"key": "value"}', response.data);
+ assertEquals('Response code not set', 200, response.rc);
+ assertEquals('Errors not an empty array', 0, response.errors.length);
+ finished();
+ }
+
+ gadgets.io.makeRequest('http://localhost:9003/test.json', receivedData);
+ },
+
+ /** Test fetching a makeRequest proxied for JSON */
+ makeRequestJsonTest: function() {
+ function receivedData(response) {
+ assertEquals('Text property not set', '{"key": "value"}', response.text);
+ assertEquals('Data property not set', 'value', response.data.key);
+ assertEquals('Response code not set', 200, response.rc);
+ assertEquals('Errors not an empty array', 0, response.errors.length);
+ finished();
+ }
+
+ gadgets.io.makeRequest('http://localhost:9003/test.json', receivedData,
+ {CONTENT_TYPE: 'JSON'});
+ },
+
+ /** Test fetching a makeRequest proxied call that fails */
+ makeRequestJsonDoesntExistTest: function() {
+ function receivedData(response) {
+ assertEquals('Response code not set', 404, response.rc);
+ assertEquals('Errors not an empty array', 1, response.errors.length);
+ finished();
+ }
+
+ gadgets.io.makeRequest('http://localhost:9003/doesntexist.txt', receivedData);
+ },
+
+ /** Message bundle */
+ messageBundleTest: function() {
+ var msg = document.getElementById('substituteHere');
+ var bidi = document.getElementById('bidi');
+ var prefs = new gadgets.Prefs();
+ var expectedText = 'test FTW';
+ var expectedLtr = 'ltr';
+
+ if('ar' == prefs.getLang()) {
+ expectedText = 'WTF tset';
+ expectedLtr = 'rtl';
+ }
+
+ assertEquals('Text not substituted', expectedText, msg.firstChild.data);
+ assertEquals('getMsg not successful', expectedText, prefs.getMsg('TEST'));
+ assertEquals('BIDI not substituted', expectedLtr, bidi.firstChild.data);
+ finished();
+ }
+ }
+ </script>
+
+ <div>Core Features Test Cases!</div>
+ ]]>
+ </Content>
+</Module>
Added: portal/trunk/gadgets/server/src/test/resources/endtoend/hello.xml
===================================================================
--- portal/trunk/gadgets/server/src/test/resources/endtoend/hello.xml (rev 0)
+++ portal/trunk/gadgets/server/src/test/resources/endtoend/hello.xml 2012-02-03 07:58:09 UTC (rev 8379)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Module>
+ <ModulePrefs title="hello world example" description="The hello world gadget." />
+ <Content type="html"> <![CDATA[
+ Hello, world!
+ ]]>
+ </Content>
+</Module>
\ No newline at end of file
Added: portal/trunk/gadgets/server/src/test/resources/endtoend/messages.xml
===================================================================
--- portal/trunk/gadgets/server/src/test/resources/endtoend/messages.xml (rev 0)
+++ portal/trunk/gadgets/server/src/test/resources/endtoend/messages.xml 2012-02-03 07:58:09 UTC (rev 8379)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<messagebundle>
+ <msg name="TEST">test FTW</msg>
+</messagebundle>
\ No newline at end of file
Added: portal/trunk/gadgets/server/src/test/resources/endtoend/messages_ar.xml
===================================================================
--- portal/trunk/gadgets/server/src/test/resources/endtoend/messages_ar.xml (rev 0)
+++ portal/trunk/gadgets/server/src/test/resources/endtoend/messages_ar.xml 2012-02-03 07:58:09 UTC (rev 8379)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<messagebundle>
+ <!-- No, not really Arabic -->
+ <msg name="TEST">WTF tset</msg>
+</messagebundle>
\ No newline at end of file
Added: portal/trunk/gadgets/server/src/test/resources/endtoend/test.json
===================================================================
--- portal/trunk/gadgets/server/src/test/resources/endtoend/test.json (rev 0)
+++ portal/trunk/gadgets/server/src/test/resources/endtoend/test.json 2012-02-03 07:58:09 UTC (rev 8379)
@@ -0,0 +1 @@
+{"key": "value"}
\ No newline at end of file
Added: portal/trunk/gadgets/server/src/test/resources/endtoend/testframework.js
===================================================================
--- portal/trunk/gadgets/server/src/test/resources/endtoend/testframework.js (rev 0)
+++ portal/trunk/gadgets/server/src/test/resources/endtoend/testframework.js 2012-02-03 07:58:09 UTC (rev 8379)
@@ -0,0 +1,95 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+var tests;
+
+function assertTrue(msg, value) {
+ if (!value) {
+ throw "assertTrue() failed: " + msg;
+ }
+}
+
+function assertFalse(msg, value) {
+ if (value) {
+ throw "assertFalse() failed: " + msg;
+ }
+}
+
+function assertEquals(msg, a, b) {
+ if (a != b) {
+ throw "assertEquals() failed: " + msg +
+ "\nExpected \"" + a + "\", was \"" + b + "\"";
+ }
+}
+
+/**
+ * Signals the server code that a test successfully finished. This
+ * method must be called to verify that a test completed successfully,
+ * instead of simply failing to load.
+ */
+
+function finished() {
+ alert("FINISHED");
+ // After finishing run the next test..
+ runOneTest();
+}
+
+/** Executes the test identifed by the testMethod URL parameter */
+function executeTest() {
+ var params = gadgets.util.getUrlParameters();
+ var testMethod = params["testMethod"];
+ if (!testMethod) {
+ throw "No testMethod parameter found.";
+ }
+
+ // "all": run all the tests
+ if ("all" == testMethod) {
+ allTests();
+ } else {
+ // Show an alert for the test method name, identifying what test started.
+ alert(testMethod);
+
+ var testMethodFunction = tests[testMethod];
+ if (!testMethodFunction) {
+ throw "Test method " + testMethod + " not found.";
+ }
+
+ // Execute the test method
+ testMethodFunction();
+ }
+}
+
+var testFunctions = [];
+
+function runOneTest() {
+ var t = testFunctions.pop();
+ if (t) {
+ alert(t);
+ tests[t]();
+ }
+}
+function allTests() {
+ // Collect the test names and iterate through them serially
+ for (var testMethod in tests) {
+ testFunctions.push(testMethod);
+ }
+ runOneTest();
+}
+
+gadgets.util.registerOnLoadHandler(executeTest);
12 years, 4 months
- 1
- 0
gatein SVN: r8378 - portal/trunk/packaging/jboss-as7.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2012-02-02 20:32:36 -0500 (Thu, 02 Feb 2012)
New Revision: 8378
Modified:
portal/trunk/packaging/jboss-as7/README.txt
Log:
GTNPORTAL-2154 Support for JBoss AS7
- updated README.txt
Modified: portal/trunk/packaging/jboss-as7/README.txt
===================================================================
--- portal/trunk/packaging/jboss-as7/README.txt 2012-02-03 00:40:41 UTC (rev 8377)
+++ portal/trunk/packaging/jboss-as7/README.txt 2012-02-03 01:32:36 UTC (rev 8378)
@@ -30,7 +30,7 @@
Known Issues
============
-- Only one JBoss AS 7 version is supported at one time. At the moment it's JBoss AS 7.1.0.CR1.
+- Only one JBoss AS 7 version is supported at one time. At the moment it's JBoss AS 7.1.0.CR1b.
- WSRP is not yet supported
- <distributable/> is not yet supported
- Sample ears have been repackaged as their current default packaging is not supported
@@ -74,7 +74,7 @@
mvn clean install
-Set CONTAINERS_DIR env variable to point to a directory containing your application servers (i.e. export CONTAINERS_DIR=$HOME/devel/containers). If you already have ‘jboss-as-7.1.0.CR1’ in your CONTAINERS_DIR, then remove ‘,download’ from the next command:
+Set CONTAINERS_DIR env variable to point to a directory containing your application servers (i.e. export CONTAINERS_DIR=$HOME/devel/containers). If you already have ‘jboss-as-7.1.0.CR1b’ in your CONTAINERS_DIR, then remove ‘,download’ from the next command:
cd packaging/jboss-as7
mvn clean install -Ppkg-jbossas7,download -Dexo.projects.directory.dependencies=$CONTAINERS_DIR
@@ -83,7 +83,7 @@
Now that we successfully built GateIn including JBoss AS7 support, let’s run it:
-cd pkg/target/jboss-as-7.1.0.CR1/bin
+cd pkg/target/jboss-as-7.1.0.CR1b/bin
./standalone.sh
12 years, 4 months
- 1
- 0