projects
/
gpl
/
argeo-slc.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adapt to changes in Argeo Build and Argeo Commons
[gpl/argeo-slc.git]
/
org.argeo.slc.cms
/
src
/
org
/
argeo
/
slc
/
cms
/
deploy
/
osgi
/
OsgiCmsDeployment.java
diff --git
a/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/osgi/OsgiCmsDeployment.java
b/org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/osgi/OsgiCmsDeployment.java
index 77d72faf74d564e23106bc364b91becac1a08bec..1c472e70fd8491c5e95a2a24e79c986369843712 100644
(file)
--- a/
org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/osgi/OsgiCmsDeployment.java
+++ b/
org.argeo.slc.cms/src/org/argeo/slc/cms/deploy/osgi/OsgiCmsDeployment.java
@@
-15,7
+15,9
@@
import java.util.TreeMap;
import org.argeo.api.a2.A2Source;
import org.argeo.api.a2.FsA2Source;
import org.argeo.api.init.InitConstants;
import org.argeo.api.a2.A2Source;
import org.argeo.api.a2.FsA2Source;
import org.argeo.api.init.InitConstants;
+import org.argeo.api.init.RuntimeContext;
import org.argeo.cms.CmsDeployProperty;
import org.argeo.cms.CmsDeployProperty;
+import org.argeo.init.osgi.OsgiRuntimeContext;
import org.argeo.slc.WellKnownConstants;
import org.argeo.slc.build.Distribution;
import org.argeo.slc.cms.deploy.CmsDeployedSystem;
import org.argeo.slc.WellKnownConstants;
import org.argeo.slc.build.Distribution;
import org.argeo.slc.cms.deploy.CmsDeployedSystem;
@@
-38,6
+40,8
@@
public class OsgiCmsDeployment implements Deployment {
private CmsDeployedSystem deployedSystem;
private CmsDeployedSystem deployedSystem;
+ private OsgiRuntimeContext runtimeContext;
+
@Override
public void run() {
try {
@Override
public void run() {
try {
@@
-100,8
+104,8
@@
public class OsgiCmsDeployment implements Deployment {
}
// FIXME use runtime manager
}
// FIXME use runtime manager
-
//
runtimeContext = new OsgiRuntimeContext(config);
-
//
runtimeContext.run();
+
runtimeContext = new OsgiRuntimeContext(config);
+
runtimeContext.run();
// deployedSystem = new OsgiCmsDeployedSystem(runtimeContext.getFramework().getBundleContext(), distribution,
// targetData, deploymentData);
// deployedSystem = new OsgiCmsDeployedSystem(runtimeContext.getFramework().getBundleContext(), distribution,
// targetData, deploymentData);
@@
-132,7
+136,20
@@
public class OsgiCmsDeployment implements Deployment {
this.distribution = (A2Distribution) distribution;
}
this.distribution = (A2Distribution) distribution;
}
+ public OsgiRuntimeContext getRuntimeContext() {
+ return runtimeContext;
+ }
+
public static void main(String[] args) {
public static void main(String[] args) {
+ RuntimeContext runtimeContext = test();
+ try {
+ runtimeContext.waitForStop(0);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+
+ public static RuntimeContext test() {
try {
Path userHome = Paths.get(System.getProperty("user.home"));
try {
Path userHome = Paths.get(System.getProperty("user.home"));
@@
-187,7
+204,7
@@
public class OsgiCmsDeployment implements Deployment {
boolean multiple = true;
if (multiple) {
// wait a bit
boolean multiple = true;
if (multiple) {
// wait a bit
-
Thread.sleep(5000);
+
//
Thread.sleep(5000);
Path instanceData2 = userHome.resolve("dev/git/unstable/argeo-slc/sdk/exec/cms-deployment2/data");
Files.createDirectories(instanceData2);
Path instanceData2 = userHome.resolve("dev/git/unstable/argeo-slc/sdk/exec/cms-deployment2/data");
Files.createDirectories(instanceData2);
@@
-200,11
+217,11
@@
public class OsgiCmsDeployment implements Deployment {
deployment2.run();
}
deployment2.run();
}
- // deployment.getRuntimeContext().waitForStop(0);
-
- } catch (IOException | InterruptedException e) {
+ return deployment.getRuntimeContext();
+ } catch (IOException e) {
e.printStackTrace();
System.exit(1);
e.printStackTrace();
System.exit(1);
+ return null;
}
}
}
}