Update for 2.2.1

rssowl · Dec 30, 2013 · 3069197 · 3069197
1 parent 4d0d11d
commit 3069197
Show file tree

Hide file tree

Showing 41 changed files with 123 additions and 252 deletions.
diff --git a/org.rssowl.build/build-files/svn/SVNCLIENTADAPTER-LICENSE b/org.rssowl.build/build-files/svn/SVNCLIENTADAPTER-LICENSE
diff --git a/org.rssowl.build/build-files/svn/ganymed.jar b/org.rssowl.build/build-files/svn/ganymed.jar
diff --git a/org.rssowl.build/build-files/svn/svnClientAdapter.jar b/org.rssowl.build/build-files/svn/svnClientAdapter.jar
diff --git a/org.rssowl.build/build-files/svn/svnant.jar b/org.rssowl.build/build-files/svn/svnant.jar
diff --git a/org.rssowl.build/build-files/svn/svnjavahl.jar b/org.rssowl.build/build-files/svn/svnjavahl.jar
diff --git a/org.rssowl.build/build-files/svn/svnkit.jar b/org.rssowl.build/build-files/svn/svnkit.jar
diff --git a/org.rssowl.core.tests/META-INF/MANIFEST.MF b/org.rssowl.core.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests Plug-in
 Bundle-SymbolicName: org.rssowl.core.tests;singleton:=true
-Bundle-Version: 2.2.0.qualifier
+Bundle-Version: 2.2.1.qualifier
 Bundle-Vendor: RSSOwl.org
 Require-Bundle: org.eclipse.core.runtime,
  org.rssowl.lib.jdom,

diff --git a/org.rssowl.core.tests/src/org/rssowl/core/tests/NetworkTests.java b/org.rssowl.core.tests/src/org/rssowl/core/tests/NetworkTests.java
@@ -28,7 +28,6 @@
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 import org.rssowl.core.tests.connection.ConnectionTests;
-import org.rssowl.core.tests.connection.SyncConnectionTests;
 import org.rssowl.core.tests.controller.ControllerTestNetwork;
 
 /**
@@ -40,7 +39,6 @@
 @RunWith(Suite.class)
 @SuiteClasses({
   ConnectionTests.class,
-  SyncConnectionTests.class,
   ControllerTestNetwork.class
 })
 public class NetworkTests {}
diff --git a/org.rssowl.core.tests/src/org/rssowl/core/tests/connection/ConnectionTests.java b/org.rssowl.core.tests/src/org/rssowl/core/tests/connection/ConnectionTests.java
@@ -37,6 +37,7 @@
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Platform;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.rssowl.core.Owl;
 import org.rssowl.core.connection.AuthenticationRequiredException;
@@ -667,6 +668,7 @@ public void testWebsite() throws Exception {
    * @throws Exception
    */
   @Test
+  @Ignore
   public void testGoogleReaderSync() throws Exception {
     String authToken = SyncUtils.getGoogleAuthToken("rssowl@mailinator.com", "rssowl.org", true, new NullProgressMonitor());
     assertNotNull(authToken);

diff --git a/org.rssowl.core.tests/src/org/rssowl/core/tests/ui/CleanUpTests.java b/org.rssowl.core.tests/src/org/rssowl/core/tests/ui/CleanUpTests.java
@@ -28,6 +28,7 @@
 
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.rssowl.core.Owl;
 import org.rssowl.core.internal.persist.service.PersistenceServiceImpl;
@@ -974,6 +975,7 @@ public void testCleanUpNewsByAgeAndCount() throws Exception {
    * @throws Exception
    */
   @Test
+  @Ignore
   public void testCleanUpBookmarksBySynchronization() throws Exception {
     IFolder rootFolder = fFactory.createFolder(null, null, "Root");
     DynamicDAO.save(rootFolder);

diff --git a/org.rssowl.core/META-INF/MANIFEST.MF b/org.rssowl.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.rssowl.core;singleton:=true
-Bundle-Version: 2.2.0.qualifier
+Bundle-Version: 2.2.1.qualifier
 Bundle-Activator: org.rssowl.core.internal.Activator
 Eclipse-RegisterBuddy: org.rssowl.lib.db4o, org.rssowl.lib.httpclient
 Require-Bundle: org.eclipse.core.runtime,

diff --git a/org.rssowl.core/src/org/rssowl/core/internal/interpreter/DublinCoreNamespaceHandler.java b/org.rssowl.core/src/org/rssowl/core/internal/interpreter/DublinCoreNamespaceHandler.java
@@ -91,6 +91,14 @@ else if (type instanceof INews)
         ((INews) type).setPublishDate(DateUtils.parseDate(element.getText()));
     }
 
+    /* Modified date */
+    else if ("modified".equals(name)) { //$NON-NLS-1$
+      if (type instanceof IFeed)
+        ((IFeed) type).setLastModifiedDate(DateUtils.parseDate(element.getText()));
+      else if (type instanceof INews)
+        ((INews) type).setModifiedDate(DateUtils.parseDate(element.getText()));
+    }
+
     /* Creator */
     else if ("creator".equals(name)) { //$NON-NLS-1$
       IPerson person = Owl.getModelFactory().createPerson(null, type);

diff --git a/org.rssowl.feature.eclipse/feature.xml b/org.rssowl.feature.eclipse/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.rssowl.eclipse"
       label="RSSOwl in Eclipse"
-      version="2.2.0.qualifier"
+      version="2.2.1.qualifier"
       provider-name="RSSOwl.org"
       plugin="org.rssowl.ui">
 

diff --git a/org.rssowl.feature.tests/feature.xml b/org.rssowl.feature.tests/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.rssowl.tests"
       label="RSSOwl Tests Feature"
-      version="2.2.0.qualifier"
+      version="2.2.1.qualifier"
       provider-name="RSSOwl.org">
 
    <description url="http://www.example.com/description">

diff --git a/org.rssowl.feature/feature.xml b/org.rssowl.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.rssowl"
       label="RSSOwl"
-      version="2.2.0.qualifier"
+      version="2.2.1.qualifier"
       provider-name="RSSOwl.org"
       plugin="org.rssowl.ui">
 

diff --git a/org.rssowl.lib.db4o/META-INF/MANIFEST.MF b/org.rssowl.lib.db4o/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.rssowl.lib.db4o
-Bundle-Version: 2.2.0.qualifier
+Bundle-Version: 2.2.1.qualifier
 Eclipse-BuddyPolicy: registered
 Bundle-Vendor: %Bundle-Vendor
 Export-Package: com.db4o,

diff --git a/org.rssowl.lib.httpclient/META-INF/MANIFEST.MF b/org.rssowl.lib.httpclient/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.rssowl.lib.httpclient
-Bundle-Version: 2.2.0.qualifier
+Bundle-Version: 2.2.1.qualifier
 Eclipse-BuddyPolicy: registered
 Export-Package: org.apache.commons.codec,
  org.apache.commons.codec.binary,

diff --git a/org.rssowl.lib.jdom/META-INF/MANIFEST.MF b/org.rssowl.lib.jdom/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.rssowl.lib.jdom
-Bundle-Version: 2.2.0.qualifier
+Bundle-Version: 2.2.1.qualifier
 Eclipse-BuddyPolicy: registered
 Bundle-Vendor: %Bundle-Vendor
 Export-Package: .,

diff --git a/org.rssowl.lib.lucene/META-INF/MANIFEST.MF b/org.rssowl.lib.lucene/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.rssowl.lib.lucene
-Bundle-Version: 2.2.0.qualifier
+Bundle-Version: 2.2.1.qualifier
 Export-Package: org.apache.lucene,
  org.apache.lucene.analysis,
  org.apache.lucene.analysis.standard,

diff --git a/org.rssowl.ui/Launch RSSOwl 2.0.launch b/org.rssowl.ui/Launch RSSOwl 2.0.launch
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
 <stringAttribute key="application" value="org.rssowl.ui.rssowl"/>
 <booleanAttribute key="askclear" value="true"/>
@@ -11,7 +11,6 @@
 <booleanAttribute key="clearwslog" value="false"/>
 <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Launch RSSOwl 2.0"/>
 <booleanAttribute key="default" value="false"/>
-<stringAttribute key="deselected_workspace_plugins" value="org.rssowl.core.tests"/>
 <booleanAttribute key="includeOptional" value="true"/>
 <stringAttribute key="location" value="${workspace_loc}/../runtime-RSSOwl_configuration"/>
 <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
@@ -20,11 +19,12 @@
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx96m -DmultiInstance"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.rssowl.ui.product"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.ui.views.log,com.ibm.icu,org.eclipse.jface.databinding,org.eclipse.core.net.win32.x86,org.eclipse.equinox.security.macosx,org.eclipse.equinox.security.win32.x86,org.eclipse.ui.workbench,org.eclipse.swt.gtk.linux.x86,org.eclipse.swt.carbon.macosx,org.eclipse.swt,org.eclipse.core.expressions,org.eclipse.core.runtime.compatibility.auth,org.eclipse.update.scheduler,org.eclipse.help,org.eclipse.core.jobs,org.eclipse.equinox.app,org.eclipse.equinox.preferences,org.eclipse.update.configurator,org.eclipse.core.contenttype,org.eclipse.swt.gtk.linux.x86_64,org.eclipse.core.databinding,org.eclipse.ui,org.eclipse.update.ui,org.eclipse.core.net.linux.x86,org.eclipse.core.net,org.eclipse.ui.net,org.eclipse.core.runtime,org.eclipse.equinox.registry,org.eclipse.swt.win32.win32.x86,org.eclipse.update.core,org.eclipse.osgi,org.eclipse.jface,org.eclipse.core.commands,org.eclipse.equinox.security,org.eclipse.pde.runtime,org.eclipse.ui.forms,org.eclipse.equinox.common"/>
-<stringAttribute key="selected_workspace_plugins" value="org.rssowl.core,org.rssowl.lib.jdom,org.rssowl.lib.httpclient,org.rssowl.contrib.nntp,org.rssowl.lib.db4o,org.rssowl.lib.lucene,org.rssowl.ui"/>
+<stringAttribute key="selected_target_plugins" value="com.ibm.icu.base@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.core.net@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.equinox.security@default:default,org.eclipse.help@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface@default:default,org.eclipse.osgi@-1:true,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.swt@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.update.configurator@3:true,org.eclipse.update.core.win32@default:false,org.eclipse.update.core@default:default,org.eclipse.update.ui@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.rssowl.core@default:default,org.rssowl.lib.db4o@default:default,org.rssowl.lib.httpclient@default:default,org.rssowl.lib.jdom@default:default,org.rssowl.lib.lucene@default:default,org.rssowl.ui@default:default"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <stringAttribute key="templateConfig" value="${workspace_loc:org.rssowl.ui/config.ini}"/>
 <booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
 <booleanAttribute key="useDefaultConfig" value="true"/>
 <booleanAttribute key="useDefaultConfigArea" value="true"/>
 <booleanAttribute key="useNamedJRE" value="true"/>