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 2009/10/06 07:06:48 UTC
svn commit: r822124 - in /webservices/juddi/trunk/juddi-console:
subscription-listener/ subscription-listener/src/main/java/org/apache/juddi/
subscription-listener/src/main/java/org/apache/juddi/subscription/
subscription-listener/src/main/java/org/apa...
Author: kstam
Date: Tue Oct 6 05:06:48 2009
New Revision: 822124
URL: http://svn.apache.org/viewvc?rev=822124&view=rev
Log:
JUDDI-287 adding auto register/unregister annotations.
Added:
webservices/juddi/trunk/juddi-console/subscription-listener/src/main/java/org/apache/juddi/subscription/
webservices/juddi/trunk/juddi-console/subscription-listener/src/main/java/org/apache/juddi/subscription/NotifyServlet.java (contents, props changed)
- copied, changed from r821420, webservices/juddi/trunk/juddi-console/subscription-listener/src/main/java/org/apache/juddi/NotifyServlet.java
webservices/juddi/trunk/juddi-console/subscription-listener/src/main/java/org/apache/juddi/test/
webservices/juddi/trunk/juddi-console/subscription-listener/src/main/java/org/apache/juddi/test/HelloWorld.java
webservices/juddi/trunk/juddi-console/subscription-listener/src/main/java/org/apache/juddi/test/HelloWorldImpl.java
webservices/juddi/trunk/juddi-console/subscription-listener/src/main/resources/META-INF/uddi.xml
Removed:
webservices/juddi/trunk/juddi-console/subscription-listener/src/main/java/org/apache/juddi/NotifyServlet.java
Modified:
webservices/juddi/trunk/juddi-console/subscription-listener/pom.xml
webservices/juddi/trunk/juddi-console/subscription-listener/src/main/webapp/WEB-INF/beans.xml
webservices/juddi/trunk/juddi-console/subscription-listener/src/main/webapp/WEB-INF/web.xml
webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/DetailPanel.java
webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml
Modified: webservices/juddi/trunk/juddi-console/subscription-listener/pom.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/subscription-listener/pom.xml?rev=822124&r1=822123&r2=822124&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-console/subscription-listener/pom.xml (original)
+++ webservices/juddi/trunk/juddi-console/subscription-listener/pom.xml Tue Oct 6 05:06:48 2009
@@ -45,6 +45,16 @@
<version>3.0.0.SNAPSHOT</version>
</dependency>
<dependency>
+ <artifactId>uddi-client</artifactId>
+ <groupId>org.apache.juddi</groupId>
+ <version>3.0.0.SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <artifactId>uddi-ws</artifactId>
+ <groupId>org.apache.juddi</groupId>
+ <version>3.0.0.SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
Copied: webservices/juddi/trunk/juddi-console/subscription-listener/src/main/java/org/apache/juddi/subscription/NotifyServlet.java (from r821420, webservices/juddi/trunk/juddi-console/subscription-listener/src/main/java/org/apache/juddi/NotifyServlet.java)
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/subscription-listener/src/main/java/org/apache/juddi/subscription/NotifyServlet.java?p2=webservices/juddi/trunk/juddi-console/subscription-listener/src/main/java/org/apache/juddi/subscription/NotifyServlet.java&p1=webservices/juddi/trunk/juddi-console/subscription-listener/src/main/java/org/apache/juddi/NotifyServlet.java&r1=821420&r2=822124&rev=822124&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-console/subscription-listener/src/main/java/org/apache/juddi/NotifyServlet.java (original)
+++ webservices/juddi/trunk/juddi-console/subscription-listener/src/main/java/org/apache/juddi/subscription/NotifyServlet.java Tue Oct 6 05:06:48 2009
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.juddi;
+package org.apache.juddi.subscription;
import java.io.IOException;
import java.io.PrintWriter;
Propchange: webservices/juddi/trunk/juddi-console/subscription-listener/src/main/java/org/apache/juddi/subscription/NotifyServlet.java
------------------------------------------------------------------------------
svn:mergeinfo =
Added: webservices/juddi/trunk/juddi-console/subscription-listener/src/main/java/org/apache/juddi/test/HelloWorld.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/subscription-listener/src/main/java/org/apache/juddi/test/HelloWorld.java?rev=822124&view=auto
==============================================================================
--- webservices/juddi/trunk/juddi-console/subscription-listener/src/main/java/org/apache/juddi/test/HelloWorld.java (added)
+++ webservices/juddi/trunk/juddi-console/subscription-listener/src/main/java/org/apache/juddi/test/HelloWorld.java Tue Oct 6 05:06:48 2009
@@ -0,0 +1,11 @@
+package org.apache.juddi.test;
+
+import javax.jws.WebParam;
+import javax.jws.WebService;
+
+@WebService
+public interface HelloWorld {
+
+ String sayHi(@WebParam(name="text") String text);
+
+}
Added: webservices/juddi/trunk/juddi-console/subscription-listener/src/main/java/org/apache/juddi/test/HelloWorldImpl.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/subscription-listener/src/main/java/org/apache/juddi/test/HelloWorldImpl.java?rev=822124&view=auto
==============================================================================
--- webservices/juddi/trunk/juddi-console/subscription-listener/src/main/java/org/apache/juddi/test/HelloWorldImpl.java (added)
+++ webservices/juddi/trunk/juddi-console/subscription-listener/src/main/java/org/apache/juddi/test/HelloWorldImpl.java Tue Oct 6 05:06:48 2009
@@ -0,0 +1,30 @@
+package org.apache.juddi.test;
+
+import javax.jws.WebService;
+
+import org.apache.juddi.v3.annotations.UDDIService;
+import org.apache.juddi.v3.annotations.UDDIServiceBinding;
+
+
+@UDDIService(
+ businessKey="uddi:juddi.apache.org:businesses-asf",
+ serviceKey="uddi:juddi.apache.org:services-helloworld",
+ description = "Hello World test service")
+@UDDIServiceBinding(
+ bindingKey="uddi:juddi.apache.org:bindings-helloworld-wsdl",
+ description="WSDL endpoint for the HelloWorld Service. This service is used for "
+ + "testing the jUDDI annotation functionality",
+ accessPointType="wsdlDeployment",
+ accessPoint="http://${serverName}:${serverPort}/subscription-listener/helloworld")
+@WebService(
+ endpointInterface = "org.apache.juddi.test.HelloWorld",
+ serviceName = "HelloWorld")
+
+public class HelloWorldImpl implements HelloWorld {
+
+ public String sayHi(String text) {
+ System.out.println("sayHi called");
+ return "Hello " + text;
+ }
+
+}
Added: webservices/juddi/trunk/juddi-console/subscription-listener/src/main/resources/META-INF/uddi.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/subscription-listener/src/main/resources/META-INF/uddi.xml?rev=822124&view=auto
==============================================================================
--- webservices/juddi/trunk/juddi-console/subscription-listener/src/main/resources/META-INF/uddi.xml (added)
+++ webservices/juddi/trunk/juddi-console/subscription-listener/src/main/resources/META-INF/uddi.xml Tue Oct 6 05:06:48 2009
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+
+<uddi>
+ <reloadDelay>5000</reloadDelay>
+ <nodes>
+ <node>
+ <name>default</name>
+ <properties>
+ <property name="serverName" value="localhost"/>
+ <property name="serverPort" value="8080"/>
+ </properties>
+ <description>Main jUDDI node</description>
+ <!-- JAX-WS Transport -->
+ <proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
+ <custodyTransferUrl>http://${serverName}:${serverPort}/juddiv3/services/custody-transfer?wsdl</custodyTransferUrl>
+ <inquiryUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiry?wsdl</inquiryUrl>
+ <publishUrl>http://${serverName}:${serverPort}/juddiv3/services/publish?wsdl</publishUrl>
+ <securityUrl>http://${serverName}:${serverPort}/juddiv3/services/security?wsdl</securityUrl>
+ <subscriptionUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription?wsdl</subscriptionUrl>
+ <subscriptionListenerUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription-listener?wsdl</subscriptionListenerUrl>
+ <juddiApiUrl>http://${serverName}:${serverPort}/juddiv3/services/juddi-api?wsdl</juddiApiUrl>
+ </node>
+ </nodes>
+ <clerks>
+ <clerk name="default" node="default" publisher="root" password="root">
+ <class>org.apache.juddi.test.HelloWorldImpl</class>
+ </clerk>
+ </clerks>
+
+</uddi>
\ No newline at end of file
Modified: webservices/juddi/trunk/juddi-console/subscription-listener/src/main/webapp/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/subscription-listener/src/main/webapp/WEB-INF/beans.xml?rev=822124&r1=822123&r2=822124&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-console/subscription-listener/src/main/webapp/WEB-INF/beans.xml (original)
+++ webservices/juddi/trunk/juddi-console/subscription-listener/src/main/webapp/WEB-INF/beans.xml Tue Oct 6 05:06:48 2009
@@ -30,5 +30,15 @@
<entry key="schema-validation-enabled" value="true"/>
</jaxws:properties>
</jaxws:endpoint>
+
+ <jaxws:endpoint id="helloworld" implementor="org.apache.juddi.test.HelloWorldImpl" address="/helloworld"
+ >
+ <!--
+ serviceName="a:SubscriptionListenerService" endpointName="a:SubscriptionListenerServicePort" xmlns:a="urn:uddi-org:subr_v3_portType">
+ <jaxws:properties>
+ <entry key="schema-validation-enabled" value="true"/>
+ </jaxws:properties>
+ -->
+ </jaxws:endpoint>
</beans>
Modified: webservices/juddi/trunk/juddi-console/subscription-listener/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/subscription-listener/src/main/webapp/WEB-INF/web.xml?rev=822124&r1=822123&r2=822124&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-console/subscription-listener/src/main/webapp/WEB-INF/web.xml (original)
+++ webservices/juddi/trunk/juddi-console/subscription-listener/src/main/webapp/WEB-INF/web.xml Tue Oct 6 05:06:48 2009
@@ -52,7 +52,16 @@
<servlet-name>NotifyServlet</servlet-name>
<display-name>Notify Servlet</display-name>
<servlet-class>
- org.apache.juddi.NotifyServlet
+ org.apache.juddi.subscription.NotifyServlet
+ </servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>UDDIClerkServlet</servlet-name>
+ <display-name>Clerk Servlet</display-name>
+ <servlet-class>
+ org.apache.juddi.v3.client.UDDIClerkServlet
</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
@@ -66,4 +75,5 @@
<servlet-name>CXFServlet</servlet-name>
<url-pattern>/services/*</url-pattern>
</servlet-mapping>
+
</web-app>
Modified: webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/DetailPanel.java
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/DetailPanel.java?rev=822124&r1=822123&r2=822124&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/DetailPanel.java (original)
+++ webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/java/org/apache/juddi/portlets/client/DetailPanel.java Tue Oct 6 05:06:48 2009
@@ -131,7 +131,8 @@
bindingtable.setHTML(bindingRow, 0, UDDIBrowser.images.description().getHTML());
bindingtable.setText(bindingRow++, 1, serviceBinding.getDescription());
bindingtable.setHTML(bindingRow, 0, UDDIBrowser.images.endpointlive().getHTML());
- bindingtable.setHTML(bindingRow++, 1, new HTML("<a href='"
+ bindingtable.setHTML(bindingRow++, 1, serviceBinding.getUrlType() + ":"
+ + new HTML("<a href='"
+ serviceBinding.getAccessPoint() + "'>"
+ serviceBinding.getAccessPoint() + "</a>").getHTML());
table.setHTML(row, 1, bindingtable.toString());
Modified: webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml?rev=822124&r1=822123&r2=822124&view=diff
==============================================================================
--- webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml (original)
+++ webservices/juddi/trunk/juddi-console/uddi-portlets/src/main/resources/META-INF/uddi.xml Tue Oct 6 05:06:48 2009
@@ -1,20 +1,25 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<uddi>
- <reloadDelay>5001</reloadDelay>
+ <reloadDelay>5000</reloadDelay>
<nodes>
<node>
<name>default</name>
+ <properties>
+ <property name="serverName" value="localhost"/>
+ <property name="serverPort" value="8080"/>
+ <property name="rmiPort" value="1099"/>
+ </properties>
<description>Main jUDDI node</description>
<!-- JAX-WS Transport -->
<proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
- <custodyTransferUrl>http://localhost:8080/juddiv3/services/custody-transfer?wsdl</custodyTransferUrl>
- <inquiryUrl>http://localhost:8080/juddiv3/services/inquiry?wsdl</inquiryUrl>
- <publishUrl>http://localhost:8080/juddiv3/services/publish?wsdl</publishUrl>
- <securityUrl>http://localhost:8080/juddiv3/services/security?wsdl</securityUrl>
- <subscriptionUrl>http://localhost:8080/juddiv3/services/subscription?wsdl</subscriptionUrl>
- <subscriptionListenerUrl>http://localhost:8080/juddiv3/services/subscription-listener?wsdl</subscriptionListenerUrl>
- <juddiApiUrl>http://localhost:8080/juddiv3/services/juddi-api?wsdl</juddiApiUrl>
+ <custodyTransferUrl>http://${serverName}:${serverPort}/juddiv3/services/custody-transfer?wsdl</custodyTransferUrl>
+ <inquiryUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiry?wsdl</inquiryUrl>
+ <publishUrl>http://${serverName}:${serverPort}/juddiv3/services/publish?wsdl</publishUrl>
+ <securityUrl>http://${serverName}:${serverPort}/juddiv3/services/security?wsdl</securityUrl>
+ <subscriptionUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription?wsdl</subscriptionUrl>
+ <subscriptionListenerUrl>http://${serverPort}:${serverPort}/juddiv3/services/subscription-listener?wsdl</subscriptionListenerUrl>
+ <juddiApiUrl>http://${serverName}:${serverPort}/juddiv3/services/juddi-api?wsdl</juddiApiUrl>
<!-- In VM Transport Settings
<proxyTransport>org.apache.juddi.v3.client.transport.InVMTransport</proxyTransport>
<custodyTransferUrl>org.apache.juddi.api.impl.UDDICustodyTransferImpl</custodyTransferUrl>
@@ -36,26 +41,30 @@
<juddiApiUrl>/juddiv3/JUDDIApiService</juddiApiUrl>
<javaNamingFactoryInitial>org.jnp.interfaces.NamingContextFactory</javaNamingFactoryInitial>
<javaNamingFactoryUrlPkgs>org.jboss.naming</javaNamingFactoryUrlPkgs>
- <javaNamingProviderUrl>jnp://localhost:1099</javaNamingProviderUrl>
+ <javaNamingProviderUrl>jnp://${serverName}:${rmiPort}</javaNamingProviderUrl>
-->
</node>
<node>
<name>med</name>
+ <properties>
+ <property name="serverName" value="med"/>
+ <property name="serverPort" value="8080"/>
+ </properties>
<description>jUDDI node in other Department</description>
<proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
- <custodyTransferUrl>http://med:8080/juddiv3/services/custody-transfer?wsdl</custodyTransferUrl>
- <inquiryUrl>http://med:8080/juddiv3/services/inquiry?wsdl</inquiryUrl>
- <publishUrl>http://med:8080/juddiv3/services/publish?wsdl</publishUrl>
- <securityUrl>http://med:8080/juddiv3/services/security?wsdl</securityUrl>
- <subscriptionUrl>http://med:8080/juddiv3/services/subscription?wsdl</subscriptionUrl>
- <subscriptionListenerUrl>http://med:8080/juddiv3/services/subscription-listener?wsdl</subscriptionListenerUrl>
- <juddiApiUrl>http://med:8080/juddiv3/services/juddi-api?wsdl</juddiApiUrl>
+ <custodyTransferUrl>http://${serverName}:${serverPort}/juddiv3/services/custody-transfer?wsdl</custodyTransferUrl>
+ <inquiryUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiry?wsdl</inquiryUrl>
+ <publishUrl>http://${serverName}:${serverPort}/juddiv3/services/publish?wsdl</publishUrl>
+ <securityUrl>http://${serverName}:${serverPort}/juddiv3/services/security?wsdl</securityUrl>
+ <subscriptionUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription?wsdl</subscriptionUrl>
+ <subscriptionListenerUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription-listener?wsdl</subscriptionListenerUrl>
+ <juddiApiUrl>http://${serverName}:${serverPort}/juddiv3/services/juddi-api?wsdl</juddiApiUrl>
</node>
</nodes>
<clerks>
<clerk name="default" node="default" publisher="root" password="root"/>
<clerk name="medroot" node="med" publisher="root" password="root"/>
- <xregister >
+ <xregister>
<service bindingKey="uddi:juddi.apache.org:servicebindings-subscriptionlistener-ws" fromClerk="default" toClerk="medroot"/>
</xregister>
</clerks>
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org