diff options
42 files changed, 238 insertions, 195 deletions
diff --git a/sca-java-2.x/trunk/distribution/all/pom.xml b/sca-java-2.x/trunk/distribution/all/pom.xml index 41e31f8d1b..2b49fe47e1 100644 --- a/sca-java-2.x/trunk/distribution/all/pom.xml +++ b/sca-java-2.x/trunk/distribution/all/pom.xml @@ -132,7 +132,7 @@ <plugin> <groupId>org.apache.tuscany.maven.plugins</groupId> <artifactId>maven-bundle-plugin</artifactId> - <version>1.0.5</version> + <version>1.0.6-SNAPSHOT</version> <executions> <execution> <id>distribution-modules</id> @@ -145,24 +145,57 @@ <useDistributionName>false</useDistributionName> <generateManifestJar>true</generateManifestJar> <artifactManifests> - <artifactManifest> + <!--artifactManifest> <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>axiom-api</artifactId> - <version>1.2.7</version> - <manifestFile>${basedir}/manifests/axiom-api-1.2.7.MF</manifestFile> - </artifactManifest> + <version>1.2.8</version> + <manifestFile>${basedir}/manifests/axiom-api-1.2.8.MF</manifestFile> + </artifactManifest--> <artifactManifest> <groupId>org.apache.woden</groupId> <artifactId>woden-impl-dom</artifactId> <version>1.0M8</version> <manifestFile>${basedir}/manifests/woden-impl-dom-1.0M8.MF</manifestFile> </artifactManifest> + <!-- artifactAggregations (below) is the right approach to solving the split + package between axis-kernel and axis2-transport-http however the Tuscany + runtime doesn't take any notice of it so using a fragment at the moment --> + <artifactManifest> + <groupId>org.apache.axis2</groupId> + <artifactId>axis2-kernel</artifactId> + <version>1.5.1</version> + <manifestFile>${basedir}/manifests/axis2-kernel-1.5.1.MF</manifestFile> + </artifactManifest> + <artifactManifest> + <groupId>org.apache.axis2</groupId> + <artifactId>axis2-transport-http</artifactId> + <version>1.5.1</version> + <manifestFile>${basedir}/manifests/axis2-transport-http-1.5.1.MF</manifestFile> + </artifactManifest> <artifactManifest> <groupId>org.apache.axis2</groupId> <artifactId>*</artifactId> <version>*</version> </artifactManifest> </artifactManifests> + <!--artifactAggregations> + <artifactAggregation> + <symbolicName>org.apache.tuscany.sca.axis2-kernel</symbolicName> + <version>1.5.1</version> + <artifactMembers> + <artifactMember> + <groupId>org.apache.axis2</groupId> + <artifactId>axis2-kernel</artifactId> + <version>1.5.1</version> + </artifactMember> + <artifactMember> + <groupId>org.apache.axis2</groupId> + <artifactId>axis2-transport-http</artifactId> + <version>1.5.1</version> + </artifactMember> + </artifactMembers> + </artifactAggregation> + </artifactAggregations--> </configuration> </execution> </executions> diff --git a/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE b/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE index af574e4fa6..a4561ef047 100644 --- a/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE +++ b/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE @@ -226,13 +226,17 @@ The following components come under Apache Software License 2.0 addressing-1.3.mar
aopalliance-1.0.jar
annogen-0.1.0.jar
- axiom-api-1.2.7.jar
- axiom-dom-1.2.7.jar
- axiom-impl-1.2.7.jar
- axis2-codegen-1.4.1.jar
- axis2-kernel-1.4.1.jar
- axis2-java2wsdl-1.4.1.jar
- axis2-mtompolicy-1.4.1.jar
+ axiom-api-1.2.8.jar
+ axiom-dom-1.2.8.jar
+ axiom-impl-1.2.8.jar
+ axis2-codegen-1.5.1.jar
+ axis2-kernel-1.5.1.jar
+ axis2-java2wsdl-1.5.1.jar
+ axis2-mtompolicy-1.5.1.jar
+ axis2-transport-base-1.0.0.jar
+ axis2-transport-jms-1.0.0.jar
+ axis2-transport-local-1.5.1.jar
+ axis2-transport-http-1.5.1.jar
axis-ant-1.4.jar
cglib-2.2.jar
commons-beanutils-1.7.0.jar
@@ -253,15 +257,17 @@ The following components come under Apache Software License 2.0 geronimo-connector-2.0.1.jar
geronimo-ejb_3.0_spec-1.0.1.jar
geronimo-el_1.0_spec-1.0.1.jar
- geronimo-javamail_1.4_spec-1.2.jar
+ geronimo-javamail_1.4_spec-1.6.jar
geronimo-jms_1.1_spec-1.1.1.jar
geronimo-jpa_3.0_spec-1.1.1.jar
geronimo-jsp_2.1_spec-1.0.1.jar
+ geronimo-jta_1.0.1B_spec-1.0.jar
geronimo-jta_1.1_spec-1.1.1.jar
geronimo-j2ee-connector_1.5_spec-2.0.0.jar
geronimo-kernel-2.0.1.jar
geronimo-stax-api_1.0_spec-1.0.1.jar
geronimo-transaction-2.0.1.jar
+ geronimo-ws-metadata_2.0_spec-1.1.2.jar
hazelcast-1.8.jar
hazelcast-client-1.8.jar
httpclient-4.0.jar
@@ -275,7 +281,7 @@ The following components come under Apache Software License 2.0 jetty-util-6.1.19.jar
juli-6.0.18.jar
log4j-1.2.15.jar
- mex-1.41-impl.jar
+ mex-1.5.1-impl.jar
myfaces-api-1.2.2.jar
myfaces-impl-1.2.2.jar
neethi-2.0.4.jar
@@ -311,9 +317,11 @@ The following components come under Apache Software License 2.0 wstx-asl-3.2.4.jar
xalan-2.7.0.jar
xercesImpl-2.8.1.jar
+ xml-apis-1.3.04.jar
xmlbeans-2.3.0.jar
- xmlsec-1.4.2.jar
+ xmlsec-1.4.3.jar
XmlSchema-1.4.2.jar
+ XmlSchema-1.4.3.jar
===============================================================================
The serp-1.13.1.jar is distributed under the BSD license with the following copyright:
diff --git a/sca-java-2.x/trunk/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE b/sca-java-2.x/trunk/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE index de01f39373..22ac5f47eb 100644 --- a/sca-java-2.x/trunk/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE +++ b/sca-java-2.x/trunk/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE @@ -217,14 +217,18 @@ The following components come under Apache Software License 2.0 addressing-1.3.mar
annogen-0.1.0.jar
- axiom-api-1.2.7.jar
- axiom-dom-1.2.7.jar
- axiom-impl-1.2.7.jar
+ axiom-api-1.2.8.jar
+ axiom-dom-1.2.8.jar
+ axiom-impl-1.2.8.jar
axis2-adb-1.4.jar
axis2-codegen-1.4.jar
- axis2-kernel-1.4.1.jar
- axis2-java2wsdl-1.4.1.jar
- axis2-mtompolicy-1.4.1.jar
+ axis2-kernel-1.5.1.jar
+ axis2-java2wsdl-1.5.1.jar
+ axis2-mtompolicy-1.5.1.jar
+ axis2-transport-base-1.0.0.jar
+ axis2-transport-local-1.5.1.jar
+ axis2-transport-http-1.5.1.jar
+ axis2-transport-jms-1.0.0.jar
axis-ant-1.4.jar
cglib-2.2.jar
commons-codec-1.2.jar
@@ -235,14 +239,17 @@ The following components come under Apache Software License 2.0 commons-io-1.4.jar
commons-logging-1.1.1.jar
geronimo-activation_1.1_spec-1.0.1.jar
- geronimo-javamail_1.4_spec-1.2.jar
+ geronimo-javamail_1.4_spec-1.6.jar
geronimo-jms_1.1_spec-1.1.jar
+ geronimo-jta_1.0.1B_spec-1.0.jar
+ geronimo-jta_1.1_spec-1.1.jar
geronimo-stax-api_1.0_spec-1.0.1.jar
+ geronimo-ws-metadata_2.0_spec-1.1.2.jar
hazelcast-1.8.jar
hazelcast-client-1.8.jar
httpcore-4.0.1.jar
httpcore-nio-4.0.1.jar
- mex-1.41-impl.jar
+ mex-1.5.1-impl.jar
neethi-2.0.4.jar
rampart-core-1.4.jar
rampart-policy-1.4.jar
@@ -250,7 +257,7 @@ The following components come under Apache Software License 2.0 woden-api-1.0M8.jar
woden-impl-dom-1.0M8.jar
wss4j-1.5.4.jar
- xmlsec-1.4.2.jar
+ xmlsec-1.4.3.jar
XmlSchema-1.4.2.jar
===============================================================================
diff --git a/sca-java-2.x/trunk/features/webservice/pom.xml b/sca-java-2.x/trunk/features/webservice/pom.xml index e77bc14183..054434415a 100644 --- a/sca-java-2.x/trunk/features/webservice/pom.xml +++ b/sca-java-2.x/trunk/features/webservice/pom.xml @@ -41,17 +41,17 @@ </dependency> <!-- Bindings --> - <dependency> + <!--dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-binding-sca-axis2-runtime</artifactId> <version>2.0-SNAPSHOT</version> - </dependency> + </dependency--> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-binding-ws</artifactId> <version>2.0-SNAPSHOT</version> </dependency> - <dependency> + <!--dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-binding-ws-axis2</artifactId> <version>2.0-SNAPSHOT</version> @@ -81,6 +81,37 @@ <artifactId>opensaml</artifactId> </exclusion> </exclusions> + </dependency--> + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> + <version>2.0-SNAPSHOT</version> + <exclusions> + <exclusion> + <groupId>org.apache.ant</groupId> + <artifactId>ant-nodeps</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.axis2</groupId> + <artifactId>addressing</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.axis2</groupId> + <artifactId>axis2-xmlbeans</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.axis2</groupId> + <artifactId>axis2-adb-codegen</artifactId> + </exclusion> + <exclusion> + <groupId>bouncycastle</groupId> + <artifactId>bcprov-jdk15</artifactId> + </exclusion> + <exclusion> + <groupId>opensaml</groupId> + <artifactId>opensaml</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> diff --git a/sca-java-2.x/trunk/itest/bpel/helloworld-reference/pom.xml b/sca-java-2.x/trunk/itest/bpel/helloworld-reference/pom.xml index be818711c4..75856a4c74 100644 --- a/sca-java-2.x/trunk/itest/bpel/helloworld-reference/pom.xml +++ b/sca-java-2.x/trunk/itest/bpel/helloworld-reference/pom.xml @@ -51,7 +51,7 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> + <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> <version>2.0-SNAPSHOT</version> <scope>runtime</scope> </dependency> diff --git a/sca-java-2.x/trunk/itest/bpel/helloworld-ws/pom.xml b/sca-java-2.x/trunk/itest/bpel/helloworld-ws/pom.xml index fcd7bda656..dffbb4f9a9 100644 --- a/sca-java-2.x/trunk/itest/bpel/helloworld-ws/pom.xml +++ b/sca-java-2.x/trunk/itest/bpel/helloworld-ws/pom.xml @@ -56,7 +56,7 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> + <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> <version>2.0-SNAPSHOT</version> <scope>runtime</scope> </dependency> diff --git a/sca-java-2.x/trunk/itest/builder/pom.xml b/sca-java-2.x/trunk/itest/builder/pom.xml index 532a0a9f88..390716452d 100644 --- a/sca-java-2.x/trunk/itest/builder/pom.xml +++ b/sca-java-2.x/trunk/itest/builder/pom.xml @@ -51,7 +51,7 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> + <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> <version>2.0-SNAPSHOT</version> <scope>test</scope> </dependency> diff --git a/sca-java-2.x/trunk/itest/callback-basic-ws/pom.xml b/sca-java-2.x/trunk/itest/callback-basic-ws/pom.xml index 16a92b0245..3321a05a85 100644 --- a/sca-java-2.x/trunk/itest/callback-basic-ws/pom.xml +++ b/sca-java-2.x/trunk/itest/callback-basic-ws/pom.xml @@ -51,7 +51,7 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> + <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> <version>2.0-SNAPSHOT</version> <scope>test</scope> </dependency> diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/export-composite/pom.xml b/sca-java-2.x/trunk/itest/contribution-import-export/export-composite/pom.xml index 6e1f180999..842a7ca47a 100644 --- a/sca-java-2.x/trunk/itest/contribution-import-export/export-composite/pom.xml +++ b/sca-java-2.x/trunk/itest/contribution-import-export/export-composite/pom.xml @@ -44,7 +44,7 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> + <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> <version>1.6-SNAPSHOT</version> <scope>runtime</scope> </dependency> diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/export-java/pom.xml b/sca-java-2.x/trunk/itest/contribution-import-export/export-java/pom.xml index 331f7bc195..a863a7843f 100644 --- a/sca-java-2.x/trunk/itest/contribution-import-export/export-java/pom.xml +++ b/sca-java-2.x/trunk/itest/contribution-import-export/export-java/pom.xml @@ -44,7 +44,7 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> + <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> <version>1.6-SNAPSHOT</version> <scope>runtime</scope> </dependency> diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/pom.xml b/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/pom.xml index 1d04a7e6cb..7fdc6b68e4 100644 --- a/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/pom.xml +++ b/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/pom.xml @@ -50,7 +50,7 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> + <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> <version>1.6-SNAPSHOT</version> <scope>runtime</scope> </dependency> diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/import-java/pom.xml b/sca-java-2.x/trunk/itest/contribution-import-export/import-java/pom.xml index 37530cb833..a0fac8b806 100644 --- a/sca-java-2.x/trunk/itest/contribution-import-export/import-java/pom.xml +++ b/sca-java-2.x/trunk/itest/contribution-import-export/import-java/pom.xml @@ -50,7 +50,7 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> + <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> <version>1.6-SNAPSHOT</version> <scope>runtime</scope> </dependency> diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/import-wsdl/pom.xml b/sca-java-2.x/trunk/itest/contribution-import-export/import-wsdl/pom.xml index 6d8ed9c3b8..a0d1b7d215 100644 --- a/sca-java-2.x/trunk/itest/contribution-import-export/import-wsdl/pom.xml +++ b/sca-java-2.x/trunk/itest/contribution-import-export/import-wsdl/pom.xml @@ -50,7 +50,7 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> + <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> <version>1.6-SNAPSHOT</version> <scope>runtime</scope> </dependency> diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/pom.xml b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/pom.xml index 1e3eb4f7dd..669c85ca19 100644 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/pom.xml +++ b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/pom.xml @@ -69,7 +69,7 @@ </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> + <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> <version>${pom.version}</version> <scope>runtime</scope> </dependency> diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/pom.xml b/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/pom.xml index 1f74290cb8..be9d12f1e2 100644 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/pom.xml +++ b/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/pom.xml @@ -70,7 +70,7 @@ </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> + <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> <version>2.0-SNAPSHOT</version> <scope>runtime</scope> </dependency> diff --git a/sca-java-2.x/trunk/itest/endpoints/pom.xml b/sca-java-2.x/trunk/itest/endpoints/pom.xml index 6a1930c627..4a962cfdf2 100644 --- a/sca-java-2.x/trunk/itest/endpoints/pom.xml +++ b/sca-java-2.x/trunk/itest/endpoints/pom.xml @@ -42,7 +42,7 @@ </dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
diff --git a/sca-java-2.x/trunk/itest/implementation-spring/pom.xml b/sca-java-2.x/trunk/itest/implementation-spring/pom.xml index 1ce02ed1ee..548b3e955e 100644 --- a/sca-java-2.x/trunk/itest/implementation-spring/pom.xml +++ b/sca-java-2.x/trunk/itest/implementation-spring/pom.xml @@ -54,9 +54,15 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> + <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> <version>2.0-SNAPSHOT</version> </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-policy-security</artifactId> + <version>2.0-SNAPSHOT</version> + </dependency> <!-- Spring dependencies... --> <dependency> diff --git a/sca-java-2.x/trunk/itest/nodes/two-nodes-test/pom.xml b/sca-java-2.x/trunk/itest/nodes/two-nodes-test/pom.xml index f0df20c597..18708f0523 100644 --- a/sca-java-2.x/trunk/itest/nodes/two-nodes-test/pom.xml +++ b/sca-java-2.x/trunk/itest/nodes/two-nodes-test/pom.xml @@ -51,7 +51,7 @@ </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> + <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> <version>2.0-SNAPSHOT</version> </dependency> </dependencies> diff --git a/sca-java-2.x/trunk/itest/service-reference/pom.xml b/sca-java-2.x/trunk/itest/service-reference/pom.xml index 0fdd1cb994..ffd8d14fe6 100644 --- a/sca-java-2.x/trunk/itest/service-reference/pom.xml +++ b/sca-java-2.x/trunk/itest/service-reference/pom.xml @@ -51,7 +51,7 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> + <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> <version>2.0-SNAPSHOT</version> <scope>test</scope> </dependency> diff --git a/sca-java-2.x/trunk/modules/assembly-xml/src/main/resources/META-INF/sca-policy-1.1-intents-definitions-cd03.xml b/sca-java-2.x/trunk/modules/assembly-xml/src/main/resources/META-INF/sca-policy-1.1-intents-definitions-cd03.xml index aee8f121b5..7d50cd0ae4 100644 --- a/sca-java-2.x/trunk/modules/assembly-xml/src/main/resources/META-INF/sca-policy-1.1-intents-definitions-cd03.xml +++ b/sca-java-2.x/trunk/modules/assembly-xml/src/main/resources/META-INF/sca-policy-1.1-intents-definitions-cd03.xml @@ -216,8 +216,8 @@ Specifies that the SOAP messaging model is used for delivering messages. </sca:description> - <sca:qualifier name="V1_1" default="true"/> - <sca:qualifier name="V1_2"/> + <sca:qualifier name="v1_1" default="true"/> + <sca:qualifier name="v1_2"/> </sca:intent> <sca:intent name="JMS" constrains="sca:binding" intentType="interaction"> diff --git a/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHelper.java b/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHelper.java index f87938a5cb..1ff7280d07 100644 --- a/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHelper.java +++ b/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHelper.java @@ -21,9 +21,11 @@ package org.apache.tuscany.sca.policy.util; import java.util.ArrayList; import java.util.Collection; +import java.util.List; import javax.xml.namespace.QName; +import org.apache.tuscany.sca.assembly.Binding; import org.apache.tuscany.sca.definitions.Definitions; import org.apache.tuscany.sca.policy.Intent; import org.apache.tuscany.sca.policy.PolicyExpression; @@ -93,5 +95,35 @@ public class PolicyHelper { } return policies; } + + public static PolicySet getPolicySet(Binding wsBinding, QName intentName) { + PolicySet returnPolicySet = null; + + if (wsBinding instanceof PolicySubject) { + PolicySubject policiedBinding = (PolicySubject)wsBinding; + for (PolicySet policySet : policiedBinding.getPolicySets()) { + for (Intent intent : policySet.getProvidedIntents()) { + if (intent.getName().equals(intentName)) { + returnPolicySet = policySet; + break; + } + } + } + } + + return returnPolicySet; + } + + public static boolean isIntentRequired(Binding wsBinding, QName intent) { + if (wsBinding instanceof PolicySubject) { + List<Intent> intents = ((PolicySubject)wsBinding).getRequiredIntents(); + for (Intent i : intents) { + if (intent.equals(i.getName())) { + return true; + } + } + } + return getPolicySet(wsBinding, intent) != null; + } } diff --git a/sca-java-2.x/trunk/modules/binding-atom-runtime/pom.xml b/sca-java-2.x/trunk/modules/binding-atom-runtime/pom.xml index 6d3f5b9b8c..4afdce9945 100644 --- a/sca-java-2.x/trunk/modules/binding-atom-runtime/pom.xml +++ b/sca-java-2.x/trunk/modules/binding-atom-runtime/pom.xml @@ -100,7 +100,7 @@ <dependency> <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>axiom-impl</artifactId> - <version>1.2.7</version> + <version>1.2.8</version> <scope>runtime</scope> </dependency> diff --git a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationReferencePolicyProvider.java b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationReferencePolicyProvider.java index e630d0cd53..97d065fc50 100644 --- a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationReferencePolicyProvider.java +++ b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationReferencePolicyProvider.java @@ -23,43 +23,25 @@ import java.util.List; import org.apache.tuscany.sca.assembly.EndpointReference; import org.apache.tuscany.sca.binding.jms.policy.authentication.token.JMSTokenAuthenticationPolicy; +import org.apache.tuscany.sca.binding.jms.policy.header.JMSHeaderPolicy; import org.apache.tuscany.sca.interfacedef.Operation; import org.apache.tuscany.sca.invocation.Phase; import org.apache.tuscany.sca.invocation.PhasedInterceptor; import org.apache.tuscany.sca.policy.PolicySet; +import org.apache.tuscany.sca.provider.BasePolicyProvider; import org.apache.tuscany.sca.provider.PolicyProvider; /** * @version $Rev$ $Date$ */ -public class JMSTokenAuthenticationReferencePolicyProvider implements PolicyProvider { +public class JMSTokenAuthenticationReferencePolicyProvider extends BasePolicyProvider<JMSTokenAuthenticationPolicy> { private EndpointReference endpointReference; public JMSTokenAuthenticationReferencePolicyProvider(EndpointReference endpointReference) { + super(JMSTokenAuthenticationPolicy.class, endpointReference); this.endpointReference = endpointReference; } - - private PolicySet findPolicySet() { - List<PolicySet> policySets = endpointReference.getPolicySets(); - for (PolicySet ps : policySets) { - for (Object p : ps.getPolicies()) { - if (JMSTokenAuthenticationPolicy.class.isInstance(p)) { - return ps; - } - } - } - return null; - } - - private String getContext() { - return "component.reference: " + endpointReference.getComponent().getURI() - + "#" - + endpointReference.getReference().getName() - + "(" - + endpointReference.getBinding().getClass().getName() - + ")"; - } - + /** * @see org.apache.tuscany.sca.provider.PolicyProvider#createInterceptor(org.apache.tuscany.sca.interfacedef.Operation) */ @@ -76,10 +58,4 @@ public class JMSTokenAuthenticationReferencePolicyProvider implements PolicyProv return Phase.REFERENCE_BINDING_POLICY; } - public void start() { - } - - public void stop() { - } - } diff --git a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationServicePolicyProvider.java b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationServicePolicyProvider.java index be5ca5dd61..351b1c3f0f 100644 --- a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationServicePolicyProvider.java +++ b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationServicePolicyProvider.java @@ -19,48 +19,26 @@ package org.apache.tuscany.sca.binding.jms.policy.authentication.token.provider; -import java.util.List; - import org.apache.tuscany.sca.assembly.Endpoint; import org.apache.tuscany.sca.binding.jms.policy.authentication.token.JMSTokenAuthenticationPolicy; import org.apache.tuscany.sca.interfacedef.Operation; import org.apache.tuscany.sca.invocation.Phase; import org.apache.tuscany.sca.invocation.PhasedInterceptor; import org.apache.tuscany.sca.policy.PolicySet; -import org.apache.tuscany.sca.provider.PolicyProvider; +import org.apache.tuscany.sca.provider.BasePolicyProvider; /** * @version $Rev$ $Date$ */ -public class JMSTokenAuthenticationServicePolicyProvider implements PolicyProvider { +public class JMSTokenAuthenticationServicePolicyProvider extends BasePolicyProvider<JMSTokenAuthenticationPolicy> { private Endpoint endpoint; public JMSTokenAuthenticationServicePolicyProvider(Endpoint endpoint) { + super(JMSTokenAuthenticationPolicy.class, endpoint); this.endpoint = endpoint; } - private PolicySet findPolicySet() { - List<PolicySet> policySets = endpoint.getPolicySets(); - for (PolicySet ps : policySets) { - for (Object p : ps.getPolicies()) { - if (JMSTokenAuthenticationPolicy.class.isInstance(p)) { - return ps; - } - } - } - return null; - } - - private String getContext() { - return "component.service: " + endpoint.getComponent().getURI() - + "#" - + endpoint.getService().getName() - + "(" - + endpoint.getBinding().getClass().getName() - + ")"; - } - /** * @see org.apache.tuscany.sca.provider.PolicyProvider#createInterceptor(org.apache.tuscany.sca.interfacedef.Operation) */ @@ -76,10 +54,4 @@ public class JMSTokenAuthenticationServicePolicyProvider implements PolicyProvid return Phase.SERVICE_BINDING_POLICY; } - public void start() { - } - - public void stop() { - } - } diff --git a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/provider/JMSHeaderReferencePolicyProvider.java b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/provider/JMSHeaderReferencePolicyProvider.java index 29fc08ed14..3f994da033 100644 --- a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/provider/JMSHeaderReferencePolicyProvider.java +++ b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/provider/JMSHeaderReferencePolicyProvider.java @@ -27,6 +27,7 @@ import org.apache.tuscany.sca.interfacedef.Operation; import org.apache.tuscany.sca.invocation.Phase; import org.apache.tuscany.sca.invocation.PhasedInterceptor; import org.apache.tuscany.sca.policy.PolicySet; +import org.apache.tuscany.sca.provider.BasePolicyProvider; import org.apache.tuscany.sca.provider.PolicyProvider; import org.apache.tuscany.sca.runtime.RuntimeComponent; import org.apache.tuscany.sca.runtime.RuntimeComponentReference; @@ -34,34 +35,14 @@ import org.apache.tuscany.sca.runtime.RuntimeComponentReference; /** * @version $Rev$ $Date$ */ -public class JMSHeaderReferencePolicyProvider implements PolicyProvider { +public class JMSHeaderReferencePolicyProvider extends BasePolicyProvider<JMSHeaderPolicy> { private EndpointReference endpointReference; public JMSHeaderReferencePolicyProvider(EndpointReference endpointReference) { + super(JMSHeaderPolicy.class, endpointReference); this.endpointReference = endpointReference; } - - private PolicySet findPolicySet() { - List<PolicySet> policySets = endpointReference.getPolicySets(); - for (PolicySet ps : policySets) { - for (Object p : ps.getPolicies()) { - if (JMSHeaderPolicy.class.isInstance(p)) { - return ps; - } - } - } - return null; - } - - private String getContext() { - return "component.reference: " + endpointReference.getComponent().getURI() - + "#" - + endpointReference.getReference().getName() - + "(" - + endpointReference.getBinding().getClass().getName() - + ")"; - } /** * @see org.apache.tuscany.sca.provider.PolicyProvider#createInterceptor(org.apache.tuscany.sca.interfacedef.Operation) @@ -78,10 +59,5 @@ public class JMSHeaderReferencePolicyProvider implements PolicyProvider { return Phase.REFERENCE_BINDING_POLICY; } - public void start() { - } - - public void stop() { - } } diff --git a/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java b/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java index 3364dd83d9..25791394fe 100644 --- a/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java +++ b/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java @@ -60,7 +60,7 @@ import org.apache.tuscany.sca.xsd.XSDFactory; */ public class BindingWSDLGenerator { private static final Logger logger = Logger.getLogger(BindingWSDLGenerator.class.getName()); - private static final QName SOAP12_INTENT = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200912", "SOAP.1_2"); + private static final QName SOAP12_INTENT = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200912", "SOAP.v1_2"); public static boolean printWSDL; // external code sets this to print generated WSDL diff --git a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BasePolicyProvider.java b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BasePolicyProvider.java index 8f93476c85..30802feb82 100644 --- a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BasePolicyProvider.java +++ b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BasePolicyProvider.java @@ -129,6 +129,13 @@ public abstract class BasePolicyProvider<T> implements PolicyProvider { public PhasedInterceptor createInterceptor(Operation operation) { return null; } + + public PhasedInterceptor createBindingInterceptor() { + return null; + } + + public void configureBinding(Object configuration){ + } protected InvocationChain getInvocationChain() { if (subject instanceof RuntimeEndpoint) { diff --git a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java index 00ef0d1c3c..35b64ad56f 100644 --- a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java +++ b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java @@ -28,12 +28,31 @@ import org.apache.tuscany.sca.invocation.PhasedInterceptor; public interface PolicyProvider { /** * Create an interceptor for a given operation + * * @param operation - * @return An interceptor that realize the policySet + * @return An interceptor that realizes the policySet */ PhasedInterceptor createInterceptor(Operation operation); /** + * Create a binding interceptor. The binding wire is + * not operation specific so an operation parameter + * isn't required + * + * @return An interceptor that realizes the policySet + */ + PhasedInterceptor createBindingInterceptor(); + + /** + * Give the provider an opportunity to affect the + * binding configuration if required + * + * @param configurationContext the configuration context of the + * binding that will be modified + */ + void configureBinding(Object configuration); + + /** * Start the provider */ void start(); diff --git a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java index b4743676b0..ce5f72ca94 100644 --- a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java +++ b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java @@ -55,7 +55,6 @@ import org.apache.tuscany.sca.invocation.Invoker; import org.apache.tuscany.sca.invocation.Message; import org.apache.tuscany.sca.invocation.MessageFactory; import org.apache.tuscany.sca.invocation.Phase; -import org.apache.tuscany.sca.provider.BindingPolicyProvider; import org.apache.tuscany.sca.provider.BindingProviderFactory; import org.apache.tuscany.sca.provider.EndpointProvider; import org.apache.tuscany.sca.provider.ImplementationProvider; @@ -306,12 +305,15 @@ public class RuntimeEndpointImpl extends EndpointImpl implements RuntimeEndpoint List<PolicyProvider> pps = getPolicyProviders(); if (pps != null) { for (PolicyProvider p : pps) { + // TODO - SL - Need to get the binding policy providers +/* if (p instanceof BindingPolicyProvider) { Interceptor interceptor = ((BindingPolicyProvider)p).createBindingInterceptor(); if (interceptor != null) { bindingInvocationChain.addInterceptor(interceptor); } } +*/ } } diff --git a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java index 32078eabc9..fc5a942186 100644 --- a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java +++ b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java @@ -56,7 +56,6 @@ import org.apache.tuscany.sca.invocation.Invoker; import org.apache.tuscany.sca.invocation.Message; import org.apache.tuscany.sca.invocation.MessageFactory; import org.apache.tuscany.sca.invocation.Phase; -import org.apache.tuscany.sca.provider.BindingPolicyProvider; import org.apache.tuscany.sca.provider.BindingProviderFactory; import org.apache.tuscany.sca.provider.EndpointReferenceProvider; import org.apache.tuscany.sca.provider.PolicyProvider; @@ -347,12 +346,15 @@ public class RuntimeEndpointReferenceImpl extends EndpointReferenceImpl implemen // add the policy interceptors to the service binding wire // find out which policies are active for (PolicyProvider p : getPolicyProviders()) { + // TODO - SL - Need to get the binding policy providers +/* if (p instanceof BindingPolicyProvider) { Interceptor interceptor = ((BindingPolicyProvider)p).createBindingInterceptor(); if (interceptor != null) { bindingInvocationChain.addInterceptor(interceptor); } } +*/ } } diff --git a/sca-java-2.x/trunk/modules/databinding-axiom/pom.xml b/sca-java-2.x/trunk/modules/databinding-axiom/pom.xml index 027de3659c..f46bd41d7d 100644 --- a/sca-java-2.x/trunk/modules/databinding-axiom/pom.xml +++ b/sca-java-2.x/trunk/modules/databinding-axiom/pom.xml @@ -57,7 +57,7 @@ <dependency> <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>axiom-api</artifactId> - <version>1.2.7</version> + <version>1.2.8</version> <exclusions> <exclusion> <groupId>xerces</groupId> @@ -77,7 +77,7 @@ <dependency> <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>axiom-impl</artifactId> - <version>1.2.7</version> + <version>1.2.8</version> <scope>runtime</scope> <exclusions> <exclusion> diff --git a/sca-java-2.x/trunk/modules/databinding-jaxb-axiom/pom.xml b/sca-java-2.x/trunk/modules/databinding-jaxb-axiom/pom.xml index 485f71e6ea..744fe474da 100644 --- a/sca-java-2.x/trunk/modules/databinding-jaxb-axiom/pom.xml +++ b/sca-java-2.x/trunk/modules/databinding-jaxb-axiom/pom.xml @@ -42,7 +42,7 @@ <dependency> <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>axiom-api</artifactId> - <version>1.2.7</version> + <version>1.2.8</version> <exclusions> <exclusion> <groupId>xerces</groupId> @@ -66,7 +66,7 @@ <dependency> <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>axiom-impl</artifactId> - <version>1.2.7</version> + <version>1.2.8</version> <scope>runtime</scope> </dependency> </dependencies> diff --git a/sca-java-2.x/trunk/modules/databinding-json/pom.xml b/sca-java-2.x/trunk/modules/databinding-json/pom.xml index 305477cc11..4d600358f0 100644 --- a/sca-java-2.x/trunk/modules/databinding-json/pom.xml +++ b/sca-java-2.x/trunk/modules/databinding-json/pom.xml @@ -69,7 +69,7 @@ <dependency> <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>axiom-api</artifactId> - <version>1.2.7</version> + <version>1.2.8</version> <exclusions> <exclusion> <groupId>xerces</groupId> @@ -93,7 +93,7 @@ <dependency> <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>axiom-impl</artifactId> - <version>1.2.7</version> + <version>1.2.8</version> <scope>runtime</scope> </dependency> diff --git a/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java b/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java index d4d8e59429..4c8d452c2d 100644 --- a/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java +++ b/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java @@ -25,34 +25,19 @@ import org.apache.tuscany.sca.assembly.EndpointReference; import org.apache.tuscany.sca.interfacedef.Operation; import org.apache.tuscany.sca.invocation.PhasedInterceptor; import org.apache.tuscany.sca.policy.PolicySet; +import org.apache.tuscany.sca.provider.BasePolicyProvider; import org.apache.tuscany.sca.provider.PolicyProvider; /** * @version $Rev$ $Date$ */ -public class BasicAuthenticationReferencePolicyProvider implements PolicyProvider { +public class BasicAuthenticationReferencePolicyProvider extends BasePolicyProvider<BasicAuthenticationPolicy> { private EndpointReference endpointReference; public BasicAuthenticationReferencePolicyProvider(EndpointReference endpointReference) { - super(); + super(BasicAuthenticationPolicy.class, endpointReference); this.endpointReference = endpointReference; } - - private PolicySet findPolicySet() { - List<PolicySet> policySets = endpointReference.getPolicySets(); - for (PolicySet ps : policySets) { - for (Object p : ps.getPolicies()) { - if (BasicAuthenticationPolicy.class.isInstance(p)) { - return ps; - } - } - } - return null; - } - - private String getContext() { - return endpointReference.getURI(); - } /** * @see org.apache.tuscany.sca.provider.PolicyProvider#createInterceptor(org.apache.tuscany.sca.interfacedef.Operation) diff --git a/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java b/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java index b640ec60e5..48effb2dc1 100644 --- a/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java +++ b/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java @@ -25,35 +25,20 @@ import org.apache.tuscany.sca.assembly.Endpoint; import org.apache.tuscany.sca.interfacedef.Operation; import org.apache.tuscany.sca.invocation.PhasedInterceptor; import org.apache.tuscany.sca.policy.PolicySet; +import org.apache.tuscany.sca.provider.BasePolicyProvider; import org.apache.tuscany.sca.provider.PolicyProvider; /** * @version $Rev$ $Date$ */ -public class BasicAuthenticationServicePolicyProvider implements PolicyProvider { +public class BasicAuthenticationServicePolicyProvider extends BasePolicyProvider<BasicAuthenticationPolicy> { private Endpoint endpoint; public BasicAuthenticationServicePolicyProvider(Endpoint endpoint) { - super(); + super(BasicAuthenticationPolicy.class, endpoint); this.endpoint = endpoint; } - private PolicySet findPolicySet() { - List<PolicySet> policySets = endpoint.getPolicySets(); - for (PolicySet ps : policySets) { - for (Object p : ps.getPolicies()) { - if (BasicAuthenticationPolicy.class.isInstance(p)) { - return ps; - } - } - } - return null; - } - - private String getContext() { - return endpoint.getURI(); - } - /** * @see org.apache.tuscany.sca.provider.PolicyProvider#createInterceptor(org.apache.tuscany.sca.interfacedef.Operation) */ diff --git a/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java b/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java index 2783a37316..ced2543c38 100644 --- a/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java +++ b/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java @@ -25,18 +25,19 @@ import org.apache.tuscany.sca.assembly.Implementation; import org.apache.tuscany.sca.interfacedef.Operation; import org.apache.tuscany.sca.invocation.PhasedInterceptor; import org.apache.tuscany.sca.policy.PolicySet; +import org.apache.tuscany.sca.provider.BasePolicyProvider; import org.apache.tuscany.sca.provider.PolicyProvider; import org.apache.tuscany.sca.runtime.RuntimeComponent; /** * @version $Rev$ $Date$ */ -public class SecurityIdentityImplementationPolicyProvider implements PolicyProvider { +public class SecurityIdentityImplementationPolicyProvider extends BasePolicyProvider<SecurityIdentityPolicy> { private RuntimeComponent component; private Implementation implementation; public SecurityIdentityImplementationPolicyProvider(RuntimeComponent component) { - super(); + super(SecurityIdentityPolicy.class, component); this.component = component; this.implementation = component.getImplementation(); } diff --git a/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java b/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java index 6666469b75..6425ae7fca 100644 --- a/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java +++ b/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java @@ -25,7 +25,7 @@ import org.apache.tuscany.sca.assembly.Implementation; import org.apache.tuscany.sca.interfacedef.Operation; import org.apache.tuscany.sca.invocation.PhasedInterceptor; import org.apache.tuscany.sca.policy.PolicySet; -import org.apache.tuscany.sca.provider.PolicyProvider; +import org.apache.tuscany.sca.provider.BasePolicyProvider; import org.apache.tuscany.sca.runtime.RuntimeComponent; /** @@ -33,12 +33,12 @@ import org.apache.tuscany.sca.runtime.RuntimeComponent; * * @version $Rev$ $Date$ */ -public class JaasAuthenticationImplementationPolicyProvider implements PolicyProvider { +public class JaasAuthenticationImplementationPolicyProvider extends BasePolicyProvider<JaasAuthenticationPolicy> { private RuntimeComponent component; private Implementation implementation; public JaasAuthenticationImplementationPolicyProvider(RuntimeComponent component) { - super(); + super(JaasAuthenticationPolicy.class, component); this.component = component; this.implementation = component.getImplementation(); } diff --git a/sca-java-2.x/trunk/modules/policy-wspolicy/pom.xml b/sca-java-2.x/trunk/modules/policy-wspolicy/pom.xml index 12955012a4..b3fe706a7a 100644 --- a/sca-java-2.x/trunk/modules/policy-wspolicy/pom.xml +++ b/sca-java-2.x/trunk/modules/policy-wspolicy/pom.xml @@ -56,7 +56,7 @@ <dependency> <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>axiom-api</artifactId> - <version>1.2.7</version> + <version>1.2.8</version> <exclusions> <exclusion> <groupId>xerces</groupId> @@ -96,7 +96,7 @@ <dependency> <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>axiom-impl</artifactId> - <version>1.2.7</version> + <version>1.2.8</version> <scope>runtime</scope> <exclusions> <exclusion> diff --git a/sca-java-2.x/trunk/modules/policy-xml-ws/pom.xml b/sca-java-2.x/trunk/modules/policy-xml-ws/pom.xml index 2075bbe047..3a0bcec5da 100644 --- a/sca-java-2.x/trunk/modules/policy-xml-ws/pom.xml +++ b/sca-java-2.x/trunk/modules/policy-xml-ws/pom.xml @@ -50,7 +50,7 @@ <dependency> <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>axiom-api</artifactId> - <version>1.2.7</version> + <version>1.2.8</version> <exclusions> <exclusion> <groupId>xerces</groupId> @@ -90,7 +90,7 @@ <dependency> <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>axiom-impl</artifactId> - <version>1.2.7</version> + <version>1.2.8</version> <scope>runtime</scope> <exclusions> <exclusion> diff --git a/sca-java-2.x/trunk/modules/pom.xml b/sca-java-2.x/trunk/modules/pom.xml index d8ae6a5628..b618f2ce93 100644 --- a/sca-java-2.x/trunk/modules/pom.xml +++ b/sca-java-2.x/trunk/modules/pom.xml @@ -53,9 +53,9 @@ <module>binding-sca-runtime-rmi</module> <module>binding-sca-axis2-runtime</module> <module>binding-ws</module> - <module>binding-ws-axis2</module> - <!--module>binding-ws-axis2-15-runtime</module--> - <module>binding-ws-axis2-policy</module> + <!--module>binding-ws-axis2</module--> + <module>binding-ws-runtime-axis2</module> + <!--module>binding-ws-axis2-policy</module--> <module>binding-ws-wsdlgen</module> <module>builder</module> <module>common-java</module> @@ -104,8 +104,8 @@ <module>node-launcher</module> <module>node-launcher-equinox</module> <module>policy-security</module> - <!--module>policy-wspolicy</module--> - <module>policy-xml-ws</module> + <module>policy-wspolicy</module> + <!--module>policy-xml-ws</module--> <module>policy-logging</module> <!--module>policy-transaction</module--> <module>sca-api</module> diff --git a/sca-java-2.x/trunk/pom.xml b/sca-java-2.x/trunk/pom.xml index 17d764c92f..4767c726bc 100644 --- a/sca-java-2.x/trunk/pom.xml +++ b/sca-java-2.x/trunk/pom.xml @@ -540,7 +540,6 @@ <module>modules/assembly-xsd</module> <module>modules/binding-sca-runtime</module> <module>modules/binding-ws</module> - <module>modules/binding-ws-axis2-policy</module> <module>modules/binding-ws-wsdlgen</module> <module>modules/builder</module> <module>modules/common-java</module> @@ -686,7 +685,9 @@ <message>Best Practice is to always define released plugin versions!</message> <banLatest>true</banLatest> <banRelease>true</banRelease> - <banSnapshots>true</banSnapshots> + <!-- turn off while I get our bundle plugin working --> + <!--banSnapshots>true</banSnapshots--> + <banSnapshots>false</banSnapshots> <phases>clean,deploy,site</phases> <additionalPlugins> </additionalPlugins> diff --git a/sca-java-2.x/trunk/shades/webservices/pom.xml b/sca-java-2.x/trunk/shades/webservices/pom.xml index 8254751241..b7eab7f84b 100644 --- a/sca-java-2.x/trunk/shades/webservices/pom.xml +++ b/sca-java-2.x/trunk/shades/webservices/pom.xml @@ -34,7 +34,7 @@ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
<version>${pom.version}</version>
<exclusions>
<exclusion>
|