You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by al...@apache.org on 2013/05/18 03:11:29 UTC
svn commit: r1484038 [3/3] - in /juddi/trunk: ./ juddi-client/
juddi-client/src/main/java/org/apache/juddi/v3/client/config/
juddi-client/src/main/java/org/apache/juddi/v3/client/transport/
juddi-client/src/main/java/org/apache/juddi/v3/client/transpor...
Modified: juddi/trunk/juddi-gui/nbproject/build-impl.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/nbproject/build-impl.xml?rev=1484038&r1=1483596&r2=1484038&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/nbproject/build-impl.xml (original)
+++ juddi/trunk/juddi-gui/nbproject/build-impl.xml Sat May 18 01:11:28 2013
@@ -1000,7 +1000,6 @@ exists or setup the property manually. F
<copyfiles files="${file.reference.cxf-tools-common-2.3.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.geronimo-javamail_1.4_spec-1.7.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.jaxb-impl-2.1.13.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
- <copyfiles files="${file.reference.juddi-client-3.1.5-SNAPSHOT.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.neethi-2.0.4.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.persistence-api-1.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.serp-1.13.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
@@ -1012,8 +1011,9 @@ exists or setup the property manually. F
<copyfiles files="${file.reference.spring-expression-3.0.5.RELEASE.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.spring-web-3.0.5.RELEASE.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.stax2-api-3.0.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
- <copyfiles files="${file.reference.uddi-ws-3.1.5-SNAPSHOT.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.woodstox-core-asl-4.0.8.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+ <copyfiles files="${file.reference.juddi-client-3.1.6-SNAPSHOT.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+ <copyfiles files="${file.reference.uddi-ws-3.1.6-SNAPSHOT.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.wsdl4j-1.6.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.xml-resolver-1.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${file.reference.httpclient-4.2.5.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
@@ -1048,7 +1048,6 @@ exists or setup the property manually. F
<copyfiles files="${file.reference.cxf-tools-common-2.3.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.geronimo-javamail_1.4_spec-1.7.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.jaxb-impl-2.1.13.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
- <copyfiles files="${file.reference.juddi-client-3.1.5-SNAPSHOT.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.neethi-2.0.4.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.persistence-api-1.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.serp-1.13.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
@@ -1060,8 +1059,9 @@ exists or setup the property manually. F
<copyfiles files="${file.reference.spring-expression-3.0.5.RELEASE.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.spring-web-3.0.5.RELEASE.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.stax2-api-3.0.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
- <copyfiles files="${file.reference.uddi-ws-3.1.5-SNAPSHOT.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.woodstox-core-asl-4.0.8.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+ <copyfiles files="${file.reference.juddi-client-3.1.6-SNAPSHOT.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+ <copyfiles files="${file.reference.uddi-ws-3.1.6-SNAPSHOT.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.wsdl4j-1.6.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.xml-resolver-1.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${file.reference.httpclient-4.2.5.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
Modified: juddi/trunk/juddi-gui/nbproject/genfiles.properties
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/nbproject/genfiles.properties?rev=1484038&r1=1483596&r2=1484038&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/nbproject/genfiles.properties (original)
+++ juddi/trunk/juddi-gui/nbproject/genfiles.properties Sat May 18 01:11:28 2013
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=50026b8a
+build.xml.data.CRC32=34736081
build.xml.script.CRC32=33f4ab89
build.xml.stylesheet.CRC32=651128d4@1.38.1.1
# 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=50026b8a
-nbproject/build-impl.xml.script.CRC32=9390a50e
+nbproject/build-impl.xml.data.CRC32=34736081
+nbproject/build-impl.xml.script.CRC32=b245034e
nbproject/build-impl.xml.stylesheet.CRC32=4e9cae83@1.38.1.1
Modified: juddi/trunk/juddi-gui/nbproject/project.properties
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/nbproject/project.properties?rev=1484038&r1=1483596&r2=1484038&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/nbproject/project.properties (original)
+++ juddi/trunk/juddi-gui/nbproject/project.properties Sat May 18 01:11:28 2013
@@ -52,7 +52,7 @@ file.reference.geronimo-javamail_1.4_spe
file.reference.httpclient-4.2.5.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\httpclient-4.2.5.jar
file.reference.httpcore-4.2.4.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\httpcore-4.2.4.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-client/target/juddi-client-3.1.5-SNAPSHOT.jar
+file.reference.juddi-client-3.1.6-SNAPSHOT.jar=../juddiv3-war/target/juddiv3/WEB-INF/lib/juddi-client-3.1.6-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.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.serp-1.13.1.jar=../juddi-tomcat/target/tomcat/apache-tomcat-6.0.26/webapps/juddiv3/WEB-INF/lib/serp-1.13.1.jar
@@ -64,7 +64,7 @@ file.reference.spring-core-3.0.5.RELEASE
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.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.uddi-ws-3.1.6-SNAPSHOT.jar=../juddiv3-war/target/juddiv3/WEB-INF/lib/uddi-ws-3.1.6-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
@@ -104,7 +104,6 @@ javac.classpath=\
${file.reference.cxf-tools-common-2.3.1.jar}:\
${file.reference.geronimo-javamail_1.4_spec-1.7.1.jar}:\
${file.reference.jaxb-impl-2.1.13.jar}:\
- ${file.reference.juddi-client-3.1.5-SNAPSHOT.jar}:\
${file.reference.neethi-2.0.4.jar}:\
${file.reference.persistence-api-1.0.jar}:\
${file.reference.serp-1.13.1.jar}:\
@@ -116,8 +115,9 @@ javac.classpath=\
${file.reference.spring-expression-3.0.5.RELEASE.jar}:\
${file.reference.spring-web-3.0.5.RELEASE.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.juddi-client-3.1.6-SNAPSHOT.jar}:\
+ ${file.reference.uddi-ws-3.1.6-SNAPSHOT.jar}:\
${file.reference.wsdl4j-1.6.2.jar}:\
${file.reference.xml-resolver-1.2.jar}:\
${file.reference.httpclient-4.2.5.jar}:\
Modified: juddi/trunk/juddi-gui/nbproject/project.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/nbproject/project.xml?rev=1484038&r1=1483596&r2=1484038&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/nbproject/project.xml (original)
+++ juddi/trunk/juddi-gui/nbproject/project.xml Sat May 18 01:11:28 2013
@@ -111,10 +111,6 @@
<path-in-war>WEB-INF/lib</path-in-war>
</library>
<library dirs="200">
- <file>${file.reference.juddi-client-3.1.5-SNAPSHOT.jar}</file>
- <path-in-war>WEB-INF/lib</path-in-war>
- </library>
- <library dirs="200">
<file>${file.reference.neethi-2.0.4.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war>
</library>
@@ -159,11 +155,15 @@
<path-in-war>WEB-INF/lib</path-in-war>
</library>
<library dirs="200">
- <file>${file.reference.uddi-ws-3.1.5-SNAPSHOT.jar}</file>
+ <file>${file.reference.woodstox-core-asl-4.0.8.jar}</file>
+ <path-in-war>WEB-INF/lib</path-in-war>
+ </library>
+ <library dirs="200">
+ <file>${file.reference.juddi-client-3.1.6-SNAPSHOT.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war>
</library>
<library dirs="200">
- <file>${file.reference.woodstox-core-asl-4.0.8.jar}</file>
+ <file>${file.reference.uddi-ws-3.1.6-SNAPSHOT.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war>
</library>
<library dirs="200">
Modified: juddi/trunk/juddi-tomcat/build.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-tomcat/build.xml?rev=1484038&r1=1484037&r2=1484038&view=diff
==============================================================================
--- juddi/trunk/juddi-tomcat/build.xml (original)
+++ juddi/trunk/juddi-tomcat/build.xml Sat May 18 01:11:28 2013
@@ -15,6 +15,7 @@
<copy file="${basedir}/catalina.sh" todir="${basedir}/target/tomcat/apache-tomcat-${apache.tomcat.version}/bin" overwrite="true"/>
<copy file="${basedir}/context.xml" todir="${webapps.dir}/juddiv3/META-INF" overwrite="true"/>
<copy file="${basedir}/server.xml" todir="${conf.dir}" overwrite="true"/>
+ <copy file="${basedir}/keystore.jks" todir="${conf.dir}" overwrite="true"/>
<copy file="${dependency.mysql.jar}" todir="${lib.dir}"/>
<copy file="${dependency.postgres.jar}" todir="${lib.dir}"/>
<copy file="${dependency.log4j.jar}" todir="${lib.dir}"/>
Modified: juddi/trunk/juddi-tomcat/server.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-tomcat/server.xml?rev=1484038&r1=1484037&r2=1484038&view=diff
==============================================================================
--- juddi/trunk/juddi-tomcat/server.xml (original)
+++ juddi/trunk/juddi-tomcat/server.xml Sat May 18 01:11:28 2013
@@ -78,12 +78,13 @@
This connector uses the JSSE configuration, when using APR, the
connector should be using the OpenSSL style configuration
described in the APR documentation -->
- <!--
+
<Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
maxThreads="150" scheme="https" secure="true"
- clientAuth="false" sslProtocol="TLS" />
- -->
-
+ clientAuth="false" sslProtocol="TLS"
+ keystoreFile="conf/keystore.jks" keystorePass="password"
+ />
+
<!-- Define an AJP 1.3 Connector on port 8009 -->
<Connector port="8009" protocol="AJP/1.3" redirectPort="8443" />
Propchange: juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java
------------------------------------------------------------------------------
Merged /juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java:r1460934-1483596
Propchange: juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusinessService.java
------------------------------------------------------------------------------
Merged /juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusinessService.java:r1460934-1483596
Propchange: juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckFindEntity.java
------------------------------------------------------------------------------
Merged /juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckFindEntity.java:r1460934-1483596
Propchange: juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java
------------------------------------------------------------------------------
Merged /juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java:r1460934-1483596
Modified: juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscription.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscription.java?rev=1484038&r1=1484037&r2=1484038&view=diff
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscription.java (original)
+++ juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscription.java Sat May 18 01:11:28 2013
@@ -284,6 +284,10 @@ public class TckSubscription
try {
Subscription subIn = (Subscription)EntityCreator.buildFromDoc(subscriptionXML, "org.uddi.sub_v3");
List<Subscription> subscriptionList = new ArrayList<Subscription>();
+ subIn.setSubscriptionKey(subscriptionKey);
+ if (subIn.getBindingKey()!=null && subIn.getBindingKey().length()==0){
+ subIn.setBindingKey(null);
+ }
subscriptionList.add(subIn);
Holder<List<Subscription>> subscriptionHolder = new Holder<List<Subscription>>();
subscriptionHolder.value = subscriptionList;
Propchange: juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscription.java
------------------------------------------------------------------------------
Merged /juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscription.java:r1460934-1483596
Propchange: juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscriptionListener.java
------------------------------------------------------------------------------
Merged /juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscriptionListener.java:r1460934-1483596
Propchange: juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckTModel.java
------------------------------------------------------------------------------
Merged /juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckTModel.java:r1460934-1483596
Propchange: juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/
------------------------------------------------------------------------------
Merged /juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/resources/uddi_data:r1460934-1483596
Modified: juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscription/subscription1.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscription/subscription1.xml?rev=1484038&r1=1484037&r2=1484038&view=diff
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscription/subscription1.xml (original)
+++ juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscription/subscription1.xml Sat May 18 01:11:28 2013
@@ -33,7 +33,7 @@
</categoryBag>
</find_service>
</subscriptionFilter>
- <bindingKey xmlns="urn:uddi-org:api_v3">bindingKeyOfTheClientsNotifySubscriptionListenerService</bindingKey>
+ <bindingKey xmlns="urn:uddi-org:api_v3"></bindingKey>
<notificationInterval>P5D</notificationInterval>
<maxEntities>1000</maxEntities>
</subscription>
\ No newline at end of file
Modified: juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscription/subscription2.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscription/subscription2.xml?rev=1484038&r1=1484037&r2=1484038&view=diff
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscription/subscription2.xml (original)
+++ juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscription/subscription2.xml Sat May 18 01:11:28 2013
@@ -24,7 +24,7 @@
<businessKey>uddi:www.this.key.doesnot.exist</businessKey>
</get_businessDetail>
</subscriptionFilter>
- <bindingKey xmlns="urn:uddi-org:api_v3">bindingKeyOfTheClientsNotifySubscriptionListenerService</bindingKey>
+ <bindingKey xmlns="urn:uddi-org:api_v3"></bindingKey>
<notificationInterval>P5D</notificationInterval>
<maxEntities>1000</maxEntities>
</subscription>
\ No newline at end of file
Modified: juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscription/subscription3.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscription/subscription3.xml?rev=1484038&r1=1484037&r2=1484038&view=diff
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscription/subscription3.xml (original)
+++ juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscription/subscription3.xml Sat May 18 01:11:28 2013
@@ -25,7 +25,7 @@
</categoryBag>
</find_tModel>
</subscriptionFilter>
- <bindingKey xmlns="urn:uddi-org:api_v3">bindingKeyOfTheClientsNotifySubscriptionListenerService</bindingKey>
+ <bindingKey xmlns="urn:uddi-org:api_v3"></bindingKey>
<notificationInterval>P5D</notificationInterval>
<maxEntities>3</maxEntities>
</subscription>
\ No newline at end of file
Modified: juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscription/subscription4.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscription/subscription4.xml?rev=1484038&r1=1484037&r2=1484038&view=diff
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscription/subscription4.xml (original)
+++ juddi/trunk/uddi-tck-base/src/main/resources/uddi_data/subscription/subscription4.xml Sat May 18 01:11:28 2013
@@ -51,7 +51,7 @@
<tModelKey>uddi:garbage.key.7</tModelKey>
</get_tModelDetail>
</subscriptionFilter>
- <bindingKey xmlns="urn:uddi-org:api_v3">bindingKeyOfTheClientsNotifySubscriptionListenerService</bindingKey>
+ <bindingKey xmlns="urn:uddi-org:api_v3"></bindingKey>
<notificationInterval>P5D</notificationInterval>
<maxEntities>5</maxEntities>
</subscription>
\ No newline at end of file
Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/bpel/BPEL_020_IntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/bpel/BPEL_020_IntegrationTest.java?rev=1484038&r1=1484037&r2=1484038&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/bpel/BPEL_020_IntegrationTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/bpel/BPEL_020_IntegrationTest.java Sat May 18 01:11:28 2013
@@ -97,7 +97,7 @@ private static Log logger = LogFactory.g
}
@Test
- public void parseWSDL_PortTypeTModels() throws WSDLException {
+ public void parseWSDL_PortTypeTModels() throws WSDLException , Exception {
Definition wsdlDefinition = rw.readWSDL("uddi_data/bpel/riftsaw/bpel-technote.wsdl");
@SuppressWarnings("unchecked")
@@ -118,7 +118,7 @@ private static Log logger = LogFactory.g
@Test
public void registerBPELProcess() throws WSDLException, ConfigurationException,
- MalformedURLException, RemoteException, TransportException {
+ MalformedURLException, RemoteException, TransportException, Exception {
UDDIClerk clerk = new UDDIClerk();
clerk.setManagerName(manager.getName());
Propchange: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_010_PublisherIntegrationTest.java
------------------------------------------------------------------------------
Merged /juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_010_PublisherIntegrationTest.java:r1460934-1483596
Propchange: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceLoadTest.java
------------------------------------------------------------------------------
Merged /juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceLoadTest.java:r1460934-1483596
Propchange: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java
------------------------------------------------------------------------------
Merged /juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java:r1460934-1483596
Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_141_JIRAIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_141_JIRAIntegrationTest.java?rev=1484038&r1=1484037&r2=1484038&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_141_JIRAIntegrationTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_141_JIRAIntegrationTest.java Sat May 18 01:11:28 2013
@@ -14,9 +14,18 @@
*/
package org.apache.juddi.v3.tck;
+import java.net.Inet4Address;
+import java.util.AbstractList;
import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
import java.util.List;
+import javax.xml.bind.JAXB;
+import javax.xml.datatype.DatatypeFactory;
import javax.xml.soap.SOAPFault;
+import javax.xml.ws.Endpoint;
+import javax.xml.ws.Holder;
+import javax.xml.ws.soap.SOAPFaultException;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -28,9 +37,12 @@ import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
import org.uddi.api_v3.*;
+import org.uddi.sub_v3.Subscription;
+import org.uddi.sub_v3.SubscriptionFilter;
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 test class provides test cases of items discovered or reported through
@@ -44,6 +56,7 @@ public class UDDI_141_JIRAIntegrationTes
private static Log logger = LogFactory.getLog(UDDI_141_JIRAIntegrationTest.class);
static UDDISecurityPortType security = null;
+ static UDDISubscriptionPortType subscription = null;
static UDDIInquiryPortType inquiry = null;
static UDDIPublicationPortType publication = null;
protected static String authInfoJoe = null;
@@ -80,6 +93,7 @@ public class UDDI_141_JIRAIntegrationTes
try {
Transport transport = manager.getTransport();
security = transport.getUDDISecurityService();
+ subscription = transport.getUDDISubscriptionService();
authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
authInfoSam = TckSecurity.getAuthToken(security, TckPublisher.getSamPublisherId(), TckPublisher.getSamPassword());
Assert.assertNotNull(authInfoJoe);
@@ -479,6 +493,486 @@ public class UDDI_141_JIRAIntegrationTes
}
+ /**
+ * sets up a compelte publisher assertion
+ *
+ * @throws Exception
+ */
+ @Test
+ public void JUDDI_590() throws Exception {
+ //create two businesses
+ System.out.println("JUDDI_590");
+
+ SaveBusiness sb = new SaveBusiness();
+ sb.setAuthInfo(authInfoJoe);
+ BusinessEntity be = new BusinessEntity();
+ Name n = new Name();
+ n.setValue("JUDDI_590 Joe");
+ be.getName().add(n);
+ sb.getBusinessEntity().add(be);
+ String joeBiz = null;
+ try {
+ BusinessDetail saveBusiness = publication.saveBusiness(sb);
+ joeBiz = saveBusiness.getBusinessEntity().get(0).getBusinessKey();
+ //DeleteBusiness db = new DeleteBusiness();
+ //db.setAuthInfo(authInfoJoe);
+ //db.getBusinessKey().add(saveBusiness.getBusinessEntity().get(0).getBusinessKey());
+ //publication.deleteBusiness(db);
+ //Assert.fail("request should have been rejected");
+ } catch (SOAPFaultException ex) {
+ HandleException(ex);
+ }
+
+ sb = new SaveBusiness();
+ sb.setAuthInfo(authInfoSam);
+ be = new BusinessEntity();
+ n = new Name();
+ n.setValue("JUDDI_590 Sam");
+ be.getName().add(n);
+ sb.getBusinessEntity().add(be);
+ String samBiz = null;
+ try {
+ BusinessDetail saveBusiness = publication.saveBusiness(sb);
+ samBiz = saveBusiness.getBusinessEntity().get(0).getBusinessKey();
+ //DeleteBusiness db = new DeleteBusiness();
+ //db.setAuthInfo(authInfoJoe);
+ //db.getBusinessKey().add(saveBusiness.getBusinessEntity().get(0).getBusinessKey());
+ //publication.deleteBusiness(db);
+ //Assert.fail("request should have been rejected");
+ } catch (SOAPFaultException ex) {
+ HandleException(ex);
+ }
+
+
+ //create an assertion on one end
+ AddPublisherAssertions apa = new AddPublisherAssertions();
+ apa.setAuthInfo(authInfoJoe);
+ apa.getPublisherAssertion().add(new PublisherAssertion());
+ apa.getPublisherAssertion().get(0).setFromKey(joeBiz);
+ apa.getPublisherAssertion().get(0).setToKey(samBiz);
+ KeyedReference kr = new KeyedReference();
+ kr.setKeyName("Subsidiary");
+ kr.setKeyValue("parent-child");
+ kr.setTModelKey("uddi:uddi.org:relationships");
+ apa.getPublisherAssertion().get(0).setKeyedReference(kr);
+ publication.addPublisherAssertions(apa);
+ //check get status is not null from 1 and from 2
+ boolean ok = true;
+ String msg = "";
+ try {
+ List<AssertionStatusItem> assertionStatusReport = publication.getAssertionStatusReport(authInfoJoe, CompletionStatus.STATUS_TO_KEY_INCOMPLETE);
+ if (assertionStatusReport.isEmpty()) {
+ msg = "Stage1: no result returned, expected at least 1";
+ ok = false;
+ }
+ for (int i = 0; i < assertionStatusReport.size(); i++) {
+ JAXB.marshal(assertionStatusReport.get(i), System.out);
+ if (assertionStatusReport.get(i).getToKey().equals(samBiz)) {
+ if (!assertionStatusReport.get(i).getCompletionStatus().equals(CompletionStatus.STATUS_TO_KEY_INCOMPLETE)) {
+ ok = false;
+ msg = "Stage1: status type mismatch";
+ }
+ }
+ }
+ } catch (Exception ex) {
+ ok = false;
+ ex.printStackTrace();
+ }
+
+
+ //aprove the assertion from sam
+ apa = new AddPublisherAssertions();
+ apa.setAuthInfo(authInfoSam);
+ apa.getPublisherAssertion().add(new PublisherAssertion());
+ apa.getPublisherAssertion().get(0).setFromKey(joeBiz);
+ apa.getPublisherAssertion().get(0).setToKey(samBiz);
+ kr = new KeyedReference();
+ kr.setKeyName("Subsidiary");
+ kr.setKeyValue("parent-child");
+ kr.setTModelKey("uddi:uddi.org:relationships");
+ apa.getPublisherAssertion().get(0).setKeyedReference(kr);
+ publication.addPublisherAssertions(apa);
+ try {
+ List<AssertionStatusItem> assertionStatusReport = publication.getAssertionStatusReport(authInfoJoe, CompletionStatus.STATUS_COMPLETE);
+ if (assertionStatusReport.isEmpty()) {
+ msg = "Stage2: no result returned, expected at least 1";
+ ok = false;
+ }
+ for (int i = 0; i < assertionStatusReport.size(); i++) {
+ JAXB.marshal(assertionStatusReport.get(i), System.out);
+ if (assertionStatusReport.get(i).getToKey().equals(samBiz)) {
+ if (!assertionStatusReport.get(i).getCompletionStatus().equals(CompletionStatus.STATUS_COMPLETE)) {
+ ok = false;
+ msg = "Stage2: status type mismatch";
+ }
+ }
+ }
+ //test to see what the status actually is
+ if (!ok) {
+ assertionStatusReport = publication.getAssertionStatusReport(authInfoJoe, CompletionStatus.STATUS_FROM_KEY_INCOMPLETE);
+ for (int i = 0; i < assertionStatusReport.size(); i++) {
+ JAXB.marshal(assertionStatusReport.get(i), System.out);
+ if (assertionStatusReport.get(i).getToKey().equals(samBiz)) {
+ msg = "Stage3: status is " + assertionStatusReport.get(i).getCompletionStatus().toString() + " instead of complete";
+ }
+ }
+
+ assertionStatusReport = publication.getAssertionStatusReport(authInfoJoe, CompletionStatus.STATUS_TO_KEY_INCOMPLETE);
+ for (int i = 0; i < assertionStatusReport.size(); i++) {
+ JAXB.marshal(assertionStatusReport.get(i), System.out);
+ if (assertionStatusReport.get(i).getToKey().equals(samBiz)) {
+ msg = "Stage3: status is " + assertionStatusReport.get(i).getCompletionStatus().toString() + " instead of complete";
+ }
+ }
+ assertionStatusReport = publication.getAssertionStatusReport(authInfoJoe, CompletionStatus.STATUS_BOTH_INCOMPLETE);
+ for (int i = 0; i < assertionStatusReport.size(); i++) {
+ JAXB.marshal(assertionStatusReport.get(i), System.out);
+ if (assertionStatusReport.get(i).getToKey().equals(samBiz)) {
+ msg = "Stage3: status is " + assertionStatusReport.get(i).getCompletionStatus().toString() + " instead of complete";
+ }
+ }
+
+ }
+ } catch (Exception ex) {
+ ok = false;
+ ex.printStackTrace();
+ }
+ List<String> biz = new ArrayList<String>();
+ biz.add(samBiz);
+ DeleteBusinesses(biz, authInfoSam);
+
+ biz = new ArrayList<String>();
+ biz.add(joeBiz);
+ DeleteBusinesses(biz, authInfoJoe);
+ Assert.assertTrue(msg, ok);
+
+
+ }
+
+ /**
+ * setups up a partial relationship and confirms its existence
+ *
+ * @throws Exception
+ */
+ @Test
+ public void JUDDI_590_1() throws Exception {
+ //create two businesses
+ System.out.println("JUDDI_590_1");
+
+ SaveBusiness sb = new SaveBusiness();
+ sb.setAuthInfo(authInfoJoe);
+ BusinessEntity be = new BusinessEntity();
+ Name n = new Name();
+ n.setValue("JUDDI_590 Joe");
+ be.getName().add(n);
+ sb.getBusinessEntity().add(be);
+ String joeBiz = null;
+ try {
+ BusinessDetail saveBusiness = publication.saveBusiness(sb);
+ joeBiz = saveBusiness.getBusinessEntity().get(0).getBusinessKey();
+ //DeleteBusiness db = new DeleteBusiness();
+ //db.setAuthInfo(authInfoJoe);
+ //db.getBusinessKey().add(saveBusiness.getBusinessEntity().get(0).getBusinessKey());
+ //publication.deleteBusiness(db);
+ //Assert.fail("request should have been rejected");
+ } catch (SOAPFaultException ex) {
+ HandleException(ex);
+ }
+
+ sb = new SaveBusiness();
+ sb.setAuthInfo(authInfoSam);
+ be = new BusinessEntity();
+ n = new Name();
+ n.setValue("JUDDI_590 Sam");
+ be.getName().add(n);
+ sb.getBusinessEntity().add(be);
+ String samBiz = null;
+ try {
+ BusinessDetail saveBusiness = publication.saveBusiness(sb);
+ samBiz = saveBusiness.getBusinessEntity().get(0).getBusinessKey();
+ //DeleteBusiness db = new DeleteBusiness();
+ //db.setAuthInfo(authInfoJoe);
+ //db.getBusinessKey().add(saveBusiness.getBusinessEntity().get(0).getBusinessKey());
+ //publication.deleteBusiness(db);
+ //Assert.fail("request should have been rejected");
+ } catch (SOAPFaultException ex) {
+ HandleException(ex);
+ }
+
+
+ //create an assertion on one end
+ AddPublisherAssertions apa = new AddPublisherAssertions();
+ apa.setAuthInfo(authInfoJoe);
+ apa.getPublisherAssertion().add(new PublisherAssertion());
+ apa.getPublisherAssertion().get(0).setFromKey(joeBiz);
+ apa.getPublisherAssertion().get(0).setToKey(samBiz);
+ KeyedReference kr = new KeyedReference();
+ kr.setKeyName("Subsidiary");
+ kr.setKeyValue("parent-child");
+ kr.setTModelKey("uddi:uddi.org:relationships");
+ apa.getPublisherAssertion().get(0).setKeyedReference(kr);
+ publication.addPublisherAssertions(apa);
+ //ok so joe has asserted that he knows sam
+
+ //check get status is not null from 1 and from 2
+ boolean ok = true;
+ String msg = "";
+ try {
+ List<AssertionStatusItem> assertionStatusReport = publication.getAssertionStatusReport(authInfoJoe, CompletionStatus.STATUS_TO_KEY_INCOMPLETE);
+ if (assertionStatusReport.isEmpty()) {
+ msg = "Stage1: no result returned, expected at least 1";
+ ok = false;
+ }
+ for (int i = 0; i < assertionStatusReport.size(); i++) {
+ JAXB.marshal(assertionStatusReport.get(i), System.out);
+ if (assertionStatusReport.get(i).getToKey().equals(samBiz)) {
+ if (!assertionStatusReport.get(i).getCompletionStatus().equals(CompletionStatus.STATUS_TO_KEY_INCOMPLETE)) {
+ ok = false;
+ msg = "Stage1: status type mismatch";
+ }
+ }
+ }
+ } catch (Exception ex) {
+ ok = false;
+ ex.printStackTrace();
+ }
+ //check that sam got the message
+
+ try {
+ List<AssertionStatusItem> assertionStatusReport = publication.getAssertionStatusReport(authInfoSam, CompletionStatus.STATUS_TO_KEY_INCOMPLETE);
+ if (assertionStatusReport.isEmpty()) {
+ msg = "Stage2: no result returned, expected at least 1";
+ ok = false;
+ }
+ for (int i = 0; i < assertionStatusReport.size(); i++) {
+ JAXB.marshal(assertionStatusReport.get(i), System.out);
+ if (assertionStatusReport.get(i).getToKey().equals(samBiz)) {
+ if (!assertionStatusReport.get(i).getCompletionStatus().equals(CompletionStatus.STATUS_TO_KEY_INCOMPLETE)) {
+ ok = false;
+ msg = "Stage2: status type mismatch";
+ }
+ }
+ }
+ } catch (Exception ex) {
+ ok = false;
+ ex.printStackTrace();
+ }
+
+ List<String> biz = new ArrayList<String>();
+ biz.add(samBiz);
+ DeleteBusinesses(biz, authInfoSam);
+
+ biz = new ArrayList<String>();
+ biz.add(joeBiz);
+ DeleteBusinesses(biz, authInfoJoe);
+ Assert.assertTrue(msg, ok);
+
+
+ }
+
+ /**
+ * //testing upper case subscription callbacks
+ *
+ * @throws Exception
+ */
+ @Test
+ public void JIRA_597() throws Exception {
+ System.out.println("JIRA_597");
+ int port = 4444;
+ String localhostname = java.net.InetAddress.getLocalHost().getHostName();
+ UDDISubscriptionListenerImpl impl = new UDDISubscriptionListenerImpl();
+ UDDISubscriptionListenerImpl.notifcationMap.clear();
+ UDDISubscriptionListenerImpl.notificationCount = 0;
+ Endpoint ep = null;
+ boolean ok = false;
+ do {
+ try {
+ ep = Endpoint.publish("http://" + localhostname + ":" + port + "/UDDI_CALLBACK", impl);
+ ok = true;
+ } catch (Exception ex) {
+ port++;
+ }
+ } while (!ok);
+ SaveBusiness sb = new SaveBusiness();
+ sb.setAuthInfo(authInfoJoe);
+ BusinessEntity be = new BusinessEntity();
+ be.getName().add(new Name());
+ be.getName().get(0).setValue("Joe's callback business");
+ be.setBusinessServices(new BusinessServices());
+ BusinessService bs = new BusinessService();
+ bs.getName().add(new Name());
+ bs.getName().get(0).setValue("Joe's callback service");
+ bs.setBindingTemplates(new BindingTemplates());
+ BindingTemplate bt = new BindingTemplate();
+ bt.setAccessPoint(new AccessPoint());
+ bt.getAccessPoint().setValue("http://" + localhostname + ":" + port + "/UDDI_CALLBACK");
+ bt.getAccessPoint().setUseType("endPoint");
+ //Added per Kurt
+ TModelInstanceInfo instanceInfo = new TModelInstanceInfo();
+ instanceInfo.setTModelKey("uddi:uddi.org:transport:http");
+ bt.setTModelInstanceDetails(new TModelInstanceDetails());
+ bt.getTModelInstanceDetails().getTModelInstanceInfo().add(instanceInfo);
+
+ bs.getBindingTemplates().getBindingTemplate().add(bt);
+
+ bs.getBindingTemplates().getBindingTemplate().add(bt);
+ be.getBusinessServices().getBusinessService().add(bs);
+ sb.getBusinessEntity().add(be);
+ BusinessDetail saveBusiness = publication.saveBusiness(sb);
+
+ //ok Joe's callback is setup
+
+ //Setup a business to subscribe to
+ sb = new SaveBusiness();
+ sb.setAuthInfo(authInfoSam);
+ be = new BusinessEntity();
+ be.getName().add(new Name());
+ be.getName().get(0).setValue("Sam's business");
+ sb.getBusinessEntity().add(be);
+ BusinessDetail saveBusiness1 = publication.saveBusiness(sb);
+
+ //ok Joe now needs to subscribe for Sam's business
+ Holder<List<Subscription>> list = new Holder<List<Subscription>>();
+ list.value = new ArrayList<Subscription>();
+ Subscription s = new Subscription();
+ s.setBindingKey(saveBusiness.getBusinessEntity().get(0).getBusinessServices().getBusinessService().get(0).getBindingTemplates().getBindingTemplate().get(0).getBindingKey());
+ s.setSubscriptionFilter(new SubscriptionFilter());
+ s.getSubscriptionFilter().setGetBusinessDetail(new GetBusinessDetail());
+ s.getSubscriptionFilter().getGetBusinessDetail().getBusinessKey().add(saveBusiness1.getBusinessEntity().get(0).getBusinessKey());
+ DatatypeFactory df = DatatypeFactory.newInstance();
+ GregorianCalendar gcal = new GregorianCalendar();
+ gcal.setTimeInMillis(System.currentTimeMillis());
+ gcal.add(Calendar.HOUR, 1);
+ s.setExpiresAfter(df.newXMLGregorianCalendar(gcal));
+
+ s.setNotificationInterval(df.newDuration(5000));
+ list.value.add(s);
+ subscription.saveSubscription(authInfoJoe, list);
+
+ //ok have sam change his business around.
+ sb = new SaveBusiness();
+ sb.setAuthInfo(authInfoSam);
+ be = saveBusiness1.getBusinessEntity().get(0);
+ be.getName().get(0).setLang("en");
+ sb.getBusinessEntity().add(be);
+ publication.saveBusiness(sb);
+ int maxwait = 30000;
+ while (maxwait > 0) {
+ if (UDDISubscriptionListenerImpl.notifcationMap.size() > 0) {
+ break;
+ }
+ Thread.sleep(1000);
+ maxwait = maxwait - 1000;
+ }
+ if (UDDISubscriptionListenerImpl.notifcationMap.isEmpty()) {
+ Assert.fail("no callbacks were recieved.");
+ }
+
+
+ }
+
+ /**
+ * testing callbacks with underfined transport type
+ *
+ * @throws Exception
+ */
+ @Test
+ public void JIRA_596() throws Exception {
+ System.out.println("JIRA_596");
+ int port = 4444;
+ String localhostname = java.net.InetAddress.getLocalHost().getHostName();
+ UDDISubscriptionListenerImpl impl = new UDDISubscriptionListenerImpl();
+ UDDISubscriptionListenerImpl.notifcationMap.clear();
+ UDDISubscriptionListenerImpl.notificationCount = 0;
+ Endpoint ep = null;
+ boolean ok = false;
+ do {
+ try {
+ ep = Endpoint.publish("http://" + localhostname + ":" + port + "/UDDI_CALLBACK", impl);
+ ok = true;
+ } catch (Exception ex) {
+ port++;
+ }
+ } while (!ok);
+ SaveBusiness sb = new SaveBusiness();
+ sb.setAuthInfo(authInfoJoe);
+ BusinessEntity be = new BusinessEntity();
+ be.getName().add(new Name());
+ be.getName().get(0).setValue("Joe's callback business");
+ be.setBusinessServices(new BusinessServices());
+ BusinessService bs = new BusinessService();
+ bs.getName().add(new Name());
+ bs.getName().get(0).setValue("Joe's callback service");
+ bs.setBindingTemplates(new BindingTemplates());
+ BindingTemplate bt = new BindingTemplate();
+ bt.setAccessPoint(new AccessPoint());
+ bt.getAccessPoint().setValue("http://" + localhostname + ":" + port + "/UDDI_CALLBACK");
+ bt.getAccessPoint().setUseType("endPoint");
+ //Added per Kurt
+ /*TModelInstanceInfo instanceInfo = new TModelInstanceInfo();
+ instanceInfo.setTModelKey("uddi:uddi.org:transport:http");
+ bt.setTModelInstanceDetails(new TModelInstanceDetails());
+ bt.getTModelInstanceDetails().getTModelInstanceInfo().add(instanceInfo);
+ */
+ bs.getBindingTemplates().getBindingTemplate().add(bt);
+
+ bs.getBindingTemplates().getBindingTemplate().add(bt);
+ be.getBusinessServices().getBusinessService().add(bs);
+ sb.getBusinessEntity().add(be);
+ BusinessDetail saveBusiness = publication.saveBusiness(sb);
+
+ //ok Joe's callback is setup
+
+ //Setup a business to subscribe to
+ sb = new SaveBusiness();
+ sb.setAuthInfo(authInfoSam);
+ be = new BusinessEntity();
+ be.getName().add(new Name());
+ be.getName().get(0).setValue("Sam's business");
+ sb.getBusinessEntity().add(be);
+ BusinessDetail saveBusiness1 = publication.saveBusiness(sb);
+
+ //ok Joe now needs to subscribe for Sam's business
+ Holder<List<Subscription>> list = new Holder<List<Subscription>>();
+ list.value = new ArrayList<Subscription>();
+ Subscription s = new Subscription();
+ s.setBindingKey(saveBusiness.getBusinessEntity().get(0).getBusinessServices().getBusinessService().get(0).getBindingTemplates().getBindingTemplate().get(0).getBindingKey());
+ s.setSubscriptionFilter(new SubscriptionFilter());
+ s.getSubscriptionFilter().setGetBusinessDetail(new GetBusinessDetail());
+ s.getSubscriptionFilter().getGetBusinessDetail().getBusinessKey().add(saveBusiness1.getBusinessEntity().get(0).getBusinessKey());
+ DatatypeFactory df = DatatypeFactory.newInstance();
+ GregorianCalendar gcal = new GregorianCalendar();
+ gcal.setTimeInMillis(System.currentTimeMillis());
+ gcal.add(Calendar.HOUR, 1);
+ s.setExpiresAfter(df.newXMLGregorianCalendar(gcal));
+
+ s.setNotificationInterval(df.newDuration(5000));
+ list.value.add(s);
+ subscription.saveSubscription(authInfoJoe, list);
+
+ //ok have sam change his business around.
+ sb = new SaveBusiness();
+ sb.setAuthInfo(authInfoSam);
+ be = saveBusiness1.getBusinessEntity().get(0);
+ be.getName().get(0).setLang("en");
+ sb.getBusinessEntity().add(be);
+ publication.saveBusiness(sb);
+ int maxwait = 30000;
+ while (maxwait > 0) {
+ if (UDDISubscriptionListenerImpl.notifcationMap.size() > 0) {
+ break;
+ }
+ Thread.sleep(1000);
+ maxwait = maxwait - 1000;
+ }
+ if (UDDISubscriptionListenerImpl.notifcationMap.isEmpty()) {
+ Assert.fail("no callbacks were recieved.");
+ }
+
+
+ }
+
+ //once more without any relationship
//TODO binding template tmodel instance info
//TODO tmodel tests
//TODO create tests for enforcing ref integrity of tmodel keys, after enforcing this, the tests in this class will need to be heavily revised
@@ -628,11 +1122,17 @@ public class UDDI_141_JIRAIntegrationTes
private void DeleteBusinesses(List<String> businesskeysToDelete) {
+ DeleteBusinesses(businesskeysToDelete, authInfoJoe);
+
+ }
+
+ private void DeleteBusinesses(List<String> businesskeysToDelete, String authinfo) {
+
//cleanup
try {
DeleteBusiness db = new DeleteBusiness();
- db.setAuthInfo(authInfoJoe);
+ db.setAuthInfo(authinfo);
db.getBusinessKey().addAll(businesskeysToDelete);
publication.deleteBusiness(db);
} catch (Exception ex) {
Propchange: juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/api_v3/Node.java
------------------------------------------------------------------------------
Merged /juddi/branches/juddi-3.2.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/Node.java:r1460934-1483596
Modified: juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/jaxb/JAXBMarshaller.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/jaxb/JAXBMarshaller.java?rev=1484038&r1=1484037&r2=1484038&view=diff
==============================================================================
--- juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/jaxb/JAXBMarshaller.java (original)
+++ juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/jaxb/JAXBMarshaller.java Sat May 18 01:11:28 2013
@@ -105,7 +105,7 @@ public class JAXBMarshaller {
try {
JAXBContext jc = getContext(thePackage);
Marshaller marshaller = jc.createMarshaller();
- marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
+ marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.FALSE);
marshaller.setProperty(Marshaller.JAXB_FRAGMENT, Boolean.TRUE);
marshaller.setProperty(Marshaller.JAXB_ENCODING, "UTF-8");
ByteArrayOutputStream baos = new ByteArrayOutputStream();
Propchange: juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/jaxb/JAXBMarshaller.java
------------------------------------------------------------------------------
Merged /juddi/branches/juddi-3.2.x/uddi-ws/src/main/java/org/apache/juddi/jaxb/JAXBMarshaller.java:r1460934-1483596
Modified: juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/v3_service/JUDDIApiPortType.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/v3_service/JUDDIApiPortType.java?rev=1484038&r1=1484037&r2=1484038&view=diff
==============================================================================
--- juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/v3_service/JUDDIApiPortType.java (original)
+++ juddi/trunk/uddi-ws/src/main/java/org/apache/juddi/v3_service/JUDDIApiPortType.java Sat May 18 01:11:28 2013
@@ -48,6 +48,10 @@ import org.uddi.v3_service.DispositionRe
/**
* This portType defines all of the jUDDI publisher operations.
+ * This is above and beyond the original UDDI v3 specification and is NOT part of the standard.
+ * Method behavior within this class may change from version to version. These methods are
+ * primarily mean for administrative functions.
+ *
*
*/
@WebService(name = "JUDDI_Api_PortType", targetNamespace = "urn:juddi-apache-org:v3_service")
Modified: juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/Name.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/Name.java?rev=1484038&r1=1484037&r2=1484038&view=diff
==============================================================================
--- juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/Name.java (original)
+++ juddi/trunk/uddi-ws/src/main/java/org/uddi/api_v3/Name.java Sat May 18 01:11:28 2013
@@ -57,6 +57,11 @@ public class Name implements Serializabl
@XmlAttribute(namespace = "http://www.w3.org/XML/1998/namespace")
protected String lang;
+ /**
+ * A simple convenience constructor
+ * @param value max length is 255 chars
+ * @param lang max length is 26 chars
+ */
public Name(String value, String lang) {
this.value = value;
this.lang = lang;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org