X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=cms%2Forg.argeo.slc.cms%2Fsrc%2Forg%2Fargeo%2Fslc%2Fcms%2Fdeploy%2Fosgi%2FCmsOsgiDeployment.java;h=3c0cf7cc870192b57cc1088d92f774f766125091;hb=ff161d02563a58c82fc1f5f0fd4b498aac1404c6;hp=65326d9aacdab51a7a74aff117d7f25a7cbfe33a;hpb=1782faee8ce8c25d748ca17f8565d2a4dac377db;p=gpl%2Fargeo-slc.git

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);