juddi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexo...@apache.org
Subject svn commit: r1550327 [2/8] - in /juddi/branches/juddi-3.3.x: ./ juddi-client/src/main/java/org/apache/juddi/v3/client/config/ juddi-client/src/test/java/org/apache/juddi/v3/client/mapping/ juddi-core/src/main/java/org/apache/juddi/validation/ juddi-cor...
Date Thu, 12 Dec 2013 00:27:32 GMT
Modified: juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscriptionListener.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscriptionListener.java?rev=1550327&r1=1550326&r2=1550327&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscriptionListener.java (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscriptionListener.java Thu Dec 12 00:27:31 2013
@@ -125,7 +125,7 @@ public class TckSubscriptionListener
 		
 	}
 	
-	public void saveService(String authInfo, String listenerService, Integer port) {
+	public void saveService(String authInfo, String listenerService, Integer port, String hostname) {
 		try {
 			// First save the entity
 			ss = new SaveService();
@@ -136,6 +136,7 @@ public class TckSubscriptionListener
 				for (BindingTemplate btIn: bsIn.getBindingTemplates().getBindingTemplate()) {
 					String value = btIn.getAccessPoint().getValue();
 					value = value.replace("{randomPort}", port.toString());
+                                        value = value.replace("{hostname}", hostname);
 					btIn.getAccessPoint().setValue(value);
 				}
 			}

Modified: juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckTModel.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckTModel.java?rev=1550327&r1=1550326&r2=1550327&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckTModel.java (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckTModel.java Thu Dec 12 00:27:31 2013
@@ -14,9 +14,11 @@
  */
 package org.apache.juddi.v3.tck;
 
+import java.util.HashSet;
 import static junit.framework.Assert.assertEquals;
 
 import java.util.List;
+import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -27,211 +29,251 @@ import org.uddi.api_v3.FindTModel;
 import org.uddi.api_v3.GetTModelDetail;
 import org.uddi.api_v3.OverviewDoc;
 import org.uddi.api_v3.SaveTModel;
+import org.uddi.api_v3.TModel;
 import org.uddi.api_v3.TModelDetail;
 import org.uddi.api_v3.TModelList;
 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";
-    public static String JOE_PUBLISHER_TMODEL_XML_SUBSCRIPTION3      = "uddi_data/joepublisher/FindTmodelTest.xml";
-    public static String JOE_PUBLISHER_TMODEL_SUBSCRIPTION3_TMODEL_KEY="uddi:uddi.joepublisher.com:tmodelone";
-    /**"uddi:uddi.joepublisher.com:"*/
-    public final static String JOE_PUBLISHER_KEY_PREFIX= "uddi:uddi.joepublisher.com:";
-    final static String JOE_PUBLISHER_TMODEL_KEY      = "uddi:uddi.joepublisher.com:keygenerator";
-    final static String MARY_PUBLISHER_TMODEL_XML     = "uddi_data/marypublisher/tModelKeyGen.xml";
-    final static String MARY_PUBLISHER_TMODEL_KEY     = "uddi:uddi.marypublisher.com:keygenerator";
-    final static String SAM_SYNDICATOR_TMODEL_XML     = "uddi_data/samsyndicator/tModelKeyGen.xml";
-    final static String SAM_SYNDICATOR_TMODEL_KEY     = "uddi:www.samco.com:keygenerator";
-    final static String TMODEL_PUBLISHER_TMODEL_XML   = "uddi_data/tmodels/tModelKeyGen.xml";
-    final static String TMODEL_PUBLISHER_TMODEL_KEY   = "uddi:tmodelkey:categories:keygenerator";
-    final static String FIND_TMODEL_XML               = "uddi_data/find/findTModel1.xml";
-    final static String FIND_TMODEL_XML_BY_CAT        = "uddi_data/find/findTModelByCategoryBag.xml";
-    public final static String TMODELS_XML            = "uddi_data/tmodels/tmodels.xml";
-    
-    public final static String RIFTSAW_PUBLISHER_TMODEL_XML  = "uddi_data/bpel/riftsaw/tModelKeyGen.xml";
-    public final static String RIFTSAW_PUBLISHER_TMODEL_KEY  = "uddi:riftsaw.jboss.org:keygenerator";
-    public final static String RIFTSAW_CUST_PORTTYPE_TMODEL_XML  = "uddi_data/bpel/riftsaw/tModelCustomerPortType.xml";
-    public final static String RIFTSAW_CUST_PORTTYPE_TMODEL_KEY  = "uddi:riftsaw.jboss.org:CustomerInterface_portType";
-    public final static String RIFTSAW_AGENT_PORTTYPE_TMODEL_XML  = "uddi_data/bpel/riftsaw/tModelAgentPortType.xml";
-    public final static String RIFTSAW_AGENT_PORTTYPE_TMODEL_KEY  = "uddi:riftsaw.jboss.org:TravelAgentInterface_portType";
-    public final static String RIFTSAW_PROCESS_TMODEL_XML  = "uddi_data/bpel/riftsaw/tModelProcess.xml";
-    public final static String RIFTSAW_PROCESS_TMODEL_KEY  = "uddi:riftsaw.jboss.org:ReservationAndBookingTicketsProcess";
-  
-   
- 
-    private Log logger = LogFactory.getLog(this.getClass());
-	private UDDIPublicationPortType publication = null;
-    private UDDIInquiryPortType inquiry = null;
-	
-	public TckTModel(UDDIPublicationPortType publication, 
-				  UDDIInquiryPortType inquiry) {
-		super();
-		this.publication = publication;
-		this.inquiry = inquiry;
-	}
-	
+public class TckTModel {
+        
+        final static String JOE_PUBLISHER_TMODEL_XML = "uddi_data/joepublisher/tModelKeyGen.xml";
+        public static String JOE_PUBLISHER_TMODEL_XML_SUBSCRIPTION3 = "uddi_data/joepublisher/FindTmodelTest.xml";
+        public static String JOE_PUBLISHER_TMODEL_SUBSCRIPTION3_TMODEL_KEY = "uddi:uddi.joepublisher.com:tmodelone";
+        /**
+         * "uddi:uddi.joepublisher.com:"
+         */
+        public final static String JOE_PUBLISHER_KEY_PREFIX = "uddi:uddi.joepublisher.com:";
+        final static String JOE_PUBLISHER_TMODEL_KEY = "uddi:uddi.joepublisher.com:keygenerator";
+        final static String MARY_PUBLISHER_TMODEL_XML = "uddi_data/marypublisher/tModelKeyGen.xml";
+        final static String MARY_PUBLISHER_TMODEL_KEY = "uddi:uddi.marypublisher.com:keygenerator";
+        final static String SAM_SYNDICATOR_TMODEL_XML = "uddi_data/samsyndicator/tModelKeyGen.xml";
+        final static String SAM_SYNDICATOR_TMODEL_KEY = "uddi:www.samco.com:keygenerator";
+        final static String TMODEL_PUBLISHER_TMODEL_XML = "uddi_data/tmodels/tModelKeyGen.xml";
+        final static String TMODEL_PUBLISHER_TMODEL_KEY = "uddi:tmodelkey:categories:keygenerator";
+        final static String FIND_TMODEL_XML = "uddi_data/find/findTModel1.xml";
+        final static String FIND_TMODEL_XML_BY_CAT = "uddi_data/find/findTModelByCategoryBag.xml";
+        public final static String TMODELS_XML = "uddi_data/tmodels/tmodels.xml";
+        public final static String RIFTSAW_PUBLISHER_TMODEL_XML = "uddi_data/bpel/riftsaw/tModelKeyGen.xml";
+        public final static String RIFTSAW_PUBLISHER_TMODEL_KEY = "uddi:riftsaw.jboss.org:keygenerator";
+        public final static String RIFTSAW_CUST_PORTTYPE_TMODEL_XML = "uddi_data/bpel/riftsaw/tModelCustomerPortType.xml";
+        public final static String RIFTSAW_CUST_PORTTYPE_TMODEL_KEY = "uddi:riftsaw.jboss.org:CustomerInterface_portType";
+        public final static String RIFTSAW_AGENT_PORTTYPE_TMODEL_XML = "uddi_data/bpel/riftsaw/tModelAgentPortType.xml";
+        public final static String RIFTSAW_AGENT_PORTTYPE_TMODEL_KEY = "uddi:riftsaw.jboss.org:TravelAgentInterface_portType";
+        public final static String RIFTSAW_PROCESS_TMODEL_XML = "uddi_data/bpel/riftsaw/tModelProcess.xml";
+        public final static String RIFTSAW_PROCESS_TMODEL_KEY = "uddi:riftsaw.jboss.org:ReservationAndBookingTicketsProcess";
+        private Log logger = LogFactory.getLog(this.getClass());
+        private UDDIPublicationPortType publication = null;
+        private UDDIInquiryPortType inquiry = null;
+        private Set<String> keyscreated = new HashSet<String>();
+
+        public TckTModel(UDDIPublicationPortType publication,
+                UDDIInquiryPortType inquiry) {
+                super();
+                this.publication = publication;
+                this.inquiry = inquiry;
+        }
+
         /**
          * saves a tmodel using the tModelXml parameter as a file path
+         *
          * @param authInfo
          * @param tModelXml this is a relative file path
          */
-	public void saveTModels(String authInfo, String tModelXml) {
-		
-		// Add tModels
-		try {
-			SaveTModel st = (org.uddi.api_v3.SaveTModel)EntityCreator.buildFromDoc(tModelXml, "org.uddi.api_v3");
-			st.setAuthInfo(authInfo);
-			publication.saveTModel(st);
-			
-		} catch(Exception e) {
-			logger.error(e.getMessage(),e);
-			Assert.fail("No exception should be thrown");
-		}
-	}
-
-	public void saveTModel(String authInfo, String tModelXml, String tModelKey) {
-		
-		// Add the tModel
-		try {
-			SaveTModel st = new SaveTModel();
-			st.setAuthInfo(authInfo);
-                        logger.info("Loading tModel from " + tModelXml);
-			org.uddi.api_v3.TModel tmIn = (org.uddi.api_v3.TModel)EntityCreator.buildFromDoc(tModelXml, "org.uddi.api_v3");
-                        if (tmIn==null)
-                                Assert.fail("unable to load tmodel from file!");
-			st.getTModel().add(tmIn);
-			publication.saveTModel(st);
-	
-			// 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().toLowerCase(), 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 TModelDetail getTModelDetail(String authInfo, String tModelXml, String tModelKey) {
-		try {
-			//Try to get the TModel
-			GetTModelDetail tmodelDetail = new GetTModelDetail();
-			tmodelDetail.setAuthInfo(authInfo);
-			tmodelDetail.getTModelKey().add(tModelKey);
-			
-			return inquiry.getTModelDetail(tmodelDetail);
-			
-		} catch(Exception e) {
-			logger.error(e.getMessage(),e);
-			Assert.fail("No exception should be thrown");
-		}
-		Assert.fail("We should already have returned");
-		return null;
-	}
-	
-	public TModelList findJoeTModelDetail() {
-		try {
-			
-			FindTModel body = (FindTModel)EntityCreator.buildFromDoc(FIND_TMODEL_XML, "org.uddi.api_v3");
-			TModelList result = inquiry.findTModel(body);
-			
-			return result;
-			
-		} catch(Exception e) {
-			logger.error(e.getMessage(),e);
-			Assert.fail("No exception should be thrown");
-		}
-		Assert.fail("We should already have returned");
-		return null;
-	}
-	
-	public TModelList findJoeTModelDetailByCategoryBag() {
-		try {
-			
-			FindTModel body = (FindTModel)EntityCreator.buildFromDoc(FIND_TMODEL_XML_BY_CAT, "org.uddi.api_v3");
-			TModelList result = inquiry.findTModel(body);
-			
-			return result;
-			
-		} catch(Exception e) {
-			logger.error(e.getMessage(),e);
-			Assert.fail("No exception should be thrown");
-		}
-		Assert.fail("We should already have returned");
-		return null;
-	}
-	
-	public void saveJoePublisherTmodel(String authInfoJoe) {
-		saveTModel(authInfoJoe, JOE_PUBLISHER_TMODEL_XML, JOE_PUBLISHER_TMODEL_KEY);
-	}
-	
-	public void saveUDDIPublisherTmodel(String authInfoTM) {
-		saveTModel(authInfoTM, TMODEL_PUBLISHER_TMODEL_XML, TMODEL_PUBLISHER_TMODEL_KEY);
-	}
-	
-	public void saveTmodels(String authInfoJoe) {
-		saveTModels(authInfoJoe, TMODELS_XML);
-	}
-	
-	public void deleteJoePublisherTmodel(String authInfoJoe) {
-		deleteTModel(authInfoJoe, JOE_PUBLISHER_TMODEL_XML, JOE_PUBLISHER_TMODEL_KEY);
-	}
-	
-	public TModelDetail getJoePublisherTmodel(String authInfoJoe) {
-		return getTModelDetail(authInfoJoe, JOE_PUBLISHER_TMODEL_XML, JOE_PUBLISHER_TMODEL_KEY);
-	}
-	
-	public TModelList findJoePublisherTmodel(String authInfoJoe) {
-		return findJoeTModelDetail();
-	}
-	
-	public void saveMaryPublisherTmodel(String authInfoMary) {
-		saveTModel(authInfoMary, MARY_PUBLISHER_TMODEL_XML, MARY_PUBLISHER_TMODEL_KEY);
-	}
-	
-	public void deleteMaryPublisherTmodel(String authInfoMary) {
-		deleteTModel(authInfoMary, MARY_PUBLISHER_TMODEL_XML, MARY_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);
-	}
+        public void saveTModels(String authInfo, String tModelXml) {
+
+                // Add tModels
+                try {
+                        SaveTModel st = (org.uddi.api_v3.SaveTModel) EntityCreator.buildFromDoc(tModelXml, "org.uddi.api_v3");
+                        
+                        for (int i = 0; i < st.getTModel().size(); i++) {
+                                saveTModel(authInfo, st.getTModel().get(i), false);                                
+                        }
+                        //st.setAuthInfo(authInfo);
+                        //publication.saveTModel(st);
+
+                } catch (Exception e) {
+                        logger.error(e.getMessage(), e);
+                        Assert.fail("No exception should be thrown");
+                }
+        }
+        
+        private void saveTModel(String authInfo, TModel tmIn,boolean force) {
+                boolean exists = false;
+                GetTModelDetail gt1 = new GetTModelDetail();
+                gt1.getTModelKey().add(tmIn.getTModelKey());
+                try {
+                        TModelDetail td1 = inquiry.getTModelDetail(gt1);
+                        if (td1 != null && !td1.getTModel().isEmpty()) {
+                                exists = true;
+                        }
+                } catch (Exception ex) {
+                }
+                
+                if (!exists || force) // Add the tModel
+                {
+                        try {
+                                SaveTModel st = new SaveTModel();
+                                st.setAuthInfo(authInfo);
+                                
+                                st.getTModel().add(tmIn);
+                                publication.saveTModel(st);
+                                
+                                keyscreated.add(tmIn.getTModelKey());
+                                // Now get the entity and check the values
+                                GetTModelDetail gt = new GetTModelDetail();
+                                gt.getTModelKey().add(tmIn.getTModelKey());
+                                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().toLowerCase(), 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");
+                        }
+                        
+                } else {
+                        logger.info("The TModel " + tmIn.getTModelKey() + " exists already, skipping");
+                }
+        }
+        public void saveTModel(String authInfo, String tModelXml, String tModelKey) {
+                saveTModel(authInfo, tModelXml, tModelKey, false);
+        }
+        public void saveTModel(String authInfo, String tModelXml, String tModelKey, boolean force) {
+                logger.info("Loading tModel from " + tModelXml);
+                org.uddi.api_v3.TModel tmIn = null;
+                try {
+                        tmIn = (org.uddi.api_v3.TModel) EntityCreator.buildFromDoc(tModelXml, "org.uddi.api_v3");
+                } catch (Exception ex) {
+                        Assert.fail("unable to load tmodel from file!");
+                }
+                if (tmIn == null) {
+                        Assert.fail("unable to load tmodel from file!");
+                }
+                saveTModel(authInfo, tmIn,force);
+        }
+        
+        public void deleteTModel(String authInfo, String tModelXml, String tModelKey) {
+                
+                if (keyscreated.contains(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 TModelDetail getTModelDetail(String authInfo, String tModelXml, String tModelKey) {
+                try {
+                        //Try to get the TModel
+                        GetTModelDetail tmodelDetail = new GetTModelDetail();
+                        tmodelDetail.setAuthInfo(authInfo);
+                        tmodelDetail.getTModelKey().add(tModelKey);
+                        
+                        return inquiry.getTModelDetail(tmodelDetail);
+                        
+                } catch (Exception e) {
+                        logger.error(e.getMessage(), e);
+                        Assert.fail("No exception should be thrown");
+                }
+                Assert.fail("We should already have returned");
+                return null;
+        }
+        
+        public TModelList findJoeTModelDetail() {
+                try {
+                        
+                        FindTModel body = (FindTModel) EntityCreator.buildFromDoc(FIND_TMODEL_XML, "org.uddi.api_v3");
+                        TModelList result = inquiry.findTModel(body);
+                        
+                        return result;
+                        
+                } catch (Exception e) {
+                        logger.error(e.getMessage(), e);
+                        Assert.fail("No exception should be thrown");
+                }
+                Assert.fail("We should already have returned");
+                return null;
+        }
+        
+        public TModelList findJoeTModelDetailByCategoryBag() {
+                try {
+                        
+                        FindTModel body = (FindTModel) EntityCreator.buildFromDoc(FIND_TMODEL_XML_BY_CAT, "org.uddi.api_v3");
+                        TModelList result = inquiry.findTModel(body);
+                        
+                        return result;
+                        
+                } catch (Exception e) {
+                        logger.error(e.getMessage(), e);
+                        Assert.fail("No exception should be thrown");
+                }
+                Assert.fail("We should already have returned");
+                return null;
+        }
+        
+        public void saveJoePublisherTmodel(String authInfoJoe) {
+                saveTModel(authInfoJoe, JOE_PUBLISHER_TMODEL_XML, JOE_PUBLISHER_TMODEL_KEY,false);
+        }
+        public void saveJoePublisherTmodel(String authInfoJoe, boolean force) {
+                saveTModel(authInfoJoe, JOE_PUBLISHER_TMODEL_XML, JOE_PUBLISHER_TMODEL_KEY,force);
+        }
+        
+        public void saveUDDIPublisherTmodel(String authInfoTM) {
+                saveTModel(authInfoTM, TMODEL_PUBLISHER_TMODEL_XML, TMODEL_PUBLISHER_TMODEL_KEY,false);
+        }
+        
+        public void saveTmodels(String authInfoJoe) {
+                saveTModels(authInfoJoe, TMODELS_XML);
+        }
+        
+        public void deleteJoePublisherTmodel(String authInfoJoe) {
+                deleteTModel(authInfoJoe, JOE_PUBLISHER_TMODEL_XML, JOE_PUBLISHER_TMODEL_KEY);
+        }
+        
+        public TModelDetail getJoePublisherTmodel(String authInfoJoe) {
+                return getTModelDetail(authInfoJoe, JOE_PUBLISHER_TMODEL_XML, JOE_PUBLISHER_TMODEL_KEY);
+        }
+        
+        public TModelList findJoePublisherTmodel(String authInfoJoe) {
+                return findJoeTModelDetail();
+        }
+        
+        public void saveMaryPublisherTmodel(String authInfoMary) {
+                saveTModel(authInfoMary, MARY_PUBLISHER_TMODEL_XML, MARY_PUBLISHER_TMODEL_KEY,false);
+        }
+        
+        public void deleteMaryPublisherTmodel(String authInfoMary) {
+                deleteTModel(authInfoMary, MARY_PUBLISHER_TMODEL_XML, MARY_PUBLISHER_TMODEL_KEY);
+        }
+        
+        public void saveSamSyndicatorTmodel(String authInfoSam) {
+                saveTModel(authInfoSam, SAM_SYNDICATOR_TMODEL_XML, SAM_SYNDICATOR_TMODEL_KEY,false);
+        }
+        
+        public void deleteSamSyndicatorTmodel(String authInfoSam) {
+                deleteTModel(authInfoSam, SAM_SYNDICATOR_TMODEL_XML, SAM_SYNDICATOR_TMODEL_KEY);
+        }
 }
\ No newline at end of file

Modified: juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/tck.properties
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/tck.properties?rev=1550327&r1=1550326&r2=1550327&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/tck.properties (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/tck.properties Thu Dec 12 00:27:31 2013
@@ -1,5 +1,8 @@
+#some user with administrative rights
 root.publisher = root
 root.password  = 
+
+#the rest of these are regular users with basic CRUD permissions
 uddi.publisher = uddi
 uddi.password  = uddi
 joe.publisher  = joepublisher
@@ -9,4 +12,30 @@ sam.password   = ssyndicator
 mary.publisher = marypublisher
 mary.password  = marypublisher
 riftsaw.publisher = riftsaw
-riftsaw.password  = riftsaw
\ No newline at end of file
+riftsaw.password  = riftsaw
+
+#if this is a jUDDI server, use true, otherwise false
+isJuddi = true
+
+# does the UDDI server support RMI transport?
+rmi.enabled=true
+
+#authentication mechanism, uddi=auth token, http for everything else.
+# in general, MS UDDI = HTTP, all others use Auth Token
+auth_mode = uddi
+
+#does the UDDI server support HTTP GET/REST specification identified by the spec?
+rest.enabled = true
+
+#does the UDDI server support the Value Set Validation APIs?
+vsv.enabled = true
+#does the UDDI server support the Subscription API?
+sub.enabled=true
+#does the UDDI server support the Custody Transfer API?
+transfer.enabled=true
+#does the UDDI server support the Replication API?
+replication.enabled=true
+
+
+#for load testing, this is the max number of businesses and services to create
+loadtest.maxbusinesses=1100
\ No newline at end of file

Modified: juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/listenerService.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/listenerService.xml?rev=1550327&r1=1550326&r2=1550327&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/listenerService.xml (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/listenerService.xml Thu Dec 12 00:27:31 2013
@@ -24,7 +24,7 @@
   <bindingTemplates>
 	<bindingTemplate xmlns="urn:uddi-org:api_v3" bindingKey="uddi:uddi.joepublisher.com:bindinglistener">
 	  <description xml:lang="en">This is the endpoint for the subscription listener</description>
-	  <accessPoint useType="endPoint">http://localhost:{randomPort}/tcksubscriptionlistener</accessPoint>
+	  <accessPoint useType="endPoint">http://{hostname}:{randomPort}/tcksubscriptionlistener</accessPoint>
 	  <tModelInstanceDetails>
 		<tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
 	  </tModelInstanceDetails>

Modified: juddi/branches/juddi-3.3.x/uddi-tck/src/main/resources/META-INF/uddi.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck/src/main/resources/META-INF/uddi.xml?rev=1550327&r1=1550326&r2=1550327&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck/src/main/resources/META-INF/uddi.xml (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck/src/main/resources/META-INF/uddi.xml Thu Dec 12 00:27:31 2013
@@ -25,14 +25,20 @@
 				-->
 				<!-- JAX-WS Transport -->
 				<proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
+				
 				<custodyTransferUrl>http://${serverName}:${serverPort}/juddiv3/services/custody-transfer</custodyTransferUrl>
-				<inquiryUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiry</inquiryUrl>
-				<inquiryRESTUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiryRest</inquiryRESTUrl>
-		        <publishUrl>http://${serverName}:${serverPort}/juddiv3/services/publish</publishUrl>
-		        <securityUrl>http://${serverName}:${serverPort}/juddiv3/services/security</securityUrl>
-				<subscriptionUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription</subscriptionUrl>
-				<subscriptionListenerUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription-listener</subscriptionListenerUrl>
-				<juddiApiUrl>http://${serverName}:${serverPort}/juddiv3/services/juddi-api</juddiApiUrl>
+                <inquiryUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiry</inquiryUrl>
+				<!-- optional API -->
+				<inquiryRESTUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiryRest/XML/</inquiryRESTUrl>
+                <publishUrl>http://${serverName}:${serverPort}/juddiv3/services/publish</publishUrl>
+                <securityUrl>http://${serverName}:${serverPort}/juddiv3/services/security</securityUrl>
+                <subscriptionUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription</subscriptionUrl>
+                <subscriptionListenerUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription-listener</subscriptionListenerUrl>
+				<replicationUrl>http://${serverName}:${serverPort}/juddiv3/services/replication?wsdl</replicationUrl>
+				<valueSetValidationUrl>http://${serverName}:${serverPort}/juddiv3/services/valueset-validation</valueSetValidationUrl>
+				<valueSetCachingUrl>http://${serverName}:${serverPort}/juddiv3/services/valueset-caching</valueSetCachingUrl>
+				<!-- optional -->
+                <juddiApiUrl>http://${serverName}:${serverPort}/juddiv3/services/juddi-api?wsdl</juddiApiUrl>
 				
 				<!-- AXIS JAX-WS Transport 
                 <proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>

Modified: juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_010_PublisherIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_010_PublisherIntegrationTest.java?rev=1550327&r1=1550326&r2=1550327&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_010_PublisherIntegrationTest.java (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_010_PublisherIntegrationTest.java Thu Dec 12 00:27:31 2013
@@ -36,6 +36,7 @@ import org.apache.juddi.v3.client.transp
 import org.apache.juddi.v3_service.JUDDIApiPortType;
 import org.junit.AfterClass;
 import org.junit.Assert;
+import org.junit.Assume;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.uddi.api_v3.AuthToken;
@@ -44,7 +45,9 @@ import org.uddi.v3_service.DispositionRe
 import org.uddi.v3_service.UDDISecurityPortType;
 
 /**
+ * jUDDI specific tests
  * @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
+ * @author <a href="mailto:alexoree@apache.org">Alex O'Ree</a>
  */
 public class JUDDI_010_PublisherIntegrationTest {
 	
@@ -56,7 +59,7 @@ public class JUDDI_010_PublisherIntegrat
 	
 	@BeforeClass
 	public static void startManager() throws ConfigurationException {
-		
+		Assume.assumeTrue(TckPublisher.isJUDDI());
 		manager  = new UDDIClient();
 		manager.start();
 
@@ -85,6 +88,7 @@ public class JUDDI_010_PublisherIntegrat
 	
      @Test
      public void testAuthToken() {
+             Assume.assumeTrue(TckPublisher.isUDDIAuthMode());
 	     try {
 	    	 Transport transport = manager.getTransport();
         	 
@@ -103,6 +107,7 @@ public class JUDDI_010_PublisherIntegrat
      
      @Test
  	public void testJoePublisher() {
+             Assume.assumeTrue(TckPublisher.isJUDDI());
  		//We can only test this if the publisher is not there already.
  		//If it already there is probably has foreign key relationships.
  		//This test should really only run on an empty database. Seed
@@ -115,6 +120,7 @@ public class JUDDI_010_PublisherIntegrat
  	
  	@Test
  	public void testSamSyndicator() {
+                Assume.assumeTrue(TckPublisher.isJUDDI());
  		//We can only test this if the publisher is not there already.
  		if (!isExistPublisher(TckPublisher.getSamPublisherId())) {
  			saveSamSyndicator();
@@ -124,6 +130,7 @@ public class JUDDI_010_PublisherIntegrat
  	
  	@Test
  	public void testGetAllPublishers(){
+                Assume.assumeTrue(TckPublisher.isJUDDI());
 		GetAllPublisherDetail gp = new GetAllPublisherDetail();
 		gp.setAuthInfo(authInfo);
 		try {
@@ -140,6 +147,7 @@ public class JUDDI_010_PublisherIntegrat
  	 * 		   - false in all other cases.
  	 */
  	public boolean saveJoePublisher() {
+                Assume.assumeTrue(TckPublisher.isJUDDI());
  		if (!isExistPublisher(TckPublisher.getJoePublisherId())) {
  			savePublisher(TckPublisher.getJoePublisherId(), TckPublisher.JOE_PUBLISHER_XML);
  			return true;
@@ -152,6 +160,7 @@ public class JUDDI_010_PublisherIntegrat
  	 * are child objects attached; think Services etc.
  	 */
  	public void deleteJoePublisher() {
+                Assume.assumeTrue(TckPublisher.isJUDDI());
  		deletePublisher(TckPublisher.getJoePublisherId());
  	}
  	/**
@@ -159,6 +168,7 @@ public class JUDDI_010_PublisherIntegrat
  	 * @return publisherId
  	 */
  	public String saveSamSyndicator() {
+                Assume.assumeTrue(TckPublisher.isJUDDI());
  		if (!isExistPublisher(TckPublisher.getSamPublisherId())) {
  			savePublisher(TckPublisher.getSamPublisherId(), TckPublisher.SAM_SYNDICATOR_XML);
  		}
@@ -169,6 +179,7 @@ public class JUDDI_010_PublisherIntegrat
  	 * are child objects attached; think Services etc.
  	 */
  	public void deleteSamSyndicator() {
+                Assume.assumeTrue(TckPublisher.isJUDDI());
  		deletePublisher(TckPublisher.getSamPublisherId());
  	}
  	

Modified: juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_091_RMISubscriptionListenerIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_091_RMISubscriptionListenerIntegrationTest.java?rev=1550327&r1=1550326&r2=1550327&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_091_RMISubscriptionListenerIntegrationTest.java (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_091_RMISubscriptionListenerIntegrationTest.java Thu Dec 12 00:27:31 2013
@@ -14,11 +14,12 @@ package org.apache.juddi.v3.tck;
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
+import java.net.InetAddress;
 import java.net.URI;
 import java.rmi.registry.LocateRegistry;
 import java.rmi.registry.Registry;
 import java.util.Random;
+import javax.xml.ws.BindingProvider;
 
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.logging.Log;
@@ -27,6 +28,7 @@ import org.apache.juddi.v3.client.config
 import org.apache.juddi.v3.client.transport.Transport;
 import org.junit.AfterClass;
 import org.junit.Assert;
+import org.junit.Assume;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.uddi.v3_service.UDDIInquiryPortType;
@@ -35,125 +37,135 @@ import org.uddi.v3_service.UDDISecurityP
 import org.uddi.v3_service.UDDISubscriptionPortType;
 
 /**
+ * jUDDI specific test
+ *
+ * @author <a href="mailto:alexoree@apache.org">Alex O'Ree</a>
  * @author <a href="mailto:tcunning@apache.org">Tom Cunningham</a>
  */
-public class JUDDI_091_RMISubscriptionListenerIntegrationTest
-{
-	private static Log logger = LogFactory.getLog(JUDDI_091_RMISubscriptionListenerIntegrationTest.class);
-
-	private static TckTModel tckTModel                    = null;
-	private static TckBusiness tckBusiness                = null;
-	private static TckBusinessService tckBusinessService  = null;
-	private static TckSubscriptionListenerRMI rmiSubscriptionListener = null;
-	
-	private static String authInfoJoe = null;
-	private static UDDIClient manager;
-	private static UDDISubscriptionListenerImpl rmiSubscriptionListenerService = null;
-	private static Registry registry;
-	private static Integer randomPort = null;
-
-	@AfterClass
-	public static void stopManager() throws ConfigurationException {
-		manager.stop();
-		//shutting down the TCK SubscriptionListener
-		//re
-	}
-	
-	@BeforeClass
-	public static void startManager() throws ConfigurationException {
-			
-		try {
-			//bring up the RMISubscriptionListener
-			//random port
-			randomPort = 19800 + new Random().nextInt(99);
-			System.out.println("RMI Random port=" + randomPort);
-			//bring up the RMISubscriptionListener
-			URI rmiEndPoint = new URI("rmi://localhost:" + randomPort + "/tck/rmisubscriptionlistener");
-			registry = LocateRegistry.createRegistry(rmiEndPoint.getPort());
-			String path = rmiEndPoint.getPath();
-			
-			//starting the service
-			rmiSubscriptionListenerService = new UDDISubscriptionListenerImpl(0);
-			//binding to the RMI Registry
-			registry.bind(path,rmiSubscriptionListenerService);
-			
-			//double check that the service is bound in the local Registry
-			Registry registry2 = LocateRegistry.getRegistry(rmiEndPoint.getHost(), rmiEndPoint.getPort());
-			registry2.lookup(rmiEndPoint.getPath());
-           
-            
-		} catch (Exception e2) {
-			// TODO Auto-generated catch block
-			e2.printStackTrace();
-			Assert.fail();
-		}
-
-		manager  = new UDDIClient();
-		manager.start();
-		
-		logger.debug("Getting auth tokens..");
-		try {
-			 
-			 Transport transport = manager.getTransport();
-        	 UDDISecurityPortType security = transport.getUDDISecurityService();
-        	 authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.getJoePublisherId(),  TckPublisher.getJoePassword());
-        	 Assert.assertNotNull(authInfoJoe);
-        	 UDDISubscriptionPortType subscription = transport.getUDDISubscriptionService();
-        	 
-        	 UDDIPublicationPortType publication = transport.getUDDIPublishService();
-        	 UDDIInquiryPortType inquiry = transport.getUDDIInquiryService();
-        	 tckTModel  = new TckTModel(publication, inquiry);
-        	 tckBusiness = new TckBusiness(publication, inquiry);
-        	 tckBusinessService = new TckBusinessService(publication, inquiry);
-        	 rmiSubscriptionListener = new TckSubscriptionListenerRMI(subscription, publication);	
-        	  
-	     } catch (Exception e) {
-	    	 logger.error(e.getMessage(), e);
-				Assert.fail("Could not obtain authInfo token.");
-	     } 
-	}
-	
-	@Test
-	public void joePublisher() {
-		try {
-			tckTModel.saveJoePublisherTmodel(authInfoJoe);
-			tckBusiness.saveJoePublisherBusiness(authInfoJoe);
-			tckBusinessService.saveJoePublisherService(authInfoJoe);
-			rmiSubscriptionListener.saveService(authInfoJoe, TckSubscriptionListener.LISTENER_RMI_SERVICE_XML, randomPort);
-			
-			rmiSubscriptionListener.saveNotifierSubscription(authInfoJoe, TckSubscriptionListenerRMI.SUBSCRIPTION_XML_RMI);
-
-			tckBusinessService.updateJoePublisherService(authInfoJoe, "foo");
-			
-            //waiting up to 100 seconds for the listener to notice the change.
-			String test="";
-			for (int i=0; i<200; i++) {
-				Thread.sleep(500);
-				System.out.print(".");
-				if (UDDISubscriptionListenerImpl.notificationCount > 0) {
-					break;
-				} else {
-					System.out.print(test);
-				}
-			}
-			if (UDDISubscriptionListenerImpl.notificationCount == 0) {
-				Assert.fail("No Notification was sent");
-			}
-			if (!UDDISubscriptionListenerImpl.notifcationMap.get(0).contains("<name xml:lang=\"en\">Service One</name>")) {
-				Assert.fail("Notification does not contain the correct service");
-			}
-			
-		} catch (Exception e) {
-			e.printStackTrace();
-
-			Assert.fail();
-		} finally {
-			
-			rmiSubscriptionListener.deleteNotifierSubscription(authInfoJoe, TckSubscriptionListenerRMI.SUBSCRIPTION_KEY_RMI);
-			tckBusinessService.deleteJoePublisherService(authInfoJoe);
-			tckBusiness.deleteJoePublisherBusiness(authInfoJoe);
-			tckTModel.deleteJoePublisherTmodel(authInfoJoe);
-		}
-	}	
-    
+public class JUDDI_091_RMISubscriptionListenerIntegrationTest {
+
+        private static Log logger = LogFactory.getLog(JUDDI_091_RMISubscriptionListenerIntegrationTest.class);
+        private static TckTModel tckTModel = null;
+        private static TckBusiness tckBusiness = null;
+        private static TckBusinessService tckBusinessService = null;
+        private static TckSubscriptionListenerRMI rmiSubscriptionListener = null;
+        private static String authInfoJoe = null;
+        private static String hostname = null;
+        private static UDDIClient manager;
+        private static UDDISubscriptionListenerImpl rmiSubscriptionListenerService = null;
+        private static Registry registry;
+        private static Integer randomPort = null;
+
+        @AfterClass
+        public static void stopManager() throws ConfigurationException {
+                manager.stop();
+                //shutting down the TCK SubscriptionListener
+                //re
+        }
+
+        @BeforeClass
+        public static void startManager() throws ConfigurationException {
+
+                try {
+                        //bring up the RMISubscriptionListener
+                        //random port
+                        randomPort = 19800 + new Random().nextInt(99);
+                        System.out.println("RMI Random port=" + randomPort);
+                        //bring up the RMISubscriptionListener
+                        URI rmiEndPoint = new URI("rmi://localhost:" + randomPort + "/tck/rmisubscriptionlistener");
+                        registry = LocateRegistry.createRegistry(rmiEndPoint.getPort());
+                        String path = rmiEndPoint.getPath();
+                        hostname = InetAddress.getLocalHost().getHostName();
+                        //starting the service
+                        rmiSubscriptionListenerService = new UDDISubscriptionListenerImpl(0);
+                        //binding to the RMI Registry
+                        registry.bind(path, rmiSubscriptionListenerService);
+
+                        //double check that the service is bound in the local Registry
+                        Registry registry2 = LocateRegistry.getRegistry(rmiEndPoint.getHost(), rmiEndPoint.getPort());
+                        registry2.lookup(rmiEndPoint.getPath());
+
+
+                } catch (Exception e2) {
+                        // TODO Auto-generated catch block
+                        e2.printStackTrace();
+                        Assert.fail();
+                }
+
+                manager = new UDDIClient();
+                manager.start();
+
+                logger.debug("Getting auth tokens..");
+                try {
+
+                        Transport transport = manager.getTransport();
+                        UDDISecurityPortType security = transport.getUDDISecurityService();
+                        authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
+
+
+                        UDDISubscriptionPortType subscription = transport.getUDDISubscriptionService();
+                        UDDIPublicationPortType publication = transport.getUDDIPublishService();
+                        UDDIInquiryPortType inquiry = transport.getUDDIInquiryService();
+
+                        tckTModel = new TckTModel(publication, inquiry);
+                        tckBusiness = new TckBusiness(publication, inquiry);
+                        tckBusinessService = new TckBusinessService(publication, inquiry);
+                        rmiSubscriptionListener = new TckSubscriptionListenerRMI(subscription, publication);
+
+                        if (!TckPublisher.isUDDIAuthMode()) {
+                                TckSecurity.setCredentials((BindingProvider) publication, TckPublisher.getRootPublisherId(), TckPublisher.getRootPassword());
+                                TckSecurity.setCredentials((BindingProvider) subscription, TckPublisher.getRootPublisherId(), TckPublisher.getRootPassword());
+                                TckSecurity.setCredentials((BindingProvider) inquiry, TckPublisher.getRootPublisherId(), TckPublisher.getRootPassword());
+                        }
+
+                } catch (Exception e) {
+                        logger.error(e.getMessage(), e);
+                        Assert.fail("Could not obtain authInfo token.");
+                }
+        }
+
+        @Test
+        public void joePublisher() {
+                Assume.assumeTrue(TckPublisher.isRMI());
+                Assume.assumeTrue(TckPublisher.isSubscriptionEnabled());
+                try {
+                        tckTModel.saveJoePublisherTmodel(authInfoJoe);
+                        tckBusiness.saveJoePublisherBusiness(authInfoJoe);
+                        tckBusinessService.saveJoePublisherService(authInfoJoe);
+                        rmiSubscriptionListener.saveService(authInfoJoe, TckSubscriptionListener.LISTENER_RMI_SERVICE_XML, randomPort, hostname);
+
+                        rmiSubscriptionListener.saveNotifierSubscription(authInfoJoe, TckSubscriptionListenerRMI.SUBSCRIPTION_XML_RMI);
+
+                        tckBusinessService.updateJoePublisherService(authInfoJoe, "foo");
+
+                        //waiting up to 100 seconds for the listener to notice the change.
+                        String test = "";
+                        for (int i = 0; i < 200; i++) {
+                                Thread.sleep(500);
+                                System.out.print(".");
+                                if (UDDISubscriptionListenerImpl.notificationCount > 0) {
+                                        break;
+                                } else {
+                                        System.out.print(test);
+                                }
+                        }
+                        if (UDDISubscriptionListenerImpl.notificationCount == 0) {
+                                Assert.fail("No Notification was sent");
+                        }
+                        if (!UDDISubscriptionListenerImpl.notifcationMap.get(0).contains("<name xml:lang=\"en\">Service One</name>")) {
+                                Assert.fail("Notification does not contain the correct service");
+                        }
+
+                } catch (Exception e) {
+                        e.printStackTrace();
+
+                        Assert.fail();
+                } finally {
+
+                        rmiSubscriptionListener.deleteNotifierSubscription(authInfoJoe, TckSubscriptionListenerRMI.SUBSCRIPTION_KEY_RMI);
+                        tckBusinessService.deleteJoePublisherService(authInfoJoe);
+                        tckBusiness.deleteJoePublisherBusiness(authInfoJoe);
+                        tckTModel.deleteJoePublisherTmodel(authInfoJoe);
+                }
+        }
 }

Modified: juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_100_ClientSubscriptionInfoTest.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_100_ClientSubscriptionInfoTest.java?rev=1550327&r1=1550326&r2=1550327&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_100_ClientSubscriptionInfoTest.java (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_100_ClientSubscriptionInfoTest.java Thu Dec 12 00:27:31 2013
@@ -14,6 +14,7 @@
  */
 package org.apache.juddi.v3.tck;
 
+import javax.xml.ws.BindingProvider;
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -29,13 +30,15 @@ import org.apache.juddi.v3.client.transp
 import org.apache.juddi.v3_service.JUDDIApiPortType;
 import org.junit.AfterClass;
 import org.junit.Assert;
+import org.junit.Assume;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.uddi.api_v3.GetAuthToken;
 import org.uddi.v3_service.UDDISecurityPortType;
 
 /**
+ * jUDDI specific tests
  * @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
+ * @author <a href="mailto:alexoree@apache.org">Alex O'Ree</a>
  */
 public class JUDDI_100_ClientSubscriptionInfoTest {
 
@@ -57,12 +60,13 @@ public class JUDDI_100_ClientSubscriptio
  			Transport transport = manager.getTransport();
 			
 			security = transport.getUDDISecurityService();
-			GetAuthToken getAuthToken = new GetAuthToken();
-			getAuthToken.setUserID(TckPublisher.getRootPublisherId());
-			getAuthToken.setCred(TckPublisher.getRootPassword());
-			authInfo = security.getAuthToken(getAuthToken).getAuthInfo();
+			authInfo = TckSecurity.getAuthToken(security, TckPublisher.getRootPublisherId(), TckPublisher.getRootPassword());
 			
 			publisher = transport.getJUDDIApiService();
+                        if (!TckPublisher.isUDDIAuthMode())
+                        {
+                                TckSecurity.setCredentials((BindingProvider)publisher, TckPublisher.getRootPublisherId(), TckPublisher.getRootPassword());
+                        }
 		} catch (Exception e) {
 			logger.error(e.getMessage(), e);
 			Assert.fail("Could not obtain authInfo token.");
@@ -76,6 +80,7 @@ public class JUDDI_100_ClientSubscriptio
 
 	@Test
 	public void addClientSubscriptionInfo() {
+                Assume.assumeTrue(TckPublisher.isJUDDI());
 		ClientSubscriptionInfo clientSubscriptionInfo = new ClientSubscriptionInfo();
 
 		Node node = new Node();

Modified: juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_001_UDDIServiceTest.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_001_UDDIServiceTest.java?rev=1550327&r1=1550326&r2=1550327&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_001_UDDIServiceTest.java (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_001_UDDIServiceTest.java Thu Dec 12 00:27:31 2013
@@ -9,6 +9,7 @@ import org.apache.juddi.v3.client.UDDISe
 import org.apache.juddi.v3.client.config.UDDIClient;
 import org.apache.juddi.v3.client.config.UDDINode;
 import org.junit.AfterClass;
+import org.junit.Assume;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.uddi.api_v3.AuthToken;
@@ -21,80 +22,86 @@ import org.uddi.v3_service.UDDISubscript
 import org.uddi.v3_service.UDDISubscriptionPortType;
 
 /**
- * Checking the UDDI Server for all the required ports specified in the UDDI v3 spec.
+ * Checking the UDDI Server for all the required ports specified in the UDDI v3
+ * spec.
+ *
  * @author kstam
+ * @author <a href="mailto:alexoree@apache.org">Alex O'Ree</a>
  *
  */
 public class UDDI_001_UDDIServiceTest {
-	
-	static UDDIClient manager;
-	static UDDINode uddiServer;
-	
-	@BeforeClass
-	public static void readClientConfig() throws ConfigurationException {
-		manager = new UDDIClient();
-		manager.start();
-		uddiServer = manager.getClientConfig().getHomeNode();
-	}
-	
-	@AfterClass
-	public static void stop() throws ConfigurationException {
-		if (manager!=null) manager.stop();
-	}
-	
-	@Test
-	public void findSecurityPort() throws IOException {
-		UDDIService uddiService = new UDDIService();
-		UDDISecurityPortType port = uddiService.getUDDISecurityPort();
-	    assertNotNull(port);
-	    GetAuthToken body = new GetAuthToken();
-	    body.setUserID("root");
-	    body.setCred("root");
-	    AuthToken token = port.getAuthToken(body);
-	    System.out.println("token=" + token);
-	}
-	
-	@Test
-	public void findInquiryPort() throws IOException {
-		UDDIService uddiService = new UDDIService();
-		UDDIInquiryPortType port = uddiService.getUDDIInquiryPort();
-	    assertNotNull(port);
-	}
-	
-	@Test
-	public void findPublicationPort() throws IOException {
-		UDDIService uddiService = new UDDIService();
-		UDDIPublicationPortType port = uddiService.getUDDIPublicationPort();
-	    assertNotNull(port);
-	}
-	
-	@Test
-	public void findSubscriptionPort() throws IOException {
-		UDDIService uddiService = new UDDIService();
-		UDDISubscriptionPortType port = uddiService.getUDDISubscriptionPort();
-	    assertNotNull(port);
-	}
-	
-	@Test
-	public void findReplicationPort() throws IOException {
-		String url = uddiServer.getSecurityUrl();
-		if (url!=null) { //Replication is option, but if it is configured in the uddi.xml then we assume it is implemented
-			UDDIService uddiService = new UDDIService();
-			UDDIReplicationPortType port = uddiService.getUDDIReplicationPort();
-		    assertNotNull(port);
-		}
-	}
-	
-	@Test
-	public void findSubscriptionListenerPort() throws IOException {
-		String url = uddiServer.getSecurityUrl();
-		if (url!=null) { //Subscription Listener is client side, but if it is configured in the uddi.xml then we assume it is implemented
-			UDDIService uddiService = new UDDIService();
-			UDDISubscriptionListenerPortType port = uddiService.getUDDISubscriptionListenerPort();
-		    assertNotNull(port);
-		}
-	}
-	
-	
-	
+
+        static UDDIClient manager;
+        static UDDINode uddiServer;
+
+        @BeforeClass
+        public static void readClientConfig() throws ConfigurationException {
+                manager = new UDDIClient();
+                manager.start();
+                uddiServer = manager.getClientConfig().getHomeNode();
+        }
+
+        @AfterClass
+        public static void stop() throws ConfigurationException {
+                if (manager != null) {
+                        manager.stop();
+                }
+        }
+
+        @Test
+        public void findSecurityPort() throws IOException {
+                Assume.assumeTrue(TckPublisher.isUDDIAuthMode());
+                UDDIService uddiService = new UDDIService();
+                UDDISecurityPortType port = uddiService.getUDDISecurityPort();
+                assertNotNull(port);
+                GetAuthToken body = new GetAuthToken();
+                body.setUserID("root");
+                body.setCred("root");
+                AuthToken token = port.getAuthToken(body);
+                System.out.println("token=" + token);
+        }
+
+        @Test
+        public void findInquiryPort() throws IOException {
+                UDDIService uddiService = new UDDIService();
+                UDDIInquiryPortType port = uddiService.getUDDIInquiryPort();
+                assertNotNull(port);
+        }
+
+        @Test
+        public void findPublicationPort() throws IOException {
+                UDDIService uddiService = new UDDIService();
+                UDDIPublicationPortType port = uddiService.getUDDIPublicationPort();
+                assertNotNull(port);
+        }
+
+        @Test
+        public void findSubscriptionPort() throws IOException {
+                Assume.assumeTrue(TckPublisher.isSubscriptionEnabled());
+                UDDIService uddiService = new UDDIService();
+                UDDISubscriptionPortType port = uddiService.getUDDISubscriptionPort();
+                assertNotNull(port);
+        }
+
+        @Test
+        public void findReplicationPort() throws IOException {
+                Assume.assumeTrue(TckPublisher.isReplicationEnabled());
+                String url = uddiServer.getSecurityUrl();
+                if (url != null) { //Replication is option, but if it is configured in the uddi.xml then we assume it is implemented
+                        UDDIService uddiService = new UDDIService();
+                        UDDIReplicationPortType port = uddiService.getUDDIReplicationPort();
+                        assertNotNull(port);
+                }
+        }
+
+        @Test
+        public void findSubscriptionListenerPort() throws IOException {
+                Assume.assumeTrue(TckPublisher.isSubscriptionEnabled());
+                String url = uddiServer.getSecurityUrl();
+                if (url != null) { //Subscription Listener is client side, but if it is configured in the uddi.xml then we assume it is implemented
+                        UDDIService uddiService = new UDDIService();
+                        UDDISubscriptionListenerPortType port = uddiService.getUDDISubscriptionListenerPort();
+                        assertNotNull(port);
+                }
+        }
 }

Modified: juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_010_PublisherIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_010_PublisherIntegrationTest.java?rev=1550327&r1=1550326&r2=1550327&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_010_PublisherIntegrationTest.java (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_010_PublisherIntegrationTest.java Thu Dec 12 00:27:31 2013
@@ -19,6 +19,7 @@ import org.apache.juddi.v3.client.config
 import org.apache.juddi.v3.client.transport.Transport;
 import org.junit.AfterClass;
 import org.junit.Assert;
+import org.junit.Assume;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.uddi.api_v3.AuthToken;
@@ -27,6 +28,7 @@ import org.uddi.v3_service.UDDISecurityP
 
 /**
  * @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
+ * @author <a href="mailto:alexoree@apache.org">Alex O'Ree</a>
  */
 public class UDDI_010_PublisherIntegrationTest {
 	
@@ -45,6 +47,7 @@ public class UDDI_010_PublisherIntegrati
 	
      @Test
      public void testAuthToken() {
+             Assume.assumeTrue(TckPublisher.isUDDIAuthMode());
 	     try {
 	    	 Transport transport = manager.getTransport();
         	 UDDISecurityPortType securityService = transport.getUDDISecurityService();

Modified: juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_020_TmodelIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_020_TmodelIntegrationTest.java?rev=1550327&r1=1550326&r2=1550327&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_020_TmodelIntegrationTest.java (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_020_TmodelIntegrationTest.java Thu Dec 12 00:27:31 2013
@@ -14,6 +14,7 @@
  */
 package org.apache.juddi.v3.tck;
 
+import javax.xml.ws.BindingProvider;
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -33,77 +34,89 @@ import org.uddi.v3_service.UDDISecurityP
 /**
  * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
  * @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
+ * @author <a href="mailto:alexoree@apache.org">Alex O'Ree</a>
  */
 public class UDDI_020_TmodelIntegrationTest {
-	
-	private static TckTModel tckTModel                = null;
-	private static Log logger = LogFactory.getLog(UDDI_020_TmodelIntegrationTest.class);
-	
-	private static String authInfoJoe                 = null;
-	private static String authInfoSam                 = null;
-	
-private static UDDIClient manager;
-	
-	
-	@BeforeClass
-	public static void startManager() throws ConfigurationException {
-		
-		manager  = new UDDIClient();
-		manager.start();
-		logger.debug("Getting auth tokens..");
-		try {
-			 Transport transport = manager.getTransport();
-	        	 
-        	 UDDISecurityPortType security = transport.getUDDISecurityService();
-        	 authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.getJoePublisherId(),  TckPublisher.getJoePassword());
- 			 authInfoSam = TckSecurity.getAuthToken(security, TckPublisher.getSamPublisherId(),  TckPublisher.getSamPassword());
-        	 Assert.assertNotNull(authInfoJoe);
-        	 Assert.assertNotNull(authInfoSam);
-        	 
-        	 UDDIPublicationPortType publication = transport.getUDDIPublishService();
-        	 UDDIInquiryPortType inquiry = transport.getUDDIInquiryService();
-        	 tckTModel  = new TckTModel(publication, inquiry);
-	        
-	     } catch (Exception e) {
-	    	 logger.error(e.getMessage(), e);
-				Assert.fail("Could not obtain authInfo token.");
-	     } 
-	}
-	
-	@AfterClass
-	public static void stopManager() throws ConfigurationException {
-		manager.stop();
-	}
-	
-	@Test
-	public void testJoePublisherTmodel() {
-		tckTModel.saveJoePublisherTmodel(authInfoJoe);
-		
-		//Now if we use a finder it should be found.
-		TModelList tModelList = tckTModel.findJoeTModelDetail();
-		Assert.assertNotNull(tModelList.getTModelInfos());
-		
-		tckTModel.deleteJoePublisherTmodel(authInfoJoe);
-		
-		//Even if it deleted you should still be able to access it through a getTModelDetail
-		TModelDetail detail = tckTModel.getJoePublisherTmodel(authInfoJoe);
-		Assert.assertNotNull(detail.getTModel());
-		
-		//However if we use a finder it should not be found.
-		TModelList tModelList2 = tckTModel.findJoeTModelDetail();
-		Assert.assertNull(tModelList2.getTModelInfos());
-		
-		//Make sure none of the found key generators is Joe's key generator
-		TModelList tModelList3 = tckTModel.findJoeTModelDetailByCategoryBag();
-		for (TModelInfo tModelInfo : tModelList3.getTModelInfos().getTModelInfo()) {
-			Assert.assertFalse("uddi:uddi.joepublisher.com:keygenerator".equals(tModelInfo.getTModelKey()));
-		}
-	}
-	
-	@Test
-	public void testSamSyndicatorTmodelTest() {
-		tckTModel.saveSamSyndicatorTmodel(authInfoSam);
-		tckTModel.deleteSamSyndicatorTmodel(authInfoSam);
-	}	
-	
+
+        private static TckTModel tckTModelJoe = null;
+        private static TckTModel tckTModelSam = null;
+        private static Log logger = LogFactory.getLog(UDDI_020_TmodelIntegrationTest.class);
+        private static String authInfoJoe = null;
+        private static String authInfoSam = null;
+        private static UDDIClient manager;
+
+        @BeforeClass
+        public static void startManager() throws ConfigurationException {
+
+                manager = new UDDIClient();
+                manager.start();
+                logger.debug("Getting auth tokens..");
+                try {
+                        Transport transport = manager.getTransport();
+
+                        UDDISecurityPortType security = transport.getUDDISecurityService();
+                        authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
+                        authInfoSam = TckSecurity.getAuthToken(security, TckPublisher.getSamPublisherId(), TckPublisher.getSamPassword());
+                        //Assert.assertNotNull(authInfoJoe);
+                        //Assert.assertNotNull(authInfoSam);
+
+
+                        UDDIPublicationPortType publication = transport.getUDDIPublishService();
+                        UDDIInquiryPortType inquiry = transport.getUDDIInquiryService();
+                        if (!TckPublisher.isUDDIAuthMode()) {
+                                TckSecurity.setCredentials((BindingProvider) publication, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
+                                TckSecurity.setCredentials((BindingProvider) inquiry, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
+                        }
+                        tckTModelJoe = new TckTModel(publication, inquiry);
+
+                        transport = manager.getTransport();
+                        publication = transport.getUDDIPublishService();
+                        inquiry = transport.getUDDIInquiryService();
+                        if (!TckPublisher.isUDDIAuthMode()) {
+                                TckSecurity.setCredentials((BindingProvider) publication, TckPublisher.getSamPublisherId(), TckPublisher.getSamPassword());
+                                TckSecurity.setCredentials((BindingProvider) inquiry, TckPublisher.getSamPublisherId(), TckPublisher.getSamPassword());
+                        }
+                        tckTModelSam = new TckTModel(publication, inquiry);
+
+                } catch (Exception e) {
+                        logger.error(e.getMessage(), e);
+                        Assert.fail("Could not obtain authInfo token.");
+                }
+        }
+
+        @AfterClass
+        public static void stopManager() throws ConfigurationException {
+                manager.stop();
+        }
+
+        @Test
+        public void testJoePublisherTmodel() {
+                tckTModelJoe.saveJoePublisherTmodel(authInfoJoe, true);
+
+                //Now if we use a finder it should be found.
+                TModelList tModelList = tckTModelJoe.findJoeTModelDetail();
+                Assert.assertNotNull(tModelList.getTModelInfos());
+
+                tckTModelJoe.deleteJoePublisherTmodel(authInfoJoe);
+
+                //Even if it deleted you should still be able to access it through a getTModelDetail
+                TModelDetail detail = tckTModelJoe.getJoePublisherTmodel(authInfoJoe);
+                Assert.assertNotNull(detail.getTModel());
+
+                //However if we use a finder it should not be found.
+                TModelList tModelList2 = tckTModelJoe.findJoeTModelDetail();
+                Assert.assertNull(tModelList2.getTModelInfos());
+
+                //Make sure none of the found key generators is Joe's key generator
+                TModelList tModelList3 = tckTModelJoe.findJoeTModelDetailByCategoryBag();
+                for (TModelInfo tModelInfo : tModelList3.getTModelInfos().getTModelInfo()) {
+                        Assert.assertFalse("uddi:uddi.joepublisher.com:keygenerator".equals(tModelInfo.getTModelKey()));
+                }
+        }
+
+        @Test
+        public void testSamSyndicatorTmodelTest() {
+                tckTModelSam.saveSamSyndicatorTmodel(authInfoSam);
+                tckTModelSam.deleteSamSyndicatorTmodel(authInfoSam);
+        }
 }

Modified: juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java?rev=1550327&r1=1550326&r2=1550327&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java Thu Dec 12 00:27:31 2013
@@ -14,6 +14,7 @@
  */
 package org.apache.juddi.v3.tck;
 
+import javax.xml.ws.BindingProvider;
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -30,85 +31,114 @@ import org.uddi.v3_service.UDDISecurityP
 /**
  * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
  * @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
+ * @author <a href="mailto:alexoree@apache.org">Alex O'Ree</a>
  */
 public class UDDI_030_BusinessEntityIntegrationTest {
-	
-	private static Log logger = LogFactory.getLog(UDDI_030_BusinessEntityIntegrationTest.class);
-	
-	protected static TckTModel tckTModel          = null;
-	protected static TckBusiness tckBusiness      = null;
-	protected static TckFindEntity tckFindEntity  = null;
-	protected static String authInfoJoe           = null;
-	protected static String authInfoSam           = null;
-	private static UDDIClient manager;
-	
-	@AfterClass
-	public static void stopManager() throws ConfigurationException {
-		manager.stop();
-	}
-	
-	@BeforeClass
-	public static void startManager() throws ConfigurationException {
-		manager  = new UDDIClient();
-		manager.start();
-		
-		logger.debug("Getting auth tokens..");
-		try {
-			 Transport transport = manager.getTransport();
-        	 UDDISecurityPortType security = transport.getUDDISecurityService();
-        	 authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.getJoePublisherId(),  TckPublisher.getJoePassword());
- 			 authInfoSam = TckSecurity.getAuthToken(security, TckPublisher.getSamPublisherId(),  TckPublisher.getSamPassword());
-        	 Assert.assertNotNull(authInfoJoe);
-        	 Assert.assertNotNull(authInfoSam);
-        	 
-        	 UDDIPublicationPortType publication = transport.getUDDIPublishService();
-        	 UDDIInquiryPortType inquiry = transport.getUDDIInquiryService();
-        	 tckTModel  = new TckTModel(publication, inquiry);
-        	 tckBusiness = new TckBusiness(publication, inquiry);
-        	 tckFindEntity = new TckFindEntity(inquiry);
- 			String authInfoUDDI  = TckSecurity.getAuthToken(security, TckPublisher.getUDDIPublisherId(),  TckPublisher.getUDDIPassword());
- 			tckTModel.saveUDDIPublisherTmodel(authInfoUDDI);
- 			tckTModel.saveTModels(authInfoUDDI, TckTModel.TMODELS_XML);
-	     } catch (Exception e) {
-	    	 logger.error(e.getMessage(), e);
-				Assert.fail("Could not obtain authInfo token.");
-	     } 
-	}
-	
-	@Test
-	public void testJoePublisherBusinessEntitySignature() {
-		try {
-			tckTModel.saveJoePublisherTmodel(authInfoJoe);
-			tckBusiness.saveJoePublisherBusinessX509Signature(authInfoJoe);
-			tckFindEntity.findAllBusiness();
-			tckBusiness.deleteJoePublisherBusiness(authInfoJoe);
-		} finally {
-			tckTModel.deleteJoePublisherTmodel(authInfoJoe);
-		}
-	}
-	
-	@Test
-	public void testJoePublisherBusinessEntity() {
-		try {
-			tckTModel.saveJoePublisherTmodel(authInfoJoe);
-			tckBusiness.saveJoePublisherBusiness(authInfoJoe);
-			tckFindEntity.findAllBusiness();
-			tckBusiness.deleteJoePublisherBusiness(authInfoJoe);
-		} finally {
-			tckTModel.deleteJoePublisherTmodel(authInfoJoe);
-		}
-	}
-	
-	@Test
-	public void testSamSyndicatorBusiness() {
-		try {
-			tckTModel.saveSamSyndicatorTmodel(authInfoSam);
-			tckBusiness.saveSamSyndicatorBusiness(authInfoSam);
-			tckBusiness.deleteSamSyndicatorBusiness(authInfoSam);
-		} finally {
-			tckTModel.deleteSamSyndicatorTmodel(authInfoSam);
-		}
-	}
-	
-	
+
+        private static Log logger = LogFactory.getLog(UDDI_030_BusinessEntityIntegrationTest.class);
+        protected static TckTModel tckTModelJoe = null;
+        protected static TckBusiness tckBusinessJoe = null;
+        protected static TckFindEntity tckFindEntityJoe = null;
+        protected static TckTModel tckTModelSam = null;
+        protected static TckBusiness tckBusinessSam = null;
+        protected static TckFindEntity tckFindEntitySam = null;
+        protected static String authInfoJoe = null;
+        protected static String authInfoSam = null;
+        private static UDDIClient manager;
+
+        @AfterClass
+        public static void stopManager() throws ConfigurationException {
+                manager.stop();
+        }
+
+        @BeforeClass
+        public static void startManager() throws ConfigurationException {
+                manager = new UDDIClient();
+                manager.start();
+
+                logger.debug("Getting auth tokens..");
+                try {
+                        Transport transport = manager.getTransport();
+                        UDDISecurityPortType security = transport.getUDDISecurityService();
+
+                        authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
+                        authInfoSam = TckSecurity.getAuthToken(security, TckPublisher.getSamPublisherId(), TckPublisher.getSamPassword());
+                        //Assert.assertNotNull(authInfoJoe);
+                        //Assert.assertNotNull(authInfoSam);
+
+                        UDDIPublicationPortType publication = transport.getUDDIPublishService();
+                        UDDIInquiryPortType inquiry = transport.getUDDIInquiryService();
+                        if (!TckPublisher.isUDDIAuthMode()) {
+                                TckSecurity.setCredentials((BindingProvider) publication, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
+                                TckSecurity.setCredentials((BindingProvider) inquiry, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
+                        }
+                        tckTModelJoe = new TckTModel(publication, inquiry);
+                        tckBusinessJoe = new TckBusiness(publication, inquiry);
+                        tckFindEntityJoe = new TckFindEntity(inquiry);
+
+                        transport = manager.getTransport();
+                        publication = transport.getUDDIPublishService();
+                        inquiry = transport.getUDDIInquiryService();
+                        if (!TckPublisher.isUDDIAuthMode()) {
+                                TckSecurity.setCredentials((BindingProvider) publication, TckPublisher.getSamPublisherId(), TckPublisher.getSamPassword());
+                                TckSecurity.setCredentials((BindingProvider) inquiry, TckPublisher.getSamPublisherId(), TckPublisher.getSamPassword());
+                        }
+                        tckTModelSam = new TckTModel(publication, inquiry);
+                        tckBusinessSam = new TckBusiness(publication, inquiry);
+                        tckFindEntitySam = new TckFindEntity(inquiry);
+
+
+                        String authInfoUDDI = TckSecurity.getAuthToken(security, TckPublisher.getUDDIPublisherId(), TckPublisher.getUDDIPassword());
+                        transport = manager.getTransport();
+                        publication = transport.getUDDIPublishService();
+                        inquiry = transport.getUDDIInquiryService();
+                        if (!TckPublisher.isUDDIAuthMode()) {
+                                TckSecurity.setCredentials((BindingProvider) publication, TckPublisher.getUDDIPublisherId(), TckPublisher.getUDDIPassword());
+                                TckSecurity.setCredentials((BindingProvider) inquiry, TckPublisher.getUDDIPublisherId(), TckPublisher.getUDDIPassword());
+                        }
+                        TckTModel tckTModelUddi = new TckTModel(publication, inquiry);
+                        tckTModelUddi.saveUDDIPublisherTmodel(authInfoUDDI);
+                        tckTModelUddi.saveTModels(authInfoUDDI, TckTModel.TMODELS_XML);
+                        
+                        
+                } catch (Exception e) {
+                        logger.error(e.getMessage(), e);
+                        Assert.fail("Could not obtain authInfo token.");
+                }
+        }
+
+        @Test
+        public void testJoePublisherBusinessEntitySignature() {
+                try {
+                        tckTModelJoe.saveJoePublisherTmodel(authInfoJoe);
+                        tckBusinessJoe.saveJoePublisherBusinessX509Signature(authInfoJoe);
+                        tckFindEntityJoe.findAllBusiness();
+                        tckBusinessJoe.deleteJoePublisherBusiness(authInfoJoe);
+                } finally {
+                        tckTModelJoe.deleteJoePublisherTmodel(authInfoJoe);
+                }
+        }
+
+        @Test
+        public void testJoePublisherBusinessEntity() {
+                try {
+                        tckTModelJoe.saveJoePublisherTmodel(authInfoJoe);
+                        tckBusinessJoe.saveJoePublisherBusiness(authInfoJoe);
+                        tckFindEntityJoe.findAllBusiness();
+                        tckBusinessJoe.deleteJoePublisherBusiness(authInfoJoe);
+                } finally {
+                        tckTModelJoe.deleteJoePublisherTmodel(authInfoJoe);
+                }
+        }
+
+        @Test
+        public void testSamSyndicatorBusiness() {
+                try {
+                        tckTModelSam.saveSamSyndicatorTmodel(authInfoSam);
+                        tckBusinessSam.saveSamSyndicatorBusiness(authInfoSam);
+                        tckBusinessSam.deleteSamSyndicatorBusiness(authInfoSam);
+                } finally {
+                        tckTModelSam.deleteSamSyndicatorTmodel(authInfoSam);
+                }
+        }
 }

Modified: juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityLoadTest.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityLoadTest.java?rev=1550327&r1=1550326&r2=1550327&view=diff
==============================================================================
--- juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityLoadTest.java (original)
+++ juddi/branches/juddi-3.3.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityLoadTest.java Thu Dec 12 00:27:31 2013
@@ -20,42 +20,44 @@ import org.junit.Test;
 
 /**
  * @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
+ * @author <a href="mailto:alexoree@apache.org">Alex O'Ree</a>
  */
 public class UDDI_030_BusinessEntityLoadTest extends UDDI_030_BusinessEntityIntegrationTest {
-	
-	int numberOfBusinesses=1100;
-	
-	@BeforeClass
-	public static void setup() throws ConfigurationException {
-		UDDI_030_BusinessEntityIntegrationTest.startManager();
-	}
-	
-	@Test @Override
-	public void testJoePublisherBusinessEntity() {
-		tckTModel.saveJoePublisherTmodel(authInfoJoe);
-		long startSave = System.currentTimeMillis();
-		tckBusiness.saveJoePublisherBusinesses(authInfoJoe, numberOfBusinesses);
-		long saveDuration = System.currentTimeMillis() - startSave;
-		System.out.println("Save " + numberOfBusinesses + " Joes Duration=" + saveDuration);
-		long startDelete = System.currentTimeMillis();
-		tckBusiness.deleteJoePublisherBusinesses(authInfoJoe, numberOfBusinesses);
-		long deleteDuration = System.currentTimeMillis() - startDelete;
-	    System.out.println("Delete " + numberOfBusinesses + " Joes Duration= " + deleteDuration);
-	    tckTModel.deleteJoePublisherTmodel(authInfoJoe);
-	}
-	
-	@Test @Override
-	public void testSamSyndicatorBusiness() {
-		tckTModel.saveSamSyndicatorTmodel(authInfoSam);
-		long startSave = System.currentTimeMillis();
-		tckBusiness.saveSamSyndicatorBusinesses(authInfoSam, numberOfBusinesses);
-		long saveDuration = System.currentTimeMillis() - startSave;
-		System.out.println("Save " + numberOfBusinesses + " Sams Duration=" + saveDuration);
-		long startDelete = System.currentTimeMillis();
-		tckBusiness.deleteSamSyndicatorBusinesses(authInfoSam, numberOfBusinesses);
-		long deleteDuration = System.currentTimeMillis() - startDelete;
-	    System.out.println("Delete " + numberOfBusinesses + " Sams Duration= " + deleteDuration);
-	    tckTModel.deleteSamSyndicatorTmodel(authInfoSam);
-	}
-	
+
+        int numberOfBusinesses = 1100;
+
+        @BeforeClass
+        public static void setup() throws ConfigurationException {
+                UDDI_030_BusinessEntityIntegrationTest.startManager();
+        }
+
+        @Test
+        @Override
+        public void testJoePublisherBusinessEntity() {
+                tckTModelJoe.saveJoePublisherTmodel(authInfoJoe);
+                long startSave = System.currentTimeMillis();
+                tckBusinessJoe.saveJoePublisherBusinesses(authInfoJoe, numberOfBusinesses);
+                long saveDuration = System.currentTimeMillis() - startSave;
+                System.out.println("Save " + numberOfBusinesses + " Joes Duration=" + saveDuration);
+                long startDelete = System.currentTimeMillis();
+                tckBusinessJoe.deleteJoePublisherBusinesses(authInfoJoe, numberOfBusinesses);
+                long deleteDuration = System.currentTimeMillis() - startDelete;
+                System.out.println("Delete " + numberOfBusinesses + " Joes Duration= " + deleteDuration);
+                tckTModelJoe.deleteJoePublisherTmodel(authInfoJoe);
+        }
+
+        @Test
+        @Override
+        public void testSamSyndicatorBusiness() {
+                tckTModelSam.saveSamSyndicatorTmodel(authInfoSam);
+                long startSave = System.currentTimeMillis();
+                tckBusinessSam.saveSamSyndicatorBusinesses(authInfoSam, numberOfBusinesses);
+                long saveDuration = System.currentTimeMillis() - startSave;
+                System.out.println("Save " + numberOfBusinesses + " Sams Duration=" + saveDuration);
+                long startDelete = System.currentTimeMillis();
+                tckBusinessSam.deleteSamSyndicatorBusinesses(authInfoSam, numberOfBusinesses);
+                long deleteDuration = System.currentTimeMillis() - startDelete;
+                System.out.println("Delete " + numberOfBusinesses + " Sams Duration= " + deleteDuration);
+                tckTModelSam.deleteSamSyndicatorTmodel(authInfoSam);
+        }
 }



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


Mime
View raw message