X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.lib.detached%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Flib%2Fdetached%2FDetachedLauncher.java;h=5f2bbd2e977a0aa800ea42d15a700c009a7bf429;hb=bd07be7603d234ac496652aaa07ded77d4a2a292;hp=85fabfdb530cbd88117cd8c9992be31a4b429eca;hpb=59d8abed7c2c661fccabdf1edf1ee99bfbbc2d7b;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.lib.detached/src/main/java/org/argeo/slc/lib/detached/DetachedLauncher.java b/runtime/org.argeo.slc.lib.detached/src/main/java/org/argeo/slc/lib/detached/DetachedLauncher.java
index 85fabfdb5..5f2bbd2e9 100644
--- a/runtime/org.argeo.slc.lib.detached/src/main/java/org/argeo/slc/lib/detached/DetachedLauncher.java
+++ b/runtime/org.argeo.slc.lib.detached/src/main/java/org/argeo/slc/lib/detached/DetachedLauncher.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2007-2012 Argeo GmbH
+ *
+ * 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.lib.detached;
 
 import java.io.File;
@@ -28,8 +43,8 @@ public class DetachedLauncher extends JvmProcess implements BundleContextAware,
 	private Resource osgiFramework = null;
 	private String osgibootBundleName = "org.argeo.osgi.boot";	
 	private String equinoxBundleName = "org.eclipse.osgi";
-	private String xmlapisBundleName = "com.springsource.org.apache.xmlcommons";
-	private String xercesBundleName = "com.springsource.org.apache.xerces";
+	private String xmlapisBundleName = "org.apache.xmlcommons";
+	private String xercesBundleName = "org.apache.xerces";
 
 	private List<String> excludeBundleNames = new ArrayList<String>();
 	private List<String> includeBundleUrls = new ArrayList<String>();
@@ -43,7 +58,7 @@ public class DetachedLauncher extends JvmProcess implements BundleContextAware,
 	public DetachedLauncher() {
 		// Override defaults
 		setSynchronous(false);
-		setMainClass("org.argeo.slc.osgiboot.Launcher");
+		setMainClass("org.argeo.osgi.boot.Launcher");
 	}
 
 	public void afterPropertiesSet() throws Exception {
@@ -92,7 +107,7 @@ public class DetachedLauncher extends JvmProcess implements BundleContextAware,
 				osgiLocations.append(location);
 				if (log.isTraceEnabled())
 					log.trace("Added bundle " + name
-							+ " to slc.osgi.locations: " + location);
+							+ " to argeo.osgi.locations: " + location);
 			} else {
 				if (osgiBundles.length() != 0)
 					osgiBundles.append(',');
@@ -114,7 +129,7 @@ public class DetachedLauncher extends JvmProcess implements BundleContextAware,
 
 		getSystemProperties().setProperty("osgi.bundles",
 				osgiBundles.toString());
-		getSystemProperties().setProperty("slc.osgi.locations",
+		getSystemProperties().setProperty("argeo.osgi.locations",
 				osgiLocations.toString());
 		
 		super.afterPropertiesSet();