Author: kstam
Date: Tue Mar 5 21:43:26 2013
New Revision: 1453024
URL: http://svn.apache.org/r1453024
Log:
JUDDI-540, Fixing the jUDDI distro.
it now builds
- a bin dir with all released artifacts,
- a src dir with the sources,
- a docs dir with juddi and uddi docs
- a javadocs dir with javadoc jars
- a tomcat dir with juddiv3.war deployed
- examples that can be run against a running jUDDI
Added:
juddi/trunk/juddi-dist/src/
juddi/trunk/juddi-dist/src/main/
juddi/trunk/juddi-dist/src/main/assembly/
juddi/trunk/juddi-dist/src/main/assembly/assembly.xml
- copied, changed from r1452620, juddi/trunk/juddi-dist/assembly.xml
juddi/trunk/juddi-examples/uddi-annotations/README.txt
juddi/trunk/juddi-examples/uddi-annotations/src/main/resources/META-INF/sales-uddi.xml
juddi/trunk/juddi-examples/uddi-annotations/src/main/resources/META-INF/uddi-annotations.xml
- copied, changed from r1452622,
juddi/trunk/juddi-examples/uddi-annotations/src/main/resources/META-INF/uddi.xml
Removed:
juddi/trunk/juddi-dist/assembly.xml
juddi/trunk/juddi-examples/uddi-annotations/src/main/resources/META-INF/uddi.xml
Modified:
juddi/trunk/docs/assembly.xml
juddi/trunk/docs/pom.xml
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIServiceCounter.java
juddi/trunk/juddi-dist/pom.xml
juddi/trunk/juddi-examples/create-partition/src/main/java/org/apache/juddi/example/partition/SimpleCreateTmodelPartition.java
juddi/trunk/juddi-examples/simple-browse/ (props changed)
juddi/trunk/juddi-examples/uddi-annotations/pom.xml
juddi/trunk/juddi-examples/uddi-annotations/src/main/java/org/apache/juddi/samples/HelloWorldImpl.java
juddi/trunk/juddi-examples/uddi-annotations/src/main/webapp/WEB-INF/web.xml
juddi/trunk/pom.xml
Modified: juddi/trunk/docs/assembly.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/docs/assembly.xml?rev=1453024&r1=1453023&r2=1453024&view=diff
==============================================================================
--- juddi/trunk/docs/assembly.xml (original)
+++ juddi/trunk/docs/assembly.xml Tue Mar 5 21:43:26 2013
@@ -16,49 +16,33 @@
*/ -->
<assembly>
- <id></id>
+ <id>docs</id>
<formats>
<format>tar.gz</format>
<format>zip</format>
</formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <
<fileSets>
- <fileSet>
-
<directory>${basedir}/devguide/target/docbook/publish/en-US/pdf</directory>
- <includes>
- <include>*.pdf</include>
- </includes>
- <outputDirectory></outputDirectory>
+ <fileSet>
+
<directory>${basedir}/devguide/target/docbook/publish/en-US</directory>
+ <outputDirectory>devguide</outputDirectory>
</fileSet>
<fileSet>
-
<directory>${basedir}/userguide/target/docbook/publish/en-US/pdf</directory>
- <includes>
- <include>*.pdf</include>
- </includes>
- <outputDirectory></outputDirectory>
+
<directory>${basedir}/userguide/target/docbook/publish/en-US</directory>
+ <outputDirectory>userguide</outputDirectory>
</fileSet>
<fileSet>
- <directory>${basedir}</directory>
- <includes>
- <include>*.java</include>
- </includes>
- <outputDirectory></outputDirectory>
+ <directory>${basedir}/db</directory>
+ <outputDirectory>db</outputDirectory>
</fileSet>
- <fileSet>
- <directory>${basedir}/examples/auth</directory>
- <includes>
- <include>*.pdf</include>
- <include>*.java</include>
- </includes>
- <outputDirectory>examples/auth</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>${basedir}/uddi3-specification</directory>
- <includes>
- <include>*.pdf</include>
- <include>*.txt</include>
- <include>*.java</include>
- </includes>
- <outputDirectory>uddi3-specification</outputDirectory>
- </fileSet>
+ <fileSet>
+ <directory>${basedir}/uddi3-specification</directory>
+ <includes>
+ <include>*.pdf</include>
+ <include>*.txt</include>
+ </includes>
+ <outputDirectory>uddi3-specification</outputDirectory>
+ </fileSet>
</fileSets>
</assembly>
Modified: juddi/trunk/docs/pom.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/docs/pom.xml?rev=1453024&r1=1453023&r2=1453024&view=diff
==============================================================================
--- juddi/trunk/docs/pom.xml (original)
+++ juddi/trunk/docs/pom.xml Tue Mar 5 21:43:26 2013
@@ -39,7 +39,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-3</version>
<executions>
<execution>
<id>make-assembly</id>
Modified:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIServiceCounter.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIServiceCounter.java?rev=1453024&r1=1453023&r2=1453024&view=diff
==============================================================================
---
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIServiceCounter.java
(original)
+++
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIServiceCounter.java
Tue Mar 5 21:43:26 2013
@@ -94,7 +94,8 @@ public class UDDIServiceCounter implemen
}
try {
- mbeanServer.registerMBean(this, listObjectName);
+ if (! mbeanServer.isRegistered(listObjectName))
+ mbeanServer.registerMBean(this, listObjectName);
} catch (InstanceAlreadyExistsException e) {
log.warn("", e);
} catch (MBeanRegistrationException e) {
Modified: juddi/trunk/juddi-dist/pom.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-dist/pom.xml?rev=1453024&r1=1453023&r2=1453024&view=diff
==============================================================================
--- juddi/trunk/juddi-dist/pom.xml (original)
+++ juddi/trunk/juddi-dist/pom.xml Tue Mar 5 21:43:26 2013
@@ -23,15 +23,43 @@
<version>3.1.5-SNAPSHOT</version>
</parent>
<artifactId>juddi-dist</artifactId>
- <name>jUDDI Distribution Packaging</name>
+ <name>jUDDI Distribution Assembly</name>
<packaging>pom</packaging>
<dependencies>
+ <!-- binary archives -->
+ <dependency>
+ <groupId>org.apache.juddi</groupId>
+ <artifactId>juddi-client</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.juddi</groupId>
+ <artifactId>juddi-core</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.juddi</groupId>
+ <artifactId>juddiv3-war</artifactId>
+ <version>${project.parent.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.juddi</groupId>
+ <artifactId>uddi-ws</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.juddi</groupId>
+ <artifactId>uddi-tck-base</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <!-- source archives -->
<dependency>
- <groupId>org.apache.juddi</groupId>
- <artifactId>juddiv3-war</artifactId>
- <version>${project.parent.version}</version>
- <type>war</type>
- </dependency>
+ <groupId>org.apache.juddi</groupId>
+ <artifactId>juddi-client</artifactId>
+ <version>${project.parent.version}</version>
+ <classifier>sources</classifier>
+ </dependency>
<dependency>
<groupId>org.apache.juddi</groupId>
<artifactId>juddi-core</artifactId>
@@ -39,23 +67,73 @@
<classifier>sources</classifier>
</dependency>
<dependency>
- <groupId>org.apache.juddi</groupId>
- <artifactId>juddi-core</artifactId>
- <version>${project.parent.version}</version>
- <classifier>javadoc</classifier>
- </dependency>
+ <groupId>org.apache.juddi</groupId>
+ <artifactId>juddiv3-war</artifactId>
+ <version>${project.parent.version}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.juddi</groupId>
+ <artifactId>uddi-ws</artifactId>
+ <version>${project.parent.version}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.juddi</groupId>
+ <artifactId>uddi-tck-base</artifactId>
+ <version>${project.parent.version}</version>
+ <classifier>sources</classifier>
+ </dependency>
+
+ <!-- javadoc archives -->
+ <dependency>
+ <groupId>org.apache.juddi</groupId>
+ <artifactId>juddi-client</artifactId>
+ <version>${project.parent.version}</version>
+ <classifier>javadoc</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.juddi</groupId>
+ <artifactId>juddi-core</artifactId>
+ <version>${project.parent.version}</version>
+ <classifier>javadoc</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.juddi</groupId>
+ <artifactId>juddiv3-war</artifactId>
+ <version>${project.parent.version}</version>
+ <classifier>javadoc</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.juddi</groupId>
+ <artifactId>uddi-ws</artifactId>
+ <version>${project.parent.version}</version>
+ <classifier>javadoc</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.juddi</groupId>
+ <artifactId>uddi-tck-base</artifactId>
+ <version>${project.parent.version}</version>
+ <classifier>javadoc</classifier>
+ </dependency>
+
+ <!-- documentation -->
<dependency>
<groupId>org.apache.juddi</groupId>
<artifactId>juddi-docs</artifactId>
<version>${project.parent.version}</version>
- <type>tar.gz</type>
+ <classifier>docs</classifier>
+ <type>zip</type>
</dependency>
+
+ <!-- tomcat -->
<dependency>
- <groupId>org.apache.juddi</groupId>
- <artifactId>juddiv3-samples</artifactId>
- <version>${project.parent.version}</version>
- <type>war</type>
- </dependency>
+ <groupId>org.apache.juddi</groupId>
+ <artifactId>juddi-tomcat</artifactId>
+ <version>${project.parent.version}</version>
+ <type>zip</type>
+ </dependency>
+
</dependencies>
<build>
<plugins>
@@ -67,12 +145,18 @@
<id>make-assembly</id>
<phase>package</phase>
<goals>
- <goal>attached</goal>
+ <goal>single</goal>
</goals>
<configuration>
+
<finalName>juddi-distro-${project.version}</finalName>
<descriptors>
-
<descriptor>${basedir}/assembly.xml</descriptor>
+
<descriptor>src/main/assembly/assembly.xml</descriptor>
</descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ <appendAssemblyId>false</appendAssemblyId>
+ <archiverConfig>
+ <defaultDirectoryMode>0755</defaultDirectoryMode>
+ </archiverConfig>
</configuration>
</execution>
</executions>
@@ -82,9 +166,11 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
+
<skip>true</skip>
</configuration>
</plugin>
+
</plugins>
</build>
</project>
Copied: juddi/trunk/juddi-dist/src/main/assembly/assembly.xml (from r1452620,
juddi/trunk/juddi-dist/assembly.xml)
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-dist/src/main/assembly/assembly.xml?p2=juddi/trunk/juddi-dist/src/main/assembly/assembly.xml&p1=juddi/trunk/juddi-dist/assembly.xml&r1=1452620&r2=1453024&rev=1453024&view=diff
==============================================================================
--- juddi/trunk/juddi-dist/assembly.xml (original)
+++ juddi/trunk/juddi-dist/src/main/assembly/assembly.xml Tue Mar 5 21:43:26
2013
@@ -1,47 +1,161 @@
-<!--
- * 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. *
*/ -->
<assembly>
- <id>dist</id>
- <formats>
- <format>tar.gz</format>
- <format>zip</format>
- </formats>
- <dependencySets>
+ <id>distro</id>
+ <formats>
+ <format>zip</format>
+ <format>tar.gz</format>
+ </formats>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <moduleSets>
+ <moduleSet>
+ <!-- Enable access to all projects in the current multi-module build
-->
+ <useAllReactorProjects>true</useAllReactorProjects>
+ </moduleSet>
+ </moduleSets>
+ <dependencySets>
+ <!-- binary artifacts -->
+ <dependencySet>
+
+ <outputDirectory>bin</outputDirectory>
+ <includes>
+ <include>org.apache.juddi:juddi-client:jar</include>
+ <include>org.apache.juddi:juddi-core:jar</include>
+ <include>org.apache.juddi:uddi-tck-base:jar</include>
+ <include>org.apache.juddi:uddi-ws:jar</include>
+ </includes>
+ <excludes>
+ <exclude>org.apache.juddi:juddi-client:jar:sources</exclude>
+ <exclude>org.apache.juddi:juddi-core:jar:sources</exclude>
+ <exclude>org.apache.juddi:uddi-tck-base:jar:sources</exclude>
+ <exclude>org.apache.juddi:uddi-ws:jar:sources</exclude>
+ <exclude>org.apache.juddi:juddi-client:jar:javadoc</exclude>
+ <exclude>org.apache.juddi:juddi-core:jar:javadoc</exclude>
+ <exclude>org.apache.juddi:uddi-tck-base:jar:javadoc</exclude>
+ <exclude>org.apache.juddi:uddi-ws:jar:javadoc</exclude>
+ </excludes>
+
+ <useProjectArtifact>false</useProjectArtifact>
+ <useProjectAttachments>false</useProjectAttachments>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <useTransitiveFiltering>false</useTransitiveFiltering>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0755</fileMode>
+ </dependencySet>
+
+ <!-- wars -->
<dependencySet>
+ <outputDirectory>bin</outputDirectory>
+ <includes>
+ <include>org.apache.juddi:juddiv3-war:war</include>
+ </includes>
+ <outputFileNameMapping>juddiv3.war</outputFileNameMapping>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useProjectAttachments>false</useProjectAttachments>
<useTransitiveDependencies>false</useTransitiveDependencies>
+ <useTransitiveFiltering>false</useTransitiveFiltering>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0755</fileMode>
</dependencySet>
- </dependencySets>
- <fileSets>
- <fileSet>
+
+ <!-- The source archives JARs -->
+ <dependencySet>
+ <outputDirectory>src</outputDirectory>
+ <includes>
+
<include>org.apache.juddi:juddi-client:jar:sources</include>
+
<include>org.apache.juddi:juddi-core:jar:sources</include>
+
<include>org.apache.juddi:juddiv3-war:jar:sources</include>
+
<include>org.apache.juddi:uddi-tck-base:jar:sources</include>
+
<include>org.apache.juddi:uddi-ws:jar:sources</include>
+ </includes>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useProjectAttachments>false</useProjectAttachments>
+
<useTransitiveDependencies>false</useTransitiveDependencies>
+ <useTransitiveFiltering>false</useTransitiveFiltering>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0755</fileMode>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>docs</outputDirectory>
<includes>
- <include>LICENSE</include>
+ <include>org.apache.juddi:juddi-docs:zip</include>
</includes>
- </fileSet>
- </fileSets>
- <!-- this doesn't work for me before proposed changes -->
- <moduleSets>
- <moduleSet>
+ <unpack>true</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useProjectAttachments>false</useProjectAttachments>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <useTransitiveFiltering>false</useTransitiveFiltering>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0755</fileMode>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>javadoc</outputDirectory>
<includes>
- <include>org.apache.juddi:juddi-docs</include>
+ <include>org.apache.juddi:juddi-client:jar:javadoc</include>
+ <include>org.apache.juddi:juddi-core:jar:javadoc</include>
+ <include>org.apache.juddi:juddiv3-war:jar:javadoc</include>
+ <include>org.apache.juddi:uddi-tck-base:jar:javadoc</include>
+ <include>org.apache.juddi:uddi-ws:jar:javadoc</include>
</includes>
- <binaries>
- <outputDirectory>docs</outputDirectory>
- <unpack>true</unpack>
- </binaries>
- </moduleSet>
- </moduleSets>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useProjectAttachments>false</useProjectAttachments>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <useTransitiveFiltering>false</useTransitiveFiltering>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0755</fileMode>
+ </dependencySet>
+
+ <!-- tomcat -->
+ <dependencySet>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>org.apache.juddi:juddi-tomcat:zip</include>
+ </includes>
+ <unpack>true</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useProjectAttachments>false</useProjectAttachments>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <useTransitiveFiltering>false</useTransitiveFiltering>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0755</fileMode>
+ </dependencySet>
+
+ </dependencySets>
+ <fileSets>
+ <fileSet>
+ <directory>${basedir}</directory>
+ <outputDirectory></outputDirectory>
+ <filtered>true</filtered>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0755</fileMode>
+ <includes>
+ <include>LICENSE</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../juddi-examples</directory>
+ <outputDirectory>examples</outputDirectory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <excludes>
+ <exclude>**/.settings/**</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.gitignore</exclude>
+ <exclude>**/.svn/**</exclude>
+ <exclude>**/.svnignore</exclude>
+ <exclude>**/target/**</exclude>
+ </excludes>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0755</fileMode>
+ </fileSet>
+ </fileSets>
+
</assembly>
Modified:
juddi/trunk/juddi-examples/create-partition/src/main/java/org/apache/juddi/example/partition/SimpleCreateTmodelPartition.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/create-partition/src/main/java/org/apache/juddi/example/partition/SimpleCreateTmodelPartition.java?rev=1453024&r1=1453023&r2=1453024&view=diff
==============================================================================
---
juddi/trunk/juddi-examples/create-partition/src/main/java/org/apache/juddi/example/partition/SimpleCreateTmodelPartition.java
(original)
+++
juddi/trunk/juddi-examples/create-partition/src/main/java/org/apache/juddi/example/partition/SimpleCreateTmodelPartition.java
Tue Mar 5 21:43:26 2013
@@ -160,7 +160,7 @@ public class SimpleCreateTmodelPartition
System.out.println("Binding Key: " +
bindingTemplates.getBindingTemplate().get(i).getBindingKey());
//TODO The UDDI spec is kind of strange at this point.
//An access point could be a URL, a reference to another UDDI
binding key, a hosting redirector (which is
- //esscentially a pointer to another UDDI registry) or a WSDL
Deployment
+ //essentially a pointer to another UDDI registry) or a WSDL
Deployment
//From an end client's perspective, all you really want is the
endpoint.
//So if you have a wsdlDeployment useType, fetch the wsdl and
parse for the invocation URL
Propchange: juddi/trunk/juddi-examples/simple-browse/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Mar 5 21:43:26 2013
@@ -0,0 +1 @@
+target
Added: juddi/trunk/juddi-examples/uddi-annotations/README.txt
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/uddi-annotations/README.txt?rev=1453024&view=auto
==============================================================================
--- juddi/trunk/juddi-examples/uddi-annotations/README.txt (added)
+++ juddi/trunk/juddi-examples/uddi-annotations/README.txt Tue Mar 5 21:43:26
2013
@@ -0,0 +1,63 @@
+This example demonstrates how to use the UDDI annotations to
+selfregister a WebService to UDDI at deployment time.
+
+1. Start the jUDDI-server (juddi-tomcat or juddi-bundle)
+
+2. Check the settings of the META-INF/uddi.xml, to make sure the serverName
and serverPort are set correctly.
+
+3. Build the uddi-annotations.war
+
+mvn package
+
+4. Deploy the uddi-annotations.war to tomcat
+
+mvn -Pdemo cargo:deploy
+
+5. A HelloWorld service should now be deployed. Point your browser to
+
+http://localhost:8080/uddi-annotations/services
+
+and see
+
+ Available SOAP services:
+ HelloWorld
+
+ sayHi
+
+ Endpoint address:
http://localhost:8080/uddi-annotations/services/helloworld
+ WSDL : {http://samples.juddi.apache.org/}HelloWorld
+ Target namespace: http://samples.juddi.apache.org/
+
+6. The service and binding should also be registered into UDDI. On the
tomcat/logs/juddi.log
+should show and entry:
+
+ [org.apache.juddi.v3.client.config.UDDIClerk] - Registering service
HelloWorld with key uddi:juddi.apache.org:services-hellobusinesses
+
+To check even further fire up a uddi-console, or you can go to the
simple-browse example and run
+
+mvn -Pdemo test
+
+Among other services it should show
+
+ Fetching data for business uddi:juddi.apache.org:businesses-asf
+ Name HelloWorld
+ Desc Hello World test service
+ Key uddi:juddi.apache.org:services-hellobusinesses
+ Cat bag no data
+ Item is not digitally signed
+ Binding Key: uddi:juddi.apache.org:localhost-8080-hellobusinesses-wsdl
+ Access Point:
http://localhost:8080/juddiv3-samples/services/helloworld?wsdl type
wsdlDeployment
+
+7. To remove the hello world service from UDDI simple undeploy the
uddi-annotations.war. Go
+back to the uddi-annotation example and run
+
+mvn -Pdemo cargo:undeploy
+
+The juddi.log should show
+
+ [org.apache.juddi.v3.client.config.UDDIClerkManager] - Stopping UDDI
Clerks for manager uddi-manager
+ [org.apache.juddi.v3.client.config.UDDIClerk] - UnRegistering binding key
uddi:juddi.apache.org:localhost-8080-hellobusinesses-wsdl
+ [org.apache.juddi.v3.client.config.UDDIClerk] - UnRegistering the service
uddi:juddi.apache.org:services-hellobusinesses
+
+
+
Modified: juddi/trunk/juddi-examples/uddi-annotations/pom.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/uddi-annotations/pom.xml?rev=1453024&r1=1453023&r2=1453024&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/uddi-annotations/pom.xml (original)
+++ juddi/trunk/juddi-examples/uddi-annotations/pom.xml Tue Mar 5 21:43:26 2013
@@ -80,11 +80,11 @@
</dependency>
</dependencies>
<build>
+ <finalName>uddi-annotations</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.1</version>
<configuration>
<excludes>
<exclude>*.xml</exclude>
@@ -101,7 +101,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4</version>
<configuration>
<skip>false</skip>
<includes>
@@ -113,7 +112,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
<executions>
<execution>
<id>foo</id>
@@ -147,6 +145,48 @@
WEB-INF/classes/RENAME4MARKETING_juddi_custom_install_data/*</dependentWarExcludes>
</configuration>
</plugin>
+ <!-- examples are 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>
+ </build>
+
+
+ <profiles>
+ <profile>
+ <id>demo</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven2-plugin</artifactId>
+ <version>1.3.3</version>
+ <configuration>
+ <container>
+ <containerId>tomcat6x</containerId>
+ </container>
+ <configuration>
+ <type>existing</type>
+
<home>${basedir}/../../juddi-tomcat-${project.parent.version}</home>
+ </configuration>
+ <deployables>
+ <deployable>
+ <groupId>org.apache.juddi.example</groupId>
+ <artifactId>uddi-annotations</artifactId>
+ <type>war</type>
+
+ </deployable>
+ </deployables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
Modified:
juddi/trunk/juddi-examples/uddi-annotations/src/main/java/org/apache/juddi/samples/HelloWorldImpl.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/uddi-annotations/src/main/java/org/apache/juddi/samples/HelloWorldImpl.java?rev=1453024&r1=1453023&r2=1453024&view=diff
==============================================================================
---
juddi/trunk/juddi-examples/uddi-annotations/src/main/java/org/apache/juddi/samples/HelloWorldImpl.java
(original)
+++
juddi/trunk/juddi-examples/uddi-annotations/src/main/java/org/apache/juddi/samples/HelloWorldImpl.java
Tue Mar 5 21:43:26 2013
@@ -31,7 +31,7 @@ import org.apache.juddi.v3.annotations.U
description="WSDL endpoint for the hello${department} Service. This
service is used for "
+ "testing the jUDDI annotation
functionality",
accessPointType="wsdlDeployment",
-
accessPoint="http://${serverName}:${serverPort}/juddiv3-samples/services/helloworld?wsdl";)
+
accessPoint="http://${serverName}:${serverPort}/uddi-annotations/services/helloworld?wsdl";)
@WebService(
endpointInterface = "org.apache.juddi.samples.HelloWorld",
serviceName = "HelloWorld")
Added:
juddi/trunk/juddi-examples/uddi-annotations/src/main/resources/META-INF/sales-uddi.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/uddi-annotations/src/main/resources/META-INF/sales-uddi.xml?rev=1453024&view=auto
==============================================================================
---
juddi/trunk/juddi-examples/uddi-annotations/src/main/resources/META-INF/sales-uddi.xml
(added)
+++
juddi/trunk/juddi-examples/uddi-annotations/src/main/resources/META-INF/sales-uddi.xml
Tue Mar 5 21:43:26 2013
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<uddi>
+ <reloadDelay>5000</reloadDelay>
+ <manager name="example-manager">
+ <nodes>
+ <node isHomeJUDDI="true">
+ <name>default</name>
+ <description>Sales jUDDI node</description>
+ <properties>
+ <property name="serverName"
value="sales"/>
+ <property name="serverPort"
value="8080"/>
+ <property name="keyDomain"
value="sales.apache.org"/>
+ <property name="department"
value="sales" />
+ </properties>
+
<proxyTransport>org.apache.juddi.v3.client.transport.InVMTransport</proxyTransport>
+
<custodyTransferUrl>org.apache.juddi.api.impl.UDDICustodyTransferImpl</custodyTransferUrl>
+
<inquiryUrl>org.apache.juddi.api.impl.UDDIInquiryImpl</inquiryUrl>
+
<publishUrl>org.apache.juddi.api.impl.UDDIPublicationImpl</publishUrl>
+
<securityUrl>org.apache.juddi.api.impl.UDDISecurityImpl</securityUrl>
+
<subscriptionUrl>org.apache.juddi.api.impl.UDDISubscriptionImpl</subscriptionUrl>
+
<subscriptionListenerUrl>org.apache.juddi.api.impl.UDDISubscriptionListenerImpl</subscriptionListenerUrl>
+
<juddiApiUrl>org.apache.juddi.api.impl.JUDDIApiImpl</juddiApiUrl>
+ </node>
+ </nodes>
+ <clerks registerOnStartup="true">
+ <clerk name="BobCratchit" node="default" publisher="sales"
password="sales">
+ <class>org.apache.juddi.samples.HelloWorldImpl</class>
+ </clerk>
+ </clerks>
+ </manager>
+
+</uddi>
\ No newline at end of file
Copied:
juddi/trunk/juddi-examples/uddi-annotations/src/main/resources/META-INF/uddi-annotations.xml
(from r1452622,
juddi/trunk/juddi-examples/uddi-annotations/src/main/resources/META-INF/uddi.xml)
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/uddi-annotations/src/main/resources/META-INF/uddi-annotations.xml?p2=juddi/trunk/juddi-examples/uddi-annotations/src/main/resources/META-INF/uddi-annotations.xml&p1=juddi/trunk/juddi-examples/uddi-annotations/src/main/resources/META-INF/uddi.xml&r1=1452622&r2=1453024&rev=1453024&view=diff
==============================================================================
---
juddi/trunk/juddi-examples/uddi-annotations/src/main/resources/META-INF/uddi.xml
(original)
+++
juddi/trunk/juddi-examples/uddi-annotations/src/main/resources/META-INF/uddi-annotations.xml
Tue Mar 5 21:43:26 2013
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<uddi>
<reloadDelay>5000</reloadDelay>
- <manager name="example-manager">
+ <manager name="uddi-manager">
<nodes>
<node isHomeJUDDI="true">
<name>default</name>
- <description>Sales jUDDI node</description>
+ <description>Local jUDDI node</description>
<properties>
- <property name="serverName"
value="sales"/>
+ <property name="serverName"
value="localhost"/>
<property name="serverPort"
value="8080"/>
- <property name="keyDomain"
value="sales.apache.org"/>
- <property name="department"
value="sales" />
+ <property name="keyDomain"
value="juddi.apache.org"/>
+ <property name="department"
value="businesses" />
</properties>
<proxyTransport>org.apache.juddi.v3.client.transport.InVMTransport</proxyTransport>
<custodyTransferUrl>org.apache.juddi.api.impl.UDDICustodyTransferImpl</custodyTransferUrl>
@@ -23,7 +23,7 @@
</node>
</nodes>
<clerks registerOnStartup="true">
- <clerk name="BobCratchit" node="default" publisher="sales"
password="sales">
+ <clerk name="ROOTClerk" node="default" publisher="root"
password="root">
<class>org.apache.juddi.samples.HelloWorldImpl</class>
</clerk>
</clerks>
Modified:
juddi/trunk/juddi-examples/uddi-annotations/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/uddi-annotations/src/main/webapp/WEB-INF/web.xml?rev=1453024&r1=1453023&r2=1453024&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/uddi-annotations/src/main/webapp/WEB-INF/web.xml
(original)
+++ juddi/trunk/juddi-examples/uddi-annotations/src/main/webapp/WEB-INF/web.xml
Tue Mar 5 21:43:26 2013
@@ -34,8 +34,8 @@
</context-param>
<context-param>
- <param-name>uddi.client.manager.name</param-name>
- <param-value>example-manager</param-value>
+ <param-name>uddi.client.config.file</param-name>
+ <param-value>/META-INF/uddi-annotations.xml</param-value>
</context-param>
Modified: juddi/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/pom.xml?rev=1453024&r1=1453023&r2=1453024&view=diff
==============================================================================
--- juddi/trunk/pom.xml (original)
+++ juddi/trunk/pom.xml Tue Mar 5 21:43:26 2013
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>9</version>
+ <version>13</version>
</parent>
<packaging>pom</packaging>
<groupId>org.apache.juddi</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
