githubcs
diff --git a/‎build.xml‎
Lines changed: 1 addition & 6 deletions b/‎build.xml‎
Lines changed: 1 addition & 6 deletions
diff --git a/‎core/src/main/java/com/orientechnologies/orient/core/command/script/OScriptGraphDatabaseWrapper.java‎
Lines changed: 0 additions & 248 deletions b/‎core/src/main/java/com/orientechnologies/orient/core/command/script/OScriptGraphDatabaseWrapper.java‎
Lines changed: 0 additions & 248 deletions
diff --git a/‎core/src/main/java/com/orientechnologies/orient/core/command/script/OScriptManager.java‎
Lines changed: 0 additions & 1 deletion b/‎core/src/main/java/com/orientechnologies/orient/core/command/script/OScriptManager.java‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎core/src/main/java/com/orientechnologies/orient/core/db/ODatabaseFactory.java‎
Lines changed: 29 additions & 13 deletions b/‎core/src/main/java/com/orientechnologies/orient/core/db/ODatabaseFactory.java‎
Lines changed: 29 additions & 13 deletions
@@ -31,6 +31,7 @@
                 <fileset dir="server" includes="build.xml"/>
                 <fileset dir="distributed" includes="build.xml"/>
                 <fileset dir="tools" includes="build.xml"/>
+                <fileset dir="graphdb" includes="build.xml"/>
                 <fileset dir="tests" includes="build.xml"/>
             </subant>
 
@@ -128,12 +129,6 @@
 
     <target name="install" depends="init">
         <delegate target="install"/>
-        <subant target="install">
-            <property name="global.lib" value="../${community.release}/lib"/>
-            <property name="version" value="${version}"/>
-
-            <fileset dir="graphdb" includes="build.xml"/>
-        </subant>
 
         <copy todir="${community.release}/" flatten="true">
             <fileset dir="." includes="*.txt"/>
 
@@ -183,7 +183,6 @@ public Bindings bind(final Bindings binding, final ODatabaseRecordTx db, final O
     if (db != null) {
       // BIND FIXED VARIABLES
       binding.put("db", new OScriptDocumentDatabaseWrapper(db));
-      binding.put("gdb", new OScriptGraphDatabaseWrapper(db));
       binding.put("orient", new OScriptOrientWrapper(db));
     }
     binding.put("util", new OFunctionUtilWrapper(null));
 
@@ -22,8 +22,9 @@
 
 import com.orientechnologies.common.log.OLogManager;
 import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
-import com.orientechnologies.orient.core.db.graph.OGraphDatabase;
+import com.orientechnologies.orient.core.metadata.schema.OClass;
 import com.orientechnologies.orient.core.storage.OStorage;
+import com.orientechnologies.orient.core.type.tree.provider.OMVRBTreeRIDProvider;
 
 /**
  * Factory to create high-level ODatabase instances. The global instance is managed by Orient class.
@@ -96,21 +97,36 @@ public synchronized void shutdown() {
   }
 
   public ODatabaseDocumentTx createDatabase(final String iType, final String url) {
-    if ("graph".equals(iType))
-      return new OGraphDatabase(url);
-    else
-      return new ODatabaseDocumentTx(url);
-  }
+    if (iType.equals("graph"))
+      return new ODatabaseDocumentTx(url) {
+        @Override
+        public <THISDB extends ODatabase> THISDB create() {
+					final THISDB db = super.create();
 
-  public ODatabaseDocumentTx createObjectDatabase(final String url) {
-    return new ODatabaseDocumentTx(url);
-  }
+          checkSchema();
 
-  public OGraphDatabase createGraphDatabase(final String url) {
-    return new OGraphDatabase(url);
-  }
+          return db;
+        }
+
+        private void checkSchema() {
+          getMetadata().getSchema().getOrCreateClass(OMVRBTreeRIDProvider.PERSISTENT_CLASS_NAME);
+
+          OClass vertexBaseClass = getMetadata().getSchema().getClass("V");
+          OClass edgeBaseClass = getMetadata().getSchema().getClass("E");
+
+          if (vertexBaseClass == null) {
+            // CREATE THE META MODEL USING THE ORIENT SCHEMA
+            vertexBaseClass = getMetadata().getSchema().createClass("V");
+            vertexBaseClass.setOverSize(2);
+          }
+
+          if (edgeBaseClass == null) {
+            edgeBaseClass = getMetadata().getSchema().createClass("E");
+            edgeBaseClass.setShortName("E");
+          }
+        }
+      };
 
-  public ODatabaseDocumentTx createDocumentDatabase(final String url) {
     return new ODatabaseDocumentTx(url);
   }
 }
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,6 @@ public Bindings bind(final Bindings binding, final ODatabaseRecordTx db, final O`
`183`	`183`	`if (db != null) {`
`184`	`184`	`// BIND FIXED VARIABLES`
`185`	`185`	`binding.put("db", new OScriptDocumentDatabaseWrapper(db));`
`186`		`- binding.put("gdb", new OScriptGraphDatabaseWrapper(db));`
`187`	`186`	`binding.put("orient", new OScriptOrientWrapper(db));`
`188`	`187`	`}`
`189`	`188`	`binding.put("util", new OFunctionUtilWrapper(null));`