Author: iocanel
Date: Tue Jul 26 18:43:24 2011
New Revision: 1151206
URL: http://svn.apache.org/viewvc?rev=1151206&view=rev
Log:
[KARAF-628] Added bundle replication support to cellar-2.2.x
Added:
karaf/cellar/branches/cellar-2.2.x/bundle/
- copied from r1125040, karaf/cellar/trunk/bundle/
karaf/cellar/branches/cellar-2.2.x/bundle/pom.xml
- copied, changed from r1125040, karaf/cellar/trunk/bundle/pom.xml
karaf/cellar/branches/cellar-2.2.x/bundle/src/
- copied from r1125040, karaf/cellar/trunk/bundle/src/
karaf/cellar/branches/cellar-2.2.x/bundle/src/main/
- copied from r1125040, karaf/cellar/trunk/bundle/src/main/
karaf/cellar/branches/cellar-2.2.x/bundle/src/main/java/
- copied from r1125040, karaf/cellar/trunk/bundle/src/main/java/
karaf/cellar/branches/cellar-2.2.x/bundle/src/main/java/org/
- copied from r1125040, karaf/cellar/trunk/bundle/src/main/java/org/
karaf/cellar/branches/cellar-2.2.x/bundle/src/main/java/org/apache/
- copied from r1125040,
karaf/cellar/trunk/bundle/src/main/java/org/apache/
karaf/cellar/branches/cellar-2.2.x/bundle/src/main/java/org/apache/karaf/
- copied from r1125040,
karaf/cellar/trunk/bundle/src/main/java/org/apache/karaf/
karaf/cellar/branches/cellar-2.2.x/bundle/src/main/java/org/apache/karaf/cellar/
- copied from r1125040,
karaf/cellar/trunk/bundle/src/main/java/org/apache/karaf/cellar/
karaf/cellar/branches/cellar-2.2.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/
- copied from r1125040,
karaf/cellar/trunk/bundle/src/main/java/org/apache/karaf/cellar/bundle/
karaf/cellar/branches/cellar-2.2.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleEventHandler.java
- copied unchanged from r1125040,
karaf/cellar/trunk/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleEventHandler.java
karaf/cellar/branches/cellar-2.2.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleState.java
- copied unchanged from r1125040,
karaf/cellar/trunk/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleState.java
karaf/cellar/branches/cellar-2.2.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleSupport.java
- copied unchanged from r1125040,
karaf/cellar/trunk/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleSupport.java
karaf/cellar/branches/cellar-2.2.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleSynchronizer.java
- copied unchanged from r1125040,
karaf/cellar/trunk/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleSynchronizer.java
karaf/cellar/branches/cellar-2.2.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/Constants.java
- copied unchanged from r1125040,
karaf/cellar/trunk/bundle/src/main/java/org/apache/karaf/cellar/bundle/Constants.java
karaf/cellar/branches/cellar-2.2.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/LocalBundleListener.java
- copied unchanged from r1125040,
karaf/cellar/trunk/bundle/src/main/java/org/apache/karaf/cellar/bundle/LocalBundleListener.java
karaf/cellar/branches/cellar-2.2.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/RemoteBundleEvent.java
- copied unchanged from r1125040,
karaf/cellar/trunk/bundle/src/main/java/org/apache/karaf/cellar/bundle/RemoteBundleEvent.java
karaf/cellar/branches/cellar-2.2.x/bundle/src/main/resources/
- copied from r1125040, karaf/cellar/trunk/bundle/src/main/resources/
karaf/cellar/branches/cellar-2.2.x/bundle/src/main/resources/OSGI-INF/
- copied from r1125040,
karaf/cellar/trunk/bundle/src/main/resources/OSGI-INF/
karaf/cellar/branches/cellar-2.2.x/bundle/src/main/resources/OSGI-INF/blueprint/
- copied from r1125040,
karaf/cellar/trunk/bundle/src/main/resources/OSGI-INF/blueprint/
karaf/cellar/branches/cellar-2.2.x/bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml
- copied, changed from r1125040,
karaf/cellar/trunk/bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml
Modified:
karaf/cellar/branches/cellar-2.2.x/ (props changed)
karaf/cellar/branches/cellar-2.2.x/assembly/src/main/resources/features.xml
karaf/cellar/branches/cellar-2.2.x/pom.xml
Propchange: karaf/cellar/branches/cellar-2.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 26 18:43:24 2011
@@ -1 +1 @@
-/karaf/cellar/trunk:1101991,1103447,1103456,1125012,1131478,1142446
+/karaf/cellar/trunk:1101991,1103447,1103456,1125012,1125040,1131478,1142446
Modified:
karaf/cellar/branches/cellar-2.2.x/assembly/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/assembly/src/main/resources/features.xml?rev=1151206&r1=1151205&r2=1151206&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/assembly/src/main/resources/features.xml
(original)
+++ karaf/cellar/branches/cellar-2.2.x/assembly/src/main/resources/features.xml
Tue Jul 26 18:43:24 2011
@@ -31,6 +31,7 @@
<bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.core/${project.version}</bundle>
<bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.config/${project.version}</bundle>
<bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.features/${project.version}</bundle>
+
<bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.bundle/${project.version}</bundle>
<bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.utils/${project.version}</bundle>
<bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.shell/${project.version}</bundle>
<bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.hazelcast/${project.version}</bundle>
Copied: karaf/cellar/branches/cellar-2.2.x/bundle/pom.xml (from r1125040,
karaf/cellar/trunk/bundle/pom.xml)
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/bundle/pom.xml?p2=karaf/cellar/branches/cellar-2.2.x/bundle/pom.xml&p1=karaf/cellar/trunk/bundle/pom.xml&r1=1125040&r2=1151206&rev=1151206&view=diff
==============================================================================
--- karaf/cellar/trunk/bundle/pom.xml (original)
+++ karaf/cellar/branches/cellar-2.2.x/bundle/pom.xml Tue Jul 26 18:43:24 2011
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>cellar</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>2.2.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Copied:
karaf/cellar/branches/cellar-2.2.x/bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml
(from r1125040,
karaf/cellar/trunk/bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml)
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml?p2=karaf/cellar/branches/cellar-2.2.x/bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml&p1=karaf/cellar/trunk/bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml&r1=1125040&r2=1151206&rev=1151206&view=diff
==============================================================================
---
karaf/cellar/trunk/bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml
(original)
+++
karaf/cellar/branches/cellar-2.2.x/bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml
Tue Jul 26 18:43:24 2011
@@ -24,9 +24,6 @@
<property name="bundleContext" ref="blueprintBundleContext"/>
</bean>
- <!-- Configuration Tracker -->
- <bean id="tracker" class="org.apache.karaf.cellar.bundle.BundleTracker"/>
-
<!-- Configuration Synchronizer -->
<bean id="synchronizer"
class="org.apache.karaf.cellar.bundle.BundleSynchronizer"
init-method="init" destroy-method="destroy"
depends-on="eventHandler">
@@ -39,7 +36,6 @@
<bean id="eventHandler"
class="org.apache.karaf.cellar.bundle.BundleEventHandler"
init-method="init" destroy-method="destroy">
- <property name="tracker" ref="tracker"/>
<property name="configurationAdmin" ref="configurationAdmin"/>
<property name="clusterManager" ref="clusterManager"/>
<property name="bundleContext" ref="blueprintBundleContext"/>
Modified: karaf/cellar/branches/cellar-2.2.x/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/pom.xml?rev=1151206&r1=1151205&r2=1151206&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/pom.xml (original)
+++ karaf/cellar/branches/cellar-2.2.x/pom.xml Tue Jul 26 18:43:24 2011
@@ -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,8 +51,9 @@
<module>core</module>
<module>config</module>
<module>features</module>
+ <module>bundle</module>
<module>shell</module>
- <module>hazelcast</module>
+ <module>hazelcast</module>
<module>utils</module>
<module>webconsole</module>
<module>assembly</module>
@@ -102,6 +104,13 @@
<dependencyManagement>
<dependencies>
+ <!-- Hazelcast -->
+ <dependency>
+ <groupId>com.hazelcast</groupId>
+ <artifactId>hazelcast</artifactId>
+ <version>${hazelcast.version}</version>
+ </dependency>
+
<!-- Cellar -->
<dependency>
<groupId>org.apache.karaf.cellar</groupId>
