printpublisher completely moved to trunk

diff --git a/.gitattributes b/.gitattributes
index 522e80e6a578684ca0346263a7e0c3084c45fbeb..cbbd0c821e91547d5837578256fb6646715b6300 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -72,6 +72,10 @@ cdmlib-plugin/hibernate-tools-3.2.0.ga.jar -text
 cdmlib-plugin/hibernate-validator-4.0.0.CR1.jar -text
 cdmlib-plugin/hibernate-validator-4.0.0.CR1src.zip -text
 cdmlib-plugin/hsqldb.jar -text
+cdmlib-plugin/httpclient-4.0.1.jar -text
+cdmlib-plugin/httpclient-4.0.1src.zip -text
+cdmlib-plugin/httpcore-4.0.1.jar -text
+cdmlib-plugin/httpcore-4.0.1src.zip -text
 cdmlib-plugin/javassist.jar -text
 cdmlib-plugin/jaxb-api-2.1.6.jar -text
 cdmlib-plugin/jaxb-impl-2.1.6.jar -text

diff --git a/cdmlib-plugin/.classpath b/cdmlib-plugin/.classpath
index 09afec62b0ca891fa342b49a1eb822c61c510051..2c74abc35ab28e3bc27e2ba4533e886862b406f5 100644 (file)
--- a/cdmlib-plugin/.classpath
+++ b/cdmlib-plugin/.classpath
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+       <classpathentry exported="true" kind="lib" path="httpcore-4.0.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="httpclient-4.0.1.jar"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="src" output="target/classes" path="src/main/java"/>

diff --git a/cdmlib-plugin/META-INF/MANIFEST.MF b/cdmlib-plugin/META-INF/MANIFEST.MF
index 54a5c38aea1dce7cb52d535a4816e548f25a6d65..8200c4e6f0e1e3bdef6ff16b119dfb64c3a5f588 100644 (file)
--- a/cdmlib-plugin/META-INF/MANIFEST.MF
+++ b/cdmlib-plugin/META-INF/MANIFEST.MF
@@ -109,7 +109,9 @@ Bundle-ClassPath: activation-1.1.jar,
  xml-apis-1.3.04.jar,
  xml-apis-ext-1.3.04.jar,
  xmlgraphics-commons-1.3.1.jar,
- xsltc.jar
+ xsltc.jar,
+ httpclient-4.0.1.jar,
+ httpcore-4.0.1.jar
 Export-Package: eu.etaxonomy.cdm,
  eu.etaxonomy.cdm.api.application;
   uses:="eu.etaxonomy.cdm.api.service,

diff --git a/cdmlib-plugin/build.properties b/cdmlib-plugin/build.properties
index 895ae57600e93ed5be08ac9c9517299e502c5ac1..743eb4c42e39aff8ee501624ab0cd2d556151f35 100644 (file)
--- a/cdmlib-plugin/build.properties
+++ b/cdmlib-plugin/build.properties
@@ -126,7 +126,9 @@ bin.includes = META-INF/,\
                xml-apis-ext-1.3.04.jar,\\r
                xmlgraphics-commons-1.3.1.jar,\\r
                xsltc.jar,\\r
-               cdmlib-print-1.0.jar\r
+               cdmlib-print-1.0.jar,\\r
+               httpclient-4.0.1.jar,\\r
+               httpcore-4.0.1.jar\r
 jars.compile.order = cdmLibrary.jar\r
 src.includes = spring-context-support-2.5src.zip,\\r
                spring-jdbc-2.5src.zip,\\r

diff --git a/cdmlib-plugin/httpclient-4.0.1.jar b/cdmlib-plugin/httpclient-4.0.1.jar
new file mode 100644 (file)
index 0000000..ad32285
Binary files /dev/null and b/cdmlib-plugin/httpclient-4.0.1.jar differ

diff --git a/cdmlib-plugin/httpclient-4.0.1src.zip b/cdmlib-plugin/httpclient-4.0.1src.zip
new file mode 100644 (file)
index 0000000..9daa2d0
Binary files /dev/null and b/cdmlib-plugin/httpclient-4.0.1src.zip differ

diff --git a/cdmlib-plugin/httpcore-4.0.1.jar b/cdmlib-plugin/httpcore-4.0.1.jar
new file mode 100644 (file)
index 0000000..4aef35e
Binary files /dev/null and b/cdmlib-plugin/httpcore-4.0.1.jar differ

diff --git a/cdmlib-plugin/httpcore-4.0.1src.zip b/cdmlib-plugin/httpcore-4.0.1src.zip
new file mode 100644 (file)
index 0000000..d6cdb09
Binary files /dev/null and b/cdmlib-plugin/httpcore-4.0.1src.zip differ

diff --git a/taxeditor-application/META-INF/MANIFEST.MF b/taxeditor-application/META-INF/MANIFEST.MF
index 070ed45089251532543f7decf40cbcdd46937413..c55ac1fa4bf0f1e47bab4745ff2cf1dc70c94e6a 100644 (file)
--- a/taxeditor-application/META-INF/MANIFEST.MF
+++ b/taxeditor-application/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EDIT Taxonomic Editor
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.application;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin
 Bundle-Vendor: EDIT
 Bundle-Localization: plugin
@@ -13,17 +13,17 @@ Import-Package: org.apache.log4j,
  org.eclipse.equinox.app,
  org.osgi.framework,
  org.osgi.service.packageadmin
-Require-Bundle: eu.etaxonomy.taxeditor.store;bundle-version="2.1.0",
+Require-Bundle: org.eclipse.ui;bundle-version="3.5.2",
+ org.eclipse.core.runtime;bundle-version="3.5.0",
+ eu.etaxonomy.taxeditor.store;bundle-version="2.1.0",
  eu.etaxonomy.taxeditor.navigation;bundle-version="2.1.0",
  eu.etaxonomy.taxeditor.bulkeditor;bundle-version="2.1.0",
  eu.etaxonomy.taxeditor.editor;bundle-version="2.1.0",
- eu.etaxonomy.printpublisher.plugin;bundle-version="1.0.0",
- org.eclipse.core.runtime;bundle-version="3.5.0",
+ eu.etaxonomy.taxeditor.printpublisher;bundle-version="1.0.0",
  org.eclipse.equinox.ds;bundle-version="1.2.0",
  org.eclipse.equinox.util;bundle-version="1.0.200",
  org.eclipse.equinox.p2.core;bundle-version="2.0.0",
  org.eclipse.equinox.p2.ui;bundle-version="1.0.101",
  org.eclipse.equinox.p2.ui.sdk;bundle-version="1.0.100",
  org.eclipse.equinox.p2.updatechecker;bundle-version="1.1.0",
- org.eclipse.equinox.p2.operations;bundle-version="2.0.0",
- org.eclipse.ui;bundle-version="3.5.2"
+ org.eclipse.equinox.p2.operations;bundle-version="2.0.0"

diff --git a/taxeditor-bulkeditor/META-INF/MANIFEST.MF b/taxeditor-bulkeditor/META-INF/MANIFEST.MF
index 1d438e025db1e177fad42f3cb8c599dddd35cab7..102f3e05dbc37fd047bf9879806333307abb8e2f 100644 (file)
--- a/taxeditor-bulkeditor/META-INF/MANIFEST.MF
+++ b/taxeditor-bulkeditor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EDIT Taxonomic Editor - Bulk Editor Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.bulkeditor;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin
 Bundle-Vendor: EDIT

diff --git a/taxeditor-editor/META-INF/MANIFEST.MF b/taxeditor-editor/META-INF/MANIFEST.MF
index 29db7f0fc5a24b0b115c4ba8339951ff393dd51a..e11bfb496416c14044448257507ff8eaeda6258f 100644 (file)
--- a/taxeditor-editor/META-INF/MANIFEST.MF
+++ b/taxeditor-editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.editor;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-ClassPath: .,icons/
 Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin
 Bundle-Vendor: %Bundle-Vendor.0

diff --git a/taxeditor-feature-platform/feature.xml b/taxeditor-feature-platform/feature.xml
index 829b4d6b1371b274c6af164a031491484cbe9b2b..f8c68917862e137957f2a840048c4abd71ae04a9 100644 (file)
--- a/taxeditor-feature-platform/feature.xml
+++ b/taxeditor-feature-platform/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature.platform"
       label="Taxeditor Dependencies"
-      version="2.1.0.qualifier"
+      version="3.0.0.qualifier"
       os="linux,macosx,win32"
       ws="cocoa,gtk,win32"
       arch="x86">

diff --git a/taxeditor-feature-product/feature.xml b/taxeditor-feature-product/feature.xml
index e82d78e2da2946e0280b99a4e45cd99470a68099..9ad1882f7b6f40dbea144dc8b6e5e6ba07a02ed2 100644 (file)
--- a/taxeditor-feature-product/feature.xml
+++ b/taxeditor-feature-product/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.product.feature"
       label="Taxonomic Editor"
-      version="2.1.0.qualifier"
+      version="3.0.0.qualifier"
       plugin="eu.etaxonomy.taxeditor.application"
       os="linux,macosx,win32"
       ws="cocoa,gtk,win32"
@@ -77,4 +77,11 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="eu.etaxonomy.taxeditor.printpublisher"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>

diff --git a/taxeditor-navigation/META-INF/MANIFEST.MF b/taxeditor-navigation/META-INF/MANIFEST.MF
index fdbd2ddd43830263d4afebd404bfb95261ad75d0..7881b3ac5faf2aed85dc6e0f87a8cc7f65f89551 100644 (file)
--- a/taxeditor-navigation/META-INF/MANIFEST.MF
+++ b/taxeditor-navigation/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EDIT Taxonomic Editor - Navigation Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.navigation;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.cdm,
  eu.etaxonomy.taxeditor.navigation,

diff --git a/taxeditor-printpublisher/META-INF/MANIFEST.MF b/taxeditor-printpublisher/META-INF/MANIFEST.MF
index 7d5e39c6aefe6abfa65622de0e261c5d5ed4c250..6599997c2ab685ba5d193e6393d4cf62629d961b 100644 (file)
--- a/taxeditor-printpublisher/META-INF/MANIFEST.MF
+++ b/taxeditor-printpublisher/META-INF/MANIFEST.MF
@@ -6,7 +6,6 @@ Bundle-Version: 1.0.0.qualifier
 Require-Bundle: org.eclipse.osgi;bundle-version="3.5.2",
  org.eclipse.ui;bundle-version="3.5.2",
  eu.etaxonomy.cdmlib;bundle-version="2.4.0",
- eu.etaxonomy.printpublisher.core;bundle-version="1.0.0",
  eu.etaxonomy.taxeditor.editor;bundle-version="2.1.0",
  eu.etaxonomy.taxeditor.store;bundle-version="2.1.0"
 Import-Package: org.apache.log4j,

diff --git a/taxeditor-store/META-INF/MANIFEST.MF b/taxeditor-store/META-INF/MANIFEST.MF
index 10bb0ed7a9bd5f777c6dab04bef5bbee1869d6fa..19118c1b0c08562a0266df57c8c33ad6312af925 100644 (file)
--- a/taxeditor-store/META-INF/MANIFEST.MF
+++ b/taxeditor-store/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EDIT Taxonomic Editor - DataStore Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.store;singleton:=true
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin
 Bundle-Vendor: EDIT
 Export-Package: dbscripts,
@@ -37,10 +37,10 @@ Export-Package: dbscripts,
  eu.etaxonomy.taxeditor.user.wizard
 Require-Bundle: org.eclipse.osgi;bundle-version="3.5.2",
  org.eclipse.ui;bundle-version="3.5.1",
- eu.etaxonomy.cdmlib;bundle-version="2.4.0",
  org.eclipse.jface.text,
  org.eclipse.ui.forms,
- org.eclipse.core.runtime;bundle-version="3.5.0"
+ org.eclipse.core.runtime;bundle-version="3.5.0",
+ eu.etaxonomy.cdmlib;bundle-version="2.4.0"
 Import-Package: junit.framework,
  org.eclipse.core.commands,
  org.eclipse.core.commands.operations,

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
index 07ed99bca7dbc745d5c6cc96de945cb779b94a0f..203cefc747fddfcb3b6218f292bf64afd65de100 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
@@ -15,14 +15,8 @@ import java.util.List;
 
 import org.apache.log4j.Logger;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
 import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.swt.widgets.Display;
-import org.jdom.Element;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.security.authentication.ProviderManager;
@@ -51,7 +45,7 @@ import eu.etaxonomy.cdm.database.DatabaseSchemaMismatchException;
 import eu.etaxonomy.cdm.database.DatabaseTypeEnum;
 import eu.etaxonomy.cdm.database.DbSchemaValidation;
 import eu.etaxonomy.cdm.database.ICdmDataSource;
-import eu.etaxonomy.cdm.ext.IEditGeoService;
+import eu.etaxonomy.cdm.ext.geo.IEditGeoService;
 import eu.etaxonomy.cdm.model.agent.AgentBase;
 import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
@@ -60,8 +54,6 @@ import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.cdm.model.reference.ReferenceBase;
 import eu.etaxonomy.cdm.model.taxon.TaxonomicTree;
-import eu.etaxonomy.cdm.remote.view.BaseView;
-import eu.etaxonomy.cdm.remote.view.JsonView;
 import eu.etaxonomy.taxeditor.datasource.CdmDataSourceRepository;
 import eu.etaxonomy.taxeditor.datasource.view.CdmDataSourceView;
 import eu.etaxonomy.taxeditor.dialogs.LoginDialog;
@@ -124,7 +116,7 @@ public class CdmStore{
                        
                        StoreUtil.warningDialog("No datasource connection", "Application is not connected to a datastore.");
                        
-                       // TODO open datasource view
+                       // TODO open datasource view 
                        
                }       
                return null;