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 16:25:19 UTC
svn commit: r379487 - in /incubator/tuscany/java/sdo: impl/pom.xml
tools/pom.xml
tools/src/main/java/org/apache/tuscany/sdo/generate/JavaGenerator.java
Author: jsdelfino
Date: Tue Feb 21 07:25:16 2006
New Revision: 379487
URL: http://svn.apache.org/viewcvs?rev=379487&view=rev
Log:
moved to use EMF 20060216 and enabled some of the commented out codegen options
Modified:
incubator/tuscany/java/sdo/impl/pom.xml
incubator/tuscany/java/sdo/tools/pom.xml
incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/JavaGenerator.java
Modified: incubator/tuscany/java/sdo/impl/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sdo/impl/pom.xml?rev=379487&r1=379486&r2=379487&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/impl/pom.xml (original)
+++ incubator/tuscany/java/sdo/impl/pom.xml Tue Feb 21 07:25:16 2006
@@ -54,31 +54,31 @@
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>common</artifactId>
- <version>2.2.0-M4</version>
+ <version>2.2.0-I200602160000</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>ecore</artifactId>
- <version>2.2.0-M4</version>
+ <version>2.2.0-I200602160000</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>ecore-change</artifactId>
- <version>2.2.0-M4</version>
+ <version>2.2.0-I200602160000</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>ecore-xmi</artifactId>
- <version>2.2.0-M4</version>
+ <version>2.2.0-I200602160000</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.xsd</groupId>
<artifactId>xsd</artifactId>
- <version>2.2.0-M4</version>
+ <version>2.2.0-I200602160000</version>
<scope>compile</scope>
</dependency>
Modified: incubator/tuscany/java/sdo/tools/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sdo/tools/pom.xml?rev=379487&r1=379486&r2=379487&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/tools/pom.xml (original)
+++ incubator/tuscany/java/sdo/tools/pom.xml Tue Feb 21 07:25:16 2006
@@ -47,14 +47,14 @@
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>codegen</artifactId>
- <version>2.2.0-M4</version>
+ <version>2.2.0-I200602160000</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>codegen-ecore</artifactId>
- <version>2.2.0-M4</version>
+ <version>2.2.0-I200602160000</version>
<scope>compile</scope>
</dependency>
Modified: incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/JavaGenerator.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/JavaGenerator.java?rev=379487&r1=379486&r2=379487&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/JavaGenerator.java (original)
+++ incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/JavaGenerator.java Tue Feb 21 07:25:16 2006
@@ -318,6 +318,9 @@
genModel.setSuppressEMFMetaData(true);
genModel.setSuppressEMFModelTags(true);
genModel.setCanGenerate(true);
+ //FIXME workaround java.lang.NoClassDefFoundError: org/eclipse/jdt/core/jdom/IDOMNode with 02162006 build
+ genModel.setFacadeHelperClass("Hack");
+ genModel.setForceOverwrite(true);
if ((genOptions & OPTION_NO_INTERFACES) != 0)
{
@@ -336,26 +339,26 @@
if ((genOptions & OPTION_NO_CONTAINMENT) != 0)
{
- //TODO genModel.setSuppressContainment(true);
+ genModel.setSuppressContainment(true);
}
if ((genOptions & OPTION_NO_NOTIFICATION) != 0)
{
- //TODO genModel.setSuppressNotification(true);
+ genModel.setSuppressNotification(true);
}
if ((genOptions & OPTION_ARRAY_ACCESSORS) != 0)
{
- //TODO genModel.setArrayAccessors(true);
+ genModel.setArrayAccessors(true);
}
if ((genOptions & OPTION_NO_UNSETTABLE) != 0)
{
- //TODO genModel.setSuppressUnsettable(true);
+ genModel.setSuppressUnsettable(true);
}
GenPackage genPackage = (GenPackage)genModel.getGenPackages().get(0);
-
+
if (basePackage != null)
{
genPackage.setBasePackage(basePackage);
@@ -369,7 +372,9 @@
if ((genOptions & OPTION_GENERATE_LOADER) != 0)
{
- //TODO genPackage.setDataTypeConverters(true);
+ //FIXME workaround compile error with 02162006 build, generated code references non-existent EcoreResourceImpl class
+ genPackage.setResource(GenResourceKind.XML_LITERAL);
+ //genPackage.setDataTypeConverters(true);
}
else
{