X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.osgiboot%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fosgiboot%2FActivator.java;h=89cb05f248c2108c792e409ac3945711c069c7e1;hb=1fdb1b4e7b1d2b0cabb6483238301b857a6392fa;hp=d3dc59ff62e74fe2537f2a6f3db2447e6856f8e8;hpb=f9d0cb02594dea32d6a1efe67fa4d60245dba937;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.osgiboot/src/main/java/org/argeo/slc/osgiboot/Activator.java b/runtime/org.argeo.slc.osgiboot/src/main/java/org/argeo/slc/osgiboot/Activator.java
index d3dc59ff6..89cb05f24 100644
--- a/runtime/org.argeo.slc.osgiboot/src/main/java/org/argeo/slc/osgiboot/Activator.java
+++ b/runtime/org.argeo.slc.osgiboot/src/main/java/org/argeo/slc/osgiboot/Activator.java
@@ -1,22 +1,45 @@
+/*
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.argeo.slc.osgiboot;
 
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 
+/**
+ * An OSGi configurator. See <a
+ * href="http://wiki.eclipse.org/Configurator">http:
+ * //wiki.eclipse.org/Configurator</a>
+ */
 public class Activator implements BundleActivator {
 
 	public void start(BundleContext bundleContext) throws Exception {
-		try {
-			OsgiBoot.info("SLC OSGi bootstrap starting...");
-			OsgiBoot osgiBoot = new OsgiBoot(bundleContext);
-			osgiBoot.installUrls(osgiBoot.getBundlesUrls());
-			osgiBoot.installUrls(osgiBoot.getLocationsUrls());
-			osgiBoot.startBundles();
-			OsgiBoot.info("SLC OSGi bootstrap completed");
-		} catch (Exception e) {
-			e.printStackTrace();
-			throw e;
-		}
+		OsgiBoot osgiBoot = new OsgiBoot(bundleContext);
+		osgiBoot.bootstrap();
+//		try {
+//			OsgiBoot.info("SLC OSGi bootstrap starting...");
+//			osgiBoot.installUrls(osgiBoot.getBundlesUrls());
+//			osgiBoot.installUrls(osgiBoot.getLocationsUrls());
+//			osgiBoot.installUrls(osgiBoot.getModulesUrls());
+//			osgiBoot.startBundles();
+//			OsgiBoot.info("SLC OSGi bootstrap completed");
+//		} catch (Exception e) {
+//			e.printStackTrace();
+//			throw e;
+//		}
 	}
 
 	public void stop(BundleContext context) throws Exception {