You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2012/08/16 11:31:33 UTC
svn commit: r1373765 - in /webservices/wss4j/trunk: bindings/
bindings/ws-secureconversation-binding/
bindings/ws-secureconversation-binding/src/main/java/org/swssf/binding/wssc/
bindings/ws-secureconversation-binding/src/main/resources/ bindings/ws-se...
Author: coheigea
Date: Thu Aug 16 09:31:31 2012
New Revision: 1373765
URL: http://svn.apache.org/viewvc?rev=1373765&view=rev
Log:
Updating package name for bindings
Added:
webservices/wss4j/trunk/bindings/wssc-binding/
webservices/wss4j/trunk/bindings/wssc-binding/pom.xml
- copied, changed from r1373757, webservices/wss4j/trunk/bindings/ws-secureconversation-binding/pom.xml
webservices/wss4j/trunk/bindings/wssc-binding/src/
webservices/wss4j/trunk/bindings/wssc-binding/src/main/
webservices/wss4j/trunk/bindings/wssc-binding/src/main/java/
webservices/wss4j/trunk/bindings/wssc-binding/src/main/java/org/
webservices/wss4j/trunk/bindings/wssc-binding/src/main/java/org/apache/
webservices/wss4j/trunk/bindings/wssc-binding/src/main/java/org/apache/ws/
webservices/wss4j/trunk/bindings/wssc-binding/src/main/java/org/apache/ws/security/
webservices/wss4j/trunk/bindings/wssc-binding/src/main/java/org/apache/ws/security/binding/
webservices/wss4j/trunk/bindings/wssc-binding/src/main/java/org/apache/ws/security/binding/wssc/
webservices/wss4j/trunk/bindings/wssc-binding/src/main/java/org/apache/ws/security/binding/wssc/AbstractDerivedKeyTokenType.java
- copied, changed from r1373757, webservices/wss4j/trunk/bindings/ws-secureconversation-binding/src/main/java/org/swssf/binding/wssc/AbstractDerivedKeyTokenType.java
webservices/wss4j/trunk/bindings/wssc-binding/src/main/java/org/apache/ws/security/binding/wssc/AbstractPropertiesType.java
- copied, changed from r1373757, webservices/wss4j/trunk/bindings/ws-secureconversation-binding/src/main/java/org/swssf/binding/wssc/AbstractPropertiesType.java
webservices/wss4j/trunk/bindings/wssc-binding/src/main/java/org/apache/ws/security/binding/wssc/AbstractSecurityContextTokenType.java
- copied, changed from r1373757, webservices/wss4j/trunk/bindings/ws-secureconversation-binding/src/main/java/org/swssf/binding/wssc/AbstractSecurityContextTokenType.java
webservices/wss4j/trunk/bindings/wssc-binding/src/main/resources/
webservices/wss4j/trunk/bindings/wssc-binding/src/main/resources/schemas/
webservices/wss4j/trunk/bindings/wssc-binding/src/main/resources/schemas/XMLSchema.dtd
- copied, changed from r1373757, webservices/wss4j/trunk/bindings/ws-secureconversation-binding/src/main/resources/schemas/XMLSchema.dtd
webservices/wss4j/trunk/bindings/wssc-binding/src/main/resources/schemas/datatypes.dtd
- copied, changed from r1373757, webservices/wss4j/trunk/bindings/ws-secureconversation-binding/src/main/resources/schemas/datatypes.dtd
webservices/wss4j/trunk/bindings/wssc-binding/src/main/resources/schemas/ws-secureconversation-1.3.xsd
- copied, changed from r1373757, webservices/wss4j/trunk/bindings/ws-secureconversation-binding/src/main/resources/schemas/ws-secureconversation-1.3.xsd
webservices/wss4j/trunk/bindings/wssc-binding/src/main/resources/schemas/ws-secureconversation-200502.xsd
- copied, changed from r1373757, webservices/wss4j/trunk/bindings/ws-secureconversation-binding/src/main/resources/schemas/ws-secureconversation-200502.xsd
webservices/wss4j/trunk/bindings/wssc-binding/src/main/resources/schemas/xml.xsd
- copied, changed from r1373757, webservices/wss4j/trunk/bindings/ws-secureconversation-binding/src/main/resources/schemas/xml.xsd
webservices/wss4j/trunk/bindings/wssc-binding/src/main/resources/wssc.cat
- copied, changed from r1373757, webservices/wss4j/trunk/bindings/ws-secureconversation-binding/src/main/resources/wssc.cat
webservices/wss4j/trunk/bindings/wssc-binding/src/main/resources/wssc.xjb
- copied, changed from r1373757, webservices/wss4j/trunk/bindings/ws-secureconversation-binding/src/main/resources/wssc.xjb
Removed:
webservices/wss4j/trunk/bindings/ws-secureconversation-binding/pom.xml
webservices/wss4j/trunk/bindings/ws-secureconversation-binding/src/main/java/org/swssf/binding/wssc/AbstractDerivedKeyTokenType.java
webservices/wss4j/trunk/bindings/ws-secureconversation-binding/src/main/java/org/swssf/binding/wssc/AbstractPropertiesType.java
webservices/wss4j/trunk/bindings/ws-secureconversation-binding/src/main/java/org/swssf/binding/wssc/AbstractSecurityContextTokenType.java
webservices/wss4j/trunk/bindings/ws-secureconversation-binding/src/main/resources/schemas/XMLSchema.dtd
webservices/wss4j/trunk/bindings/ws-secureconversation-binding/src/main/resources/schemas/datatypes.dtd
webservices/wss4j/trunk/bindings/ws-secureconversation-binding/src/main/resources/schemas/ws-secureconversation-1.3.xsd
webservices/wss4j/trunk/bindings/ws-secureconversation-binding/src/main/resources/schemas/ws-secureconversation-200502.xsd
webservices/wss4j/trunk/bindings/ws-secureconversation-binding/src/main/resources/schemas/xml.xsd
webservices/wss4j/trunk/bindings/ws-secureconversation-binding/src/main/resources/wssc.cat
webservices/wss4j/trunk/bindings/ws-secureconversation-binding/src/main/resources/wssc.xjb
Modified:
webservices/wss4j/trunk/bindings/pom.xml
webservices/wss4j/trunk/bindings/wss10-binding/pom.xml
webservices/wss4j/trunk/bindings/wss10-binding/src/main/resources/wss10.xjb
webservices/wss4j/trunk/bindings/wss10-binding/src/main/resources/xmldsig.xjb
webservices/wss4j/trunk/bindings/wss11-binding/pom.xml
webservices/wss4j/trunk/bindings/wss11-binding/src/main/resources/wss11.xjb
webservices/wss4j/trunk/bindings/wsu10-binding/pom.xml
webservices/wss4j/trunk/bindings/wsu10-binding/src/main/resources/wsu10.xjb
webservices/wss4j/trunk/streaming-ws-security/pom.xml
webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/ext/WSSConstants.java
webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/BinarySecurityTokenInputHandler.java
webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/DecryptInputProcessor.java
webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/DerivedKeyTokenInputHandler.java
webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/SecurityContextTokenInputHandler.java
webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/SecurityTokenReferenceInputHandler.java
webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/SignatureConfirmationInputHandler.java
webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/SignatureConfirmationInputProcessor.java
webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/TimestampInputHandler.java
webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/UsernameTokenInputHandler.java
webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/WSSEncryptedKeyInputHandler.java
webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/WSSSignatureInputHandler.java
webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/WSSSignatureReferenceVerifyInputProcessor.java
webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/SecurityTokenFactoryImpl.java
Modified: webservices/wss4j/trunk/bindings/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/bindings/pom.xml?rev=1373765&r1=1373764&r2=1373765&view=diff
==============================================================================
--- webservices/wss4j/trunk/bindings/pom.xml (original)
+++ webservices/wss4j/trunk/bindings/pom.xml Thu Aug 16 09:31:31 2012
@@ -28,8 +28,8 @@
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.swssf</groupId>
- <artifactId>bindings</artifactId>
+ <groupId>org.apache.ws.security</groupId>
+ <artifactId>wss4j-bindings</artifactId>
<version>2.0-SNAPSHOT</version>
<name>Apache WSS4J Bindings</name>
<packaging>pom</packaging>
@@ -38,7 +38,7 @@
<module>wsu10-binding</module>
<module>wss10-binding</module>
<module>wss11-binding</module>
- <module>ws-secureconversation-binding</module>
+ <module>wssc-binding</module>
</modules>
</project>
Modified: webservices/wss4j/trunk/bindings/wss10-binding/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/bindings/wss10-binding/pom.xml?rev=1373765&r1=1373764&r2=1373765&view=diff
==============================================================================
--- webservices/wss4j/trunk/bindings/wss10-binding/pom.xml (original)
+++ webservices/wss4j/trunk/bindings/wss10-binding/pom.xml Thu Aug 16 09:31:31 2012
@@ -28,8 +28,8 @@
<version>2.0-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
- <groupId>org.swssf</groupId>
- <artifactId>wss10-binding</artifactId>
+ <groupId>org.apache.ws.security</groupId>
+ <artifactId>wss4j-bindings-wss10</artifactId>
<version>2.0-SNAPSHOT</version>
<name>Apache WSS4J WS-Security 1.0 Binding</name>
@@ -44,8 +44,8 @@
<version>${xmlsec.version}</version>
</dependency>
<dependency>
- <groupId>org.swssf</groupId>
- <artifactId>wsu10-binding</artifactId>
+ <groupId>org.apache.ws.security</groupId>
+ <artifactId>wss4j-bindings-wsu10</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
@@ -94,8 +94,8 @@
<strict>false</strict>
<episodes>
<episode>
- <groupId>org.swssf</groupId>
- <artifactId>wsu10-binding</artifactId>
+ <groupId>org.apache.ws.security</groupId>
+ <artifactId>wss4j-bindings-wsu10</artifactId>
</episode>
</episodes>
</configuration>
Modified: webservices/wss4j/trunk/bindings/wss10-binding/src/main/resources/wss10.xjb
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/bindings/wss10-binding/src/main/resources/wss10.xjb?rev=1373765&r1=1373764&r2=1373765&view=diff
==============================================================================
--- webservices/wss4j/trunk/bindings/wss10-binding/src/main/resources/wss10.xjb (original)
+++ webservices/wss4j/trunk/bindings/wss10-binding/src/main/resources/wss10.xjb Thu Aug 16 09:31:31 2012
@@ -4,7 +4,7 @@
version="2.1">
<bindings schemaLocation="schemas/oasis-200401-wss-wssecurity-secext-1.0.xsd" node="/xs:schema" version="1.0">
<schemaBindings>
- <package name="org.swssf.binding.wss10"/>
+ <package name="org.apache.ws.security.binding.wss10"/>
</schemaBindings>
</bindings>
</bindings>
Modified: webservices/wss4j/trunk/bindings/wss10-binding/src/main/resources/xmldsig.xjb
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/bindings/wss10-binding/src/main/resources/xmldsig.xjb?rev=1373765&r1=1373764&r2=1373765&view=diff
==============================================================================
--- webservices/wss4j/trunk/bindings/wss10-binding/src/main/resources/xmldsig.xjb (original)
+++ webservices/wss4j/trunk/bindings/wss10-binding/src/main/resources/xmldsig.xjb Thu Aug 16 09:31:31 2012
@@ -3,70 +3,70 @@
<bindings scd="x-schema::tns" xmlns:tns="http://www.w3.org/2000/09/xmldsig#">
<schemaBindings map="false"/>
<bindings scd="~tns:KeyInfoType">
- <class ref="org.swssf.binding.xmldsig.KeyInfoType"/>
+ <class ref="org.apache.xml.security.binding.xmldsig.KeyInfoType"/>
</bindings>
<bindings scd="~tns:SignedInfoType">
- <class ref="org.swssf.binding.xmldsig.SignedInfoType"/>
+ <class ref="org.apache.xml.security.binding.xmldsig.SignedInfoType"/>
</bindings>
<bindings scd="~tns:RetrievalMethodType">
- <class ref="org.swssf.binding.xmldsig.RetrievalMethodType"/>
+ <class ref="org.apache.xml.security.binding.xmldsig.RetrievalMethodType"/>
</bindings>
<bindings scd="~tns:DigestMethodType">
- <class ref="org.swssf.binding.xmldsig.DigestMethodType"/>
+ <class ref="org.apache.xml.security.binding.xmldsig.DigestMethodType"/>
</bindings>
<bindings scd="~tns:SignatureMethodType">
- <class ref="org.swssf.binding.xmldsig.SignatureMethodType"/>
+ <class ref="org.apache.xml.security.binding.xmldsig.SignatureMethodType"/>
</bindings>
<bindings scd="~tns:SPKIDataType">
- <class ref="org.swssf.binding.xmldsig.SPKIDataType"/>
+ <class ref="org.apache.xml.security.binding.xmldsig.SPKIDataType"/>
</bindings>
<bindings scd="~tns:X509DataType">
- <class ref="org.swssf.binding.xmldsig.X509DataType"/>
+ <class ref="org.apache.xml.security.binding.xmldsig.X509DataType"/>
</bindings>
<bindings scd="~tns:PGPDataType">
- <class ref="org.swssf.binding.xmldsig.PGPDataType"/>
+ <class ref="org.apache.xml.security.binding.xmldsig.PGPDataType"/>
</bindings>
<bindings scd="~tns:SignatureType">
- <class ref="org.swssf.binding.xmldsig.SignatureType"/>
+ <class ref="org.apache.xml.security.binding.xmldsig.SignatureType"/>
</bindings>
<bindings scd="~tns:DSAKeyValueType">
- <class ref="org.swssf.binding.xmldsig.DSAKeyValueType"/>
+ <class ref="org.apache.xml.security.binding.xmldsig.DSAKeyValueType"/>
</bindings>
<bindings scd="~tns:ManifestType">
- <class ref="org.swssf.binding.xmldsig.ManifestType"/>
+ <class ref="org.apache.xml.security.binding.xmldsig.ManifestType"/>
</bindings>
<bindings scd="~tns:SignatureValueType">
- <class ref="org.swssf.binding.xmldsig.SignatureValueType"/>
+ <class ref="org.apache.xml.security.binding.xmldsig.SignatureValueType"/>
</bindings>
<bindings scd="~tns:TransformsType">
- <class ref="org.swssf.binding.xmldsig.TransformsType"/>
+ <class ref="org.apache.xml.security.binding.xmldsig.TransformsType"/>
</bindings>
<bindings scd="~tns:RSAKeyValueType">
- <class ref="org.swssf.binding.xmldsig.RSAKeyValueType"/>
+ <class ref="org.apache.xml.security.binding.xmldsig.RSAKeyValueType"/>
</bindings>
<bindings scd="~tns:TransformType">
- <class ref="org.swssf.binding.xmldsig.TransformType"/>
+ <class ref="org.apache.xml.security.binding.xmldsig.TransformType"/>
</bindings>
<bindings scd="~tns:SignaturePropertyType">
- <class ref="org.swssf.binding.xmldsig.SignaturePropertyType"/>
+ <class ref="org.apache.xml.security.binding.xmldsig.SignaturePropertyType"/>
</bindings>
<bindings scd="~tns:KeyValueType">
- <class ref="org.swssf.binding.xmldsig.KeyValueType"/>
+ <class ref="org.apache.xml.security.binding.xmldsig.KeyValueType"/>
</bindings>
<bindings scd="~tns:ReferenceType">
- <class ref="org.swssf.binding.xmldsig.ReferenceType"/>
+ <class ref="org.apache.xml.security.binding.xmldsig.ReferenceType"/>
</bindings>
<bindings scd="~tns:CanonicalizationMethodType">
- <class ref="org.swssf.binding.xmldsig.CanonicalizationMethodType"/>
+ <class ref="org.apache.xml.security.binding.xmldsig.CanonicalizationMethodType"/>
</bindings>
<bindings scd="~tns:SignaturePropertiesType">
- <class ref="org.swssf.binding.xmldsig.SignaturePropertiesType"/>
+ <class ref="org.apache.xml.security.binding.xmldsig.SignaturePropertiesType"/>
</bindings>
<bindings scd="~tns:ObjectType">
- <class ref="org.swssf.binding.xmldsig.ObjectType"/>
+ <class ref="org.apache.xml.security.binding.xmldsig.ObjectType"/>
</bindings>
<bindings scd="~tns:X509IssuerSerialType">
- <class ref="org.swssf.binding.xmldsig.X509IssuerSerialType"/>
+ <class ref="org.apache.xml.security.binding.xmldsig.X509IssuerSerialType"/>
</bindings>
</bindings>
</bindings>
Modified: webservices/wss4j/trunk/bindings/wss11-binding/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/bindings/wss11-binding/pom.xml?rev=1373765&r1=1373764&r2=1373765&view=diff
==============================================================================
--- webservices/wss4j/trunk/bindings/wss11-binding/pom.xml (original)
+++ webservices/wss4j/trunk/bindings/wss11-binding/pom.xml Thu Aug 16 09:31:31 2012
@@ -28,8 +28,8 @@
<version>2.0-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
- <groupId>org.swssf</groupId>
- <artifactId>wss11-binding</artifactId>
+ <groupId>org.apache.ws.security</groupId>
+ <artifactId>wss4j-bindings-wss11</artifactId>
<version>2.0-SNAPSHOT</version>
<name>Apache WSS4J WS-Security 1.1 Binding</name>
@@ -44,8 +44,8 @@
<version>${xmlsec.version}</version>
</dependency>
<dependency>
- <groupId>org.swssf</groupId>
- <artifactId>wsu10-binding</artifactId>
+ <groupId>org.apache.ws.security</groupId>
+ <artifactId>wss4j-bindings-wsu10</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
@@ -95,8 +95,8 @@
<strict>false</strict>
<episodes>
<episode>
- <groupId>org.swssf</groupId>
- <artifactId>wsu10-binding</artifactId>
+ <groupId>org.apache.ws.security</groupId>
+ <artifactId>wss4j-bindings-wsu10</artifactId>
</episode>
</episodes>
</configuration>
Modified: webservices/wss4j/trunk/bindings/wss11-binding/src/main/resources/wss11.xjb
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/bindings/wss11-binding/src/main/resources/wss11.xjb?rev=1373765&r1=1373764&r2=1373765&view=diff
==============================================================================
--- webservices/wss4j/trunk/bindings/wss11-binding/src/main/resources/wss11.xjb (original)
+++ webservices/wss4j/trunk/bindings/wss11-binding/src/main/resources/wss11.xjb Thu Aug 16 09:31:31 2012
@@ -4,7 +4,7 @@
version="2.1">
<bindings schemaLocation="schemas/oasis-wss-wssecurity-secext-1.1.xsd" version="1.0">
<schemaBindings>
- <package name="org.swssf.binding.wss11"/>
+ <package name="org.apache.ws.security.binding.wss11"/>
</schemaBindings>
<bindings node="//xs:complexType[@name='EncryptedHeaderType']">
<bindings node="xs:attribute[@ref='soap11:mustUnderstand']">
Copied: webservices/wss4j/trunk/bindings/wssc-binding/pom.xml (from r1373757, webservices/wss4j/trunk/bindings/ws-secureconversation-binding/pom.xml)
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/bindings/wssc-binding/pom.xml?p2=webservices/wss4j/trunk/bindings/wssc-binding/pom.xml&p1=webservices/wss4j/trunk/bindings/ws-secureconversation-binding/pom.xml&r1=1373757&r2=1373765&rev=1373765&view=diff
==============================================================================
--- webservices/wss4j/trunk/bindings/ws-secureconversation-binding/pom.xml (original)
+++ webservices/wss4j/trunk/bindings/wssc-binding/pom.xml Thu Aug 16 09:31:31 2012
@@ -28,8 +28,8 @@
<version>2.0-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
- <groupId>org.swssf</groupId>
- <artifactId>ws-secureconversation-binding</artifactId>
+ <groupId>org.apache.ws.security</groupId>
+ <artifactId>wss4j-bindings-wssc</artifactId>
<version>2.0-SNAPSHOT</version>
<name>Apache WSS4J WS-SecureConversation binding</name>
@@ -44,13 +44,13 @@
<version>${xmlsec.version}</version>
</dependency>
<dependency>
- <groupId>org.swssf</groupId>
- <artifactId>wss10-binding</artifactId>
+ <groupId>org.apache.ws.security</groupId>
+ <artifactId>wss4j-bindings-wss10</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.swssf</groupId>
- <artifactId>wsu10-binding</artifactId>
+ <groupId>org.apache.ws.security</groupId>
+ <artifactId>wss4j-bindings-wsu10</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
@@ -100,12 +100,12 @@
</plugins>
<episodes>
<episode>
- <groupId>org.swssf</groupId>
- <artifactId>wsu10-binding</artifactId>
+ <groupId>org.apache.ws.security</groupId>
+ <artifactId>wss4j-bindings-wsu10</artifactId>
</episode>
<episode>
- <groupId>org.swssf</groupId>
- <artifactId>wss10-binding</artifactId>
+ <groupId>org.apache.ws.security</groupId>
+ <artifactId>wss4j-bindings-wss10</artifactId>
</episode>
</episodes>
</configuration>
Copied: webservices/wss4j/trunk/bindings/wssc-binding/src/main/java/org/apache/ws/security/binding/wssc/AbstractDerivedKeyTokenType.java (from r1373757, webservices/wss4j/trunk/bindings/ws-secureconversation-binding/src/main/java/org/swssf/binding/wssc/AbstractDerivedKeyTokenType.java)
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/bindings/wssc-binding/src/main/java/org/apache/ws/security/binding/wssc/AbstractDerivedKeyTokenType.java?p2=webservices/wss4j/trunk/bindings/wssc-binding/src/main/java/org/apache/ws/security/binding/wssc/AbstractDerivedKeyTokenType.java&p1=webservices/wss4j/trunk/bindings/ws-secureconversation-binding/src/main/java/org/swssf/binding/wssc/AbstractDerivedKeyTokenType.java&r1=1373757&r2=1373765&rev=1373765&view=diff
==============================================================================
--- webservices/wss4j/trunk/bindings/ws-secureconversation-binding/src/main/java/org/swssf/binding/wssc/AbstractDerivedKeyTokenType.java (original)
+++ webservices/wss4j/trunk/bindings/wssc-binding/src/main/java/org/apache/ws/security/binding/wssc/AbstractDerivedKeyTokenType.java Thu Aug 16 09:31:31 2012
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.binding.wssc;
+package org.apache.ws.security.binding.wssc;
-import org.swssf.binding.wss10.SecurityTokenReferenceType;
+import org.apache.ws.security.binding.wss10.SecurityTokenReferenceType;
import java.math.BigInteger;
Copied: webservices/wss4j/trunk/bindings/wssc-binding/src/main/java/org/apache/ws/security/binding/wssc/AbstractPropertiesType.java (from r1373757, webservices/wss4j/trunk/bindings/ws-secureconversation-binding/src/main/java/org/swssf/binding/wssc/AbstractPropertiesType.java)
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/bindings/wssc-binding/src/main/java/org/apache/ws/security/binding/wssc/AbstractPropertiesType.java?p2=webservices/wss4j/trunk/bindings/wssc-binding/src/main/java/org/apache/ws/security/binding/wssc/AbstractPropertiesType.java&p1=webservices/wss4j/trunk/bindings/ws-secureconversation-binding/src/main/java/org/swssf/binding/wssc/AbstractPropertiesType.java&r1=1373757&r2=1373765&rev=1373765&view=diff
==============================================================================
--- webservices/wss4j/trunk/bindings/ws-secureconversation-binding/src/main/java/org/swssf/binding/wssc/AbstractPropertiesType.java (original)
+++ webservices/wss4j/trunk/bindings/wssc-binding/src/main/java/org/apache/ws/security/binding/wssc/AbstractPropertiesType.java Thu Aug 16 09:31:31 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.binding.wssc;
+package org.apache.ws.security.binding.wssc;
import java.util.List;
Copied: webservices/wss4j/trunk/bindings/wssc-binding/src/main/java/org/apache/ws/security/binding/wssc/AbstractSecurityContextTokenType.java (from r1373757, webservices/wss4j/trunk/bindings/ws-secureconversation-binding/src/main/java/org/swssf/binding/wssc/AbstractSecurityContextTokenType.java)
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/bindings/wssc-binding/src/main/java/org/apache/ws/security/binding/wssc/AbstractSecurityContextTokenType.java?p2=webservices/wss4j/trunk/bindings/wssc-binding/src/main/java/org/apache/ws/security/binding/wssc/AbstractSecurityContextTokenType.java&p1=webservices/wss4j/trunk/bindings/ws-secureconversation-binding/src/main/java/org/swssf/binding/wssc/AbstractSecurityContextTokenType.java&r1=1373757&r2=1373765&rev=1373765&view=diff
==============================================================================
--- webservices/wss4j/trunk/bindings/ws-secureconversation-binding/src/main/java/org/swssf/binding/wssc/AbstractSecurityContextTokenType.java (original)
+++ webservices/wss4j/trunk/bindings/wssc-binding/src/main/java/org/apache/ws/security/binding/wssc/AbstractSecurityContextTokenType.java Thu Aug 16 09:31:31 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.binding.wssc;
+package org.apache.ws.security.binding.wssc;
import javax.xml.namespace.QName;
import java.util.List;
Copied: webservices/wss4j/trunk/bindings/wssc-binding/src/main/resources/schemas/XMLSchema.dtd (from r1373757, webservices/wss4j/trunk/bindings/ws-secureconversation-binding/src/main/resources/schemas/XMLSchema.dtd)
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/bindings/wssc-binding/src/main/resources/schemas/XMLSchema.dtd?p2=webservices/wss4j/trunk/bindings/wssc-binding/src/main/resources/schemas/XMLSchema.dtd&p1=webservices/wss4j/trunk/bindings/ws-secureconversation-binding/src/main/resources/schemas/XMLSchema.dtd&r1=1373757&r2=1373765&rev=1373765&view=diff
==============================================================================
(empty)
Copied: webservices/wss4j/trunk/bindings/wssc-binding/src/main/resources/schemas/datatypes.dtd (from r1373757, webservices/wss4j/trunk/bindings/ws-secureconversation-binding/src/main/resources/schemas/datatypes.dtd)
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/bindings/wssc-binding/src/main/resources/schemas/datatypes.dtd?p2=webservices/wss4j/trunk/bindings/wssc-binding/src/main/resources/schemas/datatypes.dtd&p1=webservices/wss4j/trunk/bindings/ws-secureconversation-binding/src/main/resources/schemas/datatypes.dtd&r1=1373757&r2=1373765&rev=1373765&view=diff
==============================================================================
(empty)
Copied: webservices/wss4j/trunk/bindings/wssc-binding/src/main/resources/schemas/ws-secureconversation-1.3.xsd (from r1373757, webservices/wss4j/trunk/bindings/ws-secureconversation-binding/src/main/resources/schemas/ws-secureconversation-1.3.xsd)
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/bindings/wssc-binding/src/main/resources/schemas/ws-secureconversation-1.3.xsd?p2=webservices/wss4j/trunk/bindings/wssc-binding/src/main/resources/schemas/ws-secureconversation-1.3.xsd&p1=webservices/wss4j/trunk/bindings/ws-secureconversation-binding/src/main/resources/schemas/ws-secureconversation-1.3.xsd&r1=1373757&r2=1373765&rev=1373765&view=diff
==============================================================================
(empty)
Copied: webservices/wss4j/trunk/bindings/wssc-binding/src/main/resources/schemas/ws-secureconversation-200502.xsd (from r1373757, webservices/wss4j/trunk/bindings/ws-secureconversation-binding/src/main/resources/schemas/ws-secureconversation-200502.xsd)
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/bindings/wssc-binding/src/main/resources/schemas/ws-secureconversation-200502.xsd?p2=webservices/wss4j/trunk/bindings/wssc-binding/src/main/resources/schemas/ws-secureconversation-200502.xsd&p1=webservices/wss4j/trunk/bindings/ws-secureconversation-binding/src/main/resources/schemas/ws-secureconversation-200502.xsd&r1=1373757&r2=1373765&rev=1373765&view=diff
==============================================================================
(empty)
Copied: webservices/wss4j/trunk/bindings/wssc-binding/src/main/resources/schemas/xml.xsd (from r1373757, webservices/wss4j/trunk/bindings/ws-secureconversation-binding/src/main/resources/schemas/xml.xsd)
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/bindings/wssc-binding/src/main/resources/schemas/xml.xsd?p2=webservices/wss4j/trunk/bindings/wssc-binding/src/main/resources/schemas/xml.xsd&p1=webservices/wss4j/trunk/bindings/ws-secureconversation-binding/src/main/resources/schemas/xml.xsd&r1=1373757&r2=1373765&rev=1373765&view=diff
==============================================================================
(empty)
Copied: webservices/wss4j/trunk/bindings/wssc-binding/src/main/resources/wssc.cat (from r1373757, webservices/wss4j/trunk/bindings/ws-secureconversation-binding/src/main/resources/wssc.cat)
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/bindings/wssc-binding/src/main/resources/wssc.cat?p2=webservices/wss4j/trunk/bindings/wssc-binding/src/main/resources/wssc.cat&p1=webservices/wss4j/trunk/bindings/ws-secureconversation-binding/src/main/resources/wssc.cat&r1=1373757&r2=1373765&rev=1373765&view=diff
==============================================================================
(empty)
Copied: webservices/wss4j/trunk/bindings/wssc-binding/src/main/resources/wssc.xjb (from r1373757, webservices/wss4j/trunk/bindings/ws-secureconversation-binding/src/main/resources/wssc.xjb)
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/bindings/wssc-binding/src/main/resources/wssc.xjb?p2=webservices/wss4j/trunk/bindings/wssc-binding/src/main/resources/wssc.xjb&p1=webservices/wss4j/trunk/bindings/ws-secureconversation-binding/src/main/resources/wssc.xjb&r1=1373757&r2=1373765&rev=1373765&view=diff
==============================================================================
--- webservices/wss4j/trunk/bindings/ws-secureconversation-binding/src/main/resources/wssc.xjb (original)
+++ webservices/wss4j/trunk/bindings/wssc-binding/src/main/resources/wssc.xjb Thu Aug 16 09:31:31 2012
@@ -8,30 +8,30 @@
version="2.1">
<bindings schemaLocation="schemas/ws-secureconversation-1.3.xsd" node="/xs:schema" version="1.0">
<schemaBindings>
- <package name="org.swssf.binding.wssc13"/>
+ <package name="org.apache.ws.security.binding.wssc13"/>
</schemaBindings>
<bindings node="//xs:complexType[@name='DerivedKeyTokenType']">
- <inheritance:extends>org.swssf.binding.wssc.AbstractDerivedKeyTokenType</inheritance:extends>
+ <inheritance:extends>org.apache.ws.security.binding.wssc.AbstractDerivedKeyTokenType</inheritance:extends>
</bindings>
<bindings node="//xs:complexType[@name='SecurityContextTokenType']">
- <inheritance:extends>org.swssf.binding.wssc.AbstractSecurityContextTokenType</inheritance:extends>
+ <inheritance:extends>org.apache.ws.security.binding.wssc.AbstractSecurityContextTokenType</inheritance:extends>
</bindings>
<bindings node="//xs:complexType[@name='PropertiesType']">
- <inheritance:extends>org.swssf.binding.wssc.AbstractPropertiesType</inheritance:extends>
+ <inheritance:extends>org.apache.ws.security.binding.wssc.AbstractPropertiesType</inheritance:extends>
</bindings>
</bindings>
<bindings schemaLocation="schemas/ws-secureconversation-200502.xsd" node="/xs:schema" version="1.0">
<schemaBindings>
- <package name="org.swssf.binding.wssc200502"/>
+ <package name="org.apache.ws.security.binding.wssc200502"/>
</schemaBindings>
<bindings node="//xs:complexType[@name='DerivedKeyTokenType']">
- <inheritance:extends>org.swssf.binding.wssc.AbstractDerivedKeyTokenType</inheritance:extends>
+ <inheritance:extends>org.apache.ws.security.binding.wssc.AbstractDerivedKeyTokenType</inheritance:extends>
</bindings>
<bindings node="//xs:complexType[@name='SecurityContextTokenType']">
- <inheritance:extends>org.swssf.binding.wssc.AbstractSecurityContextTokenType</inheritance:extends>
+ <inheritance:extends>org.apache.ws.security.binding.wssc.AbstractSecurityContextTokenType</inheritance:extends>
</bindings>
<bindings node="//xs:complexType[@name='PropertiesType']">
- <inheritance:extends>org.swssf.binding.wssc.AbstractPropertiesType</inheritance:extends>
+ <inheritance:extends>org.apache.ws.security.binding.wssc.AbstractPropertiesType</inheritance:extends>
</bindings>
</bindings>
</bindings>
Modified: webservices/wss4j/trunk/bindings/wsu10-binding/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/bindings/wsu10-binding/pom.xml?rev=1373765&r1=1373764&r2=1373765&view=diff
==============================================================================
--- webservices/wss4j/trunk/bindings/wsu10-binding/pom.xml (original)
+++ webservices/wss4j/trunk/bindings/wsu10-binding/pom.xml Thu Aug 16 09:31:31 2012
@@ -28,8 +28,8 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.swssf</groupId>
- <artifactId>wsu10-binding</artifactId>
+ <groupId>org.apache.ws.security</groupId>
+ <artifactId>wss4j-bindings-wsu10</artifactId>
<version>2.0-SNAPSHOT</version>
<name>Apache WSS4J WSU 1.0 Binding</name>
Modified: webservices/wss4j/trunk/bindings/wsu10-binding/src/main/resources/wsu10.xjb
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/bindings/wsu10-binding/src/main/resources/wsu10.xjb?rev=1373765&r1=1373764&r2=1373765&view=diff
==============================================================================
--- webservices/wss4j/trunk/bindings/wsu10-binding/src/main/resources/wsu10.xjb (original)
+++ webservices/wss4j/trunk/bindings/wsu10-binding/src/main/resources/wsu10.xjb Thu Aug 16 09:31:31 2012
@@ -4,7 +4,7 @@
version="2.1">
<bindings schemaLocation="schemas/oasis-200401-wss-wssecurity-utility-1.0.xsd" version="1.0">
<schemaBindings>
- <package name="org.swssf.binding.wsu10"/>
+ <package name="org.apache.ws.security.binding.wsu10"/>
</schemaBindings>
</bindings>
</bindings>
Modified: webservices/wss4j/trunk/streaming-ws-security/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/pom.xml?rev=1373765&r1=1373764&r2=1373765&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/pom.xml (original)
+++ webservices/wss4j/trunk/streaming-ws-security/pom.xml Thu Aug 16 09:31:31 2012
@@ -35,18 +35,18 @@
<dependencies>
<dependency>
- <groupId>org.swssf</groupId>
- <artifactId>wss10-binding</artifactId>
+ <groupId>org.apache.ws.security</groupId>
+ <artifactId>wss4j-bindings-wss10</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.swssf</groupId>
- <artifactId>wss11-binding</artifactId>
+ <groupId>org.apache.ws.security</groupId>
+ <artifactId>wss4j-bindings-wss11</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.swssf</groupId>
- <artifactId>ws-secureconversation-binding</artifactId>
+ <groupId>org.apache.ws.security</groupId>
+ <artifactId>wss4j-bindings-wssc</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Modified: webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/ext/WSSConstants.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/ext/WSSConstants.java?rev=1373765&r1=1373764&r2=1373765&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/ext/WSSConstants.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/ext/WSSConstants.java Thu Aug 16 09:31:31 2012
@@ -44,7 +44,7 @@ public class WSSConstants extends XMLSec
static {
try {
- setJaxbContext(JAXBContext.newInstance("org.swssf.binding.wss10:org.swssf.binding.wss11:org.swssf.binding.wsu10:org.swssf.binding.wssc13:org.swssf.binding.wssc200502:org.apache.xml.security.binding.xmlenc:org.apache.xml.security.binding.xmldsig:org.apache.xml.security.binding.xmldsig11:org.apache.xml.security.binding.excc14n"));
+ setJaxbContext(JAXBContext.newInstance("org.apache.ws.security.binding.wss10:org.apache.ws.security.binding.wss11:org.apache.ws.security.binding.wsu10:org.apache.ws.security.binding.wssc13:org.apache.ws.security.binding.wssc200502:org.apache.xml.security.binding.xmlenc:org.apache.xml.security.binding.xmldsig:org.apache.xml.security.binding.xmldsig11:org.apache.xml.security.binding.excc14n"));
SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
schemaFactory.setResourceResolver(new LSResourceResolver() {
@Override
Modified: webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/BinarySecurityTokenInputHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/BinarySecurityTokenInputHandler.java?rev=1373765&r1=1373764&r2=1373765&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/BinarySecurityTokenInputHandler.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/BinarySecurityTokenInputHandler.java Thu Aug 16 09:31:31 2012
@@ -18,7 +18,7 @@
*/
package org.swssf.wss.impl.processor.input;
-import org.swssf.binding.wss10.BinarySecurityTokenType;
+import org.apache.ws.security.binding.wss10.BinarySecurityTokenType;
import org.swssf.wss.ext.WSSConstants;
import org.swssf.wss.ext.WSSSecurityProperties;
import org.swssf.wss.ext.WSSecurityContext;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/DecryptInputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/DecryptInputProcessor.java?rev=1373765&r1=1373764&r2=1373765&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/DecryptInputProcessor.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/DecryptInputProcessor.java Thu Aug 16 09:31:31 2012
@@ -24,6 +24,7 @@ import java.util.List;
import javax.xml.bind.JAXBElement;
import javax.xml.namespace.QName;
+import org.apache.ws.security.binding.wss10.SecurityTokenReferenceType;
import org.apache.xml.security.binding.xmldsig.KeyInfoType;
import org.apache.xml.security.binding.xmlenc.EncryptedDataType;
import org.apache.xml.security.binding.xmlenc.ReferenceList;
@@ -41,7 +42,6 @@ import org.apache.xml.security.stax.impl
import org.apache.xml.security.stax.securityEvent.ContentEncryptedElementSecurityEvent;
import org.apache.xml.security.stax.securityEvent.EncryptedElementSecurityEvent;
import org.apache.xml.security.stax.securityEvent.TokenSecurityEvent;
-import org.swssf.binding.wss10.SecurityTokenReferenceType;
import org.swssf.wss.ext.WSSConstants;
import org.swssf.wss.ext.WSSSecurityProperties;
import org.swssf.wss.ext.WSSUtils;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/DerivedKeyTokenInputHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/DerivedKeyTokenInputHandler.java?rev=1373765&r1=1373764&r2=1373765&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/DerivedKeyTokenInputHandler.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/DerivedKeyTokenInputHandler.java Thu Aug 16 09:31:31 2012
@@ -18,7 +18,7 @@
*/
package org.swssf.wss.impl.processor.input;
-import org.swssf.binding.wssc.AbstractDerivedKeyTokenType;
+import org.apache.ws.security.binding.wssc.AbstractDerivedKeyTokenType;
import org.swssf.wss.ext.WSSConstants;
import org.swssf.wss.ext.WSSSecurityProperties;
import org.swssf.wss.ext.WSSecurityContext;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/SecurityContextTokenInputHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/SecurityContextTokenInputHandler.java?rev=1373765&r1=1373764&r2=1373765&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/SecurityContextTokenInputHandler.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/SecurityContextTokenInputHandler.java Thu Aug 16 09:31:31 2012
@@ -18,7 +18,7 @@
*/
package org.swssf.wss.impl.processor.input;
-import org.swssf.binding.wssc.AbstractSecurityContextTokenType;
+import org.apache.ws.security.binding.wssc.AbstractSecurityContextTokenType;
import org.swssf.wss.ext.*;
import org.swssf.wss.securityEvent.SecurityContextTokenSecurityEvent;
import org.apache.xml.security.stax.config.JCEAlgorithmMapper;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/SecurityTokenReferenceInputHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/SecurityTokenReferenceInputHandler.java?rev=1373765&r1=1373764&r2=1373765&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/SecurityTokenReferenceInputHandler.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/SecurityTokenReferenceInputHandler.java Thu Aug 16 09:31:31 2012
@@ -18,8 +18,8 @@
*/
package org.swssf.wss.impl.processor.input;
-import org.swssf.binding.wss10.KeyIdentifierType;
-import org.swssf.binding.wss10.SecurityTokenReferenceType;
+import org.apache.ws.security.binding.wss10.KeyIdentifierType;
+import org.apache.ws.security.binding.wss10.SecurityTokenReferenceType;
import org.swssf.wss.ext.WSSConstants;
import org.swssf.wss.ext.WSSSecurityProperties;
import org.swssf.wss.ext.WSSUtils;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/SignatureConfirmationInputHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/SignatureConfirmationInputHandler.java?rev=1373765&r1=1373764&r2=1373765&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/SignatureConfirmationInputHandler.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/SignatureConfirmationInputHandler.java Thu Aug 16 09:31:31 2012
@@ -18,7 +18,7 @@
*/
package org.swssf.wss.impl.processor.input;
-import org.swssf.binding.wss11.SignatureConfirmationType;
+import org.apache.ws.security.binding.wss11.SignatureConfirmationType;
import org.swssf.wss.ext.WSSConstants;
import org.swssf.wss.ext.WSSecurityContext;
import org.swssf.wss.ext.WSSecurityException;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/SignatureConfirmationInputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/SignatureConfirmationInputProcessor.java?rev=1373765&r1=1373764&r2=1373765&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/SignatureConfirmationInputProcessor.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/SignatureConfirmationInputProcessor.java Thu Aug 16 09:31:31 2012
@@ -18,7 +18,7 @@
*/
package org.swssf.wss.impl.processor.input;
-import org.swssf.binding.wss11.SignatureConfirmationType;
+import org.apache.ws.security.binding.wss11.SignatureConfirmationType;
import org.swssf.wss.ext.WSSConstants;
import org.swssf.wss.ext.WSSSecurityProperties;
import org.swssf.wss.ext.WSSecurityException;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/TimestampInputHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/TimestampInputHandler.java?rev=1373765&r1=1373764&r2=1373765&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/TimestampInputHandler.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/TimestampInputHandler.java Thu Aug 16 09:31:31 2012
@@ -18,7 +18,7 @@
*/
package org.swssf.wss.impl.processor.input;
-import org.swssf.binding.wsu10.TimestampType;
+import org.apache.ws.security.binding.wsu10.TimestampType;
import org.swssf.wss.ext.WSSConstants;
import org.swssf.wss.ext.WSSSecurityProperties;
import org.swssf.wss.ext.WSSecurityContext;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/UsernameTokenInputHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/UsernameTokenInputHandler.java?rev=1373765&r1=1373764&r2=1373765&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/UsernameTokenInputHandler.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/UsernameTokenInputHandler.java Thu Aug 16 09:31:31 2012
@@ -22,11 +22,11 @@ import org.apache.commons.codec.binary.B
import org.apache.jcs.JCS;
import org.apache.jcs.access.exception.CacheException;
import org.apache.jcs.engine.ElementAttributes;
-import org.swssf.binding.wss10.AttributedString;
-import org.swssf.binding.wss10.EncodedString;
-import org.swssf.binding.wss10.PasswordString;
-import org.swssf.binding.wss10.UsernameTokenType;
-import org.swssf.binding.wsu10.AttributedDateTime;
+import org.apache.ws.security.binding.wss10.AttributedString;
+import org.apache.ws.security.binding.wss10.EncodedString;
+import org.apache.ws.security.binding.wss10.PasswordString;
+import org.apache.ws.security.binding.wss10.UsernameTokenType;
+import org.apache.ws.security.binding.wsu10.AttributedDateTime;
import org.swssf.wss.ext.*;
import org.swssf.wss.impl.securityToken.SecurityTokenFactoryImpl;
import org.swssf.wss.securityEvent.UsernameTokenSecurityEvent;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/WSSEncryptedKeyInputHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/WSSEncryptedKeyInputHandler.java?rev=1373765&r1=1373764&r2=1373765&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/WSSEncryptedKeyInputHandler.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/WSSEncryptedKeyInputHandler.java Thu Aug 16 09:31:31 2012
@@ -18,15 +18,15 @@
*/
package org.swssf.wss.impl.processor.input;
+import org.apache.ws.security.binding.wss10.ObjectFactory;
+import org.apache.ws.security.binding.wss10.ReferenceType;
+import org.apache.ws.security.binding.wss10.SecurityTokenReferenceType;
import org.apache.xml.security.binding.xmldsig.KeyInfoType;
import org.apache.xml.security.binding.xmlenc.EncryptedKeyType;
import org.apache.xml.security.stax.ext.InputProcessorChain;
import org.apache.xml.security.stax.ext.XMLSecurityException;
import org.apache.xml.security.stax.ext.XMLSecurityProperties;
import org.apache.xml.security.stax.impl.processor.input.XMLEncryptedKeyInputHandler;
-import org.swssf.binding.wss10.ObjectFactory;
-import org.swssf.binding.wss10.ReferenceType;
-import org.swssf.binding.wss10.SecurityTokenReferenceType;
import org.swssf.wss.ext.WSSConstants;
import org.swssf.wss.ext.WSSSecurityProperties;
import org.swssf.wss.ext.WSSecurityContext;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/WSSSignatureInputHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/WSSSignatureInputHandler.java?rev=1373765&r1=1373764&r2=1373765&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/WSSSignatureInputHandler.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/WSSSignatureInputHandler.java Thu Aug 16 09:31:31 2012
@@ -18,8 +18,8 @@
*/
package org.swssf.wss.impl.processor.input;
+import org.apache.ws.security.binding.wss10.SecurityTokenReferenceType;
import org.apache.xml.security.binding.excc14n.InclusiveNamespaces;
-import org.swssf.binding.wss10.SecurityTokenReferenceType;
import org.apache.xml.security.binding.xmldsig.CanonicalizationMethodType;
import org.apache.xml.security.binding.xmldsig.KeyInfoType;
import org.apache.xml.security.binding.xmldsig.ManifestType;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/WSSSignatureReferenceVerifyInputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/WSSSignatureReferenceVerifyInputProcessor.java?rev=1373765&r1=1373764&r2=1373765&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/WSSSignatureReferenceVerifyInputProcessor.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/processor/input/WSSSignatureReferenceVerifyInputProcessor.java Thu Aug 16 09:31:31 2012
@@ -21,6 +21,7 @@ package org.swssf.wss.impl.processor.inp
import org.apache.jcs.JCS;
import org.apache.jcs.access.exception.CacheException;
import org.apache.jcs.engine.ElementAttributes;
+import org.apache.ws.security.binding.wss10.TransformationParametersType;
import org.apache.xml.security.binding.excc14n.InclusiveNamespaces;
import org.apache.xml.security.binding.xmldsig.CanonicalizationMethodType;
import org.apache.xml.security.binding.xmldsig.ReferenceType;
@@ -31,7 +32,6 @@ import org.apache.xml.security.stax.ext.
import org.apache.xml.security.stax.impl.processor.input.AbstractSignatureReferenceVerifyInputProcessor;
import org.apache.xml.security.stax.securityEvent.AlgorithmSuiteSecurityEvent;
import org.apache.xml.security.stax.securityEvent.SignedElementSecurityEvent;
-import org.swssf.binding.wss10.TransformationParametersType;
import org.swssf.wss.ext.*;
import org.swssf.wss.impl.securityToken.SecurityTokenReference;
import org.swssf.wss.securityEvent.SignedPartSecurityEvent;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/SecurityTokenFactoryImpl.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/SecurityTokenFactoryImpl.java?rev=1373765&r1=1373764&r2=1373765&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/SecurityTokenFactoryImpl.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/main/java/org/swssf/wss/impl/securityToken/SecurityTokenFactoryImpl.java Thu Aug 16 09:31:31 2012
@@ -19,9 +19,9 @@
package org.swssf.wss.impl.securityToken;
import org.apache.commons.codec.binary.Base64;
-import org.swssf.binding.wss10.BinarySecurityTokenType;
-import org.swssf.binding.wss10.KeyIdentifierType;
-import org.swssf.binding.wss10.SecurityTokenReferenceType;
+import org.apache.ws.security.binding.wss10.BinarySecurityTokenType;
+import org.apache.ws.security.binding.wss10.KeyIdentifierType;
+import org.apache.ws.security.binding.wss10.SecurityTokenReferenceType;
import org.apache.xml.security.binding.xmldsig.*;
import org.apache.xml.security.binding.xmldsig11.ECKeyValueType;
import org.swssf.wss.ext.*;
@@ -148,7 +148,7 @@ public class SecurityTokenFactoryImpl ex
}
}
- final org.swssf.binding.wss10.ReferenceType referenceType
+ final org.apache.ws.security.binding.wss10.ReferenceType referenceType
= XMLSecurityUtils.getQNameType(securityTokenReferenceType.getAny(), WSSConstants.TAG_wsse_Reference);
if (referenceType != null) {
//We do not check for BSP.R3023, BSP.R3022, BSP.R3066, BSP.R3067, BSP.R3024, BSP.R3064, BSP.R3211, BSP.R3058, BSP.R3059