You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by ks...@apache.org on 2009/01/31 23:10:28 UTC

svn commit: r739639 [2/2] - in /webservices/juddi/branches/v3_trunk: ./ juddi-core/ juddi-core/src/main/java/org/apache/juddi/config/ juddi-core/src/main/java/org/apache/juddi/util/ juddi-core/src/main/resources/juddi_install_data/ juddi-core/src/test/...

Added: webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckFindEntity.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckFindEntity.java?rev=739639&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckFindEntity.java (added)
+++ webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckFindEntity.java Sat Jan 31 22:10:26 2009
@@ -0,0 +1,166 @@
+/*
+ * Copyright 2001-2009 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "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
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.uddi.api_v3.tck;
+
+import static junit.framework.Assert.assertEquals;
+
+import java.util.List;
+
+import org.apache.log4j.Logger;
+import org.junit.Assert;
+import org.uddi.api_v3.BindingDetail;
+import org.uddi.api_v3.BindingTemplate;
+import org.uddi.api_v3.BusinessEntity;
+import org.uddi.api_v3.BusinessInfo;
+import org.uddi.api_v3.BusinessInfos;
+import org.uddi.api_v3.BusinessList;
+import org.uddi.api_v3.BusinessService;
+import org.uddi.api_v3.FindBinding;
+import org.uddi.api_v3.FindBusiness;
+import org.uddi.api_v3.FindService;
+import org.uddi.api_v3.FindTModel;
+import org.uddi.api_v3.ServiceInfo;
+import org.uddi.api_v3.ServiceInfos;
+import org.uddi.api_v3.ServiceList;
+import org.uddi.api_v3.TModel;
+import org.uddi.api_v3.TModelInfo;
+import org.uddi.api_v3.TModelInfos;
+import org.uddi.api_v3.TModelList;
+import org.uddi.v3_service.UDDIInquiryPortType;
+/**
+ * @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
+ * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
+ */
+public class TckFindEntity 
+{
+	final static String FIND_BUSINESS_XML             = "uddi_data/find/findBusiness1.xml";
+	final static String FIND_SERVICE_XML              = "uddi_data/find/findService1.xml";
+	final static String FIND_BINDING_XML              = "uddi_data/find/findBinding1.xml";
+	final static String FIND_TMODEL_XML               = "uddi_data/find/findTModel1.xml";
+   
+	private Logger logger = Logger.getLogger(this.getClass());
+	UDDIInquiryPortType inquiry =null;
+	
+	public TckFindEntity(UDDIInquiryPortType inquiry) {
+		super();
+		this.inquiry = inquiry;
+	}
+
+	public void findBusiness() {
+		try {
+			FindBusiness body = (FindBusiness)EntityCreator.buildFromDoc(FIND_BUSINESS_XML, "org.uddi.api_v3");
+			BusinessList result = inquiry.findBusiness(body);
+			if (result == null)
+				Assert.fail("Null result from find business operation");
+			BusinessInfos bInfos = result.getBusinessInfos();
+			if (bInfos == null)
+				Assert.fail("No result from find business operation");
+			List<BusinessInfo> biList = bInfos.getBusinessInfo();
+			if (biList == null || biList.size() == 0)
+				Assert.fail("No result from find business operation");
+			BusinessInfo biOut = biList.get(0);
+			
+			BusinessEntity beIn = (BusinessEntity)EntityCreator.buildFromDoc(TckBusiness.JOE_BUSINESS_XML, "org.uddi.api_v3");
+			
+			assertEquals(beIn.getBusinessKey(), biOut.getBusinessKey());
+			
+			TckValidator.checkNames(beIn.getName(), biOut.getName());
+			TckValidator.checkDescriptions(beIn.getDescription(), biOut.getDescription());
+		}
+		catch(Exception e) {
+			logger.error(e.getMessage(), e);
+			Assert.fail("No exception should be thrown.");
+		}
+	}
+	
+	public void findService() {
+		try {
+			FindService body = (FindService)EntityCreator.buildFromDoc(FIND_SERVICE_XML, "org.uddi.api_v3");
+			ServiceList result = inquiry.findService(body);
+			if (result == null)
+				Assert.fail("Null result from find service operation");
+			ServiceInfos sInfos = result.getServiceInfos();
+			if (sInfos == null)
+				Assert.fail("No result from find service operation");
+			List<ServiceInfo> siList = sInfos.getServiceInfo();
+			if (siList == null || siList.size() == 0)
+				Assert.fail("No result from find service operation");
+			ServiceInfo siOut = siList.get(0);
+			
+			BusinessService bsIn = (BusinessService)EntityCreator.buildFromDoc(TckBusinessService.JOE_SERVICE_XML, "org.uddi.api_v3");
+			
+			assertEquals(bsIn.getServiceKey(), siOut.getServiceKey());
+			
+			TckValidator.checkNames(bsIn.getName(), siOut.getName());
+		}
+		catch(Exception e) {
+			logger.error(e.getMessage(), e);
+			Assert.fail("No exception should be thrown.");
+		}
+	}
+
+	public void findBinding() {
+		try {
+			FindBinding body = (FindBinding)EntityCreator.buildFromDoc(FIND_BINDING_XML, "org.uddi.api_v3");
+			BindingDetail result = inquiry.findBinding(body);
+			if (result == null)
+				Assert.fail("Null result from find binding operation");
+			List<BindingTemplate> btList = result.getBindingTemplate();
+			if (btList == null || btList.size() == 0)
+				Assert.fail("No result from find binding operation");
+			BindingTemplate btOut = btList.get(0);
+			
+			BindingTemplate btIn = (BindingTemplate)EntityCreator.buildFromDoc(TckBindingTemplate.JOE_BINDING_XML, "org.uddi.api_v3");
+			
+			assertEquals(btIn.getServiceKey(), btOut.getServiceKey());
+			assertEquals(btIn.getBindingKey(), btOut.getBindingKey());
+			
+			TckValidator.checkDescriptions(btIn.getDescription(), btOut.getDescription());
+			TckValidator.checkCategories(btIn.getCategoryBag(), btOut.getCategoryBag());
+		}
+		catch(Exception e) {
+			logger.error(e.getMessage(), e);
+			Assert.fail("No exception should be thrown:  " + e.getMessage());
+		}
+	}
+	
+	public void findTModel() {
+		try {
+			FindTModel body = (FindTModel)EntityCreator.buildFromDoc(FIND_TMODEL_XML, "org.uddi.api_v3");
+			TModelList result = inquiry.findTModel(body);
+			if (result == null)
+				Assert.fail("Null result from find tModel operation");
+			TModelInfos tInfos = result.getTModelInfos();
+			if (tInfos == null)
+				Assert.fail("No result from find tModel operation");
+			List<TModelInfo> tiList = tInfos.getTModelInfo();
+			if (tiList == null || tiList.size() == 0)
+				Assert.fail("No result from find tModel operation");
+			TModelInfo tiOut = tiList.get(0);
+			
+			TModel tmIn = (TModel)EntityCreator.buildFromDoc(TckTModel.JOE_PUBLISHER_TMODEL_XML, "org.uddi.api_v3");
+			
+			assertEquals(tmIn.getTModelKey(), tiOut.getTModelKey());
+			assertEquals(tmIn.getName().getLang(), tiOut.getName().getLang());
+			assertEquals(tmIn.getName().getValue(), tiOut.getName().getValue());
+
+			TckValidator.checkDescriptions(tmIn.getDescription(), tiOut.getDescription());
+		}
+		catch(Exception e) {
+			logger.error(e.getMessage(), e);
+			Assert.fail("No exception should be thrown.");
+		}
+	}
+}
\ No newline at end of file

Added: webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckPublisher.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckPublisher.java?rev=739639&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckPublisher.java (added)
+++ webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckPublisher.java Sat Jan 31 22:10:26 2009
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2001-2009 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "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
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.uddi.api_v3.tck;
+/**
+ * @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
+ * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
+ */
+public class TckPublisher 
+{	
+	public final static String JOE_PUBLISHER_XML  = "uddi_data/joepublisher/publisher.xml";
+    public final static String JOE_PUBLISHER_ID   = "joepublisher";
+    public final static String JOE_PUBLISHER_CRED = "";
+	public final static String SAM_SYNDICATOR_XML = "uddi_data/samsyndicator/publisher.xml";
+    public final static String SAM_SYNDICATOR_ID  = "ssyndicator";
+    public final static String SAM_SYNDICATOR_CRED= "";
+}
\ No newline at end of file

Added: webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckPublisherAssertion.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckPublisherAssertion.java?rev=739639&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckPublisherAssertion.java (added)
+++ webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckPublisherAssertion.java Sat Jan 31 22:10:26 2009
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2001-2009 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "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
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.uddi.api_v3.tck;
+
+import static junit.framework.Assert.assertEquals;
+
+import java.util.List;
+
+import org.apache.log4j.Logger;
+import org.junit.Assert;
+import org.uddi.api_v3.AddPublisherAssertions;
+import org.uddi.api_v3.DeletePublisherAssertions;
+import org.uddi.api_v3.KeyedReference;
+import org.uddi.api_v3.PublisherAssertion;
+import org.uddi.v3_service.UDDIPublicationPortType;
+/**
+ * @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
+ * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
+ */
+public class TckPublisherAssertion 
+{
+	final static String JOE_ASSERT_XML    = "uddi_data/joepublisher/publisherAssertion.xml";
+	
+	private Logger logger = Logger.getLogger(this.getClass());
+	private UDDIPublicationPortType publication = null;
+ 
+	public TckPublisherAssertion(UDDIPublicationPortType publication) {
+		super();
+		this.publication = publication;
+	}
+	
+	public void saveJoePublisherPublisherAssertion(String authInfoJoe) {
+		addPublisherAssertion(authInfoJoe, JOE_ASSERT_XML);
+	}
+	
+	public void deleteJoePublisherPublisherAssertion(String authInfoJoe) {
+		deletePublisherAssertion(authInfoJoe, JOE_ASSERT_XML);
+	}
+
+	
+	private void addPublisherAssertion(String authInfo, String pubassertXML) {
+		try {
+			AddPublisherAssertions ap = new AddPublisherAssertions();
+			ap.setAuthInfo(authInfo);
+
+			PublisherAssertion paIn = (PublisherAssertion)EntityCreator.buildFromDoc(pubassertXML, "org.uddi.api_v3");
+			ap.getPublisherAssertion().add(paIn);
+			publication.addPublisherAssertions(ap);
+	
+			// Now get the entity and check the values
+			List<PublisherAssertion> paOutList = publication.getPublisherAssertions(authInfo);
+			PublisherAssertion paOut = paOutList.get(0);
+
+			assertEquals(paIn.getFromKey(), paOut.getFromKey());
+			assertEquals(paIn.getToKey(), paOut.getToKey());
+			
+			KeyedReference keyRefIn = paIn.getKeyedReference();
+			KeyedReference keyRefOut = paOut.getKeyedReference();
+			
+			assertEquals(keyRefIn.getTModelKey(), keyRefOut.getTModelKey());
+			assertEquals(keyRefIn.getKeyName(), keyRefOut.getKeyName());
+			assertEquals(keyRefIn.getKeyValue(), keyRefOut.getKeyValue());
+			
+		}
+		catch(Exception e) {
+			logger.error(e.getMessage(), e);
+			Assert.fail("No exception should be thrown");
+		}
+
+	}
+
+	private void deletePublisherAssertion(String authInfo, String pubassertXML) {
+		try {
+			// Delete the entity and make sure it is removed
+			DeletePublisherAssertions dp = new DeletePublisherAssertions();
+			dp.setAuthInfo(authInfo);
+			
+			PublisherAssertion paIn = (PublisherAssertion)EntityCreator.buildFromDoc(pubassertXML, "org.uddi.api_v3");
+			dp.getPublisherAssertion().add(paIn);
+			
+			publication.deletePublisherAssertions(dp);
+		}
+		catch(Exception e) {
+			logger.error(e.getMessage(), e);
+			Assert.fail("No exception should be thrown");
+		}
+		
+	}
+}
\ No newline at end of file

Added: webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckSecurity.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckSecurity.java?rev=739639&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckSecurity.java (added)
+++ webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckSecurity.java Sat Jan 31 22:10:26 2009
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2001-2009 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "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
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.uddi.api_v3.tck;
+
+import org.uddi.v3_service.DispositionReportFaultMessage;
+import org.uddi.v3_service.UDDISecurityPortType;
+/**
+ * @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
+ * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
+ */
+public class TckSecurity {
+
+	public static String getAuthToken(UDDISecurityPortType securityService, String pubId, String cred) throws DispositionReportFaultMessage {
+	
+		org.uddi.api_v3.GetAuthToken ga = new org.uddi.api_v3.GetAuthToken();
+		ga.setUserID(pubId);
+		ga.setCred(cred);
+
+		org.uddi.api_v3.AuthToken token = securityService.getAuthToken(ga);
+		
+		return token.getAuthInfo();
+	}
+
+}

Added: webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckSubscriber.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckSubscriber.java?rev=739639&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckSubscriber.java (added)
+++ webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckSubscriber.java Sat Jan 31 22:10:26 2009
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2001-2009 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "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
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.uddi.api_v3.tck;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.uddi.sub_v3.SaveSubscription;
+import org.uddi.sub_v3.Subscription;
+import org.uddi.v3_service.UDDISecurityPortType;
+import org.uddi.v3_service.UDDISubscriptionPortType;
+
+/**
+ * @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
+ * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
+ */
+public class TckSubscriber 
+{	
+	final static String SUBSCRIPTION_XML    = "uddi_data/subscription/subscription1.xml";
+	UDDISubscriptionPortType subscription = null;
+	UDDISecurityPortType security = null;
+	
+	public TckSubscriber(UDDISubscriptionPortType subscription, UDDISecurityPortType security) {
+		super();
+		this.subscription = subscription;
+		this.security = security;
+	}
+
+	public void saveSubscriber() {
+		try {
+			String authInfo = TckSecurity.getAuthToken(security, "root", "");
+			
+			SaveSubscription ss = new SaveSubscription();
+			ss.setAuthInfo(authInfo);
+
+			Subscription subIn = (Subscription)EntityCreator.buildFromDoc(SUBSCRIPTION_XML, "org.uddi.sub_v3");
+			ss.getSubscription().add(subIn);
+			subscription.saveSubscription(authInfo, null);
+		} catch (Exception e) {
+			e.printStackTrace();
+			Assert.fail("No exception should be thrown");		
+		}
+	}
+
+	@Test
+	public void deleteSubscriber() {
+		try {
+			String authInfo = TckSecurity.getAuthToken(security, "root", "");
+			System.out.println("AUTHINFO=" + authInfo);
+			
+		}
+		catch(Exception e) {
+			e.printStackTrace();
+			Assert.fail("No exception should be thrown");
+		}
+	}
+}
\ No newline at end of file

Added: webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckTModel.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckTModel.java?rev=739639&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckTModel.java (added)
+++ webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckTModel.java Sat Jan 31 22:10:26 2009
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2001-2009 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "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
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.uddi.api_v3.tck;
+
+import static junit.framework.Assert.assertEquals;
+
+import java.util.List;
+
+import org.apache.log4j.Logger;
+import org.junit.Assert;
+import org.uddi.api_v3.DeleteTModel;
+import org.uddi.api_v3.GetTModelDetail;
+import org.uddi.api_v3.OverviewDoc;
+import org.uddi.api_v3.SaveTModel;
+import org.uddi.api_v3.TModelDetail;
+import org.uddi.v3_service.UDDIInquiryPortType;
+import org.uddi.v3_service.UDDIPublicationPortType;
+/**
+ * @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
+ * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
+ */
+public class TckTModel 
+{
+	final static String JOE_PUBLISHER_TMODEL_XML      = "uddi_data/joepublisher/tModelKeyGen.xml";
+    final static String JOE_PUBLISHER_TMODEL_KEY      = "uddi:juddi.apache.org:joepublisher:KEYGENERATOR";
+    final static String SAM_SYNDICATOR_TMODEL_XML     = "uddi_data/samsyndicator/tModelKeyGen.xml";
+    final static String SAM_SYNDICATOR_TMODEL_KEY     = "uddi:juddi.apache.org:samco:repository:keygenerator";
+ 
+    
+	private Logger logger = Logger.getLogger(this.getClass());
+	private UDDIPublicationPortType publication = null;
+    private UDDIInquiryPortType inquiry = null;
+	
+	public TckTModel(UDDIPublicationPortType publication, 
+				  UDDIInquiryPortType inquiry) {
+		super();
+		this.publication = publication;
+		this.inquiry = inquiry;
+	}
+
+	public void saveTModel(String authInfo, String tModelXml, String tModelKey) {
+		
+		// Add the tModel
+		try {
+			SaveTModel st = new SaveTModel();
+			st.setAuthInfo(authInfo);
+
+			org.uddi.api_v3.TModel tmIn = (org.uddi.api_v3.TModel)EntityCreator.buildFromDoc(tModelXml, "org.uddi.api_v3");
+			st.getTModel().add(tmIn);
+			publication.saveTModel(st);
+	
+			// Now get the entity and check the values
+			GetTModelDetail gt = new GetTModelDetail();
+			gt.getTModelKey().add(tModelKey);
+			TModelDetail td = inquiry.getTModelDetail(gt);
+			List<org.uddi.api_v3.TModel> tmOutList = td.getTModel();
+			org.uddi.api_v3.TModel tmOut = tmOutList.get(0);
+
+			assertEquals(tmIn.getTModelKey(), tmOut.getTModelKey());
+			assertEquals(tmIn.getName().getLang(), tmOut.getName().getLang());
+			assertEquals(tmIn.getName().getValue(), tmOut.getName().getValue());
+			TckValidator.checkDescriptions(tmIn.getDescription(), tmOut.getDescription());
+			TckValidator.checkCategories(tmIn.getCategoryBag(), tmOut.getCategoryBag());
+			for (OverviewDoc overviewDoc : tmIn.getOverviewDoc()) {
+				TckValidator.checkOverviewDocs(overviewDoc, tmOut.getOverviewDoc());
+			}
+			
+		} catch(Exception e) {
+			logger.error(e.getMessage(),e);
+			Assert.fail("No exception should be thrown");
+		}
+	}
+	
+	public void deleteTModel(String authInfo, String tModelXml, String tModelKey) {
+		
+		try {
+			//Now deleting the TModel
+			// Delete the entity and make sure it is removed
+			DeleteTModel dt = new DeleteTModel();
+			dt.setAuthInfo(authInfo);
+			
+			dt.getTModelKey().add(tModelKey);
+			publication.deleteTModel(dt);
+			
+		} catch(Exception e) {
+			logger.error(e.getMessage(),e);
+			Assert.fail("No exception should be thrown");
+		}
+	}
+	
+	public void saveJoePublisherTmodel(String authInfoJoe) {
+		saveTModel(authInfoJoe, JOE_PUBLISHER_TMODEL_XML, JOE_PUBLISHER_TMODEL_KEY);
+	}
+	
+	public void deleteJoePublisherTmodel(String authInfoJoe) {
+		deleteTModel(authInfoJoe, JOE_PUBLISHER_TMODEL_XML, JOE_PUBLISHER_TMODEL_KEY);
+	}
+	
+	public void saveSamSyndicatorTmodel(String authInfoSam) {
+		saveTModel(authInfoSam, SAM_SYNDICATOR_TMODEL_XML, SAM_SYNDICATOR_TMODEL_KEY);
+	}
+	
+	public void deleteSamSyndicatorTmodel(String authInfoSam) {
+		deleteTModel(authInfoSam, SAM_SYNDICATOR_TMODEL_XML, SAM_SYNDICATOR_TMODEL_KEY);
+	}
+}
\ No newline at end of file

Copied: webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckValidator.java (from r739384, webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/UDDIApiTestHelper.java)
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckValidator.java?p2=webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckValidator.java&p1=webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/UDDIApiTestHelper.java&r1=739384&r2=739639&rev=739639&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/test/java/org/apache/juddi/api/impl/UDDIApiTestHelper.java (original)
+++ webservices/juddi/branches/v3_trunk/uddi-tck/src/main/java/org/uddi/api_v3/tck/TckValidator.java Sat Jan 31 22:10:26 2009
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.juddi.api.impl;
+package org.uddi.api_v3.tck;
 
 /**
  * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
@@ -21,24 +21,12 @@
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertTrue;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityTransaction;
-import javax.persistence.Query;
-import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
 
-import org.apache.juddi.query.PersistenceManager;
-import org.apache.log4j.Logger;
 import org.uddi.api_v3.BindingTemplate;
 import org.uddi.api_v3.BindingTemplates;
 import org.uddi.api_v3.CategoryBag;
@@ -56,74 +44,11 @@
 import org.uddi.api_v3.PersonName;
 import org.uddi.api_v3.TModelInstanceDetails;
 import org.uddi.api_v3.TModelInstanceInfo;
-import org.uddi.v3_service.DispositionReportFaultMessage;
 
-public class UDDIApiTestHelper {
+public class TckValidator {
 
-	private static Logger logger = Logger.getLogger(UDDIApiTestHelper.class);
 	
-	@SuppressWarnings("unchecked")
-	public static Object buildEntityFromDoc(String fileName, String thePackage) throws JAXBException, IOException {
-		Object obj = null;
-		URL url = Thread.currentThread().getContextClassLoader().getResource(fileName);
-		if (url==null) {
-			logger.error("Could not find resource: " + fileName);
-		} else {
-			InputStream resourceStream =url.openStream();
-	
-			JAXBContext jc = JAXBContext.newInstance(thePackage);
-			Unmarshaller unmarshaller = jc.createUnmarshaller();
-			obj = ((JAXBElement)unmarshaller.unmarshal(resourceStream)).getValue();
-		}
-		return obj;
-	}
-
-	public static void outputEntity(Object obj, String thePackage) throws JAXBException {
-		JAXBContext jc = JAXBContext.newInstance(thePackage);
-		Marshaller marshaller = jc.createMarshaller();
-		marshaller.marshal( new JAXBElement<Object>(new javax.xml.namespace.QName("uri","local"), Object.class, obj), System.out);
-		
-	}
-
-	public static void deleteEntity(Class<?> entityClass, Object entityKey) {
-		EntityManager em = PersistenceManager.getEntityManager();
-		EntityTransaction tx = em.getTransaction();
-		tx.begin();
-
-		Object obj = em.find(entityClass, entityKey);
-		em.remove(obj);
-		
-		tx.commit();
-		em.close();
-	}
-
-	public static void removeAuthTokens() {
-		
-		EntityManager em = PersistenceManager.getEntityManager();
-		EntityTransaction tx = em.getTransaction();
-		tx.begin();
-
-		Query qry = em.createQuery("delete from AuthToken");
-		qry.executeUpdate();
-		
-		tx.commit();
-		em.close();
-
-	}
-
 	
-	public static String getAuthToken(String pubId) throws DispositionReportFaultMessage {
-		UDDISecurityImpl securityService = new UDDISecurityImpl();
-
-		org.uddi.api_v3.GetAuthToken ga = new org.uddi.api_v3.GetAuthToken();
-		ga.setUserID(pubId);
-		ga.setCred("");
-
-		org.uddi.api_v3.AuthToken token = securityService.getAuthToken(ga);
-		
-		return token.getAuthInfo();
-	}
-
 
 	public static void checkNames(List<Name> names1, List<Name> names2) {
 		if (names1 == null || names2 == null) {

Added: webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/find/findBinding1.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/find/findBinding1.xml?rev=739639&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/find/findBinding1.xml (added)
+++ webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/find/findBinding1.xml Sat Jan 31 22:10:26 2009
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<find_binding xmlns="urn:uddi-org:api_v3" xmlns:xml="http://www.w3.org/XML/1998/namespace">
+  <findQualifiers>
+    <findQualifier>orAllKeys</findQualifier>
+  </findQualifiers>
+  <tModelBag>
+    <tModelKey>uddi:uddi.org:protocol:serverauthenticatedssl3</tModelKey>
+  </tModelBag>
+  <categoryBag>
+    <keyedReference tModelKey="uddi:tmodelkey:categories:bindings" keyName="category" keyValue="secure" />
+  </categoryBag>
+</find_binding>

Added: webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/find/findBusiness1.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/find/findBusiness1.xml?rev=739639&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/find/findBusiness1.xml (added)
+++ webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/find/findBusiness1.xml Sat Jan 31 22:10:26 2009
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<find_business xmlns="urn:uddi-org:api_v3" xmlns:xml="http://www.w3.org/XML/1998/namespace" maxRows="1" listHead="0">
+  <findQualifiers>
+    <findQualifier>orLikeKeys</findQualifier>
+    <findQualifier>caseInsensitiveMatch</findQualifier>
+    <findQualifier>approximateMatch</findQualifier>
+  </findQualifiers>
+  <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" />
+  </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" />
+    </keyedReferenceGroup>
+  </categoryBag>
+  <discoveryURLs>
+    <discoveryURL useType="home">http://www.businessone.com</discoveryURL>
+    <discoveryURL useType="serviceList">http://www.businessone.com/services</discoveryURL>
+  </discoveryURLs>
+  <find_tModel xmlns="urn:uddi-org:api_v3" xmlns:xml="http://www.w3.org/XML/1998/namespace">
+    <findQualifiers>
+      <findQualifier>caseInsensitiveMatch</findQualifier>
+      <findQualifier>approximateMatch</findQualifier>
+      <findQualifier>andAllKeys</findQualifier>
+    </findQualifiers>
+    <name>uddi-org:serverAuthenticatedSSL3</name>
+  </find_tModel>
+</find_business>

Added: webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/find/findService1.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/find/findService1.xml?rev=739639&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/find/findService1.xml (added)
+++ webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/find/findService1.xml Sat Jan 31 22:10:26 2009
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<find_service xmlns="urn:uddi-org:api_v3" xmlns:xml="http://www.w3.org/XML/1998/namespace">
+  <findQualifiers>
+    <findQualifier>exactMatch</findQualifier>
+  </findQualifiers>
+  <name xml:lang="en">Service One</name>
+  <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>
+</find_service>

Added: webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/find/findTModel1.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/find/findTModel1.xml?rev=739639&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/find/findTModel1.xml (added)
+++ webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/find/findTModel1.xml Sat Jan 31 22:10:26 2009
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<find_tModel xmlns="urn:uddi-org:api_v3" xmlns:xml="http://www.w3.org/XML/1998/namespace">
+  <findQualifiers>
+    <findQualifier>caseInsensitiveMatch</findQualifier>
+    <findQualifier>approximateMatch</findQualifier>
+    <findQualifier>andAllKeys</findQualifier>
+  </findQualifiers>
+  <name>Joe Publisher</name>
+  <categoryBag>
+    <keyedReference tModelKey="uddi:uddi.org:categorization:types" keyName="uddi-org:types:keyGenerator"
+      keyValue="keyGenerator" />
+  </categoryBag>
+</find_tModel>

Added: webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/joepublisher/bindingTemplate.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/joepublisher/bindingTemplate.xml?rev=739639&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/joepublisher/bindingTemplate.xml (added)
+++ webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/joepublisher/bindingTemplate.xml Sat Jan 31 22:10:26 2009
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<bindingTemplate xmlns="urn:uddi-org:api_v3" serviceKey="uddi:juddi.apache.org:joepublisher:serviceone" bindingKey="uddi:juddi.apache.org:joepublisher:bindingtwo">
+  <description xml:lang="en">This is the secure access point for service one</description>
+  <accessPoint useType="endPoint">https://businessone.com/services/serviceone</accessPoint>
+  <tModelInstanceDetails>
+    <tModelInstanceInfo tModelKey="uddi:uddi.org:protocol:serverauthenticatedssl3"/>
+  </tModelInstanceDetails>
+  <categoryBag>
+    <keyedReference tModelKey="uddi:tmodelkey:categories:bindings" keyName="category" keyValue="secure" />
+  </categoryBag>
+</bindingTemplate>

Added: webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/joepublisher/businessEntity.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/joepublisher/businessEntity.xml?rev=739639&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/joepublisher/businessEntity.xml (added)
+++ webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/joepublisher/businessEntity.xml Sat Jan 31 22:10:26 2009
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<businessEntity xmlns="urn:uddi-org:api_v3" xmlns:xml="http://www.w3.org/XML/1998/namespace" businessKey="uddi:juddi.apache.org:joepublisher:businessone">
+  <discoveryURLs>
+    <discoveryURL useType="home">http://www.businessone.com</discoveryURL>
+    <discoveryURL useType="serviceList">http://www.businessone.com/services</discoveryURL>
+  </discoveryURLs>
+  <name xml:lang="en">John Doe Enterprises</name>
+  <name xml:lang="es">Negocio Uno</name>
+  <description xml:lang="en">This is the description for Business One.</description>
+  <contacts>
+    <contact useType="administrator">
+      <personName xml:lang="en">John Doe</personName>
+      <personName xml:lang="es">Juan Doe</personName>
+      <description xml:lang="en">This is the administrator of the service offerings.</description>
+      <description xml:lang="es">Éste es el administrador de las ofrendas del servicio.</description>
+      <phone useType="office">123-456-7890</phone>
+      <phone useType="mobile">987-654-3210</phone>
+      <email useType="work">jdoe@businessone.com</email>
+      <address xml:lang="en" useType="headquarters" sortCode="1" tModelKey="uddi:tmodelKey:address">
+        <addressLine keyName="suite" keyValue="suite">Suite 1500</addressLine>
+        <addressLine keyName="street" keyValue="street">1515 Main St.</addressLine>
+        <addressLine keyName="citystatezip" keyValue="citystatezip">Chicago, IL 60614</addressLine>
+        <addressLine keyName="country" keyValue="country">USA</addressLine>
+      </address>
+    </contact>
+    <contact useType="engineer">
+      <personName xml:lang="en">Steve Smith</personName>
+      <phone useType="office">555-111-2222</phone>
+      <email useType="work">ssmith@businessone.com</email>
+    </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" />
+    </keyedReferenceGroup>
+  </categoryBag>
+  <identifierBag>
+    <keyedReference tModelKey="uddi:tmodelkey:identifier" keyName="identify" keyValue="identity" />
+  </identifierBag>
+</businessEntity>
\ No newline at end of file

Added: webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/joepublisher/businessEntity3.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/joepublisher/businessEntity3.xml?rev=739639&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/joepublisher/businessEntity3.xml (added)
+++ webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/joepublisher/businessEntity3.xml Sat Jan 31 22:10:26 2009
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<businessEntity xmlns="urn:uddi-org:api_v3" xmlns:xml="http://www.w3.org/XML/1998/namespace" businessKey="uddi:businessthree.com">
+  <discoveryURLs>
+    <discoveryURL useType="home">http://www.businessthree.com</discoveryURL>
+    <discoveryURL useType="serviceList">http://www.businessthree.com/services</discoveryURL>
+  </discoveryURLs>
+  <name xml:lang="en">A-1 Solutions</name>
+  <name xml:lang="es">Negocio Tres</name>
+  <description xml:lang="en">This is the description for Business Three.</description>
+  <contacts>
+    <contact useType="administrator">
+      <personName xml:lang="en">Luke Skywalker</personName>
+      <description xml:lang="en">This is the administrator of the service offerings.</description>
+      <phtwo useType="office">123-456-7890</phtwo>
+      <phtwo useType="mobile">987-654-3210</phtwo>
+      <email useType="work">lskywalker@businessthree.com</email>
+      <address xml:lang="en" useType="headquarters" sortCode="1" tModelKey="uddi:tmodelKey:address">
+        <addressLine keyName="street" keyValue="street">2 Briar</addressLine>
+        <addressLine keyName="citystatezip" keyValue="citystatezip">Chicago, IL 60657</addressLine>
+        <addressLine keyName="country" keyValue="country">USA</addressLine>
+      </address>
+    </contact>
+  </contacts>
+  <businessServices>
+  </businessServices>
+  <categoryBag>
+    <keyedReference tModelKey="uddi:tmodelkey:categories:fruit" keyName="category" keyValue="apples" />
+    <keyedReference tModelKey="uddi:tmodelkey:categories:music" keyName="category" keyValue="jazz" />
+    <keyedReference tModelKey="uddi:tmodelkey:categories:music" keyName="category" keyValue="blues" />
+    <keyedReference tModelKey="uddi:tmodelkey:categories:music" keyName="category" keyValue="blues-rock" />
+    <keyedReferenceGroup tModelKey="uddi:tmodelKey:group">
+      <keyedReference tModelKey="uddi:tmodelKey:blank" keyName="blank" keyValue="blank" />
+    </keyedReferenceGroup>
+  </categoryBag>
+  <identifierBag>
+    <keyedReference tModelKey="uddi:tmodelkey:identifier" keyName="identify" keyValue="identity" />
+  </identifierBag>
+</businessEntity>
\ No newline at end of file

Added: webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/joepublisher/businessService.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/joepublisher/businessService.xml?rev=739639&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/joepublisher/businessService.xml (added)
+++ webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/joepublisher/businessService.xml Sat Jan 31 22:10:26 2009
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<businessService xmlns="urn:uddi-org:api_v3" xmlns:xml="http://www.w3.org/XML/1998/namespace" 
+     businessKey="uddi:juddi.apache.org:joepublisher:businessone" serviceKey="uddi:juddi.apache.org:joepublisher:serviceone">
+  <name xml:lang="en">Service One</name>
+  <name xml:lang="es">Servicio Uno</name>
+  <description xml:lang="en">This is the description of service one.</description>
+  <description xml:lang="es">Ésta es la descripción del servicio uno.</description>
+  <bindingTemplates>
+    <bindingTemplate bindingKey="uddi:juddi.apache.org:joepublisher: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:businessone.com:services:serviceone:wsdlSpec">
+          <description xml:lang="en">The wsdl for this service: service one</description>
+          <instanceDetails>
+            <overviewDoc>
+              <description xml:lang="en">Help document to describe the WSDL</description>
+              <overviewURL useType="text">http://www.w3.org/TR/wsdl</overviewURL>
+            </overviewDoc>
+            <instanceParms>instanceParms</instanceParms>
+          </instanceDetails>
+        </tModelInstanceInfo>
+      </tModelInstanceDetails>
+	  <categoryBag>
+	    <keyedReference tModelKey="uddi:tmodelkey:categories:bindings" 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" />
+    </keyedReferenceGroup>
+  </categoryBag>
+</businessService>

Added: webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/joepublisher/publisher.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/joepublisher/publisher.xml?rev=739639&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/joepublisher/publisher.xml (added)
+++ webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/joepublisher/publisher.xml Sat Jan 31 22:10:26 2009
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<publisher xmlns="urn:apache-org:juddi_v3" authorizedName="joepublisher">
+  <publisherName>Joe Publisher</publisherName>
+  <emailAddress>jpublisher@business.com</emailAddress>
+  <isAdmin>true</isAdmin>
+  <isEnabled>True</isEnabled>
+  <maxBindingsPerService>199</maxBindingsPerService>
+  <maxBusinesses>100</maxBusinesses>
+  <maxServicePerBusiness>100</maxServicePerBusiness>
+  <maxTModels>100</maxTModels>
+</publisher>

Added: webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/joepublisher/publisherAssertion.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/joepublisher/publisherAssertion.xml?rev=739639&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/joepublisher/publisherAssertion.xml (added)
+++ webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/joepublisher/publisherAssertion.xml Sat Jan 31 22:10:26 2009
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<publisherAssertion xmlns="urn:uddi-org:api_v3">
+  <fromKey>uddi:juddi.apache.org:joepublisher:businessone</fromKey>
+  <toKey>uddi:juddi.apache.org:samco:repository:samco</toKey>
+  <keyedReference tModelKey="uddi:uddi.org:relationships" keyName="Holding Company" keyValue="parent-child" />
+</publisherAssertion>

Added: webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/joepublisher/tModelKeyGen.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/joepublisher/tModelKeyGen.xml?rev=739639&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/joepublisher/tModelKeyGen.xml (added)
+++ webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/joepublisher/tModelKeyGen.xml Sat Jan 31 22:10:26 2009
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tModel tModelKey="uddi:juddi.apache.org:joepublisher:KEYGENERATOR" xmlns="urn:uddi-org:api_v3">
+  <name>Joe Publisher's Key Generator</name>
+  <description>This is the key generator for Joe Publisher's UDDI entities!</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>

Added: webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/samsyndicator/businessEntity.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/samsyndicator/businessEntity.xml?rev=739639&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/samsyndicator/businessEntity.xml (added)
+++ webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/samsyndicator/businessEntity.xml Sat Jan 31 22:10:26 2009
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<businessEntity xmlns="urn:uddi-org:api_v3" xmlns:xml="http://www.w3.org/XML/1998/namespace" businessKey="uddi:juddi.apache.org:samco:repository:samco">
+  <discoveryURLs>
+    <discoveryURL useType="home">http://www.samco.com</discoveryURL>
+    <discoveryURL useType="serviceList">http://www.samco.com/services</discoveryURL>
+  </discoveryURLs>
+  <name xml:lang="en">SamCo, Inc.</name>
+  <description xml:lang="en">SamCo provides a suite of digital assets.</description>
+  <contacts>
+    <contact useType="administrator">
+      <personName xml:lang="en">Sam Syndicator</personName>
+      <description xml:lang="en">This is the administrator of the service offerings.</description>
+      <phtwo useType="office">123-456-7890</phtwo>
+      <phtwo useType="mobile">987-654-3210</phtwo>
+      <email useType="work">ssyndicator@samco.com</email>
+      <address xml:lang="en" useType="headquarters" sortCode="1" tModelKey="uddi:tmodelKey:address">
+        <addressLine keyName="street" keyValue="street">1515 Main St</addressLine>
+        <addressLine keyName="citystatezip" keyValue="citystatezip">Ann Arbor, MI 41804</addressLine>
+        <addressLine keyName="country" keyValue="country">USA</addressLine>
+      </address>
+    </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" />
+    </keyedReferenceGroup>
+  </categoryBag>
+  <identifierBag>
+    <keyedReference tModelKey="uddi:tmodelkey:identifier" keyName="identify" keyValue="identity" />
+  </identifierBag>
+</businessEntity>
\ No newline at end of file

Added: webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/samsyndicator/businessService.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/samsyndicator/businessService.xml?rev=739639&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/samsyndicator/businessService.xml (added)
+++ webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/samsyndicator/businessService.xml Sat Jan 31 22:10:26 2009
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<businessService xmlns="urn:uddi-org:api_v3" xmlns:xml="http://www.w3.org/XML/1998/namespace" businessKey="uddi:juddi.apache.org:samco:repository:samco" serviceKey="uddi:juddi.apache.org:samco:repository:listingservice">
+  <name xml:lang="en">Listing Service</name>
+  <name xml:lang="es">Servicio del listado</name>
+  <description xml:lang="en">This is the description of the listing service.</description>
+  <description xml:lang="es">Ésta es la descripción del servicio del listado.</description>
+  <bindingTemplates>
+    <bindingTemplate bindingKey="uddi:juddi.apache.org:samco:repository:listservice-accesspoint">
+      <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:juddi.apache.org:samco:repository:listservice-wsdlSpec">
+          <description xml:lang="en">The wsdl for this service: Listing Service</description>
+          <instanceDetails>
+            <overviewDoc>
+              <description xml:lang="en">Help document to describe the WSDL</description>
+              <overviewURL useType="text">http://www.w3.org/TR/wsdl</overviewURL>
+            </overviewDoc>
+            <instanceParms>instanceParms</instanceParms>
+          </instanceDetails>
+        </tModelInstanceInfo>
+      </tModelInstanceDetails>
+	  <categoryBag>
+	    <keyedReference tModelKey="uddi:tmodelkey:categories:bindings" 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" />
+    </keyedReferenceGroup>
+  </categoryBag>
+</businessService>

Added: webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/samsyndicator/publisher.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/samsyndicator/publisher.xml?rev=739639&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/samsyndicator/publisher.xml (added)
+++ webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/samsyndicator/publisher.xml Sat Jan 31 22:10:26 2009
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<publisher xmlns="urn:apache-org:juddi_v3" authorizedName="ssyndicator">
+  <publisherName>Sam Syndicator</publisherName>
+  <emailAddress>ssyndicator@samco.com</emailAddress>
+  <isAdmin>false</isAdmin>
+  <isEnabled>True</isEnabled>
+  <maxBindingsPerService>199</maxBindingsPerService>
+  <maxBusinesses>100</maxBusinesses>
+  <maxServicePerBusiness>100</maxServicePerBusiness>
+  <maxTModels>100</maxTModels>
+</publisher>

Added: webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/samsyndicator/tModelKeyGen.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/samsyndicator/tModelKeyGen.xml?rev=739639&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/samsyndicator/tModelKeyGen.xml (added)
+++ webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/samsyndicator/tModelKeyGen.xml Sat Jan 31 22:10:26 2009
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tModel tModelKey="uddi:juddi.apache.org:samco:repository:keygenerator" xmlns="urn:uddi-org:api_v3">
+  <name>Sam Syndicator's Key Generator</name>
+  <description>This is the key generator for Sam Syndicator's UDDI entities!</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>

Added: webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/subscription/subscription1.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/subscription/subscription1.xml?rev=739639&view=auto
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/subscription/subscription1.xml (added)
+++ webservices/juddi/branches/v3_trunk/uddi-tck/src/main/resources/uddi_data/subscription/subscription1.xml Sat Jan 31 22:10:26 2009
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+       <subscription xmlns="urn:uddi-org:sub_v3" xmlns:xml="http://www.w3.org/XML/1998/namespace" subscriptionKey="uddi:juddi.apache.org:joepublisher:subscription">
+           <subscriptionFilter>
+               <find_service xmlns="urn:uddi-org:api_v3" >
+                   <findQualifiers>
+                      <findQualifier>
+                          uddi:uddi.org:findqualifier:sql99:like
+                      </findQualifier>
+                   </findQualifiers>
+                   <categoryBag>
+                      <keyedReference
+                          tModeKey="uddi:uddi.org:ubr:taxonomy:naics"
+                          keyName="Motor Vehicle Parts"
+                          keyValue="42112_"/>
+                   </categoryBag>
+               </find_service>
+           </subscriptionFilter>
+               <bindingKey>
+                   bindingKeyOfTheClientsNotifySubscriptionListenerService
+               </bindingKey>
+               <notificationInterval>P5D</notificationInterval>
+               <maxEntities>1000</maxEntities>
+       </subscription>

Modified: webservices/juddi/branches/v3_trunk/uddi-ws/pom.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/uddi-ws/pom.xml?rev=739639&r1=739638&r2=739639&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/uddi-ws/pom.xml (original)
+++ webservices/juddi/branches/v3_trunk/uddi-ws/pom.xml Sat Jan 31 22:10:26 2009
@@ -11,7 +11,7 @@
   <artifactId>uddi-ws</artifactId>
   <version>3.0.0.SNAPSHOT</version>
   <packaging>jar</packaging>
-  <name>UDDI v3 Web Service Stubs and Schema bindings generated from WSDL</name>
+  <name>UDDI_v3 WS Stubs & Schema Bindings Generated from WSDL</name>
   
   <repositories>
     <repository>



---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org