http://git-wip-us.apache.org/repos/asf/juddi/blob/d7195270/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_101_ClientSubscriptionCallbackAPIIntegrationTest.java ---------------------------------------------------------------------- diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_101_ClientSubscriptionCallbackAPIIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_101_ClientSubscriptionCallbackAPIIntegrationTest.java index a33b76a..dd5a269 100644 --- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_101_ClientSubscriptionCallbackAPIIntegrationTest.java +++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_101_ClientSubscriptionCallbackAPIIntegrationTest.java @@ -93,6 +93,7 @@ public class JUDDI_101_ClientSubscriptionCallbackAPIIntegrationTest implements I logger.error(e.getMessage(), e); Assert.fail(e.getMessage()); } + JUDDI_300_MultiNodeIntegrationTest.testSetupReplicationConfig(); } @Test
http://git-wip-us.apache.org/repos/asf/juddi/blob/d7195270/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_200_GUI_IntegrationTest.java ---------------------------------------------------------------------- diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_200_GUI_IntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_200_GUI_IntegrationTest.java index 743d78d..79c1a2d 100644 --- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_200_GUI_IntegrationTest.java +++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_200_GUI_IntegrationTest.java @@ -15,7 +15,6 @@ */ package org.apache.juddi.v3.tck; -import java.io.IOException; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -26,13 +25,11 @@ import org.apache.http.impl.client.DefaultHttpClient; import org.apache.juddi.v3.client.config.TokenResolver; import org.apache.juddi.v3.client.config.UDDIClerk; import org.apache.juddi.v3.client.config.UDDIClient; -import org.apache.juddi.v3_service.JUDDIApiPortType; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Assume; import org.junit.BeforeClass; import org.junit.Test; -import org.uddi.v3_service.UDDISecurityPortType; /** * @@ -63,6 +60,7 @@ public class JUDDI_200_GUI_IntegrationTest { } baseurl = TokenResolver.replaceTokens(baseurl, manager.getClientConfig().getUDDINode("default").getProperties()); } + JUDDI_300_MultiNodeIntegrationTest.testSetupReplicationConfig(); } @Test http://git-wip-us.apache.org/repos/asf/juddi/blob/d7195270/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_300_MultiNodeIntegrationTest.java ---------------------------------------------------------------------- diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_300_MultiNodeIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_300_MultiNodeIntegrationTest.java new file mode 100644 index 0000000..5301cd0 --- /dev/null +++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/JUDDI_300_MultiNodeIntegrationTest.java @@ -0,0 +1,457 @@ +/* + * Copyright 2015 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.math.BigInteger; +import java.util.List; +import javax.xml.bind.JAXB; +import javax.xml.datatype.XMLGregorianCalendar; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Holder; +import org.junit.Assert; +import org.apache.commons.configuration.ConfigurationException; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.juddi.v3.client.UDDIService; +import org.apache.juddi.v3.client.config.UDDIClient; +import org.apache.juddi.v3.client.transport.Transport; +import org.apache.juddi.v3_service.JUDDIApiPortType; +import org.junit.AfterClass; +import org.junit.Assume; +import org.junit.BeforeClass; +import org.junit.Ignore; +import org.junit.Test; +import org.uddi.api_v3.AccessPoint; +import org.uddi.api_v3.BindingTemplate; +import org.uddi.api_v3.BindingTemplates; +import org.uddi.api_v3.BusinessDetail; +import org.uddi.api_v3.BusinessEntity; +import org.uddi.api_v3.BusinessService; +import org.uddi.api_v3.BusinessServices; +import org.uddi.api_v3.Contact; +import org.uddi.api_v3.GetBusinessDetail; +import org.uddi.api_v3.GetOperationalInfo; +import org.uddi.api_v3.Name; +import org.uddi.api_v3.OperationalInfos; +import org.uddi.api_v3.PersonName; +import org.uddi.api_v3.SaveBusiness; +import org.uddi.custody_v3.KeyBag; +import org.uddi.custody_v3.TransferEntities; +import org.uddi.custody_v3.TransferToken; +import org.uddi.repl_v3.ChangeRecordIDType; +import org.uddi.repl_v3.CommunicationGraph; +import org.uddi.repl_v3.Operator; +import org.uddi.repl_v3.OperatorStatusType; +import org.uddi.repl_v3.ReplicationConfiguration; + +import org.uddi.v3_service.UDDICustodyTransferPortType; +import org.uddi.v3_service.UDDIInquiryPortType; +import org.uddi.v3_service.UDDIPublicationPortType; +import org.uddi.v3_service.UDDIReplicationPortType; + +import org.uddi.v3_service.UDDISecurityPortType; + +/** + * Contains all multinode tests, replication, custody transfer. This is juddi + * specific since most of these function depend on a juddi specific api in order + * to configure, since the uddi spec doesn't define a mechanism to do so. + * + * @author <a href="mailto:[email protected]";>Alex O'Ree</a> + */ +public class JUDDI_300_MultiNodeIntegrationTest { + + private static Log logger = LogFactory.getLog(JUDDI_300_MultiNodeIntegrationTest.class); + private static UDDIClient manager; + private static String rootNode1Token; + private static String rootNode2Token; + private static JUDDIApiPortType juddiApiServiceNode1; + private static JUDDIApiPortType juddiApiServiceNode2; + + private static String maryTokenNode1; + private static String samTokenNode2; + private static UDDICustodyTransferPortType custodySam; + private static UDDICustodyTransferPortType custodyMary; + private static UDDIPublicationPortType publishMary; + private static UDDIInquiryPortType inquiryMary; + private static UDDIInquiryPortType inquirySam; + private static UDDIReplicationPortType replicationMary; + private static UDDIReplicationPortType replicationSam; + + static final String CFG_node1_MARY = "uddiv3"; + static final String CFG_node2_SAM = "uddiv3-2"; + + @BeforeClass + public static void startRegistry() throws Exception { + if (!TckPublisher.isEnabled()) { + return; + } + if (!TckPublisher.isJUDDI()) { + return; + } + + testSetupReplicationConfig(); + + } + + static synchronized void init() throws Exception { + if (manager != null) { + return; + } + manager = new UDDIClient(); + manager.start(); + + Transport node1 = manager.getTransport(CFG_node1_MARY); + juddiApiServiceNode1 = node1.getJUDDIApiService(); + custodyMary = node1.getUDDICustodyTransferService(); + inquiryMary = node1.getUDDIInquiryService(); + publishMary = node1.getUDDIPublishService(); + UDDIService uddiService = new UDDIService(); + + replicationMary = uddiService.getUDDIReplicationPort(); + + ((BindingProvider) replicationMary).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, manager.getClientConfig().getUDDINode(CFG_node1_MARY).getReplicationUrl()); + UDDISecurityPortType secNode1 = node1.getUDDISecurityService(); + rootNode1Token = TckSecurity.getAuthToken(secNode1, TckPublisher.getRootPublisherId(), TckPublisher.getRootPassword()); + maryTokenNode1 = TckSecurity.getAuthToken(secNode1, TckPublisher.getMaryPublisherId(), TckPublisher.getMaryPassword()); + + Transport node2 = manager.getTransport(CFG_node2_SAM); + UDDISecurityPortType secNode2 = node2.getUDDISecurityService(); + rootNode2Token = TckSecurity.getAuthToken(secNode2, TckPublisher.getRootPublisherId(), TckPublisher.getRootPassword()); + samTokenNode2 = TckSecurity.getAuthToken(secNode2, TckPublisher.getSamPublisherId(), TckPublisher.getSamPassword()); + replicationSam = uddiService.getUDDIReplicationPort(); + ((BindingProvider) replicationSam).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, manager.getClientConfig().getUDDINode(CFG_node2_SAM).getReplicationUrl()); + juddiApiServiceNode2 = node2.getJUDDIApiService(); + custodySam = node2.getUDDICustodyTransferService(); + inquirySam = node2.getUDDIInquiryService(); + + if (!TckPublisher.isUDDIAuthMode()) { + TckSecurity.setCredentials((BindingProvider) juddiApiServiceNode1, TckPublisher.getRootPublisherId(), TckPublisher.getRootPassword()); + TckSecurity.setCredentials((BindingProvider) juddiApiServiceNode2, TckPublisher.getRootPublisherId(), TckPublisher.getRootPassword()); + TckSecurity.setCredentials((BindingProvider) custodyMary, TckPublisher.getMaryPublisherId(), TckPublisher.getMaryPassword()); + TckSecurity.setCredentials((BindingProvider) inquiryMary, TckPublisher.getMaryPublisherId(), TckPublisher.getMaryPassword()); + TckSecurity.setCredentials((BindingProvider) publishMary, TckPublisher.getMaryPublisherId(), TckPublisher.getMaryPassword()); + TckSecurity.setCredentials((BindingProvider) replicationMary, TckPublisher.getMaryPublisherId(), TckPublisher.getMaryPassword()); + + TckSecurity.setCredentials((BindingProvider) custodySam, TckPublisher.getSamPublisherId(), TckPublisher.getSamPassword()); + TckSecurity.setCredentials((BindingProvider) inquirySam, TckPublisher.getSamPublisherId(), TckPublisher.getSamPassword()); + TckSecurity.setCredentials((BindingProvider) replicationSam, TckPublisher.getSamPublisherId(), TckPublisher.getSamPassword()); + + } + } + + static void refreshTokens() throws Exception { + Transport node1 = manager.getTransport(CFG_node1_MARY); + + UDDISecurityPortType secNode1 = node1.getUDDISecurityService(); + rootNode1Token = TckSecurity.getAuthToken(secNode1, TckPublisher.getRootPublisherId(), TckPublisher.getRootPassword()); + maryTokenNode1 = TckSecurity.getAuthToken(secNode1, TckPublisher.getMaryPublisherId(), TckPublisher.getMaryPassword()); + + Transport node2 = manager.getTransport(CFG_node2_SAM); + UDDISecurityPortType secNode2 = node2.getUDDISecurityService(); + rootNode2Token = TckSecurity.getAuthToken(secNode2, TckPublisher.getRootPublisherId(), TckPublisher.getRootPassword()); + samTokenNode2 = TckSecurity.getAuthToken(secNode2, TckPublisher.getSamPublisherId(), TckPublisher.getSamPassword()); + + } + + @AfterClass + public static void stopRegistry() throws ConfigurationException { + if (!TckPublisher.isEnabled()) { + return; + } + if (!TckPublisher.isJUDDI()) { + return; + } + if (manager != null) { + manager.stop(); + } + } + + private static boolean Contains(List<Operator> operator, Operator op) { + for (Operator o : operator) { + if (o.getOperatorNodeID().equals(op.getOperatorNodeID())) { + return true; + } + } + return false; + } + + @Test + public void santityTest() { + + } + + public static void testSetupReplicationConfig() { + //this only runs if it is JUDDI and Replication is enabled + if (!TckPublisher.isReplicationEnabled() || !TckPublisher.isJUDDI()) { + logger.info("TCK says that replication is disabled...skipping replication config..."); + return; + } + try { + init(); + refreshTokens(); + logger.info("fetching current replication config..."); + + ReplicationConfiguration replicationNode1 = null; + try { + replicationNode1 = juddiApiServiceNode1.getReplicationNodes(rootNode1Token); + } catch (Exception ex) { + System.out.println("Error getting replication config"); + ex.printStackTrace(); + Assert.fail(ex.getMessage()); + + } + if (replicationNode1.getCommunicationGraph() == null) { + replicationNode1.setCommunicationGraph(new CommunicationGraph()); + } + + Operator op = new Operator(); + op.setOperatorNodeID("uddi:juddi.apache.org:node1"); + op.setSoapReplicationURL(manager.getClientConfig().getUDDINode(CFG_node1_MARY).getReplicationUrl()); + op.setOperatorStatus(OperatorStatusType.NORMAL); + op.getContact().add(new Contact()); + op.getContact().get(0).getPersonName().add(new PersonName("bob", "en")); + op.getContact().get(0).setUseType("admin"); + if (!Contains(replicationNode1.getOperator(), op)) { + replicationNode1.getOperator().add(op); + } + + op = new Operator(); + op.setOperatorNodeID("uddi:another.juddi.apache.org:node2"); + op.setSoapReplicationURL(manager.getClientConfig().getUDDINode(CFG_node2_SAM).getReplicationUrl()); + op.setOperatorStatus(OperatorStatusType.NORMAL); + op.getContact().add(new Contact()); + op.getContact().get(0).getPersonName().add(new PersonName("mary", "en")); + op.getContact().get(0).setUseType("admin"); + if (!Contains(replicationNode1.getOperator(), op)) { + replicationNode1.getOperator().add(op); + } + if (!replicationNode1.getCommunicationGraph().getNode().contains("uddi:another.juddi.apache.org:node2")) { + replicationNode1.getCommunicationGraph().getNode().add("uddi:another.juddi.apache.org:node2"); + } + if (!replicationNode1.getCommunicationGraph().getNode().contains("uddi:juddi.apache.org:node1")) { + replicationNode1.getCommunicationGraph().getNode().add("uddi:juddi.apache.org:node1"); + } + replicationNode1.setSerialNumber(0L); + replicationNode1.setTimeOfConfigurationUpdate(""); + replicationNode1.setMaximumTimeToGetChanges(BigInteger.ONE); + replicationNode1.setMaximumTimeToSyncRegistry(BigInteger.ONE); + + if (replicationNode1.getRegistryContact().getContact() == null) { + replicationNode1.getRegistryContact().setContact(new Contact()); + replicationNode1.getRegistryContact().getContact().getPersonName().add(new PersonName("unknown", null)); + } + + JAXB.marshal(replicationNode1, System.out); + logger.info("Setting replication config on Node 1..."); + juddiApiServiceNode1.setReplicationNodes(rootNode1Token, replicationNode1); + logger.info("Setting replication config on Node 2..."); + juddiApiServiceNode2.setReplicationNodes(rootNode2Token, replicationNode1); + + } catch (Exception ex) { + TckCommon.PrintMarker(); + ex.printStackTrace(); + TckCommon.PrintMarker(); + } + } + + public void testUnsetReplicationConfig() throws Exception { + + } + + /** + * transfer business from mary/node1 to sam/node2, then delete + * + * @throws Exception + */ + @Test + //@Ignore + public void testMultiNodeBusinessCustodyTransfer() throws Exception { + logger.info("testMultiNodeBusinessCustodyTransfer"); + Assume.assumeTrue(TckPublisher.isReplicationEnabled() && TckPublisher.isCustodyTransferEnabled()); + Assume.assumeTrue(TckPublisher.isJUDDI()); + refreshTokens(); + testSetupReplicationConfig(); + + getReplicationStatus(); + + //create mary's business, node1 + BusinessEntity mary = new BusinessEntity(); + mary.getName().add(new Name("Mary's biz on " + CFG_node1_MARY, null)); + mary.setBusinessServices(new BusinessServices()); + BusinessService bs = new BusinessService(); + bs.getName().add(new Name("Mary's service", null)); + bs.setBindingTemplates(new BindingTemplates()); + BindingTemplate bt = new BindingTemplate(); + bt.setAccessPoint(new AccessPoint("http://localhost/mary";, "wsdlDeployment")); + bs.getBindingTemplates().getBindingTemplate().add(bt); + mary.getBusinessServices().getBusinessService().add(bs); + + SaveBusiness sb = new SaveBusiness(); + sb.setAuthInfo(maryTokenNode1); + sb.getBusinessEntity().add(mary); + BusinessDetail saveBusiness = publishMary.saveBusiness(sb); + + Thread.sleep(5000); //sleep a bit and wait for replication to do it's thing + + GetOperationalInfo operationalInfo = new GetOperationalInfo(); + operationalInfo.setAuthInfo(maryTokenNode1); + operationalInfo.getEntityKey().add(saveBusiness.getBusinessEntity().get(0).getBusinessKey()); + OperationalInfos beforeNode1 = inquiryMary.getOperationalInfo(operationalInfo); + + operationalInfo.setAuthInfo(samTokenNode2); + OperationalInfos beforeNode2 = null; + int timeout = TckPublisher.getSubscriptionTimeout(); + while (timeout > 0) { + logger.info("Waiting for the update..."); + try { + GetBusinessDetail gbd = new GetBusinessDetail(); + gbd.setAuthInfo(samTokenNode2); + gbd.getBusinessKey().add(saveBusiness.getBusinessEntity().get(0).getBusinessKey()); + + BusinessDetail businessDetail = inquirySam.getBusinessDetail(gbd); + if (businessDetail != null + && !businessDetail.getBusinessEntity().isEmpty()) { + logger.info("Mary's business exists on Sams node, grabbing the operational info to confirm ownership..."); + } + beforeNode2 = inquirySam.getOperationalInfo(operationalInfo); + break; + } catch (Exception ex) { + logger.warn(ex.getMessage(), ex); + } + timeout--; + Thread.sleep(1000); + + } + Assert.assertNotNull(beforeNode1); + Assert.assertNotNull(beforeNode2); + + JAXB.marshal(beforeNode1, System.out); + JAXB.marshal(beforeNode2, System.out); + //confirm we're replicated correctly + Assert.assertEquals(beforeNode1.getOperationalInfo().get(0).getAuthorizedName(), beforeNode2.getOperationalInfo().get(0).getAuthorizedName()); + Assert.assertEquals(beforeNode1.getOperationalInfo().get(0).getEntityKey(), beforeNode2.getOperationalInfo().get(0).getEntityKey()); + Assert.assertEquals(beforeNode1.getOperationalInfo().get(0).getEntityKey(), saveBusiness.getBusinessEntity().get(0).getBusinessKey()); + Assert.assertEquals(beforeNode1.getOperationalInfo().get(0).getNodeID(), beforeNode2.getOperationalInfo().get(0).getNodeID()); + + //get a transfer token, node1 + KeyBag kb = new KeyBag(); + kb.getKey().add(saveBusiness.getBusinessEntity().get(0).getBusinessKey()); + Holder<String> sourceNode = new Holder<String>(); + Holder<XMLGregorianCalendar> expiration = new Holder<XMLGregorianCalendar>(); + Holder<byte[]> token = new Holder<byte[]>(); + custodyMary.getTransferToken(maryTokenNode1, kb, sourceNode, expiration, token); + + //sam accepts the transfer token, node 2 + TransferEntities transferEntities = new TransferEntities(); + transferEntities.setAuthInfo(samTokenNode2); + transferEntities.setKeyBag(kb); + transferEntities.setTransferToken(new TransferToken()); + transferEntities.getTransferToken().setExpirationTime(expiration.value); + transferEntities.getTransferToken().setNodeID(sourceNode.value); + transferEntities.getTransferToken().setOpaqueToken(token.value); + custodySam.transferEntities(transferEntities); + //stuff happens + //Thread.sleep(5000); + //confirm the transfer + timeout = TckPublisher.getSubscriptionTimeout(); + OperationalInfos afterNode1 = null; + OperationalInfos afterNode2 = null; + while (timeout > 0) { + logger.info("Waiting for the update..."); + try { + operationalInfo.setAuthInfo(maryTokenNode1); + //operationalInfo.getEntityKey().add(saveBusiness.getBusinessEntity().get(0).getBusinessKey()); + afterNode1 = inquiryMary.getOperationalInfo(operationalInfo); + if (afterNode1.getOperationalInfo().get(0).getAuthorizedName().equals(TckPublisher.getSamPublisherId())) { + logger.info("Mary's biz on node 1 is now owned by Sam"); + //node 1 is up to date + operationalInfo.setAuthInfo(samTokenNode2); + afterNode2 = inquirySam.getOperationalInfo(operationalInfo); + if (afterNode2.getOperationalInfo().get(0).getAuthorizedName().equals(TckPublisher.getSamPublisherId())) { + //node 2 is up to date + logger.info("Mary's biz on node 2 is now owned by Sam"); + break; + } else { + logger.info("Mary's biz on node 2 is still owned by Mary"); + } + } else { + logger.info("Mary's biz on node 1 is still owned by Mary"); + } + } catch (Exception ex) { + logger.warn(ex.getMessage()); + } + timeout--; + Thread.sleep(1000); + + } + //operationalInfo.setAuthInfo(maryTokenNode1); + // operationalInfo.getEntityKey().add(saveBusiness.getBusinessEntity().get(0).getBusinessKey()); + + Assert.assertNotNull(afterNode1); + Assert.assertNotNull(afterNode2); + JAXB.marshal(afterNode1, System.out); + JAXB.marshal(afterNode2, System.out); + + //confirm we're replicated correctly + Assert.assertEquals(afterNode1.getOperationalInfo().get(0).getAuthorizedName(), afterNode2.getOperationalInfo().get(0).getAuthorizedName()); + Assert.assertEquals(afterNode1.getOperationalInfo().get(0).getEntityKey(), afterNode2.getOperationalInfo().get(0).getEntityKey()); + Assert.assertEquals(afterNode1.getOperationalInfo().get(0).getEntityKey(), saveBusiness.getBusinessEntity().get(0).getBusinessKey()); + Assert.assertEquals(afterNode1.getOperationalInfo().get(0).getNodeID(), afterNode2.getOperationalInfo().get(0).getNodeID()); + //confirm that the entity now belongs to sam + + Assert.assertEquals(afterNode1.getOperationalInfo().get(0).getAuthorizedName(), TckPublisher.getSamPublisherId()); + Assert.assertNotEquals(beforeNode1.getOperationalInfo().get(0).getNodeID(), afterNode1.getOperationalInfo().get(0).getNodeID()); + + testUnsetReplicationConfig(); + + } + + /** + * this function basically waits until the nodes are done synchronizing + * + * @throws Exception + */ + private void getReplicationStatus() throws Exception { + logger.info("Getting replication status....Mary's node..."); + waitUntilSynched(replicationMary); + waitUntilSynched(replicationSam); + } + + private void waitUntilSynched(UDDIReplicationPortType repl) throws Exception { + List<ChangeRecordIDType> mary = repl.getHighWaterMarks(); + JAXB.marshal(mary.get(0), System.out); + + Long highmary = mary.get(0).getOriginatingUSN(); + Thread.sleep(1000); + Long highmary2 = mary.get(0).getOriginatingUSN(); + int counter = 0; + while (highmary2 > highmary && counter < 90) { //indicates that there are still changes being processed + highmary = highmary2; + //= mary.get(0).getOriginatingUSN(); + Thread.sleep(1000); + mary = repl.getHighWaterMarks(); + highmary2 = mary.get(0).getOriginatingUSN(); + logger.info("Changes are still being processesed...." + highmary2 + ">" + highmary); + counter++; + } + if (counter == 90) { + TckCommon.PrintMarker(); + logger.info("Changes are still being processed after a " + counter + "sec wait!!"); + } + + } + +} http://git-wip-us.apache.org/repos/asf/juddi/blob/d7195270/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_010_PublisherIntegrationTest.java ---------------------------------------------------------------------- diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_010_PublisherIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_010_PublisherIntegrationTest.java index 2f6dee9..5e46f97 100644 --- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_010_PublisherIntegrationTest.java +++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_010_PublisherIntegrationTest.java @@ -40,6 +40,7 @@ public class UDDI_010_PublisherIntegrationTest { if (!TckPublisher.isJUDDI()) return; manager = new UDDIClient(); manager.start(); + JUDDI_300_MultiNodeIntegrationTest.testSetupReplicationConfig(); } @AfterClass http://git-wip-us.apache.org/repos/asf/juddi/blob/d7195270/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_020_TmodelIntegrationTest.java ---------------------------------------------------------------------- diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_020_TmodelIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_020_TmodelIntegrationTest.java index fb9c9c8..0274a06 100644 --- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_020_TmodelIntegrationTest.java +++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_020_TmodelIntegrationTest.java @@ -48,7 +48,9 @@ public class UDDI_020_TmodelIntegrationTest { @BeforeClass public static void startManager() throws ConfigurationException { -if (!TckPublisher.isEnabled()) return; + if (!TckPublisher.isEnabled()) { + return; + } manager = new UDDIClient(); manager.start(); logger.debug("Getting auth tokens.."); @@ -61,7 +63,6 @@ if (!TckPublisher.isEnabled()) return; //Assert.assertNotNull(authInfoJoe); //Assert.assertNotNull(authInfoSam); - UDDIPublicationPortType publication = transport.getUDDIPublishService(); UDDIInquiryPortType inquiry = transport.getUDDIInquiryService(); if (!TckPublisher.isUDDIAuthMode()) { @@ -83,11 +84,14 @@ if (!TckPublisher.isEnabled()) return; logger.error(e.getMessage(), e); Assert.fail("Could not obtain authInfo token."); } + JUDDI_300_MultiNodeIntegrationTest.testSetupReplicationConfig(); } @AfterClass public static void stopManager() throws ConfigurationException { - if (!TckPublisher.isEnabled()) return; + if (!TckPublisher.isEnabled()) { + return; + } tckTModelJoe.deleteCreatedTModels(authInfoJoe); tckTModelSam.deleteCreatedTModels(authInfoSam); manager.stop(); @@ -95,7 +99,7 @@ if (!TckPublisher.isEnabled()) return; @Test public void testJoePublisherTmodel() { - Assume.assumeTrue(TckPublisher.isEnabled()); + Assume.assumeTrue(TckPublisher.isEnabled()); tckTModelJoe.saveJoePublisherTmodel(authInfoJoe, true); //Now if we use a finder it should be found. @@ -121,7 +125,7 @@ if (!TckPublisher.isEnabled()) return; @Test public void testSamSyndicatorTmodelTest() { - Assume.assumeTrue(TckPublisher.isEnabled()); + Assume.assumeTrue(TckPublisher.isEnabled()); tckTModelSam.saveSamSyndicatorTmodel(authInfoSam); tckTModelSam.deleteSamSyndicatorTmodel(authInfoSam); } http://git-wip-us.apache.org/repos/asf/juddi/blob/d7195270/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java ---------------------------------------------------------------------- diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java index 81f0bbe..a0b8ebe 100644 --- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java +++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_030_BusinessEntityIntegrationTest.java @@ -114,6 +114,7 @@ public class UDDI_030_BusinessEntityIntegrationTest { logger.error(e.getMessage(), e); Assert.fail("Could not obtain authInfo token."); } + JUDDI_300_MultiNodeIntegrationTest.testSetupReplicationConfig(); } @Test http://git-wip-us.apache.org/repos/asf/juddi/blob/d7195270/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java ---------------------------------------------------------------------- diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java index 2df607c..167aa4c 100644 --- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java +++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_BusinessServiceIntegrationTest.java @@ -112,6 +112,7 @@ public class UDDI_040_BusinessServiceIntegrationTest { logger.error(e.getMessage(), e); Assert.fail("Could not obtain authInfo token."); } + JUDDI_300_MultiNodeIntegrationTest.testSetupReplicationConfig(); } @Test http://git-wip-us.apache.org/repos/asf/juddi/blob/d7195270/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_PerformanceIntegrationTest.java ---------------------------------------------------------------------- diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_PerformanceIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_PerformanceIntegrationTest.java index fb33b33..63ea8dd 100644 --- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_PerformanceIntegrationTest.java +++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_040_PerformanceIntegrationTest.java @@ -123,6 +123,7 @@ public class UDDI_040_PerformanceIntegrationTest { logger.error(e.getMessage(), e); Assert.fail("Could not obtain authInfo token."); } + JUDDI_300_MultiNodeIntegrationTest.testSetupReplicationConfig(); } long counter = 30; http://git-wip-us.apache.org/repos/asf/juddi/blob/d7195270/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java ---------------------------------------------------------------------- diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java index 0d58c0c..bf025c2 100644 --- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java +++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_050_BindingTemplateIntegrationTest.java @@ -98,6 +98,7 @@ public class UDDI_050_BindingTemplateIntegrationTest { logger.error(e.getMessage(), e); Assert.fail("Could not obtain authInfo token."); } + JUDDI_300_MultiNodeIntegrationTest.testSetupReplicationConfig(); } @Test http://git-wip-us.apache.org/repos/asf/juddi/blob/d7195270/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_060_PublisherAssertionIntegrationTest.java ---------------------------------------------------------------------- diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_060_PublisherAssertionIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_060_PublisherAssertionIntegrationTest.java index 97ab126..69f22af 100644 --- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_060_PublisherAssertionIntegrationTest.java +++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_060_PublisherAssertionIntegrationTest.java @@ -119,6 +119,7 @@ public class UDDI_060_PublisherAssertionIntegrationTest { logger.error(e.getMessage(), e); Assert.fail("Could not obtain authInfo token."); } + JUDDI_300_MultiNodeIntegrationTest.testSetupReplicationConfig(); } @Test http://git-wip-us.apache.org/repos/asf/juddi/blob/d7195270/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_070_FindEntityIntegrationTest.java ---------------------------------------------------------------------- diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_070_FindEntityIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_070_FindEntityIntegrationTest.java index ea11f9c..d574dfa 100644 --- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_070_FindEntityIntegrationTest.java +++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_070_FindEntityIntegrationTest.java @@ -108,6 +108,7 @@ public class UDDI_070_FindEntityIntegrationTest { logger.error(e.getMessage(), e); Assert.fail("Could not obtain authInfo token."); } + JUDDI_300_MultiNodeIntegrationTest.testSetupReplicationConfig(); } @Test http://git-wip-us.apache.org/repos/asf/juddi/blob/d7195270/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java ---------------------------------------------------------------------- diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java index 6a1646f..8b706f1 100644 --- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java +++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_080_SubscriptionIntegrationTest.java @@ -160,6 +160,7 @@ public class UDDI_080_SubscriptionIntegrationTest { logger.error(e.getMessage(), e); Assert.fail("Could not obtain authInfo token."); } + JUDDI_300_MultiNodeIntegrationTest.testSetupReplicationConfig(); } static final String TRANS = "The transaction has been rolled back"; static final String MISSING_RESOURCE = "Can't find resource for bundle"; http://git-wip-us.apache.org/repos/asf/juddi/blob/d7195270/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_HttpExternalTest.java ---------------------------------------------------------------------- diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_HttpExternalTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_HttpExternalTest.java index bc04c2a..1aa2e5d 100644 --- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_HttpExternalTest.java +++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_HttpExternalTest.java @@ -72,6 +72,7 @@ public class UDDI_090_HttpExternalTest extends UDDI_090_SubscriptionListenerInte Assert.fail("unable to bring up endpoint"); } } + } @Override @@ -167,4 +168,9 @@ public class UDDI_090_HttpExternalTest extends UDDI_090_SubscriptionListenerInte return TckSubscriptionListener.SUBSCRIPTION_KEY; } + @Override + public boolean IsEnabled() { + return true; + } + } http://git-wip-us.apache.org/repos/asf/juddi/blob/d7195270/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_HttpMavenIntegrationTest.java ---------------------------------------------------------------------- diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_HttpMavenIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_HttpMavenIntegrationTest.java index 39f379a..037b00d 100644 --- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_HttpMavenIntegrationTest.java +++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_HttpMavenIntegrationTest.java @@ -15,16 +15,12 @@ */ package org.apache.juddi.v3.tck; -import java.net.InetAddress; import java.util.Iterator; import java.util.Random; -import java.util.logging.Level; -import java.util.logging.Logger; import javax.xml.ws.Endpoint; import org.apache.commons.configuration.ConfigurationException; import org.junit.AfterClass; import org.junit.Assert; -import org.junit.Assume; import org.junit.BeforeClass; /** @@ -156,4 +152,9 @@ public class UDDI_090_HttpMavenIntegrationTest extends UDDI_090_SubscriptionList return TckSubscriptionListener.SUBSCRIPTION_KEY; } + @Override + public boolean IsEnabled() { + return true; + } + } http://git-wip-us.apache.org/repos/asf/juddi/blob/d7195270/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_RMIIntegrationTest.java ---------------------------------------------------------------------- diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_RMIIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_RMIIntegrationTest.java index 5e925a8..4d11732 100644 --- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_RMIIntegrationTest.java +++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_RMIIntegrationTest.java @@ -157,4 +157,9 @@ public class UDDI_090_RMIIntegrationTest extends UDDI_090_SubscriptionListenerIn return TckSubscriptionListenerRMI.SUBSCRIPTION_KEY_RMI; } + @Override + public boolean IsEnabled() { + return TckPublisher.isRMI(); + } + } http://git-wip-us.apache.org/repos/asf/juddi/blob/d7195270/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_Smtp_ExternalTest.java ---------------------------------------------------------------------- diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_Smtp_ExternalTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_Smtp_ExternalTest.java index 998bf19..08f1b20 100644 --- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_Smtp_ExternalTest.java +++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_Smtp_ExternalTest.java @@ -19,22 +19,16 @@ import java.io.BufferedInputStream; import java.io.InputStream; import java.util.Enumeration; import java.util.Properties; -import java.util.Random; -import java.util.logging.Level; -import java.util.logging.Logger; import javax.mail.Flags; import javax.mail.Folder; import javax.mail.Message; import javax.mail.Session; import javax.mail.Store; import javax.mail.internet.MimeMessage; -import javax.xml.ws.Endpoint; import org.apache.commons.codec.net.QuotedPrintableCodec; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.mail.util.MimeMessageParser; import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.Assume; import org.junit.BeforeClass; /** @@ -226,4 +220,11 @@ public class UDDI_090_Smtp_ExternalTest extends UDDI_090_SubscriptionListenerInt return TckSubscriptionListener.SUBSCRIPTION_SMTP_KEY; } + @Override + public boolean IsEnabled() { + return TckPublisher.isSMTPEnabled(); + } + + + } http://git-wip-us.apache.org/repos/asf/juddi/blob/d7195270/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationBase.java ---------------------------------------------------------------------- diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationBase.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationBase.java index f25f32c..afce7c9 100644 --- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationBase.java +++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationBase.java @@ -107,6 +107,7 @@ public abstract class UDDI_090_SubscriptionListenerIntegrationBase { tckTModelMary.deleteCreatedTModels(authInfoMary); manager.stop(); //shutting down the TCK SubscriptionListener + JUDDI_300_MultiNodeIntegrationTest.testSetupReplicationConfig(); } @@ -199,6 +200,8 @@ public abstract class UDDI_090_SubscriptionListenerIntegrationBase { * reform transport specific resets of the listener */ public abstract void reset(); + + public abstract boolean IsEnabled(); public abstract String getXMLLocationOfServiceForDelivery(); @@ -227,6 +230,7 @@ public abstract class UDDI_090_SubscriptionListenerIntegrationBase { public void joePublisherUpdate_FIND_SERVICE() { Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeNotNull(getHostame()); + Assume.assumeTrue(IsEnabled()); logger.info("joePublisherUpdate_" + getTransport() + "_FIND_SERVICE"); try { TckCommon.removeAllExistingSubscriptions(authInfoJoe, subscriptionJoe); @@ -273,6 +277,7 @@ public abstract class UDDI_090_SubscriptionListenerIntegrationBase { public void joePublisherUpdate_FIND_BUSINESS() { Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeNotNull(getHostame()); + Assume.assumeTrue(IsEnabled()); logger.info("joePublisherUpdate_" + getTransport() + "_FIND_BUSINESS"); try { TckCommon.removeAllExistingSubscriptions(authInfoJoe, subscriptionJoe); @@ -336,6 +341,7 @@ public abstract class UDDI_090_SubscriptionListenerIntegrationBase { public void joePublisherUpdate_FIND_TMODEL() { Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeNotNull(getHostame()); + Assume.assumeTrue(IsEnabled()); logger.info("joePublisherUpdate_" + getTransport() + "_FIND_TMODEL " + getXMLLocationOfServiceForDelivery() + " " + getPort() + " " + getHostame()); TckCommon.removeAllExistingSubscriptions(authInfoJoe, subscriptionJoe); try { @@ -391,6 +397,7 @@ public abstract class UDDI_090_SubscriptionListenerIntegrationBase { public void joePublisherUpdate_GET_BUSINESS_DETAIL() throws Exception { Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeNotNull(getHostame()); + Assume.assumeTrue(IsEnabled()); logger.info("joePublisherUpdate_" + getTransport() + "_GET_BUSINESS_DETAIL"); TckCommon.removeAllExistingSubscriptions(authInfoJoe, subscriptionJoe); Holder<List<Subscription>> holder = null; @@ -471,6 +478,7 @@ public abstract class UDDI_090_SubscriptionListenerIntegrationBase { public void joePublisherUpdate_GET_TMODEL_DETAIL() throws Exception { Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeNotNull(getHostame()); + Assume.assumeTrue(IsEnabled()); logger.info("joePublisherUpdate_" + getTransport() + "_GET_TMODEL_DETAIL"); TckCommon.removeAllExistingSubscriptions(authInfoJoe, subscriptionJoe); Holder<List<Subscription>> holder = null; @@ -576,6 +584,7 @@ public abstract class UDDI_090_SubscriptionListenerIntegrationBase { public void joePublisherUpdate_GET_SERVICE_DETAIL() throws Exception { Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeNotNull(getHostame()); + Assume.assumeTrue(IsEnabled()); logger.info("joePublisherUpdate_" + getTransport() + "_GET_SERVICE_DETAIL"); TckCommon.removeAllExistingSubscriptions(authInfoJoe, subscriptionJoe); Holder<List<Subscription>> holder = null; @@ -665,6 +674,7 @@ public abstract class UDDI_090_SubscriptionListenerIntegrationBase { public void joePublisherUpdate_GET_BINDING_DETAIL() throws Exception { Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeNotNull(getHostame()); + Assume.assumeTrue(IsEnabled()); logger.info("joePublisherUpdate_" + getTransport() + "_GET_BINDING_DETAIL"); TckCommon.removeAllExistingSubscriptions(authInfoJoe, subscriptionJoe); Holder<List<Subscription>> holder = null; @@ -763,6 +773,7 @@ public abstract class UDDI_090_SubscriptionListenerIntegrationBase { public void joePublisherUpdate_PUBLISHERASSERTION_DETAIL_TO() throws Exception { Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeNotNull(getHostame()); + Assume.assumeTrue(IsEnabled()); logger.info("joePublisherUpdate_" + getTransport() + "_PUBLISHERASSERTION_DETAIL_TO"); TckCommon.removeAllExistingSubscriptions(authInfoJoe, subscriptionJoe); Holder<List<Subscription>> holder = null; @@ -856,6 +867,7 @@ public abstract class UDDI_090_SubscriptionListenerIntegrationBase { public void joePublisherUpdate_PUBLISHERASSERTION_DETAIL_FROM() throws Exception { Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeNotNull(getHostame()); + Assume.assumeTrue(IsEnabled()); logger.info("joePublisherUpdate_" + getTransport() + "_PUBLISHERASSERTION_DETAIL_FROM"); TckCommon.removeAllExistingSubscriptions(authInfoJoe, subscriptionJoe); Holder<List<Subscription>> holder = null; @@ -948,6 +960,7 @@ public abstract class UDDI_090_SubscriptionListenerIntegrationBase { public void joePublisherUpdate_PUBLISHERASSERTION_DETAIL_NULL() throws Exception { Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeNotNull(getHostame()); + Assume.assumeTrue(IsEnabled()); logger.info("joePublisherUpdate_" + getTransport() + "_PUBLISHERASSERTION_DETAIL_NULL"); TckCommon.removeAllExistingSubscriptions(authInfoJoe, subscriptionJoe); Holder<List<Subscription>> holder = null; @@ -1038,6 +1051,7 @@ public abstract class UDDI_090_SubscriptionListenerIntegrationBase { public void joePublisherUpdate_PUBLISHERASSERTION_DETAIL_COMPLETE() throws Exception { Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeNotNull(getHostame()); + Assume.assumeTrue(IsEnabled()); logger.info("joePublisherUpdate_" + getTransport() + "_PUBLISHERASSERTION_DETAIL_COMPLETE"); TckCommon.removeAllExistingSubscriptions(authInfoJoe, subscriptionJoe); Holder<List<Subscription>> holder = null; @@ -1133,6 +1147,7 @@ public abstract class UDDI_090_SubscriptionListenerIntegrationBase { public void joePublisherUpdate_FIND_RELATED_BIZ() throws Exception { Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeNotNull(getHostame()); + Assume.assumeTrue(IsEnabled()); logger.info("joePublisherUpdate_" + getTransport() + "_FIND_RELATED_BIZ"); TckCommon.removeAllExistingSubscriptions(authInfoJoe, subscriptionJoe); Holder<List<Subscription>> holder = null; @@ -1240,6 +1255,7 @@ public abstract class UDDI_090_SubscriptionListenerIntegrationBase { public void joePublisherUpdate_FIND_BINDING_BY_SERVICEKEY_AND_TMI() throws Exception { Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeNotNull(getHostame()); + Assume.assumeTrue(IsEnabled()); logger.info("joePublisherUpdate_" + getTransport() + "_FIND_BINDING_BY_SERVICEKEY_AND_TMI"); TckCommon.removeAllExistingSubscriptions(authInfoJoe, subscriptionJoe); Holder<List<Subscription>> holder = null; @@ -1344,6 +1360,7 @@ public abstract class UDDI_090_SubscriptionListenerIntegrationBase { public void joePublisherUpdate_FIND_BINDING_BY_CATBAG() throws Exception { Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeNotNull(getHostame()); + Assume.assumeTrue(IsEnabled()); logger.info("joePublisherUpdate_" + getTransport() + "_FIND_BINDING_BY_CATBAG"); TckCommon.removeAllExistingSubscriptions(authInfoJoe, subscriptionJoe); Holder<List<Subscription>> holder = null; http://git-wip-us.apache.org/repos/asf/juddi/blob/d7195270/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_110_FindBusinessIntegrationTest.java ---------------------------------------------------------------------- diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_110_FindBusinessIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_110_FindBusinessIntegrationTest.java index 71a3244..d62d3e8 100644 --- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_110_FindBusinessIntegrationTest.java +++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_110_FindBusinessIntegrationTest.java @@ -104,6 +104,7 @@ public class UDDI_110_FindBusinessIntegrationTest { logger.error(e.getMessage(), e); Assert.fail("Could not obtain authInfo token."); } + JUDDI_300_MultiNodeIntegrationTest.testSetupReplicationConfig(); } /** http://git-wip-us.apache.org/repos/asf/juddi/blob/d7195270/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_120_CombineCategoryBagsFindServiceIntegrationTest.java ---------------------------------------------------------------------- diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_120_CombineCategoryBagsFindServiceIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_120_CombineCategoryBagsFindServiceIntegrationTest.java index 786a086..dc6087d 100644 --- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_120_CombineCategoryBagsFindServiceIntegrationTest.java +++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_120_CombineCategoryBagsFindServiceIntegrationTest.java @@ -105,6 +105,7 @@ public class UDDI_120_CombineCategoryBagsFindServiceIntegrationTest { logger.error(e.getMessage(), e); Assert.fail("Could not obtain authInfo token."); } + JUDDI_300_MultiNodeIntegrationTest.testSetupReplicationConfig(); } @Test http://git-wip-us.apache.org/repos/asf/juddi/blob/d7195270/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_130_CombineCategoryBagsFindBusinessIntegrationTest.java ---------------------------------------------------------------------- diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_130_CombineCategoryBagsFindBusinessIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_130_CombineCategoryBagsFindBusinessIntegrationTest.java index badb884..cac9928 100644 --- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_130_CombineCategoryBagsFindBusinessIntegrationTest.java +++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_130_CombineCategoryBagsFindBusinessIntegrationTest.java @@ -112,6 +112,7 @@ public class UDDI_130_CombineCategoryBagsFindBusinessIntegrationTest logger.error(e.getMessage(), e); Assert.fail("Could not obtain authInfo token."); } + JUDDI_300_MultiNodeIntegrationTest.testSetupReplicationConfig(); } @Test http://git-wip-us.apache.org/repos/asf/juddi/blob/d7195270/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_140_NegativePublicationIntegrationTest.java ---------------------------------------------------------------------- diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_140_NegativePublicationIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_140_NegativePublicationIntegrationTest.java index db1d5ac..90ef51d 100644 --- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_140_NegativePublicationIntegrationTest.java +++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_140_NegativePublicationIntegrationTest.java @@ -154,6 +154,7 @@ public class UDDI_140_NegativePublicationIntegrationTest { logger.error(e.getMessage(), e); Assert.fail("Could not obtain authInfo token."); } + JUDDI_300_MultiNodeIntegrationTest.testSetupReplicationConfig(); } static void HandleException(Exception ex) { http://git-wip-us.apache.org/repos/asf/juddi/blob/d7195270/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_141_JIRAIntegrationTest.java ---------------------------------------------------------------------- diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_141_JIRAIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_141_JIRAIntegrationTest.java index 44ea3fe..8901483 100644 --- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_141_JIRAIntegrationTest.java +++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_141_JIRAIntegrationTest.java @@ -146,6 +146,7 @@ public class UDDI_141_JIRAIntegrationTest { logger.error(e.getMessage(), e); Assert.fail("Could not obtain authInfo token."); } + JUDDI_300_MultiNodeIntegrationTest.testSetupReplicationConfig(); } static void HandleException(Exception ex) { http://git-wip-us.apache.org/repos/asf/juddi/blob/d7195270/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_142_DigitalSignatureIntegrationTest.java ---------------------------------------------------------------------- diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_142_DigitalSignatureIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_142_DigitalSignatureIntegrationTest.java index 7291724..a4d8685 100644 --- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_142_DigitalSignatureIntegrationTest.java +++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_142_DigitalSignatureIntegrationTest.java @@ -130,6 +130,7 @@ public class UDDI_142_DigitalSignatureIntegrationTest { logger.error(e.getMessage(), e); Assert.fail("Could not obtain authInfo token."); } + JUDDI_300_MultiNodeIntegrationTest.testSetupReplicationConfig(); } private void DeleteBusinesses(List<String> businesskeysToDelete, String authinfo, UDDIPublicationPortType pub) { http://git-wip-us.apache.org/repos/asf/juddi/blob/d7195270/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_150_CustodyTransferIntegrationTest.java ---------------------------------------------------------------------- diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_150_CustodyTransferIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_150_CustodyTransferIntegrationTest.java index 5d29914..0f8051b 100644 --- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_150_CustodyTransferIntegrationTest.java +++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_150_CustodyTransferIntegrationTest.java @@ -141,6 +141,7 @@ public class UDDI_150_CustodyTransferIntegrationTest { logger.error(e.getMessage(), e); Assert.fail("Could not obtain authInfo token."); } + JUDDI_300_MultiNodeIntegrationTest.testSetupReplicationConfig(); } static void HandleException(Exception ex) { http://git-wip-us.apache.org/repos/asf/juddi/blob/d7195270/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_160_RESTIntergrationTest.java ---------------------------------------------------------------------- diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_160_RESTIntergrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_160_RESTIntergrationTest.java index 0c8d56f..2c01601 100644 --- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_160_RESTIntergrationTest.java +++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_160_RESTIntergrationTest.java @@ -66,7 +66,9 @@ public class UDDI_160_RESTIntergrationTest { @BeforeClass public static void startRegistry() throws ConfigurationException { - if (!TckPublisher.isEnabled()) return; + if (!TckPublisher.isEnabled()) { + return; + } manager = new UDDIClient(); manager.start(); @@ -77,11 +79,14 @@ public class UDDI_160_RESTIntergrationTest { logger.error(e.getMessage(), e); Assert.fail("Could not obtain authInfo token."); } + JUDDI_300_MultiNodeIntegrationTest.testSetupReplicationConfig(); } @AfterClass public static void stopRegistry() throws ConfigurationException { - if (!TckPublisher.isEnabled()) return; + if (!TckPublisher.isEnabled()) { + return; + } manager.stop(); } @@ -99,7 +104,7 @@ public class UDDI_160_RESTIntergrationTest { }*/ @Test public void InquiryREST_GET_Business() throws Exception { - Assume.assumeTrue(TckPublisher.isEnabled()); + Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeTrue(TckPublisher.isInquiryRestEnabled()); FindBusiness fb = new FindBusiness(); fb.setMaxRows(1); @@ -118,7 +123,7 @@ public class UDDI_160_RESTIntergrationTest { HttpGet httpGet = new HttpGet(url + "?businessKey=" + findBusiness.getBusinessInfos().getBusinessInfo().get(0).getBusinessKey()); logger.info("Fetching " + httpGet.getURI()); HttpResponse response = client.execute(httpGet); - + Assert.assertTrue(response.getStatusLine().getStatusCode() == 200); logger.info("Response content: " + response.getEntity().getContent()); BusinessEntity unmarshal = JAXB.unmarshal(response.getEntity().getContent(), BusinessEntity.class); @@ -126,12 +131,11 @@ public class UDDI_160_RESTIntergrationTest { Assert.assertNotNull(unmarshal); Assert.assertEquals(unmarshal.getBusinessKey(), findBusiness.getBusinessInfos().getBusinessInfo().get(0).getBusinessKey()); - } @Test public void InquiryREST_GET_TModel() throws Exception { - Assume.assumeTrue(TckPublisher.isEnabled()); + Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeTrue(TckPublisher.isInquiryRestEnabled()); FindTModel fb = new FindTModel(); fb.setMaxRows(1); @@ -146,13 +150,13 @@ public class UDDI_160_RESTIntergrationTest { String url = manager.getClientConfig().getHomeNode().getInquiry_REST_Url(); Assume.assumeNotNull(url); - + HttpClient client = new DefaultHttpClient(); - + HttpGet httpGet = new HttpGet(url + "?tModelKey=" + findTModel.getTModelInfos().getTModelInfo().get(0).getTModelKey()); logger.info("Fetching " + httpGet.getURI()); HttpResponse response = client.execute(httpGet); - + Assert.assertTrue(response.getStatusLine().getStatusCode() == 200); logger.info("Response content: " + response.getEntity().getContent()); TModel unmarshal = JAXB.unmarshal(response.getEntity().getContent(), TModel.class); @@ -160,12 +164,11 @@ public class UDDI_160_RESTIntergrationTest { Assert.assertNotNull(unmarshal); Assert.assertEquals(unmarshal.getTModelKey(), findTModel.getTModelInfos().getTModelInfo().get(0).getTModelKey()); - } @Test public void InquiryREST_GET_Service() throws Exception { - Assume.assumeTrue(TckPublisher.isEnabled()); + Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeTrue(TckPublisher.isInquiryRestEnabled()); //find the first service via inquriy soap FindService fb = new FindService(); @@ -181,14 +184,13 @@ public class UDDI_160_RESTIntergrationTest { String url = manager.getClientConfig().getHomeNode().getInquiry_REST_Url(); Assume.assumeNotNull(url); - + //get the results via inquiry rest HttpClient client = new DefaultHttpClient(); HttpGet httpGet = new HttpGet(url + "?serviceKey=" + findService.getServiceInfos().getServiceInfo().get(0).getServiceKey()); logger.info("Fetching " + httpGet.getURI()); HttpResponse response = client.execute(httpGet); - - + Assert.assertTrue(response.getStatusLine().getStatusCode() == 200); logger.info("Response content: " + response.getEntity().getContent()); BusinessService unmarshal = JAXB.unmarshal(response.getEntity().getContent(), BusinessService.class); @@ -196,7 +198,6 @@ public class UDDI_160_RESTIntergrationTest { Assert.assertNotNull(unmarshal); Assert.assertEquals(unmarshal.getServiceKey(), findService.getServiceInfos().getServiceInfo().get(0).getServiceKey()); - } private BindingTemplate getFirstBindingTemplate() { @@ -244,12 +245,12 @@ public class UDDI_160_RESTIntergrationTest { @Test public void InquiryREST_GET_Binding() throws Exception { - Assume.assumeTrue(TckPublisher.isEnabled()); + Assume.assumeTrue(TckPublisher.isEnabled()); Assume.assumeTrue(TckPublisher.isInquiryRestEnabled()); - + BindingTemplate bt = getFirstBindingTemplate(); Assume.assumeTrue(bt != null); - + String url = manager.getClientConfig().getHomeNode().getInquiry_REST_Url(); Assume.assumeNotNull(url); @@ -257,7 +258,7 @@ public class UDDI_160_RESTIntergrationTest { HttpGet httpGet = new HttpGet(url + "?bindingKey=" + bt.getBindingKey()); logger.info("Fetching " + httpGet.getURI()); HttpResponse response = client.execute(httpGet); - + Assert.assertTrue(response.getStatusLine().getStatusCode() == 200); logger.info("Response content: " + response.getEntity().getContent()); BindingTemplate unmarshal = JAXB.unmarshal(response.getEntity().getContent(), BindingTemplate.class); @@ -266,6 +267,5 @@ public class UDDI_160_RESTIntergrationTest { Assert.assertEquals(unmarshal.getServiceKey(), bt.getServiceKey()); Assert.assertEquals(unmarshal.getBindingKey(), bt.getBindingKey()); - } } http://git-wip-us.apache.org/repos/asf/juddi/blob/d7195270/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_170_ValueSetValidationIntegrationTest.java ---------------------------------------------------------------------- diff --git a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_170_ValueSetValidationIntegrationTest.java b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_170_ValueSetValidationIntegrationTest.java index 578685e..a6fc23b 100644 --- a/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_170_ValueSetValidationIntegrationTest.java +++ b/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_170_ValueSetValidationIntegrationTest.java @@ -124,6 +124,7 @@ public class UDDI_170_ValueSetValidationIntegrationTest implements UDDIValueSetV logger.error(e.getMessage(), e); Assert.fail("Could not obtain authInfo token."); } + JUDDI_300_MultiNodeIntegrationTest.testSetupReplicationConfig(); } @AfterClass http://git-wip-us.apache.org/repos/asf/juddi/blob/d7195270/uddi-tck/uddiNode2.xml ---------------------------------------------------------------------- diff --git a/uddi-tck/uddiNode2.xml b/uddi-tck/uddiNode2.xml new file mode 100644 index 0000000..71c865a --- /dev/null +++ b/uddi-tck/uddiNode2.xml @@ -0,0 +1,134 @@ +<?xml version="1.0" encoding="ISO-8859-1" ?> +<!-- +This config is for the juddi-gui. + +It currently does not use the ValueSet, jUDDI, Replication, or REST APIs +--> +<uddi> + <reloadDelay>5000</reloadDelay> + <client name="juddigui"> + <nodes> + <node> + <!-- required 'default' node --> + <name>default</name> + <description>Main UDDI Node</description> + <!-- JAX-WS Transport --> + <proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport> + <custodyTransferUrl>http://localhost:9080/juddiv3/services/custody-transfer</custodyTransferUrl> + <inquiryUrl>http://localhost:9080/juddiv3/services/inquiry</inquiryUrl> + <publishUrl>http://localhost:9080/juddiv3/services/publish</publishUrl> + <securityUrl>http://localhost:9080/juddiv3/services/security</securityUrl> + <subscriptionUrl>http://localhost:9080/juddiv3/services/subscription</subscriptionUrl> + </node> + <node> + <name>default-ssl</name> + <description>Main UDDI Node using SSL</description> + <!-- JAX-WS Transport --> + <proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport> + <custodyTransferUrl>http://localhost:9443/juddiv3/services/custody-transfer</custodyTransferUrl> + <inquiryUrl>https://localhost:9443/juddiv3/services/inquiry</inquiryUrl> + <publishUrl>https://localhost:9443/juddiv3/services/publish</publishUrl> + <securityUrl>https://localhost:9443/juddiv3/services/security</securityUrl> + <subscriptionUrl>https://localhost:9443/juddiv3/services/subscription</subscriptionUrl> + </node> + <node> + <name>jboss7</name> + <description>Main UDDI node running on Jboss EAP6 or AS7</description> + <!-- + Jboss users, note that the url is typically different, here's an example for Jboss EAP 6.x--> + <custodyTransferUrl>http://localhost:8080/juddiv3/UDDICustodyTransferService</custodyTransferUrl> + <inquiryUrl>http://localhost:8080/juddiv3/UDDIInquiryService</inquiryUrl> + <publishUrl>http://localhost:8080/juddiv3/UDDIPublicationService</publishUrl> + <securityUrl>http://localhost:8080/juddiv3/UDDISecurityService</securityUrl> + <subscriptionUrl>http://localhost:8080/juddiv3/UDDISubscriptionService</subscriptionUrl> + <subscriptionListenerUrl>http://localhost:8080/juddiv3/UDDISubscriptionListenerService</subscriptionListenerUrl> + </node> + <node> + <name>jboss7-ssl</name> + <description>Main UDDI node running on Jboss EAP6 or AS7</description> + <!-- + Jboss users, note that the url is typically different, here's an example for Jboss EAP 6.x--> + <custodyTransferUrl>https://localhost:8443/juddiv3/UDDICustodyTransferService</custodyTransferUrl> + <inquiryUrl>https://localhost:8443/juddiv3/UDDIInquiryService</inquiryUrl> + <publishUrl>https://localhost:8443/juddiv3/UDDIPublicationService</publishUrl> + <securityUrl>https://localhost:8443/juddiv3/UDDISecurityService</securityUrl> + <subscriptionUrl>https://localhost:8443/juddiv3/UDDISubscriptionService</subscriptionUrl> + </node> + </nodes> + <signature> + <!-- signing stuff, is NOT used by juddi-gui --> + <signingKeyStorePath>(not used)</signingKeyStorePath> + <signingKeyStoreType>(not used)</signingKeyStoreType> + <signingKeyStoreFilePassword + isPasswordEncrypted="false" + cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">(not used)</signingKeyStoreFilePassword> + <signingKeyPassword + isPasswordEncrypted="false" + cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor">(not used)</signingKeyPassword> + <signingKeyAlias>(not used)</signingKeyAlias> + + <canonicalizationMethod>http://www.w3.org/2001/10/xml-exc-c14n#</canonicalizationMethod> + <signatureMethod>http://www.w3.org/2000/09/xmldsig#rsa-sha1</signatureMethod> + <XML_DIGSIG_NS>http://www.w3.org/2000/09/xmldsig#</XML_DIGSIG_NS> + + <!-- validation stuff + This part IS used by juddi-gui whenever someone views an entity that is signed + --> + <!-- if this doesn't exist or is incorrect, the client will attempt to load from system properties, then + from the standard jdk trust store + generally, if defined, the working path is typically the bin folder of the container + --> + <trustStorePath></trustStorePath> + <trustStoreType>JKS</trustStoreType> + <trustStorePassword + isPasswordEncrypted="false" + cryptoProvider="org.apache.juddi.v3.client.crypto.AES128Cryptor"></trustStorePassword> + + <checkTimestamps>true</checkTimestamps> + <checkTrust>true</checkTrust> + <checkRevocationCRL>true</checkRevocationCRL> + <keyInfoInclusionSubjectDN>false</keyInfoInclusionSubjectDN> + <keyInfoInclusionSerial>false</keyInfoInclusionSerial> + <keyInfoInclusionBase64PublicKey>true</keyInfoInclusionBase64PublicKey> + <digestMethod>http://www.w3.org/2000/09/xmldsig#sha1</digestMethod> + </signature> + <!-- not used by juddi-gui--> + <subscriptionCallbacks> + <keyDomain>(not used)</keyDomain> + <listenUrl>(not used)</listenUrl> + <autoRegisterBindingTemplate>false</autoRegisterBindingTemplate> + <autoRegisterBusinessServiceKey>(not used)</autoRegisterBusinessServiceKey> + <signatureBehavior>DoNothing</signatureBehavior> + <!--valid values are AbortIfSigned,Sign,DoNothing,SignOnlyIfParentIsntSigned, default is DoNothing--> + </subscriptionCallbacks> + <!-- juddi-gui, used in the Create, Import from Wadl/Wsdl --> + <XtoWsdl> + <IgnoreSSLErrors>false</IgnoreSSLErrors> + </XtoWsdl> + + </client> + + <!-- hi there! + this section is required by juddi-gui and is an extension of what the normal juddi-client does + it's not in the standard config schema. + + --> + <config> + + <props> + <!--#required. if this uddi client is connected to uddi services that use the auth token, then set to UDDI_AUTH + #if not, set authtype to HTTP--> + <authtype>UDDI_AUTH</authtype> + <automaticLogouts> + <!-- #enables automatic logout timer, defaults to false if not defined--> + <enabled>true</enabled> + <!--#defines the duration of time to wait for the automatic logout, defaults to 15min if not defined--> + <duration>900000</duration> + </automaticLogouts> + <!--#node, this is the node defined in uddi.xml that the jUDDI-GUI will use for connections--> + <node>default</node> + <!-- controls remote access to the settings/configuration page --> + <configLocalHostOnly>true</configLocalHostOnly> + </props> + </config> +</uddi> http://git-wip-us.apache.org/repos/asf/juddi/blob/d7195270/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminDeleteSubscriptionRequest.java ---------------------------------------------------------------------- diff --git a/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminDeleteSubscriptionRequest.java b/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminDeleteSubscriptionRequest.java index 605c45b..62e5dee 100644 --- a/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminDeleteSubscriptionRequest.java +++ b/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminDeleteSubscriptionRequest.java @@ -1,4 +1,19 @@ - +/* + * Copyright 2001-2009 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package org.apache.juddi.api_v3; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/juddi/blob/d7195270/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminDeleteSubscriptionResponse.java ---------------------------------------------------------------------- diff --git a/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminDeleteSubscriptionResponse.java b/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminDeleteSubscriptionResponse.java index d5ff02f..e32ab16 100644 --- a/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminDeleteSubscriptionResponse.java +++ b/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminDeleteSubscriptionResponse.java @@ -1,4 +1,19 @@ - +/* + * Copyright 2001-2009 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package org.apache.juddi.api_v3; import javax.xml.bind.annotation.XmlAccessType; http://git-wip-us.apache.org/repos/asf/juddi/blob/d7195270/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveBusiness.java ---------------------------------------------------------------------- diff --git a/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveBusiness.java b/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveBusiness.java index 7c778ef..cd0a338 100644 --- a/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveBusiness.java +++ b/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveBusiness.java @@ -1,4 +1,19 @@ - +/* + * Copyright 2001-2009 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package org.apache.juddi.api_v3; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/juddi/blob/d7195270/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveBusinessResponse.java ---------------------------------------------------------------------- diff --git a/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveBusinessResponse.java b/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveBusinessResponse.java index f6cab0e..07248f4 100644 --- a/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveBusinessResponse.java +++ b/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveBusinessResponse.java @@ -1,4 +1,19 @@ - +/* + * Copyright 2001-2009 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package org.apache.juddi.api_v3; import javax.xml.bind.annotation.XmlAccessType; http://git-wip-us.apache.org/repos/asf/juddi/blob/d7195270/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveBusinessWrapper.java ---------------------------------------------------------------------- diff --git a/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveBusinessWrapper.java b/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveBusinessWrapper.java index 3cc6ca8..8d69d37 100644 --- a/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveBusinessWrapper.java +++ b/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveBusinessWrapper.java @@ -1,4 +1,19 @@ - +/* + * Copyright 2001-2009 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package org.apache.juddi.api_v3; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/juddi/blob/d7195270/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveSubscriptionRequest.java ---------------------------------------------------------------------- diff --git a/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveSubscriptionRequest.java b/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveSubscriptionRequest.java index d9111c7..d439b46 100644 --- a/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveSubscriptionRequest.java +++ b/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveSubscriptionRequest.java @@ -1,4 +1,19 @@ - +/* + * Copyright 2001-2009 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package org.apache.juddi.api_v3; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/juddi/blob/d7195270/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveSubscriptionResponse.java ---------------------------------------------------------------------- diff --git a/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveSubscriptionResponse.java b/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveSubscriptionResponse.java index 718dbd0..c341d99 100644 --- a/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveSubscriptionResponse.java +++ b/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveSubscriptionResponse.java @@ -1,4 +1,19 @@ - +/* + * Copyright 2001-2009 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package org.apache.juddi.api_v3; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/juddi/blob/d7195270/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveTModel.java ---------------------------------------------------------------------- diff --git a/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveTModel.java b/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveTModel.java index c419d0e..e16a81f 100644 --- a/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveTModel.java +++ b/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveTModel.java @@ -1,4 +1,19 @@ - +/* + * Copyright 2001-2009 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package org.apache.juddi.api_v3; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/juddi/blob/d7195270/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveTModelResponse.java ---------------------------------------------------------------------- diff --git a/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveTModelResponse.java b/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveTModelResponse.java index 41ca877..a19342b 100644 --- a/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveTModelResponse.java +++ b/uddi-ws/src/main/java/org/apache/juddi/api_v3/AdminSaveTModelResponse.java @@ -1,4 +1,19 @@ - +/* + * Copyright 2001-2009 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package org.apache.juddi.api_v3; import javax.xml.bind.annotation.XmlAccessType; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
