Author: alexoree
Date: Thu May 9 00:40:22 2013
New Revision: 1480509
URL: http://svn.apache.org/r1480509
Log:
adding more friendly user error messages
juddi client api documentation (just an overview)
Modified:
juddi/branches/juddi-3.2.x/juddi-client/src/main/java/org/apache/juddi/v3/client/JUDDIApiService.java
juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/UddiHub.java
juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/assertions.jsp
juddi/branches/juddi-3.2.x/juddi-gui/web/businessEditor2.jsp
juddi/branches/juddi-3.2.x/juddi-gui/web/csrf.jsp
juddi/branches/juddi-3.2.x/juddi-gui/web/reginfo.jsp
juddi/branches/juddi-3.2.x/juddi-gui/web/serviceEditor.jsp
juddi/branches/juddi-3.2.x/juddi-gui/web/transfer.jsp
juddi/branches/juddi-3.2.x/juddi-gui/web/viewSubscriptions.jsp
juddi/branches/juddi-3.2.x/uddi-ws/src/main/java/org/apache/juddi/v3_service/JUDDIApiPortType.java
Modified:
juddi/branches/juddi-3.2.x/juddi-client/src/main/java/org/apache/juddi/v3/client/JUDDIApiService.java
URL:
http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-client/src/main/java/org/apache/juddi/v3/client/JUDDIApiService.java?rev=1480509&r1=1480508&r2=1480509&view=diff
==============================================================================
---
juddi/branches/juddi-3.2.x/juddi-client/src/main/java/org/apache/juddi/v3/client/JUDDIApiService.java
(original)
+++
juddi/branches/juddi-3.2.x/juddi-client/src/main/java/org/apache/juddi/v3/client/JUDDIApiService.java
Thu May 9 00:40:22 2013
@@ -9,7 +9,12 @@ import javax.xml.ws.WebServiceFeature;
import org.apache.juddi.v3_service.JUDDIApiPortType;
-
+/**
+ * This call is for client side access to the JUDDI API, a web service meant
for administrative functions above and beyond the
+ * UDDI v3 specification.
+ *
+ * @author jUDDI Team
+ */
@WebServiceClient(name = "JUDDIApiService", targetNamespace =
"urn:juddi-apache-org:v3_service", wsdlLocation =
"classpath:/juddi_api_v1.wsdl")
public class JUDDIApiService
extends Service
Modified:
juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/UddiHub.java
URL:
http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/UddiHub.java?rev=1480509&r1=1480508&r2=1480509&view=diff
==============================================================================
---
juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/UddiHub.java
(original)
+++
juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/UddiHub.java
Thu May 9 00:40:22 2013
@@ -377,7 +377,7 @@ public class UddiHub {
GetRegisteredInfo r = new GetRegisteredInfo();
r.setAuthInfo(GetToken());
if (r.getAuthInfo() == null) {
- return "<h1>" + ResourceLoader.GetResource(session,
"errors.notsignedin") + "</h1>";
+ return ToErrorAlert(ResourceLoader.GetResource(session,
"errors.notsignedin"));
}
r.setInfoSelection(InfoSelection.ALL);
@@ -445,7 +445,7 @@ public class UddiHub {
*/
public String GetServiceDetailAsHtml(String serviceid) {
if (serviceid == null || serviceid.length() == 0) {
- return "No business id specified";
+ return ResourceLoader.GetResource(session, "errors.noinput");
}
StringBuilder sb = new StringBuilder();
try {
@@ -547,7 +547,7 @@ public class UddiHub {
* Performs a getServiceDetails in Inquiry API
*
* @param serviceid
- * @return
+ * @return null if no id was specified or if it didn't exist
*/
public BusinessService GetServiceDetail(String serviceid) {
if (serviceid == null || serviceid.length() == 0) {
@@ -861,8 +861,7 @@ public class UddiHub {
* Gets a business's details used for the businessEditor
*
* @param bizid
- * @return null if no id is provided
- * @throws Exception if there's an error
+ * @return null if no id is provided or if there is a remote error
*/
public BusinessEntity GetBusinessDetails(String bizid) {
if (bizid == null || bizid.isEmpty()) {
@@ -900,8 +899,8 @@ public class UddiHub {
}
- private String ToErrorAlert(String HandleException) {
- return "<div class=\"alert alert-error\">" + HandleException +
"</div>";
+ public static String ToErrorAlert(String HandleException) {
+ return "<div class=\"alert alert-error\"><i class=\"icon-warning-sign
icon-large\"></i> " + HandleException + "</div>";
}
/**
@@ -2274,11 +2273,14 @@ public class UddiHub {
*
* @return
*/
- public RegisteredInfo GetNodeInformation() {
+ public RegisteredInfo GetNodeInformation(AtomicReference<String> outmsg) {
+ if (outmsg==null)
+ outmsg = new AtomicReference<String>();
try {
GetRegisteredInfo r = new GetRegisteredInfo();
r.setAuthInfo(GetToken());
if (r.getAuthInfo() == null) {
+ outmsg.set(ResourceLoader.GetResource(session,
"errors.notsignedin"));
return null;
}
r.setInfoSelection(InfoSelection.ALL);
@@ -2299,7 +2301,7 @@ public class UddiHub {
}
return registeredInfo;
} catch (Exception ex) {
- HandleException(ex);
+ outmsg.set(HandleException(ex));
}
return null;
}
@@ -2323,6 +2325,11 @@ public class UddiHub {
public List<AssertionStatusItem>
GetPublisherAssertions(AtomicReference<String> msg) {
List<AssertionStatusItem> out = new ArrayList<AssertionStatusItem>();
+ if (GetToken()==null)
+ {
+ msg.set( ResourceLoader.GetResource(session,
"errors.notsignedin"));
+ return null;
+ }
List<AssertionStatusItem> STATUS_COMPLETE = null;
try {
@@ -2483,12 +2490,18 @@ public class UddiHub {
}
/**
- * Returns bootstrap stylized html representing all changes in the last
refresh
+ * Returns bootstrap stylized html representing all changes in the last
+ * refresh
+ *
* @param lastRefresh
* @return
- * @throws DatatypeConfigurationException
+ * @throws DatatypeConfigurationException
*/
public String GetNewsFeed(XMLGregorianCalendar lastRefresh) throws
DatatypeConfigurationException {
+ if (GetToken()==null)
+ {
+ return ToErrorAlert(ResourceLoader.GetResource(session,
"errors.notsignedin"));
+ }
if (df == null) {
df = DatatypeFactory.newInstance();
}
@@ -2656,14 +2669,16 @@ public class UddiHub {
}
/**
- * Searches first for a service, then iterates through to identify
bindings matching the specified criteria.
- * Since UDDI does not have a find_binding API, this is as good as it gets.
+ * Searches first for a service, then iterates through to identify bindings
+ * matching the specified criteria. Since UDDI does not have a find_binding
+ * API, this is as good as it gets.
+ *
* @param keyword
* @param lang
* @param offset
* @param maxrecords
* @param isChooser
- * @return
+ * @return
*/
public PagableContainer SearchForBinding(String keyword, String lang, int
offset, int maxrecords, boolean isChooser) {
PagableContainer ret = new PagableContainer();
@@ -2791,7 +2806,8 @@ public class UddiHub {
}
/**
- * Get a custody transfer token for giving away control of the specified
business or tmodel keys
+ * Get a custody transfer token for giving away control of the specified
+ * business or tmodel keys
*
* authInfo: This OPTIONAL argument is an element that contains an
* authentication token. Authentication tokens are obtained using the
@@ -2886,9 +2902,10 @@ public class UddiHub {
/**
* Accepts a transfer token and transfers the entities.
+ *
* @param tokenXML
* @param keyBagXML
- * @return
+ * @return
*/
public String AcceptCustodyTranferToken(String tokenXML, String keyBagXML)
{
try {
@@ -2920,8 +2937,10 @@ public class UddiHub {
}
/**
- * returns a subscription by id, since UDDI does not provide this
function, it simply gets all of them for the current user
- * then filters out the requested item
+ * returns a subscription by id, since UDDI does not provide this function,
+ * it simply gets all of them for the current user then filters out the
+ * requested item
+ *
* @param id
* @return null if not found
*/
Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/assertions.jsp
URL:
http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/assertions.jsp?rev=1480509&r1=1480508&r2=1480509&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/assertions.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/assertions.jsp Thu May 9
00:40:22 2013
@@ -42,9 +42,9 @@
AtomicReference<String> msg = new AtomicReference<String>();
data = x.GetPublisherAssertions(msg);
if (msg != null && msg.get() != null) {
- out.write(msg.get());
+ out.write(UddiHub.ToErrorAlert(msg.get()));
} else if (data == null || data.isEmpty())
- out.write(ResourceLoader.GetResource(session,
"errors.nodatareturned"));
+ out.write(UddiHub.ToErrorAlert(ResourceLoader.GetResource(session,
"errors.nodatareturned")));
else {
%>
Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/businessEditor2.jsp
URL:
http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/businessEditor2.jsp?rev=1480509&r1=1480508&r2=1480509&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/businessEditor2.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/businessEditor2.jsp Thu May 9
00:40:22 2013
@@ -43,6 +43,10 @@
} else {
bd = new BusinessEntity();
}
+ if (bd == null) {
+ bd = new BusinessEntity();
+ newitem = true;
+ }
%>
<%
Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/csrf.jsp
URL:
http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/csrf.jsp?rev=1480509&r1=1480508&r2=1480509&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/csrf.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/csrf.jsp Thu May 9 00:40:22 2013
@@ -25,10 +25,7 @@
//last change, default to english
session.setAttribute("locale", "en");
}
-%>
-<%
-
- String current = null;
+ String currentNonce = null;
if (request.getMethod().equalsIgnoreCase("post")) {
@@ -53,7 +50,7 @@
//generate new one, add to page and session
//else redirect to index page
if (noncestr.equals(postedstr)) {
- current = noncestr;
+ currentNonce = noncestr;
//OK
// current = UUID.randomUUID();
//session.removeAttribute("nonce");
@@ -68,12 +65,12 @@
}
} else {
//HTTP GET or otherwise message
- if ((current == null) || current.isEmpty()) {
- current = (String)session.getAttribute("nonce");
- if (current == null) {
- current = java.util.UUID.randomUUID().toString();
+ if ((currentNonce == null) || currentNonce.isEmpty()) {
+ currentNonce = (String)session.getAttribute("nonce");
+ if (currentNonce == null) {
+ currentNonce = java.util.UUID.randomUUID().toString();
}
- session.setAttribute("nonce", current);
+ session.setAttribute("nonce", currentNonce);
}
}
Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/reginfo.jsp
URL:
http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/reginfo.jsp?rev=1480509&r1=1480508&r2=1480509&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/reginfo.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/reginfo.jsp Thu May 9 00:40:22
2013
@@ -4,6 +4,7 @@
Author : Alex O'Ree
--%>
+<%@page import="java.util.concurrent.atomic.AtomicReference"%>
<%@page import="java.net.URLEncoder"%>
<%@page import="org.apache.juddi.webconsole.hub.builders.Printers"%>
<%@page import="org.uddi.api_v3.RegisteredInfo"%>
@@ -25,20 +26,23 @@
<div class="span12">
<%=ResourceLoader.GetResource(session,
"navbar.create.mybiz.content")%>
<br><Br>
- <%
+ <%
UddiHub x = UddiHub.getInstance(application, session);
- RegisteredInfo info = x.GetNodeInformation();
- if (info == null || info.getBusinessInfos() == null ||
info.getBusinessInfos().getBusinessInfo().isEmpty()) {
- out.write(ResourceLoader.GetResource(session,
"errors.nodatareturned"));
+ AtomicReference<String> msg = new AtomicReference<String>();
+ RegisteredInfo info = x.GetNodeInformation(msg);
+ if (msg != null && msg.get() != null) {
+ out.write(UddiHub.ToErrorAlert(msg.get()));
+ } else if (info == null || info.getBusinessInfos() == null ||
info.getBusinessInfos().getBusinessInfo().isEmpty()) {
+
out.write(UddiHub.ToErrorAlert(ResourceLoader.GetResource(session,
"errors.nodatareturned")));
} else {
//TODO i18n
- %>
+ %>
<table class="table table-hover">
<tr><th><%=ResourceLoader.GetResource(session,
"items.key")%></th><th><%=ResourceLoader.GetResource(session,
"items.name")%></th>
<th><%=ResourceLoader.GetResource(session,
"items.actions")%></th></tr>
- <%
+ <%
for (int i = 0; i <
info.getBusinessInfos().getBusinessInfo().size(); i++) {
out.write("<tr id=\"" +
StringEscapeUtils.escapeHtml(info.getBusinessInfos().getBusinessInfo().get(i).getBusinessKey())
+ "\"><td>");
out.write("<a href=\"businessEditor2.jsp?id=" +
URLEncoder.encode(info.getBusinessInfos().getBusinessInfo().get(i).getBusinessKey(),
"UTF-8") + "\">");
@@ -70,7 +74,7 @@
}
%>
</table>
- <%
+ <%
}
%>
</div>
@@ -78,7 +82,7 @@
<div class="modal hide fade" id="viewAsXml">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal"
aria-hidden="true">×</button>
- <h3>As XML</h3>
+ <h3><%=ResourceLoader.GetResource(session,
"actions.asxml")%></h3>
</div>
<div class="modal-body" id="viewAsXmlContent">
Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/serviceEditor.jsp
URL:
http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/serviceEditor.jsp?rev=1480509&r1=1480508&r2=1480509&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/serviceEditor.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/serviceEditor.jsp Thu May 9
00:40:22 2013
@@ -26,6 +26,49 @@
<%@page import="org.apache.juddi.webconsole.hub.UddiHub"%>
<%@page contentType="text/html" pageEncoding="UTF-8"%>
+
+
+<%
+//@include file="csrf.jsp"
+ boolean newitem = false;
+ String serviceid = request.getParameter("id");
+ String businessid = request.getParameter("bizid");
+ if (serviceid == null && businessid == null) {
+ response.sendRedirect("index.jsp");
+ }
+ if (serviceid == null || serviceid.length() == 0) {
+ //response.sendRedirect("browse.jsp");
+ if (businessid != null && businessid.length() > 0) {
+ newitem = true;
+ } else {
+ response.sendRedirect("index.jsp");
+ }
+
+ }
+
+ UddiHub x = UddiHub.getInstance(application, request.getSession());
+
+ BusinessService bd = null;
+ if (!newitem) {
+ bd = x.GetServiceDetail(serviceid);
+ } else {
+ bd = new BusinessService();
+ bd.setBusinessKey(businessid);
+ BusinessEntity be = x.GetBusinessDetails(businessid);
+ if (be == null) {
+ //incase an invalid business id was passed in
+ response.sendRedirect("index.jsp");
+ } else {
+ bd.setBusinessKey(be.getBusinessKey());
+ }
+ }
+
+ if (bd == null) {
+
+ //we can't make a new service without a business to reference
+ response.sendRedirect("error.jsp");
+ }
+%>
<%@include file="header-top.jsp" %>
<div class="container">
@@ -40,39 +83,9 @@
<div id="businesseditor">
<%
- boolean newitem = false;
-
- UddiHub x = UddiHub.getInstance(application,
request.getSession());
- String serviceid = request.getParameter("id");
- String businessid = request.getParameter("bizid");
- if (serviceid == null || serviceid.isEmpty()) {
- //response.sendRedirect("browse.jsp");
- if (businessid != null && businessid.length() > 0) {
- newitem = true;
- } else {
- response.sendRedirect("index.jsp");
- }
- }
- BusinessService bd = null;
- if (!newitem) {
- bd = x.GetServiceDetail(serviceid);
- } else {
- bd = new BusinessService();
- bd.setBusinessKey(businessid);
- BusinessEntity be = x.GetBusinessDetails(businessid);
- if (be == null) {
- //incase an invalid business id was passed in
- response.sendRedirect("index.jsp");
- } else {
- bd.setBusinessKey(be.getBusinessKey());
- }
- }
- if (bd == null) {
- response.sendError(501);
- }
int totalBTDescriptions = 0;
%>
@@ -211,7 +224,7 @@
<%
for (int i = 0; i < bd.getName().size(); i++) {
out.write("<div id=\"" +
PostBackConstants.NAME + i + "\" style=\"border-width:1px; border-style:solid\"
>");
- out.write("<div style=\"float:left;
height:100%\"><a href=\"javascript:Remove('" + PostBackConstants.NAME + i +
"');\"><i class=\"icon-trash icon-large\"></i></a></div>");
+ out.write("<div style=\"float:left;
height:100%\"><a href=\"javascript:Remove('" + PostBackConstants.NAME + i +
"');\"><i class=\"icon-trash icon-large\"></i> </a></div>");
out.write("<div style=\"float:left\">" +
ResourceLoader.GetResource(session, "items.key") + ": </div>"
+ "<div class=\"edit\" id=\"" +
PostBackConstants.NAME + i + PostBackConstants.VALUE + "\">" +
StringEscapeUtils.escapeHtml(bd.getName().get(i).getValue()) + "</div>");
out.write("<div style=\"float:left\">" +
ResourceLoader.GetResource(session, "items.lang") + ": </div>"
@@ -234,7 +247,7 @@
<%
for (int i = 0; i <
bd.getDescription().size(); i++) {
out.write("<div id=\"" +
PostBackConstants.DESCRIPTION + i + "\" style=\"border-width:1px;
border-style:solid\">");
- out.write("<div
style=\"float:left;height:100%\"><a href=\"javascript:Remove('Description" + i
+ "');\"><i class=\"icon-trash icon-large\"></i></a></div>");
+ out.write("<div
style=\"float:left;height:100%\"><a href=\"javascript:Remove('Description" + i
+ "');\"><i class=\"icon-trash icon-large\"></i> </a></div>");
out.write("<div style=\"float:left\">" +
ResourceLoader.GetResource(session, "items.key") + ": </div>"
+ "<div class=\"edit\" id=\"" +
PostBackConstants.DESCRIPTION + i + PostBackConstants.VALUE + "\">" +
StringEscapeUtils.escapeHtml(bd.getDescription().get(i).getValue()) + "</div>");
out.write("<div style=\"float:left\">" +
ResourceLoader.GetResource(session, "items.lang") + ": </div>"
@@ -266,7 +279,7 @@
for (int i = 0; i <
bd.getCategoryBag().getKeyedReference().size(); i++) {
out.write("<div id=\"" +
PostBackConstants.CATBAG_KEY_REF + i + "\" style=\"border-width:2px;
border-style:solid\">");
- out.write("<div
style=\"float:left;height:100%\"><a href=\"javascript:Remove('" +
PostBackConstants.CATBAG_KEY_REF + i + "');\"><i class=\"icon-trash
icon-large\"></i></a></div>");
+ out.write("<div
style=\"float:left;height:100%\"><a href=\"javascript:Remove('" +
PostBackConstants.CATBAG_KEY_REF + i + "');\"><i class=\"icon-trash
icon-large\"></i> </a></div>");
out.write("<div style=\"float:left\">" +
ResourceLoader.GetResource(session, "items.key") + " (<a
href=\"javascript:tModelModal('" + PostBackConstants.CATBAG_KEY_REF + i +
PostBackConstants.VALUE + "')\" ><i class=\"icon-list-alt icon-large\"></i>" +
ResourceLoader.GetResource(session, "items.picker") + "</a>): </div>"
+ "<div class=\"edit\" id=\"" +
PostBackConstants.CATBAG_KEY_REF + i + PostBackConstants.VALUE + "\">" +
StringEscapeUtils.escapeHtml(bd.getCategoryBag().getKeyedReference().get(i).getTModelKey())
+ "</div>");
out.write("<div style=\"float:left\">" +
ResourceLoader.GetResource(session, "items.name") + ": </div>"
@@ -288,7 +301,7 @@
for (int i = 0; i <
bd.getCategoryBag().getKeyedReferenceGroup().size(); i++) {
out.write("<div id=\"" +
PostBackConstants.CATBAG_KEY_REF_GRP + i + "\" style=\"border-width:2px;
border-style:solid\">"
- + "<div
style=\"float:left;height:100%\"><a href=\"javascript:Remove('catbaggrpkeyref"
+ i + "');\"><i class=\"icon-trash icon-large\"></i></a></div>"
+ + "<div
style=\"float:left;height:100%\"><a href=\"javascript:Remove('catbaggrpkeyref"
+ i + "');\"><i class=\"icon-trash icon-large\"></i> </a></div>"
+ "<div style=\"float:left\">" +
ResourceLoader.GetResource(session, "items.key") + " (<a
href=\"javascript:tModelModal('" + PostBackConstants.CATBAG_KEY_REF_GRP + i +
PostBackConstants.VALUE + "')\" ><i class=\"icon-list-alt icon-large\"></i>" +
ResourceLoader.GetResource(session, "items.picker") + "</a>): </div>"
+ "<div class=\"edit\" id=\"" +
PostBackConstants.CATBAG_KEY_REF_GRP + i + PostBackConstants.VALUE + "\">"
+
StringEscapeUtils.escapeHtml(bd.getCategoryBag().getKeyedReferenceGroup().get(i).getTModelKey())
@@ -302,7 +315,7 @@
for (int k = 0; k <
bd.getCategoryBag().getKeyedReferenceGroup().get(i).getKeyedReference().size();
k++) {
out.write("<div id=\"" +
PostBackConstants.CATBAG_KEY_REF_GRP + i + "keyref" + k + "\"
style=\"border-width:1px; border-style:solid\">");
- out.write("<div
style=\"float:left;height:100%\"><a href=\"javascript:Remove('" +
PostBackConstants.CATBAG_KEY_REF_GRP + i + PostBackConstants.KEY_REF + k +
"');\"><i class=\"icon-trash icon-large\"></i></a></div>");
+ out.write("<div
style=\"float:left;height:100%\"><a href=\"javascript:Remove('" +
PostBackConstants.CATBAG_KEY_REF_GRP + i + PostBackConstants.KEY_REF + k +
"');\"><i class=\"icon-trash icon-large\"></i> </a></div>");
out.write("<div style=\"float:left\">"
+ ResourceLoader.GetResource(session, "items.key") + " (<a
href=\"javascript:tModelModal('" + PostBackConstants.CATBAG_KEY_REF_GRP + i +
PostBackConstants.KEY_REF + k + PostBackConstants.VALUE + "')\" ><i
class=\"icon-list-alt icon-large\"></i>" + ResourceLoader.GetResource(session,
"items.picker") + "</a>): </div>"
+ "<div class=\"edit\" id=\""
+ PostBackConstants.CATBAG_KEY_REF_GRP + i + PostBackConstants.KEY_REF + k +
PostBackConstants.VALUE + "\">" +
StringEscapeUtils.escapeHtml(bd.getCategoryBag().getKeyedReferenceGroup().get(i).getKeyedReference().get(k).getTModelKey())
+ "</div>");
out.write("<div style=\"float:left\">"
+ ResourceLoader.GetResource(session, "items.name") + ": </div>"
@@ -329,7 +342,7 @@
for (int i = 0; i <
bd.getBindingTemplates().getBindingTemplate().size(); i++) {
out.write("<div id=\"bindingTemplate" + i
+ "\" style=\"border-width: 2px; border-style: dashed;; border-color:
lightseagreen\" >");
out.write("<div style=\"float:left\">"
- + "<a href=\"javascript:Remove('"
+ PostBackConstants.BINDINGTEMPLATE + i + "');\"><i class=\"icon-trash
icon-large\"></i></a>"
+ + "<a href=\"javascript:Remove('"
+ PostBackConstants.BINDINGTEMPLATE + i + "');\"><i class=\"icon-trash
icon-large\"></i> </a>"
+
ResourceLoader.GetResource(session, "items.bindingtemplate.key") + ":
</div>"
+ "<div class=\"");
if (!newitem) {
@@ -340,7 +353,7 @@
out.write(StringEscapeUtils.escapeHtml(bd.getBindingTemplates().getBindingTemplate().get(i).getBindingKey()));
}
out.write("</div>"); //end of binding
template key section
-%>
+ %>
<br>
<a
href="javascript:AddDescriptionSpecific('<%=PostBackConstants.BINDINGTEMPLATE +
i + PostBackConstants.DESCRIPTION%>');">
<i class="icon-plus-sign
icon-large"></i></a><%=ResourceLoader.GetResource(session,
"items.bindingtemplate.description.add")%> <Br>
@@ -350,7 +363,7 @@
for (int k = 0; k <
bd.getBindingTemplates().getBindingTemplate().get(i).getDescription().size();
k++) {
out.write("<div id=\"" +
PostBackConstants.BINDINGTEMPLATE + i + PostBackConstants.DESCRIPTION + k + "\"
style=\"border-width:1px; border-style:solid\">");
out.write("<div
style=\"float:left;height:100%\">"
- + "<a
href=\"javascript:Remove('" + PostBackConstants.BINDINGTEMPLATE + i +
PostBackConstants.DESCRIPTION + k + "');\"><i class=\"icon-trash
icon-large\"></i></a></div>");
+ + "<a
href=\"javascript:Remove('" + PostBackConstants.BINDINGTEMPLATE + i +
PostBackConstants.DESCRIPTION + k + "');\"><i class=\"icon-trash
icon-large\"></i> </a></div>");
out.write("<div
style=\"float:left\">Value: </div>"
+ "<div class=\"edit\" id=\""
+ PostBackConstants.BINDINGTEMPLATE + i + PostBackConstants.DESCRIPTION + k +
PostBackConstants.VALUE + "\">" +
StringEscapeUtils.escapeHtml(bd.getBindingTemplates().getBindingTemplate().get(i).getDescription().get(k).getValue())
+ "</div>");
out.write("<div style=\"float:left\">"
+ ResourceLoader.GetResource(session, "items.lang") + ": </div>"
@@ -363,7 +376,7 @@
}
//1:1
-%>
+ %>
</div>
<b><%=ResourceLoader.GetResource(session,
"items.accesspoint")%></b> - <%=ResourceLoader.GetResource(session,
"items.accesspoint.description")%><br>
<%
@@ -397,13 +410,13 @@
<div id="<%=PostBackConstants.BINDINGTEMPLATE
+ i + PostBackConstants.TMODELINSTANCE + k%>" style="border-width: 2px;
border-style: dashed; border-color: red" >
<%
out.write("<div
style=\"float:left;height:100%\">"
- + "<a
href=\"javascript:Remove('" + PostBackConstants.BINDINGTEMPLATE + i +
PostBackConstants.TMODELINSTANCE + k + "');\"><i class=\"icon-trash
icon-large\"></i></a></div>");
+ + "<a
href=\"javascript:Remove('" + PostBackConstants.BINDINGTEMPLATE + i +
PostBackConstants.TMODELINSTANCE + k + "');\"><i class=\"icon-trash
icon-large\"></i> </a></div>");
out.write("<div
style=\"float:left\"><b>" + ResourceLoader.GetResource(session,
"items.tmodel.key") + " </b> (<a href=\"javascript:tModelModal('" +
PostBackConstants.BINDINGTEMPLATE + i + PostBackConstants.TMODELINSTANCE + k +
PostBackConstants.KEYNAME + "')\" ><i class=\"icon-list-alt icon-large\"></i>"
+ ResourceLoader.GetResource(session, "items.picker") + "</a>): </div>"
+ "<div class=\"edit\" id=\""
+ PostBackConstants.BINDINGTEMPLATE + i + PostBackConstants.TMODELINSTANCE + k
+ PostBackConstants.KEYNAME + "\">" +
StringEscapeUtils.escapeHtml(bd.getBindingTemplates().getBindingTemplate().get(i).getTModelInstanceDetails().getTModelInstanceInfo().get(k).getTModelKey())
+ "</div>");
// out.write("<div
style=\"float:left\"><span title=\"Instance Params\">Value</span>: </div>"
// + "<div class=\"edit\"
id=\"" + PostBackConstants.BINDINGTEMPLATE + i +
PostBackConstants.TMODELINSTANCE + k + PostBackConstants.VALUE + "\">" +
((bd.getBindingTemplates().getBindingTemplate().get(i).getTModelInstanceDetails().getTModelInstanceInfo().get(k).getInstanceDetails()
!= null) ?
StringEscapeUtils.escapeHtml(bd.getBindingTemplates().getBindingTemplate().get(i).getTModelInstanceDetails().getTModelInstanceInfo().get(k).getInstanceDetails().getInstanceParms())
: "") + "</div>");
-%>
+ %>
<br>
<%
@@ -427,7 +440,7 @@
for (int j = 0; j <
bd.getBindingTemplates().getBindingTemplate().get(i).getTModelInstanceDetails().getTModelInstanceInfo().get(k).getDescription().size();
j++) {
out.write("<div id=\"" +
PostBackConstants.BINDINGTEMPLATE + i + PostBackConstants.TMODELINSTANCE + k +
PostBackConstants.INSTANCE + PostBackConstants.DESCRIPTION + j + "\"
style=\"border-width:1px; border-style:solid\">");
out.write("<div
style=\"float:left;height:100%\">"
- + "<a
href=\"javascript:Remove('" + PostBackConstants.BINDINGTEMPLATE + i +
PostBackConstants.TMODELINSTANCE + k + PostBackConstants.INSTANCE +
PostBackConstants.DESCRIPTION + j + "');\"><i class=\"icon-trash
icon-large\"></i></a></div>");
+ + "<a
href=\"javascript:Remove('" + PostBackConstants.BINDINGTEMPLATE + i +
PostBackConstants.TMODELINSTANCE + k + PostBackConstants.INSTANCE +
PostBackConstants.DESCRIPTION + j + "');\"><i class=\"icon-trash
icon-large\"></i> </a></div>");
out.write("<div
style=\"float:left\">" + ResourceLoader.GetResource(session, "items.name") +
": </div>"
+ "<div class=\"edit\"
id=\"" + PostBackConstants.BINDINGTEMPLATE + i +
PostBackConstants.TMODELINSTANCE + k + PostBackConstants.INSTANCE +
PostBackConstants.DESCRIPTION + j + PostBackConstants.VALUE + "\">" +
StringEscapeUtils.escapeHtml(bd.getBindingTemplates().getBindingTemplate().get(i).getTModelInstanceDetails().getTModelInstanceInfo().get(k).getDescription().get(j).getValue())
+ "</div>");
out.write("<div
style=\"float:left\">" + ResourceLoader.GetResource(session, "items.lang") +
": </div>"
@@ -449,7 +462,7 @@
if
(bd.getBindingTemplates().getBindingTemplate().get(i).getTModelInstanceDetails().getTModelInstanceInfo().get(k).getInstanceDetails()
!= null)
for (int j = 0; j <
bd.getBindingTemplates().getBindingTemplate().get(i).getTModelInstanceDetails().getTModelInstanceInfo().get(k).getInstanceDetails().getOverviewDoc().size();
j++) {
out.write("<div id=\""
+ PostBackConstants.BINDINGTEMPLATE + i + PostBackConstants.TMODELINSTANCE + k
+ PostBackConstants.INSTANCE + PostBackConstants.OVERVIEW + j + "\"
style=\"border-width:1px; border-style:solid\">");
- out.write("<div
style=\"float:left;height:100%\"><a href=\"javascript:Remove('" +
PostBackConstants.BINDINGTEMPLATE + i + PostBackConstants.TMODELINSTANCE + k +
PostBackConstants.INSTANCE + PostBackConstants.OVERVIEW + j + "');\"><i
class=\"icon-trash icon-large\"></i></a></div>");
+ out.write("<div
style=\"float:left;height:100%\"><a href=\"javascript:Remove('" +
PostBackConstants.BINDINGTEMPLATE + i + PostBackConstants.TMODELINSTANCE + k +
PostBackConstants.INSTANCE + PostBackConstants.OVERVIEW + j + "');\"><i
class=\"icon-trash icon-large\"></i> </a></div>");
out.write("<div
style=\"float:left\">" + ResourceLoader.GetResource(session, "items.value") +
": </div>"
+ "<div
class=\"edit\" id=\"" + PostBackConstants.BINDINGTEMPLATE + i +
PostBackConstants.TMODELINSTANCE + k + PostBackConstants.INSTANCE +
PostBackConstants.OVERVIEW + j + PostBackConstants.VALUE + "\">" +
StringEscapeUtils.escapeHtml(bd.getBindingTemplates().getBindingTemplate().get(i).getTModelInstanceDetails().getTModelInstanceInfo().get(k).getInstanceDetails().getOverviewDoc().get(j).getOverviewURL().getValue())
+ "</div>");
out.write("<div
style=\"float:left\">Use type: </div>"
@@ -462,7 +475,7 @@
// out.write("<div id=\""
+ PostBackConstants.OVERVIEW + "\" style=\"border-width:2px;
border-style:solid\">");
for (int h = 0; h <
bd.getBindingTemplates().getBindingTemplate().get(i).getTModelInstanceDetails().getTModelInstanceInfo().get(k).getInstanceDetails().getOverviewDoc().get(j).getDescription().size();
h++) {
out.write("<div id=\""
+ PostBackConstants.BINDINGTEMPLATE + i + PostBackConstants.TMODELINSTANCE + k
+ PostBackConstants.INSTANCE + PostBackConstants.OVERVIEW + j +
PostBackConstants.DESCRIPTION + h + "\" style=\"border-width:1px;
border-style:solid\">");
- out.write("<div
style=\"float:left;height:100%\"><a href=\"javascript:Remove('" +
PostBackConstants.BINDINGTEMPLATE + i + PostBackConstants.TMODELINSTANCE + k +
PostBackConstants.INSTANCE + PostBackConstants.OVERVIEW + j +
PostBackConstants.DESCRIPTION + h + "');\"><i class=\"icon-trash
icon-large\"></i></a></div>");
+ out.write("<div
style=\"float:left;height:100%\"><a href=\"javascript:Remove('" +
PostBackConstants.BINDINGTEMPLATE + i + PostBackConstants.TMODELINSTANCE + k +
PostBackConstants.INSTANCE + PostBackConstants.OVERVIEW + j +
PostBackConstants.DESCRIPTION + h + "');\"><i class=\"icon-trash
icon-large\"></i> </a></div>");
out.write("<div
style=\"float:left\">" + ResourceLoader.GetResource(session, "items.value") +
": </div>"
+ "<div
class=\"edit\" id=\"" + PostBackConstants.BINDINGTEMPLATE + i +
PostBackConstants.TMODELINSTANCE + k + PostBackConstants.INSTANCE +
PostBackConstants.OVERVIEW + j + PostBackConstants.DESCRIPTION + h +
PostBackConstants.VALUE + "\">" +
StringEscapeUtils.escapeHtml(bd.getBindingTemplates().getBindingTemplate().get(i).getTModelInstanceDetails().getTModelInstanceInfo().get(k).getInstanceDetails().getOverviewDoc().get(j).getDescription().get(h).getValue())
+ "</div>");
out.write("<div
style=\"float:left\">" + ResourceLoader.GetResource(session, "items.lang") +
": </div>"
@@ -484,7 +497,7 @@
</div>
<% } //end of instance details
-%>
+ %>
<%
}
@@ -501,7 +514,7 @@
}
for (int k = 0; k <
bd.getBindingTemplates().getBindingTemplate().get(i).getCategoryBag().getKeyedReference().size();
k++) {
out.write("<div id=\"" +
PostBackConstants.BINDINGTEMPLATE + i + PostBackConstants.CATBAG_KEY_REF + k +
"\" style=\"border-width:2px; border-style:solid\">");
- out.write("<div
style=\"float:left;height:100%\"><a href=\"javascript:Remove('" +
PostBackConstants.BINDINGTEMPLATE + i + PostBackConstants.CATBAG_KEY_REF + k +
"');\"><i class=\"icon-trash icon-large\"></i></a></div>");
+ out.write("<div
style=\"float:left;height:100%\"><a href=\"javascript:Remove('" +
PostBackConstants.BINDINGTEMPLATE + i + PostBackConstants.CATBAG_KEY_REF + k +
"');\"><i class=\"icon-trash icon-large\"></i> </a></div>");
out.write("<div style=\"float:left\">"
+ ResourceLoader.GetResource(session, "items.key") + " (<a
href=\"javascript:tModelModal('" + PostBackConstants.BINDINGTEMPLATE + i +
PostBackConstants.CATBAG_KEY_REF + k + PostBackConstants.VALUE + "')\" ><i
class=\"icon-list-alt icon-large\"></i>" + ResourceLoader.GetResource(session,
"items.picker") + "</a>): </div>"
+ "<div class=\"edit\" id=\""
+ PostBackConstants.BINDINGTEMPLATE + i + PostBackConstants.CATBAG_KEY_REF + k
+ PostBackConstants.VALUE + "\">" +
StringEscapeUtils.escapeHtml(bd.getBindingTemplates().getBindingTemplate().get(i).getCategoryBag().getKeyedReference().get(k).getTModelKey())
+ "</div>");
out.write("<div style=\"float:left\">"
+ ResourceLoader.GetResource(session, "items.name") + ": </div>"
@@ -522,7 +535,7 @@
for (int z = 0; z <
bd.getBindingTemplates().getBindingTemplate().get(i).getCategoryBag().getKeyedReferenceGroup().size();
z++) {
out.write("<div id=\"" +
PostBackConstants.BINDINGTEMPLATE + i + PostBackConstants.CATBAG_KEY_REF_GRP +
z + "\" style=\"border-width:2px; border-style:solid\">"
- + "<div
style=\"float:left;height:100%\"><a href=\"javascript:Remove('" +
PostBackConstants.BINDINGTEMPLATE + i + PostBackConstants.CATBAG_KEY_REF_GRP +
z + "');\"><i class=\"icon-trash icon-large\"></i></a></div>"
+ + "<div
style=\"float:left;height:100%\"><a href=\"javascript:Remove('" +
PostBackConstants.BINDINGTEMPLATE + i + PostBackConstants.CATBAG_KEY_REF_GRP +
z + "');\"><i class=\"icon-trash icon-large\"></i> </a></div>"
+ "<div style=\"float:left\">"
+ ResourceLoader.GetResource(session, "items.key") + " (<a
href=\"javascript:tModelModal('" + PostBackConstants.BINDINGTEMPLATE + i +
PostBackConstants.CATBAG_KEY_REF_GRP + z + PostBackConstants.VALUE + "')\" ><i
class=\"icon-list-alt icon-large\"></i>" + ResourceLoader.GetResource(session,
"items.picker") + "</a>): </div>"
+ "<div class=\"edit\" id=\""
+ PostBackConstants.BINDINGTEMPLATE + i + PostBackConstants.CATBAG_KEY_REF_GRP
+ z + PostBackConstants.VALUE + "\">"
+
StringEscapeUtils.escapeHtml(bd.getCategoryBag().getKeyedReferenceGroup().get(i).getTModelKey())
@@ -534,7 +547,7 @@
for (int k = 0; k <
bd.getBindingTemplates().getBindingTemplate().get(i).getCategoryBag().getKeyedReferenceGroup().get(z).getKeyedReference().size();
k++) {
out.write("<div id=\"" +
PostBackConstants.BINDINGTEMPLATE + i + PostBackConstants.CATBAG_KEY_REF_GRP +
z + PostBackConstants.KEY_REF + k + "\" style=\"border-width:1px;
border-style:solid\">");
- out.write("<div
style=\"float:left;height:100%\"><a href=\"javascript:Remove('" +
PostBackConstants.BINDINGTEMPLATE + i + PostBackConstants.CATBAG_KEY_REF_GRP +
z + "keyref" + k + "');\"><i class=\"icon-trash icon-large\"></i></a></div>");
+ out.write("<div
style=\"float:left;height:100%\"><a href=\"javascript:Remove('" +
PostBackConstants.BINDINGTEMPLATE + i + PostBackConstants.CATBAG_KEY_REF_GRP +
z + "keyref" + k + "');\"><i class=\"icon-trash
icon-large\"></i> </a></div>");
out.write("<div
style=\"float:left\">" + ResourceLoader.GetResource(session, "items.key") + "
(<a href=\"javascript:tModelModal('" + PostBackConstants.BINDINGTEMPLATE + i +
PostBackConstants.CATBAG_KEY_REF_GRP + z + PostBackConstants.KEY_REF + k +
PostBackConstants.VALUE + "')\" ><i class=\"icon-list-alt icon-large\"></i>" +
ResourceLoader.GetResource(session, "items.picker") + "</a>): </div>"
+ "<div class=\"edit\"
id=\"" + PostBackConstants.BINDINGTEMPLATE + i +
PostBackConstants.CATBAG_KEY_REF_GRP + z + PostBackConstants.KEY_REF + k +
PostBackConstants.VALUE + "\">" +
StringEscapeUtils.escapeHtml(bd.getBindingTemplates().getBindingTemplate().get(i).getCategoryBag().getKeyedReferenceGroup().get(z).getKeyedReference().get(k).getTModelKey())
+ "</div>");
out.write("<div
style=\"float:left\">" + ResourceLoader.GetResource(session, "items.name") + ":
</div>"
@@ -551,7 +564,7 @@
<%
} //end of binding templates loop
-%>
+ %>
</div> <!-- binding template container-->
Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/transfer.jsp
URL:
http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/transfer.jsp?rev=1480509&r1=1480508&r2=1480509&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/transfer.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/transfer.jsp Thu May 9 00:40:22
2013
@@ -63,7 +63,7 @@
<div id="data">
- <img src="img/ajax-loader.gif">
+ <img src="img/bigrollergreen.gif">
</div>
<div>
Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/viewSubscriptions.jsp
URL:
http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/viewSubscriptions.jsp?rev=1480509&r1=1480508&r2=1480509&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/viewSubscriptions.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/viewSubscriptions.jsp Thu May 9
00:40:22 2013
@@ -49,12 +49,7 @@
List<Subscription> list = x.GetSubscriptions();
if (list == null) {
- %>
- <div class="alert alert-error" >
- <h3> <i class="icon-warning-sign"></i>
<%=ResourceLoader.GetResource(session, "errors.notsignedin")%></h3>
- </div>
- <%
-
+
out.write(UddiHub.ToErrorAlert(ResourceLoader.GetResource(session,
"errors.notsignedin")));
}
if (list != null) {
if (!list.isEmpty()) {
Modified:
juddi/branches/juddi-3.2.x/uddi-ws/src/main/java/org/apache/juddi/v3_service/JUDDIApiPortType.java
URL:
http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/uddi-ws/src/main/java/org/apache/juddi/v3_service/JUDDIApiPortType.java?rev=1480509&r1=1480508&r2=1480509&view=diff
==============================================================================
---
juddi/branches/juddi-3.2.x/uddi-ws/src/main/java/org/apache/juddi/v3_service/JUDDIApiPortType.java
(original)
+++
juddi/branches/juddi-3.2.x/uddi-ws/src/main/java/org/apache/juddi/v3_service/JUDDIApiPortType.java
Thu May 9 00:40:22 2013
@@ -48,6 +48,10 @@ import org.uddi.v3_service.DispositionRe
/**
* This portType defines all of the jUDDI publisher operations.
+ * This is above and beyond the original UDDI v3 specification and is NOT part
of the standard.
+ * Method behavior within this class may change from version to version. These
methods are
+ * primarily mean for administrative functions.
+ *
*
*/
@WebService(name = "JUDDI_Api_PortType", targetNamespace =
"urn:juddi-apache-org:v3_service")
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
