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 2007/02/13 07:01:42 UTC
svn commit: r506877 - in
/incubator/tuscany/branches/sca-java-integration/sca:
extensions/axis2/binding/src/main/resources/META-INF/sca/
extensions/axis2/databinding/src/main/resources/META-INF/sca/
extensions/groovy/container/src/main/resources/META-I...
Author: rfeng
Date: Mon Feb 12 22:01:40 2007
New Revision: 506877
URL: http://svn.apache.org/viewvc?view=rev&rev=506877
Log:
[sca-integration-branch] Add extension.composite for extensions and other clean up
Added:
incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/resources/META-INF/sca/extension.composite
incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/databinding/src/main/resources/META-INF/sca/extension.composite
incubator/tuscany/branches/sca-java-integration/sca/extensions/groovy/container/src/main/resources/META-INF/sca/container.groovy.scdl
- copied, changed from r506573, incubator/tuscany/branches/sca-java-integration/sca/extensions/groovy/container/src/main/resources/META-INF/sca/groovy.system.scdl
incubator/tuscany/branches/sca-java-integration/sca/extensions/groovy/container/src/main/resources/META-INF/sca/extension.composite
incubator/tuscany/branches/sca-java-integration/sca/extensions/javascript/container/src/main/resources/META-INF/sca/container.javascript.scdl
- copied, changed from r506573, incubator/tuscany/branches/sca-java-integration/sca/extensions/javascript/container/src/main/resources/META-INF/sca/js.system.scdl
incubator/tuscany/branches/sca-java-integration/sca/extensions/javascript/container/src/main/resources/META-INF/sca/extension.composite
incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/binding/src/main/resources/META-INF/sca/binding.jms.scdl
- copied, changed from r506573, incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/binding/src/main/resources/META-INF/sca/jms.system.scdl
incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/binding/src/main/resources/META-INF/sca/extension.composite
incubator/tuscany/branches/sca-java-integration/sca/extensions/jsonrpc/binding/src/main/resources/META-INF/sca/extension.composite
incubator/tuscany/branches/sca-java-integration/sca/extensions/rmi/binding.rmi/src/main/resources/META-INF/sca/binding.rmi.scdl
- copied, changed from r506573, incubator/tuscany/branches/sca-java-integration/sca/extensions/rmi/binding.rmi/src/main/resources/META-INF/sca/rmi_extension.scdl
incubator/tuscany/branches/sca-java-integration/sca/extensions/rmi/binding.rmi/src/main/resources/META-INF/sca/extension.composite
incubator/tuscany/branches/sca-java-integration/sca/extensions/ruby/container/src/main/resources/META-INF/sca/container.ruby.scdl
- copied, changed from r506573, incubator/tuscany/branches/sca-java-integration/sca/extensions/ruby/container/src/main/resources/META-INF/sca/ruby.system.scdl
incubator/tuscany/branches/sca-java-integration/sca/extensions/ruby/container/src/main/resources/META-INF/sca/extension.composite
incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/resources/META-INF/
incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/resources/META-INF/tuscany/
incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/resources/META-INF/tuscany/system.composite
incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-jaxb/src/main/resources/META-INF/sca/extension.composite
incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/resources/META-INF/sca/extension.composite
incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-xmlbeans/src/main/resources/META-INF/sca/databinding.xmlbeans.scdl
incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-xmlbeans/src/main/resources/META-INF/sca/extension.composite
incubator/tuscany/branches/sca-java-integration/sca/services/idl/wsdl/src/main/resources/META-INF/sca/extension.composite
Removed:
incubator/tuscany/branches/sca-java-integration/sca/extensions/groovy/container/src/main/resources/META-INF/sca/groovy.system.scdl
incubator/tuscany/branches/sca-java-integration/sca/extensions/javascript/container/src/main/resources/META-INF/sca/js.system.scdl
incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/binding/src/main/resources/META-INF/sca/jms.system.scdl
incubator/tuscany/branches/sca-java-integration/sca/extensions/jsonrpc/binding/src/main/resources/META-INF/sca/jsonrpc_extension.scdl
incubator/tuscany/branches/sca-java-integration/sca/extensions/rmi/binding.rmi/src/main/resources/META-INF/sca/rmi_extension.scdl
incubator/tuscany/branches/sca-java-integration/sca/extensions/ruby/container/src/main/resources/META-INF/sca/ruby.system.scdl
Modified:
incubator/tuscany/branches/sca-java-integration/sca/extensions/groovy/container/src/main/resources/META-INF/sca/default.scdl
incubator/tuscany/branches/sca-java-integration/sca/extensions/javascript/container/src/main/resources/META-INF/sca/default.scdl
incubator/tuscany/branches/sca-java-integration/sca/extensions/javascript/container/src/test/java/org/apache/tuscany/container/javascript/function/HelloWorldTestCase.java
incubator/tuscany/branches/sca-java-integration/sca/extensions/javascript/container/src/test/java/org/apache/tuscany/container/javascript/function/ScopeTestCase.java
incubator/tuscany/branches/sca-java-integration/sca/extensions/javascript/samples/helloworld/src/test/java/helloworld/HelloWorldTestCase.java
incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/binding/src/main/resources/META-INF/sca/default.scdl
incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/binding/src/test/java/org/apache/tuscany/binding/jms/JMSBindingTestCaseX.java
incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/samples/helloworld.jmsReference/src/test/java/helloworld/HelloWorldJmsClient.java
incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/samples/helloworld.jmsService/src/test/java/helloworld/HelloWorldJmsServer.java
incubator/tuscany/branches/sca-java-integration/sca/extensions/jsonrpc/binding/src/main/resources/META-INF/sca/binding.jsonrpc.scdl
incubator/tuscany/branches/sca-java-integration/sca/extensions/ruby/container/src/main/resources/META-INF/sca/default.scdl
incubator/tuscany/branches/sca-java-integration/sca/extensions/ruby/container/src/test/java/org/apache/tuscany/container/ruby/function/HelloWorldTestCase.java
incubator/tuscany/branches/sca-java-integration/sca/extensions/ruby/samples/helloworld/src/test/java/helloworld/HelloWorldTestCase.java
incubator/tuscany/branches/sca-java-integration/sca/kernel/api/src/main/java/org/apache/tuscany/api/TuscanyContainer.java
incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultTuscanyContainer.java
incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-xmlbeans/src/main/resources/META-INF/sca/default.scdl
incubator/tuscany/branches/sca-java-integration/sca/test/src/main/java/org/apache/tuscany/test/SCATestCase.java
Added: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/resources/META-INF/sca/extension.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/resources/META-INF/sca/extension.composite?view=auto&rev=506877
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/resources/META-INF/sca/extension.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/binding/src/main/resources/META-INF/sca/extension.composite Mon Feb 12 22:01:40 2007
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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 peaxis2ssions and limitations
+ * under the License.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" name="org.apache.tuscany.binding.axis2">
+ <include name="org.apache.tuscany.binding.axis2.include" scdlLocation="binding.axis2.scdl" />
+</composite>
\ No newline at end of file
Added: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/databinding/src/main/resources/META-INF/sca/extension.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/databinding/src/main/resources/META-INF/sca/extension.composite?view=auto&rev=506877
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/databinding/src/main/resources/META-INF/sca/extension.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/databinding/src/main/resources/META-INF/sca/extension.composite Mon Feb 12 22:01:40 2007
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" name="org.apache.tuscany.databinding.axiom">
+ <include name="org.apache.tuscany.databinding.axiom.include" scdlLocation="databinding.axiom.scdl" />
+</composite>
\ No newline at end of file
Copied: incubator/tuscany/branches/sca-java-integration/sca/extensions/groovy/container/src/main/resources/META-INF/sca/container.groovy.scdl (from r506573, incubator/tuscany/branches/sca-java-integration/sca/extensions/groovy/container/src/main/resources/META-INF/sca/groovy.system.scdl)
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/groovy/container/src/main/resources/META-INF/sca/container.groovy.scdl?view=diff&rev=506877&p1=incubator/tuscany/branches/sca-java-integration/sca/extensions/groovy/container/src/main/resources/META-INF/sca/groovy.system.scdl&r1=506573&p2=incubator/tuscany/branches/sca-java-integration/sca/extensions/groovy/container/src/main/resources/META-INF/sca/container.groovy.scdl&r2=506877
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/groovy/container/src/main/resources/META-INF/sca/groovy.system.scdl (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/groovy/container/src/main/resources/META-INF/sca/container.groovy.scdl Mon Feb 12 22:01:40 2007
@@ -23,7 +23,7 @@
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT"
- name="groovy.extension">
+ name="org.apache.tuscany.container.groovy.include">
<dependency xmlns="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT">
<group>org.apache.tuscany.sca.extensions.groovy</group>
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/groovy/container/src/main/resources/META-INF/sca/default.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/groovy/container/src/main/resources/META-INF/sca/default.scdl?view=diff&rev=506877&r1=506876&r2=506877
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/groovy/container/src/main/resources/META-INF/sca/default.scdl (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/groovy/container/src/main/resources/META-INF/sca/default.scdl Mon Feb 12 22:01:40 2007
@@ -23,7 +23,7 @@
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT"
- name="groovy.extension">
+ name="org.apache.tuscany.container.groovy">
<dependency xmlns="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT">
<group>org.apache.tuscany.sca.extensions.groovy</group>
Added: incubator/tuscany/branches/sca-java-integration/sca/extensions/groovy/container/src/main/resources/META-INF/sca/extension.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/groovy/container/src/main/resources/META-INF/sca/extension.composite?view=auto&rev=506877
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/groovy/container/src/main/resources/META-INF/sca/extension.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/groovy/container/src/main/resources/META-INF/sca/extension.composite Mon Feb 12 22:01:40 2007
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" name="org.apache.tuscany.container.groovy">
+ <include name="org.apache.tuscany.container.groovy.include" scdlLocation="container.groovy.scdl" />
+</composite>
\ No newline at end of file
Copied: incubator/tuscany/branches/sca-java-integration/sca/extensions/javascript/container/src/main/resources/META-INF/sca/container.javascript.scdl (from r506573, incubator/tuscany/branches/sca-java-integration/sca/extensions/javascript/container/src/main/resources/META-INF/sca/js.system.scdl)
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/javascript/container/src/main/resources/META-INF/sca/container.javascript.scdl?view=diff&rev=506877&p1=incubator/tuscany/branches/sca-java-integration/sca/extensions/javascript/container/src/main/resources/META-INF/sca/js.system.scdl&r1=506573&p2=incubator/tuscany/branches/sca-java-integration/sca/extensions/javascript/container/src/main/resources/META-INF/sca/container.javascript.scdl&r2=506877
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/javascript/container/src/main/resources/META-INF/sca/js.system.scdl (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/javascript/container/src/main/resources/META-INF/sca/container.javascript.scdl Mon Feb 12 22:01:40 2007
@@ -1,29 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- * 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.
+ * 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.
-->
<!--
JavaScript configuration for the launcher environment.
-->
-<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.JavaScriptImplementation">
+<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.container.javascript.include">
<dependency xmlns="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT">
<group>org.apache.tuscany.sca.extensions.javascript</group>
@@ -32,20 +30,20 @@
</dependency>
<component name="javascript.implementationLoader">
- <system:implementation.system class="org.apache.tuscany.container.javascript.JavaScriptImplementationLoader"/>
+ <system:implementation.system class="org.apache.tuscany.container.javascript.JavaScriptImplementationLoader" />
</component>
<component name="javascript.componentTypeLoader">
- <system:implementation.system class="org.apache.tuscany.container.javascript.JavaScriptComponentTypeLoader"/>
+ <system:implementation.system class="org.apache.tuscany.container.javascript.JavaScriptComponentTypeLoader" />
</component>
<component name="javascript.componentBuilder">
- <system:implementation.system class="org.apache.tuscany.container.javascript.JavaScriptComponentBuilder"/>
+ <system:implementation.system class="org.apache.tuscany.container.javascript.JavaScriptComponentBuilder" />
</component>
-
- <!-- Xml Instance Registry service -->
+
+ <!-- Xml Instance Registry service -->
<component name="xmlInstRegistry">
- <system:implementation.system class="org.apache.tuscany.container.javascript.utils.xmlfromxsd.XmlInstanceRegistryImpl"/>
+ <system:implementation.system class="org.apache.tuscany.container.javascript.utils.xmlfromxsd.XmlInstanceRegistryImpl" />
</component>
</composite>
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/javascript/container/src/main/resources/META-INF/sca/default.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/javascript/container/src/main/resources/META-INF/sca/default.scdl?view=diff&rev=506877&r1=506876&r2=506877
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/javascript/container/src/main/resources/META-INF/sca/default.scdl (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/javascript/container/src/main/resources/META-INF/sca/default.scdl Mon Feb 12 22:01:40 2007
@@ -1,29 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- * 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.
+ * 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.
-->
<!--
JavaScript configuration for the launcher environment.
-->
-<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.JavaScriptImplementation">
+<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.container.javascript">
<dependency xmlns="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT">
<group>org.apache.tuscany.sca.extensions.javascript</group>
@@ -32,20 +30,20 @@
</dependency>
<component name="javascript.implementationLoader">
- <system:implementation.system class="org.apache.tuscany.container.javascript.JavaScriptImplementationLoader"/>
+ <system:implementation.system class="org.apache.tuscany.container.javascript.JavaScriptImplementationLoader" />
</component>
<component name="javascript.componentTypeLoader">
- <system:implementation.system class="org.apache.tuscany.container.javascript.JavaScriptComponentTypeLoader"/>
+ <system:implementation.system class="org.apache.tuscany.container.javascript.JavaScriptComponentTypeLoader" />
</component>
<component name="javascript.componentBuilder">
- <system:implementation.system class="org.apache.tuscany.container.javascript.JavaScriptComponentBuilder"/>
+ <system:implementation.system class="org.apache.tuscany.container.javascript.JavaScriptComponentBuilder" />
</component>
-
+
<!-- Xml Instance Registry service -->
<component name="xmlInstRegistry">
- <system:implementation.system class="org.apache.tuscany.container.javascript.utils.xmlfromxsd.XmlInstanceRegistryImpl"/>
+ <system:implementation.system class="org.apache.tuscany.container.javascript.utils.xmlfromxsd.XmlInstanceRegistryImpl" />
</component>
</composite>
Added: incubator/tuscany/branches/sca-java-integration/sca/extensions/javascript/container/src/main/resources/META-INF/sca/extension.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/javascript/container/src/main/resources/META-INF/sca/extension.composite?view=auto&rev=506877
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/javascript/container/src/main/resources/META-INF/sca/extension.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/javascript/container/src/main/resources/META-INF/sca/extension.composite Mon Feb 12 22:01:40 2007
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" name="org.apache.tuscany.container.javascript">
+ <include name="org.apache.tuscany.container.javascript.include" scdlLocation="container.javascript.scdl" />
+</composite>
\ No newline at end of file
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/javascript/container/src/test/java/org/apache/tuscany/container/javascript/function/HelloWorldTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/javascript/container/src/test/java/org/apache/tuscany/container/javascript/function/HelloWorldTestCase.java?view=diff&rev=506877&r1=506876&r2=506877
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/javascript/container/src/test/java/org/apache/tuscany/container/javascript/function/HelloWorldTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/javascript/container/src/test/java/org/apache/tuscany/container/javascript/function/HelloWorldTestCase.java Mon Feb 12 22:01:40 2007
@@ -41,7 +41,7 @@
private CompositeContext context;
protected void setUp() throws Exception {
- URL base = getClass().getResource("/META-INF/sca/js.system.scdl");
+ URL base = getClass().getResource("/META-INF/sca/container.javascript.scdl");
addExtension("JavaScriptContainer", new URL(base, "default.scdl"));
setApplicationSCDL(getClass().getResource("helloworld.scdl"));
super.setUp();
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/javascript/container/src/test/java/org/apache/tuscany/container/javascript/function/ScopeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/javascript/container/src/test/java/org/apache/tuscany/container/javascript/function/ScopeTestCase.java?view=diff&rev=506877&r1=506876&r2=506877
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/javascript/container/src/test/java/org/apache/tuscany/container/javascript/function/ScopeTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/javascript/container/src/test/java/org/apache/tuscany/container/javascript/function/ScopeTestCase.java Mon Feb 12 22:01:40 2007
@@ -34,7 +34,7 @@
private CompositeContext context;
protected void setUp() throws Exception {
- URL base = getClass().getResource("/META-INF/sca/js.system.scdl");
+ URL base = getClass().getResource("/META-INF/sca/container.javascript.scdl");
addExtension("JavaScriptContainer", new URL(base, "default.scdl"));
setApplicationSCDL(getClass().getResource("scopeTest.scdl"));
super.setUp();
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/javascript/samples/helloworld/src/test/java/helloworld/HelloWorldTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/javascript/samples/helloworld/src/test/java/helloworld/HelloWorldTestCase.java?view=diff&rev=506877&r1=506876&r2=506877
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/javascript/samples/helloworld/src/test/java/helloworld/HelloWorldTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/javascript/samples/helloworld/src/test/java/helloworld/HelloWorldTestCase.java Mon Feb 12 22:01:40 2007
@@ -32,7 +32,7 @@
private HelloWorldService helloWorldService;
protected void setUp() throws Exception {
- URL scdl = getClass().getClassLoader().getResource("META-INF/sca/js.system.scdl");
+ URL scdl = getClass().getClassLoader().getResource("META-INF/sca/container.javascript.scdl");
addExtension("JavaScriptContainer", scdl);
setApplicationSCDL(HelloWorldService.class, "META-INF/sca/default.scdl");
super.setUp();
Copied: incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/binding/src/main/resources/META-INF/sca/binding.jms.scdl (from r506573, incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/binding/src/main/resources/META-INF/sca/jms.system.scdl)
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/binding/src/main/resources/META-INF/sca/binding.jms.scdl?view=diff&rev=506877&p1=incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/binding/src/main/resources/META-INF/sca/jms.system.scdl&r1=506573&p2=incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/binding/src/main/resources/META-INF/sca/binding.jms.scdl&r2=506877
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/binding/src/main/resources/META-INF/sca/jms.system.scdl (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/binding/src/main/resources/META-INF/sca/binding.jms.scdl Mon Feb 12 22:01:40 2007
@@ -15,7 +15,7 @@
* under the License.
-->
<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.binding.jms.JMSBinding">
+ name="org.apache.tuscany.binding.jms.include">
<dependency xmlns="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT">
<group>org.apache.tuscany.sca.extensions.jms</group>
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/binding/src/main/resources/META-INF/sca/default.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/binding/src/main/resources/META-INF/sca/default.scdl?view=diff&rev=506877&r1=506876&r2=506877
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/binding/src/main/resources/META-INF/sca/default.scdl (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/binding/src/main/resources/META-INF/sca/default.scdl Mon Feb 12 22:01:40 2007
@@ -15,7 +15,7 @@
* under the License.
-->
<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.binding.jms.JMSBinding">
+ name="org.apache.tuscany.binding.jms">
<dependency xmlns="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT">
<group>org.apache.tuscany.sca.extensions.jms</group>
Added: incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/binding/src/main/resources/META-INF/sca/extension.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/binding/src/main/resources/META-INF/sca/extension.composite?view=auto&rev=506877
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/binding/src/main/resources/META-INF/sca/extension.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/binding/src/main/resources/META-INF/sca/extension.composite Mon Feb 12 22:01:40 2007
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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 pejmsssions and limitations
+ * under the License.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" name="org.apache.tuscany.binding.jms">
+ <include name="org.apache.tuscany.binding.jms.include" scdlLocation="binding.jms.scdl" />
+</composite>
\ No newline at end of file
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/binding/src/test/java/org/apache/tuscany/binding/jms/JMSBindingTestCaseX.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/binding/src/test/java/org/apache/tuscany/binding/jms/JMSBindingTestCaseX.java?view=diff&rev=506877&r1=506876&r2=506877
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/binding/src/test/java/org/apache/tuscany/binding/jms/JMSBindingTestCaseX.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/binding/src/test/java/org/apache/tuscany/binding/jms/JMSBindingTestCaseX.java Mon Feb 12 22:01:40 2007
@@ -79,7 +79,7 @@
protected void setUp() throws Exception {
startBroker();
setApplicationSCDL(IntroService.class, "META-INF/sca/default.scdl");
- addExtension("jms.binding", getClass().getClassLoader().getResource("META-INF/sca/jms.system.scdl"));
+ addExtension("jms.binding", getClass().getClassLoader().getResource("META-INF/sca/binding.jms.scdl"));
addExtension("idl.wsdl", getClass().getClassLoader().getResource("META-INF/sca/idl.wsdl.scdl"));
addExtension("databinding.axiom", getClass().getResource("/META-INF/sca/databinding.axiom.scdl"));
super.setUp();
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/samples/helloworld.jmsReference/src/test/java/helloworld/HelloWorldJmsClient.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/samples/helloworld.jmsReference/src/test/java/helloworld/HelloWorldJmsClient.java?view=diff&rev=506877&r1=506876&r2=506877
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/samples/helloworld.jmsReference/src/test/java/helloworld/HelloWorldJmsClient.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/samples/helloworld.jmsReference/src/test/java/helloworld/HelloWorldJmsClient.java Mon Feb 12 22:01:40 2007
@@ -30,7 +30,7 @@
private HelloWorldService helloWorldService;
protected void setUp() throws Exception {
setApplicationSCDL(HelloWorldService.class, "META-INF/sca/default.scdl");
- addExtension("jms.binding", getClass().getClassLoader().getResource("META-INF/sca/jms.system.scdl"));
+ addExtension("jms.binding", getClass().getClassLoader().getResource("META-INF/sca/binding.jms.scdl"));
addExtension("idl.wsdl", getClass().getClassLoader().getResource("META-INF/sca/idl.wsdl.scdl"));
addExtension("databinding.axiom", getClass().getResource("/META-INF/sca/databinding.axiom.scdl"));
super.setUp();
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/samples/helloworld.jmsService/src/test/java/helloworld/HelloWorldJmsServer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/samples/helloworld.jmsService/src/test/java/helloworld/HelloWorldJmsServer.java?view=diff&rev=506877&r1=506876&r2=506877
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/samples/helloworld.jmsService/src/test/java/helloworld/HelloWorldJmsServer.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/samples/helloworld.jmsService/src/test/java/helloworld/HelloWorldJmsServer.java Mon Feb 12 22:01:40 2007
@@ -46,7 +46,7 @@
protected void setUp() throws Exception {
startBroker();
setApplicationSCDL(HelloWorldService.class, "META-INF/sca/default.scdl");
- addExtension("jms.binding", getClass().getClassLoader().getResource("META-INF/sca/jms.system.scdl"));
+ addExtension("jms.binding", getClass().getClassLoader().getResource("META-INF/sca/binding.jms.scdl"));
addExtension("idl.wsdl", getClass().getClassLoader().getResource("META-INF/sca/idl.wsdl.scdl"));
addExtension("databinding.axiom", getClass().getResource("/META-INF/sca/databinding.axiom.scdl"));
super.setUp();
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/jsonrpc/binding/src/main/resources/META-INF/sca/binding.jsonrpc.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/jsonrpc/binding/src/main/resources/META-INF/sca/binding.jsonrpc.scdl?view=diff&rev=506877&r1=506876&r2=506877
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/jsonrpc/binding/src/main/resources/META-INF/sca/binding.jsonrpc.scdl (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/jsonrpc/binding/src/main/resources/META-INF/sca/binding.jsonrpc.scdl Mon Feb 12 22:01:40 2007
@@ -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.binding.jsonrpc">
+ name="org.apache.tuscany.binding.jsonrpc.include">
<dependency xmlns="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT">
<group>org.apache.tuscany.sca.extensions.jsonrpc</group>
Added: incubator/tuscany/branches/sca-java-integration/sca/extensions/jsonrpc/binding/src/main/resources/META-INF/sca/extension.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/jsonrpc/binding/src/main/resources/META-INF/sca/extension.composite?view=auto&rev=506877
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/jsonrpc/binding/src/main/resources/META-INF/sca/extension.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/jsonrpc/binding/src/main/resources/META-INF/sca/extension.composite Mon Feb 12 22:01:40 2007
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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 pejsonrpcssions and limitations
+ * under the License.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" name="org.apache.tuscany.binding.jsonrpc">
+ <include name="org.apache.tuscany.binding.jsonrpc.include" scdlLocation="binding.jsonrpc.scdl" />
+</composite>
\ No newline at end of file
Copied: incubator/tuscany/branches/sca-java-integration/sca/extensions/rmi/binding.rmi/src/main/resources/META-INF/sca/binding.rmi.scdl (from r506573, incubator/tuscany/branches/sca-java-integration/sca/extensions/rmi/binding.rmi/src/main/resources/META-INF/sca/rmi_extension.scdl)
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/rmi/binding.rmi/src/main/resources/META-INF/sca/binding.rmi.scdl?view=diff&rev=506877&p1=incubator/tuscany/branches/sca-java-integration/sca/extensions/rmi/binding.rmi/src/main/resources/META-INF/sca/rmi_extension.scdl&r1=506573&p2=incubator/tuscany/branches/sca-java-integration/sca/extensions/rmi/binding.rmi/src/main/resources/META-INF/sca/binding.rmi.scdl&r2=506877
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/rmi/binding.rmi/src/main/resources/META-INF/sca/rmi_extension.scdl (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/rmi/binding.rmi/src/main/resources/META-INF/sca/binding.rmi.scdl Mon Feb 12 22:01:40 2007
@@ -1,48 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- * 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.
- -->
+ * 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.
+-->
<!--
Default system configuration for the launcher environment.
$Rev$ $Date$
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT"
- name="org.apache.tuscany.binding.rmi">
-
+<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.binding.rmi.include">
+
<dependency xmlns="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT">
<group>org.apache.tuscany.sca.extensions.rmi</group>
<name>tuscany-rmi</name>
<version>1.0-incubator-SNAPSHOT</version>
</dependency>
-
+
<component name="binding.rmi.bindingLoader">
- <system:implementation.system class="org.apache.tuscany.binding.rmi.RMIBindingLoader"/>
+ <system:implementation.system class="org.apache.tuscany.binding.rmi.RMIBindingLoader" />
</component>
-
+
<component name="binding.rmi.bindingBuilder">
- <system:implementation.system class="org.apache.tuscany.binding.rmi.RMIBindingBuilder"/>
+ <system:implementation.system class="org.apache.tuscany.binding.rmi.RMIBindingBuilder" />
</component>
-
+
<!-- RMI Host service -->
<component name="rmiHost">
- <system:implementation.system class="org.apache.tuscany.binding.rmi.host.RMIHostImpl"/>
+ <system:implementation.system class="org.apache.tuscany.binding.rmi.host.RMIHostImpl" />
</component>
</composite>
Added: incubator/tuscany/branches/sca-java-integration/sca/extensions/rmi/binding.rmi/src/main/resources/META-INF/sca/extension.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/rmi/binding.rmi/src/main/resources/META-INF/sca/extension.composite?view=auto&rev=506877
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/rmi/binding.rmi/src/main/resources/META-INF/sca/extension.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/rmi/binding.rmi/src/main/resources/META-INF/sca/extension.composite Mon Feb 12 22:01:40 2007
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" name="org.apache.tuscany.binding.rmi">
+ <include name="org.apache.tuscany.binding.rmi.include" scdlLocation="binding.rmi.scdl" />
+</composite>
\ No newline at end of file
Copied: incubator/tuscany/branches/sca-java-integration/sca/extensions/ruby/container/src/main/resources/META-INF/sca/container.ruby.scdl (from r506573, incubator/tuscany/branches/sca-java-integration/sca/extensions/ruby/container/src/main/resources/META-INF/sca/ruby.system.scdl)
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/ruby/container/src/main/resources/META-INF/sca/container.ruby.scdl?view=diff&rev=506877&p1=incubator/tuscany/branches/sca-java-integration/sca/extensions/ruby/container/src/main/resources/META-INF/sca/ruby.system.scdl&r1=506573&p2=incubator/tuscany/branches/sca-java-integration/sca/extensions/ruby/container/src/main/resources/META-INF/sca/container.ruby.scdl&r2=506877
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/ruby/container/src/main/resources/META-INF/sca/ruby.system.scdl (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/ruby/container/src/main/resources/META-INF/sca/container.ruby.scdl Mon Feb 12 22:01:40 2007
@@ -1,29 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- * 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.
+ * 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.
-->
<!--
Ruby configuration for the launcher environment.
-->
-<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.RubyImplementation">
+<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.container.ruby.include">
<dependency xmlns="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT">
<group>org.apache.tuscany.sca.extensions.ruby</group>
@@ -32,15 +30,15 @@
</dependency>
<component name="ruby.implementationLoader">
- <system:implementation.system class="org.apache.tuscany.container.ruby.RubyImplementationLoader"/>
+ <system:implementation.system class="org.apache.tuscany.container.ruby.RubyImplementationLoader" />
</component>
<component name="ruby.componentTypeLoader">
- <system:implementation.system class="org.apache.tuscany.container.ruby.RubyComponentTypeLoader"/>
+ <system:implementation.system class="org.apache.tuscany.container.ruby.RubyComponentTypeLoader" />
</component>
<component name="ruby.componentBuilder">
- <system:implementation.system class="org.apache.tuscany.container.ruby.RubyComponentBuilder"/>
+ <system:implementation.system class="org.apache.tuscany.container.ruby.RubyComponentBuilder" />
</component>
-
+
</composite>
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/ruby/container/src/main/resources/META-INF/sca/default.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/ruby/container/src/main/resources/META-INF/sca/default.scdl?view=diff&rev=506877&r1=506876&r2=506877
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/ruby/container/src/main/resources/META-INF/sca/default.scdl (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/ruby/container/src/main/resources/META-INF/sca/default.scdl Mon Feb 12 22:01:40 2007
@@ -23,7 +23,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.launcher.RubyImplementation">
+ name="org.apache.tuscany.container.ruby">
<dependency xmlns="http://tuscany.apache.org/xmlns/1.0-SNAPSHOT">
<group>org.apache.tuscany.sca.extensions.ruby</group>
Added: incubator/tuscany/branches/sca-java-integration/sca/extensions/ruby/container/src/main/resources/META-INF/sca/extension.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/ruby/container/src/main/resources/META-INF/sca/extension.composite?view=auto&rev=506877
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/ruby/container/src/main/resources/META-INF/sca/extension.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/ruby/container/src/main/resources/META-INF/sca/extension.composite Mon Feb 12 22:01:40 2007
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" name="org.apache.tuscany.container.ruby">
+ <include name="org.apache.tuscany.container.ruby.include" scdlLocation="container.ruby.scdl" />
+</composite>
\ No newline at end of file
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/ruby/container/src/test/java/org/apache/tuscany/container/ruby/function/HelloWorldTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/ruby/container/src/test/java/org/apache/tuscany/container/ruby/function/HelloWorldTestCase.java?view=diff&rev=506877&r1=506876&r2=506877
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/ruby/container/src/test/java/org/apache/tuscany/container/ruby/function/HelloWorldTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/ruby/container/src/test/java/org/apache/tuscany/container/ruby/function/HelloWorldTestCase.java Mon Feb 12 22:01:40 2007
@@ -36,7 +36,7 @@
protected void setUp() throws Exception {
- URL base = getClass().getResource("/META-INF/sca/ruby.system.scdl");
+ URL base = getClass().getResource("/META-INF/sca/container.ruby.scdl");
addExtension("RubyContainer", new URL(base, "default.scdl"));
setApplicationSCDL(getClass().getResource("helloworld.scdl"));
super.setUp();
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/ruby/samples/helloworld/src/test/java/helloworld/HelloWorldTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/ruby/samples/helloworld/src/test/java/helloworld/HelloWorldTestCase.java?view=diff&rev=506877&r1=506876&r2=506877
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/ruby/samples/helloworld/src/test/java/helloworld/HelloWorldTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/ruby/samples/helloworld/src/test/java/helloworld/HelloWorldTestCase.java Mon Feb 12 22:01:40 2007
@@ -32,7 +32,7 @@
private HelloWorldService helloWorldService;
protected void setUp() throws Exception {
- URL scdl = getClass().getClassLoader().getResource("META-INF/sca/ruby.system.scdl");
+ URL scdl = getClass().getClassLoader().getResource("META-INF/sca/container.ruby.scdl");
addExtension("RubyContainer", scdl);
setApplicationSCDL(HelloWorldService.class, "META-INF/sca/default.scdl");
super.setUp();
Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/api/src/main/java/org/apache/tuscany/api/TuscanyContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/api/src/main/java/org/apache/tuscany/api/TuscanyContainer.java?view=diff&rev=506877&r1=506876&r2=506877
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/api/src/main/java/org/apache/tuscany/api/TuscanyContainer.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/api/src/main/java/org/apache/tuscany/api/TuscanyContainer.java Mon Feb 12 22:01:40 2007
@@ -33,8 +33,8 @@
* The Tuscany container
*/
public abstract class TuscanyContainer {
- public static final String SYSTEM_SCDL = "META-INF/tuscany/system.scdl";
- public static final String EXTENSION_SCDL = "META-INF/sca/extension.scdl";
+ public static final String SYSTEM_SCDL = "META-INF/tuscany/system.composite";
+ public static final String EXTENSION_SCDL = "META-INF/sca/extension.composite";
public static final String APPLICATION_SCDL = "META-INF/sca/application.composite";
private static TuscanyContainer instance;
@@ -82,7 +82,7 @@
*
* @return
*/
- private synchronized static TuscanyContainer newInstance(final ClassLoader classLoader) {
+ private static TuscanyContainer newInstance(final ClassLoader classLoader) {
try {
final String name = TuscanyContainer.class.getName();
@@ -110,7 +110,7 @@
*
* @return The instance
*/
- private static TuscanyContainer getInstance() {
+ public synchronized static TuscanyContainer getInstance() {
if (instance != null) {
return instance;
}
Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultTuscanyContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultTuscanyContainer.java?view=diff&rev=506877&r1=506876&r2=506877
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultTuscanyContainer.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultTuscanyContainer.java Mon Feb 12 22:01:40 2007
@@ -53,7 +53,7 @@
*/
@SuppressWarnings("deprecation")
public class DefaultTuscanyContainer extends TuscanyContainer {
- protected CompositeComponent component;
+ private CompositeComponent component;
private CompositeContextImpl context;
private LauncherImpl launcher;
private MonitorFactory monitorFactory;
@@ -76,8 +76,8 @@
Enumeration<URL> urls = cl.getResources(TuscanyContainer.EXTENSION_SCDL);
exts = Collections.list(urls).toArray(new URL[0]);
}
- for (int i=0;i<exts.length;i++) {
- deployExtension(composite, "tuscany.extension." + (i++), exts[i]);
+ for (int i = 0; i < exts.length; i++) {
+ deployExtension(composite, "tuscany.extension." + i, exts[i]);
}
SCAObject wireServiceComponent = composite.getSystemChild(ComponentNames.TUSCANY_WIRE_SERVICE);
@@ -140,5 +140,9 @@
protected ComponentContext getContext(String componentName) {
// TODO
return null;
+ }
+
+ public CompositeComponent getCompsiteComponent() {
+ return component;
}
}
Added: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/resources/META-INF/tuscany/system.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/resources/META-INF/tuscany/system.composite?view=auto&rev=506877
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/resources/META-INF/tuscany/system.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/resources/META-INF/tuscany/system.composite Mon Feb 12 22:01:40 2007
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<!--
+ Default system configuration for the launcher environment.
+
+ $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.launcher.System">
+
+ <!-- Component that provides the Deployer service -->
+ <component name="deployer">
+ <system:implementation.system class="org.apache.tuscany.core.deployer.DeployerImpl" />
+ </component>
+
+ <!-- Work management -->
+ <component name="workContext">
+ <system:implementation.system class="org.apache.tuscany.core.component.WorkContextImpl" />
+ </component>
+
+ <!-- Wire service -->
+ <component name="wireService">
+ <system:implementation.system class="org.apache.tuscany.core.wire.jdk.JDKWireService" />
+ </component>
+
+ <!-- Scope infrastructure -->
+ <component name="scopeRegistry">
+ <system:implementation.system class="org.apache.tuscany.core.component.scope.ScopeRegistryImpl" />
+ </component>
+
+ <!-- Store infrastructure -->
+ <component name="store">
+ <system:implementation.system class="org.apache.tuscany.core.services.store.memory.MemoryStore" />
+ </component>
+
+ <!-- Builder and BuilderRegistry -->
+ <component name="builder">
+ <system:implementation.system class="org.apache.tuscany.core.builder.BuilderRegistryImpl" />
+ </component>
+
+ <!-- Loader and LoaderRegistry -->
+ <component name="loader">
+ <system:implementation.system class="org.apache.tuscany.core.loader.LoaderRegistryImpl" />
+ </component>
+
+ <!-- Introspector and IntrospectionRegistry -->
+ <component name="interfaceProcessorRegistry">
+ <system:implementation.system class="org.apache.tuscany.core.implementation.IntrospectionRegistryImpl" />
+ </component>
+
+ <!-- Resource host registry -->
+ <component name="resourceHostRegistry">
+ <system:implementation.system class="org.apache.tuscany.core.services.host.DelegatingResourceHostRegistry" />
+ </component>
+
+ <!-- Connector infrastructure -->
+ <component name="connector">
+ <system:implementation.system class="org.apache.tuscany.core.builder.ConnectorImpl" />
+ </component>
+
+ <component name="wirePostProcessorRegistry">
+ <system:implementation.system class="org.apache.tuscany.core.builder.WirePostProcessorRegistryImpl" />
+ </component>
+
+ <!-- Default scopes -->
+ <component name="scope.module">
+ <system:implementation.system class="org.apache.tuscany.core.component.scope.CompositeScopeObjectFactory" />
+ </component>
+ <component name="scope.stateless">
+ <system:implementation.system class="org.apache.tuscany.core.component.scope.StatelessScopeObjectFactory" />
+ </component>
+ <component name="scope.request">
+ <system:implementation.system class="org.apache.tuscany.core.component.scope.RequestScopeObjectFactory" />
+ </component>
+
+ <component name="scope.conversational">
+ <system:implementation.system class="org.apache.tuscany.core.component.scope.ConversationalScopeObjectFactory" />
+ </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" />
+ <property name="poolSize">10</property>
+ </component>
+
+ <component name="workScheduler">
+ <system:implementation.system class="org.apache.tuscany.core.services.work.jsr237.Jsr237WorkScheduler" />
+ </component>
+
+ <component name="policyBuilderRegistry">
+ <system:implementation.system class="org.apache.tuscany.core.policy.PolicyBuilderRegistryImpl" />
+ </component>
+
+ <component name="propertyFactory">
+ <system:implementation.system class="org.apache.tuscany.core.property.PropertyObjectFactoryImpl" />
+ </component>
+
+ <component name="wireLoader">
+ <system:implementation.system class="org.apache.tuscany.core.loader.WireLoader" />
+ </component>
+
+ <!-- include loader configuration -->
+ <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" scdlResource="org/apache/tuscany/core/implementation.scdl" />
+
+ <!-- Java interface definition language -->
+ <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" scdlResource="org/apache/tuscany/core/composite.scdl" />
+
+ <!-- System implementation type -->
+ <include name="org.apache.tuscany.launcher.SystemImplementation"
+ scdlResource="org/apache/tuscany/core/systemImplementation.scdl" />
+
+ <!-- Java implementation type -->
+ <include name="org.apache.tuscany.launcher.JavaImplementation"
+ scdlResource="org/apache/tuscany/core/javaImplementation.scdl" />
+
+ <!-- Data Binding -->
+ <include name="org.apache.tuscany.launcher.DataBinding" scdlResource="org/apache/tuscany/core/databinding.scdl" />
+
+ <!-- Logging formatters -->
+ <include name="org.apache.tuscany.launcher.Formatters" scdlResource="org/apache/tuscany/core/formatters.scdl" />
+
+ <!-- the local binding -->
+ <component name="localBindingLoader">
+ <system:implementation.system class="org.apache.tuscany.core.binding.local.LocalBindingLoader" />
+ </component>
+
+ <component name="localBindingBuilder">
+ <system:implementation.system class="org.apache.tuscany.core.binding.local.LocalBindingBuilder" />
+ </component>
+
+</composite>
Added: incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-jaxb/src/main/resources/META-INF/sca/extension.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-jaxb/src/main/resources/META-INF/sca/extension.composite?view=auto&rev=506877
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-jaxb/src/main/resources/META-INF/sca/extension.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-jaxb/src/main/resources/META-INF/sca/extension.composite Mon Feb 12 22:01:40 2007
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" name="org.apache.tuscany.databinding.jaxb">
+ <include name="org.apache.tuscany.databinding.jaxb.include" scdlLocation="databinding.jaxb.scdl" />
+</composite>
\ No newline at end of file
Added: incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/resources/META-INF/sca/extension.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/resources/META-INF/sca/extension.composite?view=auto&rev=506877
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/resources/META-INF/sca/extension.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/resources/META-INF/sca/extension.composite Mon Feb 12 22:01:40 2007
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" name="org.apache.tuscany.databinding.sdo">
+ <include name="org.apache.tuscany.databinding.sdo.include" scdlLocation="databinding.sdo.scdl" />
+</composite>
\ No newline at end of file
Added: incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-xmlbeans/src/main/resources/META-INF/sca/databinding.xmlbeans.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-xmlbeans/src/main/resources/META-INF/sca/databinding.xmlbeans.scdl?view=auto&rev=506877
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-xmlbeans/src/main/resources/META-INF/sca/databinding.xmlbeans.scdl (added)
+++ incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-xmlbeans/src/main/resources/META-INF/sca/databinding.xmlbeans.scdl Mon Feb 12 22:01:40 2007
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<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.databinding.xmlbeans.include">
+
+ <component name="databinding.XMLBeans">
+ <system:implementation.system class="org.apache.tuscany.databinding.xmlbeans.XMLBeansDataBinding" />
+ </component>
+
+ <component name="transformer.XMLStreamReader2XmlObject">
+ <system:implementation.system class="org.apache.tuscany.databinding.xmlbeans.XMLStreamReader2XmlObject" />
+ </component>
+
+ <component name="transformer.Node2XmlObject">
+ <system:implementation.system class="org.apache.tuscany.databinding.xmlbeans.Node2XmlObject" />
+ </component>
+
+ <component name="transformer.XmlObject2Node">
+ <system:implementation.system class="org.apache.tuscany.databinding.xmlbeans.XmlObject2Node" />
+ </component>
+
+ <component name="transformer.XMLStreamReader2XmlObject">
+ <system:implementation.system class="org.apache.tuscany.databinding.xmlbeans.XMLStreamReader2XmlObject" />
+ </component>
+
+</composite>
\ No newline at end of file
Modified: incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-xmlbeans/src/main/resources/META-INF/sca/default.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-xmlbeans/src/main/resources/META-INF/sca/default.scdl?view=diff&rev=506877&r1=506876&r2=506877
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-xmlbeans/src/main/resources/META-INF/sca/default.scdl (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-xmlbeans/src/main/resources/META-INF/sca/default.scdl Mon Feb 12 22:01:40 2007
@@ -18,7 +18,7 @@
* under the License.
-->
<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.databinding.XMLBeans">
+ name="org.apache.tuscany.databinding.xmlbeans">
<component name="databinding.XMLBeans">
<system:implementation.system class="org.apache.tuscany.databinding.xmlbeans.XMLBeansDataBinding" />
Added: incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-xmlbeans/src/main/resources/META-INF/sca/extension.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-xmlbeans/src/main/resources/META-INF/sca/extension.composite?view=auto&rev=506877
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-xmlbeans/src/main/resources/META-INF/sca/extension.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-xmlbeans/src/main/resources/META-INF/sca/extension.composite Mon Feb 12 22:01:40 2007
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" name="org.apache.tuscany.databinding.xmlbeans">
+ <include name="org.apache.tuscany.databinding.xmlbeans.include" scdlLocation="databinding.xmlbeans.scdl" />
+</composite>
\ No newline at end of file
Added: incubator/tuscany/branches/sca-java-integration/sca/services/idl/wsdl/src/main/resources/META-INF/sca/extension.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/services/idl/wsdl/src/main/resources/META-INF/sca/extension.composite?view=auto&rev=506877
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/services/idl/wsdl/src/main/resources/META-INF/sca/extension.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/sca/services/idl/wsdl/src/main/resources/META-INF/sca/extension.composite Mon Feb 12 22:01:40 2007
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" name="org.apache.tuscany.idl.wsdl">
+ <include name="org.apache.tuscany.idl.wsdl.include" scdlLocation="idl.wsdl.scdl" />
+</composite>
\ No newline at end of file
Modified: incubator/tuscany/branches/sca-java-integration/sca/test/src/main/java/org/apache/tuscany/test/SCATestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/test/src/main/java/org/apache/tuscany/test/SCATestCase.java?view=diff&rev=506877&r1=506876&r2=506877
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/test/src/main/java/org/apache/tuscany/test/SCATestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/test/src/main/java/org/apache/tuscany/test/SCATestCase.java Mon Feb 12 22:01:40 2007
@@ -26,6 +26,8 @@
import junit.framework.TestCase;
import org.apache.tuscany.api.TuscanyContainer;
+import org.apache.tuscany.core.bootstrap.DefaultTuscanyContainer;
+import org.apache.tuscany.spi.component.CompositeComponent;
/**
* Base class for JUnit tests that want to run in an SCA client environment.
@@ -35,10 +37,13 @@
public abstract class SCATestCase extends TestCase {
private Map<String, URL> extensions = new HashMap<String, URL>();
private URL applicationSCDL;
+ protected CompositeComponent component;
protected void setUp() throws Exception {
super.setUp();
TuscanyContainer.start(null, extensions.values().toArray(new URL[0]), applicationSCDL);
+ // FIXME: How to expose the composite component?
+ this.component = ((DefaultTuscanyContainer)TuscanyContainer.getInstance()).getCompsiteComponent();
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org