Author: rfeng
Date: Thu Jul 9 18:26:35 2009
New Revision: 792626
URL: http://svn.apache.org/viewvc?rev=792626&view=rev
Log:
Add the jdk logging into the itest-policies
Modified:
tuscany/java/sca/itest/policies/pom.xml
tuscany/java/sca/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/PaymentImpl.java
tuscany/java/sca/itest/policies/src/main/resources/Customer.composite
tuscany/java/sca/itest/policies/src/main/resources/Payment.composite
tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BasePolicyProvider.java
tuscany/java/sca/modules/pom.xml
Modified: tuscany/java/sca/itest/policies/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/itest/policies/pom.xml?rev=792626&r1=792625&r2=792626&view=diff
==============================================================================
--- tuscany/java/sca/itest/policies/pom.xml (original)
+++ tuscany/java/sca/itest/policies/pom.xml Thu Jul 9 18:26:35 2009
@@ -37,6 +37,12 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-policy-logging</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-impl</artifactId>
<version>2.0-SNAPSHOT</version>
<scope>test</scope>
Modified:
tuscany/java/sca/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/PaymentImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/PaymentImpl.java?rev=792626&r1=792625&r2=792626&view=diff
==============================================================================
---
tuscany/java/sca/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/PaymentImpl.java
(original)
+++
tuscany/java/sca/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/PaymentImpl.java
Thu Jul 9 18:26:35 2009
@@ -24,6 +24,7 @@
import org.apache.tuscany.sca.itest.policies.Customer;
import org.apache.tuscany.sca.itest.policies.CustomerRegistry;
import org.apache.tuscany.sca.itest.policies.Payment;
+import org.apache.tuscany.sca.policy.logging.Logging;
import org.oasisopen.sca.annotation.Authentication;
import org.oasisopen.sca.annotation.Confidentiality;
import org.oasisopen.sca.annotation.Reference;
@@ -32,6 +33,7 @@
/**
*
*/
+...@logging
public class PaymentImpl implements Payment {
@Reference
Modified: tuscany/java/sca/itest/policies/src/main/resources/Customer.composite
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/itest/policies/src/main/resources/Customer.composite?rev=792626&r1=792625&r2=792626&view=diff
==============================================================================
--- tuscany/java/sca/itest/policies/src/main/resources/Customer.composite
(original)
+++ tuscany/java/sca/itest/policies/src/main/resources/Customer.composite Thu
Jul 9 18:26:35 2009
@@ -19,11 +19,11 @@
-->
<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903";
xmlns:c="http://customer";
- xmlns:sca = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
targetNamespace="http://customer";
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1";
name="Customer">
- <service name="Registry" promote="CustomerRegistry">
+ <service name="Registry" promote="CustomerRegistry"
requires="tuscany:logging">
<binding.sca/>
</service>
Modified: tuscany/java/sca/itest/policies/src/main/resources/Payment.composite
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/itest/policies/src/main/resources/Payment.composite?rev=792626&r1=792625&r2=792626&view=diff
==============================================================================
--- tuscany/java/sca/itest/policies/src/main/resources/Payment.composite
(original)
+++ tuscany/java/sca/itest/policies/src/main/resources/Payment.composite Thu
Jul 9 18:26:35 2009
@@ -21,6 +21,7 @@
xmlns:p="http://payment";
xmlns:c="http://customer";
xmlns:sca = "http://docs.oasis-open.org/ns/opencsa/sca/200903";
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1";
requires = "sca:authorization"
targetNamespace="http://payment";
name="Payment">
@@ -28,10 +29,10 @@
<component name="Payment">
<implementation.java
class="org.apache.tuscany.sca.itest.policies.impl.PaymentImpl" />
<reference name="creditCardPayment" target="CreditCardPayment">
- <binding.sca requires="sca:integrity">
+ <binding.sca requires="sca:integrity tuscany:logging">
</binding.sca>
</reference>
- <reference name="customerRegistry" target="Customer/Registry"
requires="sca:suspendsTransaction"/>
+ <reference name="customerRegistry" target="Customer/Registry"
requires="sca:suspendsTransaction tuscany:logging"/>
</component>
<component name="CreditCardPayment">
Modified:
tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BasePolicyProvider.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BasePolicyProvider.java?rev=792626&r1=792625&r2=792626&view=diff
==============================================================================
---
tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BasePolicyProvider.java
(original)
+++
tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BasePolicyProvider.java
Thu Jul 9 18:26:35 2009
@@ -29,6 +29,7 @@
import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.invocation.InvocationChain;
import org.apache.tuscany.sca.invocation.PhasedInterceptor;
+import org.apache.tuscany.sca.policy.PolicyExpression;
import org.apache.tuscany.sca.policy.PolicySet;
import org.apache.tuscany.sca.policy.PolicySubject;
import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
@@ -55,6 +56,13 @@
if (policyType.isInstance(p)) {
policies.add(policyType.cast(p));
}
+ if (p instanceof PolicyExpression) {
+ PolicyExpression exp = (PolicyExpression)p;
+ if (policyType.isInstance(exp.getPolicy())) {
+ policies.add(policyType.cast(exp.getPolicy()));
+ }
+ }
+
}
}
return policies;
@@ -68,6 +76,12 @@
if (policyType.isInstance(p)) {
policies.add(ps);
}
+ if (p instanceof PolicyExpression) {
+ PolicyExpression exp = (PolicyExpression)p;
+ if (policyType.isInstance(exp.getPolicy())) {
+ policies.add(ps);
+ }
+ }
}
}
return policies;
@@ -80,6 +94,12 @@
if (policyType.isInstance(p)) {
return ps;
}
+ if (p instanceof PolicyExpression) {
+ PolicyExpression exp = (PolicyExpression)p;
+ if (policyType.isInstance(exp.getPolicy())) {
+ return ps;
+ }
+ }
}
}
return null;
Modified: tuscany/java/sca/modules/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/pom.xml?rev=792626&r1=792625&r2=792626&view=diff
==============================================================================
--- tuscany/java/sca/modules/pom.xml (original)
+++ tuscany/java/sca/modules/pom.xml Thu Jul 9 18:26:35 2009
@@ -84,6 +84,7 @@
<module>policy-security</module>
<module>policy-xml</module>
<module>policy-xml-ws</module>
+ <module>policy-logging</module>
<module>sca-api</module>
<module>sca-client-impl</module>
<module>stripes</module>
@@ -100,14 +101,16 @@
<profile>
<id>eclipse</id>
<build>
- <!--plugins>
+
<defaultGoal>org.apache.tuscany.maven.plugins:maven-bundle-plugin:eclipse</defaultGoal>
+ <!--
+ <plugins>
<plugin>
<groupId>org.apache.tuscany.maven.plugins</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>1.0.2</version>
<extensions>true</extensions>
<executions>
- <execution>
+ <execution>
<id>generate-pde</id>
<phase>generate-resources</phase>
<goals>
@@ -115,12 +118,11 @@
</goals>
<configuration>
</configuration>
- </execution>
+ </execution>
</executions>
</plugin>
- </plugins-->
-
<defaultGoal>org.apache.tuscany.maven.plugins:maven-bundle-plugin:eclipse</defaultGoal>
-
+ </plugins>
+ -->
</build>
</profile>
</profiles>
