Author: rfeng
Date: Wed Nov 29 13:31:03 2006
New Revision: 480719
URL: http://svn.apache.org/viewvc?view=rev&rev=480719
Log:
Merged from M2
Added:
incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/resources/META-INF/sca/default2.scdl
- copied unchanged from r480714,
incubator/tuscany/sandbox/rfeng/samples.M2/mortgage/src/main/resources/META-INF/sca/default2.scdl
incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/resources/doc/credit_composite.jpg
- copied unchanged from r480714,
incubator/tuscany/sandbox/rfeng/samples.M2/mortgage/src/main/resources/doc/credit_composite.jpg
incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/resources/doc/credit_composite.png
- copied unchanged from r480714,
incubator/tuscany/sandbox/rfeng/samples.M2/mortgage/src/main/resources/doc/credit_composite.png
incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/resources/doc/loan_approval.png
- copied unchanged from r480714,
incubator/tuscany/sandbox/rfeng/samples.M2/mortgage/src/main/resources/doc/loan_approval.png
incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/resources/doc/mortgage_assembly0.png
- copied unchanged from r480714,
incubator/tuscany/sandbox/rfeng/samples.M2/mortgage/src/main/resources/doc/mortgage_assembly0.png
incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/resources/doc/mortgage_assembly1.png
- copied unchanged from r480714,
incubator/tuscany/sandbox/rfeng/samples.M2/mortgage/src/main/resources/doc/mortgage_assembly1.png
incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/resources/doc/mortgage_assembly2.jpg
- copied unchanged from r480714,
incubator/tuscany/sandbox/rfeng/samples.M2/mortgage/src/main/resources/doc/mortgage_assembly2.jpg
incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/resources/doc/mortgage_assembly2.png
- copied unchanged from r480714,
incubator/tuscany/sandbox/rfeng/samples.M2/mortgage/src/main/resources/doc/mortgage_assembly2.png
incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/resources/doc/mortgage_composite.jpg
- copied unchanged from r480714,
incubator/tuscany/sandbox/rfeng/samples.M2/mortgage/src/main/resources/doc/mortgage_composite.jpg
incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/resources/doc/mortgage_composite.png
- copied unchanged from r480714,
incubator/tuscany/sandbox/rfeng/samples.M2/mortgage/src/main/resources/doc/mortgage_composite.png
incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/resources/doc/mortgage_package1.jpg
- copied unchanged from r480714,
incubator/tuscany/sandbox/rfeng/samples.M2/mortgage/src/main/resources/doc/mortgage_package1.jpg
incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/resources/doc/mortgage_package1.png
- copied unchanged from r480714,
incubator/tuscany/sandbox/rfeng/samples.M2/mortgage/src/main/resources/doc/mortgage_package1.png
incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/resources/doc/mortgage_package2.jpg
- copied unchanged from r480714,
incubator/tuscany/sandbox/rfeng/samples.M2/mortgage/src/main/resources/doc/mortgage_package2.jpg
incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/resources/doc/mortgage_package2.png
- copied unchanged from r480714,
incubator/tuscany/sandbox/rfeng/samples.M2/mortgage/src/main/resources/doc/mortgage_package2.png
incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/resources/doc/mortgage_scenario.png
- copied unchanged from r480714,
incubator/tuscany/sandbox/rfeng/samples.M2/mortgage/src/main/resources/doc/mortgage_scenario.png
incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/resources/doc/readme.html
- copied unchanged from r480714,
incubator/tuscany/sandbox/rfeng/samples.M2/mortgage/src/main/resources/doc/readme.html
Modified:
incubator/tuscany/sandbox/rfeng/samples/mortgage/pom.xml
incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/CreditCheck.java
incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/LoanApprovalImpl.java
incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/MortgageClient.java
incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/resources/doc/mortgage_assembly0.jpg
incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/resources/doc/mortgage_assembly1.jpg
incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/resources/doc/mortgage_diagrams.doc
incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/resources/wsdl/credit.wsdl
incubator/tuscany/sandbox/rfeng/samples/mortgage/src/test/java/mortgage/MortgageClientTestCase.java
Modified: incubator/tuscany/sandbox/rfeng/samples/mortgage/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/rfeng/samples/mortgage/pom.xml?view=diff&rev=480719&r1=480718&r2=480719
==============================================================================
--- incubator/tuscany/sandbox/rfeng/samples/mortgage/pom.xml (original)
+++ incubator/tuscany/sandbox/rfeng/samples/mortgage/pom.xml Wed Nov 29
13:31:03 2006
@@ -19,7 +19,7 @@
-->
<project>
<parent>
- <groupId>org.apache.tuscany.samples.sca</groupId>
+ <groupId>org.apache.tuscany.sca.samples</groupId>
<artifactId>parent</artifactId>
<version>1.0-incubator-SNAPSHOT</version>
</parent>
@@ -42,19 +42,19 @@
<dependency>
<groupId>org.apache.tuscany.sca.services.containers</groupId>
<artifactId>javascript</artifactId>
- <version>${tuscanyVersion}</version>
+ <version>${scaImplVersion}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca.services.bindings</groupId>
<artifactId>axis2</artifactId>
- <version>${tuscanyVersion}</version>
+ <version>${scaImplVersion}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca.services.databinding</groupId>
<artifactId>databinding-axiom</artifactId>
- <version>${tuscanyVersion}</version>
+ <version>${scaImplVersion}</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -67,6 +67,8 @@
</dependencies>
<build>
+ <defaultGoal>install</defaultGoal>
+ <finalName>${artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified:
incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/CreditCheck.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/CreditCheck.java?view=diff&rev=480719&r1=480718&r2=480719
==============================================================================
---
incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/CreditCheck.java
(original)
+++
incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/CreditCheck.java
Wed Nov 29 13:31:03 2006
@@ -20,6 +20,9 @@
import org.osoa.sca.annotations.Remotable;
+/**
+ * CreditCheck interface
+ */
@Remotable
public interface CreditCheck {
int getCreditScore(String ssn);
Modified:
incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/LoanApprovalImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/LoanApprovalImpl.java?view=diff&rev=480719&r1=480718&r2=480719
==============================================================================
---
incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/LoanApprovalImpl.java
(original)
+++
incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/LoanApprovalImpl.java
Wed Nov 29 13:31:03 2006
@@ -61,9 +61,9 @@
public boolean approve(Customer customer, double loanAmount, int years) {
int score = creditCheck.getCreditScore(customer.getSsn());
- if (score < minimumCreditScore)
+ if (score < minimumCreditScore) {
return false;
-
+ }
float rate = interestRateQuote.getRate(customer.getState(),
loanAmount, years);
double monthlyPayment =
mortgageCalculator.getMonthlyPayment(loanAmount, years, rate);
double ratio = monthlyPayment / customer.getMonthlyIncome();
Modified:
incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/MortgageClient.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/MortgageClient.java?view=diff&rev=480719&r1=480718&r2=480719
==============================================================================
---
incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/MortgageClient.java
(original)
+++
incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/MortgageClient.java
Wed Nov 29 13:31:03 2006
@@ -29,7 +29,7 @@
// Locate the service using SCA APIs
CompositeContext context = CurrentCompositeContext.getContext();
- LoanApproval loanApplication =
context.locateService(LoanApproval.class, "LoanApplicationComponent");
+ LoanApproval loanApplication =
context.locateService(LoanApproval.class, "LoanApprovalComponent");
// Create the customer
Customer customer = new Customer();
Modified:
incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/resources/doc/mortgage_assembly0.jpg
URL:
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/resources/doc/mortgage_assembly0.jpg?view=diff&rev=480719&r1=480718&r2=480719
==============================================================================
Binary files - no diff available.
Modified:
incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/resources/doc/mortgage_assembly1.jpg
URL:
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/resources/doc/mortgage_assembly1.jpg?view=diff&rev=480719&r1=480718&r2=480719
==============================================================================
Binary files - no diff available.
Modified:
incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/resources/doc/mortgage_diagrams.doc
URL:
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/resources/doc/mortgage_diagrams.doc?view=diff&rev=480719&r1=480718&r2=480719
==============================================================================
Binary files - no diff available.
Modified:
incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/resources/wsdl/credit.wsdl
URL:
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/resources/wsdl/credit.wsdl?view=diff&rev=480719&r1=480718&r2=480719
==============================================================================
---
incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/resources/wsdl/credit.wsdl
(original)
+++
incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/resources/wsdl/credit.wsdl
Wed Nov 29 13:31:03 2006
@@ -76,6 +76,9 @@
<wsdl:port binding="tns:CreditCheckSoapBinding"
name="CreditCheckSoapPort">
<wsdlsoap:address
location="http://localhost:8080/credit/services/CreditCheckWebService"; />
</wsdl:port>
+ <wsdl:port binding="tns:CreditCheckSoapBinding"
name="CreditCheckSoapPort1">
+ <wsdlsoap:address
location="http://localhost:8080/axis2/services/CreditCheckService"; />
+ </wsdl:port>
</wsdl:service>
</wsdl:definitions>
Modified:
incubator/tuscany/sandbox/rfeng/samples/mortgage/src/test/java/mortgage/MortgageClientTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/rfeng/samples/mortgage/src/test/java/mortgage/MortgageClientTestCase.java?view=diff&rev=480719&r1=480718&r2=480719
==============================================================================
---
incubator/tuscany/sandbox/rfeng/samples/mortgage/src/test/java/mortgage/MortgageClientTestCase.java
(original)
+++
incubator/tuscany/sandbox/rfeng/samples/mortgage/src/test/java/mortgage/MortgageClientTestCase.java
Wed Nov 29 13:31:03 2006
@@ -33,7 +33,12 @@
private LoanApproval loanApproval;
protected void setUp() throws Exception {
+ // version 1: One composite with local components
setApplicationSCDL(LoanApproval.class, "META-INF/sca/default.scdl");
+ // version 2: two composites, one for mortgage and the other for credit
+ // setApplicationSCDL(LoanApproval.class,
"META-INF/sca/default1.scdl");
+ // version 3: one composite and an external web service for credit
+ // setApplicationSCDL(LoanApproval.class,
"META-INF/sca/default2.scdl");
ClassLoader classLoader = getClass().getClassLoader();
addExtension("binding.axis2",
classLoader.getResource("META-INF/sca/binding.axis2.scdl"));
addExtension("container.js",
classLoader.getResource("META-INF/sca/js.system.scdl"));
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
