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 17:43:35 UTC
svn commit: r1559521 - in /juddi/trunk:
juddi-core/src/main/java/org/apache/juddi/
juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/
juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/builders/
juddi-gui/src/main/webapp/ juddi-gui/test/sele...
Author: alexoree
Date: Sun Jan 19 16:43:34 2014
New Revision: 1559521
URL: http://svn.apache.org/r1559521
Log:
JUDDI-651 adding selenium test pages, fixing several issues with rebuild binding templates, logging
JUDDI-796 done
Added:
juddi/trunk/juddi-gui/test/selenium/AdminPages.html
juddi/trunk/juddi-gui/test/selenium/testSuite.html
juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/
juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/AES.java
- copied, changed from r1559519, juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/AES.java
juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/CrossSiteRequestForgeryException.java
- copied, changed from r1558962, juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/CrossSiteRequestForgeryException.java
juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/PostBackConstants.java
- copied, changed from r1558962, juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/PostBackConstants.java
juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/StartupServlet.java
- copied, changed from r1559301, juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/StartupServlet.java
juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/hub/
juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/hub/UddiAdminHub.java
- copied, changed from r1559461, juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/hub/UddiAdminHub.java
juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/hub/builders/
juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/hub/builders/Builders.java
- copied, changed from r1558962, juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/hub/builders/Builders.java
juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/hub/builders/Printers.java
- copied, changed from r1558962, juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/hub/builders/Printers.java
juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/hub/builders/SubscriptionHelper.java
- copied, changed from r1558962, juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/hub/builders/SubscriptionHelper.java
juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/resources/
juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/resources/ResourceLoader.java
- copied, changed from r1558962, juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/resources/ResourceLoader.java
juddi/trunk/juddiv3-war/src/main/resources/org/apache/juddi/adminconsole/
juddi/trunk/juddiv3-war/src/main/resources/org/apache/juddi/adminconsole/resources/
juddi/trunk/juddiv3-war/src/main/resources/org/apache/juddi/adminconsole/resources/web.properties
- copied unchanged from r1559432, juddi/trunk/juddiv3-war/src/main/resources/org/apache/juddi/webconsole/resources/web.properties
juddi/trunk/juddiv3-war/src/main/resources/org/apache/juddi/adminconsole/resources/web_es.properties
- copied unchanged from r1559432, juddi/trunk/juddiv3-war/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties
Removed:
juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/
juddi/trunk/juddiv3-war/src/main/resources/org/apache/juddi/webconsole/
Modified:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/Registry.java
juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java
juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/builders/Builders.java
juddi/trunk/juddi-gui/src/main/webapp/serviceEditor.jsp
juddi/trunk/juddiv3-war/JAX-WS/Axis2/WEB-INF/web.xml
juddi/trunk/juddiv3-war/JAX-WS/CXF/WEB-INF/web.xml
juddi/trunk/juddiv3-war/JAX-WS/JBossWS-CXF/WEB-INF/web.xml
juddi/trunk/juddiv3-war/JAX-WS/JBossWS-Native/WEB-INF/web.xml
juddi/trunk/juddiv3-war/src/main/webapp/admin/about.jsp
juddi/trunk/juddiv3-war/src/main/webapp/admin/admin.jsp
juddi/trunk/juddiv3-war/src/main/webapp/admin/ajax/go.jsp
juddi/trunk/juddiv3-war/src/main/webapp/admin/ajax/loginpost.jsp
juddi/trunk/juddiv3-war/src/main/webapp/admin/ajax/saveconfig.jsp
juddi/trunk/juddiv3-war/src/main/webapp/admin/csrf.jsp
juddi/trunk/juddiv3-war/src/main/webapp/admin/error.jsp
juddi/trunk/juddiv3-war/src/main/webapp/admin/header-bottom.jsp
juddi/trunk/juddiv3-war/src/main/webapp/admin/header-top.jsp
juddi/trunk/juddiv3-war/src/main/webapp/admin/js/i18n.js.jsp
juddi/trunk/juddiv3-war/src/main/webapp/admin/login.jsp
juddi/trunk/juddiv3-war/src/main/webapp/admin/logout.jsp
juddi/trunk/juddiv3-war/src/main/webapp/admin/stats.jsp
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/Registry.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/Registry.java?rev=1559521&r1=1559520&r2=1559521&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/Registry.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/Registry.java Sun Jan 19 16:43:34 2014
@@ -91,7 +91,7 @@ public class Registry {
}
}
- log.info("jUDDI registry started succesfully.");
+ log.info("jUDDI registry started successfully.");
}
}
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=1559521&r1=1559520&r2=1559521&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 16:43:34 2014
@@ -73,7 +73,6 @@ import org.uddi.v3_service.UDDISubscript
import org.w3._2000._09.xmldsig_.SignatureType;
import org.w3._2000._09.xmldsig_.X509DataType;
-
/**
* UddiHub - The hub acts as a single point for managing browser to uddi
* services. At most 1 instance is allowed per http session. In general, all
@@ -843,7 +842,6 @@ public class UddiHub implements Serializ
return null;
}
-
/**
* don't think this is used yet
*
@@ -924,23 +922,23 @@ public class UddiHub implements Serializ
try {
SaveService sb = new SaveService();
sb.setAuthInfo(GetToken());
- ServiceDetail saveService =null;
+ ServiceDetail saveService = null;
sb.getBusinessService().add(be);
try {
- saveService = publish.saveService(sb);
+ saveService = publish.saveService(sb);
} catch (Exception ex) {
if (isExceptionExpiration(ex)) {
token = null;
sb.setAuthInfo(GetToken());
- saveService = publish.saveService(sb);
+ saveService = publish.saveService(sb);
} else {
throw ex;
}
}
- return ResourceLoader.GetResource(session, "actions.saved") + " " +
- "<a href=\"businessEditor2.jsp?id=" + URLEncoder.encode(saveService.getBusinessService().get(0).getServiceKey(),"UTF8") +
- "\">" + StringEscapeUtils.escapeHtml(saveService.getBusinessService().get(0).getServiceKey()) + "</a>";
+ return ResourceLoader.GetResource(session, "actions.saved") + " "
+ + "<a href=\"serviceEditor.jsp?id=" + URLEncoder.encode(saveService.getBusinessService().get(0).getServiceKey(), "UTF8")
+ + "\">" + StringEscapeUtils.escapeHtml(saveService.getBusinessService().get(0).getServiceKey()) + "</a>";
} catch (Exception ex) {
return HandleException(ex);
}
@@ -957,23 +955,23 @@ public class UddiHub implements Serializ
SaveBusiness sb = new SaveBusiness();
sb.setAuthInfo(GetToken());
sb.getBusinessEntity().add(be);
- BusinessDetail saveBusiness=null;
+ BusinessDetail saveBusiness = null;
try {
- saveBusiness = publish.saveBusiness(sb);
+ saveBusiness = publish.saveBusiness(sb);
} catch (Exception ex) {
if (isExceptionExpiration(ex)) {
token = null;
sb.setAuthInfo(GetToken());
- saveBusiness= publish.saveBusiness(sb);
+ saveBusiness = publish.saveBusiness(sb);
} else {
throw ex;
}
}
- return ResourceLoader.GetResource(session, "actions.saved") + " " +
- "<a href=\"businessEditor2.jsp?id=" + URLEncoder.encode(saveBusiness.getBusinessEntity().get(0).getBusinessKey(),"UTF8") +
- "\">" + StringEscapeUtils.escapeHtml(saveBusiness.getBusinessEntity().get(0).getBusinessKey()) + "</a>";
+ return ResourceLoader.GetResource(session, "actions.saved") + " "
+ + "<a href=\"businessEditor2.jsp?id=" + URLEncoder.encode(saveBusiness.getBusinessEntity().get(0).getBusinessKey(), "UTF8")
+ + "\">" + StringEscapeUtils.escapeHtml(saveBusiness.getBusinessEntity().get(0).getBusinessKey()) + "</a>";
} catch (Exception ex) {
return HandleException(ex);
}
@@ -1221,19 +1219,23 @@ public class UddiHub implements Serializ
private String HandleException(Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- log.error(ex.getMessage());
- log.debug(null, ex);
- return ResourceLoader.GetResource(session, "errors.uddi") + " " + ex.getMessage() + " " + (f.detail!=null ? f.detail.getMessage() : "");
- }
- if (ex instanceof RemoteException) {
+ log.error(ex.getMessage() + (f.detail != null && f.detail.getMessage() != null ? StringEscapeUtils.escapeHtml(f.detail.getMessage()) : ""));
+ log.debug(ex.getMessage(), ex);
+ return ResourceLoader.GetResource(session, "errors.uddi") + " " + StringEscapeUtils.escapeHtml(ex.getMessage()) + " " + (f.detail != null && f.detail.getMessage() != null ? StringEscapeUtils.escapeHtml(f.detail.getMessage()) : "");
+ } else 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!=null ? f.detail.getMessage() : "");
- }
- log.error(ex.getMessage());
- log.debug(null, ex);
- return ResourceLoader.GetResource(session, "errors.generic") + " " + StringEscapeUtils.escapeHtml(ex.getMessage());
+ log.error("RemoteException " + ex.getMessage());
+ log.debug("RemoteException " + ex.getMessage(), ex);
+ return ResourceLoader.GetResource(session, "errors.generic") + " " + StringEscapeUtils.escapeHtml(ex.getMessage()) + " " + (f.detail != null && f.detail.getMessage() != null ? StringEscapeUtils.escapeHtml(f.detail.getMessage()) : "");
+ } else if (ex instanceof NullPointerException) {
+ log.error("NPE! Please report! " + ex.getMessage(), ex);
+ log.debug("NPE! Please report! " + ex.getMessage(), ex);
+ return ResourceLoader.GetResource(session, "errors.generic") + " " + StringEscapeUtils.escapeHtml(ex.getMessage());
+ } else {
+ log.error("Unexpected error " + ex.getMessage(), ex);
+ //log.debug(ex.getMessage(), ex);
+ return ResourceLoader.GetResource(session, "errors.generic") + " " + StringEscapeUtils.escapeHtml(ex.getMessage());
+ }
}
/**
@@ -2047,25 +2049,25 @@ public class UddiHub implements Serializ
try {
SaveTModel sb = new SaveTModel();
sb.setAuthInfo(GetToken());
- TModelDetail saveTModel=null;
+ TModelDetail saveTModel = null;
sb.getTModel().add(be);
//JAXB.marshal(be, System.out);
try {
- saveTModel = publish.saveTModel(sb);
+ saveTModel = publish.saveTModel(sb);
} catch (Exception ex) {
if (isExceptionExpiration(ex)) {
token = null;
sb.setAuthInfo(GetToken());
- saveTModel = publish.saveTModel(sb);
+ saveTModel = publish.saveTModel(sb);
} else {
throw ex;
}
}
//return ResourceLoader.GetResource(session, "actions.saved");
- return ResourceLoader.GetResource(session, "actions.saved") + " " +
- "<a href=\"tmodelEditor.jsp?id=" + URLEncoder.encode(saveTModel.getTModel().get(0).getTModelKey(),"UTF8") +
- "\">" + StringEscapeUtils.escapeHtml(saveTModel.getTModel().get(0).getTModelKey()) + "</a>";
+ return ResourceLoader.GetResource(session, "actions.saved") + " "
+ + "<a href=\"tmodelEditor.jsp?id=" + URLEncoder.encode(saveTModel.getTModel().get(0).getTModelKey(), "UTF8")
+ + "\">" + StringEscapeUtils.escapeHtml(saveTModel.getTModel().get(0).getTModelKey()) + "</a>";
} catch (Exception ex) {
return HandleException(ex);
}
@@ -2290,9 +2292,9 @@ 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>";
+ 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);
}
Modified: juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/builders/Builders.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/builders/Builders.java?rev=1559521&r1=1559520&r2=1559521&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/builders/Builders.java (original)
+++ juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/builders/Builders.java Sun Jan 19 16:43:34 2014
@@ -610,6 +610,8 @@ public class Builders {
String[] t = (String[]) map.get(prefix + index + PostBackConstants.VALUE);
if (t != null && t.length > 0) {
pn.setBindingKey(t[0]);
+ if (pn.getBindingKey().equalsIgnoreCase(ResourceLoader.GetResource(locale, "items.clicktoedit")))
+ pn.setBindingKey(null);
}
t = (String[]) map.get(prefix + index + PostBackConstants.HOSTINGREDIRECTOR);
Modified: juddi/trunk/juddi-gui/src/main/webapp/serviceEditor.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/serviceEditor.jsp?rev=1559521&r1=1559520&r2=1559521&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/serviceEditor.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/serviceEditor.jsp Sun Jan 19 16:43:34 2014
@@ -41,6 +41,7 @@
if (businessid != null && businessid.length() > 0) {
newitem = true;
} else {
+ //no service id or business id
response.sendRedirect("index.jsp");
}
@@ -97,13 +98,18 @@
<br>
<div style="border-width: 2px; border-style: solid;" class="noedit" id="<%=PostBackConstants.BUSINESSKEY%>">
<%
- out.write("<a href=\"businessEditor2.jsp?id=" + StringEscapeUtils.escapeHtml(bd.getBusinessKey()) + "\">");
+ if (bd==null || bd.getBusinessKey() ==null){
+ out.write("");
+ }
+ else{
+ out.write("<a href=\"businessEditor2.jsp?id=" + StringEscapeUtils.escapeHtml(bd.getBusinessKey()) + "\">");
out.write(StringEscapeUtils.escapeHtml(bd.getBusinessKey()));
out.write("</a>");
+
if (bd.getCategoryBag() == null) {
bd.setCategoryBag(new CategoryBag());
}
-
+}
%>
</div>
<br>
Added: juddi/trunk/juddi-gui/test/selenium/AdminPages.html
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/test/selenium/AdminPages.html?rev=1559521&view=auto
==============================================================================
--- juddi/trunk/juddi-gui/test/selenium/AdminPages.html (added)
+++ juddi/trunk/juddi-gui/test/selenium/AdminPages.html Sun Jan 19 16:43:34 2014
@@ -0,0 +1,327 @@
+<?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/juddiv3/" />
+<title>AdminPages</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">AdminPages</td></tr>
+</thead><tbody>
+<tr>
+ <td>open</td>
+ <td>/juddiv3/</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertText</td>
+ <td>css=div.content > div</td>
+ <td>jUDDI has been successfully installed!</td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>link=View the service listing on this UDDI node</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertElementPresent</td>
+ <td>link={urn:juddi-apache-org:v3_service}JUDDIApiService</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertElementPresent</td>
+ <td>link={urn:uddi-org:v3_service}UDDICustodyTransferService</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertElementPresent</td>
+ <td>link={urn:uddi-org:v3_service}UDDIInquiryService</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertElementPresent</td>
+ <td>link={urn:uddi-org:v3_service}UDDIPublicationService</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertElementPresent</td>
+ <td>link={urn:uddi-org:v3_service}UDDISecurityService</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertElementPresent</td>
+ <td>link={urn:uddi-org:v3_service}UDDISubscriptionListenerService</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertElementPresent</td>
+ <td>link={urn:uddi-org:v3_service}UDDISubscriptionService</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertElementPresent</td>
+ <td>link=exact:http://localhost:8080/juddiv3/services/inquiryRest?_wadl</td>
+ <td></td>
+</tr>
+<tr>
+ <td>open</td>
+ <td>/juddiv3/</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>link=View the jUDDI Administration Interface</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>css=button.btn.btn-primary</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>xpath=(//a[contains(text(),'View Details »')])[2]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertText</td>
+ <td>//div[@id='status']/pre[3]/font</td>
+ <td>Data source is valid and online!</td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Statistics</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertText</td>
+ <td>css=td</td>
+ <td>Failed API Queries</td>
+</tr>
+<tr>
+ <td>selectWindow</td>
+ <td>null</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>link=Configure</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>link=Save</td>
+ <td>5000</td>
+</tr>
+<tr>
+ <td>assertText</td>
+ <td>css=i.icon-thumbs-up.icon-2x</td>
+ <td>Saved!</td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Show Debug Information</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertText</td>
+ <td>//div[@id='debugtable']/table/tbody/tr[11]/td</td>
+ <td>java.home</td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>css=i.icon-question-sign.icon-large</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>link=Admin</td>
+ <td></td>
+</tr>
+<tr>
+ <td>select</td>
+ <td>id=divselector</td>
+ <td>label=getAllPublisherDetail</td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Go!</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Ã</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>id=username</td>
+ <td>root</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>id=password</td>
+ <td>root</td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>id=loginbutton</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Go!</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertElementPresent</td>
+ <td>//div[@id='adminresults']/table/tbody/tr[2]/td[2]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Close</td>
+ <td></td>
+</tr>
+<tr>
+ <td>select</td>
+ <td>id=divselector</td>
+ <td>label=get_publisherDetail</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>id=get_publisherDetailKEY</td>
+ <td>root</td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Go!</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertElementPresent</td>
+ <td>//div[@id='adminresults']/table/tbody/tr[2]/td[2]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Close</td>
+ <td></td>
+</tr>
+<tr>
+ <td>select</td>
+ <td>id=divselector</td>
+ <td>label=invoke_SyncSubscription</td>
+</tr>
+<tr>
+ <td>select</td>
+ <td>id=divselector</td>
+ <td>label=save_Clerk</td>
+</tr>
+<tr>
+ <td>select</td>
+ <td>id=divselector</td>
+ <td>label=save_Node</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>id=NODEsetClientName</td>
+ <td>test</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>id=NODEsetName</td>
+ <td>test</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>id=NODEsetDescription</td>
+ <td>test</td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Go!</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertText</td>
+ <td>id=adminresults</td>
+ <td>Success</td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Close</td>
+ <td></td>
+</tr>
+<tr>
+ <td>select</td>
+ <td>id=divselector</td>
+ <td>label=save_publisher</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>id=savePublisherNAME</td>
+ <td>bob</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>id=savePublisherEMAIL</td>
+ <td>bob@mail.com</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>id=savePublisherAuthorizedName</td>
+ <td>bob</td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Go!</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertText</td>
+ <td>id=adminresults</td>
+ <td>Success</td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Close</td>
+ <td></td>
+</tr>
+<tr>
+ <td>select</td>
+ <td>id=divselector</td>
+ <td>label=save_Node</td>
+</tr>
+<tr>
+ <td>select</td>
+ <td>id=divselector</td>
+ <td>label=get_publisherDetail</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>id=get_publisherDetailKEY</td>
+ <td>bob</td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Go!</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertText</td>
+ <td>//div[@id='adminresults']/table/tbody/tr[2]/td[2]</td>
+ <td>Authorized Name = bob<br />Publisher Name = bob<br />Email = bob@mail.com<br />Administrator = true<br />Enabled = true<br />Max Bindings per = null<br />Max Businesses = null<br />Max Services per = null<br />Max tModels = null</td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Close</td>
+ <td></td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
Added: juddi/trunk/juddi-gui/test/selenium/testSuite.html
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/test/selenium/testSuite.html?rev=1559521&view=auto
==============================================================================
--- juddi/trunk/juddi-gui/test/selenium/testSuite.html (added)
+++ juddi/trunk/juddi-gui/test/selenium/testSuite.html Sun Jan 19 16:43:34 2014
@@ -0,0 +1,18 @@
+<?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>
+ <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
+ <title>Test Suite</title>
+</head>
+<body>
+<table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
+<tr><td><b>Test Suite</b></td></tr>
+<tr><td><a href="BusinessEditorRender.html">BusinessEditorRender</a></td></tr>
+<tr><td><a href="BusinessSearchBasic.html">BusinessSearchBasic</a></td></tr>
+<tr><td><a href="WadlImport.html">WadlImport</a></td></tr>
+<tr><td><a href="WsdlImport.html">WsdlImport</a></td></tr>
+<tr><td><a href="AdminPages.html">AdminPages</a></td></tr>
+</tbody></table>
+</body>
+</html>
Modified: juddi/trunk/juddiv3-war/JAX-WS/Axis2/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/JAX-WS/Axis2/WEB-INF/web.xml?rev=1559521&r1=1559520&r2=1559521&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/JAX-WS/Axis2/WEB-INF/web.xml (original)
+++ juddi/trunk/juddiv3-war/JAX-WS/Axis2/WEB-INF/web.xml Sun Jan 19 16:43:34 2014
@@ -31,7 +31,7 @@
<listener>
<!-- this class setups the encryption key for the session-->
- <listener-class>org.apache.juddi.webconsole.StartupServlet</listener-class>
+ <listener-class>org.apache.juddi.adminconsole.StartupServlet</listener-class>
</listener>
<servlet>
Modified: juddi/trunk/juddiv3-war/JAX-WS/CXF/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/JAX-WS/CXF/WEB-INF/web.xml?rev=1559521&r1=1559520&r2=1559521&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/JAX-WS/CXF/WEB-INF/web.xml (original)
+++ juddi/trunk/juddiv3-war/JAX-WS/CXF/WEB-INF/web.xml Sun Jan 19 16:43:34 2014
@@ -38,7 +38,7 @@
org.springframework.web.context.ContextLoaderListener
</listener-class>
<!-- this class setups the encryption key for the session-->
- <listener-class>org.apache.juddi.webconsole.StartupServlet</listener-class>
+ <listener-class>org.apache.juddi.adminconsole.StartupServlet</listener-class>
</listener>
Modified: juddi/trunk/juddiv3-war/JAX-WS/JBossWS-CXF/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/JAX-WS/JBossWS-CXF/WEB-INF/web.xml?rev=1559521&r1=1559520&r2=1559521&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/JAX-WS/JBossWS-CXF/WEB-INF/web.xml (original)
+++ juddi/trunk/juddiv3-war/JAX-WS/JBossWS-CXF/WEB-INF/web.xml Sun Jan 19 16:43:34 2014
@@ -26,7 +26,7 @@
</context-param>
<listener>
<!-- this class setups the encryption key for the session-->
- <listener-class>org.apache.juddi.webconsole.StartupServlet</listener-class>
+ <listener-class>org.apache.juddi.adminconsole.StartupServlet</listener-class>
</listener>
<servlet>
Modified: juddi/trunk/juddiv3-war/JAX-WS/JBossWS-Native/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/JAX-WS/JBossWS-Native/WEB-INF/web.xml?rev=1559521&r1=1559520&r2=1559521&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/JAX-WS/JBossWS-Native/WEB-INF/web.xml (original)
+++ juddi/trunk/juddiv3-war/JAX-WS/JBossWS-Native/WEB-INF/web.xml Sun Jan 19 16:43:34 2014
@@ -23,7 +23,7 @@
</description>
<listener>
<!-- this class setups the encryption key for the session-->
- <listener-class>org.apache.juddi.webconsole.StartupServlet</listener-class>
+ <listener-class>org.apache.juddi.adminconsole.StartupServlet</listener-class>
</listener>
<servlet>
Copied: juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/AES.java (from r1559519, juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/AES.java)
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/AES.java?p2=juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/AES.java&p1=juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/AES.java&r1=1559519&r2=1559521&rev=1559521&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/AES.java (original)
+++ juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/AES.java Sun Jan 19 16:43:34 2014
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.juddi.webconsole;
+package org.apache.juddi.adminconsole;
import java.nio.charset.Charset;
import javax.crypto.*;
Copied: juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/CrossSiteRequestForgeryException.java (from r1558962, juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/CrossSiteRequestForgeryException.java)
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/CrossSiteRequestForgeryException.java?p2=juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/CrossSiteRequestForgeryException.java&p1=juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/CrossSiteRequestForgeryException.java&r1=1558962&r2=1559521&rev=1559521&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/CrossSiteRequestForgeryException.java (original)
+++ juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/CrossSiteRequestForgeryException.java Sun Jan 19 16:43:34 2014
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.juddi.webconsole;
+package org.apache.juddi.adminconsole;
/**
* Provides a very basic, no stack trace exception, useful for throwing at a browser without revealing any details
Copied: juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/PostBackConstants.java (from r1558962, juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/PostBackConstants.java)
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/PostBackConstants.java?p2=juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/PostBackConstants.java&p1=juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/PostBackConstants.java&r1=1558962&r2=1559521&rev=1559521&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/PostBackConstants.java (original)
+++ juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/PostBackConstants.java Sun Jan 19 16:43:34 2014
@@ -2,7 +2,7 @@
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
-package org.apache.juddi.webconsole;
+package org.apache.juddi.adminconsole;
/**
* A collection of constants to use for form postbacks and parsing data from the
Copied: juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/StartupServlet.java (from r1559301, juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/StartupServlet.java)
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/StartupServlet.java?p2=juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/StartupServlet.java&p1=juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/StartupServlet.java&r1=1559301&r2=1559521&rev=1559521&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/StartupServlet.java (original)
+++ juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/StartupServlet.java Sun Jan 19 16:43:34 2014
@@ -2,7 +2,7 @@
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
-package org.apache.juddi.webconsole;
+package org.apache.juddi.adminconsole;
import java.io.FileOutputStream;
import java.io.InputStream;
Copied: juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/hub/UddiAdminHub.java (from r1559461, 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/adminconsole/hub/UddiAdminHub.java?p2=juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/hub/UddiAdminHub.java&p1=juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/hub/UddiAdminHub.java&r1=1559461&r2=1559521&rev=1559521&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/adminconsole/hub/UddiAdminHub.java Sun Jan 19 16:43:34 2014
@@ -1,4 +1,4 @@
-package org.apache.juddi.webconsole.hub;
+package org.apache.juddi.adminconsole.hub;
/*
* Copyright 2001-2013 The Apache Software Foundation.
@@ -62,8 +62,8 @@ import org.apache.juddi.v3.client.config
import org.apache.juddi.v3.client.config.UDDINode;
import org.apache.juddi.v3.client.transport.Transport;
import org.apache.juddi.v3_service.JUDDIApiPortType;
-import org.apache.juddi.webconsole.AES;
-import org.apache.juddi.webconsole.resources.ResourceLoader;
+import org.apache.juddi.adminconsole.AES;
+import org.apache.juddi.adminconsole.resources.ResourceLoader;
import org.uddi.api_v3.AuthToken;
import org.uddi.api_v3.DeleteTModel;
import org.uddi.api_v3.DiscardAuthToken;
@@ -261,19 +261,23 @@ public class UddiAdminHub {
private String HandleException(Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
- log.error(null, ex);
- return ResourceLoader.GetResource(session, "errors.uddi") + " " + ex.getMessage() + " " + (f.detail!=null ? f.detail.getMessage() : "");
- }
- if (ex instanceof RemoteException) {
+ log.error(ex.getMessage() + (f.detail != null && f.detail.getMessage() != null ? StringEscapeUtils.escapeHtml(f.detail.getMessage()) : ""));
+ log.debug(ex.getMessage(), ex);
+ return ResourceLoader.GetResource(session, "errors.uddi") + " " + StringEscapeUtils.escapeHtml(ex.getMessage()) + " " + (f.detail != null && f.detail.getMessage() != null ? StringEscapeUtils.escapeHtml(f.detail.getMessage()) : "");
+ } else if (ex instanceof RemoteException) {
RemoteException f = (RemoteException) ex;
- log.error(null, ex);
- return ResourceLoader.GetResource(session, "errors.generic") + " " + ex.getMessage() + " " + (f.detail!=null ? f.detail.getMessage() : "");
+ log.error("RemoteException " + ex.getMessage());
+ log.debug("RemoteException " + ex.getMessage(), ex);
+ return ResourceLoader.GetResource(session, "errors.generic") + " " + StringEscapeUtils.escapeHtml(ex.getMessage()) + " " + (f.detail != null && f.detail.getMessage() != null ? StringEscapeUtils.escapeHtml(f.detail.getMessage()) : "");
+ } else if (ex instanceof NullPointerException) {
+ log.error("NPE! Please report! " + ex.getMessage(), ex);
+ log.debug("NPE! Please report! " + ex.getMessage(), ex);
+ return ResourceLoader.GetResource(session, "errors.generic") + " " + StringEscapeUtils.escapeHtml(ex.getMessage());
+ } else {
+ log.error("Unexpected error " + ex.getMessage(), ex);
+ //log.debug(ex.getMessage(), ex);
+ return ResourceLoader.GetResource(session, "errors.generic") + " " + StringEscapeUtils.escapeHtml(ex.getMessage());
}
- log.error(null, ex);
- return //"<div class=\"alert alert-error\" ><h3><i class=\"icon-warning-sign\"></i> "
- ResourceLoader.GetResource(session, "errors.generic") + " " + StringEscapeUtils.escapeHtml(ex.getMessage());
- //+ "</h3></div>";
-
}
/**
@@ -350,7 +354,7 @@ public class UddiAdminHub {
sc.setAuthInfo(GetToken());
Clerk c = new Clerk();
c.setName(parameters.getParameter("CLERKsetName"));
- Node node=new Node();
+ Node node = new Node();
node.setClientName(parameters.getParameter("CLERKNODEsetClientName"));
node.setCustodyTransferUrl(parameters.getParameter("CLERKNODEsetCustodyTransferUrl"));
node.setDescription(parameters.getParameter("CLERKNODEsetDescription"));
@@ -369,7 +373,7 @@ public class UddiAdminHub {
c.setNode(node);
c.setPassword(parameters.getParameter("CLERKsetPassword"));
c.setPublisher(parameters.getParameter("CLERKsetPublisher"));
-
+
sc.getClerk().add(c);
try {
juddi.saveClerk(sc);
@@ -430,8 +434,6 @@ public class UddiAdminHub {
return "Success";
}
-
-
public enum AuthStyle {
/**
Copied: juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/hub/builders/Builders.java (from r1558962, juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/hub/builders/Builders.java)
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/hub/builders/Builders.java?p2=juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/hub/builders/Builders.java&p1=juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/hub/builders/Builders.java&r1=1558962&r2=1559521&rev=1559521&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/hub/builders/Builders.java (original)
+++ juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/hub/builders/Builders.java Sun Jan 19 16:43:34 2014
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.juddi.webconsole.hub.builders;
+package org.apache.juddi.adminconsole.hub.builders;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
@@ -32,8 +32,8 @@ import javax.servlet.http.HttpSession;
import javax.xml.datatype.DatatypeFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.juddi.webconsole.PostBackConstants;
-import org.apache.juddi.webconsole.resources.ResourceLoader;
+import org.apache.juddi.adminconsole.PostBackConstants;
+import org.apache.juddi.adminconsole.resources.ResourceLoader;
import org.uddi.api_v3.*;
import org.uddi.sub_v3.Subscription;
import org.uddi.sub_v3.SubscriptionFilter;
Copied: juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/hub/builders/Printers.java (from r1558962, juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/hub/builders/Printers.java)
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/hub/builders/Printers.java?p2=juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/hub/builders/Printers.java&p1=juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/hub/builders/Printers.java&r1=1558962&r2=1559521&rev=1559521&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/hub/builders/Printers.java (original)
+++ juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/hub/builders/Printers.java Sun Jan 19 16:43:34 2014
@@ -14,12 +14,12 @@
* limitations under the License.
*
*/
-package org.apache.juddi.webconsole.hub.builders;
+package org.apache.juddi.adminconsole.hub.builders;
import java.util.List;
import javax.servlet.http.HttpSession;
import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.juddi.webconsole.resources.ResourceLoader;
+import org.apache.juddi.adminconsole.resources.ResourceLoader;
import org.uddi.api_v3.*;
/**
Copied: juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/hub/builders/SubscriptionHelper.java (from r1558962, juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/hub/builders/SubscriptionHelper.java)
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/hub/builders/SubscriptionHelper.java?p2=juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/hub/builders/SubscriptionHelper.java&p1=juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/hub/builders/SubscriptionHelper.java&r1=1558962&r2=1559521&rev=1559521&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/hub/builders/SubscriptionHelper.java (original)
+++ juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/hub/builders/SubscriptionHelper.java Sun Jan 19 16:43:34 2014
@@ -2,7 +2,7 @@
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
-package org.apache.juddi.webconsole.hub.builders;
+package org.apache.juddi.adminconsole.hub.builders;
import java.util.List;
import org.apache.commons.lang.StringEscapeUtils;
Copied: juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/resources/ResourceLoader.java (from r1558962, juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/resources/ResourceLoader.java)
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/resources/ResourceLoader.java?p2=juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/resources/ResourceLoader.java&p1=juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/resources/ResourceLoader.java&r1=1558962&r2=1559521&rev=1559521&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/webconsole/resources/ResourceLoader.java (original)
+++ juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/resources/ResourceLoader.java Sun Jan 19 16:43:34 2014
@@ -2,7 +2,7 @@
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
-package org.apache.juddi.webconsole.resources;
+package org.apache.juddi.adminconsole.resources;
import java.util.HashMap;
import java.util.Locale;
@@ -56,7 +56,7 @@ public class ResourceLoader {
ResourceBundle bundle = (ResourceBundle) map.get(locale);
if (bundle == null) {
- bundle = ResourceBundle.getBundle("org.apache.juddi.webconsole.resources.web", new Locale(locale));
+ bundle = ResourceBundle.getBundle("org.apache.juddi.adminconsole.resources.web", new Locale(locale));
map.put(locale, bundle);
}
try {
Modified: juddi/trunk/juddiv3-war/src/main/webapp/admin/about.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/src/main/webapp/admin/about.jsp?rev=1559521&r1=1559520&r2=1559521&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/src/main/webapp/admin/about.jsp (original)
+++ juddi/trunk/juddiv3-war/src/main/webapp/admin/about.jsp Sun Jan 19 16:43:34 2014
@@ -6,7 +6,7 @@
<%@page import="java.net.URLEncoder"%>
-<%@page import="org.apache.juddi.webconsole.hub.builders.Printers"%>
+<%@page import="org.apache.juddi.adminconsole.hub.builders.Printers"%>
<%@page import="org.uddi.api_v3.RegisteredInfo"%>
<%@page import="java.util.Iterator"%>
<%@page import="java.util.Map.Entry"%>
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=1559521&r1=1559520&r2=1559521&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 16:43:34 2014
@@ -33,7 +33,7 @@
<div class="span12">
<% UddiAdminHub x = UddiAdminHub.getInstance(application, session);
- %>
+ %>
<%=ResourceLoader.GetResource(session, "pages.admin.content")%>
<br>
<select onchange="toggledivs();" id="divselector">
Modified: juddi/trunk/juddiv3-war/src/main/webapp/admin/ajax/go.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/src/main/webapp/admin/ajax/go.jsp?rev=1559521&r1=1559520&r2=1559521&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/src/main/webapp/admin/ajax/go.jsp (original)
+++ juddi/trunk/juddiv3-war/src/main/webapp/admin/ajax/go.jsp Sun Jan 19 16:43:34 2014
@@ -4,8 +4,8 @@
Author : Alex O'Ree
--%>
-<%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
-<%@page import="org.apache.juddi.webconsole.hub.UddiAdminHub"%>
+<%@page import="org.apache.juddi.adminconsole.resources.ResourceLoader"%>
+<%@page import="org.apache.juddi.adminconsole.hub.UddiAdminHub"%>
<%@page import="org.apache.commons.lang.StringEscapeUtils"%>
<%@page import="java.util.Enumeration"%>
<%@page contentType="text/html" pageEncoding="UTF-8"%>
Modified: juddi/trunk/juddiv3-war/src/main/webapp/admin/ajax/loginpost.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/src/main/webapp/admin/ajax/loginpost.jsp?rev=1559521&r1=1559520&r2=1559521&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/src/main/webapp/admin/ajax/loginpost.jsp (original)
+++ juddi/trunk/juddiv3-war/src/main/webapp/admin/ajax/loginpost.jsp Sun Jan 19 16:43:34 2014
@@ -10,8 +10,8 @@
<%@page import="java.util.Properties"%>
<%@page import="java.io.InputStream"%>
<%@page import="java.net.URL"%>
-<%@page import="org.apache.juddi.webconsole.AES"%>
-<%@page import="org.apache.juddi.webconsole.hub.UddiAdminHub"%>
+<%@page import="org.apache.juddi.adminconsole.AES"%>
+<%@page import="org.apache.juddi.adminconsole.hub.UddiAdminHub"%>
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<%@include file="../csrf.jsp" %>
<% boolean ok = true;
Modified: juddi/trunk/juddiv3-war/src/main/webapp/admin/ajax/saveconfig.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/src/main/webapp/admin/ajax/saveconfig.jsp?rev=1559521&r1=1559520&r2=1559521&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/src/main/webapp/admin/ajax/saveconfig.jsp (original)
+++ juddi/trunk/juddiv3-war/src/main/webapp/admin/ajax/saveconfig.jsp Sun Jan 19 16:43:34 2014
@@ -4,7 +4,7 @@
Author : Alex O'Ree
--%>
-<%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
+<%@page import="org.apache.juddi.adminconsole.resources.ResourceLoader"%>
<%@page import="org.apache.commons.lang.StringEscapeUtils"%>
<%@page import="org.apache.juddi.config.AppConfig"%>
<%@page import="org.apache.commons.configuration.Configuration"%>
Modified: juddi/trunk/juddiv3-war/src/main/webapp/admin/csrf.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/src/main/webapp/admin/csrf.jsp?rev=1559521&r1=1559520&r2=1559521&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/src/main/webapp/admin/csrf.jsp (original)
+++ juddi/trunk/juddiv3-war/src/main/webapp/admin/csrf.jsp Sun Jan 19 16:43:34 2014
@@ -4,8 +4,8 @@
Author : Alex O'Ree
--%>
-<%@page import="org.apache.juddi.webconsole.hub.UddiAdminHub"%>
-<%@page import="org.apache.juddi.webconsole.CrossSiteRequestForgeryException"%>
+<%@page import="org.apache.juddi.adminconsole.hub.UddiAdminHub"%>
+<%@page import="org.apache.juddi.adminconsole.CrossSiteRequestForgeryException"%>
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<%
//this is to catch someone that bookmarked a page after selecting a language
Modified: juddi/trunk/juddiv3-war/src/main/webapp/admin/error.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/src/main/webapp/admin/error.jsp?rev=1559521&r1=1559520&r2=1559521&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/src/main/webapp/admin/error.jsp (original)
+++ juddi/trunk/juddiv3-war/src/main/webapp/admin/error.jsp Sun Jan 19 16:43:34 2014
@@ -22,7 +22,7 @@
Author : Alex O'Ree
--%>
-<%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
+<%@page import="org.apache.juddi.adminconsole.resources.ResourceLoader"%>
<%@page import="javax.xml.datatype.DatatypeFactory"%>
<%@page import="java.util.GregorianCalendar"%>
<%@page contentType="text/html" pageEncoding="UTF-8"%>
Modified: juddi/trunk/juddiv3-war/src/main/webapp/admin/header-bottom.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/src/main/webapp/admin/header-bottom.jsp?rev=1559521&r1=1559520&r2=1559521&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/src/main/webapp/admin/header-bottom.jsp (original)
+++ juddi/trunk/juddiv3-war/src/main/webapp/admin/header-bottom.jsp Sun Jan 19 16:43:34 2014
@@ -12,7 +12,7 @@
<%@page import="java.util.jar.JarFile"%>
<%@page import="java.net.URL"%>
<%@page import="java.util.Enumeration"%>
-<%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
+<%@page import="org.apache.juddi.adminconsole.resources.ResourceLoader"%>
<%@page contentType="text/html" pageEncoding="UTF-8"%>
</div> <!-- /container -->
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=1559521&r1=1559520&r2=1559521&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 16:43:34 2014
@@ -20,8 +20,8 @@
Author : Alex O'Ree
--%>
-<%@page import="org.apache.juddi.webconsole.hub.UddiAdminHub"%>
-<%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
+<%@page import="org.apache.juddi.adminconsole.hub.UddiAdminHub"%>
+<%@page import="org.apache.juddi.adminconsole.resources.ResourceLoader"%>
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<!DOCTYPE html>
<%
Modified: juddi/trunk/juddiv3-war/src/main/webapp/admin/js/i18n.js.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/src/main/webapp/admin/js/i18n.js.jsp?rev=1559521&r1=1559520&r2=1559521&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/src/main/webapp/admin/js/i18n.js.jsp (original)
+++ juddi/trunk/juddiv3-war/src/main/webapp/admin/js/i18n.js.jsp Sun Jan 19 16:43:34 2014
@@ -1,5 +1,5 @@
-<%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
+<%@page import="org.apache.juddi.adminconsole.resources.ResourceLoader"%>
<%--
/*
* Copyright 2001-2013 The Apache Software Foundation.
Modified: juddi/trunk/juddiv3-war/src/main/webapp/admin/login.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/src/main/webapp/admin/login.jsp?rev=1559521&r1=1559520&r2=1559521&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/src/main/webapp/admin/login.jsp (original)
+++ juddi/trunk/juddiv3-war/src/main/webapp/admin/login.jsp Sun Jan 19 16:43:34 2014
@@ -4,8 +4,8 @@
Author : Alex O'Ree
--%>
-<%@page import="org.apache.juddi.webconsole.hub.UddiAdminHub"%>
-<%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
+<%@page import="org.apache.juddi.adminconsole.hub.UddiAdminHub"%>
+<%@page import="org.apache.juddi.adminconsole.resources.ResourceLoader"%>
<%@page import="org.apache.commons.lang.StringEscapeUtils"%>
<%@page contentType="text/html" pageEncoding="UTF-8"%>
Modified: juddi/trunk/juddiv3-war/src/main/webapp/admin/logout.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/src/main/webapp/admin/logout.jsp?rev=1559521&r1=1559520&r2=1559521&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/src/main/webapp/admin/logout.jsp (original)
+++ juddi/trunk/juddiv3-war/src/main/webapp/admin/logout.jsp Sun Jan 19 16:43:34 2014
@@ -4,7 +4,7 @@
Author : Alex O'Ree
--%>
-<%@page import="org.apache.juddi.webconsole.hub.UddiAdminHub"%>
+<%@page import="org.apache.juddi.adminconsole.hub.UddiAdminHub"%>
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<%
UddiAdminHub hub = UddiAdminHub.getInstance(application, session);
Modified: juddi/trunk/juddiv3-war/src/main/webapp/admin/stats.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/src/main/webapp/admin/stats.jsp?rev=1559521&r1=1559520&r2=1559521&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/src/main/webapp/admin/stats.jsp (original)
+++ juddi/trunk/juddiv3-war/src/main/webapp/admin/stats.jsp Sun Jan 19 16:43:34 2014
@@ -7,7 +7,7 @@
<%@page import="javax.persistence.EntityTransaction"%>
<%@page import="org.uddi.api_v3.BusinessEntity"%>
-<%@page import="org.apache.juddi.config.Property"%>
+<%@page import="org.apache.juddi.config.Property"%>
<%@page import="org.apache.juddi.config.AppConfig"%>
<%@page import="javax.persistence.EntityManager"%>
<%@page import="org.apache.juddi.config.PersistenceManager"%>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org