Repository: juddi Updated Branches: refs/heads/master fa3c699f3 -> a8785abb7
JUDDI-978 possible fix for replication tests Project: http://git-wip-us.apache.org/repos/asf/juddi/repo Commit: http://git-wip-us.apache.org/repos/asf/juddi/commit/a8785abb Tree: http://git-wip-us.apache.org/repos/asf/juddi/tree/a8785abb Diff: http://git-wip-us.apache.org/repos/asf/juddi/diff/a8785abb Branch: refs/heads/master Commit: a8785abb7aeeeecee0b6d43edb5be484b70560fb Parents: fa3c699 Author: Alex O'Ree <[email protected]> Authored: Sun Oct 8 10:17:25 2017 -0400 Committer: Alex O'Ree <[email protected]> Committed: Sun Oct 8 10:17:25 2017 -0400 ---------------------------------------------------------------------- .../java/org/apache/juddi/v3/tck/TckTModel.java | 12 +++- .../uddi_data/tmodels/tmodelsKeyGenParent.xml | 28 ++++++++ uddi-tck/pom.xml | 4 +- .../tck/JUDDI_300_MultiNodeIntegrationTest.java | 69 +++++++++++++++----- 4 files changed, 94 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/juddi/blob/a8785abb/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckTModel.java ---------------------------------------------------------------------- diff --git a/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckTModel.java b/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckTModel.java index b338eaf..1feadf4 100644 --- a/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckTModel.java +++ b/uddi-tck-base/src/main/java/org/apache/juddi/v3/tck/TckTModel.java @@ -57,7 +57,13 @@ public class TckTModel { final static String SAM_SYNDICATOR_TMODEL_XML = "uddi_data/samsyndicator/tModelKeyGen.xml"; final static String SAM_SYNDICATOR_TMODEL_KEY = "uddi:www.samco.com:keygenerator"; final static String TMODEL_PUBLISHER_TMODEL_XML = "uddi_data/tmodels/tModelKeyGen.xml"; + + final static String TMODEL_PUBLISHER_TMODEL_KEY_ROOT = "uddi:tmodelkey:keygenerator"; + final static String TMODEL_PUBLISHER_TMODEL_XML_PARENT = "uddi_data/tmodels/tmodelsKeyGenParent.xml"; + final static String TMODEL_PUBLISHER_TMODEL_KEY = "uddi:tmodelkey:categories:keygenerator"; + + final static String FIND_TMODEL_XML = "uddi_data/find/findTModel1.xml"; final static String FIND_TMODEL_XML_BY_CAT = "uddi_data/find/findTModelByCategoryBag.xml"; public final static String TMODELS_XML = "uddi_data/tmodels/tmodels.xml"; @@ -174,7 +180,7 @@ public class TckTModel { try { tmIn = (org.uddi.api_v3.TModel) EntityCreator.buildFromDoc(tModelXml, "org.uddi.api_v3"); } catch (Exception ex) { - Assert.fail("unable to load tmodel from file!"); + Assert.fail("unable to load tmodel from file!" + ex.getMessage()); } if (tmIn == null) { Assert.fail("unable to load tmodel from file!"); @@ -266,6 +272,10 @@ public class TckTModel { return saveTModel(authInfoJoe, JOE_PUBLISHER_TMODEL_XML, JOE_PUBLISHER_TMODEL_KEY, force); } + /** + * creates key generator + * @param authInfoTM + */ public void saveUDDIPublisherTmodel(String authInfoTM) { saveTModel(authInfoTM, TMODEL_PUBLISHER_TMODEL_XML, TMODEL_PUBLISHER_TMODEL_KEY, false); } http://git-wip-us.apache.org/repos/asf/juddi/blob/a8785abb/uddi-tck-base/src/main/resources/uddi_data/tmodels/tmodelsKeyGenParent.xml ---------------------------------------------------------------------- diff --git a/uddi-tck-base/src/main/resources/uddi_data/tmodels/tmodelsKeyGenParent.xml b/uddi-tck-base/src/main/resources/uddi_data/tmodels/tmodelsKeyGenParent.xml new file mode 100644 index 0000000..c352982 --- /dev/null +++ b/uddi-tck-base/src/main/resources/uddi_data/tmodels/tmodelsKeyGenParent.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * 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. + * + */ --> +<tModel tModelKey="uddi:tmodelkey:keygenerator" xmlns="urn:uddi-org:api_v3"> + <name>tmodelkey:keyGenerator</name> + <description>Key Generator for generic UDDI tModel Keys</description> + <overviewDoc> + <overviewURL useType="text"> + http://uddi.org/pubs/uddi_v3.htm#keyGen</overviewURL> + </overviewDoc> + <categoryBag> + <keyedReference keyName="uddi-org:types:keyGenerator" keyValue="keyGenerator" tModelKey="uddi:uddi.org:categorization:types" /> + </categoryBag> +</tModel> http://git-wip-us.apache.org/repos/asf/juddi/blob/a8785abb/uddi-tck/pom.xml ---------------------------------------------------------------------- diff --git a/uddi-tck/pom.xml b/uddi-tck/pom.xml index ed929a9..d723b76 100644 --- a/uddi-tck/pom.xml +++ b/uddi-tck/pom.xml @@ -218,7 +218,7 @@ <cargo.logging>high</cargo.logging> <cargo.hostname>localhost</cargo.hostname> <cargo.servlet.port>8880</cargo.servlet.port> - <cargo.jvmargs>-Xms256m -Xmx256m -XX:MaxPermSize=256M -Djava.endorsed.dirs=${basedir}/target/juddi-tomcat-${project.parent.version}/endorsed -Djavax.net.ssl.keyStore=${basedir}/../juddi-tomcat/keystore.jks -Djavax.net.ssl.keyStorePassword=password -Djavax.net.ssl.trustStore=${basedir}/../juddi-tomcat/truststore.jks -Djavax.net.ssl.trustStorePassword=password</cargo.jvmargs> + <cargo.jvmargs>-Xms256m -Xmx256m -XX:MaxPermSize=256M -Djava.endorsed.dirs=${basedir}/target/juddi-tomcat-${project.parent.version}/endorsed -Djavax.net.ssl.keyStore=${basedir}/../juddi-tomcat/keystore.jks -Djavax.net.ssl.keyStorePassword=password -Djavax.net.ssl.trustStore=${basedir}/../juddi-tomcat/truststore.jks -Djavax.net.ssl.trustStorePassword=password -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5000 -Xnoagent</cargo.jvmargs> </properties> </configuration> </configuration> @@ -244,7 +244,7 @@ <cargo.logging>high</cargo.logging> <cargo.hostname>localhost</cargo.hostname> <cargo.servlet.port>8980</cargo.servlet.port> - <cargo.jvmargs>-Xms256m -Xmx256m -XX:MaxPermSize=256M -Djava.endorsed.dirs=${basedir}/target/node2/juddi-tomcat-${project.parent.version}/endorsed -Djavax.net.ssl.keyStore=${basedir}/../juddi-tomcat/keystore.jks -Djavax.net.ssl.keyStorePassword=password -Djavax.net.ssl.trustStore=${basedir}/../juddi-tomcat/truststore.jks -Djavax.net.ssl.trustStorePassword=password</cargo.jvmargs> + <cargo.jvmargs>-Xms256m -Xmx256m -XX:MaxPermSize=256M -Djava.endorsed.dirs=${basedir}/target/node2/juddi-tomcat-${project.parent.version}/endorsed -Djavax.net.ssl.keyStore=${basedir}/../juddi-tomcat/keystore.jks -Djavax.net.ssl.keyStorePassword=password -Djavax.net.ssl.trustStore=${basedir}/../juddi-tomcat/truststore.jks -Djavax.net.ssl.trustStorePassword=password -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -Xnoagent</cargo.jvmargs> </properties> </configuration> </configuration> http://git-wip-us.apache.org/repos/asf/juddi/blob/a8785abb/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 index e636f14..236d0e9 100644 --- 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 @@ -97,6 +97,9 @@ public class JUDDI_300_MultiNodeIntegrationTest { private static UDDIClient manager; private static String rootNode1Token; private static String rootNode2Token; + private static String uddiNode1Token; + private static String uddiNode2Token; + private static JUDDIApiPortType juddiApiServiceNode1; private static JUDDIApiPortType juddiApiServiceNode2; @@ -106,16 +109,19 @@ public class JUDDI_300_MultiNodeIntegrationTest { private static UDDICustodyTransferPortType custodyMary; private static UDDIPublicationPortType publishMary; private static UDDIPublicationPortType publishSamNode2; + private static UDDIPublicationPortType publishUddiNode1; + private static UDDIPublicationPortType publishUddiNode2; private static UDDIInquiryPortType inquiryMary; private static UDDIInquiryPortType inquirySamNode2; - //private static UDDIReplicationPortType replicationMary; - //private static UDDIReplicationPortType replicationSam; + static TckBusiness maryBizNode1; static TckTModel maryTModelNode1; - + static TckTModel uddiTmodelNode1; + static TckBusinessService samServiceNode2; static TckBusiness samBizNode2; static TckTModel samTModelNode2; + static TckTModel uddiTmodelNode2; static final String CFG_node1_MARY = "uddiv3"; static final String CFG_node2_SAM = "uddiv3-2"; @@ -154,11 +160,13 @@ public class JUDDI_300_MultiNodeIntegrationTest { UDDISecurityPortType secNode1 = node1.getUDDISecurityService(); rootNode1Token = TckSecurity.getAuthToken(secNode1, TckPublisher.getRootPublisherId(), TckPublisher.getRootPassword()); maryTokenNode1 = TckSecurity.getAuthToken(secNode1, TckPublisher.getMaryPublisherId(), TckPublisher.getMaryPassword()); + uddiNode1Token = TckSecurity.getAuthToken(secNode1, TckPublisher.getUDDIPublisherId(), TckPublisher.getUDDIPassword()); 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()); + uddiNode2Token = TckSecurity.getAuthToken(secNode2, TckPublisher.getUDDIPublisherId(), TckPublisher.getUDDIPassword()); //replicationSam = uddiService.getUDDIReplicationPort(); //((BindingProvider) replicationSam).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, manager.getClientConfig().getUDDINode(CFG_node2_SAM).getReplicationUrl()); //TransportSecurityHelper.applyTransportSecurity((BindingProvider) replicationSam); @@ -168,14 +176,27 @@ public class JUDDI_300_MultiNodeIntegrationTest { custodySam = node2.getUDDICustodyTransferService(); inquirySamNode2 = node2.getUDDIInquiryService(); publishSamNode2 = node2.getUDDIPublishService(); + + Transport node2Uddi = manager.getTransport(CFG_node2_SAM); + publishUddiNode2 = node2Uddi.getUDDIPublishService(); + + Transport node1Uddi = manager.getTransport(CFG_node1_MARY); + publishUddiNode1 = node1Uddi.getUDDIPublishService(); + + samServiceNode2 = new TckBusinessService(publishSamNode2, inquirySamNode2); samBizNode2 = new TckBusiness(publishSamNode2, inquirySamNode2); samTModelNode2 = new TckTModel(publishSamNode2, inquirySamNode2); maryBizNode1 = new TckBusiness(publishMary, inquiryMary); maryTModelNode1 = new TckTModel(publishMary, inquiryMary); + uddiTmodelNode1 = new TckTModel(publishUddiNode1,node1Uddi.getUDDIInquiryService() ); + uddiTmodelNode2= new TckTModel(publishUddiNode2,node2Uddi.getUDDIInquiryService() ); if (!TckPublisher.isUDDIAuthMode()) { + TckSecurity.setCredentials((BindingProvider) publishUddiNode2, TckPublisher.getUDDIPublisherId(), TckPublisher.getUDDIPassword()); + TckSecurity.setCredentials((BindingProvider) publishUddiNode1, TckPublisher.getUDDIPublisherId(), TckPublisher.getUDDIPassword()); + TckSecurity.setCredentials((BindingProvider) juddiApiServiceNode1, TckPublisher.getRootPublisherId(), TckPublisher.getRootPassword()); TckSecurity.setCredentials((BindingProvider) juddiApiServiceNode2, TckPublisher.getRootPublisherId(), TckPublisher.getRootPassword()); TckSecurity.setCredentials((BindingProvider) custodyMary, TckPublisher.getMaryPublisherId(), TckPublisher.getMaryPassword()); @@ -322,7 +343,7 @@ public class JUDDI_300_MultiNodeIntegrationTest { * @throws Exception */ @Test - @Ignore + //@Ignore public void testMultiNodeBusinessCustodyTransfer() throws Exception { logger.info("testMultiNodeBusinessCustodyTransfer"); try { @@ -475,7 +496,7 @@ public class JUDDI_300_MultiNodeIntegrationTest { * @throws Exception */ @Test - @Ignore + //@Ignore public void testReplicationTModelBusinessPublisherAssertionAddDelete() throws Exception { Assume.assumeTrue(TckPublisher.isReplicationEnabled()); Assume.assumeTrue(TckPublisher.isJUDDI()); @@ -491,6 +512,14 @@ public class JUDDI_300_MultiNodeIntegrationTest { BusinessEntity saveMaryPublisherBusiness = maryBizNode1.saveMaryPublisherBusiness(maryTokenNode1); + uddiTmodelNode2.saveTModel(uddiNode2Token, TckTModel.TMODEL_PUBLISHER_TMODEL_XML_PARENT, TckTModel.TMODEL_PUBLISHER_TMODEL_KEY_ROOT); + try{ + uddiTmodelNode2.saveUDDIPublisherTmodel(uddiNode2Token); + uddiTmodelNode2.saveTmodels(uddiNode2Token); + }catch (Throwable t) { + //already exists + } + // TModel saveSamSyndicatorTmodel = samTModelNode2.saveSamSyndicatorTmodel(samTokenNode2); BusinessEntity saveSamSyndicatorBusiness = samBizNode2.saveSamSyndicatorBusiness(samTokenNode2); @@ -743,7 +772,11 @@ public class JUDDI_300_MultiNodeIntegrationTest { } finally { - samBizNode2.deleteSamSyndicatorBusiness(samTokenNode2); + try{ + samBizNode2.deleteSamSyndicatorBusiness(samTokenNode2); + } catch (Throwable t) { + + } resetTmodels(); resetBusinesses(); @@ -764,7 +797,7 @@ public class JUDDI_300_MultiNodeIntegrationTest { * @throws Exception */ @Test - @Ignore + //@Ignore public void testReplicationServiceBindingAddRemove() throws Exception { Assume.assumeTrue(TckPublisher.isReplicationEnabled()); Assume.assumeTrue(TckPublisher.isJUDDI()); @@ -775,10 +808,11 @@ public class JUDDI_300_MultiNodeIntegrationTest { resetBusinesses(); resetTmodels(); - try { - samTModelNode2.saveTmodels(rootNode2Token); - } catch (Exception ex) { - } + + uddiTmodelNode2.saveUDDIPublisherTmodel(uddiNode2Token); + uddiTmodelNode2.saveTmodels(uddiNode2Token); + //samTModelNode2.saveTmodels(rootNode2Token); //should be owned by the uddi account? + samTModelNode2.saveSamSyndicatorTmodel(samTokenNode2); samBizNode2.saveSamSyndicatorBusiness(samTokenNode2); @@ -1226,18 +1260,21 @@ public class JUDDI_300_MultiNodeIntegrationTest { GetTModelDetail findTModel = new GetTModelDetail(); findTModel.setAuthInfo(token); findTModel.getTModelKey().add(tModelKey); - TModelDetail tModelDetail = null; + TModel tModelDetail = null; while (timeout > 0) { logger.info("Waiting for the update..."); try { - tModelDetail = inquiry.getTModelDetail(findTModel); - // JAXB.marshal(tModelDetail, System.out); - // + TModelDetail tModelDetail1 = inquiry.getTModelDetail(findTModel); + if (tModelDetail1==null || tModelDetail1.getTModel().isEmpty()) { + tModelDetail = null; + break; + } else { + tModelDetail = tModelDetail1.getTModel().get(0); + } } catch (Exception ex) { logger.warn(ex.getMessage()); tModelDetail = null; break; - } timeout--; try { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
