Changeset 8544

Timestamp:

29/08/12 21:46:09 (9 years ago)

Author:

mnagni

Message:

 

Location:

mauRepo/xmi2sqlalchemy/trunk/src

Files:

• main/java/ndg/services/newmoon/XMIParser.java (moved) (moved from mauRepo/xmi2sqlalchemy/trunk/src/main/java/ndg/services/newmoon/UmlToRDBM.java) (2 diffs)
• main/java/ndg/services/newmoon/XMIToGML.java (added)
• main/java/ndg/services/newmoon/XMIToRDBM.java (added)
• test/java/ngn/services/newmoon/DOMParser.java (modified) (2 diffs)
• test/java/ngn/services/newmoon/TestsTester.java (modified) (2 diffs)

mauRepo/xmi2sqlalchemy/trunk/src/main/java/ndg/services/newmoon/XMIParser.java

@@ -65 +65 @@
  *
  */
-public class UmlToRDBM extends XMIParserAbstract {
-        
-        private final Logger logger = LoggerFactory.getLogger(UmlToRDBM.class);
+public class XMIParser extends XMIParserAbstract {
+        
+        private final Logger logger = LoggerFactory.getLogger(XMIParser.class);
         
         public void execute(Map<NewmoonManager.NM_PARAM, String> params) throws NewmoonException {
@@ -121 +121 @@
                         substitutesSuperAttributes(cms);
                                 
-                        
-                        //Generates the python classes
-                        GenerateFromClassModel gen = new GenerateFromClassModel(new GenerateClasses(outDir, umlArchive));
-                        gen.execute(umlArchive.getClassModel());
-
-                        //Generates the sqlalchemy tables
-                        GenerateTables gen2 = new GenerateTables(outDir, umlArchive, additionalClasses);
-                        gen2.execute(umlModel);
+                        //generates library and schema for RDBM
+                        XMIToRDBM.execute(outDir, umlArchive, additionalClasses, umlModel);
+
                 } catch (Exception e) {
                         e.printStackTrace();

mauRepo/xmi2sqlalchemy/trunk/src/test/java/ngn/services/newmoon/DOMParser.java

@@ -9 +9 @@
 import ndg.services.newmoon.NewmoonManager;
 import ndg.services.newmoon.NmParser;
-import ndg.services.newmoon.UmlToRDBM;
+import ndg.services.newmoon.XMIParser;
 import ndg.services.newmoon.velocity.python.GenerateModuleHelper;
 
@@ -62 +62 @@
                 params.put(NewmoonManager.NM_PARAM.OUTPUT_DIR, "encode");
                 
-                UmlToRDBM umlToDB = new UmlToRDBM();
+                XMIParser umlToDB = new XMIParser();
                 try {
                         umlToDB.execute(params);

mauRepo/xmi2sqlalchemy/trunk/src/test/java/ngn/services/newmoon/TestsTester.java

@@ -16 +16 @@
 import ndg.services.newmoon.NmParser;
 import ndg.services.newmoon.UMLElementsArchive;
-import ndg.services.newmoon.UmlToRDBM;
+import ndg.services.newmoon.XMIParser;
 import ndg.services.newmoon.collect.CollectClasses;
 import ndg.services.newmoon.velocity.python.GenerateClasses;
@@ -90 +90 @@
                                 
                 
-                UmlToRDBM umlToDB = new UmlToRDBM();
+                XMIParser umlToDB = new XMIParser();
                 try {
                         umlToDB.execute(params);