You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2006/02/21 07:54:10 UTC
svn commit: r379376 [11/11] - in /incubator/tuscany/java/sca/model: ./
src/main/java/org/apache/tuscany/model/
src/main/java/org/apache/tuscany/model/assembly/
src/main/java/org/apache/tuscany/model/assembly/impl/
src/main/java/org/apache/tuscany/model...
Modified: incubator/tuscany/java/sca/model/src/main/resources/model/sca-interface-java.xsd
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/resources/model/sca-interface-java.xsd?rev=379376&r1=379375&r2=379376&view=diff
==============================================================================
--- incubator/tuscany/java/sca/model/src/main/resources/model/sca-interface-java.xsd (original)
+++ incubator/tuscany/java/sca/model/src/main/resources/model/sca-interface-java.xsd Mon Feb 20 22:54:02 2006
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- (c) Copyright BEA Systems Inc. and IBM Corporation 2005 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.osoa.org/xmlns/sca/0.9"
- xmlns:sca="http://www.osoa.org/xmlns/sca/0.9"
- elementFormDefault="qualified">
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://www.osoa.org/xmlns/sca/0.9"
+ xmlns:sca="http://www.osoa.org/xmlns/sca/0.9"
+ elementFormDefault="qualified">
- <include schemaLocation="sca-core.xsd"/>
+ <include schemaLocation="sca-core.xsd"/>
- <element name="interface.java" type="sca:JavaInterface" substitutionGroup="sca:interface"/>
- <complexType name="JavaInterface">
- <complexContent>
- <extension base="sca:Interface">
- <sequence>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="interface" type="NCName" use="required"/>
- <attribute name="callbackInterface" type="NCName" use="optional"/>
- <anyAttribute namespace="##any" processContents="lax"/>
- </extension>
- </complexContent>
- </complexType>
+ <element name="interface.java" type="sca:JavaInterface" substitutionGroup="sca:interface"/>
+ <complexType name="JavaInterface">
+ <complexContent>
+ <extension base="sca:Interface">
+ <sequence>
+ <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="interface" type="NCName" use="required"/>
+ <attribute name="callbackInterface" type="NCName" use="optional"/>
+ <anyAttribute namespace="##any" processContents="lax"/>
+ </extension>
+ </complexContent>
+ </complexType>
</schema>
Modified: incubator/tuscany/java/sca/model/src/main/resources/model/sca-interface-wsdl.xsd
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/resources/model/sca-interface-wsdl.xsd?rev=379376&r1=379375&r2=379376&view=diff
==============================================================================
--- incubator/tuscany/java/sca/model/src/main/resources/model/sca-interface-wsdl.xsd (original)
+++ incubator/tuscany/java/sca/model/src/main/resources/model/sca-interface-wsdl.xsd Mon Feb 20 22:54:02 2006
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- (c) Copyright BEA Systems Inc. and IBM Corporation 2005 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.osoa.org/xmlns/sca/0.9"
- xmlns:sca="http://www.osoa.org/xmlns/sca/0.9"
- elementFormDefault="qualified">
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://www.osoa.org/xmlns/sca/0.9"
+ xmlns:sca="http://www.osoa.org/xmlns/sca/0.9"
+ elementFormDefault="qualified">
- <include schemaLocation="sca-core.xsd"/>
+ <include schemaLocation="sca-core.xsd"/>
- <element name="interface.wsdl" type="sca:WSDLPortType" substitutionGroup="sca:interface"/>
- <complexType name="WSDLPortType">
- <complexContent>
- <extension base="sca:Interface">
- <sequence>
- <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="interface" type="anyURI" use="required"/>
- <attribute name="callbackInterface" type="anyURI" use="optional"/>
- <anyAttribute namespace="##any" processContents="lax"/>
- </extension>
- </complexContent>
- </complexType>
+ <element name="interface.wsdl" type="sca:WSDLPortType" substitutionGroup="sca:interface"/>
+ <complexType name="WSDLPortType">
+ <complexContent>
+ <extension base="sca:Interface">
+ <sequence>
+ <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="interface" type="anyURI" use="required"/>
+ <attribute name="callbackInterface" type="anyURI" use="optional"/>
+ <anyAttribute namespace="##any" processContents="lax"/>
+ </extension>
+ </complexContent>
+ </complexType>
</schema>
Modified: incubator/tuscany/java/sca/model/src/main/resources/model/sca.xsd
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/resources/model/sca.xsd?rev=379376&r1=379375&r2=379376&view=diff
==============================================================================
--- incubator/tuscany/java/sca/model/src/main/resources/model/sca.xsd (original)
+++ incubator/tuscany/java/sca/model/src/main/resources/model/sca.xsd Mon Feb 20 22:54:02 2006
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- (c) Copyright BEA Systems Inc. and IBM Corporation 2005 -->
<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.osoa.org/xmlns/sca/0.9"
- xmlns:sca="http://www.osoa.org/xmlns/sca/0.9"
- xmlns:codegen="http://www.eclipse.org/emf/2002/Ecore"
- codegen:nsPrefix="sca"
- codegen:package="org.apache.tuscany.model.assembly">
+ targetNamespace="http://www.osoa.org/xmlns/sca/0.9"
+ xmlns:sca="http://www.osoa.org/xmlns/sca/0.9">
- <include schemaLocation="sca-core.xsd"/>
+ <include schemaLocation="sca-core.xsd"/>
- <include schemaLocation="sca-interface-java.xsd"/>
- <include schemaLocation="sca-interface-wsdl.xsd"/>
+ <include schemaLocation="sca-interface-java.xsd"/>
+ <include schemaLocation="sca-interface-wsdl.xsd"/>
- <include schemaLocation="sca-binding-sca.xsd"/>
+ <include schemaLocation="sca-implementation-java.xsd"/>
+
+ <include schemaLocation="sca-binding-webservice.xsd"/>
+ <include schemaLocation="sca-binding-sca.xsd"/>
</schema>
Added: incubator/tuscany/java/sca/model/src/test/java/org/apache/tuscany/model/assembly/tests/SCDLXMLLoaderTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/test/java/org/apache/tuscany/model/assembly/tests/SCDLXMLLoaderTestCase.java?rev=379376&view=auto
==============================================================================
--- incubator/tuscany/java/sca/model/src/test/java/org/apache/tuscany/model/assembly/tests/SCDLXMLLoaderTestCase.java (added)
+++ incubator/tuscany/java/sca/model/src/test/java/org/apache/tuscany/model/assembly/tests/SCDLXMLLoaderTestCase.java Mon Feb 20 22:54:02 2006
@@ -0,0 +1,67 @@
+/**
+ *
+ * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ * Licensed 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.
+ */
+package org.apache.tuscany.model.assembly.tests;
+
+import java.util.List;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+import org.apache.tuscany.model.assembly.loader.impl.SCDLXMLLoader;
+import org.apache.tuscany.model.assembly.scdl.Component;
+import org.apache.tuscany.model.assembly.scdl.EntryPoint;
+import org.apache.tuscany.model.assembly.scdl.Module;
+
+/**
+ */
+public class SCDLXMLLoaderTestCase extends TestCase {
+
+ /**
+ *
+ */
+ public SCDLXMLLoaderTestCase() {
+ super();
+ }
+
+ public void testLoader() {
+
+ SCDLXMLLoader loader = new SCDLXMLLoader();
+ Module module = loader.getModule(getClass().getResource("sca.module").toString());
+ Assert.assertTrue(module.getName().equals("tuscany.model.assembly.tests.bigbank.account"));
+
+ Component foundComponent=null;
+ for (Component component : (List<Component>)module.getComponent()) {
+ if (component.getName().equals("AccountServiceComponent"))
+ foundComponent=component;
+ }
+ Assert.assertTrue(foundComponent!= null);
+
+ EntryPoint foundEntryPoint=null;
+ for (EntryPoint entryPoint: (List<EntryPoint>)module.getEntryPoint()) {
+ if (entryPoint.getName().equals("AccountService"))
+ foundEntryPoint=entryPoint;
+ }
+ Assert.assertTrue(foundEntryPoint!= null);
+ }
+
+ protected void setUp() throws Exception {
+ super.setUp();
+
+ Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
+ }
+
+}
Propchange: incubator/tuscany/java/sca/model/src/test/java/org/apache/tuscany/model/assembly/tests/SCDLXMLLoaderTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/model/src/test/java/org/apache/tuscany/model/assembly/tests/SCDLXMLLoaderTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev,Date