Merge branch 'master' into bug/JUDDI-977
diff --git a/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java b/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java
index 987b8eb..817c284 100644
--- a/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java
+++ b/juddi-core/src/main/java/org/apache/juddi/api/impl/JUDDIApiImpl.java
@@ -1367,8 +1367,6 @@
}
new ValidateReplication(publisher).validateSetReplicationNodes(replicationConfiguration, em, getNode(), AppConfig.getConfiguration());
- //StringWriter sw = new StringWriter();
- //JAXB.marshal(replicationConfiguration, sw);
org.apache.juddi.model.ReplicationConfiguration model = null;
logger.info(publisher.getAuthorizedName() + " is setting the replication config from " + getRequestorsIPAddress());// + " " + sw.toString());
try {
@@ -1417,7 +1415,6 @@
throw drfm;
} catch (Exception ex) {
logger.error(ex, ex);
- JAXB.marshal(replicationConfiguration, System.out);
throw new FatalErrorException(new ErrorMessage("E_fatalError", ex.getMessage()));
} finally {
if (tx.isActive()) {
diff --git a/juddi-core/src/test/java/org/apache/juddi/api/impl/API_160_ReplicationTest.java b/juddi-core/src/test/java/org/apache/juddi/api/impl/API_160_ReplicationTest.java
index 71095ee..de0e75e 100644
--- a/juddi-core/src/test/java/org/apache/juddi/api/impl/API_160_ReplicationTest.java
+++ b/juddi-core/src/test/java/org/apache/juddi/api/impl/API_160_ReplicationTest.java
@@ -332,6 +332,7 @@
r.getCommunicationGraph().getNode().add("test_node");
JAXB.marshal(r, System.out);
+ Thread.sleep(50);
setReplicationNodes = juddi.setReplicationNodes(authInfoRoot, r);
replicationNodes = juddi.getReplicationNodes(authInfoRoot);
diff --git a/pom.xml b/pom.xml
index 3f6b3a7..369844b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1059,6 +1059,7 @@
<exclude>**/target/**/*</exclude>
<exclude>**/nb-configuration.xml</exclude>
<exclude>.travis.yml</exclude>
+ <exclude>**/*.mwb</exclude>
</excludes>
<consoleOutput>true</consoleOutput>
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 22191e1..890b0d2 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
@@ -116,28 +116,6 @@
return;
}
try {
- /* smtpPort = 9700 + new Random().nextInt(99);
- httpPort = 9600 + new Random().nextInt(99);
- Properties properties = new Properties();
- properties.setProperty("juddi.mail.smtp.host", "localhost");
- properties.setProperty("juddi.mail.smtp.port", String.valueOf(smtpPort));
- properties.setProperty("juddi.mail.smtp.from", "jUDDI@example.org");
- String version = Release.getRegistryVersion().replaceAll(".SNAPSHOT", "-SNAPSHOT");
- String curDir = System.getProperty("user.dir");
- if (!curDir.endsWith("uddi-tck")) {
- curDir += "/uddi-tck";
- }
- String path = curDir + "/target/juddi-tomcat-" + version + "/temp/";
- System.out.println("Saving jUDDI email properties to " + path);
- File tmpDir = new File(path);
- File tmpFile = new File(tmpDir + "/juddi-mail.properties");
- if (!tmpFile.createNewFile()) {
- tmpFile.delete();
- tmpFile.createNewFile();
- }
- properties.store(new FileOutputStream(tmpFile), "tmp email settings");
- */
-
manager = new UDDIClient();
manager.start();
@@ -513,7 +491,7 @@
logger.info("updating Mary's tModel ********** ");
updateTModel(authInfoMary, saveMaryPublisherTmodel, publicationMary);
- boolean found = verifyDelivery("a new description");
+ boolean found = verifyDelivery(TckTModel.MARY_PUBLISHER_TMODEL_KEY);
if (!found) {
TckCommon.PrintMarker();
