Added new atom compatibility.

Terradue · Oct 29, 2014 · df8d476 · df8d476
1 parent afce913
commit df8d476
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>com.terradue</groupId>
     <artifactId>jcatalogue-client-parent</artifactId>
-    <version>0.9</version>
+    <version>0.9-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
   <properties>

diff --git a/core/src/main/java/com/terradue/jcatalogue/client/internal/digester/DataSetRulesModule.java b/core/src/main/java/com/terradue/jcatalogue/client/internal/digester/DataSetRulesModule.java
@@ -50,12 +50,14 @@ protected void configure()
         forPattern( "feed/entry/date" )
         .withNamespaceURI( "http://purl.org/dc/elements/1.1/" )
         	.setBeanProperty().withName( "datePosition" );
-        /*
-        forPattern( "feed/entry/gml:validTime/gml:TimePeriod/gml:beginPosition" )
-        .setBeanProperty().withName( "beginPosition" );
-        forPattern( "feed/entry/gml:validTime/gml:TimePeriod/gml:endPosition" )
+
+        forPattern( "feed/entry/validTime/TimePeriod/beginPosition" )
+        .withNamespaceURI( "http://www.opengis.net/gml" )
+        	.setBeanProperty().withName( "beginPosition" );
+        forPattern( "feed/entry/validTime/TimePeriod/endPosition" )
+        .withNamespaceURI( "http://www.opengis.net/gml" )
             .setBeanProperty().withName( "endPosition" );
-*/
+
         forPattern( "feed/entry/georss:where/Envelope" )
             .createObject().ofType( Box.class );
         forPattern( "feed/entry/georss:where/gml:Envelope/gml:lowerCorner" )

diff --git a/.../main/java/com/terradue/jcatalogue/client/internal/digester/SingleDataSetRulesModule.java b/.../main/java/com/terradue/jcatalogue/client/internal/digester/SingleDataSetRulesModule.java
@@ -49,14 +49,16 @@ protected void configure()
 
         forPattern( "feed/entry/published" ).setBeanProperty();
         forPattern( "feed/entry/updated" ).setBeanProperty();
-        /*
+
         forPattern( "feed/entry/date" )
         .withNamespaceURI( "http://purl.org/dc/elements/1.1/" )
-        	.setBeanProperty().withName( "datePosition" );
-        */
-        forPattern( "feed/entry/gml:validTime/gml:TimePeriod/gml:beginPosition" )
+        	.setBeanProperty().withName( "datePosition" );        
+
+        forPattern( "feed/entry/validTime/TimePeriod/beginPosition" )
+        .withNamespaceURI( "http://www.opengis.net/gml" )
             .setBeanProperty().withName( "beginPosition" );
-        forPattern( "feed/entry/gml:validTime/gml:TimePeriod/gml:endPosition" )
+        forPattern( "feed/entry/validTime/TimePeriod/endPosition" )
+        .withNamespaceURI( "http://www.opengis.net/gml" )
             .setBeanProperty().withName( "endPosition" );
 
         forPattern( "feed/georss:where/Envelope" )