From: Cherian Mathew Date: Wed, 22 Jul 2015 08:27:46 +0000 (+0200) Subject: Integrate molecular plugins X-Git-Tag: 3.8.0^2~58 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/104f6c96f79029a5c1cd1d67b0b1e0257f36ce02 Integrate molecular plugins --- diff --git a/eu.etaxonomy.taxeditor.feature/feature.xml b/eu.etaxonomy.taxeditor.feature/feature.xml index f86f25f05..ac7ccae48 100644 --- a/eu.etaxonomy.taxeditor.feature/feature.xml +++ b/eu.etaxonomy.taxeditor.feature/feature.xml @@ -121,4 +121,11 @@ version="0.0.0" unpack="false"/> + + diff --git a/eu.etaxonomy.taxeditor.molecular.aggregator/.classpath b/eu.etaxonomy.taxeditor.molecular.aggregator/.classpath new file mode 100644 index 000000000..1d66dd2b8 --- /dev/null +++ b/eu.etaxonomy.taxeditor.molecular.aggregator/.classpath @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/eu.etaxonomy.taxeditor.molecular.aggregator/.gitignore b/eu.etaxonomy.taxeditor.molecular.aggregator/.gitignore new file mode 100644 index 000000000..e6066b230 --- /dev/null +++ b/eu.etaxonomy.taxeditor.molecular.aggregator/.gitignore @@ -0,0 +1,2 @@ +/target +.settings/ diff --git a/eu.etaxonomy.taxeditor.molecular.aggregator/.project b/eu.etaxonomy.taxeditor.molecular.aggregator/.project index 0daf6c182..a115d4e7f 100644 --- a/eu.etaxonomy.taxeditor.molecular.aggregator/.project +++ b/eu.etaxonomy.taxeditor.molecular.aggregator/.project @@ -1,11 +1,29 @@ eu.etaxonomy.taxeditor.molecular.aggregator - + The Taxonomic Editor for EDIT's platform for + cybertaxonomy. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse. + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + org.eclipse.jdt.core.javabuilder + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature diff --git a/eu.etaxonomy.taxeditor.molecular.aggregator/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.molecular.aggregator/META-INF/MANIFEST.MF new file mode 100644 index 000000000..60b04e420 --- /dev/null +++ b/eu.etaxonomy.taxeditor.molecular.aggregator/META-INF/MANIFEST.MF @@ -0,0 +1,41 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: eu.etaxonomy.taxeditor.molecular.aggregator +Bundle-SymbolicName: eu.etaxonomy.taxeditor.molecular.aggregator;singleton:=true +Bundle-Version: 3.8.0.qualifier +Bundle-ClassPath: ., + lib/bioinfweb-commons-bio-2-SNAPSHOT.jar, + lib/bioinfweb-commons-core-2-SNAPSHOT.jar, + lib/bioinfweb-commons-swing-2-SNAPSHOT.jar, + lib/bioinfweb-commons-swt-2-SNAPSHOT.jar, + lib/core-1.9.2-SNAPSHOT.jar, + lib/libralign-biojava1-0-SNAPSHOT.jar, + lib/libralign-core-0-SNAPSHOT.jar, + lib/libralign-swt-0-SNAPSHOT.jar, + lib/sequencing-1.9.2-SNAPSHOT.jar, + lib/tic-core-2-SNAPSHOT.jar, + lib/tic-swt-2-SNAPSHOT.jar +Export-Package: info.bioinfweb.commons.collections, + info.bioinfweb.libralign.alignmentarea, + info.bioinfweb.libralign.alignmentarea.order, + info.bioinfweb.libralign.alignmentarea.paintsettings, + info.bioinfweb.libralign.alignmentarea.selection, + info.bioinfweb.libralign.alignmentarea.tokenpainter, + info.bioinfweb.libralign.dataarea, + info.bioinfweb.libralign.dataarea.implementations, + info.bioinfweb.libralign.dataarea.implementations.pherogram, + info.bioinfweb.libralign.editsettings, + info.bioinfweb.libralign.model, + info.bioinfweb.libralign.model.adapters, + info.bioinfweb.libralign.model.events, + info.bioinfweb.libralign.model.implementations, + info.bioinfweb.libralign.model.tokenset, + info.bioinfweb.libralign.multiplealignments, + info.bioinfweb.libralign.pherogram, + info.bioinfweb.libralign.pherogram.model, + info.bioinfweb.libralign.pherogram.provider, + info.bioinfweb.libralign.pherogram.view, + info.bioinfweb.tic, + info.bioinfweb.tic.input, + org.biojava.bio.chromatogram +Bundle-ActivationPolicy: lazy diff --git a/eu.etaxonomy.taxeditor.molecular.aggregator/pom.xml b/eu.etaxonomy.taxeditor.molecular.aggregator/pom.xml index ff20500b7..ddc1dd689 100644 --- a/eu.etaxonomy.taxeditor.molecular.aggregator/pom.xml +++ b/eu.etaxonomy.taxeditor.molecular.aggregator/pom.xml @@ -1,8 +1,8 @@ 4.0.0 eu.etaxonomy.taxeditor - eu.etaxonomy.taxeditor.aggregator - pom + eu.etaxonomy.taxeditor.molecular.aggregator + eclipse-plugin eu.etaxonomy @@ -10,13 +10,180 @@ 3.8.0-SNAPSHOT - - ../eu.etaxonomy.taxeditor.cdmlib - ../eu.etaxonomy.taxeditor.store - ../eu.etaxonomy.taxeditor.bulkeditor - ../eu.etaxonomy.taxeditor.editor - ../eu.etaxonomy.taxeditor.molecular - + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.4 + + + copy-dependencies + validate + + copy-dependencies + + + libralign-swt, libralign-core, + bioinfweb-commons-swt, bioinfweb-commons-core, + bioinfweb-commons-bio, bioinfweb-commons-swing, + tic-core, libralign-biojava1, core, sequencing, tic-swt + lib + true + true + true + + + + + + + + + + + + + + + + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + 1.7 + + + remove-existing-jars + clean + + run + + + + Remove all jars + + + + + + + + update-snapshot-jar-names + validate + + run + + + + Update jars to SNAPSHOT when build with + timestamp + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + info.bioinfweb.libralign + libralign-core + 0-SNAPSHOT + + + info.bioinfweb.libralign + libralign-swt + 0-SNAPSHOT + + + info.bioinfweb.libralign + libralign-biojava1 + 0-SNAPSHOT + + + + info.bioinfweb.commons.java + bioinfweb-commons-swt + 2-SNAPSHOT + + + info.bioinfweb.commons.java + bioinfweb-commons-core + 2-SNAPSHOT + + + info.bioinfweb.commons.java + bioinfweb-commons-bio + 2-SNAPSHOT + + + info.bioinfweb.commons.java + bioinfweb-commons-swing + 2-SNAPSHOT + + + + info.bioinfweb.tic + tic-core + 2-SNAPSHOT + + + info.bioinfweb.tic + tic-swt + 2-SNAPSHOT + + + + org.biojava + core + 1.9.2 + + + org.biojava + sequencing + 1.9.2 + + + + + + bioinfweb-maven-repo + bioinfweb repository + http://bioinfweb.info/MavenRepository/ + + diff --git a/eu.etaxonomy.taxeditor.molecular/.classpath b/eu.etaxonomy.taxeditor.molecular/.classpath index a4fa48b4a..f14ba2c2e 100644 --- a/eu.etaxonomy.taxeditor.molecular/.classpath +++ b/eu.etaxonomy.taxeditor.molecular/.classpath @@ -1,17 +1,6 @@ - - - - - - - - - - - - + diff --git a/eu.etaxonomy.taxeditor.molecular/.gitignore b/eu.etaxonomy.taxeditor.molecular/.gitignore index b83d22266..e6066b230 100644 --- a/eu.etaxonomy.taxeditor.molecular/.gitignore +++ b/eu.etaxonomy.taxeditor.molecular/.gitignore @@ -1 +1,2 @@ -/target/ +/target +.settings/ diff --git a/eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF index e70a7ed3a..f3eca7301 100644 --- a/eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF @@ -8,26 +8,11 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.core.expressions, org.eclipse.ui.ide, - eu.etaxonomy.taxeditor.bulkeditor;bundle-version="3.6.1", - eu.etaxonomy.taxeditor.cdmlib;bundle-version="3.6.1", - eu.etaxonomy.taxeditor.editor;bundle-version="3.6.1", - eu.etaxonomy.taxeditor.store;bundle-version="3.6.1" + eu.etaxonomy.taxeditor.bulkeditor, + eu.etaxonomy.taxeditor.cdmlib, + eu.etaxonomy.taxeditor.editor, + eu.etaxonomy.taxeditor.store, + eu.etaxonomy.taxeditor.molecular.aggregator Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-Vendor: EDIT -Bundle-ClassPath: ., - lib/bioinfweb-commons-bio-2-SNAPSHOT.jar, - lib/bioinfweb-commons-core-2-SNAPSHOT.jar, - lib/bioinfweb-commons-swing-2-SNAPSHOT.jar, - lib/bioinfweb-commons-swt-2-SNAPSHOT.jar, - lib/core-1.9.2-SNAPSHOT.jar, - lib/libralign-biojava1-0-SNAPSHOT.jar, - lib/libralign-core-0-SNAPSHOT.jar, - lib/libralign-swt-0-SNAPSHOT.jar, - lib/sequencing-1.9.2-SNAPSHOT.jar, - lib/tic-core-2-SNAPSHOT.jar, - lib/tic-swt-2-SNAPSHOT.jar -Export-Package: eu.etaxonomy.taxeditor.molecular, - eu.etaxonomy.taxeditor.molecular.editor, - eu.etaxonomy.taxeditor.molecular.handler, - info.bioinfweb.commons diff --git a/eu.etaxonomy.taxeditor.molecular/build.properties b/eu.etaxonomy.taxeditor.molecular/build.properties index fdb877c32..e4bf8ac38 100644 --- a/eu.etaxonomy.taxeditor.molecular/build.properties +++ b/eu.etaxonomy.taxeditor.molecular/build.properties @@ -1,17 +1,4 @@ -source.. = src/main/java/ bin.includes = META-INF/,\ - .,\ plugin.xml,\ icons/,\ - OSGI-INF/,\ - lib/bioinfweb-commons-bio-2-SNAPSHOT.jar,\ - lib/bioinfweb-commons-core-2-SNAPSHOT.jar,\ - lib/bioinfweb-commons-swing-2-SNAPSHOT.jar,\ - lib/bioinfweb-commons-swt-2-SNAPSHOT.jar,\ - lib/core-1.9.2-SNAPSHOT.jar,\ - lib/libralign-biojava1-0-SNAPSHOT.jar,\ - lib/libralign-core-0-SNAPSHOT.jar,\ - lib/libralign-swt-0-SNAPSHOT.jar,\ - lib/sequencing-1.9.2-SNAPSHOT.jar,\ - lib/tic-core-2-SNAPSHOT.jar,\ - lib/tic-swt-2-SNAPSHOT.jar + OSGI-INF/ diff --git a/eu.etaxonomy.taxeditor.molecular/pom.xml b/eu.etaxonomy.taxeditor.molecular/pom.xml index cc17342fc..1e91c23b5 100644 --- a/eu.etaxonomy.taxeditor.molecular/pom.xml +++ b/eu.etaxonomy.taxeditor.molecular/pom.xml @@ -14,179 +14,4 @@ Molecular Bundle Provides editors, views and operations for handling molecular data and alignments - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.4 - - - copy-dependencies - validate - - copy-dependencies - - - libralign-swt, libralign-core, - bioinfweb-commons-swt, bioinfweb-commons-core, - bioinfweb-commons-bio, bioinfweb-commons-swing, - tic-core, libralign-biojava1, core, sequencing, tic-swt - lib - true - true - true - - - - - - - - - - - - - - - - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - 1.7 - - - remove-existing-jars - clean - - run - - - - Remove all jars - - - - - - - - update-snapshot-jar-names - validate - - run - - - - Update jars to SNAPSHOT when build with - timestamp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - info.bioinfweb.libralign - libralign-core - 0-SNAPSHOT - - - info.bioinfweb.libralign - libralign-swt - 0-SNAPSHOT - - - info.bioinfweb.libralign - libralign-biojava1 - 0-SNAPSHOT - - - - info.bioinfweb.commons.java - bioinfweb-commons-swt - 2-SNAPSHOT - - - info.bioinfweb.commons.java - bioinfweb-commons-core - 2-SNAPSHOT - - - info.bioinfweb.commons.java - bioinfweb-commons-bio - 2-SNAPSHOT - - - info.bioinfweb.commons.java - bioinfweb-commons-swing - 2-SNAPSHOT - - - - info.bioinfweb.tic - tic-core - 2-SNAPSHOT - - - info.bioinfweb.tic - tic-swt - 2-SNAPSHOT - - - - org.biojava - core - 1.9.2 - - - org.biojava - sequencing - 1.9.2 - - - - - - bioinfweb-maven-repo - bioinfweb repository - http://bioinfweb.info/MavenRepository/ - - - diff --git a/pom.xml b/pom.xml index fac701883..c595378bf 100644 --- a/pom.xml +++ b/pom.xml @@ -34,6 +34,8 @@ eu.etaxonomy.taxeditor.application eu.etaxonomy.taxeditor.feature.platform eu.etaxonomy.taxeditor.feature + eu.etaxonomy.taxeditor.molecular + eu.etaxonomy.taxeditor.molecular.aggregator eu.etaxonomy.taxeditor