Author: frankb
Date: Wed Jul 19 14:21:15 2006
New Revision: 423614

URL: http://svn.apache.org/viewvc?rev=423614&view=rev
Log:
Move to EMF 2.2.1-SNAPSHOT builds

Modified:
    
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOXSDEcoreBuilder.java
    incubator/tuscany/java/sdo/pom.xml

Modified: 
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOXSDEcoreBuilder.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOXSDEcoreBuilder.java?rev=423614&r1=423613&r2=423614&view=diff
==============================================================================
--- 
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOXSDEcoreBuilder.java
 (original)
+++ 
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOXSDEcoreBuilder.java
 Wed Jul 19 14:21:15 2006
@@ -51,12 +51,20 @@
  */
 public class SDOXSDEcoreBuilder extends XSDEcoreBuilder
 {
-
   public SDOXSDEcoreBuilder(ExtendedMetaData extendedMetaData)
   {
     super(extendedMetaData);
   }
 
+  /**
+   * Overrides method in EMF. This will cause the SDO Properties to be in the
+   * order in which the Attributes appeared in the XSD.
+   */
+  protected boolean useSortedAttributes()
+  {
+    return false;
+  }
+
   public EClassifier getEClassifier(XSDTypeDefinition xsdTypeDefinition) {
     EClassifier eClassifier = null;
     if 
(rootSchema.getSchemaForSchemaNamespace().equals(xsdTypeDefinition.getTargetNamespace()))
 {
@@ -290,7 +298,7 @@
     }
   }
 
-protected static String validNameStatic(String name, int casing, String prefix)
+  protected static String validNameStatic(String name, int casing, String 
prefix)
   {
     List parsedName = parseNameStatic(name, '_');
     StringBuffer result = new StringBuffer();
@@ -372,7 +380,7 @@
     return result;
   }
 
-public static String getDefaultPackageName(String targetNamespace)
+  public static String getDefaultPackageName(String targetNamespace)
   {
 
       URI uri = URI.createURI(targetNamespace);
@@ -429,6 +437,5 @@
     
     return qualifiedPackageName.toString().toLowerCase(); //make sure it's 
lower case .. we can't work with Axis if not.
   }
- 
 
 }

Modified: incubator/tuscany/java/sdo/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/pom.xml?rev=423614&r1=423613&r2=423614&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/pom.xml (original)
+++ incubator/tuscany/java/sdo/pom.xml Wed Jul 19 14:21:15 2006
@@ -37,7 +37,7 @@
     </repositories>
 
     <properties>
-        <emfVersion>2.2.0</emfVersion>
+        <emfVersion>2.2.1-SNAPSHOT</emfVersion>
     </properties>
 
     <modules>



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to