Return-Path: Delivered-To: apmail-ws-tuscany-commits-archive@locus.apache.org Received: (qmail 74386 invoked from network); 2 Apr 2008 21:06:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Apr 2008 21:06:54 -0000 Received: (qmail 55133 invoked by uid 500); 2 Apr 2008 21:06:48 -0000 Delivered-To: apmail-ws-tuscany-commits-archive@ws.apache.org Received: (qmail 55090 invoked by uid 500); 2 Apr 2008 21:06:48 -0000 Mailing-List: contact tuscany-commits-help@ws.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: tuscany-dev@ws.apache.org Delivered-To: mailing list tuscany-commits@ws.apache.org Received: (qmail 55064 invoked by uid 99); 2 Apr 2008 21:06:48 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Apr 2008 14:06:48 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Apr 2008 21:05:51 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 625011A9832; Wed, 2 Apr 2008 14:06:09 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r644060 [1/2] - in /incubator/tuscany/branches/sca-java-1.2/modules: ./ assembly-xml/ assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ binding-ws-axis2/ definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/ de... Date: Wed, 02 Apr 2008 21:06:05 -0000 To: tuscany-commits@ws.apache.org From: lresende@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080402210609.625011A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: lresende Date: Wed Apr 2 14:06:01 2008 New Revision: 644060 URL: http://svn.apache.org/viewvc?rev=644060&view=rev Log: TUSCANY-2167 - Cleaning sample dependencies - Breaking policy and policy-ws dependencies Added: incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/ - copied from r643679, incubator/tuscany/branches/sca-java-1.2/modules/policy-security/ incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/DISCLAIMER - copied unchanged from r643970, incubator/tuscany/branches/sca-java-1.2/modules/policy-security/DISCLAIMER incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/LICENSE - copied unchanged from r643970, incubator/tuscany/branches/sca-java-1.2/modules/policy-security/LICENSE incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/NOTICE - copied unchanged from r643970, incubator/tuscany/branches/sca-java-1.2/modules/policy-security/NOTICE incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/pom.xml - copied, changed from r643970, incubator/tuscany/branches/sca-java-1.2/modules/policy-security/pom.xml incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/ - copied from r643970, incubator/tuscany/branches/sca-java-1.2/modules/policy-security/src/ incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/ (with props) incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/DISCLAIMER (with props) incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/LICENSE (with props) incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/NOTICE (with props) incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/pom.xml (with props) incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/ incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/main/ incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/main/java/ incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/main/java/org/ incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/main/java/org/apache/ incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/main/java/org/apache/tuscany/ incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/ incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/ incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/ incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessor.java (with props) incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/main/resources/ incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/main/resources/META-INF/ incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/main/resources/META-INF/services/ 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/branches/sca-java-1.2/modules/policy-xml-ws/src/test/ incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/java/ incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/java/org/ incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/java/org/apache/ incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/java/org/apache/tuscany/ incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/ incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/ incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/ incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/MockPolicyProcessor.java (with props) incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java (with props) incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessorTestCase.java (with props) incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/resources/ incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/resources/org/ incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/resources/org/apache/ incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/ incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/ incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/ incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/ incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml (with props) Removed: incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/main/java/org/ incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/main/resources/org/ incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/main/resources/policy_definitions.xml incubator/tuscany/branches/sca-java-1.2/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/ws/ incubator/tuscany/branches/sca-java-1.2/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler incubator/tuscany/branches/sca-java-1.2/modules/policy-security/src/main/resources/policy_definitions.xml incubator/tuscany/branches/sca-java-1.2/modules/policy-security/src/test/java/org/ Modified: incubator/tuscany/branches/sca-java-1.2/modules/assembly-xml/pom.xml incubator/tuscany/branches/sca-java-1.2/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java incubator/tuscany/branches/sca-java-1.2/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java incubator/tuscany/branches/sca-java-1.2/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java incubator/tuscany/branches/sca-java-1.2/modules/binding-ws-axis2/pom.xml incubator/tuscany/branches/sca-java-1.2/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.java incubator/tuscany/branches/sca-java-1.2/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java incubator/tuscany/branches/sca-java-1.2/modules/implementation-bpel/pom.xml incubator/tuscany/branches/sca-java-1.2/modules/implementation-java-xml/pom.xml incubator/tuscany/branches/sca-java-1.2/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java incubator/tuscany/branches/sca-java-1.2/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java 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/branches/sca-java-1.2/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler 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/branches/sca-java-1.2/modules/policy-security/pom.xml incubator/tuscany/branches/sca-java-1.2/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityPolicyDefinitionsProvider.java incubator/tuscany/branches/sca-java-1.2/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor incubator/tuscany/branches/sca-java-1.2/modules/policy-xml/pom.xml incubator/tuscany/branches/sca-java-1.2/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java incubator/tuscany/branches/sca-java-1.2/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java incubator/tuscany/branches/sca-java-1.2/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java incubator/tuscany/branches/sca-java-1.2/modules/pom.xml Modified: incubator/tuscany/branches/sca-java-1.2/modules/assembly-xml/pom.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/assembly-xml/pom.xml?rev=644060&r1=644059&r2=644060&view=diff ============================================================================== --- incubator/tuscany/branches/sca-java-1.2/modules/assembly-xml/pom.xml (original) +++ incubator/tuscany/branches/sca-java-1.2/modules/assembly-xml/pom.xml Wed Apr 2 14:06:01 2008 @@ -34,17 +34,16 @@ tuscany-assembly 1.2-incubating-SNAPSHOT - + org.apache.tuscany.sca - tuscany-definitions-xml + tuscany-definitions 1.2-incubating-SNAPSHOT - test - + org.apache.tuscany.sca - tuscany-definitions + tuscany-policy 1.2-incubating-SNAPSHOT @@ -65,52 +64,54 @@ tuscany-contribution-java 1.2-incubating-SNAPSHOT - + - org.apache.tuscany.sca - tuscany-contribution-impl - 1.2-incubating-SNAPSHOT - test + stax + stax-api + 1.0.1 - + - org.apache.tuscany.sca - tuscany-policy - 1.2-incubating-SNAPSHOT + org.codehaus.woodstox + wstx-asl + 3.2.1 + runtime + org.apache.tuscany.sca - tuscany-policy-xml + tuscany-definitions-xml 1.2-incubating-SNAPSHOT test - stax - stax-api - 1.0.1 + org.apache.tuscany.sca + tuscany-policy-xml + 1.2-incubating-SNAPSHOT + test - + - org.codehaus.woodstox - wstx-asl - 3.2.1 - runtime + org.apache.tuscany.sca + tuscany-policy-xml-ws + 1.2-incubating-SNAPSHOT + test - + - xalan - xalan - 2.7.0 + org.apache.tuscany.sca + tuscany-assembly-xsd + 1.2-incubating-SNAPSHOT + test org.apache.tuscany.sca - tuscany-assembly-xsd + tuscany-contribution-impl 1.2-incubating-SNAPSHOT test - Modified: incubator/tuscany/branches/sca-java-1.2/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java?rev=644060&r1=644059&r2=644060&view=diff ============================================================================== --- incubator/tuscany/branches/sca-java-1.2/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java (original) +++ incubator/tuscany/branches/sca-java-1.2/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java Wed Apr 2 14:06:01 2008 @@ -43,8 +43,6 @@ import org.apache.tuscany.sca.definitions.SCADefinitions; import org.apache.tuscany.sca.definitions.xml.SCADefinitionsDocumentProcessor; import org.apache.tuscany.sca.definitions.xml.SCADefinitionsProcessor; -import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper; -import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl; import org.apache.tuscany.sca.policy.DefaultPolicyFactory; import org.apache.tuscany.sca.policy.PolicyFactory; import org.apache.tuscany.sca.policy.PolicySetAttachPoint; @@ -52,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. @@ -85,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/branches/sca-java-1.2/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java?rev=644060&r1=644059&r2=644060&view=diff ============================================================================== --- incubator/tuscany/branches/sca-java-1.2/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java (original) +++ incubator/tuscany/branches/sca-java-1.2/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java Wed Apr 2 14:06:01 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/branches/sca-java-1.2/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java?rev=644060&r1=644059&r2=644060&view=diff ============================================================================== --- incubator/tuscany/branches/sca-java-1.2/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java (original) +++ incubator/tuscany/branches/sca-java-1.2/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java Wed Apr 2 14:06:01 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/branches/sca-java-1.2/modules/binding-ws-axis2/pom.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/binding-ws-axis2/pom.xml?rev=644060&r1=644059&r2=644060&view=diff ============================================================================== --- incubator/tuscany/branches/sca-java-1.2/modules/binding-ws-axis2/pom.xml (original) +++ incubator/tuscany/branches/sca-java-1.2/modules/binding-ws-axis2/pom.xml Wed Apr 2 14:06:01 2008 @@ -89,7 +89,13 @@ org.apache.tuscany.sca - tuscany-policy-security + tuscany-policy-xml-ws + 1.2-incubating-SNAPSHOT + + + + org.apache.tuscany.sca + tuscany-policy-security-ws 1.2-incubating-SNAPSHOT Modified: incubator/tuscany/branches/sca-java-1.2/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.java URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.java?rev=644060&r1=644059&r2=644060&view=diff ============================================================================== --- incubator/tuscany/branches/sca-java-1.2/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.java (original) +++ incubator/tuscany/branches/sca-java-1.2/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.java Wed Apr 2 14:06:01 2008 @@ -38,16 +38,11 @@ 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; -import org.apache.tuscany.sca.policy.Intent; import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory; import org.apache.tuscany.sca.policy.PolicyFactory; -import org.apache.tuscany.sca.policy.PolicySet; -import org.apache.tuscany.sca.policy.ProfileIntent; import org.apache.tuscany.sca.policy.xml.BindingTypeProcessor; import org.apache.tuscany.sca.policy.xml.ImplementationTypeProcessor; import org.apache.tuscany.sca.policy.xml.PolicySetProcessor; @@ -61,7 +56,7 @@ */ public class SCADefinitionsDocumentProcessor implements URLArtifactProcessor { private StAXArtifactProcessor 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 +75,7 @@ PolicyFactory policyFactory) { this.extensionProcessor = (StAXArtifactProcessor)staxProcessor; this.inputFactory = inputFactory; - definitionsBuilder = new SCADefinitionsBuilderImpl(); + //definitionsBuilder = new SCADefinitionsBuilderImpl(); this.scaDefinitionsResolver = new SCADefinitionsResolver(); IntentAttachPointTypeFactory intentAttachPointFactory = new DefaultIntentAttachPointTypeFactory(); Modified: incubator/tuscany/branches/sca-java-1.2/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java?rev=644060&r1=644059&r2=644060&view=diff ============================================================================== --- incubator/tuscany/branches/sca-java-1.2/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java (original) +++ incubator/tuscany/branches/sca-java-1.2/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java Wed Apr 2 14:06:01 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/branches/sca-java-1.2/modules/implementation-bpel/pom.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/implementation-bpel/pom.xml?rev=644060&r1=644059&r2=644060&view=diff ============================================================================== --- incubator/tuscany/branches/sca-java-1.2/modules/implementation-bpel/pom.xml (original) +++ incubator/tuscany/branches/sca-java-1.2/modules/implementation-bpel/pom.xml Wed Apr 2 14:06:01 2008 @@ -300,11 +300,21 @@ net.sourceforge.serp serp 1.12.0 - + + + jaxen + jaxen + 1.1.1 + + + xalan + xalan + 2.7.0 + xerces xercesImpl - 2.8.0 + 2.8.1 org.apache.xmlbeans Modified: incubator/tuscany/branches/sca-java-1.2/modules/implementation-java-xml/pom.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/implementation-java-xml/pom.xml?rev=644060&r1=644059&r2=644060&view=diff ============================================================================== --- incubator/tuscany/branches/sca-java-1.2/modules/implementation-java-xml/pom.xml (original) +++ incubator/tuscany/branches/sca-java-1.2/modules/implementation-java-xml/pom.xml Wed Apr 2 14:06:01 2008 @@ -58,6 +58,20 @@ org.apache.tuscany.sca + tuscany-policy-xml + ${version} + test + + + + org.apache.tuscany.sca + tuscany-policy-xml-ws + ${version} + test + + + + org.apache.tuscany.sca tuscany-definitions-xml ${version} test Modified: incubator/tuscany/branches/sca-java-1.2/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java?rev=644060&r1=644059&r2=644060&view=diff ============================================================================== --- incubator/tuscany/branches/sca-java-1.2/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java (original) +++ incubator/tuscany/branches/sca-java-1.2/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java Wed Apr 2 14:06:01 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(); Modified: incubator/tuscany/branches/sca-java-1.2/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java?rev=644060&r1=644059&r2=644060&view=diff ============================================================================== --- incubator/tuscany/branches/sca-java-1.2/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java (original) +++ incubator/tuscany/branches/sca-java-1.2/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java Wed Apr 2 14:06:01 2008 @@ -39,8 +39,6 @@ import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor; import org.apache.tuscany.sca.implementation.java.DefaultJavaImplementationFactory; import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory; -import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper; -import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl; import org.apache.tuscany.sca.policy.DefaultPolicyFactory; import org.apache.tuscany.sca.policy.PolicyFactory; Copied: incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/pom.xml (from r643970, incubator/tuscany/branches/sca-java-1.2/modules/policy-security/pom.xml) URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/pom.xml?p2=incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/pom.xml&p1=incubator/tuscany/branches/sca-java-1.2/modules/policy-security/pom.xml&r1=643970&r2=644060&rev=644060&view=diff ============================================================================== --- incubator/tuscany/branches/sca-java-1.2/modules/policy-security/pom.xml (original) +++ incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/pom.xml Wed Apr 2 14:06:01 2008 @@ -25,10 +25,28 @@ 1.2-incubating-SNAPSHOT ../pom.xml - tuscany-policy-security - Apache Tuscany Security Policy Model + tuscany-policy-security-ws + Apache Tuscany Security Policy WS Model - + + + org.apache.tuscany.sca + tuscany-contribution + 1.2-incubating-SNAPSHOT + + + + org.apache.tuscany.sca + tuscany-assembly-xml + 1.2-incubating-SNAPSHOT + + + + org.apache.tuscany.sca + tuscany-policy-security + 1.2-incubating-SNAPSHOT + + org.apache.ws.commons.axiom axiom-api @@ -62,17 +80,7 @@ 1.2.5 - - org.apache.tuscany.sca - tuscany-contribution - 1.2-incubating-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-assembly-xml - 1.2-incubating-SNAPSHOT - + org.apache.axis2 Modified: incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=644060&r1=643970&r2=644060&view=diff ============================================================================== --- incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (original) +++ incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor Wed Apr 2 14:06:01 2008 @@ -16,5 +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 \ No newline at end of file +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 \ No newline at end of file Modified: incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler?rev=644060&r1=643970&r2=644060&view=diff ============================================================================== --- incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler (original) +++ incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler Wed Apr 2 14:06:01 2008 @@ -17,7 +17,6 @@ # # PolicyHandlerClasses to interpret specific PolicyModels against specific QoS infrastructures # handler classname;intent=;model= -# org.apache.tuscany.sca.policy.security.jaas.JaasAuthenticationPolicyHandler;intent=http://tuscany.apache.org/xmlns/sca/1.0#jaasAuthentication,model=org.apache.tuscany.sca.policy.security.jaas.JaasAuthenticationPolicy org.apache.tuscany.sca.policy.security.ws.Axis2ConfigParamPolicyHandler;intent=http://www.osoa.org/xmlns/sca/1.0#authentication,model=org.apache.tuscany.sca.policy.security.ws.Axis2ConfigParamPolicy org.apache.tuscany.sca.policy.security.ws.WSSecurityPolicyHandler;intent=http://www.osoa.org/xmlns/sca/1.0#authentication,model=org.apache.neethi.Policy org.apache.tuscany.sca.policy.security.ws.Axis2ConfigParamPolicyHandler;intent=http://www.osoa.org/xmlns/sca/1.0#integrity,model=org.apache.tuscany.sca.policy.security.ws.Axis2ConfigParamPolicy Modified: incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory?rev=644060&r1=643970&r2=644060&view=diff ============================================================================== --- incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory (original) +++ incubator/tuscany/branches/sca-java-1.2/modules/policy-security-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory Wed Apr 2 14:06:01 2008 @@ -16,4 +16,3 @@ # under the License. # Implementation class for the policy extension -org.apache.tuscany.sca.policy.security.jaas.JaasAuthenticationPolicyProviderFactory;model=org.apache.tuscany.sca.policy.security.jaas.JaasAuthenticationPolicy Modified: incubator/tuscany/branches/sca-java-1.2/modules/policy-security/pom.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/policy-security/pom.xml?rev=644060&r1=644059&r2=644060&view=diff ============================================================================== --- incubator/tuscany/branches/sca-java-1.2/modules/policy-security/pom.xml (original) +++ incubator/tuscany/branches/sca-java-1.2/modules/policy-security/pom.xml Wed Apr 2 14:06:01 2008 @@ -29,39 +29,6 @@ Apache Tuscany Security Policy Model - - org.apache.ws.commons.axiom - axiom-api - - - xerces - xercesImpl - - - javax.mail - mail - - - commons-logging - commons-logging - - - 1.2.5 - - - - xerces - xercesImpl - 2.8.1 - runtime - - - - org.apache.ws.commons.axiom - axiom-impl - 1.2.5 - - org.apache.tuscany.sca tuscany-contribution @@ -73,29 +40,7 @@ tuscany-assembly-xml 1.2-incubating-SNAPSHOT - - - org.apache.axis2 - axis2-kernel - 1.3 - - - - org.apache.neethi - neethi - 2.0.2 - - - wsdl4j - wsdl4j - - - org.codehaus.woodstox - wstx-asl - - - - + org.apache.tuscany.sca tuscany-contribution-impl Modified: incubator/tuscany/branches/sca-java-1.2/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityPolicyDefinitionsProvider.java URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityPolicyDefinitionsProvider.java?rev=644060&r1=644059&r2=644060&view=diff ============================================================================== --- incubator/tuscany/branches/sca-java-1.2/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityPolicyDefinitionsProvider.java (original) +++ incubator/tuscany/branches/sca-java-1.2/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityPolicyDefinitionsProvider.java Wed Apr 2 14:06:01 2008 @@ -22,7 +22,6 @@ import java.net.URI; import java.net.URL; -import org.apache.tuscany.sca.contribution.processor.ExtensibleURLArtifactProcessor; import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor; import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint; import org.apache.tuscany.sca.core.ExtensionPointRegistry; @@ -47,9 +46,7 @@ Object scaDefn = null; try { URI uri = new URI(definitionsFile); - return (SCADefinitions)urlArtifactProcessor.read(null, - uri, - defintionsFileUrl); + return (SCADefinitions)urlArtifactProcessor.read(null, uri, defintionsFileUrl); } catch ( Exception e ) { throw new SCADefinitionsProviderException(e); } Modified: incubator/tuscany/branches/sca-java-1.2/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=644060&r1=644059&r2=644060&view=diff ============================================================================== --- incubator/tuscany/branches/sca-java-1.2/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (original) +++ incubator/tuscany/branches/sca-java-1.2/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor Wed Apr 2 14:06:01 2008 @@ -16,5 +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 Propchange: incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/ ------------------------------------------------------------------------------ --- svn-ignore (added) +++ svn-ignore Wed Apr 2 14:06:01 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 Added: incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/DISCLAIMER URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/DISCLAIMER?rev=644060&view=auto ============================================================================== --- incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/DISCLAIMER (added) +++ incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/DISCLAIMER Wed Apr 2 14:06:01 2008 @@ -0,0 +1,8 @@ +Apache Tuscany is an effort undergoing incubation at The Apache Software +Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is +required of all newly accepted projects until a further review indicates that +the infrastructure, communications, and decision making process have stabilized +in a manner consistent with other successful ASF projects. While incubation +status is not necessarily a reflection of the completeness or stability of the +code, it does indicate that the project has yet to be fully endorsed by the ASF. + Propchange: incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/DISCLAIMER ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/DISCLAIMER ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/LICENSE URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/LICENSE?rev=644060&view=auto ============================================================================== --- incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/LICENSE (added) +++ incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/LICENSE Wed Apr 2 14:06:01 2008 @@ -0,0 +1,205 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + + Propchange: incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/LICENSE ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/LICENSE ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/NOTICE URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/NOTICE?rev=644060&view=auto ============================================================================== --- incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/NOTICE (added) +++ incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/NOTICE Wed Apr 2 14:06:01 2008 @@ -0,0 +1,6 @@ +${pom.name} +Copyright (c) 2005 - 2008 The Apache Software Foundation + +This product includes software developed by +The Apache Software Foundation (http://www.apache.org/). + Propchange: incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/NOTICE ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/NOTICE ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/pom.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/pom.xml?rev=644060&view=auto ============================================================================== --- incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/pom.xml (added) +++ incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/pom.xml Wed Apr 2 14:06:01 2008 @@ -0,0 +1,126 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + tuscany-modules + 1.2-incubating-SNAPSHOT + ../pom.xml + + tuscany-policy-xml-ws + Apache Tuscany SCA Policy XML WS Model + + + + org.apache.tuscany.sca + tuscany-policy + 1.2-incubating-SNAPSHOT + + + + org.apache.tuscany.sca + tuscany-policy-xml + 1.2-incubating-SNAPSHOT + + + + org.apache.tuscany.sca + tuscany-contribution + 1.2-incubating-SNAPSHOT + + + + org.apache.ws.commons.axiom + axiom-api + 1.2.5 + + + xerces + xercesImpl + + + javax.mail + mail + + + commons-logging + commons-logging + + + + + + xerces + xercesImpl + 2.8.1 + runtime + + + + org.apache.neethi + neethi + 2.0.2 + + + wsdl4j + wsdl4j + + + org.codehaus.woodstox + wstx-asl + + + + + + org.apache.ws.commons.axiom + axiom-impl + 1.2.5 + runtime + + + javax.mail + mail + + + + + + org.codehaus.woodstox + wstx-asl + 3.2.1 + runtime + + + + commons-logging + commons-logging + 1.1 + runtime + + + commons-logging + commons-logging + + + + + Propchange: incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/pom.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/pom.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessor.java URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessor.java?rev=644060&view=auto ============================================================================== --- incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessor.java (added) +++ incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessor.java Wed Apr 2 14:06:01 2008 @@ -0,0 +1,158 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.tuscany.sca.policy.xml; + +import static javax.xml.stream.XMLStreamConstants.END_ELEMENT; +import static javax.xml.stream.XMLStreamConstants.START_ELEMENT; + +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; + +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.PolicyEngine; +import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; +import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor; +import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; +import org.apache.tuscany.sca.contribution.resolver.ModelResolver; +import org.apache.tuscany.sca.contribution.service.ContributionReadException; +import org.apache.tuscany.sca.contribution.service.ContributionResolveException; +import org.apache.tuscany.sca.contribution.service.ContributionWriteException; + + +/* + * Processor for handling xml models of PolicySet definitions + */ +public class WSPolicyProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor, PolicyConstants { + public final static String WS_POLICY_NS = "http://schemas.xmlsoap.org/ws/2004/09/policy"; + public final static String WS_POLICY = "Policy"; + + public final static QName WS_POLICY_QNAME =new QName(WS_POLICY_NS, WS_POLICY); + + public WSPolicyProcessor() { + System.out.println(">>>Initializing WSPolicyProcessor"); + } + + public WSPolicyProcessor(ModelFactoryExtensionPoint modelFactories) { + System.out.println(">>>Initializing WSPolicyProcessor"); + } + + public QName getArtifactType() { + return WS_POLICY_QNAME; + } + + public Class getModelType() { + return org.apache.neethi.Policy.class; + } + + public org.apache.neethi.Policy read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException { + org.apache.neethi.Policy wsPolicy = null; + + int event = reader.getEventType(); + if (event == START_ELEMENT) { + QName name = reader.getName(); + if (WS_POLICY_QNAME.equals(name)) { + OMElement policyElement = loadElement(reader); + wsPolicy = PolicyEngine.getPolicy(policyElement); + } + } + return wsPolicy; + } + + public void write(org.apache.neethi.Policy wsPolicy, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException { + + // Write an + writer.writeStartElement(WS_POLICY_NS, WS_POLICY); + + //FIXME write proper ws-policy stuff here + + writer.writeEndElement(); + } + + public void resolve(org.apache.neethi.Policy wsPolicy, ModelResolver resolver) throws ContributionResolveException { + + } + + + 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(); + } + } + } + } + + + } Propchange: incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessor.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessor.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Added: incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=644060&view=auto ============================================================================== --- incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (added) +++ incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor Wed Apr 2 14:06:01 2008 @@ -0,0 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +# Implementation class for the artifact processor extension +org.apache.tuscany.sca.policy.xml.WSPolicyProcessor;qname=http://schemas.xmlsoap.org/ws/2004/09/policy#Policy,model=org.apache.neethi.Policy Added: incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/MockPolicyProcessor.java URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/MockPolicyProcessor.java?rev=644060&view=auto ============================================================================== --- incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/MockPolicyProcessor.java (added) +++ incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/MockPolicyProcessor.java Wed Apr 2 14:06:01 2008 @@ -0,0 +1,74 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.tuscany.sca.policy.xml; + +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamReader; +import javax.xml.stream.XMLStreamWriter; + +import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; +import org.apache.tuscany.sca.contribution.resolver.ModelResolver; +import org.apache.tuscany.sca.contribution.service.ContributionReadException; +import org.apache.tuscany.sca.contribution.service.ContributionResolveException; +import org.apache.tuscany.sca.contribution.service.ContributionWriteException; +import org.apache.tuscany.sca.policy.Policy; + +/** + * @author administrator + * + */ +public class MockPolicyProcessor implements StAXArtifactProcessor { + + public QName getArtifactType() { + return new QName("http://schemas.xmlsoap.org/ws/2004/09/policy", "PolicyAttachment"); + } + + public Policy read(XMLStreamReader arg0) throws ContributionReadException, XMLStreamException { + return new MockPolicyImplOne(); + } + + public void write(Policy arg0, XMLStreamWriter arg1) throws ContributionWriteException, + XMLStreamException { + } + + public Class getModelType() { + // TODO Auto-generated method stub + return Policy.class; + } + + public void resolve(Policy arg0, ModelResolver arg1) throws ContributionResolveException { + + } + + + public class MockPolicyImplOne implements Policy { + public QName getSchemaName() { + return new QName("http://schemas.xmlsoap.org/ws/2004/09/policy", "PolicyAttachment"); + } + + public boolean isUnresolved() { + return false; + } + + public void setUnresolved(boolean unresolved) { + } + + } +} Propchange: incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/MockPolicyProcessor.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/MockPolicyProcessor.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Added: incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java?rev=644060&view=auto ============================================================================== --- incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java (added) +++ incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java Wed Apr 2 14:06:01 2008 @@ -0,0 +1,63 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.tuscany.sca.policy.xml; + +import java.util.HashMap; +import java.util.Map; + +import org.apache.tuscany.sca.contribution.resolver.ModelResolver; + + +/** + * A default implementation of an artifact resolver, based on a map. + * + * @version $Rev$ $Date$ + */ +public class TestModelResolver implements ModelResolver { + private static final long serialVersionUID = -7826976465762296634L; + + private Map map = new HashMap(); + + public TestModelResolver() { + } + + public T resolveModel(Class modelClass, T unresolved) { + Object resolved = map.get(unresolved); + if (resolved != null) { + + // Return the resolved object + return modelClass.cast(resolved); + + } else { + + // Return the unresolved object + return unresolved; + } + } + + public void addModel(Object resolved) { + map.put(resolved, resolved); + } + + public Object removeModel(Object resolved) { + return map.remove(resolved); + } + +} Propchange: incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Added: incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessorTestCase.java URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessorTestCase.java?rev=644060&view=auto ============================================================================== --- incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessorTestCase.java (added) +++ incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessorTestCase.java Wed Apr 2 14:06:01 2008 @@ -0,0 +1,114 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.tuscany.sca.policy.xml; + +import static javax.xml.stream.XMLStreamConstants.START_ELEMENT; + +import java.io.StringReader; + +import javax.xml.namespace.QName; +import javax.xml.stream.XMLInputFactory; +import javax.xml.stream.XMLStreamReader; + +import junit.framework.TestCase; + +/** + * Test reading SCA XML assembly documents. + * + * @version $Rev$ $Date$ + */ +public class WSPolicyProcessorTestCase extends TestCase { + + private static final String VALID_WS_POLICY = + "" + + "" + + " " + + " " + + " " + + " " + + " " + + " " + + " sp:X509v3" + + " " + + " " + + " " + + " " + + " " + + " " + + " " + + " " + + " " + + " " + + " " + + " " + + " " + + " "; + + private XMLInputFactory xmlInputFactory; + + @Override + public void setUp() throws Exception { + xmlInputFactory = XMLInputFactory.newInstance(); + + } + + @Override + public void tearDown() throws Exception { + + } + + public void testReadWsPolicy() throws Exception { + XMLStreamReader reader = xmlInputFactory.createXMLStreamReader(new StringReader(VALID_WS_POLICY)); + WSPolicyProcessor processor = new WSPolicyProcessor(); + Object artifact = null; + + QName name = null; + reader.next(); + while ( true ) { + int event = reader.getEventType(); + switch (event) { + case START_ELEMENT: { + name = reader.getName(); + + if(WSPolicyProcessor.WS_POLICY_QNAME.equals(name)) { + artifact = processor.read(reader); + } + + break; + } + } + + if ( reader.hasNext() ) { + reader.next(); + } else { + break; + } + } + assertNotNull(artifact); + } +} Propchange: incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessorTestCase.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessorTestCase.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Added: incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml?rev=644060&view=auto ============================================================================== --- incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml (added) +++ incubator/tuscany/branches/sca-java-1.2/modules/policy-xml-ws/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml Wed Apr 2 14:06:01 2008 @@ -0,0 +1,106 @@ + + + + + + + + + + sp:X509v3 + + + + + + + + + + + + + + + + + + Protect messages from unauthorized reading or modification + + + + + + Protect messages from unauthorized reading or modification + + + + + + + Communitcation thro this binding must prevent + unauthorized users from reading the messages. + + + + + + Communitcation thro this binding must prevent + unauthorized modification of the messages. + + + + + + Communitcation thro this binding required + Authentication. + + + + + + All messages to and from this implementation must be logged + + + + + + Need to figure out some description for this + + + + \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org For additional commands, e-mail: tuscany-commits-help@ws.apache.org