You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by io...@apache.org on 2011/06/04 21:53:50 UTC
svn commit: r1131482 - in /karaf/cellar/branches/cellar-2.2.x: ./
hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/
src/main/resources/ webconsole/ webconsole/src/ webconsole/src/main/
webconsole/src/main/java/ webconsole/src/main/java/org/ we...
Author: iocanel
Date: Sat Jun 4 19:53:49 2011
New Revision: 1131482
URL: http://svn.apache.org/viewvc?rev=1131482&view=rev
Log:
Merged from trunk
[KARAF-616] Added a webconsole plugin for Cellar. Added Group and Node listing to the webconsole plugin. Added the abilitiy to create groups via webconsole. [from revision 1131478]
Added:
karaf/cellar/branches/cellar-2.2.x/webconsole/
- copied from r1131478, karaf/cellar/trunk/webconsole/
karaf/cellar/branches/cellar-2.2.x/webconsole/pom.xml
- copied, changed from r1131478, karaf/cellar/trunk/webconsole/pom.xml
karaf/cellar/branches/cellar-2.2.x/webconsole/src/
- copied from r1131478, karaf/cellar/trunk/webconsole/src/
karaf/cellar/branches/cellar-2.2.x/webconsole/src/main/
- copied from r1131478, karaf/cellar/trunk/webconsole/src/main/
karaf/cellar/branches/cellar-2.2.x/webconsole/src/main/java/
- copied from r1131478, karaf/cellar/trunk/webconsole/src/main/java/
karaf/cellar/branches/cellar-2.2.x/webconsole/src/main/java/org/
- copied from r1131478, karaf/cellar/trunk/webconsole/src/main/java/org/
karaf/cellar/branches/cellar-2.2.x/webconsole/src/main/java/org/apache/
- copied from r1131478, karaf/cellar/trunk/webconsole/src/main/java/org/apache/
karaf/cellar/branches/cellar-2.2.x/webconsole/src/main/java/org/apache/karaf/
- copied from r1131478, karaf/cellar/trunk/webconsole/src/main/java/org/apache/karaf/
karaf/cellar/branches/cellar-2.2.x/webconsole/src/main/java/org/apache/karaf/cellar/
- copied from r1131478, karaf/cellar/trunk/webconsole/src/main/java/org/apache/karaf/cellar/
karaf/cellar/branches/cellar-2.2.x/webconsole/src/main/java/org/apache/karaf/cellar/webconsole/
- copied from r1131478, karaf/cellar/trunk/webconsole/src/main/java/org/apache/karaf/cellar/webconsole/
karaf/cellar/branches/cellar-2.2.x/webconsole/src/main/java/org/apache/karaf/cellar/webconsole/CellarPlugin.java
- copied unchanged from r1131478, karaf/cellar/trunk/webconsole/src/main/java/org/apache/karaf/cellar/webconsole/CellarPlugin.java
karaf/cellar/branches/cellar-2.2.x/webconsole/src/main/resources/
- copied from r1131478, karaf/cellar/trunk/webconsole/src/main/resources/
karaf/cellar/branches/cellar-2.2.x/webconsole/src/main/resources/OSGI-INF/
- copied from r1131478, karaf/cellar/trunk/webconsole/src/main/resources/OSGI-INF/
karaf/cellar/branches/cellar-2.2.x/webconsole/src/main/resources/OSGI-INF/blueprint/
- copied from r1131478, karaf/cellar/trunk/webconsole/src/main/resources/OSGI-INF/blueprint/
karaf/cellar/branches/cellar-2.2.x/webconsole/src/main/resources/OSGI-INF/blueprint/webconsole-cellar.xml
- copied unchanged from r1131478, karaf/cellar/trunk/webconsole/src/main/resources/OSGI-INF/blueprint/webconsole-cellar.xml
karaf/cellar/branches/cellar-2.2.x/webconsole/src/test/
- copied from r1131478, karaf/cellar/trunk/webconsole/src/test/
karaf/cellar/branches/cellar-2.2.x/webconsole/src/test/java/
- copied from r1131478, karaf/cellar/trunk/webconsole/src/test/java/
Modified:
karaf/cellar/branches/cellar-2.2.x/ (props changed)
karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java
karaf/cellar/branches/cellar-2.2.x/pom.xml
karaf/cellar/branches/cellar-2.2.x/src/main/resources/feature.xml
Propchange: karaf/cellar/branches/cellar-2.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jun 4 19:53:49 2011
@@ -1 +1 @@
-/karaf/cellar/trunk:1101991,1103447,1103456,1125012
+/karaf/cellar/trunk:1101991,1103447,1103456,1125012,1131478
Modified: karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java?rev=1131482&r1=1131481&r2=1131482&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java Sat Jun 4 19:53:49 2011
@@ -104,6 +104,7 @@ public class HazelcastGroupManager imple
public void deleteGroup(String groupName) {
ClassLoader originalClassLoader = Thread.currentThread().getContextClassLoader();
try {
+ Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
if (!groupName.equals(Configurations.DEFAULT_GROUP_NAME))
listGroups().remove(groupName);
} finally {
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=1131482&r1=1131481&r2=1131482&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/pom.xml (original)
+++ karaf/cellar/branches/cellar-2.2.x/pom.xml Sat Jun 4 19:53:49 2011
@@ -151,10 +151,10 @@
<configuration>
<rules>
<requireMavenVersion>
- <version>[2.2.1,3)</version>
+ <version>[2.2.1,4)</version>
</requireMavenVersion>
<requireJavaVersion>
- <version>[1.5,1.6)</version>
+ <version>[1.5,1.7]</version>
</requireJavaVersion>
</rules>
</configuration>
@@ -171,6 +171,7 @@
<module>shell</module>
<module>hazelcast</module>
<module>utils</module>
+ <module>webconsole</module>
</modules>
<properties>
Modified: karaf/cellar/branches/cellar-2.2.x/src/main/resources/feature.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/src/main/resources/feature.xml?rev=1131482&r1=1131481&r2=1131482&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/src/main/resources/feature.xml (original)
+++ karaf/cellar/branches/cellar-2.2.x/src/main/resources/feature.xml Sat Jun 4 19:53:49 2011
@@ -45,4 +45,10 @@
</configfile>
</feature>
+ <feature name='cellar-webconsole' description='Karaf Cellar Webconsole Plugin' version='${project.version}'
+ resolver='(obr)'>
+ <feature>webconsole</feature>
+ <bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.webconsole/${project.version}</bundle>
+ </feature>
+
</features>
\ No newline at end of file
Copied: karaf/cellar/branches/cellar-2.2.x/webconsole/pom.xml (from r1131478, karaf/cellar/trunk/webconsole/pom.xml)
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/webconsole/pom.xml?p2=karaf/cellar/branches/cellar-2.2.x/webconsole/pom.xml&p1=karaf/cellar/trunk/webconsole/pom.xml&r1=1131478&r2=1131482&rev=1131482&view=diff
==============================================================================
--- karaf/cellar/trunk/webconsole/pom.xml (original)
+++ karaf/cellar/branches/cellar-2.2.x/webconsole/pom.xml Sat Jun 4 19:53:49 2011
@@ -19,7 +19,7 @@
<parent>
<artifactId>cellar</artifactId>
<groupId>org.apache.karaf</groupId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>2.2.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>