isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1378484 [3/3] - in /incubator/isis/trunk: examples/quickstart/dom/src/main/java/dom/todo/ framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/ framework/core/metamodel/src/main/java/org/apache/isis/core/metamodel...
Date Wed, 29 Aug 2012 09:10:21 GMT
Modified: incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java?rev=1378484&r1=1378483&r2=1378484&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java
(original)
+++ incubator/isis/trunk/framework/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java
Wed Aug 29 09:10:16 2012
@@ -27,10 +27,8 @@ import java.util.Calendar;
 import java.util.TimeZone;
 
 import org.jmock.Expectations;
-import org.jmock.integration.junit4.JMock;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import org.apache.isis.applib.profiles.Localization;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;

Modified: incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationFacetAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationFacetAbstract.java?rev=1378484&r1=1378483&r2=1378484&view=diff
==============================================================================
--- incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationFacetAbstract.java
(original)
+++ incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationFacetAbstract.java
Wed Aug 29 09:10:16 2012
@@ -37,7 +37,7 @@ public abstract class AuthorizationFacet
     private final AuthorizationManager authorizationManager;
 
     public AuthorizationFacetAbstract(final FacetHolder holder, final AuthorizationManager
authorizationManager) {
-        super(type(), holder, false);
+        super(type(), holder, Derivation.NOT_DERIVED);
         this.authorizationManager = authorizationManager;
     }
 

Modified: incubator/isis/trunk/framework/progmodels/dflt/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/progmodels/dflt/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java?rev=1378484&r1=1378483&r2=1378484&view=diff
==============================================================================
--- incubator/isis/trunk/framework/progmodels/dflt/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
(original)
+++ incubator/isis/trunk/framework/progmodels/dflt/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
Wed Aug 29 09:10:16 2012
@@ -158,6 +158,7 @@ import org.apache.isis.core.progmodel.fa
 import org.apache.isis.core.progmodel.facets.value.chars.CharWrapperValueTypeFacetFactory;
 import org.apache.isis.core.progmodel.facets.value.color.ColorValueTypeFacetFactory;
 import org.apache.isis.core.progmodel.facets.value.date.DateValueTypeFacetFactory;
+import org.apache.isis.core.progmodel.facets.value.datejodalocal.JodaLocalDateValueTypeFacetFactory;
 import org.apache.isis.core.progmodel.facets.value.datesql.JavaSqlDateValueTypeFacetFactory;
 import org.apache.isis.core.progmodel.facets.value.datetime.DateTimeValueTypeFacetFactory;
 import org.apache.isis.core.progmodel.facets.value.dateutil.JavaUtilDateValueTypeFacetFactory;
@@ -397,6 +398,9 @@ public class ProgrammingModelFacetsJava5
         addFactory(ImageValueTypeFacetFactory.class);
         addFactory(JavaAwtImageValueTypeFacetFactory.class);
 
+        // jodatime values
+        addFactory(JodaLocalDateValueTypeFacetFactory.class);
+
         // written to not trample over TypeOf if already installed
         addFactory(CollectionFacetFactory.class);
         // must come after CollectionFacetFactory

Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-applib/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-applib/pom.xml?rev=1378484&r1=1378483&r2=1378484&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-applib/pom.xml (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-applib/pom.xml Wed Aug
29 09:10:16 2012
@@ -139,10 +139,13 @@
         </dependency>
         <dependency>
             <groupId>org.datanucleus</groupId>
+            <artifactId>datanucleus-jodatime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-api-jdo</artifactId>
         </dependency>
 
-        
     </dependencies>
 
 </project>

Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-applib/src/main/resources/plugin.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-applib/src/main/resources/plugin.xml?rev=1378484&r1=1378483&r2=1378484&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-applib/src/main/resources/plugin.xml
(original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-applib/src/main/resources/plugin.xml
Wed Aug 29 09:10:16 2012
@@ -7,21 +7,24 @@
         	persistent="true" 
         	dfg="true" 
         	embedded="true"
-            long-converter="org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus.applibtypes.IsisDateConverter"/>
+            long-converter="org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus.valuetypes.IsisDateConverter"/>
         <java-type 
             name="org.apache.isis.applib.value.DateTime" 
             persistent="true" 
             dfg="true" 
             embedded="true"
-            long-converter="org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus.applibtypes.IsisDateTimeConverter"/>
+            long-converter="org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus.valuetypes.IsisDateTimeConverter"/>
     </extension>
 
     <extension point="org.datanucleus.store_mapping">
         <mapping 
             java-type="org.apache.isis.applib.value.Date" 
-            mapping-class="org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus.applibtypes.IsisDateMapping"/>
+            mapping-class="org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus.valuetypes.IsisDateMapping"/>
         <mapping 
             java-type="org.apache.isis.applib.value.DateTime" 
-            mapping-class="org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus.applibtypes.IsisDateTimeMapping"/>
+            mapping-class="org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus.valuetypes.IsisDateTimeMapping"/>
+        <mapping 
+            java-type="org.joda.time.LocalDate" 
+            mapping-class="org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus.valuetypes.JodaLocalDateMapping"/>
     </extension>
 </plugin>
\ No newline at end of file

Copied: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/valuetypes/IsisDateConverter.java
(from r1378001, incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/applibtypes/IsisDateConverter.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/valuetypes/IsisDateConverter.java?p2=incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/valuetypes/IsisDateConverter.java&p1=incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/applibtypes/IsisDateConverter.java&r1=1378001&r2=1378484&rev=1378484&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/applibtypes/IsisDateConverter.java
(original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/valuetypes/IsisDateConverter.java
Wed Aug 29 09:10:16 2012
@@ -1,50 +1,50 @@
-package org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus.applibtypes;
-
-import org.apache.isis.applib.value.Date;
-import org.datanucleus.store.types.converters.TypeConverter;
-
-public class IsisDateConverter implements TypeConverter<Date, Long>{
-
-    private static final long serialVersionUID = 1L;
-
-    public IsisDateConverter() {
-        
-    }
-    
-//    @Override
-//    public Long toLong(Date object) {
-//        if(object == null) {
-//            return null;
-//        }
-//
-//        Date d = (Date)object;
-//        return d.getMillisSinceEpoch();
-//    }
-//
-//    @Override
-//    public Date toObject(Long value) {
-//        if(value == null) {
-//            return null;
-//        }
-//        return new Date(value);
-//    }
-
-    @Override
-    public Long toDatastoreType(Date memberValue) {
-        if(memberValue == null) {
-            return null;
-        }
-
-        Date d = (Date)memberValue;
-        return d.getMillisSinceEpoch();
-    }
-
-    @Override
-    public Date toMemberType(Long datastoreValue) {
-        if(datastoreValue == null) {
-            return null;
-        }
-        return new Date(datastoreValue);
-    }
-
-}
+package org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus.valuetypes;
+
+import org.apache.isis.applib.value.Date;
+import org.datanucleus.store.types.converters.TypeConverter;
+
+public class IsisDateConverter implements TypeConverter<Date, Long>{
+
+    private static final long serialVersionUID = 1L;
+
+    public IsisDateConverter() {
+        
+    }
+    
+//    @Override
+//    public Long toLong(Date object) {
+//        if(object == null) {
+//            return null;
+//        }
+//
+//        Date d = (Date)object;
+//        return d.getMillisSinceEpoch();
+//    }
+//
+//    @Override
+//    public Date toObject(Long value) {
+//        if(value == null) {
+//            return null;
+//        }
+//        return new Date(value);
+//    }
+
+    @Override
+    public Long toDatastoreType(Date memberValue) {
+        if(memberValue == null) {
+            return null;
+        }
+
+        Date d = (Date)memberValue;
+        return d.getMillisSinceEpoch();
+    }
+
+    @Override
+    public Date toMemberType(Long datastoreValue) {
+        if(datastoreValue == null) {
+            return null;
+        }
+        return new Date(datastoreValue);
+    }
+
+}

Copied: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/valuetypes/IsisDateMapping.java
(from r1378001, incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/applibtypes/IsisDateMapping.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/valuetypes/IsisDateMapping.java?p2=incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/valuetypes/IsisDateMapping.java&p1=incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/applibtypes/IsisDateMapping.java&r1=1378001&r2=1378484&rev=1378484&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/applibtypes/IsisDateMapping.java
(original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/valuetypes/IsisDateMapping.java
Wed Aug 29 09:10:16 2012
@@ -1,30 +1,30 @@
-package org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus.applibtypes;
-
-import org.datanucleus.store.mapped.mapping.ObjectAsLongMapping;
-
-import org.apache.isis.applib.value.Date;
-
-public class IsisDateMapping extends ObjectAsLongMapping {
-
-    private final IsisDateConverter dateConverter = new IsisDateConverter();
-    
-    public IsisDateMapping() {
-        
-    }
-    
-    @Override
-    public Class<?> getJavaType() {
-        return org.apache.isis.applib.value.Date.class;
-    }
-
-    @Override
-    protected Long objectToLong(Object object) {
-        return dateConverter.toDatastoreType((Date) object);
-    }
-
-    @Override
-    protected Object longToObject(Long datastoreValue) {
-        return dateConverter.toMemberType(datastoreValue);
-    }
-
-}
+package org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus.valuetypes;
+
+import org.datanucleus.store.mapped.mapping.ObjectAsLongMapping;
+
+import org.apache.isis.applib.value.Date;
+
+public class IsisDateMapping extends ObjectAsLongMapping {
+
+    private final IsisDateConverter dateConverter = new IsisDateConverter();
+    
+    public IsisDateMapping() {
+        
+    }
+    
+    @Override
+    public Class<?> getJavaType() {
+        return org.apache.isis.applib.value.Date.class;
+    }
+
+    @Override
+    protected Long objectToLong(Object object) {
+        return dateConverter.toDatastoreType((Date) object);
+    }
+
+    @Override
+    protected Object longToObject(Long datastoreValue) {
+        return dateConverter.toMemberType(datastoreValue);
+    }
+
+}

Copied: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/valuetypes/IsisDateTimeConverter.java
(from r1378001, incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/applibtypes/IsisDateTimeConverter.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/valuetypes/IsisDateTimeConverter.java?p2=incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/valuetypes/IsisDateTimeConverter.java&p1=incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/applibtypes/IsisDateTimeConverter.java&r1=1378001&r2=1378484&rev=1378484&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/applibtypes/IsisDateTimeConverter.java
(original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/valuetypes/IsisDateTimeConverter.java
Wed Aug 29 09:10:16 2012
@@ -1,4 +1,4 @@
-package org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus.applibtypes;
+package org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus.valuetypes;
 
 import org.apache.isis.applib.value.DateTime;
 import org.datanucleus.store.types.converters.TypeConverter;

Copied: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/valuetypes/IsisDateTimeMapping.java
(from r1378001, incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/applibtypes/IsisDateTimeMapping.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/valuetypes/IsisDateTimeMapping.java?p2=incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/valuetypes/IsisDateTimeMapping.java&p1=incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/applibtypes/IsisDateTimeMapping.java&r1=1378001&r2=1378484&rev=1378484&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/applibtypes/IsisDateTimeMapping.java
(original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/valuetypes/IsisDateTimeMapping.java
Wed Aug 29 09:10:16 2012
@@ -1,4 +1,4 @@
-package org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus.applibtypes;
+package org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus.valuetypes;
 
 import org.datanucleus.store.mapped.mapping.ObjectAsLongMapping;
 

Copied: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/scenarios/adaptermanager/Persistence_lazyLoading.java
(from r1378001, incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/scenarios/adaptermgr/Persistence_lazyLoading.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/jdo/datanucleus/scenarios/adaptermanager/Persistence_lazyLoading.java?p2=incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/scenarios/adaptermanager/Persistence_lazyLoading.java&p1=incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/scenarios/adaptermgr/Persistence_lazyLoading.java&r1=1378001&r2=1378484&rev=1378484&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/scenarios/adaptermgr/Persistence_lazyLoading.java
(original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/scenarios/adaptermanager/Persistence_lazyLoading.java
Wed Aug 29 09:10:16 2012
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus.scenarios.adaptermgr;
+package org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus.scenarios.adaptermanager;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;

Copied: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/scenarios/adaptermanager/Persistence_loadObject.java
(from r1378001, incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/scenarios/adaptermgr/Persistence_loadObject.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/jdo/datanucleus/scenarios/adaptermanager/Persistence_loadObject.java?p2=incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/scenarios/adaptermanager/Persistence_loadObject.java&p1=incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/scenarios/adaptermgr/Persistence_loadObject.java&r1=1378001&r2=1378484&rev=1378484&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/scenarios/adaptermgr/Persistence_loadObject.java
(original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/scenarios/adaptermanager/Persistence_loadObject.java
Wed Aug 29 09:10:16 2012
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus.scenarios.adaptermgr;
+package org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus.scenarios.adaptermanager;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;

Copied: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/scenarios/adaptermanager/Persistence_persistentAdapterFor.java
(from r1378001, incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/scenarios/adaptermgr/Persistence_persistentAdapterFor.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/jdo/datanucleus/scenarios/adaptermanager/Persistence_persistentAdapterFor.java?p2=incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/scenarios/adaptermanager/Persistence_persistentAdapterFor.java&p1=incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/scenarios/adaptermgr/Persistence_persistentAdapterFor.java&r1=1378001&r2=1378484&rev=1378484&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/scenarios/adaptermgr/Persistence_persistentAdapterFor.java
(original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/scenarios/adaptermanager/Persistence_persistentAdapterFor.java
Wed Aug 29 09:10:16 2012
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus.scenarios.adaptermgr;
+package org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus.scenarios.adaptermanager;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;

Copied: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/valuetypes/IsisDateConverterTest.java
(from r1378001, incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/applibtypes/IsisDateConverterTest.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/jdo/datanucleus/valuetypes/IsisDateConverterTest.java?p2=incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/valuetypes/IsisDateConverterTest.java&p1=incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/applibtypes/IsisDateConverterTest.java&r1=1378001&r2=1378484&rev=1378484&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/applibtypes/IsisDateConverterTest.java
(original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/valuetypes/IsisDateConverterTest.java
Wed Aug 29 09:10:16 2012
@@ -1,41 +1,42 @@
-package org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus.applibtypes;
-
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import org.apache.isis.applib.value.Date;
-
-public class IsisDateConverterTest {
-
-    private IsisDateConverter converter;
-
-    @Before
-    public void setUp() throws Exception {
-        converter = new IsisDateConverter();
-    }
-    
-    @Test
-    public void roundTrip() {
-        Date date = new Date();
-        final Long value = converter.toDatastoreType(date);
-        Date date2 = (Date) converter.toMemberType(value);
-        
-        // necessary to use dateValue() because the Isis date (rather poorly) does not
-        // override equals() / hashCode()
-        assertThat(date.dateValue(), is(equalTo(date2.dateValue())));
-    }
-
-    @Test
-    public void toLong_whenNull() {
-        assertNull(converter.toDatastoreType(null));
-    }
-
-    @Test
-    public void toObject_whenNull() {
-        assertNull(converter.toMemberType(null));
-    }
-
-}
+package org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus.valuetypes;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.apache.isis.applib.value.Date;
+import org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus.valuetypes.IsisDateConverter;
+
+public class IsisDateConverterTest {
+
+    private IsisDateConverter converter;
+
+    @Before
+    public void setUp() throws Exception {
+        converter = new IsisDateConverter();
+    }
+    
+    @Test
+    public void roundTrip() {
+        Date date = new Date();
+        final Long value = converter.toDatastoreType(date);
+        Date date2 = (Date) converter.toMemberType(value);
+        
+        // necessary to use dateValue() because the Isis date (rather poorly) does not
+        // override equals() / hashCode()
+        assertThat(date.dateValue(), is(equalTo(date2.dateValue())));
+    }
+
+    @Test
+    public void toLong_whenNull() {
+        assertNull(converter.toDatastoreType(null));
+    }
+
+    @Test
+    public void toObject_whenNull() {
+        assertNull(converter.toMemberType(null));
+    }
+
+}

Copied: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/valuetypes/IsisDateMappingTest.java
(from r1378001, incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/applibtypes/IsisDateMappingTest.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/jdo/datanucleus/valuetypes/IsisDateMappingTest.java?p2=incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/valuetypes/IsisDateMappingTest.java&p1=incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/applibtypes/IsisDateMappingTest.java&r1=1378001&r2=1378484&rev=1378484&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/applibtypes/IsisDateMappingTest.java
(original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/test/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/valuetypes/IsisDateMappingTest.java
Wed Aug 29 09:10:16 2012
@@ -1,31 +1,32 @@
-package org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus.applibtypes;
-
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import org.apache.isis.applib.value.Date;
-
-public class IsisDateMappingTest {
-
-    private IsisDateMapping dateMapping;
-
-    @Before
-    public void setUp() throws Exception {
-        dateMapping = new IsisDateMapping();
-    }
-    
-    @Test
-    public void roundTrip() {
-        Date date = new Date();
-        final Long datastoreValue = dateMapping.objectToLong(date);
-        Date date2 = (Date) dateMapping.longToObject(datastoreValue);
-        
-        // necessary to use dateValue() because the Isis date (rather poorly) does not
-        // override equals() / hashCode()
-        assertThat(date.dateValue(), is(equalTo(date2.dateValue())));
-    }
-
-}
+package org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus.valuetypes;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.apache.isis.applib.value.Date;
+import org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus.valuetypes.IsisDateMapping;
+
+public class IsisDateMappingTest {
+
+    private IsisDateMapping dateMapping;
+
+    @Before
+    public void setUp() throws Exception {
+        dateMapping = new IsisDateMapping();
+    }
+    
+    @Test
+    public void roundTrip() {
+        Date date = new Date();
+        final Long datastoreValue = dateMapping.objectToLong(date);
+        Date date2 = (Date) dateMapping.longToObject(datastoreValue);
+        
+        // necessary to use dateValue() because the Isis date (rather poorly) does not
+        // override equals() / hashCode()
+        assertThat(date.dateValue(), is(equalTo(date2.dateValue())));
+    }
+
+}

Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/metamodel/facets/object/auditable/AuditableFacetAbstract.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/auditable/AuditableFacetAbstract.java?rev=1378484&r1=1378483&r2=1378484&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/auditable/AuditableFacetAbstract.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/auditable/AuditableFacetAbstract.java
Wed Aug 29 09:10:16 2012
@@ -33,7 +33,7 @@ public abstract class AuditableFacetAbst
     }
 
     public AuditableFacetAbstract(FacetHolder facetHolder) {
-        super(AuditableFacetAbstract.type(), facetHolder, false);
+        super(AuditableFacetAbstract.type(), facetHolder, Derivation.NOT_DERIVED);
     }
 
 }

Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityFacetAbstract.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/datastoreidentity/JdoDatastoreIdentityFacetAbstract.java?rev=1378484&r1=1378483&r2=1378484&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/datastoreidentity/JdoDatastoreIdentityFacetAbstract.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/datastoreidentity/JdoDatastoreIdentityFacetAbstract.java
Wed Aug 29 09:10:16 2012
@@ -36,7 +36,7 @@ public abstract class JdoDatastoreIdenti
     private final IdGeneratorStrategy strategy;
 
     public JdoDatastoreIdentityFacetAbstract(IdGeneratorStrategy strategy, FacetHolder facetHolder)
{
-        super(JdoDatastoreIdentityFacetAbstract.type(), facetHolder, false);
+        super(JdoDatastoreIdentityFacetAbstract.type(), facetHolder, Derivation.NOT_DERIVED);
         this.strategy = strategy;
     }
 

Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/metamodel/facets/object/embeddedonly/JdoEmbeddedOnlyFacetAnnotation.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/embeddedonly/JdoEmbeddedOnlyFacetAnnotation.java?rev=1378484&r1=1378483&r2=1378484&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/embeddedonly/JdoEmbeddedOnlyFacetAnnotation.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/embeddedonly/JdoEmbeddedOnlyFacetAnnotation.java
Wed Aug 29 09:10:16 2012
@@ -31,7 +31,7 @@ public class JdoEmbeddedOnlyFacetAnnotat
     }
 
     public JdoEmbeddedOnlyFacetAnnotation(final FacetHolder holder) {
-        super(JdoEmbeddedOnlyFacetAnnotation.type(), holder, false);
+        super(JdoEmbeddedOnlyFacetAnnotation.type(), holder, Derivation.NOT_DERIVED);
     }
 
 }

Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAbstract.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/persistencecapable/JdoPersistenceCapableFacetAbstract.java?rev=1378484&r1=1378483&r2=1378484&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/persistencecapable/JdoPersistenceCapableFacetAbstract.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/persistencecapable/JdoPersistenceCapableFacetAbstract.java
Wed Aug 29 09:10:16 2012
@@ -36,7 +36,7 @@ public abstract class JdoPersistenceCapa
     private final IdentityType identityType;
 
     public JdoPersistenceCapableFacetAbstract(final String table, IdentityType identityType,
final FacetHolder holder) {
-        super(JdoPersistenceCapableFacetAbstract.type(), holder, false);
+        super(JdoPersistenceCapableFacetAbstract.type(), holder, Derivation.NOT_DERIVED);
         this.table = table;
         this.identityType = identityType;
     }

Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-metamodel/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/metamodel/facets/object/query/JdoQueryFacetAbstract.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/query/JdoQueryFacetAbstract.java?rev=1378484&r1=1378483&r2=1378484&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/query/JdoQueryFacetAbstract.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/query/JdoQueryFacetAbstract.java
Wed Aug 29 09:10:16 2012
@@ -40,7 +40,7 @@ public class JdoQueryFacetAbstract exten
     private final List<JdoNamedQuery> namedQueries = new ArrayList<JdoNamedQuery>();
 
     public JdoQueryFacetAbstract(final FacetHolder holder) {
-        super(JdoQueryFacetAbstract.type(), holder, false);
+        super(JdoQueryFacetAbstract.type(), holder, Derivation.NOT_DERIVED);
     }
 
     protected void add(final Query... jdoNamedQueries) {

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=1378484&r1=1378483&r2=1378484&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/pom.xml (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/pom.xml Wed Aug 29 09:10:16
2012
@@ -158,6 +158,11 @@
 	        </dependency>
 	        <dependency>
 	            <groupId>org.datanucleus</groupId>
+	            <artifactId>datanucleus-jodatime</artifactId>
+	            <version>3.1.0-release</version>
+	        </dependency>
+	        <dependency>
+	            <groupId>org.datanucleus</groupId>
 	            <artifactId>datanucleus-enhancer</artifactId>
 	            <version>3.1.0-release</version>
 	        </dependency>



Mime
View raw message