eu.etaxonomy.taxeditor.feature/pom.xml, build.properties.with.jre/wo.jre : configuration for jre dir symlinks and root dir properties
removing jre dir since they will be created dynamically
pom.xml : added check to make sure that the jre bundle can only be done on linux
eu.etaxonomy.taxeditor.feature.platform/pom.xml -text
eu.etaxonomy.taxeditor.feature/.project -text
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
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/selection/TaxonSelectionElementTest.java -text
eu.etaxonomy.taxeditor/.classpath -text
eu.etaxonomy.taxeditor/.project -text
+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
category.id.eu.etaxonomy=EDIT
category.description.eu.etaxonomy=EDIT Taxonomic Editor
category.members.eu.etaxonomy=eu.etaxonomy.taxeditor.feature
-#root.win32.win32.x86_64 = win-64-jre
-#root.win32.win32.x86 = win-32-jre
-#root.linux.gtk.x86=linux-32-jre
-#root.linux.gtk.x86_64=linux-64-jre
-#root.macosx.cocoa.x86_64=mac-64-jre
\ No newline at end of file
--- /dev/null
+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
--- /dev/null
+bin.includes = feature.xml
+
+category.id.eu.etaxonomy=EDIT
+category.description.eu.etaxonomy=EDIT Taxonomic Editor
+category.members.eu.etaxonomy=eu.etaxonomy.taxeditor.feature
<?xml version="1.0" encoding="UTF-8"?>
-<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.5.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>eu.etaxonomy.taxeditor.feature</artifactId>
- <packaging>eclipse-feature</packaging>
-
- <name>Taxonomic Editor Feature</name>
- <description/>
- <url>http://dev.e-taxonomy.eu/trac/wiki/TaxonomicEditorEditorBundle</url>
+<project 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.5.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>eu.etaxonomy.taxeditor.feature</artifactId>
+ <packaging>eclipse-feature</packaging>
+
+ <name>Taxonomic Editor Feature</name>
+ <description />
+ <url>http://dev.e-taxonomy.eu/trac/wiki/TaxonomicEditorEditorBundle</url>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.8</version>
+ <executions>
+ <execution>
+ <id>setPropertiesWithoutJRE</id>
+ <phase>validate</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>
+ <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>deleteJRESymLinks</id>
+ <phase>clean</phase>
+ <configuration>
+ <target>
+ <echo>Deleting sym links to various OS JREs</echo>
+ <symlink action="delete" link="${basedir}/${linux.64.dir}" />
+ <symlink action="delete" link="${basedir}/${linux.32.dir}" />
+ <symlink action="delete" link="${basedir}/${win.64.dir}" />
+ <symlink action="delete" link="${basedir}/${win.32.dir}" />
+ <symlink action="delete" link="${basedir}/${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>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
--- /dev/null
+when updating the eu.etaxonomy.taxeditor.product file make sure to apply the updates on both
+eu.etaxonomy.taxeditor.product.with.jre and
+eu.etaxonomy.taxeditor.product.wo.jre
\ No newline at end of file
</configIni>\r
\r
<launcherArgs>\r
- <programArgs>-data @user.home/.cdmLibrary -Dserver_port=58080 </programArgs>\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
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>\r
+<?pde version="3.5"?>\r
+\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
+ <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 -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
+\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
--- /dev/null
+<?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
<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>
+ <product.id>eu.etaxonomy.taxeditor.product</product.id>
+ </properties>
<build>
<plugins>
<plugin>
<configuration>
<products>
<product>
- <id>eu.etaxonomy.taxeditor.product</id>
+ <id>${product.id}</id>
<rootFolder>EDIT Taxonomic Editor</rootFolder>
</product>
</products>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.8</version>
+ <executions>
+ <execution>
+ <id>setProductWithoutJRE</id>
+ <phase>validate</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>
<profiles>
</profile>
<profile>
<!-- Upload the repo to the server -->
- <!-- ATTENTION : This does not work well currently since the file permissions
- are set with read permission set to off after upload -->
+ <!-- ATTENTION : This does not work well currently since the file permissions
+ are set with read permission set to off after upload -->
<id>uploadRepo</id>
<build>
<plugins>
</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>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
-<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">
<modelVersion>4.0.0</modelVersion>
<prerequisites>
<maven>3.0</maven>
<version>3.5.0-SNAPSHOT</version>
<name>EDIT Taxonomic Editor</name>
<description>The Taxonomic Editor for EDIT's platform for
- cybertaxonomy</description>
- <url>http://cybertaxonomy.eu/taxeditor//taxeditor//taxeditor//taxeditor//taxeditor//taxeditor//taxeditor/</url>
+ cybertaxonomy
+ </description>
+ <url>http://cybertaxonomy.eu/taxeditor//taxeditor//taxeditor//taxeditor//taxeditor//taxeditor//taxeditor/
+ </url>
<inceptionYear>2007</inceptionYear>
<packaging>pom</packaging>
<properties>
<module>eu.etaxonomy.taxeditor</module>
</modules>
<scm>
- <connection>scm:svn:http://dev.e-taxonomy.eu/svn/trunk/taxeditor/</connection>
- <developerConnection>scm:svn:https://dev.e-taxonomy.eu/svn/trunk/taxeditor/</developerConnection>
+ <connection>scm:svn:http://dev.e-taxonomy.eu/svn/trunk/taxeditor/
+ </connection>
+ <developerConnection>scm:svn:https://dev.e-taxonomy.eu/svn/trunk/taxeditor/
+ </developerConnection>
<url>https://dev.e-taxonomy.eu/trac/browser/trunk/taxeditor/</url>
</scm>
<mailingLists>
edit-taxonomic-editor+unsubscribe@googlegroups.com
</unsubscribe>
<post>edit-taxonomic-editor@googlegroups.com</post>
- <archive>http://groups.google.com/group/edit-taxonomic-editor/topics</archive>
+ <archive>http://groups.google.com/group/edit-taxonomic-editor/topics
+ </archive>
</mailingList>
</mailingLists>
<licenses>
<role>Java Developer</role>
<role>Architect</role>
</roles>
- <url/>
+ <url />
</developer>
<developer>
<!-- your SVN account id please! -->
<role>Java Developer</role>
<role>Architect</role>
</roles>
- <url/>
+ <url />
</developer>
</developers>
<issueManagement>
</issueManagement>
<ciManagement>
<system>Jenkins</system>
- <url>http://160.45.63.201/jenkins/view/EDIT%20Taxonomic%20Editor/</url>
+ <url>http://160.45.63.201/jenkins/view/EDIT%20Taxonomic%20Editor/
+ </url>
</ciManagement>
<!-- **** REPOSITORIES **** -->
<profiles>
</repository>
</repositories>
</profile>
+ <profile>
+ <!-- Installs the jre bundle, which is done by 1) copying the jre directories
+ as set in the ~/.m2/settings.xml to the corresponding folders in the feature
+ dir 2) 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>checkJREBundleOS</id>
+ <phase>validate</phase>
+ <configuration>
+ <target>
+ <echo>Checking if JRE bundle can be configured</echo>
+ <fail
+ message="Copy of JRE folder possible only on Unix (and Unix like systems)">
+ <condition>
+ <not>
+ <os family="unix" />
+ </not>
+ </condition>
+ </fail>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
<repositories>
<!-- the cdm internal repository -->
<repository>
<id>eclipse-indigo</id>
<layout>p2</layout>
- <url>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/</url>
+ <url>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/
+ </url>
</repository>
- <!-- The nebula repository (retention period 2 years starting Q32014) set here is an archived one
- so as to have a stable version of the jar when building the editor . Refer to #4452 for details -->
+ <!-- The nebula repository (retention period 2 years starting Q32014)
+ set here is an archived one so as to have a stable version of the jar when
+ building the editor . Refer to #4452 for details -->
<repository>
<id>eclipse-nebula</id>
<layout>p2</layout>
- <url>http://download.eclipse.org/technology/nebula/archives/Q32014/release/</url>
+ <url>http://download.eclipse.org/technology/nebula/archives/Q32014/release/
+ </url>
</repository>
<repository>
<id>eclipse-swtbot</id>
<site>
<id>wp5.e-taxonomy.eu</id>
<name>EDIT Taxonomic Editor</name>
- <url>scpexe://wp5.e-taxonomy.eu/var/www/wp5.e-taxonomy.eu/taxeditor/</url>
+ <url>scpexe://wp5.e-taxonomy.eu/var/www/wp5.e-taxonomy.eu/taxeditor/
+ </url>
</site>
<repository>
<uniqueVersion>false</uniqueVersion>
<id>wp5.e-taxonomy.eu</id>
<name>Edit Maven Repository</name>
- <url>scpexe://wp5.e-taxonomy.eu/var/www/wp5.e-taxonomy.eu/mavenrepo/</url>
+ <url>scpexe://wp5.e-taxonomy.eu/var/www/wp5.e-taxonomy.eu/mavenrepo/
+ </url>
</repository>
</distributionManagement>
</project>