- Temporarily remove dependency on Chile

- Simple persistence interface

cuba.ipr

@@ -277,13 +277,9 @@
   <component name="WebServicesPlugin" addRequiredLibraries="true" />
   <component name="libraryTable">
     <library name="chile">
-      <CLASSES>
+      <CLASSES />
-        <root url="jar://$PROJECT_DIR$/../chile/build/chile-core.jar!/" />
-      </CLASSES>
       <JAVADOC />
-      <SOURCES>
+      <SOURCES />
-        <root url="file://$PROJECT_DIR$/../chile/modules/core/src" />
-      </SOURCES>
     </library>
     <library name="server">
       <CLASSES>

modules/core/build.xml

@@ -6,25 +6,25 @@
 	<property name="root.dir" location="${project.dir}/.."/>
 	
 	<property name="module.name" value="core"/>
-	<property name="module.jar" value="cuba-core.jar"/>
+	<property name="module.jar" value="20-cuba-core.jar"/>
 
 	<import file="${root.dir}/build-inc.xml"/>
 	<property file="${root.dir}/build.properties"/>
 
+    <fileset id="chile-jars" dir="${root.dir}/chile/build">
+        <include name="*.jar"/>
+    </fileset>
+
     <path id="compile-cp">
         <fileset refid="common-lib-fs"/>
         <fileset refid="server-lib-fs"/>
-        <fileset dir="${root.dir}/chile/build">
+        <!--<fileset refid="chile-jars"/>-->
-            <include name="*.jar"/>
-        </fileset>
     </path>
 
     <path id="test-compile-cp">
         <fileset refid="common-lib-fs"/>
         <fileset refid="server-lib-fs"/>
-        <fileset dir="${root.dir}/chile/build">
+        <!--<fileset refid="chile-jars"/>-->
-            <include name="*.jar"/>
-        </fileset>
     </path>
 
 </project>

modules/core/src/com/haulmont/cuba/core/BaseEntity.java

@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2008 Haulmont Technology Ltd. All Rights Reserved.
+ * Haulmont Technology proprietary and confidential.
+ * Use is subject to license terms.
+
+ * Author: Konstantin Krivopustov
+ * Created: 31.10.2008 16:51:51
+ * $Id$
+ */
+package com.haulmont.cuba.core;
+
+public interface BaseEntity
+{
+}

modules/core/src/com/haulmont/cuba/core/CubaCore.java

@@ -4,13 +4,13 @@
  */
 package com.haulmont.cuba.core;
 
-import com.haulmont.chile.core.ChileCore;
+//import com.haulmont.chile.core.ChileCore;
 
 public class CubaCore {
 
     public static void main(String[] args) {
         System.out.println("Hello from CubaCore");
-        new ChileCore();
+//        new ChileCore();
     }
 
     public String getName() {

modules/core/src/com/haulmont/cuba/core/CubaEntityManager.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2008 Haulmont Technology Ltd. All Rights Reserved.
+ * Haulmont Technology proprietary and confidential.
+ * Use is subject to license terms.
+
+ * Author: Konstantin Krivopustov
+ * Created: 31.10.2008 16:56:32
+ * $Id$
+ */
+package com.haulmont.cuba.core;
+
+import org.apache.openjpa.persistence.OpenJPAEntityManager;
+
+public class CubaEntityManager
+{
+    private OpenJPAEntityManager jpaEm;
+
+    CubaEntityManager(OpenJPAEntityManager jpaEntityManager) {
+        this.jpaEm = jpaEntityManager;
+    }
+
+    public void insert(BaseEntity entity) {
+        jpaEm.persist(entity);
+    }
+
+    public <T> T merge(BaseEntity entity) {
+        return (T) jpaEm.merge(entity);
+    }
+
+    public void delete(BaseEntity entity) {
+        
+    }
+}

modules/core/src/com/haulmont/cuba/core/CubaEntityManagerFactory.java

@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2008 Haulmont Technology Ltd. All Rights Reserved.
+ * Haulmont Technology proprietary and confidential.
+ * Use is subject to license terms.
+
+ * Author: Konstantin Krivopustov
+ * Created: 31.10.2008 16:55:55
+ * $Id$
+ */
+package com.haulmont.cuba.core;
+
+import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
+import org.apache.openjpa.persistence.OpenJPAEntityManager;
+
+public class CubaEntityManagerFactory
+{
+    private OpenJPAEntityManagerFactory jpaFactory;
+
+    public CubaEntityManagerFactory(OpenJPAEntityManagerFactory jpaFactory) {
+        this.jpaFactory = jpaFactory;
+    }
+
+    public CubaEntityManager getEntityManager() {
+        OpenJPAEntityManager em = jpaFactory.createEntityManager();
+        return new CubaEntityManager(em);
+    }
+}

modules/core/src/com/haulmont/cuba/core/ServiceLocator.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2008 Haulmont Technology Ltd. All Rights Reserved.
+ * Haulmont Technology proprietary and confidential.
+ * Use is subject to license terms.
+
+ * Author: Konstantin Krivopustov
+ * Created: 31.10.2008 17:58:40
+ * $Id$
+ */
+package com.haulmont.cuba.core;
+
+import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
+import org.apache.openjpa.persistence.OpenJPAPersistence;
+
+public class ServiceLocator
+{
+    public static CubaEntityManagerFactory getEntityManagerFactory() {
+        OpenJPAEntityManagerFactory jpaFactory =
+                OpenJPAPersistence.createEntityManagerFactory("cuba", "META-INF/cuba-persistence.xml");
+
+        return new CubaEntityManagerFactory(jpaFactory);
+    }
+}