You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by al...@apache.org on 2014/01/20 01:22:29 UTC
svn commit: r1559611 [1/3] - in /juddi/trunk:
juddi-client/src/main/java/org/apache/juddi/v3/client/config/
juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/
juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/
juddi-client/src/m...
Author: alexoree
Date: Mon Jan 20 00:22:28 2014
New Revision: 1559611
URL: http://svn.apache.org/r1559611
Log:
JUDDI-797 as good as its going to get, fixing issue with saving digital signed entities via juddi-gui
Removed:
juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/hub/builders/Builders.java
juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/hub/builders/SubscriptionHelper.java
Modified:
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClient.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClientContainer.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/Cryptor.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/ServiceLocator.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wsdl/BPEL2UDDI.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wsdl/WSDL2UDDI.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/subscription/SubscriptionCallbackListener.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java
juddi/trunk/juddi-gui-dsig/src/main/java/org/apache/juddi/gui/dsig/XmlSigApplet2.java
juddi/trunk/juddi-gui-dsig/src/main/java/org/apache/juddi/gui/dsig/XmlSignatureApplet.java
juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/AES.java
juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/CrossSiteRequestForgeryException.java
juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/PostBackConstants.java
juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UDDIRequestsAsXML.java
juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java
juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/builders/Builders.java
juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/builders/Printers.java
juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/resources/ResourceLoader.java
juddi/trunk/juddi-gui/src/main/webapp/ajax/abortTransferToken.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/acceptTransferToken.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/advanced.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/assertions.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/bindingsearch.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/businessAsSelect.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/businesssearch.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/deletebusiness.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/deleteservice.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/deletetmodel.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/getCert.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/getTransferToken.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/importFromWadl.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/importFromWsdl.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/loginpost.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/opInfo.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/saveFromXML.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/savebusiness.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/saveservicedetails.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/savetmodel.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/search.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/servicedetails.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/servicelist.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/servicesearch.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/settings.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/subscription.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/subscriptionFeed.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/tmodel.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/tmodelsearch.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/toXML.jsp
juddi/trunk/juddi-gui/src/main/webapp/ajax/validateSignature.jsp
juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/AES.java
juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/hub/UddiAdminHub.java
juddi/trunk/juddiv3-war/src/main/java/org/apache/juddi/adminconsole/resources/ResourceLoader.java
juddi/trunk/juddiv3-war/src/main/webapp/admin/about.jsp
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java?rev=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java Mon Jan 20 00:22:28 2014
@@ -166,7 +166,7 @@ public class UDDIClerk implements Serial
* Annotations on them for automated registration
* <br>client.clerks.clerk(" + i + ").class
*
- * @return
+ * @return classes with UDDI Annotations
* @see org.apache.juddi.v3.annotations.UDDIService
* @see org.apache.juddi.v3.annotations.UDDIServiceBinding
*/
@@ -178,7 +178,7 @@ public class UDDIClerk implements Serial
* Returns the UDDI node that this clerk is associated with
* client.clerks.clerk(" + i + ")@node
*
- * @return
+ * @return UDDINode
*/
public UDDINode getUDDINode() {
return this.uddiNode;
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClient.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClient.java?rev=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClient.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClient.java Mon Jan 20 00:22:28 2014
@@ -398,8 +398,7 @@ public class UDDIClient {
* Returns the transport defined for the node with the given name
* "default". deprecated, use the getTransport(String nodeName) instead.
* Returns the "default" jUDDI nodes Transport.
- *
- * @deprecated, use the getTransport(String nodeName) instead. Returns
+ * @deprecated use the getTransport(String nodeName) instead. Returns
* the "default" jUDDI nodes Transport. Note: this will always return a
* new instance of Transport
* @return a transport object
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClientContainer.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClientContainer.java?rev=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClientContainer.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClientContainer.java Mon Jan 20 00:22:28 2014
@@ -71,7 +71,7 @@ public class UDDIClientContainer {
/**
* return true if the client exists in the current client collection
* @param name
- * @return
+ * @return true/false
*/
public static boolean contains(String name) {
return (clients.containsKey(name)) ;
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/Cryptor.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/Cryptor.java?rev=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/Cryptor.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/cryptor/Cryptor.java Mon Jan 20 00:22:28 2014
@@ -53,7 +53,7 @@ public interface Cryptor {
* decrypts the string
*
* @param str
- * @return, if the password can be decrypted, the decrypted value is
+ * @return if the password can be decrypted, the decrypted value is
* returned, otherwise the original value is returned<br>
* In the event that decryption fails, the error message must be logged.
* @throws NoSuchPaddingException
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/ServiceLocator.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/ServiceLocator.java?rev=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/ServiceLocator.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/ServiceLocator.java Mon Jan 20 00:22:28 2014
@@ -186,7 +186,7 @@ public class ServiceLocator {
* are found.
*
* @param serviceKey
- * @return
+ * @return endpoint
* @throws RemoteException
* @throws ConfigurationException
* @throws TransportException
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wsdl/BPEL2UDDI.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wsdl/BPEL2UDDI.java?rev=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wsdl/BPEL2UDDI.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wsdl/BPEL2UDDI.java Mon Jan 20 00:22:28 2014
@@ -342,7 +342,7 @@ public class BPEL2UDDI extends Annotatio
* @param targetNamespace
* @param portTypes
* @param bpelOverviewURL
- * @return
+ * @return tmodels
*/
public TModel createBPEL4WSProcessTModel(QName serviceName, String targetNamespace, Map<QName,PortType> portTypes, String bpelOverviewURL) {
TModel tModel = new TModel();
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wsdl/WSDL2UDDI.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wsdl/WSDL2UDDI.java?rev=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wsdl/WSDL2UDDI.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/wsdl/WSDL2UDDI.java Mon Jan 20 00:22:28 2014
@@ -46,13 +46,13 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.juddi.api_v3.AccessPointType;
import org.apache.juddi.jaxb.PrintUDDI;
-import org.apache.juddi.v3.client.UDDIConstants;
import org.apache.juddi.v3.client.config.Property;
import org.apache.juddi.v3.client.config.UDDIClerk;
import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.config.UDDIKeyConvention;
import org.apache.juddi.v3.client.mapping.ServiceRegistrationResponse;
import org.apache.juddi.v3.client.mapping.URLLocalizer;
+import org.apache.juddi.v3.client.mapping.wadl.WADL2UDDI;
import org.apache.juddi.v3.client.transport.TransportException;
import org.uddi.api_v3.AccessPoint;
import org.uddi.api_v3.BindingTemplate;
@@ -60,7 +60,6 @@ import org.uddi.api_v3.BindingTemplates;
import org.uddi.api_v3.BusinessService;
import org.uddi.api_v3.BusinessServices;
import org.uddi.api_v3.CategoryBag;
-import org.uddi.api_v3.Description;
import org.uddi.api_v3.FindTModel;
import org.uddi.api_v3.InstanceDetails;
import org.uddi.api_v3.KeyedReference;
@@ -86,9 +85,10 @@ import org.w3c.dom.Element;
* uddi:bindingTemplate</li> <li>TODO: 2.4.5 wsdl:port Address Extensions ->
* uddi:bindingTemplate</li> </ul>
*
- * @see
+ * @see WADL2UDDI
+ * @see BPEL2UDDI
* @author Kurt T Stam
- * @Since 3.1.5
+ * @since 3.1.5
*/
public class WSDL2UDDI {
Modified: juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/subscription/SubscriptionCallbackListener.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/subscription/SubscriptionCallbackListener.java?rev=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/subscription/SubscriptionCallbackListener.java (original)
+++ juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/subscription/SubscriptionCallbackListener.java Mon Jan 20 00:22:28 2014
@@ -100,7 +100,7 @@ public class SubscriptionCallbackListene
* used for unit tests, may return null if the endpoint isn't started
* yet
*
- * @return
+ * @return gets an instance
*/
protected static SubscriptionCallbackListener getInstance() {
return instance;
@@ -249,7 +249,7 @@ public class SubscriptionCallbackListene
* gets the current callback url, may be null if the endpoint isn't
* started yet
*
- * @return
+ * @return the current callback url or null
*/
public static String getCallbackURL() {
return callback;
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java?rev=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/subscription/SubscriptionNotifier.java Mon Jan 20 00:22:28 2014
@@ -17,7 +17,6 @@
package org.apache.juddi.subscription;
import java.io.IOException;
-import java.net.MalformedURLException;
import java.util.Collection;
import java.util.Date;
import java.util.GregorianCalendar;
@@ -106,7 +105,7 @@ public class SubscriptionNotifier extend
* If the CRUD methods on the publication API where not called, this registry node does not contain changes. If
* the registry database is shared with other registry nodes and one of those registries pushed in a change, then
* that registry node will take care of sending out notifications.
- * @return
+ * @return true/false
*/
protected boolean registryMayContainUpdates() {
boolean isUpdated = false;
Modified: juddi/trunk/juddi-gui-dsig/src/main/java/org/apache/juddi/gui/dsig/XmlSigApplet2.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui-dsig/src/main/java/org/apache/juddi/gui/dsig/XmlSigApplet2.java?rev=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddi-gui-dsig/src/main/java/org/apache/juddi/gui/dsig/XmlSigApplet2.java (original)
+++ juddi/trunk/juddi-gui-dsig/src/main/java/org/apache/juddi/gui/dsig/XmlSigApplet2.java Mon Jan 20 00:22:28 2014
@@ -18,59 +18,39 @@ package org.apache.juddi.gui.dsig;
import java.io.File;
import java.io.StringReader;
import java.io.StringWriter;
-import java.security.InvalidAlgorithmParameterException;
import java.security.Key;
import java.security.KeyStore;
import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
import java.security.PrivateKey;
import java.security.cert.Certificate;
import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Collections;
import java.util.Enumeration;
-import java.util.List;
import java.util.Vector;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.JOptionPane;
-import javax.swing.JPopupMenu;
-import javax.swing.Popup;
-import javax.swing.PopupFactory;
import javax.xml.bind.JAXB;
-import javax.xml.crypto.dsig.CanonicalizationMethod;
-import javax.xml.crypto.dsig.DigestMethod;
-import javax.xml.crypto.dsig.Reference;
-import javax.xml.crypto.dsig.SignatureMethod;
-import javax.xml.crypto.dsig.SignedInfo;
-import javax.xml.crypto.dsig.Transform;
-import javax.xml.crypto.dsig.XMLSignature;
-import javax.xml.crypto.dsig.XMLSignatureFactory;
-import javax.xml.crypto.dsig.dom.DOMSignContext;
-import javax.xml.crypto.dsig.keyinfo.KeyInfo;
-import javax.xml.crypto.dsig.keyinfo.KeyInfoFactory;
-import javax.xml.crypto.dsig.keyinfo.X509Data;
-import javax.xml.crypto.dsig.spec.C14NMethodParameterSpec;
-import javax.xml.crypto.dsig.spec.TransformParameterSpec;
import netscape.javascript.JSObject;
import org.apache.juddi.v3.client.cryptor.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.Node;
import org.w3c.dom.ls.DOMImplementationLS;
import org.w3c.dom.ls.LSSerializer;
/**
- *
- * @author Daddy
+ * This is the current Digital Signature Applet used by juddi-gui. It can easily
+ * be adapted to sign any xml document
+ * @author <a href="mailto:alexoree@apache.org>Alex O'Ree</a>
*/
public class XmlSigApplet2 extends java.applet.Applet {
+ private static final long serialVersionUID = 1L;
/**
* Initializes the applet XmlSigApplet2
*/
+ @Override
public void init() {
try {
java.awt.EventQueue.invokeAndWait(new Runnable() {
@@ -85,38 +65,13 @@ public class XmlSigApplet2 extends java.
}
- private XMLSignatureFactory initXMLSigFactory() {
- XMLSignatureFactory fac = XMLSignatureFactory.getInstance();
- return fac;
- }
-
- private Reference initReference(XMLSignatureFactory fac) throws NoSuchAlgorithmException, InvalidAlgorithmParameterException {
- List transformers = new ArrayList();
- transformers.add(fac.newTransform(Transform.ENVELOPED, (TransformParameterSpec) null));
-
- // String dm = map.getProperty(SIGNATURE_OPTION_DIGEST_METHOD);
- //if (dm == null) {
- String dm = DigestMethod.SHA1;
- //}
- Reference ref = fac.newReference("", fac.newDigestMethod(dm, null), transformers, null, null);
- return ref;
- }
- private SignedInfo initSignedInfo(XMLSignatureFactory fac) throws Exception {
- Reference ref = initReference(fac);
- SignedInfo si = fac.newSignedInfo(fac.newCanonicalizationMethod(CanonicalizationMethod.EXCLUSIVE,
- (C14NMethodParameterSpec) null),
- fac.newSignatureMethod(SignatureMethod.RSA_SHA1,
- null),
- Collections.singletonList(ref));
- return si;
- }
/**
* this converts a xml document to a string for writing back to the browser
*
* @param doc
- * @return
+ * @return string
*/
public String getStringFromDoc(org.w3c.dom.Document doc) {
DOMImplementationLS domImplementation = (DOMImplementationLS) doc.getImplementation();
@@ -171,14 +126,13 @@ public class XmlSigApplet2 extends java.
}
}
try {
- //printMessageToConsole("Key Store loaded");
Enumeration<String> aliases = keyStore.aliases();
while (aliases.hasMoreElements()) {
String a = aliases.nextElement();
X509Certificate certificate = (X509Certificate) keyStore.getCertificate(a);
- //PublicKey publicKey = certificate.getPublicKey();
- // X509Certificate cert = (X509Certificate) publicKey;
+ //this is needed to test for access
+
try {
Key key = keyStore.getKey(a, null);
certs.add(a);
@@ -387,8 +341,8 @@ public class XmlSigApplet2 extends java.
}// </editor-fold>//GEN-END:initComponents
private void jButton2ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton2ActionPerformed
- // TODO add your handling code here:]
- JPopupMenu jp = new JPopupMenu("Certificate Info");
+
+ //JPopupMenu jp = new JPopupMenu("Certificate Info");
String data = "No certificate selected";
try {
Certificate publickey = keyStore.getCertificate((String) jList1.getSelectedValue());
@@ -406,7 +360,7 @@ public class XmlSigApplet2 extends java.
}//GEN-LAST:event_jButton2ActionPerformed
private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
- // TODO add your handling code here:
+
String signedXml = "error!";
JSObject window = JSObject.getWindow(this);
try {
@@ -426,11 +380,11 @@ public class XmlSigApplet2 extends java.
return;
}
- Object object2 = window.call("getBrowserName", null);
- Object object1 = window.call("getOsName", null);
+ //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 browserName = (String) object2;
+ //tring osName = (String) object2;
String objecttype = (String) object3;
//get the xml
@@ -493,7 +447,7 @@ public class XmlSigApplet2 extends java.
JAXB.marshal(j, sw);
signedXml = sw.toString();
} catch (Exception ex) {
- Logger.getLogger(XmlSignatureApplet.class.getName()).log(Level.SEVERE, null, ex);
+ Logger.getLogger(this.getClass().getName()).log(Level.SEVERE, null, ex);
signedXml = "Sorry I couldn't sign the data. " + ex.getMessage();
}
} else {
@@ -525,33 +479,7 @@ public class XmlSigApplet2 extends java.
*/
public final static String XML_DIGSIG_NS = "http://www.w3.org/2000/09/xmldsig#";
- private void signDOM(Node node, PrivateKey privateKey, Certificate origCert) {
- XMLSignatureFactory fac = initXMLSigFactory();
- X509Certificate cert = (X509Certificate) origCert;
- // Create the KeyInfo containing the X509Data.
- KeyInfoFactory kif = fac.getKeyInfoFactory();
- List<Object> x509Content = new ArrayList<Object>();
- //x509Content.add(cert.getSubjectX500Principal().getName());
- x509Content.add(cert);
- X509Data xd = kif.newX509Data(x509Content);
- KeyInfo ki = kif.newKeyInfo(Collections.singletonList(xd));
-
- // Create a DOMSignContext and specify the RSA PrivateKey and
- // location of the resulting XMLSignature's parent element.
- DOMSignContext dsc = new DOMSignContext(privateKey, node);
- dsc.putNamespacePrefix(XML_DIGSIG_NS, "ns2");
-
- // Create the XMLSignature, but don't sign it yet.
- try {
- SignedInfo si = initSignedInfo(fac);
- XMLSignature signature = fac.newXMLSignature(si, ki);
-
- // Marshal, generate, and sign the enveloped signature.
- signature.sign(dsc);
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
+
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.ButtonGroup buttonGroup1;
private javax.swing.JCheckBox isIncludeIssuer;
Modified: juddi/trunk/juddi-gui-dsig/src/main/java/org/apache/juddi/gui/dsig/XmlSignatureApplet.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui-dsig/src/main/java/org/apache/juddi/gui/dsig/XmlSignatureApplet.java?rev=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddi-gui-dsig/src/main/java/org/apache/juddi/gui/dsig/XmlSignatureApplet.java (original)
+++ juddi/trunk/juddi-gui-dsig/src/main/java/org/apache/juddi/gui/dsig/XmlSignatureApplet.java Mon Jan 20 00:22:28 2014
@@ -71,8 +71,10 @@ import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
/**
- * Provides a Java web applet that digitally signs UDDI xml
- *
+ * Provides a Java web applet that digitally signs UDDI xml. This class
+ * provides the most basic code for signing and was more of a proof of concept
+ * @deprecated XmlSigApplet2 instead
+ * @see XmlSigApplet2
* @author <a href="mailto:alexoree@apache.org">Alex O'Ree</a>
*/
public class XmlSignatureApplet extends java.applet.Applet {
@@ -155,7 +157,7 @@ public class XmlSignatureApplet extends
/**
* this converts a xml document to a string for writing back to the browser
* @param doc
- * @return
+ * @return string
*/
public String getStringFromDoc(org.w3c.dom.Document doc) {
DOMImplementationLS domImplementation = (DOMImplementationLS) doc.getImplementation();
Modified: juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/AES.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/AES.java?rev=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/AES.java (original)
+++ juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/AES.java Mon Jan 20 00:22:28 2014
@@ -61,7 +61,7 @@ public class AES {
* Generate a new AES 256 bit encryption key. Once generated, this key
* can be used to replace the default key.
*
- * @return
+ * @return a new key
*/
public static String GEN() {
return GEN(256);
@@ -92,7 +92,7 @@ public class AES {
* return true is the supplied key is a valid aes key
*
* @param key
- * @return
+ * @return true if the key is valid
*/
public static boolean ValidateKey(String key) {
try {
@@ -116,7 +116,7 @@ public class AES {
*
* @param clear
* @param key
- * @return
+ * @return encrypted base64 text
*/
public static String Encrypt(String clear, String key) throws Exception {
if ((clear == null || clear.length() == 0)) {
@@ -142,7 +142,7 @@ public class AES {
*
* @param cipher encrypted text
* @param key
- * @return
+ * @return encrypted text
*/
public static String Decrypt(String cipher, String key) {
if ((cipher == null || cipher.length() == 0)) {
Modified: juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/CrossSiteRequestForgeryException.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/CrossSiteRequestForgeryException.java?rev=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/CrossSiteRequestForgeryException.java (original)
+++ juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/CrossSiteRequestForgeryException.java Mon Jan 20 00:22:28 2014
@@ -17,51 +17,60 @@
package org.apache.juddi.webconsole;
/**
- * Provides a very basic, no stack trace exception, useful for throwing at a browser without revealing any details
+ * Provides a very basic, no stack trace exception, useful for throwing at a
+ * browser without revealing any details
+ *
* @author <a href="mailto:alexoree@apache.org">Alex O'Ree</a>
*/
public class CrossSiteRequestForgeryException extends Exception {
+
+ private static final long serialVersionUID = 1L;
//Parameterless Constructor
-/**
- * CrossSiteRequestForgeryException
- */
- public CrossSiteRequestForgeryException() {
- super(msg, null);
- }
-
- /**
- * Constructor that accepts a message
- */
- public CrossSiteRequestForgeryException(String message) {
- super(msg, null);
- }
-/**
- * CrossSiteRequestForgeryException
- * @param message
- * @param cause
- */
- public CrossSiteRequestForgeryException(String message, Throwable cause) {
- super(msg, null);
- }
- private static final String msg = "Cross Site Request Forgery";
-
- @Override
- public String toString() {
- return msg;
- }
-
- @Override
- public String getMessage() {
- return msg;
- }
-
- @Override
- public String getLocalizedMessage() {
- return msg;
- }
-
- @Override
- public Throwable getCause() {
- return null;
- }
+
+ /**
+ * CrossSiteRequestForgeryException
+ */
+ public CrossSiteRequestForgeryException() {
+ super(msg, null);
+ }
+
+ /**
+ * Constructor that accepts a message
+ *
+ * @param message
+ */
+ public CrossSiteRequestForgeryException(String message) {
+ super(msg, null);
+ }
+
+ /**
+ * CrossSiteRequestForgeryException
+ *
+ * @param message
+ * @param cause
+ */
+ public CrossSiteRequestForgeryException(String message, Throwable cause) {
+ super(msg, null);
+ }
+ private static final String msg = "Cross Site Request Forgery";
+
+ @Override
+ public String toString() {
+ return msg;
+ }
+
+ @Override
+ public String getMessage() {
+ return msg;
+ }
+
+ @Override
+ public String getLocalizedMessage() {
+ return msg;
+ }
+
+ @Override
+ public Throwable getCause() {
+ return null;
+ }
}
Modified: juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/PostBackConstants.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/PostBackConstants.java?rev=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/PostBackConstants.java (original)
+++ juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/PostBackConstants.java Mon Jan 20 00:22:28 2014
@@ -24,7 +24,7 @@ package org.apache.juddi.webconsole;
*
* @author <a href="mailto:alexoree@apache.org">Alex O'Ree</a>
*/
-public class PostBackConstants {
+public interface PostBackConstants {
public static final String INSTANCE = "instance";
public static final String ACCESSPOINT_TYPE = "accessPointType";
Modified: juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UDDIRequestsAsXML.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UDDIRequestsAsXML.java?rev=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UDDIRequestsAsXML.java (original)
+++ juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UDDIRequestsAsXML.java Mon Jan 20 00:22:28 2014
@@ -56,7 +56,8 @@ import org.uddi.sub_v3.GetSubscriptions;
import org.uddi.sub_v3.SaveSubscription;
/**
- * This class generates XML as String objects for UDDI requests
+ * This class generates XML as String objects for UDDI requests.
+ * This is used from the "advanced" web pages
*
* @author <a href="mailto:alexoree@apache.org">Alex O'Ree</a>
*/
Modified: juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java?rev=1559611&r1=1559610&r2=1559611&view=diff
==============================================================================
--- juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java (original)
+++ juddi/trunk/juddi-gui/src/main/java/org/apache/juddi/webconsole/hub/UddiHub.java Mon Jan 20 00:22:28 2014
@@ -115,23 +115,23 @@ public class UddiHub implements Serializ
*/
public static final String PROP_CONFIG_NODE = "config.props.node";
/**
- *
+ *"config.props.authtype"
*/
public static final String PROP_AUTH_TYPE = "config.props.authtype";
/**
- *
+ *"config.props.automaticLogouts.enable"
*/
public static final String PROP_AUTO_LOGOUT = "config.props.automaticLogouts.enable";
/**
- *
+ *"config.props.automaticLogouts.duration"
*/
public static final String PROP_AUTO_LOGOUT_TIMER = "config.props.automaticLogouts.duration";
/**
- *
+ *"config.props."
*/
public static final String PROP_PREFIX = "config.props.";
/**
- *
+ *"config.props.configLocalHostOnly"
*
*/
public static final String PROP_ADMIN_LOCALHOST_ONLY = "config.props.configLocalHostOnly";
@@ -286,7 +286,7 @@ public class UddiHub implements Serializ
*
* @param application
* @param _session
- * @return
+ * @return instance
* @throws Exception
*/
public static UddiHub getInstance(ServletContext application, HttpSession _session) throws Exception {
@@ -305,7 +305,7 @@ public class UddiHub implements Serializ
/**
* gets the user selected locale
*
- * @return
+ * @return something like "en" or "es"
*/
public String getLocale() {
return locale;
@@ -386,7 +386,7 @@ public class UddiHub implements Serializ
* returns true if we are using JAXWS transport AND all of the URLs
* start with https://
*
- * @return
+ * @return true if all coms are SSL based
*/
public boolean isSecure() {
@@ -398,7 +398,7 @@ public class UddiHub implements Serializ
* gets a reference to the current juddi client config file. this is a
* live instance changes can be stored to disk, usually
*
- * @return
+ * @return client config
* @throws ConfigurationException g
*/
public ClientConfig GetJuddiClientConfig() throws ConfigurationException {
@@ -409,7 +409,7 @@ public class UddiHub implements Serializ
/**
* returns all of the current properties defining digital signatures
*
- * @return
+ * @return digsig properties
*/
public Properties GetDigitalSignatureConfig() {
try {
@@ -520,7 +520,7 @@ public class UddiHub implements Serializ
* Returns true if the current user has a token and is signed in. Does
* not apply to non-UDDI security API logins
*
- * @return
+ * @return true if authenticated
*/
public boolean getUddiIsAuthenticated() {
return (token != null && !token.isEmpty());
@@ -534,7 +534,7 @@ public class UddiHub implements Serializ
* @param keyword
* @param lang
* @param isChooser
- * @return
+ * @return PagableContainer of businesses
*/
public PagableContainer GetBusinessListAsHtml(int offset, int maxrecords, String keyword, String lang, boolean isChooser) {
PagableContainer ret = new PagableContainer();
@@ -595,7 +595,9 @@ public class UddiHub implements Serializ
* after a network problem results in an unknown status of saved
* information.
*
- * @return
+ * @param businesses
+ * @param tModels
+ * @return returns all of "my" keys
*/
public String GetMyTransferableKeys(boolean businesses, boolean tModels) {
@@ -666,7 +668,7 @@ public class UddiHub implements Serializ
* Performs Inquiry Find_service API used from servicedetails.jsp
*
* @param serviceid
- * @return
+ * @return string
*/
public String GetServiceDetailAsHtml(String serviceid) {
if (serviceid == null || serviceid.length() == 0) {
@@ -719,7 +721,7 @@ public class UddiHub implements Serializ
* code representing an expired token
*
* @param ex
- * @return r
+ * @return true if it's an expired token
*/
public static boolean isExceptionExpiration(Exception ex) {
if (ex == null) {
@@ -756,7 +758,7 @@ public class UddiHub implements Serializ
* used on browse.jsp
*
* @param bizid
- * @return retu
+ * @return string
*/
public String GetServiceList(String bizid) {
if (bizid == null || bizid.isEmpty()) {
@@ -843,12 +845,11 @@ public class UddiHub implements Serializ
}
/**
- * don't think this is used yet
+ * this is used from the save from xml.jsp page
*
* @param be
- * @return
+ * @return status message
*/
- @Deprecated
public String SaveBindingTemplate(BindingTemplate be) {
try {
SaveBinding sb = new SaveBinding();
@@ -985,7 +986,7 @@ public class UddiHub implements Serializ
* parameters. A human readable response message is returned
*
* @param request
- * @return
+ * @return string
*/
public String SaveBusinessDetails(HttpServletRequest request) {
@@ -1019,13 +1020,7 @@ public class UddiHub implements Serializ
return SaveBusinessDetails(be);
}
- /**
- * Returns
- *
- * @param bizid
- * @return
- * @throws Exception
- */
+
/**
* Gets a business's details used for the businessEditor
*
@@ -1071,7 +1066,7 @@ public class UddiHub implements Serializ
* icon
*
* @param HandleException, any string representing an error message
- * @return
+ * @return string
*/
public static String ToErrorAlert(String HandleException) {
return "<div class=\"alert alert-error\"><i class=\"icon-warning-sign icon-large\"></i> " + HandleException + "</div>";
@@ -1100,7 +1095,7 @@ public class UddiHub implements Serializ
* @param maxrecords
* @param offset
* @param isChooser
- * @return
+ * @return PagableContainer of services
*/
public PagableContainer SearchForServices(String keyword, String lang, int maxrecords, int offset, boolean isChooser) {
PagableContainer ret = new PagableContainer();
@@ -1164,7 +1159,9 @@ public class UddiHub implements Serializ
* E_valueNotAllowed returned.
*
* @param partitionName
- * @return
+ * @param name
+ * @param lang
+ * @return string
*/
public String AddTmodelKenGenerator(String partitionName, String name, String lang) {
try {
@@ -1214,7 +1211,7 @@ public class UddiHub implements Serializ
* bootstrap stylized html error message
*
* @param ex
- * @return
+ * @return string
*/
private String HandleException(Exception ex) {
if (ex instanceof DispositionReportFaultMessage) {
@@ -1247,7 +1244,7 @@ public class UddiHub implements Serializ
* @param maxrecords
* @param isChooser if true, tModel keys will not be clickable and will
* instead be render for a modal dialog box
- * @return
+ * @return PagableContainer tmodel
*/
public PagableContainer tModelListAsHtml(String keyword, String lang, int offset, int maxrecords, boolean isChooser) {
PagableContainer ret = new PagableContainer();
@@ -1305,7 +1302,7 @@ public class UddiHub implements Serializ
*
* @param id
* @return the details or null if it doesn't exist or a null value was
- * passed
+ * passed tmodel
*/
public TModel getTmodelDetails(String id) {
try {
@@ -1345,7 +1342,7 @@ public class UddiHub implements Serializ
* A convenience function for GetBusinessDetails
*
* @param key
- * @return
+ * @return be
*/
public BusinessEntity GetBusinessDetailsAsObject(String key) {
return GetBusinessDetails(key);
@@ -1355,7 +1352,7 @@ public class UddiHub implements Serializ
* A convenience function for GetServiceDetail
*
* @param key
- * @return
+ * @return bs
*/
public BusinessService GetServiceDetailsAsObject(String key) {
return GetServiceDetail(key);
@@ -1699,8 +1696,7 @@ public class UddiHub implements Serializ
if (findBusiness != null && findBusiness.getRelatedBusinessInfos() != null) {
StringBuilder sb = new StringBuilder();
sb.append("<table class=\"table table-hover\">");
- sb.append("<tr><th>" + ResourceLoader.GetResource(session, "items.business") + "</th><th>"
- + ResourceLoader.GetResource(session, "items.publisherassertions.relationship") + "</th><tr>");
+ sb.append("<tr><th>").append(ResourceLoader.GetResource(session, "items.business")).append("</th><th>").append(ResourceLoader.GetResource(session, "items.publisherassertions.relationship")).append("</th><tr>");
for (int i = 0; i < findBusiness.getRelatedBusinessInfos().getRelatedBusinessInfo().size(); i++) {
sb.append("<tr><td>");
sb.append("<a href=\"businessEditor2.jsp?id=").
@@ -1917,7 +1913,7 @@ public class UddiHub implements Serializ
* delete a service
*
* @param serviceId
- * @return
+ * @return status msg
*/
public String deleteService(String serviceId) {
if (serviceId == null || serviceId.length() == 0) {
@@ -1932,7 +1928,7 @@ public class UddiHub implements Serializ
* deletes a list of services
*
* @param serviceId
- * @return
+ * @return status msg
*/
public String deleteService(List<String> serviceId) {
if (serviceId == null || serviceId.isEmpty()) {
@@ -1996,7 +1992,7 @@ public class UddiHub implements Serializ
* delete a tmodel
*
* @param bizid
- * @return
+ * @return status msg
*/
public String deleteTmodel(String bizid) {
if (bizid == null || bizid.length() == 0) {
@@ -2043,7 +2039,7 @@ public class UddiHub implements Serializ
* saves a tmodel object
*
* @param be
- * @return
+ * @return status msg
*/
public String SaveTModel(TModel be) {
try {
@@ -2078,7 +2074,7 @@ public class UddiHub implements Serializ
* editor page
*
* @param request
- * @return
+ * @return status msg
*/
public String SaveTModel(HttpServletRequest request) {
@@ -2129,7 +2125,7 @@ public class UddiHub implements Serializ
* certificate subject name
*
* @param sig
- * @return
+ * @return human readable signature
*/
public static String SignatureToReadable(SignatureType sig) {
StringBuilder sb = new StringBuilder();
@@ -2168,7 +2164,7 @@ public class UddiHub implements Serializ
* containing the raw data for the signing certificate, if present
*
* @param sig
- * @return
+ * @return x509 cert
*/
public String SignatureToBase64(SignatureType sig) {
if (sig == null) {
@@ -2248,7 +2244,7 @@ public class UddiHub implements Serializ
}
/**
- *
+ *gets all of my subscriptions
* @return null if there's an error
*/
public List<Subscription> GetSubscriptions() {
@@ -2332,8 +2328,7 @@ public class UddiHub implements Serializ
}
/**
- *
- * @param ft
+ * gets the opinfo on an item
* @param id
* @return null if theres an error
*/
@@ -2369,7 +2364,7 @@ public class UddiHub implements Serializ
* GetOperationalInfo
*
* @param info
- * @return
+ * @return formatted html
*/
public String GetOperationalInfo(List<OperationalInfo> info) {
StringBuilder sb = new StringBuilder();
@@ -2422,7 +2417,7 @@ public class UddiHub implements Serializ
* after a network problem results in an unknown status of saved
* information.
*
- * @return
+ * @return RegisteredInfo
*/
public RegisteredInfo GetNodeInformation(AtomicReference<String> outmsg) {
if (outmsg == null) {
@@ -2470,7 +2465,7 @@ public class UddiHub implements Serializ
* Relationships and Publisher Assertions for more information.
*
* @param msg
- * @return
+ * @return list
*/
public List<AssertionStatusItem> GetPublisherAssertions(AtomicReference<String> msg) {
List<AssertionStatusItem> out = new ArrayList<AssertionStatusItem>();
@@ -2551,7 +2546,7 @@ public class UddiHub implements Serializ
* @param tmodelkey
* @param keyname
* @param keyvalue
- * @return
+ * @return status msg
*/
public String DeletePublisherAssertion(String tokey, String fromkey, String tmodelkey, String keyname, String keyvalue) {
DeletePublisherAssertions dp = new DeletePublisherAssertions();
@@ -2590,7 +2585,7 @@ public class UddiHub implements Serializ
* @param fromkey
* @param keyname
* @param keyvalue
- * @return
+ * @return status msg
*/
public String AddPublisherAssertion(String tokey, String fromkey, String tmodelkey, String keyname, String keyvalue) {
// List<PublisherAssertion> x = GetPublisherAssertions();
@@ -2630,7 +2625,7 @@ public class UddiHub implements Serializ
* refresh
*
* @param lastRefresh
- * @return
+ * @return formatted html
* @throws DatatypeConfigurationException
*/
public String GetNewsFeed(XMLGregorianCalendar lastRefresh) throws DatatypeConfigurationException {
@@ -2810,7 +2805,7 @@ public class UddiHub implements Serializ
* @param offset
* @param maxrecords
* @param isChooser
- * @return
+ * @return PagableContainer
*/
public PagableContainer SearchForBinding(String keyword, String lang, int offset, int maxrecords, boolean isChooser) {
PagableContainer ret = new PagableContainer();
@@ -2954,7 +2949,7 @@ public class UddiHub implements Serializ
* @param nodeid
* @param outExpires
* @param outToken
- * @return
+ * @return status
*/
public String GetCustodyTransferToken(org.uddi.custody_v3.KeyBag keys, Holder<String> nodeid, Holder<XMLGregorianCalendar> outExpires, Holder<byte[]> outToken) {
@@ -3028,7 +3023,7 @@ public class UddiHub implements Serializ
*
* @param tokenXML
* @param keyBagXML
- * @return
+ * @return status msg
*/
public String AcceptCustodyTranferToken(String tokenXML, String keyBagXML) {
try {
@@ -3087,7 +3082,7 @@ public class UddiHub implements Serializ
* @param request
* @param service
* @param method
- * @return
+ * @return xml response
* @see UDDIRequestsAsXML
*/
public String SendAdvancedQuery(Object request, String service, String method) {
@@ -3659,7 +3654,7 @@ public class UddiHub implements Serializ
/**
* returns true if automatic logouts are configured
*
- * @return
+ * @return true/false
*/
public boolean isAutoLogoutEnabled() {
@@ -3681,7 +3676,7 @@ public class UddiHub implements Serializ
/**
* defaults to 15 minutes if not defined
*
- * @return
+ * @return duration
*/
public long GetAutoLogoutDuration() {
String val = clientConfig.getConfiguration().getString(PROP_AUTO_LOGOUT_TIMER);
@@ -3701,7 +3696,7 @@ public class UddiHub implements Serializ
* true, it will only be accessible from the server hosting juddi-gui.
* if not defined, the result is true.
*
- * @return
+ * @return true/false
*/
public boolean isAdminLocalhostOnly() {
return clientConfig.getConfiguration().getBoolean(PROP_ADMIN_LOCALHOST_ONLY, true);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org