Author: coheigea
Date: Wed Mar 6 17:04:55 2013
New Revision: 1453432
URL: http://svn.apache.org/r1453432
Log:
First attempt at porting model work
Modified:
cxf/branches/wss4j2.0-port/rt/ws/security/pom.xml
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java
Modified: cxf/branches/wss4j2.0-port/rt/ws/security/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/ws/security/pom.xml?rev=1453432&r1=1453431&r2=1453432&view=diff
==============================================================================
--- cxf/branches/wss4j2.0-port/rt/ws/security/pom.xml (original)
+++ cxf/branches/wss4j2.0-port/rt/ws/security/pom.xml Wed Mar 6 17:04:55 2013
@@ -102,6 +102,11 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.apache.wss4j</groupId>
+ <artifactId>wss4j-policy</artifactId>
+ <version>${cxf.wss4j.version}</version>
+ </dependency>
+ <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
Modified:
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java
URL:
http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java?rev=1453432&r1=1453431&r2=1453432&view=diff
==============================================================================
---
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java
(original)
+++
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java
Wed Mar 6 17:04:55 2013
@@ -28,46 +28,9 @@ import org.apache.cxf.Bus;
import org.apache.cxf.common.injection.NoJSR250Annotations;
import org.apache.cxf.ws.policy.AssertionBuilderLoader;
import org.apache.cxf.ws.policy.AssertionBuilderRegistry;
-import org.apache.cxf.ws.policy.PolicyBuilder;
import org.apache.cxf.ws.policy.PolicyInterceptorProviderLoader;
import org.apache.cxf.ws.policy.PolicyInterceptorProviderRegistry;
import org.apache.cxf.ws.policy.builder.primitive.PrimitiveAssertionBuilder;
-import org.apache.cxf.ws.security.policy.builders.AlgorithmSuiteBuilder;
-import org.apache.cxf.ws.security.policy.builders.AsymmetricBindingBuilder;
-import
org.apache.cxf.ws.security.policy.builders.ContentEncryptedElementsBuilder;
-import org.apache.cxf.ws.security.policy.builders.EncryptedElementsBuilder;
-import org.apache.cxf.ws.security.policy.builders.EncryptedPartsBuilder;
-import org.apache.cxf.ws.security.policy.builders.HttpsTokenBuilder;
-import
org.apache.cxf.ws.security.policy.builders.InitiatorEncryptionTokenBuilder;
-import
org.apache.cxf.ws.security.policy.builders.InitiatorSignatureTokenBuilder;
-import org.apache.cxf.ws.security.policy.builders.InitiatorTokenBuilder;
-import org.apache.cxf.ws.security.policy.builders.IssuedTokenBuilder;
-import org.apache.cxf.ws.security.policy.builders.KerberosTokenBuilder;
-import org.apache.cxf.ws.security.policy.builders.KeyValueTokenBuilder;
-import org.apache.cxf.ws.security.policy.builders.LayoutBuilder;
-import org.apache.cxf.ws.security.policy.builders.ProtectionTokenBuilder;
-import
org.apache.cxf.ws.security.policy.builders.RecipientEncryptionTokenBuilder;
-import
org.apache.cxf.ws.security.policy.builders.RecipientSignatureTokenBuilder;
-import org.apache.cxf.ws.security.policy.builders.RecipientTokenBuilder;
-import org.apache.cxf.ws.security.policy.builders.RequiredElementsBuilder;
-import org.apache.cxf.ws.security.policy.builders.RequiredPartsBuilder;
-import org.apache.cxf.ws.security.policy.builders.SamlTokenBuilder;
-import
org.apache.cxf.ws.security.policy.builders.SecureConversationTokenBuilder;
-import org.apache.cxf.ws.security.policy.builders.SecurityContextTokenBuilder;
-import org.apache.cxf.ws.security.policy.builders.SignedElementsBuilder;
-import org.apache.cxf.ws.security.policy.builders.SignedPartsBuilder;
-import org.apache.cxf.ws.security.policy.builders.SpnegoContextTokenBuilder;
-import org.apache.cxf.ws.security.policy.builders.SupportingTokens12Builder;
-import org.apache.cxf.ws.security.policy.builders.SupportingTokensBuilder;
-import org.apache.cxf.ws.security.policy.builders.SymmetricBindingBuilder;
-import org.apache.cxf.ws.security.policy.builders.TransportBindingBuilder;
-import org.apache.cxf.ws.security.policy.builders.TransportTokenBuilder;
-import org.apache.cxf.ws.security.policy.builders.Trust10Builder;
-import org.apache.cxf.ws.security.policy.builders.Trust13Builder;
-import org.apache.cxf.ws.security.policy.builders.UsernameTokenBuilder;
-import org.apache.cxf.ws.security.policy.builders.WSS10Builder;
-import org.apache.cxf.ws.security.policy.builders.WSS11Builder;
-import org.apache.cxf.ws.security.policy.builders.X509TokenBuilder;
import
org.apache.cxf.ws.security.policy.interceptors.HttpsTokenInterceptorProvider;
import
org.apache.cxf.ws.security.policy.interceptors.IssuedTokenInterceptorProvider;
import
org.apache.cxf.ws.security.policy.interceptors.KerberosTokenInterceptorProvider;
@@ -77,6 +40,41 @@ import org.apache.cxf.ws.security.policy
import
org.apache.cxf.ws.security.policy.interceptors.UsernameTokenInterceptorProvider;
import
org.apache.cxf.ws.security.policy.interceptors.WSSecurityInterceptorProvider;
import
org.apache.cxf.ws.security.policy.interceptors.WSSecurityPolicyInterceptorProvider;
+import org.apache.wss4j.policy.builders.AlgorithmSuiteBuilder;
+import org.apache.wss4j.policy.builders.AsymmetricBindingBuilder;
+import org.apache.wss4j.policy.builders.ContentEncryptedElementsBuilder;
+import org.apache.wss4j.policy.builders.EncryptedElementsBuilder;
+import org.apache.wss4j.policy.builders.EncryptedPartsBuilder;
+import org.apache.wss4j.policy.builders.HttpsTokenBuilder;
+import org.apache.wss4j.policy.builders.InitiatorEncryptionTokenBuilder;
+import org.apache.wss4j.policy.builders.InitiatorSignatureTokenBuilder;
+import org.apache.wss4j.policy.builders.InitiatorTokenBuilder;
+import org.apache.wss4j.policy.builders.IssuedTokenBuilder;
+import org.apache.wss4j.policy.builders.KerberosTokenBuilder;
+import org.apache.wss4j.policy.builders.KeyValueTokenBuilder;
+import org.apache.wss4j.policy.builders.LayoutBuilder;
+import org.apache.wss4j.policy.builders.ProtectionTokenBuilder;
+import org.apache.wss4j.policy.builders.RecipientEncryptionTokenBuilder;
+import org.apache.wss4j.policy.builders.RecipientSignatureTokenBuilder;
+import org.apache.wss4j.policy.builders.RecipientTokenBuilder;
+import org.apache.wss4j.policy.builders.RequiredElementsBuilder;
+import org.apache.wss4j.policy.builders.RequiredPartsBuilder;
+import org.apache.wss4j.policy.builders.SamlTokenBuilder;
+import org.apache.wss4j.policy.builders.SecureConversationTokenBuilder;
+import org.apache.wss4j.policy.builders.SecurityContextTokenBuilder;
+import org.apache.wss4j.policy.builders.SignedElementsBuilder;
+import org.apache.wss4j.policy.builders.SignedPartsBuilder;
+import org.apache.wss4j.policy.builders.SpnegoContextTokenBuilder;
+import org.apache.wss4j.policy.builders.SupportingTokensBuilder;
+import org.apache.wss4j.policy.builders.SymmetricBindingBuilder;
+import org.apache.wss4j.policy.builders.TransportBindingBuilder;
+import org.apache.wss4j.policy.builders.TransportTokenBuilder;
+import org.apache.wss4j.policy.builders.Trust10Builder;
+import org.apache.wss4j.policy.builders.Trust13Builder;
+import org.apache.wss4j.policy.builders.UsernameTokenBuilder;
+import org.apache.wss4j.policy.builders.WSS10Builder;
+import org.apache.wss4j.policy.builders.WSS11Builder;
+import org.apache.wss4j.policy.builders.X509TokenBuilder;
@NoJSR250Annotations
public final class WSSecurityPolicyLoader implements
PolicyInterceptorProviderLoader, AssertionBuilderLoader {
@@ -100,43 +98,41 @@ public final class WSSecurityPolicyLoade
if (reg == null) {
return;
}
- PolicyBuilder pbuild = bus.getExtension(PolicyBuilder.class);
- reg.registerBuilder(new AlgorithmSuiteBuilder(bus));
- reg.registerBuilder(new AsymmetricBindingBuilder(pbuild));
+ reg.registerBuilder(new AlgorithmSuiteBuilder());
+ reg.registerBuilder(new AsymmetricBindingBuilder());
reg.registerBuilder(new ContentEncryptedElementsBuilder());
reg.registerBuilder(new EncryptedElementsBuilder());
reg.registerBuilder(new EncryptedPartsBuilder());
- reg.registerBuilder(new HttpsTokenBuilder(pbuild));
- reg.registerBuilder(new InitiatorTokenBuilder(pbuild));
- reg.registerBuilder(new InitiatorSignatureTokenBuilder(pbuild));
- reg.registerBuilder(new InitiatorEncryptionTokenBuilder(pbuild));
- reg.registerBuilder(new IssuedTokenBuilder(pbuild));
+ reg.registerBuilder(new HttpsTokenBuilder());
+ reg.registerBuilder(new InitiatorTokenBuilder());
+ reg.registerBuilder(new InitiatorSignatureTokenBuilder());
+ reg.registerBuilder(new InitiatorEncryptionTokenBuilder());
+ reg.registerBuilder(new IssuedTokenBuilder());
reg.registerBuilder(new LayoutBuilder());
- reg.registerBuilder(new ProtectionTokenBuilder(pbuild));
- reg.registerBuilder(new RecipientTokenBuilder(pbuild));
- reg.registerBuilder(new RecipientSignatureTokenBuilder(pbuild));
- reg.registerBuilder(new RecipientEncryptionTokenBuilder(pbuild));
+ reg.registerBuilder(new ProtectionTokenBuilder());
+ reg.registerBuilder(new RecipientTokenBuilder());
+ reg.registerBuilder(new RecipientSignatureTokenBuilder());
+ reg.registerBuilder(new RecipientEncryptionTokenBuilder());
reg.registerBuilder(new RequiredElementsBuilder());
reg.registerBuilder(new RequiredPartsBuilder());
- reg.registerBuilder(new SamlTokenBuilder(pbuild));
- reg.registerBuilder(new KerberosTokenBuilder(pbuild));
- reg.registerBuilder(new SecureConversationTokenBuilder(pbuild));
+ reg.registerBuilder(new SamlTokenBuilder());
+ reg.registerBuilder(new KerberosTokenBuilder());
+ reg.registerBuilder(new SecureConversationTokenBuilder());
reg.registerBuilder(new SecurityContextTokenBuilder());
reg.registerBuilder(new SignedElementsBuilder());
reg.registerBuilder(new SignedPartsBuilder());
- reg.registerBuilder(new SpnegoContextTokenBuilder(pbuild));
- reg.registerBuilder(new SupportingTokens12Builder(pbuild));
- reg.registerBuilder(new SupportingTokensBuilder(pbuild));
- reg.registerBuilder(new SymmetricBindingBuilder(pbuild));
- reg.registerBuilder(new TransportBindingBuilder(pbuild, bus));
- reg.registerBuilder(new TransportTokenBuilder(pbuild));
+ reg.registerBuilder(new SpnegoContextTokenBuilder());
+ reg.registerBuilder(new SupportingTokensBuilder());
+ reg.registerBuilder(new SymmetricBindingBuilder());
+ reg.registerBuilder(new TransportBindingBuilder());
+ reg.registerBuilder(new TransportTokenBuilder());
reg.registerBuilder(new Trust10Builder());
reg.registerBuilder(new Trust13Builder());
- reg.registerBuilder(new UsernameTokenBuilder(pbuild));
+ reg.registerBuilder(new UsernameTokenBuilder());
reg.registerBuilder(new KeyValueTokenBuilder());
reg.registerBuilder(new WSS10Builder());
reg.registerBuilder(new WSS11Builder());
- reg.registerBuilder(new X509TokenBuilder(pbuild));
+ reg.registerBuilder(new X509TokenBuilder());
//add generic assertions for these known things to prevent warnings
List<QName> others = Arrays.asList(new QName[] {
