juddi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexo...@apache.org
Subject svn commit: r1467811 - in /juddi/branches/juddi-3.2.x/juddi-gui: src/java/org/apache/juddi/webconsole/hub/ src/java/org/apache/juddi/webconsole/resources/ web/ web/ajax/ web/js/
Date Sun, 14 Apr 2013 18:37:26 GMT
Author: alexoree
Date: Sun Apr 14 18:37:26 2013
New Revision: 1467811

URL: http://svn.apache.org/r1467811
Log:
added support for publisher assertions, a listing of my businesses, and additional i18n support

Added:
    juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/assertions.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/validateSignature.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/assertions.jsp
      - copied, changed from r1466751, juddi/branches/juddi-3.2.x/juddi-gui/web/businessBrowse.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/reginfo.jsp
      - copied, changed from r1466751, juddi/branches/juddi-3.2.x/juddi-gui/web/settings.jsp
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/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/businessEditor2.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/header-bottom.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/header-top.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/index.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/js/businesssearch.js
    juddi/branches/juddi-3.2.x/juddi-gui/web/serviceEditor.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/tmodelEditor.jsp

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=1467811&r1=1467810&r2=1467811&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 Sun Apr 14 18:37:26 2013
@@ -28,6 +28,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+import java.util.concurrent.atomic.AtomicReference;
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
@@ -35,15 +36,10 @@ import javax.xml.bind.JAXB;
 import javax.xml.bind.JAXBElement;
 import javax.xml.ws.BindingProvider;
 import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.juddi.api_v3.GetAllPublisherDetail;
-import org.apache.juddi.api_v3.Publisher;
-import org.apache.juddi.api_v3.PublisherDetail;
-import org.apache.juddi.api_v3.SavePublisher;
 import org.apache.juddi.v3.client.ClassUtil;
 import org.apache.juddi.v3.client.UDDIConstants;
 import org.apache.juddi.v3.client.config.UDDIClientContainer;
 import org.apache.juddi.v3.client.transport.Transport;
-import org.apache.juddi.v3_service.JUDDIApiPortType;
 import org.apache.juddi.webconsole.AES;
 import org.apache.juddi.webconsole.PostBackConstants;
 import org.apache.juddi.webconsole.hub.builders.Builders;
@@ -650,7 +646,7 @@ public class UddiHub {
         } else {
             be.setBusinessServices(GetBusinessDetails.getBusinessServices());
         }
-        //TODO signature
+
         be.setContacts(Builders.BuildContacts(request.getParameterMap(), ResourceLoader.GetResource(session, "items.clicktoedit")));
 
         be.getDescription().addAll(Builders.BuildDescription(Builders.MapFilter(request.getParameterMap(), PostBackConstants.DESCRIPTION), PostBackConstants.DESCRIPTION, ResourceLoader.GetResource(session, "items.clicktoedit")));
@@ -1989,7 +1985,18 @@ public class UddiHub {
         return sb.toString();
     }
 
-    //TODO this fucntion is pointless, it just returns a list of businesses
+    /**
+     * The get_registeredInfo API call is used to get an abbreviated list of all
+     * businessEntity and tModel data that are controlled by a publisher. When
+     * the registry distinguishes between publishers, this is the individual
+     * associated with the credentials passed in the authInfo element. This
+     * returned information is intended, for example, for driving tools that
+     * display lists of registered information and then provide drill-down
+     * features. This is the recommended API to use after a network problem
+     * results in an unknown status of saved information.
+     *
+     * @return
+     */
     public RegisteredInfo GetNodeInformation() {
         try {
             GetRegisteredInfo r = new GetRegisteredInfo();
@@ -2010,8 +2017,6 @@ public class UddiHub {
                     throw ex;
                 }
             }
-
-
             return registeredInfo;
         } catch (Exception ex) {
             HandleException(ex);
@@ -2019,31 +2024,193 @@ public class UddiHub {
         return null;
     }
 
-    public List<PublisherAssertion> GetPublisherAssertions() {
+    public List<AssertionStatusItem> GetPublisherAssertions(AtomicReference<String> msg) {
+        List<AssertionStatusItem> out = new ArrayList<AssertionStatusItem>();
+        //first, get all the assertions
+/*
+         List<PublisherAssertion> publisherAssertions = null;
+         try {
+         try {
+         publisherAssertions = publish.getPublisherAssertions(GetToken());
+         } catch (Exception ex) {
+         if (ex instanceof DispositionReportFaultMessage) {
+         DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
+         if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+         token = null;
+         publisherAssertions = publish.getPublisherAssertions(GetToken());
+         }
+         } else {
+         throw ex;
+         }
+         }
+         } catch (Exception ex) {
+         msg.set(HandleException(ex));
+         }
+         */
+        //then, all of the status of each item
+        /*
+         * The get_assertionStatusReport API call provides administrative support for determining 
+         * the status of current and outstanding publisher assertions that involve any of the business 
+         * registrations managed by the individual publisher.  Using this API, a publisher can see the 
+         * status of assertions that they have made, as well as see assertions that others have made that 
+         * involve businessEntity structures controlled by the requesting publisher.   See Appendix A 
+         * Relationships and Publisher Assertions for more information.
+         */
+        List<AssertionStatusItem> STATUS_COMPLETE = null;
+
         try {
-            List<PublisherAssertion> publisherAssertions = publish.getPublisherAssertions(GetToken());
-            return publisherAssertions;
+            try {
+                STATUS_COMPLETE = publish.getAssertionStatusReport(GetToken(), CompletionStatus.STATUS_COMPLETE);
+            } catch (Exception ex) {
+                if (ex instanceof DispositionReportFaultMessage) {
+                    DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
+                    if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+                        token = null;
+                        STATUS_COMPLETE = publish.getAssertionStatusReport(GetToken(), CompletionStatus.STATUS_COMPLETE);
+                    }
+                } else {
+                    throw ex;
+                }
+            }
         } catch (Exception ex) {
-            HandleException(ex);
+            msg.set(HandleException(ex));
         }
-        return null;
-    }
-    //publisher assertion, relationship between two business entities
+        if (STATUS_COMPLETE != null) {
+            out.addAll(STATUS_COMPLETE);
+        }
+        List<AssertionStatusItem> STATUS_FROM_KEY_INCOMPLETE = null;
+        try {
+            try {
+                STATUS_FROM_KEY_INCOMPLETE = publish.getAssertionStatusReport(GetToken(), CompletionStatus.STATUS_FROM_KEY_INCOMPLETE);
+            } catch (Exception ex) {
+                if (ex instanceof DispositionReportFaultMessage) {
+                    DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
+                    if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+                        token = null;
+                        STATUS_COMPLETE = publish.getAssertionStatusReport(GetToken(), CompletionStatus.STATUS_COMPLETE);
 
-    public String GetUDDISubscriptions() {
+                    }
+                } else {
+                    throw ex;
+                }
+            }
+        } catch (Exception ex) {
+            msg.set(HandleException(ex));
+        }
+        if (STATUS_FROM_KEY_INCOMPLETE != null) {
+            out.addAll(STATUS_FROM_KEY_INCOMPLETE);
+        }
+        List<AssertionStatusItem> STATUS_TO_KEY_INCOMPLETE = null;
+        try {
+            try {
+                STATUS_COMPLETE = publish.getAssertionStatusReport(GetToken(), CompletionStatus.STATUS_COMPLETE);
 
-        return null;
+            } catch (Exception ex) {
+                if (ex instanceof DispositionReportFaultMessage) {
+                    DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
+                    if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+                        token = null;
+                        STATUS_COMPLETE = publish.getAssertionStatusReport(GetToken(), CompletionStatus.STATUS_COMPLETE);
+
+                    }
+                } else {
+                    throw ex;
+                }
+            }
+        } catch (Exception ex) {
+            msg.set(HandleException(ex));
+        }
+        if (STATUS_TO_KEY_INCOMPLETE != null) {
+            out.addAll(STATUS_TO_KEY_INCOMPLETE);
+        }
+
+
+        return out;
+        //return publisherAssertions;
+    }
+
+    public String DeletePublisherAssertion(String tokey, String fromkey, String tmodelkey, String keyname, String keyvalue) {
+        DeletePublisherAssertions dp = new DeletePublisherAssertions();
+        dp.setAuthInfo(GetToken());
+        PublisherAssertion add = new PublisherAssertion();
+        add.setToKey(tokey);
+        add.setFromKey(fromkey);
+        add.setKeyedReference(new KeyedReference());
+        add.getKeyedReference().setTModelKey(tmodelkey);
+        add.getKeyedReference().setKeyName(keyname);
+        add.getKeyedReference().setKeyValue(keyvalue);
+        dp.getPublisherAssertion().add(add);
+        try {
+            try {
+                publish.deletePublisherAssertions(dp);
+            } catch (Exception ex) {
+                if (ex instanceof DispositionReportFaultMessage) {
+                    DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
+                    if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+                        token = null;
+                        publish.deletePublisherAssertions(dp);
+                    }
+                } else {
+                    throw ex;
+                }
+            }
+        } catch (Exception ex) {
+            return HandleException(ex);
+        }
+        return ResourceLoader.GetResource(session, "actions.saved");
     }
 
     /**
-     * @see FindRelatedBusinesses
+     *
+     * @param tokey
+     * @param fromkey
+     * @param keyname
+     * @param keyvalue
      * @return
      */
-    public String SetPublisherAssertion() {
-        return null;
+    public String AddPublisherAssertion(String tokey, String fromkey, String tmodelkey, String keyname, String keyvalue) {
+        // List<PublisherAssertion> x = GetPublisherAssertions();
+        AddPublisherAssertions r = new AddPublisherAssertions();
+        r.setAuthInfo(GetToken());
+        PublisherAssertion add = new PublisherAssertion();
+        add.setToKey(tokey);
+        add.setFromKey(fromkey);
+        add.setKeyedReference(new KeyedReference());
+        add.getKeyedReference().setTModelKey(tmodelkey);
+        add.getKeyedReference().setKeyName(keyname);
+        add.getKeyedReference().setKeyValue(keyvalue);
+        //TODO signatures? :(
+        r.getPublisherAssertion().add(add);
+        try {
+            try {
+                publish.addPublisherAssertions(r);
+
+            } catch (Exception ex) {
+                if (ex instanceof DispositionReportFaultMessage) {
+                    DispositionReportFaultMessage f = (DispositionReportFaultMessage) ex;
+                    if (f.getFaultInfo().countainsErrorCode(DispositionReport.E_AUTH_TOKEN_EXPIRED)) {
+                        token = null;
+                        publish.addPublisherAssertions(r);
+                    }
+                } else {
+                    throw ex;
+                }
+            }
+        } catch (Exception ex) {
+            return HandleException(ex);
+        }
+        return ResourceLoader.GetResource(session, "actions.saved");
+    }
+
+    public void GetMyBusinesses() {
     }
 
     public String TransferCustody() {
         return null;
     }
+
+    public String GetUDDISubscriptions() {
+
+        return 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=1467811&r1=1467810&r2=1467811&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 Sun Apr 14 18:37:26 2013
@@ -243,3 +243,14 @@ items.service.add=Add a Service
 items.publisherassertion.add=Add a Business Relationship (Publisher Assertion)
 actions.saved=Saved!
 items.details=Details
+navbar.publisherassertions=Publisher Assertions
+navbar.publisherassertions.tooltip=Allows you to configure relationships between businesses.
+navbar.create.mybiz=My Businesses
+navbar.create.mybiz.tooltip=A list of all businesses that you can alter.
+navbar.create.mybiz.content=My Businesses contains a list of all the UDDI business elements that you have access to. This typically means that you can make changes to it, however this may vary between vendors.
+actions.transfer.description=Transfer this entity to another UDDI node or publisher.
+actions.subscribe.description=Alert me when this entity changes.
+items.publisherassertions.from=My Business
+items.publisherassertions.to=Is related to business
+items.publisherassertions.relationship=Relationship
+items.status=Status

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=1467811&r1=1467810&r2=1467811&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 Sun Apr 14 18:37:26 2013
@@ -244,3 +244,14 @@ items.service.add=Agregar un Servicio
 items.publisherassertion.add=Agregar una Relaci\u00f3n de Negocios (aserci\u00f3n Publisher)
 actions.saved=Salvo!
 items.details=Detalles
+navbar.publisherassertions=Las Afirmaciones Editor
+navbar.publisherassertions.tooltip=Permite configurar las relaciones entre empresas.
+navbar.create.mybiz=Mis Empresas
+navbar.create.mybiz.tooltip=Una lista de todos los negocios que se pueden alterar.
+navbar.create.mybiz.content=Mis empresas contiene una lista de todos los elementos empresariales UDDI que usted tiene acceso. Esto normalmente significa que usted puede hacer cambios en \u00e9l, sin embargo esto puede variar entre los proveedores.
+actions.transfer.description=Traslade esta entidad a otro nodo UDDI o el editor.
+actions.subscribe.description=Avisarme cuando esta entidad los cambios.
+items.publisherassertions.from=Mi Negocio
+items.publisherassertions.to=Est\u00e1 relacionado con los negocios
+items.publisherassertions.relationship=Relaci\u00f3n
+items.status=Estado

Added: 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=1467811&view=auto
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/assertions.jsp (added)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/assertions.jsp Sun Apr 14 18:37:26 2013
@@ -0,0 +1,94 @@
+<%-- 
+    Document   : assertions
+    Created on : Apr 13, 2013, 7:44:30 PM
+    Author     : Alex O'Ree
+--%>
+
+<%@page import="org.uddi.api_v3.AssertionStatusItem"%>
+<%@page import="org.apache.commons.lang.StringEscapeUtils"%>
+<%@page import="java.util.concurrent.atomic.AtomicReference"%>
+<%@page import="javax.xml.ws.Holder"%>
+<%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
+<%@page import="org.apache.juddi.webconsole.PostBackConstants"%>
+<%@page import="java.util.List"%>
+<%@page import="org.uddi.api_v3.PublisherAssertion"%>
+<%@page import="org.apache.juddi.webconsole.hub.UddiHub"%>
+<%@page contentType="text/html" pageEncoding="UTF-8"%>
+<!DOCTYPE html>
+<%
+    UddiHub x = UddiHub.getInstance(application, session);
+    if (request.getMethod().equalsIgnoreCase("post")) {
+        if (request.getParameter("action") != null) {
+            String action = request.getParameter("action");
+            if (action.equalsIgnoreCase("delete")) {
+                String msg = x.DeletePublisherAssertion(request.getParameter("tokey"), request.getParameter("fromkey"), request.getParameter("tmodelkey"), request.getParameter("keyname"), request.getParameter("keyvalue"));
+                if (!msg.equals(ResourceLoader.GetResource(session, "actions.saved"))) {
+                    response.setStatus(500);
+                }
+                out.write(msg);
+            }
+        } else {
+            String msg = x.AddPublisherAssertion(request.getParameter("tokey"), request.getParameter("fromkey"), request.getParameter("tmodelkey"), request.getParameter("keyname"), request.getParameter("keyvalue"));
+            if (!msg.equals(ResourceLoader.GetResource(session, "actions.saved"))) {
+                response.setStatus(500);
+            }
+            out.write(msg);
+        }
+    } else {
+
+        List<AssertionStatusItem> data = null;
+        AtomicReference<String> msg = new AtomicReference<String>();
+        data = x.GetPublisherAssertions(msg);
+        if (msg != null && msg.get() != null) {
+            out.write(msg.get());
+        } else if (data == null || data.isEmpty())
+            out.write(ResourceLoader.GetResource(session, "errors.nodatareturned"));
+        else {
+
+%>
+<table class="table table-hover">
+    <tr><th><%=ResourceLoader.GetResource(session, "items.publisherassertions.from")%></th>
+        <th><%=ResourceLoader.GetResource(session, "items.publisherassertions.to")%></th>
+        <th><%=ResourceLoader.GetResource(session, "items.publisherassertions.relationship")%></th>
+        <th><%=ResourceLoader.GetResource(session, "items.actions")%></th>
+        <th><%=ResourceLoader.GetResource(session, "items.status")%></th>
+    </tr>
+        <%
+    //TODO i18n
+
+            for (int i = 0; i < data.size(); i++) {
+                out.write("<tr><td>");
+                out.write(data.get(i).getFromKey());
+                out.write("</td><td>");
+                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("</td><td>");
+                out.write("<a class=\"btn btn-primary\" href=\"javascript:removeAssertion('"
+                        + StringEscapeUtils.escapeJavaScript(data.get(i).getFromKey())
+                        + "','"
+                        + StringEscapeUtils.escapeJavaScript(data.get(i).getToKey())
+                        + "','"
+                        + StringEscapeUtils.escapeJavaScript(data.get(i).getKeyedReference().getTModelKey())
+                        + "','"
+                        + StringEscapeUtils.escapeJavaScript(data.get(i).getKeyedReference().getKeyName())
+                        + "','"
+                        + StringEscapeUtils.escapeJavaScript(data.get(i).getKeyedReference().getKeyValue())
+                        + "');"
+                        + "\">Delete</a>");
+                out.write("</td><td>");
+                out.write(data.get(i).getCompletionStatus().toString());
+                out.write("</td></tr>");
+                
+            }
+
+        %>
+</table>
+<%
+        }
+    }
+%>
\ No newline at end of file

Added: juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/validateSignature.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/validateSignature.jsp?rev=1467811&view=auto
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/validateSignature.jsp (added)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/validateSignature.jsp Sun Apr 14 18:37:26 2013
@@ -0,0 +1,68 @@
+<%-- 
+    Document   : validateSignature
+    Created on : Apr 10, 2013, 10:14:19 PM
+    Author     : Alex O'Ree
+--%>
+<%@page import="java.util.Iterator"%>
+<%@page import="java.util.Map.Entry"%>
+<%@page import="java.util.Set"%>
+<%@page import="java.util.Properties"%>
+<%@page import="java.util.concurrent.atomic.AtomicReference"%>
+<%@page import="org.apache.juddi.v3.client.crypto.DigSigUtil"%>
+<%@page import="org.apache.juddi.jaxb.JAXBMarshaller"%>
+<%@page import="org.apache.juddi.jaxb.EntityCreator"%>
+<%@page import="org.apache.juddi.webconsole.hub.UddiHub"%>
+<%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
+<%@page contentType="text/html" pageEncoding="UTF-8"%>
+<%
+    //org.apache.juddi.jaxb.PrintUDDI p = new PrintUDDI();
+    UddiHub x = UddiHub.getInstance(application, session);
+
+    String type = request.getParameter("type");
+    String id = request.getParameter("id");
+    if ((type != null && type.length() != 0) && (id != null && id.length() != 0)) {
+        Object j = null;
+        if (type.equalsIgnoreCase("business")) {
+            j = x.GetBusinessDetailsAsObject(id);
+        } else if (type.equalsIgnoreCase("service")) {
+            j = x.GetServiceDetailsAsObject(id);
+        } else if (type.equalsIgnoreCase("bindingTemplate")) {
+            j = x.GetBindingDetailsAsObject(id);
+        } else if (type.equalsIgnoreCase("tModel")) {
+            j = x.GettModelDetailsAsObject(id);
+        }
+        if (j != null) {
+            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> msg = new AtomicReference<String>();
+            // dsig.put(DigSigUtil., value);
+            boolean success = dsig.verifySignedUddiEntity(j, msg);
+            if (!success) {
+                out.write("<span class=\"label label-important\">" + ResourceLoader.GetResource(session, "items.signatures.invalid") + msg.get() + "</span>");
+            } else {
+                out.write("<span class=\"label label-success\">" + ResourceLoader.GetResource(session, "items.signatures.valid") + "</span>");
+            }
+        } else {
+            response.setStatus(500);
+            out.write(ResourceLoader.GetResource(session, "items.unknown"));
+        }
+    }
+
+
+    //get parameter type
+    //fetch from UDDI
+    //convert to string and output
+
+
+
+%>
\ No newline at end of file

Copied: juddi/branches/juddi-3.2.x/juddi-gui/web/assertions.jsp (from r1466751, juddi/branches/juddi-3.2.x/juddi-gui/web/businessBrowse.jsp)
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/assertions.jsp?p2=juddi/branches/juddi-3.2.x/juddi-gui/web/assertions.jsp&p1=juddi/branches/juddi-3.2.x/juddi-gui/web/businessBrowse.jsp&r1=1466751&r2=1467811&rev=1467811&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/businessBrowse.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/assertions.jsp Sun Apr 14 18:37:26 2013
@@ -1,6 +1,6 @@
 <%-- 
-    Document   : browse
-    Created on : Feb 24, 2013, 9:14:01 AM
+    Document   : assertions
+    Created on : April 13, 2013, 9:14:01 AM
     Author     : Alex O'Ree
 --%>
 
@@ -11,38 +11,200 @@
 
     <!-- Main hero unit for a primary marketing message or call to action -->
     <div class="well" >
-        <h1><%=ResourceLoader.GetResource(session, "navbar.businesses")%></h1>
+        <h1><%=ResourceLoader.GetResource(session, "navbar.publisherassertions")%></h1>
     </div>
 
     <!-- Example row of columns -->
     <div class="row">
         <div class="span12" >
-            <%=ResourceLoader.GetResource(session, "totals.records")%>: <span id="totalrecords"></span><br>
-            <%=ResourceLoader.GetResource(session, "totals.recordsreturned")%>: <span id="displayrecords"></span><br>
-           <%=ResourceLoader.GetResource(session, "totals.offset")%> : <span id="offset">0</span><br>
-            <%=ResourceLoader.GetResource(session, "items.lang")%>: <span id="lang" class="edit"></span><br>
-            <a href="javascript:pagedown();"><i class="icon-circle-arrow-left disabled " id="pageup"></i></a>
-            <a href="javascript:refreshBusinessList();"><i class="icon-refresh " id="refresh"></i></a>
-            <a href="javascript:pageup();"><i class="icon-circle-arrow-right disabled" id="pagedown"></i></a>
 
+            <a href="javascript:ShowAssertionDialog();" ><i class="icon-plus-sign"></i><%=ResourceLoader.GetResource(session, "items.publisherassertion.add")%> </a><br><br>
             <div id="businesslist">
                 <img src="img/bigrollergreen.gif" title="<%=ResourceLoader.GetResource(session, "items.loading")%>"/>
             </div>
-           
-            <script src="js/businesssearch.js"></script>
+
+            
             <script type="text/javascript">
-                
+                function ShowAssertionDialog()
+                {
+                    $("#addPublisherAssertion").modal('show');
+                }
+                function RenderAssertions()
+                {
+                    var lang = $("#lang").text();
+                    $("#businesslist").html("<img src=\"img/bigrollergreen.gif\" title=\"Loading\"/>");
+                    var request=   $.ajax({
+                        url: 'ajax/assertions.jsp',
+                        type:"GET",
+                        cache: false
+                    });
+                  
+                    request.done(function(msg) {
+                        window.console && console.log('postback done ');                
+                        $("#businesslist").html(msg);
+                        //refresh();
+                    });
+
+                    request.fail(function(jqXHR, textStatus) {
+                        window.console && console.log('postback failed ');                                
+                        $("#businesslist").html("An error occured! " + textStatus + jqXHR);
+                        //refresh();
+                    });
+                }
                 $('.edit').editable(function(value, settings) { 
                     console.log(this);
                     console.log(value);
                     console.log(settings);
-                    RenderBusinessListBySearch('%', offset, maxrecords);
+                    RenderAssertions();
                     return(value);
                 }, { 
                     type    : 'text',
                     submit  : 'OK'
                 });
+                
+                RenderAssertions();
+
+                function addAssertion()
+                {
+                    var ok=true;
+                    var url='ajax/assertions.jsp';
+                    var postbackdata = new Array();
+                    $("div.edit").each(function()
+                    {
+                        //TODO filter out (click to edit) values
+                        var id=$(this).attr("id");
+                        var value=$(this).text();
+                        if (value == i18n_clicktoedit)
+                            ok = false;
+                        postbackdata.push({
+                            name: id, 
+                            value: value
+                        });
+                    }); 
+                    postbackdata.push({
+                        name:"nonce", 
+                        value: $("#nonce").val()
+                    });
+                    $("div.noedit").each(function()
+                    {
+                        var id=$(this).attr("id");
+                        var value=$(this).text();
+                        postbackdata.push({
+                            name: id, 
+                            value: value
+                        });
+                    }); 
+                    if (!ok)
+                    {
+                        $("#saveresult").html("A value must be specified for each value.");
+                        return;
+                    }
+    
+                    var request=   $.ajax({
+                        url: url,
+                        type:"POST",
+                        //  data" + i18n_type + ": "html", 
+                        cache: false, 
+                        //  processData: false,f
+                        data: postbackdata
+                    });
+                
+                
+                    request.done(function(msg) {
+                        window.console && console.log('postback done '  + url);                
+                        $("#saveresult").html(msg);
+                        RenderAssertions();
+                    });
+
+                    request.fail(function(jqXHR, textStatus) {
+                        window.console && console.log('postback failed ' + url);                                
+                        $("#saveresult").html(jqXHR.responseText + textStatus);
+                    });
+                }
+              
+              
+                function removeAssertion(fromkey,tokey, tmodelkey, keyname, keyvalue)
+                {
+                    var ok=true;
+                    var url='ajax/assertions.jsp?action=delete';
+                    var postbackdata = new Array();
+                    postbackdata.push({
+                        name: 'fromkey', 
+                        value: fromkey
+                    });
+                    postbackdata.push({
+                        name: 'tokey', 
+                        value: tokey
+                    });
+                    postbackdata.push({
+                        name: 'tmodelkey', 
+                        value: tmodelkey
+                    });
+                    postbackdata.push({
+                        name: 'keyname', 
+                        value: keyname
+                    });
+                    postbackdata.push({
+                        name: 'keyvalue', 
+                        value: keyvalue
+                    });
+                    postbackdata.push({
+                        name: 'action', 
+                        value: 'delete'
+                    });
+                        
+                        
+                    postbackdata.push({
+                        name:"nonce", 
+                        value: $("#nonce").val()
+                    });
+                    
+                    var request=   $.ajax({
+                        url: url,
+                        type:"POST",
+                        //  data" + i18n_type + ": "html", 
+                        cache: false, 
+                        //  processData: false,f
+                        data: postbackdata
+                    });
+                
+                
+                    request.done(function(msg) {
+                        window.console && console.log('postback done '  + url);                
+                        $("#saveresult").html(msg);
+                        RenderAssertions();
+                    });
+
+                    request.fail(function(jqXHR, textStatus) {
+                        window.console && console.log('postback failed ' + url);                                
+                        $("#saveresult").html(jqXHR.responseText + textStatus);
+                    });
+                }
+
             </script>
         </div>
     </div>
+
+    <div class="modal hide fade" id="addPublisherAssertion">
+        <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+            <h3>Add a publisher assertion</h3>
+        </div>
+        <div class="modal-body" id="addPublisherAssertionContent">
+            <div style="float:left;width:25%">From Key : </div><div id="fromkey" class="edit"></div>
+            <div style="float:left;width:25%">To Key : </div><div id="tokey" class="edit"></div>
+            <div style="float:left;width:25%">tModel Key : </div><div id="tmodelkey" class="edit">uddi:uddi.org:relationships</div>
+            <div style="float:left;width:25%">Key Name : </div><div id="keyname" class="edit">Subsidiary</div>
+            <div style="float:left;width:25%">Key Value : </div><div id="keyvalue" class="edit">parent-child</div>
+            <div id="saveresult"></div>
+        </div>
+        <script type="text/javascript">
+            Reedit();
+        </script>
+        <div class="modal-footer">
+            <a href="javascript:addAssertion();" class="btn btn-primary">Save</a>
+            <a href="javascript:$('#addPublisherAssertion').modal('hide');" class="btn"><%=ResourceLoader.GetResource(session, "modal.close")%></a>
+        </div>
+    </div>
+
     <%@include file="header-bottom.jsp" %>
\ 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=1467811&r1=1467810&r2=1467811&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 Sun Apr 14 18:37:26 2013
@@ -576,6 +576,7 @@
                             <%=ResourceLoader.GetResource(session, "items.publisherassertion.add")%></a><br>
                         <div id="relationresults"></div>
 
+                        
                     </div>
                 </div>
             </div>
@@ -594,8 +595,8 @@
                 %> | 
                 <a class="btn btn-danger " href="javascript:deleteBusiness();"><%=ResourceLoader.GetResource(session, "actions.delete")%></a> |
                 <a class="btn btn-success " href="signer.jsp?id=<%=URLEncoder.encode(bizid, "UTF-8")%>&type=business"><%=ResourceLoader.GetResource(session, "actions.sign")%></a> |
-                <a class="btn btn-info " href="#" title="Alert me when this entity changes"><%=ResourceLoader.GetResource(session, "actions.subscribe")%></a> |
-                <a class="btn btn-warning " href="#" title="Transfer this entity to another UDDI node"><%=ResourceLoader.GetResource(session, "actions.transfer")%></a> |
+                <a class="btn btn-info " href="#" title="<%=ResourceLoader.GetResource(session, "actions.subscribe.description")%>"><%=ResourceLoader.GetResource(session, "actions.subscribe")%></a> |
+                <a class="btn btn-warning " href="#" title="<%=ResourceLoader.GetResource(session, "actions.transfer.description")%>"><%=ResourceLoader.GetResource(session, "actions.transfer")%></a> |
                 <a class="btn "  href="javascript:ViewAsXML();"><%=ResourceLoader.GetResource(session, "actions.asxml")%></a>
                 <%}%>
                 <script type="text/javascript" src="js/businessEditor.js"></script>
@@ -660,6 +661,23 @@
             <a href="javascript:$('#viewAsXml').modal('hide');" class="btn"><%=ResourceLoader.GetResource(session, "modal.close")%></a>
         </div>
     </div>
+        
+        <div class="modal hide fade" id="addPublisherAssertion">
+        <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+            <h3>Add a publisher assertion</h3>
+        </div>
+        <div class="modal-body" id="viewAsXmlContent">
+            <%
+            
+            %>
+
+        </div>
+        <div class="modal-footer">
+            
+            <a href="javascript:$('#addPublisherAssertion').modal('hide');" class="btn"><%=ResourceLoader.GetResource(session, "modal.close")%></a>
+        </div>
+    </div>
     <%
         }
     %>

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/header-bottom.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/header-bottom.jsp?rev=1467811&r1=1467810&r2=1467811&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/header-bottom.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/header-bottom.jsp Sun Apr 14 18:37:26 2013
@@ -14,7 +14,6 @@
 <%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%>
 <%@page contentType="text/html" pageEncoding="UTF-8"%>
 
-<hr>
 
 
 
@@ -26,8 +25,8 @@
 <div style="
      padding: 0px 0px 0px 0px; bottom: 0px; margin: 0px 0px 0px 0px; width:100%; text-align: center; position: fixed; 
      background-color: white; 
-     border-width: 4px; border-color: red; border-style: dashed"><center><footer>BETA - v<%
-
+     "><center><footer><span style="color: red"><b>BETA</b></span> - v<%
+//border-width: 4px; border-color: red; border-style: dashed
     Enumeration resEnum;
     try {
         resEnum = Thread.currentThread().getContextClassLoader().getResources(JarFile.MANIFEST_NAME);
@@ -58,7 +57,7 @@
 
 
 
-        %> - <%=ResourceLoader.GetResource(session, "footer.apachecopyright")%></footer></center></div>
+        %> - <a href="http://www.apache.org"><%=ResourceLoader.GetResource(session, "footer.apachecopyright")%></a</footer></center></div>
 </body>
 </html>
 

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/header-top.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/header-top.jsp?rev=1467811&r1=1467810&r2=1467811&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/header-top.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/header-top.jsp Sun Apr 14 18:37:26 2013
@@ -36,11 +36,11 @@
             }
         }
     }
-    if (session.getAttribute("locale")==null){
+    if (session.getAttribute("locale") == null) {
         //last chance, default to english
         session.setAttribute("locale", "en");
     }
-    %>
+%>
 <html lang="<%=(String) session.getAttribute("locale")%>" dir="<%=ResourceLoader.GetResource(session, "direction")%>">
     <head>
         <meta charset="utf-8">
@@ -96,16 +96,19 @@
                         <a class="brand" href="index.jsp" style="padding-left:19px; padding-top:0px; padding-bottom:0px"><img src="img/logo2.png"></a>
                         <div class="nav-collapse collapse">
                             <ul class="nav">
-                                <li ><a href="index.jsp"><%=ResourceLoader.GetResource(session, "navbar.home")%></a></li>
+                                <li ><a href="home.jsp"><%=ResourceLoader.GetResource(session, "navbar.home")%></a></li>
                                 <li class="dropdown" ><a href="#" data-toggle="dropdown" class="dropdowb-town"><%=ResourceLoader.GetResource(session, "navbar.discover")%><b class="caret"></b></a>
                                     <ul class="dropdown-menu">
                                         <li><a href="businessBrowse.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.businesses.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.businesses")%></a></li>
                                         <li><a href="serviceBrowse.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.services.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.services")%></a></li>
                                         <li><a href="tmodelBrowse.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.tmodels.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.tmodels")%></a></li>
                                         <%//                                        <li><a href="publisherBrowse.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.publishers.tooltip")">ResourceLoader.GetResource(session, "navbar.publishers")</a></li>
-                                        %>
-                                        <li class="divider"></li>
+%>
+                                        <li class="divider"> </li>
+                                        
                                         <li><a href="search.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.search.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.search")%></a></li>
+
+
                                     </ul>
                                 </li>
                                 <li class="dropdown"><a href="#" data-toggle="dropdown" class="dropdowb-town"><%=ResourceLoader.GetResource(session, "navbar.create")%><b class="caret"></b></a>
@@ -114,16 +117,19 @@
                                         <li><a href="businessBrowse.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.create.service.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.create.service")%></a></li>
                                         <li><a href="tmodelEditor.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.create.tmodel.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.create.tmodel")%></a></li>
                                         <li><a href="tmodelPartitions.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.create.tmodelkeygen.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.create.tmodelkeygen")%></a></li>
+                                        <li class="divider"></li>
+                                        <li><a href="reginfo.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.create.mybiz.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.create.mybiz")%></a></li>
+                                        <li><a href="assertions.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.publisherassertions.tooltip")%>"><%=ResourceLoader.GetResource(session, "navbar.publisherassertions")%></a></li>
                                         <%
-                                          //  if (hub.IsJuddiRegistry()) {
-                                        
-                                        //<li><a href="tmodelBrowse.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.create.publisher.tooltip")
+                                            //  if (hub.IsJuddiRegistry()) {
+
+                                            //<li><a href="tmodelBrowse.jsp" title="<%=ResourceLoader.GetResource(session, "navbar.create.publisher.tooltip")
 
 //"><%=ResourceLoader.GetResource(session, "navbar.create.publisher")</a></li>
-                                        
-                                        
+
+
                                             //                                      }
-                                        %>
+%>
                                     </ul>
                                 </li>
                                 <li class="dropdown"><a href="#" data-toggle="dropdown" class="dropdowb-town"><%=ResourceLoader.GetResource(session, "navbar.subscriptions")%><b class="caret"></b></a>

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/index.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/index.jsp?rev=1467811&r1=1467810&r2=1467811&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/index.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/index.jsp Sun Apr 14 18:37:26 2013
@@ -43,7 +43,8 @@
             if (checked != null && checked.equalsIgnoreCase("on")) {
                 Cookie cookie = new Cookie("locale", lang);
                 //TODO this is for debugging purposes 
-                cookie.setMaxAge(356);
+                //this is in ms, Maxvalue represents something like 70 years
+                cookie.setMaxAge(Integer.MAX_VALUE);
                 //cookie.setDomain("/UDDIBrowser");
                 cookie.setPath("/UDDIBrowser");
                 response.addCookie(cookie);

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/js/businesssearch.js
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/js/businesssearch.js?rev=1467811&r1=1467810&r2=1467811&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/js/businesssearch.js (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/js/businesssearch.js Sun Apr 14 18:37:26 2013
@@ -80,6 +80,8 @@ function RenderBusinessListBySearch(keyw
     });*/
 }
 
+
+
 function refresh()
 {
     var displayrecords = $("#displayrecords").text();

Copied: juddi/branches/juddi-3.2.x/juddi-gui/web/reginfo.jsp (from r1466751, juddi/branches/juddi-3.2.x/juddi-gui/web/settings.jsp)
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/reginfo.jsp?p2=juddi/branches/juddi-3.2.x/juddi-gui/web/reginfo.jsp&p1=juddi/branches/juddi-3.2.x/juddi-gui/web/settings.jsp&r1=1466751&r2=1467811&rev=1467811&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/settings.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/reginfo.jsp Sun Apr 14 18:37:26 2013
@@ -4,6 +4,9 @@
     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"%>
@@ -14,94 +17,93 @@
 
     <!-- Main hero unit for a primary marketing message or call to action -->
     <div class="well">
-        <h1><%=ResourceLoader.GetResource(session, "navbar.settings")%></h1>
+        <h1><%=ResourceLoader.GetResource(session, "navbar.create.mybiz")%></h1>
     </div>
 
     <!-- Example row of columns -->
     <div class="row">
         <div class="span12">
-            <h2><%=ResourceLoader.GetResource(session, "navbar.settings")%></h2>
-            <p><%=ResourceLoader.GetResource(session, "items.settings.description")%></p>
+            <%=ResourceLoader.GetResource(session, "navbar.create.mybiz.content")%>
+            <br><Br>
+            <%
+                UddiHub x = UddiHub.getInstance(application, session);
+                RegisteredInfo info = x.GetNodeInformation();
+                if (info == null || info.getBusinessInfos() == null || info.getBusinessInfos().getBusinessInfo().isEmpty()) {
+                    out.write(ResourceLoader.GetResource(session, "errors.nodatareturned"));
+                } else {
+                    //TODO i18n
+%>
 
             <table class="table table-hover">
-                <tr><th>Key</th><th>Value</th></tr>
-                <%
+                <tr><th><%=ResourceLoader.GetResource(session, "items.key")%></th><th><%=ResourceLoader.GetResource(session, "items.name")%></th>
+                    <th><%=ResourceLoader.GetResource(session, "items.actions")%></th></tr>
 
-                    UddiHub x = UddiHub.getInstance(application, session);
-                    Properties p = x.GetRawConfiguration();
-                    Set<Entry<Object, Object>> set = p.entrySet();
-                    Iterator<Entry<Object, Object>> it = set.iterator();
-                    while (it.hasNext()) {
+                <%
+                    for (int i = 0; i < info.getBusinessInfos().getBusinessInfo().size(); i++) {
                         out.write("<tr><td>");
-                        Entry<Object, Object> item = (Entry<Object, Object>) it.next();
-                        String key = (String) item.getKey();
-                        String value = (String) item.getValue();
-                        out.write(StringEscapeUtils.escapeHtml(key));
-                        out.write("</td><td><div class=\"edit\" id=\"" + StringEscapeUtils.escapeHtml(key) + "\">");
-                        out.write(StringEscapeUtils.escapeHtml(value));
-                        out.write("</div></td></tr>");
+                        out.write("<a href=\"businessEditor2.jsp?id=" + URLEncoder.encode(info.getBusinessInfos().getBusinessInfo().get(i).getBusinessKey(), "UTF-8") + "\">");
+                        out.write(StringEscapeUtils.escapeHtml(info.getBusinessInfos().getBusinessInfo().get(i).getBusinessKey()));
+                        out.write(" <i class=\"icon-edit\"></i></a>");
+                        out.write("</td><td>");
+                        out.write(StringEscapeUtils.escapeHtml(Printers.ListNamesToString(info.getBusinessInfos().getBusinessInfo().get(i).getName())));
+                        out.write("</td><td>");
+                %>
+                <div class="btn-group">
+                    <button class="btn">Actions</button>
+                    <button class="btn dropdown-toggle" data-toggle="dropdown">
+                        <span class="caret"></span>
+                    </button>
+                    <ul class="dropdown-menu">
+                        <!-- dropdown menu links -->
+                        <li>
+                            <a class="btn btn-danger " href="javascript:deleteBusiness();"><%=ResourceLoader.GetResource(session, "actions.delete")%></a></li>
+                        <li><a class="btn btn-success " href="signer.jsp?id=<%=URLEncoder.encode(info.getBusinessInfos().getBusinessInfo().get(i).getBusinessKey(), "UTF-8")%>&type=business"><%=ResourceLoader.GetResource(session, "actions.sign")%></a></li>
+                        <li><a class="btn btn-info " href="#" title="<%=ResourceLoader.GetResource(session, "actions.subscribe.description")%>"><%=ResourceLoader.GetResource(session, "actions.subscribe")%></a></li>
+                        <li><a class="btn btn-warning " href="#" title="<%=ResourceLoader.GetResource(session, "actions.transfer.description")%>"><%=ResourceLoader.GetResource(session, "actions.transfer")%></a></li>
+                        <li><a class="btn "  href="javascript:ViewAsXML('<%=StringEscapeUtils.escapeJavaScript(info.getBusinessInfos().getBusinessInfo().get(i).getBusinessKey())%>');"><%=ResourceLoader.GetResource(session, "actions.asxml")%></a></li>
+                    </ul>
+                </div>
+
+                <%
+                        //    out.write("Edit, Delete, Transfer, Sign, Subscribe, Create Relationship");
+                        out.write("</td></tr>");
                     }
                 %>
             </table>
-            <a class="btn btn-primary " href="javascript:saveSettings();"><%=ResourceLoader.GetResource(session, "actions.save")%></a>
-            <script type="text/javascript">
-                
-                Reedit();
-                function saveSettings()
-                {
-                    var url='ajax/settings.jsp';
-                    var postbackdata = new Array();
-                    $("div.edit").each(function()
-                    {
-                        var id=$(this).attr("id");
-                        var value=$(this).text();
-                        postbackdata.push({
-                            name: id, 
-                            value: value
-                        });
-                    }); 
-                    postbackdata.push({
-                        name:"nonce", 
-                        value: $("#nonce").val()
-                    });
-                    $("div.noedit").each(function()
-                    {
-                        var id=$(this).attr("id");
-                        var value=$(this).text();
-                        postbackdata.push({
-                            name: id, 
-                            value: value
-                        });
-                    }); 
-    
-    
-                    var request=   $.ajax({
-                        url: url,
-                        type:"POST",
-                        //  data" + i18n_type + ": "html", 
-                        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);
-                        $("#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 );
-                        //$(".alert").alert();
-                        $("#resultBar").show();
-        
-                    });
+            <%
                 }
-            </script>
+            %>
         </div>
+
+        <div class="modal hide fade" id="viewAsXml">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                <h3>As XML</h3>
+            </div>
+            <div class="modal-body" id="viewAsXmlContent">
+
+
+            </div>
+            <div class="modal-footer">
+                <a href="javascript:$('#viewAsXml').modal('hide');" class="btn"><%=ResourceLoader.GetResource(session, "modal.close")%></a>
+            </div>
+        </div>
+
     </div>
+    <script type="text/javascript" src="js/businessEditor.js"></script>
+    <script type="text/javascript">
+        function ViewAsXML(bizid)
+        {
+            $.get("ajax/toXML.jsp?id=" + bizid + "&type=business", function(data){
+                window.console && console.log('asXml success');                
+                  
+                $("#viewAsXmlContent").html(
+                "<a href=\"ajax/toXML.jsp?id=" + bizid + "&type=service\" class=\"btn btn-primary\">Popout</a>  " 
+                    +safe_tags_replace(data) + "<br>" 
+            );
+                $( "#viewAsXml" ).modal('show');
+            });
+                       
+        }
+    </script>
     <%@include file="header-bottom.jsp" %>
\ No newline at end of file

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/serviceEditor.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/serviceEditor.jsp?rev=1467811&r1=1467810&r2=1467811&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/serviceEditor.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/serviceEditor.jsp Sun Apr 14 18:37:26 2013
@@ -605,8 +605,8 @@
 
         <a class="btn btn-danger " href="javascript:deleteService();"><%=ResourceLoader.GetResource(session, "actions.delete")%></a> |
         <a class="btn btn-success " href="signer.jsp?id=<%=URLEncoder.encode(bd.getServiceKey(), "UTF8")%>&type=service"><%=ResourceLoader.GetResource(session, "actions.sign")%></a> |
-        <a class="btn btn-info " href="#" title="Alert me when this entity changes"><%=ResourceLoader.GetResource(session, "actions.subscribe")%></a> |
-        <a class="btn btn-warning " href="#" title="Transfer this entity to another UDDI node"><%=ResourceLoader.GetResource(session, "actions.transfer")%></a> |
+        <a class="btn btn-info " href="#" title="<%=ResourceLoader.GetResource(session, "actions.subscribe.description")%>"><%=ResourceLoader.GetResource(session, "actions.subscribe")%></a> |
+        <a class="btn btn-warning " href="#" title="<%=ResourceLoader.GetResource(session, "actions.transfer.description")%>"><%=ResourceLoader.GetResource(session, "actions.transfer")%></a> |
         <a class="btn "  href="javascript:ViewAsXML();"><%=ResourceLoader.GetResource(session, "actions.asxml")%></a>
         <script type="text/javascript">
             function ViewAsXML()

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/tmodelEditor.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/tmodelEditor.jsp?rev=1467811&r1=1467810&r2=1467811&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/tmodelEditor.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/tmodelEditor.jsp Sun Apr 14 18:37:26 2013
@@ -313,8 +313,8 @@
                         if (!newitem) {
                     %>|
                     <a class="btn btn-success " href="signer.jsp?id=<%=URLEncoder.encode(bd.getTModelKey(), "UTF8")%>&type=tmodel"><%=ResourceLoader.GetResource(session, "actions.sign")%></a> |
-                    <a class="btn btn-info " href="#" title="Alert me when this entity changes"><%=ResourceLoader.GetResource(session, "actions.subscribe")%></a> |
-                    <a class="btn btn-warning " href="#" title="Transfer this entity to another UDDI node"><%=ResourceLoader.GetResource(session, "actions.transfer")%></a> |
+                    <a class="btn btn-info " href="#" title="<%=ResourceLoader.GetResource(session, "actions.subscribe.description")%>"><%=ResourceLoader.GetResource(session, "actions.subscribe")%></a> |
+                    <a class="btn btn-warning " href="#" title="<%=ResourceLoader.GetResource(session, "actions.transfer.description")%>"><%=ResourceLoader.GetResource(session, "actions.transfer")%></a> |
                     <a class="btn "  href="javascript:ViewAsXML();"><%=ResourceLoader.GetResource(session, "actions.asxml")%></a>
                     <%
                         }



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


Mime
View raw message