Author: svkrish
Date: Tue Mar 11 12:16:42 2008
New Revision: 636068
URL: http://svn.apache.org/viewvc?rev=636068&view=rev
Log:
fixes related to targetnamespace and fixes cascading out of some cleanup of
policy support for operations
Modified:
incubator/tuscany/java/sca/itest/policy/src/main/java/calculator/DivideService.java
incubator/tuscany/java/sca/itest/policy/src/main/java/calculator/PolicyQNames.java
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/main/resources/definitions.xml
Modified:
incubator/tuscany/java/sca/itest/policy/src/main/java/calculator/DivideService.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/policy/src/main/java/calculator/DivideService.java?rev=636068&r1=636067&r2=636068&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/policy/src/main/java/calculator/DivideService.java
(original)
+++
incubator/tuscany/java/sca/itest/policy/src/main/java/calculator/DivideService.java
Tue Mar 11 12:16:42 2008
@@ -18,9 +18,14 @@
*/
package calculator;
+import org.osoa.sca.annotations.Remotable;
+import org.osoa.sca.annotations.Service;
+
/**
* The divide service interface
*/
[EMAIL PROTECTED]
[EMAIL PROTECTED]
public interface DivideService {
double divide(double n1, double n2);
Modified:
incubator/tuscany/java/sca/itest/policy/src/main/java/calculator/PolicyQNames.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/policy/src/main/java/calculator/PolicyQNames.java?rev=636068&r1=636067&r2=636068&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/policy/src/main/java/calculator/PolicyQNames.java
(original)
+++
incubator/tuscany/java/sca/itest/policy/src/main/java/calculator/PolicyQNames.java
Tue Mar 11 12:16:42 2008
@@ -25,12 +25,12 @@
public interface PolicyQNames {
public static final String QUALIFIER = ".";
- public static final String
TUSCANY_PREFIX="{http://tuscany.apache.org/xmlns/sca/1.0}";;
- public static final String TEST_INTENT_ONE = TUSCANY_PREFIX +
"TestIntent_1";
- public static final String TEST_INTENT_TWO = TUSCANY_PREFIX +
"TestIntent_2";
- public static final String TEST_INTENT_THREE = TUSCANY_PREFIX +
"TestIntent_3";
- public static final String TEST_INTENT_FOUR = TUSCANY_PREFIX +
"TestIntent_4";
- public static final String TEST_INTENT_FIVE = TUSCANY_PREFIX +
"TestIntent_5";
+ public static final String POLICY_ITEST_PREFIX="{http://itest/policy}";;
+ public static final String TEST_INTENT_ONE = POLICY_ITEST_PREFIX +
"TestIntent_1";
+ public static final String TEST_INTENT_TWO = POLICY_ITEST_PREFIX +
"TestIntent_2";
+ public static final String TEST_INTENT_THREE = POLICY_ITEST_PREFIX +
"TestIntent_3";
+ public static final String TEST_INTENT_FOUR = POLICY_ITEST_PREFIX +
"TestIntent_4";
+ public static final String TEST_INTENT_FIVE = POLICY_ITEST_PREFIX +
"TestIntent_5";
public static final String QUALIFIER_ONE = "Qualifier_1";
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=636068&r1=636067&r2=636068&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 11 12:16:42 2008
@@ -46,8 +46,9 @@
applicablePolicySet.getName().getLocalPart().equals("TestPolicySet_3_implementation")
;
Assert.assertTrue(match);
} else if ( op.getName().equals("subtract") ) {
-
Assert.assertEquals(applicablePolicySet.getName().getLocalPart(),
-
"TestPolicySet_1_Qualified_implementation");
+ boolean match =
applicablePolicySet.getName().getLocalPart().equals("TestPolicySet_1_Qualified_implementation")
||
+
applicablePolicySet.getName().getLocalPart().equals("TestPolicySet_1_implementation");
+ Assert.assertTrue(match);
} else if ( op.getName().equals("divide")) {
Assert.assertEquals(applicablePolicySet.getName().getLocalPart(),
"TestPolicySet_1_implementation");
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=636068&r1=636067&r2=636068&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 11 12:16:42 2008
@@ -17,12 +17,12 @@
#
# PolicyHandlerClasses to interpret specific PolicyModels against specific QoS
infrastructures
# handler classname;qname=<policy intent addressed>;model=<policy model class>
-calculator.policy.TestImplPolicyHandler;intent=http://tuscany.apache.org/xmlns/sca/1.0#TestIntent_1,model=org.apache.neethi.Policy,appliesTo=sca:implementation.java
-calculator.policy.TestRefPolicyHandler;intent=http://tuscany.apache.org/xmlns/sca/1.0#TestIntent_1,model=org.apache.neethi.Policy,appliesTo=sca:reference
-calculator.policy.TestSvcPolicyHandler;intent=http://tuscany.apache.org/xmlns/sca/1.0#TestIntent_1,model=org.apache.neethi.Policy,appliesTo=sca:service
-calculator.policy.TestImplPolicyHandler;intent=http://tuscany.apache.org/xmlns/sca/1.0#TestIntent_1.Qualifier_1,model=org.apache.neethi.Policy,appliesTo=sca:implementation.java
-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
-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
+calculator.policy.TestImplPolicyHandler;intent=http://itest/policy#TestIntent_1,model=org.apache.neethi.Policy,appliesTo=sca:implementation.java
+calculator.policy.TestRefPolicyHandler;intent=http://itest/policy#TestIntent_1,model=org.apache.neethi.Policy,appliesTo=sca:reference
+calculator.policy.TestSvcPolicyHandler;intent=http://itest/policy#TestIntent_1,model=org.apache.neethi.Policy,appliesTo=sca:service
+calculator.policy.TestImplPolicyHandler;intent=http://itest/policy#TestIntent_1.Qualifier_1,model=org.apache.neethi.Policy,appliesTo=sca:implementation.java
+calculator.policy.TestImplPolicyHandler;intent=http://itest/policy#TestIntent_2,model=org.apache.neethi.Policy,appliesTo=sca:implementation.java
+calculator.policy.TestRefPolicyHandler;intent=http://itest/policy#TestIntent_2,model=org.apache.neethi.Policy,appliesTo=sca:reference
+calculator.policy.TestSvcPolicyHandler;intent=http://itest/policy#TestIntent_2,model=org.apache.neethi.Policy,appliesTo=sca:service
+calculator.policy.TestImplPolicyHandler;intent=http://itest/policy#TestIntent_3,model=org.apache.neethi.Policy,appliesTo=sca:implementation.java
+calculator.policy.TestImplPolicyHandler;intent=http://itest/policy#TestIntent_5,model=org.apache.neethi.Policy,appliesTo=sca:implementation.java
\ No newline at end of file
Modified:
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=636068&r1=636067&r2=636068&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/policy/src/main/resources/definitions.xml
(original)
+++ incubator/tuscany/java/sca/itest/policy/src/main/resources/definitions.xml
Tue Mar 11 12:16:42 2008
@@ -94,6 +94,16 @@
appliesTo="sca:implementation.java"
xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";>
<wsp:Policy />
</sca:policySet>
+
+ <sca:policySet name="TestPolicySet_3_reference" provides="ip:TestIntent_3"
appliesTo="sca:reference"
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";>
+ <wsp:Policy />
+ </sca:policySet>
+
+ <sca:policySet name="TestPolicySet_3_service" provides="ip:TestIntent_3"
appliesTo="sca:service"
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";>
+ <wsp:Policy />
+ </sca:policySet>
<sca:policySet name="TestPolicySet_4_implementation"
provides="ip:TestIntent_4"
appliesTo="sca:implementation.java"
xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
