From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 3 Oct 2020 11:10:53 +0000 (+0200)
Subject: Clarify Eclipse 4 deployment.
X-Git-Tag: argeo-suite-2.1.16~89
X-Git-Url: http://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=9f1934208258e05cd309a965c1002ac3682275db

Clarify Eclipse 4 deployment.
---

diff --git a/org.argeo.suite.e4.rap/build.properties b/org.argeo.suite.e4.rap/build.properties
index eaf4033..4d5c0ad 100644
--- 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 bb4fae9..e575f55 100644
--- 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 9f62ca8..e9765d7 100644
--- 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/