You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2006/10/25 23:54:53 UTC

svn commit: r467777 - in /incubator/tuscany/sandbox/rfeng/samples/mortgage/src: main/java/mortgage/ main/resources/META-INF/tuscany/ main/resources/doc/ test/java/mortgage/

Author: rfeng
Date: Wed Oct 25 14:54:52 2006
New Revision: 467777

URL: http://svn.apache.org/viewvc?view=rev&rev=467777
Log:
Cleanup sample-mortgage

Added:
    incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/resources/doc/mortgage_diagrams.doc   (with props)
    incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/resources/doc/mortgage_scenario.jpg   (with props)
Removed:
    incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/resources/META-INF/tuscany/
    incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/resources/doc/scenario.jpg
Modified:
    incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/CreditCheckImpl.java
    incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/Customer.java
    incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/InterestRateQuote.java
    incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/InterestRateQuoteImpl.java
    incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/LoanApproval.java
    incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/MortgageCalculator.java
    incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/MortgageCalculatorImpl.java
    incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/MortgageClient.java
    incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/RiskAssessment.java
    incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/RiskAssessmentImpl.java
    incubator/tuscany/sandbox/rfeng/samples/mortgage/src/test/java/mortgage/MortgageClientTestCase.java

Modified: incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/CreditCheckImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/CreditCheckImpl.java?view=diff&rev=467777&r1=467776&r2=467777
==============================================================================
--- incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/CreditCheckImpl.java (original)
+++ incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/CreditCheckImpl.java Wed Oct 25 14:54:52 2006
@@ -18,12 +18,12 @@
  */
 package mortgage;
 
-import org.osoa.sca.annotations.Scope;
+import org.osoa.sca.annotations.Service;
 
 /**
- * An implementation of the CreditReportService service
+ * A pojo implementation of the CreditCheck service
  */
-@Scope("MODULE")
+@Service(CreditCheck.class)
 public class CreditCheckImpl implements CreditCheck {
 
     public int getCreditScore(String ssn) {

Modified: incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/Customer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/Customer.java?view=diff&rev=467777&r1=467776&r2=467777
==============================================================================
--- incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/Customer.java (original)
+++ incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/Customer.java Wed Oct 25 14:54:52 2006
@@ -20,7 +20,7 @@
 package mortgage;
 
 /**
- *
+ * A simple Customer object
  */
 public class Customer {
     private String ssn;
@@ -28,35 +28,48 @@
     private String lastName;
     private double monthlyIncome;
     private String state;
-    
+
     public double getMonthlyIncome() {
         return monthlyIncome;
     }
+
     public void setMonthlyIncome(double monthlyIncome) {
         this.monthlyIncome = monthlyIncome;
     }
+
     public String getState() {
         return state;
     }
+
     public void setState(String state) {
         this.state = state;
     }
+
     public String getFirstName() {
         return firstName;
     }
+
     public void setFirstName(String firstName) {
         this.firstName = firstName;
     }
+
     public String getLastName() {
         return lastName;
     }
+
     public void setLastName(String lastName) {
         this.lastName = lastName;
     }
+
     public String getSsn() {
         return ssn;
     }
+
     public void setSsn(String ssn) {
         this.ssn = ssn;
+    }
+
+    public String toString() {
+        return firstName + " " + lastName + "[" + ssn + "]";
     }
 }

Modified: incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/InterestRateQuote.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/InterestRateQuote.java?view=diff&rev=467777&r1=467776&r2=467777
==============================================================================
--- incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/InterestRateQuote.java (original)
+++ incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/InterestRateQuote.java Wed Oct 25 14:54:52 2006
@@ -1,3 +1,21 @@
+/*
+ * 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.    
+ */
 package mortgage;
 
 public interface InterestRateQuote {

Modified: incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/InterestRateQuoteImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/InterestRateQuoteImpl.java?view=diff&rev=467777&r1=467776&r2=467777
==============================================================================
--- incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/InterestRateQuoteImpl.java (original)
+++ incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/InterestRateQuoteImpl.java Wed Oct 25 14:54:52 2006
@@ -1,5 +1,26 @@
+/*
+ * 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.    
+ */
 package mortgage;
 
+import org.osoa.sca.annotations.Service;
+
+@Service(InterestRateQuote.class)
 public class InterestRateQuoteImpl implements InterestRateQuote {
     public float getRate(String state, double loanAmount, int termInYears) {
         if (termInYears == 5)

Modified: incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/LoanApproval.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/LoanApproval.java?view=diff&rev=467777&r1=467776&r2=467777
==============================================================================
--- incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/LoanApproval.java (original)
+++ incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/LoanApproval.java Wed Oct 25 14:54:52 2006
@@ -20,7 +20,7 @@
 package mortgage;
 
 /**
- *
+ * Loan Approval interface
  */
 public interface LoanApproval {
     public boolean approve(Customer customer, double loanAmount, int years);

Modified: incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/MortgageCalculator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/MortgageCalculator.java?view=diff&rev=467777&r1=467776&r2=467777
==============================================================================
--- incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/MortgageCalculator.java (original)
+++ incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/MortgageCalculator.java Wed Oct 25 14:54:52 2006
@@ -21,7 +21,7 @@
 import org.osoa.sca.annotations.Remotable;
 
 /**
- * The Calculator service interface.
+ * The Mortgage Calculator service interface.
  */
 @Remotable
 public interface MortgageCalculator {

Modified: incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/MortgageCalculatorImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/MortgageCalculatorImpl.java?view=diff&rev=467777&r1=467776&r2=467777
==============================================================================
--- incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/MortgageCalculatorImpl.java (original)
+++ incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/MortgageCalculatorImpl.java Wed Oct 25 14:54:52 2006
@@ -18,12 +18,12 @@
  */
 package mortgage;
 
-import org.osoa.sca.annotations.Scope;
+import org.osoa.sca.annotations.Service;
 
 /**
  * An implementation of the Calculator service.
  */
-@Scope("MODULE")
+@Service(MortgageCalculator.class)
 public class MortgageCalculatorImpl implements MortgageCalculator {
 
     public double getMonthlyPayment(double principal, int years, float interestRate) {

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=467777&r1=467776&r2=467777
==============================================================================
--- 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 Oct 25 14:54:52 2006
@@ -22,21 +22,22 @@
 import org.osoa.sca.CurrentCompositeContext;
 
 /**
- * This client program shows how to create an SCA runtime, start it, locate the Calculator service and invoke it.
+ * This client program to invoke the Mortgage LoanApproval service
  */
 public class MortgageClient {
     public static void main(String[] args) throws Exception {
 
         CompositeContext context = CurrentCompositeContext.getContext();
         LoanApproval loanApplication = context.locateService(LoanApproval.class, "LoanApplicationComponent");
-        
+
         Customer customer = new Customer();
         customer.setSsn("111-22-3333");
         customer.setFirstName("John");
         customer.setLastName("Smith");
         customer.setMonthlyIncome(5000.0d);
         customer.setState("CA");
-        
-        loanApplication.approve(customer, 200000d, 30);
+
+        boolean result = loanApplication.approve(customer, 200000d, 30);
+        System.out.println((result ? "Approved: " : "Rejected: ") + customer);
     }
 }

Modified: incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/RiskAssessment.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/RiskAssessment.java?view=diff&rev=467777&r1=467776&r2=467777
==============================================================================
--- incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/RiskAssessment.java (original)
+++ incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/RiskAssessment.java Wed Oct 25 14:54:52 2006
@@ -20,7 +20,7 @@
 package mortgage;
 
 /**
- *
+ * Risk Assessment interface
  */
 public interface RiskAssessment {
     public boolean assess(int creditScore, double ratio);

Modified: incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/RiskAssessmentImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/RiskAssessmentImpl.java?view=diff&rev=467777&r1=467776&r2=467777
==============================================================================
--- incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/RiskAssessmentImpl.java (original)
+++ incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/java/mortgage/RiskAssessmentImpl.java Wed Oct 25 14:54:52 2006
@@ -19,12 +19,12 @@
 
 package mortgage;
 
-import org.osoa.sca.annotations.Scope;
+import org.osoa.sca.annotations.Service;
 
 /**
- * 
+ * A pojo implementation of RiskAssessment service
  */
-@Scope("MODULE")
+@Service(RiskAssessment.class)
 public class RiskAssessmentImpl implements RiskAssessment {
     public boolean assess(int creditScore, double ratio) {
         if (creditScore >= 750)

Added: 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=auto&rev=467777
==============================================================================
Binary file - no diff available.

Propchange: incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/resources/doc/mortgage_diagrams.doc
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/resources/doc/mortgage_scenario.jpg
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/resources/doc/mortgage_scenario.jpg?view=auto&rev=467777
==============================================================================
Binary file - no diff available.

Propchange: incubator/tuscany/sandbox/rfeng/samples/mortgage/src/main/resources/doc/mortgage_scenario.jpg
------------------------------------------------------------------------------
    svn:mime-type = image/jpeg

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=467777&r1=467776&r2=467777
==============================================================================
--- 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 Oct 25 14:54:52 2006
@@ -35,7 +35,8 @@
     protected void setUp() throws Exception {
         setApplicationSCDL(LoanApproval.class, "META-INF/sca/default.scdl");
         ClassLoader classLoader = getClass().getClassLoader();
-        addExtension("test.extensions", classLoader.getResource("META-INF/tuscany/test-extensions.scdl"));
+        addExtension("axis2.extension", classLoader.getResource("META-INF/sca/binding.axis2.scdl"));
+        addExtension("databinding.sdo.extension", classLoader.getResource("META-INF/sca/databinding.sdo.scdl"));
         super.setUp();
         CompositeContext context = CurrentCompositeContext.getContext();
         loanApproval = context.locateService(LoanApproval.class, "LoanApprovalComponent");



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org