You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2012/07/14 09:49:17 UTC

svn commit: r1361487 - in /incubator/isis/trunk: examples/quickstart/ examples/quickstart/dom/src/main/java/dom/todo/ examples/quickstart/exploration/ide/eclipse/launch/ examples/quickstart/objstore-jdo/ examples/quickstart/objstore-jdo/lib/ examples/q...

Author: danhaywood
Date: Sat Jul 14 07:49:16 2012
New Revision: 1361487

URL: http://svn.apache.org/viewvc?rev=1361487&view=rev
Log:
ISIS-14: updating the todo (quickstart) app for jdo object store.

Added:
    incubator/isis/trunk/examples/quickstart/objstore-jdo/lib/
    incubator/isis/trunk/examples/quickstart/objstore-jdo/lib/.gitignore
    incubator/isis/trunk/examples/quickstart/webapp/lib/
    incubator/isis/trunk/examples/quickstart/webapp/lib/.gitignore
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties
    incubator/isis/trunk/examples/quickstart/wicket/lib/
    incubator/isis/trunk/examples/quickstart/wicket/lib/.gitignore
Removed:
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_jdo.properties
Modified:
    incubator/isis/trunk/examples/quickstart/dom/src/main/java/dom/todo/ToDoItem.java
    incubator/isis/trunk/examples/quickstart/exploration/ide/eclipse/launch/quickstart-exploration.launch
    incubator/isis/trunk/examples/quickstart/objstore-jdo/pom.xml
    incubator/isis/trunk/examples/quickstart/pom.xml
    incubator/isis/trunk/examples/quickstart/webapp/ide/eclipse/launch/quickstart-webapp.launch
    incubator/isis/trunk/examples/quickstart/webapp/pom.xml
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/isis.properties
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/index.html
    incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/isis.properties
    incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/DataNucleusPersistenceMechanismInstaller.java
    incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/metamodel/specloader/progmodelfacets/JdoProgrammingModelFacets.java
    incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/resources/org/apache/isis/runtimes/dflt/runtime/installer-registry.properties

Modified: incubator/isis/trunk/examples/quickstart/dom/src/main/java/dom/todo/ToDoItem.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/dom/src/main/java/dom/todo/ToDoItem.java?rev=1361487&r1=1361486&r2=1361487&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/dom/src/main/java/dom/todo/ToDoItem.java (original)
+++ incubator/isis/trunk/examples/quickstart/dom/src/main/java/dom/todo/ToDoItem.java Sat Jul 14 07:49:16 2012
@@ -23,11 +23,16 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
+import javax.jdo.annotations.IdentityType;
+
 import org.apache.isis.applib.AbstractDomainObject;
 import org.apache.isis.applib.annotation.Disabled;
 import org.apache.isis.applib.annotation.Hidden;
 import org.apache.isis.applib.annotation.MemberOrder;
 
+@javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE)
+@javax.jdo.annotations.Discriminator("TODO")
+@javax.jdo.annotations.DatastoreIdentity(strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY)
 public class ToDoItem extends AbstractDomainObject {
 
     public static final List<String> CATEGORIES = Collections.unmodifiableList(Arrays.asList("Professional", "Domestic", "Other"));

Modified: incubator/isis/trunk/examples/quickstart/exploration/ide/eclipse/launch/quickstart-exploration.launch
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/exploration/ide/eclipse/launch/quickstart-exploration.launch?rev=1361487&r1=1361486&r2=1361487&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/exploration/ide/eclipse/launch/quickstart-exploration.launch (original)
+++ incubator/isis/trunk/examples/quickstart/exploration/ide/eclipse/launch/quickstart-exploration.launch Sat Jul 14 07:49:16 2012
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/quickstart-exploration"/>
+<listEntry value="/org.apache.isis.runtimes.dflt.runtime/src/main/java/org/apache/isis/Isis.java"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
+<listEntry value="1"/>
 </listAttribute>
 <mapAttribute key="org.eclipse.debug.core.preferred_launchers">
 <mapEntry key="[debug]" value="org.eclipse.jdt.launching.localJavaApplication"/>

Added: incubator/isis/trunk/examples/quickstart/objstore-jdo/lib/.gitignore
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/objstore-jdo/lib/.gitignore?rev=1361487&view=auto
==============================================================================
--- incubator/isis/trunk/examples/quickstart/objstore-jdo/lib/.gitignore (added)
+++ incubator/isis/trunk/examples/quickstart/objstore-jdo/lib/.gitignore Sat Jul 14 07:49:16 2012
@@ -0,0 +1,5 @@
+#
+# explicitly ignoring Microsoft JDBC4 jar
+# (cannot redistribute, licensing)
+#
+sqljdbc4.jar

Modified: incubator/isis/trunk/examples/quickstart/objstore-jdo/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/objstore-jdo/pom.xml?rev=1361487&r1=1361486&r2=1361487&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/objstore-jdo/pom.xml (original)
+++ incubator/isis/trunk/examples/quickstart/objstore-jdo/pom.xml Sat Jul 14 07:49:16 2012
@@ -42,6 +42,12 @@
             <artifactId>jdo-datanucleus</artifactId>
         </dependency>
 		
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>1.6.4</version>
+        </dependency>
+
 	</dependencies>
 
 </project>

Modified: incubator/isis/trunk/examples/quickstart/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/pom.xml?rev=1361487&r1=1361486&r2=1361487&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/pom.xml (original)
+++ incubator/isis/trunk/examples/quickstart/pom.xml Sat Jul 14 07:49:16 2012
@@ -183,7 +183,13 @@
 
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>quickstart-objstore-mongodb</artifactId>
+                <artifactId>quickstart-objstore-jdo</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>quickstart-objstore-nosql</artifactId>
                 <version>${project.version}</version>
             </dependency>
 

Modified: incubator/isis/trunk/examples/quickstart/webapp/ide/eclipse/launch/quickstart-webapp.launch
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/webapp/ide/eclipse/launch/quickstart-webapp.launch?rev=1361487&r1=1361486&r2=1361487&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/ide/eclipse/launch/quickstart-webapp.launch (original)
+++ incubator/isis/trunk/examples/quickstart/webapp/ide/eclipse/launch/quickstart-webapp.launch Sat Jul 14 07:49:16 2012
@@ -15,4 +15,5 @@
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.WebServer"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="quickstart-webapp"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
 </launchConfiguration>

Added: incubator/isis/trunk/examples/quickstart/webapp/lib/.gitignore
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/webapp/lib/.gitignore?rev=1361487&view=auto
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/lib/.gitignore (added)
+++ incubator/isis/trunk/examples/quickstart/webapp/lib/.gitignore Sat Jul 14 07:49:16 2012
@@ -0,0 +1,5 @@
+#
+# explicitly ignoring Microsoft JDBC4 jar
+# (cannot redistribute, licensing)
+#
+sqljdbc4.jar

Modified: incubator/isis/trunk/examples/quickstart/webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/webapp/pom.xml?rev=1361487&r1=1361486&r2=1361487&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/pom.xml (original)
+++ incubator/isis/trunk/examples/quickstart/webapp/pom.xml Sat Jul 14 07:49:16 2012
@@ -94,21 +94,21 @@
           - uncomment in order to use in-memory or xml object stores
           - (also edit isis.properties)
           -
-          -->
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>quickstart-objstore-dflt</artifactId>
         </dependency>
+          -->
         
         <!--
          - uncomment in order to use jdo object store
          - (also edit isis.properties)
          - 
+        -->
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>quickstart-objstore-jdo</artifactId>
         </dependency>
-        -->
         
         <!--
          - uncomment in order to use sql object store
@@ -190,6 +190,31 @@
             <version>1.2</version>
         </dependency>
 
+
+
+		<!-- 
+		  JDBC drivers 
+		  (if using jdo or sql object store)
+		  -->
+
+		<!-- 
+        <dependency>
+            <groupId>org.hsqldb</groupId>
+            <artifactId>hsqldb</artifactId>
+            <version>2.2.8</version>
+        </dependency>
+		-->	
+
+		<dependency>
+			<groupId>com.microsoft.sqlserver</groupId>
+			<artifactId>jdbc</artifactId>
+			<version>4.0</version>
+			<scope>system</scope>
+			<optional>true</optional>
+			<systemPath>${basedir}/lib/sqljdbc4.jar</systemPath>
+		</dependency>
+			
+
 	</dependencies>
 
 </project>

Modified: incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/isis.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/isis.properties?rev=1361487&r1=1361486&r2=1361487&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/isis.properties (original)
+++ incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/isis.properties Sat Jul 14 07:49:16 2012
@@ -36,14 +36,14 @@
 
 # if using the in-memory or XML object stores:
 # (also edit isis.persistor below, and edit pom.xml)
-isis.services.prefix = objstore.dflt
-isis.services = todo.ToDoItemsDefault
+#isis.services.prefix = objstore.dflt
+#isis.services = todo.ToDoItemsDefault
 
 
-# if using the JDO object store:
+# if using the DataNucleus object store:
 # (also edit isis.persistor below, and edit pom.xml)
-#isis.services.prefix = objstore.jdo
-#isis.services = todo.ToDoItemsJdo
+isis.services.prefix = objstore.jdo
+isis.services = todo.ToDoItemsJdo
 
 
 # if using the SQL object store:
@@ -129,7 +129,7 @@ isis.authorization=file
 #
 # * in-memory   requires no additional configuration, but stores object in-memory.
 #               Only suitable for prototyping
-# * jdo         uses JDO DataNucleus to persist objects to relational database.
+# * datanucleus uses JDO DataNucleus to persist objects to relational database.
 #               (see persistor_jdo.properties) 
 # * fileserver  uses a simple FileServer to persist objects as JSON documents.  It requires the fileserver component  
 #               to be running (see persistor_fileserver.properties) 
@@ -143,8 +143,8 @@ isis.authorization=file
 # also edit isis.services (above) and pom.xml
 # 
 
-isis.persistor=in-memory
-#isis.persistor=jdo
+#isis.persistor=in-memory
+isis.persistor=datanucleus
 #isis.persistor=fileserver
 #isis.persistor=mongodb
 #isis.persistor=sql
@@ -169,6 +169,12 @@ isis.user-profile-store=in-memory
 #################################################################################
 
 #
+# Facets for JDO object store 
+#
+isis.reflector.facets=org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus.metamodel.specloader.progmodelfacets.DataNucleusProgrammingModelFacets
+
+
+#
 # enable authorization
 #
 # authorization requires that a "facet decorator" be installed; this intercepts every
@@ -185,8 +191,8 @@ isis.user-profile-store=in-memory
 # can be traversed transparent, and modified objects are automatically saved back to the
 # object store.
 #
-# Note that this setting isn't required by some persistors (though it is required for the 
-# in-memory, mongodb and sql persistors listed above)
+# This setting is required by most persistors (in-memory, xml, mongodb, fileserver and sql)
+# For JDO, ??? does it not matter whether it is enabled or not ???
 #
 isis.persistor.object-factory=org.apache.isis.runtimes.dflt.bytecode.dflt.objectfactory.CglibObjectFactory
 
@@ -197,4 +203,11 @@ isis.persistor.object-factory=org.apache
 # The reflector (Isis metamodel) must be instructed to ignore the side-effects of enabling lazy-loading;
 # specifically it ignores any cglib-generated subclasses. 
 #
+# This setting is required whenever the isis.persistor.object-factory property has been set. 
+#
 isis.reflector.class-substitutor=org.apache.isis.runtimes.dflt.bytecode.dflt.classsubstitutor.CglibClassSubstitutor
+
+
+
+
+

Added: incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties?rev=1361487&view=auto
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties (added)
+++ incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties Sat Jul 14 07:49:16 2012
@@ -0,0 +1,56 @@
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#         http://www.apache.org/licenses/LICENSE-2.0
+#         
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+
+#
+# configuration file for the JDO objectstore
+#
+
+isis.persistor.datanucleus.impl.javax.jdo.PersistenceManagerFactoryClass=org.datanucleus.api.jdo.JDOPersistenceManagerFactory
+isis.persistor.datanucleus.impl.datanucleus.autoCreateSchema=true
+isis.persistor.datanucleus.impl.datanucleus.validateTables=true
+isis.persistor.datanucleus.impl.datanucleus.validateConstraints=true
+
+
+#
+# JDBC drivers
+# also update the pom.xml
+#
+
+#
+# HSQLDB in-memory
+#
+#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=org.hsqldb.jdbcDriver
+#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=jdbc:hsqldb:mem:test
+#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName=sa
+#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword=
+
+#
+# HSQLDB to file
+#
+#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=org.hsqldb.jdbcDriver");
+#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=jdbc:hsqldb:file:hsql-db/test;hsqldb.write_delay=false;shutdown=true
+#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName=sa
+#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword=
+
+#
+# MS SQL Server
+#
+isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=com.microsoft.sqlserver.jdbc.SQLServerDriver
+isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=jdbc:sqlserver://127.0.0.1:1433;instance=SQLEXPRESS;databaseName=jdo
+isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName=jdo
+isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword=jdopass
+

Modified: incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/index.html?rev=1361487&r1=1361486&r2=1361487&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/index.html (original)
+++ incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/index.html Sat Jul 14 07:49:16 2012
@@ -62,7 +62,7 @@ th {
             <tr><th>Object Store</th><th>Description</th><th>Prod use?</th><th>Further Documentation</th></tr>
             <tr><td>In-memory objectstore</td><td>for rapid prototyping</td><td>No</td><td>(none currently)</td></tr>
             <tr><td>XML objectstore</td><td>also for rapid prototyping but which persists data in local XML files</td><td>No</td><td>(none currently)</td></tr>
-            <tr><td>JDO objectstore</td><td>for persisting using JDO DataNucleus to a relational database</td><td>Yes</td><td>(none currently)</td></tr>
+            <tr><td>DataNucleus objectstore</td><td>for persisting using JDO DataNucleus to a relational database</td><td>Yes</td><td>(none currently)</td></tr>
             <tr><td>SQL objectstore</td><td>for persisting simple domain models to a relational database</td><td>Yes</td><td><a href="http://incubator.apache.org/isis/runtimes/dflt/objectstores/sql/docbkx/html/guide/isis-sql-objectstore.html">Config and Deployment guide</a></td></tr>
             <tr><td>MongoDB objectstore</td><td>for persisting as JSON docs to MongoDB</td><td>(not currently)</td><td>(none currently)</td></tr>
             <tr><td>FileServer objectstore</td><td>for persisting as JSON docs to Isis' own FileServer instance</td><td>Yes</td><td>(none currently)</td></tr>

Added: incubator/isis/trunk/examples/quickstart/wicket/lib/.gitignore
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/wicket/lib/.gitignore?rev=1361487&view=auto
==============================================================================
--- incubator/isis/trunk/examples/quickstart/wicket/lib/.gitignore (added)
+++ incubator/isis/trunk/examples/quickstart/wicket/lib/.gitignore Sat Jul 14 07:49:16 2012
@@ -0,0 +1,5 @@
+#
+# explicitly ignoring Microsoft JDBC4 jar
+# (cannot redistribute, licensing)
+#
+sqljdbc4.jar

Modified: incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/isis.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/isis.properties?rev=1361487&r1=1361486&r2=1361487&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/isis.properties (original)
+++ incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/isis.properties Sat Jul 14 07:49:16 2012
@@ -40,7 +40,7 @@ isis.services.prefix = objstore.dflt
 isis.services = todo.ToDoItemsDefault
 
 
-# if using the JDO object store:
+# if using the DataNucleus object store:
 # (also edit isis.persistor below, and edit pom.xml)
 #isis.services.prefix = objstore.jdo
 #isis.services = todo.ToDoItemsJdo
@@ -129,7 +129,7 @@ isis.authorization=file
 #
 # * in-memory   requires no additional configuration, but stores object in-memory.
 #               Only suitable for prototyping
-# * jdo         uses JDO DataNucleus to persist objects to relational database.
+# * datanucleus uses JDO DataNucleus to persist objects to relational database.
 #               (see persistor_jdo.properties) 
 # * fileserver  uses a simple FileServer to persist objects as JSON documents.  It requires the fileserver component  
 #               to be running (see persistor_fileserver.properties) 
@@ -144,7 +144,7 @@ isis.authorization=file
 # 
 
 isis.persistor=in-memory
-#isis.persistor=jdo
+#isis.persistor=datanucleus
 #isis.persistor=fileserver
 #isis.persistor=mongodb
 #isis.persistor=sql

Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/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/jdo/datanucleus/DataNucleusPersistenceMechanismInstaller.java?rev=1361487&r1=1361486&r2=1361487&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/DataNucleusPersistenceMechanismInstaller.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/DataNucleusPersistenceMechanismInstaller.java Sat Jul 14 07:49:16 2012
@@ -1,5 +1,6 @@
 package org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus;
 
+
 import java.util.Map;
 
 import org.apache.isis.core.commons.components.Installer;

Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/metamodel/specloader/progmodelfacets/JdoProgrammingModelFacets.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/progmodelfacets/JdoProgrammingModelFacets.java?rev=1361487&r1=1361486&r2=1361487&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/metamodel/specloader/progmodelfacets/JdoProgrammingModelFacets.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/metamodel/specloader/progmodelfacets/JdoProgrammingModelFacets.java Sat Jul 14 07:49:16 2012
@@ -50,5 +50,3 @@ public class JdoProgrammingModelFacets e
 
 }
 
-
-// Copyright (c) Naked Objects Group Ltd.

Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/resources/org/apache/isis/runtimes/dflt/runtime/installer-registry.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/resources/org/apache/isis/runtimes/dflt/runtime/installer-registry.properties?rev=1361487&r1=1361486&r2=1361487&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/resources/org/apache/isis/runtimes/dflt/runtime/installer-registry.properties (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/resources/org/apache/isis/runtimes/dflt/runtime/installer-registry.properties Sat Jul 14 07:49:16 2012
@@ -75,8 +75,9 @@ org.apache.isis.runtimes.dflt.runtime.se
 org.apache.isis.runtimes.dflt.objectstores.dflt.InMemoryPersistenceMechanismInstaller         # "in-memory"
 org.apache.isis.runtimes.dflt.objectstores.xml.XmlPersistenceMechanismInstaller               # "xml"
 org.apache.isis.runtimes.dflt.objectstores.sql.SqlPersistorInstaller                          # "sql"
-org.apache.isis.runtimes.dflt.objectstores.nosql.db.mongo.MongoPersistorMechanismInstaller       # "mongo" (todo: will need to split up over multiple JARs)
-org.apache.isis.runtimes.dflt.objectstores.nosql.db.file.FileServerPersistorMechanismInstaller   # "file" (todo: will need to split up over multiple JARs)
+org.apache.isis.runtimes.dflt.objectstores.nosql.db.mongo.MongoPersistorMechanismInstaller       # "mongo"
+org.apache.isis.runtimes.dflt.objectstores.nosql.db.file.FileServerPersistorMechanismInstaller   # "fileserver"
+org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus.DataNucleusPersistenceMechanismInstaller # datanucleus
 
 # profilestores
 org.apache.isis.runtimes.dflt.profilestores.dflt.InMemoryUserProfileStoreInstaller # "in-memory"