juddi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexo...@apache.org
Subject svn commit: r1555648 [4/13] - in /juddi/trunk: ./ docs/examples/auth/ juddi-client/src/main/java/org/apache/juddi/v3/client/config/ juddi-core-openjpa/ juddi-core/src/main/java/org/apache/juddi/api/impl/ juddi-core/src/main/java/org/apache/juddi/subscr...
Date Mon, 06 Jan 2014 02:18:39 GMT
Modified: juddi/trunk/juddiv3-war/JAX-WS/CXF/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/JAX-WS/CXF/WEB-INF/beans.xml?rev=1555648&r1=1555647&r2=1555648&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/JAX-WS/CXF/WEB-INF/beans.xml (original)
+++ juddi/trunk/juddiv3-war/JAX-WS/CXF/WEB-INF/beans.xml Mon Jan  6 02:18:37 2014
@@ -98,7 +98,7 @@
   </jaxws:endpoint>
 
    <util:map id="jsonNamespaceMap" map-class="java.util.Hashtable" >
-                <!--<entry key="urn:uddi-org:api_v3" value="uddi-org-api_v3"/>
+                <entry key="urn:uddi-org:api_v3" value="uddi-org-api_v3"/>
 				                <entry key="urn:uddi-org:api_v3" value="urn:uddi-org:api_v3"/>
                 <entry key="urn:uddi-org:sub_v3" value="urn:uddi-org:sub_v3"/>
                 <entry key="urn:uddi-org:custody_v3" value="urn:uddi-org:custody_v3"/>
@@ -109,9 +109,8 @@
                 <entry key="urn:uddi-org:vscache_v3" value="urn:uddi-org:vscache_v3"/>
                 <entry key="urn:uddi-org:policy_v3" value="urn:uddi-org:policy_v3"/>
                 <entry key="urn:uddi-org:policy_instanceParms_v3" value="urn:uddi-org:policy_instanceParms_v3"/>
-                <entry key="http://www.w3.org/2000/09/xmldsig#" value="http://www.w3.org/2000/09/xmldsig#"/>-->
-				<entry key="urn:uddi-org:api_v3" value="uddiv3"/>
-				                <entry key="urn:uddi-org:api_v3" value="uddiv3sub"/>
+                <entry key="http://www.w3.org/2000/09/xmldsig#" value="http://www.w3.org/2000/09/xmldsig#"/>
+				
   </util:map>
  
 

Modified: juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.xml?rev=1555648&r1=1555647&r2=1555648&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.xml (original)
+++ juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.xml Mon Jan  6 02:18:37 2014
@@ -58,10 +58,10 @@
 		<maxInClause>1000</maxInClause>
 
 		<!-- The maximum number of UDDI artifacts allowed per publisher. A value of '-1' indicates any  number of artifacts is valid (These values can be overridden at the individual publisher level).-->
-		<maxBusinessesPerPublisher>100</maxBusinessesPerPublisher>
-		<maxServicesPerBusiness>100</maxServicesPerBusiness>
-		<maxBindingsPerService>100</maxBindingsPerService>
-		<maxTModelsPerPublisher>100</maxTModelsPerPublisher>
+		<maxBusinessesPerPublisher>-1</maxBusinessesPerPublisher>
+		<maxServicesPerBusiness>-1</maxServicesPerBusiness>
+		<maxBindingsPerService>-1</maxBindingsPerService>
+		<maxTModelsPerPublisher>-1</maxTModelsPerPublisher>
 
 		<!-- Days before a transfer request expires-->
 		<transfer>

Modified: juddi/trunk/pom.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/pom.xml?rev=1555648&r1=1555647&r2=1555648&view=diff
==============================================================================
--- juddi/trunk/pom.xml (original)
+++ juddi/trunk/pom.xml Mon Jan  6 02:18:37 2014
@@ -276,11 +276,11 @@
 		<module>juddi-core-openjpa</module>
 		<module>juddiv3-war</module>
 		<module>juddi-examples</module>
-		<!-- this may fail if not on windows -->
 		<module>juddi-gui-dsig</module>
 		<module>juddi-gui</module>
 		<module>juddi-tomcat</module>
 		<module>uddi-tck</module>
+		<module>juddi-tck-runner</module>
         
   </modules>
 	<distributionManagement>
@@ -293,7 +293,7 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.5</version>
+			<version>4.11</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

Modified: juddi/trunk/uddi-tck-base/pom.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/pom.xml?rev=1555648&r1=1555647&r2=1555648&view=diff
==============================================================================
--- juddi/trunk/uddi-tck-base/pom.xml (original)
+++ juddi/trunk/uddi-tck-base/pom.xml Mon Jan  6 02:18:37 2014
@@ -33,7 +33,7 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.5</version>
+			<version>4.11</version>
 		</dependency>
                 <dependency>
                         <groupId>xmlunit</groupId>

Modified: juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java?rev=1555648&r1=1555647&r2=1555648&view=diff
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java (original)
+++ juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusiness.java Mon Jan  6 02:18:37 2014
@@ -44,362 +44,358 @@ import org.uddi.v3_service.UDDIInquiryPo
 import org.uddi.v3_service.UDDIPublicationPortType;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
+
 /**
  * @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
  * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
  */
-public class TckBusiness 
-{
-    public final static String JOE_BUSINESS_XML = "uddi_data/joepublisher/businessEntity.xml";
-    public final static String JOE_BUSINESS_KEY = "uddi:uddi.joepublisher.com:businessone";
-    public final static String JOE_BUSINESS3_XML = "uddi_data/joepublisher/businessEntity3.xml";
-    public final static String JOE_BUSINESS3_KEY = "uddi:uddi.joepublisher.com:businessthree.com";
-    public final static String JOE_BUSINESS_MOVE_XML = "uddi_data/joepublisher/moveBusinessService1to3.xml";
-    public final static String MARY_BUSINESS_XML = "uddi_data/marypublisher/businessEntity.xml";
-    public final static String MARY_BUSINESS_KEY = "uddi:uddi.marypublisher.com:marybusinessone";
-    public final static String SAM_BUSINESS_XML = "uddi_data/samsyndicator/businessEntity.xml";
-    public final static String SAM_BUSINESS_WITHPROJECTION_XML = "uddi_data/samsyndicator/businessEntity_withProjection.xml";
-    public final static String SAM_BUSINESS_KEY = "uddi:www.samco.com:samco";
-    public final static String COMBINE_CATBAGS_BIZ_XML = "uddi_data/joepublisher/combineCatBagsBusinessServices.xml";
-    public final static String COMBINE_CATBAGS_BIZ_KEY = "uddi:uddi.joepublisher.com:business01";
-    public final static String RIFTSAW_BUSINESS_KEY = "uddi:riftsaw.jboss.org:business_redhat-jboss";
-    public final static String RIFTSAW_BUSINESS_XML = "uddi_data/bpel/riftsaw/businessEntity.xml";
-
-    final static String SIGNATURE_KEYSTORE = "uddi_data/signature/signature.jks";
-    final static String SIGNATURE_KEYSTORE_TYPE = "JKS";
-    final static String SIGNATURE_KEYSTORE_PASSWORD = "changeit";
-    final static String SIGNATURE_KEYSTORE_ALIAS = "mykey";
-    
-    private Log logger = LogFactory.getLog(this.getClass());
-	private UDDIPublicationPortType publication = null;
-    private UDDIInquiryPortType inquiry = null;
-	private boolean serialize=false;
-	public TckBusiness(UDDIPublicationPortType publication, 
-				  UDDIInquiryPortType inquiry) {
-		super();
-		this.publication = publication;
-		this.inquiry = inquiry;
-                serialize = false;
-                if (System.getProperty("debug")!=null &&
-                        System.getProperty("debug").equalsIgnoreCase("true"))
-                    serialize=true;
-	}
-	
-	public void saveSamSyndicatorBusiness(String authInfoSam) {
-		saveBusiness(authInfoSam, SAM_BUSINESS_XML, SAM_BUSINESS_KEY);
-	}
-
-	public void saveSamSyndicatorBusinesses(String authInfoSam, int numberOfCopies) {
-		saveBusinesses(authInfoSam, SAM_BUSINESS_XML, SAM_BUSINESS_KEY, numberOfCopies);
-	}
-	
-	public void saveSamSyndicatorBusinessWithProjection(String authInfoSam) {
-		saveBusiness(authInfoSam, SAM_BUSINESS_WITHPROJECTION_XML, SAM_BUSINESS_KEY);
-	}
-	
-	public void deleteSamSyndicatorBusiness(String authInfoSam) {
-		deleteBusiness(authInfoSam, SAM_BUSINESS_XML, SAM_BUSINESS_KEY);
-	}
-	
-	public void deleteSamSyndicatorBusinesses(String authInfoSam, int numberOfCopies) {
-		deleteBusinesses(authInfoSam, SAM_BUSINESS_XML, SAM_BUSINESS_KEY, numberOfCopies);
-	}
-	
+public class TckBusiness {
+
+        public final static String JOE_BUSINESS_XML = "uddi_data/joepublisher/businessEntity.xml";
+        public final static String JOE_BUSINESS_KEY = "uddi:uddi.joepublisher.com:businessone";
+        public final static String JOE_BUSINESS3_XML = "uddi_data/joepublisher/businessEntity3.xml";
+        public final static String JOE_BUSINESS3_KEY = "uddi:uddi.joepublisher.com:businessthree.com";
+        public final static String JOE_BUSINESS_MOVE_XML = "uddi_data/joepublisher/moveBusinessService1to3.xml";
+        public final static String MARY_BUSINESS_XML = "uddi_data/marypublisher/businessEntity.xml";
+        public final static String MARY_BUSINESS_KEY = "uddi:uddi.marypublisher.com:marybusinessone";
+        public final static String SAM_BUSINESS_XML = "uddi_data/samsyndicator/businessEntity.xml";
+        public final static String SAM_BUSINESS_WITHPROJECTION_XML = "uddi_data/samsyndicator/businessEntity_withProjection.xml";
+        public final static String SAM_BUSINESS_KEY = "uddi:www.samco.com:samco";
+        public final static String COMBINE_CATBAGS_BIZ_XML = "uddi_data/joepublisher/combineCatBagsBusinessServices.xml";
+        public final static String COMBINE_CATBAGS_BIZ_KEY = "uddi:uddi.joepublisher.com:business01";
+        public final static String RIFTSAW_BUSINESS_KEY = "uddi:riftsaw.jboss.org:business_redhat-jboss";
+        public final static String RIFTSAW_BUSINESS_XML = "uddi_data/bpel/riftsaw/businessEntity.xml";
+        final static String SIGNATURE_KEYSTORE = "uddi_data/signature/signature.jks";
+        final static String SIGNATURE_KEYSTORE_TYPE = "JKS";
+        final static String SIGNATURE_KEYSTORE_PASSWORD = "changeit";
+        final static String SIGNATURE_KEYSTORE_ALIAS = "mykey";
+        private Log logger = LogFactory.getLog(this.getClass());
+        private UDDIPublicationPortType publication = null;
+        private UDDIInquiryPortType inquiry = null;
+        
+
+        public TckBusiness(UDDIPublicationPortType publication,
+                UDDIInquiryPortType inquiry) {
+                super();
+                this.publication = publication;
+                this.inquiry = inquiry;
+        }
+
+        public void saveSamSyndicatorBusiness(String authInfoSam) {
+                saveBusiness(authInfoSam, SAM_BUSINESS_XML, SAM_BUSINESS_KEY);
+        }
+
+        public void saveSamSyndicatorBusinesses(String authInfoSam, int numberOfCopies) {
+                saveBusinesses(authInfoSam, SAM_BUSINESS_XML, SAM_BUSINESS_KEY, numberOfCopies);
+        }
+
+        public void saveSamSyndicatorBusinessWithProjection(String authInfoSam) {
+                saveBusiness(authInfoSam, SAM_BUSINESS_WITHPROJECTION_XML, SAM_BUSINESS_KEY);
+        }
+
+        public void deleteSamSyndicatorBusiness(String authInfoSam) {
+                deleteBusiness(authInfoSam, SAM_BUSINESS_XML, SAM_BUSINESS_KEY);
+        }
+
+        public void deleteSamSyndicatorBusinesses(String authInfoSam, int numberOfCopies) {
+                deleteBusinesses(authInfoSam, SAM_BUSINESS_XML, SAM_BUSINESS_KEY, numberOfCopies);
+        }
+
         public void saveJoePublisherBusinessX509Signature(String authInfoJoe) {
-            saveBusiness(authInfoJoe, JOE_BUSINESS_XML, JOE_BUSINESS_KEY);
-            signBusiness(authInfoJoe, JOE_BUSINESS_KEY);
-            verifyBusinessSignature(authInfoJoe, JOE_BUSINESS_KEY);
+                saveBusiness(authInfoJoe, JOE_BUSINESS_XML, JOE_BUSINESS_KEY);
+                signBusiness(authInfoJoe, JOE_BUSINESS_KEY);
+                verifyBusinessSignature(authInfoJoe, JOE_BUSINESS_KEY);
         }
-        
-	public void saveJoePublisherBusiness(String authInfoJoe) {
-		saveBusiness(authInfoJoe, JOE_BUSINESS_XML, JOE_BUSINESS_KEY, serialize);
-    }
-	
-	public void saveCombineCatBagsPublisherBusiness(String authInfoJoe) {
-		saveBusiness(authInfoJoe, COMBINE_CATBAGS_BIZ_XML, COMBINE_CATBAGS_BIZ_KEY);
-    }
-	
-	public void saveJoePublisherBusiness3(String authInfoJoe) {
-		saveBusiness(authInfoJoe, JOE_BUSINESS3_XML, JOE_BUSINESS3_KEY);
-    }
-	
-	public void saveJoePublisherBusiness1to3(String authInfoJoe) {
-		saveBusiness(authInfoJoe, JOE_BUSINESS_MOVE_XML, JOE_BUSINESS3_KEY);
-    }
-	
-	public void saveMaryPublisherBusiness(String authInfoMary) {
-		saveBusiness(authInfoMary, MARY_BUSINESS_XML, MARY_BUSINESS_KEY);
-    }
-	
-	public void updateJoePublisherBusiness(String authInfoJoe) {
-		updateBusiness(authInfoJoe, JOE_BUSINESS_XML, JOE_BUSINESS_KEY);
-    }
-	
-	public void saveJoePublisherBusinesses(String authInfoJoe, int numberOfCopies) {
-    	saveBusinesses(authInfoJoe, JOE_BUSINESS_XML, JOE_BUSINESS_KEY, numberOfCopies);
-    }
-    
-	public void deleteJoePublisherBusiness(String authInfoJoe) {
-    	deleteBusiness(authInfoJoe, JOE_BUSINESS_XML, JOE_BUSINESS_KEY);
-    }
-	
-	public void deleteJoePublisherBusiness3(String authInfoJoe) {
-    	deleteBusiness(authInfoJoe, JOE_BUSINESS3_XML, JOE_BUSINESS3_KEY);
-    }
-	
-	public void deleteMaryPublisherBusiness(String authInfoMary) {
-    	deleteBusiness(authInfoMary, MARY_BUSINESS_XML, MARY_BUSINESS_KEY);
-    }
-	
-	public void deleteJoePublisherBusinesses(String authInfoJoe, int numberOfCopies) {
-    	deleteBusinesses(authInfoJoe, JOE_BUSINESS_XML, JOE_BUSINESS_KEY, numberOfCopies);
-    }
-	
-	public void checkServicesBusinessOne(int expectedNumberOfServices) {
-		checkNumberOfServices(JOE_BUSINESS_KEY,expectedNumberOfServices);
-	}
-	
-	public void checkServicesBusinessThree(int expectedNumberOfServices) {
-		checkNumberOfServices(JOE_BUSINESS3_KEY,expectedNumberOfServices);
-	}
-	 
-	public void saveBusinesses(String authInfo, String businessXML, String businessKey, int numberOfCopies) {
-		try {			
-			BusinessEntity beIn = (BusinessEntity)EntityCreator.buildFromDoc(businessXML, "org.uddi.api_v3");
-			String businessName = beIn.getName().get(0).getValue();
-			for (int i=0; i<numberOfCopies; i++) {
-				SaveBusiness sb = new SaveBusiness();
-				sb.setAuthInfo(authInfo);
-				beIn.getName().get(0).setValue(businessName + "-" + i);
-				beIn.setBusinessKey(businessKey + "-" + i);
-				sb.getBusinessEntity().add(beIn);
-				publication.saveBusiness(sb);
-				logger.debug("Saved business with key " + businessName + "-" + i);
-			}
-			
-		} catch(Throwable e) {
-			logger.error(e.getMessage(),e);
-			Assert.fail("No exception should be thrown");
-		}
-	}
-	
-	public void checkNumberOfServices(String businessKey, int expectedServices) {
-		
-		try {
-			GetBusinessDetail gb = new GetBusinessDetail();
-			gb.getBusinessKey().add(businessKey);
-			BusinessDetail bd;
-			bd = inquiry.getBusinessDetail(gb);
-			List<BusinessEntity> beOutList = bd.getBusinessEntity();
-			BusinessEntity beOut = beOutList.get(0);
-			if (expectedServices > 0) {
-				assertEquals(expectedServices, beOut.getBusinessServices().getBusinessService().size());
-			} else {
-				Assert.assertNull(beOut.getBusinessServices());
-			}
-		} catch (RemoteException e) {
-			logger.error(e.getMessage(),e);
-			Assert.fail("No exception should be thrown");
-		}
-	}
-	
+
+        public void saveJoePublisherBusiness(String authInfoJoe) {
+                saveBusiness(authInfoJoe, JOE_BUSINESS_XML, JOE_BUSINESS_KEY, TckCommon.isDebug());
+        }
+
+        public void saveCombineCatBagsPublisherBusiness(String authInfoJoe) {
+                saveBusiness(authInfoJoe, COMBINE_CATBAGS_BIZ_XML, COMBINE_CATBAGS_BIZ_KEY);
+        }
+
+        public void saveJoePublisherBusiness3(String authInfoJoe) {
+                saveBusiness(authInfoJoe, JOE_BUSINESS3_XML, JOE_BUSINESS3_KEY);
+        }
+
+        public void saveJoePublisherBusiness1to3(String authInfoJoe) {
+                saveBusiness(authInfoJoe, JOE_BUSINESS_MOVE_XML, JOE_BUSINESS3_KEY);
+        }
+
+        public void saveMaryPublisherBusiness(String authInfoMary) {
+                saveBusiness(authInfoMary, MARY_BUSINESS_XML, MARY_BUSINESS_KEY);
+        }
+
+        public void updateJoePublisherBusiness(String authInfoJoe) {
+                updateBusiness(authInfoJoe, JOE_BUSINESS_XML, JOE_BUSINESS_KEY);
+        }
+
+        public void saveJoePublisherBusinesses(String authInfoJoe, int numberOfCopies) {
+                saveBusinesses(authInfoJoe, JOE_BUSINESS_XML, JOE_BUSINESS_KEY, numberOfCopies);
+        }
+
+        public void deleteJoePublisherBusiness(String authInfoJoe) {
+                deleteBusiness(authInfoJoe, JOE_BUSINESS_XML, JOE_BUSINESS_KEY);
+        }
+
+        public void deleteJoePublisherBusiness3(String authInfoJoe) {
+                deleteBusiness(authInfoJoe, JOE_BUSINESS3_XML, JOE_BUSINESS3_KEY);
+        }
+
+        public void deleteMaryPublisherBusiness(String authInfoMary) {
+                deleteBusiness(authInfoMary, MARY_BUSINESS_XML, MARY_BUSINESS_KEY);
+        }
+
+        public void deleteJoePublisherBusinesses(String authInfoJoe, int numberOfCopies) {
+                deleteBusinesses(authInfoJoe, JOE_BUSINESS_XML, JOE_BUSINESS_KEY, numberOfCopies);
+        }
+
+        public void checkServicesBusinessOne(int expectedNumberOfServices) {
+                checkNumberOfServices(JOE_BUSINESS_KEY, expectedNumberOfServices);
+        }
+
+        public void checkServicesBusinessThree(int expectedNumberOfServices) {
+                checkNumberOfServices(JOE_BUSINESS3_KEY, expectedNumberOfServices);
+        }
+
+        public void saveBusinesses(String authInfo, String businessXML, String businessKey, int numberOfCopies) {
+                try {
+                        BusinessEntity beIn = (BusinessEntity) EntityCreator.buildFromDoc(businessXML, "org.uddi.api_v3");
+                        String businessName = beIn.getName().get(0).getValue();
+                        for (int i = 0; i < numberOfCopies; i++) {
+                                SaveBusiness sb = new SaveBusiness();
+                                sb.setAuthInfo(authInfo);
+                                beIn.getName().get(0).setValue(businessName + "-" + i);
+                                beIn.setBusinessKey(businessKey + "-" + i);
+                                sb.getBusinessEntity().add(beIn);
+                                publication.saveBusiness(sb);
+                                logger.info("Saved business with key " + businessName + "-" + i);
+                        }
+
+                } catch (Throwable e) {
+                        logger.error(e.getMessage(), e);
+                        Assert.fail("No exception should be thrown");
+                }
+        }
+
+        public void checkNumberOfServices(String businessKey, int expectedServices) {
+
+                try {
+                        GetBusinessDetail gb = new GetBusinessDetail();
+                        gb.getBusinessKey().add(businessKey);
+                        BusinessDetail bd;
+                        bd = inquiry.getBusinessDetail(gb);
+                        List<BusinessEntity> beOutList = bd.getBusinessEntity();
+                        BusinessEntity beOut = beOutList.get(0);
+                        if (expectedServices > 0) {
+                                assertEquals(expectedServices, beOut.getBusinessServices().getBusinessService().size());
+                        } else {
+                                Assert.assertNull(beOut.getBusinessServices());
+                        }
+                } catch (RemoteException e) {
+                        logger.error(e.getMessage(), e);
+                        Assert.fail("No exception should be thrown");
+                }
+        }
+
         public void signBusiness(String authInfo, String businessKey) {
-            try {
-                GetBusinessDetail gb = new GetBusinessDetail();
-                gb.getBusinessKey().add(businessKey);
-                BusinessDetail bd = inquiry.getBusinessDetail(gb);
-                List<BusinessEntity> beOutList = bd.getBusinessEntity();
-                BusinessEntity bizEntity = beOutList.get(0);
-                bizEntity.getSignature().clear();
-                BusinessEntity bizEntitySigned = signJAXBObject(bizEntity);
-                        
-                SaveBusiness sb = new SaveBusiness();
-                sb.setAuthInfo(authInfo);
-                sb.getBusinessEntity().add(bizEntitySigned);
-                publication.saveBusiness(sb);
-            } catch(Throwable e) {
-                logger.error(e.getMessage(),e);
-                Assert.fail("No exception should be thrown");
-            }
+                try {
+                        GetBusinessDetail gb = new GetBusinessDetail();
+                        gb.getBusinessKey().add(businessKey);
+                        BusinessDetail bd = inquiry.getBusinessDetail(gb);
+                        List<BusinessEntity> beOutList = bd.getBusinessEntity();
+                        BusinessEntity bizEntity = beOutList.get(0);
+                        bizEntity.getSignature().clear();
+                        BusinessEntity bizEntitySigned = signJAXBObject(bizEntity);
+
+                        SaveBusiness sb = new SaveBusiness();
+                        sb.setAuthInfo(authInfo);
+                        sb.getBusinessEntity().add(bizEntitySigned);
+                        publication.saveBusiness(sb);
+                } catch (Throwable e) {
+                        logger.error(e.getMessage(), e);
+                        Assert.fail("No exception should be thrown");
+                }
         }
-        
+
         public void verifyBusinessSignature(String authInfo, String businessKey) {
-            try {
-                GetBusinessDetail gb = new GetBusinessDetail();
-                gb.getBusinessKey().add(businessKey);
-                BusinessDetail bd = inquiry.getBusinessDetail(gb);
-                List<BusinessEntity> beOutList = bd.getBusinessEntity();
-                BusinessEntity bizEntity = beOutList.get(0);
-                        
-                boolean sigOk = verifySignedJAXBObject(bizEntity);
-                assertTrue("Signature invalid!", sigOk);
-            } catch(Throwable e) {
-                logger.error(e.getMessage(),e);
-                Assert.fail("No exception should be thrown");
-            }
+                try {
+                        GetBusinessDetail gb = new GetBusinessDetail();
+                        gb.getBusinessKey().add(businessKey);
+                        BusinessDetail bd = inquiry.getBusinessDetail(gb);
+                        List<BusinessEntity> beOutList = bd.getBusinessEntity();
+                        BusinessEntity bizEntity = beOutList.get(0);
+
+                        boolean sigOk = verifySignedJAXBObject(bizEntity);
+                        assertTrue("Signature invalid!", sigOk);
+                } catch (Throwable e) {
+                        logger.error(e.getMessage(), e);
+                        Assert.fail("No exception should be thrown");
+                }
         }
-        
+
         private <T> T signJAXBObject(T jaxbObj) {
-            DOMResult domResult = new DOMResult();
-            JAXB.marshal(jaxbObj, domResult);
-            Document doc = ((Document)domResult.getNode());
-            Element docElement = doc.getDocumentElement();
-
-            try {            
-                KeyStore ks = KeyStore.getInstance(SIGNATURE_KEYSTORE_TYPE);
-                URL url = Thread.currentThread().getContextClassLoader().getResource(SIGNATURE_KEYSTORE);
-                ks.load(url.openStream(), SIGNATURE_KEYSTORE_PASSWORD.toCharArray());
-                KeyStore.PrivateKeyEntry keyEntry = (KeyStore.PrivateKeyEntry)ks.getEntry(SIGNATURE_KEYSTORE_ALIAS, new KeyStore.PasswordProtection(SIGNATURE_KEYSTORE_PASSWORD.toCharArray()));
-                PrivateKey privateKey = keyEntry.getPrivateKey();
-                Certificate origCert = keyEntry.getCertificate();
-                PublicKey validatingKey = origCert.getPublicKey();
-                TckSigningUtil.signDOM(docElement, privateKey, origCert);
-
-                DOMSource domSource = new DOMSource(doc);
-                T result = (T)JAXB.unmarshal(domSource, jaxbObj.getClass());
-                return result;
-            } catch (Exception e) {
-                throw new RuntimeException("Signature failure due to: " + e.getMessage(), e);
-            }
-        }
-        
-        private boolean verifySignedJAXBObject(Object obj) {
-            try {
                 DOMResult domResult = new DOMResult();
-                JAXB.marshal(obj, domResult);
-                Document doc = ((Document)domResult.getNode());
+                JAXB.marshal(jaxbObj, domResult);
+                Document doc = ((Document) domResult.getNode());
                 Element docElement = doc.getDocumentElement();
 
-                KeyStore ks = KeyStore.getInstance(SIGNATURE_KEYSTORE_TYPE);
-                URL url = Thread.currentThread().getContextClassLoader().getResource(SIGNATURE_KEYSTORE);
-                ks.load(url.openStream(), SIGNATURE_KEYSTORE_PASSWORD.toCharArray());
-                KeyStore.PrivateKeyEntry keyEntry = (KeyStore.PrivateKeyEntry)ks.getEntry(SIGNATURE_KEYSTORE_ALIAS, new KeyStore.PasswordProtection(SIGNATURE_KEYSTORE_PASSWORD.toCharArray()));
-                PrivateKey privateKey = keyEntry.getPrivateKey();
-                Certificate origCert = keyEntry.getCertificate();
-                PublicKey validatingKey = origCert.getPublicKey();
-                return TckSigningUtil.verifySignature(docElement, validatingKey);
-            } catch (Exception e) {
-                throw new RuntimeException (e);
-            }
+                try {
+                        KeyStore ks = KeyStore.getInstance(SIGNATURE_KEYSTORE_TYPE);
+                        URL url = Thread.currentThread().getContextClassLoader().getResource(SIGNATURE_KEYSTORE);
+                        ks.load(url.openStream(), SIGNATURE_KEYSTORE_PASSWORD.toCharArray());
+                        KeyStore.PrivateKeyEntry keyEntry = (KeyStore.PrivateKeyEntry) ks.getEntry(SIGNATURE_KEYSTORE_ALIAS, new KeyStore.PasswordProtection(SIGNATURE_KEYSTORE_PASSWORD.toCharArray()));
+                        PrivateKey privateKey = keyEntry.getPrivateKey();
+                        Certificate origCert = keyEntry.getCertificate();
+                        PublicKey validatingKey = origCert.getPublicKey();
+                        TckSigningUtil.signDOM(docElement, privateKey, origCert);
+
+                        DOMSource domSource = new DOMSource(doc);
+                        T result = (T) JAXB.unmarshal(domSource, jaxbObj.getClass());
+                        return result;
+                } catch (Exception e) {
+                        throw new RuntimeException("Signature failure due to: " + e.getMessage(), e);
+                }
         }
-        
+
+        private boolean verifySignedJAXBObject(Object obj) {
+                try {
+                        DOMResult domResult = new DOMResult();
+                        JAXB.marshal(obj, domResult);
+                        Document doc = ((Document) domResult.getNode());
+                        Element docElement = doc.getDocumentElement();
+
+                        KeyStore ks = KeyStore.getInstance(SIGNATURE_KEYSTORE_TYPE);
+                        URL url = Thread.currentThread().getContextClassLoader().getResource(SIGNATURE_KEYSTORE);
+                        ks.load(url.openStream(), SIGNATURE_KEYSTORE_PASSWORD.toCharArray());
+                        KeyStore.PrivateKeyEntry keyEntry = (KeyStore.PrivateKeyEntry) ks.getEntry(SIGNATURE_KEYSTORE_ALIAS, new KeyStore.PasswordProtection(SIGNATURE_KEYSTORE_PASSWORD.toCharArray()));
+                        PrivateKey privateKey = keyEntry.getPrivateKey();
+                        Certificate origCert = keyEntry.getCertificate();
+                        PublicKey validatingKey = origCert.getPublicKey();
+                        return TckSigningUtil.verifySignature(docElement, validatingKey);
+                } catch (Exception e) {
+                        throw new RuntimeException(e);
+                }
+        }
+
         public void saveBusiness(String authInfo, String businessXML, String businessKey) {
-            saveBusiness(authInfo, businessXML, businessKey, false);
+                saveBusiness(authInfo, businessXML, businessKey, false);
         }
-	public void saveBusiness(String authInfo, String businessXML, String businessKey, boolean serialize) {
-            logger.info("attempting to save business " + businessKey + " from " + businessXML);
-		try {
-			SaveBusiness sb = new SaveBusiness();
-			sb.setAuthInfo(authInfo);
-
-			BusinessEntity beIn = (BusinessEntity)EntityCreator.buildFromDoc(businessXML, "org.uddi.api_v3");
-                        if (beIn==null)
-                            throw new Exception("Unload to load source xml document from " + businessXML);
-			sb.getBusinessEntity().add(beIn);
-                    BusinessDetail saveBusiness = publication.saveBusiness(sb);
-                    logger.info("Business saved with key " + saveBusiness.getBusinessEntity().get(0).getBusinessKey());
-                    if (serialize)
-                        JAXB.marshal(saveBusiness, System.out);
-	
-			// Now get the entity and check the values
-			GetBusinessDetail gb = new GetBusinessDetail();
-			gb.getBusinessKey().add(businessKey);
-			BusinessDetail bd = inquiry.getBusinessDetail(gb);
-			List<BusinessEntity> beOutList = bd.getBusinessEntity();
-			BusinessEntity beOut = beOutList.get(0);
-
-            if (serialize) {
-                JAXB.marshal(beOut, new File("target/aftersave.xml"));
-            }
-            
-			assertEquals(beIn.getBusinessKey(), beOut.getBusinessKey());
-			
-			TckValidator.checkNames(beIn.getName(), beOut.getName());
-			TckValidator.checkDescriptions(beIn.getDescription(), beOut.getDescription());
-			TckValidator.checkDiscoveryUrls(beIn.getDiscoveryURLs(), beOut.getDiscoveryURLs());
-			TckValidator.checkContacts(beIn.getContacts(), beOut.getContacts());
-			TckValidator.checkCategories(beIn.getCategoryBag(), beOut.getCategoryBag());
-			TckValidator.checkSignatures(beIn.getSignature(), beOut.getSignature());
-		} catch(Throwable e) {
-			logger.error(e.getMessage(),e);
-			Assert.fail("No exception should be thrown");
-		}
-
-	}
-	
-	public void updateBusiness(String authInfo, String businessXML, String businessKey) {
-		try {
-			
-			// Now get the entity and check the values
-			GetBusinessDetail gb = new GetBusinessDetail();
-			gb.getBusinessKey().add(businessKey);
-			BusinessDetail bd = inquiry.getBusinessDetail(gb);
-			List<BusinessEntity> beOutList = bd.getBusinessEntity();
-			BusinessEntity beOut = beOutList.get(0);
-			//We are expecting 2 services
-			assertEquals(2,beOut.getBusinessServices().getBusinessService().size());
-			
-			//Now updating the business by adding another description
-			SaveBusiness sb = new SaveBusiness();
-			sb.setAuthInfo(authInfo);
-			BusinessEntity beIn = beOut;
-			Description desc2= new Description();
-			desc2.setLang("nl");
-			desc2.setValue("Omschrijving");
-			beIn.getDescription().add(desc2);
-			sb.getBusinessEntity().add(beIn);
-			publication.saveBusiness(sb);
-	
-			// Now get the entity and check the values
-			BusinessDetail bdnew = inquiry.getBusinessDetail(gb);
-			List<BusinessEntity> beOutListNew = bdnew.getBusinessEntity();
-			BusinessEntity beOutNew = beOutListNew.get(0);
-
-			assertEquals(beIn.getBusinessKey(), beOutNew.getBusinessKey());
-			// After the update we still are supposed to see two services.
-			assertNotNull(beOutNew.getBusinessServices());
-			assertEquals(2,beOutNew.getBusinessServices().getBusinessService().size());
-			
-			
-		} catch(Throwable e) {
-			logger.error(e.getMessage(),e);
-			Assert.fail("No exception should be thrown");
-		}
-
-	}
-	
-	public void deleteBusinesses(String authInfo, String businessXML, String businessKey, int numberOfCopies) {
-		try {
-			for (int i=0; i<numberOfCopies; i++) {
-				// Delete the entity and make sure it is removed
-				String key = businessKey + "-" + i;
-				DeleteBusiness db = new DeleteBusiness();
-				db.setAuthInfo(authInfo);
-				db.getBusinessKey().add(key);
-				publication.deleteBusiness(db);
-				logger.debug("Deleted business with key " + key);
-			}
-			
-		} catch(Exception e) {
-			logger.error(e.getMessage(),e);
-			Assert.fail("No exception should be thrown");
-		}
-	}
-	
-	
-	public void deleteBusiness(String authInfo, String businessXML, String businessKey) {
-		try {
-			// Delete the entity and make sure it is removed
-			DeleteBusiness db = new DeleteBusiness();
-			db.setAuthInfo(authInfo);
-			db.getBusinessKey().add(businessKey);
-			publication.deleteBusiness(db);
-			
-		} catch(Exception e) {
-			logger.error(e.getMessage(),e);
-			Assert.fail("No exception should be thrown");
-		}
-	}
-	
 
+        public void saveBusiness(String authInfo, String businessXML, String businessKey, boolean serialize) {
+                logger.info("attempting to save business " + businessKey + " from " + businessXML);
+                try {
+                        SaveBusiness sb = new SaveBusiness();
+                        sb.setAuthInfo(authInfo);
+
+                        BusinessEntity beIn = (BusinessEntity) EntityCreator.buildFromDoc(businessXML, "org.uddi.api_v3");
+                        if (beIn == null) {
+                                throw new Exception("Unload to load source xml document from " + businessXML);
+                        }
+                        sb.getBusinessEntity().add(beIn);
+                        BusinessDetail saveBusiness = publication.saveBusiness(sb);
+                        logger.info("Business saved with key " + saveBusiness.getBusinessEntity().get(0).getBusinessKey());
+                        if (serialize) {
+                                JAXB.marshal(saveBusiness, System.out);
+                        }
+
+                        // Now get the entity and check the values
+                        GetBusinessDetail gb = new GetBusinessDetail();
+                        gb.getBusinessKey().add(businessKey);
+                        BusinessDetail bd = inquiry.getBusinessDetail(gb);
+                        List<BusinessEntity> beOutList = bd.getBusinessEntity();
+                        BusinessEntity beOut = beOutList.get(0);
+
+                        if (serialize) {
+                                JAXB.marshal(beOut, new File("target/aftersave.xml"));
+                        }
+
+                        assertEquals(beIn.getBusinessKey(), beOut.getBusinessKey());
+
+                        TckValidator.checkNames(beIn.getName(), beOut.getName());
+                        TckValidator.checkDescriptions(beIn.getDescription(), beOut.getDescription());
+                        TckValidator.checkDiscoveryUrls(beIn.getDiscoveryURLs(), beOut.getDiscoveryURLs());
+                        TckValidator.checkContacts(beIn.getContacts(), beOut.getContacts());
+                        TckValidator.checkCategories(beIn.getCategoryBag(), beOut.getCategoryBag());
+                        TckValidator.checkSignatures(beIn.getSignature(), beOut.getSignature());
+                } catch (Throwable e) {
+                        logger.error(e.getMessage(), e);
+                        Assert.fail("No exception should be thrown");
+                }
+
+        }
+
+        public void updateBusiness(String authInfo, String businessXML, String businessKey) {
+                try {
+
+                        // Now get the entity and check the values
+                        GetBusinessDetail gb = new GetBusinessDetail();
+                        gb.getBusinessKey().add(businessKey);
+                        BusinessDetail bd = inquiry.getBusinessDetail(gb);
+                        List<BusinessEntity> beOutList = bd.getBusinessEntity();
+                        BusinessEntity beOut = beOutList.get(0);
+                        //We are expecting 2 services
+                        assertEquals(2, beOut.getBusinessServices().getBusinessService().size());
+
+                        //Now updating the business by adding another description
+                        SaveBusiness sb = new SaveBusiness();
+                        sb.setAuthInfo(authInfo);
+                        BusinessEntity beIn = beOut;
+                        Description desc2 = new Description();
+                        desc2.setLang("nl");
+                        desc2.setValue("Omschrijving");
+                        beIn.getDescription().add(desc2);
+                        sb.getBusinessEntity().add(beIn);
+                        publication.saveBusiness(sb);
+
+                        // Now get the entity and check the values
+                        BusinessDetail bdnew = inquiry.getBusinessDetail(gb);
+                        List<BusinessEntity> beOutListNew = bdnew.getBusinessEntity();
+                        BusinessEntity beOutNew = beOutListNew.get(0);
+
+                        assertEquals(beIn.getBusinessKey(), beOutNew.getBusinessKey());
+                        // After the update we still are supposed to see two services.
+                        assertNotNull(beOutNew.getBusinessServices());
+                        assertEquals(2, beOutNew.getBusinessServices().getBusinessService().size());
+
+
+                } catch (Throwable e) {
+                        logger.error(e.getMessage(), e);
+                        Assert.fail("No exception should be thrown");
+                }
+
+        }
+
+        public void deleteBusinesses(String authInfo, String businessXML, String businessKey, int numberOfCopies) {
+                try {
+                        for (int i = 0; i < numberOfCopies; i++) {
+                                // Delete the entity and make sure it is removed
+                                String key = businessKey + "-" + i;
+                                DeleteBusiness db = new DeleteBusiness();
+                                db.setAuthInfo(authInfo);
+                                db.getBusinessKey().add(key);
+                                publication.deleteBusiness(db);
+                                logger.debug("Deleted business with key " + key);
+                        }
+
+                } catch (Exception e) {
+                        logger.error(e.getMessage(), e);
+                        Assert.fail("No exception should be thrown");
+                }
+        }
+
+        public void deleteBusiness(String authInfo, String businessXML, String businessKey) {
+                try {
+                        // Delete the entity and make sure it is removed
+                        DeleteBusiness db = new DeleteBusiness();
+                        db.setAuthInfo(authInfo);
+                        db.getBusinessKey().add(businessKey);
+                        publication.deleteBusiness(db);
+
+                } catch (Exception e) {
+                        logger.error(e.getMessage(), e);
+                        Assert.fail("No exception should be thrown");
+                }
+        }
 }
\ No newline at end of file

Modified: juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusinessService.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusinessService.java?rev=1555648&r1=1555647&r2=1555648&view=diff
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusinessService.java (original)
+++ juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckBusinessService.java Mon Jan  6 02:18:37 2014
@@ -72,7 +72,7 @@ public class TckBusinessService 
 	}
 
 	public void saveJoePublisherServices(String authInfoJoe, int businessInt, int numberOfCopies) {
-		saveServices(authInfoJoe, businessInt, JOE_SERVICE_XML, JOE_SERVICE_KEY, numberOfCopies);
+		saveServices(authInfoJoe, businessInt, JOE_SERVICE_XML, JOE_SERVICE_KEY, numberOfCopies, TckBusiness.JOE_BUSINESS_KEY);
 	}
 	
 	public void deleteJoePublisherService(String authInfoJoe) {
@@ -101,7 +101,7 @@ public class TckBusinessService 
 	}
 	
 	public void saveSamSyndicatorServices(String authInfoSam, int businessInt, int numberOfCopies) {
-		saveServices(authInfoSam, businessInt, SAM_SERVICE_XML, SAM_SERVICE_KEY, numberOfCopies);
+		saveServices(authInfoSam, businessInt, SAM_SERVICE_XML, SAM_SERVICE_KEY, numberOfCopies, TckBusiness.SAM_BUSINESS_KEY);
 	}
 	
 	public void deleteSamSyndicatorService(String authInfoSam) {
@@ -112,7 +112,7 @@ public class TckBusinessService 
 		deleteServices(authInfoSam, businessInt, SAM_SERVICE_KEY, numberOfCopies);
 	}
 	
-	public void saveServices(String authInfo, int businessInt, String serviceXML, String serviceKey, int numberOfCopies) {
+	public void saveServices(String authInfo, int businessInt, String serviceXML, String serviceKey, int numberOfCopies, String parentBusinessKey) {
 		SaveService ss = null;
 		try {
 			org.uddi.api_v3.BusinessService bsIn = (org.uddi.api_v3.BusinessService)EntityCreator.buildFromDoc(serviceXML, "org.uddi.api_v3");
@@ -123,7 +123,7 @@ public class TckBusinessService 
 				ss = new SaveService();
 				ss.setAuthInfo(authInfo);
 				bsIn.getName().get(0).setValue(serviceName + "-" + i);
-				bsIn.setBusinessKey(TckBusiness.JOE_BUSINESS_KEY + "-" + businessInt);
+				bsIn.setBusinessKey(parentBusinessKey);
 				bsIn.setServiceKey(serviceKey + "-" + businessInt + "-" + i);
 				bsIn.getBindingTemplates().getBindingTemplate().get(0).setBindingKey(bindingKey + "-" + businessInt + "-" + i);
 				bsIn.getBindingTemplates().getBindingTemplate().get(0).setServiceKey(serviceKey + "-" + businessInt + "-" + i);
@@ -135,7 +135,7 @@ public class TckBusinessService 
 				}
 				
 				publication.saveService(ss);
-				logger.debug("Add service with key " + bsIn.getServiceKey());
+				logger.info("Add service with key " + bsIn.getServiceKey());
 			}
 		}
 		catch(Exception e) {
@@ -150,6 +150,7 @@ public class TckBusinessService 
 	
 	public String saveService(String authInfo, String serviceXML, String serviceKey, String description) {
 		try {
+                        logger.info("saving service key " + serviceKey + " from " + serviceXML);
 			// First save the entity
 			SaveService ss = new SaveService();
 			ss.setAuthInfo(authInfo);

Added: juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckCommon.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckCommon.java?rev=1555648&view=auto
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckCommon.java (added)
+++ juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckCommon.java Mon Jan  6 02:18:37 2014
@@ -0,0 +1,328 @@
+/*
+ * Copyright 2013 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.apache.juddi.v3.tck;
+
+import java.util.List;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.uddi.api_v3.BindingTemplates;
+import org.uddi.api_v3.BusinessEntity;
+import org.uddi.api_v3.BusinessInfos;
+import org.uddi.api_v3.BusinessList;
+import org.uddi.api_v3.CategoryBag;
+import org.uddi.api_v3.Contacts;
+import org.uddi.api_v3.DeleteBusiness;
+import org.uddi.api_v3.Description;
+import org.uddi.api_v3.FindBusiness;
+import org.uddi.api_v3.FindQualifiers;
+import org.uddi.api_v3.FindService;
+import org.uddi.api_v3.FindTModel;
+import org.uddi.api_v3.KeyedReference;
+import org.uddi.api_v3.Name;
+import org.uddi.api_v3.ServiceInfos;
+import org.uddi.api_v3.ServiceList;
+import org.uddi.api_v3.TModelList;
+import org.uddi.sub_v3.DeleteSubscription;
+import org.uddi.sub_v3.Subscription;
+import org.uddi.v3_service.UDDIInquiryPortType;
+import org.uddi.v3_service.UDDIPublicationPortType;
+import org.uddi.v3_service.UDDISubscriptionPortType;
+
+/**
+ * Common Utlities for TCK tests
+ *
+ * @author Alex O'Ree
+ */
+public class TckCommon {
+
+        private static Log logger = LogFactory.getLog(TckCommon.class);
+//<editor-fold defaultstate="collapsed" desc="Some basic util functions to print out the data structure">
+
+        /**
+         * Converts category bags of tmodels to a readable string
+         *
+         * @param categoryBag
+         * @return
+         */
+        public static String CatBagToString(CategoryBag categoryBag) {
+                StringBuilder sb = new StringBuilder();
+                if (categoryBag == null) {
+                        return "no data";
+                }
+                for (int i = 0; i < categoryBag.getKeyedReference().size(); i++) {
+                        sb.append(KeyedReferenceToString(categoryBag.getKeyedReference().get(i)));
+                }
+                for (int i = 0; i < categoryBag.getKeyedReferenceGroup().size(); i++) {
+                        sb.append("Key Ref Grp: TModelKey=");
+                        for (int k = 0; k < categoryBag.getKeyedReferenceGroup().get(i).getKeyedReference().size(); k++) {
+                                sb.append(KeyedReferenceToString(categoryBag.getKeyedReferenceGroup().get(i).getKeyedReference().get(k)));
+                        }
+                }
+                return sb.toString();
+        }
+
+        public static String KeyedReferenceToString(KeyedReference item) {
+                StringBuilder sb = new StringBuilder();
+                sb.append("Key Ref: Name=").
+                        append(item.getKeyName()).
+                        append(" Value=").
+                        append(item.getKeyValue()).
+                        append(" tModel=").
+                        append(item.getTModelKey()).
+                        append(System.getProperty("line.separator"));
+                return sb.toString();
+        }
+
+        public static void PrintContacts(Contacts contacts) {
+                if (contacts == null) {
+                        return;
+                }
+                for (int i = 0; i < contacts.getContact().size(); i++) {
+                        System.out.println("Contact " + i + " type:" + contacts.getContact().get(i).getUseType());
+                        for (int k = 0; k < contacts.getContact().get(i).getPersonName().size(); k++) {
+                                System.out.println("Name: " + contacts.getContact().get(i).getPersonName().get(k).getValue());
+                        }
+                        for (int k = 0; k < contacts.getContact().get(i).getEmail().size(); k++) {
+                                System.out.println("Email: " + contacts.getContact().get(i).getEmail().get(k).getValue());
+                        }
+                        for (int k = 0; k < contacts.getContact().get(i).getAddress().size(); k++) {
+                                System.out.println("Address sort code " + contacts.getContact().get(i).getAddress().get(k).getSortCode());
+                                System.out.println("Address use type " + contacts.getContact().get(i).getAddress().get(k).getUseType());
+                                System.out.println("Address tmodel key " + contacts.getContact().get(i).getAddress().get(k).getTModelKey());
+                                for (int x = 0; x < contacts.getContact().get(i).getAddress().get(k).getAddressLine().size(); x++) {
+                                        System.out.println("Address line value " + contacts.getContact().get(i).getAddress().get(k).getAddressLine().get(x).getValue());
+                                        System.out.println("Address line key name " + contacts.getContact().get(i).getAddress().get(k).getAddressLine().get(x).getKeyName());
+                                        System.out.println("Address line key value " + contacts.getContact().get(i).getAddress().get(k).getAddressLine().get(x).getKeyValue());
+                                }
+                        }
+                        for (int k = 0; k < contacts.getContact().get(i).getDescription().size(); k++) {
+                                System.out.println("Desc: " + contacts.getContact().get(i).getDescription().get(k).getValue());
+                        }
+                        for (int k = 0; k < contacts.getContact().get(i).getPhone().size(); k++) {
+                                System.out.println("Phone: " + contacts.getContact().get(i).getPhone().get(k).getValue());
+                        }
+                }
+
+        }
+
+        /**
+         * This function is useful for translating UDDI's somewhat complex data
+         * format to something that is more useful.
+         *
+         * @param bindingTemplates
+         */
+        public static void PrintBindingTemplates(BindingTemplates bindingTemplates) {
+                if (bindingTemplates == null) {
+                        return;
+                }
+                for (int i = 0; i < bindingTemplates.getBindingTemplate().size(); i++) {
+                        System.out.println("Binding Key: " + bindingTemplates.getBindingTemplate().get(i).getBindingKey());
+
+                        if (bindingTemplates.getBindingTemplate().get(i).getAccessPoint() != null) {
+                                System.out.println("Access Point: " + bindingTemplates.getBindingTemplate().get(i).getAccessPoint().getValue() + " type " + bindingTemplates.getBindingTemplate().get(i).getAccessPoint().getUseType());
+                        }
+
+                        if (bindingTemplates.getBindingTemplate().get(i).getHostingRedirector() != null) {
+                                System.out.println("Hosting Redirection: " + bindingTemplates.getBindingTemplate().get(i).getHostingRedirector().getBindingKey());
+                        }
+                }
+        }
+
+        public static void PrintBusinessInfo(BusinessInfos businessInfos) {
+                if (businessInfos == null) {
+                        System.out.println("No data returned");
+                } else {
+                        for (int i = 0; i < businessInfos.getBusinessInfo().size(); i++) {
+                                System.out.println("===============================================");
+                                System.out.println("Business Key: " + businessInfos.getBusinessInfo().get(i).getBusinessKey());
+                                System.out.println("Name: " + ListToString(businessInfos.getBusinessInfo().get(i).getName()));
+
+                                System.out.println("Name: " + ListToDescString(businessInfos.getBusinessInfo().get(i).getDescription()));
+                                System.out.println("Services:");
+                                PrintServiceInfo(businessInfos.getBusinessInfo().get(i).getServiceInfos());
+                        }
+                }
+        }
+
+        public static String ListToString(List<Name> name) {
+                StringBuilder sb = new StringBuilder();
+                for (int i = 0; i < name.size(); i++) {
+                        sb.append(name.get(i).getValue()).append(" ");
+                }
+                return sb.toString();
+        }
+
+        public static String ListToDescString(List<Description> name) {
+                StringBuilder sb = new StringBuilder();
+                for (int i = 0; i < name.size(); i++) {
+                        sb.append(name.get(i).getValue()).append(" ");
+                }
+                return sb.toString();
+        }
+
+        public static void PrintServiceInfo(ServiceInfos serviceInfos) {
+                for (int i = 0; i < serviceInfos.getServiceInfo().size(); i++) {
+                        System.out.println("-------------------------------------------");
+                        System.out.println("Service Key: " + serviceInfos.getServiceInfo().get(i).getServiceKey());
+                        System.out.println("Owning Business Key: " + serviceInfos.getServiceInfo().get(i).getBusinessKey());
+                        System.out.println("Name: " + ListToString(serviceInfos.getServiceInfo().get(i).getName()));
+                }
+        }
+
+        public static void PrintBusinessDetails(List<BusinessEntity> businessDetail) {
+
+
+                for (int i = 0; i < businessDetail.size(); i++) {
+                        System.out.println("Business Detail - key: " + businessDetail.get(i).getBusinessKey());
+                        System.out.println("Name: " + ListToString(businessDetail.get(i).getName()));
+                        System.out.println("CategoryBag: " + CatBagToString(businessDetail.get(i).getCategoryBag()));
+                        PrintContacts(businessDetail.get(i).getContacts());
+                }
+        }
+
+        /**
+         * use this for clean up actions after running tests. if an exception is
+         * raised, it will only be logged
+         *
+         * @param key
+         * @param authInfo
+         * @param publish
+         */
+        public static void DeleteBusiness(String key, String authInfo, UDDIPublicationPortType publish) {
+                if (key == null) {
+                        return;
+                }
+                try {
+                        DeleteBusiness db = new DeleteBusiness();
+                        db.setAuthInfo(authInfo);
+                        db.getBusinessKey().add(key);
+                        publish.deleteBusiness(db);
+                } catch (Exception ex) {
+                        logger.warn("failed to delete business " + key + " " + ex.getMessage());
+                        logger.debug("failed to delete business " + key + " " + ex.getMessage(), ex);
+                }
+        }
+
+        public static void removeAllExistingSubscriptions(String authinfo, UDDISubscriptionPortType sub) {
+                List<Subscription> subscriptions;
+                try {
+                        subscriptions = sub.getSubscriptions(authinfo);
+
+                        DeleteSubscription ds = new DeleteSubscription();
+                        ds.setAuthInfo(authinfo);
+                        for (int i = 0; i < subscriptions.size(); i++) {
+                                ds.getSubscriptionKey().add(subscriptions.get(i).getSubscriptionKey());
+                        }
+                        if (!subscriptions.isEmpty()) {
+                                logger.info("Purging " + subscriptions.size() + " old subscriptions");
+                                sub.deleteSubscription(ds);
+                        }
+                } catch (Exception ex) {
+                        logger.warn("error clearing subscriptions", ex);
+                }
+        }
+
+        /**
+         * returns true if the environment variable "debug" is equal to "true"
+         * @return 
+         */
+        public static boolean isDebug() {
+                boolean serialize = false;
+                try {
+                        if (System.getProperty("debug") != null
+                                && System.getProperty("debug").equalsIgnoreCase("true")) {
+                                serialize = true;
+                        }
+                } catch (Exception ex) {
+                }
+                return serialize;
+        }
+        
+        
+         public static String DumpAllServices(String authinfo, UDDIInquiryPortType inquiry) {
+                StringBuilder sb = new StringBuilder();
+                FindService fs = new FindService();
+                fs.setAuthInfo(authinfo);
+                fs.setFindQualifiers(new FindQualifiers());
+                fs.getFindQualifiers().getFindQualifier().add("approximateMatch");
+                fs.getName().add(new Name("%", null));
+                try {
+                        ServiceList findService = inquiry.findService(fs);
+                        if (findService.getServiceInfos() == null) {
+                                return ("NO SERVICES RETURNED!");
+                        } else {
+                                for (int i = 0; i < findService.getServiceInfos().getServiceInfo().size(); i++) {
+                                        sb.append(findService.getServiceInfos().getServiceInfo().get(i).getName().get(0).getValue()).append(" lang=").append(findService.getServiceInfos().getServiceInfo().get(i).getName().get(0).getLang()).append(" ").append(findService.getServiceInfos().getServiceInfo().get(i).getServiceKey()).append(" ").append(findService.getServiceInfos().getServiceInfo().get(i).getBusinessKey()).append(
+                                                System.getProperty("line.separator"));
+                                }
+                        }
+                } catch (Exception ex) {
+                        sb.append(ex.getMessage());
+                }
+                return sb.toString();
+        }
+
+         
+        public static String DumpAllTModels(String authinfo, UDDIInquiryPortType inquriy) {
+                StringBuilder sb = new StringBuilder();
+                FindTModel fs = new FindTModel();
+                fs.setAuthInfo(authinfo);
+                fs.setFindQualifiers(new FindQualifiers());
+                fs.getFindQualifiers().getFindQualifier().add("approximateMatch");
+                fs.setName(new Name("%", null));
+                try {
+                        TModelList findService = inquriy.findTModel(fs);
+                        if (findService.getTModelInfos()== null) {
+                                return ("NO TMODELS RETURNED!");
+                        } else {
+                                for (int i = 0; i < findService.getTModelInfos().getTModelInfo().size(); i++) {
+                                        sb.append(findService.getTModelInfos().getTModelInfo().get(i).getName().getValue()).
+                                                append(" lang=").append(findService.getTModelInfos().getTModelInfo().get(i).getName().getLang()).
+                                                append(" ").append(findService.getTModelInfos().getTModelInfo().get(i).getTModelKey())
+                                                .append(System.getProperty("line.separator"));
+                                }
+                        }
+                } catch (Exception ex) {
+                        return ex.getMessage();
+                }
+                return sb.toString();
+        }         
+        public static String DumpAllBusinesses(String authinfo, UDDIInquiryPortType inquriy) {
+                StringBuilder sb = new StringBuilder();
+                FindBusiness fs = new FindBusiness();
+                fs.setAuthInfo(authinfo);
+                fs.setFindQualifiers(new FindQualifiers());
+                fs.getFindQualifiers().getFindQualifier().add("approximateMatch");
+                fs.getName().add(new Name("%", null));
+                try {
+                        BusinessList findService = inquriy.findBusiness(fs);
+                        if (findService.getBusinessInfos() == null) {
+                                return ("NO BUSINESSES RETURNED!");
+                        } else {
+                                for (int i = 0; i < findService.getBusinessInfos().getBusinessInfo().size(); i++) {
+                                        sb.append(findService.getBusinessInfos().getBusinessInfo().get(i).getName().get(0).getValue()).
+                                                append(" lang=").append(findService.getBusinessInfos().getBusinessInfo().get(i).getName().get(0).getLang()).
+                                                append(" ").append(findService.getBusinessInfos().getBusinessInfo().get(i).getBusinessKey())
+                                                .append(System.getProperty("line.separator"));
+                                }
+                        }
+                } catch (Exception ex) {
+                        return ex.getMessage();
+                }
+                return sb.toString();
+        }
+
+}

Modified: juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java?rev=1555648&r1=1555647&r2=1555648&view=diff
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java (original)
+++ juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckPublisher.java Mon Jan  6 02:18:37 2014
@@ -14,85 +14,222 @@
  */
 package org.apache.juddi.v3.tck;
 
+import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
  * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
+ * @author <a href="mailto:alexoree@apache.org">Alex O'Ree</a>
  */
-public class TckPublisher 
-{	
-	private static Properties tckProperties = new Properties();
-	public final static String JOE_PUBLISHER_XML    = "uddi_data/joepublisher/publisher.xml";
-	public final static String TMODEL_PUBLISHER_XML = "uddi_data/tmodels/publisher.xml";
-	public final static String SAM_SYNDICATOR_XML   = "uddi_data/samsyndicator/publisher.xml";
-    public final static String MARY_PUBLISHER_XML   = "uddi_data/marypublisher/publisher.xml";
-    
-	static {
-		try {
-			InputStream inputSteam = TckPublisher.class.getResourceAsStream("/tck.properties");
-			tckProperties.load(inputSteam);
-		} catch (IOException ioe) {
-			ioe.printStackTrace();
-		}
-	}
-
-  
-    public final static String getRootPublisherId() {
-    	return tckProperties.getProperty(Property.ROOT_PUBLISHER);
-    }
-    
-    public final static String getRootPassword() {
-    	return tckProperties.getProperty(Property.ROOT_PASSWORD);
-    }
-    
-    public final static String getUDDIPublisherId() {
-    	return tckProperties.getProperty(Property.UDDI_PUBLISHER);
-    }
-    
-    public final static String getUDDIPassword() {
-    	return tckProperties.getProperty(Property.UDDI_PASSWORD);
-    }
-    
-    public final static String getJoePublisherId() {
-    	return tckProperties.getProperty(Property.JOE_PUBLISHER);
-    }
-    
-    public final static String getJoePassword() {
-    	return tckProperties.getProperty(Property.JOE_PASSWORD);
-    }
-    
-    public final static String getTModelPublisherId() {
-    	return tckProperties.getProperty(Property.TMODEL_PUBLISHER);
-    }
-    
-    public final static String getTModelPassword() {
-    	return tckProperties.getProperty(Property.TMODEL_PASSWORD);
-    }
-    
-    public final static String getSamPublisherId() {
-    	return tckProperties.getProperty(Property.SAM_PUBLISHER);
-    }
-    
-    public final static String getSamPassword() {
-    	return tckProperties.getProperty(Property.SAM_PASSWORD);
-    }
-    
-    public final static String getMaryPublisherId() {
-    	return tckProperties.getProperty(Property.MARY_PUBLISHER);
-    }
-    
-    public final static String getMaryPassword() {
-    	return tckProperties.getProperty(Property.MARY_PASSWORD);
-    }
-    
-    public final static String getRiftSawPublisherId() {
-    	return tckProperties.getProperty(Property.RIFTSAW_PUBLISHER);
-    }
-    
-    public final static String getRiftSawPassword() {
-    	return tckProperties.getProperty(Property.RIFTSAW_PASSWORD);
-    }
+public class TckPublisher {
+
+        private static Properties tckProperties = new Properties();
+        public final static String JOE_PUBLISHER_XML = "uddi_data/joepublisher/publisher.xml";
+        //public final static String TMODEL_PUBLISHER_XML = "uddi_data/tmodels/publisher.xml";
+        public final static String SAM_SYNDICATOR_XML = "uddi_data/samsyndicator/publisher.xml";
+        public final static String MARY_PUBLISHER_XML = "uddi_data/marypublisher/publisher.xml";
+
+        private static Log logger = LogFactory.getLog(TckPublisher.class);
+        static {
+                InputStream inputSteam = null;
+                try {
+                        File f = new File("tck.properties");
+
+                        if (f.exists()) {
+                                
+                                inputSteam = new FileInputStream(f);
+                                logger.info("Loading tck.properties from " + f.getAbsolutePath());
+                        } else {
+                                inputSteam = TckPublisher.class.getResourceAsStream("/tck.properties");
+                                logger.info("Loading tck.properties as a classpath resource, probable within uddi-tck-base.jar");
+                        }
+                        tckProperties.load(inputSteam);
+                } catch (IOException ioe) {
+                        ioe.printStackTrace();
+                } finally {
+                        if (inputSteam != null) {
+                                try {
+                                        inputSteam.close();
+                                } catch (Exception ex) {
+                                }
+                        }
+                }
+        }
+
+        public final static String getRootPublisherId() {
+                return tckProperties.getProperty(Property.ROOT_PUBLISHER);
+        }
+
+        public final static String getRootPassword() {
+                return tckProperties.getProperty(Property.ROOT_PASSWORD);
+        }
+
+        public final static String getUDDIPublisherId() {
+                return tckProperties.getProperty(Property.UDDI_PUBLISHER);
+        }
+
+        public final static String getUDDIPassword() {
+                return tckProperties.getProperty(Property.UDDI_PASSWORD);
+        }
+
+        public final static String getJoePublisherId() {
+                return tckProperties.getProperty(Property.JOE_PUBLISHER);
+        }
+
+        public final static String getJoePassword() {
+                return tckProperties.getProperty(Property.JOE_PASSWORD);
+        }
+
+        public final static String getTModelPublisherId() {
+                return tckProperties.getProperty(Property.TMODEL_PUBLISHER);
+        }
+
+        public final static String getTModelPassword() {
+                return tckProperties.getProperty(Property.TMODEL_PASSWORD);
+        }
+
+        public final static String getSamPublisherId() {
+                return tckProperties.getProperty(Property.SAM_PUBLISHER);
+        }
+
+        public final static String getSamPassword() {
+                return tckProperties.getProperty(Property.SAM_PASSWORD);
+        }
+
+        public final static String getMaryPublisherId() {
+                return tckProperties.getProperty(Property.MARY_PUBLISHER);
+        }
+
+        public final static String getMaryPassword() {
+                return tckProperties.getProperty(Property.MARY_PASSWORD);
+        }
+
+        public final static String getRiftSawPublisherId() {
+                return tckProperties.getProperty(Property.RIFTSAW_PUBLISHER);
+        }
+
+        public final static String getRiftSawPassword() {
+                return tckProperties.getProperty(Property.RIFTSAW_PASSWORD);
+        }
+
+        public static boolean isUDDIAuthMode() {
+                String x = tckProperties.getProperty("auth_mode");
+                if (x != null && x.equalsIgnoreCase("uddi")) {
+                        return true;
+                }
+                return false;
+        }
+
+        public static boolean isReplicationEnabled() {
+                String x = tckProperties.getProperty("replication.enabled");
+                if (x != null && x.equalsIgnoreCase("true")) {
+                        return true;
+                }
+                return false;
+        }
+
+        public static boolean isInquiryRestEnabled() {
+                String x = tckProperties.getProperty("rest.enabled");
+                if (x != null && x.equalsIgnoreCase("true")) {
+                        return true;
+                }
+                return false;
+        }
+
+        public static boolean isValueSetAPIEnabled() {
+                String x = tckProperties.getProperty("vsv.enabled");
+                if (x != null && x.equalsIgnoreCase("true")) {
+                        return true;
+                }
+                return false;
+        }
+
+        public static boolean isSubscriptionEnabled() {
+                String x = tckProperties.getProperty("sub.enabled");
+                if (x != null && x.equalsIgnoreCase("true")) {
+                        return true;
+                }
+                return false;
+        }
+
+        public static boolean isCustodyTransferEnabled() {
+                String x = tckProperties.getProperty("transfer.enabled");
+                if (x != null && x.equalsIgnoreCase("true")) {
+                        return true;
+                }
+                return false;
+        }
+
+        public static boolean isJUDDI() {
+                String x = tckProperties.getProperty("isJuddi");
+                if (x.equalsIgnoreCase("true")) {
+                        return true;
+                }
+                return false;
+        }
+
+        public static boolean isRMI() {
+                String x = tckProperties.getProperty("rmi.enabled");
+                if (x.equalsIgnoreCase("true")) {
+                        return true;
+                }
+                return false;
+        }
+
+        public static boolean isLoadTest() {
+                String x = tckProperties.getProperty("loadtest.enable");
+                if (x.equalsIgnoreCase("true")) {
+                        return true;
+                }
+                return false;
+        }
+
+        public static boolean isBPEL() {
+                String x = tckProperties.getProperty("bpel.enable");
+                if (x.equalsIgnoreCase("true")) {
+                        return true;
+                }
+                return false;
+        }
+
+        public static int getMaxLoadServices() {
+                String x = tckProperties.getProperty("loadtest.maxbusinesses");
+                if (x != null) {
+                        try {
+                                return Integer.parseInt(x);
+                        } catch (Exception ex) {
+                                ex.printStackTrace();
+                        }
+                }
+
+                return 1100;
+        }
+
+        public static Properties getProperties() {
+                return tckProperties;
+        }
+
+        /**
+         * time in seconds, default is 60
+         *
+         * @return
+         */
+        public static int getSubscriptionTimeout() {
+                String x = tckProperties.getProperty("sub.timeout");
+                if (x != null) {
+                        try {
+                                return Integer.parseInt(x);
+                        } catch (Exception ex) {
+                                ex.printStackTrace();
+                        }
+                }
+
+                return 60;
+        }
 }
\ No newline at end of file

Modified: juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSecurity.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSecurity.java?rev=1555648&r1=1555647&r2=1555648&view=diff
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSecurity.java (original)
+++ juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSecurity.java Mon Jan  6 02:18:37 2014
@@ -15,6 +15,7 @@
 package org.apache.juddi.v3.tck;
 
 import java.rmi.RemoteException;
+import javax.xml.ws.BindingProvider;
 
 import org.uddi.v3_service.DispositionReportFaultMessage;
 import org.uddi.v3_service.UDDISecurityPortType;
@@ -26,6 +27,8 @@ public class TckSecurity {
 
 	public static String getAuthToken(UDDISecurityPortType securityService, String pubId, String cred) throws DispositionReportFaultMessage, RemoteException {
 	
+                if (!TckPublisher.isUDDIAuthMode())
+                        return null;
 		org.uddi.api_v3.GetAuthToken ga = new org.uddi.api_v3.GetAuthToken();
 		ga.setUserID(pubId);
 		ga.setCred(cred);
@@ -35,4 +38,15 @@ public class TckSecurity {
 		return token.getAuthInfo();
 	}
 
+        /**
+         * used for non UDDI AuthToken authentication. I.e. HTTP NTLM, HTTP BASIC, HTTP DIGEST
+         * @param bindingProvider
+         * @param publisherId
+         * @param password 
+         */
+        public static void setCredentials(BindingProvider bindingProvider, String publisherId, String password) {
+                bindingProvider.getRequestContext().put(BindingProvider.USERNAME_PROPERTY, publisherId);
+                bindingProvider.getRequestContext().put(BindingProvider.PASSWORD_PROPERTY, password);
+        }
+
 }

Modified: juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscription.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscription.java?rev=1555648&r1=1555647&r2=1555648&view=diff
==============================================================================
--- juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscription.java (original)
+++ juddi/trunk/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckSubscription.java Mon Jan  6 02:18:37 2014
@@ -35,13 +35,13 @@ import org.uddi.sub_v3.GetSubscriptionRe
 import org.uddi.sub_v3.KeyBag;
 import org.uddi.sub_v3.Subscription;
 import org.uddi.sub_v3.SubscriptionResultsList;
-import org.uddi.v3_service.UDDISecurityPortType;
 import org.uddi.v3_service.UDDISubscriptionPortType;
 import static junit.framework.Assert.assertEquals;
 import org.uddi.api_v3.CategoryBag;
 import org.uddi.api_v3.FindTModel;
 import org.uddi.api_v3.KeyedReference;
 import org.uddi.v3_service.UDDIInquiryPortType;
+import org.uddi.v3_service.UDDISecurityPortType;
 
 /**
  * @author <a href="mailto:jfaath@apache.org">Jeff Faath</a>
@@ -62,10 +62,7 @@ public class TckSubscription 
 	final static String SAM_SUBSCRIPTION2_XML = "uddi_data/subscription/subscription3.xml";
     final static String SAM_SUBSCRIPTION2_KEY = "uddi:www.samco.com:subscriptiontwo";
 	final static String SAM_SUBSCRIPTIONRESULTS2_XML = "uddi_data/subscription/subscriptionresults3.xml";
-        /**
-         * this represents how many find qualifiers are present in the juddi install_data
-         */
-	 static int FINDQUALIFIER_TMODEL_TOTAL = 23;
+	 static int FINDQUALIFIER_TMODEL_TOTAL = 22;
 
 	final static String SAM_SUBSCRIPTION3_XML = "uddi_data/subscription/subscription4.xml";
     final static String SAM_SUBSCRIPTION3_KEY = "uddi:www.samco.com:subscriptionthree";
@@ -73,14 +70,14 @@ public class TckSubscription 
 	
 	private Log logger = LogFactory.getLog(this.getClass());
     UDDISubscriptionPortType subscription = null;
-        UDDIInquiryPortType inquiry = null;
 	UDDISecurityPortType security = null;
+        UDDIInquiryPortType inquiry=null;
 	
-	public TckSubscription(UDDISubscriptionPortType subscription, UDDISecurityPortType security, UDDIInquiryPortType inquiry) {
+	public TckSubscription(UDDISubscriptionPortType subscription,UDDISecurityPortType security,UDDIInquiryPortType inquiry) {
 		super();
 		this.subscription = subscription;
 		this.security = security;
-                this.inquiry = inquiry;
+                this.inquiry=inquiry;
 	}
 
 	public void saveJoePublisherSubscription(String authInfoJoe, String subscriptionXML,String subscriptionKey) {
@@ -211,7 +208,7 @@ public class TckSubscription 
 			Subscription subIn = (Subscription)EntityCreator.buildFromDoc(SAM_SUBSCRIPTION2_XML, "org.uddi.sub_v3");
 			
 			int expectedIterations = FINDQUALIFIER_TMODEL_TOTAL / subIn.getMaxEntities();
-                        if (FINDQUALIFIER_TMODEL_TOTAL % subIn.getMaxEntities() >0)
+			if (FINDQUALIFIER_TMODEL_TOTAL % subIn.getMaxEntities() >0)
 				expectedIterations++;
 			
                         



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


Mime
View raw message