You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jb...@apache.org on 2006/09/07 00:52:02 UTC

svn commit: r440894 - in /incubator/tuscany/java: samples/sca/webapp/src/main/webapp/WEB-INF/ sca/commands/launcher/src/main/resources/META-INF/tuscany/ sca/test/src/main/resources/META-INF/tuscany/

Author: jboynes
Date: Wed Sep  6 15:52:01 2006
New Revision: 440894

URL: http://svn.apache.org/viewvc?view=rev&rev=440894
Log:
consolidate common scdl fragments between launcher and test

Removed:
    incubator/tuscany/java/sca/commands/launcher/src/main/resources/META-INF/tuscany/composite.scdl
    incubator/tuscany/java/sca/commands/launcher/src/main/resources/META-INF/tuscany/implementation.scdl
    incubator/tuscany/java/sca/commands/launcher/src/main/resources/META-INF/tuscany/interfaceJava.scdl
    incubator/tuscany/java/sca/commands/launcher/src/main/resources/META-INF/tuscany/javaImplementation.scdl
    incubator/tuscany/java/sca/commands/launcher/src/main/resources/META-INF/tuscany/loader.scdl
    incubator/tuscany/java/sca/commands/launcher/src/main/resources/META-INF/tuscany/systemImplementation.scdl
    incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/composite.scdl
    incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/implementation.scdl
    incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/interfaceJava.scdl
    incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/javaImplementation.scdl
    incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/loader.scdl
    incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/systemImplementation.scdl
Modified:
    incubator/tuscany/java/samples/sca/webapp/src/main/webapp/WEB-INF/web.xml
    incubator/tuscany/java/sca/commands/launcher/src/main/resources/META-INF/tuscany/system.scdl
    incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/system.scdl

Modified: incubator/tuscany/java/samples/sca/webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/webapp/src/main/webapp/WEB-INF/web.xml?view=diff&rev=440894&r1=440893&r2=440894
==============================================================================
--- incubator/tuscany/java/samples/sca/webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/tuscany/java/samples/sca/webapp/src/main/webapp/WEB-INF/web.xml Wed Sep  6 15:52:01 2006
@@ -4,4 +4,8 @@
          xmlns="http://java.sun.com/xml/ns/j2ee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" >
+
+    <listener>
+        <listener-class>org.apache.tuscany.runtime.webapp.TuscanyContextListener</listener-class>
+    </listener>
 </web-app>

Modified: incubator/tuscany/java/sca/commands/launcher/src/main/resources/META-INF/tuscany/system.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/commands/launcher/src/main/resources/META-INF/tuscany/system.scdl?view=diff&rev=440894&r1=440893&r2=440894
==============================================================================
--- incubator/tuscany/java/sca/commands/launcher/src/main/resources/META-INF/tuscany/system.scdl (original)
+++ incubator/tuscany/java/sca/commands/launcher/src/main/resources/META-INF/tuscany/system.scdl Wed Sep  6 15:52:01 2006
@@ -79,22 +79,22 @@
     </component>
 
     <!-- include loader configuration -->
-    <include name="org.apache.tuscany.launcher.Loader" scdlLocation="loader.scdl"/>
+    <include name="org.apache.tuscany.launcher.Loader" scdlResource="org/apache/tuscany/core/loader.scdl"/>
 
     <!-- include implementation processor configuration -->
-    <include name="org.apache.tuscany.launcher.Implementation" scdlLocation="implementation.scdl"/>
+    <include name="org.apache.tuscany.launcher.Implementation" scdlResource="org/apache/tuscany/core/implementation.scdl"/>
 
     <!-- Java interface definition language -->
-    <include name="org.apache.tuscany.launcher.InterfaceJava" scdlLocation="interfaceJava.scdl"/>
+    <include name="org.apache.tuscany.launcher.InterfaceJava" scdlResource="org/apache/tuscany/core/interfaceJava.scdl"/>
 
     <!-- include omposite implementation type -->
-    <include name="org.apache.tuscany.launcher.Composite" scdlLocation="composite.scdl"/>
+    <include name="org.apache.tuscany.launcher.Composite" scdlResource="org/apache/tuscany/core/composite.scdl"/>
 
     <!-- System implementation type -->
-    <include name="org.apache.tuscany.launcher.SystemImplementation" scdlLocation="systemImplementation.scdl"/>
+    <include name="org.apache.tuscany.launcher.SystemImplementation" scdlResource="org/apache/tuscany/core/systemImplementation.scdl"/>
 
     <!-- Java implementation type -->
-    <include name="org.apache.tuscany.launcher.JavaImplementation" scdlLocation="javaImplementation.scdl"/>
+    <include name="org.apache.tuscany.launcher.JavaImplementation" scdlResource="org/apache/tuscany/core/javaImplementation.scdl"/>
 
     <!-- component that scans the extension directory -->
     <component name="directoryScanExtender" initLevel="90">

Modified: incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/system.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/system.scdl?view=diff&rev=440894&r1=440893&r2=440894
==============================================================================
--- incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/system.scdl (original)
+++ incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/system.scdl Wed Sep  6 15:52:01 2006
@@ -79,22 +79,22 @@
     </component>
 
     <!-- include loader configuration -->
-    <include name="org.apache.tuscany.launcher.Loader" scdlLocation="loader.scdl"/>
+    <include name="org.apache.tuscany.launcher.Loader" scdlResource="org/apache/tuscany/core/loader.scdl"/>
 
     <!-- include implementation processor configuration -->
-    <include name="org.apache.tuscany.launcher.Implementation" scdlLocation="implementation.scdl"/>
+    <include name="org.apache.tuscany.launcher.Implementation" scdlResource="org/apache/tuscany/core/implementation.scdl"/>
 
     <!-- Java interface definition language -->
-    <include name="org.apache.tuscany.launcher.InterfaceJava" scdlLocation="interfaceJava.scdl"/>
+    <include name="org.apache.tuscany.launcher.InterfaceJava" scdlResource="org/apache/tuscany/core/interfaceJava.scdl"/>
 
     <!-- include omposite implementation type -->
-    <include name="org.apache.tuscany.launcher.Composite" scdlLocation="composite.scdl"/>
+    <include name="org.apache.tuscany.launcher.Composite" scdlResource="org/apache/tuscany/core/composite.scdl"/>
 
     <!-- System implementation type -->
-    <include name="org.apache.tuscany.launcher.SystemImplementation" scdlLocation="systemImplementation.scdl"/>
+    <include name="org.apache.tuscany.launcher.SystemImplementation" scdlResource="org/apache/tuscany/core/systemImplementation.scdl"/>
 
     <!-- Java implementation type -->
-    <include name="org.apache.tuscany.launcher.JavaImplementation" scdlLocation="javaImplementation.scdl"/>
+    <include name="org.apache.tuscany.launcher.JavaImplementation" scdlResource="org/apache/tuscany/core/javaImplementation.scdl"/>
 
     <!-- System implementation type -->
     <include name="org.apache.tuscany.test.TestBindingImplementation" scdlLocation="test.binding.system.scdl"/>



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