Author: slaws
Date: Sun Mar 21 19:01:14 2010
New Revision: 925864
URL: http://svn.apache.org/viewvc?rev=925864&view=rev
Log:
Exercise the trip policy from the policy client and policy launcher
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/policy-client/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/java/scatours/client/TestClient.java
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/resources/META-INF/sca-contribution.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/resources/client.composite
tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/policy/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/policy/src/main/java/scatours/PolicyLauncher.java
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/policy-client/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/policy-client/pom.xml?rev=925864&r1=925863&r2=925864&view=diff
==============================================================================
---
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/policy-client/pom.xml
(original)
+++
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/policy-client/pom.xml
Sun Mar 21 19:01:14 2010
@@ -34,6 +34,13 @@
<artifactId>tuscany-sca-api</artifactId>
<version>${tuscany.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>scatours-contribution-common</artifactId>
+ <version>${pom.version}</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>javax.xml.ws</groupId>
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/java/scatours/client/TestClient.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/java/scatours/client/TestClient.java?rev=925864&r1=925863&r2=925864&view=diff
==============================================================================
---
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/java/scatours/client/TestClient.java
(original)
+++
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/java/scatours/client/TestClient.java
Sun Mar 21 19:01:14 2010
@@ -19,20 +19,42 @@
package scatours.client;
+
import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Service;
import com.tuscanyscatours.payment.Payment;
+import com.tuscanyscatours.common.Book;
+import com.tuscanyscatours.common.TripItem;
+
+/**
+ * A client for calling payment and trip components directly. The components
in this
+ * case are expected to have policy configuration associated with the in the
+ * composite files that define them
+ *
+ */
@Service(Runnable.class)
public class TestClient {
@Reference
protected Payment payment;
+
+ @Reference
+ protected Book tripBooking;
public TestClient() {
}
public void run() {
+ System.out.println("===============================================");
+ System.out.println("Test the loggin policy by calling the trip
component");
+ TripItem tripItem =
+ new TripItem("1234", "5678", TripItem.TRIP, "FS1DEC06", "Florence
and Siena pre-packaged tour", "FLR",
+ "06/12/09", "13/12/09", 450, "EUR",
"http://localhost:8085/tbd";);
+ System.out.println("Result = " + tripBooking.book(tripItem));
+ System.out.println("===============================================");
+ System.out.println("Test the basic authentication policy by calling the
payment component");
System.out.println("TestClient - Successful Payment - Status = " +
payment.makePaymentMember("c-0", 100.00f));
+ System.out.println("===============================================");
}
}
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/resources/META-INF/sca-contribution.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/resources/META-INF/sca-contribution.xml?rev=925864&r1=925863&r2=925864&view=diff
==============================================================================
---
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/resources/META-INF/sca-contribution.xml
(original)
+++
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/resources/META-INF/sca-contribution.xml
Sun Mar 21 19:01:14 2010
@@ -20,5 +20,6 @@
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0";
xmlns:client="http://client.scatours/";>
<import.java package="payment" />
+ <import.java package="com.tuscanyscatours.common"/>
<deployable composite="client:Client" />
</contribution>
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/resources/client.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/resources/client.composite?rev=925864&r1=925863&r2=925864&view=diff
==============================================================================
---
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/resources/client.composite
(original)
+++
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/resources/client.composite
Sun Mar 21 19:01:14 2010
@@ -24,5 +24,6 @@
<component name="TestClient">
<implementation.java class="scatours.client.TestClient" />
<reference name="payment" target="Payment/Payment" />
+ <reference name="tripBooking" target="Trip/Book" />
</component>
</composite>
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/policy/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/policy/pom.xml?rev=925864&r1=925863&r2=925864&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/policy/pom.xml
(original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/policy/pom.xml
Sun Mar 21 19:01:14 2010
@@ -76,7 +76,14 @@
<artifactId>tuscany-policy-security</artifactId>
<version>${tuscany.version}</version>
<scope>runtime</scope>
- </dependency>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-policy-logging</artifactId>
+ <version>${tuscany.version}</version>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/policy/src/main/java/scatours/PolicyLauncher.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/policy/src/main/java/scatours/PolicyLauncher.java?rev=925864&r1=925863&r2=925864&view=diff
==============================================================================
---
tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/policy/src/main/java/scatours/PolicyLauncher.java
(original)
+++
tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/policy/src/main/java/scatours/PolicyLauncher.java
Sun Mar 21 19:01:14 2010
@@ -30,8 +30,10 @@ public class PolicyLauncher {
public static void main(String[] args) throws Exception {
SCANode node1 =
SCANodeFactory.newInstance().createSCANode(null,
+ locate("common"),
locate("policy-client"),
-
locate("payment-java-policy"));
+
locate("payment-java-policy"),
+ locate("trip-policy"));
node1.start();
