[jbossws-commits] JBossWS SVN: r6595 - in stack/cxf/branches/tdiesler/trunk: modules/server and 4 other directories.

jbossws-commits at lists.jboss.org jbossws-commits at lists.jboss.org
Mon Apr 21 15:00:31 EDT 2008


Author: thomas.diesler at jboss.com
Date: 2008-04-21 15:00:30 -0400 (Mon, 21 Apr 2008)
New Revision: 6595

Removed:
   stack/cxf/branches/tdiesler/trunk/modules/testsuite/framework-tests/src/scripts/
Modified:
   stack/cxf/branches/tdiesler/trunk/
   stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml
   stack/cxf/branches/tdiesler/trunk/modules/testsuite/framework-tests/
   stack/cxf/branches/tdiesler/trunk/modules/testsuite/framework-tests/pom.xml
   stack/cxf/branches/tdiesler/trunk/modules/testsuite/framework-tests/src/test/
   stack/cxf/branches/tdiesler/trunk/modules/testsuite/pom.xml
   stack/cxf/branches/tdiesler/trunk/pom.xml
Log:
more work on framework tests


Property changes on: stack/cxf/branches/tdiesler/trunk
___________________________________________________________________
Name: svn:ignore
   - ant.properties
clipboard.*
target
version.properties.md5
.settings
profiles.xml

   + ant.properties
clipboard.*
target
.settings
profiles.xml


Modified: stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml	2008-04-21 18:58:44 UTC (rev 6594)
+++ stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml	2008-04-21 19:00:30 UTC (rev 6595)
@@ -77,6 +77,10 @@
       <artifactId>cxf-rt-ws-policy</artifactId>
     </dependency>
     <dependency>
+      <groupId>javax.xml</groupId>
+      <artifactId>jaxrpc-api</artifactId>
+    </dependency>
+    <dependency>
       <groupId>stax</groupId>
       <artifactId>stax-api</artifactId>
     </dependency>


Property changes on: stack/cxf/branches/tdiesler/trunk/modules/testsuite/framework-tests
___________________________________________________________________
Name: svn:ignore
   + target


Modified: stack/cxf/branches/tdiesler/trunk/modules/testsuite/framework-tests/pom.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/modules/testsuite/framework-tests/pom.xml	2008-04-21 18:58:44 UTC (rev 6594)
+++ stack/cxf/branches/tdiesler/trunk/modules/testsuite/framework-tests/pom.xml	2008-04-21 19:00:30 UTC (rev 6595)
@@ -16,6 +16,43 @@
   <build>
     <plugins>
       <plugin>
+        <artifactId>maven-clean-plugin</artifactId>
+        <configuration>
+          <filesets>
+            <fileset>
+              <directory>src/test</directory>
+              <includes>
+                <include>ant-import/**</include>
+                <include>java/**</include>
+                <include>resources/**</include>
+              </includes>
+            </fileset>
+          </filesets>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>org.jboss.ws</groupId>
+                  <artifactId>jbossws-framework</artifactId>
+                  <classifier>testsuite</classifier>
+                  <type>zip</type>
+                </artifactItem>
+              </artifactItems>
+              <outputDirectory>src/test</outputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>
           <execution>
@@ -26,8 +63,8 @@
             <configuration>
               <tasks>
                 <property name="tests.output.dir" value="${project.build.directory}"/>
-                <ant antfile="src/scripts/framework-jars-jaxws.xml" target="build-jars-jaxws"/>
-                <ant antfile="src/scripts/framework-samples-jaxws.xml" target="build-samples-jaxws"/>
+                <ant antfile="src/test/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/>
+                <ant antfile="src/test/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws"/>
               </tasks>
             </configuration>
           </execution>
@@ -152,4 +189,16 @@
     </profile>
   </profiles>
   
+  <!-- Reporting -->
+  <reporting>
+    <plugins>
+      <plugin>
+        <artifactId>maven-surefire-report-plugin</artifactId>
+        <configuration>
+          <showSuccess>false</showSuccess>
+        </configuration>
+      </plugin>
+    </plugins>
+  </reporting>
+  
 </project>


Property changes on: stack/cxf/branches/tdiesler/trunk/modules/testsuite/framework-tests/src/test
___________________________________________________________________
Name: svn:externals
   - resources  http://anonsvn.jboss.org/repos/jbossws/framework/trunk/testsuite/test/resources
java       http://anonsvn.jboss.org/repos/jbossws/framework/trunk/testsuite/test/java


Name: svn:ignore
   + ant-import
java
resources


Modified: stack/cxf/branches/tdiesler/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/modules/testsuite/pom.xml	2008-04-21 18:58:44 UTC (rev 6594)
+++ stack/cxf/branches/tdiesler/trunk/modules/testsuite/pom.xml	2008-04-21 19:00:30 UTC (rev 6595)
@@ -38,6 +38,12 @@
     </dependency>
     <dependency>
       <groupId>org.jboss.ws</groupId>
+      <artifactId>jbossws-framework</artifactId>
+      <classifier>testsuite</classifier>
+      <type>zip</type>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.ws</groupId>
       <artifactId>jbossws-spi</artifactId>
     </dependency>
     <dependency>

Modified: stack/cxf/branches/tdiesler/trunk/pom.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/pom.xml	2008-04-21 18:58:44 UTC (rev 6594)
+++ stack/cxf/branches/tdiesler/trunk/pom.xml	2008-04-21 19:00:30 UTC (rev 6595)
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <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>
@@ -65,6 +64,13 @@
       </dependency>
       <dependency>
         <groupId>org.jboss.ws</groupId>
+        <artifactId>jbossws-framework</artifactId>
+        <version>${version}</version>
+        <classifier>testsuite</classifier>
+        <type>zip</type>
+      </dependency>
+      <dependency>
+        <groupId>org.jboss.ws</groupId>
         <artifactId>jbossws-jboss42</artifactId>
         <version>${jbossws.jboss42.version}</version>
       </dependency>




More information about the jbossws-commits mailing list