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/25 17:43:38 UTC
svn commit: r1561339 [1/5] - in /juddi/trunk/juddi-gui/src/main:
java/org/apache/juddi/webconsole/hub/UddiHub.java webapp/ajax/switch.jsp
webapp/businessEditor2.jsp webapp/header-bottom.jsp
webapp/serviceEditor.jsp webapp/tmodelEditor.jsp
Author: alexoree
Date: Sat Jan 25 16:43:37 2014
New Revision: 1561339
URL: http://svn.apache.org/r1561339
Log:
JUDDI-815 done
JUDDI-800 added a field to display the current node
Modified:
juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java
juddi/trunk/juddi-gui/src/main/webapp/ajax/switch.jsp
juddi/trunk/juddi-gui/src/main/webapp/businessEditor2.jsp
juddi/trunk/juddi-gui/src/main/webapp/header-bottom.jsp
juddi/trunk/juddi-gui/src/main/webapp/serviceEditor.jsp
juddi/trunk/juddi-gui/src/main/webapp/tmodelEditor.jsp
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=1561339&r1=1561338&r2=1561339&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 Sat Jan 25 16:43:37 2014
@@ -270,7 +270,7 @@ public class UddiHub implements Serializ
DiscardAuthToken da = new DiscardAuthToken();
da.setAuthInfo(token);
try {
- if (token != null) {
+ if (token != null && security != null) {
security.discardAuthToken(da);
}
} catch (Exception ex) {
@@ -284,8 +284,10 @@ public class UddiHub implements Serializ
security = null;
//juddi = null;
subscription = null;
- session.removeAttribute("username");
- session.removeAttribute("password");
+ if (session != null) {
+ session.removeAttribute("username");
+ session.removeAttribute("password");
+ }
}
/**
@@ -397,7 +399,6 @@ public class UddiHub implements Serializ
* @return true if all coms are SSL based
*/
public boolean isSecure() {
-
EnsureConfig();
return WS_securePorts;
}
@@ -414,6 +415,12 @@ public class UddiHub implements Serializ
return clientConfig;
}
+ /**
+ * gets the configuration file's node name element of the currently
+ * connected node
+ *
+ * @return
+ */
public String getNodeName() {
EnsureConfig();
return nodename;
@@ -434,13 +441,29 @@ public class UddiHub implements Serializ
return false;
}
+ /**
+ * attempts to switch the current context to the proposed node id. if
+ * the node does not exist in the config file, null is returned and no
+ * changes are made. if the node does exist in the config file, the
+ * current login token is discard, all web service client objects are
+ * destroyed, user credentials are removed from the session. The client
+ * objects are then recreated from the config using the new node name
+ * and transport
+ *
+ * @param newnode
+ * @return the new node name if successful, or null on failure
+ */
public String switchNodes(String newnode) {
- if (!this.nodename.equalsIgnoreCase(newnode) && NodeExists(newnode)) {
+ EnsureConfig();
+ if (this.nodename.equalsIgnoreCase(newnode)) {
+ return newnode;
+ }
+ if (NodeExists(newnode)) {
this.die();
clientConfig = null;
this.nodename = newnode;
} else {
- return ResourceLoader.GetResource(session, "error.nodeexists");
+ return null;
}
EnsureConfig();
return this.nodename;
@@ -1580,6 +1603,8 @@ public class UddiHub implements Serializ
fb.setCategoryBag(new CategoryBag());
KeyedReference kr = new KeyedReference();
kr.setTModelKey(parameters);
+ kr.setKeyName("%");
+ kr.setKeyValue("%");
fb.getCategoryBag().getKeyedReference().add(kr);
break;
case Name:
@@ -1663,6 +1688,8 @@ public class UddiHub implements Serializ
fb.setCategoryBag(new CategoryBag());
KeyedReference kr = new KeyedReference();
kr.setTModelKey(parameters);
+ kr.setKeyName("%");
+ kr.setKeyValue("%");
fb.getCategoryBag().getKeyedReference().add(kr);
break;
case Name:
@@ -1805,6 +1832,8 @@ public class UddiHub implements Serializ
fb.setCategoryBag(new CategoryBag());
KeyedReference kr = new KeyedReference();
kr.setTModelKey(parameters);
+ kr.setKeyName("%");
+ kr.setKeyValue("%");
fb.getCategoryBag().getKeyedReference().add(kr);
break;
case Name:
@@ -1892,6 +1921,8 @@ public class UddiHub implements Serializ
fb.setCategoryBag(new CategoryBag());
KeyedReference kr = new KeyedReference();
kr.setTModelKey(parameters);
+ kr.setKeyName("%");
+ kr.setKeyValue("%");
fb.getCategoryBag().getKeyedReference().add(kr);
break;
case Name:
@@ -1904,6 +1935,8 @@ public class UddiHub implements Serializ
fb.setCategoryBag(new CategoryBag());
KeyedReference kr2 = new KeyedReference();
kr2.setTModelKey(parameters);
+ kr2.setKeyName("%");
+ kr2.setKeyValue("%");
fb.getCategoryBag().getKeyedReference().add(kr2);
break;
case uid:
@@ -2440,34 +2473,36 @@ public class UddiHub implements Serializ
if (info != null && !info.isEmpty()) {
sb.append("<table class=\"table table-hover\">");
- sb.append("<tr><th>").
- append(ResourceLoader.GetResource(session, "items.nodeid")).
- append("</th><th>").
- append(ResourceLoader.GetResource(session, "items.authorizedname")).
- append("</th><th>").
- append(ResourceLoader.GetResource(session, "items.key")).
- append("</th><th>").
- append(ResourceLoader.GetResource(session, "items.created")).
- append("</th><th>").
- append(ResourceLoader.GetResource(session, "items.modified")).
- append("</th><th>").
- append(ResourceLoader.GetResource(session, "items.modifiedwithchildren")).
- append("</th></tr>");
-
+ sb.append("<tr><th>").
+ append(ResourceLoader.GetResource(session, "items.nodeid")).
+ append("</th><th>").
+ append(ResourceLoader.GetResource(session, "items.authorizedname")).
+ append("</th><th>").
+ append(ResourceLoader.GetResource(session, "items.key")).
+ append("</th><th>").
+ append(ResourceLoader.GetResource(session, "items.created")).
+ append("</th><th>").
+ append(ResourceLoader.GetResource(session, "items.modified")).
+ append("</th><th>").
+ append(ResourceLoader.GetResource(session, "items.modifiedwithchildren")).
+ append("</th></tr>");
+
for (int i = 0; i < info.size(); i++) {
- if (info.get(i)==null) continue;
+ if (info.get(i) == null) {
+ continue;
+ }
sb.append("<tr><td>");
- sb.append((info.get(i).getNodeID()!=null ? StringEscapeUtils.escapeHtml(info.get(i).getNodeID()) : ""))
+ sb.append((info.get(i).getNodeID() != null ? StringEscapeUtils.escapeHtml(info.get(i).getNodeID()) : ""))
.append("</td><td>")
- .append((info.get(i).getAuthorizedName()!=null ? StringEscapeUtils.escapeHtml(info.get(i).getAuthorizedName()) :""))
+ .append((info.get(i).getAuthorizedName() != null ? StringEscapeUtils.escapeHtml(info.get(i).getAuthorizedName()) : ""))
.append("</td><td>")
- .append((info.get(i).getEntityKey()!=null ? StringEscapeUtils.escapeHtml(info.get(i).getEntityKey()):""))
+ .append((info.get(i).getEntityKey() != null ? StringEscapeUtils.escapeHtml(info.get(i).getEntityKey()) : ""))
.append("</td><td>")
- .append((info.get(i).getCreated()!=null ? StringEscapeUtils.escapeHtml(info.get(i).getCreated().toString()):""))
+ .append((info.get(i).getCreated() != null ? StringEscapeUtils.escapeHtml(info.get(i).getCreated().toString()) : ""))
.append("</td><td>")
- .append((info.get(i).getModified()!=null ? StringEscapeUtils.escapeHtml(info.get(i).getModified().toString()):""))
+ .append((info.get(i).getModified() != null ? StringEscapeUtils.escapeHtml(info.get(i).getModified().toString()) : ""))
.append("</td><td>")
- .append((info.get(i).getModifiedIncludingChildren()!=null ? StringEscapeUtils.escapeHtml(info.get(i).getModifiedIncludingChildren().toString()):""))
+ .append((info.get(i).getModifiedIncludingChildren() != null ? StringEscapeUtils.escapeHtml(info.get(i).getModifiedIncludingChildren().toString()) : ""))
.append("</td></tr>");
}
sb.append("</table>");
Modified: juddi/trunk/juddi-gui/src/main/webapp/ajax/switch.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/switch.jsp?rev=1561339&r1=1561338&r2=1561339&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/switch.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/switch.jsp Sat Jan 25 16:43:37 2014
@@ -11,12 +11,10 @@
<%@page import="org.apache.juddi.webconsole.hub.UddiHub"%>
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<%@include file="../csrf.jsp" %>
-<%
-
- UddiHub x = UddiHub.getInstance(application, session);
+<% UddiHub x = UddiHub.getInstance(application, session);
String node = request.getParameter("node");
- String description=null;
+ String description = null;
List<Node> nodes = x.GetJuddiClientConfig().getUDDINodeList();
boolean found = false;
for (int i = 0; i < nodes.size(); i++) {
@@ -28,16 +26,21 @@
}
if (!found) {
response.setStatus(406);
- out.write("Not found.");
+ out.write(ResourceLoader.GetResource(session, "error.nodeexists"));
} else {
- node=x.switchNodes(node);
- out.write(ResourceLoader.GetResource(session, "items.nowconnectedto") +"<br>");
- out.write(ResourceLoader.GetResource(session, "items.nodeid") + ": " + StringEscapeUtils.escapeHtml(node));
- out.write("<br>");
- out.write(ResourceLoader.GetResource(session, "items.description") + ": " + StringEscapeUtils.escapeHtml(description));
- Cookie cookie = new Cookie("current_node", node);
- cookie.setMaxAge(Integer.MAX_VALUE);
- cookie.setPath("/");
- response.addCookie(cookie);
+ node = x.switchNodes(node);
+ if (node == null) {
+ response.setStatus(406);
+ out.write(ResourceLoader.GetResource(session, "error.nodeexists"));
+ } else {
+ out.write(ResourceLoader.GetResource(session, "items.nowconnectedto") + "<br>");
+ out.write(ResourceLoader.GetResource(session, "items.nodeid") + ": " + StringEscapeUtils.escapeHtml(node));
+ out.write("<br>");
+ out.write(ResourceLoader.GetResource(session, "items.description") + ": " + StringEscapeUtils.escapeHtml(description));
+ Cookie cookie = new Cookie("current_node", node);
+ cookie.setMaxAge(Integer.MAX_VALUE);
+ cookie.setPath("/");
+ response.addCookie(cookie);
+ }
}
%>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org