Author: chris.laprun(a)jboss.com
Date: 2010-08-19 09:56:24 -0400 (Thu, 19 Aug 2010)
New Revision: 3871
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:
- Fixed incorrect version number.
Modified: components/wsrp/trunk/admin-gui/pom.xml
===================================================================
--- components/wsrp/trunk/admin-gui/pom.xml 2010-08-19 12:59:11 UTC (rev 3870)
+++ components/wsrp/trunk/admin-gui/pom.xml 2010-08-19 13:56:24 UTC (rev 3871)
@@ -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>\</version>
+ <version>2.0.0-Alpha02-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-08-19 12:59:11 UTC (rev 3870)
+++ components/wsrp/trunk/api/pom.xml 2010-08-19 13:56:24 UTC (rev 3871)
@@ -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>\</version>
+ <version>2.0.0-Alpha02-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-08-19 12:59:11 UTC (rev 3870)
+++ components/wsrp/trunk/common/pom.xml 2010-08-19 13:56:24 UTC (rev 3871)
@@ -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>\</version>
+ <version>2.0.0-Alpha02-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-08-19 12:59:11 UTC (rev 3870)
+++ components/wsrp/trunk/consumer/pom.xml 2010-08-19 13:56:24 UTC (rev 3871)
@@ -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>\</version>
+ <version>2.0.0-Alpha02-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-08-19 12:59:11 UTC (rev 3870)
+++ components/wsrp/trunk/hibernate-impl/pom.xml 2010-08-19 13:56:24 UTC (rev 3871)
@@ -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>\</version>
+ <version>2.0.0-Alpha02-SNAPSHOT</version>
</parent>
<groupId>org.gatein.wsrp</groupId>
Modified: components/wsrp/trunk/pom.xml
===================================================================
--- components/wsrp/trunk/pom.xml 2010-08-19 12:59:11 UTC (rev 3870)
+++ components/wsrp/trunk/pom.xml 2010-08-19 13:56:24 UTC (rev 3871)
@@ -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>\</version>
+ <version>2.0.0-Alpha02-SNAPSHOT</version>
<packaging>pom</packaging>
Modified: components/wsrp/trunk/producer/pom.xml
===================================================================
--- components/wsrp/trunk/producer/pom.xml 2010-08-19 12:59:11 UTC (rev 3870)
+++ components/wsrp/trunk/producer/pom.xml 2010-08-19 13:56:24 UTC (rev 3871)
@@ -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>\</version>
+ <version>2.0.0-Alpha02-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-08-19 12:59:11 UTC (rev 3870)
+++ components/wsrp/trunk/test/pom.xml 2010-08-19 13:56:24 UTC (rev 3871)
@@ -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>\</version>
+ <version>2.0.0-Alpha02-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-08-19 12:59:11 UTC (rev 3870)
+++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-08-19 13:56:24 UTC (rev 3871)
@@ -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>\</version>
+ <version>2.0.0-Alpha02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -122,108 +123,108 @@
</build>
</profile>
<profile>
- <id>integration-tests-enabled</id>
- <activation>
- <property>
- <name>!maven.test.skip</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-maven2-plugin</artifactId>
- <version>1.0.1</version>
- <executions>
- <execution>
- <id>pre-integration-start-server</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>start</goal>
- </goals>
- </execution>
- <execution>
- <id>post-integration-stop-server</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>stop</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <finalName>test</finalName>
- <appendAssemblyId>true</appendAssemblyId>
- <!-- we don't want to add these archives into the repo -->
- <attach>false</attach>
-
<outputDirectory>${project.build.directory}/test-archives</outputDirectory>
- <descriptors>
-
<descriptor>src/test/assembly/test-producer.xml</descriptor>
-
<descriptor>src/test/assembly/test-markup-portlet.xml</descriptor>
-
<descriptor>src/test/assembly/test-renderparam-portlet.xml</descriptor>
-
<descriptor>src/test/assembly/test-session-portlet.xml</descriptor>
-
<descriptor>src/test/assembly/test-basic-portlet.xml</descriptor>
-
<descriptor>src/test/assembly/test-dispatcher-portlet.xml</descriptor>
-
<descriptor>src/test/assembly/test-getlocales-portlet.xml</descriptor>
-
<descriptor>src/test/assembly/test-encodeurl-portlet.xml</descriptor>
-
<descriptor>src/test/assembly/test-usercontext-portlet.xml</descriptor>
-
<descriptor>src/test/assembly/test-multivalued-portlet.xml</descriptor>
-
<descriptor>src/test/assembly/test-implicitcloning-portlet.xml</descriptor>
-
<descriptor>src/test/assembly/test-resource-portlet.xml</descriptor>
-
<descriptor>src/test/assembly/test-resourcenoencodeurl-portlet.xml</descriptor>
-
<descriptor>src/test/assembly/test-applicationscope-portlet.xml</descriptor>
-
<descriptor>src/test/assembly/test-portletstate-portlet.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>assemble</id>
- <!-- note that package phase happens after the test phase and before
the integration test phase -->
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jboss-packaging-maven-plugin</artifactId>
- <version>2.1.1</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <!-- Copy Google Portlet samples from PC module to test-archives so that
they can be used in tests -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.1</version>
- <executions>
- <execution>
- <id>copy</id>
- <goals>
- <goal>copy</goal>
- </goals>
+ <id>integration-tests-enabled</id>
+ <activation>
+ <property>
+ <name>!maven.test.skip</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven2-plugin</artifactId>
+ <version>1.0.1</version>
+ <executions>
+ <execution>
+ <id>pre-integration-start-server</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>start</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>post-integration-stop-server</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>stop</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
<configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.gatein.pc</groupId>
- <artifactId>pc-samples</artifactId>
- <version>2.1.1-GA</version>
- <classifier>google-portlet</classifier>
- <type>war</type>
- <destFileName>google-portlet.war</destFileName>
-
<outputDirectory>${project.build.directory}/test-archives</outputDirectory>
- </artifactItem>
- </artifactItems>
+ <finalName>test</finalName>
+ <appendAssemblyId>true</appendAssemblyId>
+ <!-- we don't want to add these archives into the repo
-->
+ <attach>false</attach>
+
<outputDirectory>${project.build.directory}/test-archives</outputDirectory>
+ <descriptors>
+
<descriptor>src/test/assembly/test-producer.xml</descriptor>
+
<descriptor>src/test/assembly/test-markup-portlet.xml</descriptor>
+
<descriptor>src/test/assembly/test-renderparam-portlet.xml</descriptor>
+
<descriptor>src/test/assembly/test-session-portlet.xml</descriptor>
+
<descriptor>src/test/assembly/test-basic-portlet.xml</descriptor>
+
<descriptor>src/test/assembly/test-dispatcher-portlet.xml</descriptor>
+
<descriptor>src/test/assembly/test-getlocales-portlet.xml</descriptor>
+
<descriptor>src/test/assembly/test-encodeurl-portlet.xml</descriptor>
+
<descriptor>src/test/assembly/test-usercontext-portlet.xml</descriptor>
+
<descriptor>src/test/assembly/test-multivalued-portlet.xml</descriptor>
+
<descriptor>src/test/assembly/test-implicitcloning-portlet.xml</descriptor>
+
<descriptor>src/test/assembly/test-resource-portlet.xml</descriptor>
+
<descriptor>src/test/assembly/test-resourcenoencodeurl-portlet.xml</descriptor>
+
<descriptor>src/test/assembly/test-applicationscope-portlet.xml</descriptor>
+
<descriptor>src/test/assembly/test-portletstate-portlet.xml</descriptor>
+ </descriptors>
</configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <executions>
+ <execution>
+ <id>assemble</id>
+ <!-- note that package phase happens after the test phase and
before the integration test phase -->
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.mojo</groupId>
+
<artifactId>jboss-packaging-maven-plugin</artifactId>
+ <version>2.1.1</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <!-- Copy Google Portlet samples from PC module to test-archives so
that they can be used in tests -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.1</version>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.gatein.pc</groupId>
+ <artifactId>pc-samples</artifactId>
+ <version>2.1.1-GA</version>
+ <classifier>google-portlet</classifier>
+ <type>war</type>
+
<destFileName>google-portlet.war</destFileName>
+
<outputDirectory>${project.build.directory}/test-archives</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</profile>
</profiles>
@@ -423,7 +424,7 @@
<include>org/gatein/wsrp/protocol/v1/ServiceDescriptionTestCase.class</include>
<include>org/gatein/wsrp/protocol/v1/RegistrationTestCase.class</include>
<include>org/gatein/wsrp/protocol/v2/MarkupTestCase.class</include>
- <!--
<include>org/gatein/wsrp/protocol/v2/ResourceTestCase.class</include> -->
+ <!--
<include>org/gatein/wsrp/protocol/v2/ResourceTestCase.class</include> -->
<include>org/gatein/wsrp/protocol/v2/ServiceDescriptionTestCase.class</include>
<include>org/gatein/wsrp/protocol/v2/PortletManagementTestCase.class</include>
</includes>
Modified: components/wsrp/trunk/wsrp1-ws/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp1-ws/pom.xml 2010-08-19 12:59:11 UTC (rev 3870)
+++ components/wsrp/trunk/wsrp1-ws/pom.xml 2010-08-19 13:56:24 UTC (rev 3871)
@@ -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>\</version>
+ <version>2.0.0-Alpha02-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-08-19 12:59:11 UTC (rev 3870)
+++ components/wsrp/trunk/wsrp2-ws/pom.xml 2010-08-19 13:56:24 UTC (rev 3871)
@@ -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>\</version>
+ <version>2.0.0-Alpha02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp2-ws</artifactId>