You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by al...@apache.org on 2013/04/01 04:08:20 UTC

svn commit: r1463077 [3/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...

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=1463077&r1=1463076&r2=1463077&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 Mon Apr  1 02:08:19 2013
@@ -5,15 +5,16 @@
 --%>
 
 <%@page import="org.apache.juddi.webconsole.hub.UddiHub"%>
+<%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
 <%@page contentType="text/html" pageEncoding="UTF-8"%>
 <!DOCTYPE html>
-<html lang="en">
+<html lang="<%=(String)session.getAttribute("locale")%>" dir="<%=ResourceLoader.GetResource(session,"direction")%>">
     <head>
         <meta charset="utf-8">
-        <title>Apache jUDDI - Open Source UDDI Discovery Services</title>
+        <title><%=ResourceLoader.GetResource(session,"title")%></title>
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        <meta name="description" content="">
-        <meta name="author" content="">
+        <meta name="description" content="<%=ResourceLoader.GetResource(session,"description")%>">
+        <meta name="author" content="Apache Software Foundation">
 
         <!-- Le styles -->
         <link href="css/bootstrap.css" rel="stylesheet">
@@ -61,55 +62,54 @@
                         <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">Home</a></li>
-                                <li class="dropdown" ><a href="#" data-toggle="dropdown" class="dropdowb-town">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="Browse for businesses">Businesses</a></li>
-                                        <li><a href="serviceBrowse.jsp" title="Browse for Services">Services</a></li>
-                                        <li><a href="tmodelBrowse.jsp" title="Browse for tModels">tModels</a></li>
-                                        <li><a href="publisherBrowse.jsp" title="Browse for Publishers">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="Browse for Services">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">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="Create a businesses">Business</a></li>
-                                        <li><a href="businessBrowse.jsp" title="Create a Service">Service</a></li>
-                                        <li><a href="tmodelEditor.jsp" title="Create a tModel">tModel</a></li>
-                                        <li><a href="tmodelPartitions.jsp" title="Create a tModel">tModel Partition (Key Generator)</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="Create a publisher">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">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="View my subscriptions">View</a></li>
-                                        <li><a href="serviceBrowse.jsp" title="Create a subscription">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">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="Configure this UDDI Browser">Configure</a></li>
-                                        <li><a href="nodeinfo.jsp" title="Information about the UDDI Node that's being accessed">UDDI Node Information</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>
                                     <ul class="dropdown-menu">
-                                        <li><a href="http://juddi.apache.org/docs/3.x/userguide/html/index.html" title="User Guide">User Guide</a></li>
-                                        <li><a href="http://juddi.apache.org/docs/3.x/devguide/html/index.html" title="Developer Guide">Dev Guide</a></li>
-                                        <li><a href="http://juddi.apache.org/docs.html" title="API Level Developer Documentation">API Documentation</a></li>
-                                        <li><a href="http://wiki.apache.org/juddi" title="jUDDI's Official Wiki">jUDDI Wiki</a></li>
-                                        <li><a href="http://juddi.apache.org/issue-tracking.html" title="jUDDI's Issue Tracker">File a bug</a></li>
-                                        <li><a href="http://juddi.apache.org/" title="The Offical jUDDI Website">jUDDI Website</a></li>
-                                        <li><a href="http://www.nabble.com/jUDDI-f218.html" title="User/Dev/SVN Mailing Lists">Mailing List Archive</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>
                             </ul>

Copied: juddi/branches/juddi-3.2.x/juddi-gui/web/home.jsp (from r1462731, 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/home.jsp?p2=juddi/branches/juddi-3.2.x/juddi-gui/web/home.jsp&p1=juddi/branches/juddi-3.2.x/juddi-gui/web/index.jsp&r1=1462731&r2=1463077&rev=1463077&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/index.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/home.jsp Mon Apr  1 02:08:19 2013
@@ -4,33 +4,35 @@
     Author     : Alex O'Ree
 --%>
 
+<%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
 <%@page contentType="text/html" pageEncoding="UTF-8"%>
-<%@include file="header-top.jsp" %>
-        <div class="container">
+<%@include file="header-top.jsp"%>
 
-            <!-- Main hero unit for a primary marketing message or call to action -->
-            <div class="hero-unit">
-                <h1>jUDDI</h1>
-                <p>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.</p>
-                <p><a href="#" class="btn btn-primary btn-large">Learn more &raquo;</a></p>
-            </div>
+<div class="container">
 
-            <!-- Example row of columns -->
-            <div class="row">
-                <div class="span4">
-                    <h2>Browse</h2>
-                    <p>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.</p>
-                    <p><a class="btn" href="businessBrowse.jsp">View details &raquo;</a></p>
-                </div>
-                <div class="span4">
-                    <h2>Search</h2>
-                    <p>An advanced search capability that allows you to ask for specific criteria.</p>
-                    <p><a class="btn" href="search.jsp">View details &raquo;</a></p>
-                </div>
-                <div class="span4">
-                    <h2>Manage</h2>
-                    <p></p>
-                    <p><a class="btn" href="#">View details &raquo;</a></p>
-                </div>
-            </div>
-<%@include file="header-bottom.jsp" %>
\ No newline at end of file
+    <!-- Main hero unit for a primary marketing message or call to action -->
+    <div class="hero-unit">
+        <h1>jUDDI</h1>
+        <p><%=ResourceLoader.GetResource(session, "index.juddi")%></p>
+        <p><a href="#" class="btn btn-primary btn-large"><%=ResourceLoader.GetResource(session, "learnmore")%> &raquo;</a></p>
+    </div>
+
+    <!-- Example row of columns -->
+    <div class="row">
+        <div class="span4">
+            <h2><%=ResourceLoader.GetResource(session, "index.browse.title")%></h2>
+            <p><%=ResourceLoader.GetResource(session, "index.browse")%></p>
+            <p><a class="btn" href="businessBrowse.jsp"><%=ResourceLoader.GetResource(session, "viewdetails")%> &raquo;</a></p>
+        </div>
+        <div class="span4">
+            <h2><%=ResourceLoader.GetResource(session, "navbar.search")%></h2>
+            <p><%=ResourceLoader.GetResource(session, "index.search")%></p>
+            <p><a class="btn" href="search.jsp"><%=ResourceLoader.GetResource(session, "viewdetails")%> &raquo;</a></p>
+        </div>
+        <div class="span4">
+            <h2><%=ResourceLoader.GetResource(session, "index.learn.title")%></h2>
+            <p><%=ResourceLoader.GetResource(session, "index.learn")%></p>
+            <p><a class="btn" href="http://uddi.org/pubs/uddi_v3.htm"><%=ResourceLoader.GetResource(session, "viewdetails")%> &raquo;</a></p>
+        </div>
+    </div>
+    <%@include file="header-bottom.jsp"%>
\ No newline at end of file

Added: juddi/branches/juddi-3.2.x/juddi-gui/web/img/bluemarble2.jpg
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/img/bluemarble2.jpg?rev=1463077&view=auto
==============================================================================
Binary file - no diff available.

Propchange: juddi/branches/juddi-3.2.x/juddi-gui/web/img/bluemarble2.jpg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

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=1463077&r1=1463076&r2=1463077&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 Mon Apr  1 02:08:19 2013
@@ -1,36 +1,98 @@
 <%-- 
     Document   : index
-    Created on : Feb 23, 2013, 2:05:35 PM
+    Created on : Mar 30, 2013, 10:05:37 PM
     Author     : Alex O'Ree
 --%>
 
 <%@page contentType="text/html" pageEncoding="UTF-8"%>
-<%@include file="header-top.jsp" %>
-        <div class="container">
+<!DOCTYPE html>
+<%
+    Cookie[] cookies = request.getCookies();
+    if (cookies != null && cookies.length > 0) {
+        for (int i = 0; i < cookies.length; i++) {
+            if (cookies[i] != null && cookies[i].getName() != null && cookies[i].getName().equalsIgnoreCase("locale")) {
+                if (cookies[i].getValue() != null) {
+                    session.setAttribute("locale", cookies[i].getValue());
+                    response.sendRedirect("home.jsp");
+                }
+            }
+        }
+    }
+    if (request.getMethod().equalsIgnoreCase("post")) {
+        String lang = request.getParameter("language");
+        String checked=request.getParameter("setcookie");
+        if (lang != null) {
+            session.setAttribute("locale", lang);
+            if (checked != null && checked.equalsIgnoreCase("on")) {
+                Cookie cookie = new Cookie("locale", lang);
+                //TODO this is for debugging purposes 
+                cookie.setMaxAge(356);
+                //cookie.setDomain("/UDDIBrowser");
+                cookie.setPath("/UDDIBrowser");
+                response.addCookie(cookie);
+            }
+            response.sendRedirect("home.jsp");
+        }
+    }
+%>
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <title>Welcome to jUDDI</title>
+        <meta charset="utf-8">
+        <title>Welcome to Apache jUDDI</title>
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <meta name="description" content="Apache jUDDI">
+        <meta name="author" content="Apache Software Foundation">
 
-            <!-- Main hero unit for a primary marketing message or call to action -->
-            <div class="hero-unit">
-                <h1>jUDDI</h1>
-                <p>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.</p>
-                <p><a href="#" class="btn btn-primary btn-large">Learn more &raquo;</a></p>
-            </div>
+        <!-- Le styles -->
+        <link href="css/bootstrap.css" rel="stylesheet">
+        <link rel="shortcut icon" href="favicon.ico" />
+        <link href="css/bootstrap-responsive.css" rel="stylesheet">
+
+        <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
+        <!--[if lt IE 9]>
+          <script src="js/html5shiv.js"></script>
+        <![endif]-->
+
+        <!-- Fav and touch icons -->
+
+        <link rel="shortcut icon" href="ico/favicon.png">
+        <style type="text/css">
+            body {
+                padding: 0px 0px 0px 0px;
+                margin: 0px 0px 0px 0px;
+            }
+        </style>
+
+    </head>
+    <body>
+        <div style="width:100%; height: 100%; position:absolute; text-align: center; vertical-align: middle; padding: 0px; margin: 0px; 
+             background-image: url('img/bluemarble2.jpg'); background-repeat: no-repeat; background-position-x: center;
+             background-position-y: center; background-size: cover">
+            <div style="color: black; background-color: whitesmoke; 
+                 background: rgb(235, 235, 235); /* Fall-back for browsers that don't
+                                    support rgba */
+                 background: rgba(235, 235, 235, .7);width:60%; position: relative; left:20%; top:25%; height:50%; vertical-align: middle">
+                <br><br>
+                <h1>Welcome to jUDDI</h1>
+                <form method="POST">
+
+                    <select id="language" name="language" >
+                        <option value="en" selected>English</option>
+                        <option value="es" >Español</option>
+                    </select>
+                    <br>
+                    <input type="checkbox" name="setcookie" checked> Remember my decision<br>
+                    <button type="submit" value="Go" class="btn btn-primary">Go</button>
 
-            <!-- Example row of columns -->
-            <div class="row">
-                <div class="span4">
-                    <h2>Browse</h2>
-                    <p>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.</p>
-                    <p><a class="btn" href="businessBrowse.jsp">View details &raquo;</a></p>
-                </div>
-                <div class="span4">
-                    <h2>Search</h2>
-                    <p>An advanced search capability that allows you to ask for specific criteria.</p>
-                    <p><a class="btn" href="search.jsp">View details &raquo;</a></p>
-                </div>
-                <div class="span4">
-                    <h2>Manage</h2>
-                    <p></p>
-                    <p><a class="btn" href="#">View details &raquo;</a></p>
-                </div>
+                </form><br>
+                <b>We welcome help internationalizing jUDDI!</b><br>
+                <script type="text/javascript">
+                
+                </script>
+                <noscript>Your browser does not support JavaScript! Functionality will be so severely reduced, that you might as well give up, sorry!</noscript>
             </div>
-<%@include file="header-bottom.jsp" %>
\ No newline at end of file
+        </div>
+    </body>
+</html>

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/js/main.js
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/js/main.js?rev=1463077&r1=1463076&r2=1463077&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/js/main.js (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/js/main.js Mon Apr  1 02:08:19 2013
@@ -65,6 +65,7 @@ function Login()
 
     request.fail(function(jqXHR, textStatus) {
         window.console && console.log('postback failed ');                                
+        //TODO handle expired nonce values?
         RefreshLoginPage();
         $("#loginbutton").text("Login");
     });

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/login.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/login.jsp?rev=1463077&r1=1463076&r2=1463077&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/login.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/login.jsp Mon Apr  1 02:08:19 2013
@@ -4,27 +4,29 @@
     Author     : Alex O'Ree
 --%>
 
+<%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
 <%@page import="org.apache.commons.lang.StringEscapeUtils"%>
 <%@page contentType="text/html" pageEncoding="UTF-8"%>
 <!DOCTYPE html>
 
 <div class="navbar-form pull-right">
+   
     <%
         if (session.getAttribute("username") == null || session.getAttribute("password") == null) {
     %>
     <script type="text/javascript">
         loggedin = false;
     </script>
-    <input class="span2" type="text" placeholder="Username" name="username" id="username">
-    <input class="span2" type="password" placeholder="Password" name="password" id="password">
-    <button type="button" onclick="javascript:Login();" class="btn" id="loginbutton">Login</button>
+    <input class="span2" type="text" placeholder="<%=ResourceLoader.GetResource(session,"navbar.login.username")%>" name="username" id="username">
+    <input class="span2" type="password" placeholder="<%=ResourceLoader.GetResource(session,"navbar.login.password")%>" name="password" id="password">
+    <button type="button" onclick="javascript:Login();" class="btn" id="loginbutton"><%=ResourceLoader.GetResource(session,"navbar.login.button") %></button>
 
     <%    } else {
     %>
-     <script type="text/javascript">
+    <script type="text/javascript">
         loggedin = true;
     </script>
-    <a class="btn" title="Click to logout" href="javascript:logout();"><i class="icon-user"></i>
+    <a class="btn" title="<%=ResourceLoader.GetResource(session,"navbar.login.logout")%>" href="javascript:logout();"><i class="icon-user"></i>
         <%
                 out.write("Welcome " + StringEscapeUtils.escapeHtml((String) session.getAttribute("username")) + "</a>");
 

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/publisherBrowse.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/publisherBrowse.jsp?rev=1463077&r1=1463076&r2=1463077&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/publisherBrowse.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/publisherBrowse.jsp Mon Apr  1 02:08:19 2013
@@ -12,7 +12,7 @@
 
     <!-- Main hero unit for a primary marketing message or call to action -->
     <div class="well" >
-        <h1>Publishers</h1>
+        <h1><%=ResourceLoader.GetResource(session, "items.publisher")%></h1>
     </div>
 
     <!-- Example row of columns -->

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/search.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/search.jsp?rev=1463077&r1=1463076&r2=1463077&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/search.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/search.jsp Mon Apr  1 02:08:19 2013
@@ -4,7 +4,7 @@
     Author     : Alex O'Ree
 --%>
 
-<%@page import="org.apache.juddi.query.util.FindQualifiers"%>
+<%@page import="org.apache.juddi.v3.client.UDDIConstants"%>
 <%@page import="org.apache.juddi.webconsole.hub.UddiHub"%>
 
 <%@page contentType="text/html" pageEncoding="UTF-8"%>
@@ -13,7 +13,7 @@
 
     <!-- Main hero unit for a primary marketing message or call to action -->
     <div class="well" >
-        <h1>Search</h1>
+        <h1><%= ResourceLoader.GetResource(session, "navbar.search")%> </h1>
     </div>
 
     <!-- Example row of columns -->
@@ -29,64 +29,64 @@
                 <div class="accordion-group">
                     <div class="accordion-heading">
                         <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#collapseOne">
-                            <b>Search!</b>
+                            <b><%= ResourceLoader.GetResource(session, "navbar.search")%> !</b>
                         </a>
                     </div>
                     <div id="collapseOne" class="accordion-body collapse in">
                         <div class="accordion-inner">
-                            What are you looking for?<Br>
+                            <%= ResourceLoader.GetResource(session, "search.waylf")%><Br>
                             <div class="btn-group" id="searchfor" data-toggle="buttons-radio">
-                                <button type="button" class="btn active" value="business">Business</button>
+                                <button type="button" class="btn active" value="business"><%= ResourceLoader.GetResource(session, "items.business")%></button>
                                 <!--<button type="button" class="btn " >Related Business</button>-->
-                                <button type="button" class="btn " value="service">Service</button>
-                                <button type="button" class="btn " value="bindingTemplate">Binding Template</button>
-                                <button type="button" class="btn " value="tModel">tModel</button>
+                                <button type="button" class="btn " value="service"><%= ResourceLoader.GetResource(session, "items.service")%></button>
+                                <button type="button" class="btn " value="bindingTemplate"><%= ResourceLoader.GetResource(session, "items.bindingtemplate")%></button>
+                                <button type="button" class="btn " value="tModel"><%= ResourceLoader.GetResource(session, "items.tmodel")%></button>
                                 <% if (x.IsJuddiRegistry()) {
                                 %>
-                                <button type="button" class="btn " >Publisher</button>
+                                <button type="button" class="btn " ><%= ResourceLoader.GetResource(session, "items.publisher")%></button>
                                 <% }
                                 %>
                             </div><br><Br>
-                            Search Criteria<br>
+                            <%= ResourceLoader.GetResource(session, "search.criteria")%><br>
                             <div class="btn-group" id="searchcriteria" data-toggle="buttons-radio">
-                                <button type="button" class="btn active" active value="name">By Name</button>
-                                <button type="button" class="btn " value="category">By Category</button>
-                                <button type="button" class="btn " value="key">Unique Identifier</button>
-                                <button type="button" class="btn " value="tmodel">tModel</button>
+                                <button type="button" class="btn active" active value="name"><%= ResourceLoader.GetResource(session, "search.criteria.byname")%></button>
+                                <button type="button" class="btn " value="category"><%= ResourceLoader.GetResource(session, "search.criteria.bycategory")%></button>
+                                <button type="button" class="btn " value="key"><%= ResourceLoader.GetResource(session, "search.criteria.bykey")%></button>
+                                <button type="button" class="btn " value="tmodel"><%= ResourceLoader.GetResource(session, "search.criteria.bytmodel")%></button>
                             </div><br>
                             Find Qualifiers<br>
 
                             <div style=" float:left; padding: 2px">
 
-                            <div ><input type="checkbox" name="<%=FindQualifiers.AND_ALL_KEYS%>" value="<%=FindQualifiers.AND_ALL_KEYS%>"> <%=FindQualifiers.AND_ALL_KEYS%></div>
-                            <div ><input type="checkbox" name="<%=FindQualifiers.APPROXIMATE_MATCH%>" value="<%=FindQualifiers.APPROXIMATE_MATCH%>"> <%=FindQualifiers.APPROXIMATE_MATCH%></div>
-                            <div ><input type="checkbox" name="<%=FindQualifiers.BINARY_SORT%>" value="<%=FindQualifiers.BINARY_SORT%>"> <%=FindQualifiers.BINARY_SORT%></div>
-                            <div ><input type="checkbox" name="<%=FindQualifiers.BINDING_SUBSET%>" value="<%=FindQualifiers.BINDING_SUBSET%>"> <%=FindQualifiers.BINDING_SUBSET%></div>
-                            <div ><input type="checkbox" name="<%=FindQualifiers.CASE_INSENSITIVE_MATCH%>" value="<%=FindQualifiers.CASE_INSENSITIVE_MATCH%>"> <%=FindQualifiers.CASE_INSENSITIVE_MATCH%></div>
+                            <div ><input type="checkbox" name="<%=UDDIConstants.AND_ALL_KEYS%>" value="<%=UDDIConstants.AND_ALL_KEYS%>"> <%=UDDIConstants.AND_ALL_KEYS%></div>
+                            <div ><input type="checkbox" name="<%=UDDIConstants.APPROXIMATE_MATCH%>" value="<%=UDDIConstants.APPROXIMATE_MATCH%>"> <%=UDDIConstants.APPROXIMATE_MATCH%></div>
+                            <div ><input type="checkbox" name="<%=UDDIConstants.BINARY_SORT%>" value="<%=UDDIConstants.BINARY_SORT%>"> <%=UDDIConstants.BINARY_SORT%></div>
+                            <div ><input type="checkbox" name="<%=UDDIConstants.BINDING_SUBSET%>" value="<%=UDDIConstants.BINDING_SUBSET%>"> <%=UDDIConstants.BINDING_SUBSET%></div>
+                            <div ><input type="checkbox" name="<%=UDDIConstants.CASE_INSENSITIVE_MATCH%>" value="<%=UDDIConstants.CASE_INSENSITIVE_MATCH%>"> <%=UDDIConstants.CASE_INSENSITIVE_MATCH%></div>
                             </div>
                             <div style=" float:left; padding: 2px">
-                            <div ><input type="checkbox" name="<%=FindQualifiers.CASE_INSENSITIVE_SORT%>" value="<%=FindQualifiers.CASE_INSENSITIVE_SORT%>"> <%=FindQualifiers.CASE_INSENSITIVE_SORT%></div>
-                            <div ><input type="checkbox" name="<%=FindQualifiers.CASE_SENSITIVE_MATCH%>" value="<%=FindQualifiers.CASE_SENSITIVE_MATCH%>"> <%=FindQualifiers.CASE_SENSITIVE_MATCH%></div>
-                            <div ><input type="checkbox" name="<%=FindQualifiers.CASE_SENSITIVE_SORT%>" value="<%=FindQualifiers.CASE_SENSITIVE_SORT%>"> <%=FindQualifiers.CASE_SENSITIVE_SORT%></div>
-                            <div ><input type="checkbox" name="<%=FindQualifiers.COMBINE_CATEGORY_BAGS%>" value="<%=FindQualifiers.COMBINE_CATEGORY_BAGS%>"> <%=FindQualifiers.COMBINE_CATEGORY_BAGS%></div>
-                            <div ><input type="checkbox" name="<%=FindQualifiers.DIACRITIC_INSENSITIVE_MATCH%>" value="<%=FindQualifiers.DIACRITIC_INSENSITIVE_MATCH%>"> <%=FindQualifiers.DIACRITIC_INSENSITIVE_MATCH%></div>
+                            <div ><input type="checkbox" name="<%=UDDIConstants.CASE_INSENSITIVE_SORT%>" value="<%=UDDIConstants.CASE_INSENSITIVE_SORT%>"> <%=UDDIConstants.CASE_INSENSITIVE_SORT%></div>
+                            <div ><input type="checkbox" name="<%=UDDIConstants.CASE_SENSITIVE_MATCH%>" value="<%=UDDIConstants.CASE_SENSITIVE_MATCH%>"> <%=UDDIConstants.CASE_SENSITIVE_MATCH%></div>
+                            <div ><input type="checkbox" name="<%=UDDIConstants.CASE_SENSITIVE_SORT%>" value="<%=UDDIConstants.CASE_SENSITIVE_SORT%>"> <%=UDDIConstants.CASE_SENSITIVE_SORT%></div>
+                            <div ><input type="checkbox" name="<%=UDDIConstants.COMBINE_CATEGORY_BAGS%>" value="<%=UDDIConstants.COMBINE_CATEGORY_BAGS%>"> <%=UDDIConstants.COMBINE_CATEGORY_BAGS%></div>
+                            <div ><input type="checkbox" name="<%=UDDIConstants.DIACRITIC_INSENSITIVE_MATCH%>" value="<%=UDDIConstants.DIACRITIC_INSENSITIVE_MATCH%>"> <%=UDDIConstants.DIACRITIC_INSENSITIVE_MATCH%></div>
                             </div>
                             <div style=" float:left; padding: 2px">
-                            <div ><input type="checkbox" name="<%=FindQualifiers.DIACRITIC_SENSITIVE_MATCH%>" value="<%=FindQualifiers.DIACRITIC_SENSITIVE_MATCH%>"> <%=FindQualifiers.DIACRITIC_SENSITIVE_MATCH%></div>
-                            <div ><input type="checkbox" name="<%=FindQualifiers.EXACT_MATCH%>" value="<%=FindQualifiers.EXACT_MATCH%>"> <%=FindQualifiers.EXACT_MATCH%></div>
-                            <div ><input type="checkbox" name="<%=FindQualifiers.OR_ALL_KEYS%>" value="<%=FindQualifiers.OR_ALL_KEYS%>"> <%=FindQualifiers.OR_ALL_KEYS%></div>
-                            <div ><input type="checkbox" name="<%=FindQualifiers.OR_LIKE_KEYS%>" value="<%=FindQualifiers.OR_LIKE_KEYS%>"> <%=FindQualifiers.OR_LIKE_KEYS%></div>
-                            <div ><input type="checkbox" name="<%=FindQualifiers.SERVICE_SUBSET%>" value="<%=FindQualifiers.SERVICE_SUBSET%>"> <%=FindQualifiers.SERVICE_SUBSET%></div>
+                            <div ><input type="checkbox" name="<%=UDDIConstants.DIACRITIC_SENSITIVE_MATCH%>" value="<%=UDDIConstants.DIACRITIC_SENSITIVE_MATCH%>"> <%=UDDIConstants.DIACRITIC_SENSITIVE_MATCH%></div>
+                            <div ><input type="checkbox" name="<%=UDDIConstants.EXACT_MATCH%>" value="<%=UDDIConstants.EXACT_MATCH%>"> <%=UDDIConstants.EXACT_MATCH%></div>
+                            <div ><input type="checkbox" name="<%=UDDIConstants.OR_ALL_KEYS%>" value="<%=UDDIConstants.OR_ALL_KEYS%>"> <%=UDDIConstants.OR_ALL_KEYS%></div>
+                            <div ><input type="checkbox" name="<%=UDDIConstants.OR_LIKE_KEYS%>" value="<%=UDDIConstants.OR_LIKE_KEYS%>"> <%=UDDIConstants.OR_LIKE_KEYS%></div>
+                            <div ><input type="checkbox" name="<%=UDDIConstants.SERVICE_SUBSET%>" value="<%=UDDIConstants.SERVICE_SUBSET%>"> <%=UDDIConstants.SERVICE_SUBSET%></div>
                             </div>
                             <div style=" float:left; padding: 2px">
-                            <div ><input type="checkbox" name="<%=FindQualifiers.SIGNATURE_PRESENT%>" value="<%=FindQualifiers.SIGNATURE_PRESENT%>"> <%=FindQualifiers.SIGNATURE_PRESENT%></div>
-                            <div ><input type="checkbox" name="<%=FindQualifiers.SORT_BY_DATE_ASC%>" value="<%=FindQualifiers.SORT_BY_DATE_ASC%>"> <%=FindQualifiers.SORT_BY_DATE_ASC%></div>
-                            <div ><input type="checkbox" name="<%=FindQualifiers.SORT_BY_DATE_DESC%>" value="<%=FindQualifiers.SORT_BY_DATE_DESC%>"> <%=FindQualifiers.SORT_BY_DATE_DESC%></div>
-                            <div ><input type="checkbox" name="<%=FindQualifiers.SORT_BY_NAME_ASC%>" value="<%=FindQualifiers.SORT_BY_NAME_ASC%>"> <%=FindQualifiers.SORT_BY_NAME_ASC%></div>
-                            <div ><input type="checkbox" name="<%=FindQualifiers.SORT_BY_NAME_DESC%>" value="<%=FindQualifiers.SORT_BY_NAME_DESC%>"> <%=FindQualifiers.SORT_BY_NAME_DESC%></div>
+                            <div ><input type="checkbox" name="<%=UDDIConstants.SIGNATURE_PRESENT%>" value="<%=UDDIConstants.SIGNATURE_PRESENT%>"> <%=UDDIConstants.SIGNATURE_PRESENT%></div>
+                            <div ><input type="checkbox" name="<%=UDDIConstants.SORT_BY_DATE_ASC%>" value="<%=UDDIConstants.SORT_BY_DATE_ASC%>"> <%=UDDIConstants.SORT_BY_DATE_ASC%></div>
+                            <div ><input type="checkbox" name="<%=UDDIConstants.SORT_BY_DATE_DESC%>" value="<%=UDDIConstants.SORT_BY_DATE_DESC%>"> <%=UDDIConstants.SORT_BY_DATE_DESC%></div>
+                            <div ><input type="checkbox" name="<%=UDDIConstants.SORT_BY_NAME_ASC%>" value="<%=UDDIConstants.SORT_BY_NAME_ASC%>"> <%=UDDIConstants.SORT_BY_NAME_ASC%></div>
+                            <div ><input type="checkbox" name="<%=UDDIConstants.SORT_BY_NAME_DESC%>" value="<%=UDDIConstants.SORT_BY_NAME_DESC%>"> <%=UDDIConstants.SORT_BY_NAME_DESC%></div>
                             </div>
-                            <div ><input type="checkbox" name="<%=FindQualifiers.SUPPRESS_PROJECTED_SERVICES%>" value="<%=FindQualifiers.SUPPRESS_PROJECTED_SERVICES%>"> <%=FindQualifiers.SUPPRESS_PROJECTED_SERVICES%></div>
-                            <div ><input type="checkbox" name="<%=FindQualifiers.UTS_10%>" value="<%=FindQualifiers.UTS_10%>"> <%=FindQualifiers.UTS_10%></div>
+                            <div ><input type="checkbox" name="<%=UDDIConstants.SUPPRESS_PROJECTED_SERVICES%>" value="<%=UDDIConstants.SUPPRESS_PROJECTED_SERVICES%>"> <%=UDDIConstants.SUPPRESS_PROJECTED_SERVICES%></div>
+                            <div ><input type="checkbox" name="<%=UDDIConstants.UTS_10%>" value="<%=UDDIConstants.UTS_10%>"> <%=UDDIConstants.UTS_10%></div>
 
                             <Br>
                             <br>
@@ -94,9 +94,9 @@
                                 <br><Br>
                                 <input type="text" placeholder="Type something…" id="searchcontent">
                                 <input type="text" placeholder="Language" id="lang"><br>
-                                *Tip: use '%' for any number of wild card characters and '_' for a single wild card character.
+                                <%= ResourceLoader.GetResource(session, "search.tip")%>
                                 <br>
-                                <a href="javascript:search();" class="btn btn-primary btn-large">Search</a>
+                                <a href="javascript:search();" class="btn btn-primary btn-large"><%= ResourceLoader.GetResource(session, "navbar.search")%> </a>
                             </div>
                         </div>
                     </div>
@@ -104,12 +104,12 @@
                 <div class="accordion-group">
                     <div class="accordion-heading">
                         <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#collapseTwo">
-                            Results
+                             <%= ResourceLoader.GetResource(session, "search.results")%>
                         </a>
                     </div>
                     <div id="collapseTwo" class="accordion-body collapse">
                         <div class="accordion-inner" id="resultdivs">
-                            Try Searching first...
+                             <%= ResourceLoader.GetResource(session, "search.searchfirst")%>
                         </div>
                     </div>
                 </div>

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/serviceBrowse.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/serviceBrowse.jsp?rev=1463077&r1=1463076&r2=1463077&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/serviceBrowse.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/serviceBrowse.jsp Mon Apr  1 02:08:19 2013
@@ -12,18 +12,18 @@
 
     <!-- Main hero unit for a primary marketing message or call to action -->
     <div class="well" >
-        <h1>Service Browser</h1>
+        <h1><%=ResourceLoader.GetResource(session, "navbar.search")%></h1>
     </div>
 
     <!-- Example row of columns -->
     <div class="row">
         <div class="span12" >
             <div id="businesslist">
-                Total records: <span id="totalrecords"></span><br>
-                Records returned: <span id="displayrecords"></span><br>
-                Offset: <span id="offset">0</span><br>
-                Lang: <span id="lang" class="edit"></span><br>
-                
+                <%=ResourceLoader.GetResource(session, "totals.records")%>: <span id="totalrecords"></span><br>
+                <%=ResourceLoader.GetResource(session, "totals.recordsreturned")%>: <span id="displayrecords"></span><br>
+                <%=ResourceLoader.GetResource(session, "totals.offset")%> : <span id="offset">0</span><br>
+                <%=ResourceLoader.GetResource(session, "items.lang")%>: <span id="lang" class="edit"></span><br>
+
                 <a href="javascript:pagedown();"><i class="icon-circle-arrow-left " id="pageup"></i></a>
                 <a href="javascript:refreshServiceList();"><i class="icon-refresh " id="refresh"></i></a>
                 <a href="javascript:pageup();"><i class="icon-circle-arrow-right " id="pagedown"></i></a>

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/serviceEditor.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/serviceEditor.jsp?rev=1463077&r1=1463076&r2=1463077&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/serviceEditor.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/serviceEditor.jsp Mon Apr  1 02:08:19 2013
@@ -15,7 +15,7 @@
 
     <!-- Main hero unit for a primary marketing message or call to action -->
     <div class="well" >
-        <h1>Service Editor</h1>
+        <h1><%=ResourceLoader.GetResource(session, "pages.serviceeditor.title")%></h1>
     </div>
 
     <!-- Example row of columns -->
@@ -60,7 +60,7 @@
                     int totalBTDescriptions = 0;
                 %>
 
-                <i class="icon-lock"></i><b>Business Key </b>-
+                <i class="icon-lock"></i><b> Business Key </b>-
                 The Business Key is the unique identifier for the business that this service belongs to. It cannot be modified.<br>
                 <div style="border-width: 2px; border-style: solid;" class="noedit" id="<%=PostBackConstants.BUSINESSKEY%>">
                     <%
@@ -299,7 +299,7 @@
                                         out.write(StringEscapeUtils.escapeHtml(bd.getBindingTemplates().getBindingTemplate().get(i).getBindingKey()));
                                     }
                                     // out.write("</div>");
-                            %>          
+%>          
                             <br>
                             <a href="javascript:AddDescriptionSpecific('<%=PostBackConstants.BINDINGTEMPLATE + i + PostBackConstants.DESCRIPTION%>');"><i class="icon-plus-sign"></i></a>Add a Binding Template Description - binding templates can have more than one description, such as in a different language.<Br>
 
@@ -359,7 +359,7 @@
                                                 + "<div class=\"edit\" id=\"" + PostBackConstants.BINDINGTEMPLATE + i + PostBackConstants.TMODELINSTANCE + k + PostBackConstants.KEYNAME + "\">" + StringEscapeUtils.escapeHtml(bd.getBindingTemplates().getBindingTemplate().get(i).getTModelInstanceDetails().getTModelInstanceInfo().get(k).getTModelKey()) + "</div>");
                                         //  out.write("<div style=\"float:left\"><span title=\"Instance Params\">Value</span>:&nbsp;</div>"
                                         //          + "<div class=\"edit\" id=\"" + PostBackConstants.BINDINGTEMPLATE + i + PostBackConstants.TMODELINSTANCE + k + PostBackConstants.VALUE + "\">" + ((bd.getBindingTemplates().getBindingTemplate().get(i).getTModelInstanceDetails().getTModelInstanceInfo().get(k).getInstanceDetails() != null) ? StringEscapeUtils.escapeHtml(bd.getBindingTemplates().getBindingTemplate().get(i).getTModelInstanceDetails().getTModelInstanceInfo().get(k).getInstanceDetails().getInstanceParms()) : "") + "</div>");
-                                    %>
+%>
                                     <br>
                                     <%
 
@@ -431,7 +431,7 @@
                                 </div>
 
                                 <%    } //end of instance details
-                                %>
+%>
                             </div>                                        
                             <%
                                 }
@@ -494,7 +494,7 @@
                         <%
 
                             } //end of binding templates loop
-                        %>
+%>
 
 
                         <%//end of tmodel instance%>
@@ -533,7 +533,7 @@
 
                 <div class="tab-pane" id="opinfo">
                     <script type="text/javascript">
-                        $.get("ajax/opInfo.jsp?id=<%=StringEscapeUtils.escapeJavaScript(bd.getServiceKey())   %>", function(data){
+                        $.get("ajax/opInfo.jsp?id=<%=StringEscapeUtils.escapeJavaScript(bd.getServiceKey())%>", function(data){
                             $("#opinfodiv").html(data);
                         } )
                     </script>
@@ -552,32 +552,33 @@
         <a class="btn btn-primary " href="javascript:saveService();">Save</a> | 
         <%  } else {
         %>
-        <a href="#confirmDialog" role="button" class="btn btn-primary" data-toggle="modal">Save</a> |
+        <a href="#confirmDialog" role="button" class="btn btn-primary" data-toggle="modal"><%=ResourceLoader.GetResource(session, "actions.save")%></a> |
 
         <%        }
             //        <a class="btn btn-primary " href="javascript:saveService();">Save</a> | 
-%>
+        %>
 
 
-        <a class="btn btn-danger " href="javascript:deleteService();">Delete</a> |
-        <a class="btn btn-success " href="#"">Digitally Sign</a> |
-        <a class="btn btn-info " href="#" title="Alert me when this entity changes">Subscribe</a> |
-        <a class="btn btn-warning " href="#" title="Transfer this entity to another UDDI node">Transfer</a>
+        <a class="btn btn-danger " href="javascript:deleteService();"><%=ResourceLoader.GetResource(session, "actions.delete")%></a> |
+        <a class="btn btn-success " href="signer.jsp?id=<%=URLEncoder.encode(bd.getServiceKey(), "UTF8")%>&type=service"><%=ResourceLoader.GetResource(session, "actions.sign")%></a> |
+        <a class="btn btn-info " href="#" title="Alert me when this entity changes"><%=ResourceLoader.GetResource(session, "actions.subscribe")%></a> |
+        <a class="btn btn-warning " href="#" title="Transfer this entity to another UDDI node"><%=ResourceLoader.GetResource(session, "actions.transfer")%></a>
     </div>
     <script type="text/javascript" src="js/businessEditor.js"></script>
     <script type="text/javascript" src="js/serviceEditor.js"></script>
+
     <div class="modal hide fade" id="confirmDialog">
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h3>Digital Signature Warning</h3>
+            <h3><%=ResourceLoader.GetResource(session, "modal.digitalsignaturewarning.title")%></h3>
         </div>
         <div class="modal-body">
-            <p>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. </p>
+            <p><%=ResourceLoader.GetResource(session, "modal.digitalsignaturewarning.body")%></p>
         </div>
         <div class="modal-footer">
-            <a href="#" class="btn">Close</a>
-            <a href="javascript:saveService();$('#confirmDialog').modal('hide');" class="btn btn-primary">Save changes</a>
+            <a href="#" class="btn"><%=ResourceLoader.GetResource(session, "modal.close")%></a>
+            <a href="javascript:saveService();$('#confirmDialog').modal('hide');" class="btn btn-primary">
+                <%=ResourceLoader.GetResource(session, "modal.savechanges")%></a>
         </div>
     </div>
     <!-- container div is in header bottom-->

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/settings.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/settings.jsp?rev=1463077&r1=1463076&r2=1463077&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/settings.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/settings.jsp Mon Apr  1 02:08:19 2013
@@ -4,22 +4,21 @@
     Author     : Alex O'Ree
 --%>
 
-<%@page import="org.apache.juddi.query.FindBusinessByNameQuery"%>
 <%@page contentType="text/html" pageEncoding="UTF-8"%>
 <%@include file="header-top.jsp" %>
         <div class="container">
 
             <!-- Main hero unit for a primary marketing message or call to action -->
             <div class="well">
-                <h1>Settings</h1>
+                <h1><%=ResourceLoader.GetResource(session, "navbar.settings")%></h1>
             </div>
 
             <!-- Example row of columns -->
             <div class="row">
                 <div class="span12">
-                    <h2>Settings</h2>
-                    <p>Administrators can use this page to change the way this UDDI browser is configured, such as endpoint URLs, SSL stores, authentication mechanisms and more.</p>
-                    <p><a class="btn" href="businessBrowse.jsp">View details &raquo;</a></p>
+                    <h2><%=ResourceLoader.GetResource(session, "navbar.settings")%></h2>
+                    <p><%=ResourceLoader.GetResource(session, "items.settings.description")%></p>
+                    <p><a class="btn" href="businessBrowse.jsp"><%=ResourceLoader.GetResource(session, "viewdetails")%> &raquo;</a></p>
                 </div>
             </div>
 <%@include file="header-bottom.jsp" %>
\ No newline at end of file

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/signer.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/signer.jsp?rev=1463077&r1=1463076&r2=1463077&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/signer.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/signer.jsp Mon Apr  1 02:08:19 2013
@@ -10,13 +10,16 @@
 
     <!-- Main hero unit for a primary marketing message or call to action -->
     <div class="well">
-        <h1>Digital Signature</h1>
+        <h1>
+            <%=ResourceLoader.GetResource(session, "items.dsigs")%>
+            </h1>
     </div>
 
     <!-- Example row of columns -->
     <div class="row">
         <div class="span12">
-            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.
+            <%=ResourceLoader.GetResource(session, "items.dsigs.description")%>
+            
             <applet code="org.apache.juddi.gui.dsig.XmlSignatureApplet" archive="applets/juddi-gui-dsig.jar"></applet> 
             <script type="text/javascript">
                 <%

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/tmodelBrowse.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/tmodelBrowse.jsp?rev=1463077&r1=1463076&r2=1463077&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/tmodelBrowse.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/tmodelBrowse.jsp Mon Apr  1 02:08:19 2013
@@ -12,19 +12,19 @@
 
     <!-- Main hero unit for a primary marketing message or call to action -->
     <div class="well" >
-        <h2>Browse tModels</h2>
+        <h2><%=ResourceLoader.GetResource(session, "items.tmodel.browser")%></h2>
     </div>
 
     <!-- Example row of columns -->
     <div class="row">
         <div class="span12" >
-            Total records: <span id="totalrecords"></span><br>
-            Records returned: <span id="displayrecords"></span><br>
-            Offset: <span id="offset">0</span><br>
-            Lang: <span id="lang" class="edit"></span><br>
-          
+            <%=ResourceLoader.GetResource(session, "totals.records")%>: <span id="totalrecords"></span><br>
+            <%=ResourceLoader.GetResource(session, "totals.recordsreturned")%>: <span id="displayrecords"></span><br>
+            <%=ResourceLoader.GetResource(session, "totals.offset")%> : <span id="offset">0</span><br>
+            <%=ResourceLoader.GetResource(session, "items.lang")%>: <span id="lang" class="edit"></span><br>
+
             <a href="javascript:pagedown();"><i class="icon-circle-arrow-left disabled " id="pageup"></i></a>
-              <a href="javascript:reload();"><i class="icon-refresh"></i></a>
+            <a href="javascript:reload();"><i class="icon-refresh"></i></a>
             <a href="javascript:pageup();"><i class="icon-circle-arrow-right disabled" id="pagedown"></i></a>
 
             <div id="tmodellist">
@@ -42,7 +42,7 @@
                     console.log(value);
                     console.log(settings);
                     reload();
-                  //  RenderTmodelListBySearch('%', offset, maxrecords);
+                    //  RenderTmodelListBySearch('%', offset, maxrecords);
                     return(value);
                 }, { 
                     type    : 'text',

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/tmodelEditor.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/tmodelEditor.jsp?rev=1463077&r1=1463076&r2=1463077&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/tmodelEditor.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/tmodelEditor.jsp Mon Apr  1 02:08:19 2013
@@ -188,7 +188,7 @@
                             out.write("</div>");//end this block
                         }
                         out.write("</div>");//end of overview
-%>
+                    %>
 
                 </div>
 
@@ -242,34 +242,48 @@
                 </div>
                 <div class="tab-pane " id="signatures">
 
-                   <%
-                            if (bd.getSignature().isEmpty()) {
-                                out.write("This item is not digitally signed.");
-                            } else {
-                                out.write("This item is digitally signed " + bd.getSignature().size());
-                        %>
-                        <table class="table">
+                    <%
+                        if (bd.getSignature().isEmpty()) {
+                            out.write("This item is not digitally signed.");
+                        } else {
+                            out.write("This item is digitally signed " + bd.getSignature().size());
+                    %>
+                    <table class="table">
 
 
-                            <%
-                                    for (int k = 0; k < bd.getSignature().size(); k++) {
-                                        out.write("<tr><td>");
-                                        out.write(x.SignatureToReadable(bd.getSignature().get(k)));
-                                        out.write("</td><td>");
-                                        out.write("<a href=\"ajax/getCert.jsp?type=tmodel&id=" + URLEncoder.encode(bd.getTModelKey(), "UTF-8") + "&index=" + k + "\">View Certificate</a>");
-                                        out.write("</td></tr>");
-                                    }
+                        <%
+                                for (int k = 0; k < bd.getSignature().size(); k++) {
+                                    out.write("<tr><td>");
+                                    out.write(x.SignatureToReadable(bd.getSignature().get(k)));
+                                    out.write("</td><td>");
+                                    out.write("<a href=\"ajax/getCert.jsp?type=tmodel&id=" + URLEncoder.encode(bd.getTModelKey(), "UTF-8") + "&index=" + k + "\">View Certificate</a>");
+                                    out.write("</td></tr>");
                                 }
+                            }
 
-                            %>
-                        </table>
+                        %>
+                    </table>
                 </div>
                 <div><br>
-                    <a class="btn btn-primary " href="javascript:savetModel();">Save</a> | 
-                    <a class="btn btn-danger " href="javascript:deletetModel();">Delete</a> |
-                    <a class="btn btn-success " href="#"">Digitally Sign</a> |
-                    <a class="btn btn-info " href="#" title="Alert me when this entity changes">Subscribe</a> |
-                    <a class="btn btn-warning " href="#" title="Transfer this entity to another UDDI node">Transfer</a>
+                    <%
+                        if (bd.getSignature().isEmpty()) {
+                    %>
+                    <a class="btn btn-primary " href="javascript:savetModel();"><%=ResourceLoader.GetResource(session, "actions.save")%></a> | 
+                    <%  } else {
+                    %>
+                    <a href="#confirmDialog" role="button" class="btn btn-primary" data-toggle="modal"><%=ResourceLoader.GetResource(session, "actions.save")%></a> |
+
+                    <%        }
+                    %>
+
+                    <a class="btn btn-danger " href="javascript:deletetModel();"><%=ResourceLoader.GetResource(session, "actions.delete")%></a> |
+                    <a class="btn btn-success " href="signer.jsp?id=<%=URLEncoder.encode(bd.getTModelKey(), "UTF8")%>&type=business"><%=ResourceLoader.GetResource(session, "actions.sign")%></a> |
+                    <a class="btn btn-info " href="#" title="Alert me when this entity changes"><%=ResourceLoader.GetResource(session, "actions.subscribe")%></a> |
+                    <a class="btn btn-warning " href="#" title="Transfer this entity to another UDDI node"><%=ResourceLoader.GetResource(session, "actions.transfer")%></a>
+
+
+
+
                 </div>
             </div>
             <script src="js/tmodeledit.js"></script>
@@ -280,5 +294,20 @@
 
             </p>
         </div>
+
+        <div class="modal hide fade" id="confirmDialog">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                <h3><%=ResourceLoader.GetResource(session, "modal.digitalsignaturewarning.title")%></h3>
+            </div>
+            <div class="modal-body">
+                <p><%=ResourceLoader.GetResource(session, "modal.digitalsignaturewarning.body")%></p>
+            </div>
+            <div class="modal-footer">
+                <a href="#" class="btn"><%=ResourceLoader.GetResource(session, "modal.close")%></a>
+                <a href="javascript:savetModel();$('#confirmDialog').modal('hide');" class="btn btn-primary">
+                    <%=ResourceLoader.GetResource(session, "modal.savechanges")%></a>
+            </div>
+        </div>
     </div>
     <%@include file="header-bottom.jsp" %>
\ No newline at end of file

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/tmodelPartitions.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/tmodelPartitions.jsp?rev=1463077&r1=1463076&r2=1463077&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/tmodelPartitions.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/tmodelPartitions.jsp Mon Apr  1 02:08:19 2013
@@ -12,7 +12,7 @@
 
     <!-- Main hero unit for a primary marketing message or call to action -->
     <div class="well" >
-        <h1>tModel Partitions</h1>
+        <h1><%=ResourceLoader.GetResource(session, "pages.tmodelpart.title")%></h1>
     </div>
 
     <!-- Example row of columns -->
@@ -20,19 +20,17 @@
         <div class="span12" >
             
             <div id="container">
-                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.
+                <%=ResourceLoader.GetResource(session, "pages.tmodelpart.content")%>
                 <br>
-                <i class="icon-info-sign"></i>For jUDDI implementations of UDDI, the "root" account cannot be used to create a keyGenerator.
+                <i class="icon-info-sign"></i><%=ResourceLoader.GetResource(session, "pages.tmodelpart.juddinote")%>
                 <br><Br>
                 <table class="table">
-                    <tr><td>The UDDI tModel key</td><td><input type="text" value="uddi:www.mycompany.com:keyGenerator" id="keyGeneratorKey"  style="width:100%"></td></tr>
-                    <tr><td>A name describing the key</td><td><input type="text" value="My business's key generator" id="keyGeneratorName" style="width:100%"></td></tr>
-                    <tr><td>Language</td><td><input type="text" value="en" id="keyGeneratorLang" style="width:100%"></td></tr>
+                    <tr><td><%=ResourceLoader.GetResource(session, "pages.tmodelpart.key")%></td><td><input type="text" value="uddi:www.mycompany.com:keyGenerator" id="keyGeneratorKey"  style="width:100%"></td></tr>
+                    <tr><td><%=ResourceLoader.GetResource(session, "pages.thmodepart.name")%></td><td><input type="text" value="My business's key generator" id="keyGeneratorName" style="width:100%"></td></tr>
+                    <tr><td><%=ResourceLoader.GetResource(session, "items.lang")%></td><td><input type="text" value="<%=ResourceLoader.GetResource(session, "language")%>" id="keyGeneratorLang" style="width:100%"></td></tr>
                 </table>
                                 
-                <a class="btn btn-primary" title="Save" id="savekeygen" onclick="javascript:savekeygen();">Save</a>
+                <a class="btn btn-primary" title="Save" id="savekeygen" onclick="javascript:savekeygen();"><%=ResourceLoader.GetResource(session, "actions.save")%></a>
             </div>
             <div id="results"></div>
             <script type="text/javascript">

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/viewSubscriptions.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/viewSubscriptions.jsp?rev=1463077&r1=1463076&r2=1463077&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/viewSubscriptions.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/viewSubscriptions.jsp Mon Apr  1 02:08:19 2013
@@ -12,7 +12,6 @@
 <%@page import="org.uddi.api_v3.*"%>
 <%@page import="org.apache.juddi.webconsole.PostBackConstants"%>
 <%@page import="org.apache.juddi.webconsole.hub.*"%>
-<%@page import="org.apache.juddi.query.FindBusinessByNameQuery"%>
 <%@page contentType="text/html" pageEncoding="UTF-8"%>
 <%@include file="header-top.jsp" %>
 <div class="container">
@@ -25,9 +24,14 @@
     <!-- Example row of columns -->
     <div class="row">
         <div class="span12">
+            <p>
+               <%=ResourceLoader.GetResource(session, "pages.viewsubscriptions.content")%>
+                
+            </p>
+            <h2>UDDI Subscriptions (Subscription API by polling)</h2>
             <%
                 UddiHub x = UddiHub.getInstance(application, session);
-
+//TODO more internationalization
                 List<Subscription> list = x.GetSubscriptions();
                 if (list == null) {
                     out.write("Either an error occured or you're not signed in.");
@@ -44,11 +48,22 @@
                             out.write(StringEscapeUtils.escapeHtml(list.get(i).getExpiresAfter().toString()));
                             out.write("</td></tr>");
                         }
-                        if (list.isEmpty())
+                        if (list.isEmpty()) {
                             out.write("No subscriptions are currently defined.");
+                        }
                     }
                 %>
             </table>
+            
+            <h2>jUDDI Callback Subscriptions</h2>
+            <%
+            if (!x.IsJuddiRegistry())
+                out.write("You're not connected to a jUDDI registry. Contact the administrator or check the configuration file.");
+            else
+                               {
+                   // x.getJUDDISubscriptions
+            }
+            %>
         </div>
     </div>
     <%@include file="header-bottom.jsp" %>
\ No newline at end of file



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