Author: jukka
Date: Thu Nov 14 15:59:35 2013
New Revision: 1541945
URL: http://svn.apache.org/r1541945
Log:
OAK-806: Content migration from Jackrabbit to Oak
Fix handling of date properties.
Modified:
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java
Modified:
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java?rev=1541945&r1=1541944&r2=1541945&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java
(original)
+++
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java
Thu Nov 14 15:59:35 2013
@@ -49,6 +49,7 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.spi.Name;
import org.apache.jackrabbit.spi.Path;
+import org.apache.jackrabbit.util.ISO8601;
class JackrabbitNodeState extends AbstractNodeState {
@@ -164,7 +165,7 @@ class JackrabbitNodeState extends Abstra
name, value.getBoolean(), Type.BOOLEAN);
case PropertyType.DATE:
return PropertyStates.createProperty(
- name, value.getString(), Type.DATE);
+ name, ISO8601.format(value.getCalendar()), Type.DATE);
case PropertyType.DECIMAL:
return PropertyStates.createProperty(
name, value.getDecimal(), Type.DECIMAL);
@@ -214,9 +215,9 @@ class JackrabbitNodeState extends Abstra
}
return PropertyStates.createProperty(name, booleans,
Type.BOOLEANS);
case PropertyType.DATE:
- List<Long> dates = newArrayListWithCapacity(values.length);
+ List<String> dates = newArrayListWithCapacity(values.length);
for (InternalValue value : values) {
- dates.add(value.getCalendar().getTimeInMillis());
+ dates.add(ISO8601.format(value.getCalendar()));
}
return PropertyStates.createProperty(name, dates, Type.DATES);
case PropertyType.DECIMAL:
