juddi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexo...@apache.org
Subject svn commit: r1539843 - in /juddi/trunk/juddi-gui/src/main: java/org/apache/juddi/webconsole/hub/ java/org/apache/juddi/webconsole/hub/builders/ resources/org/apache/juddi/webconsole/resources/ webapp/ webapp/ajax/ webapp/js/
Date Thu, 07 Nov 2013 22:12:18 GMT
Author: alexoree
Date: Thu Nov  7 22:12:17 2013
New Revision: 1539843

URL: http://svn.apache.org/r1539843
Log:
JUDDI-692 fixing a number of i18n issues
JUDDI-684 worked started
JUDDI-697 fixing several issues with the subscription page

Added:
    juddi/trunk/juddi-gui/src/main/webapp/ajax/copyitem.jsp
Modified:
    juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java
    juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/builders/SubscriptionHelper.java
    juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties
    juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties
    juddi/trunk/juddi-gui/src/main/webapp/assertions.jsp
    juddi/trunk/juddi-gui/src/main/webapp/bindingChooser.jsp
    juddi/trunk/juddi-gui/src/main/webapp/businessBrowse.jsp
    juddi/trunk/juddi-gui/src/main/webapp/businessChooser.jsp
    juddi/trunk/juddi-gui/src/main/webapp/businessEditor2.jsp
    juddi/trunk/juddi-gui/src/main/webapp/editSubscription.jsp
    juddi/trunk/juddi-gui/src/main/webapp/importFromWadl.jsp
    juddi/trunk/juddi-gui/src/main/webapp/importFromWsdl.jsp
    juddi/trunk/juddi-gui/src/main/webapp/js/i18n.js.jsp
    juddi/trunk/juddi-gui/src/main/webapp/js/main.js
    juddi/trunk/juddi-gui/src/main/webapp/serviceBrowse.jsp
    juddi/trunk/juddi-gui/src/main/webapp/serviceChooser.jsp
    juddi/trunk/juddi-gui/src/main/webapp/serviceEditor.jsp
    juddi/trunk/juddi-gui/src/main/webapp/signer.jsp
    juddi/trunk/juddi-gui/src/main/webapp/tmodelBrowse.jsp
    juddi/trunk/juddi-gui/src/main/webapp/tmodelChooser.jsp
    juddi/trunk/juddi-gui/src/main/webapp/tmodelEditor.jsp
    juddi/trunk/juddi-gui/src/main/webapp/transfer.jsp

Modified: juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java?rev=1539843&r1=1539842&r2=1539843&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java (original)
+++ juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java Thu Nov  7 22:12:17 2013
@@ -175,6 +175,9 @@ public class UddiHub implements Serializ
         return properties;
     }
 
+    public String getLocale(){
+        return locale;
+    }
     private UddiHub(ServletContext application, HttpSession _session) throws Exception {
         URL prop = application.getResource("/META-INF/config.properties");
         if (prop == null) {

Modified: juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/builders/SubscriptionHelper.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/builders/SubscriptionHelper.java?rev=1539843&r1=1539842&r2=1539843&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/builders/SubscriptionHelper.java (original)
+++ juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/builders/SubscriptionHelper.java Thu Nov  7 22:12:17 2013
@@ -79,7 +79,7 @@ public class SubscriptionHelper {
                 || sub.getSubscriptionFilter().getGetTModelDetail() != null);
     }
 
-    public static String isBindingSpecific(Subscription sub, String locale) {
+    public static String isBindingSpecific(Subscription sub) {
         if (sub == null) {
             return "";
         }
@@ -87,12 +87,12 @@ public class SubscriptionHelper {
             return "";
         }
         if (sub.getSubscriptionFilter().getGetBindingDetail() != null && !sub.getSubscriptionFilter().getGetBindingDetail().getBindingKey().isEmpty()) {
-            return " " + ResourceLoader.GetResource(locale, "items.active")+" ";
+            return " active ";
         }
         return "";
     }
 
-    public static String isBusinessSpecific(Subscription sub, String locale) {
+    public static String isBusinessSpecific(Subscription sub) {
         if (sub == null) {
             return "";
         }
@@ -100,12 +100,12 @@ public class SubscriptionHelper {
             return "";
         }
         if (sub.getSubscriptionFilter().getGetBusinessDetail() != null && !sub.getSubscriptionFilter().getGetBusinessDetail().getBusinessKey().isEmpty()) {
-            return " " + ResourceLoader.GetResource(locale, "items.active")+" ";
+            return " active ";
         }
         return "";
     }
 
-    public static String isServiceSpecific(Subscription sub, String locale) {
+    public static String isServiceSpecific(Subscription sub) {
         if (sub == null) {
             return "";
         }
@@ -113,12 +113,12 @@ public class SubscriptionHelper {
             return "";
         }
         if (sub.getSubscriptionFilter().getGetServiceDetail() != null && !sub.getSubscriptionFilter().getGetServiceDetail().getServiceKey().isEmpty()) {
-            return " " + ResourceLoader.GetResource(locale, "items.active")+" ";
+            return " active ";
         }
         return "";
     }
 
-    public static String isTModelSpecific(Subscription sub, String locale) {
+    public static String isTModelSpecific(Subscription sub) {
         if (sub == null) {
             return "";
         }
@@ -126,12 +126,12 @@ public class SubscriptionHelper {
             return "";
         }
         if (sub.getSubscriptionFilter().getGetTModelDetail() != null && !sub.getSubscriptionFilter().getGetTModelDetail().getTModelKey().isEmpty()) {
-            return " " + ResourceLoader.GetResource(locale, "items.active")+" ";
+            return " active ";
         }
         return "";
     }
 
-    public static String isPublisherAssertionSpecific(Subscription sub, String locale) {
+    public static String isPublisherAssertionSpecific(Subscription sub) {
         if (sub == null) {
             return "";
         }
@@ -139,7 +139,7 @@ public class SubscriptionHelper {
             return "";
         }
         if (sub.getSubscriptionFilter().getGetAssertionStatusReport() != null && sub.getSubscriptionFilter().getGetAssertionStatusReport().getCompletionStatus() != null) {
-            return " " + ResourceLoader.GetResource(locale, "items.active")+" ";
+            return " active ";
         }
         return "";
     }

Modified: juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties?rev=1539843&r1=1539842&r2=1539843&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties (original)
+++ juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web.properties Thu Nov  7 22:12:17 2013
@@ -300,7 +300,7 @@ items.publisherassertion.status=Publishe
 actions.add=Add
 actions.remove=Remove
 items.findqualifiers=Find Qualifiers
-pages.subscription.step3=Step 3) How do want to receive the alerts?
+pages.subscription.step3=Step 3) How do you want to receive the alerts?
 pages.subscription.step3.direct=Send me alerts directly
 pages.subscription.step3.direct.tooltip=Either via a UDDI Subscription Client API, Email or some other notifier
 pages.subscription.step3.pickup=I'll pick them up
@@ -375,3 +375,12 @@ actions.show=Show
 errors.parsing=Unexpected parsing error
 errors.invaliddata=Invalid form data posted
 items.active=active
+items.token.xml=Token XML
+items.kegbag.xml=Key Bag XML
+actions.ok=OK
+items.import.bizname=Business Key or a new Business Name
+items.import.autofill=autofilled from the URL
+actions.add.subscription=Add a subscription
+actions.add.subscription.desc=You can setup a subscription for this business to automatically alert you when there is a change
+actions.copy=Copy
+pages.subscription.specificitem=A specific item

Modified: juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties?rev=1539843&r1=1539842&r2=1539843&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties (original)
+++ juddi/trunk/juddi-gui/src/main/resources/org/apache/juddi/webconsole/resources/web_es.properties Thu Nov  7 22:12:17 2013
@@ -377,3 +377,12 @@ actions.show=Mostrar
 errors.parsing=Error de an\u00e1lisis inesperado
 errors.invaliddata=Los datos del formulario no v\u00e1lidos publicados
 items.active=activo
+items.token.xml=Token XML
+items.kegbag.xml=Bolso de la llave XML
+actions.ok=Bueno
+items.import.bizname=Llave de negocios o un nuevo nombre comercial
+items.import.autofill=relleno autom\u00e1tico de la URL
+actions.add.subscription=Add a subscription
+actions.add.subscription.desc=You can setup a subscription for this business to automatically alert you when there is a change
+actions.copy=Copie
+pages.subscription.specificitem=Un elemento espec\u00edfico

Added: juddi/trunk/juddi-gui/src/main/webapp/ajax/copyitem.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/ajax/copyitem.jsp?rev=1539843&view=auto
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/ajax/copyitem.jsp (added)
+++ juddi/trunk/juddi-gui/src/main/webapp/ajax/copyitem.jsp Thu Nov  7 22:12:17 2013
@@ -0,0 +1,20 @@
+<%-- 
+    Document   : copyitem
+    Created on : Nov 6, 2013, 7:57:31 PM
+    Author     : Alex O'Ree
+--%>
+
+<%@page import="org.apache.juddi.webconsole.hub.UddiHub"%>
+<%@page contentType="text/html" pageEncoding="UTF-8"%>
+
+<%@include  file="../csrf.jsp" %>
+<%
+    //TODO for 3.2.1
+    /*if (request.getMethod().equalsIgnoreCase("POST")) {
+        UddiHub x = UddiHub.getInstance(application, session);
+        out.write(x.copyEntity(request.getParameter("id"),
+                request.getParameter("item_type"),
+                request.getParameter("newid")));
+    }*/
+
+%>
\ No newline at end of file

Modified: juddi/trunk/juddi-gui/src/main/webapp/assertions.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/assertions.jsp?rev=1539843&r1=1539842&r2=1539843&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/assertions.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/assertions.jsp Thu Nov  7 22:12:17 2013
@@ -60,7 +60,7 @@
                     return(value);
                 }, { 
                     type    : 'text',
-                    submit  : 'OK'
+                    submit  : i18n_ok
                 });
                 
                 RenderAssertions();

Modified: juddi/trunk/juddi-gui/src/main/webapp/bindingChooser.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/bindingChooser.jsp?rev=1539843&r1=1539842&r2=1539843&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/bindingChooser.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/bindingChooser.jsp Thu Nov  7 22:12:17 2013
@@ -38,7 +38,7 @@ this page is meant to be included via js
                 return(value);
             }, { 
                 type    : 'text',
-                submit  : 'OK'
+                submit  : i18n_ok
             });
             //only init the data when required reloadTmodelModal();
         </script>

Modified: juddi/trunk/juddi-gui/src/main/webapp/businessBrowse.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/businessBrowse.jsp?rev=1539843&r1=1539842&r2=1539843&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/businessBrowse.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/businessBrowse.jsp Thu Nov  7 22:12:17 2013
@@ -40,7 +40,7 @@
                     return(value);
                 }, { 
                     type    : 'text',
-                    submit  : 'OK'
+                    submit  : i18n_ok
                 });
             </script>
         </div>

Modified: juddi/trunk/juddi-gui/src/main/webapp/businessChooser.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/businessChooser.jsp?rev=1539843&r1=1539842&r2=1539843&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/businessChooser.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/businessChooser.jsp Thu Nov  7 22:12:17 2013
@@ -38,7 +38,7 @@ this page is meant to be included via js
                 return(value);
             }, { 
                 type    : 'text',
-                submit  : 'OK'
+                submit  : i18n_ok
             });
             //only init the data when required reloadTmodelModal();
         </script>
@@ -49,11 +49,3 @@ this page is meant to be included via js
         <a href="javascript:$('#businessChooser').modal('hide');" class="btn btn-primary" data-dismiss="modal"><%=ResourceLoader.GetResource(session, "actions.select")%></a>
     </div>
 </div>
-<%
-//<a href="javascript:tModelCancel();" class="close" class="btn btn-danger">Cancel</a>
-//<a href="javascript:tModelModal();" class="btn" >Pick a tModel</a>
-
-
-//<a href="javascript:$('#businessChooser').modal();" class="btn btn-primary" data-dismiss="modal">< %=ResourceLoader.GetResource(session, "actions.select")% ></a>
-%>
-

Modified: juddi/trunk/juddi-gui/src/main/webapp/businessEditor2.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/businessEditor2.jsp?rev=1539843&r1=1539842&r2=1539843&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/businessEditor2.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/businessEditor2.jsp Thu Nov  7 22:12:17 2013
@@ -621,10 +621,12 @@
                 %> | 
                 <a class="btn btn-danger " href="javascript:deleteBusiness();"><i class="icon-trash icon-large"></i> <%=ResourceLoader.GetResource(session, "actions.delete")%></a> |
                 <a class="btn btn-success " href="signer.jsp?id=<%=URLEncoder.encode(bizid, "UTF-8")%>&type=business"><i class="icon-pencil icon-large"></i> <%=ResourceLoader.GetResource(session, "actions.sign")%></a> |
-                <a class="btn btn-info " href="#" title="<%=ResourceLoader.GetResource(session, "actions.subscribe.description")%>"><i class="icon-rss icon-large"></i> <%=ResourceLoader.GetResource(session, "actions.subscribe")%></a> |
+                <a class="btn btn-info " href="editSubscription.jsp?bizid=<%=URLEncoder.encode(bizid, "UTF-8")%>" title="<%=ResourceLoader.GetResource(session, "actions.subscribe.description")%>"><i class="icon-rss icon-large"></i> <%=ResourceLoader.GetResource(session, "actions.subscribe")%></a> |
                 <a class="btn btn-warning "  href="transfer.jsp?biz=<%=URLEncoder.encode(bizid, "UTF-8")%>" title="<%=ResourceLoader.GetResource(session, "actions.transfer.description")%>"><i class="icon-exchange icon-large"></i> <%=ResourceLoader.GetResource(session, "actions.transfer")%></a> |
                 <a class="btn "  href="javascript:ViewAsXML();"><i class="icon-screenshot icon-large"></i> <%=ResourceLoader.GetResource(session, "actions.asxml")%></a>
+                
                 <%
+                        //TODO for 3.2.1 <a class="btn "  href="javascript:Copy();"><i class="icon-copy icon-large"></i> <%=ResourceLoader.GetResource(session, "actions.copy")% ></a>
                     }
                 %>
 
@@ -690,21 +692,6 @@
     <script type="text/javascript">
        
     </script>
-    <div class="modal hide fade container" id="addSubscriptionModal">
-        <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h3>Add a subscription</h3>
-        </div>
-        <div class="modal-body">
-            You can setup a subscription for this business to automatically alert you when there is a change
-        </div>
-        <div class="modal-footer">
-
-            <a href="javascript:closeXmlPop('viewAsXml');" class="btn"><%=ResourceLoader.GetResource(session, "modal.close")%></a>
-        </div>
-    </div>
-        
-        
         
     <%
         }

Modified: juddi/trunk/juddi-gui/src/main/webapp/editSubscription.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/editSubscription.jsp?rev=1539843&r1=1539842&r2=1539843&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/editSubscription.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/editSubscription.jsp Thu Nov  7 22:12:17 2013
@@ -54,15 +54,6 @@
             sub = x.GetSubscriptionDetails(request.getParameter("id"));
         }
         if (sub == null) {
-            if (request.getParameter("svcid") != null) {
-                //TODO handled a linked in subscription
-            }
-            if (request.getParameter("bizid") != null) {
-                //TODO handled a linked in subscription
-            }
-            if (request.getParameter("tid") != null) {
-                //TODO handled a linked in subscription
-            }
             sub = new Subscription();
             sub.setMaxEntities(50);
             sub.setBrief(false);
@@ -74,6 +65,19 @@
             sub.setExpiresAfter(df.newXMLGregorianCalendar(gcal));
             sub.setSubscriptionFilter(new SubscriptionFilter());
             newitem = true;
+            if (request.getParameter("svcid") != null) {
+                sub.getSubscriptionFilter().setGetServiceDetail(new GetServiceDetail());
+                sub.getSubscriptionFilter().getGetServiceDetail().getServiceKey().add(request.getParameter("svcid"));
+            }
+            if (request.getParameter("bizid") != null) {
+                sub.getSubscriptionFilter().setGetBusinessDetail(new GetBusinessDetail());
+                sub.getSubscriptionFilter().getGetBusinessDetail().getBusinessKey().add(request.getParameter("bizid"));
+            }
+            if (request.getParameter("tid") != null) {
+                sub.getSubscriptionFilter().setGetTModelDetail(new GetTModelDetail());
+                sub.getSubscriptionFilter().getGetTModelDetail().getTModelKey().add(request.getParameter("tid"));
+            }
+
         }
 
     %>
@@ -111,29 +115,32 @@
                             </div>
                         </div>
                         <script type="text/javascript">
-                            function toggleType1(firstLoad)
-                            {
-                                //window.console && console.log('hi  ' + $("#btn-specificitem").hasClass("active"));   
-                                setTimeout(function(){
-                                    if ($("#btn-specificitem").hasClass("active"))
-                                    {
-                                        $("#basedonresults").hide();
-                                        $("#specific").show();
-                                    }
-                                    else
+                                    function toggleType1(firstLoad)
                                     {
-                                        $("#basedonresults").show();
-                                        $("#specific").hide();
+                                        //window.console && console.log('hi  ' + $("#btn-specificitem").hasClass("active"));   
+                                        setTimeout(function() {
+                                            if ($("#btn-specificitem").hasClass("active"))
+                                            {
+                                                $("#basedonresults").hide();
+                                                $("#specific").show();
+                                            }
+                                            else
+                                            {
+                                                $("#basedonresults").show();
+                                                $("#specific").hide();
+                                            }
+                                            if (firstLoad != true) {
+                                                $('#collapseOne').collapse('hide');
+                                                $('#collapseTwo').collapse('show');
+                                            }
+                                        }, 100);
+
+                                        return false;
                                     }
-                                    if (firstLoad!=true){
-                                        $('#collapseOne').collapse('hide');
-                                        $('#collapseTwo').collapse('show');}
-                                }, 100);
-                                
-                                return false;
-                            }
-                            $(document).ready(function(){ toggleType1(true);});
-                           
+                                    $(document).ready(function() {
+                                        toggleType1(true);
+                                    });
+
                         </script>
                     </div>
                 </div>
@@ -148,13 +155,18 @@
                     <div id="collapseTwo" class="accordion-body collapse">
                         <div class="accordion-inner">
                             <div id="specific">
-                                A specific item:<Br>
+                                <%=ResourceLoader.GetResource(session, "pages.subscription.specificitem")%>:<Br>
                                 <div class="btn-group" id="alertCriteraSingleItem" data-toggle="buttons-radio">
-                                    <button onclick="javascript:clearbox(); return false;" class="btn <%=SubscriptionHelper.isBindingSpecific(sub)%>" value="binding"><%=ResourceLoader.GetResource(session, "items.bindingtemplate")%></button>
-                                    <button onclick="javascript:clearbox(); return false;" class="btn <%=SubscriptionHelper.isBusinessSpecific(sub)%>" value="business"><%=ResourceLoader.GetResource(session, "items.business")%></button>
-                                    <button onclick="javascript:clearbox(); return false;" class="btn <%=SubscriptionHelper.isServiceSpecific(sub)%>" value="service"><%=ResourceLoader.GetResource(session, "items.service")%></button>
-                                    <button onclick="javascript:clearbox(); return false;" class="btn <%=SubscriptionHelper.isTModelSpecific(sub)%>" value="tmodel"><%=ResourceLoader.GetResource(session, "items.tmodel")%></button>
-                                    <button onclick="javascript:publisherAssertionPicker(); return false;" class="btn <%=SubscriptionHelper.isPublisherAssertionSpecific(sub)%>" value="publisherAssertion"><%=ResourceLoader.GetResource(session, "items.publisherassertion.status")%></button>
+                                    <button onclick="javascript:clearbox();
+                                        return false;" class="btn <%=SubscriptionHelper.isBindingSpecific(sub)%>" value="binding"><%=ResourceLoader.GetResource(session, "items.bindingtemplate")%></button>
+                                    <button onclick="javascript:clearbox();
+                                        return false;" class="btn <%=SubscriptionHelper.isBusinessSpecific(sub)%>" value="business"><%=ResourceLoader.GetResource(session, "items.business")%></button>
+                                    <button onclick="javascript:clearbox();
+                                        return false;" class="btn <%=SubscriptionHelper.isServiceSpecific(sub)%>" value="service"><%=ResourceLoader.GetResource(session, "items.service")%></button>
+                                    <button onclick="javascript:clearbox();
+                                        return false;" class="btn <%=SubscriptionHelper.isTModelSpecific(sub)%>" value="tmodel"><%=ResourceLoader.GetResource(session, "items.tmodel")%></button>
+                                    <button onclick="javascript:publisherAssertionPicker();
+                                        return false;" class="btn <%=SubscriptionHelper.isPublisherAssertionSpecific(sub)%>" value="publisherAssertion"><%=ResourceLoader.GetResource(session, "items.publisherassertion.status")%></button>
                                 </div><br><br>
                                 <div id="keylistcontainer">
                                     <a href="javascript:additem();" class="btn" ><%=ResourceLoader.GetResource(session, "actions.add")%></a>
@@ -172,87 +184,87 @@
                                             out.write("publisherAssertionPicker();");
                                         }
                                     %>
-                                        function publisherAssertionPicker()
-                                        {
-                                            $("#keylistcontainer").hide();
-                                            $("#pubassertcontainer").show();
-                                            selectPublisherAssertionStatus();
-                                        }
-                                        function clearbox()
-                                        {
-                                            $("#keylist option").remove();
-                                            $("#keylistcontainer").show();
-                                            $("#pubassertcontainer").hide();
-                                            return false;
-                                        }
-                                        function additem()
+                                    function publisherAssertionPicker()
+                                    {
+                                        $("#keylistcontainer").hide();
+                                        $("#pubassertcontainer").show();
+                                        selectPublisherAssertionStatus();
+                                    }
+                                    function clearbox()
+                                    {
+                                        $("#keylist option").remove();
+                                        $("#keylistcontainer").show();
+                                        $("#pubassertcontainer").hide();
+                                        return false;
+                                    }
+                                    function additem()
+                                    {
+                                        var alertCriteraSingleItem = $("#alertCriteraSingleItem > button.btn.active").val();
+                                        if (alertCriteraSingleItem === "binding")
                                         {
-                                            var alertCriteraSingleItem = $("#alertCriteraSingleItem > button.btn.active").val();
-                                            if (alertCriteraSingleItem=="binding")
-                                            {
-                                                reloadBindingModal();
-                                                $.dialogBinding.confirm({
-                                                    callback: function(success, result) {
-                                                        if (success)
-                                                        {
-                                                            for (var i=0;i<result.length;i++)
-                                                                if ($("#keylist option[value='"+result[i]+"']").length == 0)
-                                                                    $("#keylist").append("<option value=\"" + result[i] + "\">" + result[i] + "</option>");
-                                                        }
+                                            reloadBindingModal();
+                                            $.dialogBinding.confirm({
+                                                callback: function(success, result) {
+                                                    if (success)
+                                                    {
+                                                        for (var i = 0; i < result.length; i++)
+                                                            if ($("#keylist option[value='" + result[i] + "']").length == 0)
+                                                                $("#keylist").append("<option value=\"" + result[i] + "\">" + result[i] + "</option>");
                                                     }
-                                                });
-                                            }
-                                            if (alertCriteraSingleItem=="business"){
-                                                reloadBusinessModal();
-                                                $.dialogBusiness.confirm({
-                                                    callback: function(success, result) {
-                                                        if (success)
-                                                        {
-                                                            for (var i=0;i<result.length;i++)
-                                                                if ($("#keylist option[value='"+result[i]+"']").length == 0)
-                                                                    $("#keylist").append("<option value=\"" + result[i] + "\">" + result[i] + "</option>");
-                                                        }
-                                                    }
-                                                });
-                                            }
-                                            if (alertCriteraSingleItem=="service"){
-                                                reloadServiceModal();
-    
-                                                $.dialogService.confirm({
-                                                    callback: function(success, result) {
-                                                        if (success)
-                                                        {
-                                                            for (var i=0;i<result.length;i++)
-                                                                if ($("#keylist option[value='"+result[i]+"']").length == 0)
-                                                                    $("#keylist").append("<option value=\"" + result[i] + "\">" + result[i] + "</option>");
-                                                        }
+                                                }
+                                            });
+                                        }
+                                        if (alertCriteraSingleItem === "business") {
+                                            reloadBusinessModal();
+                                            $.dialogBusiness.confirm({
+                                                callback: function(success, result) {
+                                                    if (success)
+                                                    {
+                                                        for (var i = 0; i < result.length; i++)
+                                                            if ($("#keylist option[value='" + result[i] + "']").length == 0)
+                                                                $("#keylist").append("<option value=\"" + result[i] + "\">" + result[i] + "</option>");
                                                     }
-                                                });
+                                                }
+                                            });
+                                        }
+                                        if (alertCriteraSingleItem === "service") {
+                                            reloadServiceModal();
 
-                                            }
-                                            if (alertCriteraSingleItem=="tmodel"){
-                                                reloadTmodelModal();
-                                                $.dialogTmodel.confirm({
-                                                    callback: function(success, result) {
-                                                        if (success)
-                                                        {
-                                                            for (var i=0;i<result.length;i++)
-                                                                if ($("#keylist option[value='"+result[i]+"']").length == 0)
-                                                                    $("#keylist").append("<option value=\"" + result[i] + "\">" + result[i] + "</option>");
-                                                        }
+                                            $.dialogService.confirm({
+                                                callback: function(success, result) {
+                                                    if (success)
+                                                    {
+                                                        for (var i = 0; i < result.length; i++)
+                                                            if ($("#keylist option[value='" + result[i] + "']").length == 0)
+                                                                $("#keylist").append("<option value=\"" + result[i] + "\">" + result[i] + "</option>");
                                                     }
-                                                });
-                                            }
+                                                }
+                                            });
+
                                         }
-                                        function removeitem()
-                                        {
-                                            $("#keylist option:selected").remove();
+                                        if (alertCriteraSingleItem === "tmodel") {
+                                            reloadTmodelModal();
+                                            $.dialogTmodel.confirm({
+                                                callback: function(success, result) {
+                                                    if (success)
+                                                    {
+                                                        for (var i = 0; i < result.length; i++)
+                                                            if ($("#keylist option[value='" + result[i] + "']").length === 0)
+                                                                $("#keylist").append("<option value=\"" + result[i] + "\">" + result[i] + "</option>");
+                                                    }
+                                                }
+                                            });
                                         }
+                                    }
+                                    function removeitem()
+                                    {
+                                        $("#keylist option:selected").remove();
+                                    }
                                 </script>
                                 <div id="pubassertcontainer" class="">
                                     <div style="float:left"><%=ResourceLoader.GetResource(session, "items.key")%>: &nbsp;</div>
                                     <div class="" id="itemKey"><%
-                                        if (!SubscriptionHelper.isPublisherAssertionSpecific(sub).equals("")) {
+                                        if (!SubscriptionHelper.isPublisherAssertionSpecific(sub).trim().equals("")) {
                                             out.write(StringEscapeUtils.escapeHtml(SubscriptionHelper.getItemKeySpecific(sub)));
                                         }
                                         %></div>
@@ -337,36 +349,37 @@
                                 <%=ResourceLoader.GetResource(session, "pages.subscription.step3.content")%>
                                 <b><%=UDDIConstants.TRANSPORT_HTTP%></b>.
                                 <input type="text" id="bindingKey" placeholder="<%=ResourceLoader.GetResource(session, "items.bindingtemplate.key")%>" style="width:360px">
-                                <button onClick="javascript:bindingModal('bindingKey', 'val'); return false;" class="btn "><%=ResourceLoader.GetResource(session, "actions.select")%></button>
+                                <button onClick="javascript:bindingModal('bindingKey', 'val');
+                                        return false;" class="btn "><%=ResourceLoader.GetResource(session, "actions.select")%></button>
                             </div>
                             <script type="text/javascript">
-                                function selectPublisherAssertionStatus()
-                                {
-                                    $("#assertionStatusChooser").modal('show');
-                                }
-                             
-                                function toggleTransport1()
-                                {
-                                    //window.console && console.log('hi  ' + $("#btn-specificitem").hasClass("active"));   
-                                    setTimeout(function(){
-                                        if ($("#btn-manual").hasClass("active"))
-                                        {
-                                            $("#bindingKeyDiv").hide();
-                                            //$("#specific").show();
-                                        }
-                                        else
-                                        {
-                                            $("#bindingKeyDiv").show();
-                                            // $("#specific").hide();
-                                        }
-                                        
-                                    }, 100);
-                                
-                                   
-                                    // $("#bindingKeyDiv").show();
-                                    return false;
-                                }
-                                toggleTransport1();
+                                    function selectPublisherAssertionStatus()
+                                    {
+                                        $("#assertionStatusChooser").modal('show');
+                                    }
+
+                                    function toggleTransport1()
+                                    {
+                                        //window.console && console.log('hi  ' + $("#btn-specificitem").hasClass("active"));   
+                                        setTimeout(function() {
+                                            if ($("#btn-manual").hasClass("active"))
+                                            {
+                                                $("#bindingKeyDiv").hide();
+                                                //$("#specific").show();
+                                            }
+                                            else
+                                            {
+                                                $("#bindingKeyDiv").show();
+                                                // $("#specific").hide();
+                                            }
+
+                                        }, 100);
+
+
+                                        // $("#bindingKeyDiv").show();
+                                        return false;
+                                    }
+                                    toggleTransport1();
                             </script>
                         </div>
                     </div>
@@ -401,7 +414,10 @@
                                         Date d = sub.getExpiresAfter().toGregorianCalendar().getTime();
                                         DateFormat dateFormat = new SimpleDateFormat("MM/dd/yyyy HH:mm:ss a");
                                         String dateStr = dateFormat.format(d);
-                                        //TODO DOES NOT WORK     out.write(dateStr);
+                                        //TODO DOES NOT WORK     
+                                        if (dateStr != null) {
+                                            out.write(StringEscapeUtils.escapeHtml(dateStr));
+                                        }
                                     }
                                        %>">
 
@@ -442,7 +458,7 @@
                                     showSeconds: true,
                                     template: 'modal',
                                     showSeconds: true,
-                                    showMeridian: false
+                                            showMeridian: false
                                 });
                             </script>
                             <br>
@@ -468,145 +484,145 @@
                     $("#bindingKey").resizable();
                     function saveSubscription()
                     {
-                        
+
                         var interval = $("#interval").val();
                         var maxRecords = $("#maxRecords").val();
                         var brief = $("#brief").val();
                         var datetimepicker2 = $("#datetimepicker2").val();
-                        
+
                         var subkey = $("#subkey").html();
 
                         var alertCriteraSingleItem = $("#alertCriteraSingleItem > button.btn.active").val();
                         var alertTransport = $("#alertTransport > button.btn.active").val();
                         var itemKey = $("#keylist option");
-                        var keys="";
-                        var first=true;
-                        $.each(itemKey, function(idx, value){
+                        var keys = "";
+                        var first = true;
+                        $.each(itemKey, function(idx, value) {
                             if (first)
                                 keys = value.value;
                             else
                                 keys = keys + "," + value.value;
-                            first=false;
+                            first = false;
                         });
                         var bindingKey = $("#bindingKey").val();
                         var alertType = $("#alertType > button.btn.active").val();
-                        
+
                         var alertCriteraMultipleItem = $("#alertCriteraMultipleItem > button.btn.active").val();
                         var searchcontent = $("#searchcontent").val();
                         var searchlang = $("#searchlang").val();
-                        
+
                         var postbackdata = new Array();
-                        var url='ajax/subscription.jsp';
+                        var url = 'ajax/subscription.jsp';
                         itemKey = $("#itemKey").html();
-                        
+
                         //  var tqs = new Array();
-                        $.each($('.fq input:checkbox'), function(index,item){
+                        $.each($('.fq input:checkbox'), function(index, item) {
                             var itemname = item.id;
                             if (item.checked)
                             {
                                 postbackdata.push({
-                                    name:"findqualifier", 
+                                    name: "findqualifier",
                                     value: itemname
                                 });
                             }
                         });
-                        
+
                         alertCriteraMultipleItem
                         postbackdata.push({
-                            name:"alertCriteraMultipleItem", 
+                            name: "alertCriteraMultipleItem",
                             value: alertCriteraMultipleItem
                         });
                         postbackdata.push({
-                            name:"searchcontent", 
+                            name: "searchcontent",
                             value: searchcontent
                         });
-                        
+
                         postbackdata.push({
-                            name:"searchlang", 
+                            name: "searchlang",
                             value: searchlang
                         });
-                        
-                        
+
+
                         postbackdata.push({
-                            name:"subkey", 
+                            name: "subkey",
                             value: subkey
                         });
-                        
+
                         postbackdata.push({
-                            name:"expires", 
+                            name: "expires",
                             value: datetimepicker2
                         });
-                        
+
                         postbackdata.push({
-                            name:"interval", 
+                            name: "interval",
                             value: interval
                         });
-                        
+
                         postbackdata.push({
-                            name:"brief", 
+                            name: "brief",
                             value: brief
                         });
-                        
+
                         postbackdata.push({
-                            name:"maxRecords", 
+                            name: "maxRecords",
                             value: maxRecords
                         });
-                        
-                        
+
+
                         postbackdata.push({
-                            name:"alertType", 
+                            name: "alertType",
                             value: alertType
                         });
                         postbackdata.push({
-                            name:"itemKey", 
+                            name: "itemKey",
                             value: keys
                         });
-                        
+
                         postbackdata.push({
-                            name:"assertionStatus", 
+                            name: "assertionStatus",
                             value: itemKey
                         });
                         postbackdata.push({
-                            name:"alertCriteraSingleItem", 
+                            name: "alertCriteraSingleItem",
                             value: alertCriteraSingleItem
                         });
                         postbackdata.push({
-                            name:"bindingKey", 
+                            name: "bindingKey",
                             value: bindingKey
                         });
                         postbackdata.push({
-                            name:"alertTransport", 
+                            name: "alertTransport",
                             value: alertTransport
                         });
                         postbackdata.push({
-                            name:"nonce", 
+                            name: "nonce",
                             value: $("#nonce").val()
                         });
-    
-            
-                        var request=   $.ajax({
+
+
+                        var request = $.ajax({
                             url: url,
-                            type:"POST",
+                            type: "POST",
                             //  dataType: "html", 
-                            cache: false, 
+                            cache: false,
                             //  processData: false,f
                             data: postbackdata
                         });
-                
-                
+
+
                         request.done(function(msg) {
-                            window.console && console.log('postback done '  + url);                
-        
-                            $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">&times;'  + '</a>' + msg);
+                            window.console && console.log('postback done ' + url);
+
+                            $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">&times;' + '</a>' + msg);
                             $("#resultBar").show();
-        
+
                         });
 
                         request.fail(function(jqXHR, textStatus) {
-                            window.console && console.log('postback failed ' + url);                                
-                            $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">&times;'  + '</a>' +jqXHR.responseText + textStatus);
+                            window.console && console.log('postback failed ' + url);
+                            $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">&times;' + '</a>' + jqXHR.responseText + textStatus);
                             $("#resultBar").show();
-        
+
                         });
                     }
                 </script>

Modified: juddi/trunk/juddi-gui/src/main/webapp/importFromWadl.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/importFromWadl.jsp?rev=1539843&r1=1539842&r2=1539843&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/importFromWadl.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/importFromWadl.jsp Thu Nov  7 22:12:17 2013
@@ -196,7 +196,7 @@
                         <div class="accordion-inner">
                             <%=ResourceLoader.GetResource(session, "pages.serviceimport.content.step2a")%>
                             <br>
-                            <input type="text" id="keydomain" placeholder="autofilled from the URL">
+                            <input type="text" id="keydomain" placeholder="<%=ResourceLoader.GetResource(session, "items.import.autofill")%>">
                         </div>
                     </div>
                 </div>
@@ -232,7 +232,7 @@
                         });
                     }
                             </script>
-                            <input type="text" id="businessname" placeholder="Business Key or a new Business Name">
+                            <input type="text" id="businessname" placeholder="<%=ResourceLoader.GetResource(session, "items.import.bizname")%>">
                         </div>
                     </div>
                 </div>

Modified: juddi/trunk/juddi-gui/src/main/webapp/importFromWsdl.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/importFromWsdl.jsp?rev=1539843&r1=1539842&r2=1539843&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/importFromWsdl.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/importFromWsdl.jsp Thu Nov  7 22:12:17 2013
@@ -197,7 +197,7 @@
                         <div class="accordion-inner">
                             <%=ResourceLoader.GetResource(session, "pages.serviceimport.content.step2a")%>
                             <br>
-                            <input type="text" id="keydomain" placeholder="autofilled from the URL">
+                            <input type="text" id="keydomain" placeholder="<%=ResourceLoader.GetResource(session, "items.import.autofill")%>">
                         </div>
                     </div>
                 </div>
@@ -233,7 +233,7 @@
                         });
                     }
                             </script>
-                            <input type="text" id="businessname" placeholder="Business Key or a new Business Name">
+                            <input type="text" id="businessname" placeholder="<%=ResourceLoader.GetResource(session, "items.import.bizname")%>">
                         </div>
                     </div>
                 </div>

Modified: juddi/trunk/juddi-gui/src/main/webapp/js/i18n.js.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/js/i18n.js.jsp?rev=1539843&r1=1539842&r2=1539843&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/js/i18n.js.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/js/i18n.js.jsp Thu Nov  7 22:12:17 2013
@@ -34,7 +34,7 @@
     var i18n_lang="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "items.lang"))%>";
     var i18n_email="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "items.email"))%>";
     var i18n_type="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "items.type"))%>";
-    
+    var i18n_ok="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "actions.ok"))%>";
     var i18n_descriptionAdd="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "items.description.add"))%>";
     var i18n_description="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "items.description"))%>";
     var i18n_contactPrimary="<%=org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(ResourceLoader.GetResource(session, "items.contact.primary"))%>";

Modified: juddi/trunk/juddi-gui/src/main/webapp/js/main.js
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/js/main.js?rev=1539843&r1=1539842&r2=1539843&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/js/main.js (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/js/main.js Thu Nov  7 22:12:17 2013
@@ -51,7 +51,7 @@ function Reedit()
         return(safe_tags_replace(value));
     }, {
         type: 'text',
-        submit: 'OK'
+        submit: i18n_ok
     });
 
 }

Modified: juddi/trunk/juddi-gui/src/main/webapp/serviceBrowse.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/serviceBrowse.jsp?rev=1539843&r1=1539842&r2=1539843&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/serviceBrowse.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/serviceBrowse.jsp Thu Nov  7 22:12:17 2013
@@ -42,7 +42,7 @@
                         return(value);
                     }, { 
                         type    : 'text',
-                        submit  : 'OK'
+                        submit  : i18n_ok
                     });
                 </script>
             </div>

Modified: juddi/trunk/juddi-gui/src/main/webapp/serviceChooser.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/serviceChooser.jsp?rev=1539843&r1=1539842&r2=1539843&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/serviceChooser.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/serviceChooser.jsp Thu Nov  7 22:12:17 2013
@@ -39,7 +39,7 @@
                 return(value);
             }, { 
                 type    : 'text',
-                submit  : 'OK'
+                submit  : i18n_ok
             });
             //only init the data when required reloadTmodelModal();
         </script>

Modified: juddi/trunk/juddi-gui/src/main/webapp/serviceEditor.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/serviceEditor.jsp?rev=1539843&r1=1539842&r2=1539843&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/serviceEditor.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/serviceEditor.jsp Thu Nov  7 22:12:17 2013
@@ -663,7 +663,7 @@
 
         <a class="btn btn-danger " href="javascript:deleteService();"><i class="icon-trash icon-large"></i> <%=ResourceLoader.GetResource(session, "actions.delete")%></a> |
         <a class="btn btn-success " href="signer.jsp?id=<%=URLEncoder.encode(bd.getServiceKey(), "UTF-8")%>&type=service"><i class="icon-pencil icon-large"></i> <%=ResourceLoader.GetResource(session, "actions.sign")%></a> |
-        <a class="btn btn-info " href="#" title="<%=ResourceLoader.GetResource(session, "actions.subscribe.description")%>"><i class="icon-rss icon-large"></i> <%=ResourceLoader.GetResource(session, "actions.subscribe")%></a> |
+        <a class="btn btn-info " href="editSubscription.jsp?svcid=<%=URLEncoder.encode(bd.getServiceKey(), "UTF-8")%>" title="<%=ResourceLoader.GetResource(session, "actions.subscribe.description")%>"><i class="icon-rss icon-large"></i> <%=ResourceLoader.GetResource(session, "actions.subscribe")%></a> |
         <a class="btn btn-warning " href="transfer.jsp?biz=<%=URLEncoder.encode(bd.getBusinessKey(), "UTF-8")%>" title="<%=ResourceLoader.GetResource(session, "actions.transfer.description")%>"><i class="icon-exchange icon-large"></i> <%=ResourceLoader.GetResource(session, "actions.transfer")%></a> |
         <a class="btn "  href="javascript:ViewAsXML();"><i class="icon-screenshot icon-large"></i> <%=ResourceLoader.GetResource(session, "actions.asxml")%></a>
         <script type="text/javascript">

Modified: juddi/trunk/juddi-gui/src/main/webapp/signer.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/signer.jsp?rev=1539843&r1=1539842&r2=1539843&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/signer.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/signer.jsp Thu Nov  7 22:12:17 2013
@@ -136,7 +136,7 @@
                     //display:none  <a class="btn" href="javascript:go();">Go</a>
             </script>
 
-            <textarea name="data" rows="15" cols="80" id="data" style="">Loading....</textarea>
+            <textarea name="data" rows="15" cols="80" id="data" style=""><%=ResourceLoader.GetResource(session, "items.loading")%>....</textarea>
         </div>
 
     </div>

Modified: juddi/trunk/juddi-gui/src/main/webapp/tmodelBrowse.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/tmodelBrowse.jsp?rev=1539843&r1=1539842&r2=1539843&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/tmodelBrowse.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/tmodelBrowse.jsp Thu Nov  7 22:12:17 2013
@@ -46,7 +46,7 @@
                     return(value);
                 }, { 
                     type    : 'text',
-                    submit  : 'OK'
+                    submit  : i18n_ok
                 });
                 reload();
             </script>

Modified: juddi/trunk/juddi-gui/src/main/webapp/tmodelChooser.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/tmodelChooser.jsp?rev=1539843&r1=1539842&r2=1539843&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/tmodelChooser.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/tmodelChooser.jsp Thu Nov  7 22:12:17 2013
@@ -39,7 +39,7 @@ this page is meant to be included via js
                 return(value);
             }, { 
                 type    : 'text',
-                submit  : 'OK'
+                submit  : i18n_ok
             });
            //only init the data when required reloadTmodelModal();
         </script>

Modified: juddi/trunk/juddi-gui/src/main/webapp/tmodelEditor.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/tmodelEditor.jsp?rev=1539843&r1=1539842&r2=1539843&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/tmodelEditor.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/tmodelEditor.jsp Thu Nov  7 22:12:17 2013
@@ -422,7 +422,7 @@
                     %> |
                     <a class="btn btn-danger " href="javascript:deletetModel();"><i class="icon-trash icon-large"></i> <%=ResourceLoader.GetResource(session, "actions.delete")%></a> |
                     <a class="btn btn-success " href="signer.jsp?id=<%=URLEncoder.encode(bd.getTModelKey(), "UTF-8")%>&type=tmodel"><i class="icon-pencil icon-large"></i> <%=ResourceLoader.GetResource(session, "actions.sign")%></a> |
-                    <a class="btn btn-info " href="#" title="<%=ResourceLoader.GetResource(session, "actions.subscribe.description")%>"><i class="icon-rss icon-large"></i> <%=ResourceLoader.GetResource(session, "actions.subscribe")%></a> |
+                    <a class="btn btn-info " href="editSubscription.jsp?tid=<%=URLEncoder.encode(bd.getTModelKey(), "UTF-8")%>" title="<%=ResourceLoader.GetResource(session, "actions.subscribe.description")%>"><i class="icon-rss icon-large"></i> <%=ResourceLoader.GetResource(session, "actions.subscribe")%></a> |
                     <a class="btn btn-warning " href="transfer.jsp?biz=<%=URLEncoder.encode(bd.getTModelKey(), "UTF-8")%>"  title="<%=ResourceLoader.GetResource(session, "actions.transfer.description")%>"><i class="icon-exchange icon-large"></i> <%=ResourceLoader.GetResource(session, "actions.transfer")%></a> |
                     <a class="btn "  href="javascript:ViewAsXML();"><i class="icon-screenshot icon-large"></i> <%=ResourceLoader.GetResource(session, "actions.asxml")%></a>
                     <%

Modified: juddi/trunk/juddi-gui/src/main/webapp/transfer.jsp
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/webapp/transfer.jsp?rev=1539843&r1=1539842&r2=1539843&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/webapp/transfer.jsp (original)
+++ juddi/trunk/juddi-gui/src/main/webapp/transfer.jsp Thu Nov  7 22:12:17 2013
@@ -257,8 +257,11 @@
                     <%=ResourceLoader.GetResource(session, "pages.transfer.accepttransfer.content")%>
                     <br>
 
-                    <%=ResourceLoader.GetResource(session, "items.token")%>: <textarea  id="accepttoken" placeholder="Token XML"></textarea> <br>
-                    <%=ResourceLoader.GetResource(session, "items.key")%>: <textarea  id="keybag" placeholder="Key Bag XML"></textarea> <br>
+                    <%=ResourceLoader.GetResource(session, "items.token")%>: <textarea  id="accepttoken" 
+                                 placeholder="<%=ResourceLoader.GetResource(session, "items.token.xml")%>"></textarea> <br>
+                                         
+                    <%=ResourceLoader.GetResource(session, "items.key")%>: <textarea  id="keybag" 
+                                 placeholder="<%=ResourceLoader.GetResource(session, "items.kegbag.xml")%>"></textarea> <br>
                     <a href="javascript:acceptToken();" class="btn btn-info btn-large" style="width:95%"><i class="icon-large icon-plus"></i> 
                       <%=ResourceLoader.GetResource(session, "actions.accept")%>  </a>
                 </div>



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


Mime
View raw message