juddi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexo...@apache.org
Subject svn commit: r1471812 - in /juddi/branches/juddi-3.2.x: ./ juddi-client/src/main/java/org/apache/juddi/v3/client/crypto/ juddi-core/src/main/java/org/apache/juddi/subscription/notify/ juddi-core/src/test/java/org/apache/juddi/api/impl/ juddi-gui-dsig/nb...
Date Thu, 25 Apr 2013 02:18:41 GMT
Author: alexoree
Date: Thu Apr 25 02:18:40 2013
New Revision: 1471812

URL: http://svn.apache.org/r1471812
Log:
Finally, xml digital signatures now work across services, businesses, and tmodels via browser and via standalone application.

Added:
    juddi/branches/juddi-3.2.x/juddi-gui/web/applets/lib/
    juddi/branches/juddi-3.2.x/juddi-gui/web/applets/lib/commons-logging-api-1.1.jar   (with props)
    juddi/branches/juddi-3.2.x/juddi-gui/web/applets/lib/juddi-client-3.1.5-SNAPSHOT.jar   (with props)
    juddi/branches/juddi-3.2.x/juddi-gui/web/applets/lib/uddi-ws-3.1.5-SNAPSHOT.jar   (with props)
Modified:
    juddi/branches/juddi-3.2.x/   (props changed)
    juddi/branches/juddi-3.2.x/juddi-client/src/main/java/org/apache/juddi/v3/client/crypto/DigSigUtil.java
    juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/subscription/notify/SMTPNotifier.java
    juddi/branches/juddi-3.2.x/juddi-core/src/test/java/org/apache/juddi/api/impl/API_090_SubscriptionListenerIntegrationTest.java
    juddi/branches/juddi-3.2.x/juddi-gui-dsig/nbproject/project.properties
    juddi/branches/juddi-3.2.x/juddi-gui-dsig/src/org/apache/juddi/gui/dsig/XmlSignatureApplet.java
    juddi/branches/juddi-3.2.x/juddi-gui/nbproject/build-impl.xml
    juddi/branches/juddi-3.2.x/juddi-gui/nbproject/genfiles.properties
    juddi/branches/juddi-3.2.x/juddi-gui/nbproject/project.properties
    juddi/branches/juddi-3.2.x/juddi-gui/nbproject/project.xml
    juddi/branches/juddi-3.2.x/juddi-gui/src/java/org/apache/juddi/webconsole/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/META-INF/config.properties
    juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/saveFromXML.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/toXML.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/applets/juddi-gui-dsig.jar
    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/js/businessEditor.js
    juddi/branches/juddi-3.2.x/juddi-gui/web/js/main.js
    juddi/branches/juddi-3.2.x/juddi-gui/web/reginfo.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/serviceBrowse.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/signer.jsp
    juddi/branches/juddi-3.2.x/juddi-gui/web/tmodelBrowse.jsp
    juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/resources/uddi_data/   (props changed)
    juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/listenerService.xml
    juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java   (contents, props changed)

Propchange: juddi/branches/juddi-3.2.x/
------------------------------------------------------------------------------
  Merged /juddi/trunk:r1470374-1471182

Modified: juddi/branches/juddi-3.2.x/juddi-client/src/main/java/org/apache/juddi/v3/client/crypto/DigSigUtil.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-client/src/main/java/org/apache/juddi/v3/client/crypto/DigSigUtil.java?rev=1471812&r1=1471811&r2=1471812&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-client/src/main/java/org/apache/juddi/v3/client/crypto/DigSigUtil.java (original)
+++ juddi/branches/juddi-3.2.x/juddi-client/src/main/java/org/apache/juddi/v3/client/crypto/DigSigUtil.java Thu Apr 25 02:18:40 2013
@@ -232,7 +232,9 @@ public final class DigSigUtil {
 
     /**
      * Digital signs a UDDI entity, such as a business, service, tmodel or
-     * binding template
+     * binding template using the map to provide certificate key stores and
+     * credentials<br><br> The UDDI entity MUST support XML Digital Signatures
+     * (tModel, Business, Service, Binding Template)
      *
      * @param <T> Any UDDI entity that supports digital signatures
      * @param jaxbObj
@@ -292,6 +294,35 @@ public final class DigSigUtil {
     }
 
     /**
+     * Digital signs a UDDI entity, such as a business, service, tmodel or
+     * binding template, provided you've already done the legwork to provide the
+     * signing keys <br><br> The UDDI entity MUST support XML Digital Signatures
+     * (tModel, Business, Service, Binding Template)
+     *
+     * @param <T>
+     * @param jaxbObj
+     * @param publicKey
+     * @param privateKey
+     * @return
+     */
+    public <T> T signUddiEntity(T jaxbObj, Certificate publicKey, PrivateKey privateKey) {
+        DOMResult domResult = new DOMResult();
+        JAXB.marshal(jaxbObj, domResult);
+        Document doc = ((Document) domResult.getNode());
+        Element docElement = doc.getDocumentElement();
+        try {
+
+            //PublicKey validatingKey = origCert.getPublicKey();
+            this.signDOM(docElement, privateKey, publicKey);
+            DOMSource domSource = new DOMSource(doc);
+            T result = (T) JAXB.unmarshal(domSource, jaxbObj.getClass());
+            return result;
+        } catch (Exception e) {
+            throw new RuntimeException("Signature failure due to: " + e.getMessage(), e);
+        }
+    }
+
+    /**
      * Serializes a JAXB object and prints to stdout
      *
      * @param obj
@@ -300,7 +331,18 @@ public final class DigSigUtil {
         StringWriter sw = new StringWriter();
         JAXB.marshal(obj, sw);
         System.out.println(sw.toString());
+    }
 
+    /**
+     * Serializes a JAXB object and prints to stdout
+     *
+     * @param obj
+     * @return
+     */
+    public static String JAXB_ToString(Object obj) {
+        StringWriter sw = new StringWriter();
+        JAXB.marshal(obj, sw);
+        return (sw.toString());
     }
 
     /**
@@ -385,12 +427,13 @@ public final class DigSigUtil {
 
     /**
      * Verifies the signature on an enveloped digital signature on a UDDI
-     * entity, such as a business, service, tmodel or binding template.
-     *
-     * It is expect that either the public key of the signing certificate is
+     * entity, such as a business, service, tmodel or binding template. <br><Br>
+     * It is expected that either the public key of the signing certificate is
      * included within the signature keyinfo section OR that sufficient
      * information is provided in the signature to reference a public key
-     * located within the Trust Store provided
+     * located within the Trust Store provided<br><Br> Optionally, this function
+     * also validate the signing certificate using the options provided to the
+     * configuration map.
      *
      * @param obj an enveloped signed JAXB object
      * @param OutErrorMessage a human readable error message explaining the
@@ -692,11 +735,11 @@ public final class DigSigUtil {
         {
             x509Content = new ArrayList<Object>();
             x509Content.add(cert);
-            x509Content.add(cert.getSubjectX500Principal().getName());
+            //x509Content.add(cert.getSubjectX500Principal().getName());
             X509Data xd = kif.newX509Data(x509Content);
             data.add(xd);
         }
-        x509Content.add(cert);
+        //x509Content.add(cert);
 
 
         KeyInfo ki = kif.newKeyInfo(data);
@@ -720,12 +763,13 @@ public final class DigSigUtil {
 
     /**
      * searches local keystores for a referenced signing certificate
+     *
      * @param childNodes
      * @return null or the public key of a signing certificate
      */
     private X509Certificate FindCert(NodeList childNodes) {
 
-
+        //TODO implement
         return null;
     }
 

Modified: juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/subscription/notify/SMTPNotifier.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/subscription/notify/SMTPNotifier.java?rev=1471812&r1=1471811&r2=1471812&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/subscription/notify/SMTPNotifier.java (original)
+++ juddi/branches/juddi-3.2.x/juddi-core/src/main/java/org/apache/juddi/subscription/notify/SMTPNotifier.java Thu Apr 25 02:18:40 2013
@@ -108,7 +108,7 @@ public class SMTPNotifier implements Not
 				message.setFrom(new InternetAddress(getEMailProperties().getProperty("mail.smtp.from", "jUDDI")));
 				//maybe nice to use a template rather then sending raw xml.
 				String subscriptionResultXML = JAXBMarshaller.marshallToString(body, JAXBMarshaller.PACKAGE_SUBSCR_RES);
-				message.setText(subscriptionResultXML);
+				message.setText(subscriptionResultXML, "UTF-8");
 				message.setSubject("UDDI Subscription Notification for subscription " 
 						+ body.getSubscriptionResultsList().getSubscription().getSubscriptionKey());
 				Transport.send(message);

Modified: juddi/branches/juddi-3.2.x/juddi-core/src/test/java/org/apache/juddi/api/impl/API_090_SubscriptionListenerIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-core/src/test/java/org/apache/juddi/api/impl/API_090_SubscriptionListenerIntegrationTest.java?rev=1471812&r1=1471811&r2=1471812&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-core/src/test/java/org/apache/juddi/api/impl/API_090_SubscriptionListenerIntegrationTest.java (original)
+++ juddi/branches/juddi-3.2.x/juddi-core/src/test/java/org/apache/juddi/api/impl/API_090_SubscriptionListenerIntegrationTest.java Thu Apr 25 02:18:40 2013
@@ -55,6 +55,7 @@ public class API_090_SubscriptionListene
 	private static String authInfoJoe = null;
 	private static SimpleSmtpServer mailServer;
 	private static Integer smtpPort = 25;
+	private static Integer httpPort = 80;
 
 	@AfterClass
 	public static void stopManager() throws ConfigurationException {
@@ -70,13 +71,15 @@ public class API_090_SubscriptionListene
 		Registry.start();
 		try {
 			smtpPort = 9700 + new Random().nextInt(99);
+			httpPort = 9600 + new Random().nextInt(99);
 			System.setProperty(Property.DEFAULT_JUDDI_EMAIL_PREFIX + "mail.smtp.host", "localhost");
 			System.setProperty(Property.DEFAULT_JUDDI_EMAIL_PREFIX + "mail.smtp.port", String.valueOf(smtpPort));
 			System.setProperty(Property.DEFAULT_JUDDI_EMAIL_PREFIX + "mail.smtp.from", "jUDDI@example.org");
 			mailServer = SimpleSmtpServer.start(smtpPort);
 			//bring up the TCK HTTP SubscriptionListener
-			endPoint = Endpoint.publish("http://localhost:12345/tcksubscriptionlistener", new UDDISubscriptionListenerImpl());
-			
+			String httpEndpoint = "http://localhost:" + httpPort + "/tcksubscriptionlistener";
+			System.out.println("Bringing up SubscriptionListener endpoint at " + httpEndpoint);
+			endPoint = Endpoint.publish(httpEndpoint, new UDDISubscriptionListenerImpl());
 			logger.debug("Getting auth tokens..");
 		
 			api010.saveJoePublisher();
@@ -86,7 +89,7 @@ public class API_090_SubscriptionListene
         	  
 	     } catch (Exception e) {
 	    	 logger.error(e.getMessage(), e);
-				Assert.fail("Could not obtain authInfo token.");
+				Assert.fail(e.getMessage());
 	     } 
 	}
 	
@@ -98,7 +101,7 @@ public class API_090_SubscriptionListene
 			//Saving the binding template that will be called by the server for a subscription event
 			tckBusinessService.saveJoePublisherService(authInfoJoe);
 			//Saving the HTTP Listener Service
-			tckSubscriptionListener.saveService(authInfoJoe, TckSubscriptionListener.LISTENER_HTTP_SERVICE_XML, 0);
+			tckSubscriptionListener.saveService(authInfoJoe, TckSubscriptionListener.LISTENER_HTTP_SERVICE_XML, httpPort);
 			//Saving the HTTP Subscription
 			tckSubscriptionListener.saveNotifierSubscription(authInfoJoe, TckSubscriptionListener.SUBSCRIPTION_XML);
             //Changing the service we subscribed to "JoePublisherService"
@@ -169,7 +172,7 @@ public class API_090_SubscriptionListene
 			System.out.println("Subject:" + email.getHeaderValue("Subject"));
 			System.out.println("Body:" + email.getBody());
 			
-			if (!email.getBody().contains("<name xml:lang=\"en\">Service One</name>")) {
+			if (!email.getBody().contains("Service One")) {
 				Assert.fail("Notification does not contain the correct service");
 			}
 			
@@ -194,7 +197,7 @@ public class API_090_SubscriptionListene
 			tckBusiness.saveJoePublisherBusiness(authInfoJoe);
 			tckBusinessService.saveJoePublisherService(authInfoJoe);
 			//Saving the Listener Service
-			tckSubscriptionListener.saveService(authInfoJoe, TckSubscriptionListener.LISTENER_HTTP_SERVICE_XML, 0);
+			tckSubscriptionListener.saveService(authInfoJoe, TckSubscriptionListener.LISTENER_HTTP_SERVICE_XML, httpPort);
 			//Saving the Subscription
 			tckSubscriptionListener.saveNotifierSubscription(authInfoJoe, TckSubscriptionListener.SUBSCRIPTION_XML);
             //Changing the service we subscribed to "JoePublisherService"

Modified: juddi/branches/juddi-3.2.x/juddi-gui-dsig/nbproject/project.properties
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui-dsig/nbproject/project.properties?rev=1471812&r1=1471811&r2=1471812&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui-dsig/nbproject/project.properties (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui-dsig/nbproject/project.properties Thu Apr 25 02:18:40 2013
@@ -30,11 +30,17 @@ endorsed.classpath=\
     ${jdk.home}/jre/lib/javaws.jar:\
     ${jdk.home}/jre/lib/plugin.jar
 excludes=
+file.reference.commons-logging-api-1.1.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\commons-logging-api-1.1.jar
+file.reference.juddi-client-3.1.5-SNAPSHOT.jar=..\\juddi-client\\target\\juddi-client-3.1.5-SNAPSHOT.jar
+file.reference.uddi-ws-3.1.5-SNAPSHOT.jar=..\\uddi-ws\\target\\uddi-ws-3.1.5-SNAPSHOT.jar
 includes=**
 jar.archive.disabled=${jnlp.enabled}
 jar.compress=false
 jar.index=${jnlp.enabled}
-javac.classpath=
+javac.classpath=\
+    ${file.reference.uddi-ws-3.1.5-SNAPSHOT.jar}:\
+    ${file.reference.juddi-client-3.1.5-SNAPSHOT.jar}:\
+    ${file.reference.commons-logging-api-1.1.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false

Modified: juddi/branches/juddi-3.2.x/juddi-gui-dsig/src/org/apache/juddi/gui/dsig/XmlSignatureApplet.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui-dsig/src/org/apache/juddi/gui/dsig/XmlSignatureApplet.java?rev=1471812&r1=1471811&r2=1471812&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui-dsig/src/org/apache/juddi/gui/dsig/XmlSignatureApplet.java (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui-dsig/src/org/apache/juddi/gui/dsig/XmlSignatureApplet.java Thu Apr 25 02:18:40 2013
@@ -7,6 +7,7 @@ package org.apache.juddi.gui.dsig;
 import java.io.File;
 import java.io.IOException;
 import java.io.StringReader;
+import java.io.StringWriter;
 import java.security.InvalidAlgorithmParameterException;
 import java.security.Key;
 import java.security.KeyStore;
@@ -15,6 +16,7 @@ import java.security.PrivateKey;
 import java.security.Provider;
 import java.security.Security;
 import java.security.cert.Certificate;
+import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -24,6 +26,7 @@ import java.util.Vector;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.swing.JOptionPane;
+import javax.xml.bind.JAXB;
 import javax.xml.crypto.dsig.CanonicalizationMethod;
 import javax.xml.crypto.dsig.DigestMethod;
 import javax.xml.crypto.dsig.Reference;
@@ -42,8 +45,11 @@ import javax.xml.parsers.DocumentBuilder
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 import netscape.javascript.JSObject;
-import org.w3c.dom.DOMConfiguration;
-import org.w3c.dom.DOMStringList;
+import org.apache.juddi.v3.client.crypto.DigSigUtil;
+import org.uddi.api_v3.BindingTemplate;
+import org.uddi.api_v3.BusinessEntity;
+import org.uddi.api_v3.BusinessService;
+import org.uddi.api_v3.TModel;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -74,8 +80,6 @@ public class XmlSignatureApplet extends 
         setupCertificates();
     }
 
-    
-    
     private XMLSignatureFactory initXMLSigFactory() {
         XMLSignatureFactory fac = XMLSignatureFactory.getInstance();
         return fac;
@@ -138,7 +142,7 @@ public class XmlSignatureApplet extends 
         LSSerializer lsSerializer = domImplementation.createLSSerializer();
         lsSerializer.getDomConfig().setParameter("xml-declaration", false);
         //lsSerializer.getDomConfig().setParameter("xml-declaration", false);
-        
+
         return lsSerializer.writeToString(doc);
     }
     KeyStore keyStore = null;
@@ -164,7 +168,6 @@ public class XmlSignatureApplet extends 
             keyStore.load(null, null);
         } catch (Exception ex) {
             //JOptionPane.showMessageDialog(this, ex.getMessage());
-
         }
         //firefox keystore
         if (keyStore != null) {
@@ -214,8 +217,7 @@ public class XmlSignatureApplet extends 
             JOptionPane.showMessageDialog(this, e.getMessage());
         }
         jList1.setListData(certs);
-        if (!certs.isEmpty())
-        {
+        if (!certs.isEmpty()) {
             jList1.setSelectedIndex(0);
         }
     }
@@ -227,7 +229,7 @@ public class XmlSignatureApplet extends 
         // Create the KeyInfo containing the X509Data.
         KeyInfoFactory kif = fac.getKeyInfoFactory();
         List<Object> x509Content = new ArrayList<Object>();
-        x509Content.add(cert.getSubjectX500Principal().getName());
+        //x509Content.add(cert.getSubjectX500Principal().getName());
         x509Content.add(cert);
         X509Data xd = kif.newX509Data(x509Content);
         KeyInfo ki = kif.newKeyInfo(Collections.singletonList(xd));
@@ -249,7 +251,6 @@ public class XmlSignatureApplet extends 
         }
     }
 
-    
     /**
      * This method is called from within the init() method to initialize the
      * form. WARNING: Do NOT modify this code. The content of this method is
@@ -279,30 +280,80 @@ public class XmlSignatureApplet extends 
 
     private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
         // TODO add your handling code here:
-        
+
         JSObject window = JSObject.getWindow(this);
         Object object2 = window.call("getBrowserName", null);
         Object object1 = window.call("getOsName", null);
+        Object object3 = window.call("getObjectType", null);
         String browserName = (String) object2;
         String osName = (String) object2;
-
+        String objecttype = (String) object3;
 
         //get the xml
         String xml = (String) window.call("getXml", new Object[]{});
-        //sign it
+        Object j = null;
+        StringReader sr = new StringReader(xml);
+        if (objecttype.equalsIgnoreCase("business")) {
+            try {
+                j = (BusinessEntity) JAXB.unmarshal(sr, BusinessEntity.class);
+            } catch (Exception ex) {
+            }
+        }
+        if (objecttype.equalsIgnoreCase("service")) {
+            try {
+                j = (BusinessService) JAXB.unmarshal(sr, BusinessService.class);
+            } catch (Exception ex) {
+            }
+        }
+        if (objecttype.equalsIgnoreCase("binding")) {
+            try {
+                j = (BindingTemplate) JAXB.unmarshal(sr, BindingTemplate.class);
+            } catch (Exception ex) {
+            }
+        }
+        if (objecttype.equalsIgnoreCase("tmodel")) {
+            try {
+                j = (TModel) JAXB.unmarshal(sr, TModel.class);
+            } catch (Exception ex) {
+            }
+        }
 
-        String signedXml = "error!";;
-        try {
-            signedXml = this.sign(xml);
-        } catch (Exception ex) {
-            signedXml = ex.getMessage();
-            Logger.getLogger(this.getClass().getName()).log(Level.SEVERE, null, ex);
+        String signedXml = "error!";
+        if (j != null) {
+            try {
+                //sign it
+                org.apache.juddi.v3.client.crypto.DigSigUtil ds = new DigSigUtil();
+                ds.put(DigSigUtil.SIGNATURE_OPTION_CERT_INCLUSION_BASE64, "t");
+                PrivateKey key = (PrivateKey) keyStore.getKey((String) jList1.getSelectedValue(), null);
+
+                Certificate publickey = keyStore.getCertificate((String) jList1.getSelectedValue());
+
+
+                j = ds.signUddiEntity(j, publickey, key);
+                ds.clear();
+                StringWriter sw = new StringWriter();
+                JAXB.marshal(j, sw);
+                signedXml = sw.toString();
+            } catch (Exception ex) {
+                Logger.getLogger(XmlSignatureApplet.class.getName()).log(Level.SEVERE, null, ex);
+                signedXml = ex.getMessage();
+            }
+        } else {
+            signedXml = "Unable to determine which type of object that we're signing";
         }
 
+
+        /*
+         try {
+         signedXml = this.sign(xml);
+         } catch (Exception ex) {
+         signedXml = ex.getMessage();
+         Logger.getLogger(this.getClass().getName()).log(Level.SEVERE, null, ex);
+         }*/
+
         //write it back to the web page
         window.call("writeXml", new Object[]{signedXml});
     }//GEN-LAST:event_jButton1ActionPerformed
-
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JButton jButton1;
     private javax.swing.JList jList1;

Modified: juddi/branches/juddi-3.2.x/juddi-gui/nbproject/build-impl.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/nbproject/build-impl.xml?rev=1471812&r1=1471811&r2=1471812&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/nbproject/build-impl.xml (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/nbproject/build-impl.xml Thu Apr 25 02:18:40 2013
@@ -1000,7 +1000,6 @@ exists or setup the property manually. F
         <copyfiles files="${file.reference.cxf-tools-common-2.3.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.geronimo-javamail_1.4_spec-1.7.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jaxb-impl-2.1.13.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${file.reference.junit-3.8.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.juddi-client-3.1.5-SNAPSHOT.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.neethi-2.0.4.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.persistence-api-1.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
@@ -1047,7 +1046,6 @@ exists or setup the property manually. F
         <copyfiles files="${file.reference.cxf-tools-common-2.3.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.geronimo-javamail_1.4_spec-1.7.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jaxb-impl-2.1.13.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${file.reference.junit-3.8.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.juddi-client-3.1.5-SNAPSHOT.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.neethi-2.0.4.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.persistence-api-1.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>

Modified: juddi/branches/juddi-3.2.x/juddi-gui/nbproject/genfiles.properties
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/nbproject/genfiles.properties?rev=1471812&r1=1471811&r2=1471812&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/nbproject/genfiles.properties (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/nbproject/genfiles.properties Thu Apr 25 02:18:40 2013
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=363a67fc
+build.xml.data.CRC32=7208fe83
 build.xml.script.CRC32=f15a2af6
 build.xml.stylesheet.CRC32=651128d4@1.38.1.1
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=363a67fc
-nbproject/build-impl.xml.script.CRC32=90fc7c80
+nbproject/build-impl.xml.data.CRC32=7208fe83
+nbproject/build-impl.xml.script.CRC32=b9be4a76
 nbproject/build-impl.xml.stylesheet.CRC32=4e9cae83@1.38.1.1

Modified: juddi/branches/juddi-3.2.x/juddi-gui/nbproject/project.properties
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/nbproject/project.properties?rev=1471812&r1=1471811&r2=1471812&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/nbproject/project.properties (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/nbproject/project.properties Thu Apr 25 02:18:40 2013
@@ -51,7 +51,6 @@ file.reference.cxf-tools-common-2.3.1.ja
 file.reference.geronimo-javamail_1.4_spec-1.7.1.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\geronimo-javamail_1.4_spec-1.7.1.jar
 file.reference.jaxb-impl-2.1.13.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\jaxb-impl-2.1.13.jar
 file.reference.juddi-client-3.1.5-SNAPSHOT.jar=../juddi-client/target/juddi-client-3.1.5-SNAPSHOT.jar
-file.reference.junit-3.8.2.jar=junit-3.8.2.jar
 file.reference.neethi-2.0.4.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\neethi-2.0.4.jar
 file.reference.persistence-api-1.0.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\persistence-api-1.0.jar
 file.reference.serp-1.13.1.jar=..\\juddi-tomcat\\target\\tomcat\\apache-tomcat-6.0.26\\webapps\\juddiv3\\WEB-INF\\lib\\serp-1.13.1.jar
@@ -103,7 +102,6 @@ javac.classpath=\
     ${file.reference.cxf-tools-common-2.3.1.jar}:\
     ${file.reference.geronimo-javamail_1.4_spec-1.7.1.jar}:\
     ${file.reference.jaxb-impl-2.1.13.jar}:\
-    ${file.reference.junit-3.8.2.jar}:\
     ${file.reference.juddi-client-3.1.5-SNAPSHOT.jar}:\
     ${file.reference.neethi-2.0.4.jar}:\
     ${file.reference.persistence-api-1.0.jar}:\

Modified: juddi/branches/juddi-3.2.x/juddi-gui/nbproject/project.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/nbproject/project.xml?rev=1471812&r1=1471811&r2=1471812&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/nbproject/project.xml (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/nbproject/project.xml Thu Apr 25 02:18:40 2013
@@ -111,10 +111,6 @@
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.junit-3.8.2.jar}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
-                </library>
-                <library dirs="200">
                     <file>${file.reference.juddi-client-3.1.5-SNAPSHOT.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>

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=1471812&r1=1471811&r2=1471812&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 Thu Apr 25 02:18:40 2013
@@ -257,3 +257,4 @@ items.status=Status
 actions.deleted=Deleted
 navbar.subscriptions.feed=News Feed
 items.picker=Picker
+navbar.subscriptions.feed.tooltip=A new feed based on your subscription settings.

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=1471812&r1=1471811&r2=1471812&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 Thu Apr 25 02:18:40 2013
@@ -258,3 +258,4 @@ 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.

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/META-INF/config.properties
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/META-INF/config.properties?rev=1471812&r1=1471811&r2=1471812&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/META-INF/config.properties (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/META-INF/config.properties Thu Apr 25 02:18:40 2013
@@ -27,15 +27,15 @@ registryType=juddi
 # to use the Windows certificate store of the current user or KeychainStore
 # for MacOS
 
-TRUSTSTORE_FILE = keyStorePath
-TRUSTSTORE_FILETYPE = keyStoreType
-TRUSTSTORE_FILE_PASSWORD = filePassword
+#TRUSTSTORE_FILE = keyStorePath
+#TRUSTSTORE_FILETYPE = keyStoreType
+#TRUSTSTORE_FILE_PASSWORD = filePassword
 
 
 # uncomment to override
 #XML_DIGSIG_NS = http://www.w3.org/2000/09/xmldsig#
 
 CHECK_TIMESTAMPS = anyvalue
-CHECK_REVOCATION_STATUS_OCSP = anyvalue
-CHECK_REVOCATION_STATUS_CRL = anyvalue
-CHECK_TRUST_CHAIN = anyvalue
+#CHECK_REVOCATION_STATUS_OCSP = anyvalue
+#CHECK_REVOCATION_STATUS_CRL = anyvalue
+#CHECK_TRUST_CHAIN = anyvalue

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=1471812&r1=1471811&r2=1471812&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 Thu Apr 25 02:18:40 2013
@@ -59,7 +59,7 @@
                     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();
@@ -74,8 +74,8 @@
                     boolean success = dsig.verifySignedUddiEntity(be, msg2);
                     if (!success) {
                         msg = "WARNING! unable to validate signature!" + msg2.get();
-                    }
-                    msg += (x.SaveTModel(be));
+                    }*/
+                    msg = (x.SaveTModel(be));
                 } else {
                     msg = (ResourceLoader.GetResource(session, "errors.unknownentity"));
                 }

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/toXML.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/toXML.jsp?rev=1471812&r1=1471811&r2=1471812&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/toXML.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/ajax/toXML.jsp Thu Apr 25 02:18:40 2013
@@ -2,7 +2,8 @@
     Document   : toXML
     Created on : Mar 14, 2013, 9:17:21 PM
     Author     : Alex O'Ree
---%><%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%><%@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.jaxb.PrintUDDI"%><%@page contentType="text/html" pageEncoding="UTF-8"%><?xml version="1.0" encoding="UTF-8" standalone="yes"?><%
+--%><%@page import="javax.xml.bind.JAXB"%><%@page import="org.apache.juddi.webconsole.resources.ResourceLoader"%><%@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.jaxb.PrintUDDI"%><%@page contentType="text/html" pageEncoding="UTF-8"%><%
+//<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
     //org.apache.juddi.jaxb.PrintUDDI p = new PrintUDDI();
     UddiHub x = UddiHub.getInstance(application, session);
 
@@ -20,7 +21,8 @@
             j = x.GettModelDetailsAsObject(id);
         }
         if (j != null) {
-            out.write(JAXBMarshaller.marshallToString(j, JAXBMarshaller.PACKAGE_UDDIAPI));
+            JAXB.marshal(j, out);
+         //   out.write(JAXBMarshaller.marshallToString(j, JAXBMarshaller.PACKAGE_UDDIAPI));
             // out.write(EntityCreator.outputEntityToString(j, "org.apache.juddi.api_v3"));
         } else {
             out.write(ResourceLoader.GetResource(session, "items.unknown"));

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/applets/juddi-gui-dsig.jar
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/applets/juddi-gui-dsig.jar?rev=1471812&r1=1471811&r2=1471812&view=diff
==============================================================================
Binary files - no diff available.

Added: juddi/branches/juddi-3.2.x/juddi-gui/web/applets/lib/commons-logging-api-1.1.jar
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/applets/lib/commons-logging-api-1.1.jar?rev=1471812&view=auto
==============================================================================
Binary file - no diff available.

Propchange: juddi/branches/juddi-3.2.x/juddi-gui/web/applets/lib/commons-logging-api-1.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: juddi/branches/juddi-3.2.x/juddi-gui/web/applets/lib/juddi-client-3.1.5-SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/applets/lib/juddi-client-3.1.5-SNAPSHOT.jar?rev=1471812&view=auto
==============================================================================
Binary file - no diff available.

Propchange: juddi/branches/juddi-3.2.x/juddi-gui/web/applets/lib/juddi-client-3.1.5-SNAPSHOT.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: juddi/branches/juddi-3.2.x/juddi-gui/web/applets/lib/uddi-ws-3.1.5-SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/applets/lib/uddi-ws-3.1.5-SNAPSHOT.jar?rev=1471812&view=auto
==============================================================================
Binary file - no diff available.

Propchange: juddi/branches/juddi-3.2.x/juddi-gui/web/applets/lib/uddi-ws-3.1.5-SNAPSHOT.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

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=1471812&r1=1471811&r2=1471812&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 Thu Apr 25 02:18:40 2013
@@ -621,7 +621,7 @@
                                 window.console && console.log('asXml success');                
                   
                                 $("#viewAsXmlContent").html(safe_tags_replace(data) + "<br>" +
-                                    "<a href=\"ajax/toXML.jsp?id=<%=URLEncoder.encode(bizid, "UTF-8")%>&type=service\" class=\"btn btn-primary\">Popout</a>  " 
+                                    "<a href=\"ajax/toXML.jsp?id=<%=URLEncoder.encode(bizid, "UTF-8")%>&type=business\" class=\"btn btn-primary\">Popout</a>  " 
                             );
                                 $( "#viewAsXml" ).modal('show');
                             });

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/createSubscription.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/createSubscription.jsp?rev=1471812&r1=1471811&r2=1471812&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/createSubscription.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/createSubscription.jsp Thu Apr 25 02:18:40 2013
@@ -59,7 +59,7 @@
                     <div id="collapseOne" class="accordion-body collapse in">
                         <div class="accordion-inner">
                             <div class="btn-group" id="alertType" data-toggle="buttons-radio">
-                                <button onclick="return toggleType1();" value="specificItem" class="btn" >Changes to a specific item</button>
+                                <button onclick="return toggleType1();" value="specificItem" class="btn active" >Changes to a specific item</button>
                                 <button onclick="return toggleType2();" value="searchResults" class="btn">Changes to search results, such as a new item</button>
                             </div>
                         </div>

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/js/businessEditor.js
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/js/businessEditor.js?rev=1471812&r1=1471811&r2=1471812&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/js/businessEditor.js (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/js/businessEditor.js Thu Apr 25 02:18:40 2013
@@ -15,6 +15,46 @@
  *
  */
 
+
+function deleteBusinessByID(id)
+{
+            
+    var    url='ajax/deletebusiness.jsp?id=' + id;
+            
+    var postbackdata = new Array();
+    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);                
+        
+        $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">&times;'  + '</a>' + msg);
+        $("#resultBar").show();
+        $("#" + escapeJquerySelector(id)).remove();
+        
+    });
+
+    request.fail(function(jqXHR, textStatus) {
+        window.console && console.log('postback failed ' + url);                                
+        $("#resultBar").html('<a class="close" data-dismiss="alert" href="javascript:hideAlert();">&times;' + '</a>' + jqXHR.responseText + textStatus );
+        //$(".alert").alert();
+        $("#resultBar").show();
+        
+    });
+}
+
+
+
 function AddName()
 {
     currentNameEntries++;
@@ -248,8 +288,8 @@ function AddCategoryKeyReferenceGroup()
 var currentcatkeyrefgrpitems=0;
 function AddCategoryKeyReferenceGroupKeyRef(div)
 {
-     var i=currentcatkeyrefgrp;
-     currentcatkeyrefgrpitems++;
+    var i=currentcatkeyrefgrp;
+    currentcatkeyrefgrpitems++;
     var k=currentcatkeyrefgrpitems;
     
     $("<div id=\"" + div + "keyref" + k + "\" style=\"border-width:1px; border-style:solid\">"+

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/js/main.js
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/js/main.js?rev=1471812&r1=1471811&r2=1471812&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/js/main.js (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/js/main.js Thu Apr 25 02:18:40 2013
@@ -31,10 +31,17 @@ function safe_tags_replace(str) {
     return str.replace(/[&<>]/g, replaceTag);
 }
 
+function escapeJquerySelector(str)
+{
+    if (str)
+        return str.replace(/([ #;?&,.+*~\':"!^$[\]()=>|\/@])/g,'\\$1');
+    return str;
+}
+
   
 function Reedit()
 {
-   window.console && console.log('Reedit');                
+    window.console && console.log('Reedit');                
     $('.edit').editable(function(value, settings) { 
                 
         window.console && console.log(this);
@@ -102,7 +109,7 @@ function RefreshLoginPage()
 //source http://totaldev.com/content/escaping-characters-get-valid-jquery-id
 function jqSelector(str)
 {
-	return str.replace(/([;&,\.\+\*\~':"\!\^#$%@\[\]\(\)=>\|])/g, '\\$1');
+    return str.replace(/([;&,\.\+\*\~':"\!\^#$%@\[\]\(\)=>\|])/g, '\\$1');
 }
 
 function ShowServicesByBusinessKey(bizid)

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/reginfo.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/reginfo.jsp?rev=1471812&r1=1471811&r2=1471812&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/reginfo.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/reginfo.jsp Thu Apr 25 02:18:40 2013
@@ -25,22 +25,22 @@
         <div class="span12">
             <%=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><%=ResourceLoader.GetResource(session, "items.key")%></th><th><%=ResourceLoader.GetResource(session, "items.name")%></th>
                     <th><%=ResourceLoader.GetResource(session, "items.actions")%></th></tr>
 
-                <%
+                <%                    
                     for (int i = 0; i < info.getBusinessInfos().getBusinessInfo().size(); i++) {
-                        out.write("<tr><td>");
+                        out.write("<tr id=\"" + StringEscapeUtils.escapeHtml(info.getBusinessInfos().getBusinessInfo().get(i).getBusinessKey()) + "\"><td>");
                         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 icon-large\"></i></a>");
@@ -56,7 +56,7 @@
                     <ul class="dropdown-menu">
                         <!-- dropdown menu links -->
                         <li>
-                            <a class="btn btn-danger " href="javascript:deleteBusiness();"><%=ResourceLoader.GetResource(session, "actions.delete")%></a></li>
+                            <a class="btn btn-danger " href="javascript:deleteBusinessByID('<%=URLEncoder.encode(info.getBusinessInfos().getBusinessInfo().get(i).getBusinessKey(), "UTF-8")%>');"><%=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>
@@ -70,7 +70,7 @@
                     }
                 %>
             </table>
-            <%
+            <%                    
                 }
             %>
         </div>
@@ -92,6 +92,10 @@
     </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){

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/serviceBrowse.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/serviceBrowse.jsp?rev=1471812&r1=1471811&r2=1471812&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/serviceBrowse.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/serviceBrowse.jsp Thu Apr 25 02:18:40 2013
@@ -24,9 +24,9 @@
                 <%=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 icon-large" id="pageup"></i></a>
-                <a href="javascript:refreshServiceList();"><i class="icon-refresh icon-large " id="refresh"></i></a>
-                <a href="javascript:pageup();"><i class="icon-circle-arrow-right  icon-large" id="pagedown"></i></a>
+                <a href="javascript:pagedown();"><i class="icon-circle-arrow-left icon-2x" id="pageup"></i></a>
+                <a href="javascript:refreshServiceList();"><i class="icon-refresh icon-2x" id="refresh"></i></a>
+                <a href="javascript:pageup();"><i class="icon-circle-arrow-right  icon-2x" id="pagedown"></i></a>
 
                 <div id="serviceBrowserListings">
                     <img src="img/bigrollergreen.gif" title="Loading"/>

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/signer.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/signer.jsp?rev=1471812&r1=1471811&r2=1471812&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/signer.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/signer.jsp Thu Apr 25 02:18:40 2013
@@ -72,6 +72,7 @@
                     if (itemtype == "tmodel") {
                         out.write("window.location=\"tmodelEditor.jsp?id=" + StringEscapeUtils.escapeJavaScript(id) + "\";");
                     }
+                 
                 %>
                             }, 5000);
                         });
@@ -127,8 +128,12 @@
                         if (navigator.appVersion.indexOf("Linux")!=-1) OSName="Linux";
                         return OSName;
                     }
-                    //<a class="btn" href="javascript:go();">Go</a>
-                    //display:none  
+                    function getObjectType()
+                    {
+                        return "<%=StringEscapeUtils.escapeJavaScript(itemtype)%>";
+                    }
+                    //
+                    //display:none  <a class="btn" href="javascript:go();">Go</a>
             </script>
 
             <textarea name="data" rows="15" cols="80" id="data" style="">Loading....</textarea>

Modified: juddi/branches/juddi-3.2.x/juddi-gui/web/tmodelBrowse.jsp
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-gui/web/tmodelBrowse.jsp?rev=1471812&r1=1471811&r2=1471812&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-gui/web/tmodelBrowse.jsp (original)
+++ juddi/branches/juddi-3.2.x/juddi-gui/web/tmodelBrowse.jsp Thu Apr 25 02:18:40 2013
@@ -23,9 +23,9 @@
             <%=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  icon-large" id="pageup"></i></a>
-            <a href="javascript:reload();"><i class="icon-refresh icon-large"></i></a>
-            <a href="javascript:pageup();"><i class="icon-circle-arrow-right disabled  icon-large" id="pagedown"></i></a>
+            <a href="javascript:pagedown();"><i class="icon-circle-arrow-left icon-2x" id="pageup"></i></a>
+            <a href="javascript:reload();"><i class="icon-refresh icon-2x"></i></a>
+            <a href="javascript:pageup();"><i class="icon-circle-arrow-right icon-2x" id="pagedown"></i></a>
 
             <div id="tmodellist">
                 <img src="img/bigrollergreen.gif" title="Loading"/>

Propchange: juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/resources/uddi_data/
------------------------------------------------------------------------------
  Merged /juddi/trunk/uddi-tck-base/src/main/resources/uddi_data:r1470374-1471182

Modified: juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/listenerService.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/listenerService.xml?rev=1471812&r1=1471811&r2=1471812&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/listenerService.xml (original)
+++ juddi/branches/juddi-3.2.x/uddi-tck-base/src/main/resources/uddi_data/subscriptionnotifier/listenerService.xml Thu Apr 25 02:18:40 2013
@@ -24,7 +24,7 @@
   <bindingTemplates>
 	<bindingTemplate xmlns="urn:uddi-org:api_v3" bindingKey="uddi:uddi.joepublisher.com:bindinglistener">
 	  <description xml:lang="en">This is the endpoint for the subscription listener</description>
-	  <accessPoint useType="endPoint">http://localhost:12345/tcksubscriptionlistener</accessPoint>
+	  <accessPoint useType="endPoint">http://localhost:{randomPort}/tcksubscriptionlistener</accessPoint>
 	  <tModelInstanceDetails>
 		<tModelInstanceInfo tModelKey="uddi:uddi.org:transport:http" />
 	  </tModelInstanceDetails>

Modified: juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java?rev=1471812&r1=1471811&r2=1471812&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java (original)
+++ juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java Thu Apr 25 02:18:40 2013
@@ -58,6 +58,7 @@ public class UDDI_090_SubscriptionListen
 	private static UDDIClerkManager manager;
 	private static SimpleSmtpServer mailServer;
 	private static Integer smtpPort = 25;
+	private static Integer httpPort = 80;
 
 	@AfterClass
 	public static void stopManager() throws ConfigurationException {
@@ -71,6 +72,7 @@ public class UDDI_090_SubscriptionListen
 	public static void startManager() throws ConfigurationException {
 		try {
 			smtpPort = 9700 + new Random().nextInt(99);
+			httpPort = 9600 + new Random().nextInt(99);
 			Properties properties = new Properties();
 			properties.setProperty("juddi.mail.smtp.host", "localhost");
 			properties.setProperty("juddi.mail.smtp.port", String.valueOf(smtpPort));
@@ -89,7 +91,9 @@ public class UDDI_090_SubscriptionListen
 			properties.store(new FileOutputStream(tmpFile), "tmp email settings");
 			
 			//bring up the TCK SubscriptionListener
-			endPoint = Endpoint.publish("http://localhost:12345/tcksubscriptionlistener", new UDDISubscriptionListenerImpl());
+			String httpEndpoint = "http://localhost:" + httpPort + "/tcksubscriptionlistener";
+			System.out.println("Bringing up SubscriptionListener endpoint at " + httpEndpoint);
+			endPoint = Endpoint.publish(httpEndpoint, new UDDISubscriptionListenerImpl());
 			
 			manager  = new UDDIClerkManager();
 			manager.start();
@@ -125,7 +129,7 @@ public class UDDI_090_SubscriptionListen
 			//Saving the binding template that will be called by the server for a subscription event
 			tckBusinessService.saveJoePublisherService(authInfoJoe);
 			//Saving the HTTP Listener Service
-			tckSubscriptionListener.saveService(authInfoJoe, TckSubscriptionListener.LISTENER_HTTP_SERVICE_XML, 0);
+			tckSubscriptionListener.saveService(authInfoJoe, TckSubscriptionListener.LISTENER_HTTP_SERVICE_XML, httpPort);
 			//Saving the HTTP Subscription
 			tckSubscriptionListener.saveNotifierSubscription(authInfoJoe, TckSubscriptionListener.SUBSCRIPTION_XML);
             //Changing the service we subscribed to "JoePublisherService"
@@ -195,9 +199,9 @@ public class UDDI_090_SubscriptionListen
 			@SuppressWarnings("rawtypes")
 			Iterator emailIter = mailServer.getReceivedEmail();
 			SmtpMessage email = (SmtpMessage)emailIter.next();
-			System.out.println(email.getHeaderValue("Subject"));
-			System.out.println(email.getBody().equals("Test Body"));
-			if (!email.getBody().contains("<name xml:lang=\"en\">Service One</name>")) {
+			System.out.println("Subject:" + email.getHeaderValue("Subject"));
+			System.out.println("Body:" + email.getBody());
+			if (!email.getBody().contains("Service One")) {
 				Assert.fail("Notification does not contain the correct service");
 			}
 			
@@ -223,7 +227,7 @@ public class UDDI_090_SubscriptionListen
 			tckBusiness.saveJoePublisherBusiness(authInfoJoe);
 			tckBusinessService.saveJoePublisherService(authInfoJoe);
 			//Saving the Listener Service
-			tckSubscriptionListener.saveService(authInfoJoe, TckSubscriptionListener.LISTENER_HTTP_SERVICE_XML, 0);
+			tckSubscriptionListener.saveService(authInfoJoe, TckSubscriptionListener.LISTENER_HTTP_SERVICE_XML, httpPort);
 			//Saving the Subscription
 			tckSubscriptionListener.saveNotifierSubscription(authInfoJoe, TckSubscriptionListener.SUBSCRIPTION_XML);
             //Changing the service we subscribed to "JoePublisherService"

Propchange: juddi/branches/juddi-3.2.x/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java
------------------------------------------------------------------------------
  Merged /juddi/trunk/uddi-tck/src/test/java/org/apache/juddi/v3/tck/UDDI_090_SubscriptionListenerIntegrationTest.java:r1470374-1471182



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


Mime
View raw message