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 2006/08/17 06:40:42 UTC
svn commit: r432139 - in
/incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany:
composite.scdl implementation.scdl interfaceJava.scdl
javaImplementation.scdl loader.scdl system.scdl systemImplementation.scdl
Author: rfeng
Date: Wed Aug 16 21:40:41 2006
New Revision: 432139
URL: http://svn.apache.org/viewvc?rev=432139&view=rev
Log:
Remove duplicate java entries from loader.scdl
Update scdl files in "test" to be in sync with "launcher"
Modified:
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/system.scdl
incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/systemImplementation.scdl
Modified: incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/composite.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/composite.scdl?rev=432139&r1=432138&r2=432139&view=diff
==============================================================================
--- incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/composite.scdl (original)
+++ incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/composite.scdl Wed Aug 16 21:40:41 2006
@@ -24,11 +24,14 @@
-->
<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.test.Composite">
+ name="org.apache.tuscany.launcher.Composite">
<!-- Composite implementation type -->
<component name="composite.loader">
<system:implementation.system class="org.apache.tuscany.core.implementation.composite.CompositeLoader"/>
+ </component>
+ <component name="composite.dependencyLoader">
+ <system:implementation.system class="org.apache.tuscany.core.implementation.composite.DependencyLoader"/>
</component>
<component name="composite.componentTypeLoader">
<system:implementation.system class="org.apache.tuscany.core.implementation.composite.CompositeComponentTypeLoader"/>
Modified: incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/implementation.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/implementation.scdl?rev=432139&r1=432138&r2=432139&view=diff
==============================================================================
--- incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/implementation.scdl (original)
+++ incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/implementation.scdl Wed Aug 16 21:40:41 2006
@@ -24,12 +24,9 @@
-->
<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.test.Implementation">
+ name="org.apache.tuscany.launcher.Implementation">
<!-- Foundation implementation processors -->
- <component name="implementation.Destroy">
- <system:implementation.system class="org.apache.tuscany.core.implementation.processor.ConstructorProcessor"/>
- </component>
<component name="implementation.Destroy">
<system:implementation.system class="org.apache.tuscany.core.implementation.processor.DestroyProcessor"/>
</component>
Modified: incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/interfaceJava.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/interfaceJava.scdl?rev=432139&r1=432138&r2=432139&view=diff
==============================================================================
--- incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/interfaceJava.scdl (original)
+++ incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/interfaceJava.scdl Wed Aug 16 21:40:41 2006
@@ -7,24 +7,24 @@
* 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.
+ * under the License.
-->
<!--
Configuration for Java IDL support.
-
+
$Rev$ $Date$
-->
<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.test.InterfaceJava">
+ name="org.apache.tuscany.launcher.InterfaceJava">
<component name="interfaceJava.introspector">
<system:implementation.system class="org.apache.tuscany.core.idl.java.InterfaceJavaIntrospectorImpl"/>
@@ -32,4 +32,5 @@
<component name="interfaceJava.loader">
<system:implementation.system class="org.apache.tuscany.core.idl.java.InterfaceJavaLoader"/>
</component>
-</composite>
+
+ </composite>
Modified: incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/javaImplementation.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/javaImplementation.scdl?rev=432139&r1=432138&r2=432139&view=diff
==============================================================================
--- incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/javaImplementation.scdl (original)
+++ incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/javaImplementation.scdl Wed Aug 16 21:40:41 2006
@@ -24,7 +24,7 @@
-->
<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.test.JavaImplementation">
+ name="org.apache.tuscany.launcher.JavaImplementation">
<!-- Java implementation type -->
<component name="java.implementationLoader">
Modified: incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/loader.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/loader.scdl?rev=432139&r1=432138&r2=432139&view=diff
==============================================================================
--- incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/loader.scdl (original)
+++ incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/loader.scdl Wed Aug 16 21:40:41 2006
@@ -24,7 +24,7 @@
-->
<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.test.Loader">
+ name="org.apache.tuscany.launcher.Loader">
<!-- Foundation element loader implementations -->
<component name="elementLoader.component">
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?rev=432139&r1=432138&r2=432139&view=diff
==============================================================================
--- 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 Aug 16 21:40:41 2006
@@ -24,7 +24,7 @@
-->
<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.test.System">
+ name="org.apache.tuscany.launcher.System">
<!-- Component that provides the Deployer service -->
<component name="deployer">
@@ -75,38 +75,43 @@
</component>
<!-- include loader configuration -->
- <include name="org.apache.tuscany.test.Loader" scdlLocation="loader.scdl"/>
+ <include name="org.apache.tuscany.launcher.Loader" scdlLocation="loader.scdl"/>
<!-- include implementation processor configuration -->
- <include name="org.apache.tuscany.test.Implementation" scdlLocation="implementation.scdl"/>
+ <include name="org.apache.tuscany.launcher.Implementation" scdlLocation="implementation.scdl"/>
<!-- Java interface definition language -->
<include name="org.apache.tuscany.launcher.InterfaceJava" scdlLocation="interfaceJava.scdl"/>
<!-- include omposite implementation type -->
- <include name="org.apache.tuscany.test.Composite" scdlLocation="composite.scdl"/>
+ <include name="org.apache.tuscany.launcher.Composite" scdlLocation="composite.scdl"/>
<!-- System implementation type -->
- <include name="org.apache.tuscany.test.SystemImplementation" scdlLocation="systemImplementation.scdl"/>
+ <include name="org.apache.tuscany.launcher.SystemImplementation" scdlLocation="systemImplementation.scdl"/>
<!-- Java implementation type -->
- <include name="org.apache.tuscany.test.JavaImplementation" scdlLocation="javaImplementation.scdl"/>
+ <include name="org.apache.tuscany.launcher.JavaImplementation" scdlLocation="javaImplementation.scdl"/>
<!-- component that scans the extension directory -->
- <component name="directoryScanExtender">
+ <component name="directoryScanExtender" initLevel="90">
<system:implementation.system class="org.apache.tuscany.core.services.extension.DirectoryScanExtender"/>
<property name="path">extension</property>
</component>
+ <!-- service for resolving artifacts against the user's local Maven repository -->
+ <component name="artifactRepository">
+ <system:implementation.system class="org.apache.tuscany.core.services.artifact.LocalMavenRepository"/>
+ <property name="repository">.m2/repository</property>
+ </component>
+
<!-- WorkScheduler service -->
<component name="workManager">
- <system:implementation.system
- class="org.apache.tuscany.core.services.work.jsr237.workmanager.ThreadPoolWorkManager"/>
+ <system:implementation.system class="org.apache.tuscany.core.services.work.jsr237.workmanager.ThreadPoolWorkManager"/>
<property name="poolSize">10</property>
</component>
<component name="workScheduler">
<system:implementation.system class="org.apache.tuscany.core.services.work.jsr237.Jsr237WorkScheduler"/>
</component>
-
+
</composite>
Modified: incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/systemImplementation.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/systemImplementation.scdl?rev=432139&r1=432138&r2=432139&view=diff
==============================================================================
--- incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/systemImplementation.scdl (original)
+++ incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/systemImplementation.scdl Wed Aug 16 21:40:41 2006
@@ -24,7 +24,7 @@
-->
<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.test.SystemImplementation">
+ name="org.apache.tuscany.launcher.SystemImplementation">
<!-- System implementation type -->
<component name="system.bindingLoader">
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org
Re: svn commit: r432139 - in /incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany: composite.scdl implementation.scdl interfaceJava.scdl javaImplementation.scdl loader.scdl system.scdl systemImplementation.scdl
Posted by Jeremy Boynes <jb...@apache.org>.
I don't think we should have potentially different composite
definitions with the same name. For example, this will cause problems
when used in conjunction with a repository.
--
Jeremy
On Aug 16, 2006, at 9:40 PM, rfeng@apache.org wrote:
> ======================================================================
> ========
> --- incubator/tuscany/java/sca/test/src/main/resources/META-INF/
> tuscany/composite.scdl (original)
> +++ incubator/tuscany/java/sca/test/src/main/resources/META-INF/
> tuscany/composite.scdl Wed Aug 16 21:40:41 2006
> @@ -24,11 +24,14 @@
> -->
> <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.test.Composite">
> + name="org.apache.tuscany.launcher.Composite">
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-dev-help@ws.apache.org