You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2011/05/08 11:03:25 UTC
svn commit: r1100707 - in /karaf/cellar/trunk: ./ config/
config/src/main/java/org/apache/karaf/cellar/config/
config/src/main/java/org/apache/karaf/cellar/config/shell/
config/src/main/java/org/apache/karaf/cellar/config/shell/completers/
config/src/m...
Author: jbonofre
Date: Sun May 8 09:03:24 2011
New Revision: 1100707
URL: http://svn.apache.org/viewvc?rev=1100707&view=rev
Log:
[KARAF-618] Align Cellar major version with the Karaf one
[KARAF-620] Use Karaf parent POM
Start to cleanup java to apply Apache checkstyle convention.
Modified:
karaf/cellar/trunk/config/pom.xml
karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationEventHandler.java
karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSupport.java
karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java
karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/Constants.java
karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/LocalConfigurationListener.java
karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/RemoteConfigurationEvent.java
karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/ConfigCommandSupport.java
karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/ListCommand.java
karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/PropListCommand.java
karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/PropSetCommand.java
karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/completers/ClusterConfigCompleter.java
karaf/cellar/trunk/config/src/main/resources/OSGI-INF/blueprint/blueprint.xml
karaf/cellar/trunk/config/src/main/resources/OSGI-INF/blueprint/shell-config.xml
karaf/cellar/trunk/config/src/test/java/org/apache/karaf/cellar/config/ConfigurationSupportTest.java
karaf/cellar/trunk/core/pom.xml
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/command/BasicCommandStore.java
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/command/ClusteredExecutionContext.java
karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/command/Command.java
karaf/cellar/trunk/features/pom.xml
karaf/cellar/trunk/hazelcast/pom.xml
karaf/cellar/trunk/pom.xml
karaf/cellar/trunk/shell/pom.xml
karaf/cellar/trunk/src/main/resources/feature.xml
karaf/cellar/trunk/utils/pom.xml
Modified: karaf/cellar/trunk/config/pom.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/config/pom.xml?rev=1100707&r1=1100706&r2=1100707&view=diff
==============================================================================
--- karaf/cellar/trunk/config/pom.xml (original)
+++ karaf/cellar/trunk/config/pom.xml Sun May 8 09:03:24 2011
@@ -1,33 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed 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">
+<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">
+
+ <!--
+
+ 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.
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <groupId>org.apache.karaf.cellar</groupId>
- <artifactId>karaf-cellar</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>cellar</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>config</artifactId>
+ <groupId>org.apache.karaf.cellar</groupId>
+ <artifactId>org.apache.karaf.cellar.config</artifactId>
<packaging>bundle</packaging>
<name>Apache Karaf :: Cellar :: Config</name>
-
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<osgi.import>
@@ -45,7 +50,7 @@
<!-- Internal Dependencies -->
<dependency>
<groupId>org.apache.karaf.cellar</groupId>
- <artifactId>core</artifactId>
+ <artifactId>org.apache.karaf.cellar.core</artifactId>
<version>${project.version}</version>
</dependency>
@@ -60,4 +65,5 @@
<artifactId>slf4j-api</artifactId>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+
+</project>
Modified: karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationEventHandler.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationEventHandler.java?rev=1100707&r1=1100706&r2=1100707&view=diff
==============================================================================
--- karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationEventHandler.java (original)
+++ karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationEventHandler.java Sun May 8 09:03:24 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.config;
@@ -33,7 +32,7 @@ import java.util.Map;
import java.util.Properties;
/**
- * @author iocanel
+ * Configuration event handler.
*/
public class ConfigurationEventHandler extends ConfigurationSupport implements EventHandler<RemoteConfigurationEvent> {
@@ -106,4 +105,5 @@ public class ConfigurationEventHandler e
public Class<RemoteConfigurationEvent> getType() {
return RemoteConfigurationEvent.class;
}
+
}
Modified: karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSupport.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSupport.java?rev=1100707&r1=1100706&r2=1100707&view=diff
==============================================================================
--- karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSupport.java (original)
+++ karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSupport.java Sun May 8 09:03:24 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.config;
import org.apache.karaf.cellar.core.CellarSupport;
@@ -23,7 +22,7 @@ import java.util.Enumeration;
import java.util.Properties;
/**
- * @author iocanel
+ * Configuration support.
*/
public class ConfigurationSupport extends CellarSupport {
@@ -189,4 +188,5 @@ public class ConfigurationSupport extend
}
return false;
}
+
}
Modified: karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java?rev=1100707&r1=1100706&r2=1100707&view=diff
==============================================================================
--- karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java (original)
+++ karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java Sun May 8 09:03:24 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.config;
import org.apache.karaf.cellar.core.Configurations;
@@ -33,7 +32,7 @@ import java.util.Properties;
import java.util.Set;
/**
- * @author iocanel
+ * Configuration synchronizer.
*/
public class ConfigurationSynchronizer extends ConfigurationSupport implements Synchronizer {
@@ -194,4 +193,5 @@ public class ConfigurationSynchronizer e
public void setProducerList(List<EventProducer> producerList) {
this.producerList = producerList;
}
+
}
Modified: karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/Constants.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/Constants.java?rev=1100707&r1=1100706&r2=1100707&view=diff
==============================================================================
--- karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/Constants.java (original)
+++ karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/Constants.java Sun May 8 09:03:24 2011
@@ -11,13 +11,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.config;
/**
- * @author iocanel
+ * Cellar config constants.
*/
public class Constants {
+
public static final String CATEGORY = "config";
public static final String CONFIGURATION_MAP = "org.apache.karaf.cellar.configuration.map";
+
}
Modified: karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/LocalConfigurationListener.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/LocalConfigurationListener.java?rev=1100707&r1=1100706&r2=1100707&view=diff
==============================================================================
--- karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/LocalConfigurationListener.java (original)
+++ karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/LocalConfigurationListener.java Sun May 8 09:03:24 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.config;
import org.apache.karaf.cellar.core.Configurations;
@@ -33,7 +32,7 @@ import java.util.Properties;
import java.util.Set;
/**
- * @author: iocanel
+ * Local configuration listener.
*/
public class LocalConfigurationListener extends ConfigurationSupport implements ConfigurationListener {
@@ -118,4 +117,5 @@ public class LocalConfigurationListener
public void setProducerList(List<EventProducer> producerList) {
this.producerList = producerList;
}
+
}
Modified: karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/RemoteConfigurationEvent.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/RemoteConfigurationEvent.java?rev=1100707&r1=1100706&r2=1100707&view=diff
==============================================================================
--- karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/RemoteConfigurationEvent.java (original)
+++ karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/RemoteConfigurationEvent.java Sun May 8 09:03:24 2011
@@ -11,18 +11,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.config;
-
import org.apache.karaf.cellar.core.event.Event;
/**
- * @author iocanel
+ * Remote configuration event.
*/
public class RemoteConfigurationEvent extends Event {
public RemoteConfigurationEvent(String id) {
super(id);
}
+
}
Modified: karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/ConfigCommandSupport.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/ConfigCommandSupport.java?rev=1100707&r1=1100706&r2=1100707&view=diff
==============================================================================
--- karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/ConfigCommandSupport.java (original)
+++ karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/ConfigCommandSupport.java Sun May 8 09:03:24 2011
@@ -11,13 +11,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.config.shell;
import org.apache.karaf.cellar.core.shell.CellarCommandSupport;
/**
- * @author: iocanel
+ * Abstract config command support.
*/
public abstract class ConfigCommandSupport extends CellarCommandSupport {
+
}
Modified: karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/ListCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/ListCommand.java?rev=1100707&r1=1100706&r2=1100707&view=diff
==============================================================================
--- karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/ListCommand.java (original)
+++ karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/ListCommand.java Sun May 8 09:03:24 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.config.shell;
import org.apache.karaf.cellar.config.Constants;
@@ -23,7 +22,7 @@ import java.util.Map;
import java.util.Properties;
/**
- * @author: iocanel
+ * List cluster config command.
*/
@Command(scope = "cluster", name = "config-list", description = "List the config pids that are assigned to a group")
public class ListCommand extends ConfigCommandSupport {
@@ -54,4 +53,5 @@ public class ListCommand extends ConfigC
}
return null;
}
+
}
Modified: karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/PropListCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/PropListCommand.java?rev=1100707&r1=1100706&r2=1100707&view=diff
==============================================================================
--- karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/PropListCommand.java (original)
+++ karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/PropListCommand.java Sun May 8 09:03:24 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.config.shell;
import org.apache.karaf.cellar.config.Constants;
@@ -24,7 +23,7 @@ import java.util.Map;
import java.util.Properties;
/**
- * @author: iocanel
+ * Config properties list cluster command.
*/
@Command(scope = "cluster", name = "config-proplist", description = "List the config pids that are assigned to a group")
public class PropListCommand extends CellarCommandSupport {
@@ -61,4 +60,5 @@ public class PropListCommand extends Cel
}
return null;
}
+
}
Modified: karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/PropSetCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/PropSetCommand.java?rev=1100707&r1=1100706&r2=1100707&view=diff
==============================================================================
--- karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/PropSetCommand.java (original)
+++ karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/PropSetCommand.java Sun May 8 09:03:24 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.config.shell;
import org.apache.karaf.cellar.config.Constants;
@@ -24,7 +23,7 @@ import java.util.Map;
import java.util.Properties;
/**
- * @author: iocanel
+ * Config properties set cluster command.
*/
@Command(scope = "cluster", name = "config-propset", description = "Sets the a property value for a PID and group")
public class PropSetCommand extends ConfigCommandSupport {
@@ -53,4 +52,5 @@ public class PropSetCommand extends Conf
configurationTable.put(pid, properties);
return null;
}
+
}
Modified: karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/completers/ClusterConfigCompleter.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/completers/ClusterConfigCompleter.java?rev=1100707&r1=1100706&r2=1100707&view=diff
==============================================================================
--- karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/completers/ClusterConfigCompleter.java (original)
+++ karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/completers/ClusterConfigCompleter.java Sun May 8 09:03:24 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.config.shell.completers;
import org.apache.karaf.cellar.config.Constants;
@@ -27,7 +26,7 @@ import java.util.Map;
import java.util.Properties;
/**
- * @author: iocanel
+ * Command completer on the cluster config.
*/
public class ClusterConfigCompleter implements Completer {
@@ -72,4 +71,5 @@ public class ClusterConfigCompleter impl
public void setGroupManager(GroupManager groupManager) {
this.groupManager = groupManager;
}
+
}
Modified: karaf/cellar/trunk/config/src/main/resources/OSGI-INF/blueprint/blueprint.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/config/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=1100707&r1=1100706&r2=1100707&view=diff
==============================================================================
--- karaf/cellar/trunk/config/src/main/resources/OSGI-INF/blueprint/blueprint.xml (original)
+++ karaf/cellar/trunk/config/src/main/resources/OSGI-INF/blueprint/blueprint.xml Sun May 8 09:03:24 2011
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
+
Licensed 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
@@ -13,7 +13,6 @@
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">
<!-- Cluster Configuration Listener -->
Modified: karaf/cellar/trunk/config/src/main/resources/OSGI-INF/blueprint/shell-config.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/config/src/main/resources/OSGI-INF/blueprint/shell-config.xml?rev=1100707&r1=1100706&r2=1100707&view=diff
==============================================================================
--- karaf/cellar/trunk/config/src/main/resources/OSGI-INF/blueprint/shell-config.xml (original)
+++ karaf/cellar/trunk/config/src/main/resources/OSGI-INF/blueprint/shell-config.xml Sun May 8 09:03:24 2011
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
+
Licensed 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
@@ -13,7 +13,6 @@
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" default-activation="lazy">
<!-- Command Bundle -->
Modified: karaf/cellar/trunk/config/src/test/java/org/apache/karaf/cellar/config/ConfigurationSupportTest.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/config/src/test/java/org/apache/karaf/cellar/config/ConfigurationSupportTest.java?rev=1100707&r1=1100706&r2=1100707&view=diff
==============================================================================
--- karaf/cellar/trunk/config/src/test/java/org/apache/karaf/cellar/config/ConfigurationSupportTest.java (original)
+++ karaf/cellar/trunk/config/src/test/java/org/apache/karaf/cellar/config/ConfigurationSupportTest.java Sun May 8 09:03:24 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.config;
import org.junit.Assert;
@@ -21,7 +20,7 @@ import java.util.Dictionary;
import java.util.Properties;
/**
- * @author iocanel
+ * Configuration support test.
*/
public class ConfigurationSupportTest {
@@ -57,4 +56,5 @@ public class ConfigurationSupportTest {
String result = support.convertStrings(absolutePath, home, var);
Assert.assertEquals(expectedResult, result);
}
+
}
Modified: karaf/cellar/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/pom.xml?rev=1100707&r1=1100706&r2=1100707&view=diff
==============================================================================
--- karaf/cellar/trunk/core/pom.xml (original)
+++ karaf/cellar/trunk/core/pom.xml Sun May 8 09:03:24 2011
@@ -1,29 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed 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">
+<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">
+
+ <!--
+
+ 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.
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <groupId>org.apache.karaf.cellar</groupId>
- <artifactId>karaf-cellar</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>cellar</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>core</artifactId>
+ <groupId>org.apache.karaf.cellar</groupId>
+ <artifactId>org.apache.karaf.cellar.core</artifactId>
<name>Apache Karaf :: Cellar :: Core</name>
<packaging>bundle</packaging>
@@ -70,8 +76,8 @@
<!-- Testing Dependencies -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.junit</artifactId>
</dependency>
<dependency>
@@ -80,4 +86,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/command/BasicCommandStore.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/command/BasicCommandStore.java?rev=1100707&r1=1100706&r2=1100707&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/command/BasicCommandStore.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/command/BasicCommandStore.java Sun May 8 09:03:24 2011
@@ -11,14 +11,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.core.command;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
/**
- * @author iocanel
+ * Basic command store.
*/
public class BasicCommandStore implements CommandStore {
@@ -31,4 +30,5 @@ public class BasicCommandStore implement
public void setPending(ConcurrentMap<String, Command> pending) {
this.pending = pending;
}
+
}
Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/command/ClusteredExecutionContext.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/command/ClusteredExecutionContext.java?rev=1100707&r1=1100706&r2=1100707&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/command/ClusteredExecutionContext.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/command/ClusteredExecutionContext.java Sun May 8 09:03:24 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.core.command;
import org.apache.karaf.cellar.core.Node;
@@ -24,7 +23,7 @@ import java.util.concurrent.ScheduledThr
import java.util.concurrent.TimeUnit;
/**
- * @author iocanel
+ * Clustered execution context.
*/
public class ClusteredExecutionContext implements ExecutionContext {
@@ -65,4 +64,5 @@ public class ClusteredExecutionContext i
public void setCommandStore(CommandStore commandStore) {
this.commandStore = commandStore;
}
+
}
Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/command/Command.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/command/Command.java?rev=1100707&r1=1100706&r2=1100707&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/command/Command.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/command/Command.java Sun May 8 09:03:24 2011
@@ -11,7 +11,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.karaf.cellar.core.command;
import org.apache.karaf.cellar.core.Node;
@@ -26,7 +25,7 @@ import java.util.concurrent.LinkedBlocki
import java.util.concurrent.TimeUnit;
/**
- * @author iocanel
+ * Command.
*/
public class Command<R extends Result> extends Event {
@@ -101,4 +100,5 @@ public class Command<R extends Result> e
public void setTimeout(long timeout) {
this.timeout = timeout;
}
+
}
Modified: karaf/cellar/trunk/features/pom.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/features/pom.xml?rev=1100707&r1=1100706&r2=1100707&view=diff
==============================================================================
--- karaf/cellar/trunk/features/pom.xml (original)
+++ karaf/cellar/trunk/features/pom.xml Sun May 8 09:03:24 2011
@@ -1,33 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed 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">
+<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">
+
+ <!--
+
+ 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.
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <groupId>org.apache.karaf.cellar</groupId>
- <artifactId>karaf-cellar</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>cellar</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>features</artifactId>
+ <groupId>org.apache.karaf.cellar</groupId>
+ <artifactId>org.apache.karaf.cellar.features</artifactId>
<packaging>bundle</packaging>
<name>Apache Karaf :: Cellar :: Features</name>
-
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<osgi.import>
@@ -47,7 +52,7 @@
<!-- Internal Dependencies -->
<dependency>
<groupId>org.apache.karaf.cellar</groupId>
- <artifactId>core</artifactId>
+ <artifactId>org.apache.karaf.cellar.core</artifactId>
<version>${project.version}</version>
</dependency>
@@ -68,7 +73,6 @@
<artifactId>org.apache.karaf.features.command</artifactId>
</dependency>
-
<!-- Logging -->
<dependency>
<groupId>org.slf4j</groupId>
@@ -82,8 +86,8 @@
<!-- Testing -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.junit</artifactId>
</dependency>
<dependency>
@@ -91,4 +95,5 @@
<artifactId>easymock</artifactId>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+
+</project>
Modified: karaf/cellar/trunk/hazelcast/pom.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/hazelcast/pom.xml?rev=1100707&r1=1100706&r2=1100707&view=diff
==============================================================================
--- karaf/cellar/trunk/hazelcast/pom.xml (original)
+++ karaf/cellar/trunk/hazelcast/pom.xml Sun May 8 09:03:24 2011
@@ -1,29 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed 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">
+<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">
+
+ <!--
+
+ 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.
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <groupId>org.apache.karaf.cellar</groupId>
- <artifactId>karaf-cellar</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>cellar</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>hazelcast</artifactId>
+ <groupId>org.apache.karaf.cellar</groupId>
+ <artifactId>org.apache.karaf.cellar.hazelcast</artifactId>
<packaging>bundle</packaging>
<name>Apache Karaf :: Cellar :: Hazelcast</name>
@@ -53,15 +59,14 @@
<!-- Internal Dependencies -->
<dependency>
<groupId>org.apache.karaf.cellar</groupId>
- <artifactId>core</artifactId>
+ <artifactId>org.apache.karaf.cellar.core</artifactId>
<version>${project.version}</version>
</dependency>
<!-- Spring DM -->
<dependency>
<groupId>org.springframework.osgi</groupId>
- <artifactId>org.springframework.osgi.core</artifactId>
- <version>1.2.1</version>
+ <artifactId>spring-osgi-core</artifactId>
</dependency>
<!-- Logging Dependencies -->
@@ -71,4 +76,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: karaf/cellar/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/pom.xml?rev=1100707&r1=1100706&r2=1100707&view=diff
==============================================================================
--- karaf/cellar/trunk/pom.xml (original)
+++ karaf/cellar/trunk/pom.xml Sun May 8 09:03:24 2011
@@ -1,32 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed 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">
+<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">
+
+ <!--
+
+ 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.
+ -->
+
<modelVersion>4.0.0</modelVersion>
+
<parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>8</version>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>karaf</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.karaf.cellar</groupId>
- <artifactId>karaf-cellar</artifactId>
+ <artifactId>cellar</artifactId>
<packaging>pom</packaging>
- <version>1.0.0-SNAPSHOT</version>
<name>Apache Karaf :: Cellar</name>
<build>
@@ -34,7 +36,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>${maven-bundle-plugin.version}</version>
+ <version>${felix.plugin.version}</version>
<extensions>true</extensions>
<inherited>true</inherited>
<configuration>
@@ -67,7 +69,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>${build-helper-maven-plugin.version}</version>
<inherited>false</inherited>
<executions>
<execution>
@@ -101,7 +102,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>${maven-resources-plugin.version}</version>
<inherited>false</inherited>
<executions>
<execution>
@@ -125,7 +125,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${maven-compiler-plugin.version}</version>
+ <version>2.3.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
@@ -144,25 +144,12 @@
</modules>
<properties>
- <osgi.version>4.2.0</osgi.version>
- <karaf.version>2.2.0</karaf.version>
- <felix.configadmin.version>1.2.8</felix.configadmin.version>
- <springdm.version>1.2.1</springdm.version>
<hazelcast.version>1.9.3</hazelcast.version>
-
- <slf4j.version>1.5.8</slf4j.version>
- <junit.version>4.8.2</junit.version>
- <easymock.version>3.0</easymock.version>
- <!-- Plugin Versions -->
- <maven-bundle-plugin.version>2.1.0</maven-bundle-plugin.version>
- <maven-compiler-plugin.version>2.0.2</maven-compiler-plugin.version>
- <maven-war-plugin.version>2.1.1</maven-war-plugin.version>
- <maven-resources-plugin.version>2.4.3</maven-resources-plugin.version>
- <build-helper-maven-plugin.version>1.5</build-helper-maven-plugin.version>
</properties>
<dependencyManagement>
<dependencies>
+
<!-- Hazelcast -->
<dependency>
<groupId>com.hazelcast</groupId>
@@ -170,69 +157,7 @@
<version>${hazelcast.version}</version>
</dependency>
- <!-- OSGi dependencies -->
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>${osgi.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configadmin</artifactId>
- <version>${felix.configadmin.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.karaf.features</groupId>
- <artifactId>org.apache.karaf.features.core</artifactId>
- <version>${karaf.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.karaf.shell</groupId>
- <artifactId>org.apache.karaf.shell.console</artifactId>
- <version>${karaf.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.karaf.features</groupId>
- <artifactId>org.apache.karaf.features.command</artifactId>
- <version>${karaf.version}</version>
- </dependency>
-
- <!-- Logging Dependencies -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
-
- <!-- Testing Dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>${easymock.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
- <repositories>
- <repository>
- <id>JBoss Nexus Repository</id>
- <url>https://repository.jboss.org/nexus/content/groups/public/</url>
- </repository>
- </repositories>
</project>
Modified: karaf/cellar/trunk/shell/pom.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/pom.xml?rev=1100707&r1=1100706&r2=1100707&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/pom.xml (original)
+++ karaf/cellar/trunk/shell/pom.xml Sun May 8 09:03:24 2011
@@ -1,29 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed 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">
+<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">
+
+ <!--
+
+ 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.
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <groupId>org.apache.karaf.cellar</groupId>
- <artifactId>karaf-cellar</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>cellar</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>shell</artifactId>
+ <groupId>org.apache.karaf.cellar</groupId>
+ <artifactId>org.apache.karaf.cellar.shell</artifactId>
<packaging>bundle</packaging>
<name>Apache Karaf :: Cellar :: Shell</name>
@@ -49,22 +55,22 @@
<!-- Internal Dependencies -->
<dependency>
<groupId>org.apache.karaf.cellar</groupId>
- <artifactId>core</artifactId>
+ <artifactId>org.apache.karaf.cellar.core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.karaf.cellar</groupId>
- <artifactId>config</artifactId>
+ <artifactId>org.apache.karaf.cellar.config</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.karaf.cellar</groupId>
- <artifactId>features</artifactId>
+ <artifactId>org.apache.karaf.cellar.features</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.karaf.cellar</groupId>
- <artifactId>utils</artifactId>
+ <artifactId>org.apache.karaf.cellar.utils</artifactId>
<version>${project.version}</version>
</dependency>
<!-- Logging Dependencies -->
@@ -73,4 +79,5 @@
<artifactId>slf4j-api</artifactId>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+
+</project>
Modified: karaf/cellar/trunk/src/main/resources/feature.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/src/main/resources/feature.xml?rev=1100707&r1=1100706&r2=1100707&view=diff
==============================================================================
--- karaf/cellar/trunk/src/main/resources/feature.xml (original)
+++ karaf/cellar/trunk/src/main/resources/feature.xml Sun May 8 09:03:24 2011
@@ -13,8 +13,7 @@
limitations under the License.
-->
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">
- <repository>mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features</repository>
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">
<feature name='hazelcast' description='In memory data grid' version='${hazelcast.version}' resolver='(obr)'>
<bundle>mvn:com.hazelcast/hazelcast/${hazelcast.version}</bundle>
@@ -29,14 +28,14 @@
<feature name='cellar' description='Karaf clustering' version='${project.version}' resolver='(obr)'>
<feature version='${hazelcast.version}'>hazelcast</feature>
<feature version='${springdm.version}'>spring-dm</feature>
- <bundle>mvn:org.apache.karaf.cellar/core/${project.version}</bundle>
- <bundle>mvn:org.apache.karaf.cellar/config/${project.version}</bundle>
- <bundle>mvn:org.apache.karaf.cellar/features/${project.version}</bundle>
- <bundle>mvn:org.apache.karaf.cellar/utils/${project.version}</bundle>
- <bundle>mvn:org.apache.karaf.cellar/shell/${project.version}</bundle>
- <bundle>mvn:org.apache.karaf.cellar/hazelcast/${project.version}</bundle>
- <configfile finalname="/etc/org.apache.karaf.cellar.groups.cfg">mvn:org.apache.karaf.cellar/karaf-cellar/${project.version}/cfg/groups</configfile>
- <configfile finalname="/etc/org.apache.karaf.cellar.node.cfg">mvn:org.apache.karaf.cellar/karaf-cellar/${project.version}/cfg/node</configfile>
+ <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.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>
+ <configfile finalname="/etc/org.apache.karaf.cellar.groups.cfg">mvn:org.apache.karaf/cellar/${project.version}/cfg/groups</configfile>
+ <configfile finalname="/etc/org.apache.karaf.cellar.node.cfg">mvn:org.apache.karaf/cellar/${project.version}/cfg/node</configfile>
</feature>
</features>
\ No newline at end of file
Modified: karaf/cellar/trunk/utils/pom.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/utils/pom.xml?rev=1100707&r1=1100706&r2=1100707&view=diff
==============================================================================
--- karaf/cellar/trunk/utils/pom.xml (original)
+++ karaf/cellar/trunk/utils/pom.xml Sun May 8 09:03:24 2011
@@ -1,34 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed 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">
+<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">
+
+ <!--
+
+ 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.
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <groupId>org.apache.karaf.cellar</groupId>
- <artifactId>karaf-cellar</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>cellar</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.karaf.cellar</groupId>
- <artifactId>utils</artifactId>
+ <artifactId>org.apache.karaf.cellar.utils</artifactId>
<packaging>bundle</packaging>
<name>Apache Karaf :: Cellar :: Utils</name>
-
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<osgi.import>
@@ -46,7 +50,7 @@
<!-- Internal Dependencies -->
<dependency>
<groupId>org.apache.karaf.cellar</groupId>
- <artifactId>core</artifactId>
+ <artifactId>org.apache.karaf.cellar.core</artifactId>
<version>${project.version}</version>
</dependency>
<!-- Configuration Admin -->
@@ -61,4 +65,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>