incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1358272 - in /incubator/isis/trunk/framework/runtimes/dflt/objectstores: ./ jdo/ jdo/jdo-applib/src/site/ jdo/jdo-datanucleus/ jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/ jdo/jdo-datanucleus/sr...
Date Fri, 06 Jul 2012 15:40:57 GMT
Author: danhaywood
Date: Fri Jul  6 15:40:56 2012
New Revision: 1358272

URL: http://svn.apache.org/viewvc?rev=1358272&view=rev
Log:
ISIS-14: more on jdo os

Added:
    incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/JdoRuntimeException.java
Modified:
    incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-applib/src/site/site.xml
    incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/pom.xml
    incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/DataNucleusApplicationComponents.java
    incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/DataNucleusObjectStore.java
    incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/DataNucleusPersistenceMechanismInstaller.java
    incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/metamodel/facets/RemoveDataNucleusEnhancementTypesFacetFactory.java
    incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/persistence/commands/AbstractDataNucleusObjectCommand.java
    incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/persistence/commands/DataNucleusDeleteObjectCommand.java
    incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/persistence/queries/PersistenceQueryFindAllInstancesProcessor.java
    incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/persistence/queries/PersistenceQueryFindByPatternProcessor.java
    incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/persistence/queries/PersistenceQueryProcessorAbstract.java
    incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/persistence/queries/QueryUtil.java
    incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/persistence/spi/DataNucleusIdentifierGenerator.java
    incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/DataNucleusPersistenceMechanismInstallerTest_getName.java
    incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/Utils.java
    incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/metamodel/facets/object/version/JdoVersionFacet.java
    incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/metamodel/facets/prop/primarykey/OptionalFacetDerivedFromJdoPrimaryKeyAnnotation.java
    incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/metamodel/specloader/validator/JdoMetaModelValidator.java
    incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/site/site.xml
    incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/metamodel/facets/object/version/GivenJdoVersionAnnotationFacetFactoryTest.java
    incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/pom.xml
    incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/src/site/site.xml
    incubator/isis/trunk/framework/runtimes/dflt/objectstores/pom.xml

Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-applib/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-applib/src/site/site.xml?rev=1358272&r1=1358271&r2=1358272&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-applib/src/site/site.xml (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-applib/src/site/site.xml Fri Jul  6 15:40:56 2012
@@ -24,15 +24,15 @@
 			<item name="Applib" href="index.html"/>
 		</breadcrumbs>
 
-		<menu name="JPA Applib">
+		<menu name="JDO Applib">
 			<item name="About" href="index.html" />
             <item name="Jottings" href="jottings.html" />
 		</menu>
 
-        <menu name="JPA Modules">
-            <item name="Applib" href="../jpa-applib/index.html" />
-            <item name="Metamodel" href="../jpa-metamodel/index.html" />
-            <item name="OpenJPA" href="../jpa-openjpa/index.html" />
+        <menu name="JDO Modules">
+            <item name="Applib" href="../jdo-applib/index.html" />
+            <item name="Metamodel" href="../jdo-metamodel/index.html" />
+            <item name="DataNucleus" href="../jdo-datanucleus/index.html" />
         </menu>
         
 		<menu name="Maven Reports" ref="reports" />

Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/pom.xml?rev=1358272&r1=1358271&r2=1358272&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/pom.xml (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/pom.xml Fri Jul  6 15:40:56 2012
@@ -27,7 +27,7 @@
 	</parent>
 
 	<artifactId>jdo-datanucleus</artifactId>
-	<name>DataNucleus ObjectStore</name>
+	<name>JDO DataNucleus ObjectStore</name>
 
     <properties>
 	    <siteBaseDir>../../../../..</siteBaseDir>
@@ -37,77 +37,49 @@
     <!-- used in Site generation for relative references. -->
     <url>http://incubator.apache.org/isis/${relativeUrl}</url>
 
-
 	<build>
-		<plugins>
+	    <plugins>
 			<plugin>
-                <groupId>org.datanucleus</groupId>
-                <artifactId>maven-datanucleus-plugin</artifactId>
-                <version>2.0.0-release</version>
-                <configuration>
-                    <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
-                    <verbose>true</verbose>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>process-classes</phase>
-                        <goals>
-                            <goal>enhance</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-  		</plugins>
-		<pluginManagement>
-			<plugins>
-				<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-				<plugin>
-					<groupId>org.eclipse.m2e</groupId>
-					<artifactId>lifecycle-mapping</artifactId>
-					<version>1.0.0</version>
-					<configuration>
-						<lifecycleMappingMetadata>
-							<pluginExecutions>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>
-											org.datanucleus
-										</groupId>
-										<artifactId>
-											maven-datanucleus-plugin
-										</artifactId>
-										<versionRange>
-											[2.0.0-release,)
-										</versionRange>
-										<goals>
-											<goal>enhance</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<ignore></ignore>
-									</action>
-								</pluginExecution>
-							</pluginExecutions>
-						</lifecycleMappingMetadata>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-	</build>    
-	
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<skipTests>true</skipTests>
+				</configuration>
+			</plugin>
+	    </plugins>
+	</build>
+  
+
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
 			<artifactId>jdo-metamodel</artifactId>
-			<version>0.3.1-incubating-SNAPSHOT</version>
-			<optional>true</optional>
 		</dependency>
 		
-		<dependency>
-			<groupId>org.datanucleus</groupId>
-			<artifactId>datanucleus-accessplatform-jdo-rdbms</artifactId>
-			<type>pom</type>
-		</dependency>
+       <dependency>
+            <groupId>javax.jdo</groupId>
+            <artifactId>jdo-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-enhancer</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-api-jdo</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-jdo-query</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-rdbms</artifactId>
+        </dependency>
 
 		<dependency>
 		    <groupId>org.apache.isis.runtimes.dflt.bytecode</groupId>

Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/DataNucleusApplicationComponents.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/DataNucleusApplicationComponents.java?rev=1358272&r1=1358271&r2=1358272&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/DataNucleusApplicationComponents.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/DataNucleusApplicationComponents.java Fri Jul  6 15:40:56 2012
@@ -2,17 +2,30 @@ package org.apache.isis.runtimes.dflt.ob
 
 import java.util.Collection;
 import java.util.Collections;
+import java.util.List;
 import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
 
+import javax.jdo.JDOEnhancer;
 import javax.jdo.JDOHelper;
 import javax.jdo.PersistenceManager;
 import javax.jdo.PersistenceManagerFactory;
 
+import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+
+import org.datanucleus.NucleusContext;
+import org.datanucleus.api.jdo.JDOPersistenceManagerFactory;
+import org.datanucleus.store.StoreManager;
+import org.datanucleus.store.schema.SchemaAwareStoreManager;
 
 import org.apache.isis.core.commons.components.ApplicationScopedComponent;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.runtimes.dflt.objectstores.datanucleus.persistence.IsisLifecycleListener;
+import org.apache.isis.runtimes.dflt.objectstores.jdo.metamodel.facets.object.embeddedonly.JdoEmbeddedOnlyFacet;
+import org.apache.isis.runtimes.dflt.objectstores.jdo.metamodel.facets.object.persistencecapable.JdoPersistenceCapableFacet;
 import org.apache.isis.runtimes.dflt.objectstores.jdo.metamodel.facets.object.query.JdoNamedQuery;
 import org.apache.isis.runtimes.dflt.objectstores.jdo.metamodel.facets.object.query.JdoQueryFacet;
 
@@ -30,12 +43,49 @@ public class DataNucleusApplicationCompo
     public DataNucleusApplicationComponents(final Map<String, String> props, final Collection<ObjectSpecification> objectSpecs) {
         persistenceManagerFactory = JDOHelper.getPersistenceManagerFactory(props);
         
+        final Set<String> classesToBePersisted = catalogClassesToBePersisted(objectSpecs);
+
+        enhanceClasses(classesToBePersisted.toArray(new String[0]));
+        createSchema(props, classesToBePersisted);
+
         namedQueryByName = Collections.unmodifiableMap(catalogNamedQueries(objectSpecs));
-        
+
         lifecycleListener = new IsisLifecycleListener();
     }
 
-    private Map<String, JdoNamedQuery> catalogNamedQueries(Collection<ObjectSpecification> objectSpecs) {
+    private static void enhanceClasses(String[] classesToBePersisted) {
+        JDOEnhancer enhancer = JDOHelper.getEnhancer();
+        enhancer.addClasses(classesToBePersisted);
+        int numberClassesEnhanced = enhancer.enhance();
+        if(numberClassesEnhanced == 0) {
+            throw new JdoRuntimeException("Failed to enhance any classes");
+        }
+    }
+
+    private void createSchema(final Map<String, String> props, final Set<String> classesToBePersisted) {
+        final JDOPersistenceManagerFactory jdopmf = (JDOPersistenceManagerFactory)persistenceManagerFactory;
+        final NucleusContext nucleusContext = jdopmf.getNucleusContext();
+        final SchemaAwareStoreManager storeManager = (SchemaAwareStoreManager) nucleusContext.getStoreManager();
+        storeManager.createSchema(classesToBePersisted, asProperties(props));
+    }
+
+    private static Set<String> catalogClassesToBePersisted(Collection<ObjectSpecification> objectSpecs) {
+        Set<String> classNames = Sets.newTreeSet();
+        for (final ObjectSpecification spec : objectSpecs) {
+            if(spec.containsFacet(JdoPersistenceCapableFacet.class) || spec.containsFacet(JdoEmbeddedOnlyFacet.class)) {
+                classNames.add(spec.getFullIdentifier());
+            }
+        }
+        return Collections.unmodifiableSet(classNames);
+    }
+
+    private static Properties asProperties(Map<String, String> props) {
+        Properties properties = new Properties();
+        properties.putAll(props);
+        return properties;
+    }
+
+    private static Map<String, JdoNamedQuery> catalogNamedQueries(Collection<ObjectSpecification> objectSpecs) {
         final Map<String, JdoNamedQuery> namedQueryByName = Maps.newHashMap();
         for (final ObjectSpecification spec : objectSpecs) {
             final JdoQueryFacet facet = spec.getFacet(JdoQueryFacet.class);
@@ -68,6 +118,7 @@ public class DataNucleusApplicationCompo
     
     public PersistenceManager createPersistenceManager() {
         PersistenceManager persistenceManager = persistenceManagerFactory.getPersistenceManager();
+        
         persistenceManager.addInstanceLifecycleListener(lifecycleListener, (Class[])null);
         return persistenceManager;
     }

Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/DataNucleusObjectStore.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/DataNucleusObjectStore.java?rev=1358272&r1=1358271&r2=1358272&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/DataNucleusObjectStore.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/DataNucleusObjectStore.java Fri Jul  6 15:40:56 2012
@@ -13,7 +13,6 @@ import java.util.Map;
 
 import javax.jdo.PersistenceManager;
 import javax.jdo.Query;
-import javax.transaction.Transaction;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -78,7 +77,7 @@ public class DataNucleusObjectStore impl
     /**
      * @see #isFixturesInstalled()
      */
-    public static final String IS_FIXTURES_INSTALLED_KEY = ConfigurationConstants.ROOT + "persistor.openjpa.install-fixtures";
+    public static final String IS_FIXTURES_INSTALLED_KEY = ConfigurationConstants.ROOT + "persistor.datanucleus.install-fixtures";
     public static final boolean IS_FIXTURES_INSTALLED_DEFAULT = true;
 
     static enum TransactionMode {
@@ -128,7 +127,7 @@ public class DataNucleusObjectStore impl
 
     @Override
     public String name() {
-        return "openjpa";
+        return "datanucleus";
     }
 
     // ///////////////////////////////////////////////////////////////////////
@@ -155,7 +154,7 @@ public class DataNucleusObjectStore impl
      * {@link DataNucleusObjectStore#commitJpaTransaction() commits the underlying
      * JPA transaction}.
      * <p>
-     * The corresponding OpenJPA {@link EntityManager} is then
+     * The corresponding DataNucleus {@link Entity} is then
      * {@link EntityManager#close() close}d.
      */
     public void close() {
@@ -173,7 +172,8 @@ public class DataNucleusObjectStore impl
     }
 
     private PersistenceManager openSession() {
-        return persistenceManager = applicationComponents.createPersistenceManager();
+        this.persistenceManager = applicationComponents.createPersistenceManager();
+        return this.persistenceManager;
     }
 
     private void addPersistenceQueryProcessors(final PersistenceManager persistenceManager) {

Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/DataNucleusPersistenceMechanismInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/DataNucleusPersistenceMechanismInstaller.java?rev=1358272&r1=1358271&r2=1358272&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/DataNucleusPersistenceMechanismInstaller.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/DataNucleusPersistenceMechanismInstaller.java Fri Jul  6 15:40:56 2012
@@ -46,11 +46,11 @@ public class DataNucleusPersistenceMecha
 
     @Override
     protected ObjectStore createObjectStore(IsisConfiguration configuration, ObjectAdapterFactory adapterFactory, AdapterManager adapterManager) {
-        createOpenJpaApplicationComponentsIfRequired(configuration);
+        createDataNucleusApplicationComponentsIfRequired(configuration);
         return new DataNucleusObjectStore(configuration, adapterFactory, adapterManager, applicationComponents);
     }
 
-    private void createOpenJpaApplicationComponentsIfRequired(IsisConfiguration configuration) {
+    private void createDataNucleusApplicationComponentsIfRequired(IsisConfiguration configuration) {
         if(applicationComponents != null) {
             return;
         }

Added: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/JdoRuntimeException.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/JdoRuntimeException.java?rev=1358272&view=auto
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/JdoRuntimeException.java (added)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/JdoRuntimeException.java Fri Jul  6 15:40:56 2012
@@ -0,0 +1,16 @@
+package org.apache.isis.runtimes.dflt.objectstores.datanucleus;
+
+public class JdoRuntimeException extends RuntimeException {
+
+    private static final long serialVersionUID = 1L;
+
+    public JdoRuntimeException() {
+        super();
+    }
+
+    public JdoRuntimeException(String arg0) {
+        super(arg0);
+    }
+
+    
+}

Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/metamodel/facets/RemoveDataNucleusEnhancementTypesFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/metamodel/facets/RemoveDataNucleusEnhancementTypesFacetFactory.java?rev=1358272&r1=1358271&r2=1358272&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/metamodel/facets/RemoveDataNucleusEnhancementTypesFacetFactory.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/metamodel/facets/RemoveDataNucleusEnhancementTypesFacetFactory.java Fri Jul  6 15:40:56 2012
@@ -23,7 +23,7 @@ package org.apache.isis.runtimes.dflt.ob
 import org.apache.isis.core.progmodel.facets.object.ignore.javalang.AbstractRemoveMethodsFacetFactory;
 
 /**
- * Removes all methods inherited from {@link Object}.
+ * Removes all methods inherited from {@link javax.jdo.spi.PersistenceCapable}.
  */
 public class RemoveDataNucleusEnhancementTypesFacetFactory extends AbstractRemoveMethodsFacetFactory {
 

Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/persistence/commands/AbstractDataNucleusObjectCommand.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/persistence/commands/AbstractDataNucleusObjectCommand.java?rev=1358272&r1=1358271&r2=1358272&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/persistence/commands/AbstractDataNucleusObjectCommand.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/persistence/commands/AbstractDataNucleusObjectCommand.java Fri Jul  6 15:40:56 2012
@@ -1,7 +1,6 @@
 package org.apache.isis.runtimes.dflt.objectstores.datanucleus.persistence.commands;
 
 import javax.jdo.PersistenceManager;
-import javax.persistence.EntityManager;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.transaction.PersistenceCommandAbstract;

Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/persistence/commands/DataNucleusDeleteObjectCommand.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/persistence/commands/DataNucleusDeleteObjectCommand.java?rev=1358272&r1=1358271&r2=1358272&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/persistence/commands/DataNucleusDeleteObjectCommand.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/persistence/commands/DataNucleusDeleteObjectCommand.java Fri Jul  6 15:40:56 2012
@@ -1,7 +1,6 @@
 package org.apache.isis.runtimes.dflt.objectstores.datanucleus.persistence.commands;
 
 import javax.jdo.PersistenceManager;
-import javax.persistence.EntityManager;
 
 import org.apache.log4j.Logger;
 

Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/persistence/queries/PersistenceQueryFindAllInstancesProcessor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/persistence/queries/PersistenceQueryFindAllInstancesProcessor.java?rev=1358272&r1=1358271&r2=1358272&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/persistence/queries/PersistenceQueryFindAllInstancesProcessor.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/persistence/queries/PersistenceQueryFindAllInstancesProcessor.java Fri Jul  6 15:40:56 2012
@@ -5,8 +5,10 @@ import java.util.List;
 import javax.jdo.PersistenceManager;
 import javax.jdo.Query;
 
+import org.apache.commons.lang.ClassUtils;
 import org.apache.log4j.Logger;
 
+import org.apache.isis.core.commons.lang.ClassUtil;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.runtimes.dflt.runtime.persistence.query.PersistenceQueryFindAllInstances;
@@ -26,7 +28,8 @@ public class PersistenceQueryFindAllInst
         if (LOG.isDebugEnabled()) {
             LOG.debug("getInstances: class=" + specification.getFullIdentifier());
         }
-        final Query query = QueryUtil.createQuery(getPersistenceManager(), "o", null, specification, null);
+        Class<?> cls = specification.getCorrespondingClass();
+        final Query query = getPersistenceManager().newQuery(cls);
         final List<?> pojos = (List<?>) query.execute();
         return loadAdapters(specification, pojos);
     }

Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/persistence/queries/PersistenceQueryFindByPatternProcessor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/persistence/queries/PersistenceQueryFindByPatternProcessor.java?rev=1358272&r1=1358271&r2=1358272&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/persistence/queries/PersistenceQueryFindByPatternProcessor.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/persistence/queries/PersistenceQueryFindByPatternProcessor.java Fri Jul  6 15:40:56 2012
@@ -3,7 +3,6 @@ package org.apache.isis.runtimes.dflt.ob
 import java.util.List;
 
 import javax.jdo.PersistenceManager;
-import javax.persistence.EntityManager;
 
 import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;

Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/persistence/queries/PersistenceQueryProcessorAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/persistence/queries/PersistenceQueryProcessorAbstract.java?rev=1358272&r1=1358271&r2=1358272&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/persistence/queries/PersistenceQueryProcessorAbstract.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/persistence/queries/PersistenceQueryProcessorAbstract.java Fri Jul  6 15:40:56 2012
@@ -5,17 +5,10 @@ import java.util.List;
 import javax.jdo.PersistenceManager;
 import javax.jdo.PersistenceManagerFactory;
 import javax.jdo.metadata.TypeMetadata;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.metamodel.ManagedType;
-import javax.persistence.metamodel.Metamodel;
 
 import com.google.common.collect.Lists;
 
 import org.apache.isis.core.commons.ensure.Assert;
-import org.apache.isis.core.commons.ensure.Ensure;
-import org.apache.isis.core.commons.factory.InstanceUtil;
-import org.apache.isis.core.commons.lang.CastUtils;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManager;

Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/persistence/queries/QueryUtil.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/persistence/queries/QueryUtil.java?rev=1358272&r1=1358271&r2=1358272&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/persistence/queries/QueryUtil.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/persistence/queries/QueryUtil.java Fri Jul  6 15:40:56 2012
@@ -40,7 +40,9 @@ public final class QueryUtil {
         if (select != null) {
             buf.append(select);
         } else {
-            buf.append("select ").append(alias);
+            buf.append("select ");
+            // not required in JDOQL (cf JPA QL)
+            // buf.append(alias);
         }
         buf.append(" ");
         return buf;

Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/persistence/spi/DataNucleusIdentifierGenerator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/persistence/spi/DataNucleusIdentifierGenerator.java?rev=1358272&r1=1358271&r2=1358272&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/persistence/spi/DataNucleusIdentifierGenerator.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/persistence/spi/DataNucleusIdentifierGenerator.java Fri Jul  6 15:40:56 2012
@@ -3,8 +3,6 @@ package org.apache.isis.runtimes.dflt.ob
 import java.util.UUID;
 
 import javax.jdo.PersistenceManager;
-import javax.jdo.PersistenceManagerFactory;
-import javax.persistence.PersistenceUnitUtil;
 
 import org.apache.log4j.Logger;
 
@@ -24,7 +22,11 @@ public class DataNucleusIdentifierGenera
 
     @SuppressWarnings("unused")
     private static final Logger LOG = Logger.getLogger(DataNucleusIdentifierGenerator.class);
+    
+    @SuppressWarnings("unused")
     private AdapterMap adapterMap;
+    
+    @SuppressWarnings("unused")
     private SpecificationLookup specificationLookup;
 
 
@@ -68,7 +70,7 @@ public class DataNucleusIdentifierGenera
 
 
     public String debugTitle() {
-        return "OpenJpa Identifier Generator";
+        return "DataNucleus Identifier Generator";
     }
 
     

Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/DataNucleusPersistenceMechanismInstallerTest_getName.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/DataNucleusPersistenceMechanismInstallerTest_getName.java?rev=1358272&r1=1358271&r2=1358272&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/DataNucleusPersistenceMechanismInstallerTest_getName.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/DataNucleusPersistenceMechanismInstallerTest_getName.java Fri Jul  6 15:40:56 2012
@@ -1,14 +1,12 @@
 package org.apache.isis.runtimes.dflt.objectstores.datanucleus;
 
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import org.apache.isis.runtimes.dflt.objectstores.datanucleus.DataNucleusPersistenceMechanismInstaller;
-
 public class DataNucleusPersistenceMechanismInstallerTest_getName {
 
     private DataNucleusPersistenceMechanismInstaller installer;

Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/Utils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/Utils.java?rev=1358272&r1=1358271&r2=1358272&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/Utils.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/datanucleus/Utils.java Fri Jul  6 15:40:56 2012
@@ -7,8 +7,6 @@ import java.util.Properties;
 
 import org.apache.isis.core.commons.config.IsisConfiguration;
 import org.apache.isis.core.commons.config.IsisConfigurationDefault;
-import org.apache.isis.runtimes.dflt.objectstores.datanucleus.DataNucleusObjectStore;
-import org.apache.isis.runtimes.dflt.objectstores.datanucleus.DataNucleusPersistenceMechanismInstaller;
 import org.apache.isis.runtimes.dflt.objectstores.datanucleus.metamodel.specloader.progmodelfacets.DataNucleusProgrammingModelFacets;
 import org.apache.isis.runtimes.dflt.objectstores.jdo.metamodel.specloader.validator.JdoMetaModelValidator;
 import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
@@ -48,10 +46,9 @@ public class Utils {
     public static IsisConfiguration configurationForDataNucleusOverHsqlDb() {
         final IsisConfigurationDefault configuration = new IsisConfigurationDefault();
         Properties props = new Properties();
-        props.put("isis.persistor.datanucleus.impl.openjpa.jdbc.SynchronizeMappings", "buildSchema");
         props.put("isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName", "org.hsqldb.jdbcDriver");
-        props.put("isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL", "jdbc:hsqldb:mem:test");
-        //props.put("isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL", "jdbc:hsqldb:file:hsql-db/test;hsqldb.write_delay=false;shutdown=true");
+        //props.put("isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL", "jdbc:hsqldb:mem:test");
+        props.put("isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL", "jdbc:hsqldb:file:hsql-db/test;hsqldb.write_delay=false;shutdown=true");
         props.put("isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName", "sa");
         props.put("isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword", "");
         props.put("isis.persistor.datanucleus.impl.datanucleus.autoCreateSchema", "true");

Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/metamodel/facets/object/version/JdoVersionFacet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/metamodel/facets/object/version/JdoVersionFacet.java?rev=1358272&r1=1358271&r2=1358272&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/metamodel/facets/object/version/JdoVersionFacet.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/metamodel/facets/object/version/JdoVersionFacet.java Fri Jul  6 15:40:56 2012
@@ -21,7 +21,6 @@ package org.apache.isis.runtimes.dflt.ob
 import javax.jdo.annotations.Version;
 
 import org.apache.isis.core.metamodel.facets.MarkerFacet;
-import org.apache.isis.core.metamodel.facets.SingleValueFacet;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
 
 /**

Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/metamodel/facets/prop/primarykey/OptionalFacetDerivedFromJdoPrimaryKeyAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/metamodel/facets/prop/primarykey/OptionalFacetDerivedFromJdoPrimaryKeyAnnotation.java?rev=1358272&r1=1358271&r2=1358272&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/metamodel/facets/prop/primarykey/OptionalFacetDerivedFromJdoPrimaryKeyAnnotation.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/metamodel/facets/prop/primarykey/OptionalFacetDerivedFromJdoPrimaryKeyAnnotation.java Fri Jul  6 15:40:56 2012
@@ -18,9 +18,12 @@
  */
 package org.apache.isis.runtimes.dflt.objectstores.jdo.metamodel.facets.prop.primarykey;
 
+import javax.jdo.annotations.PrimaryKey;
+
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.mandatory.MandatoryFacetDefault;
 import org.apache.isis.core.metamodel.facets.properties.defaults.PropertyDefaultFacet;
+import org.apache.isis.runtimes.dflt.objectstores.jdo.metamodel.facets.object.version.OptionalFacetDerivedFromJdoVersionAnnotation;
 
 
 /**

Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/metamodel/specloader/validator/JdoMetaModelValidator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/metamodel/specloader/validator/JdoMetaModelValidator.java?rev=1358272&r1=1358271&r2=1358272&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/metamodel/specloader/validator/JdoMetaModelValidator.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/metamodel/specloader/validator/JdoMetaModelValidator.java Fri Jul  6 15:40:56 2012
@@ -48,7 +48,7 @@ public class JdoMetaModelValidator exten
                 return;
             }
         }
-        throw new MetaModelInvalidException("No annotated entities found; " + "are they annotated with @Entity? " + "are the entities referenced by the registered services? " + "are all services registered? " + "are you using the JPA reflector");
+        throw new MetaModelInvalidException("No annotated entities found; " + "are they annotated with @PersistenceCapable? " + "are the entities referenced by the registered services? " + "are all services registered? " + "are you using the JPA reflector");
     }
 
     private void ensureAllSpecificationsValid() throws ClassNotFoundException {
@@ -68,7 +68,7 @@ public class JdoMetaModelValidator exten
         }
 
         final String classFullName = objSpec.getFullIdentifier();
-        throw new MetaModelInvalidException(MessageFormat.format("Class {0} is mapped as both @Entity and @Embeddable; " + "not supported", classFullName));
+        throw new MetaModelInvalidException(MessageFormat.format("Class {0} is mapped as both @PersistenceCapable and @EmbeddedOnly; " + "not supported", classFullName));
     }
 
     private void ensureEntityIfAnnotatedAsSuchHasOrInheritsAnPrimaryKyProperty(final ObjectSpecification objSpec) throws ClassNotFoundException {
@@ -100,7 +100,7 @@ public class JdoMetaModelValidator exten
             return;
         }
         final String classFullName = objSpec.getFullIdentifier();
-        throw new MetaModelInvalidException(MessageFormat.format("OpenJpa object store requires that concrete class {0} mapped by @Entity " + "must also have an @DiscriminatorValue annotation", classFullName));
+        throw new MetaModelInvalidException(MessageFormat.format("DataNucleus object store requires that concrete class {0} mapped by @PersistenceCapable " + "must also have an @Discriminator annotation", classFullName));
     }
 
 }

Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/site/site.xml?rev=1358272&r1=1358271&r2=1358272&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/site/site.xml (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/site/site.xml Fri Jul  6 15:40:56 2012
@@ -23,15 +23,15 @@
 			<item name="Metamodel" href="index.html"/>
 		</breadcrumbs>
 
-		<menu name="JPA Metamodel">
+		<menu name="JDO Metamodel">
 			<item name="About" href="index.html" />
             <item name="Jottings" href="jottings.html" />
 		</menu>
 
-        <menu name="JPA Modules">
-            <item name="Applib" href="../jpa-applib/index.html" />
-            <item name="Metamodel" href="../jpa-metamodel/index.html" />
-            <item name="OpenJPA" href="../jpa-openjpa/index.html" />
+        <menu name="JDO Modules">
+            <item name="Applib" href="../jdo-applib/index.html" />
+            <item name="Metamodel" href="../jdo-metamodel/index.html" />
+            <item name="DataNucleus" href="../jdo-datanucleus/index.html" />
         </menu>
 
 		<menu name="Maven Reports" ref="reports" />

Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/metamodel/facets/object/version/GivenJdoVersionAnnotationFacetFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/metamodel/facets/object/version/GivenJdoVersionAnnotationFacetFactoryTest.java?rev=1358272&r1=1358271&r2=1358272&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/metamodel/facets/object/version/GivenJdoVersionAnnotationFacetFactoryTest.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/metamodel/facets/object/version/GivenJdoVersionAnnotationFacetFactoryTest.java Fri Jul  6 15:40:56 2012
@@ -18,18 +18,13 @@
  */
 package org.apache.isis.runtimes.dflt.objectstores.jdo.metamodel.facets.object.version;
 
-import java.lang.reflect.Method;
 import java.util.List;
 
-import junit.framework.Assert;
-
 import org.jmock.Expectations;
 
 import org.apache.isis.core.commons.matchers.IsisMatchers;
-import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facetapi.FeatureType;
 import org.apache.isis.core.metamodel.facets.FacetFactory;
-import org.apache.isis.core.metamodel.facets.mandatory.MandatoryFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
 import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryTest;

Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/pom.xml?rev=1358272&r1=1358271&r2=1358272&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/pom.xml (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/pom.xml Fri Jul  6 15:40:56 2012
@@ -136,14 +136,37 @@
 			</dependency>
 
 			<!-- DataNucleus -->
-
-			<dependency>
-				<groupId>org.datanucleus</groupId>
-				<artifactId>datanucleus-accessplatform-jdo-rdbms</artifactId>
-				<version>3.0.10</version>
-				<type>pom</type>
-			</dependency>
-
+	       <dependency>
+	            <groupId>javax.jdo</groupId>
+	            <artifactId>jdo-api</artifactId>
+	            <version>3.0.1</version>
+	        </dependency>
+	        <dependency>
+	            <groupId>org.datanucleus</groupId>
+	            <artifactId>datanucleus-core</artifactId>
+	            <version>3.0.11</version>
+	        </dependency>
+	        <dependency>
+	            <groupId>org.datanucleus</groupId>
+	            <artifactId>datanucleus-enhancer</artifactId>
+	            <version>3.0.1</version>
+	        </dependency>
+	        <dependency>
+	            <groupId>org.datanucleus</groupId>
+	            <artifactId>datanucleus-api-jdo</artifactId>
+	            <version>3.0.8</version>
+	        </dependency>
+	        <dependency>
+	            <groupId>org.datanucleus</groupId>
+	            <artifactId>datanucleus-jdo-query</artifactId>
+	            <version>3.0.2</version>
+	        </dependency>
+	        <dependency>
+	            <groupId>org.datanucleus</groupId>
+	            <artifactId>datanucleus-rdbms</artifactId>
+	            <version>3.0.10</version>
+	        </dependency>
+	    
 	        <dependency>
 	            <groupId>org.hsqldb</groupId>
 	            <artifactId>hsqldb</artifactId>

Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/src/site/site.xml?rev=1358272&r1=1358271&r2=1358272&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/src/site/site.xml (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/src/site/site.xml Fri Jul  6 15:40:56 2012
@@ -21,19 +21,18 @@
 
 	<body>
 		<breadcrumbs>
-			<item name="JPA" href="index.html"/>
+			<item name="JDO" href="index.html"/>
 		</breadcrumbs>
 
-		<menu name="JPA ObjectStore">
+		<menu name="JDO ObjectStore">
 			<item name="About" href="index.html" />
             <item name="Jottings" href="jottings.html" />
 		</menu>
 
-
-        <menu name="JPA Modules">
-            <item name="Applib" href="./jpa-applib/index.html" />
-            <item name="Metamodel" href="./jpa-metamodel/index.html" />
-            <item name="OpenJPA" href="./jpa-viewer/index.html" />
+        <menu name="JDO Modules">
+            <item name="Applib" href="./jdo-applib/index.html" />
+            <item name="Metamodel" href="./jdo-metamodel/index.html" />
+            <item name="DataNucleus" href="./jdo-datanucleus/index.html" />
         </menu>
         
 		<menu name="Documentation">

Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/pom.xml?rev=1358272&r1=1358271&r2=1358272&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/pom.xml (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/pom.xml Fri Jul  6 15:40:56 2012
@@ -46,10 +46,8 @@
 		<module>xml</module>
 		<module>sql</module>
 		<module>nosql</module>
-		<!--
 		<module>jpa</module>
 		<module>jdo</module>
-		-->
 	</modules>
 	
 	<reporting>



Mime
View raw message