Author: jbonofre
Date: Thu Nov 3 10:06:52 2011
New Revision: 1197041
URL: http://svn.apache.org/viewvc?rev=1197041&view=rev
Log:
[KARAF-855] Upgrade to OSGi r4.3
[KARAF-770] Upgrade to Eclipse Equinox 3.7.1
[KARAF-854] Upgrade to Felix Framework 4.0.1
Modified:
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties
karaf/trunk/main/src/main/java/org/apache/karaf/main/util/StringMap.java
karaf/trunk/main/src/test/java/org/apache/karaf/main/util/StringMapTest.java
karaf/trunk/manual/pom.xml
karaf/trunk/pom.xml
karaf/trunk/scheduler/core/src/main/java/org/apache/karaf/scheduler/core/Activator.java
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/Converters.java
Modified:
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties
URL:
http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties?rev=1197041&r1=1197040&r2=1197041&view=diff
==============================================================================
---
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties
(original)
+++
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties
Thu Nov 3 10:06:52 2011
@@ -46,18 +46,24 @@ karaf.framework.felix=${karaf.default.re
#
# Framework config properties.
#
-org.osgi.framework.system.packages=org.osgi.framework; version=1.5.0, \
- org.osgi.framework.launch; version=1.0.0, \
- org.osgi.framework.hooks.service; version=1.0.0, \
- org.osgi.service.packageadmin; version=1.2.0, \
- org.osgi.service.startlevel; version=1.1.0, \
- org.osgi.service.url; version=1.0.0, \
- org.osgi.util.tracker; version=1.4.0, \
- org.apache.karaf.jaas.boot; version=${karaf.osgi.version}, \
- org.apache.karaf.version; version=${karaf.osgi.version}, \
+org.osgi.framework.system.packages= \
+ org.osgi.framework.startlevel;uses:="org.osgi.framework";version="1.0", \
+ org.osgi.framework.wiring;uses:="org.osgi.framework";version="1.0", \
+ org.osgi.framework.hooks.bundle;uses:="org.osgi.framework";version="1.0", \
+ org.osgi.framework.hooks.service;uses:="org.osgi.framework";version="1.1", \
+
org.osgi.framework.hooks.resolver;uses:="org.osgi.framework.wiring";version="1.0",
\
+ org.osgi.framework.launch;uses:="org.osgi.framework";version="1.0", \
+
org.osgi.framework;version="1.6",org.osgi.framework.hooks.weaving;uses:="org.osgi.framework.wiring";version="1.0",
\
+ org.osgi.service.packageadmin;uses:="org.osgi.framework";version="1.2", \
+ org.osgi.service.url;version="1.0", \
+ org.osgi.service.startlevel;uses:="org.osgi.framework";version="1.1", \
+ org.osgi.util.tracker;uses:="org.osgi.framework";version="1.5", \
+ org.apache.karaf.jaas.boot;version="${karaf.osgi.version}", \
+ org.apache.karaf.version;version="${karaf.osgi.version}", \
${jre-${java.specification.version}}
-org.osgi.framework.system.packages.extra=
+# Extra packages appended after standard packages
+# org.osgi.framework.system.packages.extra=
# javax.transaction is needed to avoid class loader constraint violation when
using javax.sql
org.osgi.framework.bootdelegation=org.apache.karaf.jaas.boot,sun.*,com.sun.*,javax.transaction,javax.transaction.*
Modified:
karaf/trunk/main/src/main/java/org/apache/karaf/main/util/StringMap.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/main/src/main/java/org/apache/karaf/main/util/StringMap.java?rev=1197041&r1=1197040&r2=1197041&view=diff
==============================================================================
--- karaf/trunk/main/src/main/java/org/apache/karaf/main/util/StringMap.java
(original)
+++ karaf/trunk/main/src/main/java/org/apache/karaf/main/util/StringMap.java
Thu Nov 3 10:06:52 2011
@@ -30,7 +30,7 @@ import java.util.TreeMap;
* a <tt>String</tt> using the <tt>toString()</tt> method,
* since it is only intended to compare strings.
**/
-public class StringMap extends TreeMap<String, Object>
+public class StringMap extends TreeMap<String, String>
{
/**
*
@@ -51,10 +51,10 @@ public class StringMap extends TreeMap<S
public StringMap(Map<?, ?> map, boolean caseSensitive)
{
this(caseSensitive);
- putAll((Map<? extends String, ? extends Object>) map);
+ putAll((Map<? extends String, ? extends String>) map);
}
- public Object put(String key, Object value)
+ public String put(String key, String value)
{
return super.put(key.toString(), value);
}
Modified:
karaf/trunk/main/src/test/java/org/apache/karaf/main/util/StringMapTest.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/main/src/test/java/org/apache/karaf/main/util/StringMapTest.java?rev=1197041&r1=1197040&r2=1197041&view=diff
==============================================================================
---
karaf/trunk/main/src/test/java/org/apache/karaf/main/util/StringMapTest.java
(original)
+++
karaf/trunk/main/src/test/java/org/apache/karaf/main/util/StringMapTest.java
Thu Nov 3 10:06:52 2011
@@ -29,7 +29,7 @@ public class StringMapTest extends TestC
public void testCaseInsensitiveStringMap() throws Exception {
StringMap sm = new StringMap(false);
- Object value = new String("value");
+ String value = new String("value");
sm.put("key", value);
Object result = sm.get("Key");
assertFalse(result == null);
Modified: karaf/trunk/manual/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/manual/pom.xml?rev=1197041&r1=1197040&r2=1197041&view=diff
==============================================================================
--- karaf/trunk/manual/pom.xml (original)
+++ karaf/trunk/manual/pom.xml Thu Nov 3 10:06:52 2011
@@ -275,7 +275,7 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>${osgi.version}</version>
+ <version>${osgi.compendium.version}</version>
</dependency>
</dependencies>
</plugin>
Modified: karaf/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1197041&r1=1197040&r2=1197041&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Thu Nov 3 10:06:52 2011
@@ -122,11 +122,11 @@
<geronimo.jpa-spec.version>1.1</geronimo.jpa-spec.version>
<geronimo.jta-spec.version>1.1.1</geronimo.jta-spec.version>
<easymock.version>2.5.2</easymock.version>
- <equinox.version>3.6.2.R36x_v20110210</equinox.version>
+ <equinox.version>3.7.1.R37x_v20110808-1106</equinox.version>
<felix.bundlerepository.version>1.6.4</felix.bundlerepository.version>
<felix.configadmin.version>1.2.8</felix.configadmin.version>
<felix.fileinstall.version>3.1.10</felix.fileinstall.version>
- <felix.framework.version>3.2.2</felix.framework.version>
+ <felix.framework.version>4.0.1</felix.framework.version>
<felix.gogo.version>0.10.0</felix.gogo.version>
<felix.plugin.version>2.3.5</felix.plugin.version>
<felix.utils.version>1.1.0</felix.utils.version>
@@ -149,7 +149,8 @@
<log4j.version>1.2.16</log4j.version>
<maven.version>2.0.9</maven.version>
<mina.version>2.0.3</mina.version>
- <osgi.version>4.2.0</osgi.version>
+ <osgi.version>4.3.0</osgi.version>
+ <osgi.compendium.version>4.2.0</osgi.compendium.version>
<pax.exam.version>1.2.4</pax.exam.version>
<pax.logging.version>1.6.3</pax.logging.version>
<pax.runner.version>1.7.5</pax.runner.version>
@@ -569,7 +570,7 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>${osgi.version}</version>
+ <version>${osgi.compendium.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
Modified:
karaf/trunk/scheduler/core/src/main/java/org/apache/karaf/scheduler/core/Activator.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/scheduler/core/src/main/java/org/apache/karaf/scheduler/core/Activator.java?rev=1197041&r1=1197040&r2=1197041&view=diff
==============================================================================
---
karaf/trunk/scheduler/core/src/main/java/org/apache/karaf/scheduler/core/Activator.java
(original)
+++
karaf/trunk/scheduler/core/src/main/java/org/apache/karaf/scheduler/core/Activator.java
Thu Nov 3 10:06:52 2011
@@ -19,6 +19,7 @@ package org.apache.karaf.scheduler.core;
import org.osgi.framework.*;
+import java.util.Dictionary;
import java.util.Properties;
public class Activator implements BundleActivator {
@@ -33,7 +34,7 @@ public class Activator implements Bundle
listener = new RunnableServiceListener(context, scheduler);
//register scheduler service
- context.registerService(scheduler.getClass().getName(), scheduler, new
Properties());
+ context.registerService(scheduler.getClass().getName(), scheduler,
(Dictionary) new Properties());
//register service listener
context.addServiceListener(listener, String.format(filter,
Runnable.class.getName(), KarafTimerTask.ID_PROPERTY,
KarafTimerTask.PERIOD_PROPERTY));
Modified:
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/Converters.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/Converters.java?rev=1197041&r1=1197040&r2=1197041&view=diff
==============================================================================
---
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/Converters.java
(original)
+++
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/Converters.java
Thu Nov 3 10:06:52 2011
@@ -193,7 +193,7 @@ public class Converters implements Conve
String s = in.toString();
if (s.startsWith("(") && s.endsWith(")"))
{
- ServiceReference refs[] = context.getServiceReferences(null,
String.format(
+ ServiceReference refs[] = context.getServiceReferences((String)
null, String.format(
"(|(service.id=%s)(service.pid=%s))", in, in));
if (refs != null && refs.length > 0)
{
@@ -201,7 +201,7 @@ public class Converters implements Conve
}
}
- ServiceReference refs[] = context.getServiceReferences(null,
String.format(
+ ServiceReference refs[] = context.getServiceReferences((String) null,
String.format(
"(|(service.id=%s)(service.pid=%s))", in, in));
if (refs != null && refs.length > 0)
{
