Start repairing SLC console command

git-svn-id: https://svn.argeo.org/slc/trunk@6066 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

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 b4180a1a13c4ad5eda2ec813d27c1ce57935a025..8000cd6ca6142c8827db81f47ca38a3d5d7e2eaf 100644 (file)
--- 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 e5779ac1049d2385ab16a336053d184d17d0b857..ecd64eb0493f0193b9ca911b53c607016ebd4481 100644 (file)
--- 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" />\r
                <property name="ignoreUnresolvablePlaceholders" value="false" />\r
                <property name="locations">\r
-                       <value>osgibundle:equinox.properties\r
-                       </value>\r
+                       <value>osgibundle:equinox.properties</value>\r
                </property>\r
        </bean>\r
 \r
@@ -30,13 +29,13 @@
                <property name="modulesManager" ref="modulesManager" />\r
        </bean>\r
 \r
+       <bean id="modulesManager" class="org.argeo.slc.osgi.OsgiExecutionModulesManager">\r
+               <property name="bundlesManager" ref="bundlesManager" />\r
+       </bean>\r
+\r
        <bean id="bundlesManager" class="org.argeo.slc.osgi.BundlesManager">\r
                <property name="defaultTimeout" value="${slc.equinox.commandTimeout}" />\r
                <property name="pollingPeriod" value="${slc.equinox.commandPollingPeriod}" />\r
        </bean>\r
 \r
-       <bean id="modulesManager" class="org.argeo.slc.osgi.OsgiExecutionModulesManager">\r
-               <property name="bundlesManager" ref="bundlesManager" />\r
-       </bean>\r
-\r
 </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 79a47bc1560c0768518a6b47a2291381af58fbc5..08d00045afee954b8e2f3e88d170e60232190f81 100644 (file)
--- 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"?>\r
-<!--\r
-\r
-    Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>\r
-\r
-    Licensed under the Apache License, Version 2.0 (the "License");\r
-    you may not use this file except in compliance with the License.\r
-    You may obtain a copy of the License at\r
-\r
-            http://www.apache.org/licenses/LICENSE-2.0\r
-\r
-    Unless required by applicable law or agreed to in writing, software\r
-    distributed under the License is distributed on an "AS IS" BASIS,\r
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-    See the License for the specific language governing permissions and\r
-    limitations under the License.\r
-\r
--->\r
+<!-- Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org> Licensed under \r
+       the Apache License, Version 2.0 (the "License"); you may not use this file \r
+       except in compliance with the License. You may obtain a copy of the License \r
+       at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable \r
+       law or agreed to in writing, software distributed under the License is distributed \r
+       on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either \r
+       express or implied. See the License for the specific language governing permissions \r
+       and limitations under the License. -->\r
 \r
 <beans:beans xmlns="http://www.springframework.org/schema/osgi"\r
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"\r
@@ -23,15 +14,7 @@
        http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd\r
        http://www.springframework.org/schema/beans   \r
        http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
-\r
-       <beans:import resource="classpath:org/argeo/slc/osgi/manager.xml" />\r
-\r
+       <!-- SERVICES -->\r
        <service interface="org.eclipse.osgi.framework.console.CommandProvider"\r
                ref="commandProvider" />\r
-\r
-       <!--\r
-               <service\r
-               interface="org.springframework.osgi.context.event.OsgiBundleApplicationContextListener"\r
-               ref="bundlesManager" />\r
-       -->\r
 </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 e71fabc6877b8fb9baac08479af8d5804e2c1f69..d8c27f722fda70546ab48250c295f9702a40c419 100644 (file)
--- 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 d7678cc18827620d5963dcd552a4b045e02551b8..134bdfa2be624fb1ee1ad3ad6e164c16c8750a72 100644 (file)
--- 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 bf32d16d5bda934d934de2f40fac2e94b53ea755..ae99ab0c453c2a1d9eec3e80716696481a0bb6d4 100644 (file)
--- 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 c436f3d975c80f49c65a30ed02bc53752dc058b1..4258b8aaedc604b1ab6e97c2fb39bc828c2f38f8 100644 (file)
--- 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();