You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by is...@apache.org on 2007/02/22 23:31:25 UTC

svn commit: r510694 - in /incubator/tuscany/sandbox/isilval/notification: ./ local/ local/src/main/java/org/apache/tuscany/notification/local/ local/src/main/resources/META-INF/sca/

Author: isilval
Date: Thu Feb 22 14:31:24 2007
New Revision: 510694

URL: http://svn.apache.org/viewvc?view=rev&rev=510694
Log:
ProxyService update, version updates and pom systemScdl config

Modified:
    incubator/tuscany/sandbox/isilval/notification/local/pom.xml
    incubator/tuscany/sandbox/isilval/notification/local/src/main/java/org/apache/tuscany/notification/local/LocalNotificationComponent.java
    incubator/tuscany/sandbox/isilval/notification/local/src/main/java/org/apache/tuscany/notification/local/LocalNotificationComponentBuilder.java
    incubator/tuscany/sandbox/isilval/notification/local/src/main/resources/META-INF/sca/notification.system.scdl
    incubator/tuscany/sandbox/isilval/notification/pom.xml

Modified: incubator/tuscany/sandbox/isilval/notification/local/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/isilval/notification/local/pom.xml?view=diff&rev=510694&r1=510693&r2=510694
==============================================================================
--- incubator/tuscany/sandbox/isilval/notification/local/pom.xml (original)
+++ incubator/tuscany/sandbox/isilval/notification/local/pom.xml Thu Feb 22 14:31:24 2007
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca.extensions.notification</groupId>
         <artifactId>parent</artifactId>
-        <version>1.0-incubator-SNAPSHOT</version>
+        <version>1.0-alpha-incubating-SNAPSHOT</version>
     </parent>
     <artifactId>tuscany-notification</artifactId>
     <name>Local Notification</name>
@@ -32,25 +32,25 @@
         <dependency>
             <groupId>org.apache.tuscany.sca.kernel</groupId>
             <artifactId>tuscany-spi</artifactId>
-            <version>1.0-incubator-SNAPSHOT</version>
+            <version>1.0-alpha-incubating-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca.kernel</groupId>
             <artifactId>tuscany-api</artifactId>
-            <version>1.0-incubator-SNAPSHOT</version>
+            <version>1.0-alpha-incubating-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca.kernel</groupId>
             <artifactId>tuscany-host-api</artifactId>
-            <version>1.0-incubator-SNAPSHOT</version>
+            <version>1.0-alpha-incubating-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.osoa</groupId>
             <artifactId>sca-api-r1.0</artifactId>
-            <version>1.0-incubator-SNAPSHOT</version>
+            <version>1.0-alpha-incubating-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -78,7 +78,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.tuscany.sca</groupId>
+                <groupId>org.apache.tuscany</groupId>
                 <artifactId>tuscany-itest-plugin</artifactId>
                 <executions>
                     <execution>
@@ -87,6 +87,9 @@
                         </goals>
                     </execution>
                 </executions>
+                <configuration>
+                    <systemScdl>file:///C:/Devt/tuscany-sbox/sandbox/isilval/notification/local/src/main/resources/META-INF/sca/notification.system.scdl</systemScdl>
+                </configuration>
             </plugin>
         </plugins>
     </build>

Modified: incubator/tuscany/sandbox/isilval/notification/local/src/main/java/org/apache/tuscany/notification/local/LocalNotificationComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/isilval/notification/local/src/main/java/org/apache/tuscany/notification/local/LocalNotificationComponent.java?view=diff&rev=510694&r1=510693&r2=510694
==============================================================================
--- incubator/tuscany/sandbox/isilval/notification/local/src/main/java/org/apache/tuscany/notification/local/LocalNotificationComponent.java (original)
+++ incubator/tuscany/sandbox/isilval/notification/local/src/main/java/org/apache/tuscany/notification/local/LocalNotificationComponent.java Thu Feb 22 14:31:24 2007
@@ -37,9 +37,9 @@
 import org.apache.tuscany.spi.wire.InvocationChain;
 import org.apache.tuscany.spi.wire.InvocationRuntimeException;
 import org.apache.tuscany.spi.wire.Message;
+import org.apache.tuscany.spi.wire.ProxyService;
 import org.apache.tuscany.spi.wire.TargetInvoker;
 import org.apache.tuscany.spi.wire.Wire;
-import org.apache.tuscany.spi.wire.WireService;
 
 /**
  * 
@@ -52,13 +52,13 @@
     private List<Wire> wires;
 
     public LocalNotificationComponent(URI name,
-                                       WireService wireService,
+                                       ProxyService proxyService,
                                        WorkContext workContext,
                                        WorkScheduler workScheduler,
                                        ExecutionMonitor monitor,
                                        int initLevel) {
-        super(name, wireService, workContext, workScheduler, monitor, initLevel, -1L, -1L);
-
+        super(name, proxyService, workContext, workScheduler, monitor, initLevel, -1L, -1L);
+        wires = null;
     }
     
     public Object createInstance() throws ObjectCreationException {
@@ -83,7 +83,11 @@
 
     public void attachWire(Wire wire) {
 
-        throw new AssertionError();
+        if (wires == null) {
+            wires = new ArrayList<Wire>();
+        }
+        wires.add(wire);
+        // throw new AssertionError();
     }
     
     public void attachWires(List<Wire> attachWires) {
@@ -120,6 +124,7 @@
             // REVIEW Should separate copies of message be used?
             for (Interceptor subscriberInterceptor : subscriberInterceptors) {
                 subscriberInterceptor.invoke(msg);
+                System.out.println("*** invoke msg [" + msg + "], subscriberInterceptor [" + subscriberInterceptor + "]");
             }
             
             return RESPONSE;

Modified: incubator/tuscany/sandbox/isilval/notification/local/src/main/java/org/apache/tuscany/notification/local/LocalNotificationComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/isilval/notification/local/src/main/java/org/apache/tuscany/notification/local/LocalNotificationComponentBuilder.java?view=diff&rev=510694&r1=510693&r2=510694
==============================================================================
--- incubator/tuscany/sandbox/isilval/notification/local/src/main/java/org/apache/tuscany/notification/local/LocalNotificationComponentBuilder.java (original)
+++ incubator/tuscany/sandbox/isilval/notification/local/src/main/java/org/apache/tuscany/notification/local/LocalNotificationComponentBuilder.java Thu Feb 22 14:31:24 2007
@@ -41,7 +41,7 @@
                            ComponentDefinition<NotificationImplementation> componentDefinition,
                            DeploymentContext deploymentContext) throws BuilderConfigException {
         return new LocalNotificationComponent(componentDefinition.getUri(),
-                                              wireService,
+                                              proxyService,
                                               workContext,
                                               workScheduler,
                                               monitor,

Modified: incubator/tuscany/sandbox/isilval/notification/local/src/main/resources/META-INF/sca/notification.system.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/isilval/notification/local/src/main/resources/META-INF/sca/notification.system.scdl?view=diff&rev=510694&r1=510693&r2=510694
==============================================================================
--- incubator/tuscany/sandbox/isilval/notification/local/src/main/resources/META-INF/sca/notification.system.scdl (original)
+++ incubator/tuscany/sandbox/isilval/notification/local/src/main/resources/META-INF/sca/notification.system.scdl Thu Feb 22 14:31:24 2007
@@ -22,13 +22,12 @@
 -->
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
            xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT"
-
            name="org.apache.tuscany.launcher.NotificationImplementation">
 <!--
     <dependency xmlns="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT">
         <groupId>org.apache.tuscany.sca.extensions.notification</groupId>
         <artifactId>tuscany-notification</artifactId>
-        <version>1.0-incubator-SNAPSHOT</version>
+        <version>1.0-alpha-incubating-SNAPSHOT</version>
     </dependency>
 -->
     <component name="notification.implementationLoader">

Modified: incubator/tuscany/sandbox/isilval/notification/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/isilval/notification/pom.xml?view=diff&rev=510694&r1=510693&r2=510694
==============================================================================
--- incubator/tuscany/sandbox/isilval/notification/pom.xml (original)
+++ incubator/tuscany/sandbox/isilval/notification/pom.xml Thu Feb 22 14:31:24 2007
@@ -23,7 +23,7 @@
     <artifactId>parent</artifactId>
     <name>Tuscany SCA Extensions for Multi-consumer Notification</name>
     <description></description>
-    <version>1.0-incubator-SNAPSHOT</version>
+    <version>1.0-alpha-incubating-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>



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