You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2014/04/14 11:36:32 UTC
[1/5] git commit: Clean main jar a bit to avoid unused or duplicate
classes
Repository: karaf
Updated Branches:
refs/heads/master fd4b3f677 -> 69a53969d
Clean main jar a bit to avoid unused or duplicate classes
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/bf00db92
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/bf00db92
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/bf00db92
Branch: refs/heads/master
Commit: bf00db92c148cd9b852596273cbba3e6f510dcd6
Parents: fd4b3f6
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Fri Apr 11 20:56:48 2014 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Fri Apr 11 20:56:48 2014 +0200
----------------------------------------------------------------------
main/pom.xml | 5 +-
.../apache/karaf/main/util/ServerInfoImpl.java | 107 -------------------
2 files changed, 2 insertions(+), 110 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/bf00db92/main/pom.xml
----------------------------------------------------------------------
diff --git a/main/pom.xml b/main/pom.xml
index 2f4982a..e3783b4 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -93,9 +93,8 @@
</Export-Package>
<Private-Package>
org.apache.karaf.main*,
- org.apache.felix.*;-split-package:=merge-first,
- org.apache.karaf.util.*;-split-package:=merge-first,
- org.osgi.*;-split-package:=merge-first,
+ org.apache.felix.utils.properties;-split-package:=merge-first,
+ org.apache.karaf.util.locks;-split-package:=merge-first,
META-INF;-split-package:=merge-first
</Private-Package>
<Import-Package>!*</Import-Package>
http://git-wip-us.apache.org/repos/asf/karaf/blob/bf00db92/main/src/main/java/org/apache/karaf/main/util/ServerInfoImpl.java
----------------------------------------------------------------------
diff --git a/main/src/main/java/org/apache/karaf/main/util/ServerInfoImpl.java b/main/src/main/java/org/apache/karaf/main/util/ServerInfoImpl.java
deleted file mode 100644
index aa4821f..0000000
--- a/main/src/main/java/org/apache/karaf/main/util/ServerInfoImpl.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
- */
-
-
-package org.apache.karaf.main.util;
-
-import java.io.File;
-import java.net.URI;
-
-import org.apache.karaf.info.ServerInfo;
-
-public class ServerInfoImpl implements ServerInfo {
-
- private final File base;
- private final File home;
- private final File data;
- private final File instances;
- private final String[] args;
-
- public ServerInfoImpl(String[] args, File base, File data, File home, File instances) {
- this.args = args;
- this.base = base;
- this.data = data;
- this.home = home;
- this.instances = instances;
- }
-
- @Override
- public File getHomeDirectory() {
- return home;
- }
-
- @Override
- public String resolveHomePath(String filename) {
- return resolveWithBase(home, filename).getAbsolutePath();
- }
-
- @Override
- public File resolveHome(String filename) {
- return resolveWithBase(home, filename);
- }
-
- @Override
- public URI resolveHome(URI uri) {
- return home.toURI().resolve(uri);
- }
-
- @Override
- public File getBaseDirectory() {
- return base;
- }
-
- @Override
- public String resolveBasePath(String filename) {
- return resolveWithBase(base, filename).getAbsolutePath();
- }
-
- @Override
- public File resolveBase(String filename) {
- return resolveWithBase(base, filename);
- }
-
- @Override
- public URI resolveBase(URI uri) {
- return base.toURI().resolve(uri);
- }
-
- @Override
- public File getDataDirectory() {
- return data;
- }
-
- @Override
- public File getInstancesDirectory() {
- return instances;
- }
-
- @Override
- public String[] getArgs() {
- return args.clone();
- }
-
- private File resolveWithBase(File baseDir, String filename) {
- File file = new File(filename);
- if (file.isAbsolute()) {
- return file;
- }
- return new File(baseDir, filename);
- }
-
-}
[2/5] git commit: [KARAF-2903] Upgrade to gemini blueprint 1.0.2
Posted by gn...@apache.org.
[KARAF-2903] Upgrade to gemini blueprint 1.0.2
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/ce0f75d3
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/ce0f75d3
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/ce0f75d3
Branch: refs/heads/master
Commit: ce0f75d30e5c214a03e3195fb01c48c5219ede1b
Parents: bf00db9
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Mon Apr 14 11:03:48 2014 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Mon Apr 14 11:03:48 2014 +0200
----------------------------------------------------------------------
assemblies/features/spring/pom.xml | 12 ++++-----
.../spring/src/main/feature/feature.xml | 6 ++---
pom.xml | 27 ++++++++++++++------
3 files changed, 28 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/ce0f75d3/assemblies/features/spring/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/spring/pom.xml b/assemblies/features/spring/pom.xml
index a37137e..2112070 100644
--- a/assemblies/features/spring/pom.xml
+++ b/assemblies/features/spring/pom.xml
@@ -255,13 +255,13 @@
<!-- gemini-blueprint deps -->
<dependency>
- <groupId>org.eclipse.gemini.blueprint</groupId>
- <artifactId>gemini-blueprint-io</artifactId>
+ <groupId>org.eclipse.gemini</groupId>
+ <artifactId>org.eclipse.gemini.blueprint.io</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.gemini.blueprint</groupId>
- <artifactId>gemini-blueprint-core</artifactId>
+ <groupId>org.eclipse.gemini</groupId>
+ <artifactId>org.eclipse.gemini.blueprint.core</artifactId>
<scope>provided</scope>
<exclusions>
<exclusion>
@@ -283,8 +283,8 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.eclipse.gemini.blueprint</groupId>
- <artifactId>gemini-blueprint-extender</artifactId>
+ <groupId>org.eclipse.gemini</groupId>
+ <artifactId>org.eclipse.gemini.blueprint.extender</artifactId>
<scope>provided</scope>
<exclusions>
<exclusion>
http://git-wip-us.apache.org/repos/asf/karaf/blob/ce0f75d3/assemblies/features/spring/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/spring/src/main/feature/feature.xml b/assemblies/features/spring/src/main/feature/feature.xml
index 768d9c3..5917225 100644
--- a/assemblies/features/spring/src/main/feature/feature.xml
+++ b/assemblies/features/spring/src/main/feature/feature.xml
@@ -284,9 +284,9 @@
<feature name="gemini-blueprint" description="Gemini Blueprint Extender" version="${gemini.blueprint.version}" resolver="(obr)">
<feature version="[3,4)">spring</feature>
- <bundle start-level="30">mvn:org.eclipse.gemini.blueprint/gemini-blueprint-io/${gemini.blueprint.version}</bundle>
- <bundle start-level="30">mvn:org.eclipse.gemini.blueprint/gemini-blueprint-core/${gemini.blueprint.version}</bundle>
- <bundle start-level="30">mvn:org.eclipse.gemini.blueprint/gemini-blueprint-extender/${gemini.blueprint.version}</bundle>
+ <bundle start-level="30">mvn:org.eclipse.gemini/org.eclipse.gemini.blueprint.io/${gemini.blueprint.version}</bundle>
+ <bundle start-level="30">mvn:org.eclipse.gemini/org.eclipse.gemini.blueprint.core/${gemini.blueprint.version}</bundle>
+ <bundle start-level="30">mvn:org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/${gemini.blueprint.version}</bundle>
</feature>
</features>
http://git-wip-us.apache.org/repos/asf/karaf/blob/ce0f75d3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6a0dcb4..c701331 100644
--- a/pom.xml
+++ b/pom.xml
@@ -206,7 +206,7 @@
<aries.transaction.jdbc.version>1.0.0</aries.transaction.jdbc.version>
<aries.util.version>1.1.0</aries.util.version>
- <gemini.blueprint.version>1.0.0.RELEASE</gemini.blueprint.version>
+ <gemini.blueprint.version>1.0.2.RELEASE</gemini.blueprint.version>
<hibernate.annotations.common.version>3.3.0.ga</hibernate.annotations.common.version>
<hibernate.annotations.version>3.4.0.GA</hibernate.annotations.version>
<hibernate.ejb.version>3.4.0.GA</hibernate.ejb.version>
@@ -315,7 +315,18 @@
<repository>
<id>zodiac-repository</id>
<name>Zodiac Release Repository</name>
- <url>http://zodiac.springsource.com/maven/bundles/release</url>
+ <url>http://repository.springsource.com/maven/bundles/release</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>spring-ebr-repository</id>
+ <name>Spring EBR Repository</name>
+ <url>http://repository.springsource.com/maven/bundles/external</url>
<releases>
<enabled>true</enabled>
</releases>
@@ -1119,18 +1130,18 @@
</dependency>
<dependency>
- <groupId>org.eclipse.gemini.blueprint</groupId>
- <artifactId>gemini-blueprint-io</artifactId>
+ <groupId>org.eclipse.gemini</groupId>
+ <artifactId>org.eclipse.gemini.blueprint.extender</artifactId>
<version>${gemini.blueprint.version}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.gemini.blueprint</groupId>
- <artifactId>gemini-blueprint-core</artifactId>
+ <groupId>org.eclipse.gemini</groupId>
+ <artifactId>org.eclipse.gemini.blueprint.core</artifactId>
<version>${gemini.blueprint.version}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.gemini.blueprint</groupId>
- <artifactId>gemini-blueprint-extender</artifactId>
+ <groupId>org.eclipse.gemini</groupId>
+ <artifactId>org.eclipse.gemini.blueprint.io</artifactId>
<version>${gemini.blueprint.version}</version>
</dependency>
[4/5] git commit: [KARAF-2904] Use the osgi extender namespace for
blueprint
Posted by gn...@apache.org.
[KARAF-2904] Use the osgi extender namespace for blueprint
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/8b59f976
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/8b59f976
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/8b59f976
Branch: refs/heads/master
Commit: 8b59f9767c2ec2b36dfe7cee9787ff44e72396bc
Parents: 3fe6898
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Mon Apr 14 11:08:39 2014 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Mon Apr 14 11:08:39 2014 +0200
----------------------------------------------------------------------
.../features/enterprise/src/main/feature/feature.xml | 11 +++++++++--
assemblies/features/spring/src/main/feature/feature.xml | 5 ++++-
.../features/standard/src/main/feature/feature.xml | 5 +++--
3 files changed, 16 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/8b59f976/assemblies/features/enterprise/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/enterprise/src/main/feature/feature.xml b/assemblies/features/enterprise/src/main/feature/feature.xml
index 24c4136..da68fe1 100644
--- a/assemblies/features/enterprise/src/main/feature/feature.xml
+++ b/assemblies/features/enterprise/src/main/feature/feature.xml
@@ -16,7 +16,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<features name="enterprise-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
+<features name="enterprise-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.3.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.3.0 http://karaf.apache.org/xmlns/features/v1.3.0">
<!-- NB: this file is not the one really used. This file is used by the karaf-maven-plugin to define the start-level of bundles in the generated feature.xml -->
@@ -186,10 +186,17 @@
<feature name="jdbc" description="JDBC service and commands" version="${project.version}" resolver="(obr)">
<details>JDBC support providing service, commands, and MBean.</details>
<feature>transaction</feature>
- <feature>aries-blueprint</feature>
<bundle>mvn:commons-pool/commons-pool/${commons-pool.version}</bundle>
<bundle>mvn:commons-dbcp/commons-dbcp/${commons-dbcp.version}</bundle>
<bundle>mvn:org.apache.karaf.jdbc/org.apache.karaf.jdbc.core/${project.version}</bundle>
+ <!--
+ Requirement on Blueprint.
+ We don't use a feature dependency to allow the choice between aries-blueprint and gemini-blueprint.
+ This means that you need to install one of the above to be able to install the jdbc feature.
+ -->
+ <requirement>
+ osgi.extender;filter:="(&(osgi.extender=osgi.blueprint)(version>=1.0))"
+ </requirement>
</feature>
<feature name="jms" description="JMS service and commands" version="${project.version}" resolver="(obr)">
http://git-wip-us.apache.org/repos/asf/karaf/blob/8b59f976/assemblies/features/spring/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/spring/src/main/feature/feature.xml b/assemblies/features/spring/src/main/feature/feature.xml
index 5917225..b8f0066 100644
--- a/assemblies/features/spring/src/main/feature/feature.xml
+++ b/assemblies/features/spring/src/main/feature/feature.xml
@@ -16,7 +16,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<features name="spring-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
+<features name="spring-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.3.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.3.0 http://karaf.apache.org/xmlns/features/v1.3.0">
<!-- NB: this file is not the one really used. This file is used by the karaf-maven-plugin to define the start-level of bundles in the generated feature.xml -->
@@ -287,6 +287,9 @@
<bundle start-level="30">mvn:org.eclipse.gemini/org.eclipse.gemini.blueprint.io/${gemini.blueprint.version}</bundle>
<bundle start-level="30">mvn:org.eclipse.gemini/org.eclipse.gemini.blueprint.core/${gemini.blueprint.version}</bundle>
<bundle start-level="30">mvn:org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/${gemini.blueprint.version}</bundle>
+ <capability>
+ osgi.extender; osgi.extender="osgi.blueprint";uses:="org.osgi.service.blueprint.container,org.osgi.service.blueprint.reflect";version:Version="1.0"
+ </capability>
</feature>
</features>
http://git-wip-us.apache.org/repos/asf/karaf/blob/8b59f976/assemblies/features/standard/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/standard/src/main/feature/feature.xml b/assemblies/features/standard/src/main/feature/feature.xml
index 5e3fd11..6612af4 100644
--- a/assemblies/features/standard/src/main/feature/feature.xml
+++ b/assemblies/features/standard/src/main/feature/feature.xml
@@ -51,7 +51,8 @@
<bundle start-level="30">mvn:org.apache.karaf.bundle/org.apache.karaf.bundle.blueprintstate/${project.version}</bundle>
</conditional>
<capability>
- service-reference;effective:=active;objectClass=org.apache.aries.blueprint.services.ParserService
+ service-reference;effective:=active;objectClass=org.apache.aries.blueprint.services.ParserService,
+ osgi.extender; osgi.extender="osgi.blueprint";uses:="org.osgi.service.blueprint.container,org.osgi.service.blueprint.reflect";version:Version="1.0"
</capability>
</feature>
@@ -87,7 +88,7 @@
<bundle start="true" start-level="24">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.wrap/${project.version}</bundle>
<bundle start="true" start-level="26">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.features/${project.version}</bundle>
<conditional>
- <condition>aries-blueprint</condition>
+ <condition>req:osgi.extender;filter:="(&(osgi.extender=osgi.blueprint)(version>=1.0))"</condition>
<bundle start="true" start-level="24">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.blueprint/${project.version}</bundle>
</conditional>
<conditional>
[5/5] git commit: Fix integration tests
Posted by gn...@apache.org.
Fix integration tests
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/69a53969
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/69a53969
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/69a53969
Branch: refs/heads/master
Commit: 69a53969d817dce68816ceb6a229e6d6177b5b16
Parents: 8b59f97
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Mon Apr 14 11:18:12 2014 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Mon Apr 14 11:18:12 2014 +0200
----------------------------------------------------------------------
itests/pom.xml | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/69a53969/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index aa74c4f..21178d2 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -39,6 +39,10 @@
<dependencies>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>apache-karaf</artifactId>
<scope>test</scope>
[3/5] git commit: [KARAF-2833] Make jdbc independent of blueprint.
Note that blueprint is still required to deploy the datasources
Posted by gn...@apache.org.
[KARAF-2833] Make jdbc independent of blueprint.
Note that blueprint is still required to deploy the datasources
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/3fe68988
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/3fe68988
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/3fe68988
Branch: refs/heads/master
Commit: 3fe68988b2bf41808cd7647ebc82ae4092b8191a
Parents: ce0f75d
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Mon Apr 14 11:06:40 2014 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Mon Apr 14 11:06:40 2014 +0200
----------------------------------------------------------------------
jdbc/pom.xml | 7 +++-
.../karaf/jdbc/internal/osgi/Activator.java | 35 +++++++++++++++++
.../resources/OSGI-INF/blueprint/jdbc-core.xml | 41 --------------------
3 files changed, 41 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/3fe68988/jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index a6dce66..be8ef62 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -84,8 +84,13 @@
org.apache.karaf.jdbc.command,
org.apache.karaf.jdbc.command.completers,
org.apache.karaf.jdbc.internal,
- org.apache.karaf.util
+ org.apache.karaf.jdbc.internal.osgi,
+ org.apache.karaf.util,
+ org.apache.karaf.util.tracker
</Private-Package>
+ <Bundle-Activator>
+ org.apache.karaf.jdbc.internal.osgi.Activator
+ </Bundle-Activator>
<Karaf-Commands>*</Karaf-Commands>
</instructions>
</configuration>
http://git-wip-us.apache.org/repos/asf/karaf/blob/3fe68988/jdbc/src/main/java/org/apache/karaf/jdbc/internal/osgi/Activator.java
----------------------------------------------------------------------
diff --git a/jdbc/src/main/java/org/apache/karaf/jdbc/internal/osgi/Activator.java b/jdbc/src/main/java/org/apache/karaf/jdbc/internal/osgi/Activator.java
new file mode 100644
index 0000000..8ede97a
--- /dev/null
+++ b/jdbc/src/main/java/org/apache/karaf/jdbc/internal/osgi/Activator.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+package org.apache.karaf.jdbc.internal.osgi;
+
+import org.apache.karaf.jdbc.JdbcService;
+import org.apache.karaf.jdbc.internal.JdbcMBeanImpl;
+import org.apache.karaf.jdbc.internal.JdbcServiceImpl;
+import org.apache.karaf.util.tracker.BaseActivator;
+
+public class Activator extends BaseActivator {
+ @Override
+ protected void doStart() throws Exception {
+ JdbcServiceImpl service = new JdbcServiceImpl();
+ service.setBundleContext(bundleContext);
+ register(JdbcService.class, service);
+
+ JdbcMBeanImpl mbean = new JdbcMBeanImpl();
+ mbean.setJdbcService(service);
+ registerMBean(mbean, "type=jdbc");
+ }
+}
http://git-wip-us.apache.org/repos/asf/karaf/blob/3fe68988/jdbc/src/main/resources/OSGI-INF/blueprint/jdbc-core.xml
----------------------------------------------------------------------
diff --git a/jdbc/src/main/resources/OSGI-INF/blueprint/jdbc-core.xml b/jdbc/src/main/resources/OSGI-INF/blueprint/jdbc-core.xml
deleted file mode 100644
index e961697..0000000
--- a/jdbc/src/main/resources/OSGI-INF/blueprint/jdbc-core.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You 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.
- -->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
- xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0"
- default-activation="lazy">
-
- <ext:property-placeholder placeholder-prefix="$[" placeholder-suffix="]"/>
-
- <bean id="jdbcService" class="org.apache.karaf.jdbc.internal.JdbcServiceImpl">
- <property name="bundleContext" ref="blueprintBundleContext"/>
- </bean>
-
- <service ref="jdbcService" interface="org.apache.karaf.jdbc.JdbcService" />
-
- <!-- Management -->
- <bean id="jdbcMBeanImpl" class="org.apache.karaf.jdbc.internal.JdbcMBeanImpl">
- <property name="jdbcService" ref="jdbcService"/>
- </bean>
-
- <service ref="jdbcMBeanImpl" auto-export="interfaces">
- <service-properties>
- <entry key="jmx.objectname" value="org.apache.karaf:type=jdbc,name=$[karaf.name]"/>
- </service-properties>
- </service>
-
-</blueprint>
\ No newline at end of file