You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2008/04/24 03:39:11 UTC
svn commit: r651130 - in /incubator/tuscany/java/sca:
demos/workpool-distributed/ modules/ modules/assembly-xml/
modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/
modules/binding-ws-axis2/ modules/definitions-xml/src/main/java/org...
Author: lresende
Date: Wed Apr 23 18:38:53 2008
New Revision: 651130
URL: http://svn.apache.org/viewvc?rev=651130&view=rev
Log:
TUSCANY-2167 - Merging policy dependency clean-up from SCA 1.2 branch
Added:
incubator/tuscany/java/sca/modules/policy-security-ws/ (props changed)
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/
incubator/tuscany/java/sca/modules/policy-security-ws/DISCLAIMER
- copied unchanged from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/DISCLAIMER
incubator/tuscany/java/sca/modules/policy-security-ws/LICENSE
- copied unchanged from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/LICENSE
incubator/tuscany/java/sca/modules/policy-security-ws/NOTICE
- copied unchanged from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/NOTICE
incubator/tuscany/java/sca/modules/policy-security-ws/pom.xml
- copied, changed from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/pom.xml
incubator/tuscany/java/sca/modules/policy-security-ws/src/
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/
incubator/tuscany/java/sca/modules/policy-security-ws/src/main/
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/main/
incubator/tuscany/java/sca/modules/policy-security-ws/src/main/java/
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/main/java/
incubator/tuscany/java/sca/modules/policy-security-ws/src/main/java/org/
- copied from r644089, incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/main/java/org/
incubator/tuscany/java/sca/modules/policy-security-ws/src/main/java/org/apache/
- copied from r644089, incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/main/java/org/apache/
incubator/tuscany/java/sca/modules/policy-security-ws/src/main/java/org/apache/tuscany/
- copied from r644089, incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/main/java/org/apache/tuscany/
incubator/tuscany/java/sca/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/
- copied from r644089, incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/
incubator/tuscany/java/sca/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/
- copied from r644089, incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/
incubator/tuscany/java/sca/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/
- copied from r644089, incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/
incubator/tuscany/java/sca/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/jaas/
- copied from r644089, incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/jaas/
incubator/tuscany/java/sca/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/
- copied from r644089, incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/
incubator/tuscany/java/sca/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicy.java
- copied unchanged from r644089, incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicy.java
incubator/tuscany/java/sca/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyHandler.java
- copied unchanged from r644089, incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyHandler.java
incubator/tuscany/java/sca/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProcessor.java
- copied unchanged from r644089, incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProcessor.java
incubator/tuscany/java/sca/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProviderFactory.java
- copied unchanged from r644089, incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProviderFactory.java
incubator/tuscany/java/sca/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/WSSecurityPolicyHandler.java
- copied unchanged from r644089, incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/main/java/org/apache/tuscany/sca/policy/security/ws/WSSecurityPolicyHandler.java
incubator/tuscany/java/sca/modules/policy-security-ws/src/main/resources/
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/main/resources/
incubator/tuscany/java/sca/modules/policy-security-ws/src/main/resources/META-INF/
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/main/resources/META-INF/
incubator/tuscany/java/sca/modules/policy-security-ws/src/main/resources/META-INF/services/
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/main/resources/META-INF/services/
incubator/tuscany/java/sca/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
- copied unchanged from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
incubator/tuscany/java/sca/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider
- copied unchanged from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider
incubator/tuscany/java/sca/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
- copied unchanged from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
incubator/tuscany/java/sca/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
- copied unchanged from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
incubator/tuscany/java/sca/modules/policy-security-ws/src/test/
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/test/
incubator/tuscany/java/sca/modules/policy-security-ws/src/test/java/
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/test/java/
incubator/tuscany/java/sca/modules/policy-security-ws/src/test/java/org/
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/test/java/org/
incubator/tuscany/java/sca/modules/policy-security-ws/src/test/java/org/apache/
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/test/java/org/apache/
incubator/tuscany/java/sca/modules/policy-security-ws/src/test/java/org/apache/tuscany/
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/test/java/org/apache/tuscany/
incubator/tuscany/java/sca/modules/policy-security-ws/src/test/java/org/apache/tuscany/sca/
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/test/java/org/apache/tuscany/sca/
incubator/tuscany/java/sca/modules/policy-security-ws/src/test/java/org/apache/tuscany/sca/policy/
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/test/java/org/apache/tuscany/sca/policy/
incubator/tuscany/java/sca/modules/policy-security-ws/src/test/java/org/apache/tuscany/sca/policy/security/
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/test/java/org/apache/tuscany/sca/policy/security/
incubator/tuscany/java/sca/modules/policy-security-ws/src/test/java/org/apache/tuscany/sca/policy/security/ws/
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/test/java/org/apache/tuscany/sca/policy/security/ws/
incubator/tuscany/java/sca/modules/policy-security-ws/src/test/java/org/apache/tuscany/sca/policy/security/ws/PolicyReadTestCase.java
- copied unchanged from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/test/java/org/apache/tuscany/sca/policy/security/ws/PolicyReadTestCase.java
incubator/tuscany/java/sca/modules/policy-security-ws/src/test/resources/
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/test/resources/
incubator/tuscany/java/sca/modules/policy-security-ws/src/test/resources/org/
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/test/resources/org/
incubator/tuscany/java/sca/modules/policy-security-ws/src/test/resources/org/apache/
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/test/resources/org/apache/
incubator/tuscany/java/sca/modules/policy-security-ws/src/test/resources/org/apache/tuscany/
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/test/resources/org/apache/tuscany/
incubator/tuscany/java/sca/modules/policy-security-ws/src/test/resources/org/apache/tuscany/sca/
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/test/resources/org/apache/tuscany/sca/
incubator/tuscany/java/sca/modules/policy-security-ws/src/test/resources/org/apache/tuscany/sca/policy/
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/test/resources/org/apache/tuscany/sca/policy/
incubator/tuscany/java/sca/modules/policy-security-ws/src/test/resources/org/apache/tuscany/sca/policy/security/
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/test/resources/org/apache/tuscany/sca/policy/security/
incubator/tuscany/java/sca/modules/policy-security-ws/src/test/resources/org/apache/tuscany/sca/policy/security/ws/
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/test/resources/org/apache/tuscany/sca/policy/security/ws/
incubator/tuscany/java/sca/modules/policy-security-ws/src/test/resources/org/apache/tuscany/sca/policy/security/ws/mock_policies.xml
- copied unchanged from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/test/resources/org/apache/tuscany/sca/policy/security/ws/mock_policies.xml
incubator/tuscany/java/sca/modules/policy-xml-ws/ (props changed)
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/
incubator/tuscany/java/sca/modules/policy-xml-ws/DISCLAIMER
- copied unchanged from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/DISCLAIMER
incubator/tuscany/java/sca/modules/policy-xml-ws/LICENSE
- copied unchanged from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/LICENSE
incubator/tuscany/java/sca/modules/policy-xml-ws/NOTICE
- copied unchanged from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/NOTICE
incubator/tuscany/java/sca/modules/policy-xml-ws/pom.xml
- copied, changed from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/pom.xml
incubator/tuscany/java/sca/modules/policy-xml-ws/src/
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/
incubator/tuscany/java/sca/modules/policy-xml-ws/src/main/
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/main/
incubator/tuscany/java/sca/modules/policy-xml-ws/src/main/java/
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/main/java/
incubator/tuscany/java/sca/modules/policy-xml-ws/src/main/java/org/
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/main/java/org/
incubator/tuscany/java/sca/modules/policy-xml-ws/src/main/java/org/apache/
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/main/java/org/apache/
incubator/tuscany/java/sca/modules/policy-xml-ws/src/main/java/org/apache/tuscany/
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/main/java/org/apache/tuscany/
incubator/tuscany/java/sca/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/
incubator/tuscany/java/sca/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/
incubator/tuscany/java/sca/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/
incubator/tuscany/java/sca/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessor.java
- copied unchanged from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessor.java
incubator/tuscany/java/sca/modules/policy-xml-ws/src/main/resources/
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/main/resources/
incubator/tuscany/java/sca/modules/policy-xml-ws/src/main/resources/META-INF/
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/main/resources/META-INF/
incubator/tuscany/java/sca/modules/policy-xml-ws/src/main/resources/META-INF/services/
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/main/resources/META-INF/services/
incubator/tuscany/java/sca/modules/policy-xml-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
- copied unchanged from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
incubator/tuscany/java/sca/modules/policy-xml-ws/src/test/
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/
incubator/tuscany/java/sca/modules/policy-xml-ws/src/test/java/
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/java/
incubator/tuscany/java/sca/modules/policy-xml-ws/src/test/java/org/
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/java/org/
incubator/tuscany/java/sca/modules/policy-xml-ws/src/test/java/org/apache/
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/java/org/apache/
incubator/tuscany/java/sca/modules/policy-xml-ws/src/test/java/org/apache/tuscany/
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/java/org/apache/tuscany/
incubator/tuscany/java/sca/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/
incubator/tuscany/java/sca/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/
incubator/tuscany/java/sca/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/
incubator/tuscany/java/sca/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/MockPolicyProcessor.java
- copied unchanged from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/MockPolicyProcessor.java
incubator/tuscany/java/sca/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java
- copied unchanged from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java
incubator/tuscany/java/sca/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessorTestCase.java
- copied unchanged from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessorTestCase.java
incubator/tuscany/java/sca/modules/policy-xml-ws/src/test/resources/
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/resources/
incubator/tuscany/java/sca/modules/policy-xml-ws/src/test/resources/org/
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/resources/org/
incubator/tuscany/java/sca/modules/policy-xml-ws/src/test/resources/org/apache/
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/resources/org/apache/
incubator/tuscany/java/sca/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/
incubator/tuscany/java/sca/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/
incubator/tuscany/java/sca/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/
incubator/tuscany/java/sca/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/
- copied from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/
incubator/tuscany/java/sca/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
- copied unchanged from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
Removed:
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/ws/
incubator/tuscany/java/sca/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
incubator/tuscany/java/sca/modules/policy-security/src/main/resources/policy_definitions.xml
incubator/tuscany/java/sca/modules/policy-security/src/test/java/org/
Modified:
incubator/tuscany/java/sca/demos/workpool-distributed/pom.xml
incubator/tuscany/java/sca/modules/assembly-xml/pom.xml
incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
incubator/tuscany/java/sca/modules/binding-ws-axis2/pom.xml
incubator/tuscany/java/sca/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.java
incubator/tuscany/java/sca/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java
incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml
incubator/tuscany/java/sca/modules/implementation-java-xml/pom.xml
incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java
incubator/tuscany/java/sca/modules/policy-security/pom.xml
incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityPolicyDefinitionsProvider.java
incubator/tuscany/java/sca/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
incubator/tuscany/java/sca/modules/policy-xml/pom.xml
incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
incubator/tuscany/java/sca/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
incubator/tuscany/java/sca/modules/pom.xml
Modified: incubator/tuscany/java/sca/demos/workpool-distributed/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/workpool-distributed/pom.xml?rev=651130&r1=651129&r2=651130&view=diff
==============================================================================
--- incubator/tuscany/java/sca/demos/workpool-distributed/pom.xml (original)
+++ incubator/tuscany/java/sca/demos/workpool-distributed/pom.xml Wed Apr 23 18:38:53 2008
@@ -105,7 +105,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-contribution-updater</artifactId>
- <version>1.2-incubating-SNAPSHOT</version>
+ <version>2.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
Modified: incubator/tuscany/java/sca/modules/assembly-xml/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/pom.xml?rev=651130&r1=651129&r2=651130&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/pom.xml Wed Apr 23 18:38:53 2008
@@ -34,17 +34,16 @@
<artifactId>tuscany-assembly</artifactId>
<version>2.0-incubating-SNAPSHOT</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-definitions-xml</artifactId>
+ <artifactId>tuscany-definitions</artifactId>
<version>2.0-incubating-SNAPSHOT</version>
- <scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-definitions</artifactId>
+ <artifactId>tuscany-policy</artifactId>
<version>2.0-incubating-SNAPSHOT</version>
</dependency>
@@ -65,52 +64,54 @@
<artifactId>tuscany-contribution-java</artifactId>
<version>2.0-incubating-SNAPSHOT</version>
</dependency>
-
+
<dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-contribution-impl</artifactId>
- <version>2.0-incubating-SNAPSHOT</version>
- <scope>test</scope>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0.1</version>
</dependency>
-
+
<dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-policy</artifactId>
- <version>2.0-incubating-SNAPSHOT</version>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <version>3.2.1</version>
+ <scope>runtime</scope>
</dependency>
+ <!-- Test Dependencies -->
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-policy-xml</artifactId>
+ <artifactId>tuscany-definitions-xml</artifactId>
<version>2.0-incubating-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0.1</version>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-policy-xml</artifactId>
+ <version>2.0-incubating-SNAPSHOT</version>
+ <scope>test</scope>
</dependency>
-
+
<dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- <version>3.2.1</version>
- <scope>runtime</scope>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-policy-xml-ws</artifactId>
+ <version>2.0-incubating-SNAPSHOT</version>
+ <scope>test</scope>
</dependency>
-
+
<dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <version>2.7.0</version>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-assembly-xsd</artifactId>
+ <version>2.0-incubating-SNAPSHOT</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-assembly-xsd</artifactId>
+ <artifactId>tuscany-contribution-impl</artifactId>
<version>2.0-incubating-SNAPSHOT</version>
<scope>test</scope>
</dependency>
-
</dependencies>
</project>
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java?rev=651130&r1=651129&r2=651130&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java Wed Apr 23 18:38:53 2008
@@ -50,6 +50,7 @@
import org.apache.tuscany.sca.policy.xml.ProfileIntentProcessor;
import org.apache.tuscany.sca.policy.xml.QualifiedIntentProcessor;
import org.apache.tuscany.sca.policy.xml.SimpleIntentProcessor;
+import org.apache.tuscany.sca.policy.xml.WSPolicyProcessor;
/**
* Test reading SCA XML assembly documents.
@@ -83,6 +84,7 @@
staxProcessors.addArtifactProcessor(new ProfileIntentProcessor(policyFactory, staxProcessor));
staxProcessors.addArtifactProcessor(new QualifiedIntentProcessor(policyFactory, staxProcessor));
staxProcessors.addArtifactProcessor(new PolicySetProcessor(policyFactory, staxProcessor));
+ staxProcessors.addArtifactProcessor(new WSPolicyProcessor());
staxProcessors.addArtifactProcessor(new MockPolicyProcessor());
// Create document processors
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java?rev=651130&r1=651129&r2=651130&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java Wed Apr 23 18:38:53 2008
@@ -46,6 +46,7 @@
import org.apache.tuscany.sca.policy.DefaultIntentAttachPointTypeFactory;
import org.apache.tuscany.sca.policy.DefaultPolicyFactory;
import org.apache.tuscany.sca.policy.PolicyFactory;
+import org.apache.tuscany.sca.policy.xml.WSPolicyProcessor;
/**
* Test the wiring of SCA XML assemblies.
@@ -68,6 +69,7 @@
public void setUp() throws Exception {
inputFactory = XMLInputFactory.newInstance();
staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint(new DefaultModelFactoryExtensionPoint());
+ staxProcessors.addArtifactProcessor(new WSPolicyProcessor());
staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, XMLInputFactory.newInstance(), XMLOutputFactory.newInstance());
resolver = new TestModelResolver();
assemblyFactory = new DefaultAssemblyFactory();
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java?rev=651130&r1=651129&r2=651130&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java Wed Apr 23 18:38:53 2008
@@ -49,6 +49,7 @@
import org.apache.tuscany.sca.policy.DefaultIntentAttachPointTypeFactory;
import org.apache.tuscany.sca.policy.DefaultPolicyFactory;
import org.apache.tuscany.sca.policy.PolicyFactory;
+import org.apache.tuscany.sca.policy.xml.WSPolicyProcessor;
/**
* Test writing SCA XML assemblies.
@@ -79,6 +80,7 @@
staxProcessors.addArtifactProcessor(new CompositeProcessor(new DefaultContributionFactory(), assemblyFactory, policyFactory, staxProcessor));
staxProcessors.addArtifactProcessor(new ComponentTypeProcessor(assemblyFactory, policyFactory, staxProcessor));
staxProcessors.addArtifactProcessor(new ConstrainingTypeProcessor(assemblyFactory, policyFactory, staxProcessor));
+ staxProcessors.addArtifactProcessor(new WSPolicyProcessor());
resolver = new TestModelResolver();
scaDefnDocProcessor = new SCADefinitionsDocumentProcessor(staxProcessors, staxProcessor, XMLInputFactory.newInstance(), policyFactory);
}
Modified: incubator/tuscany/java/sca/modules/binding-ws-axis2/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/pom.xml?rev=651130&r1=651129&r2=651130&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-axis2/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-axis2/pom.xml Wed Apr 23 18:38:53 2008
@@ -89,7 +89,13 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-policy-security</artifactId>
+ <artifactId>tuscany-policy-xml-ws</artifactId>
+ <version>2.0-incubating-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-policy-security-ws</artifactId>
<version>2.0-incubating-SNAPSHOT</version>
</dependency>
@@ -381,7 +387,13 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.12</version>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version> <!-- to keep compatible with older servlet containers -->
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
Modified: incubator/tuscany/java/sca/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.java?rev=651130&r1=651129&r2=651130&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.java Wed Apr 23 18:38:53 2008
@@ -41,8 +41,6 @@
import org.apache.tuscany.sca.contribution.service.ContributionReadException;
import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
import org.apache.tuscany.sca.definitions.SCADefinitions;
-import org.apache.tuscany.sca.definitions.SCADefinitionsBuilder;
-import org.apache.tuscany.sca.definitions.SCADefinitionsBuilderImpl;
import org.apache.tuscany.sca.definitions.impl.SCADefinitionsImpl;
import org.apache.tuscany.sca.definitions.util.SCADefinitionsUtil;
import org.apache.tuscany.sca.policy.DefaultIntentAttachPointTypeFactory;
@@ -61,7 +59,7 @@
*/
public class SCADefinitionsDocumentProcessor implements URLArtifactProcessor<SCADefinitions> {
private StAXArtifactProcessor<Object> extensionProcessor;
- private SCADefinitionsBuilder definitionsBuilder;
+ //private SCADefinitionsBuilder definitionsBuilder;
private ModelResolver scaDefinitionsResolver;
private XMLInputFactory inputFactory;
private static final String TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";
@@ -80,7 +78,7 @@
PolicyFactory policyFactory) {
this.extensionProcessor = (StAXArtifactProcessor<Object>)staxProcessor;
this.inputFactory = inputFactory;
- definitionsBuilder = new SCADefinitionsBuilderImpl();
+ //definitionsBuilder = new SCADefinitionsBuilderImpl();
this.scaDefinitionsResolver = new SCADefinitionsResolver();
IntentAttachPointTypeFactory intentAttachPointFactory = new DefaultIntentAttachPointTypeFactory();
Modified: incubator/tuscany/java/sca/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java?rev=651130&r1=651129&r2=651130&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java Wed Apr 23 18:38:53 2008
@@ -131,7 +131,7 @@
assertNotNull(policySetTable.get(secureMessagingPolicies));
assertEquals(policySetTable.get(secureMessagingPolicies).getMappedPolicies().size(), 3);
- assertTrue(policySetTable.get(secureWsPolicy).getPolicies().get(0) instanceof org.apache.neethi.Policy);
+ //assertTrue(policySetTable.get(secureWsPolicy).getPolicies().get(0) instanceof org.apache.neethi.Policy);
assertEquals(bindingTypesTable.size(), 1);
assertNotNull(bindingTypesTable.get(wsBinding));
Modified: incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml?rev=651130&r1=651129&r2=651130&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml Wed Apr 23 18:38:53 2008
@@ -300,7 +300,17 @@
<groupId>net.sourceforge.serp</groupId>
<artifactId>serp</artifactId>
<version>1.12.0</version>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>2.7.0</version>
+ </dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-xml/pom.xml?rev=651130&r1=651129&r2=651130&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/pom.xml Wed Apr 23 18:38:53 2008
@@ -58,6 +58,20 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-policy-xml</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-policy-xml-ws</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-definitions-xml</artifactId>
<version>${version}</version>
<scope>test</scope>
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java?rev=651130&r1=651129&r2=651130&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java Wed Apr 23 18:38:53 2008
@@ -57,6 +57,7 @@
import org.apache.tuscany.sca.policy.PolicyFactory;
import org.apache.tuscany.sca.policy.PolicySet;
import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
+import org.apache.tuscany.sca.policy.xml.WSPolicyProcessor;
/**
* Test reading Java implementations.
@@ -86,6 +87,7 @@
mapper = new InterfaceContractMapperImpl();
inputFactory = XMLInputFactory.newInstance();
staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint(modelFactories);
+ staxProcessors.addArtifactProcessor(new WSPolicyProcessor());
staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, XMLInputFactory.newInstance(), XMLOutputFactory.newInstance());
intentAttachPointTypeFactory = new DefaultIntentAttachPointTypeFactory();
Propchange: incubator/tuscany/java/sca/modules/policy-security-ws/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Apr 23 18:38:53 2008
@@ -0,0 +1,18 @@
+dojo
+work
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+derby.log
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+.felix
+
Copied: incubator/tuscany/java/sca/modules/policy-security-ws/pom.xml (from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy-security-ws/pom.xml?p2=incubator/tuscany/java/sca/modules/policy-security-ws/pom.xml&p1=incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/pom.xml&r1=644060&r2=651130&rev=651130&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/policy-security-ws/pom.xml Wed Apr 23 18:38:53 2008
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-modules</artifactId>
- <version>1.2-incubating-SNAPSHOT</version>
+ <version>2.0-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>tuscany-policy-security-ws</artifactId>
@@ -32,19 +32,19 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-contribution</artifactId>
- <version>1.2-incubating-SNAPSHOT</version>
+ <version>2.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-assembly-xml</artifactId>
- <version>1.2-incubating-SNAPSHOT</version>
+ <version>2.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-policy-security</artifactId>
- <version>1.2-incubating-SNAPSHOT</version>
+ <version>2.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
@@ -107,7 +107,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-contribution-impl</artifactId>
- <version>1.2-incubating-SNAPSHOT</version>
+ <version>2.0-incubating-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: incubator/tuscany/java/sca/modules/policy-security/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy-security/pom.xml?rev=651130&r1=651129&r2=651130&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/policy-security/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/policy-security/pom.xml Wed Apr 23 18:38:53 2008
@@ -29,39 +29,6 @@
<name>Apache Tuscany Security Policy Model</name>
<dependencies>
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-api</artifactId>
- <exclusions>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- <version>1.2.5</version>
- </dependency>
-
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.8.1</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-impl</artifactId>
- <version>1.2.5</version>
- </dependency>
-
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-contribution</artifactId>
@@ -73,29 +40,7 @@
<artifactId>tuscany-assembly-xml</artifactId>
<version>2.0-incubating-SNAPSHOT</version>
</dependency>
-
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-kernel</artifactId>
- <version>1.3</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.neethi</groupId>
- <artifactId>neethi</artifactId>
- <version>2.0.2</version>
- <exclusions>
- <exclusion>
- <groupId>wsdl4j</groupId>
- <artifactId>wsdl4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-contribution-impl</artifactId>
Modified: incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityPolicyDefinitionsProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityPolicyDefinitionsProvider.java?rev=651130&r1=651129&r2=651130&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityPolicyDefinitionsProvider.java (original)
+++ incubator/tuscany/java/sca/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityPolicyDefinitionsProvider.java Wed Apr 23 18:38:53 2008
@@ -57,6 +57,7 @@
});
URI uri = new URI(definitionsFile);
+
scaDefns = (SCADefinitions)urlArtifactProcessor.read(null,
uri,
definitionsFileUrl);
Modified: incubator/tuscany/java/sca/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=651130&r1=651129&r2=651130&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (original)
+++ incubator/tuscany/java/sca/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor Wed Apr 23 18:38:53 2008
@@ -16,11 +16,4 @@
# under the License.
# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.policy.security.ws.Axis2ConfigParamPolicyProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#wsConfigParam,model=org.apache.tuscany.sca.policy.security.ws.Axis2ConfigParamPolicy
-org.apache.tuscany.sca.policy.security.jaas.JaasAuthenticationPolicyProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#jaasAuthentication,model=org.apache.tuscany.sca.policy.security.jaas.JaasAuthenticationPolicy
-org.apache.tuscany.sca.policy.authorization.AuthorizationPolicyProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#authorization,model=org.apache.tuscany.sca.policy.authorization.AuthorizationPolicy
-org.apache.tuscany.sca.policy.authorization.AuthorizationPolicyProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#allow,model=org.apache.tuscany.sca.policy.authorization.AuthorizationPolicy
-org.apache.tuscany.sca.policy.authorization.AuthorizationPolicyProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#permitAll,model=org.apache.tuscany.sca.policy.authorization.AuthorizationPolicy
-org.apache.tuscany.sca.policy.authorization.AuthorizationPolicyProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#denyAll,model=org.apache.tuscany.sca.policy.authorization.AuthorizationPolicy
-org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicyProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#securityIdentity,model=org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicy
-org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicyProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#runAs,model=org.apache.tuscany.sca.policy.identity.SecurityIdentityPolicy
\ No newline at end of file
+org.apache.tuscany.sca.policy.security.jaas.JaasAuthenticationPolicyProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#jaasAuthentication,model=org.apache.tuscany.sca.policy.security.jaas.JaasAuthenticationPolicy
\ No newline at end of file
Propchange: incubator/tuscany/java/sca/modules/policy-xml-ws/
------------------------------------------------------------------------------
--- svn-ignore (added)
+++ svn-ignore Wed Apr 23 18:38:53 2008
@@ -0,0 +1,19 @@
+target
+work
+dojo
+*.iws
+*.ipr
+*.iml
+derby.log
+maven.log
+build.xml
+build-dependency.xml
+velocity.log*
+junit*.properties
+surefire*.properties
+.project
+.classpath
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
Copied: incubator/tuscany/java/sca/modules/policy-xml-ws/pom.xml (from r644060, incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy-xml-ws/pom.xml?p2=incubator/tuscany/java/sca/modules/policy-xml-ws/pom.xml&p1=incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/pom.xml&r1=644060&r2=651130&rev=651130&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/policy-xml-ws/pom.xml Wed Apr 23 18:38:53 2008
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-modules</artifactId>
- <version>1.2-incubating-SNAPSHOT</version>
+ <version>2.0-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>tuscany-policy-xml-ws</artifactId>
@@ -32,19 +32,19 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-policy</artifactId>
- <version>1.2-incubating-SNAPSHOT</version>
+ <version>2.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-policy-xml</artifactId>
- <version>1.2-incubating-SNAPSHOT</version>
+ <version>2.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-contribution</artifactId>
- <version>1.2-incubating-SNAPSHOT</version>
+ <version>2.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
Modified: incubator/tuscany/java/sca/modules/policy-xml/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy-xml/pom.xml?rev=651130&r1=651129&r2=651130&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/policy-xml/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/policy-xml/pom.xml Wed Apr 23 18:38:53 2008
@@ -41,7 +41,7 @@
<version>2.0-incubating-SNAPSHOT</version>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-api</artifactId>
<version>1.2.5</version>
@@ -95,7 +95,7 @@
<artifactId>mail</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.codehaus.woodstox</groupId>
@@ -104,7 +104,7 @@
<scope>runtime</scope>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1</version>
@@ -115,6 +115,6 @@
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency-->
</dependencies>
</project>
Modified: incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java?rev=651130&r1=651129&r2=651130&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java (original)
+++ incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java Wed Apr 23 18:38:53 2008
@@ -46,10 +46,7 @@
String REQUIRES = "requires";
String EXCLUDES = "excludes";
String DEFAULT = "default";
-
- String WS_POLICY_NS = "http://schemas.xmlsoap.org/ws/2004/09/policy";
- String WS_POLICY = "Policy";
-
+
String ALWAYS_PROVIDES = "alwaysProvides";
String MAY_PROVIDE = "mayProvide";
String TYPE = "type";
@@ -67,7 +64,6 @@
QName DESCRIPTION_QNAME = new QName(SCA10_NS, DESCRIPTION);
QName POLICY_INTENT_MAP_QUALIFIER_QNAME = new QName(SCA10_NS, INTENT_MAP_QUALIFIER);
QName POLICY_SET_REFERENCE_QNAME = new QName(SCA10_NS, POLICY_SET_REFERENCE);
- QName WS_POLICY_QNAME = new QName(WS_POLICY_NS, WS_POLICY);
String QUALIFIED_INTENT_CONSTRAINS_ERROR = " - Qualified Intents must not specify 'constrains' attribute";
Modified: incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java?rev=651130&r1=651129&r2=651130&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java Wed Apr 23 18:38:53 2008
@@ -29,7 +29,6 @@
import java.util.StringTokenizer;
import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
@@ -37,12 +36,6 @@
import javax.xml.xpath.XPathExpressionException;
import javax.xml.xpath.XPathFactory;
-import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMNamespace;
-import org.apache.neethi.Policy;
-import org.apache.neethi.PolicyEngine;
import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
@@ -131,11 +124,11 @@
PolicySet referredPolicySet = policyFactory.createPolicySet();
referredPolicySet.setName(getQName(reader, NAME));
policySet.getReferencedPolicySets().add(referredPolicySet);
- } else if ( WS_POLICY_QNAME.equals(name) ) {
+ } /*else if ( WS_POLICY_QNAME.equals(name) ) {
OMElement policyElement = loadElement(reader);
org.apache.neethi.Policy wsPolicy = PolicyEngine.getPolicy(policyElement);
policySet.getPolicies().add(wsPolicy);
- } else {
+ } */ else {
Object extension = extensionProcessor.read(reader);
if ( extension != null ) {
policySet.getPolicies().add(extension);
@@ -195,7 +188,7 @@
providedIntent + " does not match parent qualifier " + qualifierName +
" in policyset - " + policySet);
}
- } else if ( WS_POLICY_QNAME.equals(name) ) {
+ }/* else if ( WS_POLICY_QNAME.equals(name) ) {
OMElement policyElement = loadElement(reader);
Policy wsPolicy = PolicyEngine.getPolicy(policyElement);
policySet.getPolicies().add(wsPolicy);
@@ -210,7 +203,7 @@
}
}
policyList.add((Policy)wsPolicy);
- } else {
+ }*/ else {
Object extension = extensionProcessor.read(reader);
if ( extension != null ) {
List<Object> policyList = mappedPolicies.get(qualifiedIntent);
@@ -320,64 +313,6 @@
public Class<PolicySet> getModelType() {
return PolicySet.class;
- }
-
- private OMElement loadElement(XMLStreamReader reader) throws XMLStreamException {
- OMFactory fac = OMAbstractFactory.getOMFactory();
- OMElement head = fac.createOMElement(reader.getName());
- OMElement current = head;
-
- while (true) {
- switch (reader.next()) {
- case XMLStreamConstants.START_ELEMENT:
- QName name = reader.getName();
- OMElement child = fac.createOMElement(name, current);
-
- int count = reader.getNamespaceCount();
- for (int i = 0; i < count; i++) {
- String prefix = reader.getNamespacePrefix(i);
- String ns = reader.getNamespaceURI(i);
- child.declareNamespace(ns, prefix);
- }
-
- if(!"".equals(name.getNamespaceURI())) {
- child.declareNamespace(name.getNamespaceURI(), name.getPrefix());
- }
-
- // add the attributes for this element
- count = reader.getAttributeCount();
- for (int i = 0; i < count; i++) {
- OMNamespace omNs = null;
- String ns = reader.getAttributeNamespace(i);
- String prefix = reader.getAttributePrefix(i);
- String qname = reader.getAttributeLocalName(i);
- String value = reader.getAttributeValue(i);
-
- if ( ns != null ) {
- omNs = fac.createOMNamespace(ns, prefix);
- }
-
- child.addAttribute(qname, value, omNs);
- if (ns != null) {
- child.declareNamespace(ns, prefix);
- }
- }
- current = child;
- break;
- case XMLStreamConstants.CDATA:
- fac.createOMText(current, reader.getText());
- break;
- case XMLStreamConstants.CHARACTERS:
- fac.createOMText(current, reader.getText());
- break;
- case XMLStreamConstants.END_ELEMENT:
- if ( current == head ) {
- return head;
- } else {
- current = (OMElement)current.getParent();
- }
- }
- }
}
private void resolveProvidedIntents(PolicySet policySet, ModelResolver resolver) throws ContributionResolveException {
Modified: incubator/tuscany/java/sca/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java?rev=651130&r1=651129&r2=651130&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java Wed Apr 23 18:38:53 2008
@@ -33,7 +33,6 @@
import junit.framework.TestCase;
-import org.apache.neethi.Policy;
import org.apache.tuscany.sca.contribution.DefaultModelFactoryExtensionPoint;
import org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
@@ -69,7 +68,6 @@
public static final String scaNamespace = "http://www.osoa.org/xmlns/sca/1.0";
public static final String namespace = "http://test";
- private static final QName secureWsPolicy = new QName(namespace, "SecureWSPolicy");
private static final QName confidentiality = new QName(namespace, "confidentiality");
private static final QName integrity = new QName(namespace, "integrity");
private static final QName messageProtection = new QName(namespace, "messageProtection");
@@ -163,7 +161,6 @@
assertNotNull(policySetTable.get(secureMessagingPolicies));
assertEquals(policySetTable.get(secureMessagingPolicies).getMappedPolicies().size(), 3);
- assertTrue(policySetTable.get(secureWsPolicy).getPolicies().get(0) instanceof Policy);
assertEquals(bindingTypesTable.size(), 1);
assertNotNull(bindingTypesTable.get(wsBinding));
Modified: incubator/tuscany/java/sca/modules/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/pom.xml?rev=651130&r1=651129&r2=651130&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/pom.xml Wed Apr 23 18:38:53 2008
@@ -137,12 +137,12 @@
<module>osgi-runtime</module>
<module>policy</module>
<module>policy-xml</module>
+ <module>policy-xml-ws</module>
<module>policy-logging</module>
<module>policy-security</module>
+ <module>policy-security-ws</module>
<module>policy-transaction</module>
<module>runtime</module>
- <!-- module>runtime-geronimo</module -->
- <!-- module>runtime-standalone</module -->
<module>runtime-tomcat</module>
<module>runtime-war</module>
<module>sca-api</module>