juddi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexo...@apache.org
Subject svn commit: r1476880 [1/3] - in /juddi/branches/juddi-3.2.x: juddi-gui-dsig/ juddi-gui/ juddi-gui/license/ juddi-gui/src/java/org/apache/juddi/webconsole/hub/ juddi-gui/src/java/org/apache/juddi/webconsole/hub/builders/ juddi-gui/src/java/org/apache/ju...
Date Mon, 29 Apr 2013 02:49:10 GMT
Author: alexoree
Date: Mon Apr 29 02:49:09 2013
New Revision: 1476880

URL: http://svn.apache.org/r1476880
Log:
adding readme for building the juddi-gui and juddi-gui-dsig projects
adding choosers for business, service, binding, added to the subscription page
subscription page is partially implemented but does not work yet
custody transfer page is functional, but needs some i18n work and ui enhancements

Added:
    juddi/branches/juddi-3.2.x/juddi-gui-dsig/preview-applet.html
    juddi/branches/juddi-3.2.x/juddi-gui/readme.txt
    juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/builders/SubscriptionHelper.java
    juddi/branches/juddi-3.2.x/juddi-gui/test/asd.html
    juddi/branches/juddi-3.2.x/juddi-gui/test/asd2.html
    juddi/branches/juddi-3.2.x/juddi-gui/test/asd3
    juddi/branches/juddi-3.2.x/juddi-gui/web/about.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/abortTransferToken.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/acceptTransferToken.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/businessChooser.jsp
      - copied, changed from r1476397, juddi/branches/juddi-3.2.x/juddi-gui/web/bindingChooser.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/error.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/js/businessChooser.js
      - copied, changed from r1476397, juddi/branches/juddi-3.2.x/juddi-gui/web/js/bindingChooser.js
    juddi/branches/juddi-3.2.x/juddi-gui/web/js/serviceChooser.js
      - copied, changed from r1476397, juddi/branches/juddi-3.2.x/juddi-gui/web/js/bindingChooser.js
    juddi/branches/juddi-3.2.x/juddi-gui/web/serviceChooser.jsp
Removed:
    juddi/branches/juddi-3.2.x/juddi-gui-dsig/index.html
    juddi/branches/juddi-3.2.x/juddi-gui/findbugs.xml
    juddi/branches/juddi-3.2.x/juddi-gui/license/BSD3.txt
    juddi/branches/juddi-3.2.x/juddi-gui/license/jsCrypto.txt
    juddi/branches/juddi-3.2.x/juddi-gui/seleniumTests.html
Modified:
    juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/UddiHub.java
    juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/builders/Printers.java
    juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web.properties
    juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web_es.properties
    juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/assertions.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/bindingsearch.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/businessAsSelect.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/businesssearch.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/getTransferToken.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/loginpost.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/saveFromXML.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/servicesearch.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/settings.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/bindingChooser.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/businessEditor2.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/createSubscription.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/header-top.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/js/bindingChooser.js
    juddi/branches/juddi-3.2.x/juddi-gui/web/js/businessEditor.js
    juddi/branches/juddi-3.2.x/juddi-gui/web/js/businesssearch.js
    juddi/branches/juddi-3.2.x/juddi-gui/web/js/main.js
    juddi/branches/juddi-3.2.x/juddi-gui/web/js/serviceBrowse.js
    juddi/branches/juddi-3.2.x/juddi-gui/web/js/serviceEditor.js
    juddi/branches/juddi-3.2.x/juddi-gui/web/js/tmodelChooser.js
    juddi/branches/juddi-3.2.x/juddi-gui/web/js/tmodeledit.js
    juddi/branches/juddi-3.2.x/juddi-gui/web/js/tmodelsearch.js
    juddi/branches/juddi-3.2.x/juddi-gui/web/search.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/serviceEditor.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/tmodelChooser.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/tmodelEditor.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/transfer.jsp
    juddi/branches/juddi-3.2.x/uddi-ws/src/main/java/org/uddi/v3_service/UDDICustodyTransferPortType.java
    juddi/branches/juddi-3.2.x/uddi-ws/src/main/java/org/uddi/v3_service/UDDISubscriptionPortType.java

Added: juddi/branches/juddi-3.2.x/juddi-gui-dsig/preview-applet.html
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui-dsig/preview-applet.html?rev=1476880&view=auto
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui-dsig/preview-applet.html (added)
+++ juddi/branches/juddi-3.2.x/juddi-gui-dsig/preview-applet.html Mon Apr 29 02:49:09 2013
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <title>JSP Page</title>
+    </head>
+    <body>
+        <h1>Hello World!</h1>
+        <applet code="org.apache.juddi.gui.dsig.NewApplet" archive="dist/juddi-gui-dsig.jar"></applet> 
+		        <script src="http://code.jquery.com/jquery-1.9.1.js"></script>
+				 <script type="text/javascript">
+				 function getXml()
+				{
+					return $("#data").val();
+				}
+				 
+				 
+				function writeXml(data)
+				{
+					$("#data").val(data);
+				}
+				
+				function getBrowserName()
+				{
+					return navigator.appName;
+				}
+				function getOsName()
+				{
+					var OSName="unknown OS";
+					if (navigator.appVersion.indexOf("Win")!=-1) OSName="Windows";
+					if (navigator.appVersion.indexOf("Mac")!=-1) OSName="MacOS";
+					if (navigator.appVersion.indexOf("X11")!=-1) OSName="UNIX";
+					if (navigator.appVersion.indexOf("Linux")!=-1) OSName="Linux";
+					return OSName;
+				}
+				</script>
+			<textarea rows="15" cols="80" id="data">hello world</textarea>
+    </body>
+</html>

Added: juddi/branches/juddi-3.2.x/juddi-gui/readme.txt
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/readme.txt?rev=1476880&view=auto
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/readme.txt (added)
+++ juddi/branches/juddi-3.2.x/juddi-gui/readme.txt Mon Apr 29 02:49:09 2013
@@ -0,0 +1,30 @@
+The juddi-gui project is an extension to jUDDI that provides a user interface for UDDI v3 compliant registries.
+
+Direction for building:
+
+Pre-requists:
+1) Ant 1.8+
+2) Maven 3.0.x
+3) Netbeans 7.x
+4) Full source for jUDDI
+5) Java JDK 1.6+
+
+Build:
+1) First, build the main jUDDI project. 
+	mvn clean install
+2) Build the juddi-gui-dsig project
+	cd juddi-gui-disg
+	ant jar
+3) Copy the applet binaries to within the juddi-gui war
+	copy dist\juddi-gui-dsig.jar ..\juddi-gui\web\applets
+	mkdir ..\juddi-gui\web\applets\lib
+	copy dist\lib\*.* ..\juddi-gui\web\applets\lib
+3) Build the war
+	cd juddi-gui
+	ant dist
+4) Deploy
+	copy the war file into any J2EE container that has a soap stack that supports JAX-WS 2.2 or higher
+5) Access
+	http://localhost:8080/juddi-gui
+6) Configure
+	Alter the contents of juddi-gui/META-INF/config.properties
\ No newline at end of file

Modified: juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/UddiHub.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/UddiHub.java?rev=1476880&r1=1476879&r2=1476880&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/UddiHub.java (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/UddiHub.java Mon Apr 29 02:49:09 2013
@@ -18,6 +18,7 @@ package org.apache.juddi.webconsole.hub;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
+import java.io.StringReader;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.rmi.RemoteException;
@@ -54,6 +55,9 @@ import org.apache.juddi.webconsole.hub.b
 import org.apache.juddi.webconsole.resources.ResourceLoader;
 import org.apache.log4j.Level;
 import org.uddi.api_v3.*;
+import org.uddi.custody_v3.DiscardTransferToken;
+import org.uddi.custody_v3.TransferEntities;
+import org.uddi.custody_v3.TransferToken;
 import org.uddi.sub_v3.*;
 import org.uddi.v3_service.DispositionReportFaultMessage;
 import org.uddi.v3_service.UDDICustodyTransferPortType;
@@ -267,7 +271,6 @@ public class UddiHub {
     private String token = null;
 
     public PagableContainer GetBusinessListAsHtml(int offset, int maxrecords, String keyword, String lang, boolean isChooser) {
-        //TODO chooser
         PagableContainer ret = new PagableContainer();
         ret.offset = offset;
         ret.displaycount = 0;
@@ -306,7 +309,7 @@ public class UddiHub {
                 ret.displaycount = findBusiness.getListDescription().getIncludeCount();
                 ret.offset = findBusiness.getListDescription().getListHead();
                 ret.totalrecords = findBusiness.getListDescription().getActualCount();
-                ret.renderedHtml = Printers.BusinessListAsTable(findBusiness, session);
+                ret.renderedHtml = Printers.BusinessListAsTable(findBusiness, session, isChooser);
             }
 
         } catch (Exception ex) {
@@ -828,7 +831,6 @@ public class UddiHub {
     }
 
     public PagableContainer SearchForServices(String keyword, String lang, int maxrecords, int offset, boolean isChooser) {
-        //TODO chooser
         PagableContainer ret = new PagableContainer();
         ret.displaycount = 0;
         ret.offset = offset;
@@ -871,27 +873,9 @@ public class UddiHub {
             }
             ret.displaycount = findService.getListDescription().getIncludeCount();
             ret.totalrecords = findService.getListDescription().getActualCount();
-            StringBuilder sb = new StringBuilder();
-            sb.append("<table class=\"table\"><tr><th>").
-                    append(ResourceLoader.GetResource(session, "items.name")).
-                    append("</th><th>").
-                    append(ResourceLoader.GetResource(session, "items.key")).
-                    append("</th><th>").
-                    append(ResourceLoader.GetResource(session, "items.business")).
-                    append("</th></tr>");
-            for (int i = 0; i < findService.getServiceInfos().getServiceInfo().size(); i++) {
-                sb.append("<tr><td><a href=\"serviceEditor.jsp?id=").
-                        append(StringEscapeUtils.escapeHtml(findService.getServiceInfos().getServiceInfo().get(i).getServiceKey())).
-                        append("\" title=\"").
-                        append(StringEscapeUtils.escapeHtml(findService.getServiceInfos().getServiceInfo().get(i).getServiceKey()))
-                        .append("\">");
-                sb.append(Printers.ListNamesToString(findService.getServiceInfos().getServiceInfo().get(i).getName())).append("</a></td><td>");
-                sb.append((findService.getServiceInfos().getServiceInfo().get(i).getServiceKey())).append("</td><td>");
-                sb.append(StringEscapeUtils.escapeHtml((findService.getServiceInfos().getServiceInfo().get(i).getBusinessKey())))
-                        .append("</td></tr>");
-            }
-            sb.append("</table>");
-            ret.renderedHtml = sb.toString();
+            ret.renderedHtml = Printers.ServiceListAsHtml(findService, isChooser, session);
+
+            //  ret.renderedHtml = sb.toString();
             return ret;
         } catch (Exception ex) {
             ret.renderedHtml = HandleException(ex);
@@ -1067,11 +1051,11 @@ public class UddiHub {
             if (findTModel == null || findTModel.getTModelInfos() == null || findTModel.getTModelInfos().getTModelInfo().isEmpty()) {
                 ret.renderedHtml = ResourceLoader.GetResource(session, "errors.norecordsfound");//"No tModels are defined";
             } else {
-                if (!isChooser) {
-                    ret.renderedHtml = Printers.PrintTModelListAsHtml(findTModel, session);
-                } else {
-                    ret.renderedHtml = Printers.PrintTModelListAsHtmlModel(findTModel, session);
-                }
+                // if (!isChooser) {
+                ret.renderedHtml = Printers.PrintTModelListAsHtml(findTModel, session, isChooser);
+                // } else {
+                //     ret.renderedHtml = Printers.PrintTModelListAsHtmlModel(findTModel, session);
+                // }
 
             }
         } catch (Exception ex) {
@@ -2381,7 +2365,8 @@ public class UddiHub {
             if (subscriptionResults != null) {
                 //    subscriptionResults.getAssertionStatusReport().
                 if (subscriptionResults.getAssertionStatusReport() != null) {
-                    sb.append("Assertion Status Report Changed<br><table class=\"table table-hover\">");
+                    sb.append(ResourceLoader.GetResource(session, "items.subscriptions.assertion")).
+                            append("<br><table class=\"table table-hover\">");
                     for (int i = 0; i < subscriptionResults.getAssertionStatusReport().getAssertionStatusItem().size(); i++) {
                         sb.append("<tr><td>");
                         sb.append(StringEscapeUtils.escapeHtml(subscriptionResults.getAssertionStatusReport().getAssertionStatusItem().get(i).getFromKey()));
@@ -2393,7 +2378,8 @@ public class UddiHub {
                     }
                     sb.append("</table><br><br>");
                 } else if (subscriptionResults.getBindingDetail() != null) {
-                    sb.append("Bindings Changed<br><table class=\"table table-hover\">");
+                    sb.append(ResourceLoader.GetResource(session, "items.subscriptions.bindings")).
+                            append("<br><table class=\"table table-hover\">");
                     for (int i = 0; i < subscriptionResults.getBindingDetail().getBindingTemplate().size(); i++) {
                         sb.append("<tr><td>");
                         sb.append(StringEscapeUtils.escapeHtml(subscriptionResults.getBindingDetail().getBindingTemplate().get(i).getServiceKey()));
@@ -2403,7 +2389,8 @@ public class UddiHub {
                     }
                     sb.append("</table><br><br>");
                 } else if (subscriptionResults.getBusinessDetail() != null) {
-                    sb.append("Businesses Changed<br><table class=\"table table-hover\">");
+                    sb.append(ResourceLoader.GetResource(session, "items.subscriptions.business")).
+                            append("<br><table class=\"table table-hover\">");
                     for (int i = 0; i < subscriptionResults.getBusinessDetail().getBusinessEntity().size(); i++) {
                         sb.append("<tr><td>");
                         sb.append(StringEscapeUtils.escapeHtml(subscriptionResults.getBusinessDetail().getBusinessEntity().get(i).getBusinessKey()));
@@ -2411,7 +2398,8 @@ public class UddiHub {
                     }
                     sb.append("</table><br><br>");
                 } else if (subscriptionResults.getRelatedBusinessesList() != null) {
-                    sb.append("Business Relationships (Publisher Asssertions)<br><table class=\"table table-hover\">");
+                    sb.append(ResourceLoader.GetResource(session, "items.subscriptions.assertion2")).
+                            append("<br><table class=\"table table-hover\">");
                     // for (int i = 0; i < subscriptionResults.getRelatedBusinessesList().getBusinessKey().size(); i++) {
                     sb.append("<tr><td>");
                     sb.append(StringEscapeUtils.escapeHtml(subscriptionResults.getRelatedBusinessesList().getBusinessKey()));
@@ -2419,7 +2407,8 @@ public class UddiHub {
                     //}
                     sb.append("</table><br><br>");
                 } else if (subscriptionResults.getServiceDetail() != null) {
-                    sb.append("Services Changed<br><table class=\"table table-hover\">");
+                    sb.append(ResourceLoader.GetResource(session, "items.subscriptions.services")).
+                            append("d<br><table class=\"table table-hover\">");
                     for (int i = 0; i < subscriptionResults.getServiceDetail().getBusinessService().size(); i++) {
                         sb.append("<tr><td>");
                         sb.append(StringEscapeUtils.escapeHtml(subscriptionResults.getServiceDetail().getBusinessService().get(i).getServiceKey()));
@@ -2427,7 +2416,7 @@ public class UddiHub {
                     }
                     sb.append("</table><br><br>");
                 } else if (subscriptionResults.getServiceList() != null) {
-                    sb.append("Service Listing<br><table class=\"table table-hover\">");
+                    sb.append(ResourceLoader.GetResource(session, "items.subscriptions.servicelist")).append("<br><table class=\"table table-hover\">");
                     for (int i = 0; i < subscriptionResults.getServiceList().getServiceInfos().getServiceInfo().size(); i++) {
                         sb.append("<tr><td>");
                         sb.append(StringEscapeUtils.escapeHtml(subscriptionResults.getServiceList().getServiceInfos().getServiceInfo().get(i).getServiceKey()));
@@ -2437,7 +2426,7 @@ public class UddiHub {
                     }
                     sb.append("</table><br><br>");
                 } else if (subscriptionResults.getTModelDetail() != null) {
-                    sb.append("tModels Changed<br><table class=\"table table-hover\">");
+                    sb.append(ResourceLoader.GetResource(session, "items.subscriptions.tmodels")).append("<br><table class=\"table table-hover\">");
                     for (int i = 0; i < subscriptionResults.getTModelDetail().getTModel().size(); i++) {
                         sb.append("<tr><td>");
                         sb.append(StringEscapeUtils.escapeHtml(subscriptionResults.getTModelDetail().getTModel().get(i).getTModelKey()));
@@ -2447,7 +2436,8 @@ public class UddiHub {
                     }
                     sb.append("</table><br><br>");
                 } else if (subscriptionResults.getTModelList() != null) {
-                    sb.append("tModel Listing<br><table class=\"table table-hover\">");
+                    sb.append(ResourceLoader.GetResource(session, "items.subscriptions.tmodels2"))
+                            .append("<br><table class=\"table table-hover\">");
                     for (int i = 0; i < subscriptionResults.getTModelList().getTModelInfos().getTModelInfo().size(); i++) {
                         sb.append("<tr><td>");
                         sb.append(StringEscapeUtils.escapeHtml(subscriptionResults.getTModelList().getTModelInfos().getTModelInfo().get(i).getTModelKey()));
@@ -2531,7 +2521,7 @@ public class UddiHub {
                 ret.renderedHtml = ResourceLoader.GetResource(session, "errors.norecordsfound");
                 return ret;
             }
-
+            
 
 
             StringBuilder sb = new StringBuilder();
@@ -2551,7 +2541,7 @@ public class UddiHub {
                 if (serviceDetail.getBusinessService().get(i).getBindingTemplates() != null) {
                     for (int k = 0; k < serviceDetail.getBusinessService().get(i).getBindingTemplates().getBindingTemplate().size(); k++) {
                         //System.out.println(serviceDetail.getBusinessService().get(i).getBindingTemplates().getBindingTemplate().get(k).getAccessPoint().getValue());
-                        sb.append("<tr><td><input type=\"checkbox\" class=\"modalable\" id=\"").
+                        sb.append("<tr><td><input type=\"checkbox\" class=\"modalableBinding\" id=\"").
                                 append(StringEscapeUtils.escapeHtml(serviceDetail.getBusinessService().get(i).getBindingTemplates().getBindingTemplate().get(k).getBindingKey())).
                                 append("\">").
                                 append("</td><td>").
@@ -2607,24 +2597,69 @@ public class UddiHub {
      * must be provided in a keyBag.
      *
      * @param keys
-     * @param transferTo
+     * @param nodeid
      * @param outExpires
      * @param outToken
      * @return
      */
-    public String GetCustodyTransferToken(List<String> keys, Holder<String> transferTo, Holder<XMLGregorianCalendar> outExpires, Holder<byte[]> outToken) {
+    public String GetCustodyTransferToken(org.uddi.custody_v3.KeyBag keys, Holder<String> nodeid, Holder<XMLGregorianCalendar> outExpires, Holder<byte[]> outToken) {
+
+        // org.uddi.custody_v3.KeyBag kb = new org.uddi.custody_v3.KeyBag();
+        // kb.getKey().addAll(keys);
+        try {
+            try {
+                custody.getTransferToken(GetToken(), keys, nodeid, outExpires, outToken);
+            } catch (Exception ex) {
+                if (ex instanceof DispositionReportFaultMessage) {
+                    DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
+                    if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+                        token = null;
+                        custody.getTransferToken(GetToken(), keys, nodeid, outExpires, outToken);
+                    }
+                } else {
+                    throw ex;
+                }
+            }
+        } catch (Exception ex) {
+            return HandleException(ex);
+
+        }
+        return null;//"Success";
+    }
+
+    /**
+     *
+     * @param tokenxml
+     * @return The discard_transferToken API is a client API used to discard a
+     * transferToken obtained through the get_transferToken API at the same
+     * node. This API accepts either a transferToken or a keyBag as parameters
+     * to remove the permission to transfer data associated with a particular
+     * transferToken. If a keyBag is provided, all tokens corresponding to the
+     * keys in the keyBag will be discarded and will no longer be valid for
+     * custody or ownership transfer after the discard_transferToken is
+     * processed, irrespective of whether the keys match any known business or
+     * tmodelKey values. In the event that the keyBag represents a subset of the
+     * keyBag for one or more transferToken elements, the transferToken is
+     * discarded and will no longer be valid for transferring any entity. If the
+     * token passed in the transferToken argument does not match an existing
+     * token known to the system, no action is taken and success is reported.
+     * Keys in the keyBag argument that do not have a corresponding token are
+     * ignored.
+     */
+    public String DiscardToken(String tokenxml) {
+        DiscardTransferToken r = new DiscardTransferToken();
+        r.setAuthInfo(GetToken());
+        r.setTransferToken(JAXB.unmarshal(new StringReader(tokenxml), TransferToken.class));
 
-        org.uddi.custody_v3.KeyBag kb = new org.uddi.custody_v3.KeyBag();
-        kb.getKey().addAll(keys);
         try {
             try {
-                custody.getTransferToken(GetToken(), kb, transferTo, outExpires, outToken);
+                custody.discardTransferToken(r);
             } catch (Exception ex) {
                 if (ex instanceof DispositionReportFaultMessage) {
                     DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
                     if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
                         token = null;
-                        custody.getTransferToken(GetToken(), kb, transferTo, outExpires, outToken);
+                        custody.discardTransferToken(r);
                     }
                 } else {
                     throw ex;
@@ -2632,7 +2667,52 @@ public class UddiHub {
             }
         } catch (Exception ex) {
             return HandleException(ex);
+        }
+        return null;//"Success";
+
+    }
 
+    public String AcceptCustodyTranferToken(String tokenXML, String keyBagXML) {
+        try {
+            TransferEntities te = new TransferEntities();
+            te.setAuthInfo(GetToken());
+            StringReader sr = new StringReader(tokenXML.trim());
+            te.setTransferToken(JAXB.unmarshal(sr, TransferToken.class));
+            sr = new StringReader(keyBagXML.trim());
+            te.setKeyBag(JAXB.unmarshal(sr, org.uddi.custody_v3.KeyBag.class));
+
+            try {
+                custody.transferEntities(te);
+            } catch (Exception ex) {
+                if (ex instanceof DispositionReportFaultMessage) {
+                    DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
+                    if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+                        token = null;
+                        custody.transferEntities(te);
+                    }
+                } else {
+                    throw ex;
+                }
+            }
+        } catch (Exception ex) {
+            return HandleException(ex);
+        }
+        return null;//"Success";
+
+    }
+
+    public Subscription GetSubscriptionDetails(String id) {
+        if (id == null) {
+            return null;
+        }
+        List<Subscription> GetSubscriptions = this.GetSubscriptions();
+        if (GetSubscriptions == null) {
+            return null;
+        }
+        for (int i = 0; i < GetSubscriptions.size(); i++) {
+            if (GetSubscriptions.get(i).getSubscriptionKey() != null && GetSubscriptions.get(i).getSubscriptionKey().equalsIgnoreCase(id)) {
+                return GetSubscriptions.get(i);
+            }
         }
         return null;
     }

Modified: juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/builders/Printers.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/builders/Printers.java?rev=1476880&r1=1476879&r2=1476880&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/builders/Printers.java (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/builders/Printers.java Mon Apr 29 02:49:09 2013
@@ -187,8 +187,7 @@ public class Printers {
         return sb.toString();
     }
 
-    public static String PrintTModelListAsHtml(TModelList findTModel, HttpSession session) {
-        boolean isChooser = false;
+    public static String PrintTModelListAsHtml(TModelList findTModel, HttpSession session, boolean isChooser) {
 
         StringBuilder sb = new StringBuilder();
 
@@ -205,7 +204,7 @@ public class Printers {
         for (int i = 0; i < findTModel.getTModelInfos().getTModelInfo().size(); i++) {
             sb.append("<tr><td>");
             if (isChooser) {
-                sb.append("<input class=\"modalable\" type=checkbox id=\"")
+                sb.append("<input class=\"modalableTmodel\" type=checkbox id=\"")
                         .append(StringEscapeUtils.escapeHtml(findTModel.getTModelInfos().getTModelInfo().get(i).getTModelKey()))
                         .append("\"></td><td>");
             }
@@ -232,7 +231,8 @@ public class Printers {
         return sb.toString();
     }
 
-    public static String PrintTModelListAsHtmlModel(TModelList findTModel, HttpSession session) {
+    @Deprecated
+    private static String PrintTModelListAsHtmlModel(TModelList findTModel, HttpSession session) {
         StringBuilder sb = new StringBuilder();
 
         sb.append("<table class=\"table table-hover\"><tr><th>");
@@ -248,7 +248,7 @@ public class Printers {
         for (int i = 0; i < findTModel.getTModelInfos().getTModelInfo().size(); i++) {
             sb.append("<tr><td>");
 
-            sb.append("<input class=\"modalable\" type=checkbox id=\"")
+            sb.append("<input class=\"modalableTmodel\" type=checkbox id=\"")
                     .append(StringEscapeUtils.escapeHtml(findTModel.getTModelInfos().getTModelInfo().get(i).getTModelKey()))
                     .append("\"></td><td>");
 
@@ -267,15 +267,24 @@ public class Printers {
         return sb.toString();
     }
 
-    public static String BusinessListAsTable(BusinessList findBusiness, HttpSession session) {
+    public static String BusinessListAsTable(BusinessList findBusiness, HttpSession session, boolean isChooser) {
         StringBuilder sb = new StringBuilder();
-        sb.append("<table class=\"table table-hover\"<tr><th>").
-                append(ResourceLoader.GetResource(session, "items.name")).
+        sb.append("<table class=\"table table-hover\"<tr><th>");
+        if (isChooser) {
+            sb.append("</th><th>");
+        }
+        sb.append(ResourceLoader.GetResource(session, "items.name")).
                 append("</th><th>").
                 append(ResourceLoader.GetResource(session, "items.service")).
                 append("</th></tr>");
         for (int i = 0; i < findBusiness.getBusinessInfos().getBusinessInfo().size(); i++) {
-            sb.append("<tr><td><a title=\"").
+            sb.append("<tr><td>");
+            if (isChooser) {
+                sb.append("<input type=\"checkbox\" class=\"modalableBusinessChooser\" id=\"").
+                        append(StringEscapeUtils.escapeHtml(findBusiness.getBusinessInfos().getBusinessInfo().get(i).getBusinessKey())).
+                        append("\"></td><td>");
+            }
+            sb.append("<a title=\"").
                     append(StringEscapeUtils.escapeHtml(findBusiness.getBusinessInfos().getBusinessInfo().get(i).getBusinessKey())).
                     append("\"  href=\"businessEditor2.jsp?id=").
                     append(StringEscapeUtils.escapeHtml(findBusiness.getBusinessInfos().getBusinessInfo().get(i).getBusinessKey())).
@@ -291,9 +300,13 @@ public class Printers {
             } else {
                 sb.append("Show ").append(findBusiness.getBusinessInfos().getBusinessInfo().get(i).getServiceInfos().getServiceInfo().size());
             }
-            sb.append("</a><a class=\"btn btn-primary\" href=\"serviceEditor.jsp?bizid=").
-                    append(StringEscapeUtils.escapeHtml(findBusiness.getBusinessInfos().getBusinessInfo().get(i).getBusinessKey())).
-                    append("\"><i class=\"icon-plus-sign icon-white  icon-large\"></i></a></td></tr>");
+            sb.append("</a>");
+            if (!isChooser) {
+                sb.append("<a class=\"btn btn-primary\" href=\"serviceEditor.jsp?bizid=").
+                        append(StringEscapeUtils.escapeHtml(findBusiness.getBusinessInfos().getBusinessInfo().get(i).getBusinessKey())).
+                        append("\"><i class=\"icon-plus-sign icon-white  icon-large\"></i></a>");
+            }
+            sb.append("</td></tr>");
 
             sb.append("<tr><td colspan=3><div id=\"").
                     append(StringEscapeUtils.escapeHtml(findBusiness.getBusinessInfos().getBusinessInfo().get(i).getBusinessKey())).
@@ -302,4 +315,38 @@ public class Printers {
         sb.append("</table>");
         return sb.toString();
     }
+
+    public static String ServiceListAsHtml(ServiceList findService, boolean chooser, HttpSession session) {
+        StringBuilder sb = new StringBuilder();
+        sb.append("<table class=\"table\"><tr><th>");
+        if (chooser) {
+            sb.append("</th><th>");
+        }
+        sb.append(ResourceLoader.GetResource(session, "items.name")).
+                append("</th><th>").
+                append(ResourceLoader.GetResource(session, "items.key")).
+                append("</th><th>").
+                append(ResourceLoader.GetResource(session, "items.business")).
+                append("</th></tr>");
+        for (int i = 0; i < findService.getServiceInfos().getServiceInfo().size(); i++) {
+            sb.append("<tr><td>");
+            if (chooser) {
+                sb.append("<input class=\"modalableServiceChooser\" type=\"checkbox\" id=\"").
+                        append(StringEscapeUtils.escapeHtml(findService.getServiceInfos().getServiceInfo().get(i).getServiceKey())).
+                        append("\">");
+                sb.append("</td><td>");
+            }
+            sb.append("<a href=\"serviceEditor.jsp?id=").
+                    append(StringEscapeUtils.escapeHtml(findService.getServiceInfos().getServiceInfo().get(i).getServiceKey())).
+                    append("\" title=\"").
+                    append(StringEscapeUtils.escapeHtml(findService.getServiceInfos().getServiceInfo().get(i).getServiceKey()))
+                    .append("\">");
+            sb.append(Printers.ListNamesToString(findService.getServiceInfos().getServiceInfo().get(i).getName())).append("</a></td><td>");
+            sb.append((findService.getServiceInfos().getServiceInfo().get(i).getServiceKey())).append("</td><td>");
+            sb.append(StringEscapeUtils.escapeHtml((findService.getServiceInfos().getServiceInfo().get(i).getBusinessKey())))
+                    .append("</td></tr>");
+        }
+        sb.append("</table>");
+        return sb.toString();
+    }
 }

Added: juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/builders/SubscriptionHelper.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/builders/SubscriptionHelper.java?rev=1476880&view=auto
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/builders/SubscriptionHelper.java (added)
+++ juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/hub/builders/SubscriptionHelper.java Mon Apr 29 02:49:09 2013
@@ -0,0 +1,28 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.apache.juddi.webconsole.hub.builders;
+
+import org.uddi.sub_v3.Subscription;
+
+/**
+ *
+ * @author Alex O'Ree
+ */
+public class SubscriptionHelper {
+
+    public static boolean isSpecificItem(Subscription sub) {
+        if (sub == null) {
+            throw new IllegalArgumentException();
+        }
+        if (sub.getSubscriptionFilter() == null) {
+            throw new IllegalArgumentException();
+        }
+        return (sub.getSubscriptionFilter().getGetAssertionStatusReport() != null
+                || sub.getSubscriptionFilter().getGetBindingDetail() != null
+                || sub.getSubscriptionFilter().getGetBusinessDetail() != null
+                || sub.getSubscriptionFilter().getGetServiceDetail() != null
+                || sub.getSubscriptionFilter().getGetTModelDetail() != null);
+    }
+}

Modified: juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web.properties
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web.properties?rev=1476880&r1=1476879&r2=1476880&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web.properties (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web.properties Mon Apr 29 02:49:09 2013
@@ -37,8 +37,8 @@ navbar.create.publisher.tooltip=Create a
 navbar.create.tmodelkeygen=tModel Partition (Key Generator)
 
 navbar.subscriptions=Subscriptions
-navbar.subscriptions.view=View
-navbar.subscriptions.create=Create
+navbar.subscriptions.view=View Subscriptions
+navbar.subscriptions.create=Create Subscriptions
 navbar.subscriptions.view.tooltip=View My Subscriptions
 navbar.subscriptions.create.tooltip=Create a Subscription
 
@@ -261,3 +261,29 @@ navbar.subscriptions.feed.tooltip=A new 
 items.tmodel.chooser=tModel Chooser
 actions.select=Select
 actions.cancel=Cancel
+navbar.transfer=Transfer Custody
+navbar.transfer.tooltip=Transfer Ownership to another Publisher
+items.subscriptions.assertion=Assertion Status Report Changed
+items.subscriptions.bindings=Bindings Changed
+items.subscriptions.business=Businesses Changed
+items.subscriptions.assertion2=Business Relationships (Publisher Assertions)
+items.subscriptions.services=Services Changed
+items.subscriptions.servicelist=Service Listing
+items.subscriptions.tmodels=tModels Changed
+items.subscriptions.tmodels2=tModel Listing
+actions.canceled=Canceled
+actions.success=Success!
+items.transfertoken=Transfer Token
+items.transferkeys=Keys to Transfer (KeyBag)
+error.ohno=Oh no!
+error.occurred=Unfortunately, an error occurred. 
+error.pleasereport=Please do us a favor and report to your jUDDI administrator.
+error.timeofevent=Time the event occurred
+error.reportadmin=If you are the administrator, please review the server logs and report the findings to the following URL.
+error.filereport=File a Bug Report
+navbar.help.about=About
+navbar.help.about.tooltip=About this site
+pages.about.content=This website is part of the <a href="http://juddi.apache.org">Apache jUDDI</a> project and provides end user functionality for\n            interacting with a UDDI version 3 registry as defined by the OASIS standard located here: <a href="http://uddi.org/pubs/uddi-v3.0.2-20041019.htm">http://uddi.org/pubs/uddi-v3.0.2-20041019.htm</a>.\n            <br><br>\n            This user interface should work with any UDDI v3 implementation but was designed and tested with the Apache jUDDI server and communicates via \n            web service transactions.\n            <br><br>\n            This user interface is open source and uses a number of other open source libraries and capabilities which are listed below.
+items.binding.chooser=Binding Chooser
+items.service.chooser=Service Chooser
+items.business.chooser=Business Chooser

Modified: juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web_es.properties
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web_es.properties?rev=1476880&r1=1476879&r2=1476880&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web_es.properties (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/resources/web_es.properties Mon Apr 29 02:49:09 2013
@@ -39,8 +39,8 @@ navbar.create.publisher.tooltip=Crear un
 navbar.create.tmodelkeygen=tModel Partition (Key Generator)
 
 navbar.subscriptions=Suscripciones
-navbar.subscriptions.view=Ver
-navbar.subscriptions.create=Crear
+navbar.subscriptions.view=Ver Suscripciones
+navbar.subscriptions.create=Crear Suscripciones
 navbar.subscriptions.view.tooltip=Ver Mis Suscripciones
 navbar.subscriptions.create.tooltip=Crear una suscripci\u00f3n
 
@@ -258,7 +258,33 @@ items.status=Estado
 actions.deleted=Suprimido
 navbar.subscriptions.feed=Noticias Corriente
 items.picker=Selector
-navbar.subscriptions.feed.tooltip=asdUn nuevo avance basado en la configuraci\u00f3n de la suscripci\u00f3n.
+navbar.subscriptions.feed.tooltip=Un nuevo avance basado en la configuraci\u00f3n de la suscripci\u00f3n.
 items.tmodel.chooser=tModel Selector
 actions.select=Seleccionar
 actions.cancel=Cancelar
+navbar.transfer=Transferencia de Custodia
+navbar.transfer.tooltip=Transferencia de la propiedad a otra Editor
+items.subscriptions.assertion=Informe sobre la situaci\u00f3n de aserci\u00f3n cambiado
+items.subscriptions.bindings=Vinculaciones Cambiado
+items.subscriptions.business=Las empresas Cambiado
+items.subscriptions.assertion2=Relaciones comerciales (Aseveraciones Editorial)
+items.subscriptions.services=Servicios Cambiado
+items.subscriptions.servicelist=Lista de servicios
+items.subscriptions.tmodels=tModels Cambiado
+items.subscriptions.tmodels2=Listado tModel
+actions.canceled=Cancelado
+actions.success=\u00c9xito!
+items.transfertoken=Traslado Token
+items.transferkeys=Claves para la transferencia (Bolsa de clave)
+error.ohno=\u00a1Ay no!
+error.occurred=Por desgracia, se ha producido un error.
+error.pleasereport=Por favor, haga el favor de informe al administrador jUDDI.
+error.timeofevent=Hora en que ocurri\u00f3 el evento
+error.reportadmin=Si usted es el administrador, por favor revise los registros del servidor y reportar los resultados a la siguiente URL.
+error.filereport=Presentar un informe de errores
+navbar.help.about=Acerca de
+navbar.help.about.tooltip=Acerca de este sitio
+pages.about.content=Este sitio es parte de la <a href="http://juddi.apache.org"> Apache jUDDI </ a> proyecto y proporciona funcionalidad para el usuario final\n\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0 interactuar con una versi\u00f3n 3 registro UDDI tal como se define por la norma OASIS se encuentra aqu\u00ed: <un\n\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0 <br>\n\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0 Esta interfaz de usuario deber\u00eda funcionar con cualquier aplicaci\u00f3n UDDI v3, pero fue dise\u00f1ado y probado con el servidor Apache jUDDI y se comunica a trav\u00e9s de\n\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0 transacciones de servicios Web.\n\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0 <br>\n\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0 Esta interfaz de usuario es de c\u00f3digo abiert
 o y utiliza una serie de otras bibliotecas y las capacidades que se enumeran a continuaci\u00f3n de c\u00f3digo abierto.
+items.binding.chooser=Binding Selector
+items.service.chooser=Servicio de Selector
+items.business.chooser=Negocio Selector

Added: juddi/branches/juddi-3.2.x/juddi-gui/test/asd.html
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/test/asd.html?rev=1476880&view=auto
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/test/asd.html (added)
+++ juddi/branches/juddi-3.2.x/juddi-gui/test/asd.html Mon Apr 29 02:49:09 2013
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="http://localhost:8080/UDDIBrowser" />
+<title>LangSelect2</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">LangSelect2</td></tr>
+</thead><tbody>
+<tr>
+	<td>open</td>
+	<td>/UDDIBrowser/</td>
+	<td></td>
+</tr>
+<tr>
+	<td>select</td>
+	<td>id=language</td>
+	<td>label=Español</td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>css=button.btn.btn-primary</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>pronunciado </td>
+	<td></td>
+</tr>
+
+</tbody></table>
+</body>
+</html>

Added: juddi/branches/juddi-3.2.x/juddi-gui/test/asd2.html
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/test/asd2.html?rev=1476880&view=auto
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/test/asd2.html (added)
+++ juddi/branches/juddi-3.2.x/juddi-gui/test/asd2.html Mon Apr 29 02:49:09 2013
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="http://localhost:8080/UDDIBrowser" />
+<title>LoginRoot</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">LoginRoot</td></tr>
+</thead><tbody>
+<tr>
+	<td>open</td>
+	<td>/UDDIBrowser/home.jsp</td>
+	<td></td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>id=username</td>
+	<td>root</td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>id=password</td>
+	<td>root</td>
+</tr>
+<tr>
+	<td>pause</td>
+	<td>5000</td>
+	<td>5000</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>id=loginbutton</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertText</td>
+	<td>css=i.icon-user</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>root</td>
+	<td></td>
+</tr>
+
+</tbody></table>
+</body>
+</html>

Added: juddi/branches/juddi-3.2.x/juddi-gui/test/asd3
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/test/asd3?rev=1476880&view=auto
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/test/asd3 (added)
+++ juddi/branches/juddi-3.2.x/juddi-gui/test/asd3 Mon Apr 29 02:49:09 2013
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
+  <title>Test Suite</title>
+</head>
+<body>
+<table id="suiteTable" cellpadding="1" cellspacing="1" border="1" class="selenium"><tbody>
+<tr><td><b>Test Suite</b></td></tr>
+<tr><td><a href="../seleniumTests.html">LangSelect1</a></td></tr>
+<tr><td><a href="asd.html">LangSelect2</a></td></tr>
+<tr><td><a href="asd2.html">LoginRoot</a></td></tr>
+<tr><td><a href="BusinessSearchBasic.html">BusinessSearchBasic</a></td></tr>
+<tr><td><a href="BusinessEditorRender.html">BusinessEditor render</a></td></tr>
+</tbody></table>
+</body>
+</html>

Added: juddi/branches/juddi-3.2.x/juddi-gui/web/about.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/about.jsp?rev=1476880&view=auto
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/about.jsp (added)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/about.jsp Mon Apr 29 02:49:09 2013
@@ -0,0 +1,45 @@
+<%-- 
+    Document   : about
+    Created on : Apr 28, 2013, 4:26:58 PM
+    Author     : Alex O'Ree
+--%>
+
+
+<%@page import="java.net.URLEncoder"%>
+<%@page import="org.apache.juddi.webconsole.hub.builders.Printers"%>
+<%@page import="org.uddi.api_v3.RegisteredInfo"%>
+<%@page import="java.util.Iterator"%>
+<%@page import="java.util.Map.Entry"%>
+<%@page import="java.util.Set"%>
+<%@page import="java.util.Properties"%>
+<%@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><%=ResourceLoader.GetResource(session, "navbar.help.about")%></h1>
+    </div>
+
+    <!-- Example row of columns -->
+    <div class="row">
+        <div class="span12">
+            <%=ResourceLoader.GetResource(session, "pages.about.content")%>
+            
+            <ul>
+                <li><a href="http://www.flickr.com/photos/acbo/2073367106/sizes/z/in/photostream/">Splash page photo</a></li>
+                <li><a href="http://twitter.github.com/bootstrap/">Twitter Bootstrap</a></li>
+                <li><a href="http://tarruda.github.io/bootstrap-datetimepicker/">Date/time picker</a></li>
+                <li><a href="https://github.com/jschr/bootstrap-modal/">Modal Master</a></li>
+                <li><a href="https://github.com/jdewit/bootstrap-timepicker">Time Picker</a></li>
+                <li><a href="http://fortawesome.github.io/Font-Awesome/">Font Awesome</a></li>
+                <li><a href="http://www.appelsiini.net/projects/jeditable">jEditable</a></li>
+                <li><a href="http://jquery.com/">jQuery</a></li>
+                <li><a href="http://jqueryui.com/">jQuery UI</a></li>
+            </ul>
+        </div>
+
+
+    </div>
+
+    <%@include file="header-bottom.jsp" %>
\ No newline at end of file

Added: juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/abortTransferToken.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/abortTransferToken.jsp?rev=1476880&view=auto
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/abortTransferToken.jsp (added)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/abortTransferToken.jsp Mon Apr 29 02:49:09 2013
@@ -0,0 +1,37 @@
+<%-- 
+    Document   : abortTransferToken
+    Created on : Apr 27, 2013, 1:20:37 PM
+    Author     : Alex O'Ree
+--%>
+
+<%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
+<%@page import="org.apache.juddi.jaxb.PrintUDDI"%>
+<%@page import="org.uddi.custody_v3.TransferToken"%>
+<%@page import="javax.xml.datatype.DatatypeFactory"%>
+<%@page import="java.util.List"%>
+<%@page import="java.util.ArrayList"%>
+<%@page import="javax.xml.datatype.XMLGregorianCalendar"%>
+<%@page import="javax.xml.ws.Holder"%>
+<%@page import="org.apache.juddi.webconsole.hub.UddiHub"%>
+<%@page import="org.apache.juddi.webconsole.hub.UddiHub"%>
+<%@page contentType="text/html" pageEncoding="UTF-8"%>
+<jsp:include page="../csrf.jsp" />
+<!DOCTYPE html>
+<%
+    if (request.getMethod().equalsIgnoreCase("POST")) {
+        String tokenxml = request.getParameter("tokenxml");
+
+
+        UddiHub x = UddiHub.getInstance(application, session);
+
+        String msg = x.DiscardToken(tokenxml);
+        if (msg != null) {
+            out.write(msg);
+        } else {
+            out.write(ResourceLoader.GetResource(session, "actions.canceled"));
+
+        }
+    }
+
+
+%>
\ No newline at end of file

Added: juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/acceptTransferToken.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/acceptTransferToken.jsp?rev=1476880&view=auto
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/acceptTransferToken.jsp (added)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/acceptTransferToken.jsp Mon Apr 29 02:49:09 2013
@@ -0,0 +1,45 @@
+<%-- 
+    Document   : acceptTransferToken
+    Created on : Apr 27, 2013, 2:17:35 PM
+    Author     : Alex O'Ree
+--%>
+
+
+<%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
+<%@page import="javax.xml.bind.JAXB"%>
+<%@page import="java.io.StringWriter"%>
+<%@page import="org.apache.juddi.jaxb.PrintUDDI"%>
+<%@page import="org.uddi.custody_v3.TransferToken"%>
+<%@page import="javax.xml.datatype.DatatypeFactory"%>
+<%@page import="java.util.List"%>
+<%@page import="java.util.ArrayList"%>
+<%@page import="javax.xml.datatype.XMLGregorianCalendar"%>
+<%@page import="javax.xml.ws.Holder"%>
+<%@page import="org.apache.juddi.webconsole.hub.UddiHub"%>
+<%@page import="org.apache.juddi.webconsole.hub.UddiHub"%>
+<%@page contentType="text/html" pageEncoding="UTF-8"%>
+<jsp:include page="../csrf.jsp" />
+<%
+    if (request.getMethod().equalsIgnoreCase("POST")) {
+        String keyBagXML = request.getParameter("keybag");
+        String tokenXML = request.getParameter("tokenxml");
+
+        if (keyBagXML==null || tokenXML==null)
+                       {
+            response.setStatus(400);
+        }
+        else
+                       {
+        UddiHub x = UddiHub.getInstance(application, session);
+     
+        String msg = x.AcceptCustodyTranferToken(tokenXML, keyBagXML);
+        if (msg != null) {
+            out.write(msg);
+        } else {
+           out.write(ResourceLoader.GetResource(session, "actions.success"));
+          
+        }
+    }
+
+    }
+%>
\ No newline at end of file

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/assertions.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/assertions.jsp?rev=1476880&r1=1476879&r2=1476880&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/assertions.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/assertions.jsp Mon Apr 29 02:49:09 2013
@@ -64,9 +64,9 @@
                 out.write(data.get(i).getToKey());
                 out.write("</td><td>");
                 if (data.get(i).getKeyedReference() != null) {
-                    out.write("<div style=\"float:left\">Key :</div><div id=\"" + PostBackConstants.VALUE + "\" class=\"edit\">" + data.get(i).getKeyedReference().getTModelKey());
-                    out.write("<div style=\"float:left\">Name :</div><div id=\"" + PostBackConstants.KEYNAME + "\" class=\"edit\">" + data.get(i).getKeyedReference().getKeyName());
-                    out.write("<div style=\"float:left\">Value :</div><div id=\"" + PostBackConstants.KEYVALUE + "\" class=\"edit\">" + data.get(i).getKeyedReference().getKeyValue());
+                    out.write("<div style=\"float:left\">" + ResourceLoader.GetResource(session, "items.key") + " :</div><div id=\"" + PostBackConstants.VALUE + "\" class=\"edit\">" + data.get(i).getKeyedReference().getTModelKey());
+                    out.write("<div style=\"float:left\">" + ResourceLoader.GetResource(session, "items.name") + " :</div><div id=\"" + PostBackConstants.KEYNAME + "\" class=\"edit\">" + data.get(i).getKeyedReference().getKeyName());
+                    out.write("<div style=\"float:left\">" + ResourceLoader.GetResource(session, "items.value") + " :</div><div id=\"" + PostBackConstants.KEYVALUE + "\" class=\"edit\">" + data.get(i).getKeyedReference().getKeyValue());
                 }
                 out.write("</td><td>");
                 out.write("<a class=\"btn btn-primary\" href=\"javascript:removeAssertion('"
@@ -80,7 +80,7 @@
                         + "','"
                         + StringEscapeUtils.escapeJavaScript(data.get(i).getKeyedReference().getKeyValue())
                         + "');"
-                        + "\">Delete</a>");
+                        + "\">" + ResourceLoader.GetResource(session, "actions.delete") + "</a>");
                 out.write("</td><td>");
                 out.write(data.get(i).getCompletionStatus().toString());
                 out.write("</td></tr>");

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/bindingsearch.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/bindingsearch.jsp?rev=1476880&r1=1476879&r2=1476880&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/bindingsearch.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/bindingsearch.jsp Mon Apr 29 02:49:09 2013
@@ -51,8 +51,8 @@
 %>
 <script type="text/javascript">
     totalrecordsBinding=<%=ret.totalrecords%>;
-    $("#totalrecordsBinding").text(totalrecords);
-    $("#offsetBinding").text(<%=offset%>);
-    $("#displayrecordsBinding").text (<%=ret.displaycount%>);
+    $("#totalrecordsBinding").text(totalrecordsBinding);
+    $("#offsetBinding").text('<%=offset%>');
+    $("#displayrecordsBinding").text ('<%=ret.displaycount%>');
     refresh();
 </script>
\ No newline at end of file

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/businessAsSelect.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/businessAsSelect.jsp?rev=1476880&r1=1476879&r2=1476880&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/businessAsSelect.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/businessAsSelect.jsp Mon Apr 29 02:49:09 2013
@@ -7,6 +7,7 @@
 <%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
 <%@page import="org.apache.juddi.webconsole.hub.UddiHub"%>
 <%@page contentType="text/html" pageEncoding="UTF-8"%>
+<jsp:include page="../csrf.jsp" />
 <%
     UddiHub x = UddiHub.getInstance(application, session);
 

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/businesssearch.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/businesssearch.jsp?rev=1476880&r1=1476879&r2=1476880&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/businesssearch.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/businesssearch.jsp Mon Apr 29 02:49:09 2013
@@ -44,8 +44,14 @@
         }
     } catch (Exception ex) {
     }
-//public PagableContainer GetBusinessListAsHtml(int offset, int maxrecords, String keyword) {
-    PagableContainer ret= (x.GetBusinessListAsHtml(offset, maxrecords, keyword, lang, false));
+     boolean isChooser = false;
+    try {
+        isChooser = Boolean.parseBoolean(request.getParameter("chooser"));
+    } catch (Exception ex) {
+    }
+     
+
+    PagableContainer ret= (x.GetBusinessListAsHtml(offset, maxrecords, keyword, lang, isChooser));
     out.write(ret.renderedHtml);
 %>
 <script type="text/javascript">

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/getTransferToken.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/getTransferToken.jsp?rev=1476880&r1=1476879&r2=1476880&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/getTransferToken.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/getTransferToken.jsp Mon Apr 29 02:49:09 2013
@@ -4,6 +4,11 @@
     Author     : Alex O'Ree
 --%>
 
+<%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
+<%@page import="javax.xml.bind.JAXB"%>
+<%@page import="java.io.StringWriter"%>
+<%@page import="org.apache.juddi.jaxb.PrintUDDI"%>
+<%@page import="org.uddi.custody_v3.TransferToken"%>
 <%@page import="javax.xml.datatype.DatatypeFactory"%>
 <%@page import="java.util.List"%>
 <%@page import="java.util.ArrayList"%>
@@ -12,44 +17,66 @@
 <%@page import="org.apache.juddi.webconsole.hub.UddiHub"%>
 <%@page import="org.apache.juddi.webconsole.hub.UddiHub"%>
 <%@page contentType="text/html" pageEncoding="UTF-8"%>
-<!DOCTYPE html>
+<jsp:include page="../csrf.jsp" />
 <%
     if (request.getMethod().equalsIgnoreCase("POST")) {
-        String businesslist = request.getParameter("keylist");
-
-        //String tmodellist = request.getParameter("tmodellist");
-        String username = request.getParameter("transferto");
+        String keylist = request.getParameter("keylist");
+        if (keylist == null) {
+            response.setStatus(400);
+        } else {
+
+            UddiHub x = UddiHub.getInstance(application, session);
+            Holder<byte[]> outToken = new Holder<byte[]>();
+            Holder<XMLGregorianCalendar> outXcal = new Holder<XMLGregorianCalendar>();
+            DatatypeFactory df = DatatypeFactory.newInstance();
+            outXcal.value = df.newXMLGregorianCalendar();
+            Holder<String> transferTo = new Holder<String>();
+            //transferTo.value = username;
+            //  List<String> keys = new ArrayList<String>();
+
+            /*if (tmodellist != null) {
+             String[] tmodelkeys = tmodellist.split(",");
+             for (int i = 0; i < tmodelkeys.length; i++) {
+             keys.add(tmodelkeys[i]);
+             }
+             }*/
+            org.uddi.custody_v3.KeyBag keys = new org.uddi.custody_v3.KeyBag();
+
+            if (keylist != null) {
+                String[] keylists = keylist.split(",");
+
+                for (int i = 0; i < keylists.length; i++) {
+                    keys.getKey().add(keylists[i]);
+                }
+            }
 
+            String msg = x.GetCustodyTransferToken(keys, transferTo, outXcal, outToken);
+            if (msg != null) {
+                out.write(msg);
+            } else {
+                TransferToken tt = new TransferToken();
+                tt.setExpirationTime(outXcal.value);
+                tt.setNodeID(transferTo.value);
+                tt.setOpaqueToken(outToken.value);
+                try {
+                    StringWriter sw = new StringWriter();
+                    sw.write(ResourceLoader.GetResource(session, "items.transfertoken") + ": ");
+                    JAXB.marshal(tt, sw);
+                    
+
+                    sw.write(ResourceLoader.GetResource(session, "items.transferkeys") + ": ");
+                    JAXB.marshal(keys, sw);
+                    out.write(sw.toString());
+
+
+                } catch (Exception ex) {
+                    out.write(ex.getMessage());
+                }
 
-        UddiHub x = UddiHub.getInstance(application, session);
-        Holder<byte[]> outToken = new Holder<byte[]>();
-        Holder<XMLGregorianCalendar> outXcal = new Holder<XMLGregorianCalendar>();
-        DatatypeFactory df = DatatypeFactory.newInstance();
-        outXcal.value = df.newXMLGregorianCalendar();
-        Holder<String> transferTo = new Holder<String>();
-        transferTo.value = username;
-        List<String> keys = new ArrayList<String>();
-        if (businesslist != null) {
-            String[] businesskeys = businesslist.split(",");
 
-            for (int i = 0; i < businesskeys.length; i++) {
-                keys.add(businesskeys[i]);
+                //out.write(new String(outToken.value) + "<br>");
             }
         }
-        /*if (tmodellist != null) {
-            String[] tmodelkeys = tmodellist.split(",");
-            for (int i = 0; i < tmodelkeys.length; i++) {
-                keys.add(tmodelkeys[i]);
-            }
-        }*/
-        x.GetCustodyTransferToken(keys, transferTo, outXcal, outToken);
-        try{
-        if (outXcal!=null && outXcal.value!=null)
-        out.write(outXcal.value.toString() + "<br>");
-               }
-        catch (Exception ex){}
-        out.write(new String(outToken.value) + "<br>");
     }
 
-
 %>
\ No newline at end of file

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/loginpost.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/loginpost.jsp?rev=1476880&r1=1476879&r2=1476880&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/loginpost.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/loginpost.jsp Mon Apr 29 02:49:09 2013
@@ -16,21 +16,25 @@
 
     URL prop = application.getResource("/META-INF/config.properties");
     if (prop == null) {
+        prop = application.getResource("META-INF/config.properties");
+
+    }
+    if (prop == null) {
         throw new Exception("Cannot locate the configuration file.");
     }
-
+    
     InputStream in = prop.openStream();
     Properties p = new Properties();
     p.load(in);
     in.close();
     session.setAttribute("username", request.getParameter("username"));
-    session.setAttribute("password", AES.Encrypt(request.getParameter("password"), (String)p.get("key")));
+    session.setAttribute("password", AES.Encrypt(request.getParameter("password"), (String) p.get("key")));
 
 
 
     UddiHub.reset(request.getSession());
     UddiHub x = UddiHub.getInstance(application, request.getSession());
-    
+
 
 
 %>
\ No newline at end of file

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/saveFromXML.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/saveFromXML.jsp?rev=1476880&r1=1476879&r2=1476880&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/saveFromXML.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/saveFromXML.jsp Mon Apr 29 02:49:09 2013
@@ -54,27 +54,7 @@
                     BindingTemplate be = (BindingTemplate) JAXB.unmarshal(sr, BindingTemplate.class);
                     msg = (x.SaveBindingTemplate(be));
                 } else if (type.equalsIgnoreCase("tModel")) {
-                    //System.out.println(signedxml);
-
                     TModel be = (TModel) JAXB.unmarshal(sr, TModel.class);
-                    //JAXB.marshal(be, System.out);
-
-/*
-                    org.apache.juddi.v3.client.crypto.DigSigUtil dsig = new DigSigUtil();
-                    UddiHub hub = UddiHub.getInstance(application, session);
-                    Properties config2 = hub.GetRawConfiguration();
-                    Set<Entry<Object, Object>> it = config2.entrySet();
-                    Iterator it2 = it.iterator();
-                    while (it2.hasNext()) {
-                        Object j2 = it2.next();
-                        Entry<Object, Object> item = (Entry<Object, Object>) j2;
-                        dsig.put((String) item.getKey(), (String) item.getValue());
-                    }
-                    AtomicReference<String> msg2 = new AtomicReference<String>();
-                    boolean success = dsig.verifySignedUddiEntity(be, msg2);
-                    if (!success) {
-                        msg = "WARNING! unable to validate signature!" + msg2.get();
-                    }*/
                     msg = (x.SaveTModel(be));
                 } else {
                     msg = (ResourceLoader.GetResource(session, "errors.unknownentity"));

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/servicesearch.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/servicesearch.jsp?rev=1476880&r1=1476879&r2=1476880&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/servicesearch.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/servicesearch.jsp Mon Apr 29 02:49:09 2013
@@ -42,8 +42,13 @@
     if (maxrecords > 50) {
         maxrecords = 50;
     }
+    boolean isChooser = false;
+    try {
+        isChooser = Boolean.parseBoolean(request.getParameter("chooser"));
+    } catch (Exception ex) {
+    }
 
-    PagableContainer ret = (x.SearchForServices(keyword, lang, maxrecords, offset, false));
+    PagableContainer ret = (x.SearchForServices(keyword, lang, maxrecords, offset, isChooser));
     out.write(ret.renderedHtml);
 
 %>

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/settings.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/settings.jsp?rev=1476880&r1=1476879&r2=1476880&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/settings.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/settings.jsp Mon Apr 29 02:49:09 2013
@@ -11,7 +11,9 @@
 <%@page contentType="text/html" pageEncoding="UTF-8"%>
 <%@include  file="../csrf.jsp" %>
 <%
-
+    if (!request.getRemoteHost().equalsIgnoreCase("localhost") && !request.getRemoteHost().equalsIgnoreCase("127.0.0.1")) {
+        response.setStatus(403);
+    }
     if (!request.isUserInRole("manager")) {
         response.setStatus(403);
     }

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/bindingChooser.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/bindingChooser.jsp?rev=1476880&r1=1476879&r2=1476880&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/bindingChooser.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/bindingChooser.jsp Mon Apr 29 02:49:09 2013
@@ -7,17 +7,17 @@ this page is meant to be included via js
 
 <%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
 <%@page contentType="text/html" pageEncoding="UTF-8"%>
-<div class="modal hide fade" id="bindingChooser">
+<div class="modal hide fade container " id="bindingChooser">
     <div class="modal-header">
         <a href="javascript:$('#bindingChooser').modal('hide');" class="close" data-dismiss="modal" aria-hidden="true">&times;</a>
-        <h3>Binding Chooser</h3>
+        <h3><%=ResourceLoader.GetResource(session, "items.binding.chooser")%> </h3>
     </div>
     <div class="modal-body">
 
         <%=ResourceLoader.GetResource(session, "totals.records")%>: <span id="totalrecordsBinding"></span><br>
         <%=ResourceLoader.GetResource(session, "totals.recordsreturned")%>: <span id="displayrecordsBinding"></span><br>
         <%=ResourceLoader.GetResource(session, "totals.offset")%> : <span id="offsetBinding">0</span><br>
-        <%=ResourceLoader.GetResource(session, "items.lang")%>: <span id="langBinding" class="edit"></span><br>
+        <%//ResourceLoader.GetResource(session, "items.lang")%> <span id="langBinding" class=""></span><br>
 
         <a href="javascript:pagedownChooserBinding();"><i class="icon-circle-arrow-left disabled icon-2x" id="pageupBinding"></i></a>
         <a href="javascript:reloadBinding();"><i class="icon-refresh icon-2x"></i></a>
@@ -40,18 +40,20 @@ this page is meant to be included via js
                 type    : 'text',
                 submit  : 'OK'
             });
-           //only init the data when required reloadTmodelModal();
+            //only init the data when required reloadTmodelModal();
         </script>
 
     </div>
     <div class="modal-footer">
-        <a href="#" class="btn" data-dismiss="modal">Cancel</a>
-        <a href="javascript:$('#bindingChooser').modal('hide');" class="btn btn-primary" data-dismiss="modal">Select</a>
+        <a href="#" class="btn" data-dismiss="modal"><%=ResourceLoader.GetResource(session, "actions.cancel")%></a>
+        <a href="javascript:$('#bindingChooser').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:$('#bindingChooser').modal();" class="btn btn-primary" data-dismiss="modal">< %=ResourceLoader.GetResource(session, "actions.select")% ></a>
 %>
 
-<a href="javascript:$('#bindingChooser').modal();" class="btn btn-primary" data-dismiss="modal">Select</a>
\ No newline at end of file

Copied: juddi/branches/juddi-3.2.x/juddi-gui/web/businessChooser.jsp (from r1476397, juddi/branches/juddi-3.2.x/juddi-gui/web/bindingChooser.jsp)
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/businessChooser.jsp?p2=juddi/branches/juddi-3.2.x/juddi-gui/web/businessChooser.jsp&p1=juddi/branches/juddi-3.2.x/juddi-gui/web/bindingChooser.jsp&r1=1476397&r2=1476880&rev=1476880&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/bindingChooser.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/businessChooser.jsp Mon Apr 29 02:49:09 2013
@@ -1,5 +1,5 @@
 <%-- 
-    Document   : bindingChooser
+    Document   : businessChooser
     Created on : Apr 24, 2013, 6:25:00 PM
     Author     : Alex O'Ree
 this page is meant to be included via jsp:include
@@ -7,51 +7,53 @@ this page is meant to be included via js
 
 <%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
 <%@page contentType="text/html" pageEncoding="UTF-8"%>
-<div class="modal hide fade" id="bindingChooser">
+<div class="modal hide fade container " id="businessChooser">
     <div class="modal-header">
-        <a href="javascript:$('#bindingChooser').modal('hide');" class="close" data-dismiss="modal" aria-hidden="true">&times;</a>
-        <h3>Binding Chooser</h3>
+        <a href="javascript:$('#businessChooser').modal('hide');" class="close" data-dismiss="modal" aria-hidden="true">&times;</a>
+        <h3><%=ResourceLoader.GetResource(session, "items.business.chooser")%> </h3>
     </div>
     <div class="modal-body">
 
-        <%=ResourceLoader.GetResource(session, "totals.records")%>: <span id="totalrecordsBinding"></span><br>
-        <%=ResourceLoader.GetResource(session, "totals.recordsreturned")%>: <span id="displayrecordsBinding"></span><br>
-        <%=ResourceLoader.GetResource(session, "totals.offset")%> : <span id="offsetBinding">0</span><br>
-        <%=ResourceLoader.GetResource(session, "items.lang")%>: <span id="langBinding" class="edit"></span><br>
-
-        <a href="javascript:pagedownChooserBinding();"><i class="icon-circle-arrow-left disabled icon-2x" id="pageupBinding"></i></a>
-        <a href="javascript:reloadBinding();"><i class="icon-refresh icon-2x"></i></a>
-        <a href="javascript:pageupChooserBinding();"><i class="icon-circle-arrow-right disabled icon-2x" id="pagedownBinding"></i></a>
+        <%=ResourceLoader.GetResource(session, "totals.records")%>: <span id="totalrecordsBusiness"></span><br>
+        <%=ResourceLoader.GetResource(session, "totals.recordsreturned")%>: <span id="displayrecordsBusiness"></span><br>
+        <%=ResourceLoader.GetResource(session, "totals.offset")%> : <span id="offsetBusiness">0</span><br>
+        <%//ResourceLoader.GetResource(session, "items.lang")%> <span id="langBusiness" class=""></span><br>
+
+        <a href="javascript:pagedownChooserBusiness();"><i class="icon-circle-arrow-left disabled icon-2x" id="pageupBusiness"></i></a>
+        <a href="javascript:reloadBusiness();"><i class="icon-refresh icon-2x"></i></a>
+        <a href="javascript:pageupChooserBusiness();"><i class="icon-circle-arrow-right disabled icon-2x" id="pagedownBusiness"></i></a>
 
-        <div id="bindinglist">
+        <div id="businesslist">
             <img src="img/bigrollergreen.gif" title="Loading"/>
         </div>
-        <script src="js/bindingChooser.js"></script>
+        <script src="js/businessChooser.js"></script>
         <script type="text/javascript">
                     
             $('.edit').editable(function(value, settings) { 
                 console.log(this);
                 console.log(value);
                 console.log(settings);
-                reloadBindingModal();
+                reloadBusinessModal();
                 //  RenderTmodelListBySearch('%', offset, maxrecords);
                 return(value);
             }, { 
                 type    : 'text',
                 submit  : 'OK'
             });
-           //only init the data when required reloadTmodelModal();
+            //only init the data when required reloadTmodelModal();
         </script>
 
     </div>
     <div class="modal-footer">
-        <a href="#" class="btn" data-dismiss="modal">Cancel</a>
-        <a href="javascript:$('#bindingChooser').modal('hide');" class="btn btn-primary" data-dismiss="modal">Select</a>
+        <a href="#" class="btn" data-dismiss="modal"><%=ResourceLoader.GetResource(session, "actions.cancel")%></a>
+        <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>
 %>
 
-<a href="javascript:$('#bindingChooser').modal();" class="btn btn-primary" data-dismiss="modal">Select</a>
\ No newline at end of file

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/businessEditor2.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/businessEditor2.jsp?rev=1476880&r1=1476879&r2=1476880&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/businessEditor2.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/businessEditor2.jsp Mon Apr 29 02:49:09 2013
@@ -663,10 +663,10 @@
         if (!newitem) {
 
     %>
-    <div class="modal hide fade" id="viewAsXml">
+    <div class="modal hide fade container" id="viewAsXml">
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h3>As XML</h3>
+            <h3><%=ResourceLoader.GetResource(session, "actions.asxml")%></h3>
         </div>
         <div class="modal-body" id="viewAsXmlContent">
 
@@ -683,7 +683,7 @@
             $('#' + modaldiv).modal('hide');
         }
     </script>
-    <div class="modal hide fade" id="addSubscriptionModal">
+    <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>



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


Mime
View raw message