-#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
<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
<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
<?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
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
org.argeo.osgi.boot,\
org.eclipse.osgi
source.. = src/main/java/,\
- src/main/resources/,\
src/test/java/,\
src/test/resources/
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() {
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);
package org.argeo.slc.equinox.cli;
import org.eclipse.core.runtime.adaptor.EclipseStarter;
-import org.osgi.framework.BundleContext;
@SuppressWarnings("restriction")
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();