From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 29 May 2022 07:51:05 +0000 (+0200)
Subject: Improve CMS OSGi deployment.
X-Git-Tag: v2.3.5~38
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=ff161d02563a58c82fc1f5f0fd4b498aac1404c6;p=gpl%2Fargeo-slc.git

Improve CMS OSGi deployment.
---

diff --git a/cms/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/osgi/CmsOsgiDeployment.java b/cms/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/osgi/CmsOsgiDeployment.java
index 65326d9aa..3c0cf7cc8 100644
--- a/cms/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/osgi/CmsOsgiDeployment.java
+++ b/cms/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/osgi/CmsOsgiDeployment.java
@@ -145,6 +145,7 @@ public class CmsOsgiDeployment implements Deployment {
 			deploymentData.getModulesToActivate(3).add("org.argeo.cms");
 
 			deploymentData.getModulesToActivate(4).add("org.argeo.cms.servlet");
+			deploymentData.getModulesToActivate(4).add("org.argeo.cms.ui.rap");
 			deploymentData.getModulesToActivate(4).add("org.argeo.cms.jcr");
 
 			deploymentData.getModulesToActivate(5).add("org.argeo.cms.e4.rap");
@@ -155,16 +156,20 @@ public class CmsOsgiDeployment implements Deployment {
 			deployment.setDeploymentData(deploymentData);
 			deployment.run();
 
-//			Path instanceData2 = userHome.resolve("dev/git/unstable/argeo-slc/sdk/exec/cms-deployment2/data");
-//			Files.createDirectories(instanceData2);
-//			Integer httpPort2 = 7071;
-//			SimpleCmsTargetData targetData2 = new SimpleCmsTargetData(instanceData2, httpPort2);
-//
-//			CmsOsgiDeployment deployment2 = new CmsOsgiDeployment();
-//			deployment2.setDistribution(distribution);
-//			deployment2.setTargetData(targetData2);
-//			deployment2.setDeploymentData(deploymentData);
-//			deployment2.run();
+			boolean multiple = false;
+			if (multiple) {
+
+				Path instanceData2 = userHome.resolve("dev/git/unstable/argeo-slc/sdk/exec/cms-deployment2/data");
+				Files.createDirectories(instanceData2);
+				Integer httpPort2 = 7071;
+				SimpleCmsTargetData targetData2 = new SimpleCmsTargetData(instanceData2, httpPort2);
+
+				CmsOsgiDeployment deployment2 = new CmsOsgiDeployment();
+				deployment2.setDistribution(distribution);
+				deployment2.setTargetData(targetData2);
+				deployment2.setDeploymentData(deploymentData);
+				deployment2.run();
+			}
 
 			deployment.getRuntimeContext().waitForStop(0);
 
diff --git a/sdk/argeo-tp-rap.target b/sdk/argeo-tp-rap.target
deleted file mode 100644
index 81c9e8172..000000000
--- a/sdk/argeo-tp-rap.target
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?>
-<target name="argeo-tp-rap">
-	<locations>
-		<location path="/usr/share/a2/org.argeo.tp" type="Directory"/>
-		<location path="/usr/share/a2/org.argeo.tp.apache" type="Directory"/>
-		<location path="/usr/share/a2/org.argeo.tp.eclipse.equinox" type="Directory"/>
-		<location path="/usr/share/a2/org.argeo.tp.eclipse.rap" type="Directory"/>
-		<location path="/usr/share/a2/org.argeo.tp.jetty" type="Directory"/>
-		<location path="/usr/share/a2/org.argeo.tp.sdk" type="Directory"/>
-		<location path="/usr/share/a2/org.argeo.tp.jcr" type="Directory"/>
-	</locations>
-</target>
\ No newline at end of file