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/12/09 01:40:44 UTC
svn commit: r1549363 [5/5] - in /juddi/branches/juddi-3.3.x: ./
juddi-core-openjpa/src/test/resources/
juddi-core/src/main/java/org/apache/juddi/config/
juddi-core/src/main/java/org/apache/juddi/mapping/
juddi-core/src/main/java/org/apache/juddi/valida...
Modified: juddi/branches/juddi-3.3.x/juddiv3-war/JAX-WS/CXF/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddiv3-war/JAX-WS/CXF/WEB-INF/beans.xml?rev=1549363&r1=1549362&r2=1549363&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddiv3-war/JAX-WS/CXF/WEB-INF/beans.xml (original)
+++ juddi/branches/juddi-3.3.x/juddiv3-war/JAX-WS/CXF/WEB-INF/beans.xml Mon Dec 9 00:40:43 2013
@@ -5,7 +5,7 @@
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
+ "License"/> you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
@@ -21,10 +21,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:jaxws="http://cxf.apache.org/jaxws"
xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xmlns:util="http://www.springframework.org/schema/util"
xsi:schemaLocation="
http://www.springframework.org/schema/beans classpath:schemas/spring-beans.xsd
http://cxf.apache.org/jaxws classpath:schemas/jaxws.xsd
http://cxf.apache.org/jaxrs classpath:schemas/jaxrs.xsd
+ http://www.springframework.org/schema/util classpath:schemas/spring-util.xsd
">
<import resource="classpath:META-INF/cxf/cxf.xml" />
@@ -95,13 +97,41 @@
</jaxws:properties>
</jaxws:endpoint>
+ <util:map id="jsonNamespaceMap" map-class="java.util.Hashtable" >
+ <!--<entry key="urn:uddi-org:api_v3" value="uddi-org-api_v3"/>
+ <entry key="urn:uddi-org:api_v3" value="urn:uddi-org:api_v3"/>
+ <entry key="urn:uddi-org:sub_v3" value="urn:uddi-org:sub_v3"/>
+ <entry key="urn:uddi-org:custody_v3" value="urn:uddi-org:custody_v3"/>
+ <entry key="urn:uddi-org:repl_v3" value="urn:uddi-org:repl_v3"/>
+ <entry key="urn:uddi-org:subr_v3" value="urn:uddi-org:subr_v3"/>
+ <entry key="urn:uddi-org:repl_v3" value="urn:uddi-org:repl_v3"/>
+ <entry key="urn:uddi-org:vs_v3" value="urn:uddi-org:vs_v3"/>
+ <entry key="urn:uddi-org:vscache_v3" value="urn:uddi-org:vscache_v3"/>
+ <entry key="urn:uddi-org:policy_v3" value="urn:uddi-org:policy_v3"/>
+ <entry key="urn:uddi-org:policy_instanceParms_v3" value="urn:uddi-org:policy_instanceParms_v3"/>
+ <entry key="http://www.w3.org/2000/09/xmldsig#" value="http://www.w3.org/2000/09/xmldsig#"/>-->
+ <entry key="urn:uddi-org:api_v3" value="uddiv3"/>
+ <entry key="urn:uddi-org:api_v3" value="uddiv3sub"/>
+ </util:map>
+
+
<jaxrs:server id="inquiryRestService" address="/inquiryRest">
<jaxrs:serviceBeans>
<ref bean="inquiryRest" />
</jaxrs:serviceBeans>
+ <jaxrs:providers>
+ <ref bean="jaxbProvider"/>
+ <ref bean="jsonProvider"/>
+ </jaxrs:providers>
</jaxrs:server>
<bean id="inquiryRest" class="org.apache.juddi.api.impl.rest.UDDIInquiryJAXRS" />
- <bean id="jaxbProvider" class="org.apache.cxf.jaxrs.provider.json.JSONProvider">
- <property name="ignoreNamespaces" value="true"/>
+ <bean id="jsonProvider" class="org.apache.cxf.jaxrs.provider.json.JSONProvider">
+ <property name="ignoreNamespaces" value="true"/><!-- this doesn't work -->
+ <property name="namespaceMap" ref="jsonNamespaceMap"/>
</bean>
+ <bean id="jaxbProvider"
+class="org.apache.cxf.jaxrs.provider.JAXBElementProvider"/>
+
+
+
</beans>
Modified: juddi/branches/juddi-3.3.x/juddiv3-war/pom.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddiv3-war/pom.xml?rev=1549363&r1=1549362&r2=1549363&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddiv3-war/pom.xml (original)
+++ juddi/branches/juddi-3.3.x/juddiv3-war/pom.xml Mon Dec 9 00:40:43 2013
@@ -306,7 +306,7 @@
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
- <version>1.3.2</version>
+ <version>1.3.4</version>
</dependency>
<!--END added AO 6/8/2013 support for JSON encoding on REST endpoints -->
<dependency>
Modified: juddi/branches/juddi-3.3.x/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.xml?rev=1549363&r1=1549362&r2=1549363&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.xml (original)
+++ juddi/branches/juddi-3.3.x/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.xml Mon Dec 9 00:40:43 2013
@@ -13,6 +13,7 @@
<!-- The ${juddi.server.baseurl} token can be referenced in accessPoints and will be resolved at runtime. -->
<server>
<baseurl>http://localhost:8080/juddiv3</baseurl>
+ <baseurlsecure>https://localhost:8443/juddiv3</baseurlsecure>
</server>
<!-- The node Id must be unique when setup in a cluster of UDDI servers implementing the replication API
don't worry, jUDDI doesn't implement it right now, but it may come in the future -->
Modified: juddi/branches/juddi-3.3.x/pom.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/pom.xml?rev=1549363&r1=1549362&r2=1549363&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/pom.xml (original)
+++ juddi/branches/juddi-3.3.x/pom.xml Mon Dec 9 00:40:43 2013
@@ -281,7 +281,7 @@
<module>juddi-gui</module>
<module>juddi-tomcat</module>
<module>uddi-tck</module>
-
+
</modules>
<distributionManagement>
<site>
Modified: juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscription.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscription.java?rev=1549363&r1=1549362&r2=1549363&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscription.java (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscription.java Mon Dec 9 00:40:43 2013
@@ -98,8 +98,9 @@ public class TckSubscription
SubscriptionResultsList result = subscription.getSubscriptionResults(getSubResultsIn);
if (result == null)
Assert.fail("Null result from getSubscriptionResults operation");
-
- ServiceInfos sInfos = result.getServiceList().getServiceInfos();
+ ServiceInfos sInfos=null;
+ if (result.getServiceList()!=null)
+ sInfos = result.getServiceList().getServiceInfos();
if (sInfos == null)
Assert.fail("No result from getSubscriptionResults operation");
List<ServiceInfo> siList = sInfos.getServiceInfo();
Propchange: juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscription.java
------------------------------------------------------------------------------
Merged /juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscription.java:r1548772-1549358
Modified: juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckTModel.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckTModel.java?rev=1549363&r1=1549362&r2=1549363&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckTModel.java (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckTModel.java Mon Dec 9 00:40:43 2013
@@ -100,8 +100,10 @@ public class TckTModel
try {
SaveTModel st = new SaveTModel();
st.setAuthInfo(authInfo);
-
+ logger.info("Loading tModel from " + tModelXml);
org.uddi.api_v3.TModel tmIn = (org.uddi.api_v3.TModel)EntityCreator.buildFromDoc(tModelXml, "org.uddi.api_v3");
+ if (tmIn==null)
+ Assert.fail("unable to load tmodel from file!");
st.getTModel().add(tmIn);
publication.saveTModel(st);
Propchange: juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckTModel.java
------------------------------------------------------------------------------
Merged /juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckTModel.java:r1548772-1549358
Propchange: juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/
------------------------------------------------------------------------------
Merged /juddi/trunk/uddi-tck-base/src/main/resources/uddi_data:r1548772-1549358
Modified: juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/find/findBusiness1.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/find/findBusiness1.xml?rev=1549363&r1=1549362&r2=1549363&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/find/findBusiness1.xml (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/find/findBusiness1.xml Mon Dec 9 00:40:43 2013
@@ -24,14 +24,14 @@
<name xml:lang="en">john%</name>
<name xml:lang="en">A-1%</name>
<identifierBag>
- <keyedReference tModelKey="uddi:tmodelkey:identifier" keyName="identify" keyValue="identity%" />
- <keyedReference tModelKey="uddi:tmodelkey:identifier" keyName="identify" keyValue="identityX%" />
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="identify" keyValue="identity%" />
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="identify" keyValue="identityX%" />
</identifierBag>
<categoryBag>
- <keyedReference tModelKey="uddi:tmodelkey:categories:fruit" keyName="category" keyValue="apples%" />
- <keyedReference tModelKey="uddi:tmodelkey:categories:music" keyName="category" keyValue="blues%" />
- <keyedReferenceGroup tModelKey="uddi:tmodelkey:group">
- <keyedReference tModelKey="uddi:tmodelkey:blank" keyName="blank" keyValue="blank%" />
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="category" keyValue="apples%" />
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="category" keyValue="blues%" />
+ <keyedReferenceGroup tModelKey="uddi:uddi.org:categorization:types">
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="blank" keyValue="blank%" />
</keyedReferenceGroup>
</categoryBag>
<discoveryURLs>
Modified: juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/find/findService1.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/find/findService1.xml?rev=1549363&r1=1549362&r2=1549363&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/find/findService1.xml (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/find/findService1.xml Mon Dec 9 00:40:43 2013
@@ -21,10 +21,10 @@
</findQualifiers>
<name xml:lang="en">Service One</name>
<categoryBag>
- <keyedReference tModelKey="uddi:tmodelkey:categories:fruit" keyName="category" keyValue="peaches" />
- <keyedReference tModelKey="uddi:tmodelkey:categories:fruit" keyName="category" keyValue="plums" />
- <keyedReferenceGroup tModelKey="uddi:tmodelkey:group">
- <keyedReference tModelKey="uddi:tmodelkey:blank" keyName="blank" keyValue="blank" />
+ <keyedReference tModelKey="uddi:uddi.org:transport:telephone" keyName="category" keyValue="peaches" />
+ <keyedReference tModelKey="uddi:uddi.org:transport:telephone" keyName="category" keyValue="plums" />
+ <keyedReferenceGroup tModelKey="uddi:uddi.org:transport:telephone">
+ <keyedReference tModelKey="uddi:uddi.org:transport:telephone" keyName="blank" keyValue="blank" />
</keyedReferenceGroup>
</categoryBag>
</find_service>
Modified: juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/joepublisher/businessEntity.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/joepublisher/businessEntity.xml?rev=1549363&r1=1549362&r2=1549363&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/joepublisher/businessEntity.xml (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/joepublisher/businessEntity.xml Mon Dec 9 00:40:43 2013
@@ -53,16 +53,16 @@
</contact>
</contacts>
<categoryBag>
- <keyedReference tModelKey="uddi:tmodelkey:categories:fruit" keyName="category" keyValue="apples" />
- <keyedReference tModelKey="uddi:tmodelkey:categories:fruit" keyName="category" keyValue="oranges" />
- <keyedReference tModelKey="uddi:tmodelkey:categories:sports" keyName="category" keyValue="football" />
- <keyedReference tModelKey="uddi:tmodelkey:categories:music" keyName="category" keyValue="blues" />
- <keyedReferenceGroup tModelKey="uddi:tmodelkey:group">
- <keyedReference tModelKey="uddi:tmodelKey:blank" keyName="blank" keyValue="blank" />
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="category" keyValue="apples" />
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="category" keyValue="oranges" />
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="category" keyValue="football" />
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="category" keyValue="blues" />
+ <keyedReferenceGroup tModelKey="uddi:uddi.org:categorization:types">
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="blank" keyValue="blank" />
</keyedReferenceGroup>
</categoryBag>
<identifierBag>
- <keyedReference tModelKey="uddi:tmodelkey:identifier" keyName="identify" keyValue="identity" />
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="identify" keyValue="identity" />
</identifierBag>
<ns2:Signature>
<ns2:SignedInfo>
Modified: juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/joepublisher/businessService.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/joepublisher/businessService.xml?rev=1549363&r1=1549362&r2=1549363&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/joepublisher/businessService.xml (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/joepublisher/businessService.xml Mon Dec 9 00:40:43 2013
@@ -25,8 +25,8 @@
<bindingTemplate bindingKey="uddi:uddi.joepublisher.com:bindingone">
<description xml:lang="en">This is the access point for service one.</description>
<accessPoint useType="endPoint">http://businessone.com/services/serviceone</accessPoint>
- <tModelInstanceDetails>
- <tModelInstanceInfo tModelKey="uddi:uddi.joepublisher.com:services:serviceone:wsdlspec">
+ <tModelInstanceDetails>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:telephone">
<description xml:lang="en">The wsdl for this service: service one</description>
<instanceDetails>
<overviewDoc>
@@ -38,15 +38,15 @@
</tModelInstanceInfo>
</tModelInstanceDetails>
<categoryBag>
- <keyedReference tModelKey="uddi:tmodelkey:categories:bindings" keyName="category" keyValue="accesspoint" />
+ <keyedReference tModelKey="uddi:uddi.org:transport:telephone" keyName="category" keyValue="accesspoint" />
</categoryBag>
</bindingTemplate>
</bindingTemplates>
<categoryBag>
- <keyedReference tModelKey="uddi:tmodelkey:categories:fruit" keyName="category" keyValue="peaches" />
- <keyedReference tModelKey="uddi:tmodelkey:categories:fruit" keyName="category" keyValue="plums" />
- <keyedReferenceGroup tModelKey="uddi:tmodelkey:group">
- <keyedReference tModelKey="uddi:tmodelkey:blank" keyName="blank" keyValue="blank" />
+ <keyedReference tModelKey="uddi:uddi.org:transport:telephone" keyName="category" keyValue="peaches" />
+ <keyedReference tModelKey="uddi:uddi.org:transport:telephone" keyName="category" keyValue="plums" />
+ <keyedReferenceGroup tModelKey="uddi:uddi.org:transport:telephone">
+ <keyedReference tModelKey="uddi:uddi.org:transport:telephone" keyName="blank" keyValue="blank" />
</keyedReferenceGroup>
</categoryBag>
</businessService>
Modified: juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/joepublisher/businessService2.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/joepublisher/businessService2.xml?rev=1549363&r1=1549362&r2=1549363&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/joepublisher/businessService2.xml (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/joepublisher/businessService2.xml Mon Dec 9 00:40:43 2013
@@ -26,7 +26,7 @@
<description xml:lang="en">This is the access point for service two.</description>
<accessPoint useType="endPoint">http://businessone.com/services/servicetwo</accessPoint>
<tModelInstanceDetails>
- <tModelInstanceInfo tModelKey="uddi:uddi.joepublisher.com:services:servicetwo:wsdlspec">
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:telephone">
<description xml:lang="en">The wsdl for this service: service two</description>
<instanceDetails>
<overviewDoc>
@@ -43,10 +43,10 @@
</bindingTemplate>
</bindingTemplates>
<categoryBag>
- <keyedReference tModelKey="uddi:tmodelkey:categories" keyName="category" keyValue="peaches" />
- <keyedReference tModelKey="uddi:tmodelkey:categories" keyName="category" keyValue="plums" />
- <keyedReferenceGroup tModelKey="uddi:tmodelkey:group">
- <keyedReference tModelKey="uddi:tmodelkey:blank" keyName="blank" keyValue="blank" />
+ <keyedReference tModelKey="uddi:uddi.org:transport:telephone" keyName="category" keyValue="peaches" />
+ <keyedReference tModelKey="uddi:uddi.org:transport:telephone" keyName="category" keyValue="plums" />
+ <keyedReferenceGroup tModelKey="uddi:uddi.org:transport:telephone">
+ <keyedReference tModelKey="uddi:uddi.org:transport:telephone" keyName="blank" keyValue="blank" />
</keyedReferenceGroup>
- </categoryBag>
+ </categoryBag>-->
</businessService>
Modified: juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/samsyndicator/businessEntity.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/samsyndicator/businessEntity.xml?rev=1549363&r1=1549362&r2=1549363&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/samsyndicator/businessEntity.xml (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/samsyndicator/businessEntity.xml Mon Dec 9 00:40:43 2013
@@ -37,12 +37,12 @@
</contact>
</contacts>
<categoryBag>
- <keyedReference tModelKey="uddi:tmodelkey:categories:fruit" keyName="category" keyValue="bananas" />
- <keyedReference tModelKey="uddi:tmodelkey:categories:fruit" keyName="category" keyValue="kiwi" />
- <keyedReference tModelKey="uddi:tmodelkey:categories:music" keyName="category" keyValue="progressive-rock" />
- <keyedReference tModelKey="uddi:tmodelkey:categories:music" keyName="category" keyValue="country" />
- <keyedReferenceGroup tModelKey="uddi:tmodelkey:group">
- <keyedReference tModelKey="uddi:tmodelkey:blank" keyName="blank" keyValue="blank" />
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="category" keyValue="bananas" />
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="category" keyValue="kiwi" />
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="category" keyValue="progressive-rock" />
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="category" keyValue="country" />
+ <keyedReferenceGroup tModelKey="uddi:uddi.org:categorization:types">
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="blank" keyValue="blank" />
</keyedReferenceGroup>
</categoryBag>
<identifierBag>
Modified: juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/samsyndicator/businessEntity_withProjection.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/samsyndicator/businessEntity_withProjection.xml?rev=1549363&r1=1549362&r2=1549363&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/samsyndicator/businessEntity_withProjection.xml (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/samsyndicator/businessEntity_withProjection.xml Mon Dec 9 00:40:43 2013
@@ -37,16 +37,16 @@
</contact>
</contacts>
<categoryBag>
- <keyedReference tModelKey="uddi:tmodelkey:categories:fruit" keyName="category" keyValue="bananas" />
- <keyedReference tModelKey="uddi:tmodelkey:categories:fruit" keyName="category" keyValue="kiwi" />
- <keyedReference tModelKey="uddi:tmodelkey:categories:music" keyName="category" keyValue="progressive-rock" />
- <keyedReference tModelKey="uddi:tmodelkey:categories:music" keyName="category" keyValue="country" />
- <keyedReferenceGroup tModelKey="uddi:tmodelkey:group">
- <keyedReference tModelKey="uddi:tmodelkey:blank" keyName="blank" keyValue="blank" />
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="category" keyValue="bananas" />
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="category" keyValue="kiwi" />
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="category" keyValue="progressive-rock" />
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="category" keyValue="country" />
+ <keyedReferenceGroup tModelKey="uddi:uddi.org:categorization:types">
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="blank" keyValue="blank" />
</keyedReferenceGroup>
</categoryBag>
<identifierBag>
- <keyedReference tModelKey="uddi:tmodelkey:identifier" keyName="identify" keyValue="identity" />
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="identify" keyValue="identity" />
</identifierBag>
<businessServices>
<businessService xmlns="urn:uddi-org:api_v3" xmlns:xml="http://www.w3.org/XML/1998/namespace"
@@ -60,7 +60,7 @@
<description xml:lang="en">This is the access point for service one.</description>
<accessPoint useType="endPoint">http://businessone.com/services/serviceone</accessPoint>
<tModelInstanceDetails>
- <tModelInstanceInfo tModelKey="uddi:uddi.joepublisher.com:services:serviceone:wsdlspec">
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:telephone">
<description xml:lang="en">The wsdl for this service: service one</description>
<instanceDetails>
<overviewDoc>
@@ -72,15 +72,15 @@
</tModelInstanceInfo>
</tModelInstanceDetails>
<categoryBag>
- <keyedReference tModelKey="uddi:tmodelkey:categories:bindings" keyName="category" keyValue="accesspoint" />
+ <keyedReference tModelKey="uddi:uddi.org:transport:telephone" keyName="category" keyValue="accesspoint" />
</categoryBag>
</bindingTemplate>
</bindingTemplates>
<categoryBag>
- <keyedReference tModelKey="uddi:tmodelkey:categories" keyName="category" keyValue="peaches" />
- <keyedReference tModelKey="uddi:tmodelkey:categories" keyName="category" keyValue="plums" />
- <keyedReferenceGroup tModelKey="uddi:tmodelkey:group">
- <keyedReference tModelKey="uddi:tmodelkey:blank" keyName="blank" keyValue="blank" />
+ <keyedReference tModelKey="uddi:uddi.org:transport:telephone" keyName="category" keyValue="peaches" />
+ <keyedReference tModelKey="uddi:uddi.org:transport:telephone" keyName="category" keyValue="plums" />
+ <keyedReferenceGroup tModelKey="uddi:uddi.org:transport:telephone">
+ <keyedReference tModelKey="uddi:uddi.org:transport:telephone" keyName="blank" keyValue="blank" />
</keyedReferenceGroup>
</categoryBag>
</businessService>
Modified: juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/samsyndicator/businessService.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/samsyndicator/businessService.xml?rev=1549363&r1=1549362&r2=1549363&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/samsyndicator/businessService.xml (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/samsyndicator/businessService.xml Mon Dec 9 00:40:43 2013
@@ -25,7 +25,7 @@
<description xml:lang="en">This is the access point for listing service.</description>
<accessPoint useType="endPoint">http:/samco.com/services/listingservice</accessPoint>
<tModelInstanceDetails>
- <tModelInstanceInfo tModelKey="uddi:www.samco.com:listservice-wsdlspec">
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:telephone">
<description xml:lang="en">The wsdl for this service: Listing Service</description>
<instanceDetails>
<overviewDoc>
@@ -37,15 +37,15 @@
</tModelInstanceInfo>
</tModelInstanceDetails>
<categoryBag>
- <keyedReference tModelKey="uddi:tmodelkey:categories:bindings" keyName="category" keyValue="accesspoint" />
+ <keyedReference tModelKey="uddi:uddi.org:transport:telephone" keyName="category" keyValue="accesspoint" />
</categoryBag>
</bindingTemplate>
</bindingTemplates>
<categoryBag>
- <keyedReference tModelKey="uddi:tmodelkey:categories:beer" keyName="category" keyValue="lager" />
- <keyedReference tModelKey="uddi:tmodelkey:categories:beer" keyName="category" keyValue="pilsner" />
- <keyedReferenceGroup tModelKey="uddi:tmodelkey:group">
- <keyedReference tModelKey="uddi:tmodelkey:blank" keyName="blank" keyValue="blank" />
+ <keyedReference tModelKey="uddi:uddi.org:transport:telephone" keyName="category" keyValue="lager" />
+ <keyedReference tModelKey="uddi:uddi.org:transport:telephone" keyName="category" keyValue="pilsner" />
+ <keyedReferenceGroup tModelKey="uddi:uddi.org:transport:telephone">
+ <keyedReference tModelKey="uddi:uddi.org:transport:telephone" keyName="blank" keyValue="blank" />
</keyedReferenceGroup>
</categoryBag>
</businessService>
Modified: juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/subscription/subscription1.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/subscription/subscription1.xml?rev=1549363&r1=1549362&r2=1549363&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/subscription/subscription1.xml (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/subscription/subscription1.xml Mon Dec 9 00:40:43 2013
@@ -25,10 +25,10 @@
</findQualifiers>
<name xml:lang="en">Service One</name>
<categoryBag>
- <keyedReference tModelKey="uddi:tmodelkey:categories:fruit" keyName="category" keyValue="peaches" />
- <keyedReference tModelKey="uddi:tmodelkey:categories:fruit" keyName="category" keyValue="plums" />
- <keyedReferenceGroup tModelKey="uddi:tmodelkey:group">
- <keyedReference tModelKey="uddi:tmodelkey:blank" keyName="blank" keyValue="blank" />
+ <keyedReference tModelKey="uddi:uddi.org:transport:telephone" keyName="category" keyValue="peaches" />
+ <keyedReference tModelKey="uddi:uddi.org:transport:telephone" keyName="category" keyValue="plums" />
+ <keyedReferenceGroup tModelKey="uddi:uddi.org:transport:telephone">
+ <keyedReference tModelKey="uddi:uddi.org:transport:telephone" keyName="blank" keyValue="blank" />
</keyedReferenceGroup>
</categoryBag>
</find_service>
Modified: juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/listenerService.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/listenerService.xml?rev=1549363&r1=1549362&r2=1549363&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/listenerService.xml (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/listenerService.xml Mon Dec 9 00:40:43 2013
@@ -28,16 +28,16 @@
<tModelInstanceDetails>
<tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
</tModelInstanceDetails>
- <categoryBag>
+ <!--<categoryBag>
<keyedReference tModelKey="uddi:tmodelkey:categories:bindings" keyName="category" keyValue="secure" />
- </categoryBag>
+ </categoryBag>-->
</bindingTemplate>
</bindingTemplates>
- <categoryBag>
+ <!--<categoryBag>
<keyedReference tModelKey="uddi:tmodelkey:categories" keyName="category" keyValue="peaches" />
<keyedReference tModelKey="uddi:tmodelkey:categories" keyName="category" keyValue="plums" />
<keyedReferenceGroup tModelKey="uddi:tmodelkey:group">
<keyedReference tModelKey="uddi:tmodelkey:blank" keyName="blank" keyValue="blank" />
</keyedReferenceGroup>
- </categoryBag>
+ </categoryBag>-->
</businessService>
Modified: juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/listenerServiceRMI.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/listenerServiceRMI.xml?rev=1549363&r1=1549362&r2=1549363&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/listenerServiceRMI.xml (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/listenerServiceRMI.xml Mon Dec 9 00:40:43 2013
@@ -29,15 +29,15 @@
<tModelInstanceInfo tModelKey="uddi:uddi.org:transport:rmi" />
</tModelInstanceDetails>
<categoryBag>
- <keyedReference tModelKey="uddi:tmodelkey:categories:bindings" keyName="category" keyValue="secure" />
+ <keyedReference tModelKey="uddi:uddi.org:transport:telephone" keyName="category" keyValue="secure" />
</categoryBag>
</bindingTemplate>
</bindingTemplates>
<categoryBag>
- <keyedReference tModelKey="uddi:tmodelkey:categories" keyName="category" keyValue="peaches" />
- <keyedReference tModelKey="uddi:tmodelkey:categories" keyName="category" keyValue="plums" />
- <keyedReferenceGroup tModelKey="uddi:tmodelkey:group">
- <keyedReference tModelKey="uddi:tmodelkey:blank" keyName="blank" keyValue="blank" />
+ <keyedReference tModelKey="uddi:uddi.org:transport:telephone" keyName="category" keyValue="peaches" />
+ <keyedReference tModelKey="uddi:uddi.org:transport:telephone" keyName="category" keyValue="plums" />
+ <keyedReferenceGroup tModelKey="uddi:uddi.org:transport:telephone">
+ <keyedReference tModelKey="uddi:uddi.org:transport:telephone" keyName="blank" keyValue="blank" />
</keyedReferenceGroup>
</categoryBag>
</businessService>
Modified: juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/listenerServiceSMTP.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/listenerServiceSMTP.xml?rev=1549363&r1=1549362&r2=1549363&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/listenerServiceSMTP.xml (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/listenerServiceSMTP.xml Mon Dec 9 00:40:43 2013
@@ -28,16 +28,16 @@
<tModelInstanceDetails>
<tModelInstanceInfo tModelKey="uddi:uddi.org:transport:smtp"/>
</tModelInstanceDetails>
- <categoryBag>
+ <!--<categoryBag>
<keyedReference tModelKey="uddi:tmodelkey:categories:bindings" keyName="category" keyValue="secure" />
- </categoryBag>
+ </categoryBag>-->
</bindingTemplate>
</bindingTemplates>
- <categoryBag>
+ <!--<categoryBag>
<keyedReference tModelKey="uddi:tmodelkey:categories" keyName="category" keyValue="peaches" />
<keyedReference tModelKey="uddi:tmodelkey:categories" keyName="category" keyValue="plums" />
<keyedReferenceGroup tModelKey="uddi:tmodelkey:group">
<keyedReference tModelKey="uddi:tmodelkey:blank" keyName="blank" keyValue="blank" />
</keyedReferenceGroup>
- </categoryBag>
+ </categoryBag>-->
</businessService>
Modified: juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_141_JIRAIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_141_JIRAIntegrationTest.java?rev=1549363&r1=1549362&r2=1549363&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_141_JIRAIntegrationTest.java (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_141_JIRAIntegrationTest.java Mon Dec 9 00:40:43 2013
@@ -18,6 +18,7 @@ import java.util.ArrayList;
import java.util.Calendar;
import java.util.GregorianCalendar;
import java.util.List;
+import java.util.UUID;
import javax.xml.bind.JAXB;
import javax.xml.datatype.DatatypeFactory;
import javax.xml.soap.SOAPFault;
@@ -30,8 +31,11 @@ import org.apache.commons.logging.LogFac
import org.apache.juddi.v3.client.UDDIConstants;
import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.transport.Transport;
+import static org.apache.juddi.v3.tck.UDDI_030_BusinessEntityIntegrationTest.tckBusiness;
+import static org.apache.juddi.v3.tck.UDDI_140_NegativePublicationIntegrationTest.tckTModel;
import org.junit.AfterClass;
import org.junit.Assert;
+import org.junit.Assume;
import org.junit.BeforeClass;
import org.junit.Test;
import org.uddi.api_v3.*;
@@ -58,6 +62,8 @@ public class UDDI_141_JIRAIntegrationTes
static UDDISubscriptionPortType subscription = null;
static UDDIInquiryPortType inquiry = null;
static UDDIPublicationPortType publication = null;
+ static TckTModel tckTModel = null;
+ static TckBusiness tckBusiness = null;
protected static String authInfoJoe = null;
protected static String authInfoSam = null;
private static UDDIClient manager;
@@ -92,15 +98,18 @@ public class UDDI_141_JIRAIntegrationTes
try {
Transport transport = manager.getTransport();
security = transport.getUDDISecurityService();
+ publication = transport.getUDDIPublishService();
+ inquiry = transport.getUDDIInquiryService();
+
subscription = transport.getUDDISubscriptionService();
+ tckTModel = new TckTModel(publication, inquiry);
+ tckBusiness = new TckBusiness(publication, inquiry);
authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
authInfoSam = TckSecurity.getAuthToken(security, TckPublisher.getSamPublisherId(), TckPublisher.getSamPassword());
Assert.assertNotNull(authInfoJoe);
Assert.assertNotNull(authInfoSam);
- publication = transport.getUDDIPublishService();
- inquiry = transport.getUDDIInquiryService();
-
+
} catch (Exception e) {
logger.error(e.getMessage(), e);
@@ -1009,8 +1018,353 @@ public class UDDI_141_JIRAIntegrationTes
}
+
+
+
+
+
+
+
+
+
//once more without any relationship
- //TODO binding template tmodel instance info
+ //binding template tmodel instance info
+ @Test
+ public void JIRA_575_BT() throws Exception {
+ System.out.println("JIRA_575_BT");
+ String madeupTmodel = "uddi" + UUID.randomUUID().toString();
+ GetTModelDetail gtm = new GetTModelDetail();
+ gtm.setAuthInfo(authInfoJoe);
+ gtm.getTModelKey().add(madeupTmodel);
+ TModelDetail tModelDetail = null;
+ try {
+ tModelDetail = inquiry.getTModelDetail(gtm);
+ } catch (Exception ex) {
+ }
+ Assume.assumeTrue(tModelDetail == null);
+
+ SaveBusiness sb = new SaveBusiness();
+ sb.setAuthInfo(authInfoJoe);
+ BusinessEntity be = new BusinessEntity();
+ be.getName().add(new Name());
+ be.getName().get(0).setValue("Joe's JIRA_575_BT business");
+ be.setBusinessServices(new BusinessServices());
+ BusinessService bs = new BusinessService();
+ bs.getName().add(new Name());
+ bs.getName().get(0).setValue("Joe's JIRA_575_BT service");
+ bs.setBindingTemplates(new BindingTemplates());
+ BindingTemplate bt = new BindingTemplate();
+ bt.setAccessPoint(new AccessPoint());
+ bt.getAccessPoint().setValue("http://JIRA_575_BT/UDDI_CALLBACK");
+ bt.getAccessPoint().setUseType("endPoint");
+
+ TModelInstanceInfo instanceInfo = new TModelInstanceInfo();
+ instanceInfo.setTModelKey(madeupTmodel);
+ bt.setTModelInstanceDetails(new TModelInstanceDetails());
+ bt.getTModelInstanceDetails().getTModelInstanceInfo().add(instanceInfo);
+
+ bs.getBindingTemplates().getBindingTemplate().add(bt);
+ be.getBusinessServices().getBusinessService().add(bs);
+ sb.getBusinessEntity().add(be);
+ logger.info("setting up joe's callback business");
+ try {
+ BusinessDetail saveBusiness = publication.saveBusiness(sb);
+ Assert.fail("unexpected success");
+ } catch (Exception ex) {
+ logger.error(ex.getMessage());
+ }
+
+
+ }
+
+
+ @Test
+ public void JIRA_575_KR_Biz() throws Exception {
+ System.out.println("JIRA_575_KR_Biz");
+ String madeupTmodel = "uddi" + UUID.randomUUID().toString();
+ GetTModelDetail gtm = new GetTModelDetail();
+ gtm.setAuthInfo(authInfoJoe);
+ gtm.getTModelKey().add(madeupTmodel);
+ TModelDetail tModelDetail = null;
+ try {
+ tModelDetail = inquiry.getTModelDetail(gtm);
+ } catch (Exception ex) {
+ }
+ Assume.assumeTrue(tModelDetail == null);
+
+ SaveBusiness sb = new SaveBusiness();
+ sb.setAuthInfo(authInfoJoe);
+ BusinessEntity be = new BusinessEntity();
+ be.getName().add(new Name());
+ be.getName().get(0).setValue("Joe's JIRA_575_KR_Biz business");
+ be.setBusinessServices(new BusinessServices());
+ be.setCategoryBag(new CategoryBag());
+ be.getCategoryBag().getKeyedReference().add(new KeyedReference(madeupTmodel, "name", "val"));
+ sb.getBusinessEntity().add(be);
+
+ try {
+ BusinessDetail saveBusiness = publication.saveBusiness(sb);
+ Assert.fail("unexpected success");
+ } catch (Exception ex) {
+ logger.error(ex.getMessage());
+ }
+
+ }
+
+
+ @Test
+ public void JIRA_575_IDENT_Biz() throws Exception {
+ System.out.println("JIRA_575_IDENT_Biz");
+ String madeupTmodel = "uddi" + UUID.randomUUID().toString();
+ GetTModelDetail gtm = new GetTModelDetail();
+ gtm.setAuthInfo(authInfoJoe);
+ gtm.getTModelKey().add(madeupTmodel);
+ TModelDetail tModelDetail = null;
+ try {
+ tModelDetail = inquiry.getTModelDetail(gtm);
+ } catch (Exception ex) {
+ }
+ Assume.assumeTrue(tModelDetail == null);
+
+ SaveBusiness sb = new SaveBusiness();
+ sb.setAuthInfo(authInfoJoe);
+ BusinessEntity be = new BusinessEntity();
+ be.getName().add(new Name());
+ be.getName().get(0).setValue("Joe's JIRA_575_IDENT_Biz business");
+ be.setBusinessServices(new BusinessServices());
+ be.setIdentifierBag(new IdentifierBag());
+ be.getIdentifierBag().getKeyedReference().add(new KeyedReference(madeupTmodel, "name", "val"));
+ sb.getBusinessEntity().add(be);
+
+ try {
+ BusinessDetail saveBusiness = publication.saveBusiness(sb);
+ Assert.fail("unexpected success");
+ } catch (Exception ex) {
+ logger.error(ex.getMessage());
+ }
+
+ }
+
+
+
+ @Test
+ public void JIRA_575_KR_TMODEL() throws Exception {
+ System.out.println("JIRA_575_KR_TMODEL");
+ String madeupTmodel = "uddi" + UUID.randomUUID().toString();
+ GetTModelDetail gtm = new GetTModelDetail();
+ gtm.setAuthInfo(authInfoJoe);
+ gtm.getTModelKey().add(madeupTmodel);
+ TModelDetail tModelDetail = null;
+ try {
+ tModelDetail = inquiry.getTModelDetail(gtm);
+ } catch (Exception ex) {
+ }
+ Assume.assumeTrue(tModelDetail == null);
+
+ SaveTModel stm = new SaveTModel();
+ stm.setAuthInfo(authInfoJoe);
+ TModel tm = new TModel();
+ tm.setName(new Name("JIRA_575_KR_TMODEL",null));
+ tm.setCategoryBag(new CategoryBag());
+ tm.getCategoryBag().getKeyedReference().add(new KeyedReference(madeupTmodel, "name", "val"));
+ try {
+ publication.saveTModel(stm);
+ Assert.fail("unexpected success");
+ } catch (Exception ex) {
+ logger.error(ex.getMessage());
+ }
+ }
+
+ @Test
+ public void JIRA_575_KRGRP_TMODEL() throws Exception {
+ System.out.println("JIRA_575_KRGRP_TMODEL");
+ String madeupTmodel = "uddi" + UUID.randomUUID().toString();
+ GetTModelDetail gtm = new GetTModelDetail();
+ gtm.setAuthInfo(authInfoJoe);
+ gtm.getTModelKey().add(madeupTmodel);
+ TModelDetail tModelDetail = null;
+ try {
+ tModelDetail = inquiry.getTModelDetail(gtm);
+ } catch (Exception ex) {
+ }
+ Assume.assumeTrue(tModelDetail == null);
+
+ SaveTModel stm = new SaveTModel();
+ stm.setAuthInfo(authInfoJoe);
+ TModel tm = new TModel();
+ tm.setName(new Name("JIRA_575_KRGRP_TMODEL", null));
+ tm.setCategoryBag(new CategoryBag());
+ tm.getCategoryBag().getKeyedReferenceGroup().add(new KeyedReferenceGroup());
+ tm.getCategoryBag().getKeyedReferenceGroup().get(0).setTModelKey(madeupTmodel);
+ try {
+ publication.saveTModel(stm);
+ Assert.fail("unexpected success");
+ } catch (Exception ex) {
+ logger.error(ex.getMessage());
+ }
+ }
+
+
+ @Test
+ public void JIRA_575_KRGRP_Biz() throws Exception {
+ System.out.println("JIRA_575_KRGRP_Biz");
+ String madeupTmodel = "uddi" + UUID.randomUUID().toString();
+ GetTModelDetail gtm = new GetTModelDetail();
+ gtm.setAuthInfo(authInfoJoe);
+ gtm.getTModelKey().add(madeupTmodel);
+ TModelDetail tModelDetail = null;
+ try {
+ tModelDetail = inquiry.getTModelDetail(gtm);
+ } catch (Exception ex) {
+ }
+ Assume.assumeTrue(tModelDetail == null);
+
+ SaveBusiness sb = new SaveBusiness();
+ sb.setAuthInfo(authInfoJoe);
+ BusinessEntity be = new BusinessEntity();
+ be.getName().add(new Name());
+ be.getName().get(0).setValue("Joe's JIRA_575_KRGRP_Biz business");
+ be.setBusinessServices(new BusinessServices());
+ be.setCategoryBag(new CategoryBag());
+ //be.getCategoryBag().getKeyedReference().add(new KeyedReference(madeupTmodel, "name", "val"));
+ be.getCategoryBag().getKeyedReferenceGroup().add(new KeyedReferenceGroup());
+ be.getCategoryBag().getKeyedReferenceGroup().get(0).setTModelKey(madeupTmodel);
+
+ sb.getBusinessEntity().add(be);
+
+ try {
+ BusinessDetail saveBusiness = publication.saveBusiness(sb);
+ Assert.fail("unexpected success");
+ } catch (Exception ex) {
+ logger.error(ex.getMessage());
+ }
+
+ }
+
+
+
+
+
+ @Test
+ public void JIRA_575_KRGRP_PA() throws Exception {
+ System.out.println("JIRA_575_KRGRP_PA");
+ String madeupTmodel = "uddi" + UUID.randomUUID().toString();
+ GetTModelDetail gtm = new GetTModelDetail();
+ gtm.setAuthInfo(authInfoJoe);
+ gtm.getTModelKey().add(madeupTmodel);
+ TModelDetail tModelDetail = null;
+ try {
+ tModelDetail = inquiry.getTModelDetail(gtm);
+ } catch (Exception ex) {
+ }
+ Assume.assumeTrue(tModelDetail == null);
+
+
+ tckTModel.saveJoePublisherTmodel(authInfoJoe);
+ tckTModel.saveSamSyndicatorTmodel(authInfoSam);
+
+ tckBusiness.saveJoePublisherBusiness(authInfoJoe);
+ tckBusiness.saveSamSyndicatorBusiness(authInfoSam);
+
+ AddPublisherAssertions apa = new AddPublisherAssertions();
+ apa.setAuthInfo(madeupTmodel);
+ PublisherAssertion pa = new PublisherAssertion();
+ pa.setKeyedReference(new KeyedReference(madeupTmodel, "name", "val"));
+ pa.setFromKey(TckBusiness.JOE_BUSINESS_KEY);
+ pa.setToKey(TckBusiness.SAM_BUSINESS_KEY);
+ apa.getPublisherAssertion().add(pa);
+ try {
+ publication.addPublisherAssertions(apa);
+ Assert.fail("unexpected success");
+ } catch (Exception ex) {
+ logger.error(ex.getMessage());
+ }
+ }
+
+
+
+
+
+
+ @Test
+ public void JIRA_575_SVC_KR() throws Exception {
+ System.out.println("JIRA_575_SVC_KR");
+ String madeupTmodel = "uddi" + UUID.randomUUID().toString();
+ GetTModelDetail gtm = new GetTModelDetail();
+ gtm.setAuthInfo(authInfoJoe);
+ gtm.getTModelKey().add(madeupTmodel);
+ TModelDetail tModelDetail = null;
+ try {
+ tModelDetail = inquiry.getTModelDetail(gtm);
+ } catch (Exception ex) {
+ }
+ Assume.assumeTrue(tModelDetail == null);
+
+ SaveBusiness sb = new SaveBusiness();
+ sb.setAuthInfo(authInfoJoe);
+ BusinessEntity be = new BusinessEntity();
+ be.getName().add(new Name());
+ be.getName().get(0).setValue("Joe's JIRA_575_SVC_KR business");
+ be.setBusinessServices(new BusinessServices());
+ BusinessService bs = new BusinessService();
+ bs.getName().add(new Name());
+ bs.getName().get(0).setValue("Joe's JIRA_575_SVC_KR service");
+ bs.setBindingTemplates(new BindingTemplates());
+ bs.setCategoryBag(new CategoryBag());
+ bs.getCategoryBag().getKeyedReference().add(new KeyedReference(madeupTmodel, "name", "val"));
+
+ be.getBusinessServices().getBusinessService().add(bs);
+ sb.getBusinessEntity().add(be);
+
+ try {
+ BusinessDetail saveBusiness = publication.saveBusiness(sb);
+ Assert.fail("unexpected success");
+ } catch (Exception ex) {
+ logger.error(ex.getMessage());
+ }
+ }
+
+
+ @Test
+ public void JIRA_575_SVC_KRGRP() throws Exception {
+ System.out.println("JIRA_575_SVC_KRGRP");
+ String madeupTmodel = "uddi" + UUID.randomUUID().toString();
+ GetTModelDetail gtm = new GetTModelDetail();
+ gtm.setAuthInfo(authInfoJoe);
+ gtm.getTModelKey().add(madeupTmodel);
+ TModelDetail tModelDetail = null;
+ try {
+ tModelDetail = inquiry.getTModelDetail(gtm);
+ } catch (Exception ex) {
+ }
+ Assume.assumeTrue(tModelDetail == null);
+
+ SaveBusiness sb = new SaveBusiness();
+ sb.setAuthInfo(authInfoJoe);
+ BusinessEntity be = new BusinessEntity();
+ be.getName().add(new Name());
+ be.getName().get(0).setValue("Joe's JIRA_575_SVC_KRGRP business");
+ be.setBusinessServices(new BusinessServices());
+ BusinessService bs = new BusinessService();
+ bs.getName().add(new Name());
+ bs.getName().get(0).setValue("Joe's JIRA_575_SVC_KRGRP service");
+ bs.setBindingTemplates(new BindingTemplates());
+ bs.setCategoryBag(new CategoryBag());
+ bs.getCategoryBag().getKeyedReferenceGroup().add(new KeyedReferenceGroup());
+ bs.getCategoryBag().getKeyedReferenceGroup().get(0).setTModelKey(madeupTmodel);
+
+
+ be.getBusinessServices().getBusinessService().add(bs);
+ sb.getBusinessEntity().add(be);
+
+ try {
+ BusinessDetail saveBusiness = publication.saveBusiness(sb);
+ Assert.fail("unexpected success");
+ } catch (Exception ex) {
+ logger.error(ex.getMessage());
+ }
+ }
+
//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
//<editor-fold defaultstate="collapsed" desc="Some basic util functions to print out the data structure">
Modified: juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/ClientSubscriptionInfo.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/ClientSubscriptionInfo.java?rev=1549363&r1=1549362&r2=1549363&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/ClientSubscriptionInfo.java (original)
+++ juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/apache/juddi/api_v3/ClientSubscriptionInfo.java Mon Dec 9 00:40:43 2013
@@ -14,161 +14,68 @@
* limitations under the License.
*
*/
+
package org.apache.juddi.api_v3;
import java.io.Serializable;
+import java.util.Date;
+
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import javax.xml.datatype.XMLGregorianCalendar;
+
/**
- * <p>Java class for clientSubscriptionInfo complex type.
- *
- * <p>The following schema fragment specifies the expected content contained
- * within this class.
- *
- * <pre>
- * <complexType name="clientSubscriptionInfo">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="subscriptionKey" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * <element name="fromClerk" type="{urn:juddi-apache-org:api_v3}clerk"/>
- * <element name="toClerk" type="{urn:juddi-apache-org:api_v3}clerk"/>
- * <element name="lastModified" type="{http://www.w3.org/2001/XMLSchema}dateTime" minOccurs="0"/>
- * <element name="lastNotified" type="{http://www.w3.org/2001/XMLSchema}dateTime" minOccurs="0"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
+ * <p>Java class for save_subscriptionInfo type. Specific to juddi.
+ *
+ * @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
+ *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "clientSubscriptionInfo", propOrder = {
- "subscriptionKey",
- "fromClerk",
- "toClerk",
- "lastModified",
- "lastNotified"
+ "subscriptionKey",
+ "fromClerk",
+ "toClerk",
+ "lastModified"
})
-public class ClientSubscriptionInfo implements Serializable {
+public class ClientSubscriptionInfo implements Serializable{
+
+ @XmlTransient
+ private static final long serialVersionUID = 6885792665298161949L;
+ @XmlElement(required = true)
+ protected String subscriptionKey;
+ @XmlElement(required = true)
+ protected Clerk toClerk;
+ @XmlElement(required = true)
+ protected Clerk fromClerk;
+ protected Date lastModified;
+
+ public String getSubscriptionKey() {
+ return subscriptionKey;
+ }
+ public void setSubscriptionKey(String subscriptionKey) {
+ this.subscriptionKey = subscriptionKey;
+ }
+ public Clerk getToClerk() {
+ return toClerk;
+ }
+ public void setToClerk(Clerk toClerk) {
+ this.toClerk = toClerk;
+ }
+ public Clerk getFromClerk() {
+ return fromClerk;
+ }
+ public void setFromClerk(Clerk fromClerk) {
+ this.fromClerk = fromClerk;
+ }
+ public Date getLastModified() {
+ return lastModified;
+ }
+ public void setLastModified(Date lastModified) {
+ this.lastModified = lastModified;
+ }
- @XmlTransient
- private static final long serialVersionUID = 6885792665298161949L;
- @XmlElement(required = true)
- protected String subscriptionKey;
- @XmlElement(required = true)
- protected Clerk fromClerk;
- @XmlElement(required = true)
- protected Clerk toClerk;
- @XmlSchemaType(name = "dateTime")
- protected XMLGregorianCalendar lastModified;
- @XmlSchemaType(name = "dateTime")
- protected XMLGregorianCalendar lastNotified;
-
- /**
- * Gets the value of the subscriptionKey property.
- *
- * @return possible object is {@link String }
- *
- */
- public String getSubscriptionKey() {
- return subscriptionKey;
- }
-
- /**
- * Sets the value of the subscriptionKey property.
- *
- * @param value allowed object is {@link String }
- *
- */
- public void setSubscriptionKey(String value) {
- this.subscriptionKey = value;
- }
-
- /**
- * Gets the value of the fromClerk property.
- *
- * @return possible object is {@link Clerk }
- *
- */
- public Clerk getFromClerk() {
- return fromClerk;
- }
-
- /**
- * Sets the value of the fromClerk property.
- *
- * @param value allowed object is {@link Clerk }
- *
- */
- public void setFromClerk(Clerk value) {
- this.fromClerk = value;
- }
-
- /**
- * Gets the value of the toClerk property.
- *
- * @return possible object is {@link Clerk }
- *
- */
- public Clerk getToClerk() {
- return toClerk;
- }
-
- /**
- * Sets the value of the toClerk property.
- *
- * @param value allowed object is {@link Clerk }
- *
- */
- public void setToClerk(Clerk value) {
- this.toClerk = value;
- }
-
- /**
- * Gets the value of the lastModified property.
- *
- * @return possible object is {@link XMLGregorianCalendar }
- *
- */
- public XMLGregorianCalendar getLastModified() {
- return lastModified;
- }
-
- /**
- * Sets the value of the lastModified property.
- *
- * @param value allowed object is {@link XMLGregorianCalendar }
- *
- */
- public void setLastModified(XMLGregorianCalendar value) {
- this.lastModified = value;
- }
-
- /**
- * Gets the value of the lastNotified property.
- *
- * @return possible object is {@link XMLGregorianCalendar }
- *
- */
- public XMLGregorianCalendar getLastNotified() {
- return lastNotified;
- }
-
- /**
- * Sets the value of the lastNotified property.
- *
- * @param value allowed object is {@link XMLGregorianCalendar }
- *
- */
- public void setLastNotified(XMLGregorianCalendar value) {
- this.lastNotified = value;
- }
}
+
\ No newline at end of file
Modified: juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/uddi/api_v3/OperationalInfo.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/uddi/api_v3/OperationalInfo.java?rev=1549363&r1=1549362&r2=1549363&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/uddi/api_v3/OperationalInfo.java (original)
+++ juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/uddi/api_v3/OperationalInfo.java Mon Dec 9 00:40:43 2013
@@ -23,6 +23,7 @@ import java.io.Serializable;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import javax.xml.datatype.XMLGregorianCalendar;
@@ -60,6 +61,7 @@ import javax.xml.datatype.XMLGregorianCa
"nodeID",
"authorizedName"
})
+@XmlRootElement
public class OperationalInfo implements Serializable{
@XmlTransient
private static final long serialVersionUID = -3112659463581534112L;
Modified: juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/uddi/sub_v3/KeyBag.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/uddi/sub_v3/KeyBag.java?rev=1549363&r1=1549362&r2=1549363&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/uddi/sub_v3/KeyBag.java (original)
+++ juddi/branches/juddi-3.3.x/uddi-ws/src/main/java/org/uddi/sub_v3/KeyBag.java Mon Dec 9 00:40:43 2013
@@ -24,6 +24,7 @@ import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
@@ -61,6 +62,7 @@ import javax.xml.bind.annotation.XmlType
"serviceKey",
"bindingKey"
})
+ @XmlRootElement() //required for REST APIs
public class KeyBag implements Serializable{
@XmlTransient
private static final long serialVersionUID = -4702163443625186185L;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org