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/20 01:22:29 UTC
svn commit: r1559611 [3/3] - in /juddi/trunk:
juddi-client/src/main/java/org/apache/juddi/v3/client/config/
juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/
juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/
juddi-client/src/m...
Modified: juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/builders/Printers.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/builders/Printers.java?rev=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/builders/Printers.java (original)
+++ juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/builders/Printers.java Mon Jan 20 00:22:28 2014
@@ -42,7 +42,7 @@ public class Printers {
* Converts category bags of tmodels to a readable string used from hub
*
* @param categoryBag
- * @return
+ * @return string
*/
public static String CatBagToString(CategoryBag categoryBag, String locale) {
StringBuilder sb = new StringBuilder();
@@ -89,6 +89,8 @@ public class Printers {
* format to something that is more useful. used from hub
*
* @param bindingTemplates
+ * @param locale
+ * @return string
*/
public static String PrintBindingTemplates(BindingTemplates bindingTemplates, String locale) {
if (bindingTemplates == null) {
@@ -134,7 +136,7 @@ public class Printers {
* Description to space separated string
*
* @param name
- * @return
+ * @return string
*/
public static String ListToDescString(List<Description> name) {
StringBuilder sb = new StringBuilder();
@@ -148,7 +150,7 @@ public class Printers {
* Name to space separated string
*
* @param name
- * @return
+ * @return string
*/
public static String ListNamesToString(List<Name> name) {
StringBuilder sb = new StringBuilder();
@@ -164,7 +166,7 @@ public class Printers {
* @param findTModel
* @param session
* @param isChooser
- * @return
+ * @return string
*/
public static String PrintTModelListAsHtml(TModelList findTModel, HttpSession session, boolean isChooser) {
@@ -215,8 +217,8 @@ public class Printers {
*
* @param findBusiness
* @param session
- * @param isChooser
- * @return
+ * @param isChooser if it's a chooser/modal the format is different and adds check boxes
+ * @return string
*/
public static String BusinessListAsTable(BusinessList findBusiness, HttpSession session, boolean isChooser) {
StringBuilder sb = new StringBuilder();
@@ -271,9 +273,9 @@ public class Printers {
* service list as html, used
*
* @param findService
- * @param chooser
+ * @param chooser adds checkboxes for a modal
* @param session
- * @return
+ * @return string
*/
public static String ServiceListAsHtml(ServiceList findService, boolean chooser, HttpSession session) {
StringBuilder sb = new StringBuilder();
Modified: juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/resources/ResourceLoader.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/resources/ResourceLoader.java?rev=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/resources/ResourceLoader.java (original)
+++ juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/resources/ResourceLoader.java Mon Jan 20 00:22:28 2014
@@ -49,7 +49,7 @@ public class ResourceLoader {
* returns a localized string in the locale defined within locale or in
* the default locale, en
*
- * @param session
+ * @param locale
* @param key
* @return a localized string
* @throws IllegalArgumentException if the key is null
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/abortTransferToken.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/abortTransferToken.jsp?rev=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/abortTransferToken.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/abortTransferToken.jsp Mon Jan 20 00:22:28 2014
@@ -20,7 +20,7 @@
<%
if (request.getMethod().equalsIgnoreCase("POST")) {
String tokenxml = request.getParameter("tokenxml");
-
+
UddiHub x = UddiHub.getInstance(application, session);
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/acceptTransferToken.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/acceptTransferToken.jsp?rev=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/acceptTransferToken.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/acceptTransferToken.jsp Mon Jan 20 00:22:28 2014
@@ -19,7 +19,7 @@
<%@page import="org.apache.juddi.webconsole.hub.UddiHub"%>
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<jsp:include page="../csrf.jsp" />
-<%
+<%
if (request.getMethod().equalsIgnoreCase("POST")) {
String keyBagXML = request.getParameter("keybag");
String tokenXML = request.getParameter("tokenxml");
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/advanced.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/advanced.jsp?rev=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/advanced.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/advanced.jsp Mon Jan 20 00:22:28 2014
@@ -19,7 +19,7 @@
String service = request.getParameter("service");
UddiHub x = UddiHub.getInstance(application,session);
if (action.equalsIgnoreCase("getdefaultrequest")) {
-
+
if (service != null && service.equalsIgnoreCase(UDDIRequestsAsXML.custody)) {
out.write(UDDIRequestsAsXML.getCustody(method));
}
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/assertions.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/assertions.jsp?rev=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/assertions.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/assertions.jsp Mon Jan 20 00:22:28 2014
@@ -17,7 +17,7 @@
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<!DOCTYPE html>
<jsp:include page="../csrf.jsp" />
-<%
+<%
UddiHub x = UddiHub.getInstance(application, session);
if (request.getMethod().equalsIgnoreCase("post")) {
if (request.getParameter("action") != null) {
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/bindingsearch.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/bindingsearch.jsp?rev=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/bindingsearch.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/bindingsearch.jsp Mon Jan 20 00:22:28 2014
@@ -11,7 +11,7 @@
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<%@include file="../csrf.jsp" %>
<!DOCTYPE html>
-<%
+<%
UddiHub x = UddiHub.getInstance(application, request.getSession());
int maxrecords = 50;
int offset = 0;
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/businessAsSelect.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/businessAsSelect.jsp?rev=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/businessAsSelect.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/businessAsSelect.jsp Mon Jan 20 00:22:28 2014
@@ -10,7 +10,7 @@
<jsp:include page="../csrf.jsp" />
<%
UddiHub x = UddiHub.getInstance(application, session);
-
+
out.write(x.GetMyTransferableKeys(true, true));
%>
\ No newline at end of file
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/businesssearch.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/businesssearch.jsp?rev=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/businesssearch.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/businesssearch.jsp Mon Jan 20 00:22:28 2014
@@ -18,7 +18,7 @@
String lang = request.getParameter("lang");
if (lang == null || lang.length() == 0) {
lang = null;
- }
+ }
if (lang!=null && lang.equalsIgnoreCase(ResourceLoader.GetResource(session, "items.clicktoedit"))) {
lang = null;
}
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/deletebusiness.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/deletebusiness.jsp?rev=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/deletebusiness.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/deletebusiness.jsp Mon Jan 20 00:22:28 2014
@@ -8,7 +8,7 @@
<%@include file="../csrf.jsp" %>
<%
- if (request.getMethod().equalsIgnoreCase("POST")) {
+ if (request.getMethod().equalsIgnoreCase("POST")) {
UddiHub x =UddiHub.getInstance(application, session);
out.write(x.deleteBusiness(request.getParameter("id")));
}
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/deleteservice.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/deleteservice.jsp?rev=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/deleteservice.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/deleteservice.jsp Mon Jan 20 00:22:28 2014
@@ -8,7 +8,7 @@
<%@include file="../csrf.jsp" %>
<%
- if (request.getMethod().equalsIgnoreCase("POST")) {
+ if (request.getMethod().equalsIgnoreCase("POST")) {
UddiHub x = UddiHub.getInstance(application, session);
out.write(x.deleteService(request.getParameter("id")));
}
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/deletetmodel.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/deletetmodel.jsp?rev=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/deletetmodel.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/deletetmodel.jsp Mon Jan 20 00:22:28 2014
@@ -8,7 +8,7 @@
<%@include file="../csrf.jsp" %>
<%
- if (request.getMethod().equalsIgnoreCase("POST")) {
+ if (request.getMethod().equalsIgnoreCase("POST")) {
UddiHub x =UddiHub.getInstance(application, session);
out.write(x.deleteTmodel(request.getParameter("id")));
}
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/getCert.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/getCert.jsp?rev=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/getCert.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/getCert.jsp Mon Jan 20 00:22:28 2014
@@ -9,7 +9,7 @@
try {
index = Integer.parseInt(request.getParameter("index"));
} catch (Exception ex) {
- }
+ }
UddiHub x = UddiHub.getInstance(application, session);
String data = null;
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/getTransferToken.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/getTransferToken.jsp?rev=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/getTransferToken.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/getTransferToken.jsp Mon Jan 20 00:22:28 2014
@@ -6,7 +6,7 @@
<%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
<%@page import="javax.xml.bind.JAXB"%>
-<%@page import="java.io.StringWriter"%>
+<%@page import="java.io.StringWriter"%>
<%@page import="org.apache.juddi.jaxb.PrintUDDI"%>
<%@page import="org.uddi.custody_v3.TransferToken"%>
<%@page import="javax.xml.datatype.DatatypeFactory"%>
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=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/importFromWadl.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/importFromWadl.jsp Mon Jan 20 00:22:28 2014
@@ -9,7 +9,7 @@
<%@page import="org.apache.juddi.v3.client.mapping.wadl.WADL2UDDI"%>
<%@page import="java.io.File"%>
<%@page import="org.apache.juddi.v3.client.config.TokenResolver"%>
-<%@page import="org.uddi.api_v3.Name"%>
+<%@page import="org.uddi.api_v3.Name"%>
<%@page import="org.uddi.api_v3.BusinessEntity"%>
<%@page import="java.util.ArrayList"%>
<%@page import="java.util.List"%>
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=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/importFromWsdl.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/importFromWsdl.jsp Mon Jan 20 00:22:28 2014
@@ -12,7 +12,7 @@
<%@page import="org.apache.commons.lang.StringEscapeUtils"%>
<%@page import="java.util.Set"%>
<%@page import="javax.xml.namespace.QName"%>
-<%@page import="javax.wsdl.PortType"%>
+<%@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"%>
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/loginpost.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/loginpost.jsp?rev=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/loginpost.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/loginpost.jsp Mon Jan 20 00:22:28 2014
@@ -14,7 +14,7 @@
<%@include file="../csrf.jsp" %>
<% URL prop = application.getResource("/WEB-INF/config.properties");
boolean ok = true;
- if (prop == null) {
+ if (prop == null) {
prop = application.getResource("WEB-INF/config.properties");
}
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/opInfo.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/opInfo.jsp?rev=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/opInfo.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/opInfo.jsp Mon Jan 20 00:22:28 2014
@@ -10,7 +10,7 @@
<%
String id=null;
id = request.getParameter("id");
- if (id!=null){
+ if (id!=null){
UddiHub x = UddiHub.getInstance(application, session);
out.write(x.GetOperationalInfo(x.GetOperationalInfo(id)));
}
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/saveFromXML.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/saveFromXML.jsp?rev=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/saveFromXML.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/saveFromXML.jsp Mon Jan 20 00:22:28 2014
@@ -16,7 +16,7 @@
<%@page import="org.uddi.api_v3.BindingTemplate"%>
<%@page import="org.uddi.api_v3.BusinessService"%>
<%@page import="org.uddi.api_v3.BusinessEntity"%>
-<%@page import="org.apache.juddi.jaxb.EntityCreator"%>
+<%@page import="org.apache.juddi.jaxb.EntityCreator"%>
<%@page import="org.apache.juddi.webconsole.hub.UddiHub"%>
<%@page import="org.apache.juddi.jaxb.PrintUDDI"%>
<%@page contentType="text/html" pageEncoding="UTF-8"%><%
@@ -48,7 +48,7 @@
msg = (x.SaveBusinessDetails(be));
} else if (type.equalsIgnoreCase("service")) {
BusinessService be = (BusinessService) JAXB.unmarshal(sr, BusinessService.class);
- msg = (x.SaveService(be));
+ msg = (x.SaveServiceDetails(be));
} else if (type.equalsIgnoreCase("bindingTemplate")) {
BindingTemplate be = (BindingTemplate) JAXB.unmarshal(sr, BindingTemplate.class);
msg = (x.SaveBindingTemplate(be));
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/savebusiness.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/savebusiness.jsp?rev=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/savebusiness.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/savebusiness.jsp Mon Jan 20 00:22:28 2014
@@ -11,7 +11,7 @@
<%
if (request.getMethod().equalsIgnoreCase("POST")) {
/* Enumeration it = request.getParameterNames();
- while (it.hasMoreElements()) {
+ while (it.hasMoreElements()) {
String name = (String) it.nextElement();
out.write(name + " " + request.getParameter(name) + "<br>");
}*/
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/saveservicedetails.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/saveservicedetails.jsp?rev=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/saveservicedetails.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/saveservicedetails.jsp Mon Jan 20 00:22:28 2014
@@ -9,7 +9,7 @@
<%@include file="../csrf.jsp" %>
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<%
- if (request.getMethod().equalsIgnoreCase("POST")) {
+ if (request.getMethod().equalsIgnoreCase("POST")) {
UddiHub x = UddiHub.getInstance(application, request.getSession());
out.write(x.SaveServiceDetails(request));
}
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/savetmodel.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/savetmodel.jsp?rev=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/savetmodel.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/savetmodel.jsp Mon Jan 20 00:22:28 2014
@@ -10,7 +10,7 @@
<%@include file="../csrf.jsp" %>
<%
if (request.getMethod().equalsIgnoreCase("POST")) {
- /* Enumeration it = request.getParameterNames();
+ /* Enumeration it = request.getParameterNames();
while (it.hasMoreElements()) {
String name = (String) it.nextElement();
out.write(name + " " + request.getParameter(name) + "<br>");
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/search.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/search.jsp?rev=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/search.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/search.jsp Mon Jan 20 00:22:28 2014
@@ -11,7 +11,7 @@
<%@include file="../csrf.jsp" %>
<%
if (request.getMethod().equalsIgnoreCase("post")) {
- String lang = request.getParameter("lang");
+ String lang = request.getParameter("lang");
//searchcriteria name category key tmodel
String selection = request.getParameter("selection");
//searchcontent the thing we're looking for
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/servicedetails.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/servicedetails.jsp?rev=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/servicedetails.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/servicedetails.jsp Mon Jan 20 00:22:28 2014
@@ -10,6 +10,6 @@
<!DOCTYPE html>
<%
UddiHub x = UddiHub.getInstance(application, request.getSession());
-
+
out.write(x.GetServiceDetailAsHtml(request.getParameter("id")));
%>
\ No newline at end of file
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/servicelist.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/servicelist.jsp?rev=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/servicelist.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/servicelist.jsp Mon Jan 20 00:22:28 2014
@@ -11,5 +11,5 @@
<!DOCTYPE html>
<%
UddiHub x = UddiHub.getInstance(application, request.getSession());
- out.write(x.GetServiceList(request.getParameter("id")));
+ out.write(x.GetServiceList(request.getParameter("id")));
%>
\ No newline at end of file
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/servicesearch.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/servicesearch.jsp?rev=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/servicesearch.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/servicesearch.jsp Mon Jan 20 00:22:28 2014
@@ -12,7 +12,7 @@
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<%@include file="../csrf.jsp" %>
<!DOCTYPE html>
-<%
+<%
UddiHub x = UddiHub.getInstance(application, request.getSession());
//keyword=' + keyword + "&offset=" + offset + "&maxrecords=" + maxrecords
int maxrecords = 50;
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/settings.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/settings.jsp?rev=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/settings.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/settings.jsp Mon Jan 20 00:22:28 2014
@@ -13,7 +13,7 @@
<%@include file="../csrf.jsp" %>
<%
UddiHub x = UddiHub.getInstance(application, session);
- if (x.isAdminLocalhostOnly() &&
+ if (x.isAdminLocalhostOnly() &&
!request.getRemoteAddr().equalsIgnoreCase("localhost") &&
!request.getRemoteHost().equalsIgnoreCase("127.0.0.1") &&
!request.getRemoteHost().equalsIgnoreCase("0:0:0:0:0:0:0:1")) {
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/subscription.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/subscription.jsp?rev=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/subscription.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/subscription.jsp Mon Jan 20 00:22:28 2014
@@ -11,7 +11,7 @@
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<jsp:include page="../csrf.jsp"></jsp:include>
<%
- if (request.getMethod().equalsIgnoreCase("POST")) {
+ if (request.getMethod().equalsIgnoreCase("POST")) {
UddiHub x = UddiHub.getInstance(application, session);
if (request.getParameter("DELETE") != null) {
out.write( x.RemoveSubscription(request.getParameter("DELETE")));
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/subscriptionFeed.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/subscriptionFeed.jsp?rev=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/subscriptionFeed.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/subscriptionFeed.jsp Mon Jan 20 00:22:28 2014
@@ -14,7 +14,7 @@
<%
UddiHub x = UddiHub.getInstance(application, session);
DatatypeFactory df = DatatypeFactory.newInstance();
- GregorianCalendar gcal = new GregorianCalendar();
+ GregorianCalendar gcal = new GregorianCalendar();
gcal.setTimeInMillis(System.currentTimeMillis());
//TODO get/set cookie data
gcal.add(Calendar.DATE, -1);
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/tmodel.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/tmodel.jsp?rev=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/tmodel.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/tmodel.jsp Mon Jan 20 00:22:28 2014
@@ -9,7 +9,7 @@
<!DOCTYPE html>
<%
UddiHub hub = UddiHub.getInstance(application, session);
- if (request.getParameter("action") != null) {
+ if (request.getParameter("action") != null) {
String action = request.getParameter("action");
if (action.equalsIgnoreCase("createKeyGen")) {
out.write(hub.AddTmodelKenGenerator(request.getParameter("key"),request.getParameter("name"), request.getParameter("lang")));
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/tmodelsearch.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/tmodelsearch.jsp?rev=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/tmodelsearch.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/tmodelsearch.jsp Mon Jan 20 00:22:28 2014
@@ -15,7 +15,7 @@
int maxrecords = 50;
int offset = 0;
String lang = request.getParameter("lang");
- if (lang == null || lang.length() == 0) {
+ if (lang == null || lang.length() == 0) {
lang = null;
}
if (lang != null && lang.equalsIgnoreCase(ResourceLoader.GetResource(session, "items.clicktoedit"))) {
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/toXML.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/toXML.jsp?rev=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/toXML.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/toXML.jsp Mon Jan 20 00:22:28 2014
@@ -12,7 +12,7 @@
if ((type != null && type.length() != 0) && (id != null && id.length() != 0)) {
Object j = null;
if (type.equalsIgnoreCase("business")) {
- j = x.GetBusinessDetailsAsObject(id);
+ j = x.GetBusinessDetailsAsObject(id);
} else if (type.equalsIgnoreCase("service")) {
j = x.GetServiceDetailsAsObject(id);
} else if (type.equalsIgnoreCase("bindingTemplate")) {
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/validateSignature.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/validateSignature.jsp?rev=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/validateSignature.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/validateSignature.jsp Mon Jan 20 00:22:28 2014
@@ -5,7 +5,7 @@
--%>
<%@page import="java.util.Iterator"%>
<%@page import="java.util.Map.Entry"%>
-<%@page import="java.util.Set"%>
+<%@page import="java.util.Set"%>
<%@page import="java.util.Properties"%>
<%@page import="java.util.concurrent.atomic.AtomicReference"%>
<%@page import="org.apache.juddi.v3.client.cryptor.DigSigUtil"%>
Modified: juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/AES.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/AES.java?rev=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/AES.java (original)
+++ juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/AES.java Mon Jan 20 00:22:28 2014
@@ -62,7 +62,7 @@ public class AES {
* Generate a new AES 256 bit encryption key. Once generated, this key
* can be used to replace the default key.
*
- * @return
+ * @return a base64 encoded key, 256 bit
*/
public static String GEN() {
return GEN(256);
@@ -93,7 +93,7 @@ public class AES {
* return true is the supplied key is a valid aes key
*
* @param key
- * @return
+ * @return true if the key is valid
*/
public static boolean ValidateKey(String key) {
try {
@@ -117,7 +117,7 @@ public class AES {
*
* @param clear
* @param key
- * @return
+ * @return a base64 encoded cipher of the clear text using the key
*/
public static String Encrypt(String clear, String key) throws Exception {
if ((clear == null || clear.length() == 0)) {
@@ -143,7 +143,7 @@ public class AES {
*
* @param cipher encrypted text
* @param key
- * @return
+ * @return the decrypted string
*/
public static String Decrypt(String cipher, String key) {
if ((cipher == null || cipher.length() == 0)) {
Modified: juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/hub/UddiAdminHub.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/hub/UddiAdminHub.java?rev=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/hub/UddiAdminHub.java (original)
+++ juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/hub/UddiAdminHub.java Mon Jan 20 00:22:28 2014
@@ -23,8 +23,6 @@ import java.net.URL;
import java.rmi.RemoteException;
import java.util.Map;
import java.util.Properties;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
@@ -41,7 +39,6 @@ import org.apache.commons.lang.StringEsc
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.juddi.api_v3.Clerk;
-import org.apache.juddi.api_v3.ClerkDetail;
import org.apache.juddi.api_v3.ClientSubscriptionInfoDetail;
import org.apache.juddi.api_v3.DeleteClientSubscriptionInfo;
import org.apache.juddi.api_v3.DeletePublisher;
@@ -175,7 +172,7 @@ public class UddiAdminHub {
*
* @param application
* @param _session
- * @return
+ * @return instance
* @throws Exception
*/
public static UddiAdminHub getInstance(ServletContext application, HttpSession _session) throws Exception {
@@ -285,7 +282,7 @@ public class UddiAdminHub {
* returns true if we are using JAXWS transport AND all of the URLs
* start with https://
*
- * @return
+ * @return true/false
*/
public boolean isSecure() {
@@ -297,7 +294,7 @@ public class UddiAdminHub {
* gets a reference to the current juddi client config file. this is a
* live instance changes can be stored to disk, usually
*
- * @return
+ * @return client config
* @throws ConfigurationException g
*/
public ClientConfig GetJuddiClientConfig() throws ConfigurationException {
@@ -309,7 +306,7 @@ public class UddiAdminHub {
* Handles all API calls to the juddi web service
*
* @param parameters
- * @return
+ * @return html formatted status message
*/
public String go(HttpServletRequest parameters) {
try {
@@ -895,7 +892,7 @@ public class UddiAdminHub {
* true, it will only be accessible from the server hosting juddi-gui.
* if not defined, the result is true.
*
- * @return
+ * @return true/false
*/
public boolean isAdminLocalhostOnly() {
return clientConfig.getConfiguration().getBoolean(PROP_ADMIN_LOCALHOST_ONLY, true);
Modified: juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/resources/ResourceLoader.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/resources/ResourceLoader.java?rev=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/resources/ResourceLoader.java (original)
+++ juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/resources/ResourceLoader.java Mon Jan 20 00:22:28 2014
@@ -19,50 +19,52 @@ import javax.servlet.http.HttpSession;
*/
public class ResourceLoader {
- private static Map map = new HashMap();
+ private static Map map = new HashMap();
- /**
- * returns a localized string in the locale defined within
- * session.getAttribute("locale") or in the default locale, en
- *
- * @param session
- * @param key
- * @return a localized string
- * @throws IllegalArgumentException if the key is null
- * @throws MissingResourceException if the resource bundle can't be found
- */
- public static String GetResource(HttpSession session, String key) throws MissingResourceException {
- if (key == null) {
- throw new IllegalArgumentException("key");
+ /**
+ * returns a localized string in the locale defined within
+ * session.getAttribute("locale") or in the default locale, en
+ *
+ * @param session
+ * @param key
+ * @return a localized string
+ * @throws IllegalArgumentException if the key is null
+ * @throws MissingResourceException if the resource bundle can't be
+ * found
+ */
+ public static String GetResource(HttpSession session, String key) throws MissingResourceException {
+ if (key == null) {
+ throw new IllegalArgumentException("key");
+ }
+ String locale = (String) session.getAttribute("locale");
+ return GetResource(locale, key);
}
- String locale = (String) session.getAttribute("locale");
- return GetResource(locale, key);
- }
- /**
- * returns a localized string in the locale defined within locale or in the
- * default locale, en
- *
- * @param session
- * @param key
- * @return a localized string
- * @throws IllegalArgumentException if the key is null
- * @throws MissingResourceException if the resource bundle can't be found
- */
- public static String GetResource(String locale, String key) throws MissingResourceException {
- if (key == null) {
- throw new IllegalArgumentException("key");
- }
+ /**
+ * returns a localized string in the locale defined within locale or in
+ * the default locale, en
+ *
+ * @param locale
+ * @param key
+ * @return a localized string
+ * @throws IllegalArgumentException if the key is null
+ * @throws MissingResourceException if the resource bundle can't be
+ * found
+ */
+ public static String GetResource(String locale, String key) throws MissingResourceException {
+ if (key == null) {
+ throw new IllegalArgumentException("key");
+ }
- ResourceBundle bundle = (ResourceBundle) map.get(locale);
- if (bundle == null) {
- bundle = ResourceBundle.getBundle("org.apache.juddi.adminconsole.resources.web", new Locale(locale));
- map.put(locale, bundle);
- }
- try {
- return bundle.getString(key.trim());
- } catch (Exception ex) {
- return "key " + key + " not found " + ex.getMessage();
+ ResourceBundle bundle = (ResourceBundle) map.get(locale);
+ if (bundle == null) {
+ bundle = ResourceBundle.getBundle("org.apache.juddi.adminconsole.resources.web", new Locale(locale));
+ map.put(locale, bundle);
+ }
+ try {
+ return bundle.getString(key.trim());
+ } catch (Exception ex) {
+ return "key " + key + " not found " + ex.getMessage();
+ }
}
- }
}
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=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/src/main/webapp/admin/about.jsp (original)
+++ juddi/trunk/juddiv3-war/src/main/webapp/admin/about.jsp Mon Jan 20 00:22:28 2014
@@ -6,7 +6,6 @@
<%@page import="java.net.URLEncoder"%>
-<%@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"%>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org