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 2014/01/04 18:21:15 UTC
svn commit: r1555373 - in /juddi/trunk:
juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/
juddi-client/src/main/java/org/apache/juddi/v3/client/config/
juddi-core/src/main/resources/juddi_install_data/
juddi-core/src/test/java/org/ap...
Author: alexoree
Date: Sat Jan 4 17:21:15 2014
New Revision: 1555373
URL: http://svn.apache.org/r1555373
Log:
JUDDI-755 updating tModel helper functions for catbags, .net updated
JUDDI-598 adding tModel instance infos to the default install data,
JUDDI-598 adding tModels that are specified in the uddi spec, but not already present. forced a tck test class api change
Modified:
juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/UDDIClient.cs
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClient.java
juddi/trunk/juddi-core/src/main/resources/juddi_install_data/UDDI_tModels.xml
juddi/trunk/juddi-core/src/main/resources/juddi_install_data/root_BusinessEntity.xml
juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_080_SubscriptionTest.java
juddi/trunk/juddi-core/src/test/java/org/apache/juddi/subscription/SubscriptionNotifierTest.java
juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscription.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java
Modified: juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/UDDIClient.cs
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/UDDIClient.cs?rev=1555373&r1=1555372&r2=1555373&view=diff
==============================================================================
--- juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/UDDIClient.cs (original)
+++ juddi/trunk/juddi-client.net/juddi-client.net/org.apache.juddi.v3.client.config/UDDIClient.cs Sat Jan 4 17:21:15 2014
@@ -373,6 +373,213 @@ namespace org.apache.juddi.v3.client
}
-
+ /**
+ * adds the typical SOAP tmodel references, but only if they aren't already present
+ * @param bt
+ * @return
+ */
+ public static bindingTemplate addSOAPtModels(bindingTemplate bt)
+ {
+ bool found = false;
+ List<object> cbags = new List<object>();
+ if (bt.categoryBag != null)
+ cbags.AddRange(bt.categoryBag.Items);
+
+ for (int i = 0; i < cbags.Count; i++)
+ {
+ if (cbags[i] is keyedReference)
+ {
+ keyedReference kr = (keyedReference)cbags[i];
+ if (kr.tModelKey!=null
+ && kr.tModelKey.Equals("uddi:uddi.org:categorization:types", StringComparison.CurrentCultureIgnoreCase))
+ {
+ if (kr.keyName != null
+ && kr.keyName.Equals("uddi-org:types:wsdl", StringComparison.CurrentCultureIgnoreCase))
+ {
+ found = true;
+ }
+ }
+ }
+ }
+ if (!found)
+ cbags.Add(new keyedReference("uddi:uddi.org:categorization:types", "uddi-org:types:wsdl", "wsdlDeployment"));
+ if (cbags.Count > 0)
+ {
+ if (bt.categoryBag == null)
+ bt.categoryBag = new categoryBag();
+ bt.categoryBag.Items = cbags.ToArray();
+ }
+
+ List<tModelInstanceInfo> data = new List<tModelInstanceInfo>();
+ if (bt.tModelInstanceDetails != null)
+ {
+ data.AddRange(bt.tModelInstanceDetails);
+ }
+ accessPoint ap=null;
+ if (bt.Item is accessPoint)
+ {
+ ap = (accessPoint)bt.Item;
+ }
+ tModelInstanceInfo tModelInstanceInfo;
+ if (!Exists(data, UDDIConstants.PROTOCOL_SOAP))
+ {
+ tModelInstanceInfo = new tModelInstanceInfo();
+ tModelInstanceInfo.tModelKey=(UDDIConstants.PROTOCOL_SOAP);
+ data.Add(tModelInstanceInfo);
+ }
+
+ if (ap != null && ap.Value!=null && ap.Value.StartsWith("http:"))
+ {
+ if (!Exists(data, UDDIConstants.TRANSPORT_HTTP))
+ {
+ tModelInstanceInfo = new tModelInstanceInfo();
+ tModelInstanceInfo.tModelKey=(UDDIConstants.TRANSPORT_HTTP);
+ data.Add(tModelInstanceInfo);
+ }
+ }
+ if (ap != null && ap.Value!=null && ap.Value.StartsWith("jms:"))
+ {
+ if (!Exists(data, UDDIConstants.TRANSPORT_JMS))
+ {
+ tModelInstanceInfo = new tModelInstanceInfo();
+ tModelInstanceInfo.tModelKey=(UDDIConstants.TRANSPORT_JMS);
+ data.Add(tModelInstanceInfo);
+ }
+ }
+ if (ap != null && ap.Value!=null && ap.Value.StartsWith("rmi:"))
+ {
+ if (!Exists(data, UDDIConstants.TRANSPORT_RMI))
+ {
+ tModelInstanceInfo = new tModelInstanceInfo();
+ tModelInstanceInfo.tModelKey=(UDDIConstants.TRANSPORT_RMI);
+ data.Add(tModelInstanceInfo);
+ }
+ }
+ if (ap != null && ap.Value!=null && ap.Value.StartsWith("udp:"))
+ {
+ if (!Exists(data, UDDIConstants.TRANSPORT_UDP))
+ {
+ tModelInstanceInfo = new tModelInstanceInfo();
+ tModelInstanceInfo.tModelKey=(UDDIConstants.TRANSPORT_UDP);
+ data.Add(tModelInstanceInfo);
+ }
+ }
+ if (ap != null && ap.Value!=null && ap.Value.StartsWith("amqp:"))
+ {
+ if (!Exists(data, UDDIConstants.TRANSPORT_AMQP))
+ {
+ tModelInstanceInfo = new tModelInstanceInfo();
+ tModelInstanceInfo.tModelKey=(UDDIConstants.TRANSPORT_AMQP);
+ data.Add(tModelInstanceInfo);
+ }
+ }
+ if (ap != null && ap.Value!=null && ap.Value.StartsWith("mailto:"))
+ {
+ if (!Exists(data, UDDIConstants.TRANSPORT_EMAIL))
+ {
+ tModelInstanceInfo = new tModelInstanceInfo();
+ tModelInstanceInfo.tModelKey=(UDDIConstants.TRANSPORT_EMAIL);
+ data.Add(tModelInstanceInfo);
+ }
+ }
+ if (ap != null && ap.Value!=null && ap.Value.StartsWith("ftp:"))
+ {
+ if (!Exists(data, UDDIConstants.TRANSPORT_FTP))
+ {
+ tModelInstanceInfo = new tModelInstanceInfo();
+ tModelInstanceInfo.tModelKey=(UDDIConstants.TRANSPORT_FTP);
+ data.Add(tModelInstanceInfo);
+ }
+ }
+ if (ap != null && ap.Value!=null && ap.Value.StartsWith("https:"))
+ {
+ if (!Exists(data, UDDIConstants.PROTOCOL_SSLv3))
+ {
+ tModelInstanceInfo = new tModelInstanceInfo();
+ tModelInstanceInfo.tModelKey=(UDDIConstants.PROTOCOL_SSLv3);
+ data.Add(tModelInstanceInfo);
+ }
+ }
+ if (ap != null && ap.Value!=null && ap.Value.StartsWith("ftps:"))
+ {
+ if (!Exists(data, UDDIConstants.PROTOCOL_SSLv3))
+ {
+ tModelInstanceInfo = new tModelInstanceInfo();
+ tModelInstanceInfo.tModelKey=(UDDIConstants.PROTOCOL_SSLv3);
+ data.Add(tModelInstanceInfo);
+ }
+ }
+ if (ap != null && ap.Value!=null && ap.Value.StartsWith("jndi:"))
+ {
+ if (!Exists(data, UDDIConstants.TRANSPORT_JNDI_RMI))
+ {
+ tModelInstanceInfo = new tModelInstanceInfo();
+ tModelInstanceInfo.tModelKey=(UDDIConstants.TRANSPORT_JNDI_RMI);
+ data.Add(tModelInstanceInfo);
+ }
+ }
+ bt.tModelInstanceDetails = data.ToArray();
+ return bt;
+ }
+
+ /**
+ * adds the typical REST tmodel references, but only if they aren't already present
+ * @param bt
+ * @return
+ */
+ public static bindingTemplate addRESTtModels(bindingTemplate bt)
+ {
+ List<tModelInstanceInfo> data = new List<tModelInstanceInfo>();
+ if (bt.tModelInstanceDetails != null)
+ {
+ data.AddRange(bt.tModelInstanceDetails);
+ }
+ accessPoint ap = null;
+ if (bt.Item is accessPoint)
+ {
+ ap = (accessPoint)bt.Item;
+ }
+ tModelInstanceInfo tModelInstanceInfo;
+ if (!Exists(data, UDDIConstants.PROTOCOL_REST))
+ {
+ tModelInstanceInfo = new tModelInstanceInfo();
+ tModelInstanceInfo.tModelKey = (UDDIConstants.PROTOCOL_REST);
+ data.Add(tModelInstanceInfo);
+ }
+
+ if (ap != null && ap.Value!=null && ap.Value.StartsWith("http:"))
+ {
+ if (!Exists(data, UDDIConstants.TRANSPORT_HTTP))
+ {
+ tModelInstanceInfo = new tModelInstanceInfo();
+ tModelInstanceInfo.tModelKey = (UDDIConstants.TRANSPORT_HTTP);
+ data.Add(tModelInstanceInfo);
+ }
+ }
+ if (ap != null && ap.Value!=null && ap.Value.StartsWith("https:"))
+ {
+ if (!Exists(data, UDDIConstants.PROTOCOL_SSLv3))
+ {
+ tModelInstanceInfo = new tModelInstanceInfo();
+ tModelInstanceInfo.tModelKey = (UDDIConstants.PROTOCOL_SSLv3);
+ data.Add(tModelInstanceInfo);
+ }
+ }
+ bt.tModelInstanceDetails = data.ToArray();
+ return bt;
+ }
+
+ private static bool Exists(List<tModelInstanceInfo> items, String key)
+ {
+ for (int i = 0; i < items.Count; i++)
+ {
+ if (items[i].tModelKey != null
+ && items[i].tModelKey.Equals(key, StringComparison.CurrentCultureIgnoreCase))
+ {
+ return true;
+ }
+ }
+ return false;
+ }
}
}
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClient.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClient.java?rev=1555373&r1=1555372&r2=1555373&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClient.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClient.java Sat Jan 4 17:21:15 2014
@@ -424,6 +424,23 @@ public class UDDIClient {
* @return
*/
public static BindingTemplate addSOAPtModels(BindingTemplate bt) {
+ if (bt.getCategoryBag() == null) {
+ bt.setCategoryBag(new CategoryBag());
+ }
+ boolean found = false;
+ for (int i = 0; i < bt.getCategoryBag().getKeyedReference().size(); i++) {
+ if (bt.getCategoryBag().getKeyedReference().get(i).getTModelKey() != null
+ && bt.getCategoryBag().getKeyedReference().get(i).getTModelKey().equalsIgnoreCase("uddi:uddi.org:categorization:types")) {
+ if (bt.getCategoryBag().getKeyedReference().get(i).getKeyName() != null
+ && bt.getCategoryBag().getKeyedReference().get(i).getKeyName().equalsIgnoreCase("uddi-org:types:wsdl")) {
+ found = true;
+ }
+ }
+ }
+ if (!found)
+ bt.getCategoryBag().getKeyedReference().add(new KeyedReference( "uddi:uddi.org:categorization:types","uddi-org:types:wsdl", "wsdlDeployment" ));
+ if (bt.getCategoryBag().getKeyedReference().isEmpty() && bt.getCategoryBag().getKeyedReferenceGroup().isEmpty())
+ bt.setCategoryBag(null);
if (bt.getTModelInstanceDetails() == null) {
bt.setTModelInstanceDetails(new TModelInstanceDetails());
}
Modified: juddi/trunk/juddi-core/src/main/resources/juddi_install_data/UDDI_tModels.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/resources/juddi_install_data/UDDI_tModels.xml?rev=1555373&r1=1555372&r2=1555373&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/resources/juddi_install_data/UDDI_tModels.xml (original)
+++ juddi/trunk/juddi-core/src/main/resources/juddi_install_data/UDDI_tModels.xml Sat Jan 4 17:21:15 2014
@@ -6,7 +6,7 @@
* 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
+* http://www.apache.org/licenses/LICenSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,6 +15,15 @@
* limitations under the License.
*
*/ -->
+
+<!-- Important notes on editing this file
+
+1) if you add a new find qualifier item, you must then increase the count in
+ org.apache.juddi.v3.tck.TckSubscription.FINDQUALIFIER_TMODEL_TOTAL
+
+-->
+
+
<save_tModel xmlns="urn:uddi-org:api_v3">
<tModel tModelKey="uddi:uddi.org:keygenerator" xmlns="urn:uddi-org:api_v3">
<name>uddi-org:keyGenerator</name>
@@ -1079,23 +1088,7 @@
</categoryBag>
</tModel>
- <tModel tModelKey="uddi:uddi.org:ubr:postaladdress">
- <name>ubr-uddi-org:postalAddress</name>
- <description xml:lang="EN">Postal address structure</description>
- <overviewDoc>
- <overviewURL useType="text">
- http://uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#postal
- </overviewURL>
- </overviewDoc>
- <categoryBag>
- <keyedReference keyName="uddi-org:types:postalAddress"
- keyValue="postalAddress"
- tModelKey="uddi:uddi.org:categorization:types"/>
- <keyedReference keyName="uddi-org:types:unchecked"
- keyValue="unchecked"
- tModelKey="uddi:uddi.org:categorization:types"/>
- </categoryBag>
- </tModel>
+
<tModel tModelKey="uddi:tmodelkey:keygenerator" xmlns="urn:uddi-org:api_v3">
@@ -1353,4 +1346,317 @@
</categoryBag>
</tModel>
+ <tModel tModelKey="uddi:uddi.org:ubr:categorization:iso3166">
+ <name>ISO 3166 Country Codes</name>
+ <description xml:lang="en">When used in a Category Bag for a Business or Service, it can indicate the physical or logically location of the Business or Service.</description>
+ <overviewDoc>
+ <overviewURL>
+ http://www.iso.org/iso/country_codes
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:checked" keyValue="checked" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+
+ <tModel tModelKey="uddi:uddi.org:ubr:categorizationGroup:wgs84">
+ <name>World Geodetic System</name>
+ <description xml:lang="en">Standard for use in cartography, geodesy, and navigation. </description>
+ <overviewDoc>
+ <overviewURL>
+ http://www.ngs.noaa.gov/PUBS_LIB/Geodesy4Layman/TR80003E.HTM#ZZ11
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:checked" keyValue="checked" tModelKey="uddi:uddi.org:categorization:types" />
+ </categoryBag>
+ </tModel>
+
+ <tModel tModelKey="uddi:uddi.org:ubr:keygenerator">
+ <name>Universal Business Registry Key Generator</name>
+ <description>UBR domain key generator</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#keyGen
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="uddi-org:types:keyGenerator"
+ keyValue="keyGenerator" />
+ </categoryBag>
+ </tModel>
+ <tModel tModelKey="uddi:uddi.org:ubr:categorizationgroup:keygenerator">
+ <name>Universal Business Registry Categorization Group Key Generator</name>
+ <description>UBR Categorization Group domain key generator</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#keyGen
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="uddi-org:types:keyGenerator"
+ keyValue="keyGenerator" />
+ </categoryBag>
+ </tModel>
+
+ <tModel tModelKey="uddi:uddi.org:ubr:categorization:keygenerator">
+ <name>Universal Business Registry Categorization Key Generator</name>
+ <description>UBR Categorization domain key generator</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#keyGen
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="uddi-org:types:keyGenerator"
+ keyValue="keyGenerator" />
+ </categoryBag>
+ </tModel>
+
+ <tModel tModelKey="uddi:uddi.org:ubr:postaladdress">
+ <name>ubr-uddi-org:postalAddress</name>
+ <description xml:lang="en">Postal address structure</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#postal
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:postalAddress"
+ keyValue="postalAddress"
+ tModelKey="uddi:uddi.org:categorization:types"/>
+ <keyedReference keyName="uddi-org:types:unchecked"
+ keyValue="unchecked"
+ tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </tModel>
+
+
+ <tModel tModelKey="uddi:uddi.org:ubr:relationships">
+ <name>ubr-uddi-org:relationships</name>
+ <description xml:lang="en">relationships in a UBR</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:unchecked"
+ keyValue="unchecked"
+ tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </tModel>
+
+ <tModel tModelKey="uddi:uddi.org:ubr:identifier:keygenerator">
+ <name>ubr-uddi-org:identifier key generator</name>
+ <description>UBR Identifier Group domain key generator</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#keyGen
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="uddi-org:types:keyGenerator"
+ keyValue="keyGenerator" />
+ </categoryBag>
+ </tModel>
+
+ <tModel tModelKey="uddi:uddi.org:ubr:identifier:owningbusiness">
+ <name>UBR Identifier Owning Business</name>
+ <description xml:lang="en">Identifier for an Owning Business in a UBR</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:unchecked"
+ keyValue="unchecked"
+ tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </tModel>
+
+ <tModel tModelKey="uddi:uddi.org:ubr:categorization:unspsc">
+ <name>UBR Categorization Unspecified</name>
+ <description xml:lang="en">Unspecified Categorization in a UBR</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:unchecked"
+ keyValue="unchecked"
+ tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </tModel>
+
+
+ <tModel tModelKey="uddi:uddi.org:ubr:categorization:naics:keygenerator">
+ <name>North American Industry Classification System Key Generator</name>
+ <description xml:lang="en">North American Industry Classification System Key Generator.</description>
+ <description xml:lang="en">The North American Industry Classification System (NAICS) is the standard used by Federal statistical agencies in classifying business establishments for the purpose of collecting, analyzing, and publishing statistical data in the U.S. business economy</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#keyGen
+ </overviewURL>
+ <overviewURL useType="text">
+ https://www.census.gov/eos/www/naics/index.html
+ </overviewURL>
+
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="uddi-org:types:keyGenerator"
+ keyValue="keyGenerator" />
+ </categoryBag>
+ </tModel>
+
+
+ <tModel tModelKey="uddi:uddi.org:ubr:categorization:naics:1997">
+ <name>North American Industry Classification System 1997</name>
+ <description xml:lang="en">North American Industry Classification System 1997</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ https://www.census.gov/eos/www/naics/reference_files_tools/1997/1997.html
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:unchecked"
+ keyValue="unchecked"
+ tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </tModel>
+
+
+ <tModel tModelKey="uddi:uddi.org:ubr:categorization:naics:2012">
+ <name>North American Industry Classification System 2012</name>
+ <description xml:lang="en">North American Industry Classification System 2012</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ https://www.census.gov/cgi-bin/sssd/naics/naicsrch?chart=2012
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:unchecked"
+ keyValue="unchecked"
+ tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </tModel>
+
+ <tModel tModelKey="uddi:uddi.org:ubr:categorization:naics:2002">
+ <name>North American Industry Classification System 2002</name>
+ <description xml:lang="en">North American Industry Classification System 2002</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ https://www.census.gov/cgi-bin/sssd/naics/naicsrch?chart=2002
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:unchecked"
+ keyValue="unchecked"
+ tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </tModel>
+
+ <tModel tModelKey="uddi:uddi.org:ubr:categorization:naics:2007">
+ <name>North American Industry Classification System 2007</name>
+ <description xml:lang="en">North American Industry Classification System 2007</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ https://www.census.gov/cgi-bin/sssd/naics/naicsrch?chart=2007
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:unchecked"
+ keyValue="unchecked"
+ tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </tModel>
+
+
+
+
+ <tModel tModelKey="uddi:uddi.org:ubr:taxonomy:keygenerator">
+ <name>UBR Taxonomies</name>
+ <description xml:lang="en">Universal Business Registry Taxonomy Key Generator.</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#keyGen
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="uddi-org:types:keyGenerator"
+ keyValue="keyGenerator" />
+ </categoryBag>
+ </tModel>
+
+ <tModel tModelKey="uddi:uddi.org:ubr:taxonomy:naics">
+ <name>North American Industry Classification System Taxonomy</name>
+ <description xml:lang="en">North American Industry Classification System Taxonomy</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ https://www.census.gov/eos/www/naics/index.html
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:unchecked"
+ keyValue="unchecked"
+ tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </tModel>
+
+
+
+ <tModel tModelKey="uddi:uddi.org:sortorder:jis-x4061">
+ <name>uddi-org:JIS-X4061</name>
+ <description>UDDI JIS X 4061 Japanese
+ collation sequence find qualifier
+ </description>
+ <overviewDoc typeURI="text">
+ <overviewURL>
+ http://uddi.org/pubs/uddi-v3.0.2-20041019.htm#_Toc42047570
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:categorization"
+ keyValue="sortOrder"
+ tModelKey="uddi:uddi.org:categorization:types"/>
+ <keyedReference keyName="uddi-org:types:categorization"
+ keyValue="findQualifier"
+ tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </tModel>
+
+
+ <tModel tModelKey="uddi:uddi.org:ubr:identifier:dnb.com:keygenerator">
+ <name>ubr-uddi-org:identifier for dnb.com</name>
+ <description>UBR Identifier dnb.com Group domain key generator</description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://uddi.org/pubs/uddi_v3.htm#keyGen
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="uddi-org:types:keyGenerator"
+ keyValue="keyGenerator" />
+ </categoryBag>
+ </tModel>
+
+ <tModel tModelKey="uddi:uddi.org:ubr:identifier:dnb.com:d-u-n-s">
+ <name>Dun and Bradstreet D-U-N-S® Number</name>
+ <description>A unique nine digit identification number, for each physical location of your business. </description>
+ <overviewDoc>
+ <overviewURL useType="text">
+ http://fedgov.dnb.com/webform/pages/dunsnumber.jsp
+ </overviewURL>
+ </overviewDoc>
+ <categoryBag>
+ <keyedReference keyName="uddi-org:types:unchecked"
+ keyValue="unchecked"
+ tModelKey="uddi:uddi.org:categorization:types"/>
+ </categoryBag>
+ </tModel>
+
+
+
</save_tModel>
\ No newline at end of file
Modified: juddi/trunk/juddi-core/src/main/resources/juddi_install_data/root_BusinessEntity.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/resources/juddi_install_data/root_BusinessEntity.xml?rev=1555373&r1=1555372&r2=1555373&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/resources/juddi_install_data/root_BusinessEntity.xml (original)
+++ juddi/trunk/juddi-core/src/main/resources/juddi_install_data/root_BusinessEntity.xml Sat Jan 4 17:21:15 2014
@@ -77,6 +77,9 @@
</instanceParms>
</instanceDetails>
</tModelInstanceInfo>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
+
</tModelInstanceDetails>
<categoryBag>
<keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
@@ -87,7 +90,7 @@
<description>UDDI Inquiry API V3 SSL</description>
<!-- This should be changed to the WSDL URL of the inquiry API. An access point inside a bindingTemplate will be found for every service
in this file. They all must point to their API's WSDL URL -->
- <accessPoint useType="wsdlDeployment">${juddi.server.baseurlsecure}/services/inquiry?wsdl</accessPoint>
+ <accessPoint useType="wsdlDeployment">${juddi.server.baseurlsecure}/services/inquiry?wsdl</accessPoint>
<tModelInstanceDetails>
<tModelInstanceInfo tModelKey="uddi:uddi.org:v3_inquiry">
<instanceDetails>
@@ -104,6 +107,9 @@
</instanceDetails>
</tModelInstanceInfo>
<tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3"/>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
+
</tModelInstanceDetails>
<categoryBag>
<keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
@@ -129,6 +135,11 @@
<accessPoint useType="wadlDeployment">${juddi.server.baseurlsecure}/services/inquiryRest?_wadl</accessPoint>
<tModelInstanceDetails>
<tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3"/>
+
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
+
+
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:rest" />
</tModelInstanceDetails>
<categoryBag>
<keyedReference keyName="uddi-org:types:wadl" keyValue="wadlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
@@ -157,6 +168,9 @@
</instanceParms>
</instanceDetails>
</tModelInstanceInfo>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
+
</tModelInstanceDetails>
<categoryBag>
<keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
@@ -180,6 +194,10 @@
</instanceDetails>
</tModelInstanceInfo>
<tModelInstanceInfo tModelKey="uddi:uddi.org:v3_security" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3" />
+
</tModelInstanceDetails>
<categoryBag>
<keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
@@ -197,6 +215,10 @@
<accessPoint useType="wsdlDeployment">${juddi.server.baseurl}/services/security?wsdl</accessPoint>
<tModelInstanceDetails>
<tModelInstanceInfo tModelKey="uddi:uddi.org:v3_security" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3" />
+
</tModelInstanceDetails>
<categoryBag>
<keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
@@ -207,6 +229,10 @@
<accessPoint useType="wsdlDeployment">${juddi.server.baseurlsecure}/services/security?wsdl</accessPoint>
<tModelInstanceDetails>
<tModelInstanceInfo tModelKey="uddi:uddi.org:v3_security" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3" />
+
</tModelInstanceDetails>
<categoryBag>
<keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
@@ -234,7 +260,11 @@
]]>
</instanceParms>
</instanceDetails>
+
</tModelInstanceInfo>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
+
</tModelInstanceDetails>
<categoryBag>
<keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
@@ -260,6 +290,9 @@
</instanceDetails>
</tModelInstanceInfo>
<tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3"/>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
+
</tModelInstanceDetails>
<categoryBag>
<keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
@@ -291,6 +324,9 @@
</instanceParms>
</instanceDetails>
</tModelInstanceInfo>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
+
</tModelInstanceDetails>
<categoryBag>
<keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
@@ -316,6 +352,9 @@
</instanceDetails>
</tModelInstanceInfo>
<tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3"/>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
+
</tModelInstanceDetails>
<categoryBag>
<keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
@@ -334,7 +373,9 @@
<accessPoint useType="wsdlDeployment">${juddi.server.baseurl}/services/subscription-listener?wsdl</accessPoint>
<tModelInstanceDetails>
<tModelInstanceInfo tModelKey="uddi:uddi.org:v3_subscriptionlistener" />
- <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3"/>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
+
</tModelInstanceDetails>
<categoryBag>
<keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
@@ -346,6 +387,10 @@
<accessPoint useType="wsdlDeployment">${juddi.server.baseurlsecure}/services/subscription-listener?wsdl</accessPoint>
<tModelInstanceDetails>
<tModelInstanceInfo tModelKey="uddi:uddi.org:v3_subscriptionlistener" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3" />
+
</tModelInstanceDetails>
<categoryBag>
<keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
@@ -362,6 +407,10 @@
<bindingTemplate bindingKey="uddi:juddi.apache.org:servicebindings-publisher-ws" serviceKey="uddi:juddi.apache.org:services-publisher">
<description>jUDDI Publisher Service API V3</description>
<accessPoint useType="wsdlDeployment">${juddi.server.baseurl}/services/publisher?wsdl</accessPoint>
+ <tModelInstanceDetails>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
+ </tModelInstanceDetails>
<categoryBag>
<keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
</categoryBag>
@@ -371,6 +420,9 @@
<accessPoint useType="wsdlDeployment">${juddi.server.baseurlsecure}/services/publisher?wsdl</accessPoint>
<tModelInstanceDetails>
<tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3"/>
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:soap" />
+ <tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
+
</tModelInstanceDetails>
<categoryBag>
<keyedReference keyName="uddi-org:types:wsdl" keyValue="wsdlDeployment" tModelKey="uddi:uddi.org:categorization:types"/>
Modified: juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_080_SubscriptionTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_080_SubscriptionTest.java?rev=1555373&r1=1555372&r2=1555373&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_080_SubscriptionTest.java (original)
+++ juddi/trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/API_080_SubscriptionTest.java Sat Jan 4 17:21:15 2014
@@ -45,7 +45,7 @@ public class API_080_SubscriptionTest
private static TckBusiness tckBusiness = new TckBusiness(new UDDIPublicationImpl(), new UDDIInquiryImpl());
private static TckBusinessService tckBusinessService = new TckBusinessService(new UDDIPublicationImpl(), new UDDIInquiryImpl());
private static TckBindingTemplate tckBindingTemplate = new TckBindingTemplate(new UDDIPublicationImpl(), new UDDIInquiryImpl());
- private static TckSubscription tckSubscription = new TckSubscription(new UDDISubscriptionImpl(), new UDDISecurityImpl());
+ private static TckSubscription tckSubscription = new TckSubscription(new UDDISubscriptionImpl(), new UDDISecurityImpl(), new UDDIInquiryImpl());
private static String authInfoJoe = null;
private static String authInfoSam = null;
Modified: juddi/trunk/juddi-core/src/test/java/org/apache/juddi/subscription/SubscriptionNotifierTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/test/java/org/apache/juddi/subscription/SubscriptionNotifierTest.java?rev=1555373&r1=1555372&r2=1555373&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/test/java/org/apache/juddi/subscription/SubscriptionNotifierTest.java (original)
+++ juddi/trunk/juddi-core/src/test/java/org/apache/juddi/subscription/SubscriptionNotifierTest.java Sat Jan 4 17:21:15 2014
@@ -63,7 +63,7 @@ public class SubscriptionNotifierTest {
private static TckBusiness tckBusiness = new TckBusiness(new UDDIPublicationImpl(), new UDDIInquiryImpl());
private static TckBusinessService tckBusinessService = new TckBusinessService(new UDDIPublicationImpl(), new UDDIInquiryImpl());
private static TckBindingTemplate tckBindingTemplate = new TckBindingTemplate(new UDDIPublicationImpl(), new UDDIInquiryImpl());
- private static TckSubscription tckSubscription = new TckSubscription(new UDDISubscriptionImpl(), new UDDISecurityImpl());
+ private static TckSubscription tckSubscription = new TckSubscription(new UDDISubscriptionImpl(), new UDDISecurityImpl(), new UDDIInquiryImpl());
private static String authInfoJoe = null;
@BeforeClass
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=1555373&r1=1555372&r2=1555373&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 Jan 4 17:21:15 2014
@@ -38,6 +38,10 @@ import org.uddi.sub_v3.SubscriptionResul
import org.uddi.v3_service.UDDISecurityPortType;
import org.uddi.v3_service.UDDISubscriptionPortType;
import static junit.framework.Assert.assertEquals;
+import org.uddi.api_v3.CategoryBag;
+import org.uddi.api_v3.FindTModel;
+import org.uddi.api_v3.KeyedReference;
+import org.uddi.v3_service.UDDIInquiryPortType;
/**
* @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
@@ -58,7 +62,10 @@ public class TckSubscription
final static String SAM_SUBSCRIPTION2_XML = "uddi_data/subscription/subscription3.xml";
final static String SAM_SUBSCRIPTION2_KEY = "uddi:www.samco.com:subscriptiontwo";
final static String SAM_SUBSCRIPTIONRESULTS2_XML = "uddi_data/subscription/subscriptionresults3.xml";
- final static int FINDQUALIFIER_TMODEL_TOTAL = 22;
+ /**
+ * this represents how many find qualifiers are present in the juddi install_data
+ */
+ static int FINDQUALIFIER_TMODEL_TOTAL = 23;
final static String SAM_SUBSCRIPTION3_XML = "uddi_data/subscription/subscription4.xml";
final static String SAM_SUBSCRIPTION3_KEY = "uddi:www.samco.com:subscriptionthree";
@@ -66,12 +73,14 @@ public class TckSubscription
private Log logger = LogFactory.getLog(this.getClass());
UDDISubscriptionPortType subscription = null;
+ UDDIInquiryPortType inquiry = null;
UDDISecurityPortType security = null;
- public TckSubscription(UDDISubscriptionPortType subscription, UDDISecurityPortType security) {
+ public TckSubscription(UDDISubscriptionPortType subscription, UDDISecurityPortType security, UDDIInquiryPortType inquiry) {
super();
this.subscription = subscription;
this.security = security;
+ this.inquiry = inquiry;
}
public void saveJoePublisherSubscription(String authInfoJoe, String subscriptionXML,String subscriptionKey) {
@@ -188,15 +197,27 @@ public class TckSubscription
public void getSamSyndicatorSubscriptionResultsWithChunkingOnFind(String authInfoSam) {
try {
+
GetSubscriptionResults getSubResultsIn = (GetSubscriptionResults)EntityCreator.buildFromDoc(SAM_SUBSCRIPTIONRESULTS2_XML, "org.uddi.sub_v3");
getSubResultsIn.setAuthInfo(authInfoSam);
+ FindTModel ftm = new FindTModel();
+ ftm.setAuthInfo(authInfoSam);
+ ftm.setCategoryBag(new CategoryBag());
+ ftm.getCategoryBag().getKeyedReference().add(new KeyedReference("uddi:uddi.org:categorization:types", "uddi-org:types:findQualifier", "findQualifier"));
+ TModelList findTModel = inquiry.findTModel(ftm);
+ FINDQUALIFIER_TMODEL_TOTAL = findTModel.getListDescription().getActualCount();
+
Subscription subIn = (Subscription)EntityCreator.buildFromDoc(SAM_SUBSCRIPTION2_XML, "org.uddi.sub_v3");
int expectedIterations = FINDQUALIFIER_TMODEL_TOTAL / subIn.getMaxEntities();
- if (FINDQUALIFIER_TMODEL_TOTAL % subIn.getMaxEntities() >0)
+ if (FINDQUALIFIER_TMODEL_TOTAL % subIn.getMaxEntities() >0)
expectedIterations++;
+
+ logger.info("getSamSyndicatorSubscriptionResultsWithChunkingOnFind loading from " + SAM_SUBSCRIPTION2_XML + " expecting " + FINDQUALIFIER_TMODEL_TOTAL + " find qualifier tmodels. Fetching "
+ + subIn.getMaxEntities() + " at a time, expected iterations " + expectedIterations);
+
String chunkToken = "";
int iterations = 0;
//JUDDI-655
@@ -209,7 +230,7 @@ public class TckSubscription
Assert.fail("Null result from getSubscriptionResults operation");
Assert.assertNotNull("Chunk token should either be not null or '0'",result.getChunkToken());
TModelList tmodelList = result.getTModelList();
- if (tmodelList == null)
+ if (tmodelList == null || tmodelList.getTModelInfos()==null)
Assert.fail("No result from getSubscriptionResults operation on chunk attempt " + iterations);
int resultSize = tmodelList.getTModelInfos().getTModelInfo().size();
@@ -243,6 +264,8 @@ public class TckSubscription
Subscription subIn = (Subscription)EntityCreator.buildFromDoc(SAM_SUBSCRIPTION3_XML, "org.uddi.sub_v3");
+ FINDQUALIFIER_TMODEL_TOTAL = 22;
+
int expectedIterations = FINDQUALIFIER_TMODEL_TOTAL / subIn.getMaxEntities();
if (FINDQUALIFIER_TMODEL_TOTAL % subIn.getMaxEntities() >0)
expectedIterations++;
Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java?rev=1555373&r1=1555372&r2=1555373&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java Sat Jan 4 17:21:15 2014
@@ -100,7 +100,7 @@ public class UDDI_080_SubscriptionIntegr
tckBusinessService = new TckBusinessService(publication, inquiry);
tckBindingTemplate = new TckBindingTemplate(publication, inquiry);
- tckSubscription = new TckSubscription(subscription, security);
+ tckSubscription = new TckSubscription(subscription, security,inquiry);
String authInfoUDDI = TckSecurity.getAuthToken(security, TckPublisher.getUDDIPublisherId(), TckPublisher.getUDDIPassword());
tckTModel.saveUDDIPublisherTmodel(authInfoUDDI);
tckTModel.saveTModels(authInfoUDDI, TckTModel.TMODELS_XML);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org