You are viewing a plain text version of this content. The canonical link for it is here.
Posted to tsik-dev@ws.apache.org by ha...@apache.org on 2005/09/10 00:49:50 UTC
svn commit: r279902 [3/3] - in /incubator/tsik/trunk: ./ addons/ addons/src/
addons/src/org/ addons/src/org/apache/ addons/src/org/apache/tsik/
addons/src/org/apache/tsik/addon/ addons/src/org/apache/tsik/addon/messaging/
addons/src/org/apache/tsik/add...
Modified: incubator/tsik/trunk/src/org/apache/tsik/wss/Wss.java
URL: http://svn.apache.org/viewcvs/incubator/tsik/trunk/src/org/apache/tsik/wss/Wss.java?rev=279902&r1=279901&r2=279902&view=diff
==============================================================================
--- incubator/tsik/trunk/src/org/apache/tsik/wss/Wss.java (original)
+++ incubator/tsik/trunk/src/org/apache/tsik/wss/Wss.java Fri Sep 9 15:49:44 2005
@@ -1,20 +1,22 @@
-// $Id$
+/* $Id$ */
-//
-// (C) Copyright 2005 VeriSign, Inc. All Rights Reserved.
-//
-// VeriSign, Inc. shall have no responsibility, financial or
-// otherwise, for any consequences arising out of the use of
-// this material. The program material is provided on an "AS IS"
-// BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
-// express or implied. The user is responsible for determining
-// any necessary third party rights or authorizations that may
-// be required for the use of the materials. Users are advised
-// that they may need authorizations under certain patents from
-// Microsoft and IBM, or others. Please see notice.txt file.
-// VeriSign disclaims any obligation to notify the user of any
-// such third party rights.
-//
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
package org.apache.tsik.wss;
@@ -25,18 +27,19 @@
import java.security.PrivateKey;
import java.security.SignatureException;
import java.security.cert.CertificateException;
-
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-
import org.apache.tsik.common.Logger;
import org.apache.tsik.common.LoggerFactory;
import org.apache.tsik.domutil.DOMCursor;
import org.apache.tsik.domutil.DOMWriteCursor;
import org.apache.tsik.domutil.elements.ElementImpl;
-import org.apache.tsik.messaging.SoapFault;
-import org.apache.tsik.messaging.SoapMessage;
+import org.apache.tsik.plugins.SoapEngine;
+import org.apache.tsik.plugins.SoapFactory;
+import org.apache.tsik.plugins.SoapFault;
+import org.apache.tsik.plugins.SoapFaultConstants;
+import org.apache.tsik.plugins.SoapMessage;
import org.apache.tsik.wss.Id;
import org.apache.tsik.wss.TokenResolver;
import org.apache.tsik.wss.elements.BinarySecurityToken;
@@ -85,6 +88,7 @@
public class Wss
{
private Logger log = LoggerFactory.getLogger(Wss.class);
+ private SoapEngine soapEngine = SoapFactory.getDefaultEngine();
private List headers;
private SoapMessage soap;
@@ -253,8 +257,9 @@
StringWriter stringWriter = new StringWriter();
PrintWriter printWriter = new PrintWriter(stringWriter);
e.printStackTrace(printWriter);
- return new SoapFault(SoapFault.SERVER,
- stringWriter.toString(), "actor",null);
+ return soapEngine
+ .getSoapFaultInstance(SoapFaultConstants.SERVER,
+ stringWriter.toString(), "actor", null);
}
}
@@ -327,7 +332,8 @@
// create a soap envelope
//
- SoapMessage soapCopy = new SoapMessage(temp.getDocument());
+ SoapMessage soapCopy =
+ soapEngine.getSoapMessageInstance(temp.getDocument());
doc = soapCopy.getDocument();
org.apache.tsik.xmlsig.KeyInfo ki
Modified: incubator/tsik/trunk/src/org/apache/tsik/wss/WssException.java
URL: http://svn.apache.org/viewcvs/incubator/tsik/trunk/src/org/apache/tsik/wss/WssException.java?rev=279902&r1=279901&r2=279902&view=diff
==============================================================================
--- incubator/tsik/trunk/src/org/apache/tsik/wss/WssException.java (original)
+++ incubator/tsik/trunk/src/org/apache/tsik/wss/WssException.java Fri Sep 9 15:49:44 2005
@@ -18,7 +18,8 @@
package org.apache.tsik.wss;
-import org.apache.tsik.messaging.SoapFault;
+import org.apache.tsik.plugins.SoapFactory;
+import org.apache.tsik.plugins.SoapFault;
/**
* Signals an error in the WS-Security processing.
@@ -41,7 +42,7 @@
/**
* Returns the SOAP fault.
*
- * @return the soap faul.
+ * @return the soap fault.
*/
public SoapFault getSoapFault()
{
Modified: incubator/tsik/trunk/src/org/apache/tsik/wss/elements/Security.java
URL: http://svn.apache.org/viewcvs/incubator/tsik/trunk/src/org/apache/tsik/wss/elements/Security.java?rev=279902&r1=279901&r2=279902&view=diff
==============================================================================
--- incubator/tsik/trunk/src/org/apache/tsik/wss/elements/Security.java (original)
+++ incubator/tsik/trunk/src/org/apache/tsik/wss/elements/Security.java Fri Sep 9 15:49:44 2005
@@ -35,7 +35,8 @@
import org.apache.tsik.domutil.DOMCursor;
import org.apache.tsik.domutil.DOMWriteCursor;
import org.apache.tsik.domutil.elements.ElementImpl;
-import org.apache.tsik.messaging.SoapMessage;
+import org.apache.tsik.plugins.SoapFactory;
+import org.apache.tsik.plugins.SoapMessage;
import org.apache.tsik.util.Namespaces;
import org.apache.tsik.wss.Id;
import org.apache.tsik.wss.TokenResolver;
Added: incubator/tsik/trunk/src/packages.txt
URL: http://svn.apache.org/viewcvs/incubator/tsik/trunk/src/packages.txt?rev=279902&view=auto
==============================================================================
--- incubator/tsik/trunk/src/packages.txt (added)
+++ incubator/tsik/trunk/src/packages.txt Fri Sep 9 15:49:44 2005
@@ -0,0 +1,31 @@
+org/apache/tsik/common
+org/apache/tsik/crl
+org/apache/tsik/datatypes
+org/apache/tsik/domutil
+org/apache/tsik/domutil/elements
+org/apache/tsik/plugins
+org/apache/tsik/resource
+org/apache/tsik/util
+org/apache/tsik/verifier
+org/apache/tsik/wsa
+org/apache/tsik/wsa/elements
+org/apache/tsik/wsa/types
+org/apache/tsik/wsp/
+org/apache/tsik/wsp/actions
+org/apache/tsik/wss
+org/apache/tsik/wss/actions
+org/apache/tsik/wss/elements
+org/apache/tsik/wss/graphs
+org/apache/tsik/wst
+org/apache/tsik/wst/elements
+org/apache/tsik/wsu
+org/apache/tsik/wsx
+org/apache/tsik/wsx/actions
+org/apache/tsik/wsx/graphs
+org/apache/tsik/xenc
+org/apache/tsik/xmlenc
+org/apache/tsik/xmlsig
+org/apache/tsik/xmlsig/tools
+org/apache/tsik/xpath
+
+
Modified: incubator/tsik/trunk/test/src/org/apache/tsik/testutils/TestUtils.java
URL: http://svn.apache.org/viewcvs/incubator/tsik/trunk/test/src/org/apache/tsik/testutils/TestUtils.java?rev=279902&r1=279901&r2=279902&view=diff
==============================================================================
--- incubator/tsik/trunk/test/src/org/apache/tsik/testutils/TestUtils.java (original)
+++ incubator/tsik/trunk/test/src/org/apache/tsik/testutils/TestUtils.java Fri Sep 9 15:49:44 2005
@@ -28,10 +28,13 @@
import org.apache.tsik.common.Logger;
import org.apache.tsik.domutil.DOMCursor;
import org.apache.tsik.domutil.DOMWriteCursor;
-import org.apache.tsik.messaging.SoapMessage;
+import org.apache.tsik.plugins.SoapMessage;
import org.apache.tsik.resource.ResourceFactory;
import org.apache.tsik.resource.XMLResource;
import org.w3c.dom.Document;
+import org.apache.tsik.plugins.SoapEngine;
+import org.apache.tsik.plugins.SoapFactory;
+import org.apache.tsik.plugins.SoapMessage;
/**
* Just some test utilities.
@@ -39,6 +42,7 @@
public class TestUtils
{
private static XMLResource xmlres = ResourceFactory.getXMLResource();
+ private static SoapEngine e = SoapFactory.getDefaultEngine();
private int n;
public static Document read(String in) throws IOException
@@ -48,7 +52,7 @@
public static SoapMessage readSoap(String in) throws IOException
{
- return new SoapMessage(read(in));
+ return e.getSoapMessageInstance(read(in));
}
public static void writeSoap(SoapMessage soap, String outname)
@@ -60,7 +64,7 @@
public static SoapMessage createEmptySoap() throws IOException
{
- return new SoapMessage(new DOMWriteCursor().getDocument());
+ return e.getSoapMessageInstance(new DOMWriteCursor().getDocument());
}
private static String CLASSNAME = TestUtils.class.getName();
Modified: incubator/tsik/trunk/test/src/org/apache/tsik/wsp/test/WspTest.java
URL: http://svn.apache.org/viewcvs/incubator/tsik/trunk/test/src/org/apache/tsik/wsp/test/WspTest.java?rev=279902&r1=279901&r2=279902&view=diff
==============================================================================
--- incubator/tsik/trunk/test/src/org/apache/tsik/wsp/test/WspTest.java (original)
+++ incubator/tsik/trunk/test/src/org/apache/tsik/wsp/test/WspTest.java Fri Sep 9 15:49:44 2005
@@ -37,7 +37,9 @@
import org.apache.tsik.common.Logger;
import org.apache.tsik.common.LoggerFactory;
import org.apache.tsik.domutil.DOMCursor;
-import org.apache.tsik.messaging.SoapMessage;
+import org.apache.tsik.plugins.SoapMessage;
+import org.apache.tsik.plugins.SoapEngine;
+import org.apache.tsik.plugins.SoapFactory;
import org.apache.tsik.resource.ResourceFactory;
import org.apache.tsik.resource.XMLResource;
import org.apache.tsik.testutils.TestUtils;
@@ -80,7 +82,8 @@
private SoapMessage readSoap(String in) throws IOException
{
- return new SoapMessage(read(in));
+ SoapEngine e = SoapFactory.getDefaultEngine();
+ return e.getSoapMessageInstance(read(in));
}
Modified: incubator/tsik/trunk/test/src/org/apache/tsik/wss/test/WssTest.java
URL: http://svn.apache.org/viewcvs/incubator/tsik/trunk/test/src/org/apache/tsik/wss/test/WssTest.java?rev=279902&r1=279901&r2=279902&view=diff
==============================================================================
--- incubator/tsik/trunk/test/src/org/apache/tsik/wss/test/WssTest.java (original)
+++ incubator/tsik/trunk/test/src/org/apache/tsik/wss/test/WssTest.java Fri Sep 9 15:49:44 2005
@@ -45,8 +45,10 @@
import org.apache.tsik.domutil.DOMCursor;
import org.apache.tsik.domutil.DOMWriteCursor;
import org.apache.tsik.domutil.elements.ElementImpl;
-import org.apache.tsik.messaging.SoapFault;
-import org.apache.tsik.messaging.SoapMessage;
+import org.apache.tsik.plugins.SoapEngine;
+import org.apache.tsik.plugins.SoapFault;
+import org.apache.tsik.plugins.SoapMessage;
+import org.apache.tsik.plugins.SoapFactory;
import org.apache.tsik.resource.ResourceFactory;
import org.apache.tsik.resource.XMLResource;
import org.apache.tsik.testutils.TestUtils;
@@ -462,8 +464,9 @@
}
responseCursor.copyOver(in);
+ SoapEngine e = SoapFactory.getDefaultEngine();
SoapMessage soap
- = new SoapMessage(responseCursor.getDocument());
+ = e.getSoapMessageInstance(responseCursor.getDocument());
Wss wss = new Wss(soap);
Security security = new Security();
Modified: incubator/tsik/trunk/test/src/org/apache/tsik/wst/test/WstTest.java
URL: http://svn.apache.org/viewcvs/incubator/tsik/trunk/test/src/org/apache/tsik/wst/test/WstTest.java?rev=279902&r1=279901&r2=279902&view=diff
==============================================================================
--- incubator/tsik/trunk/test/src/org/apache/tsik/wst/test/WstTest.java (original)
+++ incubator/tsik/trunk/test/src/org/apache/tsik/wst/test/WstTest.java Fri Sep 9 15:49:44 2005
@@ -1,39 +1,40 @@
-// $Id$
+/* $Id$ */
-//
-// (C) Copyright 2005 VeriSign, Inc. All Rights Reserved.
-//
-// VeriSign, Inc. shall have no responsibility, financial or
-// otherwise, for any consequences arising out of the use of
-// this material. The program material is provided on an "AS IS"
-// BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
-// express or implied. The user is responsible for determining
-// any necessary third party rights or authorizations that may
-// be required for the use of the materials. Users are advised
-// that they may need authorizations under certain patents from
-// Microsoft and IBM, or others. Please see notice.txt file.
-// VeriSign disclaims any obligation to notify the user of any
-// such third party rights.
-//
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
package org.apache.tsik.wst.test;
-import org.apache.tsik.domutil.DOMCursor;
-import org.apache.tsik.domutil.DOMWriteCursor;
-import org.apache.tsik.resource.ResourceFactory;
-import org.apache.tsik.resource.XMLResource;
-
import java.io.FileInputStream;
import java.io.IOException;
-
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-
import org.apache.tsik.common.Logger;
import org.apache.tsik.common.LoggerFactory;
-import org.apache.tsik.messaging.SoapMessage;
import org.apache.tsik.common.WsHandler;
+import org.apache.tsik.domutil.DOMCursor;
+import org.apache.tsik.domutil.DOMWriteCursor;
+import org.apache.tsik.plugins.SoapEngine;
+import org.apache.tsik.plugins.SoapFactory;
+import org.apache.tsik.plugins.SoapMessage;
+import org.apache.tsik.resource.ResourceFactory;
+import org.apache.tsik.resource.XMLResource;
import org.apache.tsik.wsa.elements.Address;
import org.apache.tsik.wsa.types.EndpointReferenceType;
import org.apache.tsik.wst.Wst;
@@ -44,7 +45,6 @@
import org.apache.tsik.wst.elements.RequestType;
import org.apache.tsik.wst.elements.RequestedSecurityToken;
import org.apache.tsik.wst.elements.Status;
-
import org.w3c.dom.Document;
public class WstTest extends TestCase
@@ -98,7 +98,8 @@
DOMWriteCursor wc = new DOMWriteCursor();
rst.toXml(wc);
- return new SoapMessage(wc.getDocument());
+ SoapEngine e = SoapFactory.getDefaultEngine();
+ return e.getSoapMessageInstance(wc.getDocument());
}
private SoapMessage handleRequest(SoapMessage soap) throws Exception
@@ -108,7 +109,8 @@
soap.process();
FileInputStream fis = new FileInputStream("wst/eptoip2-response.xml");
- soap = new SoapMessage(xmlres.parseXML(fis, false));
+ SoapEngine e = SoapFactory.getDefaultEngine();
+ soap = e.getSoapMessageInstance(xmlres.parseXML(fis, false));
return soap;
}
Modified: incubator/tsik/trunk/test/src/org/apache/tsik/wsx/test/WsxTest.java
URL: http://svn.apache.org/viewcvs/incubator/tsik/trunk/test/src/org/apache/tsik/wsx/test/WsxTest.java?rev=279902&r1=279901&r2=279902&view=diff
==============================================================================
--- incubator/tsik/trunk/test/src/org/apache/tsik/wsx/test/WsxTest.java (original)
+++ incubator/tsik/trunk/test/src/org/apache/tsik/wsx/test/WsxTest.java Fri Sep 9 15:49:44 2005
@@ -31,7 +31,9 @@
import org.apache.tsik.common.LoggerFactory;
import org.apache.tsik.domutil.DOMCursor;
import org.apache.tsik.domutil.DOMWriteCursor;
-import org.apache.tsik.messaging.SoapMessage;
+import org.apache.tsik.plugins.SoapMessage;
+import org.apache.tsik.plugins.SoapEngine;
+import org.apache.tsik.plugins.SoapFactory;
import org.apache.tsik.testutils.TestUtils;
import org.apache.tsik.wsp.DependencyGraph;
import org.apache.tsik.wsp.Violation;
@@ -77,7 +79,8 @@
// write/read
File tmp = TestUtils.createTempFile();
String path = tmp.getCanonicalPath();
- TestUtils.writeSoap(new SoapMessage(graph.getOutput()), path);
+ SoapEngine e = SoapFactory.getDefaultEngine();
+ TestUtils.writeSoap(e.getSoapMessageInstance(graph.getOutput()), path);
soap = TestUtils.readSoap(path);
//new DOMCursor(soap.getDocument()).publish(System.out, true);
Modified: incubator/tsik/trunk/xdocs/overview.html
URL: http://svn.apache.org/viewcvs/incubator/tsik/trunk/xdocs/overview.html?rev=279902&r1=279901&r2=279902&view=diff
==============================================================================
--- incubator/tsik/trunk/xdocs/overview.html (original)
+++ incubator/tsik/trunk/xdocs/overview.html Fri Sep 9 15:49:44 2005
@@ -5,11 +5,19 @@
<p>Apache TSIK is a client and server toolkit for creating secure XML
applications.</p>
-<h2>Overview</h2>
+<h2>Source layout</h2>
-<p>TSIK contains API functionality for sending and receiving secure XML
-messages. The following functionality is implemented to various degrees. More
-information can be found in each package.
+<p>TSIK source is divided into three main categories.
+<ol>
+<li>Core functionality</li>
+<li>Plug-ins</li>
+<li>Add-ons</li>
+</ol>
+
+<h3>Core functionality</h3>
+<p>This is the main TSIK body of source. The core functionality includes
+APIs for sending and receiving secure XML messages. The following
+functionality is implemented. More information can be found in each package.
<ul>
<li>XML encryption <code>{@link org.apache.tsik.xmlenc}</code></li>
<li>XML signature <code>{@link org.apache.tsik.xmlsig}</code></li>
@@ -18,8 +26,9 @@
<li>WS-Security <code>{@link org.apache.tsik.wss}</code></li>
<li>WS-MetadataExchange <code>{@link org.apache.tsik.wsx}</code></li>
</ul>
+</p>
-<p>Utilities used throughout the code include
+<p>The core also includes utilities used throughout the code, for example
<ul>
<li>Loggers, schema mappers <code>{@link org.apache.tsik.common}</code></li>
<li>Datatypes <code>{@link org.apache.tsik.datatypes}</code></li>
@@ -30,6 +39,20 @@
<li>PKI utilities <code>{@link org.apache.tsik.crl}</code>,
<code>{@link org.apache.tsik.verifier}</code></li>
</ul>
+</p>
+
+<h3>Plug-ins (<code>org.apache.tsik.plugin.*</code>)</h3>
+<p>The plug-ins include implementations that conform to the base interfaces
+of the core functionalities. Currently, the SOAP engine is abstracted into
+a TSIK plug-in. An Apache Axis based SOAP plugin is planned.</p>
+
+<p>In the future, other parts of TSIK may be converted into plug-ins.</p>
+
+<h3>Add-ons (<code>org.apache.tsik.addon.*</code>)</h3>
+<p>The TSIK add-ons represent optional TSIK functionality. The {@link
+org.apache.tsik.addon.messaging} plug-ins implements a hierarchy for XML based
+messaging.</p>
+
<h2>Prerequisites</h2>
---------------------------------------------------------------------
To unsubscribe, e-mail: tsik-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: tsik-dev-help@ws.apache.org