Permalink
Show file tree
Hide file tree
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
JUDDI-895 done with support for tokens
JUDDI-861 dialing back the logging a bit
- Loading branch information
Showing
9 changed files
with
342 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| 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. | ||
| --> | ||
| <replicationConfiguration xmlns="urn:uddi-org:repl_v3" xmlns:ns2="urn:uddi-org:api_v3" xmlns:ns3="http://www.w3.org/2000/09/xmldsig#"> | ||
| <serialNumber>0</serialNumber> | ||
| <timeOfConfigurationUpdate></timeOfConfigurationUpdate> | ||
| <registryContact> | ||
| <ns2:contact> | ||
| <ns2:personName>Unknown</ns2:personName> | ||
| </ns2:contact> | ||
| </registryContact> | ||
| <operator> | ||
| <operatorNodeID>${juddi.nodeId}</operatorNodeID> | ||
| <operatorStatus>normal</operatorStatus> | ||
| <ns2:contact> | ||
| <ns2:personName>Unknown</ns2:personName> | ||
| </ns2:contact> | ||
| <soapReplicationURL>${juddi.server.baseurl}/services/replication</soapReplicationURL> | ||
| </operator> | ||
| <communicationGraph> | ||
| <node>${juddi.nodeId}</node> | ||
| <controlledMessage>*</controlledMessage> | ||
| </communicationGraph> | ||
| <maximumTimeToSyncRegistry>1</maximumTimeToSyncRegistry> | ||
| <maximumTimeToGetChanges>1</maximumTimeToGetChanges> | ||
| </replicationConfiguration> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| /* | ||
| * 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.config; | ||
|
|
||
| import java.io.FileInputStream; | ||
| import java.io.FileNotFoundException; | ||
| import java.io.StringWriter; | ||
| import java.util.Properties; | ||
| import javax.persistence.EntityManager; | ||
| import javax.xml.bind.JAXB; | ||
| import org.apache.commons.configuration.Configuration; | ||
| import org.apache.commons.configuration.MapConfiguration; | ||
| import org.apache.juddi.model.UddiEntityPublisher; | ||
| import org.junit.After; | ||
| import org.junit.AfterClass; | ||
| import org.junit.Assert; | ||
| import org.junit.Before; | ||
| import org.junit.BeforeClass; | ||
| import org.junit.Test; | ||
| import static org.junit.Assert.*; | ||
| import org.uddi.api_v3.BusinessEntity; | ||
| import org.uddi.api_v3.TModel; | ||
| import org.uddi.repl_v3.ReplicationConfiguration; | ||
|
|
||
| /** | ||
| * | ||
| * @author alex | ||
| */ | ||
| public class InstallTest { | ||
|
|
||
| public InstallTest() { | ||
| } | ||
|
|
||
| @BeforeClass | ||
| public static void setUpClass() { | ||
| } | ||
|
|
||
| @AfterClass | ||
| public static void tearDownClass() { | ||
| } | ||
|
|
||
| @Before | ||
| public void setUp() { | ||
| } | ||
|
|
||
| @After | ||
| public void tearDown() { | ||
| } | ||
|
|
||
| /** | ||
| * Test of applyReplicationTokenChanges method, of class Install. | ||
| */ | ||
| @Test | ||
| public void testApplyReplicationTokenChanges() throws Exception { | ||
| System.out.println("applyReplicationTokenChanges"); | ||
| FileInputStream fis = new FileInputStream("./src/main/resources/juddi_install_data/root_replicationConfiguration.xml"); | ||
|
|
||
| ReplicationConfiguration replicationCfg = JAXB.unmarshal(fis, ReplicationConfiguration.class); | ||
| Properties props = new Properties(); | ||
| props.put(Property.JUDDI_NODE_ID, "uddi:a_custom_node"); | ||
| props.put(Property.JUDDI_BASE_URL, "http://juddi.apache.org"); | ||
| props.put(Property.JUDDI_BASE_URL_SECURE, "https://juddi.apache.org"); | ||
|
|
||
| Configuration config = new MapConfiguration(props); | ||
| String thisnode = "uddi:a_custom_node"; | ||
|
|
||
| ReplicationConfiguration result = Install.applyReplicationTokenChanges(replicationCfg, config, thisnode); | ||
| StringWriter sw = new StringWriter(); | ||
| JAXB.marshal(result, sw); | ||
| Assert.assertFalse(sw.toString().contains("${juddi.nodeId}")); | ||
| Assert.assertFalse(sw.toString().contains("${juddi.server.baseurlsecure}")); | ||
| Assert.assertFalse(sw.toString().contains("${juddi.server.baseurl}")); | ||
|
|
||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters