You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2010/02/04 17:43:20 UTC
svn commit: r906557 - in /tuscany/sca-java-2.x/trunk: ./ distribution/all/
distribution/all/src/main/release/bin/
distribution/tomcat/tomcat-war/src/main/webapp/ features/webservice/
itest/bpel/helloworld-reference/ itest/bpel/helloworld-ws/ itest/buil...
Author: slaws
Date: Thu Feb 4 16:43:19 2010
New Revision: 906557
URL: http://svn.apache.org/viewvc?rev=906557&view=rev
Log:
Move the runtime over to use Axis2 1.5.1. Three main parts to this 1) replace binding-ws-axis2 and binding binding-ws-axis2-policy with binding-ws-runtime-axis which is still very much a work in progress 2) correct the axis/axiom version references across the project and make the various OSGi environments work 3) start fixing policy provides to allow the ws binding to exploit the binding wire.
Modified:
tuscany/sca-java-2.x/trunk/distribution/all/pom.xml
tuscany/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE
tuscany/sca-java-2.x/trunk/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE
tuscany/sca-java-2.x/trunk/features/webservice/pom.xml
tuscany/sca-java-2.x/trunk/itest/bpel/helloworld-reference/pom.xml
tuscany/sca-java-2.x/trunk/itest/bpel/helloworld-ws/pom.xml
tuscany/sca-java-2.x/trunk/itest/builder/pom.xml
tuscany/sca-java-2.x/trunk/itest/callback-basic-ws/pom.xml
tuscany/sca-java-2.x/trunk/itest/contribution-import-export/export-composite/pom.xml
tuscany/sca-java-2.x/trunk/itest/contribution-import-export/export-java/pom.xml
tuscany/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/pom.xml
tuscany/sca-java-2.x/trunk/itest/contribution-import-export/import-java/pom.xml
tuscany/sca-java-2.x/trunk/itest/contribution-import-export/import-wsdl/pom.xml
tuscany/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/pom.xml
tuscany/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/pom.xml
tuscany/sca-java-2.x/trunk/itest/endpoints/pom.xml
tuscany/sca-java-2.x/trunk/itest/implementation-spring/pom.xml
tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-test/pom.xml
tuscany/sca-java-2.x/trunk/itest/service-reference/pom.xml
tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/resources/META-INF/sca-policy-1.1-intents-definitions-cd03.xml
tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHelper.java
tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/pom.xml
tuscany/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationReferencePolicyProvider.java
tuscany/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationServicePolicyProvider.java
tuscany/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/provider/JMSHeaderReferencePolicyProvider.java
tuscany/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java
tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BasePolicyProvider.java
tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java
tuscany/sca-java-2.x/trunk/modules/databinding-axiom/pom.xml
tuscany/sca-java-2.x/trunk/modules/databinding-jaxb-axiom/pom.xml
tuscany/sca-java-2.x/trunk/modules/databinding-json/pom.xml
tuscany/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java
tuscany/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java
tuscany/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java
tuscany/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java
tuscany/sca-java-2.x/trunk/modules/policy-wspolicy/pom.xml
tuscany/sca-java-2.x/trunk/modules/policy-xml-ws/pom.xml
tuscany/sca-java-2.x/trunk/modules/pom.xml
tuscany/sca-java-2.x/trunk/pom.xml
tuscany/sca-java-2.x/trunk/shades/webservices/pom.xml
Modified: tuscany/sca-java-2.x/trunk/distribution/all/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/distribution/all/pom.xml?rev=906557&r1=906556&r2=906557&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/distribution/all/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/distribution/all/pom.xml Thu Feb 4 16:43:19 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE?rev=906557&r1=906556&r2=906557&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE (original)
+++ tuscany/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE Thu Feb 4 16:43:19 2010
@@ -226,13 +226,17 @@
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 @@
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 @@
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 @@
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:
Modified: tuscany/sca-java-2.x/trunk/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE?rev=906557&r1=906556&r2=906557&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE (original)
+++ tuscany/sca-java-2.x/trunk/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE Thu Feb 4 16:43:19 2010
@@ -217,14 +217,18 @@
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 @@
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 @@
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
===============================================================================
Modified: tuscany/sca-java-2.x/trunk/features/webservice/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/features/webservice/pom.xml?rev=906557&r1=906556&r2=906557&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/features/webservice/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/features/webservice/pom.xml Thu Feb 4 16:43:19 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/itest/bpel/helloworld-reference/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/bpel/helloworld-reference/pom.xml?rev=906557&r1=906556&r2=906557&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/bpel/helloworld-reference/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/itest/bpel/helloworld-reference/pom.xml Thu Feb 4 16:43:19 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/itest/bpel/helloworld-ws/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/bpel/helloworld-ws/pom.xml?rev=906557&r1=906556&r2=906557&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/bpel/helloworld-ws/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/itest/bpel/helloworld-ws/pom.xml Thu Feb 4 16:43:19 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/itest/builder/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/builder/pom.xml?rev=906557&r1=906556&r2=906557&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/builder/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/itest/builder/pom.xml Thu Feb 4 16:43:19 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/itest/callback-basic-ws/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/callback-basic-ws/pom.xml?rev=906557&r1=906556&r2=906557&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/callback-basic-ws/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/itest/callback-basic-ws/pom.xml Thu Feb 4 16:43:19 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/itest/contribution-import-export/export-composite/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/contribution-import-export/export-composite/pom.xml?rev=906557&r1=906556&r2=906557&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/contribution-import-export/export-composite/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/itest/contribution-import-export/export-composite/pom.xml Thu Feb 4 16:43:19 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/itest/contribution-import-export/export-java/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/contribution-import-export/export-java/pom.xml?rev=906557&r1=906556&r2=906557&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/contribution-import-export/export-java/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/itest/contribution-import-export/export-java/pom.xml Thu Feb 4 16:43:19 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/pom.xml?rev=906557&r1=906556&r2=906557&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/pom.xml Thu Feb 4 16:43:19 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/itest/contribution-import-export/import-java/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/contribution-import-export/import-java/pom.xml?rev=906557&r1=906556&r2=906557&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/contribution-import-export/import-java/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/itest/contribution-import-export/import-java/pom.xml Thu Feb 4 16:43:19 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/itest/contribution-import-export/import-wsdl/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/contribution-import-export/import-wsdl/pom.xml?rev=906557&r1=906556&r2=906557&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/contribution-import-export/import-wsdl/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/itest/contribution-import-export/import-wsdl/pom.xml Thu Feb 4 16:43:19 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/pom.xml?rev=906557&r1=906556&r2=906557&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/pom.xml Thu Feb 4 16:43:19 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/pom.xml?rev=906557&r1=906556&r2=906557&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/pom.xml Thu Feb 4 16:43:19 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/itest/endpoints/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/endpoints/pom.xml?rev=906557&r1=906556&r2=906557&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/endpoints/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/itest/endpoints/pom.xml Thu Feb 4 16:43:19 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/itest/implementation-spring/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/implementation-spring/pom.xml?rev=906557&r1=906556&r2=906557&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/implementation-spring/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/itest/implementation-spring/pom.xml Thu Feb 4 16:43:19 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-test/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-test/pom.xml?rev=906557&r1=906556&r2=906557&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-test/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-test/pom.xml Thu Feb 4 16:43:19 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/itest/service-reference/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/service-reference/pom.xml?rev=906557&r1=906556&r2=906557&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/service-reference/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/itest/service-reference/pom.xml Thu Feb 4 16:43:19 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/resources/META-INF/sca-policy-1.1-intents-definitions-cd03.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/resources/META-INF/sca-policy-1.1-intents-definitions-cd03.xml?rev=906557&r1=906556&r2=906557&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/resources/META-INF/sca-policy-1.1-intents-definitions-cd03.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/resources/META-INF/sca-policy-1.1-intents-definitions-cd03.xml Thu Feb 4 16:43:19 2010
@@ -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">
Modified: tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHelper.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHelper.java?rev=906557&r1=906556&r2=906557&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHelper.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHelper.java Thu Feb 4 16:43:19 2010
@@ -21,9 +21,11 @@
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 @@
}
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;
+ }
}
Modified: tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/pom.xml?rev=906557&r1=906556&r2=906557&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-atom-runtime/pom.xml Thu Feb 4 16:43:19 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationReferencePolicyProvider.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationReferencePolicyProvider.java?rev=906557&r1=906556&r2=906557&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationReferencePolicyProvider.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationReferencePolicyProvider.java Thu Feb 4 16:43:19 2010
@@ -23,43 +23,25 @@
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 @@
return Phase.REFERENCE_BINDING_POLICY;
}
- public void start() {
- }
-
- public void stop() {
- }
-
}
Modified: tuscany/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationServicePolicyProvider.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationServicePolicyProvider.java?rev=906557&r1=906556&r2=906557&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationServicePolicyProvider.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationServicePolicyProvider.java Thu Feb 4 16:43:19 2010
@@ -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 @@
return Phase.SERVICE_BINDING_POLICY;
}
- public void start() {
- }
-
- public void stop() {
- }
-
}
Modified: tuscany/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/provider/JMSHeaderReferencePolicyProvider.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/provider/JMSHeaderReferencePolicyProvider.java?rev=906557&r1=906556&r2=906557&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/provider/JMSHeaderReferencePolicyProvider.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/provider/JMSHeaderReferencePolicyProvider.java Thu Feb 4 16:43:19 2010
@@ -27,6 +27,7 @@
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 @@
/**
* @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 @@
return Phase.REFERENCE_BINDING_POLICY;
}
- public void start() {
- }
-
- public void stop() {
- }
}
Modified: tuscany/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java?rev=906557&r1=906556&r2=906557&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java Thu Feb 4 16:43:19 2010
@@ -60,7 +60,7 @@
*/
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
Modified: tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BasePolicyProvider.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BasePolicyProvider.java?rev=906557&r1=906556&r2=906557&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BasePolicyProvider.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BasePolicyProvider.java Thu Feb 4 16:43:19 2010
@@ -129,6 +129,13 @@
public PhasedInterceptor createInterceptor(Operation operation) {
return null;
}
+
+ public PhasedInterceptor createBindingInterceptor() {
+ return null;
+ }
+
+ public void configureBinding(Object configuration){
+ }
protected InvocationChain getInvocationChain() {
if (subject instanceof RuntimeEndpoint) {
Modified: tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java?rev=906557&r1=906556&r2=906557&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java Thu Feb 4 16:43:19 2010
@@ -28,12 +28,31 @@
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();
Modified: tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java?rev=906557&r1=906556&r2=906557&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java Thu Feb 4 16:43:19 2010
@@ -55,7 +55,6 @@
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 @@
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);
}
}
+*/
}
}
Modified: tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java?rev=906557&r1=906556&r2=906557&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java Thu Feb 4 16:43:19 2010
@@ -56,7 +56,6 @@
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 @@
// 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);
}
}
+*/
}
}
Modified: tuscany/sca-java-2.x/trunk/modules/databinding-axiom/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/databinding-axiom/pom.xml?rev=906557&r1=906556&r2=906557&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/databinding-axiom/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/databinding-axiom/pom.xml Thu Feb 4 16:43:19 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/modules/databinding-jaxb-axiom/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/databinding-jaxb-axiom/pom.xml?rev=906557&r1=906556&r2=906557&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/databinding-jaxb-axiom/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/databinding-jaxb-axiom/pom.xml Thu Feb 4 16:43:19 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/modules/databinding-json/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/databinding-json/pom.xml?rev=906557&r1=906556&r2=906557&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/databinding-json/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/databinding-json/pom.xml Thu Feb 4 16:43:19 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java?rev=906557&r1=906556&r2=906557&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java Thu Feb 4 16:43:19 2010
@@ -25,34 +25,19 @@
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)
Modified: tuscany/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java?rev=906557&r1=906556&r2=906557&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java Thu Feb 4 16:43:19 2010
@@ -25,35 +25,20 @@
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)
*/
Modified: tuscany/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java?rev=906557&r1=906556&r2=906557&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java Thu Feb 4 16:43:19 2010
@@ -25,18 +25,19 @@
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();
}
Modified: tuscany/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java?rev=906557&r1=906556&r2=906557&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java Thu Feb 4 16:43:19 2010
@@ -25,7 +25,7 @@
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 @@
*
* @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();
}
Modified: tuscany/sca-java-2.x/trunk/modules/policy-wspolicy/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/policy-wspolicy/pom.xml?rev=906557&r1=906556&r2=906557&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/policy-wspolicy/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/policy-wspolicy/pom.xml Thu Feb 4 16:43:19 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/modules/policy-xml-ws/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/policy-xml-ws/pom.xml?rev=906557&r1=906556&r2=906557&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/policy-xml-ws/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/policy-xml-ws/pom.xml Thu Feb 4 16:43:19 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/modules/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/pom.xml?rev=906557&r1=906556&r2=906557&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/pom.xml Thu Feb 4 16:43:19 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/pom.xml?rev=906557&r1=906556&r2=906557&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/pom.xml Thu Feb 4 16:43:19 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/shades/webservices/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/shades/webservices/pom.xml?rev=906557&r1=906556&r2=906557&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/shades/webservices/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/shades/webservices/pom.xml Thu Feb 4 16:43:19 2010
@@ -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>