Author: alexoree
Date: Wed Jan 22 12:56:18 2014
New Revision: 1560339
URL: http://svn.apache.org/r1560339
Log:
JUDDI-800 fixed a typo, some i18n fixes
Modified:
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/Printers.java
juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties
juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties
juddi/trunk/juddi-gui/src/main/webapp/ajax/loginpost.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/switch.jsp
juddi/trunk/juddi-gui/src/main/webapp/header-top.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=1560339&r1=1560338&r2=1560339&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
Wed Jan 22 12:56:18 2014
@@ -33,6 +33,8 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.concurrent.atomic.AtomicReference;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
@@ -47,6 +49,7 @@ import org.apache.commons.configuration.
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.juddi.api_v3.Node;
import org.apache.juddi.v3.client.ClassUtil;
import org.apache.juddi.v3.client.UDDIConstants;
import org.apache.juddi.v3.client.config.ClientConfig;
@@ -413,12 +416,26 @@ public class UddiHub implements Serializ
return nodename;
}
+ private boolean NodeExists(String newnode){
+ try {
+ List<Node> uddiNodeList =
GetJuddiClientConfig().getUDDINodeList();
+ for (int i=0; i < uddiNodeList.size(); i++){
+ if
(uddiNodeList.get(i).getName().equals(newnode))
+ return true;
+ }
+ } catch (ConfigurationException ex) {
+ log.error(ex);
+ return false;
+ }
+ return false;
+ }
public String switchNodes(String newnode) {
- if (this.nodename.equalsIgnoreCase(newnode)) {
+ if (!this.nodename.equalsIgnoreCase(newnode) &&
NodeExists(newnode)) {
this.die();
clientConfig = null;
this.nodename = newnode;
}
+ else return ResourceLoader.GetResource(session,
"error.nodeexists");
EnsureConfig();
return this.nodename;
}
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=1560339&r1=1560338&r2=1560339&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
Wed Jan 22 12:56:18 2014
@@ -65,7 +65,6 @@ public class Printers {
}
private static String KeyedReferenceToString(KeyedReference item,
String locale) {
- //TODO i18n
StringBuilder sb = new StringBuilder();
sb.append(ResourceLoader.GetResource(locale,
"items.keyrefgroup")).
append(": ").
Modified:
juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties?rev=1560339&r1=1560338&r2=1560339&view=diff
==============================================================================
---
juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties
(original)
+++
juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties
Wed Jan 22 12:56:18 2014
@@ -400,4 +400,7 @@ items.publisherassertion.direction=Direc
items.switchnode=Node Switch
items.switchnode.tooltip=jUDDI-GUI can connect to different UDDI servers
(nodes). Use this to switch to another one.
actions.continue=Continue
-items.nowconnectedto=Now connected to the UDDI Node,
+items.nowconnectedto=Now connected to the UDDI Node
+error.nodeexists=The proposed node does not exist!
+error.nopassword=Please enter a password
+error.nousername=Please enter a username
Modified:
juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties?rev=1560339&r1=1560338&r2=1560339&view=diff
==============================================================================
---
juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties
(original)
+++
juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties
Wed Jan 22 12:56:18 2014
@@ -345,7 +345,7 @@ pages.serviceimport.content.step3=Paso 3
pages.serviceimport.content.step4=Paso 4) Revisar y aprobar
actions.preview=Preestrenar
pages.serviceimport.content.step4a=Ver los nuevos art\u00edculos, haga clic en
Guardar. No te preocupes, siempre puedes cambiar estos valores m\u00e1s tarde.
-pages.serviceimport.content.step1.wadl=Step 1) WADL Location and Credentials
+pages.serviceimport.content.step1.wadl=Paso 1) WADL Localizaci\u00f3n y
Credenciales
pages.serviceimport.content.step1a.wadl=El primer paso es que nos diga donde
podemos encontrar la aplicaci\u00f3n web (lenguaje de descripci\u00f3n WADL)
documento que describe las operaciones, las entradas y salidas de sus servicios
y de las direcciones URL de ejecuci\u00f3n. Si usted no sabe d\u00f3nde
encontrarlo normalmente se puede a\u00f1adir un '? _wadl' Al final de la
direcci\u00f3n URL del servicio. WADLs son documentos XML.
items.optional=(Opcional)
items.ignoresslerror=Ignorar errores SSL
@@ -402,4 +402,7 @@ items.publisherassertion.direction=Direc
items.switchnode=Nodo de Conmutaci\u00f3n
items.switchnode.tooltip=jUDDI-GUI puede conectarse a diferentes servidores
UDDI (nodos). Utilice esta opci\u00f3n para cambiar a otro.
actions.continue=Continuar
-items.nowconnectedto=Ahora conectado al nodo UDDI,
+items.nowconnectedto=Ahora conectado al nodo UDDI
+error.nodeexists=El nodo propuesto no existe!
+error.nopassword=Por favor, ingrese una contrase\u00f1a
+error.nousername=Por favor, introduzca un nombre de usuario
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=1560339&r1=1560338&r2=1560339&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/loginpost.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/loginpost.jsp Wed Jan 22
12:56:18 2014
@@ -4,6 +4,7 @@
Author : Alex O'Ree
--%>
+<%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
<%@page import="org.apache.commons.lang.StringEscapeUtils"%>
<%@page import="java.util.Properties"%>
<%@page import="java.io.InputStream"%>
@@ -41,14 +42,12 @@
if (request.getParameter("password") == null ||
request.getParameter("password").length() == 0) {
response.setStatus(406);
ok = false;
- out.write("Please enter a password");
- //TODO i18n
+ out.write(ResourceLoader.GetResource(session,
"error.nopassword"));
}
if (request.getParameter("username") == null ||
request.getParameter("username").length() == 0) {
response.setStatus(406);
ok = false;
- out.write("Please enter a username");
- //TODO i18n
+ out.write(ResourceLoader.GetResource(session,
"error.nousername"));
}
if (ok) {
try {
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=1560339&r1=1560338&r2=1560339&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/switch.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/switch.jsp Wed Jan 22 12:56:18
2014
@@ -31,6 +31,7 @@
out.write("Not found.");
} 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));
Modified: juddi/trunk/juddi-gui/src/main/webapp/header-top.jsp
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/header-top.jsp?rev=1560339&r1=1560338&r2=1560339&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/header-top.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/header-top.jsp Wed Jan 22 12:56:18
2014
@@ -256,7 +256,6 @@
<h3><%=ResourceLoader.GetResource(session, "items.switchnode")%></h3>
</div>
<div class="modal-body">
- <%=ResourceLoader.GetResource(session, "items.nowconnectedto")%>
<br>
<div id="nodeswitcherdetails"></div>
</div>
<div class="modal-footer">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
