Author: frankb
Date: Tue Mar 21 08:37:20 2006
New Revision: 387577
URL: http://svn.apache.org/viewcvs?rev=387577&view=rev
Log:
fix bug in SCDLModelContentHandlerImpl and move back to new EMF jars
Modified:
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/scdl/loader/impl/SCDLModelContentHandlerImpl.java
incubator/tuscany/java/sca/tools/pom.xml
incubator/tuscany/java/sdo/impl/pom.xml
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLDocumentImpl.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataGraphResourceFactoryImpl.java
incubator/tuscany/java/sdo/tools/pom.xml
Modified:
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/scdl/loader/impl/SCDLModelContentHandlerImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/scdl/loader/impl/SCDLModelContentHandlerImpl.java?rev=387577&r1=387576&r2=387577&view=diff
==============================================================================
---
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/scdl/loader/impl/SCDLModelContentHandlerImpl.java
(original)
+++
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/scdl/loader/impl/SCDLModelContentHandlerImpl.java
Tue Mar 21 08:37:20 2006
@@ -450,7 +450,7 @@
// Create a linker that gets the property value text and convert
to the expected java type
// This needs to be deferred until the Property has been located
from the ComponentType
- final Sequence text = propertyElement.getSequence("any");
+ final Sequence text = propertyElement.getSequence("mixed");
if (text != null && text.size() != 0) {
linkers.add(new Runnable() {
public void run() {
Modified: incubator/tuscany/java/sca/tools/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tools/pom.xml?rev=387577&r1=387576&r2=387577&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tools/pom.xml (original)
+++ incubator/tuscany/java/sca/tools/pom.xml Tue Mar 21 08:37:20 2006
@@ -28,10 +28,10 @@
<repositories>
<repository>
- <id>jeremy</id>
- <url>http://people.apache.org/~jboynes/maven2</url>
+ <id>eclipse.emf</id>
+ <url>http://download.eclipse.org/tools/emf/maven2</url>
<snapshots>
- <enabled>false</enabled>
+ <enabled>true</enabled>
</snapshots>
</repository>
</repositories>
@@ -53,14 +53,14 @@
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>codegen</artifactId>
- <version>2.2.0-I200602160000</version>
+ <version>2.2.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>codegen-ecore</artifactId>
- <version>2.2.0-I200602160000</version>
+ <version>2.2.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
Modified: incubator/tuscany/java/sdo/impl/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sdo/impl/pom.xml?rev=387577&r1=387576&r2=387577&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/impl/pom.xml (original)
+++ incubator/tuscany/java/sdo/impl/pom.xml Tue Mar 21 08:37:20 2006
@@ -28,10 +28,10 @@
<repositories>
<repository>
- <id>jeremy</id>
- <url>http://people.apache.org/~jboynes/maven2</url>
+ <id>eclipse.emf</id>
+ <url>http://download.eclipse.org/tools/emf/maven2</url>
<snapshots>
- <enabled>false</enabled>
+ <enabled>true</enabled>
</snapshots>
</repository>
</repositories>
@@ -54,31 +54,31 @@
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>common</artifactId>
- <version>2.2.0-I200602160000</version>
+ <version>2.2.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>ecore</artifactId>
- <version>2.2.0-I200602160000</version>
+ <version>2.2.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>ecore-change</artifactId>
- <version>2.2.0-I200602160000</version>
+ <version>2.2.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>ecore-xmi</artifactId>
- <version>2.2.0-I200602160000</version>
+ <version>2.2.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.xsd</groupId>
<artifactId>xsd</artifactId>
- <version>2.2.0-I200602160000</version>
+ <version>2.2.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
Modified:
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLDocumentImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLDocumentImpl.java?rev=387577&r1=387576&r2=387577&view=diff
==============================================================================
---
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLDocumentImpl.java
(original)
+++
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLDocumentImpl.java
Tue Mar 21 08:37:20 2006
@@ -319,14 +319,12 @@
public String getXMLVersion()
{
- //return resource.getXMLVersion();
- return "1.0"; //TODO
+ return resource.getXMLVersion();
}
public void setXMLVersion(String xmlVersion)
{
- //resource.setXMLVersion(xmlVersion);
- throw new UnsupportedOperationException(); //TODO
+ resource.setXMLVersion(xmlVersion);
}
public String getSchemaLocation()
Modified:
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataGraphResourceFactoryImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataGraphResourceFactoryImpl.java?rev=387577&r1=387576&r2=387577&view=diff
==============================================================================
---
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataGraphResourceFactoryImpl.java
(original)
+++
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataGraphResourceFactoryImpl.java
Tue Mar 21 08:37:20 2006
@@ -298,7 +298,7 @@
{
if (declareXML)
{
- doc.add("<?xml version=\"" + XML_VERSION + "\" encoding=\"" +
encoding + "\"?>");
+ doc.add("<?xml version=\"" + xmlVersion + "\" encoding=\"" +
encoding + "\"?>");
doc.addLine();
}
String elementName = helper.getQName(eDataGraph.eClass());
Modified: incubator/tuscany/java/sdo/tools/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sdo/tools/pom.xml?rev=387577&r1=387576&r2=387577&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/tools/pom.xml (original)
+++ incubator/tuscany/java/sdo/tools/pom.xml Tue Mar 21 08:37:20 2006
@@ -28,10 +28,10 @@
<repositories>
<repository>
- <id>jeremy</id>
- <url>http://people.apache.org/~jboynes/maven2</url>
+ <id>eclipse.emf</id>
+ <url>http://download.eclipse.org/tools/emf/maven2</url>
<snapshots>
- <enabled>false</enabled>
+ <enabled>true</enabled>
</snapshots>
</repository>
</repositories>
@@ -47,14 +47,14 @@
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>codegen</artifactId>
- <version>2.2.0-I200602160000</version>
+ <version>2.2.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>codegen-ecore</artifactId>
- <version>2.2.0-I200602160000</version>
+ <version>2.2.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
