Buckminster is dead, long live Tycho. The complete build can now be fully automated...
authorn.hoffmann <n.hoffmann@localhost>
Thu, 14 Jul 2011 15:56:55 +0000 (15:56 +0000)
committern.hoffmann <n.hoffmann@localhost>
Thu, 14 Jul 2011 15:56:55 +0000 (15:56 +0000)
42 files changed:
.gitattributes
.gitignore
eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.application/plugin.xml
eu.etaxonomy.taxeditor.application/pom.xml
eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.bulkeditor/pom.xml
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/build.properties
eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.common-3.6.0.v20100503.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.osgi-3.6.2.R36x_v20110210.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/servlet-2.5.0.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/pom.xml
eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.editor/build.properties
eu.etaxonomy.taxeditor.editor/pom.xml
eu.etaxonomy.taxeditor.feature.platform/.project [deleted file]
eu.etaxonomy.taxeditor.feature.platform/feature.xml
eu.etaxonomy.taxeditor.feature.platform/pom.xml [new file with mode: 0644]
eu.etaxonomy.taxeditor.feature/buckminster.cspex [deleted file]
eu.etaxonomy.taxeditor.feature/buckminster.properties [deleted file]
eu.etaxonomy.taxeditor.feature/buckminster_product.properties [deleted file]
eu.etaxonomy.taxeditor.feature/build.properties
eu.etaxonomy.taxeditor.feature/build/product.ant [deleted file]
eu.etaxonomy.taxeditor.feature/feature.xml
eu.etaxonomy.taxeditor.feature/pom.xml [new file with mode: 0644]
eu.etaxonomy.taxeditor.feature/site.cquery [deleted file]
eu.etaxonomy.taxeditor.feature/site.rmap [deleted file]
eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.navigation/pom.xml
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/NewTaxonNodeHandler.java
eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.printpublisher/pom.xml
eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.store/build.properties
eu.etaxonomy.taxeditor.store/pom.xml
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/UriDialog.java
eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product [moved from eu.etaxonomy.taxeditor.feature/taxeditor.product with 88% similarity]
eu.etaxonomy.taxeditor/plugin_customization.ini [new file with mode: 0644]
eu.etaxonomy.taxeditor/pom.xml [new file with mode: 0644]
eu.etaxonomy.taxeditor/rcp.target [moved from eu.etaxonomy.taxeditor.feature/rcp.target with 83% similarity]

index ba44754d2f55f3f58bac2aa4528da98e5c9a6a8a..89836b955c1b9b3f20fd15446095870508e48d99 100644 (file)
@@ -220,6 +220,8 @@ eu.etaxonomy.taxeditor.cdmlib/lib/odfdom-0.8-sources.zip -text
 eu.etaxonomy.taxeditor.cdmlib/lib/odfdom-0.8.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/opencsv-1.8.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/org.apache.commons.codec-1.3.0.jar -text
+eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.common-3.6.0.v20100503.jar -text
+eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.osgi-3.6.2.R36x_v20110210.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.aop-3.0.4.RELEASE-sources.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.aop-3.0.4.RELEASE.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.asm-3.0.4.RELEASE-sources.jar -text
@@ -255,6 +257,7 @@ eu.etaxonomy.taxeditor.cdmlib/lib/saxon9he.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/serializer-2.7.0.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/serializer.LICENSE.txt -text
 eu.etaxonomy.taxeditor.cdmlib/lib/serializer.NOTICE.txt -text
+eu.etaxonomy.taxeditor.cdmlib/lib/servlet-2.5.0.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/servlet-api-2.5.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/servlet-api-2.5src.zip -text
 eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-api-1.5.2.jar -text
@@ -489,20 +492,13 @@ eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/o
 eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteSynonymOperationTest.java -text
 eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/MoveTaxonOperationTest.java -text
 eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperationTest.java -text
-eu.etaxonomy.taxeditor.feature.platform/.project -text
 eu.etaxonomy.taxeditor.feature.platform/build.properties -text
 eu.etaxonomy.taxeditor.feature.platform/feature.xml -text
+eu.etaxonomy.taxeditor.feature.platform/pom.xml -text
 eu.etaxonomy.taxeditor.feature/.project -text
-eu.etaxonomy.taxeditor.feature/buckminster.cspex -text
-eu.etaxonomy.taxeditor.feature/buckminster.properties -text
-eu.etaxonomy.taxeditor.feature/buckminster_product.properties -text
 eu.etaxonomy.taxeditor.feature/build.properties -text
-eu.etaxonomy.taxeditor.feature/build/product.ant -text
 eu.etaxonomy.taxeditor.feature/feature.xml -text
-eu.etaxonomy.taxeditor.feature/rcp.target -text
-eu.etaxonomy.taxeditor.feature/site.cquery -text
-eu.etaxonomy.taxeditor.feature/site.rmap -text
-eu.etaxonomy.taxeditor.feature/taxeditor.product -text
+eu.etaxonomy.taxeditor.feature/pom.xml -text
 eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF -text
 eu.etaxonomy.taxeditor.navigation/build.properties -text
 eu.etaxonomy.taxeditor.navigation/icons/edit_16x16.gif -text
@@ -1221,6 +1217,10 @@ eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/test/ContextMen
 eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/test/LoginTest.java -text
 eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/test/NewMenuTest.java -text
 eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/test/NewTaxonWizardTest.java -text
+eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product -text
+eu.etaxonomy.taxeditor/plugin_customization.ini -text
+eu.etaxonomy.taxeditor/pom.xml -text
+eu.etaxonomy.taxeditor/rcp.target -text
 /pom.xml -text
 src/changes/changes.xml -text
 src/site/apt/download.apt -text
index 3e751f7239755af59315dd287862faf527e1b93f..e4b0ac2303ebc95d4e348374df501c2d8283e711 100644 (file)
@@ -42,8 +42,10 @@ eu.etaxonomy.taxeditor.editor/.classpath
 eu.etaxonomy.taxeditor.editor/.project
 eu.etaxonomy.taxeditor.editor/.settings
 eu.etaxonomy.taxeditor.editor/target
+eu.etaxonomy.taxeditor.feature.platform/target
 eu.etaxonomy.taxeditor.feature/compile.eu.etaxonomy.taxeditor.product.feature.xml
 eu.etaxonomy.taxeditor.feature/plugin_customization.ini
+eu.etaxonomy.taxeditor.feature/target
 eu.etaxonomy.taxeditor.feature/workspace
 eu.etaxonomy.taxeditor.navigation/.classpath
 eu.etaxonomy.taxeditor.navigation/.project
@@ -59,6 +61,8 @@ eu.etaxonomy.taxeditor.store/.settings
 eu.etaxonomy.taxeditor.store/hibernate.log
 eu.etaxonomy.taxeditor.store/target
 eu.etaxonomy.taxeditor.test/screenshots/*.jpeg
+eu.etaxonomy.taxeditor/.project
+eu.etaxonomy.taxeditor/target
 /runtime-taxeditor.product
 /target
 /workspace
index c18bdd2311907fe59039a436fda733a4b61a672f..b62c3e4766c6124b605f34b82f36661cfb1a7d03 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EDIT Taxonomic Editor
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.application;singleton:=true
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 3.0.6.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin
 Bundle-Vendor: EDIT
 Bundle-Localization: plugin
@@ -26,5 +26,4 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.equinox.p2.ui,
  org.eclipse.equinox.p2.ui.sdk,
  org.eclipse.equinox.p2.updatechecker,
- org.eclipse.equinox.p2.operations,
- org.eclipse.pde.junit.runtime;bundle-version="3.4.100"
+ org.eclipse.equinox.p2.operations
index c84791d7e1afcef72d3b67f1a43ea1ecea847bbc..baead6ca639eb9cf18b6814e1e19879d438e71d6 100644 (file)
         pattern="org\.eclipse\.search.*">\r
   </activityPatternBinding>\r
        </extension>\r
+ <extension\r
+       id="eu_etaxonomy_taxeditor_product"\r
+       point="org.eclipse.core.runtime.products">\r
+    <product\r
+          application="eu.etaxonomy.taxeditor.application.application"\r
+          name="EDIT Taxonomic Editor">\r
+       <property\r
+             name="appName"\r
+             value="EDIT Taxonomic Editor">\r
+       </property>\r
+       <property\r
+             name="aboutImage"\r
+             value="icons/256color_48x48.gif">\r
+       </property>\r
+       <property\r
+             name="aboutText"\r
+             value="%productBlurb">\r
+       </property>\r
+       <property\r
+             name="windowImages"\r
+             value="icons/256color_16x16.gif,icons/256color_32x32.gif,icons/256color_48x48.gif">\r
+       </property>\r
+       <property\r
+             name="startupForegroundColor"\r
+             value="000000">\r
+       </property>\r
+       <property\r
+             name="startupMessageRect"\r
+             value="7,432,360,20">\r
+       </property>\r
+       <property\r
+             name="startupProgressRect"\r
+             value="5,447,366,15">\r
+       </property>\r
+       <property\r
+             name="preferenceCustomization"\r
+             value="plugin_customization.ini">\r
+       </property>\r
+    </product>\r
+ </extension>\r
 \r
 </plugin>\r
index f601910995936c84f3439be8d9521b3c7f7df1ec..a96e189be32ba8e28fc671816be5dbc43c6f4e24 100644 (file)
@@ -1,40 +1,39 @@
 <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">
-  <parent>
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+       <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>taxeditor-parent</artifactId>
-    <version>3.0</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>eu.etaxonomy</groupId>
-  <artifactId>eu.etaxonomy.taxeditor.application</artifactId>
-  <packaging>jar</packaging>
-  <version>3.0</version>
-  <name>Application</name>
-  <description>All plugins are combined into this application.</description>
-  <url>http://dev.e-taxonomy.eu/trac/wiki/TaxonomicEditor</url>
-  <dependencies>
-    <dependency>
-               <groupId>eu.etaxonomy</groupId>
-               <artifactId>eu.etaxonomy.taxeditor.store</artifactId>
-       </dependency>
-       <dependency>
-               <groupId>eu.etaxonomy</groupId>
-               <artifactId>eu.etaxonomy.taxeditor.navigation</artifactId>
-       </dependency>
-       <dependency>
-               <groupId>eu.etaxonomy</groupId>
-               <artifactId>eu.etaxonomy.taxeditor.editor</artifactId>
-       </dependency>
-       <dependency>
-               <groupId>eu.etaxonomy</groupId>
-               <artifactId>eu.etaxonomy.taxeditor.printpublisher</artifactId>
-       </dependency>
-       <dependency>
-               <groupId>org.eclipse.equinox.p2</groupId>
-               <artifactId>operations</artifactId>
-       </dependency>
-  </dependencies>
+       <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>
index ae9923349ac31dcb411aca00e4d4407ba1d787d3..f60adf5de0dd86d73482c68e121b85c0e32dd6e6 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EDIT Taxonomic Editor - Bulk Editor Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.bulkeditor;singleton:=true
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 3.0.6.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin
 Bundle-Vendor: EDIT
@@ -11,8 +11,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.ui.editors,
  org.eclipse.core.expressions,
- eu.etaxonomy.taxeditor.cdmlib;bundle-version="3.0.0",
- eu.etaxonomy.taxeditor.store
+ eu.etaxonomy.taxeditor.store,
+ eu.etaxonomy.taxeditor.cdmlib
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.core.runtime,
index 8d2c37403c91557bbe9e986d0f02a6e5c42b0c81..54ec746667cce6476777acc7b6e8d37f8e2eb323 100644 (file)
@@ -1,39 +1,38 @@
 <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">
-  
-    <parent>
-       <groupId>eu.etaxonomy</groupId>
-       <artifactId>taxeditor-parent</artifactId>
-      <version>3.0</version>
-  </parent>
-  
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>eu.etaxonomy</groupId>
-  <artifactId>eu.etaxonomy.taxeditor.bulkeditor</artifactId>
-  <packaging>jar</packaging>
-  <version>3.0</version>
-  <name>Bulkeditor Bundle</name>
-  <url>http://dev.e-taxonomy.eu/trac/wiki/TaxonomicEditorBulkeditorBundle</url>
-  <dependencies>
-      <dependency>
-               <groupId>eu.etaxonomy</groupId>
-               <artifactId>eu.etaxonomy.taxeditor.store</artifactId>
-       </dependency>
-       <dependency>
-                       <groupId>org.eclipse.ui</groupId>
-                       <artifactId>editors</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.core</groupId>
-                       <artifactId>filebuffers</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.ui.workbench</groupId>
-                       <artifactId>texteditor</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.core</groupId>
-                       <artifactId>resources</artifactId>
-               </dependency>
-  </dependencies>
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+       <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.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>
index ed622db19a0e3fdfb945d8c6696ecb658bbd5888..1dfcb223e632c62b1c89bce75c956db8e76dfaac 100644 (file)
@@ -2,7 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CDM Library Plug-in
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.cdmlib;singleton:=true
-Bundle-Version: 3.0.0.qualifier
+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,
@@ -106,15 +107,15 @@ Bundle-ClassPath: lib/activation-1.1.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/cdmlib-services-3.0.5-SNAPSHOT.jar,
- lib/cdmlib-commons-3.0.6-SNAPSHOT.jar,
- lib/cdmlib-ext-3.0.6-SNAPSHOT.jar,
- lib/cdmlib-io-3.0.6-SNAPSHOT.jar,
- lib/cdmlib-model-3.0.6-SNAPSHOT.jar,
- lib/cdmlib-persistence-3.0.6-SNAPSHOT.jar,
- lib/cdmlib-print-3.0.6-SNAPSHOT.jar,
- lib/cdmlib-remote-3.0.6-SNAPSHOT.jar,
- lib/cdmlib-services-3.0.6-SNAPSHOT.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,
@@ -881,4 +882,4 @@ Export-Package: com.google.api,
 Bundle-Vendor: EDIT
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.osgi,
- org.eclipse.equinox.common;bundle-version="3.6.0"
+ org.eclipse.equinox.common
index 6a05b9cf7adcd72e5b9e053eca872b45c57b47b3..50c031a3c73eaf1dfed191febb7a7eac895b4205 100644 (file)
@@ -2,16 +2,17 @@ bin.includes = META-INF/,\
                lib/,\\r
                lib/mysql-connector-java-5.0.5.jar,\\r
                lib/junit-4.8.1.jar,\\r
-               lib/cdmlib-commons-3.0.6-SNAPSHOT.jar,\\r
-               lib/cdmlib-ext-3.0.6-SNAPSHOT.jar,\\r
-               lib/cdmlib-io-3.0.6-SNAPSHOT.jar,\\r
-               lib/cdmlib-model-3.0.6-SNAPSHOT.jar,\\r
-               lib/cdmlib-persistence-3.0.6-SNAPSHOT.jar,\\r
-               lib/cdmlib-print-3.0.6-SNAPSHOT.jar,\\r
-               lib/cdmlib-remote-3.0.6-SNAPSHOT.jar,\\r
-               lib/cdmlib-services-3.0.6-SNAPSHOT.jar,\\r
                lib/spring-security-config-3.0.5.RELEASE.jar,\\r
-               lib/spring-security-core-3.0.5.RELEASE.jar\r
+               lib/spring-security-core-3.0.5.RELEASE.jar,\\r
+               lib/servlet-2.5.0.jar,\\r
+               lib/cdmlib-commons-3.0.7-SNAPSHOT.jar,\\r
+               lib/cdmlib-ext-3.0.7-SNAPSHOT.jar,\\r
+               lib/cdmlib-io-3.0.7-SNAPSHOT.jar,\\r
+               lib/cdmlib-model-3.0.7-SNAPSHOT.jar,\\r
+               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
 jars.compile.order = cdmLibrary.jar\r
 src.includes = lib/\r
 jre.compilation.profile = J2SE-1.6\r
@@ -82,5 +83,7 @@ bin.excludes = lib/activation-1.1src.zip,\
                lib/cdmlib-model-3.0.6-SNAPSHOT-sources.jar,\\r
                lib/cdmlib-io-3.0.6-SNAPSHOT-sources.jar,\\r
                lib/cdmlib-ext-3.0.6-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-commons-3.0.6-SNAPSHOT-sources.jar\r
+               lib/cdmlib-commons-3.0.6-SNAPSHOT-sources.jar,\\r
+               lib/cdmlib-commons-3.0.6-SNAPSHOT.jar,\\r
+               lib/cdmlib-ext-3.0.6-SNAPSHOT.jar\r
 \r
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.common-3.6.0.v20100503.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.common-3.6.0.v20100503.jar
new file mode 100644 (file)
index 0000000..b9800a7
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.common-3.6.0.v20100503.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.osgi-3.6.2.R36x_v20110210.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.osgi-3.6.2.R36x_v20110210.jar
new file mode 100644 (file)
index 0000000..35d7dfc
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.osgi-3.6.2.R36x_v20110210.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/servlet-2.5.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/servlet-2.5.0.jar
new file mode 100644 (file)
index 0000000..f26b78b
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/servlet-2.5.0.jar differ
index 0956a886f286b14fae7ca1c364c24e84619d1262..a92ce31a84e8bae73933a24f0eeecb18f6e573e2 100644 (file)
@@ -5,16 +5,33 @@
        <parent>\r
                <groupId>eu.etaxonomy</groupId>\r
                <artifactId>taxeditor-parent</artifactId>\r
-               <version>3.0</version>\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
+               <plugins>\r
+                       <plugin>\r
+                               <groupId>org.apache.maven.plugins</groupId>\r
+                               <artifactId>maven-jar-plugin</artifactId>\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
@@ -33,7 +50,7 @@
                      <excludeTransitive>true</excludeTransitive>\r
                    </configuration>\r
                  </execution>\r
-                 <execution>\r
+                 <!-- execution>\r
                    <id>copy-dependencies-sources</id>\r
                    <phase>validate</phase>\r
                    <goals>\r
@@ -47,7 +64,7 @@
                      <overWriteSnapshots>true</overWriteSnapshots>\r
                      <excludeTransitive>true</excludeTransitive>\r
                    </configuration>\r
-                 </execution>\r
+                 </execution-->\r
                </executions>\r
              </plugin>\r
            </plugins>\r
                <dependency>\r
                        <groupId>eu.etaxonomy</groupId>\r
                        <artifactId>cdmlib-commons</artifactId>\r
+                       <version>${cdmlib.version}</version>\r
                </dependency>\r
                <dependency>\r
                        <groupId>eu.etaxonomy</groupId>\r
                        <artifactId>cdmlib-model</artifactId>\r
+                       <version>${cdmlib.version}</version>\r
                </dependency>\r
                <dependency>\r
                        <groupId>eu.etaxonomy</groupId>\r
                        <artifactId>cdmlib-persistence</artifactId>\r
+                       <version>${cdmlib.version}</version>\r
                </dependency>\r
                <dependency>\r
                        <groupId>eu.etaxonomy</groupId>\r
                        <artifactId>cdmlib-remote</artifactId>\r
+                       <version>${cdmlib.version}</version>\r
                </dependency>\r
                <dependency>\r
                        <groupId>eu.etaxonomy</groupId>\r
                        <artifactId>cdmlib-print</artifactId>\r
+                       <version>${cdmlib.version}</version>\r
                </dependency>\r
                <dependency>\r
                        <groupId>eu.etaxonomy</groupId>\r
                        <artifactId>cdmlib-services</artifactId>\r
+                       <version>${cdmlib.version}</version>\r
                </dependency>\r
                <dependency>\r
                        <groupId>eu.etaxonomy</groupId>\r
                        <artifactId>cdmlib-io</artifactId>\r
+                       <version>${cdmlib.version}</version>\r
                </dependency>\r
                <dependency>\r
                        <groupId>eu.etaxonomy</groupId>\r
                        <artifactId>cdmlib-ext</artifactId>\r
+                       <version>${cdmlib.version}</version>\r
                </dependency>\r
        </dependencies>\r
 </project>
\ No newline at end of file
index d63b1058d0240bc438aee1ad95b6bd4397a347f3..cfa5fcb99ea03ddb8d18f7acccbb0e7bb1e0bd86 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.editor;singleton:=true
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 3.0.6.qualifier
 Bundle-ClassPath: .,icons/
 Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin
 Bundle-Vendor: %Bundle-Vendor.0
@@ -31,11 +31,11 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.core.expressions,
  org.eclipse.ui.forms,
- eu.etaxonomy.taxeditor.cdmlib;bundle-version="3.0.0",
  eu.etaxonomy.taxeditor.store,
  eu.etaxonomy.taxeditor.bulkeditor,
  org.eclipse.zest.core,
- org.eclipse.zest.layouts
+ org.eclipse.zest.layouts,
+ eu.etaxonomy.taxeditor.cdmlib
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.core.databinding.beans,
index f91983f7474a122415ec4bf84c65c35cc2dcfe60..4c434ef68a020b2f38beb7359a71dbe99cf80aa0 100644 (file)
@@ -6,6 +6,3 @@ bin.includes = META-INF/,\
                plugin.properties,\
                icons/,\
                p2.inf
-source.icons/ = src/main/java/,\
-                src/main/resources/,\
-                src/test/java/
index f83e2569f942cbdd4846bcf04f25dc81d0c9710d..f5adc6407613981b27ec4121c0c9cbfff0d4d278 100644 (file)
@@ -4,49 +4,35 @@
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
-    <version>3.0</version>
+    <version>3.0.6-SNAPSHOT</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>eu.etaxonomy.taxeditor.editor</artifactId>
-  <packaging>jar</packaging>
-  <version>3.0</version>
+  <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>
   
-  <dependencies>
-    <dependency>
-               <groupId>eu.etaxonomy</groupId>
-               <artifactId>eu.etaxonomy.taxeditor.store</artifactId>
-       </dependency>
-       <dependency>
-               <groupId>eu.etaxonomy</groupId>
-               <artifactId>eu.etaxonomy.taxeditor.bulkeditor</artifactId>
-       </dependency>
-       <dependency>
-               <groupId>org.eclipse.core</groupId>
-               <artifactId>resources</artifactId>
-       </dependency>
-       <dependency>
-               <groupId>org.eclipse.ui</groupId>
-               <artifactId>forms</artifactId>
-       </dependency>
-       <dependency>
-               <groupId>org.eclipse.ui</groupId>
-               <artifactId>editors</artifactId>
-       </dependency>
-       <dependency>
-               <groupId>org.eclipse.ui.workbench</groupId>
-               <artifactId>texteditor</artifactId>
-       </dependency>
-       <dependency>
-          <groupId>org.apache.commons</groupId>
-          <artifactId>commons-io</artifactId>
-       </dependency>
-       <dependency>
-          <groupId>com.google.api</groupId>
-          <artifactId>translate</artifactId>
-       </dependency>
-  </dependencies>
+  <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/.project b/eu.etaxonomy.taxeditor.feature.platform/.project
deleted file mode 100644 (file)
index f12c041..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-       <name>eu.etaxonomy.taxeditor.feature.platform</name>
-       <comment></comment>
-       <projects>
-       </projects>
-       <buildSpec>
-               <buildCommand>
-                       <name>org.eclipse.pde.FeatureBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-       </buildSpec>
-       <natures>
-               <nature>org.eclipse.pde.FeatureNature</nature>
-       </natures>
-</projectDescription>
index 41db9bebbe0ec1891719cf58592e9b224b1f44fd..b6ffda4ceaa042fbc03c28bb85f40eeffd3a2860 100644 (file)
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature.platform"
       label="Taxeditor Dependencies"
-      version="3.0.0.qualifier"
+      version="3.0.6.qualifier"
       os="linux,macosx,win32"
       ws="cocoa,gtk,win32"
       arch="x86,x86_64">
@@ -81,16 +81,6 @@ Software distributed under the License is distributed on an &quot;AS IS&quot; ba
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.core.filesystem.macosx"
-         os="macosx"
-         arch="x86,x86_64"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.core.jobs"
          download-size="0"
@@ -178,6 +168,7 @@ Software distributed under the License is distributed on an &quot;AS IS&quot; ba
    <plugin
          id="org.eclipse.equinox.security.macosx"
          os="macosx"
+         ws="cocoa"
          arch="x86,x86_64"
          download-size="0"
          install-size="0"
@@ -895,17 +886,28 @@ Software distributed under the License is distributed on an &quot;AS IS&quot; ba
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.pde.junit.runtime"
+         id="org.eclipse.jdt.junit.runtime"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="javax.servlet"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.jdt.junit.runtime"
+         id="org.eclipse.core.filesystem.macosx"
+         os="macosx"
+         ws="cocoa"
+         arch="x86,x86_64"
          download-size="0"
          install-size="0"
          version="0.0.0"
+         fragment="true"
          unpack="false"/>
 
 </feature>
diff --git a/eu.etaxonomy.taxeditor.feature.platform/pom.xml b/eu.etaxonomy.taxeditor.feature.platform/pom.xml
new file mode 100644 (file)
index 0000000..0e2e99d
--- /dev/null
@@ -0,0 +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>
diff --git a/eu.etaxonomy.taxeditor.feature/buckminster.cspex b/eu.etaxonomy.taxeditor.feature/buckminster.cspex
deleted file mode 100644 (file)
index 9fe0c56..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cspecExtension
-       xmlns:com="http://www.eclipse.org/buckminster/Common-1.0"
-       xmlns="http://www.eclipse.org/buckminster/CSpec-1.0">
-
-       <actions>
-               <public name="create.product" actor="ant">
-            <actorProperties>
-                <property key="buildFile" value="build/product.ant"/>
-                <property key="targets" value="create.product"/>
-            </actorProperties>
-            <properties>
-                <property key="profile" value="TaxonomicEditorProfile"/>
-                <property key="iu" value="eu.etaxonomy.taxeditor"/>
-            </properties>
-                       <prerequisites alias="repository">
-                               <attribute name="site.p2"/>
-                       </prerequisites>
-            <products alias="destination" base="${buckminster.output}">
-                <path path="TaxonomicEditor.${target.ws}.${target.os}.${target.arch}/"/>
-            </products>
-               </public>
-               <public name="create.product.zip" actor="ant">
-            <actorProperties>
-                <property key="buildFileId" value="buckminster.pdetasks"/>
-                <property key="targets" value="create.zip"/>
-            </actorProperties>
-                       <prerequisites alias="action.requirements">
-                               <attribute name="create.product"/>
-                       </prerequisites>
-            <products alias="action.output" base="${buckminster.output}">
-                <path path="TaxonomicEditor.${target.ws}.${target.os}.${target.arch}.zip"/>
-            </products>
-               </public>
-       </actions>
-</cspecExtension>
diff --git a/eu.etaxonomy.taxeditor.feature/buckminster.properties b/eu.etaxonomy.taxeditor.feature/buckminster.properties
deleted file mode 100644 (file)
index 5edee33..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-# buckminster.properties
-# ----------------------
-# These properties control how buckminster performs a build, where output should be placed,
-# where temporary files should be kept, and where options for signing, packing, and
-# platforms are stated.
-#
-
-# Where all the output should go
-buckminster.output.root=${user.home}/tmp/feature
-
-# Where the temp files should go
-buckminster.temp.root=${user.home}/tmp/feature/taxeditor.tmp
-
-# How .qualifier in versions should be replaced
-qualifier.replacement.*=generator:lastModified
-#generator.lastModified.format='v'yyyyMMdd-HHmm
-#qualifier.replacement.*=generator:lastRevision
-#generator.lastRevision.format=r{0,number,00000}
-#qualifier.replacement.*=generator:buildTimestamp
-#generator.buildTimestamp.format='v'yyyyMMdd'_'HHmm
-
-# Sets the Java compiler compliance level
-org.eclipse.buckminster.core.jdt.compliancelevel= 1.6
-
-# Should source bundles be built and included
-#cbi.include.source=true
-cbi.include.source=false
-
-
-# If a site should use pack200, turn off for faster build
-# site.pack200=true
-
-# If a site should be signed
-# site.signing=true
-
-# If a site should be signed locally, or remotely at Eclipse
-# signing.type=eclipse.remote
-
-# Should local signing be performed
-# local.sign=true
-
-build.type=R
-
-# What platforms should be built, * for "all"
-target.os=*
-target.ws=*
-target.arch=*
-
-buckminster.p2.site=http://download.eclipse.org/tools/buckminster/headless-3.6
-director.url=http://download.eclipse.org/tools/buckminster/products/director_latest.zip
diff --git a/eu.etaxonomy.taxeditor.feature/buckminster_product.properties b/eu.etaxonomy.taxeditor.feature/buckminster_product.properties
deleted file mode 100644 (file)
index dbbe4d5..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-# Where all the output should go
-buckminster.output.root=${user.home}/tmp/EDIT_Taxonomic_Editor
-# Where the temp files should go
-buckminster.temp.root=${user.home}/tmp/buildtmp
-# How .qualifier in versions should be replaced
-qualifier.replacement.*=generator:lastRevision
-
-target.os=macosx
-target.ws=cocoa
-target.arch=x86_64
\ No newline at end of file
index e10104d9e67165a498d54a65308b541f25456873..f1201a6d35262e5656307d64f4e7729484c48ab6 100644 (file)
@@ -1,3 +1,6 @@
 bin.includes = plugin_customization.ini,\
                feature.xml
-p2.gathering = true
+
+category.id.eu.etaxonomy=EDIT
+category.description.eu.etaxonomy=EDIT Taxonomic Editor
+category.members.eu.etaxonomy=eu.etaxonomy.taxeditor.feature
diff --git a/eu.etaxonomy.taxeditor.feature/build/product.ant b/eu.etaxonomy.taxeditor.feature/build/product.ant
deleted file mode 100644 (file)
index 89047ed..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-<project>
-       <property name="eclipse.home" value="/Applications/eclipse-helios"/> 
-       
-       <pathconvert property="equinox.launcher.jar">
-          <first count="1">
-            <sort>
-              <fileset dir="${eclipse.home}/plugins" includes="**/org.eclipse.equinox.launcher_*.jar"/>
-              <reverse xmlns="antlib:org.apache.tools.ant.types.resources.comparators">
-                <date/>
-              </reverse>
-            </sort>
-          </first>
-        </pathconvert>
-
-       <target name="create.product">
-               <property name="destination" location="${sp:destination}"/>
-               <delete dir="${destination}"></delete>
-               <makeurl property="repository" file="${sp:repository}"/>
-               <mkdir dir="${destination}"/>
-               <echoproperties ></echoproperties>
-               <echo message="${equinox.launcher.jar}"/>
-               <echo message="${repository}"/>
-               <echo message="${destination}"/>
-               <java jar="${equinox.launcher.jar}" fork="true" failonerror="true" >
-                       <arg value="-application"/>
-                       <arg value="org.eclipse.equinox.p2.director"/>
-                       <arg value="-artifactRepository"/>
-                       <arg value="${repository}"/>
-                       <arg value="-metadataRepository"/>
-                       <arg value="${repository}"/>
-                       <arg value="-destination"/>
-                       <arg value="${destination}"/>
-                       <arg value="-bundlepool"/>
-                       <arg value="${destination}"/>
-                       <arg value="-profile"/>
-                       <arg value="${profile}"/>
-                       <arg value="-profileProperties" />
-                       <arg value="org.eclipse.update.install.features=true" />
-                       <arg value="-installIU"/>
-                       <arg value="${iu}"/>
-                       <arg value="-p2.os" />
-                       <arg value="${target.os}" />
-                       <arg value="-p2.ws" />
-                       <arg value="${target.ws}" />
-                       <arg value="-p2.arch" />
-                       <arg value="${target.arch}" />
-                       <arg value="-consoleLog"/>
-                       <jvmarg value="-Declipse.p2.data.area=${destination}/p2"/>
-                       <jvmarg value="-Declipse.p2.profile=${profile}"/>
-               </java>
-       </target>
-</project>
\ No newline at end of file
index fe62c4dcab3f5d940c11a724b5ed16f878b1ece8..0f73c3dcb15294d65d79053ccb8f58807025848e 100644 (file)
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature"
       label="Taxonomic Editor"
-      version="3.0.0.qualifier"
+      version="3.0.6.qualifier"
       provider-name="EDIT"
       plugin="eu.etaxonomy.taxeditor.application"
       os="linux,macosx,win32"
@@ -68,48 +68,55 @@ Software distributed under the License is distributed on an &quot;AS IS&quot; ba
          id="eu.etaxonomy.taxeditor.application"
          download-size="0"
          install-size="0"
-         version="3.0.0.qualifier"
+         version="3.0.6.qualifier"
          unpack="false"/>
 
    <plugin
          id="eu.etaxonomy.taxeditor.bulkeditor"
          download-size="0"
          install-size="0"
-         version="3.0.0.qualifier"
+         version="3.0.6.qualifier"
          unpack="false"/>
 
    <plugin
          id="eu.etaxonomy.taxeditor.editor"
          download-size="0"
          install-size="0"
-         version="3.0.0.qualifier"
+         version="3.0.6.qualifier"
          unpack="false"/>
 
    <plugin
          id="eu.etaxonomy.taxeditor.navigation"
          download-size="0"
          install-size="0"
-         version="3.0.0.qualifier"
+         version="3.0.6.qualifier"
          unpack="false"/>
 
    <plugin
          id="eu.etaxonomy.taxeditor.store"
          download-size="0"
          install-size="0"
-         version="3.0.0.qualifier"
+         version="3.0.6.qualifier"
          unpack="false"/>
 
    <plugin
          id="eu.etaxonomy.taxeditor.printpublisher"
          download-size="0"
          install-size="0"
-         version="3.0.0.qualifier"
+         version="3.0.6.qualifier"
          unpack="false"/>
 
    <plugin
          id="eu.etaxonomy.taxeditor.cdmlib"
          download-size="0"
          install-size="0"
-         version="3.0.0.qualifier"/>
+         version="3.0.6.qualifier"/>
+
+   <plugin
+         id="javax.servlet"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
 </feature>
diff --git a/eu.etaxonomy.taxeditor.feature/pom.xml b/eu.etaxonomy.taxeditor.feature/pom.xml
new file mode 100644 (file)
index 0000000..bee5549
--- /dev/null
@@ -0,0 +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>
diff --git a/eu.etaxonomy.taxeditor.feature/site.cquery b/eu.etaxonomy.taxeditor.feature/site.cquery
deleted file mode 100644 (file)
index 3d9e7c2..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cq:componentQuery xmlns:cq="http://www.eclipse.org/buckminster/CQuery-1.0" resourceMap="site.rmap">
-    <cq:rootRequest name="eu.etaxonomy.taxeditor.feature" componentType="eclipse.feature"/>
-</cq:componentQuery>
diff --git a/eu.etaxonomy.taxeditor.feature/site.rmap b/eu.etaxonomy.taxeditor.feature/site.rmap
deleted file mode 100644 (file)
index 512c320..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rmap
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns="http://www.eclipse.org/buckminster/RMap-1.0"
-    xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0"
-    xmlns:mp="http://www.eclipse.org/buckminster/MavenProvider-1.0"
-    xmlns:pp="http://www.eclipse.org/buckminster/PDEMapProvider-1.0">
-    <searchPath name="resources">
-        <provider readerType="local" componentTypes="osgi.bundle,eclipse.feature"
-                  mutable="true" source="true">
-            <uri format="file:///{0}/{1}/">
-                <bc:propertyRef key="workspace.root" />
-        <!--provider readerType="svn" componentTypes="osgi.bundle,eclipse.feature" source="true">
-            <uri format="http://dev.e-taxonomy.eu/svn/trunk/taxeditor/{0}"-->
-                <bc:propertyRef key="buckminster.component" />
-            </uri>
-        </provider>
-    </searchPath>
-    
-    <locator searchPathRef="resources"/>
-</rmap>
\ No newline at end of file
index 9124ce60742890835fba9953964393e13f5d0936..96f67a4ca3a41b800e0d9da39b06cf4963ef977d 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EDIT Taxonomic Editor - Navigation Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.navigation;singleton:=true
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 3.0.6.qualifier
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.cdm,
  eu.etaxonomy.taxeditor.navigation,
@@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.navigator,
  org.eclipse.ui.navigator.resources,
  org.eclipse.core.expressions,
- eu.etaxonomy.taxeditor.cdmlib;bundle-version="3.0.0",
+ eu.etaxonomy.taxeditor.cdmlib,
  eu.etaxonomy.taxeditor.store,
  eu.etaxonomy.taxeditor.editor
 Bundle-ActivationPolicy: lazy
index 5f6fe3aa9569ccdde29d175fb188cf24098177ca..e03aa9535280c93fce0114d06416812534d8b76a 100644 (file)
@@ -1,34 +1,41 @@
 <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">
-  
-  <parent>
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+       <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>taxeditor-parent</artifactId>
-    <version>3.0</version>
-  </parent>
-  
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>eu.etaxonomy</groupId>
-  <artifactId>eu.etaxonomy.taxeditor.navigation</artifactId>
-  <packaging>jar</packaging>
-  <version>3.0</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>
-  
-  <dependencies>
-    <dependency>
-               <groupId>eu.etaxonomy</groupId>
-               <artifactId>eu.etaxonomy.taxeditor.store</artifactId>
-       </dependency>
-       <dependency>
-               <groupId>eu.etaxonomy</groupId>
-               <artifactId>eu.etaxonomy.taxeditor.editor</artifactId>
-       </dependency>
-  </dependencies>
-  
+       <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>
 
 
index e6dd07aa3ef3bb3fdab9d8170ff077e7b46bc458..dc5f39a1b923bcdbfc9aac28e3ff1acf70282a6d 100644 (file)
@@ -43,7 +43,7 @@ public class NewTaxonNodeHandler extends AbstractHandler implements IHandler {
                if(status == IStatus.OK && wizard.openInEditor()){
                        if(wizard.openEmpty()){
                                NavigationUtil.openEmpty(wizard.getParentTreeNode().getUuid());
-                       }else{
+                       }else if(wizard.getTaxonNode() != null){
                                NavigationUtil.openEditor(wizard.getTaxonNode());
                        }
                }       
index 031f87bec908da83e5217baf97af3a55cc841d36..fbe3c587779746f18b8623e1aa9409c42353fa16 100644 (file)
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EDIT Taxonomic Editor - Print Publisher Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.printpublisher;singleton:=true
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 3.0.6.qualifier
 Require-Bundle: org.eclipse.osgi,
  org.eclipse.ui,
- eu.etaxonomy.taxeditor.cdmlib;bundle-version="3.0.0",
+ eu.etaxonomy.taxeditor.cdmlib,
  eu.etaxonomy.taxeditor.editor,
  eu.etaxonomy.taxeditor.store
 Import-Package: org.apache.log4j,
index 72220a1cd911c697ae6f3a027c1781710296e011..ff6ef481c0b386e269817128a9590c1de3ba5e69 100644 (file)
@@ -1,41 +1,38 @@
 <?xml version="1.0"?>
-<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">
+<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">
        <parent>
                <artifactId>taxeditor-parent</artifactId>
                <groupId>eu.etaxonomy</groupId>
-               <version>3.0</version>
+               <version>3.0.6-SNAPSHOT</version>
        </parent>
-       
+
        <modelVersion>4.0.0</modelVersion>
-       
        <groupId>eu.etaxonomy</groupId>
-       
        <artifactId>eu.etaxonomy.taxeditor.printpublisher</artifactId>
-       
-       <packaging>jar</packaging>
-       
-       <version>3.0</version>
+       <packaging>eclipse-plugin</packaging>
+       <version>3.0.6-SNAPSHOT</version>
        
        <name>Printpublisher Bundle</name>
-       
+       <description></description>
        <url>http://wp5.e-taxonomy.eu/printpublisher</url>
-       
-       <dependencies>
-               <dependency>
-                       <groupId>eu.etaxonomy</groupId>
-                       <artifactId>cdmlib-print</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>eu.etaxonomy</groupId>
-                       <artifactId>eu.etaxonomy.taxeditor.store</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>eu.etaxonomy</groupId>
-                       <artifactId>eu.etaxonomy.taxeditor.editor</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse</groupId>
-                       <artifactId>jface</artifactId>
-               </dependency>
-       </dependencies>
+
+       <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>
index 1b3205c502dc75d3af7a70f53627e04351427ad2..199ab03914a22fffe8282f60f73ea848e94ce346 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EDIT Taxonomic Editor - DataStore Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.store;singleton:=true
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 3.0.6.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin
 Bundle-Vendor: EDIT
 Export-Package: dbscripts,
@@ -59,7 +59,7 @@ Require-Bundle: org.eclipse.osgi,
  org.eclipse.jface.text,
  org.eclipse.pde.runtime,
  org.eclipse.ui.forms;bundle-version="3.5.0",
- eu.etaxonomy.taxeditor.cdmlib;bundle-version="3.0.0"
+ eu.etaxonomy.taxeditor.cdmlib
 Import-Package: org.eclipse.core.commands,
  org.eclipse.core.commands.operations,
  org.eclipse.core.expressions,
index 925934e50ff1d92c868e24dda037b16c48abeb72..c90745fbf4e9d287b039ccb51535610342163c16 100644 (file)
@@ -2,6 +2,7 @@ source.. = src/main/java/,\
            src/test/java/,\
            src/main/resources/,\
            src/test/resources/
+output.. = target/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
index 9b6a2ce1b36d99e075d6161a4014c4f76d6dce15..91d90d1403fc8e1416396e05f77cb84466b72a29 100644 (file)
@@ -4,70 +4,36 @@
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
-       <version>3.0</version>
+       <version>3.0.6-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>eu.etaxonomy.taxeditor.store</artifactId>
-  <packaging>jar</packaging>
-  <version>3.0</version>
+  <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>
        
-  <dependencies>
-    <dependency>
-               <groupId>eu.etaxonomy</groupId>
-               <artifactId>cdmlib-services</artifactId>
-       </dependency>
-       <dependency>
-               <groupId>eu.etaxonomy</groupId>
-               <artifactId>cdmlib-io</artifactId>
-       </dependency>
-       <dependency>
-               <groupId>eu.etaxonomy</groupId>
-               <artifactId>cdmlib-ext</artifactId>
-       </dependency>
-       <dependency>
-               <groupId>eu.etaxonomy</groupId>
-               <artifactId>cdmlib-persistence</artifactId>
-       </dependency>
-       <dependency>
-               <groupId>org.eclipse.core</groupId>
-               <artifactId>commands</artifactId>
-       </dependency>
-       <dependency>
-               <groupId>org.eclipse.ui</groupId>
-               <artifactId>workbench</artifactId>
-       </dependency>
-       <dependency>
-               <groupId>org.eclipse.ui</groupId>
-               <artifactId>navigator</artifactId>
-       </dependency>
-       <dependency>
-               <groupId>org.eclipse.ui</groupId>
-               <artifactId>ide</artifactId>
-       </dependency>
-       <dependency>
-               <groupId>org.eclipse.equinox.p2.metadata</groupId>
-               <artifactId>repository</artifactId>
-       </dependency>
-       <dependency>
-               <groupId>org.eclipse.ecf</groupId>
-               <artifactId>filetransfer</artifactId>
-       </dependency>
-       <dependency>
-               <groupId>org.eclipse.ecf.provider</groupId>
-               <artifactId>filetransfer</artifactId>
-       </dependency>
-       <dependency>
-               <groupId>org.eclipse</groupId>
-               <artifactId>swt</artifactId>
-       </dependency>
-       <dependency>
-               <groupId>org.eclipse.swt.cocoa</groupId>
-               <artifactId>macosx</artifactId>
-       </dependency>
-  </dependencies>
+  
+  <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>
index cdafe54211060c94b411abdc8afe28100c176620..983785da1fc30be6b6f58fe5a82db84dafc7a445 100644 (file)
@@ -14,6 +14,7 @@ import eu.etaxonomy.cdm.model.taxon.ITreeNode;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
 import eu.etaxonomy.taxeditor.ui.section.classification.TaxonNodeWizardPage;
 
 /**
@@ -43,10 +44,12 @@ public class NewTaxonNodeWizard extends AbstractNewEntityWizard<ITreeNode>{
                        getConversationHolder().bind();
                        ITreeNode parent = getParentTreeNode();
                        Taxon taxon = taxonNodePage.getTaxon();
-                       TaxonNode taxonNode = parent.addChildTaxon(taxon, parent.getReference(), parent.getMicroReference(), null);
-                       
-                       
-                       generatedTaxonNodeUuid = CdmStore.getService(ITaxonNodeService.class).saveOrUpdate(taxonNode);
+                       try{
+                               TaxonNode taxonNode = parent.addChildTaxon(taxon, parent.getReference(), parent.getMicroReference(), null);
+                               generatedTaxonNodeUuid = CdmStore.getService(ITaxonNodeService.class).saveOrUpdate(taxonNode);
+                       }catch(IllegalArgumentException e){
+                               StoreUtil.warningDialog("Taxon already exists in classfication", getClass(), e.getMessage());
+                       }
                }
        }
 
index f5e8c9e3d49ebf605f081f9762630de254f17396..601847e640683910a6522636389fd46bfe7d07dc 100644 (file)
@@ -17,7 +17,6 @@ import org.eclipse.jface.dialogs.IInputValidator;
 import org.eclipse.jface.dialogs.InputDialog;
 import org.eclipse.jface.window.Window;
 import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.editors.text.EditorsUI;
 
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 
similarity index 88%
rename from eu.etaxonomy.taxeditor.feature/taxeditor.product
rename to eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
index aba752b5f1b66e9f94ccc330f4b7188352757cba..acc858c0673d2a8803dabb4b40d9a8f6f26c6bf7 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor" id="eu.etaxonomy.taxeditor.application.product" application="eu.etaxonomy.taxeditor.application.application" useFeatures="true" includeLaunchers="true">
+<product name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" application="eu.etaxonomy.taxeditor.application.application" version="3.0.6.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
       startupProgressRect="5,447,366,15"
       startupMessageRect="7,432,360,20"
       startupForegroundColor="000000" />
-   <launcher name="TaxonomicEditor">
+   <launcher name="eclipse">
       <solaris/>
       <win useIco="false">
          <bmp/>
       </win>
    </launcher>
 
-
    <vm>
    </vm>
 
@@ -51,7 +50,7 @@ Software distributed under the License is distributed on an &amp;quot;AS IS&amp;
    </plugins>
 
    <features>
-      <feature id="eu.etaxonomy.taxeditor.feature" version="3.0.0.qualifier"/>
+      <feature id="eu.etaxonomy.taxeditor.feature" version="3.0.6.qualifier"/>
    </features>
 
    <configurations>
diff --git a/eu.etaxonomy.taxeditor/plugin_customization.ini b/eu.etaxonomy.taxeditor/plugin_customization.ini
new file mode 100644 (file)
index 0000000..333fab9
--- /dev/null
@@ -0,0 +1 @@
+org.eclipse.ui/SHOW_PROGRESS_ON_STARTUP = true
diff --git a/eu.etaxonomy.taxeditor/pom.xml b/eu.etaxonomy.taxeditor/pom.xml
new file mode 100644 (file)
index 0000000..acb005c
--- /dev/null
@@ -0,0 +1,50 @@
+<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>
+       <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>
+       <url>http://wp5.e-taxonomy.eu/taxeditor</url>
+
+       <build>
+               <plugins>
+                       <!-- plugin> <groupId>org.sonatype.tycho</groupId> <artifactId>maven-osgi-packaging-plugin</artifactId> 
+                               <version>${tycho.version}</version> <configuration> <environments> <environment> 
+                               <os>macosx</os> <ws>cocoa</ws> <arch>x86</arch> </environment> <environment> 
+                               <os>linux</os> <ws>gtk</ws> <arch>x86</arch> </environment> <environment> 
+                               <os>win32</os> <ws>win32</ws> <arch>x86</arch> </environment> </environments> 
+                               </configuration> </plugin -->
+                       <plugin>
+                               <groupId>org.eclipse.tycho</groupId>
+                               <artifactId>tycho-p2-director-plugin</artifactId>
+                               <version>${tycho.version}</version>
+                               <executions>
+                                       <execution>
+                                               <id>materialize-products</id>
+                                               <goals>
+                                                       <goal>materialize-products</goal>
+                                               </goals>
+                                       </execution>
+                                       <execution>
+                                               <id>archive-products</id>
+                                               <goals>
+                                                       <goal>archive-products</goal>
+                                               </goals>
+                                       </execution>
+                               </executions>
+                       </plugin>
+               </plugins>
+       </build>
+
+</project>
\ No newline at end of file
similarity index 83%
rename from eu.etaxonomy.taxeditor.feature/rcp.target
rename to eu.etaxonomy.taxeditor/rcp.target
index b693c88e2aa3b43c529435f3e8562637d2d1ecf6..7f4c8d099e0bccb34d53418bdf5faf240370cb76 100644 (file)
@@ -1,25 +1,23 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
-<?pde version="3.6"?>\r
-\r
-<target name="Eclipse Helios Target">\r
-<locations>\r
-<location includeAllPlatforms="true" includeMode="slicer" type="InstallableUnit">\r
-<unit id="org.eclipse.equinox.executable.feature.group" version="3.4.2.R36x_v20110125-7N7K7bF8zk1BAKMh0iz0t94miBLY"/>\r
-<unit id="org.eclipse.platform.source.feature.group" version="3.6.2.r362_v20110210-9gF78Gs1FrIGnHDHWkEcopoN8AmxeZflGDGKQi"/>\r
-<unit id="org.eclipse.platform.sdk" version="3.6.2.M20110210-1200"/>\r
-<unit id="org.eclipse.pde.feature.group" version="3.6.2.r362_v20110203-7b7mFL2FET3dhHalh1iNZtL"/>\r
-<unit id="org.eclipse.rcp.sdk.id" version="3.6.0.M20110210-1200"/>\r
-<unit id="org.eclipse.zest.feature.group" version="1.2.0.v20100519-2050-67818yE6F-AA7P4B8I52322"/>\r
-<unit id="org.eclipse.pde.junit.runtime.addon.feature.group" version="1.0.0.v20100831"/>\r
-<unit id="org.eclipse.pde.junit.runtime.standalone.feature.group" version="1.0.0.v20100831"/>\r
-<repository location="http://download.eclipse.org/releases/helios"/>\r
-</location>\r
-<location includeAllPlatforms="true" includeMode="slicer" type="InstallableUnit">\r
-<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>\r
-<unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>\r
-<unit id="org.eclipse.swtbot.ide.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>\r
-<unit id="org.eclipse.swtbot.eclipse.test.junit4.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>\r
-<repository location="http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site"/>\r
-</location>\r
-</locations>\r
-</target>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.6"?>
+
+<target name="Eclipse Helios Target">
+<locations>
+<location includeAllPlatforms="true" includeMode="slicer" type="InstallableUnit">
+<unit id="org.eclipse.equinox.executable.feature.group" version="3.4.2.R36x_v20110125-7N7K7bF8zk1BAKMh0iz0t94miBLY"/>
+<unit id="org.eclipse.platform.source.feature.group" version="3.6.2.r362_v20110210-9gF78Gs1FrIGnHDHWkEcopoN8AmxeZflGDGKQi"/>
+<unit id="org.eclipse.platform.sdk" version="3.6.2.M20110210-1200"/>
+<unit id="org.eclipse.pde.feature.group" version="3.6.2.r362_v20110203-7b7mFL2FET3dhHalh1iNZtL"/>
+<!--unit id="org.eclipse.rcp.sdk.id" version="3.6.0.M20110210-1200"/-->
+<unit id="org.eclipse.zest.feature.group" version="1.2.0.v20100519-2050-67818yE6F-AA7P4B8I52322"/>
+<repository location="http://download.eclipse.org/releases/helios"/>
+</location>
+<location includeAllPlatforms="true" includeMode="slicer" type="InstallableUnit">
+<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>
+<unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>
+<unit id="org.eclipse.swtbot.ide.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>
+<unit id="org.eclipse.swtbot.eclipse.test.junit4.feature.group" version="2.0.4.20110304_0338-e5aff47-dev-e36"/>
+<repository location="http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site"/>
+</location>
+</locations>
+</target>