p2izing the editor

diff --git a/.gitattributes b/.gitattributes
index 7f533df8cc3d80cc9779f6f96150bbfe05738b80..7853a0378181aa30a8386819e4cea7a6a6a5dcbb 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -626,13 +626,13 @@ taxeditor-annotatedlineeditor/pom.xml -text
 taxeditor-annotatedlineeditor/src/main/java/eu/etaxonomy/App.java -text
 taxeditor-annotatedlineeditor/target/mvn-eclipse-cache.properties -text
 taxeditor-application/META-INF/MANIFEST.MF -text
 taxeditor-annotatedlineeditor/src/main/java/eu/etaxonomy/App.java -text
 taxeditor-annotatedlineeditor/target/mvn-eclipse-cache.properties -text
 taxeditor-application/META-INF/MANIFEST.MF -text

-taxeditor-application/TaxEditor.product -text

 taxeditor-application/build.properties -text
 taxeditor-application/icons/256color_16x16.gif -text
 taxeditor-application/icons/256color_32x32.gif -text
 taxeditor-application/icons/256color_48x48.gif -text
 taxeditor-application/icons/256color_48x48.ico -text
 taxeditor-application/icons/edit_16x16.gif -text
 taxeditor-application/build.properties -text
 taxeditor-application/icons/256color_16x16.gif -text
 taxeditor-application/icons/256color_32x32.gif -text
 taxeditor-application/icons/256color_48x48.gif -text
 taxeditor-application/icons/256color_48x48.ico -text
 taxeditor-application/icons/edit_16x16.gif -text

+taxeditor-application/p2.inf -text

 taxeditor-application/plugin.properties -text
 taxeditor-application/plugin.xml -text
 taxeditor-application/plugin_customization.ini -text
 taxeditor-application/plugin.properties -text
 taxeditor-application/plugin.xml -text
 taxeditor-application/plugin_customization.ini -text


@@ -654,6 +654,7 @@ taxeditor-bulkeditor/META-INF/MANIFEST.MF -text
 taxeditor-bulkeditor/build.properties -text
 taxeditor-bulkeditor/icons/merge_candidate.gif -text
 taxeditor-bulkeditor/icons/merge_target.gif -text
 taxeditor-bulkeditor/build.properties -text
 taxeditor-bulkeditor/icons/merge_candidate.gif -text
 taxeditor-bulkeditor/icons/merge_target.gif -text

+taxeditor-bulkeditor/p2.inf -text

 taxeditor-bulkeditor/plugin.xml -text
 taxeditor-bulkeditor/pom.xml -text
 taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/AnnotatedLineDocumentProvider.java -text
 taxeditor-bulkeditor/plugin.xml -text
 taxeditor-bulkeditor/pom.xml -text
 taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/AnnotatedLineDocumentProvider.java -text


@@ -722,6 +723,7 @@ taxeditor-bulkeditor/src/test/java/eu/etaxonomy/taxeditor/bulkeditor/Perspective
 taxeditor-editor/META-INF/MANIFEST.MF -text
 taxeditor-editor/build.properties -text
 taxeditor-editor/icons/edit_16x16.gif -text
 taxeditor-editor/META-INF/MANIFEST.MF -text
 taxeditor-editor/build.properties -text
 taxeditor-editor/icons/edit_16x16.gif -text

+taxeditor-editor/p2.inf -text

 taxeditor-editor/plugin.properties -text
 taxeditor-editor/plugin.xml -text
 taxeditor-editor/pom.xml -text
 taxeditor-editor/plugin.properties -text
 taxeditor-editor/plugin.xml -text
 taxeditor-editor/pom.xml -text


@@ -995,6 +997,7 @@ taxeditor-navigation/build.properties -text
 taxeditor-navigation/icons/edit_16x16.gif -text
 taxeditor-navigation/icons/tree_icon.jpg -text
 taxeditor-navigation/icons/tree_icon_small.jpg -text
 taxeditor-navigation/icons/edit_16x16.gif -text
 taxeditor-navigation/icons/tree_icon.jpg -text
 taxeditor-navigation/icons/tree_icon_small.jpg -text

+taxeditor-navigation/p2.inf -text

 taxeditor-navigation/plugin.xml -text
 taxeditor-navigation/pom.xml -text
 taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/NavigationUtil.java -text
 taxeditor-navigation/plugin.xml -text
 taxeditor-navigation/pom.xml -text
 taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/NavigationUtil.java -text


@@ -1126,6 +1129,7 @@ taxeditor-store/icons/unknown.gif -text
 taxeditor-store/icons/unknown_no_bg.gif -text
 taxeditor-store/icons/warn_tsk.gif -text
 taxeditor-store/icons/warning_co.gif -text
 taxeditor-store/icons/unknown_no_bg.gif -text
 taxeditor-store/icons/warn_tsk.gif -text
 taxeditor-store/icons/warning_co.gif -text

+taxeditor-store/p2.inf -text

 taxeditor-store/plugin.xml -text
 taxeditor-store/pom.xml -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/CdmDataSourceRepository.java -text
 taxeditor-store/plugin.xml -text
 taxeditor-store/pom.xml -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/CdmDataSourceRepository.java -text

diff --git a/.gitignore b/.gitignore
index 3c444bfa50a27d600e21346dd3ed625796d1b823..a25754c4fe7fb52acc3181ec17142d4d5a4e098f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@ taxeditor-editor/.classpath
 taxeditor-editor/.project
 taxeditor-editor/.settings
 taxeditor-editor/target
 taxeditor-editor/.project
 taxeditor-editor/.settings
 taxeditor-editor/target

+taxeditor-feature-product/plugin_customization.ini

 taxeditor-feature-product/workspace
 taxeditor-feature/.project
 taxeditor-navigation/.classpath
 taxeditor-feature-product/workspace
 taxeditor-feature/.project
 taxeditor-navigation/.classpath

diff --git a/taxeditor-application/META-INF/MANIFEST.MF b/taxeditor-application/META-INF/MANIFEST.MF
index caa8140cdc4cb4b195fb96358171f1e86bae0e43..1927cc2704150a437ab9bb92c81d1e9ed0f81118 100644 (file)
--- a/taxeditor-application/META-INF/MANIFEST.MF
+++ b/taxeditor-application/META-INF/MANIFEST.MF
@@ -7,5 +7,26 @@ Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin
 Bundle-Vendor: EDIT
 Bundle-Localization: plugin
 Export-Package: eu.etaxonomy.taxeditor
 Bundle-Vendor: EDIT
 Bundle-Localization: plugin
 Export-Package: eu.etaxonomy.taxeditor

-Require-Bundle: org.eclipse.ui;bundle-version="3.4.1",org.eclipse.ui.ide;bundle-version="3.4.1",org.eclipse.core.runtime;bundle-version="3.4.0",org.eclipse.core.resources;bundle-version="3.4.1",eu.etaxonomy.cdmlib;bundle-version="2.3.0",eu.etaxonomy.taxeditor.store;bundle-version="2.1.0",eu.etaxonomy.taxeditor.editor;bundle-version="2.1.0",eu.etaxonomy.taxeditor.navigation;bundle-version="2.1.0",eu.etaxonomy.taxeditor.bulkeditor;bundle-version="2.1.0"
+Require-Bundle: org.eclipse.ui;bundle-version="3.4.1",
+ org.eclipse.ui.ide;bundle-version="3.4.1",
+ org.eclipse.core.runtime;bundle-version="3.4.0",
+ org.eclipse.core.resources;bundle-version="3.4.1",
+ org.eclipse.equinox.p2.core,
+ org.eclipse.equinox.p2.ui;bundle-version="1.0.101",
+ org.eclipse.equinox.p2.ui.sdk;bundle-version="1.0.100",
+ org.eclipse.equinox.p2.ui.sdk.scheduler;bundle-version="1.0.0",
+ org.eclipse.equinox.p2.updatechecker;bundle-version="1.1.0",
+ eu.etaxonomy.cdmlib;bundle-version="2.3.0",
+ eu.etaxonomy.taxeditor.store;bundle-version="2.1.0",
+ eu.etaxonomy.taxeditor.editor;bundle-version="2.1.0",
+ eu.etaxonomy.taxeditor.navigation;bundle-version="2.1.0",
+ eu.etaxonomy.taxeditor.bulkeditor;bundle-version="2.1.0"

 Bundle-ActivationPolicy: lazy
 Bundle-ActivationPolicy: lazy

+Import-Package: org.eclipse.equinox.internal.p2.core.helpers,
+ org.eclipse.equinox.internal.provisional.p2.artifact.repository,
+ org.eclipse.equinox.internal.provisional.p2.director,
+ org.eclipse.equinox.internal.provisional.p2.engine,
+ org.eclipse.equinox.internal.provisional.p2.metadata,
+ org.eclipse.equinox.internal.provisional.p2.metadata.query,
+ org.eclipse.equinox.internal.provisional.p2.metadata.repository,
+ org.eclipse.equinox.internal.provisional.p2.repository

diff --git a/taxeditor-application/TaxEditor.product b/taxeditor-application/TaxEditor.product
deleted file mode 100644 (file)
index 231812c..0000000
--- a/taxeditor-application/TaxEditor.product
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-
-<product name="%productName" uid="eu.etaxonomy.taxeditor" id="eu.etaxonomy.taxeditor.application.TaxonomicEditor" application="eu.etaxonomy.taxeditor.application.application" version="2.1.0.qualifier" useFeatures="true" includeLaunchers="false">
-
-   <aboutInfo>
-      <text>
-         %productBlurb
-      </text>
-   </aboutInfo>
-
-   <configIni use="default">
-   </configIni>
-
-   <launcherArgs>
-      <vmArgs>-Xmx256M</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="Taxonomic Editor">
-      <solaris/>
-      <win useIco="true">
-         <ico path="/taxeditor-application/icons/256color_48x48.ico"/>
-         <bmp/>
-      </win>
-   </launcher>
-
-   <vm>
-   </vm>
-
-   <plugins>
-      <plugin id="com.ibm.icu"/>
-      <plugin id="eu.etaxonomy.cdmLibrary" fragment=""/>
-      <plugin id="eu.etaxonomy.taxeditor.application"/>
-      <plugin id="eu.etaxonomy.taxeditor.editor"/>
-      <plugin id="eu.etaxonomy.taxeditor.navigation"/>
-      <plugin id="eu.etaxonomy.taxeditor.store"/>
-      <plugin id="org.eclipse.core.commands"/>
-      <plugin id="org.eclipse.core.contenttype"/>
-      <plugin id="org.eclipse.core.databinding"/>
-      <plugin id="org.eclipse.core.databinding.beans"/>
-      <plugin id="org.eclipse.core.expressions"/>
-      <plugin id="org.eclipse.core.filebuffers"/>
-      <plugin id="org.eclipse.core.filesystem"/>
-      <plugin id="org.eclipse.core.filesystem.win32.x86" fragment="true"/>
-      <plugin id="org.eclipse.core.jobs"/>
-      <plugin id="org.eclipse.core.resources"/>
-      <plugin id="org.eclipse.core.resources.compatibility" fragment="true"/>
-      <plugin id="org.eclipse.core.resources.win32.x86" fragment="true"/>
-      <plugin id="org.eclipse.core.runtime"/>
-      <plugin id="org.eclipse.core.runtime.compatibility.registry" fragment="true"/>
-      <plugin id="org.eclipse.equinox.app"/>
-      <plugin id="org.eclipse.equinox.common"/>
-      <plugin id="org.eclipse.equinox.preferences"/>
-      <plugin id="org.eclipse.equinox.registry"/>
-      <plugin id="org.eclipse.help"/>
-      <plugin id="org.eclipse.jface"/>
-      <plugin id="org.eclipse.jface.databinding"/>
-      <plugin id="org.eclipse.jface.text"/>
-      <plugin id="org.eclipse.osgi"/>
-      <plugin id="org.eclipse.pde.source"/>
-      <plugin id="org.eclipse.swt"/>
-      <plugin id="org.eclipse.swt.win32.win32.x86" fragment="true"/>
-      <plugin id="org.eclipse.text"/>
-      <plugin id="org.eclipse.ui"/>
-      <plugin id="org.eclipse.ui.editors"/>
-      <plugin id="org.eclipse.ui.forms"/>
-      <plugin id="org.eclipse.ui.ide"/>
-      <plugin id="org.eclipse.ui.navigator"/>
-      <plugin id="org.eclipse.ui.navigator.resources"/>
-      <plugin id="org.eclipse.ui.views"/>
-      <plugin id="org.eclipse.ui.views.properties.tabbed"/>
-      <plugin id="org.eclipse.ui.win32" fragment="true"/>
-      <plugin id="org.eclipse.ui.workbench"/>
-      <plugin id="org.eclipse.ui.workbench.texteditor"/>
-      <plugin id="org.junit4"/>
-   </plugins>
-
-   <features>
-      <feature id="eu.etaxonomy.taxeditor" version="2.1.0.qualifier"/>
-   </features>
-
-
-</product>

diff --git a/taxeditor-application/build.properties b/taxeditor-application/build.properties
index 3ea0d42953683ac5709cc64a0dddda973b4c55b0..7280c0755469c1a996c677c30196c3b4aa970eb6 100644 (file)
--- a/taxeditor-application/build.properties
+++ b/taxeditor-application/build.properties
@@ -7,4 +7,5 @@ bin.includes = META-INF/,\
                plugin_customization.ini,\
                icons/,\
                plugin.properties,\
                plugin_customization.ini,\
                icons/,\
                plugin.properties,\

-               splash.bmp
+               splash.bmp,\
+               p2.inf

diff --git a/taxeditor-application/p2.inf b/taxeditor-application/p2.inf
new file mode 100644 (file)
index 0000000..cdeccf8
--- /dev/null
+++ b/taxeditor-application/p2.inf
@@ -0,0 +1,3 @@
+instructions.configure=\
+       addRepository(type:0,location:http${#58}//wp5.e-taxonomy.eu/taxeditor/update);\
+       addRepository(type:1,location:http${#58}//wp5.e-taxonomy.eu/taxeditor/update);
\ No newline at end of file

diff --git a/taxeditor-application/plugin.xml b/taxeditor-application/plugin.xml
index d610695ac3bcf39ef80e84d29335e6bff4180a05..cb89cf39fa5c52dc1939ecb0ac3b3abe1c92eac8 100644 (file)
--- a/taxeditor-application/plugin.xml
+++ b/taxeditor-application/plugin.xml
@@ -191,8 +191,13 @@
                visible="true">\r
          </separator>\r
          <command\r
                visible="true">\r
          </separator>\r
          <command\r

-               commandId="org.eclipse.ui.update.findAndInstallUpdates"\r
-               label="Software Updates..."\r
+               commandId="org.eclipse.equinox.p2.ui.sdk.update"\r
+               label="Check for Updates"\r
+               style="push">\r
+         </command>\r
+         <command\r
+               commandId="org.eclipse.equinox.p2.ui.sdk.install"\r
+               label="Install New Software..."\r

                style="push">\r
          </command>\r
          <separator\r
                style="push">\r
          </command>\r
          <separator\r


@@ -227,7 +232,7 @@
       </menuContribution>\r
    </extension>\r
    <extension\r
       </menuContribution>\r
    </extension>\r
    <extension\r

-         id="TaxonomicEditor"\r
+         id="product"\r

          point="org.eclipse.core.runtime.products">\r
       <product\r
             application="eu.etaxonomy.taxeditor.application.application"\r
          point="org.eclipse.core.runtime.products">\r
       <product\r
             application="eu.etaxonomy.taxeditor.application.application"\r

diff --git a/taxeditor-application/plugin_customization.ini b/taxeditor-application/plugin_customization.ini
index 5c5a62a76450b8456706090e00a3e13beacc235b..d97cc21c8167c7c2b4a36a9ba7765c4874539578 100644 (file)
--- a/taxeditor-application/plugin_customization.ini
+++ b/taxeditor-application/plugin_customization.ini
@@ -1,5 +1,4 @@
 org.eclipse.ui/SHOW_PROGRESS_ON_STARTUP = true
 org.eclipse.ui/SHOW_TRADITIONAL_STYLE_TABS=false
 org.eclipse.ui/DOCK_PERSPECTIVE_BAR=top-right
 org.eclipse.ui/SHOW_PROGRESS_ON_STARTUP = true
 org.eclipse.ui/SHOW_TRADITIONAL_STYLE_TABS=false
 org.eclipse.ui/DOCK_PERSPECTIVE_BAR=top-right

-org.eclipse.ui/SHOW_TEXT_ON_PERSPECTIVE_BAR=true
-
+org.eclipse.ui/SHOW_TEXT_ON_PERSPECTIVE_BAR=true
\ No newline at end of file

diff --git a/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchAdvisor.java b/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchAdvisor.java
index 12b1369b41c712bf1f043ab685a867d76ef06035..6fb5415185ca56a64f98db13fbf10152fa4d12d6 100644 (file)
--- a/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchAdvisor.java
+++ b/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchAdvisor.java
@@ -1,5 +1,6 @@
 package eu.etaxonomy.taxeditor;
 
 package eu.etaxonomy.taxeditor;
 

+import org.eclipse.ui.PlatformUI;

 import org.eclipse.ui.application.IWorkbenchConfigurer;
 import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
 import org.eclipse.ui.application.WorkbenchAdvisor;
 import org.eclipse.ui.application.IWorkbenchConfigurer;
 import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
 import org.eclipse.ui.application.WorkbenchAdvisor;


@@ -39,6 +40,19 @@ public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {
                configurer.setSaveAndRestore(true);
        }       
        
                configurer.setSaveAndRestore(true);
        }       
        

+       /* (non-Javadoc)
+        * @see org.eclipse.ui.application.WorkbenchAdvisor#preStartup()
+        */
+       @Override
+       public void preStartup() {
+               // TODO Auto-generated method stub
+               super.preStartup();
+               // XXX check for updates before starting up.
+       // If an update is performed, restart.
+//     if (P2Util.checkForUpdates())
+//             PlatformUI.getWorkbench().restart();
+       }
+       

 /**
  * see:        https://bugs.eclipse.org/bugs/show_bug.cgi?id=234252
  */
 /**
  * see:        https://bugs.eclipse.org/bugs/show_bug.cgi?id=234252
  */

diff --git a/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/TaxonomicEditorPlugin.java b/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/TaxonomicEditorPlugin.java
index 2d8e76703c22daf565a0093e593059695fa78ecc..76eb61673a6654e0a9f131bc9dd3d3f617d46fc3 100644 (file)
--- a/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/TaxonomicEditorPlugin.java
+++ b/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/TaxonomicEditorPlugin.java
@@ -2,7 +2,10 @@ package eu.etaxonomy.taxeditor;
 
 import org.apache.log4j.Logger;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 
 import org.apache.log4j.Logger;
 import org.eclipse.ui.plugin.AbstractUIPlugin;

+import org.osgi.framework.Bundle;

 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleContext;

+import org.osgi.framework.ServiceReference;
+import org.osgi.service.packageadmin.PackageAdmin;

 
 /**
  * The activator class controls the plug-in life cycle
 
 /**
  * The activator class controls the plug-in life cycle


@@ -16,6 +19,12 @@ public class TaxonomicEditorPlugin extends AbstractUIPlugin {
 
        // The shared instance
        private static TaxonomicEditorPlugin plugin;
 
        // The shared instance
        private static TaxonomicEditorPlugin plugin;

+
+       private PackageAdmin packageAdmin;
+
+       private ServiceReference packageAdminRef;
+
+       private BundleContext bundleContext;

        
        /**
         * The constructor
        
        /**
         * The constructor


@@ -30,9 +39,37 @@ public class TaxonomicEditorPlugin extends AbstractUIPlugin {
        public void start(BundleContext context) throws Exception {
                super.start(context);
                plugin = this;
        public void start(BundleContext context) throws Exception {
                super.start(context);
                plugin = this;

+               
+               bundleContext = context;
+               
+               // this should enable automatic updating. Not working at the moment
+               packageAdminRef = bundleContext.getServiceReference(PackageAdmin.class.getName());
+               packageAdmin = (PackageAdmin) bundleContext.getService(packageAdminRef);
+
+               // XXX start up the p2 infrastructure.  Normally the p2 UI class library does
+               // this, but we are running without UI.
+               getBundle("org.eclipse.equinox.p2.exemplarysetup").start(Bundle.START_TRANSIENT); //$NON-NLS-1$
+               getBundle("org.eclipse.equinox.frameworkadmin.equinox").start(Bundle.START_TRANSIENT); //$NON-NLS-1$
+               getBundle("org.eclipse.equinox.simpleconfigurator.manipulator").start(Bundle.START_TRANSIENT); //$NON-NLS-1$
+               

                logger.debug("Taxonomic Editor started.");
        }
 
                logger.debug("Taxonomic Editor started.");
        }
 

+       private Bundle getBundle(String symbolicName) {
+               if (packageAdmin == null)
+                       return null;
+               Bundle[] bundles = packageAdmin.getBundles(symbolicName, null);
+               if (bundles == null)
+                       return null;
+               // Return the first bundle that is not installed or uninstalled
+               for (int i = 0; i < bundles.length; i++) {
+                       if ((bundles[i].getState() & (Bundle.INSTALLED | Bundle.UNINSTALLED)) == 0) {
+                               return bundles[i];
+                       }
+               }
+               return null;
+       }
+       

        /*
         * (non-Javadoc)
         * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
        /*
         * (non-Javadoc)
         * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

diff --git a/taxeditor-bulkeditor/build.properties b/taxeditor-bulkeditor/build.properties
index dad1697b5fad9a0eeb6e7160ea9d43675dad8263..a41e228dcfe1d6ffb0e29108af99a9fedef97e60 100644 (file)
--- a/taxeditor-bulkeditor/build.properties
+++ b/taxeditor-bulkeditor/build.properties
@@ -4,4 +4,5 @@ bin.includes = META-INF/,\
                .,\\r
                icons/,\\r
                plugin.xml,\\r
                .,\\r
                icons/,\\r
                plugin.xml,\\r

-               build.properties\r
+               build.properties,\\r
+               p2.inf\r

diff --git a/taxeditor-bulkeditor/p2.inf b/taxeditor-bulkeditor/p2.inf
new file mode 100644 (file)
index 0000000..cdeccf8
--- /dev/null
+++ b/taxeditor-bulkeditor/p2.inf
@@ -0,0 +1,3 @@
+instructions.configure=\
+       addRepository(type:0,location:http${#58}//wp5.e-taxonomy.eu/taxeditor/update);\
+       addRepository(type:1,location:http${#58}//wp5.e-taxonomy.eu/taxeditor/update);
\ No newline at end of file

diff --git a/taxeditor-editor/build.properties b/taxeditor-editor/build.properties
index f590f5bbdd52146ec2b5afffdf11d5129e96fa80..f91983f7474a122415ec4bf84c65c35cc2dcfe60 100644 (file)
--- a/taxeditor-editor/build.properties
+++ b/taxeditor-editor/build.properties
@@ -4,7 +4,8 @@ bin.includes = META-INF/,\
                .,\
                plugin.xml,\
                plugin.properties,\
                .,\
                plugin.xml,\
                plugin.properties,\

-               icons/
+               icons/,\
+               p2.inf

 source.icons/ = src/main/java/,\
                 src/main/resources/,\
                 src/test/java/
 source.icons/ = src/main/java/,\
                 src/main/resources/,\
                 src/test/java/

diff --git a/taxeditor-editor/p2.inf b/taxeditor-editor/p2.inf
new file mode 100644 (file)
index 0000000..cdeccf8
--- /dev/null
+++ b/taxeditor-editor/p2.inf
@@ -0,0 +1,3 @@
+instructions.configure=\
+       addRepository(type:0,location:http${#58}//wp5.e-taxonomy.eu/taxeditor/update);\
+       addRepository(type:1,location:http${#58}//wp5.e-taxonomy.eu/taxeditor/update);
\ No newline at end of file

diff --git a/taxeditor-feature-product/feature.xml b/taxeditor-feature-product/feature.xml
index 8228a0e20f867adc823b91316c97b506fd41b3ef..3d954571d75731fc7c0a57e4c4629c654a672165 100644 (file)
--- a/taxeditor-feature-product/feature.xml
+++ b/taxeditor-feature-product/feature.xml
@@ -18,7 +18,15 @@
    </license>
 
    <includes
    </license>
 
    <includes

-         id="eu.etaxonomy.taxeditor.feature.dependencies"
+         id="org.eclipse.equinox.p2.user.ui"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.rcp"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.platform"

          version="0.0.0"/>
 
    <plugin
          version="0.0.0"/>
 
    <plugin


@@ -62,4 +70,94 @@
          version="0.0.0"
          unpack="false"/>
 
          version="0.0.0"
          unpack="false"/>
 

+   <plugin
+         id="com.ibm.icu"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ant.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.compare.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ecf"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ecf.filetransfer"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ecf.identity"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.ecf.provider.filetransfer"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.app"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.common"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.frameworkadmin"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.frameworkadmin.equinox"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.hamcrest.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.junit4"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+

 </feature>
 </feature>

diff --git a/taxeditor-navigation/build.properties b/taxeditor-navigation/build.properties
index bff90f61a364e0212c209faa0a25dd5563da58e6..0699eecc070b32902c6e0d8cfca6254459f7e2ba 100644 (file)
--- a/taxeditor-navigation/build.properties
+++ b/taxeditor-navigation/build.properties
@@ -5,4 +5,5 @@ output.. = target/classes/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\

-               icons/
+               icons/,\
+               p2.inf

diff --git a/taxeditor-navigation/p2.inf b/taxeditor-navigation/p2.inf
new file mode 100644 (file)
index 0000000..cdeccf8
--- /dev/null
+++ b/taxeditor-navigation/p2.inf
@@ -0,0 +1,3 @@
+instructions.configure=\
+       addRepository(type:0,location:http${#58}//wp5.e-taxonomy.eu/taxeditor/update);\
+       addRepository(type:1,location:http${#58}//wp5.e-taxonomy.eu/taxeditor/update);
\ No newline at end of file

diff --git a/taxeditor-store/build.properties b/taxeditor-store/build.properties
index a7c1b813faee3b6163b53b3614da8eed62bb72f5..925934e50ff1d92c868e24dda037b16c48abeb72 100644 (file)
--- a/taxeditor-store/build.properties
+++ b/taxeditor-store/build.properties
@@ -5,4 +5,5 @@ source.. = src/main/java/,\
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\

-               icons/
+               icons/,\
+               p2.inf

diff --git a/taxeditor-store/p2.inf b/taxeditor-store/p2.inf
new file mode 100644 (file)
index 0000000..cdeccf8
--- /dev/null
+++ b/taxeditor-store/p2.inf
@@ -0,0 +1,3 @@
+instructions.configure=\
+       addRepository(type:0,location:http${#58}//wp5.e-taxonomy.eu/taxeditor/update);\
+       addRepository(type:1,location:http${#58}//wp5.e-taxonomy.eu/taxeditor/update);
\ No newline at end of file