Automatic building
authorn.hoffmann <n.hoffmann@localhost>
Wed, 16 Mar 2011 10:21:07 +0000 (10:21 +0000)
committern.hoffmann <n.hoffmann@localhost>
Wed, 16 Mar 2011 10:21:07 +0000 (10:21 +0000)
15 files changed:
.gitattributes
.gitignore
pom.xml
taxeditor-feature-product/.project [deleted file]
taxeditor-feature-product/buckminster.cspex [deleted file]
taxeditor-feature-product/buckminster.properties [deleted file]
taxeditor-feature-product/buckminster_product.properties [deleted file]
taxeditor-feature-product/build.properties [deleted file]
taxeditor-feature-product/build/product.ant [deleted file]
taxeditor-feature-product/category.xml [deleted file]
taxeditor-feature-product/feature.xml [deleted file]
taxeditor-feature-product/rcp.target [deleted file]
taxeditor-feature-product/site.cquery [deleted file]
taxeditor-feature-product/site.rmap [deleted file]
taxeditor-feature-product/taxeditor.product [deleted file]

index fde9c79307b6c7a881bb884fe86732261c172f2a..973e8d00c889235f5e30fd5cb8c9d1ded46fcb84 100644 (file)
@@ -507,18 +507,6 @@ taxeditor-editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/Swap
 taxeditor-feature-platform/.project -text
 taxeditor-feature-platform/build.properties -text
 taxeditor-feature-platform/feature.xml -text
-taxeditor-feature-product/.project -text
-taxeditor-feature-product/buckminster.cspex -text
-taxeditor-feature-product/buckminster.properties -text
-taxeditor-feature-product/buckminster_product.properties -text
-taxeditor-feature-product/build.properties -text
-taxeditor-feature-product/build/product.ant -text
-taxeditor-feature-product/category.xml -text
-taxeditor-feature-product/feature.xml -text
-taxeditor-feature-product/rcp.target -text
-taxeditor-feature-product/site.cquery -text
-taxeditor-feature-product/site.rmap -text
-taxeditor-feature-product/taxeditor.product -text
 taxeditor-navigation/META-INF/MANIFEST.MF -text
 taxeditor-navigation/build.properties -text
 taxeditor-navigation/icons/edit_16x16.gif -text
index 63443faa71035fc6aba08b2fa28aa82dcd46e72c..b41441f6ccd71c7d03fc6b777c8c79e2d026d903 100644 (file)
@@ -90,9 +90,6 @@ taxeditor-editor/.classpath
 taxeditor-editor/.project
 taxeditor-editor/.settings
 taxeditor-editor/target
-taxeditor-feature-product/compile.eu.etaxonomy.taxeditor.product.feature.xml
-taxeditor-feature-product/plugin_customization.ini
-taxeditor-feature-product/workspace
 taxeditor-navigation/.classpath
 taxeditor-navigation/.project
 taxeditor-navigation/.settings
diff --git a/pom.xml b/pom.xml
index f04ee0c331801c048fe47c847913e5002313e85e..1a23a3e5c661fcb0582ece5ebe162f14f3743907 100644 (file)
--- a/pom.xml
+++ b/pom.xml
        <modules>
                <module>taxeditor-cdmlib</module>
                <module>taxeditor-store</module>
+       <module>taxeditor-ui</module>
                <module>taxeditor-navigation</module>
                <module>taxeditor-editor</module>
                <module>taxeditor-bulkeditor</module>
                <module>taxeditor-printpublisher</module>
                <module>taxeditor-annotatedlineeditor</module>
                <module>taxeditor-application</module>
-       </modules>
+  </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>
                        </dependency>
                </dependencies>
        </dependencyManagement>
-</project>
+</project>
\ No newline at end of file
diff --git a/taxeditor-feature-product/.project b/taxeditor-feature-product/.project
deleted file mode 100644 (file)
index e98d0dc..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-       <name>taxeditor-feature-product</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>
diff --git a/taxeditor-feature-product/buckminster.cspex b/taxeditor-feature-product/buckminster.cspex
deleted file mode 100644 (file)
index 00e1f2d..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/"/>
-            </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.zip"/>
-            </products>
-               </public>
-       </actions>
-</cspecExtension>
diff --git a/taxeditor-feature-product/buckminster.properties b/taxeditor-feature-product/buckminster.properties
deleted file mode 100644 (file)
index f438ec6..0000000
+++ /dev/null
@@ -1,38 +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
-
-# Where the temp files should go
-buckminster.temp.root=${user.home}/tmp/taxeditor.tmp
-
-# How .qualifier in versions should be replaced
-qualifier.replacement.*=generator:lastRevision
-
-# How the qualifier (last revision) should be formatted
-generator.lastRevision.format=r{0,number,00000}
-
-# 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
-
-# Should source bundles be built and included
-#cbi.include.source=false
-
-# What platforms should be built, * for "all"
-target.os=*
-target.ws=*
-target.arch=*
diff --git a/taxeditor-feature-product/buckminster_product.properties b/taxeditor-feature-product/buckminster_product.properties
deleted file mode 100644 (file)
index f9f4990..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=win32
-target.ws=win32
-target.arch=x86
\ No newline at end of file
diff --git a/taxeditor-feature-product/build.properties b/taxeditor-feature-product/build.properties
deleted file mode 100644 (file)
index 2f461a3..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-bin.includes = plugin_customization.ini,\\r
-               feature.xml\r
-p2.gathering = true\r
diff --git a/taxeditor-feature-product/build/product.ant b/taxeditor-feature-product/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
diff --git a/taxeditor-feature-product/category.xml b/taxeditor-feature-product/category.xml
deleted file mode 100644 (file)
index e5a2afd..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-   <feature url="features/eu.etaxonomy.taxeditor.feature_3.0.0.qualifier.jar" id="eu.etaxonomy.taxeditor.feature" version="3.0.0.qualifier" os="linux,macosx,win32" ws="cocoa,gtk,win32" arch="x86">
-      <category name="eu.etaxonomy.taxeditor.category"/>
-   </feature>
-   <category-def name="eu.etaxonomy.taxeditor.category" label="EDIT Taxonomic Editor"/>
-</site>
diff --git a/taxeditor-feature-product/feature.xml b/taxeditor-feature-product/feature.xml
deleted file mode 100644 (file)
index ba188a7..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="eu.etaxonomy.taxeditor.feature"
-      label="Taxonomic Editor"
-      version="3.0.0.qualifier"
-      provider-name="EDIT"
-      plugin="eu.etaxonomy.taxeditor.application"
-      os="linux,macosx,win32"
-      ws="cocoa,gtk,win32"
-      arch="x86,x86_64">
-
-   <description url="http://www.example.com/description">
-      [Enter Feature Description here.]
-   </description>
-
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
-   </copyright>
-
-   <license url="http://www.mozilla.org/MPL/">
-      The contents of this file are subject to the Mozilla Public License Version 1.1 (the &quot;License&quot;); you may not use this file except in compliance with the License. You may obtain a copy of the License at
-http://www.mozilla.org/MPL/
-
-Software distributed under the License is distributed on an &quot;AS IS&quot; basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License.
-   </license>
-
-   <url>
-      <update label="EDIT Taxonomic Editor" url="http://wp5.e-taxonomy.eu/taxeditor/update"/>
-   </url>
-
-   <includes
-         id="eu.etaxonomy.taxeditor.feature.platform"
-         version="0.0.0"/>
-
-   <requires>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.equinox.ds"/>
-      <import plugin="org.eclipse.equinox.util"/>
-      <import plugin="org.eclipse.equinox.p2.core"/>
-      <import plugin="org.eclipse.equinox.p2.ui"/>
-      <import plugin="org.eclipse.equinox.p2.ui.sdk"/>
-      <import plugin="org.eclipse.equinox.p2.updatechecker"/>
-      <import plugin="org.eclipse.equinox.p2.operations"/>
-      <import plugin="org.eclipse.equinox.app"/>
-      <import plugin="org.eclipse.osgi"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.core.expressions"/>
-      <import plugin="eu.etaxonomy.taxeditor.cdmlib" version="3.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui.forms"/>
-      <import plugin="org.eclipse.core.databinding.beans"/>
-      <import plugin="org.eclipse.core.databinding.observable"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.jface.databinding"/>
-      <import plugin="org.eclipse.ui.navigator"/>
-      <import plugin="org.eclipse.ui.navigator.resources"/>
-      <import plugin="org.eclipse.core.jobs"/>
-      <import plugin="org.eclipse.pde.runtime"/>
-      <import plugin="org.junit"/>
-      <import plugin="org.eclipse.core.commands"/>
-      <import plugin="org.eclipse.jface"/>
-      <import plugin="org.eclipse.swt"/>
-      <import plugin="org.eclipse.equinox.common" version="3.6.0" match="greaterOrEqual"/>
-   </requires>
-
-   <plugin
-         id="eu.etaxonomy.taxeditor.application"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="eu.etaxonomy.taxeditor.bulkeditor"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="eu.etaxonomy.taxeditor.editor"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="eu.etaxonomy.taxeditor.navigation"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="eu.etaxonomy.taxeditor.store"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="eu.etaxonomy.taxeditor.printpublisher"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="eu.etaxonomy.taxeditor.cdmlib"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-</feature>
diff --git a/taxeditor-feature-product/rcp.target b/taxeditor-feature-product/rcp.target
deleted file mode 100644 (file)
index 12fa016..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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>
-</locations>
-</target>
diff --git a/taxeditor-feature-product/site.cquery b/taxeditor-feature-product/site.cquery
deleted file mode 100644 (file)
index ab6d133..0000000
+++ /dev/null
@@ -1,5 +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.site" componentType="eclipse.feature"/>
-</cq:componentQuery>
\ No newline at end of file
diff --git a/taxeditor-feature-product/site.rmap b/taxeditor-feature-product/site.rmap
deleted file mode 100644 (file)
index 5a7bbd3..0000000
+++ /dev/null
@@ -1,20 +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" />
-                <bc:propertyRef key="buckminster.component" />
-            </uri>
-        </provider>
-    </searchPath>
-    <locator searchPathRef="resources"/>
-</rmap>
\ No newline at end of file
diff --git a/taxeditor-feature-product/taxeditor.product b/taxeditor-feature-product/taxeditor.product
deleted file mode 100644 (file)
index 53bf93e..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-<?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" version="3.0.0.qualifier" useFeatures="true" includeLaunchers="true">
-
-   <aboutInfo>
-      <image path="/taxeditor-application/icons/256color_48x48.gif"/>
-      <text>
-         %productBlurb
-      </text>
-   </aboutInfo>
-
-   <configIni use="default">
-   </configIni>
-
-   <launcherArgs>
-      <programArgs>-data @user.home/.cdmLibrary</programArgs>
-      <vmArgs>-Xmx512M -XX:MaxPermSize=256M</vmArgs>
-      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
-   </launcherArgs>
-
-   <windowImages i16="/taxeditor-application/icons/256color_16x16.gif" i32="/taxeditor-application/icons/256color_32x32.gif" i48="/taxeditor-application/icons/256color_48x48.gif"/>
-
-   <splash
-      location="eu.etaxonomy.taxeditor.application"
-      startupProgressRect="5,447,366,15"
-      startupMessageRect="7,432,360,20"
-      startupForegroundColor="000000" />
-   <launcher name="TaxonomicEditor">
-      <solaris/>
-      <win useIco="false">
-         <bmp/>
-      </win>
-   </launcher>
-
-   <vm>
-   </vm>
-
-   <license>
-        <url>http://www.mozilla.org/MPL/</url>
-        <text>
-   The contents of this file are subject to the Mozilla Public License Version 1.1 (the &amp;quot;License&amp;quot;); you may not use this file except in compliance with the License. You may obtain a copy of the License at
-http://www.mozilla.org/MPL/
-
-Software distributed under the License is distributed on an &amp;quot;AS IS&amp;quot; basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License.
-         </text>
-   </license>
-
-   <plugins>
-   </plugins>
-
-   <features>
-      <feature id="eu.etaxonomy.taxeditor.feature" version="3.0.0.qualifier"/>
-   </features>
-
-   <configurations>
-      <plugin id="eu.etaxonomy.taxeditor.application" autoStart="true" startLevel="4" />
-   </configurations>
-
-</product>