geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pra...@apache.org
Subject svn commit: r510157 - /geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/pom.xml
Date Wed, 21 Feb 2007 19:18:35 GMT
Author: prasad
Date: Wed Feb 21 11:18:35 2007
New Revision: 510157

URL: http://svn.apache.org/viewvc?view=rev&rev=510157
Log:
* merged deploy/undeploy executions into 1
* beautified pom.xml

Modified:
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/pom.xml

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/pom.xml?view=diff&rev=510157&r1=510156&r2=510157
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/pom.xml
(original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/pom.xml
Wed Feb 21 11:18:35 2007
@@ -18,28 +18,29 @@
     under the License.
 -->
 <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>
-
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>jaxws-tests</artifactId>
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-
     <artifactId>jaxws-client</artifactId>
     <name>Geronimo TestSuite :: WebServices TestSuite :: JAX-WS Client</name>
     <packaging>jar</packaging>
-
     <description>This project executes testcases for your testsuite</description>
-
     <properties>
-       <clientLogFile>${basedir}/target/client.log</clientLogFile>
+        <clientLogFile>${basedir}/target/client.log</clientLogFile>
     </properties>
-
     <dependencies>
         <dependency>
+            <groupId>org.apache.geronimo.testsuite</groupId>
+            <artifactId>jaxws-war</artifactId>
+            <type>war</type>
+            <version>${version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
             <groupId>javax.xml.ws</groupId>
             <artifactId>jaxws-api</artifactId>
             <scope>provided</scope>
@@ -55,10 +56,10 @@
             <artifactId>jaxb-impl</artifactId>
             <version>2.0.2</version>
             <exclusions>
-            	<exclusion>
-            		<artifactId>jsr173</artifactId>
-            		<groupId>javax.xml</groupId>
-            	</exclusion>
+                <exclusion>
+                    <artifactId>jsr173</artifactId>
+                    <groupId>javax.xml</groupId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -77,57 +78,55 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
-
     <build>
         <plugins>
             <plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.1</version>
-				<executions>
-					<execution>
-						<id>gen-ts</id>
-						<phase>generate-sources</phase>
-						<configuration>
-							<tasks>
-								<echo>Generating java from wsdl</echo>
-								<property name="schema.output.base.dir" value="target/schema"/>
-								<property name="schema.generated.src.dir" value="${schema.output.base.dir}/src"/>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.1</version>
+                <executions>
+                    <execution>
+                        <id>gen-ts</id>
+                        <phase>generate-sources</phase>
+                        <configuration>
+                            <tasks>
+                                <echo>Generating java from wsdl</echo>
+                                <property name="schema.output.base.dir" value="target/schema"/>
+                                <property name="schema.generated.src.dir" value="${schema.output.base.dir}/src"/>
 								
-								<mkdir dir="${schema.output.base.dir}"/>
-								<mkdir dir="${schema.generated.src.dir}"/>
-
-								<java classname="com.sun.tools.xjc.Driver" fork="true">
-										<classpath refid="maven.runtime.classpath"/>
-										<classpath location="${compiled.classes.dir}"/>
-									<arg line="-d ${schema.generated.src.dir} -quiet -wsdl src/main/resources/META-INF/wsdl/greeter_control.wsdl"/>
-								</java>
-							</tasks>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-				</executions>
-            </plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<executions>
-				<execution>
-					<id>add-source</id>
-					<phase>generate-sources</phase>
-					<goals>
-					  <goal>add-source</goal>
-					</goals>
-					<configuration>
-					  <sources>
-						<source>target/schema/src</source>
-					</sources>
-					</configuration>
-				</execution>
-				</executions>
-			  </plugin>
+                                <mkdir dir="${schema.output.base.dir}"/>
+                                <mkdir dir="${schema.generated.src.dir}"/>
+                                <java classname="com.sun.tools.xjc.Driver" fork="true">
+                                    <classpath refid="maven.runtime.classpath"/>
+                                    <classpath location="${compiled.classes.dir}"/>
+                                    <arg line="-d ${schema.generated.src.dir} -quiet -wsdl
src/main/resources/META-INF/wsdl/greeter_control.wsdl"/>
+                                </java>
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>target/schema/src</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
@@ -139,7 +138,6 @@
                     </archive>
                 </configuration>
             </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -152,7 +150,6 @@
                     </systemProperties>
                 </configuration>
             </plugin>
-
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>testsuite-maven-plugin</artifactId>
@@ -176,18 +173,15 @@
                     </execution>
                 </executions>
             </plugin>
-
             <plugin>
                 <groupId>org.apache.geronimo.genesis.plugins</groupId>
                 <artifactId>tools-maven-plugin</artifactId>
                 <extensions>true</extensions>
             </plugin>
-
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>geronimo-maven-plugin</artifactId>
                 <executions>
-
                     <execution>
                         <id>deploy-service</id>
                         <phase>pre-integration-test</phase>
@@ -195,17 +189,14 @@
                             <goal>deploy-module</goal>
                         </goals>
                         <configuration>
-                            <moduleArchive>${settings.localRepository}/org/apache/geronimo/testsuite/jaxws-war/${version}/jaxws-war-${version}.war</moduleArchive>
-                        </configuration>
-                    </execution>
-
-                    <execution>
-                        <id>deploy-client</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>deploy-module</goal>
-                        </goals>
-                        <configuration>
+                            <modules>
+                                <module>
+                                    <groupId>org.apache.geronimo.testsuite</groupId>
+                                    <artifactId>jaxws-war</artifactId>
+                                    <type>war</type>
+                                    <version>${version}</version>
+                                </module>
+                            </modules>
                             <moduleArchive>${project.build.directory}/${artifactId}-${version}.jar</moduleArchive>
                         </configuration>
                     </execution>
@@ -224,31 +215,30 @@
                     </execution>
 
                     <execution>
-                        <id>undeploy-client-as-moduleId</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>undeploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleId>JEE5/JAXWSClientServer/1.1/car</moduleId>
-                        </configuration>
-                    </execution>
-
-                    <execution>
-                        <id>undeploy-service-as-moduleId</id>
+                        <id>undeploy-client-as-modules</id>
                         <phase>post-integration-test</phase>
                         <goals>
                             <goal>undeploy-module</goal>
                         </goals>
                         <configuration>
-                            <moduleId>JEE5/JAXWSServlet/1.1/car</moduleId>
+                            <modules>
+                                <module>
+                                    <groupId>JEE5</groupId>
+                                    <artifactId>JAXWSClientServer</artifactId>
+                                    <version>1.1</version>
+                                    <type>car</type>
+                                </module>
+                                <module>
+                                    <groupId>JEE5</groupId>
+                                    <artifactId>JAXWSServlet</artifactId>
+                                    <version>1.1</version>
+                                    <type>car</type>
+                                </module>
+                            </modules>
                         </configuration>
                     </execution>
-
                 </executions>
             </plugin>
         </plugins>
     </build>
-
 </project>
-



Mime
View raw message