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 2007/10/31 22:09:19 UTC

svn commit: r590832 - in /incubator/tuscany/branches/sca-java-1.0.1/demos: mortgage-creditcheck/ mortgage-creditcheck/src/main/resources/ mortgage-creditcheck/src/main/resources/wsdl/ mortgage-loanapproval/src/main/resources/ mortgage-loanapproval/src/...

Author: rfeng
Date: Wed Oct 31 14:09:17 2007
New Revision: 590832

URL: http://svn.apache.org/viewvc?rev=590832&view=rev
Log:
Merge changes from r590814

Modified:
    incubator/tuscany/branches/sca-java-1.0.1/demos/mortgage-creditcheck/pom.xml
    incubator/tuscany/branches/sca-java-1.0.1/demos/mortgage-creditcheck/src/main/resources/CreditCheck.composite
    incubator/tuscany/branches/sca-java-1.0.1/demos/mortgage-creditcheck/src/main/resources/wsdl/credit.wsdl
    incubator/tuscany/branches/sca-java-1.0.1/demos/mortgage-loanapproval/src/main/resources/Mortgage.composite
    incubator/tuscany/branches/sca-java-1.0.1/demos/mortgage-loanapproval/src/main/resources/Mortgage1.composite
    incubator/tuscany/branches/sca-java-1.0.1/demos/mortgage-loanapproval/src/main/resources/wsdl/credit.wsdl

Modified: incubator/tuscany/branches/sca-java-1.0.1/demos/mortgage-creditcheck/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/demos/mortgage-creditcheck/pom.xml?rev=590832&r1=590831&r2=590832&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/demos/mortgage-creditcheck/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/demos/mortgage-creditcheck/pom.xml Wed Oct 31 14:09:17 2007
@@ -26,7 +26,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>demo-mortgage-creditcheck</artifactId>
-    <packaging>war</packaging>
+    <packaging>jar</packaging>
     <name>Apache Tuscany SCA Mortgage Credit Check Demo</name>
     <description>A sample Mortgage application made of several SCA components wired together.</description>
 
@@ -54,7 +54,7 @@
 <!--
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-webapp</artifactId>
+            <artifactId>tuscany-host-jetty</artifactId>
             <version>1.0.1-incubating-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>

Modified: incubator/tuscany/branches/sca-java-1.0.1/demos/mortgage-creditcheck/src/main/resources/CreditCheck.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/demos/mortgage-creditcheck/src/main/resources/CreditCheck.composite?rev=590832&r1=590831&r2=590832&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/demos/mortgage-creditcheck/src/main/resources/CreditCheck.composite (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/demos/mortgage-creditcheck/src/main/resources/CreditCheck.composite Wed Oct 31 14:09:17 2007
@@ -17,18 +17,21 @@
     * specific language governing permissions and limitations
     * under the License.    
 -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-	xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-	targetNamespace="http://credit" 
-	name="CreditComposite">
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+    targetNamespace="http://credit" name="CreditComposite">
 
-    <service name="CreditCheckService" promote="CreditCheckServiceComponent">
+    <!-- 
+        <service name="CreditCheckService" promote="CreditCheckServiceComponent">
         <interface.wsdl interface="http://credit#wsdl.interface(CreditCheck)" />
-        <binding.ws wsdlElement="http://credit#wsdl.endpoint(CreditCheckService/CreditCheckSoapPort)" />
-    </service>
+        <binding.ws wsdlElement="http://credit#wsdl.port(CreditCheckService/CreditCheckSoapPort)" />
+        </service>
+    -->
 
     <component name="CreditCheckServiceComponent">
         <implementation.java class="credit.CreditCheckImpl" />
+        <service name="CreditCheck">
+            <binding.ws wsdlElement="http://credit#wsdl.port(CreditCheckService/CreditCheckSoapPort)" />
+        </service>
     </component>
 
 </composite>

Modified: incubator/tuscany/branches/sca-java-1.0.1/demos/mortgage-creditcheck/src/main/resources/wsdl/credit.wsdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/demos/mortgage-creditcheck/src/main/resources/wsdl/credit.wsdl?rev=590832&r1=590831&r2=590832&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/demos/mortgage-creditcheck/src/main/resources/wsdl/credit.wsdl (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/demos/mortgage-creditcheck/src/main/resources/wsdl/credit.wsdl Wed Oct 31 14:09:17 2007
@@ -74,7 +74,7 @@
 
     <wsdl:service name="CreditCheckService">
         <wsdl:port binding="tns:CreditCheckSoapBinding" name="CreditCheckSoapPort">
-            <wsdlsoap:address location="http://localhost:8085/CreditCheckService" />
+            <wsdlsoap:address location="http://localhost:8085/CreditCheckServiceComponent" />
         </wsdl:port>
     </wsdl:service>
 

Modified: incubator/tuscany/branches/sca-java-1.0.1/demos/mortgage-loanapproval/src/main/resources/Mortgage.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/demos/mortgage-loanapproval/src/main/resources/Mortgage.composite?rev=590832&r1=590831&r2=590832&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/demos/mortgage-loanapproval/src/main/resources/Mortgage.composite (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/demos/mortgage-loanapproval/src/main/resources/Mortgage.composite Wed Oct 31 14:09:17 2007
@@ -17,10 +17,8 @@
     * specific language governing permissions and limitations
     * under the License.    
 -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-	xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-	targetNamespace="http://mortgage" 
-	name="MortgageComposite">
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+    targetNamespace="http://mortgage" name="MortgageComposite">
 
     <component name="LoanApprovalComponent">
         <implementation.java class="mortgage.LoanApprovalImpl" />

Modified: incubator/tuscany/branches/sca-java-1.0.1/demos/mortgage-loanapproval/src/main/resources/Mortgage1.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/demos/mortgage-loanapproval/src/main/resources/Mortgage1.composite?rev=590832&r1=590831&r2=590832&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/demos/mortgage-loanapproval/src/main/resources/Mortgage1.composite (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/demos/mortgage-loanapproval/src/main/resources/Mortgage1.composite Wed Oct 31 14:09:17 2007
@@ -17,15 +17,15 @@
     * specific language governing permissions and limitations
     * under the License.    
 -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-	xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-	targetNamespace="http://mortgage" 
-	name="MortgageComposite">
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+    targetNamespace="http://mortgage" name="MortgageComposite">
 
     <component name="LoanApprovalComponent">
         <implementation.java class="mortgage.LoanApprovalImpl" />
         <property name="minimumCreditScore">600</property>
-        <reference name="creditCheck" target="CreditCheckComponent" />
+        <reference name="creditCheck">
+            <binding.ws wsdlElement="http://credit#wsdl.port(CreditCheckService/CreditCheckSoapPort)" />
+        </reference>
         <reference name="interestRateQuote" target="InterestRateQuoteComponent" />
         <reference name="riskAssessment" target="RiskAssessmentComponent" />
         <reference name="mortgageCalculator" target="MortgageCalculatorJSComponent" />
@@ -47,9 +47,11 @@
         <tuscany:implementation.script script="MortgageCalculator.js" />
     </component>
 
-    <reference name="CreditCheckReference" promote="LoanApprovalComponent/creditCheck">
+    <!-- 
+        <reference name="CreditCheckReference" promote="LoanApprovalComponent/creditCheck">
         <interface.java interface="mortgage.CreditCheck" />
         <binding.ws wsdlElement="http://credit#wsdl.port(CreditCheckService/CreditCheckSoapPort)" />
-    </reference>
+        </reference>
+    -->
 
 </composite>

Modified: incubator/tuscany/branches/sca-java-1.0.1/demos/mortgage-loanapproval/src/main/resources/wsdl/credit.wsdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/demos/mortgage-loanapproval/src/main/resources/wsdl/credit.wsdl?rev=590832&r1=590831&r2=590832&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0.1/demos/mortgage-loanapproval/src/main/resources/wsdl/credit.wsdl (original)
+++ incubator/tuscany/branches/sca-java-1.0.1/demos/mortgage-loanapproval/src/main/resources/wsdl/credit.wsdl Wed Oct 31 14:09:17 2007
@@ -74,7 +74,7 @@
 
     <wsdl:service name="CreditCheckService">
         <wsdl:port binding="tns:CreditCheckSoapBinding" name="CreditCheckSoapPort">
-            <wsdlsoap:address location="http://localhost:8085/CreditCheckService" />
+            <wsdlsoap:address location="http://localhost:8085/CreditCheckServiceComponent" />
         </wsdl:port>
     </wsdl:service>
 



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