Policy extended to include additional elements. Groovy compiler versi…

…on changed to 2.0.
membrane · Oct 4, 2013 · 83349d5 · 83349d5
1 parent 4a96e51
commit 83349d5
Show file tree

Hide file tree

Showing 35 changed files with 72 additions and 268 deletions.
diff --git a/core/.settings/org.eclipse.jdt.groovy.core.prefs b/core/.settings/org.eclipse.jdt.groovy.core.prefs
@@ -1,3 +1,3 @@
 eclipse.preferences.version=1
-groovy.compiler.level=21
+groovy.compiler.level=20
 groovy.script.filters=scripts/**/*.groovy,y,src/main/resources/**/*.groovy,y,src/test/resources/**/*.groovy,y
diff --git a/core/src/main/groovy/com/predic8/policy/AlgorithmSuite.groovy b/core/src/main/groovy/com/predic8/policy/AlgorithmSuite.groovy
@@ -11,21 +11,7 @@
 
 package com.predic8.policy
 
-import javax.xml.namespace.QName
-import com.predic8.soamodel.*
-
 class AlgorithmSuite extends PolicyOperator{
-
-	/**
-	 * ELEMENTNAME will be set at runtime. Depending on the used version,
-	 * it should be the one from the XML document cause it will be used
-	 * to find the end tag of the XML element.
-	 */
-	QName ELEMENTNAME
-
-	protected parseChildren(token, child, ctx){
-		super.parseChildren(token, child, ctx)
-	}
 
 }
 
diff --git a/core/src/main/groovy/com/predic8/policy/All.groovy b/core/src/main/groovy/com/predic8/policy/All.groovy
@@ -14,16 +14,7 @@
 
 package com.predic8.policy
 
-import javax.xml.namespace.QName
-import com.predic8.soamodel.*
-
 class All extends PolicyOperator{
 
-  public QName ELEMENTNAME
-
-  QName getElementName() {
-    ELEMENTNAME
-  }
-
 }
 
diff --git a/core/src/main/groovy/com/predic8/policy/Basic128.groovy b/core/src/main/groovy/com/predic8/policy/Basic128.groovy
@@ -14,16 +14,7 @@
 
 package com.predic8.policy
 
-import javax.xml.namespace.QName
-import com.predic8.soamodel.*
-
 class Basic128 extends PolicyOperator{
 
-  public QName ELEMENTNAME
-
-  QName getElementName() {
-    ELEMENTNAME
-  }
-
 }
 
diff --git a/core/src/main/groovy/com/predic8/policy/Body.groovy b/core/src/main/groovy/com/predic8/policy/Body.groovy
@@ -11,21 +11,6 @@
 
 package com.predic8.policy
 
-import javax.xml.namespace.QName
-import com.predic8.soamodel.*
-
 class Body extends PolicyOperator{
-
-	/**
-	 * ELEMENTNAME will be set at runtime. Depending on the used version,
-	 * it should be the one from the XML document cause it will be used
-	 * to find the end tag of the XML element.
-	 */
-	QName ELEMENTNAME
-
-	protected parseChildren(token, child, ctx){
-		super.parseChildren(token, child, ctx)
-	}
-
 }
 
diff --git a/core/src/main/groovy/com/predic8/policy/EncryptedParts.groovy b/core/src/main/groovy/com/predic8/policy/EncryptedParts.groovy
@@ -14,16 +14,7 @@
 
 package com.predic8.policy
 
-import javax.xml.namespace.QName
-import com.predic8.soamodel.*
-
 class EncryptedParts extends PolicyOperator{
 
-  public QName ELEMENTNAME
-
-  QName getElementName() {
-    ELEMENTNAME
-  }
-
 }
 
diff --git a/core/src/main/groovy/com/predic8/policy/ExactlyOne.groovy b/core/src/main/groovy/com/predic8/policy/ExactlyOne.groovy
@@ -14,22 +14,7 @@
 
 package com.predic8.policy
 
-import javax.xml.namespace.QName
-
-import com.predic8.soamodel.*
-
 class ExactlyOne extends PolicyOperator{
 
-	/**
-	 * ELEMENTNAME will be set at runtime. Depending on the used version,
-	 * it should be the one from the XML document cause it will be used
-	 * to find the end tag of the XML element.
-	 */
-  public QName ELEMENTNAME 
-
-  QName getElementName() {
-    ELEMENTNAME
-  }
-
 }
 
diff --git a/core/src/main/groovy/com/predic8/policy/Header.groovy b/core/src/main/groovy/com/predic8/policy/Header.groovy
@@ -11,29 +11,13 @@
 
 package com.predic8.policy
 
-import javax.xml.namespace.QName
-
-import com.predic8.policy.creator.PolicyCreator;
-import com.predic8.soamodel.*
-
 class Header extends PolicyOperator{
-
-	/**
-	 * ELEMENTNAME will be set at runtime. Depending on the used version,
-	 * it should be the one from the XML document cause it will be used
-	 * to find the end tag of the XML element.
-	 */
-	QName ELEMENTNAME
 	String namespace
 
 	protected parseAttributes( token,  ctx) {
 		name = token.getAttributeValue( null , 'Name')
 		namespace = token.getAttributeValue( null , 'Namespace')
 	}
 
-	void create(PolicyCreator creator, CreatorContext ctx){
-		creator.createHeader(this, ctx)
-	}
-
 }
 
diff --git a/core/src/main/groovy/com/predic8/policy/IncludeTimestamp.groovy b/core/src/main/groovy/com/predic8/policy/IncludeTimestamp.groovy
@@ -14,16 +14,7 @@
 
 package com.predic8.policy
 
-import javax.xml.namespace.QName
-import com.predic8.soamodel.*
-
 class IncludeTimestamp extends PolicyOperator{
 
-  public QName ELEMENTNAME
-
-  QName getElementName() {
-    ELEMENTNAME
-  }
-
 }
 
diff --git a/core/src/main/groovy/com/predic8/policy/Layout.groovy b/core/src/main/groovy/com/predic8/policy/Layout.groovy
@@ -14,16 +14,7 @@
 
 package com.predic8.policy
 
-import javax.xml.namespace.QName
-import com.predic8.soamodel.*
-
 class Layout extends PolicyOperator{
 
-  public QName ELEMENTNAME
-
-  QName getElementName() {
-    ELEMENTNAME
-  }
-
 }
 
diff --git a/core/src/main/groovy/com/predic8/policy/MustSupportRefEncryptedKey.groovy b/core/src/main/groovy/com/predic8/policy/MustSupportRefEncryptedKey.groovy
@@ -14,16 +14,7 @@
 
 package com.predic8.policy
 
-import javax.xml.namespace.QName
-import com.predic8.soamodel.*
-
 class MustSupportRefEncryptedKey extends PolicyOperator{
 
-  public QName ELEMENTNAME
-
-  QName getElementName() {
-    ELEMENTNAME
-  }
-
 }
 
diff --git a/core/src/main/groovy/com/predic8/policy/MustSupportRefIssuerSerial.groovy b/core/src/main/groovy/com/predic8/policy/MustSupportRefIssuerSerial.groovy
@@ -14,16 +14,7 @@
 
 package com.predic8.policy
 
-import javax.xml.namespace.QName
-import com.predic8.soamodel.*
-
 class MustSupportRefIssuerSerial extends PolicyOperator{
 
-  public QName ELEMENTNAME
-
-  QName getElementName() {
-    ELEMENTNAME
-  }
-
 }
 
diff --git a/core/src/main/groovy/com/predic8/policy/MustSupportRefKeyIdentifier.groovy b/core/src/main/groovy/com/predic8/policy/MustSupportRefKeyIdentifier.groovy
@@ -14,16 +14,7 @@
 
 package com.predic8.policy
 
-import javax.xml.namespace.QName
-import com.predic8.soamodel.*
-
 class MustSupportRefKeyIdentifier extends PolicyOperator{
 
-  public QName ELEMENTNAME
-
-  QName getElementName() {
-    ELEMENTNAME
-  }
-
 }
 
diff --git a/core/src/main/groovy/com/predic8/policy/MustSupportRefThumbprint.groovy b/core/src/main/groovy/com/predic8/policy/MustSupportRefThumbprint.groovy
@@ -14,16 +14,7 @@
 
 package com.predic8.policy
 
-import javax.xml.namespace.QName
-import com.predic8.soamodel.*
-
 class MustSupportRefThumbprint extends PolicyOperator{
 
-  public QName ELEMENTNAME
-
-  QName getElementName() {
-    ELEMENTNAME
-  }
-
 }
 
diff --git a/core/src/main/groovy/com/predic8/policy/OnlySignEntireHeadersAndBody.groovy b/core/src/main/groovy/com/predic8/policy/OnlySignEntireHeadersAndBody.groovy
@@ -14,16 +14,7 @@
 
 package com.predic8.policy
 
-import javax.xml.namespace.QName
-import com.predic8.soamodel.*
-
 class OnlySignEntireHeadersAndBody extends PolicyOperator{
 
-  public QName ELEMENTNAME
-
-  QName getElementName() {
-    ELEMENTNAME
-  }
-
 }
 
diff --git a/core/src/main/groovy/com/predic8/policy/Policy.groovy b/core/src/main/groovy/com/predic8/policy/Policy.groovy
@@ -11,20 +11,16 @@
 
 package com.predic8.policy
 
+import groovy.xml.MarkupBuilder
+
 import javax.xml.namespace.QName
 
-import com.predic8.policy.creator.PolicyCreator;
+import com.predic8.policy.creator.PolicyCreator
+import com.predic8.policy.creator.PolicyCreatorContext
 import com.predic8.soamodel.*
 
 class Policy extends PolicyOperator{
 
-	/**
-	 * ELEMENTNAME will be set at runtime. Depending on the used version, 
-	 * it should be the one from the XML document cause it will be used 
-	 * to find the end tag of the XML element.
-	 */
-	QName ELEMENTNAME
-
 	String id
 
 	protected def parseAttributes( token,  AbstractParserContext ctx) {
@@ -41,6 +37,12 @@ class Policy extends PolicyOperator{
 		allPolicyItems.ELEMENTNAME.localPart
 	}
 
+	public String getAsString(){
+		StringWriter strWriter = new StringWriter()
+		new PolicyCreator(builder: new MarkupBuilder(strWriter)).createPolicy(this, new PolicyCreatorContext())
+		strWriter.toString()
+	}
+
 	void create(PolicyCreator creator, CreatorContext ctx){
 		creator.createPolicy(this, ctx)
 	}

diff --git a/core/src/main/groovy/com/predic8/policy/PolicyItemUtility.groovy b/core/src/main/groovy/com/predic8/policy/PolicyItemUtility.groovy
@@ -48,6 +48,8 @@ class PolicyItemUtility {
 				case 'WssUsernameToken10' : return new WssUsernameToken10(ELEMENTNAME: qname) ; break
 				case 'EncryptedParts' : return new EncryptedParts(ELEMENTNAME: qname) ; break
 				case 'SignedParts' : return new SignedParts(ELEMENTNAME: qname) ; break
+				case 'TransportBinding' : return new TransportBinding(ELEMENTNAME: qname) ; break
+				case 'TransportToken' : return new TransportToken(ELEMENTNAME: qname) ; break
 		 }
 	}
 }

diff --git a/core/src/main/groovy/com/predic8/policy/PolicyOperator.groovy b/core/src/main/groovy/com/predic8/policy/PolicyOperator.groovy
@@ -32,6 +32,13 @@ abstract class PolicyOperator extends XMLElement {
 
 	static final String NAMESPACE = Consts.WSP15_NS
 
+	/**
+	 * ELEMENTNAME will be set at runtime. Depending on the used version,
+	 * it should be the one from the XML document cause it will be used
+	 * to find the end tag of the XML element.
+	 */
+	JQName ELEMENTNAME
+
 	String name
 	WSDLElement wsdlElement
 

diff --git a/core/src/main/groovy/com/predic8/policy/ProtectionToken.groovy b/core/src/main/groovy/com/predic8/policy/ProtectionToken.groovy
@@ -14,16 +14,7 @@
 
 package com.predic8.policy
 
-import javax.xml.namespace.QName
-import com.predic8.soamodel.*
-
 class ProtectionToken extends PolicyOperator{
 
-  public QName ELEMENTNAME
-
-  QName getElementName() {
-    ELEMENTNAME
-  }
-
 }
 
diff --git a/core/src/main/groovy/com/predic8/policy/SignedParts.groovy b/core/src/main/groovy/com/predic8/policy/SignedParts.groovy
@@ -14,16 +14,7 @@
 
 package com.predic8.policy
 
-import javax.xml.namespace.QName
-import com.predic8.soamodel.*
-
 class SignedParts extends PolicyOperator{
 
-  public QName ELEMENTNAME
-
-  QName getElementName() {
-    ELEMENTNAME
-  }
-
 }
 
diff --git a/core/src/main/groovy/com/predic8/policy/SignedSupportingTokens.groovy b/core/src/main/groovy/com/predic8/policy/SignedSupportingTokens.groovy
@@ -14,16 +14,7 @@
 
 package com.predic8.policy
 
-import javax.xml.namespace.QName
-import com.predic8.soamodel.*
-
 class SignedSupportingTokens extends PolicyOperator{
 
-  public QName ELEMENTNAME
-
-  QName getElementName() {
-    ELEMENTNAME
-  }
-
 }