From f93740ebc261f44f7005ff247c0aab9c9085e889 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 2 Feb 2013 11:55:09 +0000
Subject: [PATCH] Start repairing SLC console command

git-svn-id: https://svn.argeo.org/slc/trunk@6066 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../.settings/org.eclipse.jdt.core.prefs      |  7 ++--
 .../META-INF/spring/manager.xml               | 11 +++---
 .../META-INF/spring/osgi.xml                  | 35 +++++--------------
 .../build.properties                          |  1 -
 .../org/argeo/slc/equinox/EquinoxRuntime.java |  3 ++
 .../slc/equinox/ExecutionCommandProvider.java |  1 -
 .../java/org/argeo/slc/equinox/cli/Main.java  |  4 +--
 7 files changed, 21 insertions(+), 41 deletions(-)

diff --git a/runtime/org.argeo.slc.support.equinox/.settings/org.eclipse.jdt.core.prefs b/runtime/org.argeo.slc.support.equinox/.settings/org.eclipse.jdt.core.prefs
index b4180a1a1..8000cd6ca 100644
--- a/runtime/org.argeo.slc.support.equinox/.settings/org.eclipse.jdt.core.prefs
+++ b/runtime/org.argeo.slc.support.equinox/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,11 @@
-#Wed Feb 25 15:37:16 CET 2009
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/runtime/org.argeo.slc.support.equinox/META-INF/spring/manager.xml b/runtime/org.argeo.slc.support.equinox/META-INF/spring/manager.xml
index e5779ac10..ecd64eb04 100644
--- a/runtime/org.argeo.slc.support.equinox/META-INF/spring/manager.xml
+++ b/runtime/org.argeo.slc.support.equinox/META-INF/spring/manager.xml
@@ -21,8 +21,7 @@
 		<property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
 		<property name="ignoreUnresolvablePlaceholders" value="false" />
 		<property name="locations">
-			<value>osgibundle:equinox.properties
-			</value>
+			<value>osgibundle:equinox.properties</value>
 		</property>
 	</bean>
 
@@ -30,13 +29,13 @@
 		<property name="modulesManager" ref="modulesManager" />
 	</bean>
 
+	<bean id="modulesManager" class="org.argeo.slc.osgi.OsgiExecutionModulesManager">
+		<property name="bundlesManager" ref="bundlesManager" />
+	</bean>
+
 	<bean id="bundlesManager" class="org.argeo.slc.osgi.BundlesManager">
 		<property name="defaultTimeout" value="${slc.equinox.commandTimeout}" />
 		<property name="pollingPeriod" value="${slc.equinox.commandPollingPeriod}" />
 	</bean>
 
-	<bean id="modulesManager" class="org.argeo.slc.osgi.OsgiExecutionModulesManager">
-		<property name="bundlesManager" ref="bundlesManager" />
-	</bean>
-
 </beans>
\ No newline at end of file
diff --git a/runtime/org.argeo.slc.support.equinox/META-INF/spring/osgi.xml b/runtime/org.argeo.slc.support.equinox/META-INF/spring/osgi.xml
index 79a47bc15..08d00045a 100644
--- a/runtime/org.argeo.slc.support.equinox/META-INF/spring/osgi.xml
+++ b/runtime/org.argeo.slc.support.equinox/META-INF/spring/osgi.xml
@@ -1,21 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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.
-
--->
+<!-- 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. -->
 
 <beans:beans xmlns="http://www.springframework.org/schema/osgi"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
@@ -23,15 +14,7 @@
        http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd
        http://www.springframework.org/schema/beans   
        http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-
-	<beans:import resource="classpath:org/argeo/slc/osgi/manager.xml" />
-
+	<!-- SERVICES -->
 	<service interface="org.eclipse.osgi.framework.console.CommandProvider"
 		ref="commandProvider" />
-
-	<!--
-		<service
-		interface="org.springframework.osgi.context.event.OsgiBundleApplicationContextListener"
-		ref="bundlesManager" />
-	-->
 </beans:beans>
\ No newline at end of file
diff --git a/runtime/org.argeo.slc.support.equinox/build.properties b/runtime/org.argeo.slc.support.equinox/build.properties
index e71fabc68..d8c27f722 100644
--- a/runtime/org.argeo.slc.support.equinox/build.properties
+++ b/runtime/org.argeo.slc.support.equinox/build.properties
@@ -5,6 +5,5 @@ additional.bundles = org.argeo.slc.core,\
                      org.argeo.osgi.boot,\
                      org.eclipse.osgi
 source.. = src/main/java/,\
-           src/main/resources/,\
            src/test/java/,\
            src/test/resources/
diff --git a/runtime/org.argeo.slc.support.equinox/src/main/java/org/argeo/slc/equinox/EquinoxRuntime.java b/runtime/org.argeo.slc.support.equinox/src/main/java/org/argeo/slc/equinox/EquinoxRuntime.java
index d7678cc18..134bdfa2b 100644
--- a/runtime/org.argeo.slc.support.equinox/src/main/java/org/argeo/slc/equinox/EquinoxRuntime.java
+++ b/runtime/org.argeo.slc.support.equinox/src/main/java/org/argeo/slc/equinox/EquinoxRuntime.java
@@ -19,6 +19,9 @@ import org.argeo.slc.SlcException;
 import org.argeo.slc.osgi.OsgiRuntime;
 import org.eclipse.core.runtime.adaptor.EclipseStarter;
 
+/** OSGi runtime with shutdown capability implemented. */
+@SuppressWarnings("restriction")
+@Deprecated
 public class EquinoxRuntime extends OsgiRuntime {
 
 	public void shutdown() {
diff --git a/runtime/org.argeo.slc.support.equinox/src/main/java/org/argeo/slc/equinox/ExecutionCommandProvider.java b/runtime/org.argeo.slc.support.equinox/src/main/java/org/argeo/slc/equinox/ExecutionCommandProvider.java
index bf32d16d5..ae99ab0c4 100644
--- a/runtime/org.argeo.slc.support.equinox/src/main/java/org/argeo/slc/equinox/ExecutionCommandProvider.java
+++ b/runtime/org.argeo.slc.support.equinox/src/main/java/org/argeo/slc/equinox/ExecutionCommandProvider.java
@@ -23,7 +23,6 @@ import org.argeo.slc.osgi.OsgiExecutionModulesManager;
 import org.eclipse.osgi.framework.console.CommandInterpreter;
 import org.eclipse.osgi.framework.console.CommandProvider;
 
-@SuppressWarnings("restriction")
 public class ExecutionCommandProvider implements CommandProvider {
 	private final static Log log = LogFactory
 			.getLog(ExecutionCommandProvider.class);
diff --git a/runtime/org.argeo.slc.support.equinox/src/main/java/org/argeo/slc/equinox/cli/Main.java b/runtime/org.argeo.slc.support.equinox/src/main/java/org/argeo/slc/equinox/cli/Main.java
index c436f3d97..4258b8aae 100644
--- a/runtime/org.argeo.slc.support.equinox/src/main/java/org/argeo/slc/equinox/cli/Main.java
+++ b/runtime/org.argeo.slc.support.equinox/src/main/java/org/argeo/slc/equinox/cli/Main.java
@@ -16,7 +16,6 @@
 package org.argeo.slc.equinox.cli;
 
 import org.eclipse.core.runtime.adaptor.EclipseStarter;
-import org.osgi.framework.BundleContext;
 
 @SuppressWarnings("restriction")
 public class Main {
@@ -25,8 +24,7 @@ public class Main {
 		try {
 			String confDir = "";
 			String[] equinoxArgs = { "-console", "-conf", confDir };
-			BundleContext systemBundleContext = EclipseStarter.startup(
-					equinoxArgs, null);
+			EclipseStarter.startup(equinoxArgs, null);
 
 		} catch (Exception e) {
 			e.printStackTrace();
-- 
2.39.2