Clarify Eclipse 4 deployment.

diff --git a/org.argeo.suite.e4.rap/build.properties b/org.argeo.suite.e4.rap/build.properties
index eaf403393d476a172568509c1d3793709b7e81f3..4d5c0ad7faffb655ec50422378c476626cde3a75 100644 (file)
--- a/org.argeo.suite.e4.rap/build.properties
+++ b/org.argeo.suite.e4.rap/build.properties
@@ -2,6 +2,6 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               e4xmi/,\
-               OSGI-INF/
+               OSGI-INF/,\
+               e4xmi/
 source.. = src/

diff --git a/org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/settings/ArgeoRapApp.java b/org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/settings/ArgeoRapApp.java
index bb4fae976e63ee422e0f7f490d9818a7ea0195cc..e575f5553da17b258ed501e8f76a477ea40948bf 100644 (file)
--- a/org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/settings/ArgeoRapApp.java
+++ b/org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/settings/ArgeoRapApp.java
@@ -26,7 +26,7 @@ public class ArgeoRapApp extends AbstractRapE4App {
                this.cmsTheme = cmsTheme;
                this.bundle = bundle;
                setLifeCycleUri("bundleclass://org.argeo.suite.e4.rap/org.argeo.suite.e4.rap.ArgeoSuiteLoginLifecycle");
-               String contextName = "argeo/" + FilenameUtils.getExtension(bundle.getSymbolicName());
+               String contextName = "apps/" + FilenameUtils.getExtension(bundle.getSymbolicName());
                setContextName(contextName);
        }
 

diff --git a/org.argeo.suite.e4/build.properties b/org.argeo.suite.e4/build.properties
index 9f62ca8350db1d58e8f10dabec8a8895f2c117cf..e9765d7915e837056d08e080d0132d1b0224320a 100644 (file)
--- a/org.argeo.suite.e4/build.properties
+++ b/org.argeo.suite.e4/build.properties
@@ -2,9 +2,5 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                OSGI-INF/,\
-               e4xmi/,\
-               plugin.xml,\
-               e4xmi/argeo-suite-toolbars.e4xmi,\
-               OSGI-INF/resourcesE4Service.xml,\
-               e4xmi/argeo-settings.e4xmi
+               e4xmi/
 source.. = src/