You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by ks...@apache.org on 2010/02/02 02:11:20 UTC

svn commit: r905487 [1/2] - in /webservices/juddi/trunk: ./ docs/ docs/devguide/ docs/userguide/ juddi-client/ juddi-console/ juddi-console/juddi-portal/ juddi-console/uddi-portlets/ juddi-core/ juddi-cxf/ juddi-dist/ juddi-tomcat/ juddiv3-samples/ jud...

Author: kstam
Date: Tue Feb  2 01:11:18 2010
New Revision: 905487

URL: http://svn.apache.org/viewvc?rev=905487&view=rev
Log:
JUDDI-299 Applying patch from David Jencks.

Modified:
    webservices/juddi/trunk/docs/devguide/pom.xml
    webservices/juddi/trunk/docs/pom.xml
    webservices/juddi/trunk/docs/userguide/pom.xml
    webservices/juddi/trunk/juddi-client/pom.xml
    webservices/juddi/trunk/juddi-console/juddi-portal/assembly.xml
    webservices/juddi/trunk/juddi-console/juddi-portal/pom.xml
    webservices/juddi/trunk/juddi-console/pom.xml
    webservices/juddi/trunk/juddi-console/uddi-portlets/pom.xml
    webservices/juddi/trunk/juddi-core/pom.xml
    webservices/juddi/trunk/juddi-cxf/pom.xml
    webservices/juddi/trunk/juddi-dist/assembly.xml
    webservices/juddi/trunk/juddi-dist/pom.xml
    webservices/juddi/trunk/juddi-tomcat/pom.xml
    webservices/juddi/trunk/juddiv3-samples/pom.xml
    webservices/juddi/trunk/juddiv3-war/pom.xml
    webservices/juddi/trunk/pom.xml
    webservices/juddi/trunk/site/pom.xml
    webservices/juddi/trunk/uddi-tck-base/pom.xml
    webservices/juddi/trunk/uddi-tck/pom.xml
    webservices/juddi/trunk/uddi-ws/pom.xml

Modified: webservices/juddi/trunk/docs/devguide/pom.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/docs/devguide/pom.xml?rev=905487&r1=905486&r2=905487&view=diff
==============================================================================
--- webservices/juddi/trunk/docs/devguide/pom.xml (original)
+++ webservices/juddi/trunk/docs/devguide/pom.xml Tue Feb  2 01:11:18 2010
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.juddi</groupId>
   <artifactId>devguide</artifactId>
-  <version>3.0.2.SNAPSHOT</version>
+  <version>3.0.2-SNAPSHOT</version>
   <packaging>jdocbook</packaging>
   <name>jUDDI Dev Guide -(en-US)</name>
   <properties>

Modified: webservices/juddi/trunk/docs/pom.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/docs/pom.xml?rev=905487&r1=905486&r2=905487&view=diff
==============================================================================
--- webservices/juddi/trunk/docs/pom.xml (original)
+++ webservices/juddi/trunk/docs/pom.xml Tue Feb  2 01:11:18 2010
@@ -14,54 +14,52 @@
  * See the License for the specific language governing permissions and
  * limitations 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">
-  <parent>
-    <groupId>org.apache.juddi</groupId>
-    <artifactId>juddi-parent</artifactId>
-    <version>3.0.2.SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion> 
-  <groupId>org.apache.juddi</groupId>
-  <artifactId>juddi-docs</artifactId>
-  <version>3.0.2.SNAPSHOT</version>
-  <name>jUDDI Document Packaging</name>
-  <url>http://maven.apache.org</url>
-  <packaging>pom</packaging>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.juddi</groupId>
-      <artifactId>juddi-core</artifactId>
-      <version>3.0.2.SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <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>
-  <modules>
-     <module>userguide</module>
-     <module>devguide</module>
-  </modules>
-
-</project>
+	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.juddi</groupId>
+		<artifactId>juddi-parent</artifactId>
+		<version>3.0.2-SNAPSHOT</version>
+	</parent>
+	<artifactId>juddi-docs</artifactId>
+	<name>jUDDI Document Packaging</name>
+	<url>http://maven.apache.org</url>
+	<packaging>pom</packaging>
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.juddi</groupId>
+			<artifactId>juddi-core</artifactId>
+			<version>3.0.2-SNAPSHOT</version>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<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>
+	<modules>
+		<module>userguide</module>
+		<module>devguide</module>
+	</modules>
+</project>
\ No newline at end of file

Modified: webservices/juddi/trunk/docs/userguide/pom.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/docs/userguide/pom.xml?rev=905487&r1=905486&r2=905487&view=diff
==============================================================================
--- webservices/juddi/trunk/docs/userguide/pom.xml (original)
+++ webservices/juddi/trunk/docs/userguide/pom.xml Tue Feb  2 01:11:18 2010
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.juddi</groupId>
   <artifactId>userguide</artifactId>
-  <version>3.0.2.SNAPSHOT</version>
+  <version>3.0.2-SNAPSHOT</version>
   <packaging>jdocbook</packaging>
   <name>jUDDI User Guide -(en-US)</name>
 

Modified: webservices/juddi/trunk/juddi-client/pom.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-client/pom.xml?rev=905487&r1=905486&r2=905487&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-client/pom.xml (original)
+++ webservices/juddi/trunk/juddi-client/pom.xml Tue Feb  2 01:11:18 2010
@@ -16,22 +16,20 @@
  *
  */ -->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.juddi</groupId>
     <artifactId>juddi-parent</artifactId>
-    <version>3.0.2.SNAPSHOT</version>
+    <version>3.0.2-SNAPSHOT</version>
   </parent> 
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.juddi</groupId>
   <artifactId>juddi-client</artifactId>
-  <version>3.0.2.SNAPSHOT</version>
+  <packaging>bundle</packaging>
   <name>jUDDI Client side Code</name>
-  <packaging>jar</packaging>  
   <dependencies>
     <dependency>
         <groupId>org.apache.juddi</groupId>
         <artifactId>uddi-ws</artifactId>
-        <version>3.0.2.SNAPSHOT</version>
+        <version>3.0.2-SNAPSHOT</version>
      </dependency>
     <dependency>
         <groupId>log4j</groupId>
@@ -66,19 +64,4 @@
         <scope>test</scope>
      </dependency>
   </dependencies> 
-  <build>
-    <plugins>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-source-plugin</artifactId>
-            <executions>
-               <execution>
-                  <goals>
-                     <goal>jar</goal>
-                  </goals>
-               </execution>
-             </executions>
-        </plugin>
-    </plugins>
-  </build>
 </project>

Modified: webservices/juddi/trunk/juddi-console/juddi-portal/assembly.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/juddi-portal/assembly.xml?rev=905487&r1=905486&r2=905487&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-console/juddi-portal/assembly.xml (original)
+++ webservices/juddi/trunk/juddi-console/juddi-portal/assembly.xml Tue Feb  2 01:11:18 2010
@@ -1,12 +1,14 @@
 <assembly>
-  <id></id>
-  <formats>
-    <format>zip</format>
-  </formats>
-  <fileSets>
-    <fileSet>
-	  <directory>${project.build.directory}/tomcat/juddi-tomcat-3.0.2.SNAPSHOT</directory>
-	  <outputDirectory></outputDirectory>
-    </fileSet>
-  </fileSets>
-</assembly>
+	<id />
+	<formats>
+		<format>zip</format>
+	</formats>
+	<fileSets>
+		<fileSet>
+			<directory>
+				${project.build.directory}/tomcat/juddi-tomcat-3.0.2-SNAPSHOT
+			</directory>
+			<outputDirectory />
+		</fileSet>
+	</fileSets>
+</assembly>
\ No newline at end of file

Modified: webservices/juddi/trunk/juddi-console/juddi-portal/pom.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/juddi-portal/pom.xml?rev=905487&r1=905486&r2=905487&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-console/juddi-portal/pom.xml (original)
+++ webservices/juddi/trunk/juddi-console/juddi-portal/pom.xml Tue Feb  2 01:11:18 2010
@@ -16,172 +16,178 @@
  *
  */ -->
 <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">
-  <parent>
-    <groupId>org.apache.juddi</groupId>
-    <artifactId>juddi-console</artifactId>
-    <version>3.0.2.SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion> 
-  <groupId>org.apache.juddi</groupId>
-  <artifactId>juddi-portal-bundle</artifactId>
-  <version>3.0.2.SNAPSHOT</version>
-  <name>jUDDI Portal</name>
-  <url>http://maven.apache.org</url>
-  <packaging>pom</packaging>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.juddi</groupId>
-      <artifactId>juddi-tomcat</artifactId>
-      <version>3.0.2.SNAPSHOT</version> 
-      <type>zip</type>
-    </dependency>
-    <dependency>
-	    <groupId>org.apache.juddi</groupId>
-	    <artifactId>uddi-portlets</artifactId>
-	    <version>3.0.2.SNAPSHOT</version>
-	    <type>war</type>
-    </dependency>
-    <dependency>
-	    <groupId>org.apache.pluto</groupId>
-	    <artifactId>pluto-portal</artifactId>
-	    <version>1.1.7</version>
-	    <type>war</type>
-     </dependency>
-     <dependency>
-	    <groupId>org.apache.pluto</groupId>
-	    <artifactId>pluto-container</artifactId>
-	    <version>1.1.7</version>
-	    <type>jar</type>
-     </dependency>
-     <dependency>
-	    <groupId>org.apache.pluto</groupId>
-	    <artifactId>pluto-descriptor-api</artifactId>
-	    <version>1.1.7</version>
-	    <type>jar</type>
-     </dependency>
-     <dependency>
-	    <groupId>org.apache.pluto</groupId>
-	    <artifactId>pluto-descriptor-impl</artifactId>
-	    <version>1.1.7</version>
-	    <type>jar</type>
-     </dependency>
-     <dependency>
-	    <groupId>org.apache.pluto</groupId>
-	    <artifactId>pluto-taglib</artifactId>
-	    <version>1.1.7</version>
-	    <type>jar</type>
-     </dependency>
-     <dependency>
-	    <groupId>org.apache.pluto</groupId>
-	    <artifactId>pluto-container</artifactId>
-	    <version>1.1.7</version>
-	    <type>jar</type>
-     </dependency>
-     <dependency>
-      <groupId>javax.portlet</groupId>
-      <artifactId>portlet-api</artifactId>
-      <version>1.0</version>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.castor</groupId>
-      <artifactId>castor</artifactId>
-      <version>1.1.1</version>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>javax.transaction</groupId>
-          <artifactId>jta</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>xerces</groupId>
-          <artifactId>xerces</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>log4j</groupId>
-          <artifactId>log4j</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-    	<groupId>commons-logging</groupId>
-    	<artifactId>commons-logging</artifactId>
-    	<version>1.1</version>
-    </dependency> 
-  </dependencies>
-  <repositories>
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<parent>
+		<groupId>org.apache.juddi</groupId>
+		<artifactId>juddi-console</artifactId>
+		<version>3.0.2-SNAPSHOT</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>juddi-portal-bundle</artifactId>
+	<name>jUDDI Portal</name>
+	<url>http://maven.apache.org</url>
+	<packaging>pom</packaging>
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.juddi</groupId>
+			<artifactId>juddi-tomcat</artifactId>
+			<version>3.0.2-SNAPSHOT</version>
+			<type>zip</type>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.juddi</groupId>
+			<artifactId>uddi-portlets</artifactId>
+			<version>3.0.2-SNAPSHOT</version>
+			<type>war</type>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.pluto</groupId>
+			<artifactId>pluto-portal</artifactId>
+			<version>1.1.7</version>
+			<type>war</type>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.pluto</groupId>
+			<artifactId>pluto-container</artifactId>
+			<version>1.1.7</version>
+			<type>jar</type>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.pluto</groupId>
+			<artifactId>pluto-descriptor-api</artifactId>
+			<version>1.1.7</version>
+			<type>jar</type>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.pluto</groupId>
+			<artifactId>pluto-descriptor-impl</artifactId>
+			<version>1.1.7</version>
+			<type>jar</type>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.pluto</groupId>
+			<artifactId>pluto-taglib</artifactId>
+			<version>1.1.7</version>
+			<type>jar</type>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.pluto</groupId>
+			<artifactId>pluto-container</artifactId>
+			<version>1.1.7</version>
+			<type>jar</type>
+		</dependency>
+		<dependency>
+			<groupId>javax.portlet</groupId>
+			<artifactId>portlet-api</artifactId>
+			<version>1.0</version>
+			<type>jar</type>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.castor</groupId>
+			<artifactId>castor</artifactId>
+			<version>1.1.1</version>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>javax.transaction</groupId>
+					<artifactId>jta</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>xerces</groupId>
+					<artifactId>xerces</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>log4j</groupId>
+					<artifactId>log4j</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>1.1</version>
+		</dependency>
+	</dependencies>
+	<repositories>
 		<repository>
 			<id>apache</id>
 			<url>http://people.apache.org/repo/m2-snapshot-repository</url>
 		</repository>
 	</repositories>
-  <build>
-    <plugins>
-      <plugin>
-	<groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-install-plugin</artifactId>
-        <version>2.1</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.3</version>
-        <executions>
-          <execution>
-            <id>test</id>
-            <phase>package</phase>
-            <configuration>
-              <tasks>
-               <property name="compile_classpath" refid="maven.compile.classpath"/>
-               <property name="runtime_classpath" refid="maven.runtime.classpath"/>
-               <property name="test_classpath"    refid="maven.test.classpath"/>
-               <property name="plugin_classpath"  refid="maven.plugin.classpath"/>
-               <property name="project.version"       value="${project.version}"/>
-		       <property name="dependency.castor.jar"  value="${maven.dependency.org.codehaus.castor.castor.jar.path}"/>
-		       <property name="dependency.pluto-container.jar"  value="${maven.dependency.org.apache.pluto.pluto-container.jar.path}"/>
-		       <property name="dependency.pluto-descriptor-api.jar" value="${maven.dependency.org.apache.pluto.pluto-descriptor-api.jar.path}"/>
-		       <property name="dependency.pluto-descriptor-impl.jar"  value="${maven.dependency.org.apache.pluto.pluto-descriptor-impl.jar.path}"/>
-		       <property name="dependency.pluto-taglib.jar"  value="${maven.dependency.org.apache.pluto.pluto-taglib.jar.path}"/>
-		       <property name="dependency.pluto-portal.war"  value="${maven.dependency.org.apache.pluto.pluto-portal.war.path}"/>
-		       <property name="dependency.commons-logging.jar" value="${maven.dependency.commons-logging.commons-logging.jar.path}"/> 
-		       <property name="dependency.portlet-api.jar"  value="${maven.dependency.javax.portlet.portlet-api.jar.path}"/>
-		       <property name="dependency.uddi-portlets.war"  value="${maven.dependency.org.apache.juddi.uddi-portlets.war.path}"/>
-		       <property name="dependency.juddi-tomcat.zip" value="${maven.dependency.org.apache.juddi.juddi-tomcat.zip.path}"/>
-		       <ant antfile="${basedir}/build.xml">
-                  <target name="package-tomcat"/>
-               </ant>
-              </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </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>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-install-plugin</artifactId>
+				<version>2.1</version>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<version>1.3</version>
+				<executions>
+					<execution>
+						<id>test</id>
+						<phase>package</phase>
+						<configuration>
+							<tasks>
+							    <property name="dependency.juddi-tomcat.zip" value="${maven.dependency.org.apache.juddi.juddi-tomcat.zip.path}"/>
+								<property name="compile_classpath" refid="maven.compile.classpath" />
+								<property name="runtime_classpath" refid="maven.runtime.classpath" />
+								<property name="test_classpath" refid="maven.test.classpath" />
+								<property name="plugin_classpath" refid="maven.plugin.classpath" />
+								<property name="project.version" value="${project.version}" />
+								<property name="dependency.castor.jar"
+									value="${maven.dependency.org.codehaus.castor.castor.jar.path}" />
+								<property name="dependency.pluto-container.jar"
+									value="${maven.dependency.org.apache.pluto.pluto-container.jar.path}" />
+								<property name="dependency.pluto-descriptor-api.jar"
+									value="${maven.dependency.org.apache.pluto.pluto-descriptor-api.jar.path}" />
+								<property name="dependency.pluto-descriptor-impl.jar"
+									value="${maven.dependency.org.apache.pluto.pluto-descriptor-impl.jar.path}" />
+								<property name="dependency.pluto-taglib.jar"
+									value="${maven.dependency.org.apache.pluto.pluto-taglib.jar.path}" />
+								<property name="dependency.pluto-portal.war"
+									value="${maven.dependency.org.apache.pluto.pluto-portal.war.path}" />
+								<property name="dependency.commons-logging.jar"
+									value="${maven.dependency.commons-logging.commons-logging.jar.path}" />
+								<property name="dependency.portlet-api.jar"
+									value="${maven.dependency.javax.portlet.portlet-api.jar.path}" />
+								<property name="dependency.uddi-portlets.war"
+									value="${maven.dependency.org.apache.juddi.uddi-portlets.war.path}" />
+								<ant antfile="${basedir}/build.xml">
+									<target name="package-tomcat" />
+								</ant>
+							</tasks>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</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>
\ No newline at end of file

Modified: webservices/juddi/trunk/juddi-console/pom.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/pom.xml?rev=905487&r1=905486&r2=905487&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-console/pom.xml (original)
+++ webservices/juddi/trunk/juddi-console/pom.xml Tue Feb  2 01:11:18 2010
@@ -1,90 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright 2001-2009 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */ -->
+	<!--
+		* Copyright 2001-2009 The Apache Software Foundation. * * Licensed
+		under the Apache License, Version 2.0 (the "License"); * you may not
+		use this file except in compliance with the License. * You may obtain
+		a copy of the License at * *
+		http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by
+		applicable law or agreed to in writing, software * distributed under
+		the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES
+		OR CONDITIONS OF ANY KIND, either express or implied. * See the
+		License for the specific language governing permissions and *
+		limitations 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> 
-  <groupId>org.apache.juddi</groupId>
-  <artifactId>juddi-console</artifactId>
-  <version>3.0.2.SNAPSHOT</version>
-  <name>jUDDI Console</name>
-  <url>http://maven.apache.org</url>
-  <packaging>pom</packaging>
-  <inceptionYear>2009</inceptionYear>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/webservices/juddi/branches/v3_trunk/juddi-console/</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/juddi/branches/v3_trunk/juddi-console/</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/webservices/juddi/branches/v3_trunk/juddi-console/</url>
-  </scm>
-  <distributionManagement>
-    <repository>
-      <id>apache-repo</id>
-      <name>Maven Central Repository</name>
-      <url>scpexe://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
-    </repository>
-    <snapshotRepository>
-      <id>apache-snapshots</id>
-      <name>Apache Development Repository</name>
-      <url>scpexe://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
-    </snapshotRepository>
-  </distributionManagement>
-  <modules>
-    <module>uddi-portlets</module>
-    <module>juddi-portal</module>
-  </modules>
-   <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <profiles>
-    <profile>
-      <id>release</id>
-      <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-gpg-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>sign-artifacts</id>
-            <phase>verify</phase>
-            <goals>
-              <goal>sign</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  </profile>  
-</profiles>
-</project>
+	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.juddi</groupId>
+		<artifactId>juddi-parent</artifactId>
+		<version>3.0.2-SNAPSHOT</version>
+	</parent>
+	<artifactId>juddi-console</artifactId>
+	<name>jUDDI Console</name>
+	<packaging>pom</packaging>
+	<modules>
+		<module>uddi-portlets</module>
+		<module>juddi-portal</module>
+	</modules>
+</project>
\ No newline at end of file

Modified: webservices/juddi/trunk/juddi-console/uddi-portlets/pom.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/uddi-portlets/pom.xml?rev=905487&r1=905486&r2=905487&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-console/uddi-portlets/pom.xml (original)
+++ webservices/juddi/trunk/juddi-console/uddi-portlets/pom.xml Tue Feb  2 01:11:18 2010
@@ -1,19 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations 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.juddi</groupId>
 		<artifactId>juddi-console</artifactId>
-		<version>3.0.2.SNAPSHOT</version>
+		<version>3.0.2-SNAPSHOT</version>
 	</parent>
-	<!--
-		GWT-Maven archetype generated POM 
+	<!--
+		GWT-Maven archetype generated POM 
 	-->
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.apache.juddi</groupId>
 	<artifactId>uddi-portlets</artifactId>
 	<packaging>war</packaging>
-	<version>3.0.2.SNAPSHOT</version>
 	<name>UDDI Portlets</name>
 	
 	<!--  include pluginRepository and repository for GWT-Maven -->
@@ -70,17 +84,17 @@
 		<dependency>
 			<groupId>org.apache.juddi</groupId>
 			<artifactId>juddi-core</artifactId>
-			<version>3.0.2.SNAPSHOT</version>
+			<version>3.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.juddi</groupId>
 			<artifactId>uddi-ws</artifactId>
-			<version>3.0.2.SNAPSHOT</version>
+			<version>3.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.juddi</groupId>
 			<artifactId>juddi-client</artifactId>
-			<version>3.0.2.SNAPSHOT</version>
+			<version>3.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>log4j</groupId>

Modified: webservices/juddi/trunk/juddi-core/pom.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-core/pom.xml?rev=905487&r1=905486&r2=905487&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-core/pom.xml (original)
+++ webservices/juddi/trunk/juddi-core/pom.xml Tue Feb  2 01:11:18 2010
@@ -1,60 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
-	<!--
-		* Copyright 2001-2009 The Apache Software Foundation. * * Licensed
-		under the Apache License, Version 2.0 (the "License"); * you may not
-		use this file except in compliance with the License. * You may obtain
-		a copy of the License at * *
-		http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by
-		applicable law or agreed to in writing, software * distributed under
-		the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES
-		OR CONDITIONS OF ANY KIND, either express or implied. * See the
-		License for the specific language governing permissions and *
-		limitations under the License. * */
-	-->
-<project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<!--
+ * Copyright 2001-2009 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */ -->
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.apache.juddi</groupId>
 		<artifactId>juddi-parent</artifactId>
-		<version>3.0.2.SNAPSHOT</version>
+		<version>3.0.2-SNAPSHOT</version>
 	</parent>
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.apache.juddi</groupId>
 	<artifactId>juddi-core</artifactId>
-	<version>3.0.2.SNAPSHOT</version>
+	<packaging>bundle</packaging>
 	<properties>
 		<persistence>hibernate</persistence>
 	</properties>
-	<packaging>jar</packaging>
+	
 	<name>jUDDI Core</name>
 	<build>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>attach-javadocs</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<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-jar-plugin</artifactId>
 				<configuration>
 					<excludes>
@@ -79,13 +57,13 @@
 								<delete dir="src/main/java/META-INF" />
 								<delete dir="src/main/resources/META-INF" />
 								<mkdir dir="src/main/java/META-INF" />
-								<copy
-									file="src/main/resources/persistence/${persistence}-persistence.xml"
-									tofile="src/main/java/META-INF/persistence.xml" overwrite="true" />
+								<copy file="src/main/resources/persistence/${persistence}-persistence.xml"
+									  tofile="src/main/java/META-INF/persistence.xml" 
+									  overwrite="true" />
 								<mkdir dir="src/main/resources/META-INF" />
-								<copy
-									file="src/main/resources/persistence/${persistence}-persistence.xml"
-									tofile="src/main/resources/META-INF/persistence.xml" overwrite="true" />
+								<copy file="src/main/resources/persistence/${persistence}-persistence.xml"
+									  tofile="src/main/resources/META-INF/persistence.xml"
+									  overwrite="true" />
 							</tasks>
 						</configuration>
 						<goals>
@@ -133,17 +111,17 @@
 		<dependency>
 			<groupId>org.apache.juddi</groupId>
 			<artifactId>uddi-ws</artifactId>
-			<version>3.0.2.SNAPSHOT</version>
+			<version>3.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.juddi</groupId>
 			<artifactId>juddi-client</artifactId>
-			<version>3.0.2.SNAPSHOT</version>
+			<version>3.0.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.juddi</groupId>
 			<artifactId>uddi-tck-base</artifactId>
-			<version>3.0.2.SNAPSHOT</version>
+			<version>3.0.2-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -236,40 +214,33 @@
 				</dependency>
 			</dependencies>
 			<build>
-			    <plugins>
-			<plugin>
-		      <groupId>org.codehaus.mojo</groupId>
-		      <artifactId>hibernate3-maven-plugin</artifactId>
-		      <version>2.2</version>
-		      <!--  
-		      <executions>
-		        <execution>
-		          <phase>process-classes</phase>
-		          <goals>
-		            <goal>hbm2ddl</goal>
-		          </goals>
-		        </execution>
-		      </executions>
-		      -->
-		      <configuration>
-		        <components>
-		          <component>
-		            <name>hbm2ddl</name>
-		            <implementation>jpaconfiguration</implementation>
-		          </component>
-		        </components>
-		        <componentProperties>
-		          <persistenceunit>juddiDatabase</persistenceunit>
-		          <outputfilename>schema.ddl</outputfilename>
-		          <drop>false</drop>
-		          <create>true</create>
-		          <export>false</export>
-		          <format>true</format>
-		        </componentProperties>
-		      </configuration>
-		    </plugin>
-			
-			    </plugins>
+				<plugins>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>hibernate3-maven-plugin</artifactId>
+						<version>2.2</version>
+						<!--
+							<executions> <execution> <phase>process-classes</phase> <goals>
+							<goal>hbm2ddl</goal> </goals> </execution> </executions>
+						-->
+						<configuration>
+							<components>
+								<component>
+									<name>hbm2ddl</name>
+									<implementation>jpaconfiguration</implementation>
+								</component>
+							</components>
+							<componentProperties>
+								<persistenceunit>juddiDatabase</persistenceunit>
+								<outputfilename>schema.ddl</outputfilename>
+								<drop>false</drop>
+								<create>true</create>
+								<export>false</export>
+								<format>true</format>
+							</componentProperties>
+						</configuration>
+					</plugin>
+				</plugins>
 				<pluginManagement>
 					<plugins>
 						<plugin>
@@ -353,18 +324,17 @@
 									<goal>enhance</goal>
 								</goals>
 							</execution>
-							</executions>
-							<dependencies>
-								<dependency>
-									<groupId>org.apache.openjpa</groupId>
-									<artifactId>openjpa</artifactId>
-									<version>1.2.1</version>
-								</dependency>
-							</dependencies>
-						
+						</executions>
+						<dependencies>
+							<dependency>
+								<groupId>org.apache.openjpa</groupId>
+								<artifactId>openjpa</artifactId>
+								<version>1.2.1</version>
+							</dependency>
+						</dependencies>
 					</plugin>
 				</plugins>
 			</build>
 		</profile>
 	</profiles>
-</project>
+</project>
\ No newline at end of file

Modified: webservices/juddi/trunk/juddi-cxf/pom.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-cxf/pom.xml?rev=905487&r1=905486&r2=905487&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-cxf/pom.xml (original)
+++ webservices/juddi/trunk/juddi-cxf/pom.xml Tue Feb  2 01:11:18 2010
@@ -1,132 +1,127 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright 2001-2009 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations 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.juddi</groupId>
-    <artifactId>juddi-parent</artifactId>
-    <version>3.0.2.SNAPSHOT</version>
-  </parent>
-  <groupId>org.apache.juddi</groupId>
-  <artifactId>juddi-cxf</artifactId>
-  <version>3.0.2.SNAPSHOT</version>
-  <name>jUDDI CXF Deployment</name>
-  <packaging>pom</packaging>
-  <repositories>
+	<!--
+		* Copyright 2001-2009 The Apache Software Foundation. * * Licensed
+		under the Apache License, Version 2.0 (the "License"); * you may not
+		use this file except in compliance with the License. * You may obtain
+		a copy of the License at * *
+		http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by
+		applicable law or agreed to in writing, software * distributed under
+		the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES
+		OR CONDITIONS OF ANY KIND, either express or implied. * See the
+		License for the specific language governing permissions and *
+		limitations 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.juddi</groupId>
+		<artifactId>juddi-parent</artifactId>
+		<version>3.0.2-SNAPSHOT</version>
+	</parent>
+	<artifactId>juddi-cxf</artifactId>
+	<name>jUDDI CXF Deployment</name>
+	<packaging>pom</packaging>
+	<repositories>
     <!-- for jaxb-impl -->
-    <repository>
-      <id>java.net</id>
-      <url>http://download.java.net/maven/1/</url>
-      <layout>legacy</layout>
-    </repository>
-  </repositories>
-  <properties>
-    <cxf.version>2.1.3</cxf.version>
-    <persistence>hibernate</persistence>
-  </properties>
-  <dependencies>
-    <dependency>
-      <artifactId>juddi-core</artifactId>
-      <groupId>org.apache.juddi</groupId>
-      <version>3.0.2.SNAPSHOT</version>
-    </dependency>
-    <dependency>
-	  <groupId>javax.servlet</groupId>
-	  <artifactId>servlet-api</artifactId>
-	  <version>2.5</version>
-	  <scope>provided</scope>
-	</dependency>
-    <dependency>
-      <groupId>org.apache.cxf</groupId>
-      <artifactId>cxf-rt-frontend-jaxws</artifactId>
-      <version>${cxf.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cxf</groupId>
-      <artifactId>cxf-rt-transports-http</artifactId>
-      <version>${cxf.version}</version>
-      <exclusions>
-	   <exclusion>
-	     <groupId>cglib</groupId>
-	     <artifactId>cglib</artifactId>
-	   </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>cglib</groupId>
-      <artifactId>cglib-nodep</artifactId>
-      <version>2.1_3</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.juddi</groupId>
-      <artifactId>juddiv3-war</artifactId>
-      <version>3.0.2.SNAPSHOT</version>
-      <type>war</type>
-    </dependency>
-  </dependencies>
-  <build>
+		<repository>
+			<id>java.net</id>
+			<url>http://download.java.net/maven/1/</url>
+			<layout>legacy</layout>
+		</repository>
+	</repositories>
+	<properties>
+		<cxf.version>2.1.3</cxf.version>
+		<persistence>hibernate</persistence>
+	</properties>
+	<dependencies>
+		<dependency>
+			<artifactId>juddi-core</artifactId>
+			<groupId>org.apache.juddi</groupId>
+			<version>3.0.2-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<version>2.5</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-rt-frontend-jaxws</artifactId>
+			<version>${cxf.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-rt-transports-http</artifactId>
+			<version>${cxf.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>cglib</groupId>
+					<artifactId>cglib</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>cglib</groupId>
+			<artifactId>cglib-nodep</artifactId>
+			<version>2.1_3</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.juddi</groupId>
+			<artifactId>juddiv3-war</artifactId>
+			<version>3.0.2-SNAPSHOT</version>
+			<type>war</type>
+		</dependency>
+	</dependencies>
+	<build>
 <!--
     <finalName>juddiv3</finalName>
 -->
-    <plugins>	
-        <plugin>
-	    <groupId>org.apache.maven.plugins</groupId>
-	    <artifactId>maven-antrun-plugin</artifactId>
-		<version>1.3</version>
-		<executions>
-		 <execution>
-			<id>foo</id>
-			<phase>package</phase>
-			<configuration>
-			<tasks>
-				<property name="dependency.juddiv3.war" value="${maven.dependency.org.apache.juddi.juddiv3-war.war.path}"/>
-				<echo>JUDDIV3.WAR=${dependency.juddiv3.war}</echo>
-				<ant antfile="${basedir}/build.xml">
-				  <target name="package-war"/>
-				</ant>
-
-			</tasks>
-			</configuration>
-			<goals>
-				<goal>run</goal>
-			</goals>
-		  </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>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<version>1.3</version>
+				<executions>
+					<execution>
+						<id>foo</id>
+						<phase>package</phase>
+						<configuration>
+							<tasks>
+								<property name="dependency.juddiv3.war"
+									value="${maven.dependency.org.apache.juddi.juddiv3-war.war.path}" />
+								<echo>JUDDIV3.WAR=${dependency.juddiv3.war}</echo>
+								<ant antfile="${basedir}/build.xml">
+									<target name="package-war" />
+								</ant>
+							</tasks>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</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>
\ No newline at end of file

Modified: webservices/juddi/trunk/juddi-dist/assembly.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-dist/assembly.xml?rev=905487&r1=905486&r2=905487&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-dist/assembly.xml (original)
+++ webservices/juddi/trunk/juddi-dist/assembly.xml Tue Feb  2 01:11:18 2010
@@ -1,24 +1,31 @@
 <assembly>
-  <id></id>
-  <formats>
-    <format>tar.gz</format>
-    <format>zip</format>
-  </formats>
-  <fileSets>
-    <fileSet>
-	  <directory>${project.build.directory}/dist</directory>
-	  <outputDirectory></outputDirectory>
-    </fileSet>
-  </fileSets>
-  <moduleSets>
-     <moduleSet>
-	<includes>
-	<include>org.apache.juddi:juddi-docs</include>
-	</includes>
-	<binaries>
-	<outputDirectory>docs</outputDirectory>
-	<unpack>true</unpack>
-	</binaries>
-     </moduleSet>
-  </moduleSets>
+    <id></id>
+    <formats>
+        <format>tar.gz</format>
+        <format>zip</format>
+    </formats>
+    <dependencySets>
+        <dependencySet>
+            <useTransitiveDependencies>false</useTransitiveDependencies>
+        </dependencySet>
+    </dependencySets>
+    <fileSets>
+        <fileSet>
+            <includes>
+                <include>LICENSE</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+    <!-- this doesn't work for me before proposed changes -->
+    <moduleSets>
+        <moduleSet>
+            <includes>
+                <include>org.apache.juddi:juddi-docs</include>
+            </includes>
+            <binaries>
+                <outputDirectory>docs</outputDirectory>
+                <unpack>true</unpack>
+            </binaries>
+        </moduleSet>
+    </moduleSets>
 </assembly>

Modified: webservices/juddi/trunk/juddi-dist/pom.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-dist/pom.xml?rev=905487&r1=905486&r2=905487&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-dist/pom.xml (original)
+++ webservices/juddi/trunk/juddi-dist/pom.xml Tue Feb  2 01:11:18 2010
@@ -16,108 +16,76 @@
  *
  */ -->
 <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">
-  <parent>
-    <groupId>org.apache.juddi</groupId>
-    <artifactId>juddi-parent</artifactId>
-    <version>3.0.2.SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion> 
-  <groupId>org.apache.juddi</groupId>
-  <artifactId>juddi-dist</artifactId>
-  <version>3.0.2.SNAPSHOT</version>
-  <name>jUDDI Distribution Packaging</name>
-  <url>http://maven.apache.org</url>
-  <packaging>pom</packaging>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.juddi</groupId>
-      <artifactId>juddiv3-war</artifactId>
-      <version>3.0.2.SNAPSHOT</version>
-      <type>war</type>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.juddi</groupId>
-      <artifactId>juddi-core</artifactId>
-      <version>3.0.2.SNAPSHOT</version>
-      <classifier>sources</classifier> 
-    </dependency>
-    <dependency>
-      <groupId>org.apache.juddi</groupId>      
-      <artifactId>juddi-core</artifactId>
-      <version>3.0.2.SNAPSHOT</version>      
-      <classifier>javadoc</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.juddi</groupId>
-      <artifactId>juddi-docs</artifactId>
-      <version>3.0.2.SNAPSHOT</version>
-      <type>tar.gz</type>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.juddi</groupId>
-      <artifactId>juddiv3-samples</artifactId>
-      <version>3.0.2.SNAPSHOT</version>
-      <type>war</type>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-	<groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-install-plugin</artifactId>
-        <version>2.1</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.3</version>
-        <executions>
-          <execution>
-            <id>test</id>
-            <phase>package</phase>
-            <configuration>
-              <tasks>
-               <property name="compile_classpath" refid="maven.compile.classpath"/>
-               <property name="runtime_classpath" refid="maven.runtime.classpath"/>
-               <property name="test_classpath" refid="maven.test.classpath"/>
-               <property name="plugin_classpath" refid="maven.plugin.classpath"/>
-               <property name="project.version" value="${project.version}"/>
-	       <property name="dependency.juddiv3.war" value="${maven.dependency.org.apache.juddi.juddiv3-war.war.path}"/>
-	       <property name="dependency.juddi.javadoc" value="${maven.dependency.org.apache.juddi.juddi-core.javadoc.jar.path}"/>
-	       <property name="dependency.juddi.sources" value="${maven.dependency.org.apache.juddi.juddi-core.sources.jar.path}"/>
-	       <property name="dependency.juddi.docs" value="${maven.dependency.org.apache.juddi.juddi-docs.tar.gz.path}"/>
-	       <property name="dependency.juddi.samples" value="${maven.dependency.org.apache.juddi.juddiv3-samples.war.path}"/>
-	       <ant antfile="${basedir}/build.xml">
-                  <target name="package-dist"/>
-               </ant>
-              </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </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>
+	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.juddi</groupId>
+		<artifactId>juddi-parent</artifactId>
+		<version>3.0.2-SNAPSHOT</version>
+	</parent>
+	<artifactId>juddi-dist</artifactId>
+	<name>jUDDI Distribution Packaging</name>
+	<packaging>pom</packaging>
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.juddi</groupId>
+			<artifactId>juddiv3-war</artifactId>
+			<version>3.0.2-SNAPSHOT</version>
+			<type>war</type>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.juddi</groupId>
+			<artifactId>juddi-core</artifactId>
+			<version>3.0.2-SNAPSHOT</version>
+			<classifier>sources</classifier>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.juddi</groupId>
+			<artifactId>juddi-core</artifactId>
+			<version>3.0.2-SNAPSHOT</version>
+			<classifier>javadoc</classifier>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.juddi</groupId>
+			<artifactId>juddi-docs</artifactId>
+			<version>3.0.2-SNAPSHOT</version>
+			<type>tar.gz</type>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.juddi</groupId>
+			<artifactId>juddiv3-samples</artifactId>
+			<version>3.0.2-SNAPSHOT</version>
+			<type>war</type>
+		</dependency>
+	</dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <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>
+            <!-- dist is not very useful from a maven repo, so don't put it there -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file

Modified: webservices/juddi/trunk/juddi-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-tomcat/pom.xml?rev=905487&r1=905486&r2=905487&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-tomcat/pom.xml (original)
+++ webservices/juddi/trunk/juddi-tomcat/pom.xml Tue Feb  2 01:11:18 2010
@@ -16,131 +16,136 @@
  *
  */ -->
 <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">
-  <parent>
-    <groupId>org.apache.juddi</groupId>
-    <artifactId>juddi-parent</artifactId>
-    <version>3.0.2.SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion> 
-  <groupId>org.apache.juddi</groupId>
-  <artifactId>juddi-tomcat</artifactId>
-  <version>3.0.2.SNAPSHOT</version>
-  <name>jUDDI Tomcat Packaging</name>
-  <url>http://maven.apache.org</url>
-  <packaging>pom</packaging>
-  <properties>
-    <juddi-cxf-version>3.0.2.SNAPSHOT</juddi-cxf-version>
-  </properties>
-  <dependencies>
-    <dependency>
-      <groupId>commons-discovery</groupId>
-      <artifactId>commons-discovery</artifactId>
-      <version>0.2</version>
-    </dependency>
-    <dependency>
-      <artifactId>apache-tomcat</artifactId>
-      <groupId>org.apache.juddi.bootstrap</groupId>
-      <version>6.0.20</version>
-      <type>zip</type>
-    </dependency>
-    <dependency>
-     <artifactId>juddi-cxf</artifactId>
-     <groupId>org.apache.juddi</groupId>
-     <version>${juddi-cxf-version}</version> 
-     <type>war</type>
-    </dependency>
-     <dependency>
-     <artifactId>juddiv3-samples</artifactId>
-     <groupId>org.apache.juddi</groupId>
-     <version>3.0.2.SNAPSHOT</version> 
-     <type>war</type>
-    </dependency>
-    <dependency>
-     <artifactId>juddi-core</artifactId>
-     <groupId>org.apache.juddi</groupId>
-     <version>3.0.2.SNAPSHOT</version>
-     <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derby</artifactId>
-      <version>10.4.2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>mysql</groupId>
-      <artifactId>mysql-connector-java</artifactId>
-      <version>5.1.6</version>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.13</version>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-	<groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-install-plugin</artifactId>
-        <version>2.1</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.3</version>
-        <executions>
-          <execution>
-            <id>test</id>
-            <phase>package</phase>
-            <configuration>
-              <tasks>
-               <property name="compile_classpath" refid="maven.compile.classpath"/>
-               <property name="runtime_classpath" refid="maven.runtime.classpath"/>
-               <property name="test_classpath" refid="maven.test.classpath"/>
-               <property name="plugin_classpath" refid="maven.plugin.classpath"/>
-               <property name="project.version" value="${project.version}"/>
-
-	       <property name="dependency.log4j.jar" value="${maven.dependency.log4j.log4j.jar.path}"/>
-	       <property name="dependency.mysql.jar" value="${maven.dependency.mysql.mysql-connector-java.jar.path}"/>
-	       <property name="dependency.commons-discovery.jar" value="${maven.dependency.commons-discovery.commons-discovery.jar.path}"/>
-	       <property name="dependency.derby.jar" value="${maven.dependency.org.apache.derby.derby.jar.path}"/>
-	       <property name="dependency.tomcat.zip" value="${maven.dependency.org.apache.juddi.bootstrap.apache-tomcat.zip.path}"/>
-	       <property name="dependency.juddiv3.war" value="${basedir}/../juddi-cxf/target/juddi-cxf-${juddi-cxf-version}.war"/>
-	       <echo>JUDDIV3.WAR=${dependency.juddiv3.war}</echo>
-	       <property name="dependency.juddiv3-samples.war" value="${basedir}/../juddiv3-samples/target/juddiv3-samples-${juddi-cxf-version}.war"/>
-	       <property name="dependency.juddi.jar" value="${maven.dependency.org.apache.juddi.juddi.jar.path}"/>
-	       <ant antfile="${basedir}/build.xml">
-		  <property name="dependency.tomcat.zip" value="${dependency.tomcat.zip}"/>
-                  <target name="package-tomcat"/>
-               </ant>
-              </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </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>
+	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.juddi</groupId>
+		<artifactId>juddi-parent</artifactId>
+		<version>3.0.2-SNAPSHOT</version>
+	</parent>
+	<artifactId>juddi-tomcat</artifactId>
+	<name>jUDDI Tomcat Packaging</name>
+	<packaging>pom</packaging>
+	<properties>
+		<juddi-cxf-version>${version}</juddi-cxf-version>
+	</properties>
+	<dependencies>
+		<dependency>
+			<groupId>commons-discovery</groupId>
+			<artifactId>commons-discovery</artifactId>
+			<version>0.2</version>
+		</dependency>
+		<dependency>
+			<artifactId>apache-tomcat</artifactId>
+			<groupId>org.apache.juddi.bootstrap</groupId>
+			<version>6.0.20</version>
+			<type>zip</type>
+		</dependency>
+		<dependency>
+			<artifactId>juddi-cxf</artifactId>
+			<groupId>org.apache.juddi</groupId>
+			<version>${juddi-cxf-version}</version>
+			<type>war</type>
+		</dependency>
+		<dependency>
+			<artifactId>juddiv3-samples</artifactId>
+			<groupId>org.apache.juddi</groupId>
+			<version>3.0.2-SNAPSHOT</version>
+			<type>war</type>
+		</dependency>
+		<dependency>
+			<artifactId>juddi-core</artifactId>
+			<groupId>org.apache.juddi</groupId>
+			<version>3.0.2-SNAPSHOT</version>
+			<type>jar</type>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.derby</groupId>
+			<artifactId>derby</artifactId>
+			<version>10.4.2.0</version>
+		</dependency>
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+			<version>5.1.6</version>
+		</dependency>
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>1.2.13</version>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-install-plugin</artifactId>
+				<version>2.1</version>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<version>1.3</version>
+				<executions>
+					<execution>
+						<id>test</id>
+						<phase>package</phase>
+						<configuration>
+							<tasks>
+								<property name="compile_classpath" refid="maven.compile.classpath" />
+								<property name="runtime_classpath" refid="maven.runtime.classpath" />
+								<property name="test_classpath" refid="maven.test.classpath" />
+								<property name="plugin_classpath" refid="maven.plugin.classpath" />
+								<property name="project.version" value="${project.version}" />
+								
+								<property name="dependency.log4j.jar"
+									value="${maven.dependency.log4j.log4j.jar.path}" />
+								<property name="dependency.mysql.jar"
+									value="${maven.dependency.mysql.mysql-connector-java.jar.path}" />
+								<property name="dependency.commons-discovery.jar"
+									value="${maven.dependency.commons-discovery.commons-discovery.jar.path}" />
+								<property name="dependency.derby.jar"
+									value="${maven.dependency.org.apache.derby.derby.jar.path}" />
+								<property name="dependency.tomcat.zip"
+									value="${maven.dependency.org.apache.juddi.bootstrap.apache-tomcat.zip.path}" />
+								<property name="dependency.juddiv3.war"
+									value="${basedir}/../juddi-cxf/target/juddi-cxf-${juddi-cxf-version}.war" />
+								<echo>JUDDIV3.WAR=${dependency.juddiv3.war}</echo>
+								<property name="dependency.juddiv3-samples.war"
+									value="${basedir}/../juddiv3-samples/target/juddiv3-samples-${juddi-cxf-version}.war" />
+								<property name="dependency.juddi.jar"
+									value="${maven.dependency.org.apache.juddi.juddi.jar.path}" />
+								<ant antfile="${basedir}/build.xml">
+									<property name="dependency.tomcat.zip" value="${dependency.tomcat.zip}" />
+									<target name="package-tomcat" />
+								</ant>
+							</tasks>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</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>
\ No newline at end of file

Modified: webservices/juddi/trunk/juddiv3-samples/pom.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddiv3-samples/pom.xml?rev=905487&r1=905486&r2=905487&view=diff
==============================================================================
--- webservices/juddi/trunk/juddiv3-samples/pom.xml (original)
+++ webservices/juddi/trunk/juddiv3-samples/pom.xml Tue Feb  2 01:11:18 2010
@@ -15,137 +15,140 @@
  * limitations 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.juddi</groupId>
-    <artifactId>juddi-parent</artifactId>
-    <version>3.0.2.SNAPSHOT</version>
-  </parent>
-  <groupId>org.apache.juddi</groupId>
-  <artifactId>juddiv3-samples</artifactId>
-  <version>3.0.2.SNAPSHOT</version>
-  <name>jUDDI Service Registration Examples</name>
-  <packaging>war</packaging>
-  <properties>
-    <cxf.version>2.1.3</cxf.version>
-  </properties>
-  <dependencies>
-    <dependency>
-      <artifactId>juddi-core</artifactId>
-      <groupId>org.apache.juddi</groupId>
-      <version>3.0.2.SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <artifactId>juddi-client</artifactId>
-      <groupId>org.apache.juddi</groupId>
-      <version>3.0.2.SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <artifactId>uddi-ws</artifactId>
-      <groupId>org.apache.juddi</groupId>
-      <version>3.0.2.SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cxf</groupId>
-      <artifactId>cxf-rt-frontend-jaxws</artifactId>
-      <version>${cxf.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cxf</groupId>
-      <artifactId>cxf-rt-transports-http</artifactId>
-      <version>${cxf.version}</version>
-      <exclusions>
-	   <exclusion>
-	     <groupId>cglib</groupId>
-	     <artifactId>cglib</artifactId>
-	   </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>cglib</groupId>
-      <artifactId>cglib-nodep</artifactId>
-      <version>2.1_3</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.juddi</groupId>
-      <artifactId>juddiv3-war</artifactId>
-      <version>3.0.2.SNAPSHOT</version>
-      <type>war</type>
-    </dependency>
-  </dependencies>
-  <build>
-        <plugins>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-surefire-plugin</artifactId>
-	      <version>2.4</version>
-              <configuration>
-		  <skip>false</skip>
-		  <includes>
-			<include>**/*Test.java</include>
-		  </includes>
-              </configuration>
-           </plugin>
-           <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-source-plugin</artifactId>
-	    <version>2.1</version>
-	    <configuration>
-		<excludes>	
-			<exclude>*.xml</exclude>
-		</excludes>
-	    </configuration>
-            <executions>
-               <execution>
-                  <goals>
-                     <goal>jar</goal>
-                  </goals>
-               </execution>
-             </executions>
-            </plugin>
-	    <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <version>1.3</version>
-            <executions>
-                 <execution>
-                        <id>foo</id>
-                        <phase>package</phase>
-                        <configuration>
-                        <tasks>
-                        <echo>getting the war from: ${maven.dependency.org.apache.juddi.juddiv3-war.war.path}</echo>
-                        <unzip src="${maven.dependency.org.apache.juddi.juddiv3-war.war.path}"
-                                dest="target/jv3">
-                                <patternset>
-                                        <include name="**/persistence.xml"/>
-                                </patternset>
-                        </unzip>
-                        <copy todir="target/classes" overwrite="true">
-                                <fileset dir="target/jv3/WEB-INF/classes" />
-                        </copy>
-                        </tasks>
-                        </configuration>
-                        <goals>
-                                <goal>run</goal>
-                        </goals>
-                 </execution>
-            </executions>
-           </plugin>
-	   <plugin>
-		<groupId>org.apache.maven.plugins</groupId>	
-		<artifactId>maven-war-plugin</artifactId>
-		<version>2.0</version>
-		<configuration>
-			<dependentWarExcludes>WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/*, WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/*</dependentWarExcludes>
-		</configuration>
-	   </plugin>
-         </plugins>
-    </build>
-</project>
+<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.juddi</groupId>
+		<artifactId>juddi-parent</artifactId>
+		<version>3.0.2-SNAPSHOT</version>
+	</parent>
+	<artifactId>juddiv3-samples</artifactId>
+	<name>jUDDI Service Registration Examples</name>
+	<packaging>war</packaging>
+	<properties>
+		<cxf.version>2.1.3</cxf.version>
+	</properties>
+	<dependencies>
+		<dependency>
+			<artifactId>juddi-core</artifactId>
+			<groupId>org.apache.juddi</groupId>
+			<version>3.0.2-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<artifactId>juddi-client</artifactId>
+			<groupId>org.apache.juddi</groupId>
+			<version>3.0.2-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<artifactId>uddi-ws</artifactId>
+			<groupId>org.apache.juddi</groupId>
+			<version>3.0.2-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<version>2.5</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-rt-frontend-jaxws</artifactId>
+			<version>${cxf.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-rt-transports-http</artifactId>
+			<version>${cxf.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>cglib</groupId>
+					<artifactId>cglib</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>cglib</groupId>
+			<artifactId>cglib-nodep</artifactId>
+			<version>2.1_3</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.juddi</groupId>
+			<artifactId>juddiv3-war</artifactId>
+			<version>3.0.2-SNAPSHOT</version>
+			<type>war</type>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+		    <plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+				<version>2.1</version>
+				<configuration>
+					<excludes>
+						<exclude>*.xml</exclude>
+					</excludes>
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.4</version>
+				<configuration>
+					<skip>false</skip>
+					<includes>
+						<include>**/*Test.java</include>
+					</includes>
+				</configuration>
+			</plugin>
+			
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<version>1.3</version>
+				<executions>
+					<execution>
+						<id>foo</id>
+						<phase>package</phase>
+						<configuration>
+							<tasks>
+								<echo>getting the war from:
+									${maven.dependency.org.apache.juddi.juddiv3-war.war.path}</echo>
+								<unzip
+									src="${maven.dependency.org.apache.juddi.juddiv3-war.war.path}"
+									dest="target/jv3">
+									<patternset>
+										<include name="**/persistence.xml" />
+									</patternset>
+								</unzip>
+								<copy todir="target/classes" overwrite="true">
+									<fileset dir="target/jv3/WEB-INF/classes" />
+								</copy>
+							</tasks>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<version>2.0</version>
+				<configuration>
+					<dependentWarExcludes>WEB-INF/classes/RENAME4SALES_juddi_custom_install_data/*,
+						WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/*</dependentWarExcludes>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
\ No newline at end of file

Modified: webservices/juddi/trunk/juddiv3-war/pom.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddiv3-war/pom.xml?rev=905487&r1=905486&r2=905487&view=diff
==============================================================================
--- webservices/juddi/trunk/juddiv3-war/pom.xml (original)
+++ webservices/juddi/trunk/juddiv3-war/pom.xml Tue Feb  2 01:11:18 2010
@@ -16,190 +16,188 @@
  *
  */ -->
 <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.juddi</groupId>
-    <artifactId>juddi-parent</artifactId>
-    <version>3.0.2.SNAPSHOT</version>
-  </parent>
-  <groupId>org.apache.juddi</groupId>
-  <artifactId>juddiv3-war</artifactId>
-  <packaging>war</packaging>
-  <version>3.0.2.SNAPSHOT</version>
-  <name>jUDDI Axis2 Deployment</name>
-  <url>http://maven.apache.org</url>
-  <properties>
-    <cxf.version>2.1.3</cxf.version>
-  </properties>
-  <dependencies>
-    <dependency>
-      <artifactId>uddi-ws</artifactId>
-      <groupId>org.apache.juddi</groupId>
-      <version>3.0.2.SNAPSHOT</version>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.xml.bind</groupId>
-          <artifactId>jaxb-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.sun.xml.ws</groupId>
-          <artifactId>jaxws-rt</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.sun.xml.bind</groupId>
-          <artifactId>jaxb-impl</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <artifactId>juddi-core</artifactId>
-      <groupId>org.apache.juddi</groupId>
-      <version>3.0.2.SNAPSHOT</version> 
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.juddi</groupId>
-          <artifactId>uddi-ws</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.juddi</groupId>
-          <artifactId>uddi-tck</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>javax.persistence</groupId>
-          <artifactId>persistence-api</artifactId>
-        </exclusion>
-        <exclusion>  
-          <groupId>commons-codec</groupId>
-          <artifactId>commons-codec</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>commons-configuration</groupId>
-          <artifactId>commons-configuration</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>commons-lang</groupId>
-          <artifactId>commons-lang</artifactId>
-        </exclusion>
-        <exclusion> 
-          <groupId>commons-collections</groupId>
-          <artifactId>commons-collections</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>log4j</groupId>
-          <artifactId>log4j</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-        </exclusion>
-     	<exclusion>
-          <groupId>org.apache.derby</groupId>
-          <artifactId>derby</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>mysql</groupId>
-          <artifactId>mysql-connector-java</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.hibernate</groupId>
-          <artifactId>hibernate</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.hibernate</groupId>
-          <artifactId>hibernate-entitymanager</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>cglib</groupId>
-          <artifactId>cglib-nodep</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.openjpa</groupId>
-          <artifactId>openjpa</artifactId>
-        </exclusion>
-      </exclusions>   
-    </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.1.1</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-        <groupId>commons-configuration</groupId>
-        <artifactId>commons-configuration</artifactId>
-        <version>1.5</version>
-        <exclusions>
-          <exclusion>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-          </exclusion>
-        </exclusions>
-    </dependency>
-    <dependency>
-        <groupId>log4j</groupId>
-        <artifactId>log4j</artifactId>
-        <version>1.2.13</version>
-	<scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cxf</groupId>
-      <artifactId>cxf-rt-frontend-jaxws</artifactId>
-      <version>${cxf.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cxf</groupId>
-      <artifactId>cxf-rt-transports-http</artifactId>
-      <version>${cxf.version}</version>
-      <scope>provided</scope>
-      <exclusions>
-           <exclusion>
-             <groupId>cglib</groupId>
-             <artifactId>cglib</artifactId>
-           </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>cglib</groupId>
-      <artifactId>cglib-nodep</artifactId>
-      <version>2.1_3</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <finalName>juddi</finalName>
-    <plugins>	
-        <plugin>
-	    <groupId>org.apache.maven.plugins</groupId>
-	    <artifactId>maven-antrun-plugin</artifactId>
-		<version>1.3</version>
-		<executions>
-		 <execution>
-			<id>foo</id>
-			<phase>compile</phase>
-			<configuration>
-			<tasks>
-			    <echo>persistence=${persistence}</echo>
-				<copy file ="${basedir}/persistence/${persistence}-persistence.xml"
-					tofile="${basedir}/target/classes/META-INF/persistence.xml"
-					overwrite="true"/>
-			</tasks>
-			</configuration>
-			<goals>
-				<goal>run</goal>
-			</goals>
-		  </execution>
-		</executions>
-      </plugin>
-     </plugins>
-  </build>
+	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.juddi</groupId>
+		<artifactId>juddi-parent</artifactId>
+		<version>3.0.2-SNAPSHOT</version>
+	</parent>
+	<artifactId>juddiv3-war</artifactId>
+	<packaging>war</packaging>
+	<name>jUDDI base-war Deployment</name>
+	<url>http://maven.apache.org</url>
+	<properties>
+		<cxf.version>2.1.3</cxf.version>
+	</properties>
+	<dependencies>
+		<dependency>
+			<artifactId>uddi-ws</artifactId>
+			<groupId>org.apache.juddi</groupId>
+			<version>3.0.2-SNAPSHOT</version>
+			<exclusions>
+				<exclusion>
+					<groupId>javax.xml.bind</groupId>
+					<artifactId>jaxb-api</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.sun.xml.ws</groupId>
+					<artifactId>jaxws-rt</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.sun.xml.bind</groupId>
+					<artifactId>jaxb-impl</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<artifactId>juddi-core</artifactId>
+			<groupId>org.apache.juddi</groupId>
+			<version>3.0.2-SNAPSHOT</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.apache.juddi</groupId>
+					<artifactId>uddi-ws</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.apache.juddi</groupId>
+					<artifactId>uddi-tck</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>javax.persistence</groupId>
+					<artifactId>persistence-api</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>commons-codec</groupId>
+					<artifactId>commons-codec</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>commons-configuration</groupId>
+					<artifactId>commons-configuration</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>commons-lang</groupId>
+					<artifactId>commons-lang</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>commons-collections</groupId>
+					<artifactId>commons-collections</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>log4j</groupId>
+					<artifactId>log4j</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>junit</groupId>
+					<artifactId>junit</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.apache.derby</groupId>
+					<artifactId>derby</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>mysql</groupId>
+					<artifactId>mysql-connector-java</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.hibernate</groupId>
+					<artifactId>hibernate</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.hibernate</groupId>
+					<artifactId>hibernate-entitymanager</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>cglib</groupId>
+					<artifactId>cglib-nodep</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.apache.openjpa</groupId>
+					<artifactId>openjpa</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>1.1.1</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<version>2.5</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>commons-configuration</groupId>
+			<artifactId>commons-configuration</artifactId>
+			<version>1.5</version>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-collections</groupId>
+					<artifactId>commons-collections</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>1.2.13</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-rt-frontend-jaxws</artifactId>
+			<version>${cxf.version}</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-rt-transports-http</artifactId>
+			<version>${cxf.version}</version>
+			<scope>provided</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>cglib</groupId>
+					<artifactId>cglib</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>cglib</groupId>
+			<artifactId>cglib-nodep</artifactId>
+			<version>2.1_3</version>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+	<build>
+		<finalName>juddi</finalName>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<version>1.3</version>
+				<executions>
+					<execution>
+						<id>foo</id>
+						<phase>compile</phase>
+						<configuration>
+							<tasks>
+								<echo>persistence=${persistence}</echo>
+								<copy file="${basedir}/persistence/${persistence}-persistence.xml"
+									tofile="${basedir}/target/classes/META-INF/persistence.xml"
+									overwrite="true" />
+							</tasks>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 	<profiles>
 		<profile>
 			<id>hibernate</id>
@@ -209,7 +207,6 @@
 					<name>persistence</name>
 					<value>hibernate</value>
 				</property>
-				
 			</activation>
 			<properties>
 				<persistence>hibernate</persistence>
@@ -228,4 +225,4 @@
 			</properties>
 		</profile>
 	</profiles>
-</project>
+</project>
\ No newline at end of file



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