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/21 22:39:59 UTC

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

Author: isilval
Date: Wed Feb 21 13:39:58 2007
New Revision: 510244

URL: http://svn.apache.org/viewvc?view=rev&rev=510244
Log:
Bug fixes

Added:
    incubator/tuscany/sandbox/isilval/notification/local/src/test/java/org/apache/tuscany/notification/local/TestCaseProducer.java
    incubator/tuscany/sandbox/isilval/notification/local/src/test/resources/TrafficAdvisoryNotification.componentType
Modified:
    incubator/tuscany/sandbox/isilval/notification/local/src/main/java/org/apache/tuscany/notification/local/NotificationComponentTypeLoader.java
    incubator/tuscany/sandbox/isilval/notification/local/src/main/resources/META-INF/sca/notification.system.scdl
    incubator/tuscany/sandbox/isilval/notification/local/src/test/java/org/apache/tuscany/notification/local/LocalNotificationITestCase.java
    incubator/tuscany/sandbox/isilval/notification/local/src/test/java/org/apache/tuscany/notification/local/TrafficAdvisoryProducer.java
    incubator/tuscany/sandbox/isilval/notification/local/src/test/resources/META-INF/sca/TrafficAdvisoryNotificationLocal.scdl

Modified: incubator/tuscany/sandbox/isilval/notification/local/src/main/java/org/apache/tuscany/notification/local/NotificationComponentTypeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/isilval/notification/local/src/main/java/org/apache/tuscany/notification/local/NotificationComponentTypeLoader.java?view=diff&rev=510244&r1=510243&r2=510244
==============================================================================
--- incubator/tuscany/sandbox/isilval/notification/local/src/main/java/org/apache/tuscany/notification/local/NotificationComponentTypeLoader.java (original)
+++ incubator/tuscany/sandbox/isilval/notification/local/src/main/java/org/apache/tuscany/notification/local/NotificationComponentTypeLoader.java Wed Feb 21 13:39:58 2007
@@ -53,7 +53,7 @@
         URL resource = implClass.getClassLoader().getResource(implementation.getComponentTypeName() + ".componentType");
         NotificationComponentType componentType;
         if (resource == null) {
-            throw new LoaderException("Can't locate component type side file");
+            throw new LoaderException("Can't locate component type side file for [" + implementation.getComponentTypeName() + "]");
         } else {
             componentType = loadFromSidefile(parent, resource, deploymentContext);
         }

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=510244&r1=510243&r2=510244
==============================================================================
--- 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 Wed Feb 21 13:39:58 2007
@@ -24,13 +24,13 @@
            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">
-        <group>org.apache.tuscany.sca.extensions.notification</group>
-        <name>tuscany-notification</name>
+        <groupId>org.apache.tuscany.sca.extensions.notification</groupId>
+        <artifactId>tuscany-notification</artifactId>
         <version>1.0-incubator-SNAPSHOT</version>
     </dependency>
-
+-->
     <component name="notification.implementationLoader">
         <system:implementation.system class="org.apache.tuscany.notification.local.NotificationImplementationLoader"/>
     </component>

Modified: incubator/tuscany/sandbox/isilval/notification/local/src/test/java/org/apache/tuscany/notification/local/LocalNotificationITestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/isilval/notification/local/src/test/java/org/apache/tuscany/notification/local/LocalNotificationITestCase.java?view=diff&rev=510244&r1=510243&r2=510244
==============================================================================
--- incubator/tuscany/sandbox/isilval/notification/local/src/test/java/org/apache/tuscany/notification/local/LocalNotificationITestCase.java (original)
+++ incubator/tuscany/sandbox/isilval/notification/local/src/test/java/org/apache/tuscany/notification/local/LocalNotificationITestCase.java Wed Feb 21 13:39:58 2007
@@ -25,7 +25,7 @@
 public class LocalNotificationITestCase extends TestCase {
     
     @Reference
-    TrafficAdvisoryProducer producer;
+    TestCaseProducer producer;
     
     public void testTrafficNotification() throws Exception {
         try {

Added: incubator/tuscany/sandbox/isilval/notification/local/src/test/java/org/apache/tuscany/notification/local/TestCaseProducer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/isilval/notification/local/src/test/java/org/apache/tuscany/notification/local/TestCaseProducer.java?view=auto&rev=510244
==============================================================================
--- incubator/tuscany/sandbox/isilval/notification/local/src/test/java/org/apache/tuscany/notification/local/TestCaseProducer.java (added)
+++ incubator/tuscany/sandbox/isilval/notification/local/src/test/java/org/apache/tuscany/notification/local/TestCaseProducer.java Wed Feb 21 13:39:58 2007
@@ -0,0 +1,6 @@
+package org.apache.tuscany.notification.local;
+
+public interface TestCaseProducer {
+
+    public void produceTrafficNotification(String report);
+}

Modified: incubator/tuscany/sandbox/isilval/notification/local/src/test/java/org/apache/tuscany/notification/local/TrafficAdvisoryProducer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/isilval/notification/local/src/test/java/org/apache/tuscany/notification/local/TrafficAdvisoryProducer.java?view=diff&rev=510244&r1=510243&r2=510244
==============================================================================
--- incubator/tuscany/sandbox/isilval/notification/local/src/test/java/org/apache/tuscany/notification/local/TrafficAdvisoryProducer.java (original)
+++ incubator/tuscany/sandbox/isilval/notification/local/src/test/java/org/apache/tuscany/notification/local/TrafficAdvisoryProducer.java Wed Feb 21 13:39:58 2007
@@ -21,11 +21,11 @@
 import org.osoa.sca.annotations.Reference;
 import org.osoa.sca.annotations.Service;
 
-@Service(TrafficAdvisoryProducer.class)
-public class TrafficAdvisoryProducer {
+@Service(TestCaseProducer.class)
+public class TrafficAdvisoryProducer implements TestCaseProducer {
     
     @Reference
-    TrafficAdvisory destination;
+    protected TrafficAdvisory destination;
 
     public void produceTrafficNotification(String report) {
         

Modified: incubator/tuscany/sandbox/isilval/notification/local/src/test/resources/META-INF/sca/TrafficAdvisoryNotificationLocal.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/isilval/notification/local/src/test/resources/META-INF/sca/TrafficAdvisoryNotificationLocal.scdl?view=diff&rev=510244&r1=510243&r2=510244
==============================================================================
--- incubator/tuscany/sandbox/isilval/notification/local/src/test/resources/META-INF/sca/TrafficAdvisoryNotificationLocal.scdl (original)
+++ incubator/tuscany/sandbox/isilval/notification/local/src/test/resources/META-INF/sca/TrafficAdvisoryNotificationLocal.scdl Wed Feb 21 13:39:58 2007
@@ -18,7 +18,8 @@
  * under the License.    
 -->
 
-<composite xmlns:nt="http://tuscany.apache.org/xmlns/notification/1.0"
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+           xmlns:nt="http://tuscany.apache.org/xmlns/notification/1.0"
            name="TrafficAdvisoryNotificationLocalComposite">
 
     <component name="TrafficAdvisoryProducer">

Added: incubator/tuscany/sandbox/isilval/notification/local/src/test/resources/TrafficAdvisoryNotification.componentType
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/isilval/notification/local/src/test/resources/TrafficAdvisoryNotification.componentType?view=auto&rev=510244
==============================================================================
--- incubator/tuscany/sandbox/isilval/notification/local/src/test/resources/TrafficAdvisoryNotification.componentType (added)
+++ incubator/tuscany/sandbox/isilval/notification/local/src/test/resources/TrafficAdvisoryNotification.componentType Wed Feb 21 13:39:58 2007
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="ASCII"?>
+<!--
+ * 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.    
+-->
+
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+     <service name="TrafficAdvisoryNotificationService">
+           <interface.java interface="org.apache.tuscany.notification.local.TrafficAdvisory"/>
+     </service>
+
+     <reference name="TrafficAdvisoryNotificationReference"
+                multiplicity="0..n">
+           <interface.java interface="org.apache.tuscany.notification.local.TrafficAdvisory"/>
+     </reference>
+</componentType>



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