You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by ks...@apache.org on 2011/01/21 19:58:21 UTC
svn commit: r1061967 [1/2] - in /juddi/trunk:
juddi-client/src/main/java/org/apache/juddi/v3/client/config/
juddi-client/src/main/java/org/apache/juddi/v3/client/embed/
juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/
juddi-core-openjpa/src/...
Author: kstam
Date: Fri Jan 21 18:58:20 2011
New Revision: 1061967
URL: http://svn.apache.org/viewvc?rev=1061967&view=rev
Log:
JUDDI-450, removing dependency on juddi-core in the juddi-client, which was there for running in InVM (embedded) mode. We can now start an embedded UDDI server in the manager if needed.
Cleaning up the TCK tests
Added:
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/embed/
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/embed/EmbeddedRegistry.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/embed/JUDDIRegistry.java
Modified:
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkManager.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClientContainer.java
juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_010_PublisherTest.java
juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_020_TmodelTest.java
juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_030_BusinessEntityTest.java
juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_040_BusinessServiceTest.java
juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_050_BindingTemplateTest.java
juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_060_PublisherAssertionTest.java
juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_070_FindEntityTest.java
juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_080_SubscriptionTest.java
juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_100_ClientSubscriptionInfoTest.java
juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/subscription/SubscriptionNotifierTest.java
juddi/trunk/uddi-tck/src/main/resources/META-INF/uddi.xml
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_010_PublisherIntegrationTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_100_ClientSubscriptionInfoTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_010_PublisherIntegrationTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_020_TmodelIntegrationTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityLoadTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_060_PublisherAssertionIntegrationTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_070_FindEntityIntegrationTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_110_FindServicesIntegrationTest.java
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java?rev=1061967&r1=1061966&r2=1061967&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/ClientConfig.java Fri Jan 21 18:58:20 2011
@@ -48,6 +48,7 @@ public class ClientConfig
private Set<XRegistration> xBusinessRegistrations = null;
private Set<XRegistration> xServiceBindingRegistrations = null;
private String managerName = null;
+ private String configurationFile=null;
/**
* Constructor (note Singleton pattern).
@@ -86,6 +87,7 @@ public class ClientConfig
}
}
log.info("Reading UDDI Client properties file " + xmlConfig.getBasePath());
+ this.configurationFile = xmlConfig.getBasePath();
long refreshDelay = xmlConfig.getLong(Property.UDDI_RELOAD_DELAY, 1000l);
log.debug("Setting refreshDelay to " + refreshDelay);
FileChangedReloadingStrategy fileChangedReloadingStrategy = new FileChangedReloadingStrategy();
@@ -249,4 +251,8 @@ public class ClientConfig
public String getManagerName() {
return managerName;
}
+
+ public String getConfigurationFile() {
+ return configurationFile;
+ }
}
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkManager.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkManager.java?rev=1061967&r1=1061966&r2=1061967&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkManager.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkManager.java Fri Jan 21 18:58:20 2011
@@ -25,7 +25,11 @@ import java.util.Set;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.juddi.v3.client.embed.EmbeddedRegistry;
import org.apache.juddi.v3.annotations.AnnotationProcessor;
+import org.apache.juddi.v3.client.ClassUtil;
+import org.apache.juddi.v3.client.transport.InVMTransport;
+import org.apache.juddi.v3.client.transport.Transport;
import org.apache.juddi.v3.client.transport.TransportException;
import org.uddi.api_v3.BindingTemplate;
import org.uddi.api_v3.BusinessService;
@@ -56,6 +60,12 @@ public class UDDIClerkManager {
log.info("Stopping UDDI Clerks for manager " + clientConfig.getManagerName());
releaseResources();
UDDIClientContainer.removeClerkManager(getName());
+
+ //If running in embedded mode
+ if (InVMTransport.class.getCanonicalName().equals(getClientConfig().getHomeNode().getProxyTransport())) {
+ log.info("Shutting down embedded Server");
+ stopEmbeddedServer();
+ }
log.info("UDDI Clerks shutdown completed for manager " + clientConfig.getManagerName());
}
@@ -67,11 +77,42 @@ public class UDDIClerkManager {
* @throws ConfigurationException
*/
public void start() throws ConfigurationException {
+
+ //If running in embedded mode
+ if (InVMTransport.class.getCanonicalName().equals(getClientConfig().getHomeNode().getProxyTransport())) {
+ log.info("Starting embedded Server");
+ startEmbeddedServer();
+ }
+
Runnable runnable = new BackGroundRegistration(this);
Thread thread = new Thread(runnable);
thread.start();
}
+ protected void startEmbeddedServer() throws ConfigurationException {
+
+ try {
+ String embeddedServerClass = getClientConfig().getHomeNode().getProperties().getProperty("embeddedServer","org.apache.juddi.client.JUDDIRegistry");
+ Class<?> clazz = ClassUtil.forName(embeddedServerClass, this.getClass());
+ EmbeddedRegistry embeddedRegistry = (EmbeddedRegistry) clazz.newInstance();
+ embeddedRegistry.start();
+ } catch (Exception e) {
+ throw new ConfigurationException(e.getMessage(),e);
+ }
+ }
+
+ protected void stopEmbeddedServer() throws ConfigurationException {
+
+ try {
+ String embeddedServerClass = getClientConfig().getHomeNode().getProperties().getProperty("embeddedServer","org.apache.juddi.client.JUDDIRegistry");
+ Class<?> clazz = ClassUtil.forName(embeddedServerClass, this.getClass());
+ EmbeddedRegistry embeddedRegistry = (EmbeddedRegistry) clazz.newInstance();
+ embeddedRegistry.stop();
+ } catch (Exception e) {
+ throw new ConfigurationException(e.getMessage(),e);
+ }
+ }
+
public void restart() throws ConfigurationException {
stop();
start();
@@ -214,6 +255,35 @@ public class UDDIClerkManager {
public String getName() {
return clientConfig.getManagerName();
}
+ /**
+ * Returns the "default" jUDDI nodes Transport.
+ *
+ * @return
+ * @throws ConfigurationException
+ */
+ public Transport getTransport() throws ConfigurationException {
+ return getTransport("default");
+ }
+ /**
+ * Returns the transport defined for the node with the given nodeName.
+ * @param nodeName
+ * @return
+ * @throws ConfigurationException
+ */
+ public Transport getTransport(String nodeName) throws ConfigurationException {
+ try {
+ String clazz = clientConfig.getHomeNode().getProxyTransport();
+ Class<?> transportClass = ClassUtil.forName(clazz, UDDIClerkManager.class);
+ if (transportClass!=null) {
+ Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance(nodeName);
+ return transport;
+ } else {
+ throw new ConfigurationException ("ProxyTransport was not defined in the " + clientConfig.getConfigurationFile());
+ }
+ } catch (Exception e) {
+ throw new ConfigurationException (e.getMessage(),e);
+ }
+ }
}
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClientContainer.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClientContainer.java?rev=1061967&r1=1061966&r2=1061967&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClientContainer.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClientContainer.java Fri Jan 21 18:58:20 2011
@@ -38,7 +38,7 @@ public class UDDIClientContainer {
" Please check your client uddi.xml files, and make sure this manager was started");
}
} else if (managers.size()==1 && managerName==null) {
- log.debug("Deprecated, please specify a manager name");
+ log.info("Deprecated, please specify a manager name");
return managers.values().iterator().next();
} else {
log.info("Deprecated, please specify a manager name");
@@ -66,13 +66,4 @@ public class UDDIClientContainer {
}
}
- public static String getDefaultTransportClass() throws ConfigurationException {
- UDDIClerkManager manager = UDDIClientContainer.getUDDIClerkManager(null);
- return manager.getClientConfig().getUDDINode("default").getProxyTransport();
- }
-
-
-
-
-
}
Added: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/embed/EmbeddedRegistry.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/embed/EmbeddedRegistry.java?rev=1061967&view=auto
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/embed/EmbeddedRegistry.java (added)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/embed/EmbeddedRegistry.java Fri Jan 21 18:58:20 2011
@@ -0,0 +1,7 @@
+package org.apache.juddi.v3.client.embed;
+
+public interface EmbeddedRegistry {
+
+ public void start();
+ public void stop();
+}
Added: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/embed/JUDDIRegistry.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/embed/JUDDIRegistry.java?rev=1061967&view=auto
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/embed/JUDDIRegistry.java (added)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/embed/JUDDIRegistry.java Fri Jan 21 18:58:20 2011
@@ -0,0 +1,34 @@
+package org.apache.juddi.v3.client.embed;
+
+import java.lang.reflect.Method;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.juddi.v3.client.ClassUtil;
+
+public class JUDDIRegistry implements EmbeddedRegistry {
+
+ private Log logger = LogFactory.getLog(this.getClass());
+ public void start() {
+ try {
+ Class<?> juddiRegistry = ClassUtil.forName("org.apache.juddi.Registry", JUDDIRegistry.class);
+ Object jUDDI = juddiRegistry.newInstance();
+ Method startMethod = juddiRegistry.getDeclaredMethod("start");
+ startMethod.invoke(jUDDI);
+ } catch (Exception e) {
+ logger.error(e.getMessage(),e);
+ }
+ }
+
+ public void stop() {
+ try {
+ Class<?> juddiRegistry = ClassUtil.forName("org.apache.juddi.Registry", JUDDIRegistry.class);
+ Object jUDDI = juddiRegistry.newInstance();
+ Method startMethod = juddiRegistry.getDeclaredMethod("stop");
+ startMethod.invoke(jUDDI);
+ } catch (Exception e) {
+ logger.error(e.getMessage(),e);
+ }
+ }
+
+}
Modified: juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_010_PublisherTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_010_PublisherTest.java?rev=1061967&r1=1061966&r2=1061967&view=diff
==============================================================================
--- juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_010_PublisherTest.java (original)
+++ juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_010_PublisherTest.java Fri Jan 21 18:58:20 2011
@@ -71,7 +71,7 @@ public class API_010_PublisherTest {
//If it already there is probably has foreign key relationships.
//This test should really only run on an empty database. Seed
//data will be added if the root publisher is missing.
- if (!isExistPublisher(TckPublisher.JOE_PUBLISHER_ID)) {
+ if (!isExistPublisher(TckPublisher.getJoePublisherId())) {
saveJoePublisher();
deleteJoePublisher();
}
@@ -80,7 +80,7 @@ public class API_010_PublisherTest {
@Test
public void testSamSyndicator() {
//We can only test this if the publisher is not there already.
- if (!isExistPublisher(TckPublisher.SAM_SYNDICATOR_ID)) {
+ if (!isExistPublisher(TckPublisher.getSamPublisherId())) {
saveSamSyndicator();
deleteSamSyndicator();
}
@@ -91,8 +91,8 @@ public class API_010_PublisherTest {
* - false in all other cases.
*/
public boolean saveJoePublisher() {
- if (!isExistPublisher(TckPublisher.JOE_PUBLISHER_ID)) {
- savePublisher(TckPublisher.JOE_PUBLISHER_ID, TckPublisher.JOE_PUBLISHER_XML);
+ if (!isExistPublisher(TckPublisher.getJoePublisherId())) {
+ savePublisher(TckPublisher.getJoePublisherId(), TckPublisher.JOE_PUBLISHER_XML);
return true;
} else {
return false;
@@ -104,8 +104,8 @@ public class API_010_PublisherTest {
* - false in all other cases.
*/
public boolean saveMaryPublisher() {
- if (!isExistPublisher(TckPublisher.MARY_PUBLISHER_ID)) {
- savePublisher(TckPublisher.MARY_PUBLISHER_ID, TckPublisher.MARY_PUBLISHER_XML);
+ if (!isExistPublisher(TckPublisher.getMaryPublisherId())) {
+ savePublisher(TckPublisher.getMaryPublisherId(), TckPublisher.MARY_PUBLISHER_XML);
return true;
} else {
return false;
@@ -116,24 +116,24 @@ public class API_010_PublisherTest {
* are child objects attached; think Services etc.
*/
public void deleteJoePublisher() {
- deletePublisher(TckPublisher.JOE_PUBLISHER_ID);
+ deletePublisher(TckPublisher.getJoePublisherId());
}
/**
* Persists Sam Syndicator to the database.
* @return publisherId
*/
public String saveSamSyndicator() {
- if (!isExistPublisher(TckPublisher.SAM_SYNDICATOR_ID)) {
- savePublisher(TckPublisher.SAM_SYNDICATOR_ID, TckPublisher.SAM_SYNDICATOR_XML);
+ if (!isExistPublisher(TckPublisher.getSamPublisherId())) {
+ savePublisher(TckPublisher.getSamPublisherId(), TckPublisher.SAM_SYNDICATOR_XML);
}
- return TckPublisher.SAM_SYNDICATOR_ID;
+ return TckPublisher.getSamPublisherId();
}
/**
* Removes Sam Syndicator from the database, this will fail if there
* are child objects attached; think Services etc.
*/
public void deleteSamSyndicator() {
- deletePublisher(TckPublisher.SAM_SYNDICATOR_ID);
+ deletePublisher(TckPublisher.getSamPublisherId());
}
@@ -226,11 +226,11 @@ public class API_010_PublisherTest {
}
protected String authInfoJoe() throws RemoteException, DispositionReportFaultMessage {
- return TckSecurity.getAuthToken(security, TckPublisher.JOE_PUBLISHER_ID, TckPublisher.JOE_PUBLISHER_CRED);
+ return TckSecurity.getAuthToken(security, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
}
protected String authInfoSam() throws RemoteException, DispositionReportFaultMessage {
- return TckSecurity.getAuthToken(security, TckPublisher.SAM_SYNDICATOR_ID, TckPublisher.SAM_SYNDICATOR_CRED);
+ return TckSecurity.getAuthToken(security, TckPublisher.getSamPublisherId(), TckPublisher.getSamPassword());
}
}
Modified: juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_020_TmodelTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_020_TmodelTest.java?rev=1061967&r1=1061966&r2=1061967&view=diff
==============================================================================
--- juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_020_TmodelTest.java (original)
+++ juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_020_TmodelTest.java Fri Jan 21 18:58:20 2011
@@ -53,8 +53,8 @@ public class API_020_TmodelTest {
api010.saveJoePublisher();
api010.saveSamSyndicator();
UDDISecurityPortType security = new UDDISecurityImpl();
- authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.JOE_PUBLISHER_ID, TckPublisher.JOE_PUBLISHER_CRED);
- authInfoSam = TckSecurity.getAuthToken(security, TckPublisher.SAM_SYNDICATOR_ID, TckPublisher.SAM_SYNDICATOR_CRED);
+ authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
+ authInfoSam = TckSecurity.getAuthToken(security, TckPublisher.getSamPublisherId(), TckPublisher.getSamPassword());
} catch (DispositionReportFaultMessage e) {
logger.error(e.getMessage(), e);
Assert.fail("Could not obtain authInfo token.");
Modified: juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_030_BusinessEntityTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_030_BusinessEntityTest.java?rev=1061967&r1=1061966&r2=1061967&view=diff
==============================================================================
--- juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_030_BusinessEntityTest.java (original)
+++ juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_030_BusinessEntityTest.java Fri Jan 21 18:58:20 2011
@@ -52,8 +52,8 @@ public class API_030_BusinessEntityTest
api010.saveJoePublisher();
api010.saveSamSyndicator();
UDDISecurityPortType security = new UDDISecurityImpl();
- authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.JOE_PUBLISHER_ID, TckPublisher.JOE_PUBLISHER_CRED);
- authInfoSam = TckSecurity.getAuthToken(security, TckPublisher.SAM_SYNDICATOR_ID, TckPublisher.SAM_SYNDICATOR_CRED);
+ authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
+ authInfoSam = TckSecurity.getAuthToken(security, TckPublisher.getSamPublisherId(), TckPublisher.getSamPassword());
} catch (RemoteException e) {
logger.error(e.getMessage(), e);
Assert.fail("Could not obtain authInfo token.");
Modified: juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_040_BusinessServiceTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_040_BusinessServiceTest.java?rev=1061967&r1=1061966&r2=1061967&view=diff
==============================================================================
--- juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_040_BusinessServiceTest.java (original)
+++ juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_040_BusinessServiceTest.java Fri Jan 21 18:58:20 2011
@@ -55,8 +55,8 @@ public class API_040_BusinessServiceTest
api010.saveJoePublisher();
api010.saveSamSyndicator();
UDDISecurityPortType security = new UDDISecurityImpl();
- authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.JOE_PUBLISHER_ID, TckPublisher.JOE_PUBLISHER_CRED);
- authInfoSam = TckSecurity.getAuthToken(security, TckPublisher.SAM_SYNDICATOR_ID, TckPublisher.SAM_SYNDICATOR_CRED);
+ authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
+ authInfoSam = TckSecurity.getAuthToken(security, TckPublisher.getSamPublisherId(), TckPublisher.getSamPassword());
} catch (RemoteException e) {
logger.error(e.getMessage(), e);
Assert.fail("Could not obtain authInfo token.");
Modified: juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_050_BindingTemplateTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_050_BindingTemplateTest.java?rev=1061967&r1=1061966&r2=1061967&view=diff
==============================================================================
--- juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_050_BindingTemplateTest.java (original)
+++ juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_050_BindingTemplateTest.java Fri Jan 21 18:58:20 2011
@@ -55,7 +55,7 @@ public class API_050_BindingTemplateTest
logger.debug("Getting auth token..");
try {
api010.saveJoePublisher();
- authInfoJoe = TckSecurity.getAuthToken(new UDDISecurityImpl(), TckPublisher.JOE_PUBLISHER_ID, TckPublisher.JOE_PUBLISHER_CRED);
+ authInfoJoe = TckSecurity.getAuthToken(new UDDISecurityImpl(), TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
} catch (RemoteException e) {
logger.error(e.getMessage(), e);
Assert.fail("Could not obtain authInfo token.");
Modified: juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_060_PublisherAssertionTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_060_PublisherAssertionTest.java?rev=1061967&r1=1061966&r2=1061967&view=diff
==============================================================================
--- juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_060_PublisherAssertionTest.java (original)
+++ juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_060_PublisherAssertionTest.java Fri Jan 21 18:58:20 2011
@@ -57,9 +57,9 @@ public class API_060_PublisherAssertionT
api010.saveJoePublisher();
api010.saveSamSyndicator();
UDDISecurityPortType security = new UDDISecurityImpl();
- authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.JOE_PUBLISHER_ID, TckPublisher.JOE_PUBLISHER_CRED);
- authInfoSam = TckSecurity.getAuthToken(security, TckPublisher.SAM_SYNDICATOR_ID, TckPublisher.SAM_SYNDICATOR_CRED);
- authInfoMary = TckSecurity.getAuthToken(security, TckPublisher.MARY_PUBLISHER_ID, TckPublisher.MARY_PUBLISHER_CRED);
+ authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
+ authInfoSam = TckSecurity.getAuthToken(security, TckPublisher.getSamPublisherId(), TckPublisher.getSamPassword());
+ authInfoMary = TckSecurity.getAuthToken(security, TckPublisher.getMaryPublisherId(), TckPublisher.getMaryPassword());
} catch (RemoteException e) {
logger.error(e.getMessage(), e);
Assert.fail("Could not obtain authInfo token.");
Modified: juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_070_FindEntityTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_070_FindEntityTest.java?rev=1061967&r1=1061966&r2=1061967&view=diff
==============================================================================
--- juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_070_FindEntityTest.java (original)
+++ juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_070_FindEntityTest.java Fri Jan 21 18:58:20 2011
@@ -55,7 +55,7 @@ public class API_070_FindEntityTest
logger.debug("Getting auth token..");
try {
api010.saveJoePublisher();
- authInfoJoe = TckSecurity.getAuthToken(new UDDISecurityImpl(), TckPublisher.JOE_PUBLISHER_ID, TckPublisher.JOE_PUBLISHER_CRED);
+ authInfoJoe = TckSecurity.getAuthToken(new UDDISecurityImpl(), TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
} catch (RemoteException e) {
logger.error(e.getMessage(), e);
Assert.fail("Could not obtain authInfo token.");
Modified: juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_080_SubscriptionTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_080_SubscriptionTest.java?rev=1061967&r1=1061966&r2=1061967&view=diff
==============================================================================
--- juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_080_SubscriptionTest.java (original)
+++ juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_080_SubscriptionTest.java Fri Jan 21 18:58:20 2011
@@ -56,10 +56,10 @@ public class API_080_SubscriptionTest
logger.debug("Getting auth token..");
try {
api010.saveJoePublisher();
- authInfoJoe = TckSecurity.getAuthToken(new UDDISecurityImpl(), TckPublisher.JOE_PUBLISHER_ID, TckPublisher.JOE_PUBLISHER_CRED);
+ authInfoJoe = TckSecurity.getAuthToken(new UDDISecurityImpl(), TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
api010.saveSamSyndicator();
- authInfoSam = TckSecurity.getAuthToken(new UDDISecurityImpl(), TckPublisher.SAM_SYNDICATOR_ID, TckPublisher.SAM_SYNDICATOR_CRED);
+ authInfoSam = TckSecurity.getAuthToken(new UDDISecurityImpl(), TckPublisher.getSamPublisherId(), TckPublisher.getSamPassword());
} catch (RemoteException e) {
logger.error(e.getMessage(), e);
Modified: juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_100_ClientSubscriptionInfoTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_100_ClientSubscriptionInfoTest.java?rev=1061967&r1=1061966&r2=1061967&view=diff
==============================================================================
--- juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_100_ClientSubscriptionInfoTest.java (original)
+++ juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/api/impl/API_100_ClientSubscriptionInfoTest.java Fri Jan 21 18:58:20 2011
@@ -58,7 +58,7 @@ public class API_100_ClientSubscriptionI
try {
api010.saveJoePublisher();
UDDISecurityPortType security = new UDDISecurityImpl();
- authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.JOE_PUBLISHER_ID, TckPublisher.JOE_PUBLISHER_CRED);
+ authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
} catch (DispositionReportFaultMessage e) {
logger.error(e.getMessage(), e);
Assert.fail("Could not obtain authInfo token.");
Modified: juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/subscription/SubscriptionNotifierTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/subscription/SubscriptionNotifierTest.java?rev=1061967&r1=1061966&r2=1061967&view=diff
==============================================================================
--- juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/subscription/SubscriptionNotifierTest.java (original)
+++ juddi/trunk/juddi-core-openjpa/src/test/java/org/apache/juddi/subscription/SubscriptionNotifierTest.java Fri Jan 21 18:58:20 2011
@@ -66,7 +66,7 @@ public class SubscriptionNotifierTest
logger.debug("Getting auth token..");
try {
api010.saveJoePublisher();
- authInfoJoe = TckSecurity.getAuthToken(new UDDISecurityImpl(), TckPublisher.JOE_PUBLISHER_ID, TckPublisher.JOE_PUBLISHER_CRED);
+ authInfoJoe = TckSecurity.getAuthToken(new UDDISecurityImpl(), TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
tckTModel.saveJoePublisherTmodel(authInfoJoe);
tckBusiness.saveJoePublisherBusiness(authInfoJoe);
tckBusinessService.saveJoePublisherService(authInfoJoe);
Modified: juddi/trunk/uddi-tck/src/main/resources/META-INF/uddi.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/main/resources/META-INF/uddi.xml?rev=1061967&r1=1061966&r2=1061967&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/main/resources/META-INF/uddi.xml (original)
+++ juddi/trunk/uddi-tck/src/main/resources/META-INF/uddi.xml Fri Jan 21 18:58:20 2011
@@ -21,6 +21,7 @@
<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?wsdl</juddiApiUrl>
+
<!-- In VM Transport Settings
<proxyTransport>org.apache.juddi.v3.client.transport.InVMTransport</proxyTransport>
<custodyTransferUrl>org.apache.juddi.api.impl.UDDICustodyTransferImpl</custodyTransferUrl>
Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_010_PublisherIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_010_PublisherIntegrationTest.java?rev=1061967&r1=1061966&r2=1061967&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_010_PublisherIntegrationTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_010_PublisherIntegrationTest.java Fri Jan 21 18:58:20 2011
@@ -22,21 +22,15 @@ import java.util.List;
import javax.xml.ws.soap.SOAPFaultException;
import org.apache.commons.configuration.ConfigurationException;
-import org.apache.juddi.ClassUtil;
-import org.apache.juddi.Registry;
import org.apache.juddi.api_v3.DeletePublisher;
import org.apache.juddi.api_v3.GetAllPublisherDetail;
import org.apache.juddi.api_v3.GetPublisherDetail;
import org.apache.juddi.api_v3.Publisher;
import org.apache.juddi.api_v3.PublisherDetail;
import org.apache.juddi.api_v3.SavePublisher;
-import org.apache.juddi.config.AppConfig;
-import org.apache.juddi.config.Property;
import org.apache.juddi.jaxb.EntityCreator;
-import org.apache.juddi.v3.client.config.UDDIClientContainer;
-import org.apache.juddi.v3.client.transport.InVMTransport;
+import org.apache.juddi.v3.client.config.UDDIClerkManager;
import org.apache.juddi.v3.client.transport.Transport;
-import org.apache.juddi.v3.error.InvalidKeyPassedException;
import org.apache.juddi.v3_service.JUDDIApiPortType;
import org.apache.log4j.Logger;
import org.junit.AfterClass;
@@ -54,63 +48,52 @@ import org.uddi.v3_service.UDDISecurityP
public class JUDDI_010_PublisherIntegrationTest {
private static Logger logger = Logger.getLogger(JUDDI_010_PublisherIntegrationTest.class);
-
+ private static UDDIClerkManager manager;
private static UDDISecurityPortType security =null;
private static JUDDIApiPortType publisher = null;
private static String authInfo = null;
@BeforeClass
- public static void startRegistry() throws ConfigurationException {
- String clazz = UDDIClientContainer.getDefaultTransportClass();
- if (InVMTransport.class.getName().equals(clazz)) {
- Registry.start();
- }
+ public static void startManager() throws ConfigurationException {
+
+ manager = new UDDIClerkManager();
+ manager.start();
+
+
logger.debug("Getting auth tokens..");
try {
- Class<?> transportClass = ClassUtil.forName(clazz, Transport.class);
- if (transportClass!=null) {
- Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance("default");
- security = transport.getUDDISecurityService();
- GetAuthToken getAuthToken = new GetAuthToken();
- getAuthToken.setUserID("root");
- getAuthToken.setCred("");
- authInfo = security.getAuthToken(getAuthToken).getAuthInfo();
- publisher = transport.getJUDDIApiService();
- } else {
- Assert.fail();
- }
- } catch (Exception e) {
- logger.error(e.getMessage(), e);
- Assert.fail("Could not obtain authInfo token.");
- }
+ Transport transport = manager.getTransport();
+
+ security = transport.getUDDISecurityService();
+ GetAuthToken getAuthToken = new GetAuthToken();
+ getAuthToken.setUserID(TckPublisher.getRootPublisherId());
+ getAuthToken.setCred(TckPublisher.getRootPassword());
+ authInfo = security.getAuthToken(getAuthToken).getAuthInfo();
+
+ publisher = transport.getJUDDIApiService();
+ } catch (Exception e) {
+ logger.error(e.getMessage(), e);
+ Assert.fail("Could not obtain authInfo token.");
+ }
}
@AfterClass
- public static void stopRegistry() throws ConfigurationException {
- String clazz = UDDIClientContainer.getDefaultTransportClass();
- if (InVMTransport.class.getName().equals(clazz)) {
- Registry.stop();
- }
+ public static void stopManager() throws ConfigurationException {
+ manager.stop();
}
@Test
public void testAuthToken() {
try {
- String clazz = UDDIClientContainer.getDefaultTransportClass();
- Class<?> transportClass = ClassUtil.forName(clazz, Transport.class);
- if (transportClass!=null) {
- Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance("default");
-
- UDDISecurityPortType securityService = transport.getUDDISecurityService();
- GetAuthToken getAuthToken = new GetAuthToken();
- getAuthToken.setUserID("root");
- getAuthToken.setCred("");
- AuthToken authToken = securityService.getAuthToken(getAuthToken);
- System.out.println(authToken.getAuthInfo());
- Assert.assertNotNull(authToken);
- } else {
- Assert.fail();
- }
+ Transport transport = manager.getTransport();
+
+ UDDISecurityPortType securityService = transport.getUDDISecurityService();
+ GetAuthToken getAuthToken = new GetAuthToken();
+ getAuthToken.setUserID("root");
+ getAuthToken.setCred("");
+ AuthToken authToken = securityService.getAuthToken(getAuthToken);
+ System.out.println(authToken.getAuthInfo());
+ Assert.assertNotNull(authToken);
} catch (Exception e) {
e.printStackTrace();
Assert.fail();
@@ -123,7 +106,7 @@ public class JUDDI_010_PublisherIntegrat
//If it already there is probably has foreign key relationships.
//This test should really only run on an empty database. Seed
//data will be added if the root publisher is missing.
- if (!isExistPublisher(TckPublisher.JOE_PUBLISHER_ID)) {
+ if (!isExistPublisher(TckPublisher.getJoePublisherId())) {
saveJoePublisher();
deleteJoePublisher();
}
@@ -132,7 +115,7 @@ public class JUDDI_010_PublisherIntegrat
@Test
public void testSamSyndicator() {
//We can only test this if the publisher is not there already.
- if (!isExistPublisher(TckPublisher.SAM_SYNDICATOR_ID)) {
+ if (!isExistPublisher(TckPublisher.getSamPublisherId())) {
saveSamSyndicator();
deleteSamSyndicator();
}
@@ -156,8 +139,8 @@ public class JUDDI_010_PublisherIntegrat
* - false in all other cases.
*/
public boolean saveJoePublisher() {
- if (!isExistPublisher(TckPublisher.JOE_PUBLISHER_ID)) {
- savePublisher(TckPublisher.JOE_PUBLISHER_ID, TckPublisher.JOE_PUBLISHER_XML);
+ if (!isExistPublisher(TckPublisher.getJoePublisherId())) {
+ savePublisher(TckPublisher.getJoePublisherId(), TckPublisher.JOE_PUBLISHER_XML);
return true;
} else {
return false;
@@ -168,30 +151,29 @@ public class JUDDI_010_PublisherIntegrat
* are child objects attached; think Services etc.
*/
public void deleteJoePublisher() {
- deletePublisher(TckPublisher.JOE_PUBLISHER_ID);
+ deletePublisher(TckPublisher.getJoePublisherId());
}
/**
* Persists Sam Syndicator to the database.
* @return publisherId
*/
public String saveSamSyndicator() {
- if (!isExistPublisher(TckPublisher.SAM_SYNDICATOR_ID)) {
- savePublisher(TckPublisher.SAM_SYNDICATOR_ID, TckPublisher.SAM_SYNDICATOR_XML);
+ if (!isExistPublisher(TckPublisher.getSamPublisherId())) {
+ savePublisher(TckPublisher.getSamPublisherId(), TckPublisher.SAM_SYNDICATOR_XML);
}
- return TckPublisher.SAM_SYNDICATOR_ID;
+ return TckPublisher.getSamPublisherId();
}
/**
* Removes Sam Syndicator from the database, this will fail if there
* are child objects attached; think Services etc.
*/
public void deleteSamSyndicator() {
- deletePublisher(TckPublisher.SAM_SYNDICATOR_ID);
+ deletePublisher(TckPublisher.getSamPublisherId());
}
private void savePublisher(String publisherId, String publisherXML) {
try {
- String rootPublisherStr = AppConfig.getConfiguration().getString(Property.JUDDI_ROOT_PUBLISHER);
- authInfo = TckSecurity.getAuthToken(security, rootPublisherStr, "");
+ authInfo = TckSecurity.getAuthToken(security, TckPublisher.getRootPublisherId(), TckPublisher.getRootPassword());
logger.debug("Saving new publisher: " + publisherXML);
SavePublisher sp = new SavePublisher();
sp.setAuthInfo(authInfo);
@@ -224,7 +206,7 @@ public class JUDDI_010_PublisherIntegrat
try {
pdBeforeDelete = publisher.getPublisherDetail(gp);
Assert.assertNotNull(pdBeforeDelete);
- } catch (InvalidKeyPassedException e) {
+ } catch (Exception e) {
Assert.fail("We expected to find publisher " + publisherXML);
}
@@ -236,8 +218,7 @@ public class JUDDI_010_PublisherIntegrat
private void deletePublisher(String publisherId) {
try {
- String rootPublisherStr = AppConfig.getConfiguration().getString(Property.JUDDI_ROOT_PUBLISHER);
- authInfo = TckSecurity.getAuthToken(security, rootPublisherStr, "");
+ authInfo = TckSecurity.getAuthToken(security, TckPublisher.getRootPublisherId(), TckPublisher.getRootPassword());
logger.debug("Delete publisher: " + publisherId);
//Now deleting this publisher
DeletePublisher dp = new DeletePublisher();
@@ -279,11 +260,11 @@ public class JUDDI_010_PublisherIntegrat
}
protected String authInfoJoe() throws RemoteException, DispositionReportFaultMessage {
- return TckSecurity.getAuthToken(security, TckPublisher.JOE_PUBLISHER_ID, TckPublisher.JOE_PUBLISHER_CRED);
+ return TckSecurity.getAuthToken(security, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
}
protected String authInfoSam() throws RemoteException, DispositionReportFaultMessage {
- return TckSecurity.getAuthToken(security, TckPublisher.SAM_SYNDICATOR_ID, TckPublisher.SAM_SYNDICATOR_CRED);
+ return TckSecurity.getAuthToken(security, TckPublisher.getSamPublisherId(), TckPublisher.getSamPassword());
}
}
Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_100_ClientSubscriptionInfoTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_100_ClientSubscriptionInfoTest.java?rev=1061967&r1=1061966&r2=1061967&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_100_ClientSubscriptionInfoTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_100_ClientSubscriptionInfoTest.java Fri Jan 21 18:58:20 2011
@@ -15,8 +15,6 @@
package org.apache.juddi.v3.tck;
import org.apache.commons.configuration.ConfigurationException;
-import org.apache.juddi.ClassUtil;
-import org.apache.juddi.Registry;
import org.apache.juddi.api_v3.Clerk;
import org.apache.juddi.api_v3.ClientSubscriptionInfo;
import org.apache.juddi.api_v3.ClientSubscriptionInfoDetail;
@@ -24,8 +22,7 @@ import org.apache.juddi.api_v3.DeleteCli
import org.apache.juddi.api_v3.GetClientSubscriptionInfoDetail;
import org.apache.juddi.api_v3.Node;
import org.apache.juddi.api_v3.SaveClientSubscriptionInfo;
-import org.apache.juddi.v3.client.config.UDDIClientContainer;
-import org.apache.juddi.v3.client.transport.InVMTransport;
+import org.apache.juddi.v3.client.config.UDDIClerkManager;
import org.apache.juddi.v3.client.transport.Transport;
import org.apache.juddi.v3_service.JUDDIApiPortType;
import org.apache.log4j.Logger;
@@ -40,101 +37,97 @@ import org.uddi.v3_service.UDDISecurityP
* @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
*/
public class JUDDI_100_ClientSubscriptionInfoTest {
-
- private static UDDISecurityPortType security =null;
+
+ private static UDDISecurityPortType security = null;
private static JUDDIApiPortType publisher = null;
private static Logger logger = Logger.getLogger(JUDDI_100_ClientSubscriptionInfoTest.class);
private static String authInfo = null;
-
+ private static UDDIClerkManager manager;
+
@BeforeClass
public static void startRegistry() throws ConfigurationException {
- String clazz = UDDIClientContainer.getDefaultTransportClass();
- if (InVMTransport.class.getName().equals(clazz)) {
- Registry.start();
- }
+
+ manager = new UDDIClerkManager();
+ manager.start();
+
+
logger.debug("Getting auth tokens..");
try {
- Class<?> transportClass = ClassUtil.forName(clazz, Transport.class);
- if (transportClass!=null) {
- Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance("default");
- security = transport.getUDDISecurityService();
- GetAuthToken getAuthToken = new GetAuthToken();
- getAuthToken.setUserID("root");
- getAuthToken.setCred("");
- authInfo = security.getAuthToken(getAuthToken).getAuthInfo();
- publisher = transport.getJUDDIApiService();
- } else {
- Assert.fail();
- }
- } catch (Exception e) {
- logger.error(e.getMessage(), e);
- Assert.fail("Could not obtain authInfo token.");
- }
+ Transport transport = manager.getTransport();
+
+ security = transport.getUDDISecurityService();
+ GetAuthToken getAuthToken = new GetAuthToken();
+ getAuthToken.setUserID(TckPublisher.getRootPublisherId());
+ getAuthToken.setCred(TckPublisher.getRootPassword());
+ authInfo = security.getAuthToken(getAuthToken).getAuthInfo();
+
+ publisher = transport.getJUDDIApiService();
+ } catch (Exception e) {
+ logger.error(e.getMessage(), e);
+ Assert.fail("Could not obtain authInfo token.");
+ }
}
-
+
@AfterClass
public static void stopRegistry() throws ConfigurationException {
- String clazz = UDDIClientContainer.getDefaultTransportClass();
- if (InVMTransport.class.getName().equals(clazz)) {
- Registry.stop();
- }
+ manager.stop();
}
-
+
@Test
public void addClientSubscriptionInfo() {
ClientSubscriptionInfo clientSubscriptionInfo = new ClientSubscriptionInfo();
-
+
Node node = new Node();
node.setSecurityUrl("http://localhost:8080/services/securityUrl");
node.setName("default");
-
+
Clerk clerk = new Clerk();
clerk.setName("default");
clerk.setPublisher("root");
clerk.setNode(node);
-
- Clerk toClerk = new Clerk();
- toClerk.setName("medroot");
- toClerk.setPublisher("root");
- toClerk.setNode(node);
-
+
+ Clerk toClerk = new Clerk();
+ toClerk.setName("medroot");
+ toClerk.setPublisher("root");
+ toClerk.setNode(node);
+
clientSubscriptionInfo.setFromClerk(clerk);
clientSubscriptionInfo.setToClerk(toClerk);
-
+
clientSubscriptionInfo.setSubscriptionKey("mykey");
-
+
SaveClientSubscriptionInfo saveClientSubscriptionInfo = new SaveClientSubscriptionInfo();
saveClientSubscriptionInfo.setAuthInfo(authInfo);
saveClientSubscriptionInfo.getClientSubscriptionInfo().add(clientSubscriptionInfo);
-
+
try {
ClientSubscriptionInfoDetail detail = publisher.saveClientSubscriptionInfo(saveClientSubscriptionInfo);
-
+
GetClientSubscriptionInfoDetail getDetail = new GetClientSubscriptionInfoDetail();
getDetail.setAuthInfo(authInfo);
getDetail.getClientSubscriptionKey().add("mykey");
-
+
Assert.assertEquals("mykey", detail.getClientSubscriptionInfo().get(0).getSubscriptionKey());
-
+
//ClientSubscriptionInfoDetail detail2 = publisher.getClientSubscriptionInfoDetail(getDetail);
//Assert.assertEquals("mykey", detail2.getClientSubscriptionInfo().get(0).getSubscriptionKey());
-
+
DeleteClientSubscriptionInfo deleteInfo = new DeleteClientSubscriptionInfo();
deleteInfo.setAuthInfo(authInfo);
deleteInfo.getSubscriptionKey().add("mykey");
publisher.deleteClientSubscriptionInfo(deleteInfo);
-
-// try {
-// @SuppressWarnings("unused")
-// ClientSubscriptionInfoDetail detail3 = publisher.getClientSubscriptionInfoDetail(getDetail);
-// Assert.fail("We're expecting an InvalidKeyPassedException");
-// } catch (Exception e) {
-// Assert.assertEquals(InvalidKeyPassedException.class, e.getClass());
-// }
+
+ // try {
+ // @SuppressWarnings("unused")
+ // ClientSubscriptionInfoDetail detail3 = publisher.getClientSubscriptionInfoDetail(getDetail);
+ // Assert.fail("We're expecting an InvalidKeyPassedException");
+ // } catch (Exception e) {
+ // Assert.assertEquals(InvalidKeyPassedException.class, e.getClass());
+ // }
} catch(Exception e) {
logger.error(e.getMessage(), e);
Assert.fail("No exception should be thrown");
}
}
-
+
}
Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_010_PublisherIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_010_PublisherIntegrationTest.java?rev=1061967&r1=1061966&r2=1061967&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_010_PublisherIntegrationTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_010_PublisherIntegrationTest.java Fri Jan 21 18:58:20 2011
@@ -15,11 +15,7 @@
package org.apache.juddi.v3.tck;
import org.apache.commons.configuration.ConfigurationException;
-import org.apache.juddi.ClassUtil;
-import org.apache.juddi.Registry;
import org.apache.juddi.v3.client.config.UDDIClerkManager;
-import org.apache.juddi.v3.client.config.UDDIClientContainer;
-import org.apache.juddi.v3.client.transport.InVMTransport;
import org.apache.juddi.v3.client.transport.Transport;
import org.junit.AfterClass;
import org.junit.Assert;
@@ -34,43 +30,30 @@ import org.uddi.v3_service.UDDISecurityP
*/
public class UDDI_010_PublisherIntegrationTest {
+ private static UDDIClerkManager manager;
+
@BeforeClass
public static void startRegistry() throws ConfigurationException {
- UDDIClerkManager manager = new UDDIClerkManager();
+ manager = new UDDIClerkManager();
manager.start();
- String clazz = manager.getClientConfig().getHomeNode().getProxyTransport();
- if (InVMTransport.class.getName().equals(clazz)) {
- Registry.start();
- }
}
@AfterClass
public static void stopRegistry() throws ConfigurationException {
- UDDIClerkManager manager = UDDIClientContainer.getUDDIClerkManager(null);
- String clazz = manager.getClientConfig().getHomeNode().getProxyTransport();
- if (InVMTransport.class.getName().equals(clazz)) {
- Registry.stop();
- }
+ manager.stop();
}
@Test
public void testAuthToken() {
try {
- String clazz = UDDIClientContainer.getDefaultTransportClass();
- Class<?> transportClass = ClassUtil.forName(clazz, Transport.class);
- if (transportClass!=null) {
- Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance("default");
-
- UDDISecurityPortType securityService = transport.getUDDISecurityService();
- GetAuthToken getAuthToken = new GetAuthToken();
- getAuthToken.setUserID("root");
- getAuthToken.setCred("root");
- AuthToken authToken = securityService.getAuthToken(getAuthToken);
- System.out.println(authToken.getAuthInfo());
- Assert.assertNotNull(authToken);
- } else {
- Assert.fail();
- }
+ Transport transport = manager.getTransport();
+ UDDISecurityPortType securityService = transport.getUDDISecurityService();
+ GetAuthToken getAuthToken = new GetAuthToken();
+ getAuthToken.setUserID(TckPublisher.getRootPublisherId());
+ getAuthToken.setCred(TckPublisher.getRootPassword());
+ AuthToken authToken = securityService.getAuthToken(getAuthToken);
+ System.out.println(authToken.getAuthInfo());
+ Assert.assertNotNull(authToken);
} catch (Exception e) {
e.printStackTrace();
Assert.fail();
Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_020_TmodelIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_020_TmodelIntegrationTest.java?rev=1061967&r1=1061966&r2=1061967&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_020_TmodelIntegrationTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_020_TmodelIntegrationTest.java Fri Jan 21 18:58:20 2011
@@ -15,10 +15,7 @@
package org.apache.juddi.v3.tck;
import org.apache.commons.configuration.ConfigurationException;
-import org.apache.juddi.ClassUtil;
-import org.apache.juddi.Registry;
-import org.apache.juddi.v3.client.config.UDDIClientContainer;
-import org.apache.juddi.v3.client.transport.InVMTransport;
+import org.apache.juddi.v3.client.config.UDDIClerkManager;
import org.apache.juddi.v3.client.transport.Transport;
import org.apache.log4j.Logger;
import org.junit.AfterClass;
@@ -44,30 +41,28 @@ public class UDDI_020_TmodelIntegrationT
private static String authInfoJoe = null;
private static String authInfoSam = null;
+private static UDDIClerkManager manager;
+
+
@BeforeClass
- public static void setup() throws ConfigurationException {
- String clazz = UDDIClientContainer.getDefaultTransportClass();
- if (InVMTransport.class.getName().equals(clazz)) {
- Registry.start();
- }
+ public static void startManager() throws ConfigurationException {
+
+ manager = new UDDIClerkManager();
+ manager.start();
logger.debug("Getting auth tokens..");
try {
- Class<?> transportClass = ClassUtil.forName(clazz, Transport.class);
- if (transportClass!=null) {
- Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance("default");
-
- UDDISecurityPortType security = transport.getUDDISecurityService();
- authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.JOE_PUBLISHER_ID, TckPublisher.JOE_PUBLISHER_CRED);
- authInfoSam = TckSecurity.getAuthToken(security, TckPublisher.SAM_SYNDICATOR_ID, TckPublisher.SAM_SYNDICATOR_CRED);
- Assert.assertNotNull(authInfoJoe);
- Assert.assertNotNull(authInfoSam);
+ Transport transport = manager.getTransport();
- UDDIPublicationPortType publication = transport.getUDDIPublishService();
- UDDIInquiryPortType inquiry = transport.getUDDIInquiryService();
- tckTModel = new TckTModel(publication, inquiry);
- } else {
- Assert.fail();
- }
+ 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.");
@@ -75,11 +70,8 @@ public class UDDI_020_TmodelIntegrationT
}
@AfterClass
- public static void stopRegistry() throws ConfigurationException {
- String clazz = UDDIClientContainer.getDefaultTransportClass();
- if (InVMTransport.class.getName().equals(clazz)) {
- Registry.stop();
- }
+ public static void stopManager() throws ConfigurationException {
+ manager.stop();
}
@Test
Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java?rev=1061967&r1=1061966&r2=1061967&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java Fri Jan 21 18:58:20 2011
@@ -15,10 +15,7 @@
package org.apache.juddi.v3.tck;
import org.apache.commons.configuration.ConfigurationException;
-import org.apache.juddi.ClassUtil;
-import org.apache.juddi.Registry;
-import org.apache.juddi.v3.client.config.UDDIClientContainer;
-import org.apache.juddi.v3.client.transport.InVMTransport;
+import org.apache.juddi.v3.client.config.UDDIClerkManager;
import org.apache.juddi.v3.client.transport.Transport;
import org.apache.log4j.Logger;
import org.junit.AfterClass;
@@ -42,46 +39,40 @@ public class UDDI_030_BusinessEntityInte
protected static TckFindEntity tckFindEntity = null;
protected static String authInfoJoe = null;
protected static String authInfoSam = null;
+ private static UDDIClerkManager manager;
+
+ @AfterClass
+ public static void stopManager() throws ConfigurationException {
+ manager.stop();
+ }
@BeforeClass
- public static void setup() throws ConfigurationException {
- String clazz = UDDIClientContainer.getDefaultTransportClass();
- if (InVMTransport.class.getName().equals(clazz)) {
- Registry.start();
- }
+ public static void startManager() throws ConfigurationException {
+ manager = new UDDIClerkManager();
+ manager.start();
+
logger.debug("Getting auth tokens..");
try {
- Class<?> transportClass = ClassUtil.forName(clazz, Transport.class);
- if (transportClass!=null) {
- Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance("default");
-
- UDDISecurityPortType security = transport.getUDDISecurityService();
- authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.JOE_PUBLISHER_ID, TckPublisher.JOE_PUBLISHER_CRED);
- authInfoSam = TckSecurity.getAuthToken(security, TckPublisher.SAM_SYNDICATOR_ID, TckPublisher.SAM_SYNDICATOR_CRED);
- 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);
- } else {
- Assert.fail();
- }
+ 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);
+
} catch (Exception e) {
logger.error(e.getMessage(), e);
Assert.fail("Could not obtain authInfo token.");
}
}
- @AfterClass
- public static void stopRegistry() throws ConfigurationException {
- String clazz = UDDIClientContainer.getDefaultTransportClass();
- if (InVMTransport.class.getName().equals(clazz)) {
- Registry.stop();
- }
- }
+
@Test
public void testJoePublisherBusinessEntity() {
Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityLoadTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityLoadTest.java?rev=1061967&r1=1061966&r2=1061967&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityLoadTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityLoadTest.java Fri Jan 21 18:58:20 2011
@@ -27,7 +27,7 @@ public class UDDI_030_BusinessEntityLoad
@BeforeClass
public static void setup() throws ConfigurationException {
- UDDI_030_BusinessEntityIntegrationTest.setup();
+ UDDI_030_BusinessEntityIntegrationTest.startManager();
}
@Test @Override
Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java?rev=1061967&r1=1061966&r2=1061967&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java Fri Jan 21 18:58:20 2011
@@ -15,10 +15,7 @@
package org.apache.juddi.v3.tck;
import org.apache.commons.configuration.ConfigurationException;
-import org.apache.juddi.ClassUtil;
-import org.apache.juddi.Registry;
-import org.apache.juddi.v3.client.config.UDDIClientContainer;
-import org.apache.juddi.v3.client.transport.InVMTransport;
+import org.apache.juddi.v3.client.config.UDDIClerkManager;
import org.apache.juddi.v3.client.transport.Transport;
import org.apache.log4j.Logger;
import org.junit.AfterClass;
@@ -44,48 +41,39 @@ public class UDDI_040_BusinessServiceInt
protected static String authInfoJoe = null;
protected static String authInfoSam = null;
+ private static UDDIClerkManager manager;
+
+ @AfterClass
+ public static void stopManager() throws ConfigurationException {
+ manager.stop();
+ }
@BeforeClass
- public static void setup() throws ConfigurationException {
- String clazz = UDDIClientContainer.getDefaultTransportClass();
- if (InVMTransport.class.getName().equals(clazz)) {
- Registry.start();
- }
+ public static void startManager() throws ConfigurationException {
+ manager = new UDDIClerkManager();
+ manager.start();
+
logger.debug("Getting auth tokens..");
try {
- Class<?> transportClass = ClassUtil.forName(clazz, Transport.class);
- if (transportClass!=null) {
- Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance("default");
-
- UDDISecurityPortType security = transport.getUDDISecurityService();
- authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.JOE_PUBLISHER_ID, TckPublisher.JOE_PUBLISHER_CRED);
- authInfoSam = TckSecurity.getAuthToken(security, TckPublisher.SAM_SYNDICATOR_ID, TckPublisher.SAM_SYNDICATOR_CRED);
- Assert.assertNotNull(authInfoJoe);
- Assert.assertNotNull(authInfoSam);
-
- UDDIPublicationPortType publication = transport.getUDDIPublishService();
- UDDIInquiryPortType inquiry = transport.getUDDIInquiryService();
-
- tckTModel = new TckTModel(publication, inquiry);
- tckBusiness = new TckBusiness(publication, inquiry);
- tckBusinessService = new TckBusinessService(publication, inquiry);
- } else {
- Assert.fail();
- }
+ 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);
+ tckBusinessService = new TckBusinessService(publication, inquiry);
+
} catch (Exception e) {
logger.error(e.getMessage(), e);
- Assert.fail("Could not obtain authInfo token.");
+ Assert.fail("Could not obtain authInfo token.");
}
}
- @AfterClass
- public static void stopRegistry() throws ConfigurationException {
- String clazz = UDDIClientContainer.getDefaultTransportClass();
- if (InVMTransport.class.getName().equals(clazz)) {
- Registry.stop();
- }
- }
-
@Test
public void joepublisher() {
try {
Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java?rev=1061967&r1=1061966&r2=1061967&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java Fri Jan 21 18:58:20 2011
@@ -15,10 +15,7 @@
package org.apache.juddi.v3.tck;
import org.apache.commons.configuration.ConfigurationException;
-import org.apache.juddi.ClassUtil;
-import org.apache.juddi.Registry;
-import org.apache.juddi.v3.client.config.UDDIClientContainer;
-import org.apache.juddi.v3.client.transport.InVMTransport;
+import org.apache.juddi.v3.client.config.UDDIClerkManager;
import org.apache.juddi.v3.client.transport.Transport;
import org.apache.log4j.Logger;
import org.junit.AfterClass;
@@ -35,7 +32,6 @@ import org.uddi.v3_service.UDDISecurityP
*/
public class UDDI_050_BindingTemplateIntegrationTest
{
-
private static Logger logger = Logger.getLogger(UDDI_050_BindingTemplateIntegrationTest.class);
private static TckTModel tckTModel = null;
@@ -43,51 +39,40 @@ public class UDDI_050_BindingTemplateInt
private static TckBusinessService tckBusinessService = null;
private static TckBindingTemplate tckBindingTemplate = null;
private static TckFindEntity tckFindEntity = null;
+ private static String authInfoJoe = null;
+ private static UDDIClerkManager manager;
-
- private static String authInfoJoe = null;
+ @AfterClass
+ public static void stopManager() throws ConfigurationException {
+ manager.stop();
+ }
@BeforeClass
- public static void setup() throws ConfigurationException {
- String clazz = UDDIClientContainer.getDefaultTransportClass();
- if (InVMTransport.class.getName().equals(clazz)) {
- Registry.start();
- }
+ public static void startManager() throws ConfigurationException {
+ manager = new UDDIClerkManager();
+ manager.start();
+
logger.debug("Getting auth tokens..");
try {
- Class<?> transportClass = ClassUtil.forName(clazz, Transport.class);
- if (transportClass!=null) {
- Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance("default");
-
- UDDISecurityPortType security = transport.getUDDISecurityService();
- authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.JOE_PUBLISHER_ID, TckPublisher.JOE_PUBLISHER_CRED);
- Assert.assertNotNull(authInfoJoe);
-
- UDDIPublicationPortType publication = transport.getUDDIPublishService();
- UDDIInquiryPortType inquiry = transport.getUDDIInquiryService();
-
- tckTModel = new TckTModel(publication, inquiry);
- tckBusiness = new TckBusiness(publication, inquiry);
- tckBusinessService = new TckBusinessService(publication, inquiry);
- tckBindingTemplate = new TckBindingTemplate(publication, inquiry);
- tckFindEntity = new TckFindEntity(inquiry);
- } else {
- Assert.fail();
- }
+ Transport transport = manager.getTransport();
+ UDDISecurityPortType security = transport.getUDDISecurityService();
+ authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
+ Assert.assertNotNull(authInfoJoe);
+
+ UDDIPublicationPortType publication = transport.getUDDIPublishService();
+ UDDIInquiryPortType inquiry = transport.getUDDIInquiryService();
+ tckTModel = new TckTModel(publication, inquiry);
+ tckBusiness = new TckBusiness(publication, inquiry);
+ tckBusinessService = new TckBusinessService(publication, inquiry);
+ tckBindingTemplate = new TckBindingTemplate(publication, inquiry);
+ tckFindEntity = new TckFindEntity(inquiry);
+
} catch (Exception e) {
logger.error(e.getMessage(), e);
- Assert.fail("Could not obtain authInfo token.");
+ Assert.fail("Could not obtain authInfo token.");
}
}
- @AfterClass
- public static void stopRegistry() throws ConfigurationException {
- String clazz = UDDIClientContainer.getDefaultTransportClass();
- if (InVMTransport.class.getName().equals(clazz)) {
- Registry.stop();
- }
- }
-
@Test
public void joepublisher() {
try {
Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_060_PublisherAssertionIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_060_PublisherAssertionIntegrationTest.java?rev=1061967&r1=1061966&r2=1061967&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_060_PublisherAssertionIntegrationTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_060_PublisherAssertionIntegrationTest.java Fri Jan 21 18:58:20 2011
@@ -19,10 +19,7 @@ package org.apache.juddi.v3.tck;
* @author <a href="mailto:kstam@apache.org">Kurt T Stam</a>
*/
import org.apache.commons.configuration.ConfigurationException;
-import org.apache.juddi.ClassUtil;
-import org.apache.juddi.Registry;
-import org.apache.juddi.v3.client.config.UDDIClientContainer;
-import org.apache.juddi.v3.client.transport.InVMTransport;
+import org.apache.juddi.v3.client.config.UDDIClerkManager;
import org.apache.juddi.v3.client.transport.Transport;
import org.apache.log4j.Logger;
import org.junit.AfterClass;
@@ -45,49 +42,40 @@ public class UDDI_060_PublisherAssertion
private static String authInfoSam = null;
private static String authInfoMary = null;
+ private static UDDIClerkManager manager;
+
+ @AfterClass
+ public static void stopManager() throws ConfigurationException {
+ manager.stop();
+ }
+
@BeforeClass
- public static void setup() throws ConfigurationException {
- String clazz = UDDIClientContainer.getDefaultTransportClass();
- if (InVMTransport.class.getName().equals(clazz)) {
- Registry.start();
- }
+ public static void startManager() throws ConfigurationException {
+ manager = new UDDIClerkManager();
+ manager.start();
+
logger.debug("Getting auth tokens..");
try {
- Class<?> transportClass = ClassUtil.forName(clazz, Transport.class);
- if (transportClass!=null) {
- Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance("default");
-
- UDDISecurityPortType security = transport.getUDDISecurityService();
- authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.JOE_PUBLISHER_ID, TckPublisher.JOE_PUBLISHER_CRED);
- authInfoSam = TckSecurity.getAuthToken(security, TckPublisher.SAM_SYNDICATOR_ID, TckPublisher.SAM_SYNDICATOR_CRED);
- authInfoMary = TckSecurity.getAuthToken(security, TckPublisher.MARY_PUBLISHER_ID, TckPublisher.MARY_PUBLISHER_CRED);
- Assert.assertNotNull(authInfoJoe);
- Assert.assertNotNull(authInfoSam);
-
- UDDIPublicationPortType publication = transport.getUDDIPublishService();
- UDDIInquiryPortType inquiry = transport.getUDDIInquiryService();
-
- tckTModel = new TckTModel(publication, inquiry);
- tckBusiness = new TckBusiness(publication, inquiry);
- tckAssertion = new TckPublisherAssertion(publication);
- tckFindEntity = new TckFindEntity(inquiry);
- } else {
- Assert.fail();
- }
+ Transport transport = manager.getTransport();
+ UDDISecurityPortType security = transport.getUDDISecurityService();
+ authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
+ authInfoSam = TckSecurity.getAuthToken(security, TckPublisher.getSamPublisherId(), TckPublisher.getSamPassword());
+ authInfoMary = TckSecurity.getAuthToken(security, TckPublisher.getMaryPublisherId(), TckPublisher.getMaryPassword());
+ Assert.assertNotNull(authInfoJoe);
+
+ UDDIPublicationPortType publication = transport.getUDDIPublishService();
+ UDDIInquiryPortType inquiry = transport.getUDDIInquiryService();
+ tckTModel = new TckTModel(publication, inquiry);
+ tckBusiness = new TckBusiness(publication, inquiry);
+ tckAssertion = new TckPublisherAssertion(publication);
+ tckFindEntity = new TckFindEntity(inquiry);
+
} catch (Exception e) {
logger.error(e.getMessage(), e);
- Assert.fail("Could not obtain authInfo token.");
+ Assert.fail("Could not obtain authInfo token.");
}
}
- @AfterClass
- public static void stopRegistry() throws ConfigurationException {
- String clazz = UDDIClientContainer.getDefaultTransportClass();
- if (InVMTransport.class.getName().equals(clazz)) {
- Registry.stop();
- }
- }
-
@Test
public void testJoepublisherToSamSyndicator() {
try {
Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_070_FindEntityIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_070_FindEntityIntegrationTest.java?rev=1061967&r1=1061966&r2=1061967&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_070_FindEntityIntegrationTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_070_FindEntityIntegrationTest.java Fri Jan 21 18:58:20 2011
@@ -15,10 +15,7 @@
package org.apache.juddi.v3.tck;
import org.apache.commons.configuration.ConfigurationException;
-import org.apache.juddi.ClassUtil;
-import org.apache.juddi.Registry;
-import org.apache.juddi.v3.client.config.UDDIClientContainer;
-import org.apache.juddi.v3.client.transport.InVMTransport;
+import org.apache.juddi.v3.client.config.UDDIClerkManager;
import org.apache.juddi.v3.client.transport.Transport;
import org.apache.log4j.Logger;
import org.junit.AfterClass;
@@ -43,50 +40,40 @@ public class UDDI_070_FindEntityIntegrat
private static TckBusinessService tckBusinessService = null;
private static TckBindingTemplate tckBindingTemplate = null;
private static TckFindEntity tckFindEntity = null;
+ private static String authInfoJoe = null;
+ private static UDDIClerkManager manager;
- private static String authInfoJoe = null;
+ @AfterClass
+ public static void stopManager() throws ConfigurationException {
+ manager.stop();
+ }
@BeforeClass
- public static void setup() throws ConfigurationException {
- String clazz = UDDIClientContainer.getDefaultTransportClass();
- if (InVMTransport.class.getName().equals(clazz)) {
- Registry.start();
- }
+ public static void startManager() throws ConfigurationException {
+ manager = new UDDIClerkManager();
+ manager.start();
+
logger.debug("Getting auth tokens..");
try {
- Class<?> transportClass = ClassUtil.forName(clazz, Transport.class);
- if (transportClass!=null) {
- Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance("default");
-
- UDDISecurityPortType security = transport.getUDDISecurityService();
- authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.JOE_PUBLISHER_ID, TckPublisher.JOE_PUBLISHER_CRED);
- Assert.assertNotNull(authInfoJoe);
-
- UDDIPublicationPortType publication = transport.getUDDIPublishService();
- UDDIInquiryPortType inquiry = transport.getUDDIInquiryService();
-
- tckTModel = new TckTModel(publication, inquiry);
- tckBusiness = new TckBusiness(publication, inquiry);
- tckBusinessService = new TckBusinessService(publication, inquiry);
- tckBindingTemplate = new TckBindingTemplate(publication, inquiry);
- tckFindEntity = new TckFindEntity(inquiry);
- } else {
- Assert.fail();
- }
+ Transport transport = manager.getTransport();
+ UDDISecurityPortType security = transport.getUDDISecurityService();
+ authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
+ Assert.assertNotNull(authInfoJoe);
+
+ UDDIPublicationPortType publication = transport.getUDDIPublishService();
+ UDDIInquiryPortType inquiry = transport.getUDDIInquiryService();
+ tckTModel = new TckTModel(publication, inquiry);
+ tckBusiness = new TckBusiness(publication, inquiry);
+ tckBusinessService = new TckBusinessService(publication, inquiry);
+ tckBindingTemplate = new TckBindingTemplate(publication, inquiry);
+ tckFindEntity = new TckFindEntity(inquiry);
+
} catch (Exception e) {
logger.error(e.getMessage(), e);
- Assert.fail("Could not obtain authInfo token.");
+ Assert.fail("Could not obtain authInfo token.");
}
}
- @AfterClass
- public static void stopRegistry() throws ConfigurationException {
- String clazz = UDDIClientContainer.getDefaultTransportClass();
- if (InVMTransport.class.getName().equals(clazz)) {
- Registry.stop();
- }
- }
-
@Test
public void findEntities() {
try {
Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java?rev=1061967&r1=1061966&r2=1061967&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java Fri Jan 21 18:58:20 2011
@@ -15,10 +15,7 @@
package org.apache.juddi.v3.tck;
import org.apache.commons.configuration.ConfigurationException;
-import org.apache.juddi.ClassUtil;
-import org.apache.juddi.Registry;
-import org.apache.juddi.v3.client.config.UDDIClientContainer;
-import org.apache.juddi.v3.client.transport.InVMTransport;
+import org.apache.juddi.v3.client.config.UDDIClerkManager;
import org.apache.juddi.v3.client.transport.Transport;
import org.apache.log4j.Logger;
import org.junit.AfterClass;
@@ -46,52 +43,42 @@ public class UDDI_080_SubscriptionIntegr
private static String authInfoJoe = null;
private static String authInfoSam = null;
+ private static UDDIClerkManager manager;
+ @AfterClass
+ public static void stopManager() throws ConfigurationException {
+ manager.stop();
+ }
+
@BeforeClass
- public static void setup() throws ConfigurationException {
- String clazz = UDDIClientContainer.getDefaultTransportClass();
- if (InVMTransport.class.getName().equals(clazz)) {
- Registry.start();
- }
- logger.debug("Getting subscriber proxy..");
+ public static void startManager() throws ConfigurationException {
+ manager = new UDDIClerkManager();
+ manager.start();
+
+ logger.debug("Getting auth tokens..");
try {
- Class<?> transportClass = ClassUtil.forName(clazz, Transport.class);
- if (transportClass!=null) {
- Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance("default");
-
- UDDISecurityPortType security = transport.getUDDISecurityService();
- authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.JOE_PUBLISHER_ID, TckPublisher.JOE_PUBLISHER_CRED);
- Assert.assertNotNull(authInfoJoe);
- authInfoSam = TckSecurity.getAuthToken(security, TckPublisher.SAM_SYNDICATOR_ID, TckPublisher.SAM_SYNDICATOR_CRED);
- Assert.assertNotNull(authInfoSam);
-
- UDDIPublicationPortType publication = transport.getUDDIPublishService();
- UDDIInquiryPortType inquiry = transport.getUDDIInquiryService();
- UDDISubscriptionPortType subscription = transport.getUDDISubscriptionService();
-
- tckTModel = new TckTModel(publication, inquiry);
- tckBusiness = new TckBusiness(publication, inquiry);
- tckBusinessService = new TckBusinessService(publication, inquiry);
- tckBindingTemplate = new TckBindingTemplate(publication, inquiry);
-
- tckSubscription = new TckSubscription(subscription, security);
- } else {
- Assert.fail();
- }
+ 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);
+ 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);
+ tckBindingTemplate = new TckBindingTemplate(publication, inquiry);
+
+ tckSubscription = new TckSubscription(subscription, security);
+
} catch (Exception e) {
logger.error(e.getMessage(), e);
- Assert.fail("Could not obtain authInfo token.");
+ Assert.fail("Could not obtain authInfo token.");
}
}
- @AfterClass
- public static void stopRegistry() throws ConfigurationException {
- String clazz = UDDIClientContainer.getDefaultTransportClass();
- if (InVMTransport.class.getName().equals(clazz)) {
- Registry.stop();
- }
- }
-
@Test
public void joePublisher() {
try {
Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java?rev=1061967&r1=1061966&r2=1061967&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java Fri Jan 21 18:58:20 2011
@@ -19,10 +19,7 @@ import java.io.File;
import java.io.FileReader;
import org.apache.commons.configuration.ConfigurationException;
-import org.apache.juddi.ClassUtil;
-import org.apache.juddi.Registry;
-import org.apache.juddi.v3.client.config.UDDIClientContainer;
-import org.apache.juddi.v3.client.transport.InVMTransport;
+import org.apache.juddi.v3.client.config.UDDIClerkManager;
import org.apache.juddi.v3.client.transport.Transport;
import org.apache.log4j.Logger;
import org.junit.AfterClass;
@@ -46,54 +43,40 @@ public class UDDI_090_SubscriptionListen
private static TckBusinessService tckBusinessService = null;
private static TckSubscriptionListener tckSubscriptionListener = null;
- private static UDDIPublicationPortType publication = null;
-
private static String authInfoJoe = null;
- private static String authInfoSam = null;
+ private static UDDIClerkManager manager;
+ @AfterClass
+ public static void stopManager() throws ConfigurationException {
+ manager.stop();
+ }
+
@BeforeClass
- public static void setup() throws ConfigurationException {
- String clazz = UDDIClientContainer.getDefaultTransportClass();
- if (InVMTransport.class.getName().equals(clazz)) {
- Registry.start();
- }
- logger.debug("Getting subscriber proxy..");
+ public static void startManager() throws ConfigurationException {
+ manager = new UDDIClerkManager();
+ manager.start();
+
+ logger.debug("Getting auth tokens..");
try {
- Class<?> transportClass = ClassUtil.forName(clazz, Transport.class);
- if (transportClass!=null) {
- Transport transport = (Transport) transportClass.getConstructor(String.class).newInstance("default");
-
- UDDISecurityPortType security = transport.getUDDISecurityService();
- authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.JOE_PUBLISHER_ID, TckPublisher.JOE_PUBLISHER_CRED);
- Assert.assertNotNull(authInfoJoe);
- authInfoSam = TckSecurity.getAuthToken(security, TckPublisher.SAM_SYNDICATOR_ID, TckPublisher.SAM_SYNDICATOR_CRED);
- Assert.assertNotNull(authInfoSam);
-
- publication = transport.getUDDIPublishService();
- UDDIInquiryPortType inquiry = transport.getUDDIInquiryService();
- UDDISubscriptionPortType subscription = transport.getUDDISubscriptionService();
-
- tckTModel = new TckTModel(publication, inquiry);
- tckBusiness = new TckBusiness(publication, inquiry);
- tckBusinessService = new TckBusinessService(publication, inquiry);
- tckSubscriptionListener = new TckSubscriptionListener(subscription, publication);
- } else {
- Assert.fail();
- }
+ 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);
+ tckSubscriptionListener = new TckSubscriptionListener(subscription, publication);
+
} catch (Exception e) {
logger.error(e.getMessage(), e);
- Assert.fail("Could not obtain authInfo token.");
+ Assert.fail("Could not obtain authInfo token.");
}
}
- @AfterClass
- public static void stopRegistry() throws ConfigurationException {
- String clazz = UDDIClientContainer.getDefaultTransportClass();
- if (InVMTransport.class.getName().equals(clazz)) {
- Registry.stop();
- }
- }
-
@Test
public void joePublisher() {
try {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org