Author: alexoree
Date: Sun Oct 27 20:14:14 2013
New Revision: 1536190
URL: http://svn.apache.org/r1536190
Log:
JUDDI-579 fixing an incorrect imports related to the digital signature refactor
JUDDI-672 adding amqp notifier class
JUDDI-509 adding versioning tmodels
Added:
juddi/trunk/juddi-examples/uddi-samples/src/org/apache/juddi/samples/SubscriptionCallbackExample.java
- copied, changed from r1534826,
juddi/trunk/juddi-examples/uddi-samples/src/org/apache/juddi/samples/UddiFindBinding.java
Modified:
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/subscription/SubscriptionCallbackListener.java
juddi/trunk/juddi-core/src/main/resources/juddi_install_data/UDDI_tModels.xml
juddi/trunk/juddi-examples/subscription-notification-handler/nbproject/
(props changed)
juddi/trunk/juddi-examples/subscription-notification-handler/nbproject/build-impl.xml
juddi/trunk/juddi-examples/subscription-notification-handler/nbproject/genfiles.properties
juddi/trunk/juddi-examples/subscription-notification-handler/nbproject/project.properties
juddi/trunk/juddi-examples/subscription-notification-handler/readme.txt
juddi/trunk/juddi-examples/subscription-notification-handler/src/org/apache/juddi/subscription/notify/AMQPNotifier.java
juddi/trunk/juddi-examples/uddi-samples/src/org/apache/juddi/samples/UddiDigitalSignatureBusiness.java
juddi/trunk/juddi-examples/uddi-samples/src/org/apache/juddi/samples/UddiDigitalSignatureService.java
juddi/trunk/juddi-examples/uddi-samples/src/org/apache/juddi/samples/UddiDigitalSignatureTmodel.java
Modified:
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/subscription/SubscriptionCallbackListener.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/subscription/SubscriptionCallbackListener.java?rev=1536190&r1=1536189&r2=1536190&view=diff
==============================================================================
---
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/subscription/SubscriptionCallbackListener.java
(original)
+++
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/subscription/SubscriptionCallbackListener.java
Sun Oct 27 20:14:14 2013
@@ -420,10 +420,7 @@ public class SubscriptionCallbackListene
}
- //TODO optionally unregister the binding template
- //delete binding templates matching this endpoint?
- //or maintain a list of binding templates that i've registered
- //TODO optionally kill the subscription
+ //TODO optionally kill the subscription?
//get all subscriptions from the uddi node,
//loop through and deduce which ones are pointed at this endpoint
//then remove them
Modified:
juddi/trunk/juddi-core/src/main/resources/juddi_install_data/UDDI_tModels.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/resources/juddi_install_data/UDDI_tModels.xml?rev=1536190&r1=1536189&r2=1536190&view=diff
==============================================================================
---
juddi/trunk/juddi-core/src/main/resources/juddi_install_data/UDDI_tModels.xml
(original)
+++
juddi/trunk/juddi-core/src/main/resources/juddi_install_data/UDDI_tModels.xml
Sun Oct 27 20:14:14 2013
@@ -1339,4 +1339,18 @@
<keyedReference keyName="uddi-org:types:checked"
keyValue="checked" tModelKey="uddi:uddi.org:categorization:types" />
</categoryBag>
</tModel>
+
+ <tModel tModelKey="urn:uddi:uddi.org:version">
+ <name>Service Interface Version</name>
+ <description xml:lang="en">When using this tModel as a tModelInstance,
it can be used to describe a version associated with either a service
interface, a bindingTemplate service instance.</description>
+ <overviewDoc>
+ <overviewURL>
+
http://www.ibm.com/developerworks/webservices/library/ws-version/
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:checked"
keyValue="checked" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+
</save_tModel>
\ No newline at end of file
Propchange:
juddi/trunk/juddi-examples/subscription-notification-handler/nbproject/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Oct 27 20:14:14 2013
@@ -0,0 +1 @@
+private
Modified:
juddi/trunk/juddi-examples/subscription-notification-handler/nbproject/build-impl.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/subscription-notification-handler/nbproject/build-impl.xml?rev=1536190&r1=1536189&r2=1536190&view=diff
==============================================================================
---
juddi/trunk/juddi-examples/subscription-notification-handler/nbproject/build-impl.xml
(original)
+++
juddi/trunk/juddi-examples/subscription-notification-handler/nbproject/build-impl.xml
Sun Oct 27 20:14:14 2013
@@ -370,6 +370,11 @@ is divided into following sections:
</and>
</condition>
</target>
+ <target name="-init-test-properties">
+ <property name="test.binaryincludes" value="<nothing>"/>
+ <property name="test.binarytestincludes" value=""/>
+ <property name="test.binaryexcludes" value=""/>
+ </target>
<target if="${nb.junit.single}" name="-init-macrodef-junit-single"
unless="${nb.junit.batch}">
<macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3";>
<attribute default="${includes}" name="includes"/>
@@ -393,7 +398,7 @@ is divided into following sections:
</sequential>
</macrodef>
</target>
- <target if="${nb.junit.batch}" name="-init-macrodef-junit-batch"
unless="${nb.junit.single}">
+ <target depends="-init-test-properties" if="${nb.junit.batch}"
name="-init-macrodef-junit-batch" unless="${nb.junit.single}">
<macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3";>
<attribute default="${includes}" name="includes"/>
<attribute default="${excludes}" name="excludes"/>
@@ -407,6 +412,9 @@ is divided into following sections:
<fileset dir="${test.src.dir}"
excludes="@{excludes},${excludes}" includes="@{includes}">
<filename name="@{testincludes}"/>
</fileset>
+ <fileset dir="${build.test.classes.dir}"
excludes="@{excludes},${excludes},${test.binaryexcludes}"
includes="${test.binaryincludes}">
+ <filename name="${test.binarytestincludes}"/>
+ </fileset>
</batchtest>
<syspropertyset>
<propertyref prefix="test-sys-prop."/>
@@ -534,7 +542,7 @@ is divided into following sections:
</sequential>
</macrodef>
</target>
- <target if="${nb.junit.batch}" name="-init-macrodef-junit-debug-batch">
+ <target depends="-init-test-properties" if="${nb.junit.batch}"
name="-init-macrodef-junit-debug-batch">
<macrodef name="junit-debug"
uri="http://www.netbeans.org/ns/j2se-project/3";>
<attribute default="${includes}" name="includes"/>
<attribute default="${excludes}" name="excludes"/>
@@ -548,6 +556,9 @@ is divided into following sections:
<fileset dir="${test.src.dir}"
excludes="@{excludes},${excludes}" includes="@{includes}">
<filename name="@{testincludes}"/>
</fileset>
+ <fileset dir="${build.test.classes.dir}"
excludes="@{excludes},${excludes},${test.binaryexcludes}"
includes="${test.binaryincludes}">
+ <filename name="${test.binarytestincludes}"/>
+ </fileset>
</batchtest>
<syspropertyset>
<propertyref prefix="test-sys-prop."/>
@@ -920,7 +931,7 @@ is divided into following sections:
<target if="has.persistence.xml" name="-copy-persistence-xml">
<mkdir dir="${build.classes.dir}/META-INF"/>
<copy todir="${build.classes.dir}/META-INF">
- <fileset dir="${meta.inf.dir}" includes="persistence.xml"/>
+ <fileset dir="${meta.inf.dir}" includes="persistence.xml orm.xml"/>
</copy>
</target>
<target name="-post-compile">
Modified:
juddi/trunk/juddi-examples/subscription-notification-handler/nbproject/genfiles.properties
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/subscription-notification-handler/nbproject/genfiles.properties?rev=1536190&r1=1536189&r2=1536190&view=diff
==============================================================================
---
juddi/trunk/juddi-examples/subscription-notification-handler/nbproject/genfiles.properties
(original)
+++
juddi/trunk/juddi-examples/subscription-notification-handler/nbproject/genfiles.properties
Sun Oct 27 20:14:14 2013
@@ -4,5 +4,5 @@ [email protected]
# This file is used by a NetBeans-based IDE to track changes in generated
files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never
regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=5e820738
-nbproject/build-impl.xml.script.CRC32=3086f51a
-nbproject/[email protected]
+nbproject/build-impl.xml.script.CRC32=ecc938e2
+nbproject/[email protected]
Modified:
juddi/trunk/juddi-examples/subscription-notification-handler/nbproject/project.properties
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/subscription-notification-handler/nbproject/project.properties?rev=1536190&r1=1536189&r2=1536190&view=diff
==============================================================================
---
juddi/trunk/juddi-examples/subscription-notification-handler/nbproject/project.properties
(original)
+++
juddi/trunk/juddi-examples/subscription-notification-handler/nbproject/project.properties
Sun Oct 27 20:14:14 2013
@@ -27,119 +27,11 @@ dist.jar=${dist.dir}/subscription-notifi
dist.javadoc.dir=${dist.dir}/javadoc
endorsed.classpath=
excludes=
-file.reference.aopalliance-1.0.jar=..\\..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\aopalliance-1.0.jar
-file.reference.asm-3.3.jar=..\\..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\asm-3.3.jar
-file.reference.commons-beanutils-1.7.0.jar=..\\..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\commons-beanutils-1.7.0.jar
-file.reference.commons-beanutils-core-1.8.0.jar=..\\..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\commons-beanutils-core-1.8.0.jar
-file.reference.commons-codec-1.3.jar=..\\..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\commons-codec-1.3.jar
-file.reference.commons-collections-3.2.1.jar=..\\..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\commons-collections-3.2.1.jar
-file.reference.commons-configuration-1.6.jar=..\\..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\commons-configuration-1.6.jar
-file.reference.commons-digester-1.8.jar=..\\..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\commons-digester-1.8.jar
-file.reference.commons-lang-2.4.jar=..\\..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\commons-lang-2.4.jar
-file.reference.commons-logging-api-1.1.jar=..\\..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\commons-logging-api-1.1.jar
-file.reference.commons-pool-1.5.4.jar=..\\..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\commons-pool-1.5.4.jar
-file.reference.cxf-api-2.3.1.jar=..\\..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\cxf-api-2.3.1.jar
-file.reference.cxf-common-schemas-2.3.1.jar=..\\..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\cxf-common-schemas-2.3.1.jar
-file.reference.cxf-common-utilities-2.3.1.jar=..\\..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\cxf-common-utilities-2.3.1.jar
-file.reference.cxf-rt-bindings-soap-2.3.1.jar=..\\..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\cxf-rt-bindings-soap-2.3.1.jar
-file.reference.cxf-rt-bindings-xml-2.3.1.jar=..\\..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\cxf-rt-bindings-xml-2.3.1.jar
-file.reference.cxf-rt-core-2.3.1.jar=..\\..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\cxf-rt-core-2.3.1.jar
-file.reference.cxf-rt-databinding-jaxb-2.3.1.jar=..\\..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\cxf-rt-databinding-jaxb-2.3.1.jar
-file.reference.cxf-rt-frontend-jaxws-2.3.1.jar=..\\..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\cxf-rt-frontend-jaxws-2.3.1.jar
-file.reference.cxf-rt-frontend-simple-2.3.1.jar=..\\..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\cxf-rt-frontend-simple-2.3.1.jar
-file.reference.cxf-rt-transports-http-2.3.1.jar=..\\..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\cxf-rt-transports-http-2.3.1.jar
-file.reference.cxf-rt-ws-addr-2.3.1.jar=..\\..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\cxf-rt-ws-addr-2.3.1.jar
-file.reference.cxf-tools-common-2.3.1.jar=..\\..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\cxf-tools-common-2.3.1.jar
-file.reference.geronimo-javamail_1.4_mail-1.8.2.jar=..\\..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\geronimo-javamail_1.4_mail-1.8.2.jar
-file.reference.geronimo-javamail_1.4_spec-1.7.1.jar=..\\..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\geronimo-javamail_1.4_spec-1.7.1.jar
-file.reference.geronimo-jms_1.1_spec-1.0.jar=lib\\geronimo-jms_1.1_spec-1.0.jar
-file.reference.geronimo-jms_1.1_spec-1.1.1.jar=..\\..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\geronimo-jms_1.1_spec-1.1.1.jar
-file.reference.geronimo-jpa_2.0_spec-1.1.jar=..\\..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\geronimo-jpa_2.0_spec-1.1.jar
-file.reference.geronimo-jta_1.1_spec-1.1.1.jar=..\\..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\geronimo-jta_1.1_spec-1.1.1.jar
-file.reference.jaxb-impl-2.1.13.jar=..\\..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\jaxb-impl-2.1.13.jar
-file.reference.juddi-client-3.1.5-SNAPSHOT.jar=..\\..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\juddi-client-3.1.5-SNAPSHOT.jar
-file.reference.juddi-core-openjpa-3.1.5-SNAPSHOT.jar=..\\..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\juddi-core-openjpa-3.1.5-SNAPSHOT.jar
-file.reference.neethi-2.0.4.jar=..\\..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\neethi-2.0.4.jar
-file.reference.openjpa-2.2.1.jar=..\\..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\openjpa-2.2.1.jar
-file.reference.persistence-api-1.0.jar=..\\..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\persistence-api-1.0.jar
-file.reference.qpid-all.jar=lib\\qpid-all.jar
-file.reference.qpid-amqp-1-0-client-0.20.jar=lib\\qpid-amqp-1-0-client-0.20.jar
-file.reference.qpid-amqp-1-0-client-jms-0.20.jar=lib\\qpid-amqp-1-0-client-jms-0.20.jar
-file.reference.qpid-amqp-1-0-common-0.20.jar=lib\\qpid-amqp-1-0-common-0.20.jar
-file.reference.serp-1.13.1.jar=..\\..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\serp-1.13.1.jar
-file.reference.spring-aop-3.0.5.RELEASE.jar=..\\..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\spring-aop-3.0.5.RELEASE.jar
-file.reference.spring-asm-3.0.5.RELEASE.jar=..\\..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\spring-asm-3.0.5.RELEASE.jar
-file.reference.spring-beans-3.0.5.RELEASE.jar=..\\..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\spring-beans-3.0.5.RELEASE.jar
-file.reference.spring-context-3.0.5.RELEASE.jar=..\\..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\spring-context-3.0.5.RELEASE.jar
-file.reference.spring-core-3.0.5.RELEASE.jar=..\\..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\spring-core-3.0.5.RELEASE.jar
-file.reference.spring-expression-3.0.5.RELEASE.jar=..\\..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\spring-expression-3.0.5.RELEASE.jar
-file.reference.spring-web-3.0.5.RELEASE.jar=..\\..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\spring-web-3.0.5.RELEASE.jar
-file.reference.stax-api-1.0-2.jar=..\\..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\stax-api-1.0-2.jar
-file.reference.stax2-api-3.0.2.jar=..\\..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\stax2-api-3.0.2.jar
-file.reference.uddi-ws-3.1.5-SNAPSHOT.jar=..\\..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\uddi-ws-3.1.5-SNAPSHOT.jar
-file.reference.woodstox-core-asl-4.0.8.jar=..\\..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\woodstox-core-asl-4.0.8.jar
-file.reference.wsdl4j-1.6.2.jar=..\\..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\wsdl4j-1.6.2.jar
-file.reference.xml-resolver-1.2.jar=..\\..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\xml-resolver-1.2.jar
-file.reference.XmlSchema-1.4.7.jar=..\\..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\XmlSchema-1.4.7.jar
includes=**
jar.archive.disabled=${jnlp.enabled}
jar.compress=false
jar.index=${jnlp.enabled}
-javac.classpath=\
- ${file.reference.aopalliance-1.0.jar}:\
- ${file.reference.asm-3.3.jar}:\
- ${file.reference.commons-beanutils-1.7.0.jar}:\
- ${file.reference.commons-beanutils-core-1.8.0.jar}:\
- ${file.reference.commons-codec-1.3.jar}:\
- ${file.reference.commons-collections-3.2.1.jar}:\
- ${file.reference.commons-configuration-1.6.jar}:\
- ${file.reference.commons-digester-1.8.jar}:\
- ${file.reference.commons-lang-2.4.jar}:\
- ${file.reference.commons-logging-api-1.1.jar}:\
- ${file.reference.commons-pool-1.5.4.jar}:\
- ${file.reference.cxf-api-2.3.1.jar}:\
- ${file.reference.cxf-common-schemas-2.3.1.jar}:\
- ${file.reference.cxf-common-utilities-2.3.1.jar}:\
- ${file.reference.cxf-rt-bindings-soap-2.3.1.jar}:\
- ${file.reference.cxf-rt-bindings-xml-2.3.1.jar}:\
- ${file.reference.cxf-rt-core-2.3.1.jar}:\
- ${file.reference.cxf-rt-databinding-jaxb-2.3.1.jar}:\
- ${file.reference.cxf-rt-frontend-jaxws-2.3.1.jar}:\
- ${file.reference.cxf-rt-frontend-simple-2.3.1.jar}:\
- ${file.reference.cxf-rt-transports-http-2.3.1.jar}:\
- ${file.reference.cxf-rt-ws-addr-2.3.1.jar}:\
- ${file.reference.cxf-tools-common-2.3.1.jar}:\
- ${file.reference.geronimo-javamail_1.4_mail-1.8.2.jar}:\
- ${file.reference.geronimo-javamail_1.4_spec-1.7.1.jar}:\
- ${file.reference.geronimo-jms_1.1_spec-1.1.1.jar}:\
- ${file.reference.geronimo-jpa_2.0_spec-1.1.jar}:\
- ${file.reference.geronimo-jta_1.1_spec-1.1.1.jar}:\
- ${file.reference.jaxb-impl-2.1.13.jar}:\
- ${file.reference.juddi-client-3.1.5-SNAPSHOT.jar}:\
- ${file.reference.juddi-core-openjpa-3.1.5-SNAPSHOT.jar}:\
- ${file.reference.neethi-2.0.4.jar}:\
- ${file.reference.openjpa-2.2.1.jar}:\
- ${file.reference.persistence-api-1.0.jar}:\
- ${file.reference.serp-1.13.1.jar}:\
- ${file.reference.spring-aop-3.0.5.RELEASE.jar}:\
- ${file.reference.spring-asm-3.0.5.RELEASE.jar}:\
- ${file.reference.spring-beans-3.0.5.RELEASE.jar}:\
- ${file.reference.spring-context-3.0.5.RELEASE.jar}:\
- ${file.reference.spring-core-3.0.5.RELEASE.jar}:\
- ${file.reference.spring-expression-3.0.5.RELEASE.jar}:\
- ${file.reference.spring-web-3.0.5.RELEASE.jar}:\
- ${file.reference.stax-api-1.0-2.jar}:\
- ${file.reference.stax2-api-3.0.2.jar}:\
- ${file.reference.uddi-ws-3.1.5-SNAPSHOT.jar}:\
- ${file.reference.woodstox-core-asl-4.0.8.jar}:\
- ${file.reference.wsdl4j-1.6.2.jar}:\
- ${file.reference.xml-resolver-1.2.jar}:\
- ${file.reference.XmlSchema-1.4.7.jar}:\
- ${file.reference.geronimo-jms_1.1_spec-1.0.jar}:\
- ${file.reference.qpid-all.jar}:\
- ${file.reference.qpid-amqp-1-0-client-0.20.jar}:\
- ${file.reference.qpid-amqp-1-0-client-jms-0.20.jar}:\
- ${file.reference.qpid-amqp-1-0-common-0.20.jar}
+javac.classpath=
# Space-separated list of extra javac options
javac.compilerargs=
javac.deprecation=false
Modified:
juddi/trunk/juddi-examples/subscription-notification-handler/readme.txt
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/subscription-notification-handler/readme.txt?rev=1536190&r1=1536189&r2=1536190&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/subscription-notification-handler/readme.txt
(original)
+++ juddi/trunk/juddi-examples/subscription-notification-handler/readme.txt Sun
Oct 27 20:14:14 2013
@@ -1,3 +1,3 @@
-Maybe one day, I can convince Kurt to convert this thing to Maven
+Maybe one day, I can convince Kurt to convert this to Maven
This project is an add on for jUDDI that lets users setup UDDI subscriptions
that get funneled to an AMQP Qpid exchange (topic, queue, etc). It's meant to
be a demonstration of what's possible and does not support all of the advanced
Qpid configuration scenarios, authentication or encryption.
\ No newline at end of file
Modified:
juddi/trunk/juddi-examples/subscription-notification-handler/src/org/apache/juddi/subscription/notify/AMQPNotifier.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/subscription-notification-handler/src/org/apache/juddi/subscription/notify/AMQPNotifier.java?rev=1536190&r1=1536189&r2=1536190&view=diff
==============================================================================
---
juddi/trunk/juddi-examples/subscription-notification-handler/src/org/apache/juddi/subscription/notify/AMQPNotifier.java
(original)
+++
juddi/trunk/juddi-examples/subscription-notification-handler/src/org/apache/juddi/subscription/notify/AMQPNotifier.java
Sun Oct 27 20:14:14 2013
@@ -46,6 +46,11 @@ import org.uddi.v3_service.DispositionRe
/**
* AMQP Notifier
+ *
+ * This is designed to enable users to setup AMQP based alerts for UDDI
subscriptions
+ *
+ * This class is incomplete, but it at least offers a quick example of how it
could be done
+ *
* amqp.java.naming.factory.initial
* amqp.connectionfactory.qpidConnectionfactory
* amqp.destination
Copied:
juddi/trunk/juddi-examples/uddi-samples/src/org/apache/juddi/samples/SubscriptionCallbackExample.java
(from r1534826,
juddi/trunk/juddi-examples/uddi-samples/src/org/apache/juddi/samples/UddiFindBinding.java)
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/uddi-samples/src/org/apache/juddi/samples/SubscriptionCallbackExample.java?p2=juddi/trunk/juddi-examples/uddi-samples/src/org/apache/juddi/samples/SubscriptionCallbackExample.java&p1=juddi/trunk/juddi-examples/uddi-samples/src/org/apache/juddi/samples/UddiFindBinding.java&r1=1534826&r2=1536190&rev=1536190&view=diff
==============================================================================
---
juddi/trunk/juddi-examples/uddi-samples/src/org/apache/juddi/samples/UddiFindBinding.java
(original)
+++
juddi/trunk/juddi-examples/uddi-samples/src/org/apache/juddi/samples/SubscriptionCallbackExample.java
Sun Oct 27 20:14:14 2013
@@ -16,15 +16,26 @@
*/
package org.apache.juddi.samples;
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.ws.Holder;
import org.apache.juddi.v3.client.UDDIConstants;
+import org.apache.juddi.v3.client.config.UDDIClerk;
import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.config.UDDIClientContainer;
+import org.apache.juddi.v3.client.subscription.ISubscriptionCallback;
+import org.apache.juddi.v3.client.subscription.SubscriptionCallbackListener;
import org.apache.juddi.v3.client.transport.Transport;
import org.apache.juddi.v3_service.JUDDIApiPortType;
import org.uddi.api_v3.*;
+import org.uddi.sub_v3.DeleteSubscription;
+import org.uddi.sub_v3.Subscription;
+import org.uddi.sub_v3.SubscriptionFilter;
+import org.uddi.sub_v3.SubscriptionResultsList;
import org.uddi.v3_service.UDDIInquiryPortType;
import org.uddi.v3_service.UDDIPublicationPortType;
import org.uddi.v3_service.UDDISecurityPortType;
+import org.uddi.v3_service.UDDISubscriptionPortType;
/**
* This class shows you how to find an endpoint by searching through all
@@ -32,72 +43,97 @@ import org.uddi.v3_service.UDDISecurityP
*
* @author <a href="mailto:[email protected]";>Alex O'Ree</a>
*/
-public class UddiFindBinding {
+public class SubscriptionCallbackExample implements ISubscriptionCallback {
private static UDDISecurityPortType security = null;
private static JUDDIApiPortType juddiApi = null;
private static UDDIPublicationPortType publish = null;
private static UDDIInquiryPortType inquiry = null;
+ private static UDDIClient c = null;
+ private static UDDISubscriptionPortType subscription = null;
+ private static UDDIClerk clerk = null;
- public UddiFindBinding() {
+ public SubscriptionCallbackExample() {
try {
+
+ c = new UDDIClient("META-INF/simple-publish-uddi.xml");
+ c.start();
+ clerk = c.getClerk("default");
+ TModel createKeyGenator =
UDDIClerk.createKeyGenator("uddi:org.apache.juddi:test:keygenerator", "Test
domain", "en");
+ clerk.register(createKeyGenator);
+
+
+
+
+
// create a manager and read the config in the archive;
// you can use your config file name
- UDDIClient clerkManager = new
UDDIClient("META-INF/simple-publish-uddi.xml");
+
// register the clerkManager with the client side container
- UDDIClientContainer.addClient(clerkManager); // a
ClerkManager can be a client to multiple UDDI nodes, so
+ UDDIClientContainer.addClient(c); // a ClerkManager can
be a client to multiple UDDI nodes, so
// supply the nodeName (defined in your uddi.xml.
// The transport can be WS, inVM, RMI etc which is defined in the
uddi.xml
- Transport transport = clerkManager.getTransport("default");
+ Transport transport = c.getTransport("default");
// Now you create a reference to the UDDI API
security = transport.getUDDISecurityService();
juddiApi = transport.getJUDDIApiService();
publish = transport.getUDDIPublishService();
inquiry = transport.getUDDIInquiryService();
+ subscription = transport.getUDDISubscriptionService();
} catch (Exception e) {
e.printStackTrace();
}
}
- public void publish() {
- try {
- // Setting up the values to get an authentication token for the
'root' user ('root' user has admin privileges
- // and can save other publishers).
- GetAuthToken getAuthTokenRoot = new GetAuthToken();
- getAuthTokenRoot.setUserID("root");
- getAuthTokenRoot.setCred("root");
-
- // Making API call that retrieves the authentication token for the
'root' user.
- AuthToken rootAuthToken = security.getAuthToken(getAuthTokenRoot);
- System.out.println("root AUTHTOKEN = " +
rootAuthToken.getAuthInfo());
-
- FindService fs = new FindService();
- fs.getName().add(new Name());
- fs.getName().get(0).setValue("%");
- fs.setFindQualifiers(new FindQualifiers());
-
fs.getFindQualifiers().getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH);
-
- ServiceList findService = inquiry.findService(fs);
-
System.out.println(findService.getServiceInfos().getServiceInfo().size());
- GetServiceDetail gs = new GetServiceDetail();
- for (int i = 0; i <
findService.getServiceInfos().getServiceInfo().size(); i++) {
-
gs.getServiceKey().add(findService.getServiceInfos().getServiceInfo().get(i).getServiceKey());
- }
-
- ServiceDetail serviceDetail = inquiry.getServiceDetail(gs);
- for (int i = 0; i < serviceDetail.getBusinessService().size();
i++) {
-
System.out.println(serviceDetail.getBusinessService().get(i).getBindingTemplates().getBindingTemplate().size());
- for (int k = 0; k <
serviceDetail.getBusinessService().get(i).getBindingTemplates().getBindingTemplate().size();
k++) {
-
System.out.println(serviceDetail.getBusinessService().get(i).getBindingTemplates().getBindingTemplate().get(k).getAccessPoint().getValue());
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
+ public static void main(String args[]) throws Exception {
+ SubscriptionCallbackExample sp = new SubscriptionCallbackExample();
+ //this will fireup a jetty server and host a UDDI Subscription
callback Listener service
+ //and register it per the config file
+ BindingTemplate start = SubscriptionCallbackListener.start(c,
"default");
+
+ //register our code for the callback part
+ SubscriptionCallbackListener.registerCallback(sp);
+
+ //login
+ String token =
clerk.getAuthToken(clerk.getUDDINode().getSecurityUrl());
+
+ //Set up a subscription using the 'start' BindingTemplate
+ Holder<List<Subscription>> subs = new Holder<List<Subscription>>();
+ subs.value = new ArrayList<Subscription>();
+ Subscription s = new Subscription();
+ s.setBindingKey(start.getBindingKey());
+ s.setBrief(false);
+ s.setSubscriptionFilter(new SubscriptionFilter());
+ s.getSubscriptionFilter().setFindBusiness(new FindBusiness());
+ s.getSubscriptionFilter().getFindBusiness().getName().add(new
Name(UDDIConstants.WILDCARD, null));
+ s.getSubscriptionFilter().getFindBusiness().setFindQualifiers(new
FindQualifiers());
+
s.getSubscriptionFilter().getFindBusiness().getFindQualifiers().getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH);
+ subs.value.add(s);
+
+ //save the subscription
+ subscription.saveSubscription(token, subs);
+
+ //Do some useful activities here, perhap something to trigger the
callback
+ Thread.sleep(1000);
+
+ //stop and unregister the callback when we're done
+ SubscriptionCallbackListener.stop(c, "default", start.getBindingKey());
+
+ //clean up the subscription
+ DeleteSubscription ds = new DeleteSubscription();
+ ds.setAuthInfo(token);
+ ds.getSubscriptionKey().add(subs.value.get(0).getSubscriptionKey());
+ subscription.deleteSubscription(ds);
}
- public static void main(String args[]) {
- UddiFindBinding sp = new UddiFindBinding();
- sp.publish();
+ @Override
+ public void HandleCallback(SubscriptionResultsList body) {
+ System.out.println("callback received");
+ }
+
+ @Override
+ public void NotifyEndpointStopped() {
+
+ System.out.println("stopped");
}
}
Modified:
juddi/trunk/juddi-examples/uddi-samples/src/org/apache/juddi/samples/UddiDigitalSignatureBusiness.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/uddi-samples/src/org/apache/juddi/samples/UddiDigitalSignatureBusiness.java?rev=1536190&r1=1536189&r2=1536190&view=diff
==============================================================================
---
juddi/trunk/juddi-examples/uddi-samples/src/org/apache/juddi/samples/UddiDigitalSignatureBusiness.java
(original)
+++
juddi/trunk/juddi-examples/uddi-samples/src/org/apache/juddi/samples/UddiDigitalSignatureBusiness.java
Sun Oct 27 20:14:14 2013
@@ -20,7 +20,7 @@ import java.util.concurrent.atomic.Atomi
import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.config.UDDIClientContainer;
-import org.apache.juddi.v3.client.crypto.DigSigUtil;
+import org.apache.juddi.v3.client.cryptor.DigSigUtil;
import org.apache.juddi.v3.client.transport.Transport;
import org.uddi.api_v3.*;
import org.uddi.v3_service.UDDIInquiryPortType;
@@ -75,7 +75,7 @@ public class UddiDigitalSignatureBusines
public void Fire(String[] args) {
try {
- org.apache.juddi.v3.client.crypto.DigSigUtil ds = null;
+ DigSigUtil ds = null;
//option 1), set everything manually
ds = new DigSigUtil();
Modified:
juddi/trunk/juddi-examples/uddi-samples/src/org/apache/juddi/samples/UddiDigitalSignatureService.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/uddi-samples/src/org/apache/juddi/samples/UddiDigitalSignatureService.java?rev=1536190&r1=1536189&r2=1536190&view=diff
==============================================================================
---
juddi/trunk/juddi-examples/uddi-samples/src/org/apache/juddi/samples/UddiDigitalSignatureService.java
(original)
+++
juddi/trunk/juddi-examples/uddi-samples/src/org/apache/juddi/samples/UddiDigitalSignatureService.java
Sun Oct 27 20:14:14 2013
@@ -19,7 +19,7 @@ package org.apache.juddi.samples;
import java.util.concurrent.atomic.AtomicReference;
import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.config.UDDIClientContainer;
-import org.apache.juddi.v3.client.crypto.DigSigUtil;
+import org.apache.juddi.v3.client.cryptor.DigSigUtil;
import org.apache.juddi.v3.client.transport.Transport;
import org.uddi.api_v3.*;
import org.uddi.v3_service.UDDIInquiryPortType;
@@ -74,7 +74,7 @@ public class UddiDigitalSignatureService
public void Fire(String[] args) {
try {
- org.apache.juddi.v3.client.crypto.DigSigUtil ds = null;
+ DigSigUtil ds = null;
//option 1), set everything manually
ds = new DigSigUtil();
Modified:
juddi/trunk/juddi-examples/uddi-samples/src/org/apache/juddi/samples/UddiDigitalSignatureTmodel.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/uddi-samples/src/org/apache/juddi/samples/UddiDigitalSignatureTmodel.java?rev=1536190&r1=1536189&r2=1536190&view=diff
==============================================================================
---
juddi/trunk/juddi-examples/uddi-samples/src/org/apache/juddi/samples/UddiDigitalSignatureTmodel.java
(original)
+++
juddi/trunk/juddi-examples/uddi-samples/src/org/apache/juddi/samples/UddiDigitalSignatureTmodel.java
Sun Oct 27 20:14:14 2013
@@ -19,7 +19,7 @@ package org.apache.juddi.samples;
import java.util.concurrent.atomic.AtomicReference;
import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.config.UDDIClientContainer;
-import org.apache.juddi.v3.client.crypto.DigSigUtil;
+import org.apache.juddi.v3.client.cryptor.DigSigUtil;
import org.apache.juddi.v3.client.transport.Transport;
import org.uddi.api_v3.*;
import org.uddi.v3_service.UDDIInquiryPortType;
@@ -72,7 +72,7 @@ public class UddiDigitalSignatureTmodel
public void Fire(String[] args) {
try {
- org.apache.juddi.v3.client.crypto.DigSigUtil ds = null;
+ DigSigUtil ds = null;
//option 1), set everything manually
ds = new DigSigUtil();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
