[gatein-commits] gatein SVN: r6037 - in components/wsrp/trunk: wsrp-producer-war and 1 other directories.

[do-not-reply at jboss.org]

Author: chris.laprun at jboss.com
Date: 2011-03-15 13:24:25 -0400 (Tue, 15 Mar 2011)
New Revision: 6037

Modified:
   components/wsrp/trunk/pom.xml
   components/wsrp/trunk/wsrp-producer-war/pom.xml
   components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-producer.xml
Log:
- GTNWSRP-206: Updated to WCI 2.1.0-Beta01, fixed incorrect assembly for test-producer that was making the tests fail. 
- GTNWSRP-207: Removed duplicated dependency in wsrp-producer-war POM.

Modified: components/wsrp/trunk/pom.xml
===================================================================
--- components/wsrp/trunk/pom.xml	2011-03-15 17:01:56 UTC (rev 6036)
+++ components/wsrp/trunk/pom.xml	2011-03-15 17:24:25 UTC (rev 6037)
@@ -49,8 +49,7 @@
    <properties>
       <version.gatein.pc>2.3.0-Beta01</version.gatein.pc>
       <version.gatein.common>2.0.4-Beta01</version.gatein.common>
-      <!--<version.gatein.wci>2.1.0-Beta01</version.gatein.wci>-->
-      <version.gatein.wci>2.0.2-GA</version.gatein.wci>
+      <version.gatein.wci>2.1.0-Beta01</version.gatein.wci>
 
       <version.jsf>1.2_12</version.jsf>
       <version.servlet>2.5</version.servlet>

Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/pom.xml	2011-03-15 17:01:56 UTC (rev 6036)
+++ components/wsrp/trunk/wsrp-producer-war/pom.xml	2011-03-15 17:24:25 UTC (rev 6037)
@@ -298,12 +298,6 @@
 
       <dependency>
          <groupId>org.gatein.wsrp</groupId>
-         <artifactId>wsrp-producer-lib</artifactId>
-         <version>${project.version}</version>
-      </dependency>
-
-      <dependency>
-         <groupId>org.gatein.wsrp</groupId>
          <artifactId>test-framework</artifactId>
          <scope>test</scope>
          <version>${project.version}</version>
@@ -316,17 +310,11 @@
 
       <!-- Producer Sar Test Dependencies -->
       <!-- TODO: move versioning to the main pom.xml -->
-      <!--<dependency>
+      <dependency>
          <groupId>org.gatein.wci</groupId>
          <artifactId>wci-tomcat6</artifactId>
          <scope>test</scope>
          <version>${version.gatein.wci}</version>
-      </dependency>-->
-      <dependency>
-         <groupId>org.gatein.wci</groupId>
-         <artifactId>wci-tomcat</artifactId>
-         <scope>test</scope>
-         <version>${version.gatein.wci}</version>
       </dependency>
       <dependency>
          <groupId>org.gatein.wsrp</groupId>

Modified: components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-producer.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-producer.xml	2011-03-15 17:01:56 UTC (rev 6036)
+++ components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-producer.xml	2011-03-15 17:24:25 UTC (rev 6037)
@@ -1,72 +1,72 @@
 <assembly>
-  <id>producer</id>
-  <formats>
-    <format>sar</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
+   <id>producer</id>
+   <formats>
+      <format>sar</format>
+   </formats>
+   <includeBaseDirectory>false</includeBaseDirectory>
 
-  <fileSets>
-    <!-- Test Classes -->
-    <fileSet>
-      <directory>target/test-classes</directory>
-      <outputDirectory></outputDirectory>
-      <includes>
-        <include>org/gatein/wsrp/config/**</include>
-      </includes>
-    </fileSet>
-    <!-- Fileset for the sar strucuture -->
-    <fileSet>
-      <directory>src/test/producer-sar</directory>
-      <outputDirectory></outputDirectory>
-    </fileSet>
-  </fileSets>
+   <fileSets>
+      <!-- Test Classes -->
+      <fileSet>
+         <directory>target/test-classes</directory>
+         <outputDirectory></outputDirectory>
+         <includes>
+            <include>org/gatein/wsrp/config/**</include>
+         </includes>
+      </fileSet>
+      <!-- Fileset for the sar strucuture -->
+      <fileSet>
+         <directory>src/test/producer-sar</directory>
+         <outputDirectory></outputDirectory>
+      </fileSet>
+   </fileSets>
 
-  <moduleSets>
-    <moduleSet>
-<!--      <includes>
-        <include>org.gatein.wsrp:wsrp-producer-lib</include>
-      </includes> -->
-      <binaries/>
-    </moduleSet>
-  </moduleSets>
+   <moduleSets>
+      <moduleSet>
+         <!--      <includes>
+          <include>org.gatein.wsrp:wsrp-producer-lib</include>
+        </includes> -->
+         <binaries/>
+      </moduleSet>
+   </moduleSets>
 
-  <dependencySets>
-   <dependencySet>
-      <scope>test</scope>
-      <outputDirectory></outputDirectory>
-      <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
-      <includes>
-        <include>org.gatein.wsrp:test-framework</include>
+   <dependencySets>
+      <dependencySet>
+         <scope>test</scope>
+         <outputDirectory></outputDirectory>
+         <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+         <includes>
+            <include>org.gatein.wsrp:test-framework</include>
 
-        <include>org.gatein.wci:wci-tomcat</include>
-        <include>org.gatein.wci:wci-wci</include>
+            <include>org.gatein.wci:wci-tomcat6</include>
+            <include>org.gatein.wci:wci-wci</include>
 
-        <include>org.gatein.pc:pc-portlet</include>
-        <include>org.gatein.pc:pc-api</include>
-        <include>javax.portlet:portlet-api</include>
+            <include>org.gatein.pc:pc-portlet</include>
+            <include>org.gatein.pc:pc-api</include>
+            <include>javax.portlet:portlet-api</include>
 
-        <include>org.gatein.pc:pc-controller</include>
-        <include>org.gatein.pc:pc-mc</include>
+            <include>org.gatein.pc:pc-controller</include>
+            <include>org.gatein.pc:pc-mc</include>
 
-        <include>org.gatein.common:common-common</include>
-        <include>org.gatein.common:common-logging</include>
+            <include>org.gatein.common:common-common</include>
+            <include>org.gatein.common:common-logging</include>
 
-        <include>javax.ccpp:ccpp</include>
+            <include>javax.ccpp:ccpp</include>
 
-        <include>org.gatein.wsrp:wsrp-common</include>
-        <include>org.gatein.wsrp:wsrp-integration-api</include>
-        <include>org.gatein.wsrp:wsrp-producer-lib</include>
-        <include>org.gatein.wsrp:wsrp-wsrp1-ws</include>
-        <include>org.gatein.wsrp:wsrp-wsrp2-ws</include>
+            <include>org.gatein.wsrp:wsrp-common</include>
+            <include>org.gatein.wsrp:wsrp-integration-api</include>
+            <include>org.gatein.wsrp:wsrp-producer-lib</include>
+            <include>org.gatein.wsrp:wsrp-wsrp1-ws</include>
+            <include>org.gatein.wsrp:wsrp-wsrp2-ws</include>
 
-        <include>junit:junit</include>
-        <include>commons-fileupload:commons-fileupload</include>
+            <include>junit:junit</include>
+            <include>commons-fileupload:commons-fileupload</include>
 
-        <include>com.google.collections:google-collections</include>
+            <include>com.google.collections:google-collections</include>
 
-      </includes>
-    </dependencySet>
-  </dependencySets>
+         </includes>
+      </dependencySet>
+   </dependencySets>
 
 </assembly>