reverted all changes using maven to setup jre bundle . will do this in a bash script...

diff --git a/.gitattributes b/.gitattributes
index 09a07e4cab3567495cd151e216a804dd00459fb7..0a98a61bf49434baaffae5513022449514b69890 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -648,7 +648,6 @@ eu.etaxonomy.taxeditor.feature/LICENSE.TXT -text
 eu.etaxonomy.taxeditor.feature/README.txt -text
 eu.etaxonomy.taxeditor.feature/build.properties -text
 eu.etaxonomy.taxeditor.feature/build.properties.with.jre -text
-eu.etaxonomy.taxeditor.feature/build.properties.wo.jre -text
 eu.etaxonomy.taxeditor.feature/feature.xml -text
 eu.etaxonomy.taxeditor.feature/pom.xml -text
 eu.etaxonomy.taxeditor.help/.classpath -text
@@ -1849,7 +1848,6 @@ eu.etaxonomy.taxeditor/README.txt -text
 eu.etaxonomy.taxeditor/deploy_nightly.sh -text
 eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product -text
 eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre -text
-eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.wo.jre -text
 eu.etaxonomy.taxeditor/plugin_customization.ini -text
 eu.etaxonomy.taxeditor/pom.xml -text
 eu.etaxonomy.taxeditor/rcp.target -text

diff --git a/eu.etaxonomy.taxeditor.feature/build.properties b/eu.etaxonomy.taxeditor.feature/build.properties
index 30f68d152ce802dcfa0eb2399ee01c1a11018049..9a1585c104f474d89d6f3dc8ce50210602a894d2 100644 (file)
--- a/eu.etaxonomy.taxeditor.feature/build.properties
+++ b/eu.etaxonomy.taxeditor.feature/build.properties
@@ -3,3 +3,14 @@ bin.includes = feature.xml
 category.id.eu.etaxonomy=EDIT
 category.description.eu.etaxonomy=EDIT Taxonomic Editor
 category.members.eu.etaxonomy=eu.etaxonomy.taxeditor.feature
+
+root.linux.gtk.x86_64=linux-64
+root.linux.gtk.x86_64.permissions.755=jre/bin/**
+root.linux.gtk.x86=linux-32
+root.linux.gtk.x86.permissions.755=jre/bin/**
+root.win32.win32.x86_64=win-64
+root.win32.win32.x86_64.permissions.755=jre/bin/**
+root.win32.win32.x86=win-32
+root.win32.win32.x86.permissions.755=jre/bin/**
+root.macosx.cocoa.x86_64=mac-64
+root.macosx.cocoa.x86_64.permissions.755=jre/bin/**
\ No newline at end of file

diff --git a/eu.etaxonomy.taxeditor.feature/build.properties.with.jre b/eu.etaxonomy.taxeditor.feature/build.properties.with.jre
index 9a1585c104f474d89d6f3dc8ce50210602a894d2..73564880ab8a98167a170b6ea6baf7e95a4185d6 100644 (file)
--- a/eu.etaxonomy.taxeditor.feature/build.properties.with.jre
+++ b/eu.etaxonomy.taxeditor.feature/build.properties.with.jre
@@ -1,8 +1,3 @@
-bin.includes = feature.xml
-
-category.id.eu.etaxonomy=EDIT
-category.description.eu.etaxonomy=EDIT Taxonomic Editor
-category.members.eu.etaxonomy=eu.etaxonomy.taxeditor.feature
 
 root.linux.gtk.x86_64=linux-64
 root.linux.gtk.x86_64.permissions.755=jre/bin/**

diff --git a/eu.etaxonomy.taxeditor.feature/build.properties.wo.jre b/eu.etaxonomy.taxeditor.feature/build.properties.wo.jre
deleted file mode 100644 (file)
index 30f68d1..0000000
--- a/eu.etaxonomy.taxeditor.feature/build.properties.wo.jre
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml
-
-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/pom.xml b/eu.etaxonomy.taxeditor.feature/pom.xml
index d74bb65adc017420e4884dbbf4ff1f4ff585ba27..0b5b622ff3cded2a0c0195c27bd0a21a6e79cb07 100644 (file)
--- a/eu.etaxonomy.taxeditor.feature/pom.xml
+++ b/eu.etaxonomy.taxeditor.feature/pom.xml
@@ -13,108 +13,4 @@
   <name>Taxonomic Editor Feature</name>
   <description />
   <url>http://dev.e-taxonomy.eu/trac/wiki/TaxonomicEditorEditorBundle</url>
-  <properties>
-    <linux.64.dir>linux-64</linux.64.dir>
-    <linux.32.dir>linux-32</linux.32.dir>
-    <win.64.dir>win-64</win.64.dir>
-    <win.32.dir>win-32</win.32.dir>
-    <mac.64.dir>mac-64</mac.64.dir>
-  </properties>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-clean-plugin</artifactId>
-        <version>2.6.1</version>
-        <configuration>
-          <filesets>
-            <fileset>
-              <directory>${basedir}</directory>
-              <followSymlinks>false</followSymlinks>
-              <includes>
-                <include>${linux.64.dir}</include>
-                <include>${linux.32.dir}</include>
-                <include>${win.64.dir}</include>
-                <include>${win.32.dir}</include>
-                <include>${mac.64.dir}</include>
-              </includes>
-            </fileset>
-          </filesets>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <profiles>
-    <profile>
-      <!-- Installs the jre bundle, which is done by 1) setting up symbolic 
-        links in the feature to the jre directories as set in the ~/.m2/settings.xml 
-        2) copying a properties file which contains the jre settings -->
-      <id>bundleJre</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <version>1.8</version>
-            <executions>
-              <execution>
-                <id>linkJREDirs</id>
-                <phase>validate</phase>
-                <configuration>
-                  <target>
-                    <echo>Recreating links to various OS JREs</echo>
-                    <symlink action="delete" link="${basedir}/${linux.64.dir}" />
-                    <symlink link="${basedir}/${linux.64.dir}"
-                      resource="${jre.root.dir}/${linux.64.dir}" />
-                    <symlink action="delete" link="${basedir}/${linux.32.dir}" />
-                    <symlink link="${basedir}/${linux.32.dir}"
-                      resource="${jre.root.dir}/${linux.32.dir}" />
-                    <symlink action="delete" link="${basedir}/${win.64.dir}" />
-                    <symlink link="${basedir}/${win.64.dir}"
-                      resource="${jre.root.dir}/${win.64.dir}" />
-                    <symlink action="delete" link="${basedir}/${win.32.dir}" />
-                    <symlink link="${basedir}/${win.32.dir}"
-                      resource="${jre.root.dir}/${win.32.dir}" />
-                    <symlink action="delete" link="${basedir}/${mac.64.dir}" />
-                    <symlink link="${basedir}/${mac.64.dir}"
-                      resource="${jre.root.dir}/${mac.64.dir}" />
-                  </target>
-                </configuration>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-              </execution>
-              <execution>
-                <id>setPropertiesWithJRE</id>
-                <phase>validate</phase>
-                <configuration>
-                  <target>
-                    <copy overwrite="true" force="true"
-                      file="${basedir}/build.properties.with.jre"
-                      tofile="${basedir}/build.properties" />
-                  </target>
-                </configuration>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-              </execution>
-              <execution>
-                <id>setPropertiesWithoutJRE</id>
-                <phase>clean</phase>
-                <configuration>
-                  <target>
-                    <copy overwrite="true" force="true"
-                      file="${basedir}/build.properties.wo.jre" tofile="${basedir}/build.properties" />
-                  </target>
-                </configuration>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
 </project>

diff --git a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
index 89a8ed0a7042782e3d0e6175f145feba21e34462..3415fd1391f7c39a2d989fbb0600bfc3df878a73 100644 (file)
--- a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
+++ b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <?pde version="3.5"?>\r
 \r
-<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.5.0.qualifier" useFeatures="true" includeLaunchers="true">\r
+<product name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product.jre" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" application="eu.etaxonomy.taxeditor.application.application" version="3.5.0.qualifier" useFeatures="true" includeLaunchers="true">\r
 \r
    <aboutInfo>\r
       <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>\r
@@ -14,7 +14,7 @@
    </configIni>\r
 \r
    <launcherArgs>\r
-      <programArgs>-data @user.home/.cdmLibrary -Dserver_port=58080</programArgs>\r
+      <programArgs>-data @user.home/.cdmLibrary -Dserver_port=58080 -vm jre/bin</programArgs>\r
       <vmArgs>-Xmx512M -XX:MaxPermSize=256M -Dorg.eclipse.update.reconcile=false -Declipse.p2.unsignedPolicy=allow</vmArgs>\r
       <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>\r
    </launcherArgs>\r

diff --git a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.wo.jre b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.wo.jre
deleted file mode 100644 (file)
index 89a8ed0..0000000
--- a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.wo.jre
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<?pde version="3.5"?>\r
-\r
-<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.5.0.qualifier" useFeatures="true" includeLaunchers="true">\r
-\r
-   <aboutInfo>\r
-      <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>\r
-      <text>\r
-         %productBlurb\r
-      </text>\r
-   </aboutInfo>\r
-\r
-   <configIni use="default">\r
-   </configIni>\r
-\r
-   <launcherArgs>\r
-      <programArgs>-data @user.home/.cdmLibrary -Dserver_port=58080</programArgs>\r
-      <vmArgs>-Xmx512M -XX:MaxPermSize=256M -Dorg.eclipse.update.reconcile=false -Declipse.p2.unsignedPolicy=allow</vmArgs>\r
-      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>\r
-   </launcherArgs>\r
-\r
-   <windowImages i16="/eu.etaxonomy.taxeditor.application/icons/256color_16x16.gif" i32="/eu.etaxonomy.taxeditor.application/icons/256color_32x32.gif" i48="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>\r
-\r
-   <splash\r
-      location="eu.etaxonomy.taxeditor.application"\r
-      startupProgressRect="5,447,366,15"\r
-      startupMessageRect="7,432,360,20"\r
-      startupForegroundColor="000000" />\r
-   <launcher name="TaxonomicEditor">\r
-      <solaris/>\r
-      <win useIco="false">\r
-         <bmp/>\r
-      </win>\r
-   </launcher>\r
-\r
-   <vm>\r
-   </vm>\r
-\r
-   <plugins>\r
-   </plugins>\r
-\r
-   <features>\r
-      <feature id="eu.etaxonomy.taxeditor.feature"/>\r
-   </features>\r
-\r
-   <configurations>\r
-      <plugin id="eu.etaxonomy.taxeditor.application" autoStart="true" startLevel="5" />\r
-      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />\r
-      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />\r
-      <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />\r
-      <plugin id="org.eclipse.equinox.p2.transport.ecf" autoStart="true" startLevel="4" />\r
-      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />\r
-   </configurations>\r
-\r
-</product>\r

diff --git a/eu.etaxonomy.taxeditor/pom.xml b/eu.etaxonomy.taxeditor/pom.xml
index 7e7c37700a9c474dba61f32ab81da860938ebbe4..22a984e6858bea290219823898f4b1305a62a6d3 100644 (file)
--- a/eu.etaxonomy.taxeditor/pom.xml
+++ b/eu.etaxonomy.taxeditor/pom.xml
@@ -13,8 +13,7 @@
   <name>EDIT Taxonomic Editor Product</name>
   <description>The EDIT Taxonomic Desktop Editor</description>
   <url>http://wp5.e-taxonomy.eu/taxeditor</url>
-  <properties>
-    <jre.vm>-vm jre/bin</jre.vm>
+  <properties>    
     <product.id>eu.etaxonomy.taxeditor.product</product.id>
   </properties>
   <build>
@@ -132,50 +131,6 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <!-- Configures the editor to lanuch using the packaged jre by adding 
-        the '-vm jre/bin' option the eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product -->
-      <id>bundleJre</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <version>1.8</version>
-            <executions>
-              <execution>
-                <id>setProductWithJRE</id>
-                <phase>validate</phase>
-                <configuration>
-                  <target>
-                    <copy overwrite="true" force="true"
-                      file="${basedir}/eu.etaxonomy.taxeditor.product.with.jre"
-                      tofile="${basedir}/eu.etaxonomy.taxeditor.product" />
-                  </target>
-                </configuration>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-              </execution>
-              <execution>
-                <id>setProductWithoutJRE</id>
-                <phase>clean</phase>
-                <configuration>
-                  <target>
-                    <copy overwrite="true" force="true"
-                      file="${basedir}/eu.etaxonomy.taxeditor.product.wo.jre"
-                      tofile="${basedir}/eu.etaxonomy.taxeditor.product" />
-                  </target>
-                </configuration>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
   </profiles>
 
 </project>
\ No newline at end of file