BGBM BDI Projects / taxeditor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 9b2cbc3 427996e)
merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Tue, 24 Sep 2013 09:24:24 +0000 (09:24 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Tue, 24 Sep 2013 09:24:24 +0000 (09:24 +0000)
1  2 
eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF patch | diff1 | diff2 | blob | history
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF patch | diff1 | diff2 | blob | history
eu.etaxonomy.taxeditor.cdmlib/build.properties patch | diff1 | diff2 | blob | history
eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF patch | diff1 | diff2 | blob | history

diff --combined eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
index 4a9ba723cfe9e7169ab08d1bfec65943b4e05a23,badb788a271b364d983cd101e780f88742000615..b1c2cf9615db35b9076dfb117a667a5a29857ab8
--- 1/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
--- 2/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
@@@ -2,19 -2,10 +2,19 @@@ Manifest-Version: 1.
  Bundle-ManifestVersion: 2
  Bundle-Name: Bulkeditor Bundle
  Bundle-SymbolicName: eu.etaxonomy.taxeditor.bulkeditor;singleton:=true
- Bundle-Version: 3.2.3.201308261400
+ Bundle-Version: 3.2.4.qualifier
  Bundle-Activator: eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin
  Bundle-Vendor: EDIT
 -Export-Package: eu.etaxonomy.taxeditor.annotatedlineeditor,eu.etaxonomy.taxeditor.annotatedlineeditor.handler,eu.etaxonomy.taxeditor.bulkeditor,eu.etaxonomy.taxeditor.bulkeditor.command,eu.etaxonomy.taxeditor.bulkeditor.handler,eu.etaxonomy.taxeditor.bulkeditor.input,eu.etaxonomy.taxeditor.bulkeditor.internal,eu.etaxonomy.taxeditor.bulkeditor.referencingobjects
 +Export-Package: eu.etaxonomy.taxeditor.annotatedlineeditor,
 + eu.etaxonomy.taxeditor.annotatedlineeditor.handler,
 + eu.etaxonomy.taxeditor.bulkeditor,
 + eu.etaxonomy.taxeditor.bulkeditor.command,
 + eu.etaxonomy.taxeditor.bulkeditor.handler,
 + eu.etaxonomy.taxeditor.bulkeditor.input,
 + eu.etaxonomy.taxeditor.bulkeditor.internal,
 + eu.etaxonomy.taxeditor.bulkeditor.referencingobjects,
 + eu.etaxonomy.taxeditor.dataimport,
 + eu.etaxonomy.taxeditor.dataimport.wizard
  Require-Bundle: org.eclipse.ui,
   org.eclipse.core.runtime,
   org.eclipse.ui.editors,
diff --combined eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index e0a236044640251ebd4a6ef95f3f48e3d04d6f6c,c2d9fd206299de2aa8633702ad7ba8ca52663c7a..d9160a29750c262d85483e94d81d7c1b82ae5912
--- 1/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
--- 2/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@@ -2,7 -2,7 +2,7 @@@ Manifest-Version: 1.
  Bundle-ManifestVersion: 2
  Bundle-Name: CDM Library Dependencies Plugin
  Bundle-SymbolicName: eu.etaxonomy.taxeditor.cdmlib;singleton:=true
- Bundle-Version: 3.2.3.201308261400
+ Bundle-Version: 3.2.4.qualifier
  Eclipse-BundleShape: dir
  Export-Package: com.google.api,
   com.google.api.detect,
@@@ -35,7 -35,6 +35,7 @@@
   eu.etaxonomy.cdm.database.update.v25_30,
   eu.etaxonomy.cdm.database.update.v30_31,
   eu.etaxonomy.cdm.ext.bci,
 + eu.etaxonomy.cdm.ext.biocase,
   eu.etaxonomy.cdm.ext.common,
   eu.etaxonomy.cdm.ext.dc,
   eu.etaxonomy.cdm.ext.geo,
@@@ -187,7 -186,6 +187,7 @@@
   org.apache.commons.lang;uses:="org.apache.commons.lang.exception",
   org.apache.fop.apps,
   org.apache.http,
 + org.apache.http.client,
   org.apache.log4j;uses:="org.apache.log4j.helpers,org.apache.log4j.or,org.apache.log4j.spi",
   org.apache.log4j.chainsaw;
    uses:="org.apache.log4j,
@@@ -418,6 -416,22 +418,22 @@@ Bundle-ClassPath: .
   lib/batik-util-1.7.jar,
   lib/batik-xml-1.7.jar,
   lib/c3p0-0.9.2.jar,
+  lib/cdmlib-commons-3.2.4-SNAPSHOT-sources.jar,
+  lib/cdmlib-commons-3.2.4-SNAPSHOT.jar,
+  lib/cdmlib-ext-3.2.4-SNAPSHOT-sources.jar,
+  lib/cdmlib-ext-3.2.4-SNAPSHOT.jar,
+  lib/cdmlib-io-3.2.4-SNAPSHOT-sources.jar,
+  lib/cdmlib-io-3.2.4-SNAPSHOT.jar,
+  lib/cdmlib-model-3.2.4-SNAPSHOT-sources.jar,
+  lib/cdmlib-model-3.2.4-SNAPSHOT.jar,
+  lib/cdmlib-persistence-3.2.4-SNAPSHOT-sources.jar,
+  lib/cdmlib-persistence-3.2.4-SNAPSHOT.jar,
+  lib/cdmlib-print-3.2.4-SNAPSHOT-sources.jar,
+  lib/cdmlib-print-3.2.4-SNAPSHOT.jar,
+  lib/cdmlib-remote-3.2.4-SNAPSHOT-sources.jar,
+  lib/cdmlib-remote-3.2.4-SNAPSHOT.jar,
+  lib/cdmlib-services-3.2.4-SNAPSHOT-sources.jar,
+  lib/cdmlib-services-3.2.4-SNAPSHOT.jar,
   lib/cglib-nodep-2.2.2.jar,
   lib/com.springsource.org.aopalliance-1.0.0.jar,
   lib/com.springsource.org.apache.commons.logging-1.1.1.jar,
@@@ -580,20 -594,4 +596,20 @@@
   lib/yjp-controller-api-redist-9.0.8.jar,
   lib/google-api-translate-java-0.92.jar,
   lib/odfdom-0.8.jar,
 - lib/h2mig_pagestore_addon.jar
 + lib/h2mig_pagestore_addon.jar,
 + lib/cdmlib-commons-3.2.4-SNAPSHOT-sources.jar,
 + lib/cdmlib-commons-3.2.4-SNAPSHOT.jar,
 + lib/cdmlib-ext-3.2.4-SNAPSHOT-sources.jar,
 + lib/cdmlib-ext-3.2.4-SNAPSHOT.jar,
 + lib/cdmlib-io-3.2.4-SNAPSHOT-sources.jar,
 + lib/cdmlib-io-3.2.4-SNAPSHOT.jar,
 + lib/cdmlib-model-3.2.4-SNAPSHOT-sources.jar,
 + lib/cdmlib-model-3.2.4-SNAPSHOT.jar,
 + lib/cdmlib-persistence-3.2.4-SNAPSHOT-sources.jar,
 + lib/cdmlib-persistence-3.2.4-SNAPSHOT.jar,
 + lib/cdmlib-print-3.2.4-SNAPSHOT-sources.jar,
 + lib/cdmlib-print-3.2.4-SNAPSHOT.jar,
 + lib/cdmlib-remote-3.2.4-SNAPSHOT-sources.jar,
 + lib/cdmlib-remote-3.2.4-SNAPSHOT.jar,
 + lib/cdmlib-services-3.2.4-SNAPSHOT-sources.jar,
 + lib/cdmlib-services-3.2.4-SNAPSHOT.jar
diff --combined eu.etaxonomy.taxeditor.cdmlib/build.properties
index ea0ee6bc4051f101167d32558ded4dba31a38792,8694db759105f327b83622fa44af04d2e4f0dc35..c3e7cc475e3edc2b4605ea7f2c1a7f557a16fd20
--- 1/eu.etaxonomy.taxeditor.cdmlib/build.properties
--- 2/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@@ -22,6 -22,22 +22,22 @@@ bin.includes = META-INF/,
                 lib/batik-util-1.7.jar,\\r
                 lib/batik-xml-1.7.jar,\\r
                 lib/c3p0-0.9.2.jar,\\r
+                lib/cdmlib-commons-3.2.4-SNAPSHOT-sources.jar,\\r
+                lib/cdmlib-commons-3.2.4-SNAPSHOT.jar,\\r
+                lib/cdmlib-ext-3.2.4-SNAPSHOT-sources.jar,\\r
+                lib/cdmlib-ext-3.2.4-SNAPSHOT.jar,\\r
+                lib/cdmlib-io-3.2.4-SNAPSHOT-sources.jar,\\r
+                lib/cdmlib-io-3.2.4-SNAPSHOT.jar,\\r
+                lib/cdmlib-model-3.2.4-SNAPSHOT-sources.jar,\\r
+                lib/cdmlib-model-3.2.4-SNAPSHOT.jar,\\r
+                lib/cdmlib-persistence-3.2.4-SNAPSHOT-sources.jar,\\r
+                lib/cdmlib-persistence-3.2.4-SNAPSHOT.jar,\\r
+                lib/cdmlib-print-3.2.4-SNAPSHOT-sources.jar,\\r
+                lib/cdmlib-print-3.2.4-SNAPSHOT.jar,\\r
+                lib/cdmlib-remote-3.2.4-SNAPSHOT-sources.jar,\\r
+                lib/cdmlib-remote-3.2.4-SNAPSHOT.jar,\\r
+                lib/cdmlib-services-3.2.4-SNAPSHOT-sources.jar,\\r
+                lib/cdmlib-services-3.2.4-SNAPSHOT.jar,\\r
                 lib/cglib-nodep-2.2.2.jar,\\r
                 lib/com.springsource.org.aopalliance-1.0.0.jar,\\r
                 lib/com.springsource.org.apache.commons.logging-1.1.1.jar,\\r
@@@ -184,21 -200,5 +200,21 @@@
                 lib/yjp-controller-api-redist-9.0.8.jar,\\r
                 lib/google-api-translate-java-0.92.jar,\\r
                 lib/odfdom-0.8.jar,\\r
 -               lib/h2mig_pagestore_addon.jar\r
 +               lib/h2mig_pagestore_addon.jar,\\r
 +               lib/cdmlib-commons-3.2.4-SNAPSHOT-sources.jar,\\r
 +               lib/cdmlib-commons-3.2.4-SNAPSHOT.jar,\\r
 +               lib/cdmlib-ext-3.2.4-SNAPSHOT-sources.jar,\\r
 +               lib/cdmlib-ext-3.2.4-SNAPSHOT.jar,\\r
 +               lib/cdmlib-io-3.2.4-SNAPSHOT-sources.jar,\\r
 +               lib/cdmlib-io-3.2.4-SNAPSHOT.jar,\\r
 +               lib/cdmlib-model-3.2.4-SNAPSHOT-sources.jar,\\r
 +               lib/cdmlib-model-3.2.4-SNAPSHOT.jar,\\r
 +               lib/cdmlib-persistence-3.2.4-SNAPSHOT-sources.jar,\\r
 +               lib/cdmlib-persistence-3.2.4-SNAPSHOT.jar,\\r
 +               lib/cdmlib-print-3.2.4-SNAPSHOT-sources.jar,\\r
 +               lib/cdmlib-print-3.2.4-SNAPSHOT.jar,\\r
 +               lib/cdmlib-remote-3.2.4-SNAPSHOT-sources.jar,\\r
 +               lib/cdmlib-remote-3.2.4-SNAPSHOT.jar,\\r
 +               lib/cdmlib-services-3.2.4-SNAPSHOT-sources.jar,\\r
 +               lib/cdmlib-services-3.2.4-SNAPSHOT.jar\r
  \r
diff --combined eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
index 223433f9fe6d512db7106c19605afb0edf27246e,2cee798dbceccb28736c1042fe1fd4a91b1bb7bd..ccd13fb2c5b2f2d0875779f0cbbb74ebac106288
--- 1/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
--- 2/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
@@@ -2,7 -2,7 +2,7 @@@ Manifest-Version: 1.
  Bundle-ManifestVersion: 2
  Bundle-Name: DataStore Bundle
  Bundle-SymbolicName: eu.etaxonomy.taxeditor.store;singleton:=true
- Bundle-Version: 3.2.3.201308261400
+ Bundle-Version: 3.2.4.qualifier
  Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin
  Bundle-Vendor: EDIT
  Export-Package: eu.etaxonomy.cdm,
@@@ -30,7 -30,6 +30,7 @@@
   eu.etaxonomy.taxeditor.store.internal,
   eu.etaxonomy.taxeditor.store.operations,
   eu.etaxonomy.taxeditor.ui.bar,
 + eu.etaxonomy.taxeditor.ui.campanula.specimenSearch,
   eu.etaxonomy.taxeditor.ui.combo,
   eu.etaxonomy.taxeditor.ui.dialog,
   eu.etaxonomy.taxeditor.ui.dialog.selection,