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/23 00:23:09 UTC

svn commit: r379975 - in /incubator/tuscany/java/sca/core: ./ src/main/resources/model/

Author: jsdelfino
Date: Wed Feb 22 15:23:06 2006
New Revision: 379975

URL: http://svn.apache.org/viewcvs?rev=379975&view=rev
Log:
integrated generation of system binding model

Removed:
    incubator/tuscany/java/sca/core/src/main/resources/model/anyobject.ecore
    incubator/tuscany/java/sca/core/src/main/resources/model/anyobject.genmodel
    incubator/tuscany/java/sca/core/src/main/resources/model/sca-assembly.ecore
    incubator/tuscany/java/sca/core/src/main/resources/model/sca-assembly.genmodel
    incubator/tuscany/java/sca/core/src/main/resources/model/sca-core.xsd
    incubator/tuscany/java/sca/core/src/main/resources/model/soap-message.ecore
    incubator/tuscany/java/sca/core/src/main/resources/model/soap-message.genmodel
    incubator/tuscany/java/sca/core/src/main/resources/model/tuscany-assembly-system.ecore
    incubator/tuscany/java/sca/core/src/main/resources/model/tuscany-assembly-system.genmodel
    incubator/tuscany/java/sca/core/src/main/resources/model/ws-adressing.ecore
    incubator/tuscany/java/sca/core/src/main/resources/model/ws-adressing.genmodel
Modified:
    incubator/tuscany/java/sca/core/pom.xml
    incubator/tuscany/java/sca/core/src/main/resources/model/tuscany-system.xsd

Modified: incubator/tuscany/java/sca/core/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/pom.xml?rev=379975&r1=379974&r2=379975&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/pom.xml (original)
+++ incubator/tuscany/java/sca/core/pom.xml Wed Feb 22 15:23:06 2006
@@ -48,4 +48,27 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.tuscany</groupId>
+                <artifactId>tuscany-sdo-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <configuration>
+                            <schemaFile>${basedir}/src/main/resources/model/tuscany-system.xsd</schemaFile>
+                            <generateLoader>true</generateLoader>
+                            <generateSwitch>true</generateSwitch>
+                            <noNotification>true</noNotification>
+                        </configuration>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

Modified: incubator/tuscany/java/sca/core/src/main/resources/model/tuscany-system.xsd
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/resources/model/tuscany-system.xsd?rev=379975&r1=379974&r2=379975&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/resources/model/tuscany-system.xsd (original)
+++ incubator/tuscany/java/sca/core/src/main/resources/model/tuscany-system.xsd Wed Feb 22 15:23:06 2006
@@ -17,15 +17,14 @@
 <schema xmlns="http://www.w3.org/2001/XMLSchema"
         targetNamespace="http://org.apache.tuscany/xmlns/system/0.9"
         xmlns:sca="http://www.osoa.org/xmlns/sca/0.9"
-        xmlns:ext="http://org.apache.tuscany/xmlns/system/0.9"
-        xmlns:codegen="http://www.eclipse.org/emf/2002/Ecore"
-        codegen:nsPrefix="ext"
-        codegen:package="org.apache.tuscany.core.system.assembly"
-        elementFormDefault="qualified">
+        xmlns:system="http://org.apache.tuscany/xmlns/system/0.9"
+		xmlns:sdojava="commonj.sdo/java"
+        elementFormDefault="qualified"
+		sdojava:package="org.apache.tuscany.assembly.core.system.assembly.scdl">
 
-    <import namespace="http://www.osoa.org/xmlns/sca/0.9" schemaLocation="sca-core.xsd"/>
+    <import namespace="http://www.osoa.org/xmlns/sca/0.9" schemaLocation="../../../../../model/src/main/resources/model/sca-core.xsd"/>
 
-    <element name="implementation.system" type="ext:SystemImplementation" substitutionGroup="sca:implementation"/>
+    <element name="implementation.system" type="system:SystemImplementation" substitutionGroup="sca:implementation"/>
     <complexType name="SystemImplementation">
         <complexContent>
             <extension base="sca:Implementation">
@@ -38,7 +37,7 @@
         </complexContent>
     </complexType>
 
-    <element name="binding.system" type="ext:SystemBinding" substitutionGroup="sca:binding"/>
+    <element name="binding.system" type="system:SystemBinding" substitutionGroup="sca:binding"/>
     <complexType name="SystemBinding">
         <complexContent>
             <extension base="sca:Binding">