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:21:52 UTC
svn commit: r379973 - in /incubator/tuscany/java/sca/model: ./
src/main/java/org/apache/tuscany/model/assembly/loader/impl/
src/main/resources/model/
Author: jsdelfino
Date: Wed Feb 22 15:21:48 2006
New Revision: 379973
URL: http://svn.apache.org/viewcvs?rev=379973&view=rev
Log:
added SDO annotations to XSDs and adjusted POM.xml to not specify the generated package name anymore
Modified:
incubator/tuscany/java/sca/model/pom.xml
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/loader/impl/AssemblyLoaderImpl.java
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/loader/impl/SCDLXMLLoader.java
incubator/tuscany/java/sca/model/src/main/resources/model/sca-core.xsd
incubator/tuscany/java/sca/model/src/main/resources/model/sca.xsd
Modified: incubator/tuscany/java/sca/model/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/pom.xml?rev=379973&r1=379972&r2=379973&view=diff
==============================================================================
--- incubator/tuscany/java/sca/model/pom.xml (original)
+++ incubator/tuscany/java/sca/model/pom.xml Wed Feb 22 15:21:48 2006
@@ -77,8 +77,6 @@
<execution>
<configuration>
<schemaFile>${basedir}/src/main/resources/model/sca.xsd</schemaFile>
- <javaPackage>org.apache.tuscany.model.assembly.scdl</javaPackage>
- <prefix>SCDL</prefix>
<generateLoader>true</generateLoader>
<generateSwitch>true</generateSwitch>
<noNotification>true</noNotification>
@@ -91,4 +89,5 @@
</plugin>
</plugins>
</build>
+
</project>
Modified: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/loader/impl/AssemblyLoaderImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/loader/impl/AssemblyLoaderImpl.java?rev=379973&r1=379972&r2=379973&view=diff
==============================================================================
--- incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/loader/impl/AssemblyLoaderImpl.java (original)
+++ incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/loader/impl/AssemblyLoaderImpl.java Wed Feb 22 15:21:48 2006
@@ -41,6 +41,9 @@
// Load the SCDL component type
org.apache.tuscany.model.assembly.scdl.ComponentType scdlComponentType=scdlLoader.getComponentType(uri);
+ // Transform it to an assembly component type
+
+
return null;
}
Modified: incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/loader/impl/SCDLXMLLoader.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/loader/impl/SCDLXMLLoader.java?rev=379973&r1=379972&r2=379973&view=diff
==============================================================================
--- incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/loader/impl/SCDLXMLLoader.java (original)
+++ incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/assembly/loader/impl/SCDLXMLLoader.java Wed Feb 22 15:21:48 2006
@@ -25,8 +25,8 @@
import org.apache.tuscany.model.assembly.scdl.Module;
import org.apache.tuscany.model.assembly.scdl.ModuleFragment;
import org.apache.tuscany.model.assembly.scdl.Subsystem;
-import org.apache.tuscany.model.assembly.scdl.impl.SCDLPackageImpl;
-import org.apache.tuscany.model.assembly.scdl.util.SCDLResourceFactoryImpl;
+import org.apache.tuscany.model.assembly.scdl.impl.ScdlPackageImpl;
+import org.apache.tuscany.model.assembly.scdl.util.ScdlResourceFactoryImpl;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
@@ -44,14 +44,14 @@
// Register resource factories
Map extensionToFactoryMap=getResourceFactoryRegistry().getExtensionToFactoryMap();
- SCDLResourceFactoryImpl resourceFactory=new SCDLResourceFactoryImpl();
+ ScdlResourceFactoryImpl resourceFactory=new ScdlResourceFactoryImpl();
extensionToFactoryMap.put("module", resourceFactory);
extensionToFactoryMap.put("fragment", resourceFactory);
extensionToFactoryMap.put("subsystem", resourceFactory);
extensionToFactoryMap.put("componentType", resourceFactory);
// Initialize SCDL package
- SCDLPackageImpl.eINSTANCE.eClass();
+ ScdlPackageImpl.eINSTANCE.eClass();
}
Modified: incubator/tuscany/java/sca/model/src/main/resources/model/sca-core.xsd
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/resources/model/sca-core.xsd?rev=379973&r1=379972&r2=379973&view=diff
==============================================================================
--- incubator/tuscany/java/sca/model/src/main/resources/model/sca-core.xsd (original)
+++ incubator/tuscany/java/sca/model/src/main/resources/model/sca-core.xsd Wed Feb 22 15:21:48 2006
@@ -4,6 +4,8 @@
targetNamespace="http://www.osoa.org/xmlns/sca/0.9"
xmlns:sca="http://www.osoa.org/xmlns/sca/0.9"
xmlns:sdo="commonj.sdo/xml"
+ xmlns:sdojava="commonj.sdo/java"
+ sdojava:package="org.apache.tuscany.model.assembly.scdl"
elementFormDefault="qualified">
<element name="componentType" type="sca:ComponentType"/>
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=379973&r1=379972&r2=379973&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 Wed Feb 22 15:21:48 2006
@@ -2,7 +2,9 @@
<!-- (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:sdojava="commonj.sdo/java"
+ xmlns:sca="http://www.osoa.org/xmlns/sca/0.9"
+ sdojava:package="org.apache.tuscany.model.assembly.scdl">
<include schemaLocation="sca-core.xsd"/>