From: n.hoffmann Date: Thu, 11 Aug 2011 14:52:10 +0000 (+0000) Subject: Pom changes to enable fully automated tycho build and MANIFEST first development... X-Git-Tag: 3.6.0~1208 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/4d1c677bc0c7dddc24d8e9763c438abf62ee1a43 Pom changes to enable fully automated tycho build and MANIFEST first development in eclipse aside --- diff --git a/.gitattributes b/.gitattributes index b20203d56..f6c2dc66f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -269,8 +269,6 @@ eu.etaxonomy.taxeditor.cdmlib/lib/spring-modules-cache-0.7src.zip -text eu.etaxonomy.taxeditor.cdmlib/lib/spring-modules-lucene-0.8a.jar -text eu.etaxonomy.taxeditor.cdmlib/lib/spring-modules-lucene-0.8asrc.zip -text eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-config-3.0.5.RELEASE.jar -text -eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-core-3.0.0.RELEASE.jar -text -eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-core-3.0.0.RELEASEsrc.zip -text eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-core-3.0.5.RELEASE.jar -text eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.1.jar -text eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.1src.zip -text diff --git a/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF index b62c3e476..e2457830b 100644 --- a/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: EDIT Taxonomic Editor +Bundle-Name: Application Bundle-SymbolicName: eu.etaxonomy.taxeditor.application;singleton:=true Bundle-Version: 3.0.6.qualifier Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin @@ -27,3 +27,138 @@ Require-Bundle: org.eclipse.ui, org.eclipse.equinox.p2.ui.sdk, org.eclipse.equinox.p2.updatechecker, org.eclipse.equinox.p2.operations +Bundle-ClassPath: ., + activation-1.1.jar, + antlr-2.7.6.jar, + aopalliance-1.0.jar, + asm-attrs.jar, + asm.jar, + aspectjrt-1.6.3.jar, + aspectjweaver-1.6.3.jar, + avalon-framework-4.2.0.jar, + batik-all-1.7.jar, + c3p0-0.9.1.jar, + cdmlib-commons-3.0.7-SNAPSHOT.jar, + cdmlib-ext-3.0.7-SNAPSHOT.jar, + cdmlib-io-3.0.7-SNAPSHOT.jar, + cdmlib-model-3.0.7-SNAPSHOT.jar, + cdmlib-persistence-3.0.7-SNAPSHOT.jar, + cdmlib-print-3.0.7-SNAPSHOT.jar, + cdmlib-remote-3.0.7-SNAPSHOT.jar, + cglib-2.1.3.jar, + commons-beanutils-1.7.0.jar, + commons-collections-3.2.jar, + commons-dbcp-1.2.2.jar, + commons-io-1.3.1.jar, + commons-logging-1.0.4.jar, + commons-pool-1.3.jar, + dom4j-1.6.1.jar, + dozer-5.3.0-sources.jar, + dozer-5.3.0.jar, + ehcache-1.2.3.jar, + ejb3-persistence.jar, + ezmorph-1.0.4.jar, + fop.jar, + google-api-translate-java-0.92.jar, + hibernate-annotations-3.4.0-SNAPSHOT.jar, + hibernate-commons-annotations-3.4.0-SNAPSHOT.jar, + hibernate-core-3.4.0-SNAPSHOT.jar, + hibernate-envers-3.4.0-SNAPSHOT.jar, + hibernate-search-3.1.0.GA.jar, + hibernate-tools-3.2.0.ga.jar, + hibernate-validator-4.0.0.CR1.jar, + hsqldb.jar, + httpclient-4.0.1.jar, + httpcore-4.0.1.jar, + javassist.jar, + jaxb-api-2.1.6.jar, + jaxb-impl-2.1.6.jar, + jaxen-1.1.2.jar, + jdbc-1.2.jar, + jdbc2_0-stdext.jar, + jdom.jar, + joda-time-1.5.jar, + joda-time-hibernate-1.0.jar, + json-lib-2.2.3-jdk15.jar, + jsr250-api-1.0.jar, + jta.jar, + jtds-1.2.2.jar, + junit-4.4.jar, + junit-4.8.1-sources.jar, + junit-4.8.1.jar, + log4j-1.2.14.jar, + lsid-client-1.1.2.jar, + lsid-server-1.1.2.jar, + lucene-core-2.4.0.jar, + lucene-spellchecker-2.4.0.jar, + mail-1.4.jar, + msbase-2000.3.jar, + mssqlserver-2000.3.jar, + msutil-2000.3.jar, + mysql-connector-java-5.0.5.jar, + odfdom-0.8.jar, + opencsv-1.8.jar, + org.springframework.aop-3.0.4.RELEASE-sources.jar, + org.springframework.asm-3.0.4.RELEASE-sources.jar, + org.springframework.aspects-3.0.4.RELEASE-sources.jar, + org.springframework.beans-3.0.4.RELEASE-sources.jar, + org.springframework.context-3.0.4.RELEASE-sources.jar, + org.springframework.context.support-3.0.4.RELEASE-sources.jar, + org.springframework.core-3.0.4.RELEASE-sources.jar, + org.springframework.expression-3.0.4.RELEASE-sources.jar, + org.springframework.jdbc-3.0.4.RELEASE-sources.jar, + org.springframework.orm-3.0.4.RELEASE-sources.jar, + org.springframework.oxm-3.0.4.RELEASE-sources.jar, + org.springframework.transaction-3.0.4.RELEASE-sources.jar, + org.springframework.web-3.0.4.RELEASE-sources.jar, + org.springframework.web.servlet-3.0.4.RELEASE-sources.jar, + poi-3.1-FINAL.jar, + postgresql-8.2-504.jdbc4.jar, + saxon9he.jar, + serializer-2.7.0.jar, + servlet-api-2.5.jar, + spring-modules-cache-0.7.jar, + spring-modules-lucene-0.8a.jar, + wsdl4j-1.6.1.jar, + xalan-2.7.0.jar, + xercesImpl-2.7.1.jar, + xercesImpl.jar, + xml-apis-1.3.04.jar, + xml-apis-ext-1.3.04.jar, + xml-apis.jar, + xml-resolver-1.2.jar, + xmlgraphics-commons-1.3.1.jar, + xom-1.0.jar, + xsltc.jar, + xstream-1.3.1.jar, + yjp-controller-api-redist-8.0.1.jar, + ant-antlr.jar, + ant-apache-bcel.jar, + ant-apache-bsf.jar, + ant-apache-log4j.jar, + ant-apache-oro.jar, + ant-apache-regexp.jar, + ant-apache-resolver.jar, + ant-commons-logging.jar, + ant-commons-net.jar, + ant-jai.jar, + ant-javamail.jar, + ant-jdepend.jar, + ant-jmf.jar, + ant-jsch.jar, + ant-junit.jar, + ant-launcher.jar, + ant-netrexx.jar, + ant-nodeps.jar, + ant-starteam.jar, + ant-stylebook.jar, + ant-swing.jar, + ant-trax.jar, + ant-weblogic.jar, + ant.jar, + runtime_registry_compatibility.jar, + jdi.jar, + jdimodel.jar, + pdebuild.jar, + compatibility.jar, + junit.jar diff --git a/eu.etaxonomy.taxeditor.application/pom.xml b/eu.etaxonomy.taxeditor.application/pom.xml index a96e189be..3ddb0afc0 100644 --- a/eu.etaxonomy.taxeditor.application/pom.xml +++ b/eu.etaxonomy.taxeditor.application/pom.xml @@ -8,32 +8,11 @@ 4.0.0 - eu.etaxonomy eu.etaxonomy.taxeditor.application eclipse-plugin - 3.0.6-SNAPSHOT Application All plugins are combined into this application. http://dev.e-taxonomy.eu/trac/wiki/TaxonomicEditor - - - - org.apache.maven.plugins - maven-jar-plugin - - - org.eclipse.tycho - tycho-packaging-plugin - ${tycho.version} - - - false - - - - - - diff --git a/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF index f60adf5de..bb18a73f3 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF @@ -1,9 +1,8 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: EDIT Taxonomic Editor - Bulk Editor Bundle +Bundle-Name: Bulkeditor Bundle Bundle-SymbolicName: eu.etaxonomy.taxeditor.bulkeditor;singleton:=true Bundle-Version: 3.0.6.qualifier -Bundle-ClassPath: . 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 @@ -24,3 +23,138 @@ Import-Package: org.eclipse.core.runtime, org.eclipse.jface.text.source, org.eclipse.ui.views.properties, org.osgi.framework +Bundle-ClassPath: ., + activation-1.1.jar, + antlr-2.7.6.jar, + aopalliance-1.0.jar, + asm-attrs.jar, + asm.jar, + aspectjrt-1.6.3.jar, + aspectjweaver-1.6.3.jar, + avalon-framework-4.2.0.jar, + batik-all-1.7.jar, + c3p0-0.9.1.jar, + cdmlib-commons-3.0.7-SNAPSHOT.jar, + cdmlib-ext-3.0.7-SNAPSHOT.jar, + cdmlib-io-3.0.7-SNAPSHOT.jar, + cdmlib-model-3.0.7-SNAPSHOT.jar, + cdmlib-persistence-3.0.7-SNAPSHOT.jar, + cdmlib-print-3.0.7-SNAPSHOT.jar, + cdmlib-remote-3.0.7-SNAPSHOT.jar, + cglib-2.1.3.jar, + commons-beanutils-1.7.0.jar, + commons-collections-3.2.jar, + commons-dbcp-1.2.2.jar, + commons-io-1.3.1.jar, + commons-logging-1.0.4.jar, + commons-pool-1.3.jar, + dom4j-1.6.1.jar, + dozer-5.3.0-sources.jar, + dozer-5.3.0.jar, + ehcache-1.2.3.jar, + ejb3-persistence.jar, + ezmorph-1.0.4.jar, + fop.jar, + google-api-translate-java-0.92.jar, + hibernate-annotations-3.4.0-SNAPSHOT.jar, + hibernate-commons-annotations-3.4.0-SNAPSHOT.jar, + hibernate-core-3.4.0-SNAPSHOT.jar, + hibernate-envers-3.4.0-SNAPSHOT.jar, + hibernate-search-3.1.0.GA.jar, + hibernate-tools-3.2.0.ga.jar, + hibernate-validator-4.0.0.CR1.jar, + hsqldb.jar, + httpclient-4.0.1.jar, + httpcore-4.0.1.jar, + javassist.jar, + jaxb-api-2.1.6.jar, + jaxb-impl-2.1.6.jar, + jaxen-1.1.2.jar, + jdbc-1.2.jar, + jdbc2_0-stdext.jar, + jdom.jar, + joda-time-1.5.jar, + joda-time-hibernate-1.0.jar, + json-lib-2.2.3-jdk15.jar, + jsr250-api-1.0.jar, + jta.jar, + jtds-1.2.2.jar, + junit-4.4.jar, + junit-4.8.1-sources.jar, + junit-4.8.1.jar, + log4j-1.2.14.jar, + lsid-client-1.1.2.jar, + lsid-server-1.1.2.jar, + lucene-core-2.4.0.jar, + lucene-spellchecker-2.4.0.jar, + mail-1.4.jar, + msbase-2000.3.jar, + mssqlserver-2000.3.jar, + msutil-2000.3.jar, + mysql-connector-java-5.0.5.jar, + odfdom-0.8.jar, + opencsv-1.8.jar, + org.springframework.aop-3.0.4.RELEASE-sources.jar, + org.springframework.asm-3.0.4.RELEASE-sources.jar, + org.springframework.aspects-3.0.4.RELEASE-sources.jar, + org.springframework.beans-3.0.4.RELEASE-sources.jar, + org.springframework.context-3.0.4.RELEASE-sources.jar, + org.springframework.context.support-3.0.4.RELEASE-sources.jar, + org.springframework.core-3.0.4.RELEASE-sources.jar, + org.springframework.expression-3.0.4.RELEASE-sources.jar, + org.springframework.jdbc-3.0.4.RELEASE-sources.jar, + org.springframework.orm-3.0.4.RELEASE-sources.jar, + org.springframework.oxm-3.0.4.RELEASE-sources.jar, + org.springframework.transaction-3.0.4.RELEASE-sources.jar, + org.springframework.web-3.0.4.RELEASE-sources.jar, + org.springframework.web.servlet-3.0.4.RELEASE-sources.jar, + poi-3.1-FINAL.jar, + postgresql-8.2-504.jdbc4.jar, + saxon9he.jar, + serializer-2.7.0.jar, + servlet-api-2.5.jar, + spring-modules-cache-0.7.jar, + spring-modules-lucene-0.8a.jar, + wsdl4j-1.6.1.jar, + xalan-2.7.0.jar, + xercesImpl-2.7.1.jar, + xercesImpl.jar, + xml-apis-1.3.04.jar, + xml-apis-ext-1.3.04.jar, + xml-apis.jar, + xml-resolver-1.2.jar, + xmlgraphics-commons-1.3.1.jar, + xom-1.0.jar, + xsltc.jar, + xstream-1.3.1.jar, + yjp-controller-api-redist-8.0.1.jar, + ant-antlr.jar, + ant-apache-bcel.jar, + ant-apache-bsf.jar, + ant-apache-log4j.jar, + ant-apache-oro.jar, + ant-apache-regexp.jar, + ant-apache-resolver.jar, + ant-commons-logging.jar, + ant-commons-net.jar, + ant-jai.jar, + ant-javamail.jar, + ant-jdepend.jar, + ant-jmf.jar, + ant-jsch.jar, + ant-junit.jar, + ant-launcher.jar, + ant-netrexx.jar, + ant-nodeps.jar, + ant-starteam.jar, + ant-stylebook.jar, + ant-swing.jar, + ant-trax.jar, + ant-weblogic.jar, + ant.jar, + runtime_registry_compatibility.jar, + jdi.jar, + jdimodel.jar, + pdebuild.jar, + compatibility.jar, + junit.jar diff --git a/eu.etaxonomy.taxeditor.bulkeditor/pom.xml b/eu.etaxonomy.taxeditor.bulkeditor/pom.xml index 54ec74666..1eba53460 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/pom.xml +++ b/eu.etaxonomy.taxeditor.bulkeditor/pom.xml @@ -8,31 +8,11 @@ 4.0.0 - eu.etaxonomy eu.etaxonomy.taxeditor.bulkeditor eclipse-plugin - 3.0.6-SNAPSHOT Bulkeditor Bundle http://dev.e-taxonomy.eu/trac/wiki/TaxonomicEditorBulkeditorBundle - - - - org.apache.maven.plugins - maven-jar-plugin - - - org.eclipse.tycho - tycho-packaging-plugin - ${tycho.version} - - - false - - - - - diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF index 1dfcb223e..743729331 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF @@ -1,121 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: CDM Library Plug-in +Bundle-Name: CDM Library Dependencies Plugin Bundle-SymbolicName: eu.etaxonomy.taxeditor.cdmlib;singleton:=true Bundle-Version: 3.0.6.qualifier Eclipse-BundleShape: dir -Bundle-ClassPath: lib/activation-1.1.jar, - lib/antlr-2.7.6.jar, - lib/aopalliance-1.0.jar, - lib/asm-attrs.jar, - lib/asm.jar, - lib/aspectjrt-1.6.3.jar, - lib/aspectjweaver-1.6.3.jar, - lib/avalon-framework-4.2.0.jar, - lib/batik-all-1.7.jar, - lib/c3p0-0.9.1.jar, - lib/cglib-2.1.3.jar, - lib/commons-beanutils-1.7.0.jar, - lib/commons-collections-3.2.jar, - lib/commons-dbcp-1.2.2.jar, - lib/commons-io-1.3.1.jar, - lib/commons-io-1.4.jar, - lib/commons-lang-2.4.jar, - lib/commons-logging-1.0.4.jar, - lib/commons-pool-1.3.jar, - lib/dom4j-1.6.1.jar, - lib/ehcache-1.2.3.jar, - lib/ejb3-persistence.jar, - lib/ezmorph-1.0.4.jar, - lib/fop.jar, - lib/h2-1.1.115.jar, - lib/hibernate-annotations-3.4.0-SNAPSHOT.jar, - lib/hibernate-commons-annotations-3.4.0-SNAPSHOT.jar, - lib/hibernate-core-3.4.0-SNAPSHOT.jar, - lib/hibernate-envers-3.4.0-SNAPSHOT.jar, - lib/hibernate-search-3.1.0.GA.jar, - lib/hibernate-tools-3.2.0.ga.jar, - lib/hibernate-validator-4.0.0.CR1.jar, - lib/hsqldb.jar, - lib/httpclient-4.0.1.jar, - lib/httpcore-4.0.1.jar, - lib/javassist.jar, - lib/jaxb-api-2.1.6.jar, - lib/jaxb-impl-2.1.6.jar, - lib/jaxen-1.1.2.jar, - lib/jdbc-1.2.jar, - lib/jdbc2_0-stdext.jar, - lib/jdom.jar, - lib/joda-time-1.5.jar, - lib/joda-time-hibernate-1.0.jar, - lib/json-lib-2.2.3-jdk15.jar, - lib/jsr250-api-1.0.jar, - lib/jta.jar, - lib/jtds-1.2.2.jar, - lib/junit-4.8.1.jar, - lib/log4j-1.2.14.jar, - lib/lsid-client-1.1.2.jar, - lib/lsid-server-1.1.2.jar, - lib/lucene-core-2.4.0.jar, - lib/lucene-spellchecker-2.4.0.jar, - lib/mail-1.4.jar, - lib/msbase-2000.3.jar, - lib/mssqlserver-2000.3.jar, - lib/msutil-2000.3.jar, - lib/mysql-connector-java-5.0.5.jar, - lib/odfdom-0.8.jar, - lib/opencsv-1.8.jar, - lib/org.apache.commons.codec-1.3.0.jar, - lib/poi-3.1-FINAL.jar, - lib/postgresql-8.2-504.jdbc4.jar, - lib/sanselan-0.97-incubator.jar, - lib/saxon9he.jar, - lib/serializer-2.7.0.jar, - lib/servlet-api-2.5.jar, - lib/slf4j-api-1.5.2.jar, - lib/slf4j-log4j12-1.5.2.jar, - lib/spring-modules-cache-0.7.jar, - lib/spring-modules-lucene-0.8a.jar, - lib/wsdl4j-1.6.1.jar, - lib/xalan-2.7.0.jar, - lib/xercesImpl-2.7.1.jar, - lib/xercesImpl.jar, - lib/xml-apis-1.3.04.jar, - lib/xml-apis-ext-1.3.04.jar, - lib/xml-apis.jar, - lib/xml-resolver-1.2.jar, - lib/xmlgraphics-commons-1.3.1.jar, - lib/xom-1.0.jar, - lib/xsltc.jar, - lib/xstream-1.3.1.jar, - lib/yjp-controller-api-redist-8.0.1.jar, - lib/org.springframework.aop-3.0.4.RELEASE.jar, - lib/org.springframework.asm-3.0.4.RELEASE.jar, - lib/org.springframework.aspects-3.0.4.RELEASE.jar, - lib/org.springframework.beans-3.0.4.RELEASE.jar, - lib/org.springframework.context-3.0.4.RELEASE.jar, - lib/org.springframework.context.support-3.0.4.RELEASE.jar, - lib/org.springframework.core-3.0.4.RELEASE.jar, - lib/org.springframework.expression-3.0.4.RELEASE.jar, - lib/org.springframework.jdbc-3.0.4.RELEASE.jar, - lib/org.springframework.orm-3.0.4.RELEASE.jar, - lib/org.springframework.oxm-3.0.4.RELEASE.jar, - lib/org.springframework.transaction-3.0.4.RELEASE.jar, - lib/org.springframework.web-3.0.4.RELEASE.jar, - lib/org.springframework.web.servlet-3.0.4.RELEASE.jar, - lib/spring-security-core-3.0.5.RELEASE.jar, - lib/spring-security-config-3.0.5.RELEASE.jar, - lib/dozer-5.3.0.jar, - lib/google-api-translate-java-0.92.jar, - lib/servlet-2.5.0.jar, - lib/cdmlib-commons-3.0.7-SNAPSHOT.jar, - lib/cdmlib-ext-3.0.7-SNAPSHOT.jar, - lib/cdmlib-io-3.0.7-SNAPSHOT.jar, - lib/cdmlib-model-3.0.7-SNAPSHOT.jar, - lib/cdmlib-persistence-3.0.7-SNAPSHOT.jar, - lib/cdmlib-print-3.0.7-SNAPSHOT.jar, - lib/cdmlib-remote-3.0.7-SNAPSHOT.jar, - lib/cdmlib-services-3.0.7-SNAPSHOT.jar Export-Package: com.google.api, com.google.api.detect, com.google.api.translate, @@ -190,11 +78,6 @@ Export-Package: com.google.api, eu.etaxonomy.cdm.persistence.fetch, eu.etaxonomy.cdm.model.common", eu.etaxonomy.cdm.api.service.config;uses:="eu.etaxonomy.cdm.model.reference,eu.etaxonomy.cdm.model.taxon,eu.etaxonomy.cdm.persistence.query", - eu.etaxonomy.cdm.api.service.config.impl; - uses:="eu.etaxonomy.cdm.api.service.config, - eu.etaxonomy.cdm.model.taxon, - eu.etaxonomy.cdm.model.reference, - eu.etaxonomy.cdm.persistence.query", eu.etaxonomy.cdm.api.service.pager, eu.etaxonomy.cdm.api.service.pager.impl;uses:="eu.etaxonomy.cdm.api.service.pager", eu.etaxonomy.cdm.api.utility;uses:="eu.etaxonomy.cdm.model.taxon,eu.etaxonomy.cdm.model.media,eu.etaxonomy.cdm.model.description", @@ -883,3 +766,135 @@ Bundle-Vendor: EDIT Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.eclipse.osgi, org.eclipse.equinox.common +Bundle-ClassPath: ., + lib/activation-1.1.jar, + lib/antlr-2.7.6.jar, + lib/aopalliance-1.0.jar, + lib/asm-attrs.jar, + lib/asm.jar, + lib/aspectjrt-1.6.3.jar, + lib/aspectjweaver-1.6.3.jar, + lib/avalon-framework-4.2.0.jar, + lib/batik-all-1.7.jar, + lib/c3p0-0.9.1.jar, + lib/cdmlib-commons-3.0.7-SNAPSHOT.jar, + lib/cdmlib-ext-3.0.7-SNAPSHOT.jar, + lib/cdmlib-io-3.0.7-SNAPSHOT.jar, + lib/cdmlib-model-3.0.7-SNAPSHOT.jar, + lib/cdmlib-persistence-3.0.7-SNAPSHOT.jar, + lib/cdmlib-print-3.0.7-SNAPSHOT.jar, + lib/cdmlib-remote-3.0.7-SNAPSHOT.jar, + lib/cdmlib-services-3.0.7-SNAPSHOT.jar, + lib/cglib-2.1.3.jar, + lib/commons-beanutils-1.7.0.jar, + lib/commons-collections-3.2.jar, + lib/commons-dbcp-1.2.2.jar, + lib/commons-io-1.3.1.jar, + lib/commons-io-1.4.jar, + lib/commons-lang-2.4.jar, + lib/commons-logging-1.0.4.jar, + lib/commons-pool-1.3.jar, + lib/dom4j-1.6.1.jar, + lib/dozer-5.3.0-sources.jar, + lib/dozer-5.3.0.jar, + lib/ehcache-1.2.3.jar, + lib/ejb3-persistence.jar, + lib/ezmorph-1.0.4.jar, + lib/fop.jar, + lib/google-api-translate-java-0.92.jar, + lib/h2-1.1.115.jar, + lib/hibernate-annotations-3.4.0-SNAPSHOT.jar, + lib/hibernate-commons-annotations-3.4.0-SNAPSHOT.jar, + lib/hibernate-core-3.4.0-SNAPSHOT.jar, + lib/hibernate-envers-3.4.0-SNAPSHOT.jar, + lib/hibernate-search-3.1.0.GA.jar, + lib/hibernate-tools-3.2.0.ga.jar, + lib/hibernate-validator-4.0.0.CR1.jar, + lib/hsqldb.jar, + lib/httpclient-4.0.1.jar, + lib/httpcore-4.0.1.jar, + lib/javassist.jar, + lib/jaxb-api-2.1.6.jar, + lib/jaxb-impl-2.1.6.jar, + lib/jaxen-1.1.2.jar, + lib/jdbc-1.2.jar, + lib/jdbc2_0-stdext.jar, + lib/jdom.jar, + lib/joda-time-1.5.jar, + lib/joda-time-hibernate-1.0.jar, + lib/json-lib-2.2.3-jdk15.jar, + lib/jsr250-api-1.0.jar, + lib/jta.jar, + lib/jtds-1.2.2.jar, + lib/junit-4.4.jar, + lib/junit-4.8.1-sources.jar, + lib/junit-4.8.1.jar, + lib/log4j-1.2.14.jar, + lib/lsid-client-1.1.2.jar, + lib/lsid-server-1.1.2.jar, + lib/lucene-core-2.4.0.jar, + lib/lucene-spellchecker-2.4.0.jar, + lib/mail-1.4.jar, + lib/msbase-2000.3.jar, + lib/mssqlserver-2000.3.jar, + lib/msutil-2000.3.jar, + lib/mysql-connector-java-5.0.5.jar, + lib/odfdom-0.8.jar, + lib/opencsv-1.8.jar, + lib/org.apache.commons.codec-1.3.0.jar, + lib/org.eclipse.equinox.common-3.6.0.v20100503.jar, + lib/org.eclipse.osgi-3.6.2.R36x_v20110210.jar, + lib/org.springframework.aop-3.0.4.RELEASE-sources.jar, + lib/org.springframework.aop-3.0.4.RELEASE.jar, + lib/org.springframework.asm-3.0.4.RELEASE-sources.jar, + lib/org.springframework.asm-3.0.4.RELEASE.jar, + lib/org.springframework.aspects-3.0.4.RELEASE-sources.jar, + lib/org.springframework.aspects-3.0.4.RELEASE.jar, + lib/org.springframework.beans-3.0.4.RELEASE-sources.jar, + lib/org.springframework.beans-3.0.4.RELEASE.jar, + lib/org.springframework.context-3.0.4.RELEASE-sources.jar, + lib/org.springframework.context-3.0.4.RELEASE.jar, + lib/org.springframework.context.support-3.0.4.RELEASE-sources.jar, + lib/org.springframework.context.support-3.0.4.RELEASE.jar, + lib/org.springframework.core-3.0.4.RELEASE-sources.jar, + lib/org.springframework.core-3.0.4.RELEASE.jar, + lib/org.springframework.expression-3.0.4.RELEASE-sources.jar, + lib/org.springframework.expression-3.0.4.RELEASE.jar, + lib/org.springframework.jdbc-3.0.4.RELEASE-sources.jar, + lib/org.springframework.jdbc-3.0.4.RELEASE.jar, + lib/org.springframework.orm-3.0.4.RELEASE-sources.jar, + lib/org.springframework.orm-3.0.4.RELEASE.jar, + lib/org.springframework.oxm-3.0.4.RELEASE-sources.jar, + lib/org.springframework.oxm-3.0.4.RELEASE.jar, + lib/org.springframework.transaction-3.0.4.RELEASE-sources.jar, + lib/org.springframework.transaction-3.0.4.RELEASE.jar, + lib/org.springframework.web-3.0.4.RELEASE-sources.jar, + lib/org.springframework.web-3.0.4.RELEASE.jar, + lib/org.springframework.web.servlet-3.0.4.RELEASE-sources.jar, + lib/org.springframework.web.servlet-3.0.4.RELEASE.jar, + lib/poi-3.1-FINAL.jar, + lib/postgresql-8.2-504.jdbc4.jar, + lib/sanselan-0.97-incubator.jar, + lib/saxon9he.jar, + lib/serializer-2.7.0.jar, + lib/servlet-2.5.0.jar, + lib/servlet-api-2.5.jar, + lib/slf4j-api-1.5.2.jar, + lib/slf4j-log4j12-1.5.2.jar, + lib/spring-modules-cache-0.7.jar, + lib/spring-modules-lucene-0.8a.jar, + lib/spring-security-config-3.0.5.RELEASE.jar, + lib/spring-security-core-3.0.5.RELEASE.jar, + lib/wsdl4j-1.6.1.jar, + lib/xalan-2.7.0.jar, + lib/xercesImpl-2.7.1.jar, + lib/xercesImpl.jar, + lib/xml-apis-1.3.04.jar, + lib/xml-apis-ext-1.3.04.jar, + lib/xml-apis.jar, + lib/xml-resolver-1.2.jar, + lib/xmlgraphics-commons-1.3.1.jar, + lib/xom-1.0.jar, + lib/xsltc.jar, + lib/xstream-1.3.1.jar, + lib/yjp-controller-api-redist-8.0.1.jar diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties index 50c031a3c..2aac1960f 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/build.properties +++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties @@ -12,7 +12,125 @@ bin.includes = META-INF/,\ lib/cdmlib-persistence-3.0.7-SNAPSHOT.jar,\ lib/cdmlib-print-3.0.7-SNAPSHOT.jar,\ lib/cdmlib-remote-3.0.7-SNAPSHOT.jar,\ - lib/cdmlib-services-3.0.7-SNAPSHOT.jar + lib/cdmlib-services-3.0.7-SNAPSHOT.jar,\ + lib/activation-1.1.jar,\ + lib/antlr-2.7.6.jar,\ + lib/aopalliance-1.0.jar,\ + lib/asm-attrs.jar,\ + lib/asm.jar,\ + lib/aspectjrt-1.6.3.jar,\ + lib/aspectjweaver-1.6.3.jar,\ + lib/avalon-framework-4.2.0.jar,\ + lib/batik-all-1.7.jar,\ + lib/c3p0-0.9.1.jar,\ + lib/cglib-2.1.3.jar,\ + lib/commons-beanutils-1.7.0.jar,\ + lib/commons-collections-3.2.jar,\ + lib/commons-dbcp-1.2.2.jar,\ + lib/commons-io-1.3.1.jar,\ + lib/commons-io-1.4.jar,\ + lib/commons-lang-2.4.jar,\ + lib/commons-logging-1.0.4.jar,\ + lib/commons-pool-1.3.jar,\ + lib/dom4j-1.6.1.jar,\ + lib/dozer-5.3.0-sources.jar,\ + lib/dozer-5.3.0.jar,\ + lib/ehcache-1.2.3.jar,\ + lib/ejb3-persistence.jar,\ + lib/ezmorph-1.0.4.jar,\ + lib/fop.jar,\ + lib/google-api-translate-java-0.92.jar,\ + lib/h2-1.1.115.jar,\ + lib/hibernate-annotations-3.4.0-SNAPSHOT.jar,\ + lib/hibernate-commons-annotations-3.4.0-SNAPSHOT.jar,\ + lib/hibernate-core-3.4.0-SNAPSHOT.jar,\ + lib/hibernate-envers-3.4.0-SNAPSHOT.jar,\ + lib/hibernate-search-3.1.0.GA.jar,\ + lib/hibernate-tools-3.2.0.ga.jar,\ + lib/hibernate-validator-4.0.0.CR1.jar,\ + lib/hsqldb.jar,\ + lib/httpclient-4.0.1.jar,\ + lib/httpcore-4.0.1.jar,\ + lib/javassist.jar,\ + lib/jaxb-api-2.1.6.jar,\ + lib/jaxb-impl-2.1.6.jar,\ + lib/jaxen-1.1.2.jar,\ + lib/jdbc-1.2.jar,\ + lib/jdbc2_0-stdext.jar,\ + lib/jdom.jar,\ + lib/joda-time-1.5.jar,\ + lib/joda-time-hibernate-1.0.jar,\ + lib/json-lib-2.2.3-jdk15.jar,\ + lib/jsr250-api-1.0.jar,\ + lib/jta.jar,\ + lib/jtds-1.2.2.jar,\ + lib/junit-4.4.jar,\ + lib/junit-4.8.1-sources.jar,\ + lib/log4j-1.2.14.jar,\ + lib/lsid-client-1.1.2.jar,\ + lib/lsid-server-1.1.2.jar,\ + lib/lucene-core-2.4.0.jar,\ + lib/lucene-spellchecker-2.4.0.jar,\ + lib/mail-1.4.jar,\ + lib/msbase-2000.3.jar,\ + lib/mssqlserver-2000.3.jar,\ + lib/msutil-2000.3.jar,\ + lib/odfdom-0.8.jar,\ + lib/opencsv-1.8.jar,\ + lib/org.apache.commons.codec-1.3.0.jar,\ + lib/org.eclipse.equinox.common-3.6.0.v20100503.jar,\ + lib/org.eclipse.osgi-3.6.2.R36x_v20110210.jar,\ + lib/org.springframework.aop-3.0.4.RELEASE-sources.jar,\ + lib/org.springframework.aop-3.0.4.RELEASE.jar,\ + lib/org.springframework.asm-3.0.4.RELEASE-sources.jar,\ + lib/org.springframework.asm-3.0.4.RELEASE.jar,\ + lib/org.springframework.aspects-3.0.4.RELEASE-sources.jar,\ + lib/org.springframework.aspects-3.0.4.RELEASE.jar,\ + lib/org.springframework.beans-3.0.4.RELEASE-sources.jar,\ + lib/org.springframework.beans-3.0.4.RELEASE.jar,\ + lib/org.springframework.context-3.0.4.RELEASE-sources.jar,\ + lib/org.springframework.context-3.0.4.RELEASE.jar,\ + lib/org.springframework.context.support-3.0.4.RELEASE-sources.jar,\ + lib/org.springframework.context.support-3.0.4.RELEASE.jar,\ + lib/org.springframework.core-3.0.4.RELEASE-sources.jar,\ + lib/org.springframework.core-3.0.4.RELEASE.jar,\ + lib/org.springframework.expression-3.0.4.RELEASE-sources.jar,\ + lib/org.springframework.expression-3.0.4.RELEASE.jar,\ + lib/org.springframework.jdbc-3.0.4.RELEASE-sources.jar,\ + lib/org.springframework.jdbc-3.0.4.RELEASE.jar,\ + lib/org.springframework.orm-3.0.4.RELEASE-sources.jar,\ + lib/org.springframework.orm-3.0.4.RELEASE.jar,\ + lib/org.springframework.oxm-3.0.4.RELEASE-sources.jar,\ + lib/org.springframework.oxm-3.0.4.RELEASE.jar,\ + lib/org.springframework.transaction-3.0.4.RELEASE-sources.jar,\ + lib/org.springframework.transaction-3.0.4.RELEASE.jar,\ + lib/org.springframework.web-3.0.4.RELEASE-sources.jar,\ + lib/org.springframework.web-3.0.4.RELEASE.jar,\ + lib/org.springframework.web.servlet-3.0.4.RELEASE-sources.jar,\ + lib/org.springframework.web.servlet-3.0.4.RELEASE.jar,\ + lib/poi-3.1-FINAL.jar,\ + lib/postgresql-8.2-504.jdbc4.jar,\ + lib/sanselan-0.97-incubator.jar,\ + lib/saxon9he.jar,\ + lib/serializer-2.7.0.jar,\ + lib/servlet-api-2.5.jar,\ + lib/slf4j-api-1.5.2.jar,\ + lib/slf4j-log4j12-1.5.2.jar,\ + lib/spring-modules-cache-0.7.jar,\ + lib/spring-modules-lucene-0.8a.jar,\ + lib/wsdl4j-1.6.1.jar,\ + lib/xalan-2.7.0.jar,\ + lib/xercesImpl-2.7.1.jar,\ + lib/xercesImpl.jar,\ + lib/xml-apis-1.3.04.jar,\ + lib/xml-apis-ext-1.3.04.jar,\ + lib/xml-apis.jar,\ + lib/xml-resolver-1.2.jar,\ + lib/xmlgraphics-commons-1.3.1.jar,\ + lib/xom-1.0.jar,\ + lib/xsltc.jar,\ + lib/xstream-1.3.1.jar,\ + lib/yjp-controller-api-redist-8.0.1.jar jars.compile.order = cdmLibrary.jar src.includes = lib/ jre.compilation.profile = J2SE-1.6 diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-core-3.0.0.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-core-3.0.0.RELEASE.jar deleted file mode 100644 index ae7910505..000000000 Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-core-3.0.0.RELEASE.jar and /dev/null differ diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-core-3.0.0.RELEASEsrc.zip b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-core-3.0.0.RELEASEsrc.zip deleted file mode 100644 index 577cb68f7..000000000 Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-core-3.0.0.RELEASEsrc.zip and /dev/null differ diff --git a/eu.etaxonomy.taxeditor.cdmlib/pom.xml b/eu.etaxonomy.taxeditor.cdmlib/pom.xml index a92ce31a8..58a76073b 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml +++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml @@ -1,75 +1,55 @@ - + eu.etaxonomy taxeditor-parent 3.0.6-SNAPSHOT 4.0.0 - eu.etaxonomy eu.etaxonomy.taxeditor.cdmlib eclipse-plugin - 3.0.6-SNAPSHOT - CDM Library Dependencies Plugin CDM Library and dependencies as a plugin - org.apache.maven.plugins - maven-jar-plugin + maven-dependency-plugin + 2.3 + + + copy-dependencies + validate + + copy-dependencies + + + junit,log4j,unitils + lib + true + true + true + + + + - - org.eclipse.tycho - tycho-packaging-plugin - ${tycho.version} - - - false - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-dependencies - validate - - copy-dependencies - - - junit,log4j,unitils - lib - true - true - true - - - - - - - - + + eu.etaxonomy @@ -112,4 +92,4 @@ ${cdmlib.version} - \ No newline at end of file + diff --git a/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF index cfa5fcb99..a8ff4092a 100644 --- a/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF @@ -1,32 +1,18 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: %Bundle-Name.0 +Bundle-Name: Editor Bundle Bundle-SymbolicName: eu.etaxonomy.taxeditor.editor;singleton:=true Bundle-Version: 3.0.6.qualifier -Bundle-ClassPath: .,icons/ Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin Export-Package: eu.etaxonomy.taxeditor.editor, - eu.etaxonomy.taxeditor.editor.descriptiontree, - eu.etaxonomy.taxeditor.editor.descriptiontree.detailpage, - eu.etaxonomy.taxeditor.editor.descriptiontree.handler, eu.etaxonomy.taxeditor.editor.handler, eu.etaxonomy.taxeditor.editor.internal, eu.etaxonomy.taxeditor.editor.name, eu.etaxonomy.taxeditor.editor.name.handler, - eu.etaxonomy.taxeditor.editor.reference, eu.etaxonomy.taxeditor.editor.view.descriptive, - eu.etaxonomy.taxeditor.editor.view.media, - eu.etaxonomy.taxeditor.forms.internal, - eu.etaxonomy.taxeditor.propertysheet, - eu.etaxonomy.taxeditor.propertysheet.authors, - eu.etaxonomy.taxeditor.propertysheet.name, - eu.etaxonomy.taxeditor.propertysheet.namerelations.wizard, - eu.etaxonomy.taxeditor.propertysheet.reference, - eu.etaxonomy.taxeditor.propertysheet.tabbed, - eu.etaxonomy.taxeditor.propertysheet.type, - eu.etaxonomy.taxeditor.propertysheet.type.wizard + eu.etaxonomy.taxeditor.editor.view.media Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.core.expressions, @@ -53,3 +39,138 @@ Import-Package: org.eclipse.core.databinding.beans, org.eclipse.zest.core.viewers, org.eclipse.zest.layouts, org.osgi.framework +Bundle-ClassPath: ., + activation-1.1.jar, + antlr-2.7.6.jar, + aopalliance-1.0.jar, + asm-attrs.jar, + asm.jar, + aspectjrt-1.6.3.jar, + aspectjweaver-1.6.3.jar, + avalon-framework-4.2.0.jar, + batik-all-1.7.jar, + c3p0-0.9.1.jar, + cdmlib-commons-3.0.7-SNAPSHOT.jar, + cdmlib-ext-3.0.7-SNAPSHOT.jar, + cdmlib-io-3.0.7-SNAPSHOT.jar, + cdmlib-model-3.0.7-SNAPSHOT.jar, + cdmlib-persistence-3.0.7-SNAPSHOT.jar, + cdmlib-print-3.0.7-SNAPSHOT.jar, + cdmlib-remote-3.0.7-SNAPSHOT.jar, + cglib-2.1.3.jar, + commons-beanutils-1.7.0.jar, + commons-collections-3.2.jar, + commons-dbcp-1.2.2.jar, + commons-io-1.3.1.jar, + commons-logging-1.0.4.jar, + commons-pool-1.3.jar, + dom4j-1.6.1.jar, + dozer-5.3.0-sources.jar, + dozer-5.3.0.jar, + ehcache-1.2.3.jar, + ejb3-persistence.jar, + ezmorph-1.0.4.jar, + fop.jar, + google-api-translate-java-0.92.jar, + hibernate-annotations-3.4.0-SNAPSHOT.jar, + hibernate-commons-annotations-3.4.0-SNAPSHOT.jar, + hibernate-core-3.4.0-SNAPSHOT.jar, + hibernate-envers-3.4.0-SNAPSHOT.jar, + hibernate-search-3.1.0.GA.jar, + hibernate-tools-3.2.0.ga.jar, + hibernate-validator-4.0.0.CR1.jar, + hsqldb.jar, + httpclient-4.0.1.jar, + httpcore-4.0.1.jar, + javassist.jar, + jaxb-api-2.1.6.jar, + jaxb-impl-2.1.6.jar, + jaxen-1.1.2.jar, + jdbc-1.2.jar, + jdbc2_0-stdext.jar, + jdom.jar, + joda-time-1.5.jar, + joda-time-hibernate-1.0.jar, + json-lib-2.2.3-jdk15.jar, + jsr250-api-1.0.jar, + jta.jar, + jtds-1.2.2.jar, + junit-4.4.jar, + junit-4.8.1-sources.jar, + junit-4.8.1.jar, + log4j-1.2.14.jar, + lsid-client-1.1.2.jar, + lsid-server-1.1.2.jar, + lucene-core-2.4.0.jar, + lucene-spellchecker-2.4.0.jar, + mail-1.4.jar, + msbase-2000.3.jar, + mssqlserver-2000.3.jar, + msutil-2000.3.jar, + mysql-connector-java-5.0.5.jar, + odfdom-0.8.jar, + opencsv-1.8.jar, + org.springframework.aop-3.0.4.RELEASE-sources.jar, + org.springframework.asm-3.0.4.RELEASE-sources.jar, + org.springframework.aspects-3.0.4.RELEASE-sources.jar, + org.springframework.beans-3.0.4.RELEASE-sources.jar, + org.springframework.context-3.0.4.RELEASE-sources.jar, + org.springframework.context.support-3.0.4.RELEASE-sources.jar, + org.springframework.core-3.0.4.RELEASE-sources.jar, + org.springframework.expression-3.0.4.RELEASE-sources.jar, + org.springframework.jdbc-3.0.4.RELEASE-sources.jar, + org.springframework.orm-3.0.4.RELEASE-sources.jar, + org.springframework.oxm-3.0.4.RELEASE-sources.jar, + org.springframework.transaction-3.0.4.RELEASE-sources.jar, + org.springframework.web-3.0.4.RELEASE-sources.jar, + org.springframework.web.servlet-3.0.4.RELEASE-sources.jar, + poi-3.1-FINAL.jar, + postgresql-8.2-504.jdbc4.jar, + saxon9he.jar, + serializer-2.7.0.jar, + servlet-api-2.5.jar, + spring-modules-cache-0.7.jar, + spring-modules-lucene-0.8a.jar, + wsdl4j-1.6.1.jar, + xalan-2.7.0.jar, + xercesImpl-2.7.1.jar, + xercesImpl.jar, + xml-apis-1.3.04.jar, + xml-apis-ext-1.3.04.jar, + xml-apis.jar, + xml-resolver-1.2.jar, + xmlgraphics-commons-1.3.1.jar, + xom-1.0.jar, + xsltc.jar, + xstream-1.3.1.jar, + yjp-controller-api-redist-8.0.1.jar, + ant-antlr.jar, + ant-apache-bcel.jar, + ant-apache-bsf.jar, + ant-apache-log4j.jar, + ant-apache-oro.jar, + ant-apache-regexp.jar, + ant-apache-resolver.jar, + ant-commons-logging.jar, + ant-commons-net.jar, + ant-jai.jar, + ant-javamail.jar, + ant-jdepend.jar, + ant-jmf.jar, + ant-jsch.jar, + ant-junit.jar, + ant-launcher.jar, + ant-netrexx.jar, + ant-nodeps.jar, + ant-starteam.jar, + ant-stylebook.jar, + ant-swing.jar, + ant-trax.jar, + ant-weblogic.jar, + ant.jar, + runtime_registry_compatibility.jar, + jdi.jar, + jdimodel.jar, + pdebuild.jar, + compatibility.jar, + junit.jar diff --git a/eu.etaxonomy.taxeditor.editor/pom.xml b/eu.etaxonomy.taxeditor.editor/pom.xml index f5adc6407..0564aa001 100644 --- a/eu.etaxonomy.taxeditor.editor/pom.xml +++ b/eu.etaxonomy.taxeditor.editor/pom.xml @@ -8,31 +8,11 @@ 4.0.0 - eu.etaxonomy eu.etaxonomy.taxeditor.editor eclipse-plugin - 3.0.6-SNAPSHOT Editor Bundle http://dev.e-taxonomy.eu/trac/wiki/TaxonomicEditorEditorBundle - - - - org.apache.maven.plugins - maven-jar-plugin - - - org.eclipse.tycho - tycho-packaging-plugin - ${tycho.version} - - - false - - - - - diff --git a/eu.etaxonomy.taxeditor.feature.platform/pom.xml b/eu.etaxonomy.taxeditor.feature.platform/pom.xml index 0e2e99d56..71986241d 100644 --- a/eu.etaxonomy.taxeditor.feature.platform/pom.xml +++ b/eu.etaxonomy.taxeditor.feature.platform/pom.xml @@ -1,15 +1,15 @@ - - - eu.etaxonomy - taxeditor-parent - 3.0.6-SNAPSHOT - - - 4.0.0 - eu.etaxonomy - eu.etaxonomy.taxeditor.feature.platform - 3.0.6-SNAPSHOT - eclipse-feature + + + eu.etaxonomy + taxeditor-parent + 3.0.6-SNAPSHOT + + 4.0.0 + eu.etaxonomy.taxeditor.feature.platform + eclipse-feature + + Taxonomic Editor Platform Dependencies + + http://dev.e-taxonomy.eu/trac/wiki/TaxonomicEditorEditorBundle diff --git a/eu.etaxonomy.taxeditor.feature/pom.xml b/eu.etaxonomy.taxeditor.feature/pom.xml index bee55492b..9a63166a8 100644 --- a/eu.etaxonomy.taxeditor.feature/pom.xml +++ b/eu.etaxonomy.taxeditor.feature/pom.xml @@ -1,15 +1,15 @@ - - - eu.etaxonomy - taxeditor-parent - 3.0.6-SNAPSHOT - - - 4.0.0 - eu.etaxonomy - eu.etaxonomy.taxeditor.feature - 3.0.6-SNAPSHOT - eclipse-feature + + + eu.etaxonomy + taxeditor-parent + 3.0.6-SNAPSHOT + + 4.0.0 + eu.etaxonomy.taxeditor.feature + eclipse-feature + + Taxonomic Editor Feature + + http://dev.e-taxonomy.eu/trac/wiki/TaxonomicEditorEditorBundle diff --git a/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF index 96f67a4ca..38f8b6fcf 100644 --- a/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF @@ -1,17 +1,15 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: EDIT Taxonomic Editor - Navigation Bundle +Bundle-Name: Navigation Bundle Bundle-SymbolicName: eu.etaxonomy.taxeditor.navigation;singleton:=true Bundle-Version: 3.0.6.qualifier Bundle-Vendor: EDIT Export-Package: eu.etaxonomy.cdm, eu.etaxonomy.taxeditor.navigation, - eu.etaxonomy.taxeditor.navigation.handler, eu.etaxonomy.taxeditor.navigation.internal, eu.etaxonomy.taxeditor.navigation.key.polytomous, eu.etaxonomy.taxeditor.navigation.navigator, - eu.etaxonomy.taxeditor.navigation.search, - eu.etaxonomy.taxeditor.wizard + eu.etaxonomy.taxeditor.navigation.search Require-Bundle: org.eclipse.ui, org.eclipse.ui.navigator, org.eclipse.ui.navigator.resources, @@ -28,3 +26,138 @@ Import-Package: org.eclipse.core.resources, org.osgi.framework Bundle-Activator: eu.etaxonomy.taxeditor.navigation.internal.TaxeditorNavigationPlugin Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-ClassPath: ., + activation-1.1.jar, + antlr-2.7.6.jar, + aopalliance-1.0.jar, + asm-attrs.jar, + asm.jar, + aspectjrt-1.6.3.jar, + aspectjweaver-1.6.3.jar, + avalon-framework-4.2.0.jar, + batik-all-1.7.jar, + c3p0-0.9.1.jar, + cdmlib-commons-3.0.7-SNAPSHOT.jar, + cdmlib-ext-3.0.7-SNAPSHOT.jar, + cdmlib-io-3.0.7-SNAPSHOT.jar, + cdmlib-model-3.0.7-SNAPSHOT.jar, + cdmlib-persistence-3.0.7-SNAPSHOT.jar, + cdmlib-print-3.0.7-SNAPSHOT.jar, + cdmlib-remote-3.0.7-SNAPSHOT.jar, + cglib-2.1.3.jar, + commons-beanutils-1.7.0.jar, + commons-collections-3.2.jar, + commons-dbcp-1.2.2.jar, + commons-io-1.3.1.jar, + commons-logging-1.0.4.jar, + commons-pool-1.3.jar, + dom4j-1.6.1.jar, + dozer-5.3.0-sources.jar, + dozer-5.3.0.jar, + ehcache-1.2.3.jar, + ejb3-persistence.jar, + ezmorph-1.0.4.jar, + fop.jar, + google-api-translate-java-0.92.jar, + hibernate-annotations-3.4.0-SNAPSHOT.jar, + hibernate-commons-annotations-3.4.0-SNAPSHOT.jar, + hibernate-core-3.4.0-SNAPSHOT.jar, + hibernate-envers-3.4.0-SNAPSHOT.jar, + hibernate-search-3.1.0.GA.jar, + hibernate-tools-3.2.0.ga.jar, + hibernate-validator-4.0.0.CR1.jar, + hsqldb.jar, + httpclient-4.0.1.jar, + httpcore-4.0.1.jar, + javassist.jar, + jaxb-api-2.1.6.jar, + jaxb-impl-2.1.6.jar, + jaxen-1.1.2.jar, + jdbc-1.2.jar, + jdbc2_0-stdext.jar, + jdom.jar, + joda-time-1.5.jar, + joda-time-hibernate-1.0.jar, + json-lib-2.2.3-jdk15.jar, + jsr250-api-1.0.jar, + jta.jar, + jtds-1.2.2.jar, + junit-4.4.jar, + junit-4.8.1-sources.jar, + junit-4.8.1.jar, + log4j-1.2.14.jar, + lsid-client-1.1.2.jar, + lsid-server-1.1.2.jar, + lucene-core-2.4.0.jar, + lucene-spellchecker-2.4.0.jar, + mail-1.4.jar, + msbase-2000.3.jar, + mssqlserver-2000.3.jar, + msutil-2000.3.jar, + mysql-connector-java-5.0.5.jar, + odfdom-0.8.jar, + opencsv-1.8.jar, + org.springframework.aop-3.0.4.RELEASE-sources.jar, + org.springframework.asm-3.0.4.RELEASE-sources.jar, + org.springframework.aspects-3.0.4.RELEASE-sources.jar, + org.springframework.beans-3.0.4.RELEASE-sources.jar, + org.springframework.context-3.0.4.RELEASE-sources.jar, + org.springframework.context.support-3.0.4.RELEASE-sources.jar, + org.springframework.core-3.0.4.RELEASE-sources.jar, + org.springframework.expression-3.0.4.RELEASE-sources.jar, + org.springframework.jdbc-3.0.4.RELEASE-sources.jar, + org.springframework.orm-3.0.4.RELEASE-sources.jar, + org.springframework.oxm-3.0.4.RELEASE-sources.jar, + org.springframework.transaction-3.0.4.RELEASE-sources.jar, + org.springframework.web-3.0.4.RELEASE-sources.jar, + org.springframework.web.servlet-3.0.4.RELEASE-sources.jar, + poi-3.1-FINAL.jar, + postgresql-8.2-504.jdbc4.jar, + saxon9he.jar, + serializer-2.7.0.jar, + servlet-api-2.5.jar, + spring-modules-cache-0.7.jar, + spring-modules-lucene-0.8a.jar, + wsdl4j-1.6.1.jar, + xalan-2.7.0.jar, + xercesImpl-2.7.1.jar, + xercesImpl.jar, + xml-apis-1.3.04.jar, + xml-apis-ext-1.3.04.jar, + xml-apis.jar, + xml-resolver-1.2.jar, + xmlgraphics-commons-1.3.1.jar, + xom-1.0.jar, + xsltc.jar, + xstream-1.3.1.jar, + yjp-controller-api-redist-8.0.1.jar, + ant-antlr.jar, + ant-apache-bcel.jar, + ant-apache-bsf.jar, + ant-apache-log4j.jar, + ant-apache-oro.jar, + ant-apache-regexp.jar, + ant-apache-resolver.jar, + ant-commons-logging.jar, + ant-commons-net.jar, + ant-jai.jar, + ant-javamail.jar, + ant-jdepend.jar, + ant-jmf.jar, + ant-jsch.jar, + ant-junit.jar, + ant-launcher.jar, + ant-netrexx.jar, + ant-nodeps.jar, + ant-starteam.jar, + ant-stylebook.jar, + ant-swing.jar, + ant-trax.jar, + ant-weblogic.jar, + ant.jar, + runtime_registry_compatibility.jar, + jdi.jar, + jdimodel.jar, + pdebuild.jar, + compatibility.jar, + junit.jar diff --git a/eu.etaxonomy.taxeditor.navigation/pom.xml b/eu.etaxonomy.taxeditor.navigation/pom.xml index e03aa9535..fee80f1b0 100644 --- a/eu.etaxonomy.taxeditor.navigation/pom.xml +++ b/eu.etaxonomy.taxeditor.navigation/pom.xml @@ -8,34 +8,13 @@ 4.0.0 - eu.etaxonomy eu.etaxonomy.taxeditor.navigation eclipse-plugin - 3.0.6-SNAPSHOT Navigation Bundle Provides navigational views such as the Taxonomic Tree or Search Views http://dev.e-taxonomy.eu/trac/wiki/TaxonomicEditorNavigationBundle - - - - org.apache.maven.plugins - maven-jar-plugin - - - org.eclipse.tycho - tycho-packaging-plugin - ${tycho.version} - - - false - - - - - - diff --git a/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF index fbe3c5877..324dc2b19 100644 --- a/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: EDIT Taxonomic Editor - Print Publisher Bundle +Bundle-Name: Printpublisher Bundle Bundle-SymbolicName: eu.etaxonomy.taxeditor.printpublisher;singleton:=true Bundle-Version: 3.0.6.qualifier Require-Bundle: org.eclipse.osgi, @@ -16,3 +16,138 @@ Bundle-ActivationPolicy: lazy Bundle-Vendor: EDIT Bundle-Activator: eu.etaxonomy.taxeditor.printpublisher.internal.PrintpublisherPlugin Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-ClassPath: ., + activation-1.1.jar, + antlr-2.7.6.jar, + aopalliance-1.0.jar, + asm-attrs.jar, + asm.jar, + aspectjrt-1.6.3.jar, + aspectjweaver-1.6.3.jar, + avalon-framework-4.2.0.jar, + batik-all-1.7.jar, + c3p0-0.9.1.jar, + cdmlib-commons-3.0.7-SNAPSHOT.jar, + cdmlib-ext-3.0.7-SNAPSHOT.jar, + cdmlib-io-3.0.7-SNAPSHOT.jar, + cdmlib-model-3.0.7-SNAPSHOT.jar, + cdmlib-persistence-3.0.7-SNAPSHOT.jar, + cdmlib-print-3.0.7-SNAPSHOT.jar, + cdmlib-remote-3.0.7-SNAPSHOT.jar, + cglib-2.1.3.jar, + commons-beanutils-1.7.0.jar, + commons-collections-3.2.jar, + commons-dbcp-1.2.2.jar, + commons-io-1.3.1.jar, + commons-logging-1.0.4.jar, + commons-pool-1.3.jar, + dom4j-1.6.1.jar, + dozer-5.3.0-sources.jar, + dozer-5.3.0.jar, + ehcache-1.2.3.jar, + ejb3-persistence.jar, + ezmorph-1.0.4.jar, + fop.jar, + google-api-translate-java-0.92.jar, + hibernate-annotations-3.4.0-SNAPSHOT.jar, + hibernate-commons-annotations-3.4.0-SNAPSHOT.jar, + hibernate-core-3.4.0-SNAPSHOT.jar, + hibernate-envers-3.4.0-SNAPSHOT.jar, + hibernate-search-3.1.0.GA.jar, + hibernate-tools-3.2.0.ga.jar, + hibernate-validator-4.0.0.CR1.jar, + hsqldb.jar, + httpclient-4.0.1.jar, + httpcore-4.0.1.jar, + javassist.jar, + jaxb-api-2.1.6.jar, + jaxb-impl-2.1.6.jar, + jaxen-1.1.2.jar, + jdbc-1.2.jar, + jdbc2_0-stdext.jar, + jdom.jar, + joda-time-1.5.jar, + joda-time-hibernate-1.0.jar, + json-lib-2.2.3-jdk15.jar, + jsr250-api-1.0.jar, + jta.jar, + jtds-1.2.2.jar, + junit-4.4.jar, + junit-4.8.1-sources.jar, + junit-4.8.1.jar, + log4j-1.2.14.jar, + lsid-client-1.1.2.jar, + lsid-server-1.1.2.jar, + lucene-core-2.4.0.jar, + lucene-spellchecker-2.4.0.jar, + mail-1.4.jar, + msbase-2000.3.jar, + mssqlserver-2000.3.jar, + msutil-2000.3.jar, + mysql-connector-java-5.0.5.jar, + odfdom-0.8.jar, + opencsv-1.8.jar, + org.springframework.aop-3.0.4.RELEASE-sources.jar, + org.springframework.asm-3.0.4.RELEASE-sources.jar, + org.springframework.aspects-3.0.4.RELEASE-sources.jar, + org.springframework.beans-3.0.4.RELEASE-sources.jar, + org.springframework.context-3.0.4.RELEASE-sources.jar, + org.springframework.context.support-3.0.4.RELEASE-sources.jar, + org.springframework.core-3.0.4.RELEASE-sources.jar, + org.springframework.expression-3.0.4.RELEASE-sources.jar, + org.springframework.jdbc-3.0.4.RELEASE-sources.jar, + org.springframework.orm-3.0.4.RELEASE-sources.jar, + org.springframework.oxm-3.0.4.RELEASE-sources.jar, + org.springframework.transaction-3.0.4.RELEASE-sources.jar, + org.springframework.web-3.0.4.RELEASE-sources.jar, + org.springframework.web.servlet-3.0.4.RELEASE-sources.jar, + poi-3.1-FINAL.jar, + postgresql-8.2-504.jdbc4.jar, + saxon9he.jar, + serializer-2.7.0.jar, + servlet-api-2.5.jar, + spring-modules-cache-0.7.jar, + spring-modules-lucene-0.8a.jar, + wsdl4j-1.6.1.jar, + xalan-2.7.0.jar, + xercesImpl-2.7.1.jar, + xercesImpl.jar, + xml-apis-1.3.04.jar, + xml-apis-ext-1.3.04.jar, + xml-apis.jar, + xml-resolver-1.2.jar, + xmlgraphics-commons-1.3.1.jar, + xom-1.0.jar, + xsltc.jar, + xstream-1.3.1.jar, + yjp-controller-api-redist-8.0.1.jar, + ant-antlr.jar, + ant-apache-bcel.jar, + ant-apache-bsf.jar, + ant-apache-log4j.jar, + ant-apache-oro.jar, + ant-apache-regexp.jar, + ant-apache-resolver.jar, + ant-commons-logging.jar, + ant-commons-net.jar, + ant-jai.jar, + ant-javamail.jar, + ant-jdepend.jar, + ant-jmf.jar, + ant-jsch.jar, + ant-junit.jar, + ant-launcher.jar, + ant-netrexx.jar, + ant-nodeps.jar, + ant-starteam.jar, + ant-stylebook.jar, + ant-swing.jar, + ant-trax.jar, + ant-weblogic.jar, + ant.jar, + runtime_registry_compatibility.jar, + jdi.jar, + jdimodel.jar, + pdebuild.jar, + compatibility.jar, + junit.jar diff --git a/eu.etaxonomy.taxeditor.printpublisher/pom.xml b/eu.etaxonomy.taxeditor.printpublisher/pom.xml index ff6ef481c..7f57480d7 100644 --- a/eu.etaxonomy.taxeditor.printpublisher/pom.xml +++ b/eu.etaxonomy.taxeditor.printpublisher/pom.xml @@ -11,28 +11,9 @@ eu.etaxonomy eu.etaxonomy.taxeditor.printpublisher eclipse-plugin - 3.0.6-SNAPSHOT Printpublisher Bundle http://wp5.e-taxonomy.eu/printpublisher - - - - org.apache.maven.plugins - maven-jar-plugin - - - org.eclipse.tycho - tycho-packaging-plugin - ${tycho.version} - - - false - - - - - diff --git a/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF index 199ab0391..237488355 100644 --- a/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF @@ -1,28 +1,21 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: EDIT Taxonomic Editor - DataStore Bundle +Bundle-Name: DataStore Bundle Bundle-SymbolicName: eu.etaxonomy.taxeditor.store;singleton:=true Bundle-Version: 3.0.6.qualifier Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin Bundle-Vendor: EDIT -Export-Package: dbscripts, - eu.etaxonomy.cdm, +Export-Package: eu.etaxonomy.cdm, eu.etaxonomy.cdm.database, - eu.etaxonomy.taxeditor.account.user.handler, - eu.etaxonomy.taxeditor.account.user.wizard, eu.etaxonomy.taxeditor.datasource, eu.etaxonomy.taxeditor.datasource.wizard, - eu.etaxonomy.taxeditor.ext.service.wizard, eu.etaxonomy.taxeditor.featuretree, - eu.etaxonomy.taxeditor.forms.section, - eu.etaxonomy.taxeditor.forms.section.reference, eu.etaxonomy.taxeditor.handler, eu.etaxonomy.taxeditor.io, eu.etaxonomy.taxeditor.io.wizard, eu.etaxonomy.taxeditor.labels, eu.etaxonomy.taxeditor.model;uses:="eu.etaxonomy.cdm.model.common,eu.etaxonomy.cdm.model.name,eu.etaxonomy.cdm.model.taxon", eu.etaxonomy.taxeditor.newWizard, - eu.etaxonomy.taxeditor.newWizards, eu.etaxonomy.taxeditor.operation, eu.etaxonomy.taxeditor.parser, eu.etaxonomy.taxeditor.preference, @@ -52,8 +45,7 @@ Export-Package: dbscripts, eu.etaxonomy.taxeditor.view.datasource, eu.etaxonomy.taxeditor.view.datasource.handler, eu.etaxonomy.taxeditor.view.detail, - eu.etaxonomy.taxeditor.view.supplementaldata, - eu.etaxonomy.taxeditor.view.user + eu.etaxonomy.taxeditor.view.supplementaldata Require-Bundle: org.eclipse.osgi, org.eclipse.ui, org.eclipse.jface.text, @@ -80,3 +72,138 @@ Import-Package: org.eclipse.core.commands, org.osgi.framework Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-ClassPath: ., + activation-1.1.jar, + antlr-2.7.6.jar, + aopalliance-1.0.jar, + asm-attrs.jar, + asm.jar, + aspectjrt-1.6.3.jar, + aspectjweaver-1.6.3.jar, + avalon-framework-4.2.0.jar, + batik-all-1.7.jar, + c3p0-0.9.1.jar, + cdmlib-commons-3.0.7-SNAPSHOT.jar, + cdmlib-ext-3.0.7-SNAPSHOT.jar, + cdmlib-io-3.0.7-SNAPSHOT.jar, + cdmlib-model-3.0.7-SNAPSHOT.jar, + cdmlib-persistence-3.0.7-SNAPSHOT.jar, + cdmlib-print-3.0.7-SNAPSHOT.jar, + cdmlib-remote-3.0.7-SNAPSHOT.jar, + cglib-2.1.3.jar, + commons-beanutils-1.7.0.jar, + commons-collections-3.2.jar, + commons-dbcp-1.2.2.jar, + commons-io-1.3.1.jar, + commons-logging-1.0.4.jar, + commons-pool-1.3.jar, + dom4j-1.6.1.jar, + dozer-5.3.0-sources.jar, + dozer-5.3.0.jar, + ehcache-1.2.3.jar, + ejb3-persistence.jar, + ezmorph-1.0.4.jar, + fop.jar, + google-api-translate-java-0.92.jar, + hibernate-annotations-3.4.0-SNAPSHOT.jar, + hibernate-commons-annotations-3.4.0-SNAPSHOT.jar, + hibernate-core-3.4.0-SNAPSHOT.jar, + hibernate-envers-3.4.0-SNAPSHOT.jar, + hibernate-search-3.1.0.GA.jar, + hibernate-tools-3.2.0.ga.jar, + hibernate-validator-4.0.0.CR1.jar, + hsqldb.jar, + httpclient-4.0.1.jar, + httpcore-4.0.1.jar, + javassist.jar, + jaxb-api-2.1.6.jar, + jaxb-impl-2.1.6.jar, + jaxen-1.1.2.jar, + jdbc-1.2.jar, + jdbc2_0-stdext.jar, + jdom.jar, + joda-time-1.5.jar, + joda-time-hibernate-1.0.jar, + json-lib-2.2.3-jdk15.jar, + jsr250-api-1.0.jar, + jta.jar, + jtds-1.2.2.jar, + junit-4.4.jar, + junit-4.8.1-sources.jar, + junit-4.8.1.jar, + log4j-1.2.14.jar, + lsid-client-1.1.2.jar, + lsid-server-1.1.2.jar, + lucene-core-2.4.0.jar, + lucene-spellchecker-2.4.0.jar, + mail-1.4.jar, + msbase-2000.3.jar, + mssqlserver-2000.3.jar, + msutil-2000.3.jar, + mysql-connector-java-5.0.5.jar, + odfdom-0.8.jar, + opencsv-1.8.jar, + org.springframework.aop-3.0.4.RELEASE-sources.jar, + org.springframework.asm-3.0.4.RELEASE-sources.jar, + org.springframework.aspects-3.0.4.RELEASE-sources.jar, + org.springframework.beans-3.0.4.RELEASE-sources.jar, + org.springframework.context-3.0.4.RELEASE-sources.jar, + org.springframework.context.support-3.0.4.RELEASE-sources.jar, + org.springframework.core-3.0.4.RELEASE-sources.jar, + org.springframework.expression-3.0.4.RELEASE-sources.jar, + org.springframework.jdbc-3.0.4.RELEASE-sources.jar, + org.springframework.orm-3.0.4.RELEASE-sources.jar, + org.springframework.oxm-3.0.4.RELEASE-sources.jar, + org.springframework.transaction-3.0.4.RELEASE-sources.jar, + org.springframework.web-3.0.4.RELEASE-sources.jar, + org.springframework.web.servlet-3.0.4.RELEASE-sources.jar, + poi-3.1-FINAL.jar, + postgresql-8.2-504.jdbc4.jar, + saxon9he.jar, + serializer-2.7.0.jar, + servlet-api-2.5.jar, + spring-modules-cache-0.7.jar, + spring-modules-lucene-0.8a.jar, + wsdl4j-1.6.1.jar, + xalan-2.7.0.jar, + xercesImpl-2.7.1.jar, + xercesImpl.jar, + xml-apis-1.3.04.jar, + xml-apis-ext-1.3.04.jar, + xml-apis.jar, + xml-resolver-1.2.jar, + xmlgraphics-commons-1.3.1.jar, + xom-1.0.jar, + xsltc.jar, + xstream-1.3.1.jar, + yjp-controller-api-redist-8.0.1.jar, + ant-antlr.jar, + ant-apache-bcel.jar, + ant-apache-bsf.jar, + ant-apache-log4j.jar, + ant-apache-oro.jar, + ant-apache-regexp.jar, + ant-apache-resolver.jar, + ant-commons-logging.jar, + ant-commons-net.jar, + ant-jai.jar, + ant-javamail.jar, + ant-jdepend.jar, + ant-jmf.jar, + ant-jsch.jar, + ant-junit.jar, + ant-launcher.jar, + ant-netrexx.jar, + ant-nodeps.jar, + ant-starteam.jar, + ant-stylebook.jar, + ant-swing.jar, + ant-trax.jar, + ant-weblogic.jar, + ant.jar, + runtime_registry_compatibility.jar, + jdi.jar, + jdimodel.jar, + pdebuild.jar, + compatibility.jar, + junit.jar diff --git a/eu.etaxonomy.taxeditor.store/build.properties b/eu.etaxonomy.taxeditor.store/build.properties index c90745fbf..925934e50 100644 --- a/eu.etaxonomy.taxeditor.store/build.properties +++ b/eu.etaxonomy.taxeditor.store/build.properties @@ -2,7 +2,6 @@ source.. = src/main/java/,\ src/test/java/,\ src/main/resources/,\ src/test/resources/ -output.. = target/ bin.includes = META-INF/,\ .,\ plugin.xml,\ diff --git a/eu.etaxonomy.taxeditor.store/pom.xml b/eu.etaxonomy.taxeditor.store/pom.xml index 91d90d140..8aeee3bba 100644 --- a/eu.etaxonomy.taxeditor.store/pom.xml +++ b/eu.etaxonomy.taxeditor.store/pom.xml @@ -8,32 +8,11 @@ 4.0.0 - eu.etaxonomy eu.etaxonomy.taxeditor.store - 3.0.6-SNAPSHOT eclipse-plugin DataStore Bundle Enables access to a CDM DataStore and provides operations on the model http://dev.e-taxonomy.eu/trac/wiki/TaxonomicEditorDataStoreBundle - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - org.eclipse.tycho - tycho-packaging-plugin - ${tycho.version} - - - false - - - - - + diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ImportManager.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ImportManager.java index 698ea8ae0..9480057d4 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ImportManager.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ImportManager.java @@ -141,7 +141,7 @@ public class ImportManager extends AbstractIOManager { return EndnoteImportConfigurator.NewInstance(null, null); case Excel_Taxa: return NormalExplicitImportConfigurator.NewInstance(null, null, - null); + null, null); case Abcd: return Abcd206ImportConfigurator.NewInstance(null, null); case Sdd: diff --git a/eu.etaxonomy.taxeditor/pom.xml b/eu.etaxonomy.taxeditor/pom.xml index acb005c3a..6724529f3 100644 --- a/eu.etaxonomy.taxeditor/pom.xml +++ b/eu.etaxonomy.taxeditor/pom.xml @@ -7,11 +7,9 @@ 4.0.0 - eu.etaxonomy eu.etaxonomy.taxeditor eclipse-repository - 3.0.6-SNAPSHOT EDIT Taxonomic Editor The EDIT Taxonomic Desktop Editor