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 [2/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...

Modified: webservices/juddi/trunk/pom.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/pom.xml?rev=905487&r1=905486&r2=905487&view=diff
==============================================================================
--- webservices/juddi/trunk/pom.xml (original)
+++ webservices/juddi/trunk/pom.xml Tue Feb  2 01:11:18 2010
@@ -1,29 +1,43 @@
 <?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
 	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</groupId>
+        <artifactId>apache</artifactId>
+        <version>6</version>
+    </parent>
 	<packaging>pom</packaging>
 	<groupId>org.apache.juddi</groupId>
 	<artifactId>juddi-parent</artifactId>
-	<version>3.0.2.SNAPSHOT</version>
+	<version>3.0.2-SNAPSHOT</version>
 	<name>jUDDI_v3 Parent</name>
 	<description>jUDDI (pronounced "Judy") is an open source Java
 		implementation of the Universal Description, Discovery, and
 		Integration (UDDI) specification for Web Services.</description>
 	<url>http://ws.apache.org/juddi/</url>
+	
+	<properties>
+        <sourceReleaseAssemblyDescriptor>source-release</sourceReleaseAssemblyDescriptor>
+    </properties>
+	
 	<issueManagement>
 		<system>JIRA</system>
 		<url>http://issues.apache.org/jira/browse/JUDDI</url>
@@ -97,12 +111,12 @@
 		</developer>
 	</developers>
 	<contributors>
-	    <contributor>
+		<contributor>
 			<name>Ken Wilson</name>
 			<organization>Dynamic Site Design</organization>
 			<url>http://www.dynamicsitedesign.com</url>
 		</contributor>
-	    <contributor>
+		<contributor>
 			<name>Jeremi Thebeau</name>
 			<organization>Xceptance Software Technologies</organization>
 			<url>http://www.xceptance.com</url>
@@ -120,23 +134,64 @@
 		<developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/juddi/trunk/</developerConnection>
 		<url>http://svn.apache.org/viewcvs.cgi/webservices/juddi/trunk/</url>
 	</scm>
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.5</source>
-					<target>1.5</target>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+	    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <version>2.2-beta-4</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <configuration>
+                        <source>1.5</source>
+                        <target>1.5</target>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-release-plugin</artifactId>
+                    <configuration>
+                        <autoVersionSubmodules>true</autoVersionSubmodules>
+                        <preparationGoals>clean install</preparationGoals>
+                        <goals>deploy</goals>
+                        <releaseProfiles>apache-release</releaseProfiles>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>maven-bundle-plugin</artifactId>
+                    <version>2.0.0</version>
+                    <extensions>true</extensions>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>ianal-maven-plugin</artifactId>
+                    <version>1.0-alpha-1</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>ianal-maven-plugin</artifactId>
+            </plugin>
+
+        </plugins>
+    </build>
 	<reporting>
 		<plugins>
 			<plugin>
 				<artifactId>maven-javadoc-plugin</artifactId>
 				<configuration>
-				    <aggregate>true</aggregate>
+					<aggregate>true</aggregate>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -162,104 +217,99 @@
 		<module>juddiv3-samples</module>
 		<module>juddi-tomcat</module>
 		<module>uddi-tck</module>
+		 <module>docs</module>
+        <!-- should these be an a profile? -->
+        <!--<module>juddi-console</module>-->
+        <!-- requires some artifacts from the apache-release profile, so put it there -->
+        <!--<module>juddi-dist</module>-->
 	</modules>
 	<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>
-		<site>
+	    <site>
 			<id>website</id>
 			<url>scpexe://people.apache.org/www/ws.apache.org/juddi/</url>
 		</site>
 	</distributionManagement>
-	<dependencies>
-	</dependencies>
+	<dependencies />
 	<repositories>
-    <repository>
-      <id>maven2-repository.dev.java.net</id>
-      <name>Java.net Maven 2 Repository</name>
-      <url>http://download.java.net/maven/2</url>
-      <layout>default</layout>
-    </repository>
-    <repository>
-      <id>maven-repository.dev.java.net</id>
-      <name>Java.net Maven 1 Repository (legacy)</name>
-      <url>http://download.java.net/maven/1</url>
-      <layout>legacy</layout>
-    </repository>
-     <repository>
-      <id>apache</id>
-      <name>ASF Repository (legacy)</name>
-      <url>http://people.apache.org/repo/m2-ibiblio-rsync-repository</url>
-      <layout>default</layout>
-    </repository>
-  </repositories>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>maven2-repository.dev.java.net</id>
-      <url>http://download.java.net/maven/2</url>
-    </pluginRepository>
-    <pluginRepository>
-      <id>maven-repository.dev.java.net</id>
-      <url>http://download.java.net/maven/1</url>
-      <layout>legacy</layout>
-    </pluginRepository>
-  </pluginRepositories>
-	<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>
-					<plugin>
-						<artifactId>maven-javadoc-plugin</artifactId>
-						<executions>
-							<execution>
-								<goals>
-									<goal>jar</goal>
-								</goals>
-							</execution>
-						</executions>
-						<configuration>
-							<attach>true</attach>
-						</configuration>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-source-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>attach-sources</id>
-								<goals>
-									<goal>jar</goal>
-								</goals>
-								<configuration>
-								   <includePom>true</includePom>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-</project>
+		<repository>
+			<id>maven2-repository.dev.java.net</id>
+			<name>Java.net Maven 2 Repository</name>
+			<url>http://download.java.net/maven/2</url>
+			<layout>default</layout>
+		</repository>
+		<repository>
+			<id>maven-repository.dev.java.net</id>
+			<name>Java.net Maven 1 Repository (legacy)</name>
+			<url>http://download.java.net/maven/1</url>
+			<layout>legacy</layout>
+		</repository>
+		<repository>
+			<id>apache</id>
+			<name>ASF Repository (legacy)</name>
+			<url>http://people.apache.org/repo/m2-ibiblio-rsync-repository</url>
+			<layout>default</layout>
+		</repository>
+	</repositories>
+	<pluginRepositories>
+		<pluginRepository>
+			<id>maven2-repository.dev.java.net</id>
+			<url>http://download.java.net/maven/2</url>
+		</pluginRepository>
+		<pluginRepository>
+			<id>maven-repository.dev.java.net</id>
+			<url>http://download.java.net/maven/1</url>
+			<layout>legacy</layout>
+		</pluginRepository>
+	</pluginRepositories>
+	 <profiles>
+        <!-- START SNIPPET: release-profile -->
+        <!-- this is borrowed from an nov 2009 apache-7 pom release attempt-->
+        <profile>
+            <id>apache-release</id>
+            <modules>
+                <!-- this requires some artifacts generated by apache-release profile (source, javadoc) -->
+                <module>juddi-dist</module>
+            </modules>
+            <build>
+                <plugins>
+                    <!-- Create a source-release artifact that contains the fully buildable
+             project directory source structure. This is the artifact which is
+             the official subject of any release vote. -->
+                    <plugin>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.apache.apache.resources</groupId>
+                                <artifactId>apache-source-release-assembly-descriptor</artifactId>
+                                <version>1.0.1</version>
+                            </dependency>
+                            <dependency>
+                                <!-- NOTE: The fix for PLXUTILS-120 is crucial for the new assembly descriptor -->
+                                <groupId>org.codehaus.plexus</groupId>
+                                <artifactId>plexus-utils</artifactId>
+                                <version>2.0.1</version>
+                            </dependency>
+                        </dependencies>
+                        <executions>
+                            <execution>
+                                <id>source-release-assembly</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                                <configuration>
+                                    <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+                                    <descriptorRefs>
+                                        <descriptorRef>${sourceReleaseAssemblyDescriptor}</descriptorRef>
+                                    </descriptorRefs>
+                                    <tarLongFileFormat>gnu</tarLongFileFormat>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <!-- END SNIPPET: release-profile -->
+    </profiles>
+</project>
\ No newline at end of file

Modified: webservices/juddi/trunk/site/pom.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/site/pom.xml?rev=905487&r1=905486&r2=905487&view=diff
==============================================================================
--- webservices/juddi/trunk/site/pom.xml (original)
+++ webservices/juddi/trunk/site/pom.xml Tue Feb  2 01:11:18 2010
@@ -1,84 +1,88 @@
 <?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
 	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>
+	</parent>
 	<packaging>pom</packaging>
 	<groupId>org.apache.juddi</groupId>
 	<artifactId>juddi-site</artifactId>
-	<version>3.0.2.SNAPSHOT</version>
 	<name>jUDDI_v3 Site</name>
-	<parent>
-      <groupId>org.apache.juddi</groupId>
-      <artifactId>juddi-parent</artifactId>
-      <version>3.0.2.SNAPSHOT</version>
-      </parent>
-      <dependencies>
-	<dependency>
-		<groupId>org.apache.juddi</groupId>
-		<artifactId>juddi-docs</artifactId>
-		<version>${project.version}</version>
-		<type>zip</type>
-	</dependency>
-      </dependencies>
-      <build>
-      <pluginManagement>
-	      <plugins>
-	        <plugin>
-	          <groupId>org.apache.maven.plugins</groupId>
-	          <artifactId>maven-site-plugin</artifactId>
-	          <version>2.0.1</version>
-	        </plugin>
-	      </plugins>
-       </pluginManagement>
-       <plugins>
-	<plugin>
-	        <groupId>org.apache.maven.plugins</groupId>
-	        <artifactId>maven-site-plugin</artifactId>
-	        <version>2.0.1</version>
-	        <configuration>
-       		   <templateFile>maven-site.vm</templateFile>
-       		</configuration>
-	 </plugin>
-	 <plugin>
-	 	<groupId>org.apache.maven.plugins</groupId>
-		<artifactId>maven-antrun-plugin</artifactId>
-		<version>1.3</version>
-		<executions>
-			<execution>
-				<id>id.pre-site</id>
-				<phase>site</phase>
-				<goals>		
-					<goal>run</goal>
-				</goals>
+	
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.juddi</groupId>
+			<artifactId>juddi-docs</artifactId>
+			<version>${project.version}</version>
+			<type>zip</type>
+		</dependency>
+	</dependencies>
+	<build>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-site-plugin</artifactId>
+					<version>2.0.1</version>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-site-plugin</artifactId>
+				<version>2.0.1</version>
 				<configuration>
-					<tasks>
-						<property name="dependency.docs.zip" value="${maven.dependency.org.apache.juddi.juddi-docs.zip.path}"/>
-						<mkdir dir="${basedir}/target/docs"/>
-						<unzip dest="${basedir}/target/docs" src="${dependency.docs.zip}"/>
-						<copy flatten="true" todir="${basedir}/target/site">
-						<fileset dir="${basedir}/target/docs">	
-						<include name="**/*.pdf"/>
-
-						</fileset>
-						</copy>
-					</tasks>
-				</configuration>		
-			</execution>
-		</executions>
-	 </plugin>
-       </plugins>
-     </build>
-</project>
+					<templateFile>maven-site.vm</templateFile>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<version>1.3</version>
+				<executions>
+					<execution>
+						<id>id.pre-site</id>
+						<phase>site</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<tasks>
+								<property name="dependency.docs.zip"
+									value="${maven.dependency.org.apache.juddi.juddi-docs.zip.path}" />
+								<mkdir dir="${basedir}/target/docs" />
+								<unzip dest="${basedir}/target/docs" src="${dependency.docs.zip}" />
+								<copy flatten="true" todir="${basedir}/target/site">
+									<fileset dir="${basedir}/target/docs">
+										<include name="**/*.pdf" />
+									</fileset>
+								</copy>
+							</tasks>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>
\ No newline at end of file

Modified: webservices/juddi/trunk/uddi-tck-base/pom.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-tck-base/pom.xml?rev=905487&r1=905486&r2=905487&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-tck-base/pom.xml (original)
+++ webservices/juddi/trunk/uddi-tck-base/pom.xml Tue Feb  2 01:11:18 2010
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
+<?xml version="1.0" encoding="UTF-8"?><!--
  * Copyright 2001-2009 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,48 +14,33 @@
  * 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">
-  <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>uddi-tck-base</artifactId>
-  <version>3.0.2.SNAPSHOT</version>
-  <name>UDDI Technical Compatibility Kit (TCK) Base</name>
-  <packaging>jar</packaging>  
-  <dependencies>
-    <dependency>
-        <groupId>org.apache.juddi</groupId>
-        <artifactId>uddi-ws</artifactId>
-        <version>3.0.2.SNAPSHOT</version>
-     </dependency>
-    <dependency>
-        <groupId>log4j</groupId>
-        <artifactId>log4j</artifactId>
-        <version>1.2.13</version>
-     </dependency>
-	<dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <version>4.5</version>
-     </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>
+<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>
+	</parent>
+	<artifactId>uddi-tck-base</artifactId>
+	<packaging>bundle</packaging>
+	<name>UDDI Technical Compatibility Kit (TCK) Base</name>
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.juddi</groupId>
+			<artifactId>uddi-ws</artifactId>
+			<version>3.0.2-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>1.2.13</version>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.5</version>
+		</dependency>
+	</dependencies>
+</project>
\ No newline at end of file

Modified: webservices/juddi/trunk/uddi-tck/pom.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-tck/pom.xml?rev=905487&r1=905486&r2=905487&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-tck/pom.xml (original)
+++ webservices/juddi/trunk/uddi-tck/pom.xml Tue Feb  2 01:11:18 2010
@@ -1,35 +1,37 @@
 <?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
 	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>uddi-tck</artifactId>
-	<version>3.0.2.SNAPSHOT</version>
+	<packaging>bundle</packaging>
 	<name>UDDI TCK Tests</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>commons-configuration</groupId>
@@ -55,35 +57,32 @@
 		<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>
 			<groupId>org.apache.juddi</groupId>
 			<artifactId>juddi-core</artifactId>
-			<version>3.0.2.SNAPSHOT</version>
+			<version>3.0.2-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.juddi</groupId>
 			<artifactId>juddi-client</artifactId>
-			<version>3.0.2.SNAPSHOT</version>
+			<version>3.0.2-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.juddi</groupId>
 			<artifactId>juddi-tomcat</artifactId>
-			<version>3.0.2.SNAPSHOT</version>
+			<version>3.0.2-SNAPSHOT</version>
 			<type>zip</type>
 			<scope>test</scope>
 		</dependency>
-		<!-- for RMI 
-		<dependency>
-			<groupId>jboss</groupId>
-			<artifactId>jbossall-client</artifactId>
-			<version>4.2.2.GA</version>
-			<scope>test</scope>
-		</dependency>
+		<!--
+			for RMI <dependency> <groupId>jboss</groupId>
+			<artifactId>jbossall-client</artifactId> <version>4.2.2.GA</version>
+			<scope>test</scope> </dependency>
 		-->
 	</dependencies>
 	<build>
@@ -104,7 +103,7 @@
 								<artifactItem>
 									<groupId>org.apache.juddi</groupId>
 									<artifactId>juddi-tomcat</artifactId>
-									<version>3.0.2.SNAPSHOT</version>
+									<version>3.0.2-SNAPSHOT</version>
 									<type>zip</type>
 									<outputDirectory>${basedir}/target</outputDirectory>
 								</artifactItem>
@@ -123,9 +122,12 @@
 						<phase>pre-integration-test</phase>
 						<configuration>
 							<tasks>
-								<unzip dest="target" src="target/juddi-tomcat-3.0.2.SNAPSHOT.zip" />
-								<copy file="${basedir}/server.xml" todir="target/juddi-tomcat-${project.version}/conf" overwrite="true"/>
-								<copy file="${basedir}/log4j.properties" todir="target/juddi-tomcat-${project.version}/webapps/juddiv3/WEB-INF/classes" overwrite="true"/>
+								<unzip dest="target" src="target/juddi-tomcat-3.0.2-SNAPSHOT.zip" />
+								<copy file="${basedir}/server.xml" todir="target/juddi-tomcat-${project.version}/conf"
+									overwrite="true" />
+								<copy file="${basedir}/log4j.properties"
+									todir="target/juddi-tomcat-${project.version}/webapps/juddiv3/WEB-INF/classes"
+									overwrite="true" />
 							</tasks>
 						</configuration>
 						<goals>
@@ -135,24 +137,6 @@
 				</executions>
 			</plugin>
 			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.5</source>
-					<target>1.5</target>
-				</configuration>
-			</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.codehaus.cargo</groupId>
 				<artifactId>cargo-maven2-plugin</artifactId>
 				<version>1.0</version>
@@ -160,16 +144,16 @@
 					<wait>false</wait>
 					<container>
 						<containerId>tomcat6x</containerId>
-						<home>${basedir}/target/juddi-tomcat-3.0.2.SNAPSHOT</home>
+						<home>${basedir}/target/juddi-tomcat-3.0.2-SNAPSHOT</home>
 					</container>
 					<configuration>
 						<type>existing</type>
-						<home>${project.build.directory}/juddi-tomcat-3.0.2.SNAPSHOT</home>
+						<home>${project.build.directory}/juddi-tomcat-3.0.2-SNAPSHOT</home>
 						<properties>
 							<cargo.logging>high</cargo.logging>
 							<cargo.hostname>localhost</cargo.hostname>
 							<cargo.servlet.port>8880</cargo.servlet.port>
-							<cargo.jvmargs>-Xms256m -Xmx256m -XX:PermSize=256M -XX:MaxPermSize=256M</cargo.jvmargs>
+							<cargo.jvmargs>-Xms256m -Xmx256m -XX:MaxPermSize=256M</cargo.jvmargs>
 						</properties>
 					</configuration>
 				</configuration>
@@ -279,4 +263,4 @@
 			</build>
 		</profile>
 	</profiles>
-</project>
+</project>
\ No newline at end of file

Modified: webservices/juddi/trunk/uddi-ws/pom.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/uddi-ws/pom.xml?rev=905487&r1=905486&r2=905487&view=diff
==============================================================================
--- webservices/juddi/trunk/uddi-ws/pom.xml (original)
+++ webservices/juddi/trunk/uddi-ws/pom.xml Tue Feb  2 01:11:18 2010
@@ -1,28 +1,30 @@
 <?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>
 	<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>uddi-ws</artifactId>
-	<version>3.0.2.SNAPSHOT</version>
-	<packaging>jar</packaging>
+	<packaging>bundle</packaging>
 	<name>UDDI_v3 WS Stubs and Schema Bindings Generated from WSDL</name>
 	<repositories>
 		<repository>
@@ -57,40 +59,34 @@
 			<layout>legacy</layout>
 		</pluginRepository>
 	</pluginRepositories>
-	<build>
-		<plugins>
-			<!--
-				uncomment this section to regenerate the java classes <plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>jaxws-maven-plugin</artifactId> <executions> <execution>
-				<goals> <goal>wsimport</goal> </goals> </execution> </executions>
-				<configuration> <wsdlDirectory>src/main/resources</wsdlDirectory>
-				<wsdlFiles> <wsdlFile>uddi_v3_service.wsdl</wsdlFile> </wsdlFiles>
-				<keep>true</keep> </configuration> </plugin>
-			-->
-                        <plugin>
-                          <groupId>org.apache.maven.plugins</groupId>
-                          <artifactId>maven-source-plugin</artifactId>
-                          <executions>
+	<profiles>
+        <profile>
+            <id>regenerate-source</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>jaxws-maven-plugin</artifactId>
+                        <!-- version??? -->
+                        <executions>
                             <execution>
-                              <goals>
-                                <goal>jar</goal>
-                  	      </goals>
-               		    </execution>
-            		  </executions>
-            		</plugin>
-			<plugin>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.4</version>
-				<configuration>
-					<skip>false</skip>
-					<includes>
-						<include>**/*Test.java</include>
-					</includes>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+                                <goals>
+                                    <goal>wsimport</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <wsdlDirectory>src/main/resources</wsdlDirectory>
+                            <wsdlFiles>
+                                <wsdlFile>uddi_v3_service.wsdl</wsdlFile>
+                            </wsdlFiles>
+                            <keep>true</keep>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 	<dependencies>
 		<dependency>
 			<groupId>javax.xml.bind</groupId>
@@ -108,10 +104,10 @@
 			<version>2.1.9</version>
 		</dependency>
 		<dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.13</version>
-        </dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>1.2.13</version>
+		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
@@ -119,4 +115,4 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-</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