cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r757981 - in /cxf/branches/2.1.x-fixes: ./ systests/pom.xml
Date Tue, 24 Mar 2009 19:44:39 GMT
Author: dkulp
Date: Tue Mar 24 19:44:38 2009
New Revision: 757981

URL: http://svn.apache.org/viewvc?rev=757981&view=rev
Log:
Merged revisions 757951 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r757951 | dkulp | 2009-03-24 14:49:34 -0400 (Tue, 24 Mar 2009) | 2 lines
  
  Try to get xmlbeans stuff to run after a clean
........

Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/systests/pom.xml

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 24 19:44:38 2009
@@ -1 +1 @@
-/cxf/trunk:753380,753397,753421,754585,755365,757859,757899,757935
+/cxf/trunk:753380,753397,753421,754585,755365,757859,757899,757935,757951

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.1.x-fixes/systests/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/pom.xml?rev=757981&r1=757980&r2=757981&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/systests/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/systests/pom.xml Tue Mar 24 19:44:38 2009
@@ -35,40 +35,41 @@
         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/cxf/trunk/systests</developerConnection>
     </scm>
     <build>
-	  <plugins>
-		<plugin>
-			<artifactId>maven-resources-plugin</artifactId>
-			<executions>
-				<execution>
-					<id>copy-resources</id>
-					<phase>validate</phase>
-					<goals>
-						<goal>copy-resources</goal>
-					</goals>
-					<configuration>
-						<outputDirectory>${basedir}/target/test-classes/schemaorg_apache_xmlbeans</outputDirectory>
-						<resources>
-							<resource>
-								<directory>${basedir}/target/generated/src/test/java/schemaorg_apache_xmlbeans</directory>
-								<includes>
-									<include>**/*.xsb</include>
-									<include>**/*.class</include>
-								</includes>
-							</resource>
-						</resources>
-					</configuration>
-				</execution>
-			</executions>
-	    </plugin>
+        <plugins>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-test-resources</id>
+                        <phase>process-test-sources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/test-classes/schemaorg_apache_xmlbeans</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>${basedir}/target/generated/src/test/java/schemaorg_apache_xmlbeans</directory>
+                                    <includes>
+                                        <include>**/*.xsb</include>
+                                        <include>**/*.class</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
 	
         
+
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
                 <version>1.0</version>
                 <executions>
                     <execution>
-                        <id>add-source</id>
+                        <id>add-test-source</id>
                         <phase>generate-test-sources</phase>
                         <goals>
                             <goal>add-test-source</goal>
@@ -110,14 +111,14 @@
                         <configuration>
                             <testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
                             <wsdlOptions>
-				<wsdlOption>
-				    <wsdl>${basedir}/src/test/resources/wsdl/xmlbeans/hello_world.wsdl</wsdl>
-					<extraargs>
-					  <extraarg>-db</extraarg>
-					  <extraarg>xmlbeans</extraarg>
-					  </extraargs>
-				</wsdlOption>
-			    </wsdlOptions>
+                                <wsdlOption>
+                                    <wsdl>${basedir}/src/test/resources/wsdl_systest/xmlbeans/hello_world.wsdl</wsdl>
+                                    <extraargs>
+                                        <extraarg>-db</extraarg>
+                                        <extraarg>xmlbeans</extraarg>
+                                    </extraargs>
+                                </wsdlOption>
+                            </wsdlOptions>
                         </configuration>
                         <goals>
                             <goal>wsdl2java</goal>
@@ -311,9 +312,9 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-	    <groupId>org.apache.cxf</groupId>
-	    <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-	    <version>${project.version}</version>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
@@ -354,13 +355,13 @@
             <artifactId>aspectjweaver</artifactId>
             <version>1.5.4</version>
             <scope>test</scope>
-        </dependency>  
+        </dependency>
         <dependency>
             <groupId>cglib</groupId>
             <artifactId>cglib-nodep</artifactId>
             <version>${cglib-nodep.version}</version>
             <scope>test</scope>
-        </dependency> 
+        </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
@@ -390,62 +391,63 @@
             <version>${spring.version}</version>
         </dependency>
         <dependency>
-           <groupId>org.springframework.security</groupId>
-           <artifactId>spring-security-core-tiger</artifactId>
-           <version>2.0.4</version>
-           <scope>test</scope> 
-           <exclusions>
-             <exclusion>
-              <groupId>org.springframework</groupId>
-              <artifactId>spring-core</artifactId>
-             </exclusion>
-             <exclusion>
-               <groupId>org.springframework</groupId>
-               <artifactId>spring-dao</artifactId>
-             </exclusion>
-             <exclusion>
-               <groupId>org.springframework</groupId>
-               <artifactId>spring-jdbc</artifactId>
-             </exclusion>
-             <exclusion>
-               <groupId>org.springframework</groupId>
-               <artifactId>spring-remoting</artifactId>
-             </exclusion> 
-             <exclusion>
-              <groupId>org.springframework</groupId>
-              <artifactId>spring-support</artifactId>
-             </exclusion>
-           </exclusions>
-        </dependency> 
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-core-tiger</artifactId>
+            <version>2.0.4</version>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-dao</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-jdbc</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-remoting</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-support</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         
+
         <dependency>
-           <groupId>org.springframework.security</groupId>
-           <artifactId>spring-security-acl</artifactId>
-           <version>2.0.4</version>
-           <scope>test</scope> 
-           <exclusions>
-             <exclusion>
-              <groupId>org.springframework</groupId>
-              <artifactId>spring-core</artifactId>
-             </exclusion>
-             <exclusion>
-               <groupId>org.springframework</groupId>
-               <artifactId>spring-dao</artifactId>
-             </exclusion>
-             <exclusion>
-               <groupId>org.springframework</groupId>
-               <artifactId>spring-jdbc</artifactId>
-             </exclusion>
-             <exclusion>
-               <groupId>org.springframework</groupId>
-               <artifactId>spring-remoting</artifactId>
-             </exclusion> 
-             <exclusion>
-              <groupId>org.springframework</groupId>
-              <artifactId>spring-support</artifactId>
-             </exclusion>
-           </exclusions>
-        </dependency>  
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-acl</artifactId>
+            <version>2.0.4</version>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-dao</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-jdbc</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-remoting</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-support</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -469,16 +471,16 @@
             <groupId>org.apache.servicemix</groupId>
             <artifactId>servicemix-core</artifactId>
             <version>${servicemix.version}</version>
-           <exclusions>
-             <exclusion>
-              <groupId>jaxen</groupId>
-              <artifactId>jaxen</artifactId>
-             </exclusion>
-             <exclusion>
-                 <groupId>org.codehaus.woodstox</groupId>
-                 <artifactId>wstx-asl</artifactId>
-             </exclusion>
-           </exclusions>
+            <exclusions>
+                <exclusion>
+                    <groupId>jaxen</groupId>
+                    <artifactId>jaxen</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.codehaus.woodstox</groupId>
+                    <artifactId>wstx-asl</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>



Mime
View raw message