juddi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexo...@apache.org
Subject svn commit: r1463077 [1/3] - in /juddi/branches/juddi-3.2.x/juddi-gui: license/ nbproject/ 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/webc...
Date Mon, 01 Apr 2013 02:08:20 GMT
Author: alexoree
Date: Mon Apr  1 02:08:19 2013
New Revision: 1463077

URL: http://svn.apache.org/r1463077
Log:
Juddi Gui updates, added partial support for internationalization with languages for english and spanish. Not all pages are tokenized yet. refactoring and a few new features

Added:
    juddi/branches/juddi-3.2.x/juddi-gui/license/BlueMarble.txt
    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/resources/
    juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/ResourceLoader.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/home.jsp
      - copied, changed from r1462731, juddi/branches/juddi-3.2.x/juddi-gui/web/index.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/img/bluemarble2.jpg   (with props)
Removed:
    juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/SaveBusinessPostbackHelper.java
    juddi/branches/juddi-3.2.x/juddi-gui/web/help/
    juddi/branches/juddi-3.2.x/juddi-gui/web/nodeinfo.jsp
Modified:
    juddi/branches/juddi-3.2.x/juddi-gui/nbproject/   (props changed)
    juddi/branches/juddi-3.2.x/juddi-gui/nbproject/build-impl.xml
    juddi/branches/juddi-3.2.x/juddi-gui/nbproject/genfiles.properties
    juddi/branches/juddi-3.2.x/juddi-gui/nbproject/project.properties
    juddi/branches/juddi-3.2.x/juddi-gui/nbproject/project.xml
    juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/StartupServlet.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/Printers.java
    juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/saveFromXML.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/savetmodel.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/search.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/tmodel.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/businessBrowse.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-bottom.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/main.js
    juddi/branches/juddi-3.2.x/juddi-gui/web/login.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/publisherBrowse.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/search.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/serviceBrowse.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/serviceEditor.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/settings.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/signer.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/tmodelBrowse.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/tmodelEditor.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/tmodelPartitions.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/viewSubscriptions.jsp

Added: juddi/branches/juddi-3.2.x/juddi-gui/license/BlueMarble.txt
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/license/BlueMarble.txt?rev=1463077&view=auto
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/license/BlueMarble.txt (added)
+++ juddi/branches/juddi-3.2.x/juddi-gui/license/BlueMarble.txt Mon Apr  1 02:08:19 2013
@@ -0,0 +1,4 @@
+The photo used for the language selection art was sourced from http://www.flickr.com/photos/acbo/2073367106/sizes/z/in/photostream/ 
+and is protected under the creative commons license agreement and was originated by the user 'acbo'.
+
+The details of the license agreement is located here: http://creativecommons.org/licenses/by-nc-nd/2.0/legalcode
\ No newline at end of file

Propchange: juddi/branches/juddi-3.2.x/juddi-gui/nbproject/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Apr  1 02:08:19 2013
@@ -0,0 +1 @@
+private

Modified: juddi/branches/juddi-3.2.x/juddi-gui/nbproject/build-impl.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/nbproject/build-impl.xml?rev=1463077&r1=1463076&r2=1463077&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/nbproject/build-impl.xml (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/nbproject/build-impl.xml Mon Apr  1 02:08:19 2013
@@ -1005,7 +1005,6 @@ exists or setup the property manually. F
         <copyfiles files="${file.reference.geronimo-jta_1.1_spec-1.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jaxb-impl-2.1.13.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.juddi-client-3.1.5-SNAPSHOT.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${file.reference.juddi-core-openjpa-3.1.5-SNAPSHOT.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.junit-3.8.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.neethi-2.0.4.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.openjpa-1.2.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
@@ -1023,7 +1022,6 @@ exists or setup the property manually. F
         <copyfiles files="${file.reference.woodstox-core-asl-4.0.8.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.wsdl4j-1.6.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.xml-resolver-1.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${file.reference.juddi-client-3.1.5-SNAPSHOT.jar-1}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <mkdir dir="${build.web.dir}/META-INF"/>
         <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
     </target>
@@ -1059,7 +1057,6 @@ exists or setup the property manually. F
         <copyfiles files="${file.reference.geronimo-jta_1.1_spec-1.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jaxb-impl-2.1.13.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.juddi-client-3.1.5-SNAPSHOT.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${file.reference.juddi-core-openjpa-3.1.5-SNAPSHOT.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.junit-3.8.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.neethi-2.0.4.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.openjpa-1.2.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
@@ -1077,7 +1074,6 @@ exists or setup the property manually. F
         <copyfiles files="${file.reference.woodstox-core-asl-4.0.8.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.wsdl4j-1.6.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.xml-resolver-1.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${file.reference.juddi-client-3.1.5-SNAPSHOT.jar-1}" todir="${build.web.dir}/WEB-INF/lib"/>
     </target>
     <target depends="init" if="dist.ear.dir" name="-clean-webinf-lib">
         <delete dir="${build.web.dir}/WEB-INF/lib"/>

Modified: juddi/branches/juddi-3.2.x/juddi-gui/nbproject/genfiles.properties
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/nbproject/genfiles.properties?rev=1463077&r1=1463076&r2=1463077&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/nbproject/genfiles.properties (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/nbproject/genfiles.properties Mon Apr  1 02:08:19 2013
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=252e20a1
+build.xml.data.CRC32=e1d5b306
 build.xml.script.CRC32=f15a2af6
 build.xml.stylesheet.CRC32=651128d4@1.38.1.1
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=252e20a1
-nbproject/build-impl.xml.script.CRC32=b20787db
+nbproject/build-impl.xml.data.CRC32=e1d5b306
+nbproject/build-impl.xml.script.CRC32=4fb29066
 nbproject/build-impl.xml.stylesheet.CRC32=4e9cae83@1.38.1.1

Modified: juddi/branches/juddi-3.2.x/juddi-gui/nbproject/project.properties
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/nbproject/project.properties?rev=1463077&r1=1463076&r2=1463077&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/nbproject/project.properties (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/nbproject/project.properties Mon Apr  1 02:08:19 2013
@@ -3,6 +3,7 @@ annotation.processing.enabled.in.editor=
 annotation.processing.processors.list=
 annotation.processing.run.all.processors=true
 annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
+auxiliary.org-netbeans-modules-projectapi.jsf_2e_language=JSP
 build.classes.dir=${build.web.dir}/WEB-INF/classes
 build.classes.excludes=**/*.java,**/*.form
 build.dir=build
@@ -13,7 +14,7 @@ build.test.results.dir=${build.dir}/test
 build.web.dir=${build.dir}/web
 build.web.excludes=${build.classes.excludes}
 client.urlPart=
-compile.jsps=true
+compile.jsps=false
 conf.dir=${source.root}/conf
 debug.classpath=${build.classes.dir}:${javac.classpath}
 debug.test.classpath=\
@@ -54,8 +55,6 @@ file.reference.geronimo-jpa_3.0_spec-1.0
 file.reference.geronimo-jta_1.1_spec-1.1.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\geronimo-jta_1.1_spec-1.1.jar
 file.reference.jaxb-impl-2.1.13.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\jaxb-impl-2.1.13.jar
 file.reference.juddi-client-3.1.5-SNAPSHOT.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\juddi-client-3.1.5-SNAPSHOT.jar
-file.reference.juddi-client-3.1.5-SNAPSHOT.jar-1=..\\juddi-client\\target\\juddi-client-3.1.5-SNAPSHOT.jar
-file.reference.juddi-core-openjpa-3.1.5-SNAPSHOT.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\juddi-core-openjpa-3.1.5-SNAPSHOT.jar
 file.reference.junit-3.8.2.jar=junit-3.8.2.jar
 file.reference.neethi-2.0.4.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\neethi-2.0.4.jar
 file.reference.openjpa-1.2.2.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\openjpa-1.2.2.jar
@@ -114,7 +113,6 @@ javac.classpath=\
     ${file.reference.geronimo-jta_1.1_spec-1.1.jar}:\
     ${file.reference.jaxb-impl-2.1.13.jar}:\
     ${file.reference.juddi-client-3.1.5-SNAPSHOT.jar}:\
-    ${file.reference.juddi-core-openjpa-3.1.5-SNAPSHOT.jar}:\
     ${file.reference.junit-3.8.2.jar}:\
     ${file.reference.neethi-2.0.4.jar}:\
     ${file.reference.openjpa-1.2.2.jar}:\
@@ -131,8 +129,7 @@ javac.classpath=\
     ${file.reference.uddi-ws-3.1.5-SNAPSHOT.jar}:\
     ${file.reference.woodstox-core-asl-4.0.8.jar}:\
     ${file.reference.wsdl4j-1.6.2.jar}:\
-    ${file.reference.xml-resolver-1.2.jar}:\
-    ${file.reference.juddi-client-3.1.5-SNAPSHOT.jar-1}
+    ${file.reference.xml-resolver-1.2.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.debug=true

Modified: juddi/branches/juddi-3.2.x/juddi-gui/nbproject/project.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/nbproject/project.xml?rev=1463077&r1=1463076&r2=1463077&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/nbproject/project.xml (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/nbproject/project.xml Mon Apr  1 02:08:19 2013
@@ -131,10 +131,6 @@
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.juddi-core-openjpa-3.1.5-SNAPSHOT.jar}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
-                </library>
-                <library dirs="200">
                     <file>${file.reference.junit-3.8.2.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
@@ -202,10 +198,6 @@
                     <file>${file.reference.xml-resolver-1.2.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
-                <library dirs="200">
-                    <file>${file.reference.juddi-client-3.1.5-SNAPSHOT.jar-1}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
-                </library>
             </web-module-libraries>
             <web-module-additional-libraries/>
             <source-roots>

Added: 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=1463077&view=auto
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/CrossSiteRequestForgeryException.java (added)
+++ juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/CrossSiteRequestForgeryException.java Mon Apr  1 02:08:19 2013
@@ -0,0 +1,47 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.apache.juddi.webconsole;
+
+/**
+ *
+ * @author Alex O'Ree
+ */
+public class CrossSiteRequestForgeryException extends Exception {
+    //Parameterless Constructor
+
+    public CrossSiteRequestForgeryException() {
+        super(msg, null);
+    }
+
+    //Constructor that accepts a message
+    public CrossSiteRequestForgeryException(String message) {
+        super(msg, null);
+    }
+
+    public CrossSiteRequestForgeryException(String message, Throwable cause) {
+        super(msg, null);
+    }
+    private static final String msg = "Cross Site Request Forgery";
+
+    @Override
+    public String toString() {
+        return msg;
+    }
+
+    @Override
+    public String getMessage() {
+        return msg;
+    }
+
+    @Override
+    public String getLocalizedMessage() {
+        return msg;
+    }
+
+    @Override
+    public Throwable getCause() {
+        return null;
+    }
+}

Modified: juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/StartupServlet.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/StartupServlet.java?rev=1463077&r1=1463076&r2=1463077&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/StartupServlet.java (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/StartupServlet.java Mon Apr  1 02:08:19 2013
@@ -6,7 +6,6 @@ package org.apache.juddi.webconsole;
 
 import java.io.FileOutputStream;
 import java.io.InputStream;
-import java.net.URL;
 import java.util.Properties;
 import javax.servlet.ServletContextEvent;
 

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=1463077&r1=1463076&r2=1463077&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 Mon Apr  1 02:08:19 2013
@@ -14,20 +14,18 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
-import java.util.logging.Logger;
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 import javax.xml.bind.JAXBElement;
 import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Holder;
 import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.juddi.ClassUtil;
 import org.apache.juddi.api_v3.GetAllPublisherDetail;
 import org.apache.juddi.api_v3.Publisher;
 import org.apache.juddi.api_v3.PublisherDetail;
 import org.apache.juddi.api_v3.SavePublisher;
-import org.apache.juddi.query.util.FindQualifiers;
+import org.apache.juddi.v3.client.ClassUtil;
+import org.apache.juddi.v3.client.UDDIConstants;
 import org.apache.juddi.v3.client.config.UDDIClientContainer;
 import org.apache.juddi.v3.client.transport.Transport;
 import org.apache.juddi.v3_service.JUDDIApiPortType;
@@ -35,9 +33,9 @@ import org.apache.juddi.webconsole.AES;
 import org.apache.juddi.webconsole.PostBackConstants;
 import org.apache.juddi.webconsole.hub.builders.Builders;
 import org.apache.juddi.webconsole.hub.builders.Printers;
+import org.apache.juddi.webconsole.resources.ResourceLoader;
 import org.apache.log4j.Level;
 import org.uddi.api_v3.*;
-import org.uddi.custody_v3.TransferEntities;
 import org.uddi.sub_v3.Subscription;
 import org.uddi.v3_service.DispositionReportFaultMessage;
 import org.uddi.v3_service.UDDICustodyTransferPortType;
@@ -82,12 +80,8 @@ public class UddiHub {
         da.setAuthInfo(token);
         try {
             security.discardAuthToken(da);
-        } catch (DispositionReportFaultMessage ex) {
-            log.log(Level.ERROR, null, ex);
-        } catch (RemoteException ex) {
-            log.log(Level.ERROR, null, ex);
         } catch (Exception ex) {
-            log.log(Level.ERROR, null, ex);
+            HandleException(ex);
         }
 
         token = null;
@@ -106,8 +100,10 @@ public class UddiHub {
             _session.setAttribute("hub", hub);
             return hub;
         }
+
         return (UddiHub) j;
     }
+    String locale = "en";
 
     private UddiHub(ServletContext application, HttpSession _session) throws Exception {
         URL prop = application.getResource("/META-INF/config.properties");
@@ -164,8 +160,8 @@ public class UddiHub {
                 context = bp.getRequestContext();
                 context.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, properties.getProperty("juddipapi"));
             }
-        } catch (Exception e) {
-            e.printStackTrace();
+        } catch (Exception ex) {
+            HandleException(ex);
         }
     }
     private HttpSession session;
@@ -200,6 +196,12 @@ public class UddiHub {
             context.put(BindingProvider.USERNAME_PROPERTY, session.getAttribute("username"));
             context.put(BindingProvider.USERNAME_PROPERTY, session.getAttribute(AES.Decrypt("password", (String) properties.get("key"))));
 
+            bp = (BindingProvider) subscription;
+            context = bp.getRequestContext();
+            context.put(BindingProvider.USERNAME_PROPERTY, session.getAttribute("username"));
+            context.put(BindingProvider.USERNAME_PROPERTY, session.getAttribute(AES.Decrypt("password", (String) properties.get("key"))));
+
+            
             bp = (BindingProvider) juddi;
             context = bp.getRequestContext();
             context.put(BindingProvider.USERNAME_PROPERTY, session.getAttribute("username"));
@@ -217,12 +219,8 @@ public class UddiHub {
                 try {
                     AuthToken authToken = security.getAuthToken(req);
                     token = authToken.getAuthInfo();
-                } catch (DispositionReportFaultMessage ex) {
-                    log.log(Level.ERROR, null, ex);
-                } catch (RemoteException ex) {
-                    log.log(Level.ERROR, null, ex);
                 } catch (Exception ex) {
-                    log.log(Level.ERROR, null, ex);
+                    return HandleException(ex);
                 }
             }
         }
@@ -253,7 +251,7 @@ public class UddiHub {
             fb.setListHead(offset);
             fb.setAuthInfo(GetToken());
             org.uddi.api_v3.FindQualifiers fq = new org.uddi.api_v3.FindQualifiers();
-            fq.getFindQualifier().add(FindQualifiers.APPROXIMATE_MATCH);
+            fq.getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH);
 
             fb.setFindQualifiers(fq);
             Name searchname = new Name();
@@ -262,12 +260,12 @@ public class UddiHub {
             fb.getName().add(searchname);
             BusinessList findBusiness = inquiry.findBusiness(fb);
             if (findBusiness == null || findBusiness.getBusinessInfos() == null) {
-                sb.append("No data returned");
+                sb.append(ResourceLoader.GetResource(session, "errors.nodatareturned"));
             } else {
                 ret.displaycount = findBusiness.getListDescription().getIncludeCount();
                 ret.offset = findBusiness.getListDescription().getListHead();
                 ret.totalrecords = findBusiness.getListDescription().getActualCount();
-                sb.append("<table class=\"table\"<tr><th>Name</th><th>Details</th><th>Services</th></tr>");
+                sb.append("<table class=\"table\"<tr><th>" + ResourceLoader.GetResource(session, "items.name") + "</th><th>Details</th><th>Services</th></tr>");
                 for (int i = 0; i < findBusiness.getBusinessInfos().getBusinessInfo().size(); i++) {
                     sb.append("<tr><td><span title=\"").append(StringEscapeUtils.escapeHtml(findBusiness.getBusinessInfos().getBusinessInfo().get(i).getBusinessKey())).
                             append("\">").append(StringEscapeUtils.escapeHtml(Printers.ListNamesToString(findBusiness.getBusinessInfos().getBusinessInfo().get(i).getName()))).
@@ -293,7 +291,7 @@ public class UddiHub {
             }
 
         } catch (Exception ex) {
-            sb.append("error caught! : ").append(ex.getMessage());
+            sb.append(HandleException(ex));
         }
         ret.renderedHtml = sb.toString();
         return ret;
@@ -311,20 +309,20 @@ public class UddiHub {
             ServiceDetail get = inquiry.getServiceDetail(gbd);
             for (int i = 0; i < get.getBusinessService().size(); i++) {
                 session.setAttribute(get.getBusinessService().get(i).getServiceKey(), get.getBusinessService().get(i));
-                sb.append("<b>Name:</b><div class=\"editable\" id=\"ServiceName\">").append(StringEscapeUtils.escapeHtml(Printers.ListNamesToString(get.getBusinessService().get(i).getName()))).append("</div><Br>");
-                sb.append("<b>Desc:</b><div class=\"editable\" id=\"ServiceDescription\">").append(StringEscapeUtils.escapeHtml((Printers.ListToDescString(get.getBusinessService().get(i).getDescription())))).append("</div><Br>");
-                sb.append("<b>Key:</b><div class=\"editable\" id=\"ServiceKey\">").append(StringEscapeUtils.escapeHtml((get.getBusinessService().get(i).getServiceKey()))).append("</div><Br>");
-                sb.append("<b>Category Bag:</b> ").append(Printers.CatBagToString(get.getBusinessService().get(i).getCategoryBag())).append("<Br>");
+                sb.append("<b>").append(ResourceLoader.GetResource(session, "items.name")).append(":</b><div class=\"editable\" id=\"ServiceName\">").append(StringEscapeUtils.escapeHtml(Printers.ListNamesToString(get.getBusinessService().get(i).getName()))).append("</div><Br>");
+                sb.append("<b>").append(ResourceLoader.GetResource(session, "items.description")).append(":</b><div class=\"editable\" id=\"ServiceDescription\">").append(StringEscapeUtils.escapeHtml((Printers.ListToDescString(get.getBusinessService().get(i).getDescription())))).append("</div><Br>");
+                sb.append("<b>").append(ResourceLoader.GetResource(session, "items.key")).append(":</b><div class=\"editable\" id=\"ServiceKey\">").append(StringEscapeUtils.escapeHtml((get.getBusinessService().get(i).getServiceKey()))).append("</div><Br>");
+                sb.append("<b>").append(ResourceLoader.GetResource(session, "items.keyrefcat")).append(":</b> ").append(Printers.CatBagToString(get.getBusinessService().get(i).getCategoryBag(), (String) session.getAttribute("locale"))).append("<Br>");
                 if (!get.getBusinessService().get(i).getSignature().isEmpty()) {
-                    sb.append("Item is digitally signed").append("<Br>");
+                    sb.append(ResourceLoader.GetResource(session, "items.signed")).append("<Br>");
                 } else {
-                    sb.append("Item is not digitally signed").append("<Br>");
+                    sb.append(ResourceLoader.GetResource(session, "items.signed.not")).append("<Br>");
                 }
 
-                sb.append(Printers.PrintBindingTemplates(get.getBusinessService().get(i).getBindingTemplates())).append("<Br>");
+                sb.append(Printers.PrintBindingTemplates(get.getBusinessService().get(i).getBindingTemplates(), (String) session.getAttribute("locale"))).append("<Br>");
             }
         } catch (Exception ex) {
-            sb.append("error ").append(StringEscapeUtils.escapeHtml((ex.getMessage())));
+            sb.append(HandleException(ex));
         }
         return sb.toString();
     }
@@ -338,7 +336,7 @@ public class UddiHub {
      */
     public String GetServiceList(String bizid) {
         if (bizid == null || bizid.isEmpty()) {
-            return "No business id specified";
+            return ResourceLoader.GetResource(session, "errors.nobusinessid");
         }
         StringBuilder sb = new StringBuilder();
         try {
@@ -348,15 +346,17 @@ public class UddiHub {
             BusinessDetail businessDetail = inquiry.getBusinessDetail(gbd);
             for (int i = 0; i < businessDetail.getBusinessEntity().size(); i++) {
                 if (businessDetail.getBusinessEntity().get(i).getBusinessServices() == null) {
-                    sb.append("No services are defined.");
+                    sb.append(ResourceLoader.GetResource(session, "errors.noservicesdefined"));
                 } else {
                     for (int k = 0; k < businessDetail.getBusinessEntity().get(i).getBusinessServices().getBusinessService().size(); k++) {
-                        sb.append("<div><a href=\"serviceEditor.jsp?id=").append(StringEscapeUtils.escapeHtml(businessDetail.getBusinessEntity().get(i).getBusinessServices().getBusinessService().get(k).getServiceKey())).append("\">").append(StringEscapeUtils.escapeHtml(Printers.ListNamesToString(businessDetail.getBusinessEntity().get(i).getBusinessServices().getBusinessService().get(k).getName()))).append("</a></div>");
+                        sb.append("<div><a href=\"serviceEditor.jsp?id=").
+                                append(StringEscapeUtils.escapeHtml(businessDetail.getBusinessEntity().get(i).getBusinessServices().getBusinessService().get(k).getServiceKey())).append("\">").
+                                append(StringEscapeUtils.escapeHtml(Printers.ListNamesToString(businessDetail.getBusinessEntity().get(i).getBusinessServices().getBusinessService().get(k).getName()))).append("</a></div>");
                     }
                 }
             }
         } catch (Exception ex) {
-            sb.append("error ").append(ex.getMessage());
+            sb.append(ResourceLoader.GetResource(session, "errors.generic")).append(ex.getMessage());
         }
         return sb.toString();
     }
@@ -377,7 +377,7 @@ public class UddiHub {
             return get.getBusinessService().get(0);
 
         } catch (Exception ex) {
-            log.log(Level.WARN, null, ex);
+            HandleException(ex);
         }
         return null;
     }
@@ -389,34 +389,27 @@ public class UddiHub {
             sb.getBusinessService().add(be);
             publish.saveService(sb);
             return "Saved!";
-        } catch (DispositionReportFaultMessage ex) {
-            log.log(Level.ERROR, null, ex);
-            return "UDDI Disposition Fault Error caught! " + ex.getMessage() + " " + ex.detail.getMessage();
-        } catch (RemoteException ex) {
-            log.log(Level.ERROR, null, ex);
-            return "Remote Exception Error caught! " + ex.getMessage() + " " + ex.detail.getMessage();
         } catch (Exception ex) {
-            log.log(Level.ERROR, null, ex);
-            return "Unexpected Error caught! " + ex.getMessage();
+            return HandleException(ex);
         }
     }
 
+    /**
+     * don't think this is used yet
+     *
+     * @param be
+     * @return
+     */
+    @Deprecated
     public String SaveBindingTemplate(BindingTemplate be) {
         try {
             SaveBinding sb = new SaveBinding();
             sb.setAuthInfo(GetToken());
             sb.getBindingTemplate().add(be);
             publish.saveBinding(sb);
-            return "Saved!";
-        } catch (DispositionReportFaultMessage ex) {
-            log.log(Level.ERROR, null, ex);
-            return "UDDI Disposition Fault Error caught! " + ex.getMessage() + " " + ex.detail.getMessage();
-        } catch (RemoteException ex) {
-            log.log(Level.ERROR, null, ex);
-            return "Remote Exception Error caught! " + ex.getMessage() + " " + ex.detail.getMessage();
+            return ResourceLoader.GetResource(session, "actions.save.bindingtemplate");
         } catch (Exception ex) {
-            log.log(Level.ERROR, null, ex);
-            return "Unexpected Error caught! " + ex.getMessage();
+            return HandleException(ex);
         }
     }
 
@@ -430,7 +423,7 @@ public class UddiHub {
             be.setServiceKey(null);
         }
         if (be.getBusinessKey() == null || be.getBusinessKey().length() == 0) {
-            return "No input was provided for the business key";
+            return ResourceLoader.GetResource(session, "errors.noinput.businesskey");
         }
 
         be.getName().addAll(Builders.BuildNames(Builders.MapFilter(request.getParameterMap(), PostBackConstants.NAME), PostBackConstants.NAME));
@@ -459,16 +452,9 @@ public class UddiHub {
             sb.setAuthInfo(GetToken());
             sb.getBusinessService().add(be);
             publish.saveService(sb);
-            return "Saved!";
-        } catch (DispositionReportFaultMessage ex) {
-            log.log(Level.ERROR, null, ex);
-            return "UDDI Disposition Fault Error caught! " + ex.getMessage() + " " + ex.detail.getMessage();
-        } catch (RemoteException ex) {
-            log.log(Level.ERROR, null, ex);
-            return "Remote Exception Error caught! " + ex.getMessage() + " " + ex.detail.getMessage();
+            return ResourceLoader.GetResource(session, "actions.save.service");
         } catch (Exception ex) {
-            log.log(Level.ERROR, null, ex);
-            return "Unexpected Error caught! " + ex.getMessage();
+            return HandleException(ex);
         }
     }
 
@@ -479,15 +465,8 @@ public class UddiHub {
             sb.getBusinessEntity().add(be);
             BusinessDetail saveBusiness = publish.saveBusiness(sb);
             return "Saved!";
-        } catch (DispositionReportFaultMessage ex) {
-            log.log(Level.ERROR, null, ex);
-            return "UDDI Disposition Fault Error caught! " + ex.getMessage() + " " + ex.detail.getMessage();
-        } catch (RemoteException ex) {
-            log.log(Level.ERROR, null, ex);
-            return "Remote Exception Error caught! " + ex.getMessage() + " " + ex.detail.getMessage();
         } catch (Exception ex) {
-            log.log(Level.ERROR, null, ex);
-            return "Unexpected Error caught! " + ex.getMessage();
+            return HandleException(ex);
         }
     }
 
@@ -534,7 +513,7 @@ public class UddiHub {
 
     public String GetBusinessDetailsAsHtml(String bizid) throws Exception {
         if (bizid == null || bizid.isEmpty()) {
-            return "No business id specified";
+            return ResourceLoader.GetResource(session, "errors.noinput.businesskey");
         }
         StringBuilder sb = new StringBuilder();
         try {
@@ -546,15 +525,20 @@ public class UddiHub {
             BusinessDetail businessDetail = inquiry.getBusinessDetail(gbd);
             for (int i = 0; i < businessDetail.getBusinessEntity().size(); i++) {
                 sb.append("Business Detail - key: ").append(businessDetail.getBusinessEntity().get(i).getBusinessKey()).append("<br>");
-                sb.append("Name: ").append(Printers.ListNamesToString(businessDetail.getBusinessEntity().get(i).getName())).append("<br>");
-                sb.append("Description: ").append(Printers.ListToDescString(businessDetail.getBusinessEntity().get(i).getDescription())).append("<br>");
-                sb.append("Discovery URLs: ").append(Printers.ListDiscoToString(businessDetail.getBusinessEntity().get(i).getDiscoveryURLs())).append("<br>");
-                sb.append("Identifiers: ").append(Printers.ListIdentBagToString(businessDetail.getBusinessEntity().get(i).getIdentifierBag())).append("<br>");
-                sb.append("CategoryBag: ").append(Printers.CatBagToString(businessDetail.getBusinessEntity().get(i).getCategoryBag())).append("<br>");
-                Printers.PrintContacts(businessDetail.getBusinessEntity().get(i).getContacts());
+                sb.append(ResourceLoader.GetResource(session, "items.name"));
+                sb.append(": ").append(Printers.ListNamesToString(businessDetail.getBusinessEntity().get(i).getName())).append("<br>");
+                sb.append(ResourceLoader.GetResource(session, "items.description"));
+                sb.append(": ").append(Printers.ListToDescString(businessDetail.getBusinessEntity().get(i).getDescription())).append("<br>");
+                sb.append(ResourceLoader.GetResource(session, "items.discoveryurl"));
+                sb.append(": ").append(Printers.ListDiscoToString(businessDetail.getBusinessEntity().get(i).getDiscoveryURLs())).append("<br>");
+                sb.append(ResourceLoader.GetResource(session, "items.identifiers"));
+                sb.append(": ").append(Printers.ListIdentBagToString(businessDetail.getBusinessEntity().get(i).getIdentifierBag(), (String) session.getAttribute("locale"))).append("<br>");
+                sb.append(ResourceLoader.GetResource(session, "items.keyrefcats"));
+                sb.append(": ").append(Printers.CatBagToString(businessDetail.getBusinessEntity().get(i).getCategoryBag(), (String) session.getAttribute("locale"))).append("<br>");
+                Printers.PrintContacts(businessDetail.getBusinessEntity().get(i).getContacts(), (String) session.getAttribute("locale"));
             }
         } catch (Exception ex) {
-            sb.append("error ").append(ex.getMessage());
+            sb.append(ResourceLoader.GetResource(session, "errors.generic")).append(ex.getMessage());
         }
         return sb.toString();
     }
@@ -582,7 +566,7 @@ public class UddiHub {
                 return businessDetail.getBusinessEntity().get(0);
             }
         } catch (Exception ex) {
-            ex.printStackTrace();
+            HandleException(ex);
         }
         return null;
 
@@ -617,16 +601,22 @@ public class UddiHub {
             n.setValue(keyword);
             fs.getName().add(n);
             fs.setFindQualifiers(new org.uddi.api_v3.FindQualifiers());
-            fs.getFindQualifiers().getFindQualifier().add(FindQualifiers.APPROXIMATE_MATCH);
+            fs.getFindQualifiers().getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH);
             ServiceList findService = inquiry.findService(fs);
             if (findService.getServiceInfos() == null) {
-                ret.renderedHtml = "No services returned";
+                ret.renderedHtml = ResourceLoader.GetResource(session, "errors.norecordsfound");
                 return ret;
             }
             ret.displaycount = findService.getListDescription().getIncludeCount();
             ret.totalrecords = findService.getListDescription().getActualCount();
             StringBuilder sb = new StringBuilder();
-            sb.append("<table class=\"table\"><tr><th>Name</th><th>Key</th><th>Business</th></tr>");
+            sb.append("<table class=\"table\"><tr><th>").
+                    append(ResourceLoader.GetResource(session, "items.name")).
+                    append("</th><th>").
+                    append(ResourceLoader.GetResource(session, "items.key")).
+                    append("</th><th>").
+                    append(ResourceLoader.GetResource(session, "items.business")).
+                    append("</th></tr>");
             for (int i = 0; i < findService.getServiceInfos().getServiceInfo().size(); i++) {
                 sb.append("<tr><td><a href=\"serviceEditor.jsp?id=").
                         append(StringEscapeUtils.escapeHtml(findService.getServiceInfos().getServiceInfo().get(i).getServiceKey())).
@@ -641,38 +631,33 @@ public class UddiHub {
             sb.append("</table>");
             ret.renderedHtml = sb.toString();
             return ret;
-        } catch (DispositionReportFaultMessage ex) {
-            log.log(Level.ERROR, null, ex);
-            ret.renderedHtml = "error " + ex.getMessage() + " " + ex.detail.getMessage();
-        } catch (RemoteException ex) {
-            log.log(Level.ERROR, null, ex);
-            ret.renderedHtml = "error " + ex.getMessage();
         } catch (Exception ex) {
-            log.log(Level.ERROR, null, ex);
-            ret.renderedHtml = "error " + ex.getMessage();
+            ret.renderedHtml = HandleException(ex);
         }
         return ret;
 
     }
 
+    /**
+     * not used yet?
+     *
+     * @param request
+     * @return
+     * @deprecated
+     */
+    @Deprecated
     public String AddPublisher(HttpServletRequest request) {
         try {
             SavePublisher sp = new SavePublisher();
             sp.setAuthInfo(GetToken());
             Publisher p = new Publisher();
-            //           p.s
+            //TODO code
             sp.getPublisher().add(p);
             PublisherDetail savePublisher = juddi.savePublisher(sp);
             return "Success";
-        } catch (DispositionReportFaultMessage ex) {
-            log.log(Level.ERROR, null, ex);
-            return ex.getMessage() + " " + ex.detail.getMessage();
-        } catch (RemoteException ex) {
-            log.log(Level.ERROR, null, ex);
-            return ex.getMessage() + " " + ex.detail.getMessage();
+            //TODO resource this
         } catch (Exception ex) {
-            log.log(Level.ERROR, null, ex);
-            return ex.getMessage();
+            return HandleException(ex);
         }
 
 
@@ -684,7 +669,7 @@ public class UddiHub {
      * @return
      */
     public String GetPublisherListAsHtml() {
-        if (this.IsJuddiRegistry()) {
+        if (!this.IsJuddiRegistry()) {
             return "This function is only available on Juddi registries";
         }
         try {
@@ -693,26 +678,23 @@ public class UddiHub {
             PublisherDetail allPublisherDetail = juddi.getAllPublisherDetail(gpd);
             StringBuilder sb = new StringBuilder();
             for (int i = 0; i < allPublisherDetail.getPublisher().size(); i++) {
-                sb.append("Authorized Name = ").append(allPublisherDetail.getPublisher().get(i).getAuthorizedName()).append("<br>");
-                sb.append("Email = ").append(allPublisherDetail.getPublisher().get(i).getEmailAddress()).append("<br>");
-                sb.append("Is Administrator ? = ").append(allPublisherDetail.getPublisher().get(i).getIsAdmin()).append("<br>");
+                sb.append(ResourceLoader.GetResource(session, "items.pubisher.name"))
+                        .append(" = ").append(allPublisherDetail.getPublisher().get(i).getPublisherName()).append("<br>");
+                sb.append(ResourceLoader.GetResource(session, "items.pubisher.authname")).append(" = ").append(allPublisherDetail.getPublisher().get(i).getAuthorizedName()).append("<br>");
+                sb.append(ResourceLoader.GetResource(session, "items.email"));
+                sb.append(" = ").append(allPublisherDetail.getPublisher().get(i).getEmailAddress()).append("<br>");
+                sb.append(ResourceLoader.GetResource(session, "items.publisher.admin"))
+                        .append(" = ").append(allPublisherDetail.getPublisher().get(i).getIsAdmin()).append("<br>");
                 sb.append("Is Enabled? = ").append(allPublisherDetail.getPublisher().get(i).getIsEnabled()).append("<br>");
                 sb.append("Max bindings per service = ").append(allPublisherDetail.getPublisher().get(i).getMaxBindingsPerService()).append("<br>");
                 sb.append("Max businesses = ").append(allPublisherDetail.getPublisher().get(i).getMaxBusinesses()).append("<br>");
                 sb.append("Max Services per Business = ").append(allPublisherDetail.getPublisher().get(i).getMaxServicePerBusiness()).append("<br>");
-                sb.append("Max tModels = ").append(allPublisherDetail.getPublisher().get(i).getMaxTModels()).append("<br>");
-                sb.append("Publisher Name = ").append(allPublisherDetail.getPublisher().get(i).getPublisherName()).append("<br><br>");
+                sb.append("Max tModels = ").append(allPublisherDetail.getPublisher().get(i).getMaxTModels()).append("<br><br>");
+
             }
             return sb.toString();
-        } catch (DispositionReportFaultMessage ex) {
-            log.log(Level.ERROR, null, ex);
-            return ex.getMessage() + " " + ex.detail.getMessage();
-        } catch (RemoteException ex) {
-            log.log(Level.ERROR, null, ex);
-            return ex.getMessage() + " " + ex.detail.getMessage();
         } catch (Exception ex) {
-            log.log(Level.ERROR, null, ex);
-            return ex.getMessage();
+            return HandleException(ex);
         }
     }
 
@@ -730,10 +712,11 @@ public class UddiHub {
     public String AddTmodelKenGenerator(String partitionName, String name, String lang) {
         try {
             if (!partitionName.startsWith("uddi:")) {
-                return "A tModel partition key generator must have a name that starts with uddi:";
+                return ResourceLoader.GetResource(session, "errors.tmodel.prefix");
+
             }
             if (!partitionName.endsWith(":keyGenerator")) {
-                return "A tModel partition key generator must have a name that ends with :keyGenerator";
+                return ResourceLoader.GetResource(session, "errors.tmodel.postfix");
             }
 
 
@@ -756,17 +739,26 @@ public class UddiHub {
             tm.setTModelKey(partitionName.toLowerCase());
             st.getTModel().add(tm);
             publish.saveTModel(st);
-            return "Success";
-        } catch (DispositionReportFaultMessage ex) {
-            log.log(Level.ERROR, null, ex);
-            return ex.getMessage() + " " + ex.detail.getMessage();
-        } catch (RemoteException ex) {
-            log.log(Level.ERROR, null, ex);
-            return ex.getMessage() + " " + ex.detail.getMessage();
+            return ResourceLoader.GetResource(session, "messages.success");
+            // "Success";
         } catch (Exception ex) {
+            return HandleException(ex);
+        }
+    }
+
+    String HandleException(Exception ex) {
+        if (ex instanceof DispositionReportFaultMessage) {
+            DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
+            log.log(Level.ERROR, null, ex);
+            return ResourceLoader.GetResource(session, "errors.uddi") + ex.getMessage() + " " + f.detail.getMessage();
+        }
+        if (ex instanceof RemoteException) {
+            RemoteException f = (RemoteException) ex;
             log.log(Level.ERROR, null, ex);
-            return ex.getMessage();
+            return ResourceLoader.GetResource(session, "errors.generic") + ex.getMessage() + " " + f.detail.getMessage();
         }
+        log.log(Level.ERROR, null, ex);
+        return ResourceLoader.GetResource(session, "errors.generic") + ex.getMessage();
     }
 
     /**
@@ -793,14 +785,14 @@ public class UddiHub {
             }
             fm.getName().setValue(keyword);
             fm.setFindQualifiers(new org.uddi.api_v3.FindQualifiers());
-            fm.getFindQualifiers().getFindQualifier().add(FindQualifiers.APPROXIMATE_MATCH);
+            fm.getFindQualifiers().getFindQualifier().add(UDDIConstants.APPROXIMATE_MATCH);
             TModelList findTModel = inquiry.findTModel(fm);
 
             ret.offset = offset;
             ret.displaycount = findTModel.getListDescription().getIncludeCount();
             ret.totalrecords = findTModel.getListDescription().getActualCount();
             if (findTModel == null || findTModel.getTModelInfos() == null || findTModel.getTModelInfos().getTModelInfo().isEmpty()) {
-                ret.renderedHtml = "No tModels are defined";
+                ret.renderedHtml = ResourceLoader.GetResource(session, "errors.norecordsfound");//"No tModels are defined";
             } else {
                 StringBuilder sb = new StringBuilder();
 
@@ -812,10 +804,10 @@ public class UddiHub {
                     sb.append("tModel Key = ").append(
                             StringEscapeUtils.escapeHtml(findTModel.getTModelInfos().getTModelInfo().get(i).getTModelKey()))
                             .append("<br>");
-                    sb.append("Description = ").append(
+                    sb.append(ResourceLoader.GetResource(session, "items.description")).append(" = ").append(
                             StringEscapeUtils.escapeHtml(Printers.ListToDescString(findTModel.getTModelInfos().getTModelInfo().get(i).getDescription())))
                             .append("<br>");
-                    sb.append("Name = ").append(StringEscapeUtils.escapeHtml(findTModel.getTModelInfos().getTModelInfo().get(i).getName().getValue()))
+                    sb.append(ResourceLoader.GetResource(session, "items.name")).append(" = ").append(StringEscapeUtils.escapeHtml(findTModel.getTModelInfos().getTModelInfo().get(i).getName().getValue()))
                             .append(", ")
                             .append(StringEscapeUtils.escapeHtml(findTModel.getTModelInfos().getTModelInfo().get(i).getName().getLang()));
                     sb.append("</td></tr>");
@@ -823,15 +815,8 @@ public class UddiHub {
                 sb.append("</table>");
                 ret.renderedHtml = sb.toString();
             }
-        } catch (DispositionReportFaultMessage ex) {
-            log.log(Level.ERROR, null, ex);
-            ret.renderedHtml = ex.getMessage() + " " + ex.detail.getMessage();
-        } catch (RemoteException ex) {
-            log.log(Level.ERROR, null, ex);
-            ret.renderedHtml = ex.getMessage() + " " + ex.detail.getMessage();
         } catch (Exception ex) {
-            log.log(Level.ERROR, null, ex);
-            ret.renderedHtml = ex.getMessage();
+            ret.renderedHtml = HandleException(ex);
         }
         return ret;
     }
@@ -858,12 +843,8 @@ public class UddiHub {
 
             }
 
-        } catch (DispositionReportFaultMessage ex) {
-            log.log(Level.ERROR, null, ex);
-        } catch (RemoteException ex) {
-            log.log(Level.ERROR, null, ex);
         } catch (Exception ex) {
-            log.log(Level.ERROR, null, ex);
+            HandleException(ex);
         }
         return null;
     }
@@ -883,14 +864,8 @@ public class UddiHub {
             r.getBindingKey().add(key);
             BindingDetail bindingDetail = inquiry.getBindingDetail(r);
             return bindingDetail.getBindingTemplate().get(0);
-        } catch (DispositionReportFaultMessage ex) {
-            log.log(Level.ERROR, null, ex);
-
-        } catch (RemoteException ex) {
-            log.log(Level.ERROR, null, ex);
-
         } catch (Exception ex) {
-            log.log(Level.ERROR, null, ex);
+            HandleException(ex);
         }
         return null;
     }
@@ -902,14 +877,8 @@ public class UddiHub {
             r.getTModelKey().add(key);
             TModelDetail tModelDetail = inquiry.getTModelDetail(r);
             return tModelDetail.getTModel().get(0);
-        } catch (DispositionReportFaultMessage ex) {
-            log.log(Level.ERROR, null, ex);
-
-        } catch (RemoteException ex) {
-            log.log(Level.ERROR, null, ex);
-
         } catch (Exception ex) {
-            log.log(Level.ERROR, null, ex);
+            HandleException(ex);
         }
         return null;
     }
@@ -999,11 +968,10 @@ public class UddiHub {
                 sb.append("</table>");
                 return sb.toString();
             } else {
-                return "no result returned.";
+                return ResourceLoader.GetResource(session, "errors.norecordsfound");
             }
         } catch (Exception ex) {
-            log.log(Level.ERROR, null, ex);
-            return "error caught! " + ex.getMessage();
+            return HandleException(ex);
         }
     }
 
@@ -1071,16 +1039,56 @@ public class UddiHub {
                 sb.append("</table>");
                 return sb.toString();
             } else {
-                return "no result returned.";
+                return  ResourceLoader.GetResource(session, "errors.norecordsfound");
             }
         } catch (Exception ex) {
-            log.log(Level.ERROR, null, ex);
-            return "error caught! " + ex.getMessage();
+            return HandleException(ex);
         }
     }
 
     private String FindRelatedBusiness(CriteriaType criteria, String parameters, String lang, String[] fq) {
-        throw new UnsupportedOperationException("Not yet implemented");
+        try {
+            FindRelatedBusinesses fb = new FindRelatedBusinesses();
+            fb.setAuthInfo(GetToken());
+            fb.setBusinessKey(parameters);
+            RelatedBusinessesList findBusiness = null;
+            switch (criteria) {
+                case Category:
+                    break;
+                case Name:
+                    break;
+                case tmodel:
+                    break;
+                case uid:
+                    break;
+            }
+
+            findBusiness = inquiry.findRelatedBusinesses(fb);
+
+            if (findBusiness.getRelatedBusinessInfos() != null) {
+                StringBuilder sb = new StringBuilder();
+                sb.append("<table class=\"table\">");
+                for (int i = 0; i < findBusiness.getRelatedBusinessInfos().getRelatedBusinessInfo().size(); i++) {
+                    sb.append("<tr><td>");
+                    sb.append("<a href=\"businessEditor2.jsp?id=").
+                            append(StringEscapeUtils.escapeHtml(findBusiness.getRelatedBusinessInfos().getRelatedBusinessInfo().get(i).getBusinessKey())).
+                            append("\">");
+                    if (findBusiness.getRelatedBusinessInfos().getRelatedBusinessInfo().get(i).getName().isEmpty()) {
+                        sb.append(StringEscapeUtils.escapeHtml(findBusiness.getRelatedBusinessInfos().getRelatedBusinessInfo().get(i).getBusinessKey()));
+                    } else {
+                        sb.append(StringEscapeUtils.escapeHtml(Printers.ListNamesToString(findBusiness.getRelatedBusinessInfos().getRelatedBusinessInfo().get(i).getName())));
+                    }
+                    sb.append("</a>");
+                    sb.append("</td></tr>");
+                }
+                sb.append("</table>");
+                return sb.toString();
+            } else {
+                return  ResourceLoader.GetResource(session, "errors.norecordsfound");
+            }
+        } catch (Exception ex) {
+            return HandleException(ex);
+        }
     }
 
     private String FindPublishers(CriteriaType criteria, String parameters, String lang, String[] fq) {
@@ -1152,11 +1160,10 @@ public class UddiHub {
                 sb.append("</table>");
                 return sb.toString();
             } else {
-                return "no result returned.";
+                return  ResourceLoader.GetResource(session, "errors.norecordsfound");
             }
         } catch (Exception ex) {
-            log.log(Level.ERROR, null, ex);
-            return "error caught! " + ex.getMessage();
+            return HandleException(ex);
         }
     }
 
@@ -1223,11 +1230,10 @@ public class UddiHub {
                 sb.append("</table>");
                 return sb.toString();
             } else {
-                return "no result returned.";
+                return  ResourceLoader.GetResource(session, "errors.norecordsfound");
             }
         } catch (Exception ex) {
-            log.log(Level.ERROR, null, ex);
-            return "error caught! " + ex.getMessage();
+            return HandleException(ex);
         }
     }
 
@@ -1239,7 +1245,7 @@ public class UddiHub {
      */
     public String deleteBusiness(String bizid) {
         if (bizid == null || bizid.length() == 0) {
-            return "No input";
+            return ResourceLoader.GetResource(session, "errors.noinput");
         }
         List<String> x = new ArrayList<String>();
         x.add(bizid.trim());
@@ -1248,7 +1254,7 @@ public class UddiHub {
 
     public String deleteService(String serviceId) {
         if (serviceId == null || serviceId.length() == 0) {
-            return "No input";
+            return ResourceLoader.GetResource(session, "errors.noinput");
         }
         List<String> x = new ArrayList<String>();
         x.add(serviceId.trim());
@@ -1257,24 +1263,17 @@ public class UddiHub {
 
     public String deleteService(List<String> serviceId) {
         if (serviceId == null || serviceId.isEmpty()) {
-            return "No input";
+            return ResourceLoader.GetResource(session, "errors.noinput");
         }
         DeleteService db = new DeleteService();
         db.setAuthInfo(GetToken());
         db.getServiceKey().addAll(serviceId);
         try {
             publish.deleteService(db);
-        } catch (DispositionReportFaultMessage ex) {
-            log.log(Level.ERROR, null, ex);
-            return ex.getMessage() + " " + ex.detail.getMessage();
-        } catch (RemoteException ex) {
-            log.log(Level.ERROR, null, ex);
-            return ex.getMessage() + " " + ex.detail.getMessage();
         } catch (Exception ex) {
-            log.log(Level.ERROR, null, ex);
-            return ex.getMessage();
+            return HandleException(ex);
         }
-        return "Success";
+        return ResourceLoader.GetResource(session, "actions.delete.service");
     }
 
     /**
@@ -1285,29 +1284,22 @@ public class UddiHub {
      */
     public String deleteBusiness(List<String> bizid) {
         if (bizid == null || bizid.isEmpty()) {
-            return "No input";
+            return ResourceLoader.GetResource(session, "errors.noinput");
         }
         DeleteBusiness db = new DeleteBusiness();
         db.setAuthInfo(GetToken());
         db.getBusinessKey().addAll(bizid);
         try {
             publish.deleteBusiness(db);
-        } catch (DispositionReportFaultMessage ex) {
-            log.log(Level.ERROR, null, ex);
-            return ex.getMessage() + " " + ex.detail.getMessage();
-        } catch (RemoteException ex) {
-            log.log(Level.ERROR, null, ex);
-            return ex.getMessage() + " " + ex.detail.getMessage();
         } catch (Exception ex) {
-            log.log(Level.ERROR, null, ex);
-            return ex.getMessage();
+            return HandleException(ex);
         }
-        return "Success";
+        return ResourceLoader.GetResource(session, "actions.delete.business");
     }
 
     public String deleteTmodel(String bizid) {
         if (bizid == null || bizid.length() == 0) {
-            return "No input";
+            return ResourceLoader.GetResource(session, "errors.noinput");
         }
         List<String> x = new ArrayList<String>();
         x.add(bizid);
@@ -1322,24 +1314,17 @@ public class UddiHub {
      */
     public String deleteTmodel(List<String> bizid) {
         if (bizid == null || bizid.isEmpty()) {
-            return "No input";
+            return ResourceLoader.GetResource(session, "errors.noinput");
         }
         DeleteTModel db = new DeleteTModel();
         db.setAuthInfo(GetToken());
         db.getTModelKey().addAll(bizid);
         try {
             publish.deleteTModel(db);
-        } catch (DispositionReportFaultMessage ex) {
-            log.log(Level.ERROR, null, ex);
-            return ex.getMessage() + " " + ex.detail.getMessage();
-        } catch (RemoteException ex) {
-            log.log(Level.ERROR, null, ex);
-            return ex.getMessage() + " " + ex.detail.getMessage();
         } catch (Exception ex) {
-            log.log(Level.ERROR, null, ex);
-            return ex.getMessage();
+            return HandleException(ex);
         }
-        return "Success";
+        return ResourceLoader.GetResource(session, "actions.delete.tmodel");
     }
 
     public String SaveTModel(TModel be) {
@@ -1349,16 +1334,9 @@ public class UddiHub {
 
             sb.getTModel().add(be);
             TModelDetail saveTModel = publish.saveTModel(sb);
-            return "Saved!";
-        } catch (DispositionReportFaultMessage ex) {
-            log.log(Level.ERROR, null, ex);
-            return "UDDI Disposition Fault Error caught! " + ex.getMessage() + " " + ex.detail.getMessage();
-        } catch (RemoteException ex) {
-            log.log(Level.ERROR, null, ex);
-            return "Remote Exception Error caught! " + ex.getMessage() + " " + ex.detail.getMessage();
+            return ResourceLoader.GetResource(session, "tModel guardado correctamente!");
         } catch (Exception ex) {
-            log.log(Level.ERROR, null, ex);
-            return "Unexpected Error caught! " + ex.getMessage();
+            return HandleException(ex);
         }
     }
 
@@ -1431,7 +1409,14 @@ public class UddiHub {
         return sb.toString();
     }
 
-    public static String SignatureToBase64(SignatureType sig) {
+    /**
+     * converts a UDDI Signature Type element into a base64 string containing
+     * the raw data for the signing certificate, if present
+     *
+     * @param sig
+     * @return
+     */
+    public String SignatureToBase64(SignatureType sig) {
         if (sig == null) {
             return "Error, the signature was nullavailable";
         }
@@ -1446,20 +1431,15 @@ public class UddiHub {
                         if (element.getValue() instanceof byte[]) {
                             try {
                                 CertificateFactory cf = CertificateFactory.getInstance("X.509");
-                                // return org.apache.commons.codec.binary. encode((byte[])element.getValue());
                                 InputStream is = new ByteArrayInputStream((byte[]) element.getValue());
                                 X509Certificate cert = (X509Certificate) cf.generateCertificate(is);
                                 is.close();
-                                //(byte[])element.getValue()
+                                //this is the most supportable way to do this
                                 BASE64Encoder encoder = new BASE64Encoder();
                                 return encoder.encodeBuffer(cert.getEncoded());
-                                // byte[] decoded = org.apache.commons.codec.binary.Base64.decodeBase64(cert.getEncoded());
-                                //byte[] value = (byte[])element.getValue();
-                                //return new String(decoded, "UTF8");
 
                             } catch (Exception ex) {
-                                log.log(Level.WARN, null, ex);
-                                return "Error! " + ex.getMessage();
+                                return HandleException(ex);
                             }
                         } else if (element.getValue() instanceof String) {
                         }
@@ -1467,7 +1447,7 @@ public class UddiHub {
                 }
             }
         }
-        return "Error, Not available";
+        return ResourceLoader.GetResource(session, "errors.nocertavaiable");
     }
 
     /**
@@ -1509,7 +1489,7 @@ public class UddiHub {
                 break;
 
         }
-        return "Error, unsupported entity type";
+        return ResourceLoader.GetResource(session, "errors.unknownentity");
     }
 
     /**
@@ -1519,12 +1499,8 @@ public class UddiHub {
     public List<Subscription> GetSubscriptions() {
         try {
             return subscription.getSubscriptions(GetToken());
-        } catch (DispositionReportFaultMessage ex) {
-            log.log(Level.ERROR, null, ex);
-        } catch (RemoteException ex) {
-            log.log(Level.ERROR, null, ex);
         } catch (Exception ex) {
-            log.log(Level.ERROR, null, ex);
+            HandleException(ex);
         }
         return null;
     }
@@ -1543,18 +1519,15 @@ public class UddiHub {
         try {
             operationalInfo = inquiry.getOperationalInfo(goi);
             return operationalInfo.getOperationalInfo();
-        } catch (DispositionReportFaultMessage ex) {
-            log.log(Level.ERROR, null, ex);
-        } catch (RemoteException ex) {
-            log.log(Level.ERROR, null, ex);
         } catch (Exception ex) {
-            log.log(Level.ERROR, null, ex);
+            HandleException(ex);
         }
         return null;
     }
 
     /**
-     *GetOperationalInfo
+     * GetOperationalInfo
+     *
      * @param info
      * @return
      */
@@ -1564,7 +1537,19 @@ public class UddiHub {
         if (info != null) {
             sb.append("<table class=\"table\">");
             for (int i = 0; i < info.size(); i++) {
-                sb.append("<tr><th>Node Id</th><th>Authorized Name</th><th>Key</th><th>Created</th><th>Modified</th><th>Modified+</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>");
                 sb.append("<tr><td>");
                 sb.append(StringEscapeUtils.escapeHtml(info.get(i).getNodeID()))
                         .append("</td><td>")
@@ -1583,7 +1568,33 @@ public class UddiHub {
         }
         return sb.toString();
     }
-    
-    
-    
+
+    //TODO this fucntion is pointless, it just returns a list of businesses
+    public RegisteredInfo GetNodeInformation() {
+        try {
+            GetRegisteredInfo r = new GetRegisteredInfo();
+            r.setAuthInfo(GetToken());
+            r.setInfoSelection(InfoSelection.ALL);
+            RegisteredInfo registeredInfo = publish.getRegisteredInfo(r);
+            return registeredInfo;
+        } catch (Exception ex) {
+            HandleException(ex);
+        }
+        return null;
+    }
+
+    public List<PublisherAssertion> GetPublisherAssertions() {
+        try {
+            List<PublisherAssertion> publisherAssertions = publish.getPublisherAssertions(GetToken());
+            return publisherAssertions;
+        } catch (Exception ex) {
+            HandleException(ex);
+        }
+        return null;
+    }
+    //publisher assertion, relationship between two business entities
+
+    public String GetJUDDISubscriptions() {
+        return null;
+    }
 }

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=1463077&r1=1463076&r2=1463077&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 Mon Apr  1 02:08:19 2013
@@ -2,7 +2,6 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-
 package org.apache.juddi.webconsole.hub.builders;
 
 import java.util.List;
@@ -29,24 +28,24 @@ public class Printers {
      * @param categoryBag
      * @return
      */
-    public static String CatBagToString(CategoryBag categoryBag) {
+    public static String CatBagToString(CategoryBag categoryBag, String locale) {
         StringBuilder sb = new StringBuilder();
         if (categoryBag == null) {
             return "no data";
         }
         for (int i = 0; i < categoryBag.getKeyedReference().size(); i++) {
-            sb.append(KeyedReferenceToString(categoryBag.getKeyedReference().get(i)));
+            sb.append(KeyedReferenceToString(categoryBag.getKeyedReference().get(i),locale));
         }
         for (int i = 0; i < categoryBag.getKeyedReferenceGroup().size(); i++) {
             sb.append("Key Ref Grp: TModelKey=");
             for (int k = 0; k < categoryBag.getKeyedReferenceGroup().get(i).getKeyedReference().size(); k++) {
-                sb.append(KeyedReferenceToString(categoryBag.getKeyedReferenceGroup().get(i).getKeyedReference().get(k)));
+                sb.append(KeyedReferenceToString(categoryBag.getKeyedReferenceGroup().get(i).getKeyedReference().get(k),locale));
             }
         }
         return sb.toString();
     }
 
-    public static String KeyedReferenceToString(KeyedReference item) {
+    public static String KeyedReferenceToString(KeyedReference item, String locale) {
         StringBuilder sb = new StringBuilder();
         sb.append("Key Ref: Name=").append(item.getKeyName()).append(" Value=").append(item.getKeyValue()).append(" tModel=").append(item.getTModelKey()).append(System.getProperty("line.separator"));
         return sb.toString();
@@ -58,7 +57,7 @@ public class Printers {
      *
      * @param bindingTemplates
      */
-    public  static String PrintBindingTemplates(BindingTemplates bindingTemplates) {
+    public static String PrintBindingTemplates(BindingTemplates bindingTemplates, String locale) {
         if (bindingTemplates == null) {
             return "No binding templates";
         }
@@ -66,7 +65,7 @@ public class Printers {
         for (int i = 0; i < bindingTemplates.getBindingTemplate().size(); i++) {
             sb.append("Binding Key: ").append(bindingTemplates.getBindingTemplate().get(i).getBindingKey()).append("<Br>");
             sb.append("Description: ").append(ListToDescString(bindingTemplates.getBindingTemplate().get(i).getDescription())).append("<Br>");
-            sb.append("CatBag: ").append(CatBagToString(bindingTemplates.getBindingTemplate().get(i).getCategoryBag())).append("<Br>");
+            sb.append("CatBag: ").append(CatBagToString(bindingTemplates.getBindingTemplate().get(i).getCategoryBag(),locale)).append("<Br>");
             sb.append("tModels: ").append(Printers.TModelInfoToString(bindingTemplates.getBindingTemplate().get(i).getTModelInstanceDetails())).append("<Br>");
             if (bindingTemplates.getBindingTemplate().get(i).getAccessPoint() != null) {
                 sb.append("Access Point: ").append(bindingTemplates.getBindingTemplate().get(i).getAccessPoint().getValue()).append(" type ").append(bindingTemplates.getBindingTemplate().get(i).getAccessPoint().getUseType()).append("<Br>");
@@ -78,7 +77,7 @@ public class Printers {
         return sb.toString();
     }
 
-    public  static String ListToDescString(List<Description> name) {
+    public static String ListToDescString(List<Description> name) {
         StringBuilder sb = new StringBuilder();
         for (int i = 0; i < name.size(); i++) {
             sb.append(name.get(i).getValue()).append(" ");
@@ -86,7 +85,7 @@ public class Printers {
         return sb.toString();
     }
 
-    public  static String ListNamesToString(List<Name> name) {
+    public static String ListNamesToString(List<Name> name) {
         StringBuilder sb = new StringBuilder();
         for (int i = 0; i < name.size(); i++) {
             sb.append(name.get(i).getValue()).append(" ");
@@ -94,7 +93,7 @@ public class Printers {
         return sb.toString();
     }
 
-    public  static String ListDiscoToString(DiscoveryURLs info) {
+    public static String ListDiscoToString(DiscoveryURLs info) {
         StringBuilder sb = new StringBuilder();
         if (info == null) {
             return "";
@@ -108,7 +107,7 @@ public class Printers {
     /**
      * converts contacts to a simple string output
      */
-    public  static String PrintContacts(Contacts contacts) {
+    public static String PrintContacts(Contacts contacts,String locale) {
         if (contacts == null) {
             return "";
         }
@@ -141,15 +140,37 @@ public class Printers {
         return sb.toString();
     }
 
-    public  static String ListIdentBagToString(IdentifierBag info) {
+    public static String ListIdentBagToString(IdentifierBag info,String locale) {
         StringBuilder sb = new StringBuilder();
         if (info == null) {
             return "";
         }
         for (int i = 0; i < info.getKeyedReference().size(); i++) {
-            sb.append(KeyedReferenceToString(info.getKeyedReference().get(i)));
+            sb.append(KeyedReferenceToString(info.getKeyedReference().get(i),locale));
+        }
+        return sb.toString();
+    }
+
+    public static String PublisherAssertionsToHtml(List<PublisherAssertion> list, String locale) {
+        if (list == null || list.isEmpty()) {
+            return "No input";
+        }
+        StringBuilder sb = new StringBuilder();
+        sb.append("<table class=\"table\">");
+        for (int i = 0; i < list.size(); i++) {
+            sb.append("<tr><td>");
+            sb.append(StringEscapeUtils.escapeHtml(list.get(i).getToKey()));
+            sb.append("</td><td>");
+            sb.append(StringEscapeUtils.escapeHtml(list.get(i).getFromKey()));
+            sb.append("</td><td>");
+            sb.append(list.get(i).getSignature().isEmpty());
+            sb.append("</td><td>");
+            sb.append(StringEscapeUtils.escapeHtml(Printers.KeyedReferenceToString(list.get(i).getKeyedReference(),locale)));
+            sb.append("</td></tr>");
         }
+        sb.append("</table>");
         return sb.toString();
     }
 
+  
 }

Added: juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/ResourceLoader.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/ResourceLoader.java?rev=1463077&view=auto
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/ResourceLoader.java (added)
+++ juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/ResourceLoader.java Mon Apr  1 02:08:19 2013
@@ -0,0 +1,68 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.apache.juddi.webconsole.resources;
+
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+import javax.servlet.http.HttpSession;
+
+/**
+ * This a resource loader for specific locales for internationalization,
+ * provides some basic caching to prevent round trip disk access
+ *
+ * @author Alex O'Ree
+ */
+public class ResourceLoader {
+
+    private static Map map = new HashMap();
+
+    /**
+     * returns a localized string in the locale defined within
+     * session.getAttribute("locale") or in the default locale, en
+     *
+     * @param session
+     * @param key
+     * @return a localized string
+     * @throws IllegalArgumentException if the key is null
+     * @throws MissingResourceException if the resource bundle can't be found
+     */
+    public static String GetResource(HttpSession session, String key) throws MissingResourceException {
+        if (key == null) {
+            throw new IllegalArgumentException("key");
+        }
+        String locale = (String) session.getAttribute("locale");
+        return GetResource(locale, key);
+    }
+
+    /**
+     * returns a localized string in the locale defined within locale or in the
+     * default locale, en
+     *
+     * @param session
+     * @param key
+     * @return a localized string
+     * @throws IllegalArgumentException if the key is null
+     * @throws MissingResourceException if the resource bundle can't be found
+     */
+    public static String GetResource(String locale, String key) throws MissingResourceException {
+        if (key == null) {
+            throw new IllegalArgumentException("key");
+        }
+
+        ResourceBundle bundle = (ResourceBundle) map.get(locale);
+        if (bundle == null) {
+            bundle = ResourceBundle.getBundle("org.apache.juddi.webconsole.resources.web", new Locale(locale));
+            map.put(locale, bundle);
+        }
+        try {
+            return bundle.getString(key.trim());
+        } catch (Exception ex) {
+            return "key " + key + " not found " + ex.getMessage();
+        }
+    }
+}

Added: 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=1463077&view=auto
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web.properties (added)
+++ juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web.properties Mon Apr  1 02:08:19 2013
@@ -0,0 +1,183 @@
+# To change this template, choose Tools | Templates
+# and open the template in the editor.
+
+language=en
+direction=LTR
+title=Apache jUDDI - Open Source UDDI Discovery Services
+description=jUDDI is a free open source implementation of OASIS's UDDI specification. Think of it as a phone book for web services.
+navbar.home=Home
+
+navbar.discover=Discover
+navbar.businesses=Businesses
+
+navbar.businesses.tooltip=Browse for businesses
+navbar.services=Services
+
+navbar.services.tooltip=Browse for Services
+navbar.tmodels=tModels
+
+navbar.tmodels.tooltip=Browse for tModels
+navbar.publishers=Publishers
+
+navbar.publishers.tooltip=Browse for Publishers
+
+navbar.search=Search
+navbar.search.tooltip=Search
+navbar.create=Create
+navbar.create.business=Business
+navbar.create.business.tooltip=Create a Business
+navbar.create.service=Service
+navbar.create.service.tooltip=Create a Service
+navbar.create.tmodel=tModel
+navbar.create.tmodel.tooltip=Create a tModel
+navbar.create.tmodelkeygen.tooltip=Create a tModel Key Generator
+navbar.create.tmodel=tModel
+navbar.create.publisher=Publisher
+navbar.create.publisher.tooltip=Create a Publisher
+navbar.create.tmodelkeygen=tModel Partition (Key Generator)
+
+navbar.subscriptions=Subscriptions
+navbar.subscriptions.view=View
+navbar.subscriptions.create=Create
+navbar.subscriptions.view.tooltip=View My Subscriptions
+navbar.subscriptions.create.tooltip=Create a Subscription
+
+navbar.settings=Settings
+navbar.settings.config=Configure
+navbar.settings.config.tooltip=Configure this UDDI Browser
+
+navbar.help.userguide=User's Guide
+navbar.help.devguide=Developer's Guide
+navbar.help.api=API Documentation
+navbar.help.wiki=jUDDI Wiki
+navbar.help.bugreport=File a Bug Report
+navbar.help.website=Official jUDDI Website
+navbar.help.mailinglist=Mailing List Archive
+
+navbar.login.username=Username
+navbar.login.password=Password
+navbar.login.button=Login
+navbar.login.logout=Click to logout
+
+index.juddi=jUDDI (pronounced "Judy") is an open source Java implementation of the Universal Description, Discovery, and Integration (UDDI v3) specification for (Web) Services. Think of UDDI as the yellow pages of the phone book for web services.
+learnmore=Learn More
+viewdetails=View Details
+index.learn=Learn all about OASIS's UDDI Technical Specification
+index.search=An advanced search capability that allows you search for specific criteria.
+index.browse=Flip through the pages of UDDI. Whether you're just curious or you're looking for something specific and don't know what to search for, the browse feature is a good place to start.
+index.browse.title=Browse
+index.search.title=Search
+index.learn.title=About UDDI
+footer.apachecopyright=&copy; 2013 The Apache Software Foundation. All Rights Reserved.
+modal.digitalsignaturewarning.title=Digital Signature Warning
+modal.digitalsignaturewarning.body=This item is digitally signed. This means that when saving your changes, all existing signatures will become invalid and will automatically be excluded from the save process. 
+modal.close=Close
+modal.savechanges=Save Changes
+totals.records=Total records
+totals.recordsreturned=Records Returned
+totals.offset=Offset
+items.lang=Language
+items.loading=Loading
+pages.businesseditor.title=Business Editor
+pages.businesskey=Business Key
+pages.businesskey.description=The Business Key is the unique identifier for this business and exists within this registry.
+pages.editor.tabnav.general=General
+pages.editor.tabnav.discovery=Discovery
+pages.editor.tabnav.contacts=Contacts
+pages.editor.tabnav.categories=Categories
+pages.editor.tabnav.identifiers=Identifiers
+pages.editor.tabnav.services=Services
+pages.editor.tabnav.signatures=Signatures
+pages.editor.tabnav.opinfo=Operational Info
+pages.editor.tabnav.relatedbusinesses=Related Businesses
+items.name=Name
+items.business.name.description=Businesses are identified by one or more name. Multiple names are useful for different languages, legal names, or abbreviations.
+items.value=Value
+items.description=Description
+items.businesses.description=businesses can have more than one description, such as in a different language
+items.discoveryurl=Discovery URLs
+items.discoveryurl.description=are typically a link to a simple web page with additional information on it, such as a listing a services. Two reserved values are specified in the specification, 'homepage' and 'businessEntity'.
+items.type=Type
+items.contacts=Contacts
+items.contacts.description=Each business typically has several points of contact for a person or a job role within the business so that someone who finds the information can make human contact for any purpose. Examples for Type: "technical questions", "technical contact", "establish account", "sales contact".
+items.email=Email
+items.phone=Phone
+items.address=Address
+items.addressline.add=Add an addline (at least one is required).
+items.addressvalue=Address Value
+items.keyname.optional=Key Name (optional)
+items.keyvalue.optional=Key Value (optional)
+items.categories.description=UDDI uses a taxonomy system to categorize businesses and their services. These categories are defined as UDDI tModels and are defined by the administrator(s) of this UDDI node. These categories are appended to business registrations either by adding one or more "Key References" or by adding one or more "Key Reference Groups", which in turn can be a zero or more of Key References as part of it.
+items.keyrefcats=Keyed Reference Categories
+items.keyrefcat.add=Add Key Reference
+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.signed.not=This item is not digitally signed.
+item.signed=This item is digitally signed. Signature Count: 
+items.signed.viewcert=View Certificate
+actions.save=Save
+actions.delete=Delete
+actions.sign=Digitally Sign
+actions.transfer=Transfer Ownership
+actions.subscribe=Subscribe
+errors.unknownentity=Error, Unrecongized entity type.
+errors.nodatareturned=No data returned.
+items.business=Business
+error.generic=Error 
+errors.tmodel.prefix=A tModel partition key generator must have a name that starts with uddi: 
+errors.tmodel.postfix=A tModel partition key generator must have a name that ends with :keyGenerator
+messages.success=Success
+errors.norecordsfound=No records were found.
+#just a prefix
+errors.uddi=UDDI Error 
+errors.nocertavaiable=Error, no certificate was available.
+items.nodeid=Node ID
+items.authorizedname=Authorized Name
+items.created=Created
+items.modified=Modified
+items.modifiedwithchildren=Modified include children
+items.signed=This item is digitally signed. Count:
+errors.nobusinessid=No business ID was specified.
+errors.noservicesdefined=No services are defined.
+actions.save.bindingtemplate=Binding Template saved successfully!
+actions.save.service=Service saved successfully!
+errors.noinput.businesskey=Error, no input was provided for the business key.
+items.pubisher.name=Publisher Name
+items.publisher.authname=Authorized Name
+items.publisher.admin=Administrator
+errors.noinput=No input was provided.
+actions.save.tmodel=tModel saved successfully!
+actions.delete.tmodel=tModel deleted successfully.
+actions.delete.business=Business deleted successfully.
+actions.delete.service=Service deleted successfully.
+search.wrylf=What are you looking for?
+items.tmodel=tModel
+items.bindingtemplate=Binding Template
+search.criteria=Search Criteria
+search.criteria.byname=By Name
+search.criteria.bycategory=By Category
+search.criteria.bykey=By Unique Identifier
+search.criteria.bytmodel=By tModel
+search.tip=*Tip: use '%' for any number of wild card characters and '_' for a single wild card character.
+search.results=Search Results
+search.searchfirst=Try searching first
+items.publisher=Publisher
+items.dsigs=Digital Signatures
+items.service.browser=Service Browser
+items.tmodel.browser=tModel Browser
+items.dsigs.description=This page will enable you to digitally sign a UDDI entity using a Java Applet and an X509 Digital Certificate. Windows and MacOS are supported.
+items.settings.description=Administrators can use this page to change the way this UDDI browser is configured, such as endpoint URLs, SSL stores, authentication mechanisms and more.
+pages.tmodelpart.title=tModel Key Generators (Partitions)
+pages.tmodelpart.content=TModel Key Generators are a special kind of tModel that enables you to define new tModels with any arbitrary tModel prefix that you want. For example, if you wanted a tModel defined as "uddi:www.mycompany.com:ServiceAuthenticationMethod", you would first have to create a tModel key generator with the value of "uddi:www.mycompany.com:keyGenerator". This is part of the UDDI specification and acts as a governance mechanism. You can also create a tModel Key Generator by using the Creat tModel menu option and by adding the appropriate settings.
+pages.tmodelpart.juddinote=For jUDDI implementations of UDDI, the "root" account cannot be used to create a keyGenerator.
+pages.tmodelpart.key=The UDDI tModel key
+pages.thmodepart.name=A name describing the key
+pages.viewsubscriptions.content=UDDI offers the ability for users to subscribe for notification to changes in most entities within a UDDI registry. However, the notification part is a bit strange. Users of strict UDDIv3 registries have only one option, periodically poll the UDDI registry for changes via the Subscription API. Although there's data types defined within the UDDI v3 specification, there's no API method for setting up a callback style of subscription, where the registry user hosts a web service that waits for notifications. In a callback subscription, those that need the information are notified immediately.<br><br>jUDDI based registries have an extension to the UDDIv3 specification that enables call back type of communication and is thus preferred mechanism.
+pages.serviceeditor.title=Service Editor
+errors.generic=Error
+pages.businesseditor.businesslist=Business Services
+pages.businesseditor.businesslist2=are defined for this business.
+items.service=Service



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


Mime
View raw message