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/05/25 19:17:19 UTC
svn commit: r541727 - in /incubator/tuscany/java/sca:
demos/mortgage-loanapproval/src/main/java/mortgage/
demos/mortgage-loanapproval/src/main/resources/
modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/
modules/databinding/src/test/java/...
Author: rfeng
Date: Fri May 25 10:17:18 2007
New Revision: 541727
URL: http://svn.apache.org/viewvc?view=rev&rev=541727
Log:
Fix the multiplicity support for references with both promotion and local target
Modified:
incubator/tuscany/java/sca/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApprovalImpl.java
incubator/tuscany/java/sca/demos/mortgage-loanapproval/src/main/resources/Mortgage1.composite
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/CompositeActivatorImpl.java
incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentInfo.java
Modified: incubator/tuscany/java/sca/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApprovalImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApprovalImpl.java?view=diff&rev=541727&r1=541726&r2=541727
==============================================================================
--- incubator/tuscany/java/sca/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApprovalImpl.java (original)
+++ incubator/tuscany/java/sca/demos/mortgage-loanapproval/src/main/java/mortgage/LoanApprovalImpl.java Fri May 25 10:17:18 2007
@@ -63,7 +63,7 @@
public boolean approve(Customer customer, double loanAmount, int years) {
int score = 0;
for (int i = 0; i < creditCheck.length; i++) {
- score += creditCheck[0].getCreditScore(customer.getSsn());
+ score += creditCheck[i].getCreditScore(customer.getSsn());
}
if (score != 0) {
score = score / creditCheck.length;
Modified: incubator/tuscany/java/sca/demos/mortgage-loanapproval/src/main/resources/Mortgage1.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/mortgage-loanapproval/src/main/resources/Mortgage1.composite?view=diff&rev=541727&r1=541726&r2=541727
==============================================================================
--- incubator/tuscany/java/sca/demos/mortgage-loanapproval/src/main/resources/Mortgage1.composite (original)
+++ incubator/tuscany/java/sca/demos/mortgage-loanapproval/src/main/resources/Mortgage1.composite Fri May 25 10:17:18 2007
@@ -22,9 +22,7 @@
<component name="LoanApprovalComponent">
<implementation.java class="mortgage.LoanApprovalImpl" />
<property name="minimumCreditScore">600</property>
- <!--
<reference name="creditCheck" target="CreditCheckComponent" />
- -->
<reference name="interestRateQuote" target="InterestRateQuoteComponent" />
<reference name="riskAssessment" target="RiskAssessmentComponent" />
<reference name="mortgageCalculator" target="MortgageCalculatorJSComponent" />
Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/CompositeActivatorImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/CompositeActivatorImpl.java?view=diff&rev=541727&r1=541726&r2=541727
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/CompositeActivatorImpl.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/CompositeActivatorImpl.java Fri May 25 10:17:18 2007
@@ -346,6 +346,8 @@
}
runtimeRef.getRuntimeWires().add(wire);
wireProcessor.process(wire);
+ // TODO: For non-SCA binding, how do we deal with targets? For now, assuming targets only apply to SCABinding
+ return;
}
for (ComponentService service : reference.getTargets()) {
Component target = null;
Modified: incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java?view=diff&rev=541727&r1=541726&r2=541727
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java Fri May 25 10:17:18 2007
@@ -49,7 +49,7 @@
SAMPLE_VALUES.put("duration", new String[] {"P8M3DT7H33M2S", "P5Y2M10DT15H"});
SAMPLE_VALUES.put("float", new String[] {"3.1415292", "INF", "NaN"});
SAMPLE_VALUES.put("gDay", "---11");
- SAMPLE_VALUES.put("gMonth", "--02--");
+ SAMPLE_VALUES.put("gMonth", "--02");
SAMPLE_VALUES.put("gMonthDay", "--02-14");
SAMPLE_VALUES.put("gYear", "1999");
SAMPLE_VALUES.put("gYearMonth", "1972-08");
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentInfo.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentInfo.java?view=diff&rev=541727&r1=541726&r2=541727
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentInfo.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentInfo.java Fri May 25 10:17:18 2007
@@ -179,8 +179,8 @@
}
if (ref.getMultiplicity() == Multiplicity.ONE_N || ref.getMultiplicity() == Multiplicity.ZERO_N) {
List<ObjectFactory<?>> factories = new ArrayList<ObjectFactory<?>>();
+ Class<?> baseType = JavaIntrospectionHelper.getBaseType(element.getType(), element.getGenericType());
for (int i = 0; i < wireList.size(); i++) {
- Class<?> baseType = JavaIntrospectionHelper.getBaseType(element.getType(), element.getGenericType());
ObjectFactory<?> factory = createWireFactory(baseType, wireList.get(i));
factories.add(factory);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org