You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2012/03/29 06:36:58 UTC
svn commit: r1306713 - in /geronimo/server/branches/3.0-beta: ./ framework/
framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/
framework/configs/karaf-framework/src/main/filtered-resources/etc/
plugins/connector...
Author: gawor
Date: Thu Mar 29 04:36:57 2012
New Revision: 1306713
URL: http://svn.apache.org/viewvc?rev=1306713&view=rev
Log:
GERONIMO-6312: Expose OSGi 4.3 core API
Modified:
geronimo/server/branches/3.0-beta/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
geronimo/server/branches/3.0-beta/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java
geronimo/server/branches/3.0-beta/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java
geronimo/server/branches/3.0-beta/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
geronimo/server/branches/3.0-beta/framework/pom.xml
geronimo/server/branches/3.0-beta/plugins/connector-1_6/geronimo-transaction-1_6/src/main/java/org/apache/geronimo/transaction/wrapper/manager/GeronimoTransactionManagerGBean.java
geronimo/server/branches/3.0-beta/pom.xml
Modified: geronimo/server/branches/3.0-beta/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java?rev=1306713&r1=1306712&r2=1306713&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java (original)
+++ geronimo/server/branches/3.0-beta/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java Thu Mar 29 04:36:57 2012
@@ -675,7 +675,7 @@ public abstract class AbstractCarMojo
}
}
- protected Framework getFramework() throws BundleException {
+ protected Framework getFramework(String extraPackages) throws BundleException {
setLoggingLevel();
Map<String, String> properties = new HashMap<String, String>();
@@ -688,13 +688,18 @@ public abstract class AbstractCarMojo
// This list and the version numbers needs to be synchronized with the list
// in the karaf framework config.properties file.
properties.put(Constants.FRAMEWORK_SYSTEMPACKAGES,
- "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.osgi.framework; version=1.6.0," +
+ "org.osgi.framework.launch; version=1.0.0," +
+ "org.osgi.framework.startlevel; version=1.0.0," +
+ "org.osgi.framework.wiring; version=1.0.0," +
+ "org.osgi.framework.hooks.service; version=1.1.0," +
+ "org.osgi.framework.hooks.bundle; version=1.0.0," +
+ "org.osgi.framework.hooks.resolver; version=1.0.0," +
+ "org.osgi.framework.hooks.weaving; 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.5.0," +
"javax.accessibility," +
"javax.annotation.processing," +
"javax.activity," +
@@ -885,13 +890,14 @@ public abstract class AbstractCarMojo
"org.apache.geronimo.system.threads," +
"org.apache.geronimo.system.util," +
"org.apache.geronimo.transformer," +
- "org.apache.geronimo.hook," +
"org.apache.geronimo.mavenplugins.car," +
"org.apache.karaf.jaas.boot;version=\"2.2.1\"," +
"org.apache.yoko," +
"org.apache.yoko.osgi," +
"org.apache.yoko.rmispec.util," +
- " org.apache.geronimo.hook"
+ "org.apache.geronimo.hook" +
+ extraPackages
+
);
/*
Modified: geronimo/server/branches/3.0-beta/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java?rev=1306713&r1=1306712&r2=1306713&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java (original)
+++ geronimo/server/branches/3.0-beta/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java Thu Mar 29 04:36:57 2012
@@ -151,7 +151,7 @@ public class InstallModulesMojo extends
public void execute() throws MojoExecutionException, MojoFailureException {
// boot one ourselves
try {
- bundleContext = getFramework().getBundleContext();
+ bundleContext = getFramework("").getBundleContext();
} catch (BundleException e) {
throw new MojoExecutionException("Could not create osqi framework", e);
}
Modified: geronimo/server/branches/3.0-beta/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java?rev=1306713&r1=1306712&r2=1306713&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java (original)
+++ geronimo/server/branches/3.0-beta/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java Thu Mar 29 04:36:57 2012
@@ -263,7 +263,7 @@ public class PackageMojo extends Abstrac
boot.setCarFile(getArtifactInRepositoryDir());
boot.setLocalRepo(repository);
boot.setPlan(planFile);
- Framework framework = getFramework();
+ Framework framework = getFramework(",org.apache.geronimo.deployment,org.apache.geronimo.deployment.service");
BundleContext bundleContext = framework.getBundleContext();
boot.setBundleContext(bundleContext);
@@ -362,7 +362,7 @@ public class PackageMojo extends Abstrac
// }
// boot one ourselves
- bundleContext = getFramework().getBundleContext();
+ bundleContext = getFramework("").getBundleContext();
kernel = KernelFactory.newInstance(bundleContext).createKernel(KERNEL_NAME);
kernel.boot();
Modified: geronimo/server/branches/3.0-beta/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties?rev=1306713&r1=1306712&r2=1306713&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties (original)
+++ geronimo/server/branches/3.0-beta/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties Thu Mar 29 04:36:57 2012
@@ -29,13 +29,19 @@ karaf.framework.felix=repository/org/apa
#
# Framework config properties.
#
-org.osgi.framework.system.packages=org.osgi.framework; version=1.5.0, \
+org.osgi.framework.system.packages= \
+ org.osgi.framework; version=1.6.0, \
org.osgi.framework.launch; version=1.0.0, \
- org.osgi.framework.hooks.service; version=1.0.0, \
+ org.osgi.framework.startlevel; version=1.0.0, \
+ org.osgi.framework.wiring; version=1.0.0, \
+ org.osgi.framework.hooks.service; version=1.1.0, \
+ org.osgi.framework.hooks.bundle; version=1.0.0, \
+ org.osgi.framework.hooks.resolver; version=1.0.0, \
+ org.osgi.framework.hooks.weaving; 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.osgi.util.tracker; version=1.5.0 \
${jre-${java.specification.version}}
org.osgi.framework.system.packages.extra=\
Modified: geronimo/server/branches/3.0-beta/framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/framework/pom.xml?rev=1306713&r1=1306712&r2=1306713&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/framework/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/framework/pom.xml Thu Mar 29 04:36:57 2012
@@ -35,7 +35,7 @@
<properties>
<felix.configadmin.version>1.2.4</felix.configadmin.version>
- <felix.framework.version>3.0.2</felix.framework.version>
+ <felix.framework.version>4.0.2</felix.framework.version>
<pax.url.version>1.1.2</pax.url.version>
</properties>
Modified: geronimo/server/branches/3.0-beta/plugins/connector-1_6/geronimo-transaction-1_6/src/main/java/org/apache/geronimo/transaction/wrapper/manager/GeronimoTransactionManagerGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/connector-1_6/geronimo-transaction-1_6/src/main/java/org/apache/geronimo/transaction/wrapper/manager/GeronimoTransactionManagerGBean.java?rev=1306713&r1=1306712&r2=1306713&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/connector-1_6/geronimo-transaction-1_6/src/main/java/org/apache/geronimo/transaction/wrapper/manager/GeronimoTransactionManagerGBean.java (original)
+++ geronimo/server/branches/3.0-beta/plugins/connector-1_6/geronimo-transaction-1_6/src/main/java/org/apache/geronimo/transaction/wrapper/manager/GeronimoTransactionManagerGBean.java Thu Mar 29 04:36:57 2012
@@ -19,7 +19,7 @@ package org.apache.geronimo.transaction.
import java.util.ArrayList;
import java.util.List;
-import java.util.Properties;
+import java.util.Hashtable;
import javax.management.j2ee.statistics.Stats;
import javax.transaction.TransactionManager;
@@ -110,7 +110,7 @@ public class GeronimoTransactionManagerG
clazzes.add(TransactionSynchronizationRegistry.class.getName());
clazzes.add(UserTransaction.class.getName());
clazzes.add(RecoverableTransactionManager.class.getName());
- serviceRegistration = bundleContext.registerService(clazzes.toArray(new String[clazzes.size()]), this, new Properties());
+ serviceRegistration = bundleContext.registerService(clazzes.toArray(new String[clazzes.size()]), this, new Hashtable());
}
public void doStop() throws Exception {
Modified: geronimo/server/branches/3.0-beta/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/pom.xml?rev=1306713&r1=1306712&r2=1306713&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/pom.xml Thu Mar 29 04:36:57 2012
@@ -1691,7 +1691,7 @@ only found in cxf
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>4.2.0</version>
+ <version>4.3.0</version>
</dependency>
<dependency>