Return-Path: 
 <juddi-cvs-return-1782-apmail-ws-juddi-cvs-archive=ws.apache.org@ws.apache.org>
Delivered-To: apmail-ws-juddi-cvs-archive@www.apache.org
Received: (qmail 90598 invoked from network); 23 Sep 2009 17:56:01 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 23 Sep 2009 17:56:01 -0000
Received: (qmail 34072 invoked by uid 500); 23 Sep 2009 17:56:01 -0000
Delivered-To: apmail-ws-juddi-cvs-archive@ws.apache.org
Received: (qmail 34023 invoked by uid 500); 23 Sep 2009 17:56:01 -0000
Mailing-List: contact juddi-cvs-help@ws.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:juddi-cvs-help@ws.apache.org>
list-unsubscribe: <mailto:juddi-cvs-unsubscribe@ws.apache.org>
List-Post: <mailto:juddi-cvs@ws.apache.org>
List-Id: <juddi-cvs.ws.apache.org>
Delivered-To: mailing list juddi-cvs@ws.apache.org
Received: (qmail 34012 invoked by uid 99); 23 Sep 2009 17:56:01 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Sep 2009 17:56:01 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Sep 2009 17:55:57 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 9D0162388873; Wed, 23 Sep 2009 17:55:36 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r818178 - in /webservices/juddi/trunk/juddi-cxf:
 assembly.xml
 build.xml pom.xml
Date: Wed, 23 Sep 2009 17:55:36 -0000
To: juddi-cvs@ws.apache.org
From: tcunning@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090923175536.9D0162388873@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: tcunning
Date: Wed Sep 23 17:55:36 2009
New Revision: 818178

URL: http://svn.apache.org/viewvc?rev=818178&view=rev
Log:
JUDDI-188
Make juddi-cxf inherit from juddiv3-war.

Added:
    webservices/juddi/trunk/juddi-cxf/assembly.xml
    webservices/juddi/trunk/juddi-cxf/build.xml
Modified:
    webservices/juddi/trunk/juddi-cxf/pom.xml

Added: webservices/juddi/trunk/juddi-cxf/assembly.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-cxf/assembly.xml?rev=818178&view=auto
==============================================================================
--- webservices/juddi/trunk/juddi-cxf/assembly.xml (added)
+++ webservices/juddi/trunk/juddi-cxf/assembly.xml Wed Sep 23 17:55:36 2009
@@ -0,0 +1,25 @@
+<assembly>
+<id></id>
+<baseDirectory></baseDirectory>
+<formats>
+	<format>war</format>
+</formats>
+<fileSets>
+  <fileSet>
+  	<directory>${project.build.directory}/juddiv3war</directory>
+  	<outputDirectory></outputDirectory>
+  </fileSet>
+</fileSets>
+<dependencySets>
+  <dependencySet>
+    <includes>
+	<include>*:*</include>
+    </includes>
+    <excludes>
+	<exclude>javax.servlet:servlet-api</exclude>
+	<exclude>org.apache.juddi:juddiv3-war</exclude>
+    </excludes>
+    <outputDirectory>WEB-INF/lib</outputDirectory>
+  </dependencySet>
+</dependencySets>
+</assembly>

Added: webservices/juddi/trunk/juddi-cxf/build.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-cxf/build.xml?rev=818178&view=auto
==============================================================================
--- webservices/juddi/trunk/juddi-cxf/build.xml (added)
+++ webservices/juddi/trunk/juddi-cxf/build.xml Wed Sep 23 17:55:36 2009
@@ -0,0 +1,24 @@
+<project name="juddi-tomcat" default="package-war" basedir=".">
+	<property file="package.properties"/>
+	<property name="lib.dir" value="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/lib"/>
+	<property name="webapps.dir" value="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/webapps"/>
+
+	<target name="unzip-war">
+		<mkdir dir="${basedir}/target/juddiv3war"/>
+
+		<unzip dest="${basedir}/target/juddiv3war" src="${dependency.juddiv3.war}"/>
+	</target>
+	
+	<target name="copy-resources" depends="unzip-war">
+		<copy todir="${basedir}/target/juddiv3war/WEB-INF"
+			overwrite="true">
+			<fileset dir="${basedir}/src/main/webapp/WEB-INF">
+				<include name="**/*.xml"/>
+				<include name="**/*.properties"/>
+			</fileset>	
+		</copy>	
+	</target>
+	
+	<target name="package-war" depends="copy-resources"/>
+
+</project>

Modified: webservices/juddi/trunk/juddi-cxf/pom.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-cxf/pom.xml?rev=818178&r1=818177&r2=818178&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-cxf/pom.xml (original)
+++ webservices/juddi/trunk/juddi-cxf/pom.xml Wed Sep 23 17:55:36 2009
@@ -26,7 +26,7 @@
   <artifactId>juddi-cxf</artifactId>
   <version>3.0.0.SNAPSHOT</version>
   <name>jUDDI CXF Deployment</name>
-  <packaging>war</packaging>
+  <packaging>pom</packaging>
   <repositories>
     <!-- for jaxb-impl -->
     <repository>
@@ -72,21 +72,18 @@
       <artifactId>cglib-nodep</artifactId>
       <version>2.1_3</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.juddi</groupId>
+      <artifactId>juddiv3-war</artifactId>
+      <version>3.0.0.SNAPSHOT</version>
+      <type>war</type>
+    </dependency>
   </dependencies>
   <build>
+<!--
     <finalName>juddiv3</finalName>
+-->
     <plugins>	
-         <plugin>
-           <groupId>org.apache.maven.plugins</groupId>
-           <artifactId>maven-source-plugin</artifactId>
-           <executions>
-              <execution>
-               	  <goals> 
-  		     <goal>jar</goal>                               		
- 		  </goals>
-              </execution>
-           </executions>
-        </plugin>
         <plugin>
 	    <groupId>org.apache.maven.plugins</groupId>
 	    <artifactId>maven-antrun-plugin</artifactId>
@@ -94,9 +91,14 @@
 		<executions>
 		 <execution>
 			<id>foo</id>
-			<phase>generate-sources</phase>
+			<phase>package</phase>
 			<configuration>
 			<tasks>
+				<property name="dependency.juddiv3.war" value="${maven.dependency.org.apache.juddi.juddiv3-war.war.path}"/>
+				<ant antfile="${basedir}/build.xml">
+				  <target name="package-war"/>
+				</ant>
+
 				<copy file ="${basedir}/persistence/${persistence}-persistence.xml"
 					tofile="${basedir}/src/main/resources/META-INF/persistence.xml"
 					overwrite="true"/>
@@ -108,6 +110,25 @@
 		  </execution>
 		</executions>
       </plugin>
+	  <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+		  <artifactId>maven-assembly-plugin</artifactId>
+		  <version>2.2-beta-3</version>
+		  <executions>
+		    <execution>
+			  <id>make-assembly</id>
+			  <phase>package</phase>
+			  <goals>
+		                <goal>attached</goal>
+			  </goals>
+			  <configuration>
+			    <descriptors>
+			      <descriptor>${basedir}/assembly.xml</descriptor>
+				</descriptors>
+			  </configuration>
+			</execution>
+		 </executions>
+      </plugin>
     </plugins>
   </build>
 </project>



---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org