juddi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexo...@apache.org
Subject svn commit: r1465312 [1/3] - in /juddi/branches/juddi-3.2.x/juddi-gui: src/java/org/apache/juddi/webconsole/ src/java/org/apache/juddi/webconsole/hub/ src/java/org/apache/juddi/webconsole/hub/builders/ src/java/org/apache/juddi/webconsole/resources/ we...
Date Sat, 06 Apr 2013 23:08:02 GMT
Author: alexoree
Date: Sat Apr  6 23:08:00 2013
New Revision: 1465312

URL: http://svn.apache.org/r1465312
Log:
committing to the 3.2 branch, new user interface is internationalized, except for the dsig applet
remaining work items, web based configuration of the gui, subscription interfaces and a number of juddi specific api hooks

Added:
    juddi/branches/juddi-3.2.x/juddi-gui/web/js/i18n.js.jsp
Modified:
    juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/AES.java
    juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/CrossSiteRequestForgeryException.java
    juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/PostBackConstants.java
    juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/PagableContainer.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/src/java/org/apache/juddi/webconsole/hub/builders/Builders.java
    juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/builders/Printers.java
    juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web.properties
    juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web_es.properties
    juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/businesssearch.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/savebusiness.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/servicesearch.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/tmodelsearch.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/header-top.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/index.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/js/businessEditor.js
    juddi/branches/juddi-3.2.x/juddi-gui/web/js/businesssearch.js
    juddi/branches/juddi-3.2.x/juddi-gui/web/js/jquery.jeditable.js
    juddi/branches/juddi-3.2.x/juddi-gui/web/js/main.js
    juddi/branches/juddi-3.2.x/juddi-gui/web/js/serviceBrowse.js
    juddi/branches/juddi-3.2.x/juddi-gui/web/js/serviceEditor.js
    juddi/branches/juddi-3.2.x/juddi-gui/web/js/tmodeledit.js
    juddi/branches/juddi-3.2.x/juddi-gui/web/login.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/serviceEditor.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/tmodelEditor.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/viewSubscriptions.jsp

Modified: juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/AES.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/AES.java?rev=1465312&r1=1465311&r2=1465312&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/AES.java (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/AES.java Sat Apr  6 23:08:00 2013
@@ -1,16 +1,27 @@
-package  org.apache.juddi.webconsole;
-
-/**
- *
- * @author Alex O'Ree
+/*
+ * Copyright 2001-2013 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  */
-import javax.crypto.*;
-import javax.crypto.spec.*;
+package  org.apache.juddi.webconsole;
+
 import java.io.*;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
+import javax.crypto.*;
+import javax.crypto.spec.*;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 
@@ -19,7 +30,7 @@ import org.apache.log4j.Logger;
  * reinstantiates a AES key from the key bytes.</summary> The reinstantiated key
  * is used to initialize a AES cipher for encryption and decryption. source :
  * http://java.sun.com/developer/technicalArticles/Security/AES/AES_v1.html
- *
+ *@author Alex O'Ree
  */
 public class AES {
 

Modified: juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/CrossSiteRequestForgeryException.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/CrossSiteRequestForgeryException.java?rev=1465312&r1=1465311&r2=1465312&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/CrossSiteRequestForgeryException.java (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/CrossSiteRequestForgeryException.java Sat Apr  6 23:08:00 2013
@@ -1,11 +1,23 @@
 /*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
+ * Copyright 2001-2013 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
  */
 package org.apache.juddi.webconsole;
 
 /**
- *
+ * Provides a very basic, no stack trace exception, useful for throwing at a browser without revealing any details 
  * @author Alex O'Ree
  */
 public class CrossSiteRequestForgeryException extends Exception {

Modified: juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/PostBackConstants.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/PostBackConstants.java?rev=1465312&r1=1465311&r2=1465312&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/PostBackConstants.java (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/PostBackConstants.java Sat Apr  6 23:08:00 2013
@@ -25,7 +25,7 @@ public static final String HOSTINGREDIRE
     public static final String BINDINGKEY = "bindingKey";
     public static final String BUSINESSKEY = "businessKey";
     public static final String SERVICEKEY = "serviceKey";
-    public static final String CLICK_TO_EDIT = "Click to edit";
+    //public static final String CLICK_TO_EDIT = "Click to edit";
     public static final String DESCRIPTION = "Description";
     public static final String DISCOVERYURL = "disco";
     public static final String PHONE = "Phone";

Modified: juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/PagableContainer.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/PagableContainer.java?rev=1465312&r1=1465311&r2=1465312&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/PagableContainer.java (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/PagableContainer.java Sat Apr  6 23:08:00 2013
@@ -1,6 +1,18 @@
 /*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
+ * Copyright 2001-2013 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
  */
 package org.apache.juddi.webconsole.hub;
 

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=1465312&r1=1465311&r2=1465312&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 Sat Apr  6 23:08:00 2013
@@ -1,6 +1,18 @@
 /*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
+ * Copyright 2001-2013 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
  */
 package org.apache.juddi.webconsole.hub;
 
@@ -419,21 +431,21 @@ public class UddiHub {
         be.setBusinessKey(request.getParameter(PostBackConstants.BUSINESSKEY).trim());
         be.setServiceKey(request.getParameter(PostBackConstants.SERVICEKEY).trim());
 
-        if (be.getServiceKey().equalsIgnoreCase(PostBackConstants.CLICK_TO_EDIT)) {
+        if (be.getServiceKey().equalsIgnoreCase(ResourceLoader.GetResource(session, "items.clicktoedit"))) {
             be.setServiceKey(null);
         }
         if (be.getBusinessKey() == null || be.getBusinessKey().length() == 0) {
             return ResourceLoader.GetResource(session, "errors.noinput.businesskey");
         }
 
-        be.getName().addAll(Builders.BuildNames(Builders.MapFilter(request.getParameterMap(), PostBackConstants.NAME), PostBackConstants.NAME));
+        be.getName().addAll(Builders.BuildNames(Builders.MapFilter(request.getParameterMap(), PostBackConstants.NAME), PostBackConstants.NAME,ResourceLoader.GetResource(session, "items.clicktoedit")));
         BindingTemplates bt = new BindingTemplates();
-        bt.getBindingTemplate().addAll(Builders.BuildBindingTemplates(Builders.MapFilter(request.getParameterMap(), PostBackConstants.BINDINGTEMPLATE), PostBackConstants.BINDINGTEMPLATE));
+        bt.getBindingTemplate().addAll(Builders.BuildBindingTemplates(Builders.MapFilter(request.getParameterMap(), PostBackConstants.BINDINGTEMPLATE), PostBackConstants.BINDINGTEMPLATE,ResourceLoader.GetResource(session, "items.clicktoedit")));
         if (!bt.getBindingTemplate().isEmpty()) {
             be.setBindingTemplates(bt);
         }
 
-        be.getDescription().addAll(Builders.BuildDescription(Builders.MapFilter(request.getParameterMap(), PostBackConstants.DESCRIPTION), PostBackConstants.DESCRIPTION));
+        be.getDescription().addAll(Builders.BuildDescription(Builders.MapFilter(request.getParameterMap(), PostBackConstants.DESCRIPTION), PostBackConstants.DESCRIPTION,ResourceLoader.GetResource(session, "items.clicktoedit")));
 
         CategoryBag cb = new CategoryBag();
         cb.getKeyedReference().addAll(Builders.BuildKeyedReference(Builders.MapFilter(request.getParameterMap(), PostBackConstants.CATBAG_KEY_REF), PostBackConstants.CATBAG_KEY_REF));
@@ -486,19 +498,19 @@ public class UddiHub {
 
         BusinessEntity be = new BusinessEntity();
         be.setBusinessKey(request.getParameter(PostBackConstants.BUSINESSKEY).trim());
-        if (be.getBusinessKey().equalsIgnoreCase(PostBackConstants.CLICK_TO_EDIT)) {
+        if (be.getBusinessKey().equalsIgnoreCase(ResourceLoader.GetResource(session, "items.clicktoedit"))) {
             be.setBusinessKey(null);
         }
-        be.getName().addAll(Builders.BuildNames(Builders.MapFilter(request.getParameterMap(), PostBackConstants.NAME), PostBackConstants.NAME));
+        be.getName().addAll(Builders.BuildNames(Builders.MapFilter(request.getParameterMap(), PostBackConstants.NAME), PostBackConstants.NAME,ResourceLoader.GetResource(session, "items.clicktoedit")));
         if (GetBusinessDetails == null) //this is a new business
         {
         } else {
             be.setBusinessServices(GetBusinessDetails.getBusinessServices());
         }
         //TODO signature
-        be.setContacts(Builders.BuildContacts(request.getParameterMap()));
+        be.setContacts(Builders.BuildContacts(request.getParameterMap(),ResourceLoader.GetResource(session, "items.clicktoedit")));
 
-        be.getDescription().addAll(Builders.BuildDescription(Builders.MapFilter(request.getParameterMap(), PostBackConstants.DESCRIPTION), PostBackConstants.DESCRIPTION));
+        be.getDescription().addAll(Builders.BuildDescription(Builders.MapFilter(request.getParameterMap(), PostBackConstants.DESCRIPTION), PostBackConstants.DESCRIPTION,ResourceLoader.GetResource(session, "items.clicktoedit")));
         be.setDiscoveryURLs(Builders.BuildDisco(Builders.MapFilter(request.getParameterMap(), PostBackConstants.DISCOVERYURL), PostBackConstants.DISCOVERYURL));
         CategoryBag cb = new CategoryBag();
         cb.getKeyedReference().addAll(Builders.BuildKeyedReference(Builders.MapFilter(request.getParameterMap(), PostBackConstants.CATBAG_KEY_REF), PostBackConstants.CATBAG_KEY_REF));
@@ -593,7 +605,7 @@ public class UddiHub {
             fs.setMaxRows(maxrecords);
             fs.setListHead(offset);
             Name n = new Name();
-            if (lang == null || lang.equalsIgnoreCase(PostBackConstants.CLICK_TO_EDIT)) {
+            if (lang == null || lang.equalsIgnoreCase(ResourceLoader.GetResource(session, "items.clicktoedit"))) {
                 n.setLang(null);
             } else {
                 n.setLang(lang);
@@ -725,7 +737,7 @@ public class UddiHub {
             TModel tm = new TModel();
             tm.setName(new Name());
             tm.getName().setValue(name);
-            if (lang == null || lang.equalsIgnoreCase(PostBackConstants.CLICK_TO_EDIT)) {
+            if (lang == null || lang.equalsIgnoreCase(ResourceLoader.GetResource(session, "items.clicktoedit"))) {
                 tm.getName().setLang(null);
             } else {
                 tm.getName().setLang(lang);
@@ -778,7 +790,7 @@ public class UddiHub {
             fm.setMaxRows(maxrecords);
             fm.setListHead(offset);
             fm.setName(new Name());
-            if (lang == null || lang.equalsIgnoreCase(PostBackConstants.CLICK_TO_EDIT)) {
+            if (lang == null || lang.equalsIgnoreCase(ResourceLoader.GetResource(session, "items.clicktoedit"))) {
                 fm.getName().setLang(null);
             } else {
                 fm.getName().setLang(lang);
@@ -1344,24 +1356,24 @@ public class UddiHub {
 
         TModel be = new TModel();
         be.setTModelKey(request.getParameter(PostBackConstants.SERVICEKEY).trim());
-        if (be.getTModelKey() != null && (be.getTModelKey().equalsIgnoreCase(PostBackConstants.CLICK_TO_EDIT))
+        if (be.getTModelKey() != null && (be.getTModelKey().equalsIgnoreCase(ResourceLoader.GetResource(session, "items.clicktoedit")))
                 || be.getTModelKey().length() == 0) {
             be.setTModelKey(null);
         }
         be.setName(new Name());
         String t = request.getParameter(PostBackConstants.NAME + PostBackConstants.VALUE);
-        if (t != null && !t.equalsIgnoreCase(PostBackConstants.CLICK_TO_EDIT) && t.length() > 0) {
+        if (t != null && !t.equalsIgnoreCase(ResourceLoader.GetResource(session, "items.clicktoedit")) && t.length() > 0) {
             be.getName().setValue(t);
         }
         t = request.getParameter(PostBackConstants.NAME + PostBackConstants.LANG);
-        if (t != null && !t.equalsIgnoreCase(PostBackConstants.CLICK_TO_EDIT) && t.length() > 0) {
+        if (t != null && !t.equalsIgnoreCase(ResourceLoader.GetResource(session, "items.clicktoedit")) && t.length() > 0) {
             be.getName().setLang(t);
         }
 
         //TODO signature
 
-        be.getDescription().addAll(Builders.BuildDescription(Builders.MapFilter(request.getParameterMap(), PostBackConstants.DESCRIPTION), PostBackConstants.DESCRIPTION));
-        be.getOverviewDoc().addAll(Builders.BuildOverviewDocs(Builders.MapFilter(request.getParameterMap(), PostBackConstants.OVERVIEW), PostBackConstants.OVERVIEW));
+        be.getDescription().addAll(Builders.BuildDescription(Builders.MapFilter(request.getParameterMap(), PostBackConstants.DESCRIPTION), PostBackConstants.DESCRIPTION,ResourceLoader.GetResource(session, "items.clicktoedit")));
+        be.getOverviewDoc().addAll(Builders.BuildOverviewDocs(Builders.MapFilter(request.getParameterMap(), PostBackConstants.OVERVIEW), PostBackConstants.OVERVIEW,ResourceLoader.GetResource(session, "items.clicktoedit")));
 
 //            be.setDiscoveryURLs(BuildDisco(MapFilter(request.getParameterMap(), PostBackConstants.DISCOVERYURL), PostBackConstants.DISCOVERYURL));
         CategoryBag cb = new CategoryBag();

Modified: juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/builders/Builders.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/builders/Builders.java?rev=1465312&r1=1465311&r2=1465312&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/builders/Builders.java (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/builders/Builders.java Sat Apr  6 23:08:00 2013
@@ -1,6 +1,18 @@
 /*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
+ * Copyright 2001-2013 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
  */
 package org.apache.juddi.webconsole.hub.builders;
 
@@ -54,7 +66,7 @@ public class Builders {
      * @param prefix
      * @return
      */
-    public static List<PersonName> BuildContactPersonNames(Map map, String prefix) {
+    public static List<PersonName> BuildContactPersonNames(Map map, String prefix, String cte) {
         List<PersonName> ret = new ArrayList();
         Iterator it = map.keySet().iterator();
         List<String> processedIndexes = new ArrayList<String>();
@@ -67,7 +79,7 @@ public class Builders {
                 if (!processedIndexes.contains(index)) {
                     PersonName pn = new PersonName();
                     String[] t = (String[]) map.get(prefix + index + PostBackConstants.LANG);
-                    if (t[0] == null || t[0].equalsIgnoreCase(PostBackConstants.CLICK_TO_EDIT)) {
+                    if (t[0] == null || t[0].equalsIgnoreCase(cte)) {
                         pn.setLang(null);
                     } else {
                         pn.setLang(t[0]);
@@ -84,7 +96,7 @@ public class Builders {
         return ret;
     }
 
-    public static List<OverviewDoc> BuildOverviewDocs(Map map, String prefix) {
+    public static List<OverviewDoc> BuildOverviewDocs(Map map, String prefix, String cte) {
         List<OverviewDoc> ret = new ArrayList<OverviewDoc>();
         Iterator it = map.keySet().iterator();
         List<String> processedIndexes = new ArrayList<String>();
@@ -101,7 +113,7 @@ public class Builders {
                     pn.getOverviewURL().setValue(t[0]);
                     t = (String[]) map.get(prefix + index + PostBackConstants.TYPE);
                     pn.getOverviewURL().setUseType(t[0]);
-                    pn.getDescription().addAll(BuildDescription(MapFilter(map, prefix + index + PostBackConstants.DESCRIPTION), prefix + index + PostBackConstants.DESCRIPTION));
+                    pn.getDescription().addAll(BuildDescription(MapFilter(map, prefix + index + PostBackConstants.DESCRIPTION), prefix + index + PostBackConstants.DESCRIPTION, cte));
                     ret.add(pn);
                     processedIndexes.add(index);
                 }
@@ -138,19 +150,19 @@ public class Builders {
         return ret;
     }
 
-    public static Contact BuildSingleContact(Map m, String prefix) {
+    public static Contact BuildSingleContact(Map m, String prefix,String cte) {
         Contact c = new Contact();
         String[] t = (String[]) m.get(prefix + PostBackConstants.TYPE);
         c.setUseType(t[0]);
-        c.getPersonName().addAll(BuildContactPersonNames(MapFilter(m, prefix + PostBackConstants.NAME), prefix + PostBackConstants.NAME));
-        c.getDescription().addAll(BuildDescription(MapFilter(m, prefix + PostBackConstants.DESCRIPTION), prefix + PostBackConstants.DESCRIPTION));
+        c.getPersonName().addAll(BuildContactPersonNames(MapFilter(m, prefix + PostBackConstants.NAME), prefix + PostBackConstants.NAME, cte));
+        c.getDescription().addAll(BuildDescription(MapFilter(m, prefix + PostBackConstants.DESCRIPTION), prefix + PostBackConstants.DESCRIPTION, cte));
         c.getEmail().addAll(BuildEmail(MapFilter(m, prefix + PostBackConstants.EMAIL), prefix + PostBackConstants.EMAIL));
         c.getPhone().addAll(BuildPhone(MapFilter(m, prefix + PostBackConstants.PHONE), prefix + PostBackConstants.PHONE));
-        c.getAddress().addAll(BuildAddress(MapFilter(m, prefix + PostBackConstants.ADDRESS), prefix + PostBackConstants.ADDRESS));
+        c.getAddress().addAll(BuildAddress(MapFilter(m, prefix + PostBackConstants.ADDRESS), prefix + PostBackConstants.ADDRESS,cte));
         return c;
     }
 
-    public static List<Name> BuildNames(Map map, String prefix) {
+    public static List<Name> BuildNames(Map map, String prefix, String cte) {
         List<Name> ret = new ArrayList();
         Iterator it = map.keySet().iterator();
         List<String> processedIndexes = new ArrayList<String>();
@@ -163,7 +175,7 @@ public class Builders {
                 if (!processedIndexes.contains(index)) {
                     Name pn = new Name();
                     String[] t = (String[]) map.get(prefix + index + PostBackConstants.LANG);
-                    if (t[0].equalsIgnoreCase(PostBackConstants.CLICK_TO_EDIT)) {
+                    if (t[0].equalsIgnoreCase(cte)) {
                         pn.setLang(null);
                     } else {
                         pn.setLang(t[0]);
@@ -246,7 +258,7 @@ public class Builders {
         return list;
     }
 
-    public static List<Address> BuildAddress(Map map, String prefix) {
+    public static List<Address> BuildAddress(Map map, String prefix, String cte) {
         List<Address> ret = new ArrayList();
         Iterator it = map.keySet().iterator();
         List<String> processedIndexes = new ArrayList<String>();
@@ -259,25 +271,25 @@ public class Builders {
                 if (!processedIndexes.contains(index)) {
                     Address pn = new Address();
                     String[] t = (String[]) map.get(prefix + index + PostBackConstants.LANG);
-                    if (t[0] == null || t[0].equalsIgnoreCase(PostBackConstants.CLICK_TO_EDIT)) {
+                    if (t[0] == null || t[0].equalsIgnoreCase(cte)) {
                         pn.setLang(null);
                     } else {
                         pn.setLang(t[0]);
                     }
                     t = (String[]) map.get(prefix + index + PostBackConstants.TYPE);
-                    if (t[0] == null || t[0].equalsIgnoreCase(PostBackConstants.CLICK_TO_EDIT)) {
+                    if (t[0] == null || t[0].equalsIgnoreCase(cte)) {
                         pn.setUseType(null);
                     } else {
                         pn.setUseType(t[0]);
                     }
                     t = (String[]) map.get(prefix + index + PostBackConstants.SORTCODE);
-                    if (t[0] == null || t[0].equalsIgnoreCase(PostBackConstants.CLICK_TO_EDIT)) {
+                    if (t[0] == null || t[0].equalsIgnoreCase(cte)) {
                         pn.setSortCode(null);
                     } else {
                         pn.setSortCode(t[0]);
                     }
                     t = (String[]) map.get(prefix + index + PostBackConstants.KEYNAME);
-                    if (t[0] == null || t[0].equalsIgnoreCase(PostBackConstants.CLICK_TO_EDIT)) {
+                    if (t[0] == null || t[0].equalsIgnoreCase(cte)) {
                         pn.setTModelKey(null);
                     } else {
                         pn.setTModelKey(t[0]);
@@ -324,7 +336,7 @@ public class Builders {
      * @param map
      * @return
      */
-    public static Contacts BuildContacts(Map map) {
+    public static Contacts BuildContacts(Map map, String cte) {
         Contacts cb = new Contacts();
         Map contactdata = MapFilter(map, PostBackConstants.CONTACT_PREFIX);
         Iterator it = contactdata.keySet().iterator();
@@ -336,7 +348,7 @@ public class Builders {
             if (match.find()) {
                 String index = key.substring(0, match.start());
                 if (!processedIndexes.contains(index)) {
-                    cb.getContact().add(BuildSingleContact(MapFilter(contactdata, PostBackConstants.CONTACT_PREFIX + index), PostBackConstants.CONTACT_PREFIX + index));
+                    cb.getContact().add(BuildSingleContact(MapFilter(contactdata, PostBackConstants.CONTACT_PREFIX + index), PostBackConstants.CONTACT_PREFIX + index, cte));
                     processedIndexes.add(index);
                 }
             } else {
@@ -375,7 +387,7 @@ public class Builders {
         return list;
     }
 
-    public static List<Description> BuildDescription(Map map, String prefix) {
+    public static List<Description> BuildDescription(Map map, String prefix, String cte) {
         List<Description> ret = new ArrayList();
         Iterator it = map.keySet().iterator();
         List<String> processedIndexes = new ArrayList<String>();
@@ -388,7 +400,7 @@ public class Builders {
                 if (!processedIndexes.contains(index)) {
                     Description pn = new Description();
                     String[] t = (String[]) map.get(prefix + index + PostBackConstants.LANG);
-                    if (t[0] == null || t[0].equalsIgnoreCase(PostBackConstants.CLICK_TO_EDIT)) {
+                    if (t[0] == null || t[0].equalsIgnoreCase(cte)) {
                         pn.setLang(null);
                     } else {
                         pn.setLang(t[0]);
@@ -461,7 +473,7 @@ public class Builders {
         return ret;
     }
 
-    public static List<BindingTemplate> BuildBindingTemplates(Map map, String prefix) {
+    public static List<BindingTemplate> BuildBindingTemplates(Map map, String prefix, String cte) {
         List<BindingTemplate> ret = new ArrayList();
         Iterator it = map.keySet().iterator();
         List<String> processedIndexes = new ArrayList<String>();
@@ -496,7 +508,7 @@ public class Builders {
                     if (ap.getValue() != null) {
                         pn.setAccessPoint(ap);
                     }
-                    pn.getDescription().addAll(BuildDescription(MapFilter(map, prefix + index + PostBackConstants.DESCRIPTION), prefix + index + PostBackConstants.DESCRIPTION));
+                    pn.getDescription().addAll(BuildDescription(MapFilter(map, prefix + index + PostBackConstants.DESCRIPTION), prefix + index + PostBackConstants.DESCRIPTION, cte));
                     CategoryBag cb = new CategoryBag();
                     cb.getKeyedReference().addAll(BuildKeyedReference(MapFilter(map, prefix + index + PostBackConstants.CATBAG_KEY_REF), prefix + index + PostBackConstants.CATBAG_KEY_REF));
                     cb.getKeyedReferenceGroup().addAll(BuildKeyedReferenceGroup(MapFilter(map, prefix + index + PostBackConstants.CATBAG_KEY_REF_GRP), prefix + index + PostBackConstants.CATBAG_KEY_REF_GRP));
@@ -505,7 +517,7 @@ public class Builders {
                     }
 
                     pn.setCategoryBag(cb);
-                    pn.setTModelInstanceDetails(BuildTmodelInstanceDetails(MapFilter(map, prefix + index + PostBackConstants.TMODELINSTANCE), prefix + index + PostBackConstants.TMODELINSTANCE));
+                    pn.setTModelInstanceDetails(BuildTmodelInstanceDetails(MapFilter(map, prefix + index + PostBackConstants.TMODELINSTANCE), prefix + index + PostBackConstants.TMODELINSTANCE, cte));
 
                     ret.add(pn);
                     processedIndexes.add(index);
@@ -517,7 +529,7 @@ public class Builders {
         return ret;
     }
 
-    private static TModelInstanceDetails BuildTmodelInstanceDetails(Map map, String prefix) {
+    private static TModelInstanceDetails BuildTmodelInstanceDetails(Map map, String prefix, String cte) {
         TModelInstanceDetails ret = new TModelInstanceDetails();
 
         Iterator it = map.keySet().iterator();
@@ -533,9 +545,9 @@ public class Builders {
                     String[] t = (String[]) map.get(prefix + index + PostBackConstants.KEYNAME);
                     tmi.setTModelKey(t[0]);
 
-                    tmi.setInstanceDetails(BuildInstanceDetails(MapFilter(map, prefix + index + PostBackConstants.INSTANCE), prefix + index + PostBackConstants.INSTANCE));
+                    tmi.setInstanceDetails(BuildInstanceDetails(MapFilter(map, prefix + index + PostBackConstants.INSTANCE), prefix + index + PostBackConstants.INSTANCE, cte));
 
-                    tmi.getDescription().addAll(BuildDescription(MapFilter(map, prefix + index + PostBackConstants.INSTANCE+PostBackConstants.DESCRIPTION), prefix + index + PostBackConstants.INSTANCE+PostBackConstants.DESCRIPTION));
+                    tmi.getDescription().addAll(BuildDescription(MapFilter(map, prefix + index + PostBackConstants.INSTANCE+PostBackConstants.DESCRIPTION), prefix + index + PostBackConstants.INSTANCE+PostBackConstants.DESCRIPTION, cte));
 
                     ret.getTModelInstanceInfo().add(tmi);
                     processedIndexes.add(index);
@@ -550,7 +562,7 @@ public class Builders {
         return ret;
     }
 
-    private static InstanceDetails BuildInstanceDetails(Map map, String prefix) {
+    private static InstanceDetails BuildInstanceDetails(Map map, String prefix, String cte) {
         InstanceDetails ret = new InstanceDetails();
         Iterator it = map.keySet().iterator();
         List<String> processedIndexes = new ArrayList<String>();
@@ -566,8 +578,8 @@ public class Builders {
                     //pn.setValue(t[0]);
                     ret.setInstanceParms(t[0]);
 
-                    ret.getDescription().addAll(BuildDescription(MapFilter(map, prefix + index + PostBackConstants.INSTANCE + PostBackConstants.DESCRIPTION), prefix + index + PostBackConstants.INSTANCE + PostBackConstants.DESCRIPTION));
-                    ret.getOverviewDoc().addAll(BuildOverviewDocs(MapFilter(map, prefix + index + PostBackConstants.OVERVIEW), prefix + index + PostBackConstants.OVERVIEW));
+                    ret.getDescription().addAll(BuildDescription(MapFilter(map, prefix + index + PostBackConstants.INSTANCE + PostBackConstants.DESCRIPTION), prefix + index + PostBackConstants.INSTANCE + PostBackConstants.DESCRIPTION, cte));
+                    ret.getOverviewDoc().addAll(BuildOverviewDocs(MapFilter(map, prefix + index + PostBackConstants.OVERVIEW), prefix + index + PostBackConstants.OVERVIEW, cte));
                     processedIndexes.add(index);
                 }
             } else {

Modified: juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/builders/Printers.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/builders/Printers.java?rev=1465312&r1=1465311&r2=1465312&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/builders/Printers.java (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/builders/Printers.java Sat Apr  6 23:08:00 2013
@@ -1,6 +1,18 @@
 /*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
+ * Copyright 2001-2013 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
  */
 package org.apache.juddi.webconsole.hub.builders;
 
@@ -9,7 +21,7 @@ import org.apache.commons.lang.StringEsc
 import org.uddi.api_v3.*;
 
 /**
- *
+ * Provides very basic UDDI spec to String formats, mostly used for debugging
  * @author Alex O'Ree
  */
 public class Printers {

Modified: juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web.properties
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web.properties?rev=1465312&r1=1465311&r2=1465312&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web.properties (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web.properties Sat Apr  6 23:08:00 2013
@@ -114,7 +114,7 @@ items.keyrefgroup=Keyed Reference Groups
 items.keyrefgroup.add=Add Key Reference Group
 items.key=Key
 items.identifiers=Identifiers
-items.identifiers.description=optionally, you can attach identifiers that uniquely identify this business from other systems, such as a tax ID or a <a href="http://www.whitehouse.gov/sites/default/files/omb/grants/duns_num_guide.pdf">DUNS Number</a>.
+items.identifiers.description=optionally, you can attach identifiers that uniquely identify this item from other systems, such as a tax ID or a <a href="http://www.whitehouse.gov/sites/default/files/omb/grants/duns_num_guide.pdf">DUNS Number</a>.
 items.signed.not=This item is not digitally signed.
 item.signed=This item is digitally signed. Signature Count: 
 items.signed.viewcert=View Certificate
@@ -181,3 +181,54 @@ errors.generic=Error
 pages.businesseditor.businesslist=Business Services
 pages.businesseditor.businesslist2=are defined for this business.
 items.service=Service
+errors.notsignedin=Either an error occured, or you're not signed in.
+pages.viewsubscriptions.listingheader=UDDI Subscriptions (Subscription API by polling)
+pages.viewsubscriptions.nosubs=No subscriptions are currently defined.
+errors.juddiapi.without.juddi=You're not connected to a jUDDI registry. Contact the administrator or check the configuration file.
+items.services.name.descriptions=Services are identified by one or more name. Multiple names are useful for different languages, legal names, or abbreviations.
+items.services.description=services can have more than one description, such as in a different language.
+items.bindingtemplate.keyrefgrp=Binding Template Keyed Reference Groups
+items.bindingtemplate.keyrefcat=Binding Template Keyed Reference Categories
+items.overviewurl=Overview Documents
+items.overviewurl.description=These are typically URLs to web pages that describe this tModel's details and usage scenarios.
+items.tmodelinstance.description=tModel Instance Description
+items.tmodelinstance.description2=tModel instance infos can have more than one description, such as in a different language.
+items.tmodelinstance.parameters=tModel Instance Parameters
+items.service.key=Service Key
+items.service.key.description=The Business Key is the unique identifier for the business that this service belongs to. If you specify a service key, it must be prefixed with an existing partition (key generator).
+items.bindingtemplate.description=A service in UDDI really defines a specific type of service, not necessarily an implementation of a service. Binding templates define specifically an implementation of a service and normally includes an access point describing how to use the service. Each service may have 0 or more binding templates. Some registries impose limits on the number of binding templates per service.
+items.bindingtemplate.add=Add a Binding Template
+items.bindingtemplate.key=Binding Template Key
+items.bindingtemplate.description.add=Add a Binding Template Description - binding templates can have more than one description, such as in a different language.
+items.accesspoint=Access Point
+items.accesspoint.description=UDDI allows for a choice of either a Hosting Redirector OR an Access Point. Access Point is recommend. The access point is usually a URL for the service endpoint.
+items.accesspoint.type=Access Point Type
+items.accesspoint.value=Access Point Value
+items.hostingredirector=Hosting Redirector
+items.tmodelinstance.info=tModel Instance Information
+items.tmodelinstance.info.desc=a binding template can have additional information attached to it using the tModel Instance.
+items.overviewurl.add=Add an Overview Document
+items.overviewurl.description.add=Add an Overview Document Description
+items.tmodelinstance.add=Add a tModel Instance
+items.tmodelinstance.description.add=Add a tModel Instance Description
+items.tmodel.key=tModel Key
+items.overviewdocument.description=Overview Document Descriptions
+navbar.help=Help
+pages.tmodeleditor.title=tModel Editor
+pages.editor.tabnav.overview=Overview Documents
+pages.editor.tabnav.overview.description=These are typically URLs to web pages that describe this tModel's details and usage scenarios.
+items.tmodel.description=tModels can have more than one description, such as in a different language.
+items.tmodel.key.description=\ The tModel Key is the unique identifier. If you specify a tModel, it must be prefixed with an existing partition (key generator), other one is generated for you.
+items.tmodel.name=Name - The name describes this tModel. It is a required field.
+items.clicktoedit=Click to edit
+pleasewait=Please wait
+items.description.add=Add a Description
+items.name.add=Add a Name
+items.contact.primary=Primary Contact
+#suggestion
+items.phone.types=(Extension, Domestic, International, DSN)
+items.sortcode=Sort Code
+items.contact.type=Contact Type
+items.contact.default=(Job Title, Role)
+items.addresstype.default=(headquarters. sales office, billing)
+items.welcome=Welcome

Modified: juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web_es.properties
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web_es.properties?rev=1465312&r1=1465311&r2=1465312&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web_es.properties (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web_es.properties Sat Apr  6 23:08:00 2013
@@ -97,7 +97,7 @@ items.business.name.description=Las empr
 items.value=Valor
 items.description=Descripci\u00f3n
 items.businesses.description=negocios pueden tener m\u00e1s de una descripci\u00f3n, tal como en un idioma diferente
-items.discoveryurl=Discovery URLs
+items.discoveryurl=Descubrimiento URLs
 items.discoveryurl.description=son t\u00edpicamente un enlace a una p\u00e1gina web simple con informaci\u00f3n adicional sobre \u00e9l, tal como un listado a los servicios. Dos valores reservados se especifican en la especificaci\u00f3n, 'homepage' y "businessEntity '.
 items.type=Tipo
 items.contacts=Contactos
@@ -116,7 +116,7 @@ items.keyrefgroup=Grupos con clave de re
 items.keyrefgroup.add=Agregar grupo de referencia clave
 items.key=Clave
 items.identifiers=Identificadores
-items.identifiers.description=opcionalmente, puede asociar identificadores que identifican de forma \u00fanica este negocio de otros sistemas, como por ejemplo un n\u00famero de identificaci\u00f3n fiscal o un <a href="http://www.whitehouse.gov/sites/default/files/omb/grants/duns_num_guide.pdf">DUNS N\u00famero</a>.
+items.identifiers.description=opcionalmente, puede asociar los identificadores que identifican este tema a partir de otros sistemas, como por ejemplo un n\u00famero de identificaci\u00f3n fiscal o un <a href = http://www.whitehouse.gov/sites/default/files/omb/grants/duns_num_guide.pdf ""> N\u00famero DUNS </ a>.
 items.signed.not=Este art\u00edculo no est\u00e1 firmado digitalmente.
 item.signed=Este art\u00edculo est\u00e1 firmado digitalmente. Firma de visitas:
 items.signed.viewcert=Ver certificado
@@ -182,3 +182,54 @@ errors.generic=Error
 pages.businesseditor.businesslist=Servicios Empresariales
 pages.businesseditor.businesslist2=se definen para este negocio.
 items.service=Servicio
+errors.notsignedin=O ha ocurrido un error, o no te has conectado pulg
+pages.viewsubscriptions.listingheader=UDDI Suscripciones (API Suscripci\u00f3n por sondeo)
+pages.viewsubscriptions.nosubs=No hay suscripciones se definen actualmente.
+errors.juddiapi.without.juddi=Usted no est\u00e1 conectado a un registro jUDDI. P\u00f3ngase en contacto con el administrador o consulte el archivo de configuraci\u00f3n.
+items.services.name.descriptions=Los servicios son identificadas por una o m\u00e1s nombre. Varios nombres son \u00fatiles para diferentes idiomas, nombres legales o abreviaturas.
+items.services.description=servicios puede tener m\u00e1s de una descripci\u00f3n, tal como en un idioma diferente.
+items.bindingtemplate.keyrefgrp=Enlace de grupos de plantillas de referencia con clave
+items.bindingtemplate.keyrefcat=Encuadernaci\u00f3n Categor\u00edas de plantillas de referencia con clave
+items.overviewurl=Documentos Informaci\u00f3n
+items.overviewurl.description=Por lo general son las URL a las p\u00e1ginas web que describen detalles de este tModel y escenarios de uso.
+items.tmodelinstance.description=Descripci\u00f3n tModel Instancia
+items.tmodelinstance.description2=informaciones sobre TModel instancia puede tener m\u00e1s de una descripci\u00f3n, tal como en un idioma diferente.
+items.tmodelinstance.parameters=Par\u00e1metros TModel Instancia
+items.service.key=Servicio Clave
+items.service.key.description=La clave del negocio es el identificador \u00fanico para el negocio que este servicio pertenece. Si se especifica una clave de servicio, debe ser precedido por una partici\u00f3n existente (generador de claves).
+items.bindingtemplate.description=Un servicio en UDDI realmente define un tipo espec\u00edfico de servicio, no necesariamente una implementaci\u00f3n de un servicio. Plantillas de uni\u00f3n definir espec\u00edficamente una implementaci\u00f3n de un servicio y normalmente incluye un punto de acceso que describe c\u00f3mo utilizar el servicio. Cada servicio puede tener 0 o m\u00e1s plantillas de uni\u00f3n. Algunos registros imponer l\u00edmites en el n\u00famero de plantillas de uni\u00f3n por servicio.
+items.bindingtemplate.add=A\u00f1adir un Enlace de plantillas
+items.bindingtemplate.key=Key Enlace de plantillas
+items.bindingtemplate.description.add=A\u00f1adir una descripci\u00f3n de plantillas Binding - Plantillas de uni\u00f3n pueden tener m\u00e1s de una descripci\u00f3n, por ejemplo, en un idioma diferente.
+items.accesspoint=Punto de Acceso
+items.accesspoint.description=UDDI permite una opci\u00f3n de un redireccionamiento de alojamiento o un punto de acceso. Punto de Acceso es recomendable. El punto de acceso es generalmente una URL para el extremo de servicio.
+items.accesspoint.type=Tipo de Punto de Acceso
+items.accesspoint.value=Valor del Punto de Acceso
+items.hostingredirector=Redireccionamiento Hosting
+items.tmodelinstance.info=tModel informaci\u00f3n de instancia
+items.tmodelinstance.info.desc=un modelo de uni\u00f3n puede disponer de informaci\u00f3n adicional que se le atribuye el uso de la Instancia tModel.
+items.overviewurl.add=A\u00f1adir un documento general\n
+items.overviewurl.description.add=A\u00f1adir un Documento Descripci\u00f3n general
+items.tmodelinstance.add=Agregar una instancia de tModel
+items.tmodelinstance.description.add=A\u00f1ada una descripci\u00f3n Instancia tModel
+items.tmodel.key=tModel Clave
+items.overviewdocument.description=Descripci\u00f3n General del Documenton
+navbar.help=Ayudar
+pages.tmodeleditor.title=tModel Editor
+pages.editor.tabnav.overview=Documentos Informaci\u00f3n General
+pages.editor.tabnav.overview.description=ads
+items.tmodel.description=tModels puede tener m\u00e1s de una descripci\u00f3n, tal como en un idioma diferente.
+items.tmodel.key.description=La clave tModel es el identificador \u00fanico. Si se especifica un tModel, debe estar precedido de una partici\u00f3n existente (generador de claves), la otra se genera para usted.
+items.tmodel.name=Nombre - El nombre describe esta estructura tModel. Se trata de un campo obligatorio.
+items.clicktoedit=Haga clic para editar
+pleasewait=Por favor, espere
+items.description.add=Agregar una descripci\u00f3n
+items.name.add=Agregar un Nombre
+items.contact.primary=Contacto Primario
+#suggestion
+items.phone.types=(Extensi\u00f3n, nacionales, internacionales, DSN)
+items.sortcode=C\u00f3digo de Clasificaci\u00f3n
+items.contact.type=Tipo de Contacto
+items.contact.default=(T\u00edtulo del trabajo, Papel)
+items.addresstype.default=(headquarters. oficina de ventas, facturaci\u00f3n)
+items.welcome=Bienvenido

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/businesssearch.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/businesssearch.jsp?rev=1465312&r1=1465311&r2=1465312&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/businesssearch.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/businesssearch.jsp Sat Apr  6 23:08:00 2013
@@ -4,6 +4,7 @@
     Author     : Alex O'Ree
 --%>
 
+<%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
 <%@page import="org.apache.juddi.webconsole.PostBackConstants"%>
 <%@page import="org.apache.juddi.webconsole.hub.PagableContainer"%>
 <%@page import="org.apache.juddi.webconsole.hub.UddiHub"%>
@@ -18,7 +19,7 @@
     if (lang == null || lang.length() == 0) {
         lang = null;
     }
-    if (lang!=null && lang.equalsIgnoreCase(PostBackConstants.CLICK_TO_EDIT)) {
+    if (lang!=null && lang.equalsIgnoreCase(ResourceLoader.GetResource(session, "items.clicktoedit"))) {
         lang = null;
     }
     String keyword = "%";

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/savebusiness.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/savebusiness.jsp?rev=1465312&r1=1465311&r2=1465312&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/savebusiness.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/savebusiness.jsp Sat Apr  6 23:08:00 2013
@@ -19,10 +19,7 @@
         UddiHub hub = UddiHub.getInstance(application, session);
         
         out.write(hub.SaveBusinessDetails(request));
-        /*
- * first loop through to validate the data
- * second loop identify counts of each item, we may have to extend the class structure to make it countable
- */
+     
     }
 
 %>
\ No newline at end of file

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/servicesearch.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/servicesearch.jsp?rev=1465312&r1=1465311&r2=1465312&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/servicesearch.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/servicesearch.jsp Sat Apr  6 23:08:00 2013
@@ -5,6 +5,7 @@
 --%>
 
 
+<%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
 <%@page import="org.apache.juddi.webconsole.PostBackConstants"%>
 <%@page import="org.apache.juddi.webconsole.hub.PagableContainer"%>
 <%@page import="org.apache.juddi.webconsole.hub.UddiHub"%>
@@ -20,7 +21,7 @@
     if (lang == null || lang.length() == 0) {
         lang = null;
     }
-    if (lang != null && lang.equalsIgnoreCase(PostBackConstants.CLICK_TO_EDIT)) {
+    if (lang != null && lang.equalsIgnoreCase(ResourceLoader.GetResource(session, "items.clicktoedit"))) {
         lang = null;
     }
     String keyword = request.getParameter("keyword");

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/tmodelsearch.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/tmodelsearch.jsp?rev=1465312&r1=1465311&r2=1465312&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/tmodelsearch.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/tmodelsearch.jsp Sat Apr  6 23:08:00 2013
@@ -4,6 +4,7 @@
     Author     : Alex O'Ree
 --%>
 
+<%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
 <%@page import="org.apache.juddi.webconsole.PostBackConstants"%>
 <%@page import="org.apache.juddi.webconsole.hub.PagableContainer"%>
 <%@page import="org.apache.juddi.webconsole.hub.UddiHub"%>
@@ -17,7 +18,7 @@
      if (lang == null || lang.length() == 0) {
         lang = null;
     }
-    if (lang!=null && lang.equalsIgnoreCase(PostBackConstants.CLICK_TO_EDIT)) {
+    if (lang!=null && lang.equalsIgnoreCase(ResourceLoader.GetResource(session, "items.clicktoedit"))) {
         lang = null;
     }
 

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=1465312&r1=1465311&r2=1465312&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 Sat Apr  6 23:08:00 2013
@@ -158,7 +158,11 @@
                                     out.write("<div style=\"float:left\">" + ResourceLoader.GetResource(session, "items.value") + ":&nbsp;</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") + "&nbsp;</div>"
-                                            + "<div class=\"edit\" id=\"" + PostBackConstants.NAME + i + PostBackConstants.LANG + "\">" + StringEscapeUtils.escapeHtml(bd.getName().get(i).getLang()) + "</div>");
+                                            + "<div class=\"edit\" id=\"" + PostBackConstants.NAME + i + PostBackConstants.LANG + "\">");
+                                    if (bd.getName().get(i).getLang() != null) {
+                                        out.write(StringEscapeUtils.escapeHtml(bd.getName().get(i).getLang()));
+                                    }
+                                    out.write("</div>");
 
                                     out.write("</div>");
                                 }
@@ -226,7 +230,7 @@
                                         out.write("<div id=\"" + PostBackConstants.CONTACT_PREFIX + i + "\" style=\"border-width:2px; border-style:solid; border-color:red\" >"
                                                 + "<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('" + PostBackConstants.CONTACT_PREFIX + i
                                                 + "');\"><i class=\"icon-remove-sign\"></i></a></div>"
-                                                + "<div style=\"float:left\">Contact Type: &nbsp;</div>"
+                                                + "<div style=\"float:left\">" + ResourceLoader.GetResource(session, "items.contact.type") + ": &nbsp;</div>"
                                                 + "<div class=\"edit\" id=\"" + PostBackConstants.CONTACT_PREFIX + i + PostBackConstants.TYPE + "\">"
                                                 + StringEscapeUtils.escapeHtml(bd.getContacts().getContact().get(i).getUseType())
                                                 + "</div>"
@@ -313,12 +317,12 @@
                                             int contactaddress = k;
                                             out.write("<div id=\"" + PostBackConstants.CONTACT_PREFIX + contactid + PostBackConstants.ADDRESS + contactaddress + "\" style=\"border-width:1px; border-style:solid\" >"
                                                     + "<div style=\"float:left;height:100%\"><a href=\"javascript:Remove('" + PostBackConstants.CONTACT_PREFIX + contactid + PostBackConstants.ADDRESS + contactaddress
-                                                    + "');\"><i class=\"icon-remove-sign\"></i></a>Address</div><br>"
+                                                    + "');\"><i class=\"icon-remove-sign\"></i></a>" + ResourceLoader.GetResource(session, "items.address") + "</div><br>"
                                                     + "<div style=\"float:left\">" + ResourceLoader.GetResource(session, "items.lang") + ": &nbsp;</div>"
                                                     + "<div class=\"edit\" id=\"" + PostBackConstants.CONTACT_PREFIX + contactid + PostBackConstants.ADDRESS + contactaddress + PostBackConstants.LANG + "\">"
                                                     + StringEscapeUtils.escapeHtml(bd.getContacts().getContact().get(i).getAddress().get(k).getLang())
                                                     + "</div>"
-                                                    + "<div style=\"float:left\">Sort Code: &nbsp;</div>"
+                                                    + "<div style=\"float:left\">" + ResourceLoader.GetResource(session, "items.sortcode") + ": &nbsp;</div>"
                                                     + "<div class=\"edit\" id=\"" + PostBackConstants.CONTACT_PREFIX + contactid + PostBackConstants.ADDRESS + contactaddress + "Sortcode\">"
                                                     + StringEscapeUtils.escapeHtml(bd.getContacts().getContact().get(i).getAddress().get(k).getSortCode())
                                                     + "</div>"
@@ -366,7 +370,7 @@
                         <b><%=ResourceLoader.GetResource(session, "pages.editor.tabnav.categories")%> </b>- 
                         <%=ResourceLoader.GetResource(session, "items.categories.description")%>
                         <br><br>
-                        <%=ResourceLoader.GetResource(session, "items.keyrefcats")%>:<Br>
+                        <b><%=ResourceLoader.GetResource(session, "items.keyrefcats")%>:</b><br>
                         <a href="javascript:AddCategoryKeyReference();"><i class="icon-plus-sign"></i></a> <%=ResourceLoader.GetResource(session, "items.keyrefcat.add")%> <Br>
                         <div id="catContainer" style="border-width: 2px; border-style: solid;" >
 
@@ -403,10 +407,12 @@
                                     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('" + PostBackConstants.CATBAG_KEY_REF_GRP + i + "');\"><i class=\"icon-remove-sign\"></i></a></div>"
                                             + "<div style=\"float:left\">" + ResourceLoader.GetResource(session, "items.key") + ":  &nbsp;</div>"
-                                            + "<div class=\"edit\" id=\"" + PostBackConstants.CATBAG_KEY_REF_GRP + i + PostBackConstants.VALUE + "\"></div>"
+                                            + "<div class=\"edit\" id=\"" + PostBackConstants.CATBAG_KEY_REF_GRP + i + PostBackConstants.VALUE + "\">"
+                                            + StringEscapeUtils.escapeHtml(bd.getCategoryBag().getKeyedReferenceGroup().get(i).getTModelKey())
+                                            + "</div>"
                                             + "<div id=\"" + PostBackConstants.CATBAG_KEY_REF_GRP + i + "keyref\" style=\"border-width:1px; border-style:solid\">"
                                             + "<div style=\"float:left;height:100%\"><a href=\"javascript:AddCategoryKeyReferenceGroupKeyRef('" + PostBackConstants.CATBAG_KEY_REF_GRP + i + "keyref');\"><i class=\"icon-plus-sign\"></i></a></div>"
-                                            + "Add Key Reference"
+                                            + ResourceLoader.GetResource(session, "items.keyrefcat.add")
                                             + "</div>");
                                     for (int k = 0; k < bd.getCategoryBag().getKeyedReferenceGroup().get(i).getKeyedReference().size(); k++) {
 
@@ -499,7 +505,7 @@
                         </table>
 
                     </div>
-                    <div class="tab-pane" id="signatures"><b>Digital Signatures</b>
+                    <div class="tab-pane" id="signatures"><b><%=ResourceLoader.GetResource(session, "items.dsigs")%></b>
                         <br>
                         <%
                             if (bd.getSignature().isEmpty()) {

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=1465312&r1=1465311&r2=1465312&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 Sat Apr  6 23:08:00 2013
@@ -10,6 +10,24 @@
 <%@page import="org.apache.log4j.Level"%>
 <%@page contentType="text/html" pageEncoding="UTF-8"%>
 <%
+    //this is to catch someone that bookmarked a page after selecting a language
+    Cookie[] cookies3 = request.getCookies();
+    if (cookies3 != null && cookies3.length > 0) {
+        for (int i = 0; i < cookies3.length; i++) {
+            if (cookies3[i] != null && cookies3[i].getName() != null && cookies3[i].getName().equalsIgnoreCase("locale")) {
+                if (cookies3[i].getValue() != null) {
+                    session.setAttribute("locale", cookies3[i].getValue());
+                }
+            }
+        }
+    }
+    if (session.getAttribute("locale")==null){
+        //last change, default to english
+        session.setAttribute("locale", "en");
+    }
+%>
+<%
+
     String current = null;
 
     if (request.getMethod().equalsIgnoreCase("post")) {

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/header-top.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/header-top.jsp?rev=1465312&r1=1465311&r2=1465312&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/header-top.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/header-top.jsp Sat Apr  6 23:08:00 2013
@@ -1,4 +1,20 @@
 <%-- 
+/*
+ * Copyright 2001-2013 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
     Document   : header-top
     Created on : Feb 24, 2013, 9:08:12 AM
     Author     : Alex O'Ree
@@ -8,12 +24,29 @@
 <%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
 <%@page contentType="text/html" pageEncoding="UTF-8"%>
 <!DOCTYPE html>
-<html lang="<%=(String)session.getAttribute("locale")%>" dir="<%=ResourceLoader.GetResource(session,"direction")%>">
+<%
+    //this is to catch someone that bookmarked a page after selecting a language
+    Cookie[] cookies2 = request.getCookies();
+    if (cookies2 != null && cookies2.length > 0) {
+        for (int i = 0; i < cookies2.length; i++) {
+            if (cookies2[i] != null && cookies2[i].getName() != null && cookies2[i].getName().equalsIgnoreCase("locale")) {
+                if (cookies2[i].getValue() != null) {
+                    session.setAttribute("locale", cookies2[i].getValue());
+                }
+            }
+        }
+    }
+    if (session.getAttribute("locale")==null){
+        //last change, default to english
+        session.setAttribute("locale", "en");
+    }
+    %>
+<html lang="<%=(String) session.getAttribute("locale")%>" dir="<%=ResourceLoader.GetResource(session, "direction")%>">
     <head>
         <meta charset="utf-8">
-        <title><%=ResourceLoader.GetResource(session,"title")%></title>
+        <title><%=ResourceLoader.GetResource(session, "title")%></title>
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        <meta name="description" content="<%=ResourceLoader.GetResource(session,"description")%>">
+        <meta name="description" content="<%=ResourceLoader.GetResource(session, "description")%>">
         <meta name="author" content="Apache Software Foundation">
 
         <!-- Le styles -->
@@ -36,7 +69,8 @@
 
         <link rel="shortcut icon" href="ico/favicon.png">
         <script src="js/jquery-1.9.1.js"></script>
-        <script src="js/bootstrap.js"></script>
+        <script src="js/i18n.js.jsp"></script>
+        <script src="js/bootstrap.min.js"></script>
         <script src="js/jquery.jeditable.js"></script>
         <script src="js/main.js"></script>
     </head>
@@ -62,53 +96,53 @@
                         <a class="brand" href="index.jsp" style="padding-left:19px; padding-top:0px; padding-bottom:0px"><img src="img/logo2.png"></a>
                         <div class="nav-collapse collapse">
                             <ul class="nav">
-                                <li ><a href="index.jsp"><%=ResourceLoader.GetResource(session,"navbar.home")%></a></li>
-                                <li class="dropdown" ><a href="#" data-toggle="dropdown" class="dropdowb-town"><%=ResourceLoader.GetResource(session,"navbar.discover")%><b class="caret"></b></a>
+                                <li ><a href="index.jsp"><%=ResourceLoader.GetResource(session, "navbar.home")%></a></li>
+                                <li class="dropdown" ><a href="#" data-toggle="dropdown" class="dropdowb-town"><%=ResourceLoader.GetResource(session, "navbar.discover")%><b class="caret"></b></a>
                                     <ul class="dropdown-menu">
-                                        <li><a href="businessBrowse.jsp" title="<%=ResourceLoader.GetResource(session,"navbar.businesses.tooltip")%>"><%=ResourceLoader.GetResource(session,"navbar.businesses")%></a></li>
-                                        <li><a href="serviceBrowse.jsp" title="<%=ResourceLoader.GetResource(session,"navbar.services.tooltip")%>"><%=ResourceLoader.GetResource(session,"navbar.services")%></a></li>
-                                        <li><a href="tmodelBrowse.jsp" title="<%=ResourceLoader.GetResource(session,"navbar.tmodels.tooltip")%>"><%=ResourceLoader.GetResource(session,"navbar.tmodels")%></a></li>
-                                        <li><a href="publisherBrowse.jsp" title="<%=ResourceLoader.GetResource(session,"navbar.publishers.tooltip")%>"><%=ResourceLoader.GetResource(session,"navbar.publishers")%></a></li>
+                                        <li><a href="businessBrowse.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.businesses.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.businesses")%></a></li>
+                                        <li><a href="serviceBrowse.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.services.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.services")%></a></li>
+                                        <li><a href="tmodelBrowse.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.tmodels.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.tmodels")%></a></li>
+                                        <li><a href="publisherBrowse.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.publishers.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.publishers")%></a></li>
                                         <li class="divider"></li>
-                                        <li><a href="search.jsp" title="<%=ResourceLoader.GetResource(session,"navbar.search.tooltip")%>"><%=ResourceLoader.GetResource(session,"navbar.search")%></a></li>
+                                        <li><a href="search.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.search.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.search")%></a></li>
                                     </ul>
                                 </li>
-                                <li class="dropdown"><a href="#" data-toggle="dropdown" class="dropdowb-town"><%=ResourceLoader.GetResource(session,"navbar.create")%><b class="caret"></b></a>
+                                <li class="dropdown"><a href="#" data-toggle="dropdown" class="dropdowb-town"><%=ResourceLoader.GetResource(session, "navbar.create")%><b class="caret"></b></a>
                                     <ul class="dropdown-menu">
-                                        <li><a href="businessEditor2.jsp" title="<%=ResourceLoader.GetResource(session,"navbar.create.business.tooltip")%>"><%=ResourceLoader.GetResource(session,"navbar.create.business")%></a></li>
-                                        <li><a href="businessBrowse.jsp" title="<%=ResourceLoader.GetResource(session,"navbar.create.service.tooltip")%>"><%=ResourceLoader.GetResource(session,"navbar.create.service")%></a></li>
-                                        <li><a href="tmodelEditor.jsp" title="<%=ResourceLoader.GetResource(session,"navbar.create.tmodel.tooltip")%>"><%=ResourceLoader.GetResource(session,"navbar.create.tmodel")%></a></li>
-                                        <li><a href="tmodelPartitions.jsp" title="<%=ResourceLoader.GetResource(session,"navbar.create.tmodelkeygen.tooltip")%>"><%=ResourceLoader.GetResource(session,"navbar.create.tmodelkeygen")%></a></li>
+                                        <li><a href="businessEditor2.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.create.business.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.create.business")%></a></li>
+                                        <li><a href="businessBrowse.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.create.service.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.create.service")%></a></li>
+                                        <li><a href="tmodelEditor.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.create.tmodel.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.create.tmodel")%></a></li>
+                                        <li><a href="tmodelPartitions.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.create.tmodelkeygen.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.create.tmodelkeygen")%></a></li>
                                         <%
                                             if (hub.IsJuddiRegistry()) {
                                         %>
-                                        <li><a href="tmodelBrowse.jsp" title="<%=ResourceLoader.GetResource(session,"navbar.create.publisher.tooltip")%>"><%=ResourceLoader.GetResource(session,"navbar.create.publisher")%></a></li>
+                                        <li><a href="tmodelBrowse.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.create.publisher.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.create.publisher")%></a></li>
                                         <%                                            }
                                         %>
                                     </ul>
                                 </li>
-                                <li class="dropdown"><a href="#" data-toggle="dropdown" class="dropdowb-town"><%=ResourceLoader.GetResource(session,"navbar.subscriptions")%><b class="caret"></b></a>
+                                <li class="dropdown"><a href="#" data-toggle="dropdown" class="dropdowb-town"><%=ResourceLoader.GetResource(session, "navbar.subscriptions")%><b class="caret"></b></a>
                                     <ul class="dropdown-menu">
-                                        <li><a href="viewSubscriptions.jsp" title="<%=ResourceLoader.GetResource(session,"navbar.subscriptions.view.tooltip")%>"><%=ResourceLoader.GetResource(session,"navbar.subscriptions.view")%></a></li>
-                                        <li><a href="serviceBrowse.jsp" title="<%=ResourceLoader.GetResource(session,"navbar.subscriptions.create.tooltip")%>"><%=ResourceLoader.GetResource(session,"navbar.subscriptions.create")%></a></li>
+                                        <li><a href="viewSubscriptions.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.subscriptions.view.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.subscriptions.view")%></a></li>
+                                        <li><a href="serviceBrowse.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.subscriptions.create.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.subscriptions.create")%></a></li>
                                     </ul>
                                 </li>
 
-                                <li class="dropdown"><a href="#" data-toggle="dropdown" class="dropdowb-town"><%=ResourceLoader.GetResource(session,"navbar.settings")%><b class="caret"></b></a>
+                                <li class="dropdown"><a href="#" data-toggle="dropdown" class="dropdowb-town"><%=ResourceLoader.GetResource(session, "navbar.settings")%><b class="caret"></b></a>
                                     <ul class="dropdown-menu">
-                                        <li><a href="settings.jsp" title="<%=ResourceLoader.GetResource(session,"navbar.settings.config.tooltip")%>"><%=ResourceLoader.GetResource(session,"navbar.settings.config")%></a></li>
+                                        <li><a href="settings.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.settings.config.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.settings.config")%></a></li>
                                     </ul>
                                 </li>
 
-                                <li class="dropdown"><a href="#" data-toggle="dropdown" class="dropdowb-town">Help<b class="caret"></b></a>
+                                <li class="dropdown"><a href="#" data-toggle="dropdown" class="dropdowb-town"><%=ResourceLoader.GetResource(session, "navbar.help")%> <b class="caret"></b></a>
                                     <ul class="dropdown-menu">
-                                        <li><a href="http://juddi.apache.org/docs/3.x/userguide/html/index.html" title="<%=ResourceLoader.GetResource(session,"navbar.help.userguide")%>"><%=ResourceLoader.GetResource(session,"navbar.help.userguide")%></a></li>
-                                        <li><a href="http://juddi.apache.org/docs/3.x/devguide/html/index.html" title="<%=ResourceLoader.GetResource(session,"navbar.help.devguide")%>"><%=ResourceLoader.GetResource(session,"navbar.help.devguide")%></a></li>
-                                        <li><a href="http://juddi.apache.org/docs.html" title="<%=ResourceLoader.GetResource(session,"navbar.help.api")%>"><%=ResourceLoader.GetResource(session,"navbar.help.api")%></a></li>
-                                        <li><a href="http://wiki.apache.org/juddi" title="<%=ResourceLoader.GetResource(session,"navbar.help.wiki")%>"><%=ResourceLoader.GetResource(session,"navbar.help.wiki")%></a></li>
-                                        <li><a href="http://juddi.apache.org/issue-tracking.html" title="<%=ResourceLoader.GetResource(session,"navbar.help.bugreport")%>"><%=ResourceLoader.GetResource(session,"navbar.help.bugreport")%></a></li>
-                                        <li><a href="http://juddi.apache.org/" title="<%=ResourceLoader.GetResource(session,"navbar.help.website")%>"><%=ResourceLoader.GetResource(session,"navbar.help.website")%></a></li>
-                                        <li><a href="http://www.nabble.com/jUDDI-f218.html" title="<%=ResourceLoader.GetResource(session,"navbar.help.mailinglist")%>"><%=ResourceLoader.GetResource(session,"navbar.help.mailinglist")%></a></li>
+                                        <li><a href="http://juddi.apache.org/docs/3.x/userguide/html/index.html" title="<%=ResourceLoader.GetResource(session, "navbar.help.userguide")%>"><%=ResourceLoader.GetResource(session, "navbar.help.userguide")%></a></li>
+                                        <li><a href="http://juddi.apache.org/docs/3.x/devguide/html/index.html" title="<%=ResourceLoader.GetResource(session, "navbar.help.devguide")%>"><%=ResourceLoader.GetResource(session, "navbar.help.devguide")%></a></li>
+                                        <li><a href="http://juddi.apache.org/docs.html" title="<%=ResourceLoader.GetResource(session, "navbar.help.api")%>"><%=ResourceLoader.GetResource(session, "navbar.help.api")%></a></li>
+                                        <li><a href="http://wiki.apache.org/juddi" title="<%=ResourceLoader.GetResource(session, "navbar.help.wiki")%>"><%=ResourceLoader.GetResource(session, "navbar.help.wiki")%></a></li>
+                                        <li><a href="http://juddi.apache.org/issue-tracking.html" title="<%=ResourceLoader.GetResource(session, "navbar.help.bugreport")%>"><%=ResourceLoader.GetResource(session, "navbar.help.bugreport")%></a></li>
+                                        <li><a href="http://juddi.apache.org/" title="<%=ResourceLoader.GetResource(session, "navbar.help.website")%>"><%=ResourceLoader.GetResource(session, "navbar.help.website")%></a></li>
+                                        <li><a href="http://www.nabble.com/jUDDI-f218.html" title="<%=ResourceLoader.GetResource(session, "navbar.help.mailinglist")%>"><%=ResourceLoader.GetResource(session, "navbar.help.mailinglist")%></a></li>
 
                                     </ul>
                                 </li>

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/index.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/index.jsp?rev=1465312&r1=1465311&r2=1465312&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/index.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/index.jsp Sat Apr  6 23:08:00 2013
@@ -1,7 +1,24 @@
 <%-- 
+/*
+ * Copyright 2001-2013 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
     Document   : index
     Created on : Mar 30, 2013, 10:05:37 PM
     Author     : Alex O'Ree
+
 --%>
 
 <%@page contentType="text/html" pageEncoding="UTF-8"%>



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org


Mime
View raw message