Author: svkrish
Date: Tue Mar 4 10:08:42 2008
New Revision: 633575
URL: http://svn.apache.org/viewvc?rev=633575&view=rev
Log:
including test for externally configurable policysets
Added:
incubator/tuscany/java/sca/itest/policy/src/main/resources/definitions.xml
(with props)
Modified:
incubator/tuscany/java/sca/itest/policy/src/main/java/calculator/policy/TestImplPolicyHandler.java
incubator/tuscany/java/sca/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
incubator/tuscany/java/sca/itest/policy/src/test/java/org/apache/tuscany/sca/itest/PoliciedCalculatorTestCase.java
Modified:
incubator/tuscany/java/sca/itest/policy/src/main/java/calculator/policy/TestImplPolicyHandler.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/policy/src/main/java/calculator/policy/TestImplPolicyHandler.java?rev=633575&r1=633574&r2=633575&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/policy/src/main/java/calculator/policy/TestImplPolicyHandler.java
(original)
+++
incubator/tuscany/java/sca/itest/policy/src/main/java/calculator/policy/TestImplPolicyHandler.java
Tue Mar 4 10:08:42 2008
@@ -48,10 +48,15 @@
} else if ( op.getName().equals("subtract") ) {
Assert.assertEquals(applicablePolicySet.getName().getLocalPart(),
"TestPolicySet_1_Qualified_implementation");
- } else if ( op.getName().equals("multiply") ||
op.getName().equals("divide")) {
+ } else if ( op.getName().equals("divide")) {
Assert.assertEquals(applicablePolicySet.getName().getLocalPart(),
"TestPolicySet_1_implementation");
- } else {
+ } else if ( op.getName().equals("multiply") ) {
+ boolean match =
applicablePolicySet.getName().getLocalPart().equals("TestPolicySet_5_implementation")
||
+
applicablePolicySet.getName().getLocalPart().equals("TestPolicySet_1_implementation");
+ Assert.assertTrue(match);
+ }
+ else {
Assert.fail();
}
//System.out.println(" *TestImplPolicyHandler* " +
op.getName() + " ** " + applicablePolicySet);
Modified:
incubator/tuscany/java/sca/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler?rev=633575&r1=633574&r2=633575&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
(original)
+++
incubator/tuscany/java/sca/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
Tue Mar 4 10:08:42 2008
@@ -24,4 +24,5 @@
calculator.policy.TestImplPolicyHandler;intent=http://tuscany.apache.org/xmlns/sca/1.0#TestIntent_2,model=org.apache.neethi.Policy,appliesTo=sca:implementation.java
calculator.policy.TestRefPolicyHandler;intent=http://tuscany.apache.org/xmlns/sca/1.0#TestIntent_2,model=org.apache.neethi.Policy,appliesTo=sca:reference
calculator.policy.TestSvcPolicyHandler;intent=http://tuscany.apache.org/xmlns/sca/1.0#TestIntent_2,model=org.apache.neethi.Policy,appliesTo=sca:service
-calculator.policy.TestImplPolicyHandler;intent=http://tuscany.apache.org/xmlns/sca/1.0#TestIntent_3,model=org.apache.neethi.Policy,appliesTo=sca:implementation.java
\ No newline at end of file
+calculator.policy.TestImplPolicyHandler;intent=http://tuscany.apache.org/xmlns/sca/1.0#TestIntent_3,model=org.apache.neethi.Policy,appliesTo=sca:implementation.java
+calculator.policy.TestImplPolicyHandler;intent=http://tuscany.apache.org/xmlns/sca/1.0#TestIntent_5,model=org.apache.neethi.Policy,appliesTo=sca:implementation.java
\ No newline at end of file
Added:
incubator/tuscany/java/sca/itest/policy/src/main/resources/definitions.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/policy/src/main/resources/definitions.xml?rev=633575&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/policy/src/main/resources/definitions.xml
(added)
+++ incubator/tuscany/java/sca/itest/policy/src/main/resources/definitions.xml
Tue Mar 4 10:08:42 2008
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="ASCII"?>
+<!--
+ * 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.
+-->
+<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0";
+ targetNamespace="http://test";
+ xmlns:sca="http://www.osoa.org/xmlns/sca/1.0";
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0";
+ xmlns:calc="http://calculator";>
+
+<!-- Policy Intents -->
+<sca:intent name="tuscany:TestIntent_1"
+ constrains="sca:implementation.java sca:binding.ws">
+ <description>
+ Test Intent One
+ </description>
+</sca:intent>
+
+<sca:intent name="tuscany:TestIntent_2"
+ constrains="sca:implementation.java sca:binding.ws">
+ <description>
+ Test Intent Two
+ </description>
+</sca:intent>
+
+<sca:intent name="tuscany:TestIntent_3"
+ constrains="sca:implementation.java sca:binding.ws">
+ <description>
+ Test Intent Three
+ </description>
+</sca:intent>
+
+<sca:intent name="tuscany:TestIntent_4"
+ constrains="sca:implementation.java sca:binding.ws">
+ <description>
+ Test Intent Four
+ </description>
+</sca:intent>
+
+<sca:intent name="tuscany:TestIntent_5"
+ constrains="sca:implementation.java sca:binding.ws">
+ <description>
+ Test Intent Five
+ </description>
+</sca:intent>
+
+<sca:intent name="tuscany:TestIntent_1.Qualifier_1" />
+
+
+
+<!-- PolicySets -->
+<sca:policySet name="tuscany:TestPolicySet_1_implementation"
+ provides="tuscany:TestIntent_1"
+ appliesTo="sca:implementation.java"
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";
+ >
+ <intentMap provides="tuscany:TestIntent_1" default="Qualifier_1">
+ <qualifier name="Qualifier_1">
+ <wsp:Policy/>
+ </qualifier>
+ </intentMap>
+ <wsp:Policy/>
+ </sca:policySet>
+
+<sca:policySet name="tuscany:TestPolicySet_1_Qualified_implementation"
+ provides="tuscany:TestIntent_1.Qualifier_1"
+ appliesTo="sca:implementation.java"
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";
+ >
+ <wsp:Policy/>
+ </sca:policySet>
+
+ <sca:policySet name="tuscany:TestPolicySet_1_reference"
+ provides="tuscany:TestIntent_1"
+ appliesTo="sca:reference"
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";
+ >
+ <wsp:Policy/>
+ </sca:policySet>
+
+ <sca:policySet name="tuscany:TestPolicySet_1_service"
+ provides="tuscany:TestIntent_1"
+ appliesTo="sca:service"
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";
+ >
+ <wsp:Policy/>
+ </sca:policySet>
+
+
+ <sca:policySet name="tuscany:TestPolicySet_2_implementation"
+ provides="tuscany:TestIntent_2"
+ appliesTo="sca:implementation.java"
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";
+ >
+ <wsp:Policy/>
+ </sca:policySet>
+
+ <sca:policySet name="tuscany:TestPolicySet_2_reference"
+ provides="tuscany:TestIntent_2"
+ appliesTo="sca:reference"
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";
+ >
+ <wsp:Policy/>
+ </sca:policySet>
+
+ <sca:policySet name="tuscany:TestPolicySet_2_service"
+ provides="tuscany:TestIntent_2"
+ appliesTo="sca:service"
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";
+ >
+ <wsp:Policy/>
+ </sca:policySet>
+
+
+ <sca:policySet name="tuscany:TestPolicySet_3_implementation"
+ provides="tuscany:TestIntent_3"
+ appliesTo="sca:implementation.java"
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";
+ >
+ <wsp:Policy/>
+ </sca:policySet>
+
+ <sca:policySet name="tuscany:TestPolicySet_4_implementation"
+ provides="tuscany:TestIntent_4"
+ appliesTo="sca:implementation.java"
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";
+ >
+ <wsp:Policy/>
+ </sca:policySet>
+
+ <sca:policySet name="tuscany:TestPolicySet_4_service"
+ provides="tuscany:TestIntent_4"
+ appliesTo="sca:service"
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";
+ >
+ <wsp:Policy/>
+ </sca:policySet>
+
+ <sca:policySet name="tuscany:TestPolicySet_4_reference"
+ provides="tuscany:TestIntent_4"
+ appliesTo="sca:reference"
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";
+ >
+ <wsp:Policy/>
+ </sca:policySet>
+
+ <sca:policySet name="tuscany:TestPolicySet_5_implementation"
+ provides=""
+ appliesTo="sca:implementation.java"
+ tuscany:alwaysAppliesTo="sca:[EMAIL
PROTECTED]'MultiplyServiceComponent']"
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";
+ >
+ <wsp:Policy/>
+ </sca:policySet>
+
+ <sca:policySet name="tuscany:TestPolicySet_5_service"
+ provides="tuscany:TestIntent_5"
+ appliesTo="sca:service"
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";
+ >
+ <wsp:Policy/>
+ </sca:policySet>
+
+ <sca:policySet name="tuscany:TestPolicySet_5_reference"
+ provides="tuscany:TestIntent_5"
+ appliesTo="sca:reference"
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";
+ >
+ <wsp:Policy/>
+ </sca:policySet>
+
+ <sca:policySet name="tuscany:TestPolicySet_4_qualified_1_implementation"
+ provides="tuscany:TestIntent_4"
+ appliesTo="sca:implementation.java"
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";
+ >
+ <intentMap provides="tuscany:TestIntent_4" default="Qualifier_1">
+ <qualifier name="Qualifier_1">
+ <wsp:Policy/>
+ </qualifier>
+ </intentMap>
+ </sca:policySet>
+</definitions>
\ No newline at end of file
Propchange:
incubator/tuscany/java/sca/itest/policy/src/main/resources/definitions.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/java/sca/itest/policy/src/main/resources/definitions.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
incubator/tuscany/java/sca/itest/policy/src/main/resources/definitions.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified:
incubator/tuscany/java/sca/itest/policy/src/test/java/org/apache/tuscany/sca/itest/PoliciedCalculatorTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/policy/src/test/java/org/apache/tuscany/sca/itest/PoliciedCalculatorTestCase.java?rev=633575&r1=633574&r2=633575&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/policy/src/test/java/org/apache/tuscany/sca/itest/PoliciedCalculatorTestCase.java
(original)
+++
incubator/tuscany/java/sca/itest/policy/src/test/java/org/apache/tuscany/sca/itest/PoliciedCalculatorTestCase.java
Tue Mar 4 10:08:42 2008
@@ -19,6 +19,10 @@
package org.apache.tuscany.sca.itest;
+import java.io.File;
+import java.io.FileDescriptor;
+import java.net.URL;
+
import org.apache.tuscany.sca.host.embedded.SCADomain;
import org.junit.AfterClass;
import org.junit.BeforeClass;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
