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/19 04:38:11 UTC
svn commit: r1559461 - in /juddi/trunk:
juddi-core/src/main/java/org/apache/juddi/validation/
juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/
juddi-gui/test/selenium/
juddiv3-war/src/main/java/org/apache/juddi/webconsole/hub/
juddiv3-war/src/m...
Author: alexoree
Date: Sun Jan 19 03:38:10 2014
New Revision: 1559461
URL: http://svn.apache.org/r1559461
Log:
JUDDI-794 fixed for businesses
JUDDI-651 updating a number of selenium tests, bug in the hubs when handling error messages
Added:
juddi/trunk/juddi-gui/test/selenium/WadlImport.html
juddi/trunk/juddi-gui/test/selenium/WsdlImport.html
Modified:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java
juddi/trunk/juddi-gui/test/selenium/BusinessEditorRender.html
juddi/trunk/juddi-gui/test/selenium/BusinessSearchBasic.html
juddi/trunk/juddi-gui/test/selenium/LangSelect1.html
juddi/trunk/juddi-gui/test/selenium/LangSelect2.html
juddi/trunk/juddi-gui/test/selenium/LoginRoot.html
juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/hub/UddiAdminHub.java
juddi/trunk/juddiv3-war/src/main/webapp/admin/admin.jsp
juddi/trunk/juddiv3-war/src/main/webapp/admin/header-top.jsp
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java?rev=1559461&r1=1559460&r2=1559461&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/validation/ValidatePublish.java Sun Jan 19 03:38:10 2014
@@ -648,7 +648,7 @@ public class ValidatePublish extends Val
entityExists = true;
// Make sure publisher owns this entity.
- if (!publisher.isOwner((UddiEntity) obj)) {
+ if (!publisher.isOwner((UddiEntity) obj) && !((Publisher) publisher).isAdmin()) {
throw new UserMismatchException(new ErrorMessage("errors.usermismatch.InvalidOwner", entityKey));
}
} else {
@@ -784,7 +784,7 @@ public class ValidatePublish extends Val
}
// Make sure publisher owns this entity.
- if (!publisher.isOwner((UddiEntity) obj)) {
+ if (!publisher.isOwner((UddiEntity) obj) && !((Publisher) publisher).isAdmin()) {
throw new UserMismatchException(new ErrorMessage("errors.usermismatch.InvalidOwner", entityKey));
}
@@ -939,7 +939,7 @@ public class ValidatePublish extends Val
}
// Make sure publisher owns this entity.
- if (!publisher.isOwner((UddiEntity) obj)) {
+ if (!publisher.isOwner((UddiEntity) obj)&& !((Publisher) publisher).isAdmin()) {
throw new UserMismatchException(new ErrorMessage("errors.usermismatch.InvalidOwner", entityKey));
}
@@ -1028,7 +1028,7 @@ public class ValidatePublish extends Val
entityExists = true;
// Make sure publisher owns this entity.
- if (!publisher.isOwner((UddiEntity) obj)) {
+ if (!publisher.isOwner((UddiEntity) obj)&& !((Publisher) publisher).isAdmin()) {
throw new UserMismatchException(new ErrorMessage("errors.usermismatch.InvalidOwner", entityKey));
}
} else {
Modified: juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java?rev=1559461&r1=1559460&r2=1559461&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java (original)
+++ juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java Sun Jan 19 03:38:10 2014
@@ -33,8 +33,6 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.concurrent.atomic.AtomicReference;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
@@ -74,7 +72,7 @@ import org.uddi.v3_service.UDDISecurityP
import org.uddi.v3_service.UDDISubscriptionPortType;
import org.w3._2000._09.xmldsig_.SignatureType;
import org.w3._2000._09.xmldsig_.X509DataType;
-import sun.misc.BASE64Encoder;
+
/**
* UddiHub - The hub acts as a single point for managing browser to uddi
@@ -1225,13 +1223,13 @@ public class UddiHub implements Serializ
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
log.error(ex.getMessage());
log.debug(null, ex);
- return ResourceLoader.GetResource(session, "errors.uddi") + " " + ex.getMessage() + " " + f.detail.getMessage();
+ return ResourceLoader.GetResource(session, "errors.uddi") + " " + ex.getMessage() + " " + (f.detail!=null ? f.detail.getMessage() : "");
}
if (ex instanceof RemoteException) {
RemoteException f = (RemoteException) ex;
log.error(ex.getMessage());
log.debug(null, ex);
- return ResourceLoader.GetResource(session, "errors.generic") + " " + ex.getMessage() + " " + f.detail.getMessage();
+ return ResourceLoader.GetResource(session, "errors.generic") + " " + ex.getMessage() + " " + (f.detail!=null ? f.detail.getMessage() : "");
}
log.error(ex.getMessage());
log.debug(null, ex);
@@ -2189,8 +2187,9 @@ public class UddiHub implements Serializ
X509Certificate cert = (X509Certificate) cf.generateCertificate(is);
is.close();
//this is the most supportable way to do this
- BASE64Encoder encoder = new BASE64Encoder();
- return encoder.encodeBuffer(cert.getEncoded());
+ return org.apache.commons.codec.binary.Base64.encodeBase64String(cert.getEncoded());
+ //BASE64Encoder encoder = new BASE64Encoder();
+ //return encoder.encodeBuffer(cert.getEncoded());
} catch (Exception ex) {
return HandleException(ex);
@@ -2291,10 +2290,12 @@ public class UddiHub implements Serializ
throw ex;
}
}
+ return ResourceLoader.GetResource(session, "messages.success") +
+ "<a href=\"editSubscription.jsp?id=" + URLEncoder.encode(data.value.get(0).getSubscriptionKey(),"UTF8") +
+ "\">" + StringEscapeUtils.escapeHtml(data.value.get(0).getSubscriptionKey()) + "</a>";
} catch (Exception ex) {
return HandleException(ex);
}
- return ResourceLoader.GetResource(session, "messages.success");
}
/**
Modified: juddi/trunk/juddi-gui/test/selenium/BusinessEditorRender.html
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/test/selenium/BusinessEditorRender.html?rev=1559461&r1=1559460&r2=1559461&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/test/selenium/BusinessEditorRender.html (original)
+++ juddi/trunk/juddi-gui/test/selenium/BusinessEditorRender.html Sun Jan 19 03:38:10 2014
@@ -13,12 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/UDDIBrowser/businessBrowse.jsp</td>
- <td></td>
-</tr>
-<tr>
- <td>click</td>
- <td>link=Discover</td>
+ <td>/juddi-gui/home.jsp</td>
<td></td>
</tr>
<tr>
@@ -63,8 +58,13 @@
</tr>
<tr>
<td>click</td>
- <td>xpath=(//a[contains(text(),'Close')])[2]</td>
- <td></td>
+ <td>css=#viewAsXml > div.modal-header > button.close</td>
+ <td>Ã</td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Discovery</td>
+ <td>Discovery</td>
</tr>
<tr>
<td>click</td>
@@ -73,8 +73,8 @@
</tr>
<tr>
<td>click</td>
- <td>xpath=(//a[contains(text(),'Services')])[2]</td>
- <td></td>
+ <td>xpath=(//a[contains(text(),'Services')])[4]</td>
+ <td>Services</td>
</tr>
<tr>
<td>click</td>
@@ -138,7 +138,7 @@
</tr>
<tr>
<td>assertText</td>
- <td>id=Name0Lang</td>
+ <td>id=Name1Lang</td>
<td>Click to edit</td>
</tr>
<tr>
@@ -163,7 +163,7 @@
</tr>
<tr>
<td>assertText</td>
- <td>id=Name1Lang</td>
+ <td>id=Name0Lang</td>
<td>en</td>
</tr>
<tr>
@@ -257,11 +257,25 @@
<td></td>
</tr>
<tr>
+ <td>assertText</td>
+ <td>id=displayrecords</td>
+ <td>10</td>
+</tr>
+<tr>
<td>clickAndWait</td>
- <td>link=exact:uddi:uddi.org:ubr:postaladdress</td>
+ <td>link=Welcome root</td>
+ <td>5000</td>
+</tr>
+<tr>
+ <td>verifyValue</td>
+ <td>id=password</td>
+ <td></td>
+</tr>
+<tr>
+ <td>verifyValue</td>
+ <td>id=username</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: juddi/trunk/juddi-gui/test/selenium/BusinessSearchBasic.html
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/test/selenium/BusinessSearchBasic.html?rev=1559461&r1=1559460&r2=1559461&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/test/selenium/BusinessSearchBasic.html (original)
+++ juddi/trunk/juddi-gui/test/selenium/BusinessSearchBasic.html Sun Jan 19 03:38:10 2014
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/UDDIBrowser/home.jsp</td>
+ <td>/juddi-gui/home.jsp</td>
<td></td>
</tr>
<tr>
@@ -33,7 +33,7 @@
</tr>
<tr>
<td>click</td>
- <td>link=Show 7</td>
+ <td>link=Show 8</td>
<td></td>
</tr>
<tr>
@@ -46,7 +46,46 @@
<td>UDDI Custody and Ownership Transfer Service</td>
<td></td>
</tr>
-
+<tr>
+ <td>click</td>
+ <td>link=Discover</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>link=Search</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>css=button.btn.active</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>css=#searchcriteria > button.btn.active</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>name=approximateMatch</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>id=searchcontent</td>
+ <td>%</td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>xpath=(//a[contains(text(),'Search')])[2]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertElementPresent</td>
+ <td>css=td</td>
+ <td></td>
+</tr>
</tbody></table>
</body>
</html>
Modified: juddi/trunk/juddi-gui/test/selenium/LangSelect1.html
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/test/selenium/LangSelect1.html?rev=1559461&r1=1559460&r2=1559461&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/test/selenium/LangSelect1.html (original)
+++ juddi/trunk/juddi-gui/test/selenium/LangSelect1.html Sun Jan 19 03:38:10 2014
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/UDDIBrowser/home.jsp</td>
+ <td>/juddi-gui/home.jsp</td>
<td></td>
</tr>
<tr>
@@ -41,7 +41,6 @@
<td>UDDI Custody and Ownership Transfer Service</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: juddi/trunk/juddi-gui/test/selenium/LangSelect2.html
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/test/selenium/LangSelect2.html?rev=1559461&r1=1559460&r2=1559461&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/test/selenium/LangSelect2.html (original)
+++ juddi/trunk/juddi-gui/test/selenium/LangSelect2.html Sun Jan 19 03:38:10 2014
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/UDDIBrowser/home.jsp</td>
+ <td>/juddi-gui/home.jsp</td>
<td></td>
</tr>
<tr>
@@ -41,7 +41,6 @@
<td>UDDI Custody and Ownership Transfer Service</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: juddi/trunk/juddi-gui/test/selenium/LoginRoot.html
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/test/selenium/LoginRoot.html?rev=1559461&r1=1559460&r2=1559461&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/test/selenium/LoginRoot.html (original)
+++ juddi/trunk/juddi-gui/test/selenium/LoginRoot.html Sun Jan 19 03:38:10 2014
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/UDDIBrowser/home.jsp</td>
+ <td>/juddi-gui/home.jsp</td>
<td></td>
</tr>
<tr>
@@ -33,15 +33,24 @@
</tr>
<tr>
<td>click</td>
- <td>link=Show 7</td>
+ <td>link=Show 8</td>
<td></td>
</tr>
<tr>
- <td>verifyTextPresent</td>
- <td>UDDI Custody and Ownership Transfer Service</td>
+ <td>selectWindow</td>
+ <td>null</td>
<td></td>
</tr>
-
+<tr>
+ <td>assertText</td>
+ <td>link=UDDI Inquiry Service</td>
+ <td>UDDI Inquiry Service</td>
+</tr>
+<tr>
+ <td>assertText</td>
+ <td>link=UDDI Custody and Ownership Transfer Service</td>
+ <td>UDDI Custody and Ownership Transfer Service</td>
+</tr>
</tbody></table>
</body>
</html>
Added: juddi/trunk/juddi-gui/test/selenium/WadlImport.html
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/test/selenium/WadlImport.html?rev=1559461&view=auto
==============================================================================
--- juddi/trunk/juddi-gui/test/selenium/WadlImport.html (added)
+++ juddi/trunk/juddi-gui/test/selenium/WadlImport.html Sun Jan 19 03:38:10 2014
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="http://localhost:8080/UDDIBrowser" />
+<title>WadlImport</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">WadlImport</td></tr>
+</thead><tbody>
+<tr>
+ <td>open</td>
+ <td>/juddi-gui/search.jsp</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Discover</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Create</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>link=Register Services from WADL</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>id=wsdlurl</td>
+ <td>http://svn.apache.org/repos/asf/juddi/trunk/juddi-client/src/test/resources/wadl/cxf.wadl</td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//a[contains(text(),'Step 2) Key Domain')]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertText</td>
+ <td>id=keydomain</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//a[contains(text(),'Step 3) Business Selection')]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>id=businessname</td>
+ <td>test</td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Step 4) Review and Approve</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Preview</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertText</td>
+ <td>id=preview</td>
+ <td>WADL successfully parsed! This will create 0 Port tModels, 2 Binding tModels, one tModel Key Generator, 1 binding, and 1 service(s) attached to the business with the key test .<br />Services:<br />Key: uddi:svn.apache.org:service_servicename <br />Name: Servicename <br />Binding Templates:Key: uddi:svn.apache.org:binding_svn.apache.org_servicename_a resource base url without a description_8080<br />Access Point: http://localhost:8080/tModels<br />Key:uddi:svn.apache.org:binding Name: uddi:svn.apache.org: Binding tModelKey:uddi:svn.apache.org:rest Name: uddi:svn.apache.org: Rest tModel</td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertText</td>
+ <td>id=preview</td>
+ <td>WADL successfully parsed! This will create 0 Port tModels, 2 Binding tModels, one tModel Key Generator, 1 binding, and 1 service(s) attached to the business with the key test .<br />Services:<br />Key: uddi:svn.apache.org:service_servicename <br />Name: Servicename <br />Binding Templates:Key: uddi:svn.apache.org:binding_svn.apache.org_servicename_a resource base url without a description_8080<br />Access Point: http://localhost:8080/tModels<br />Key:uddi:svn.apache.org:rest Name: uddi:svn.apache.org: Rest tModelKey:uddi:svn.apache.org:binding Name: uddi:svn.apache.org: Binding tModelSaving tModel svn.apache.org Key Generator Partition...Error Authentication is required for this API call<br />Saving tModel uddi:svn.apache.org: Rest tModel...Error Authentication is required for this API call<br />Saving tModel uddi:svn.apache.org: Binding tModel...Error Authentication is required for this API call<br />Saving business test...Error Authentication is required for this API call</td
>
+</tr>
+<tr>
+ <td>type</td>
+ <td>id=username</td>
+ <td>test</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>id=password</td>
+ <td>test</td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>id=loginbutton</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertText</td>
+ <td>link=exact:uddi:svn.apache.org:keygenerator</td>
+ <td>exact:uddi:svn.apache.org:keygenerator</td>
+</tr>
+<tr>
+ <td>assertText</td>
+ <td>link=exact:uddi:svn.apache.org:binding</td>
+ <td>exact:uddi:svn.apache.org:binding</td>
+</tr>
+<tr>
+ <td>assertText</td>
+ <td>link=exact:uddi:svn.apache.org:rest</td>
+ <td>exact:uddi:svn.apache.org:rest</td>
+</tr>
+<tr>
+ <td>assertText</td>
+ <td>link=exact:uddi:svn.apache.org:business_test</td>
+ <td>exact:uddi:svn.apache.org:business_test</td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>link=Welcome test</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Discover</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>link=Businesses</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertElementPresent</td>
+ <td>link=test</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>link=test</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>xpath=(//a[contains(text(),'Services')])[4]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertElementPresent</td>
+ <td>link=exact:uddi:svn.apache.org:service_servicename</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>link=exact:uddi:svn.apache.org:service_servicename</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Binding Template</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Home</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>css=img</td>
+ <td></td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
Added: juddi/trunk/juddi-gui/test/selenium/WsdlImport.html
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/test/selenium/WsdlImport.html?rev=1559461&view=auto
==============================================================================
--- juddi/trunk/juddi-gui/test/selenium/WsdlImport.html (added)
+++ juddi/trunk/juddi-gui/test/selenium/WsdlImport.html Sun Jan 19 03:38:10 2014
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="http://localhost:8080/UDDIBrowser" />
+<title>WsdlImport</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">WsdlImport</td></tr>
+</thead><tbody>
+<tr>
+ <td>open</td>
+ <td>/juddi-gui/home.jsp</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Create</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>link=Register Services from WSDL</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>id=wsdlurl</td>
+ <td>http://svn.apache.org/repos/asf/juddi/trunk/juddi-client/src/test/resources/wsdl/sample_1.wsdl</td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//a[contains(text(),'Step 2) Key Domain')]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertText</td>
+ <td>id=keydomain</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//a[contains(text(),'Step 3) Business Selection')]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>id=businessname</td>
+ <td>big wsdl</td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Step 4) Review and Approve</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Preview</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertText</td>
+ <td>id=preview</td>
+ <td>WSDL successfully parsed! This will create 1 portType tmodel(s), 1 binding tModel(s), 1 binding(s), and 1 service(s) attached to the business with the key big wsdl .<br />Services:<br />Key: uddi:svn.apache.org:service_stockquoteservice <br />Name: StockQuoteService <br />Binding Templates:Key: uddi:svn.apache.org:binding_svn.apache.org_stockquoteservice_stockquoteport_80<br />Access Point: http://location/sampletModels<br />Key: uddi:svn.apache.org:StockQuoteSoapBinding Name: StockQuoteSoapBindingKey: uddi:svn.apache.org:StockQuotePortType Name: StockQuotePortType</td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertText</td>
+ <td>id=preview</td>
+ <td>WSDL successfully parsed! This will create 1 portType tmodel(s), 1 binding tModel(s), 1 binding(s), and 1 service(s) attached to the business with the key big wsdl .<br />Services:<br />Key: uddi:svn.apache.org:service_stockquoteservice <br />Name: StockQuoteService <br />Binding Templates:Key: uddi:svn.apache.org:binding_svn.apache.org_stockquoteservice_stockquoteport_80<br />Access Point: http://location/sampletModels<br />Key: uddi:svn.apache.org:StockQuoteSoapBinding Name: StockQuoteSoapBindingKey: uddi:svn.apache.org:StockQuotePortType Name: StockQuotePortTypeSaving tModel StockQuoteSoapBinding...Error Authentication is required for this API call<br />Saving tModel StockQuotePortType...Error Authentication is required for this API call<br />Saving business big wsdl along with our imported service(s)...Error Authentication is required for this API call</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>id=username</td>
+ <td>test</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>id=password</td>
+ <td>test</td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>id=loginbutton</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertText</td>
+ <td>//div[@id='preview']/ul[2]/li</td>
+ <td>exact:Key: uddi:svn.apache.org:StockQuoteSoapBinding Name: StockQuoteSoapBinding</td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>link=exact:uddi:svn.apache.org:business_big wsdl</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertText</td>
+ <td>id=Name0Value</td>
+ <td>big wsdl</td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Discovery</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Contacts</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Categories</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Identifiers</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>xpath=(//a[contains(text(),'Services')])[4]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>id=sigtagheader</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Operational Info</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertText</td>
+ <td>//div[@id='opinfodiv']/table/tbody/tr[2]/td[2]</td>
+ <td>test</td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Related Businesses</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>xpath=(//a[contains(text(),'Services')])[4]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertText</td>
+ <td>id=services</td>
+ <td>Business Services - 1 are defined for this business. <br /> Add a Service <br /> Name Key Binding Template StockQuoteService uddi:svn.apache.org:service_stockquoteservice 1</td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>link=exact:uddi:svn.apache.org:service_stockquoteservice</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Categories</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Binding Template</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>id=sigtagheader</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Operational Info</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertText</td>
+ <td>//div[@id='opinfodiv']/table/tbody/tr[2]/td[2]</td>
+ <td>test</td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=View as XML</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Home</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>css=img</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>link=Welcome test</td>
+ <td></td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
Modified: juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/hub/UddiAdminHub.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/hub/UddiAdminHub.java?rev=1559461&r1=1559460&r2=1559461&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/hub/UddiAdminHub.java (original)
+++ juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/hub/UddiAdminHub.java Sun Jan 19 03:38:10 2014
@@ -262,12 +262,12 @@ public class UddiAdminHub {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
log.error(null, ex);
- return ResourceLoader.GetResource(session, "errors.uddi") + " " + ex.getMessage() + " " + f.detail.getMessage();
+ return ResourceLoader.GetResource(session, "errors.uddi") + " " + ex.getMessage() + " " + (f.detail!=null ? f.detail.getMessage() : "");
}
if (ex instanceof RemoteException) {
RemoteException f = (RemoteException) ex;
log.error(null, ex);
- return ResourceLoader.GetResource(session, "errors.generic") + " " + ex.getMessage() + " " + f.detail.getMessage();
+ return ResourceLoader.GetResource(session, "errors.generic") + " " + ex.getMessage() + " " + (f.detail!=null ? f.detail.getMessage() : "");
}
log.error(null, ex);
return //"<div class=\"alert alert-error\" ><h3><i class=\"icon-warning-sign\"></i> "
@@ -328,7 +328,7 @@ public class UddiAdminHub {
return invoke_SyncSubscription(parameters);
}
if (action.equalsIgnoreCase("save_Clerk")) {
- //return save_Clerk(parameters);
+ return save_Clerk(parameters);
}
if (action.equalsIgnoreCase("save_ClientSubscriptionInfo")) {
return save_ClientSubscriptionInfo(parameters);
@@ -350,7 +350,23 @@ public class UddiAdminHub {
sc.setAuthInfo(GetToken());
Clerk c = new Clerk();
c.setName(parameters.getParameter("CLERKsetName"));
- //c.setNode(getNode(parameters.getParameter("CLERKsetNode")));
+ Node node=new Node();
+ node.setClientName(parameters.getParameter("CLERKNODEsetClientName"));
+ node.setCustodyTransferUrl(parameters.getParameter("CLERKNODEsetCustodyTransferUrl"));
+ node.setDescription(parameters.getParameter("CLERKNODEsetDescription"));
+ node.setFactoryInitial(parameters.getParameter("CLERKNODEsetFactoryInitial"));
+ node.setFactoryNamingProvider(parameters.getParameter("CLERKNODEsetFactoryNamingProvider"));
+ node.setFactoryURLPkgs(parameters.getParameter("CLERKNODEsetFactoryURLPkgs"));
+ node.setInquiryUrl(parameters.getParameter("CLERKNODEsetInquiryUrl"));
+ node.setJuddiApiUrl(parameters.getParameter("CLERKNODEsetJuddiApiUrl"));
+ node.setName(parameters.getParameter("CLERKNODEsetName"));
+ node.setProxyTransport(parameters.getParameter("CLERKNODEsetProxyTransport"));
+ node.setPublishUrl(parameters.getParameter("CLERKNODEsetPublishUrl"));
+ node.setReplicationUrl(parameters.getParameter("CLERKNODEsetReplicationUrl"));
+ node.setSecurityUrl(parameters.getParameter("CLERKNODEsetSecurityUrl"));
+ node.setSubscriptionListenerUrl(parameters.getParameter("CLERKNODEsetSubscriptionListenerUrl"));
+ node.setSubscriptionUrl(parameters.getParameter("CLERKNODEsetSubscriptionUrl"));
+ c.setNode(node);
c.setPassword(parameters.getParameter("CLERKsetPassword"));
c.setPublisher(parameters.getParameter("CLERKsetPublisher"));
Modified: juddi/trunk/juddiv3-war/src/main/webapp/admin/admin.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/src/main/webapp/admin/admin.jsp?rev=1559461&r1=1559460&r2=1559461&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/src/main/webapp/admin/admin.jsp (original)
+++ juddi/trunk/juddiv3-war/src/main/webapp/admin/admin.jsp Sun Jan 19 03:38:10 2014
@@ -87,10 +87,10 @@
<%=ResourceLoader.GetResource(session, "pages.admin.max")%>
</div>
<div id="save_Node" style="display:none">
-
+
<%=ResourceLoader.GetResource(session, "items.clientname")%> <input type="text" id="NODEsetClientName" class="forminput" placeholder="Client Name"><br>
<%=ResourceLoader.GetResource(session, "items.name")%> <input type="text" id="NODEsetName" class="forminput" placeholder="Enter name"><br>
-
+
<%=ResourceLoader.GetResource(session, "items.description")%> <input type="text" id="NODEsetDescription" class="forminput" placeholder="Enter description"><br>
Factory Initial <input type="text" id="NODEsetFactoryInitial" class="forminput" placeholder="only needed for RMI transport"><br>
Factory URL Packages <input type="text" id="NODEsetFactoryURLPkgs" class="forminput" placeholder="only needed for RMI transport"><br>
@@ -107,9 +107,25 @@
</div>
<div id="save_Clerk" style="display:none">
<%=ResourceLoader.GetResource(session, "items.name")%> <input type="text" id="CLERKsetName" class="forminput" placeholder="Enter name"><br>
- Node Name <input type="text" id="CLERKsetNode" class="forminput" placeholder="Enter node name"><br>
<%=ResourceLoader.GetResource(session, "items.authorizedname")%> <input type="text" id="CLERKsetPublisher" class="forminput" placeholder="Enter Authorized Name (username)"><br>
<%=ResourceLoader.GetResource(session, "navbar.login.password")%> <input type="password" id="CLERKsetPassword" class="forminput" placeholder="Enter password"><br>
+ <hr>
+ <%=ResourceLoader.GetResource(session, "items.clientname")%> <input type="text" id="CLERKNODEsetClientName" class="forminput" placeholder="Client Name"><br>
+ <%=ResourceLoader.GetResource(session, "items.name")%> <input type="text" id="CLERKNODEsetName" class="forminput" placeholder="Enter name"><br>
+
+ <%=ResourceLoader.GetResource(session, "items.description")%> <input type="text" id="CLERKNODEsetDescription" class="forminput" placeholder="Enter description"><br>
+ Factory Initial <input type="text" id="CLERKNODEsetFactoryInitial" class="forminput" placeholder="only needed for RMI transport"><br>
+ Factory URL Packages <input type="text" id="CLERKNODEsetFactoryURLPkgs" class="forminput" placeholder="only needed for RMI transport"><br>
+ Factory Naming Provider <input type="text" id="CLERKNODEsetFactoryNamingProvider" class="forminput" placeholder="only needed for RMI transport"><br>
+ <%=ResourceLoader.GetResource(session, "items.transport")%> <input type="text" id="CLERKNODEsetProxyTransport" class="forminput" placeholder="org.apache.juddi.v3.client.transport.JAXWSTransport" value="org.apache.juddi.v3.client.transport.JAXWSTransport"><br>
+ <%=ResourceLoader.GetResource(session, "items.inquiry")%> <input type="text" id="CLERKNODEsetInquiryUrl" class="forminput" placeholder="http://localhost:8080/juddiv3/services/inquiry" value="http://localhost:8080/juddiv3/services/inquiry"><br>
+ <%=ResourceLoader.GetResource(session, "items.publish")%> <input type="text" id="CLERKNODEsetPublishUrl" class="forminput" placeholder="http://localhost:8080/juddiv3/services/publish" value="http://localhost:8080/juddiv3/services/publish"><br>
+ <%=ResourceLoader.GetResource(session, "items.security")%> <input type="text" id="CLERKNODEsetSecurityUrl" class="forminput" placeholder="http://localhost:8080/juddiv3/services/security" value="http://localhost:8080/juddiv3/services/security"><br>
+ <%=ResourceLoader.GetResource(session, "items.subscription.list")%> <input type="text" id="CLERKNODEsetSubscriptionListenerUrl" class="forminput" placeholder="http://localhost:8080/juddiv3/services/subscription-listener" value="http://localhost:8080/juddiv3/services/subscription-listener"><br>
+ <%=ResourceLoader.GetResource(session, "items.subscription")%> <input type="text" id="CLERKNODEsetSubscriptionUrl" class="forminput" placeholder="http://localhost:8080/juddiv3/services/subscription" value="http://localhost:8080/juddiv3/services/subscription"><br>
+ <%=ResourceLoader.GetResource(session, "items.custodytransfer")%> <input type="text" id="CLERKNODEsetCustodyTransferUrl" class="forminput" placeholder="http://localhost:8080/juddiv3/services/custody-transfer" value="http://localhost:8080/juddiv3/services/custody-transfer"><br>
+ <%=ResourceLoader.GetResource(session, "items.replication")%> <input type="text" id="CLERKNODEsetReplicationUrl" class="forminput" placeholder="http://localhost:8080/juddiv3/services/replication" value="http://localhost:8080/juddiv3/services/replication"><br>
+ jUDDI API <input type="text" id="CLERKNODEsetJuddiApiUrl" class="forminput" placeholder="http://localhost:8080/juddiv3/services/juddi-api" value="http://localhost:8080/juddiv3/services/juddi-api"><br>
</div>
Modified: juddi/trunk/juddiv3-war/src/main/webapp/admin/header-top.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/src/main/webapp/admin/header-top.jsp?rev=1559461&r1=1559460&r2=1559461&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/src/main/webapp/admin/header-top.jsp (original)
+++ juddi/trunk/juddiv3-war/src/main/webapp/admin/header-top.jsp Sun Jan 19 03:38:10 2014
@@ -117,16 +117,15 @@
<li class="dropdown"><a href="#" data-toggle="dropdown" class="dropdowb-town"><i class="icon-question-sign icon-large"></i><%=ResourceLoader.GetResource(session, "navbar.help")%> <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="http://juddi.apache.org/docs/3.x/userguide/html/index.html" title="<%=ResourceLoader.GetResource(session, "navbar.help.userguide")%>"><%=ResourceLoader.GetResource(session, "navbar.help.userguide")%></a></li>
+ <li><a href="http://juddi.apache.org/docs/3.x/userguide/html/index.html" title="<%=ResourceLoader.GetResource(session, "navbar.help.userguide")%>"><%=ResourceLoader.GetResource(session, "navbar.help.userguide")%></a></li>
<li><a href="http://juddi.apache.org/docs/3.x/devguide/html/index.html" title="<%=ResourceLoader.GetResource(session, "navbar.help.devguide")%>"><%=ResourceLoader.GetResource(session, "navbar.help.devguide")%></a></li>
<li><a href="http://juddi.apache.org/docs.html" title="<%=ResourceLoader.GetResource(session, "navbar.help.api")%>"><%=ResourceLoader.GetResource(session, "navbar.help.api")%></a></li>
<li><a href="http://wiki.apache.org/juddi" title="<%=ResourceLoader.GetResource(session, "navbar.help.wiki")%>"><%=ResourceLoader.GetResource(session, "navbar.help.wiki")%></a></li>
<li><a href="http://juddi.apache.org/issue-tracking.html" title="<%=ResourceLoader.GetResource(session, "navbar.help.bugreport")%>"><%=ResourceLoader.GetResource(session, "navbar.help.bugreport")%></a></li>
<li><a href="http://juddi.apache.org/" title="<%=ResourceLoader.GetResource(session, "navbar.help.website")%>"><%=ResourceLoader.GetResource(session, "navbar.help.website")%></a></li>
- <li><a href="http://www.nabble.com/jUDDI-f218.html" title="<%=ResourceLoader.GetResource(session, "navbar.help.mailinglist")%>"><%=ResourceLoader.GetResource(session, "navbar.help.mailinglist")%></a></li>
+ <li><a href="http://mail-archives.apache.org/mod_mbox/juddi-user/" title="<%=ResourceLoader.GetResource(session, "navbar.help.mailinglist")%>"><%=ResourceLoader.GetResource(session, "navbar.help.mailinglist")%></a></li>
<li><a href="http://svn.apache.org/viewvc/juddi/" title="<%=ResourceLoader.GetResource(session, "navbar.help.source")%>"><%=ResourceLoader.GetResource(session, "navbar.help.source")%></a></li>
<li><a href="about.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.help.about.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.help.about")%></a></li>
-
</ul>
</li>
</ul>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org