You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by al...@apache.org on 2014/01/07 13:36:07 UTC
svn commit: r1556195 - in /juddi/trunk: ./ juddi-core-openjpa/
juddi-core-openjpa/src/test/resources/ juddi-core/
juddi-core/src/main/java/org/apache/juddi/model/
juddi-core/src/main/java/org/apache/juddi/subscription/notify/
juddi-core/src/main/java/o...
Author: alexoree
Date: Tue Jan 7 12:36:06 2014
New Revision: 1556195
URL: http://svn.apache.org/r1556195
Log:
JUDDI-768 fixed, updated all juddiv3.xml files, updated to a newer mail api
JUDDI-770 updated the code to enable focused tests
JUDDI-633 revising default install package
JUDDI-765 fixing a broken jsp from the recent refactor
Modified:
juddi/trunk/ (props changed)
juddi/trunk/juddi-core-openjpa/pom.xml
juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-3des.xml
juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-aes128.xml
juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-aes256.xml
juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-default.xml
juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3.xml
juddi/trunk/juddi-core/pom.xml
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/KeyDataValue.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/TempKeyPK.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/notify/SMTPNotifier.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateNode.java
juddi/trunk/juddi-core/src/main/resources/juddi_install_data/UDDI_tModels.xml
juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-3des.xml
juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-aes128.xml
juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-aes256.xml
juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-default.xml
juddi/trunk/juddi-core/src/test/resources/juddiv3.xml
juddi/trunk/juddi-examples/hello-world-embedded/src/main/resources/juddiv3.xml
juddi/trunk/juddi-examples/uddi-annotations/src/main/webapp/WEB-INF/classes/juddiv3.xml
juddi/trunk/juddi-gui/src/main/webapp/ajax/importFromWadl.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/importFromWsdl.jsp
juddi/trunk/juddi-rest-cxf/pom.xml
juddi/trunk/juddi-rest-cxf/src/test/resources/juddiv3.xml
juddi/trunk/juddiv3-war/pom.xml
juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.xml
juddi/trunk/uddi-tck-runner/juddiv3.xml
juddi/trunk/uddi-tck-runner/readme.txt
juddi/trunk/uddi-tck-runner/src/main/java/org/apache/juddi/tckrunner/App.java
juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerExternalTest.java
Propchange: juddi/trunk/
------------------------------------------------------------------------------
--- svn:global-ignores (added)
+++ svn:global-ignores Tue Jan 7 12:36:06 2014
@@ -0,0 +1 @@
+juddi-tck-runner
Modified: juddi/trunk/juddi-core-openjpa/pom.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/pom.xml?rev=1556195&r1=1556194&r2=1556195&view=diff
==============================================================================
--- juddi/trunk/juddi-core-openjpa/pom.xml (original)
+++ juddi/trunk/juddi-core-openjpa/pom.xml Tue Jan 7 12:36:06 2014
@@ -187,7 +187,7 @@
<dependency>
<groupId>org.apache.geronimo.javamail</groupId>
<artifactId>geronimo-javamail_1.4_mail</artifactId>
- <version>1.8.2</version>
+ <version>1.8.3</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-3des.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-3des.xml?rev=1556195&r1=1556194&r2=1556195&view=diff
==============================================================================
--- juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-3des.xml (original)
+++ juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-3des.xml Tue Jan 7 12:36:06 2014
@@ -182,7 +182,7 @@
<auth>false</auth>-->
<!--Username used to authenticate to the SMTP server used only if mail.smtp.auth is true
- <username>user</username>-->
+ <user>user</user>-->
<!--Password used to authenticate to the SMTP server, used only if mail.smtp.auth is true-->
<password encrypted="true">7WJq9dOME/hvPMmxKliDKw==</password>
Modified: juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-aes128.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-aes128.xml?rev=1556195&r1=1556194&r2=1556195&view=diff
==============================================================================
--- juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-aes128.xml (original)
+++ juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-aes128.xml Tue Jan 7 12:36:06 2014
@@ -181,7 +181,7 @@
<auth>false</auth>-->
<!--Username used to authenticate to the SMTP server used only if mail.smtp.auth is true
- <username>user</username>-->
+ <user>user</user>-->
<!--Password used to authenticate to the SMTP server, used only if mail.smtp.auth is true-->
<password encrypted="true">18604180541d172f9827e08c998db568</password>
Modified: juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-aes256.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-aes256.xml?rev=1556195&r1=1556194&r2=1556195&view=diff
==============================================================================
--- juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-aes256.xml (original)
+++ juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-aes256.xml Tue Jan 7 12:36:06 2014
@@ -181,7 +181,7 @@
<auth>false</auth>-->
<!--Username used to authenticate to the SMTP server used only if mail.smtp.auth is true
- <username>user</username>-->
+ <user>user</user>-->
<!--Password used to authenticate to the SMTP server, used only if mail.smtp.auth is true-->
<password encrypted="true">cce2f4b3f1dfe3211408c71cd8c38ee3</password>
Modified: juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-default.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-default.xml?rev=1556195&r1=1556194&r2=1556195&view=diff
==============================================================================
--- juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-default.xml (original)
+++ juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3-enc-default.xml Tue Jan 7 12:36:06 2014
@@ -180,7 +180,7 @@
<auth>false</auth>-->
<!--Username used to authenticate to the SMTP server used only if mail.smtp.auth is true
- <username>user</username>-->
+ <user>user</user>-->
<!--Password used to authenticate to the SMTP server, used only if mail.smtp.auth is true-->
<password encrypted="true">+j/kXkZJftwTFTBH6Cf6IQ==</password>
Modified: juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3.xml?rev=1556195&r1=1556194&r2=1556195&view=diff
==============================================================================
--- juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3.xml (original)
+++ juddi/trunk/juddi-core-openjpa/src/test/resources/juddiv3.xml Tue Jan 7 12:36:06 2014
@@ -182,7 +182,7 @@
<auth>false</auth>-->
<!--Username used to authenticate to the SMTP server used only if mail.smtp.auth is true
- <username>user</username>-->
+ <user>user</user>-->
<!--Password used to authenticate to the SMTP server, used only if mail.smtp.auth is true
<password encrypted="false">pass</password>-->
Modified: juddi/trunk/juddi-core/pom.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/pom.xml?rev=1556195&r1=1556194&r2=1556195&view=diff
==============================================================================
--- juddi/trunk/juddi-core/pom.xml (original)
+++ juddi/trunk/juddi-core/pom.xml Tue Jan 7 12:36:06 2014
@@ -153,7 +153,7 @@
<dependency>
<groupId>org.apache.geronimo.javamail</groupId>
<artifactId>geronimo-javamail_1.4_mail</artifactId>
- <version>1.8.2</version>
+ <version>1.8.3</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/KeyDataValue.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/KeyDataValue.java?rev=1556195&r1=1556194&r2=1556195&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/KeyDataValue.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/KeyDataValue.java Tue Jan 7 12:36:06 2014
@@ -142,6 +142,9 @@ public class KeyDataValue implements jav
@Override
public String toString() {
- return "KeyDataValue{" + "id=" + id + ", keyDataType=" + keyDataType + ", keyDataName=" + keyDataName + ", keyDataValueBytes=" + keyDataValueBytes + ", keyDataValueString=" + keyDataValueString + ", keyDataValueList=" + keyDataValueList + '}';
+ return "KeyDataValue{" + "id=" + getId() + ", keyDataType=" + getKeyDataType() +
+ ", keyDataName=" + getKeyDataName() + ", keyDataValueBytes="
+ + getKeyDataValueBytes() + ", keyDataValueString=" + getKeyDataValueString()
+ + ", keyDataValueList=" +getKeyDataValueList() + '}';
}
}
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/TempKeyPK.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/TempKeyPK.java?rev=1556195&r1=1556194&r2=1556195&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/TempKeyPK.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/model/TempKeyPK.java Tue Jan 7 12:36:06 2014
@@ -70,8 +70,8 @@ public class TempKeyPK implements java.i
@Override
public int hashCode() {
return new HashCodeBuilder(17, 31). // two randomly chosen prime numbers
- append(txId).
- append(entityKey).
+ append(getTxId()).
+ append(getEntityKey()).
toHashCode();
}
}
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/notify/SMTPNotifier.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/notify/SMTPNotifier.java?rev=1556195&r1=1556194&r2=1556195&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/notify/SMTPNotifier.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/notify/SMTPNotifier.java Tue Jan 7 12:36:06 2014
@@ -54,10 +54,10 @@ public class SMTPNotifier implements Not
private final static String[] mailProps = {"mail.smtp.from", "mail.smtp.host", "mail.smtp.port",
"mail.smtp.socketFactory.class", "mail.smtp.socketFactory.fallback", "mail.smtp.starttls.enable",
- "mail.smtp.socketFactory.port","mail.smtp.auth","mail.smtp.user","mail.smtp.password"};
+ "mail.smtp.socketFactory.port","mail.smtp.auth","mail.smtp.user","mail.smtp.password","mail.debug"};
- protected Properties getEMailProperties() throws ConfigurationException {
- if (properties==null) {
+ protected final Properties getEMailProperties() throws ConfigurationException {
+ if (properties==null || properties.isEmpty()) {
properties = new Properties();
String mailPrefix = AppConfig.getConfiguration().getString(Property.JUDDI_EMAIL_PREFIX, Property.DEFAULT_JUDDI_EMAIL_PREFIX);
if (! mailPrefix.endsWith(".")) mailPrefix = mailPrefix + ".";
@@ -84,9 +84,11 @@ public class SMTPNotifier implements Not
//TODO maybe update the user's bindingTemplate with the error?, and also validate setting onsave
} else {
notificationEmailAddress = accessPointUrl.substring(accessPointUrl.indexOf(":")+1);
- if (Boolean.getBoolean(getEMailProperties().getProperty("mail.smtp.starttls.enable"))) {
- final String username = getEMailProperties().getProperty("mail.smtp.username");
+ boolean auth=(getEMailProperties().getProperty("mail.smtp.auth", "false")).equalsIgnoreCase("true");
+ if (auth) {
+ final String username = getEMailProperties().getProperty("mail.smtp.user");
String pwd = getEMailProperties().getProperty("mail.smtp.password");
+ //decrypt if possible
if (getEMailProperties().getProperty("mail.smtp.password" + Property.ENCRYPTED_ATTRIBUTE, "false").equalsIgnoreCase("true"))
{
try {
@@ -106,14 +108,20 @@ public class SMTPNotifier implements Not
}
}
final String password = pwd;
- log.info("SMTP username = " + username + " from address = " + notificationEmailAddress);
+ log.debug("SMTP username = " + username + " from address = " + notificationEmailAddress);
+ Properties eMailProperties = getEMailProperties();
+ eMailProperties.remove("mail.smtp.user");
+ eMailProperties.remove("mail.smtp.password");
session = Session.getInstance(getEMailProperties(), new javax.mail.Authenticator() {
protected PasswordAuthentication getPasswordAuthentication() {
return new PasswordAuthentication(username, password);
}
});
} else {
- session = Session.getInstance(getEMailProperties());
+ Properties eMailProperties = getEMailProperties();
+ eMailProperties.remove("mail.smtp.user");
+ eMailProperties.remove("mail.smtp.password");
+ session = Session.getInstance(eMailProperties);
}
}
}
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateNode.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateNode.java?rev=1556195&r1=1556194&r2=1556195&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateNode.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidateNode.java Tue Jan 7 12:36:06 2014
@@ -17,7 +17,6 @@
package org.apache.juddi.validation;
import java.util.List;
-import java.util.logging.Level;
import java.util.logging.Logger;
import javax.persistence.EntityManager;
Modified: juddi/trunk/juddi-core/src/main/resources/juddi_install_data/UDDI_tModels.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/resources/juddi_install_data/UDDI_tModels.xml?rev=1556195&r1=1556194&r2=1556195&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/resources/juddi_install_data/UDDI_tModels.xml (original)
+++ juddi/trunk/juddi-core/src/main/resources/juddi_install_data/UDDI_tModels.xml Tue Jan 7 12:36:06 2014
@@ -1643,7 +1643,7 @@
</tModel>
<tModel tModelKey="uddi:uddi.org:ubr:identifier:dnb.com:d-u-n-s">
- <name>Dun and Bradstreet D-U-N-S® Number</name>
+ <name>Dun and Bradstreet D-U-N-S Number</name>
<description>A unique nine digit identification number, for each physical location of your business. </description>
<overviewDoc>
<overviewURL useType="text">
Modified: juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-3des.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-3des.xml?rev=1556195&r1=1556194&r2=1556195&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-3des.xml (original)
+++ juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-3des.xml Tue Jan 7 12:36:06 2014
@@ -183,7 +183,7 @@
<auth>false</auth>-->
<!--Username used to authenticate to the SMTP server used only if mail.smtp.auth is true
- <username>user</username>-->
+ <user>user</user>-->
<!--Password used to authenticate to the SMTP server, used only if mail.smtp.auth is true-->
<password encrypted="true">7WJq9dOME/hvPMmxKliDKw==</password>
Modified: juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-aes128.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-aes128.xml?rev=1556195&r1=1556194&r2=1556195&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-aes128.xml (original)
+++ juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-aes128.xml Tue Jan 7 12:36:06 2014
@@ -179,7 +179,7 @@
<auth>false</auth>-->
<!--Username used to authenticate to the SMTP server used only if mail.smtp.auth is true
- <username>user</username>-->
+ <user>user</user>-->
<!--Password used to authenticate to the SMTP server, used only if mail.smtp.auth is true-->
<password encrypted="true">18604180541d172f9827e08c998db568</password>
Modified: juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-aes256.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-aes256.xml?rev=1556195&r1=1556194&r2=1556195&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-aes256.xml (original)
+++ juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-aes256.xml Tue Jan 7 12:36:06 2014
@@ -186,7 +186,7 @@
<auth>false</auth>-->
<!--Username used to authenticate to the SMTP server used only if mail.smtp.auth is true
- <username>user</username>-->
+ <user>user</user>-->
<!--Password used to authenticate to the SMTP server, used only if mail.smtp.auth is true-->
<password encrypted="true">cce2f4b3f1dfe3211408c71cd8c38ee3</password>
Modified: juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-default.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-default.xml?rev=1556195&r1=1556194&r2=1556195&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-default.xml (original)
+++ juddi/trunk/juddi-core/src/test/resources/juddiv3-enc-default.xml Tue Jan 7 12:36:06 2014
@@ -183,7 +183,7 @@
<auth>false</auth>-->
<!--Username used to authenticate to the SMTP server used only if mail.smtp.auth is true
- <username>user</username>-->
+ <user>user</user>-->
<!--Password used to authenticate to the SMTP server, used only if mail.smtp.auth is true-->
<password encrypted="true">+j/kXkZJftwTFTBH6Cf6IQ==</password>
Modified: juddi/trunk/juddi-core/src/test/resources/juddiv3.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/test/resources/juddiv3.xml?rev=1556195&r1=1556194&r2=1556195&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/test/resources/juddiv3.xml (original)
+++ juddi/trunk/juddi-core/src/test/resources/juddiv3.xml Tue Jan 7 12:36:06 2014
@@ -186,7 +186,7 @@
<auth>false</auth>-->
<!--Username used to authenticate to the SMTP server used only if mail.smtp.auth is true
- <username>user</username>-->
+ <user>user</user>-->
<!--Password used to authenticate to the SMTP server, used only if mail.smtp.auth is true
<password encrypted="false">pass</password>-->
Modified: juddi/trunk/juddi-examples/hello-world-embedded/src/main/resources/juddiv3.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/hello-world-embedded/src/main/resources/juddiv3.xml?rev=1556195&r1=1556194&r2=1556195&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/hello-world-embedded/src/main/resources/juddiv3.xml (original)
+++ juddi/trunk/juddi-examples/hello-world-embedded/src/main/resources/juddiv3.xml Tue Jan 7 12:36:06 2014
@@ -182,7 +182,7 @@
<auth>false</auth>-->
<!--Username used to authenticate to the SMTP server used only if mail.smtp.auth is true
- <username>user</username>-->
+ <user>user</user>-->
<!--Password used to authenticate to the SMTP server, used only if mail.smtp.auth is true
<password encrypted="false">pass</password>-->
Modified: juddi/trunk/juddi-examples/uddi-annotations/src/main/webapp/WEB-INF/classes/juddiv3.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/uddi-annotations/src/main/webapp/WEB-INF/classes/juddiv3.xml?rev=1556195&r1=1556194&r2=1556195&view=diff
==============================================================================
--- juddi/trunk/juddi-examples/uddi-annotations/src/main/webapp/WEB-INF/classes/juddiv3.xml (original)
+++ juddi/trunk/juddi-examples/uddi-annotations/src/main/webapp/WEB-INF/classes/juddiv3.xml Tue Jan 7 12:36:06 2014
@@ -182,7 +182,7 @@
<auth>false</auth>-->
<!--Username used to authenticate to the SMTP server used only if mail.smtp.auth is true
- <username>user</username>-->
+ <user>user</user>-->
<!--Password used to authenticate to the SMTP server, used only if mail.smtp.auth is true
<password encrypted="false">pass</password>-->
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/importFromWadl.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/importFromWadl.jsp?rev=1556195&r1=1556194&r2=1556195&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/importFromWadl.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/importFromWadl.jsp Tue Jan 7 12:36:06 2014
@@ -20,11 +20,9 @@
<%@page import="javax.wsdl.PortType"%>
<%@page import="java.util.Map"%>
<%@page import="org.uddi.api_v3.BusinessServices"%>
-<%@page import="org.apache.juddi.v3.client.mapping.wsdl.WSDL2UDDI"%>
<%@page import="org.apache.juddi.v3.client.mapping.URLLocalizerDefaultImpl"%>
<%@page import="java.util.Properties"%>
<%@page import="javax.wsdl.Definition"%>
-<%@page import="org.apache.juddi.v3.client.mapping.wsdl.ReadWSDL"%>
<%@page import="org.apache.juddi.v3.client.config.UDDIClerk"%>
<%@page import="org.uddi.api_v3.TModel"%>
<%@page import="java.net.URL"%>
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/importFromWsdl.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/importFromWsdl.jsp?rev=1556195&r1=1556194&r2=1556195&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/importFromWsdl.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/importFromWsdl.jsp Tue Jan 7 12:36:06 2014
@@ -15,11 +15,11 @@
<%@page import="javax.wsdl.PortType"%>
<%@page import="java.util.Map"%>
<%@page import="org.uddi.api_v3.BusinessServices"%>
-<%@page import="org.apache.juddi.v3.client.mapping.WSDL2UDDI"%>
+<%@page import="org.apache.juddi.v3.client.mapping.wsdl.WSDL2UDDI"%>
<%@page import="org.apache.juddi.v3.client.mapping.URLLocalizerDefaultImpl"%>
<%@page import="java.util.Properties"%>
<%@page import="javax.wsdl.Definition"%>
-<%@page import="org.apache.juddi.v3.client.mapping.ReadWSDL"%>
+<%@page import="org.apache.juddi.v3.client.mapping.wsdl.ReadWSDL"%>
<%@page import="org.apache.juddi.v3.client.config.UDDIClerk"%>
<%@page import="org.uddi.api_v3.TModel"%>
<%@page import="java.net.URL"%>
Modified: juddi/trunk/juddi-rest-cxf/pom.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-rest-cxf/pom.xml?rev=1556195&r1=1556194&r2=1556195&view=diff
==============================================================================
--- juddi/trunk/juddi-rest-cxf/pom.xml (original)
+++ juddi/trunk/juddi-rest-cxf/pom.xml Tue Jan 7 12:36:06 2014
@@ -139,7 +139,7 @@
<dependency>
<groupId>org.apache.geronimo.javamail</groupId>
<artifactId>geronimo-javamail_1.4_mail</artifactId>
- <version>1.8.2</version>
+ <version>1.8.3</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: juddi/trunk/juddi-rest-cxf/src/test/resources/juddiv3.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-rest-cxf/src/test/resources/juddiv3.xml?rev=1556195&r1=1556194&r2=1556195&view=diff
==============================================================================
--- juddi/trunk/juddi-rest-cxf/src/test/resources/juddiv3.xml (original)
+++ juddi/trunk/juddi-rest-cxf/src/test/resources/juddiv3.xml Tue Jan 7 12:36:06 2014
@@ -186,7 +186,7 @@
<auth>false</auth>-->
<!--Username used to authenticate to the SMTP server used only if mail.smtp.auth is true
- <username>user</username>-->
+ <user>user</user>-->
<!--Password used to authenticate to the SMTP server, used only if mail.smtp.auth is true
<password encrypted="false">pass</password>-->
Modified: juddi/trunk/juddiv3-war/pom.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/pom.xml?rev=1556195&r1=1556194&r2=1556195&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/pom.xml (original)
+++ juddi/trunk/juddiv3-war/pom.xml Tue Jan 7 12:36:06 2014
@@ -245,7 +245,7 @@
<dependency>
<groupId>org.apache.geronimo.javamail</groupId>
<artifactId>geronimo-javamail_1.4_mail</artifactId>
- <version>1.8.2</version>
+ <version>1.8.3</version>
</dependency>
</dependencies>
</profile>
@@ -338,7 +338,7 @@
<dependency>
<groupId>org.apache.geronimo.javamail</groupId>
<artifactId>geronimo-javamail_1.4_mail</artifactId>
- <version>1.8.2</version>
+ <version>1.8.3</version>
</dependency>
</dependencies>
</profile>
@@ -432,7 +432,7 @@
<dependency>
<groupId>org.apache.geronimo.javamail</groupId>
<artifactId>geronimo-javamail_1.4_mail</artifactId>
- <version>1.8.2</version>
+ <version>1.8.3</version>
</dependency>
</dependencies>
</profile>
Modified: juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.xml?rev=1556195&r1=1556194&r2=1556195&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.xml (original)
+++ juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/juddiv3.xml Tue Jan 7 12:36:06 2014
@@ -183,7 +183,7 @@
<auth>false</auth>-->
<!--Username used to authenticate to the SMTP server used only if mail.smtp.auth is true
- <username>user</username>-->
+ <user>user</user>-->
<!--Password used to authenticate to the SMTP server, used only if mail.smtp.auth is true
<password encrypted="false">pass</password>-->
Modified: juddi/trunk/uddi-tck-runner/juddiv3.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-runner/juddiv3.xml?rev=1556195&r1=1556194&r2=1556195&view=diff
==============================================================================
--- juddi/trunk/uddi-tck-runner/juddiv3.xml (original)
+++ juddi/trunk/uddi-tck-runner/juddiv3.xml Tue Jan 7 12:36:06 2014
@@ -155,6 +155,7 @@
<!--As of 3.1.5 Email delivery options for subscription API functions-->
<mail>
+ <debug>true</debug>
<smtp>
<!--The Operatorâs Email address-->
<from>sender@local.domain</from>
@@ -183,10 +184,10 @@
<auth>true</auth>
<!--Username used to authenticate to the SMTP server used only if mail.smtp.auth is true-->
- <username>sender@local.domain</username>
+ <user>sender@local.domain</user>
<!--Password used to authenticate to the SMTP server, used only if mail.smtp.auth is true-->
- <password encrypted="false">da_password1</password>
+ <password encrypted="false">da_password!</password>
</smtp>
</mail>
</juddi>
Modified: juddi/trunk/uddi-tck-runner/readme.txt
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-runner/readme.txt?rev=1556195&r1=1556194&r2=1556195&view=diff
==============================================================================
--- juddi/trunk/uddi-tck-runner/readme.txt (original)
+++ juddi/trunk/uddi-tck-runner/readme.txt Tue Jan 7 12:36:06 2014
@@ -11,12 +11,17 @@ Notes:
-This application requires a number of usernames and passwords for users accounts used on the UDDI server. You'll have to create them ahead of time
-This application will optionally access a SMTP mail server and scan for subscription alerts send by a UDDI server, if supported
-Endpoint URLs are loaded from uddi.xml
--If you are running this against jUDDI and want to setup a temporary mail server, try hMail. A sample server config juddiv3.xml is provided
+-If you are running this against jUDDI and want to setup a temporary mail server, try hMail. A sample server config is provided
-Execute using the following command
+Exexcute using the following command
-java -Duddi.client.xml=uddi.xml -jar juddi-tck-runner-3.3-SNAPSHOT-jar-with-dependencies.jar
+java -Duddi.client.xml=uddi.xml -jar uddi-tck-runner-{version}-jar-with-dependencies.jar
+You can also specify which test cases to run (i.e. a focused test). This will reduce run time by only running the test classes selected by giving the option -Dtests=(comma separated list)
+Example:
+java -Dtests=org.apache.juddi.v3.tck.UDDI_090_SubscriptionListenerExternalTest -Duddi.client.xml=uddi.xml -jar uddi-tck-runner-{version}-jar-with-dependencies.jar
This application SHOULD have a net zero effect on the registry, however it is recommended to make a backup of your registry server, database and/or content before proceeding.
+
+SMTP Delivery - Provided the UDDI server supports and delivers SMTP subscription updates, this tool will delete the specific email from the test case, however there's a very small chance could we delete the wrong email, therefore it's recommended to use a temporary mail account.
\ No newline at end of file
Modified: juddi/trunk/uddi-tck-runner/src/main/java/org/apache/juddi/tckrunner/App.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck-runner/src/main/java/org/apache/juddi/tckrunner/App.java?rev=1556195&r1=1556194&r2=1556195&view=diff
==============================================================================
--- juddi/trunk/uddi-tck-runner/src/main/java/org/apache/juddi/tckrunner/App.java (original)
+++ juddi/trunk/uddi-tck-runner/src/main/java/org/apache/juddi/tckrunner/App.java Tue Jan 7 12:36:06 2014
@@ -18,9 +18,7 @@ import java.io.BufferedWriter;
import java.io.File;
import java.io.FileWriter;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
import java.util.Date;
-import java.util.List;
import org.junit.runner.JUnitCore;
import org.junit.runner.Result;
@@ -36,12 +34,15 @@ public class App {
public static void main(String[] args) throws Exception {
System.out.println("_________________________________________________");
- System.out.println("Running! this can take anywhere from 2-5 minutes!");
System.out.println("Configure options using uddi.xml and tck.properties");
System.out.println("java -Duddi.client.xml=uddi.xml -jar juddi-tck-runner-{VERSION}-SNAPSHOT-jar-with-dependencies.jar");
System.out.println("_________________________________________________");
System.out.println();
-
+ System.out.println("Options");
+ System.out.println("-Dtests=TestClass1,TestClass2 Comma delimited set of focused tests to run");
+ System.out.println("_________________________________________________");
+ System.out.println("Running! this can take anywhere from 2-5 minutes!");
+ System.out.println("");
if (!new File("tck.properties").exists()) {
System.out.println("tck.properties was not found! I give up!");
System.exit(1);
@@ -51,44 +52,49 @@ public class App {
System.out.println("The value for option -Duddi.client.xml=" + s + " is either null or the file doesn't exist! I give up!");
System.exit(1);
}
-
+ String focusedTests = System.getProperty("tests");
+ Result result = null;
JUnitCore junit = new JUnitCore();
- List<Class> items = new ArrayList<Class>();
- items.add(null);
- Result result = junit.run(
- //the bpel tests really only test wsdl to uddi
- org.apache.juddi.v3.bpel.BPEL_010_IntegrationTest.class,
- org.apache.juddi.v3.bpel.BPEL_020_IntegrationTest.class,
-
-
- org.apache.juddi.v3.tck.JUDDI_010_PublisherIntegrationTest.class,
-
- org.apache.juddi.v3.tck.UDDI_010_PublisherIntegrationTest.class,
- org.apache.juddi.v3.tck.UDDI_020_TmodelIntegrationTest.class,
- org.apache.juddi.v3.tck.UDDI_030_BusinessEntityIntegrationTest.class,
-
- org.apache.juddi.v3.tck.UDDI_030_BusinessEntityLoadIntegrationTest.class,
- org.apache.juddi.v3.tck.UDDI_040_BusinessServiceIntegrationTest.class,
- org.apache.juddi.v3.tck.UDDI_040_BusinessServiceLoadIntegrationTest.class,
-
- org.apache.juddi.v3.tck.UDDI_050_BindingTemplateIntegrationTest.class,
- org.apache.juddi.v3.tck.UDDI_060_PublisherAssertionIntegrationTest.class,
- org.apache.juddi.v3.tck.UDDI_070_FindEntityIntegrationTest.class,
- org.apache.juddi.v3.tck.UDDI_080_SubscriptionIntegrationTest.class,
- //note that this is different, there is an IntegrationTest version
- //however it's for hosting our own mail server and reconfiguring juddi
- org.apache.juddi.v3.tck.UDDI_090_SubscriptionListenerExternalTest.class,
- org.apache.juddi.v3.tck.JUDDI_091_RMISubscriptionListenerIntegrationTest.class,
- org.apache.juddi.v3.tck.JUDDI_100_ClientSubscriptionInfoIntegrationTest.class,
-
- org.apache.juddi.v3.tck.UDDI_110_FindBusinessIntegrationTest.class,
- org.apache.juddi.v3.tck.UDDI_120_CombineCategoryBagsFindServiceIntegrationTest.class,
- org.apache.juddi.v3.tck.UDDI_130_CombineCategoryBagsFindBusinessIntegrationTest.class,
- org.apache.juddi.v3.tck.UDDI_140_NegativePublicationIntegrationTest.class,
- org.apache.juddi.v3.tck.UDDI_141_JIRAIntegrationTest.class,
- org.apache.juddi.v3.tck.UDDI_150_CustodyTransferIntegrationTest.class,
- org.apache.juddi.v3.tck.UDDI_160_RESTIntergrationTest.class,
- org.apache.juddi.v3.tck.UDDI_170_ValueSetValidation.class);
+ Class[] cs = null;
+ if (focusedTests != null) {
+ String[] items = focusedTests.split(",");
+ cs = new Class[items.length];
+ for (int i = 0; i < items.length; i++) {
+ cs[i] = Class.forName(items[i]);
+ }
+ } else {
+ cs = new Class[]{
+ //the bpel tests really only test wsdl to uddi
+ org.apache.juddi.v3.bpel.BPEL_010_IntegrationTest.class,
+ org.apache.juddi.v3.bpel.BPEL_020_IntegrationTest.class,
+ org.apache.juddi.v3.tck.JUDDI_010_PublisherIntegrationTest.class,
+ org.apache.juddi.v3.tck.UDDI_010_PublisherIntegrationTest.class,
+ org.apache.juddi.v3.tck.UDDI_020_TmodelIntegrationTest.class,
+ org.apache.juddi.v3.tck.UDDI_030_BusinessEntityIntegrationTest.class,
+ org.apache.juddi.v3.tck.UDDI_030_BusinessEntityLoadIntegrationTest.class,
+ org.apache.juddi.v3.tck.UDDI_040_BusinessServiceIntegrationTest.class,
+ org.apache.juddi.v3.tck.UDDI_040_BusinessServiceLoadIntegrationTest.class,
+ org.apache.juddi.v3.tck.UDDI_050_BindingTemplateIntegrationTest.class,
+ org.apache.juddi.v3.tck.UDDI_060_PublisherAssertionIntegrationTest.class,
+ org.apache.juddi.v3.tck.UDDI_070_FindEntityIntegrationTest.class,
+ org.apache.juddi.v3.tck.UDDI_080_SubscriptionIntegrationTest.class,
+ //note that this is different, there is an IntegrationTest version
+ //however it's for hosting our own mail server and reconfiguring juddi
+ org.apache.juddi.v3.tck.UDDI_090_SubscriptionListenerExternalTest.class,
+ org.apache.juddi.v3.tck.JUDDI_091_RMISubscriptionListenerIntegrationTest.class,
+ org.apache.juddi.v3.tck.JUDDI_100_ClientSubscriptionInfoIntegrationTest.class,
+ org.apache.juddi.v3.tck.UDDI_110_FindBusinessIntegrationTest.class,
+ org.apache.juddi.v3.tck.UDDI_120_CombineCategoryBagsFindServiceIntegrationTest.class,
+ org.apache.juddi.v3.tck.UDDI_130_CombineCategoryBagsFindBusinessIntegrationTest.class,
+ org.apache.juddi.v3.tck.UDDI_140_NegativePublicationIntegrationTest.class,
+ org.apache.juddi.v3.tck.UDDI_141_JIRAIntegrationTest.class,
+ org.apache.juddi.v3.tck.UDDI_150_CustodyTransferIntegrationTest.class,
+ org.apache.juddi.v3.tck.UDDI_160_RESTIntergrationTest.class,
+ org.apache.juddi.v3.tck.UDDI_170_ValueSetValidation.class
+ };
+ }
+
+ result = junit.run(cs);
String filename = "uddi-tck-results-" + new SimpleDateFormat("yyyyMMddhhmm").format(new Date()) + ".txt";
FileWriter fw = new FileWriter(filename);
@@ -108,28 +114,38 @@ public class App {
bw.newLine();
bw.write("Time: " + result.getRunTime());
bw.newLine();
- bw.write("-------------------------------------");
+ bw.write("____________________________________________");
+
bw.newLine();
+ bw.write("Tests Ran");
bw.newLine();
-
- for (int i = 0; i < result.getFailures().size(); i++) {
- try{
- bw.write(result.getFailures().get(i).getTestHeader());
+ for (int i = 0; i < cs.length; i++) {
+ bw.write(cs[i].getCanonicalName());
bw.newLine();
- bw.write(result.getFailures().get(i).getDescription().getClassName());
- bw.newLine();
- bw.write(result.getFailures().get(i).getDescription().getMethodName());
- bw.newLine();
- bw.write(result.getFailures().get(i).getMessage());
- bw.newLine();
- //result.getFailures().get(i).getException().printStackTrace();
+ }
+ bw.write("____________________________________________");
+ bw.newLine();
+ bw.write("Failed Test cases");
+ bw.newLine();
+ bw.write("____________________________________________");
- bw.write(result.getFailures().get(i).getTrace());
- bw.newLine();
- bw.write("____________________________________________");
- bw.newLine();
- }catch (Exception ex)
- {
+ for (int i = 0; i < result.getFailures().size(); i++) {
+ try {
+ bw.write(result.getFailures().get(i).getTestHeader());
+ bw.newLine();
+ bw.write(result.getFailures().get(i).getDescription().getClassName());
+ bw.newLine();
+ bw.write(result.getFailures().get(i).getDescription().getMethodName());
+ bw.newLine();
+ bw.write(result.getFailures().get(i).getMessage());
+ bw.newLine();
+ //result.getFailures().get(i).getException().printStackTrace();
+
+ bw.write(result.getFailures().get(i).getTrace());
+ bw.newLine();
+ bw.write("____________________________________________");
+ bw.newLine();
+ } catch (Exception ex) {
ex.printStackTrace();
}
}
Modified: juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerExternalTest.java
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerExternalTest.java?rev=1556195&r1=1556194&r2=1556195&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerExternalTest.java (original)
+++ juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerExternalTest.java Tue Jan 7 12:36:06 2014
@@ -112,10 +112,8 @@ public class UDDI_090_SubscriptionListen
UDDISecurityPortType security = transport.getUDDISecurityService();
authInfoJoe = TckSecurity.getAuthToken(security, TckPublisher.getJoePublisherId(), TckPublisher.getJoePassword());
authInfoMary = TckSecurity.getAuthToken(security, TckPublisher.getMaryPublisherId(), TckPublisher.getMaryPassword());
- Assert.assertNotNull(authInfoJoe);
-
-
+
UDDIPublicationPortType publication = transport.getUDDIPublishService();
inquiryJoe = transport.getUDDIInquiryService();
subscriptionJoe = transport.getUDDISubscriptionService();
@@ -140,8 +138,8 @@ public class UDDI_090_SubscriptionListen
subscriptionMary = transport.getUDDISubscriptionService();
if (!TckPublisher.isUDDIAuthMode()) {
TckSecurity.setCredentials((BindingProvider) publication, TckPublisher.getMaryPublisherId(), TckPublisher.getMaryPassword());
- TckSecurity.setCredentials((BindingProvider) inquiryJoe, TckPublisher.getMaryPublisherId(), TckPublisher.getMaryPassword());
- TckSecurity.setCredentials((BindingProvider) subscriptionJoe, TckPublisher.getMaryPublisherId(), TckPublisher.getMaryPassword());
+ TckSecurity.setCredentials((BindingProvider) inquiryMary, TckPublisher.getMaryPublisherId(), TckPublisher.getMaryPassword());
+ TckSecurity.setCredentials((BindingProvider) subscriptionMary, TckPublisher.getMaryPublisherId(), TckPublisher.getMaryPassword());
}
@@ -395,6 +393,8 @@ public class UDDI_090_SubscriptionListen
UDDISubscriptionListenerImpl.notifcationMap.clear();
UDDISubscriptionListenerImpl.notificationCount = 0;
Thread.sleep(1000);
+ logger.info("Saving Mary's tModel ********** ");
+ tckTModelMary.saveMaryPublisherTmodel(authInfoMary);
logger.info("Saving Mary's Business ********** ");
tckBusinessMary.saveMaryPublisherBusiness(authInfoMary);
logger.info("Waiting " + TckPublisher.getSubscriptionTimeout() + " seconds for delivery");
@@ -441,6 +441,7 @@ public class UDDI_090_SubscriptionListen
tckSubscriptionListenerJoe.deleteNotifierSubscription(authInfoJoe, "uddi:uddi.joepublisher.com:subscriptionone");
tckBusinessServiceJoe.deleteJoePublisherService(authInfoJoe);
tckTModelJoe.deleteJoePublisherTmodel(authInfoJoe);
+ tckTModelMary.deleteMaryPublisherTmodel(authInfoMary);
tckBusinessMary.deleteMaryPublisherBusiness(authInfoMary);
}
}
@@ -463,6 +464,8 @@ public class UDDI_090_SubscriptionListen
Thread.sleep(3000);
+ logger.info("Saving Mary's tModel ********** ");
+ tckTModelMary.saveMaryPublisherTmodel(authInfoMary);
logger.info("Saving Mary's Business ********** ");
tckBusinessMary.saveBusiness(authInfoMary, MARY_BUSINESS_XML, "uddi:uddi.marypublisher.com:marybusinessone");
@@ -494,8 +497,8 @@ public class UDDI_090_SubscriptionListen
tckBusinessServiceJoe.deleteJoePublisherService(authInfoJoe);
tckBusinessJoe.deleteJoePublisherBusiness(authInfoJoe);
tckTModelJoe.deleteJoePublisherTmodel(authInfoJoe);
- // tckTModel.deleteJoePublisherTmodel(authInfoJoe);
tckBusinessMary.deleteMaryPublisherBusiness(authInfoMary);
+ tckTModelMary.deleteMaryPublisherTmodel(authInfoMary);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org