Pom changes to enable fully automated tycho build and MANIFEST first development...

diff --git a/.gitattributes b/.gitattributes
index b20203d561ea48fb7913d713e90b9ea41183b44a..f6c2dc66fa74db39b2ecfadeaa6c2bb6f021887d 100644 (file)
--- 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 b62c3e4766c6124b605f34b82f36661cfb1a7d03..e2457830b9ebe35c8e0542573dd08ae286e8b508 100644 (file)
--- 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 a96e189be32ba8e28fc671816be5dbc43c6f4e24..3ddb0afc0741e33b783496abc53681402326acf1 100644 (file)
--- a/eu.etaxonomy.taxeditor.application/pom.xml
+++ b/eu.etaxonomy.taxeditor.application/pom.xml
@@ -8,32 +8,11 @@
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
-       <groupId>eu.etaxonomy</groupId>
        <artifactId>eu.etaxonomy.taxeditor.application</artifactId>
        <packaging>eclipse-plugin</packaging>
-       <version>3.0.6-SNAPSHOT</version>
        
        <name>Application</name>
        <description>All plugins are combined into this application.</description>
        <url>http://dev.e-taxonomy.eu/trac/wiki/TaxonomicEditor</url>
 
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.eclipse.tycho</groupId>
-                               <artifactId>tycho-packaging-plugin</artifactId>
-                               <version>${tycho.version}</version>
-                               <configuration>
-                                       <archive>
-                                               <addMavenDescriptor>false</addMavenDescriptor>
-                                       </archive>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
-
 </project>

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
index f60adf5de0dd86d73482c68e121b85c0e32dd6e6..bb18a73f37df3451d947946a3e02816c26e235d5 100644 (file)
--- 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 54ec746667cce6476777acc7b6e8d37f8e2eb323..1eba534601168fe0444a8d15e2b3a1c1c12c45b0 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/pom.xml
+++ b/eu.etaxonomy.taxeditor.bulkeditor/pom.xml
@@ -8,31 +8,11 @@
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
-       <groupId>eu.etaxonomy</groupId>
        <artifactId>eu.etaxonomy.taxeditor.bulkeditor</artifactId>
        <packaging>eclipse-plugin</packaging>
-       <version>3.0.6-SNAPSHOT</version>
 
        <name>Bulkeditor Bundle</name>
        <description></description>
        <url>http://dev.e-taxonomy.eu/trac/wiki/TaxonomicEditorBulkeditorBundle</url>
 
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.eclipse.tycho</groupId>
-                               <artifactId>tycho-packaging-plugin</artifactId>
-                               <version>${tycho.version}</version>
-                               <configuration>
-                                       <archive>
-                                               <addMavenDescriptor>false</addMavenDescriptor>
-                                       </archive>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
 </project>

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index 1dfcb223e632c62b1c89bce75c956db8e76dfaac..74372933139039dd7794e2776599b3057104d1a7 100644 (file)
--- 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 50c031a3c73eaf1dfed191febb7a7eac895b4205..2aac1960f7a6d0b8505c84b9307ddef75bcfdde8 100644 (file)
--- 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,\\r
                lib/cdmlib-print-3.0.7-SNAPSHOT.jar,\\r
                lib/cdmlib-remote-3.0.7-SNAPSHOT.jar,\\r
-               lib/cdmlib-services-3.0.7-SNAPSHOT.jar\r
+               lib/cdmlib-services-3.0.7-SNAPSHOT.jar,\\r
+               lib/activation-1.1.jar,\\r
+               lib/antlr-2.7.6.jar,\\r
+               lib/aopalliance-1.0.jar,\\r
+               lib/asm-attrs.jar,\\r
+               lib/asm.jar,\\r
+               lib/aspectjrt-1.6.3.jar,\\r
+               lib/aspectjweaver-1.6.3.jar,\\r
+               lib/avalon-framework-4.2.0.jar,\\r
+               lib/batik-all-1.7.jar,\\r
+               lib/c3p0-0.9.1.jar,\\r
+               lib/cglib-2.1.3.jar,\\r
+               lib/commons-beanutils-1.7.0.jar,\\r
+               lib/commons-collections-3.2.jar,\\r
+               lib/commons-dbcp-1.2.2.jar,\\r
+               lib/commons-io-1.3.1.jar,\\r
+               lib/commons-io-1.4.jar,\\r
+               lib/commons-lang-2.4.jar,\\r
+               lib/commons-logging-1.0.4.jar,\\r
+               lib/commons-pool-1.3.jar,\\r
+               lib/dom4j-1.6.1.jar,\\r
+               lib/dozer-5.3.0-sources.jar,\\r
+               lib/dozer-5.3.0.jar,\\r
+               lib/ehcache-1.2.3.jar,\\r
+               lib/ejb3-persistence.jar,\\r
+               lib/ezmorph-1.0.4.jar,\\r
+               lib/fop.jar,\\r
+               lib/google-api-translate-java-0.92.jar,\\r
+               lib/h2-1.1.115.jar,\\r
+               lib/hibernate-annotations-3.4.0-SNAPSHOT.jar,\\r
+               lib/hibernate-commons-annotations-3.4.0-SNAPSHOT.jar,\\r
+               lib/hibernate-core-3.4.0-SNAPSHOT.jar,\\r
+               lib/hibernate-envers-3.4.0-SNAPSHOT.jar,\\r
+               lib/hibernate-search-3.1.0.GA.jar,\\r
+               lib/hibernate-tools-3.2.0.ga.jar,\\r
+               lib/hibernate-validator-4.0.0.CR1.jar,\\r
+               lib/hsqldb.jar,\\r
+               lib/httpclient-4.0.1.jar,\\r
+               lib/httpcore-4.0.1.jar,\\r
+               lib/javassist.jar,\\r
+               lib/jaxb-api-2.1.6.jar,\\r
+               lib/jaxb-impl-2.1.6.jar,\\r
+               lib/jaxen-1.1.2.jar,\\r
+               lib/jdbc-1.2.jar,\\r
+               lib/jdbc2_0-stdext.jar,\\r
+               lib/jdom.jar,\\r
+               lib/joda-time-1.5.jar,\\r
+               lib/joda-time-hibernate-1.0.jar,\\r
+               lib/json-lib-2.2.3-jdk15.jar,\\r
+               lib/jsr250-api-1.0.jar,\\r
+               lib/jta.jar,\\r
+               lib/jtds-1.2.2.jar,\\r
+               lib/junit-4.4.jar,\\r
+               lib/junit-4.8.1-sources.jar,\\r
+               lib/log4j-1.2.14.jar,\\r
+               lib/lsid-client-1.1.2.jar,\\r
+               lib/lsid-server-1.1.2.jar,\\r
+               lib/lucene-core-2.4.0.jar,\\r
+               lib/lucene-spellchecker-2.4.0.jar,\\r
+               lib/mail-1.4.jar,\\r
+               lib/msbase-2000.3.jar,\\r
+               lib/mssqlserver-2000.3.jar,\\r
+               lib/msutil-2000.3.jar,\\r
+               lib/odfdom-0.8.jar,\\r
+               lib/opencsv-1.8.jar,\\r
+               lib/org.apache.commons.codec-1.3.0.jar,\\r
+               lib/org.eclipse.equinox.common-3.6.0.v20100503.jar,\\r
+               lib/org.eclipse.osgi-3.6.2.R36x_v20110210.jar,\\r
+               lib/org.springframework.aop-3.0.4.RELEASE-sources.jar,\\r
+               lib/org.springframework.aop-3.0.4.RELEASE.jar,\\r
+               lib/org.springframework.asm-3.0.4.RELEASE-sources.jar,\\r
+               lib/org.springframework.asm-3.0.4.RELEASE.jar,\\r
+               lib/org.springframework.aspects-3.0.4.RELEASE-sources.jar,\\r
+               lib/org.springframework.aspects-3.0.4.RELEASE.jar,\\r
+               lib/org.springframework.beans-3.0.4.RELEASE-sources.jar,\\r
+               lib/org.springframework.beans-3.0.4.RELEASE.jar,\\r
+               lib/org.springframework.context-3.0.4.RELEASE-sources.jar,\\r
+               lib/org.springframework.context-3.0.4.RELEASE.jar,\\r
+               lib/org.springframework.context.support-3.0.4.RELEASE-sources.jar,\\r
+               lib/org.springframework.context.support-3.0.4.RELEASE.jar,\\r
+               lib/org.springframework.core-3.0.4.RELEASE-sources.jar,\\r
+               lib/org.springframework.core-3.0.4.RELEASE.jar,\\r
+               lib/org.springframework.expression-3.0.4.RELEASE-sources.jar,\\r
+               lib/org.springframework.expression-3.0.4.RELEASE.jar,\\r
+               lib/org.springframework.jdbc-3.0.4.RELEASE-sources.jar,\\r
+               lib/org.springframework.jdbc-3.0.4.RELEASE.jar,\\r
+               lib/org.springframework.orm-3.0.4.RELEASE-sources.jar,\\r
+               lib/org.springframework.orm-3.0.4.RELEASE.jar,\\r
+               lib/org.springframework.oxm-3.0.4.RELEASE-sources.jar,\\r
+               lib/org.springframework.oxm-3.0.4.RELEASE.jar,\\r
+               lib/org.springframework.transaction-3.0.4.RELEASE-sources.jar,\\r
+               lib/org.springframework.transaction-3.0.4.RELEASE.jar,\\r
+               lib/org.springframework.web-3.0.4.RELEASE-sources.jar,\\r
+               lib/org.springframework.web-3.0.4.RELEASE.jar,\\r
+               lib/org.springframework.web.servlet-3.0.4.RELEASE-sources.jar,\\r
+               lib/org.springframework.web.servlet-3.0.4.RELEASE.jar,\\r
+               lib/poi-3.1-FINAL.jar,\\r
+               lib/postgresql-8.2-504.jdbc4.jar,\\r
+               lib/sanselan-0.97-incubator.jar,\\r
+               lib/saxon9he.jar,\\r
+               lib/serializer-2.7.0.jar,\\r
+               lib/servlet-api-2.5.jar,\\r
+               lib/slf4j-api-1.5.2.jar,\\r
+               lib/slf4j-log4j12-1.5.2.jar,\\r
+               lib/spring-modules-cache-0.7.jar,\\r
+               lib/spring-modules-lucene-0.8a.jar,\\r
+               lib/wsdl4j-1.6.1.jar,\\r
+               lib/xalan-2.7.0.jar,\\r
+               lib/xercesImpl-2.7.1.jar,\\r
+               lib/xercesImpl.jar,\\r
+               lib/xml-apis-1.3.04.jar,\\r
+               lib/xml-apis-ext-1.3.04.jar,\\r
+               lib/xml-apis.jar,\\r
+               lib/xml-resolver-1.2.jar,\\r
+               lib/xmlgraphics-commons-1.3.1.jar,\\r
+               lib/xom-1.0.jar,\\r
+               lib/xsltc.jar,\\r
+               lib/xstream-1.3.1.jar,\\r
+               lib/yjp-controller-api-redist-8.0.1.jar\r
 jars.compile.order = cdmLibrary.jar\r
 src.includes = lib/\r
 jre.compilation.profile = J2SE-1.6\r

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 (file)
index ae79105..0000000
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 (file)
index 577cb68..0000000
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 a92ce31a84e8bae73933a24f0eeecb18f6e573e2..58a76073b1e642c34cbdf0719a0b269f38dd5699 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
@@ -1,75 +1,55 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
-<project xmlns="http://maven.apache.org/POM/4.0.0"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
        <parent>\r
                <groupId>eu.etaxonomy</groupId>\r
                <artifactId>taxeditor-parent</artifactId>\r
                <version>3.0.6-SNAPSHOT</version>\r
        </parent>\r
        <modelVersion>4.0.0</modelVersion>\r
-       <groupId>eu.etaxonomy</groupId>\r
        <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>\r
        <packaging>eclipse-plugin</packaging>\r
-       <version>3.0.6-SNAPSHOT</version>\r
-       \r
        <name>CDM Library Dependencies Plugin</name>\r
        <description>CDM Library and dependencies as a plugin</description>\r
-       \r
        <build>\r
                <plugins>\r
                        <plugin>\r
                                <groupId>org.apache.maven.plugins</groupId>\r
-                               <artifactId>maven-jar-plugin</artifactId>\r
+                               <artifactId>maven-dependency-plugin</artifactId>\r
+                               <version>2.3</version>\r
+                               <executions>\r
+                                       <execution>\r
+                                               <id>copy-dependencies</id>\r
+                                               <phase>validate</phase>\r
+                                               <goals>\r
+                                                       <goal>copy-dependencies</goal>\r
+                                               </goals>\r
+                                               <configuration>\r
+                                                       <excludeArtifactIds>junit,log4j,unitils</excludeArtifactIds>\r
+                                                       <outputDirectory>lib</outputDirectory>\r
+                                                       <overWriteReleases>true</overWriteReleases>\r
+                                                       <overWriteSnapshots>true</overWriteSnapshots>\r
+                                                       <excludeTransitive>true</excludeTransitive>\r
+                                               </configuration>\r
+                                       </execution>\r
+                                       <!--execution>\r
+                                   <id>copy-dependencies-sources</id>\r
+                                   <phase>validate</phase>\r
+                                   <goals>\r
+                                     <goal>copy-dependencies</goal>\r
+                                   </goals>\r
+                                   <configuration>\r
+                                     <classifier>sources</classifier>\r
+                                     <excludeArtifactIds>junit,log4j,unitils</excludeArtifactIds>\r
+                                     <outputDirectory>lib</outputDirectory>\r
+                                     <overWriteReleases>true</overWriteReleases>\r
+                                     <overWriteSnapshots>true</overWriteSnapshots>\r
+                                     <excludeTransitive>true</excludeTransitive>\r
+                                   </configuration>\r
+                         </execution-->\r
+                               </executions>\r
                        </plugin>\r
-                       <plugin>\r
-                               <groupId>org.eclipse.tycho</groupId>\r
-                               <artifactId>tycho-packaging-plugin</artifactId>\r
-                               <version>${tycho.version}</version>\r
-                               <configuration>\r
-                                       <archive>\r
-                                               <addMavenDescriptor>false</addMavenDescriptor>\r
-                                       </archive>\r
-                               </configuration>\r
-                       </plugin>\r
-             <plugin>\r
-               <groupId>org.apache.maven.plugins</groupId>\r
-               <artifactId>maven-dependency-plugin</artifactId>\r
-               <executions>\r
-                 <execution>\r
-                   <id>copy-dependencies</id>\r
-                   <phase>validate</phase>\r
-                   <goals>\r
-                     <goal>copy-dependencies</goal>\r
-                   </goals>\r
-                   <configuration>\r
-                     <excludeArtifactIds>junit,log4j,unitils</excludeArtifactIds>\r
-                     <outputDirectory>lib</outputDirectory>\r
-                     <overWriteReleases>true</overWriteReleases>\r
-                     <overWriteSnapshots>true</overWriteSnapshots>\r
-                     <excludeTransitive>true</excludeTransitive>\r
-                   </configuration>\r
-                 </execution>\r
-                 <!-- execution>\r
-                   <id>copy-dependencies-sources</id>\r
-                   <phase>validate</phase>\r
-                   <goals>\r
-                     <goal>copy-dependencies</goal>\r
-                   </goals>\r
-                   <configuration>\r
-                     <classifier>sources</classifier>\r
-                     <excludeArtifactIds>junit,log4j,unitils</excludeArtifactIds>\r
-                     <outputDirectory>lib</outputDirectory>\r
-                     <overWriteReleases>true</overWriteReleases>\r
-                     <overWriteSnapshots>true</overWriteSnapshots>\r
-                     <excludeTransitive>true</excludeTransitive>\r
-                   </configuration>\r
-                 </execution-->\r
-               </executions>\r
-             </plugin>\r
-           </plugins>\r
-         </build>\r
-       \r
+               </plugins>\r
+       </build>\r
        <dependencies>\r
                <dependency>\r
                        <groupId>eu.etaxonomy</groupId>\r
@@ -112,4 +92,4 @@
                        <version>${cdmlib.version}</version>\r
                </dependency>\r
        </dependencies>\r
-</project>
\ No newline at end of file
+</project>\r

diff --git a/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
index cfa5fcb99ea03ddb8d18f7acccbb0e7bb1e0bd86..a8ff4092a6e9c6ed546769275b29fd4cbc714274 100644 (file)
--- 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 f5adc6407613981b27ec4121c0c9cbfff0d4d278..0564aa0012f417378d8cf2bee0c9f28a19176b59 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/pom.xml
+++ b/eu.etaxonomy.taxeditor.editor/pom.xml
@@ -8,31 +8,11 @@
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
-  <groupId>eu.etaxonomy</groupId>
   <artifactId>eu.etaxonomy.taxeditor.editor</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>3.0.6-SNAPSHOT</version>
   
   <name>Editor Bundle</name>
   <description></description>
   <url>http://dev.e-taxonomy.eu/trac/wiki/TaxonomicEditorEditorBundle</url>
   
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-packaging-plugin</artifactId>
-        <version>${tycho.version}</version>
-        <configuration>
-          <archive>
-            <addMavenDescriptor>false</addMavenDescriptor>
-          </archive>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>

diff --git a/eu.etaxonomy.taxeditor.feature.platform/pom.xml b/eu.etaxonomy.taxeditor.feature.platform/pom.xml
index 0e2e99d56a91fc60711b56c56cf04c790b413740..71986241d9de00090e45612d3f06ddf84b4a5d0a 100644 (file)
--- a/eu.etaxonomy.taxeditor.feature.platform/pom.xml
+++ b/eu.etaxonomy.taxeditor.feature.platform/pom.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <parent>
-       <groupId>eu.etaxonomy</groupId>
-       <artifactId>taxeditor-parent</artifactId>
-    <version>3.0.6-SNAPSHOT</version>
-  </parent>
-  
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>eu.etaxonomy</groupId>
-  <artifactId>eu.etaxonomy.taxeditor.feature.platform</artifactId>
-  <version>3.0.6-SNAPSHOT</version>
-  <packaging>eclipse-feature</packaging>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+       <parent>
+               <groupId>eu.etaxonomy</groupId>
+               <artifactId>taxeditor-parent</artifactId>
+               <version>3.0.6-SNAPSHOT</version>
+       </parent>
+       <modelVersion>4.0.0</modelVersion>
+       <artifactId>eu.etaxonomy.taxeditor.feature.platform</artifactId>
+       <packaging>eclipse-feature</packaging>
+       
+       <name>Taxonomic Editor Platform Dependencies</name>
+       <description/>
+       <url>http://dev.e-taxonomy.eu/trac/wiki/TaxonomicEditorEditorBundle</url>
 </project>

diff --git a/eu.etaxonomy.taxeditor.feature/pom.xml b/eu.etaxonomy.taxeditor.feature/pom.xml
index bee55492b62dd635c73a069e903c19fd13e9e30b..9a63166a88960d59fcfe9073691face0b09baaa0 100644 (file)
--- a/eu.etaxonomy.taxeditor.feature/pom.xml
+++ b/eu.etaxonomy.taxeditor.feature/pom.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <parent>
-       <groupId>eu.etaxonomy</groupId>
-       <artifactId>taxeditor-parent</artifactId>
-    <version>3.0.6-SNAPSHOT</version>
-  </parent>
-  
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>eu.etaxonomy</groupId>
-  <artifactId>eu.etaxonomy.taxeditor.feature</artifactId>
-  <version>3.0.6-SNAPSHOT</version>
-  <packaging>eclipse-feature</packaging>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+       <parent>
+               <groupId>eu.etaxonomy</groupId>
+               <artifactId>taxeditor-parent</artifactId>
+               <version>3.0.6-SNAPSHOT</version>
+       </parent>
+       <modelVersion>4.0.0</modelVersion>
+       <artifactId>eu.etaxonomy.taxeditor.feature</artifactId>
+       <packaging>eclipse-feature</packaging>
+       
+       <name>Taxonomic Editor Feature</name>
+       <description/>
+       <url>http://dev.e-taxonomy.eu/trac/wiki/TaxonomicEditorEditorBundle</url>
 </project>

diff --git a/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
index 96f67a4ca3a41b800e0d9da39b06cf4963ef977d..38f8b6fcf8d7e521edab8b12d428ddc7779bacb1 100644 (file)
--- 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 e03aa9535280c93fce0114d06416812534d8b76a..fee80f1b0c11d797db59208ae9d74572e48aac84 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/pom.xml
+++ b/eu.etaxonomy.taxeditor.navigation/pom.xml
@@ -8,34 +8,13 @@
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
-       <groupId>eu.etaxonomy</groupId>
        <artifactId>eu.etaxonomy.taxeditor.navigation</artifactId>
        <packaging>eclipse-plugin</packaging>
-       <version>3.0.6-SNAPSHOT</version>
 
        <name>Navigation Bundle</name>
        <description>Provides navigational views such as the Taxonomic Tree or Search Views</description>
        <url>http://dev.e-taxonomy.eu/trac/wiki/TaxonomicEditorNavigationBundle</url>
 
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.eclipse.tycho</groupId>
-                               <artifactId>tycho-packaging-plugin</artifactId>
-                               <version>${tycho.version}</version>
-                               <configuration>
-                                       <archive>
-                                               <addMavenDescriptor>false</addMavenDescriptor>
-                                       </archive>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
-
 </project>
 
 

diff --git a/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
index fbe3c587779746f18b8623e1aa9409c42353fa16..324dc2b1949ece2116ef46e048dd5f273c3f4f81 100644 (file)
--- 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 ff6ef481c0b386e269817128a9590c1de3ba5e69..7f57480d719fcd31496be93f427e55178e64fd3a 100644 (file)
--- a/eu.etaxonomy.taxeditor.printpublisher/pom.xml
+++ b/eu.etaxonomy.taxeditor.printpublisher/pom.xml
@@ -11,28 +11,9 @@
        <groupId>eu.etaxonomy</groupId>
        <artifactId>eu.etaxonomy.taxeditor.printpublisher</artifactId>
        <packaging>eclipse-plugin</packaging>
-       <version>3.0.6-SNAPSHOT</version>
        
        <name>Printpublisher Bundle</name>
        <description></description>
        <url>http://wp5.e-taxonomy.eu/printpublisher</url>
 
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.eclipse.tycho</groupId>
-                               <artifactId>tycho-packaging-plugin</artifactId>
-                               <version>${tycho.version}</version>
-                               <configuration>
-                                       <archive>
-                                               <addMavenDescriptor>false</addMavenDescriptor>
-                                       </archive>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
 </project>

diff --git a/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
index 199ab03914a22fffe8282f60f73ea848e94ce346..237488355bb01d412c57c2203e58dbcd55064341 100644 (file)
--- 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 c90745fbf4e9d287b039ccb51535610342163c16..925934e50ff1d92c868e24dda037b16c48abeb72 100644 (file)
--- 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 91d90d1403fc8e1416396e05f77cb84466b72a29..8aeee3bbac83fb98814ecde28dde170b60315536 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/pom.xml
+++ b/eu.etaxonomy.taxeditor.store/pom.xml
@@ -8,32 +8,11 @@
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <groupId>eu.etaxonomy</groupId>
   <artifactId>eu.etaxonomy.taxeditor.store</artifactId>
-  <version>3.0.6-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   
   <name>DataStore Bundle</name>
   <description>Enables access to a CDM DataStore and provides operations on the model</description>
   <url>http://dev.e-taxonomy.eu/trac/wiki/TaxonomicEditorDataStoreBundle</url>
-       
-  
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-packaging-plugin</artifactId>
-        <version>${tycho.version}</version>
-        <configuration>
-          <archive>
-            <addMavenDescriptor>false</addMavenDescriptor>
-          </archive>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+
 </project>

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 698ea8ae01e08629ad17f05cc30e752d3b04ca2e..9480057d430afcf52b6ec86d13e3fedcd4ccb607 100644 (file)
--- 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<IImportConfigurator> {
                        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 acb005c3a145c41d96837d032a9e176845f91fc9..6724529f30273f58123da66ca9f45a8b2c65541c 100644 (file)
--- a/eu.etaxonomy.taxeditor/pom.xml
+++ b/eu.etaxonomy.taxeditor/pom.xml
@@ -7,11 +7,9 @@
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
-       <groupId>eu.etaxonomy</groupId>
        <artifactId>eu.etaxonomy.taxeditor</artifactId>
        <!-- packaging>eclipse-application</packaging -->
        <packaging>eclipse-repository</packaging>
-       <version>3.0.6-SNAPSHOT</version>
 
        <name>EDIT Taxonomic Editor</name>
        <description>The EDIT Taxonomic Desktop Editor</description>