tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jboy...@apache.org
Subject svn commit: r420018 - in /incubator/tuscany/sandbox/jboynes/sca: core2/src/main/java/org/apache/tuscany/core/builder/ core2/src/main/java/org/apache/tuscany/core/implementation/system/builder/ samples/local.wire/
Date Sat, 08 Jul 2006 00:07:26 GMT
Author: jboynes
Date: Fri Jul  7 17:07:26 2006
New Revision: 420018

URL: http://svn.apache.org/viewvc?rev=420018&view=rev
Log:
fix problem with duplicate wiring of system references

Modified:
    incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java
    incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilder.java
    incubator/tuscany/sandbox/jboynes/sca/samples/local.wire/pom.xml

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java?rev=420018&r1=420017&r2=420018&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java
(original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java
Fri Jul  7 17:07:26 2006
@@ -114,13 +114,6 @@
         Component<?> component = componentBuilder.build(parent, componentDefinition,
deploymentContext);
         ComponentType<?, ?, ?> componentType = componentDefinition.getImplementation().getComponentType();
         assert componentType != null : "Component type must be set";
-        for (ServiceDefinition service : componentType.getServices().values()) {
-            component.addInboundWire(createWire(service));
-        }
-        for (ReferenceTarget reference : componentDefinition.getReferenceTargets().values())
{
-            component.addOutboundWire(
-                createWire(reference, componentType.getReferences().get(reference.getReferenceName())));
-        }
         return component;
     }
 

Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilder.java?rev=420018&r1=420017&r2=420018&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilder.java
(original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemComponentBuilder.java
Fri Jul  7 17:07:26 2006
@@ -103,9 +103,10 @@
         // handle references directly with no proxies
         for (ReferenceTarget target : definition.getReferenceTargets().values()) {
             String referenceName = target.getReferenceName();
-            Class interfaze = target.getReference().getServiceContract().getInterfaceClass();
+            JavaMappedReference referenceDefiniton = componentType.getReferences().get(referenceName);
+            Class interfaze = referenceDefiniton.getServiceContract().getInterfaceClass();
             OutboundWire<?> wire;
-            if (target.getReference().isAutowire()) {
+            if (referenceDefiniton.isAutowire()) {
                 wire = new SystemOutboundAutowire(referenceName, interfaze, autowireContext);
             } else {
                 //FIXME support multiplicity!

Modified: incubator/tuscany/sandbox/jboynes/sca/samples/local.wire/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/samples/local.wire/pom.xml?rev=420018&r1=420017&r2=420018&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/samples/local.wire/pom.xml (original)
+++ incubator/tuscany/sandbox/jboynes/sca/samples/local.wire/pom.xml Fri Jul  7 17:07:26 2006
@@ -32,13 +32,20 @@
             <groupId>org.osoa</groupId>
             <artifactId>sca-api</artifactId>
         </dependency>
-
-<!-- the below really shouldn't be needed except for the demo -->
-        <dependency>
-            <groupId>org.apache.tuscany</groupId>
-            <artifactId>core</artifactId>
-            <version>${pom.version}</version>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <mainClass>localwire.LocalWireClient</mainClass>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>



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


Mime
View raw message