Author: iocanel
Date: Mon Jan 16 20:12:52 2012
New Revision: 1232140
URL: http://svn.apache.org/viewvc?rev=1232140&view=rev
Log:
[KARAF-1136] Decoupled feature service from region persistence service, to make
possible using features without the region support installed. Modified the
minimal distribution to only installed whats required to boot up the feature
service.
Added:
karaf/trunk/region/core/
karaf/trunk/region/core/NOTICE
karaf/trunk/region/core/pom.xml
karaf/trunk/region/core/src/
karaf/trunk/region/core/src/main/
karaf/trunk/region/core/src/main/java/
karaf/trunk/region/core/src/main/java/org/
karaf/trunk/region/core/src/main/java/org/apache/
karaf/trunk/region/core/src/main/java/org/apache/karaf/
karaf/trunk/region/core/src/main/java/org/apache/karaf/region/
karaf/trunk/region/core/src/main/java/org/apache/karaf/region/persist/
karaf/trunk/region/core/src/main/java/org/apache/karaf/region/persist/RegionsPersistence.java
- copied, changed from r1232137,
karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/RegionsPersistence.java
Removed:
karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/RegionsPersistence.java
Modified:
karaf/trunk/assemblies/apache-karaf-minimal/pom.xml
karaf/trunk/assemblies/features/framework/pom.xml
karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/org.apache.karaf.features.cfg
karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
karaf/trunk/features/core/pom.xml
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java
karaf/trunk/features/core/src/main/resources/OSGI-INF/blueprint/gshell-features.xml
karaf/trunk/pom.xml
karaf/trunk/region/commands/pom.xml
karaf/trunk/region/persist/pom.xml
karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/RegionsBundleTracker.java
karaf/trunk/region/pom.xml
karaf/trunk/shell/dev/pom.xml
Modified: karaf/trunk/assemblies/apache-karaf-minimal/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/assemblies/apache-karaf-minimal/pom.xml?rev=1232140&r1=1232139&r2=1232140&view=diff
==============================================================================
--- karaf/trunk/assemblies/apache-karaf-minimal/pom.xml (original)
+++ karaf/trunk/assemblies/apache-karaf-minimal/pom.xml Mon Jan 16 20:12:52 2012
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<!--
@@ -50,6 +51,13 @@
<type>xml</type>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>spring</artifactId>
+ <classifier>features</classifier>
+ <type>xml</type>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
<build>
@@ -106,8 +114,7 @@
</executions>
<configuration>
<bootFeatures>
- <feature>standard</feature>
- <feature>management</feature>
+ <feature>framework</feature>
</bootFeatures>
</configuration>
</plugin>
Modified: karaf/trunk/assemblies/features/framework/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/pom.xml?rev=1232140&r1=1232139&r2=1232140&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/pom.xml (original)
+++ karaf/trunk/assemblies/features/framework/pom.xml Mon Jan 16 20:12:52 2012
@@ -102,10 +102,10 @@
<!--<artifactId>org.apache.karaf.features.core</artifactId>-->
<!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>org.apache.karaf.features</groupId>-->
- <!--<artifactId>org.apache.karaf.features.command</artifactId>-->
- <!--</dependency>-->
+ <dependency>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>org.apache.karaf.features.command</artifactId>
+ </dependency>
<!--<dependency>-->
<!--<groupId>org.apache.karaf.features</groupId>-->
<!--<artifactId>org.apache.karaf.features.management</artifactId>-->
@@ -184,14 +184,6 @@
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint.annotation.api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint.annotation.impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.api</artifactId>
</dependency>
<dependency>
@@ -207,10 +199,6 @@
<artifactId>org.apache.aries.blueprint.core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint.jexl.evaluator</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy.api</artifactId>
</dependency>
@@ -219,29 +207,25 @@
<artifactId>org.apache.aries.proxy.impl</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.aries.quiesce</groupId>
- <artifactId>org.apache.aries.quiesce.api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.quiesce</groupId>
- <artifactId>org.apache.aries.quiesce.manager</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
</dependency>
+ <!--
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.asm</artifactId>
</dependency>
+ -->
+ <!--
<dependency>
<groupId>org.eclipse.equinox</groupId>
<artifactId>region</artifactId>
<version>1.0.0.v20110506</version>
</dependency>
+ -->
<dependency>
<groupId>org.apache.karaf.region</groupId>
- <artifactId>org.apache.karaf.region.persist</artifactId>
+ <artifactId>org.apache.karaf.region.core</artifactId>
</dependency>
</dependencies>
<build>
Modified: karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml?rev=1232140&r1=1232139&r2=1232140&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml
(original)
+++ karaf/trunk/assemblies/features/framework/src/main/feature/feature.xml Mon
Jan 16 20:12:52 2012
@@ -28,22 +28,14 @@
<bundle start="true"
start-level="8">mvn:org.ops4j.pax.logging/pax-logging-service/${pax.logging.version}</bundle>
<bundle start="true"
start-level="10">mvn:org.apache.felix/org.apache.felix.configadmin/${felix.configadmin.version}</bundle>
<bundle start="true"
start-level="11">mvn:org.apache.felix/org.apache.felix.fileinstall/${felix.fileinstall.version}</bundle>
- <bundle start="true"
start-level="20">mvn:org.apache.commons/commons-jexl/${commons-jexl.version}</bundle>
- <bundle start="true"
start-level="20">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${asm.bundle.version}</bundle>
<bundle start="true"
start-level="20">mvn:org.apache.aries/org.apache.aries.util/${aries.util.version}</bundle>
<bundle start="true"
start-level="20">mvn:org.apache.aries.proxy/org.apache.aries.proxy.api/${aries.proxy.api.version}</bundle>
<bundle start="true"
start-level="20">mvn:org.apache.aries.proxy/org.apache.aries.proxy.impl/${aries.proxy.impl.version}</bundle>
- <bundle start="true"
start-level="20">mvn:org.apache.aries.quiesce/org.apache.aries.quiesce.api/${aries.quiesce.api.version}</bundle>
- <bundle start="true"
start-level="20">mvn:org.apache.aries.quiesce/org.apache.aries.quiesce.manager/${aries.quiesce.manager.version}</bundle>
- <bundle start="true"
start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.annotation.api/${aries.blueprint.annotation.api.version}</bundle>
- <bundle start="true"
start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.annotation.impl/${aries.blueprint.annotation.impl.version}</bundle>
<bundle start="true"
start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.api/${aries.blueprint.api.version}</bundle>
<bundle start="true"
start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.cm/${aries.blueprint.cm.version}</bundle>
<bundle start="true"
start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.core.compatibility/${aries.blueprint.core.compatibility.version}</bundle>
<bundle start="true"
start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.core/${aries.blueprint.core.version}</bundle>
- <bundle start="true"
start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.jexl.evaluator/${aries.blueprint.jexl.evaluator.version}</bundle>
- <bundle start="true"
start-level="30">mvn:org.eclipse.equinox/region/1.0.0.v20110506</bundle>
- <bundle start="true"
start-level="30">mvn:org.apache.karaf.region/org.apache.karaf.region.persist/${project.version}</bundle>
+ <bundle start="true"
start-level="25">mvn:org.apache.karaf.region/org.apache.karaf.region.core/${project.version}</bundle>
<bundle start="true"
start-level="25">mvn:org.apache.karaf.features/org.apache.karaf.features.core/${project.version}</bundle>
</feature>
Modified:
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/org.apache.karaf.features.cfg
URL:
http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/org.apache.karaf.features.cfg?rev=1232140&r1=1232139&r2=1232140&view=diff
==============================================================================
---
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/org.apache.karaf.features.cfg
(original)
+++
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/org.apache.karaf.features.cfg
Mon Jan 16 20:12:52 2012
@@ -1,28 +1,28 @@
-################################################################################
-#
-# 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.
-#
-################################################################################
-
-#
-# Comma separated list of features repositories to register by default
-#
-featuresRepositories=mvn:org.apache.karaf.features/standard/${project.version}/xml/features,mvn:org.apache.karaf.features/enterprise/${project.version}/xml/features
-
-#
-# Comma separated list of features to install at startup
-#
-featuresBoot=config,ssh,management
+################################################################################
+#
+# 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.
+#
+################################################################################
+
+#
+# Comma separated list of features repositories to register by default
+#
+featuresRepositories=mvn:org.apache.karaf.features/standard/${project.version}/xml/features,mvn:org.apache.karaf.features/enterprise/${project.version}/xml/features
+
+#
+# Comma separated list of features to install at startup
+#
+featuresBoot=config
Modified: karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml?rev=1232140&r1=1232139&r2=1232140&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
(original)
+++ karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml Mon
Jan 16 20:12:52 2012
@@ -18,6 +18,14 @@
-->
<features name="standard-${project.version}"
xmlns="http://karaf.apache.org/xmlns/features/v1.0.0";>
+ <feature name="aries-annotation" description="Aries Annotations"
version="${project.version}">
+ <bundle
start-level="20">mvn:org.apache.commons/commons-jexl/${commons-jexl.version}</bundle>
+ <bundle
start-level="20">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${asm.bundle.version}</bundle>
+ <bundle
start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.annotation.api/${aries.blueprint.annotation.api.version}</bundle>
+ <bundle
start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.annotation.impl/${aries.blueprint.annotation.impl.version}</bundle>
+ <bundle
start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.jexl.evaluator/${aries.blueprint.jexl.evaluator.version}</bundle>
+ </feature>
+
<!-- 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 -->
<feature name="wrapper" description="Provide OS integration"
version="${project.version}">
@@ -41,8 +49,10 @@
<bundle start-level="30"
start="true">mvn:org.apache.karaf.shell/org.apache.karaf.shell.config/${project.version}</bundle>
</feature>
- <feature name="region" description="Provide Region commands"
version="${project.version}">
- <bundle start-level="30"
start="true">mvn:org.apache.karaf.region/org.apache.karaf.region.commands/${project.version}</bundle>
+ <feature name="region" description="Provide Region Support"
version="${project.version}">
+ <bundle
start-level="30">mvn:org.eclipse.equinox/region/${equinox.region.version}</bundle>
+ <bundle
start-level="30">mvn:org.apache.karaf.region/org.apache.karaf.region.persist/${project.version}</bundle>
+ <bundle
start-level="30">mvn:org.apache.karaf.region/org.apache.karaf.region.commands/${project.version}</bundle>
</feature>
<feature name="jetty" description="Provide Jetty engine support"
version="${jetty.version}" resolver="(obr)">
Modified: karaf/trunk/features/core/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/features/core/pom.xml?rev=1232140&r1=1232139&r2=1232140&view=diff
==============================================================================
--- karaf/trunk/features/core/pom.xml (original)
+++ karaf/trunk/features/core/pom.xml Mon Jan 16 20:12:52 2012
@@ -43,7 +43,11 @@
<artifactId>org.apache.karaf.main</artifactId>
<scope>provided</scope>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.karaf.region</groupId>
+ <artifactId>org.apache.karaf.region.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
@@ -56,11 +60,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.region</groupId>
- <artifactId>org.apache.karaf.region.persist</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
Modified:
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java?rev=1232140&r1=1232139&r2=1232140&view=diff
==============================================================================
---
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java
(original)
+++
karaf/trunk/features/core/src/main/java/org/apache/karaf/features/internal/FeaturesServiceImpl.java
Mon Jan 16 20:12:52 2012
@@ -43,6 +43,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Properties;
+import java.util.Queue;
import java.util.Set;
import java.util.TreeSet;
import java.util.concurrent.CopyOnWriteArrayList;
@@ -103,7 +104,6 @@ public class FeaturesServiceImpl impleme
private BundleContext bundleContext;
private ConfigurationAdmin configAdmin;
- private RegionsPersistence regionsPersistence;
private long resolverTimeout = 5000;
private Set<URI> uris;
private Map<URI, RepositoryImpl> repositories = new HashMap<URI,
RepositoryImpl>();
@@ -112,6 +112,7 @@ public class FeaturesServiceImpl impleme
private String boot;
AtomicBoolean bootFeaturesInstalled = new AtomicBoolean();
private List<FeaturesListener> listeners = new
CopyOnWriteArrayList<FeaturesListener>();
+ private Queue<RegionsPersistence> regionsPersistenceQueue = new
LinkedList<RegionsPersistence>();
private ThreadLocal<Repository> repo = new ThreadLocal<Repository>();
private EventAdminListener eventAdminListener;
private final Object refreshLock = new Object();
@@ -136,14 +137,6 @@ public class FeaturesServiceImpl impleme
this.configAdmin = configAdmin;
}
- public RegionsPersistence getRegionsPersistence() {
- return regionsPersistence;
- }
-
- public void setRegionsPersistence(RegionsPersistence regionsPersistence) {
- this.regionsPersistence = regionsPersistence;
- }
-
public long getResolverTimeout() {
return resolverTimeout;
}
@@ -178,6 +171,15 @@ public class FeaturesServiceImpl impleme
listeners.remove(listener);
}
+
+ public void registerRegionsPersistence(RegionsPersistence
regionsPersistence) {
+ regionsPersistenceQueue.add(regionsPersistence);
+ }
+
+ public void unregisterRegionsPersistence(RegionsPersistence
regionsPersistence) {
+ regionsPersistenceQueue.remove(regionsPersistence);
+ }
+
public void setUrls(String uris) throws URISyntaxException {
String[] s = uris.split(",");
this.uris = new HashSet<URI>();
@@ -487,7 +489,8 @@ public class FeaturesServiceImpl impleme
Bundle b = installBundleIfNeeded(state, bInfo,
feature.getStartLevel(), verbose);
bundles.add(b.getBundleId());
state.bundleInfos.put(b.getBundleId(), bInfo);
- if (region != null && state.installed.contains(b)) {
+ RegionsPersistence regionsPersistence =
regionsPersistenceQueue.peek();
+ if (region != null && state.installed.contains(b) &&
regionsPersistence != null) {
regionsPersistence.install(b, region);
}
}
Modified:
karaf/trunk/features/core/src/main/resources/OSGI-INF/blueprint/gshell-features.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/features/core/src/main/resources/OSGI-INF/blueprint/gshell-features.xml?rev=1232140&r1=1232139&r2=1232140&view=diff
==============================================================================
---
karaf/trunk/features/core/src/main/resources/OSGI-INF/blueprint/gshell-features.xml
(original)
+++
karaf/trunk/features/core/src/main/resources/OSGI-INF/blueprint/gshell-features.xml
Mon Jan 16 20:12:52 2012
@@ -36,7 +36,6 @@
<property name="boot" value="$[featuresBoot]" />
<property name="resolverTimeout" value="$[resolverTimeout]" />
<property name="configAdmin" ref="configAdmin" />
- <property name="regionsPersistence" ref="regionsPersistence" />
<property name="mvnUrlHandler" ref="mvnUrlHandler" />
<property name="bundleContext" ref="blueprintBundleContext" />
</bean>
@@ -49,10 +48,15 @@
<reference id="configAdmin"
interface="org.osgi.service.cm.ConfigurationAdmin" />
- <reference id="regionsPersistence"
interface="org.apache.karaf.region.persist.RegionsPersistence" />
<reference id="mvnUrlHandler"
interface="org.osgi.service.url.URLStreamHandlerService"
filter="(url.handler.protocol=mvn)" />
<service ref="featuresService"
interface="org.apache.karaf.features.FeaturesService" />
+ <reference id="regionsPersistence" availability="optional"
interface="org.apache.karaf.region.persist.RegionsPersistence" >
+ <reference-listener ref="featuresService"
+ bind-method="registerRegionsPersistence"
+ unbind-method="unregisterRegionsPersistence" />
+ </reference>
+
</blueprint>
Modified: karaf/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1232140&r1=1232139&r2=1232140&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Mon Jan 16 20:12:52 2012
@@ -133,9 +133,8 @@
<geronimo.jta-spec.version>1.1.1</geronimo.jta-spec.version>
<easymock.version>2.5.2</easymock.version>
<equinox.version>3.7.1.R37x_v20110808-1106</equinox.version>
-
<bndlib.version>1.50.0</bndlib.version>
-
+ <equinox.region.version>1.0.0.v20110506</equinox.region.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>
@@ -292,6 +291,12 @@
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>${osgi.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>manual</artifactId>
<type>pdf</type>
@@ -490,6 +495,11 @@
</dependency>
<dependency>
<groupId>org.apache.karaf.region</groupId>
+ <artifactId>org.apache.karaf.region.core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.region</groupId>
<artifactId>org.apache.karaf.region.commands</artifactId>
<version>${project.version}</version>
</dependency>
Modified: karaf/trunk/region/commands/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/region/commands/pom.xml?rev=1232140&r1=1232139&r2=1232140&view=diff
==============================================================================
--- karaf/trunk/region/commands/pom.xml (original)
+++ karaf/trunk/region/commands/pom.xml Mon Jan 16 20:12:52 2012
@@ -29,7 +29,7 @@
<artifactId>org.apache.karaf.region.commands</artifactId>
<packaging>bundle</packaging>
- <name>Apache Karaf :: Shell :: Region Commands</name>
+ <name>Apache Karaf :: Region :: Shell Commands</name>
<description>This bundle provides Karaf shell commands to manipulate the
Region service.</description>
<properties>
Added: karaf/trunk/region/core/NOTICE
URL:
http://svn.apache.org/viewvc/karaf/trunk/region/core/NOTICE?rev=1232140&view=auto
==============================================================================
--- karaf/trunk/region/core/NOTICE (added)
+++ karaf/trunk/region/core/NOTICE Mon Jan 16 20:12:52 2012
@@ -0,0 +1,24 @@
+Apache Karaf
+Copyright 2010-2011 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software written by
+Antony Lesuisse.
+Licensed under Public Domain.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2010).
+Licensed under the Apache License 2.0.
+
+III. License Summary
+- Apache License 2.0
Added: karaf/trunk/region/core/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/region/core/pom.xml?rev=1232140&view=auto
==============================================================================
--- karaf/trunk/region/core/pom.xml (added)
+++ karaf/trunk/region/core/pom.xml Mon Jan 16 20:12:52 2012
@@ -0,0 +1,69 @@
+<?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.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+
+ <parent>
+ <groupId>org.apache.karaf.region</groupId>
+ <artifactId>region</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.apache.karaf.region.core</artifactId>
+ <packaging>bundle</packaging>
+ <name>Apache Karaf :: Region :: Core</name>
+ <description>This bundle provides an API for interacting with
Regions.</description>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/src/main/resources</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Import-Package>
+
!org.apache.karaf.region.persist;version="${project.version}",
+ *
+ </Import-Package>
+
<Export-Package>org.apache.karaf.region.persist;version="${project.version}"</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
Copied:
karaf/trunk/region/core/src/main/java/org/apache/karaf/region/persist/RegionsPersistence.java
(from r1232137,
karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/RegionsPersistence.java)
URL:
http://svn.apache.org/viewvc/karaf/trunk/region/core/src/main/java/org/apache/karaf/region/persist/RegionsPersistence.java?p2=karaf/trunk/region/core/src/main/java/org/apache/karaf/region/persist/RegionsPersistence.java&p1=karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/RegionsPersistence.java&r1=1232137&r2=1232140&rev=1232140&view=diff
==============================================================================
(empty)
Modified: karaf/trunk/region/persist/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/region/persist/pom.xml?rev=1232140&r1=1232139&r2=1232140&view=diff
==============================================================================
--- karaf/trunk/region/persist/pom.xml (original)
+++ karaf/trunk/region/persist/pom.xml Mon Jan 16 20:12:52 2012
@@ -38,10 +38,23 @@
<dependencies>
<dependency>
+ <groupId>org.apache.karaf.region</groupId>
+ <artifactId>org.apache.karaf.region.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>org.apache.karaf.main</artifactId>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>org.apache.karaf.features.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
@@ -97,9 +110,10 @@
<Bundle-Activator>org.apache.karaf.region.persist.internal.Activator</Bundle-Activator>
<Import-Package>
!${project.artifactId}*,
+
!org.apache.karaf.region;version="${project.version}",
*
</Import-Package>
- <Private-Package>!*</Private-Package>
+
<Private-Package>org.apache.karaf.region.internal,org.apache.karaf.region.model</Private-Package>
</instructions>
</configuration>
</plugin>
Modified:
karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/RegionsBundleTracker.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/RegionsBundleTracker.java?rev=1232140&r1=1232139&r2=1232140&view=diff
==============================================================================
---
karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/RegionsBundleTracker.java
(original)
+++
karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/RegionsBundleTracker.java
Mon Jan 16 20:12:52 2012
@@ -25,7 +25,6 @@ import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleEvent;
import org.osgi.framework.BundleException;
-import org.osgi.framework.Constants;
import org.osgi.util.tracker.BundleTracker;
import org.osgi.util.tracker.BundleTrackerCustomizer;
import org.slf4j.Logger;
Modified: karaf/trunk/region/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/region/pom.xml?rev=1232140&r1=1232139&r2=1232140&view=diff
==============================================================================
--- karaf/trunk/region/pom.xml (original)
+++ karaf/trunk/region/pom.xml Mon Jan 16 20:12:52 2012
@@ -33,9 +33,11 @@
<name>Apache Karaf :: Region</name>
<modules>
+ <module>core</module>
<module>commands</module>
<module>persist</module>
</modules>
+
<profiles>
<profile>
<id>default</id>
Modified: karaf/trunk/shell/dev/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/shell/dev/pom.xml?rev=1232140&r1=1232139&r2=1232140&view=diff
==============================================================================
--- karaf/trunk/shell/dev/pom.xml (original)
+++ karaf/trunk/shell/dev/pom.xml Mon Jan 16 20:12:52 2012
@@ -112,6 +112,7 @@
!org.apache.log,
!org.apache.xerces.xni,
!org.apache.xerces.xni.parser,
+ !org.objectweb.asm*,
org.apache.aries.blueprint,
org.osgi.service.blueprint.container,
org.osgi.service.blueprint.reflect,
