Author: jbonofre
Date: Thu Sep 22 11:35:37 2011
New Revision: 1174071
URL: http://svn.apache.org/viewvc?rev=1174071&view=rev
Log:
[KARAF-786] Add ConfigMBean and refactoring of the management module
Added:
karaf/branches/karaf-2.2.x/management/mbeans/
karaf/branches/karaf-2.2.x/management/mbeans/config/
karaf/branches/karaf-2.2.x/management/mbeans/config/NOTICE
- copied, changed from r1174005,
karaf/branches/karaf-2.2.x/management/NOTICE
karaf/branches/karaf-2.2.x/management/mbeans/config/pom.xml
- copied, changed from r1174005,
karaf/branches/karaf-2.2.x/diagnostic/management/pom.xml
karaf/branches/karaf-2.2.x/management/mbeans/config/src/
karaf/branches/karaf-2.2.x/management/mbeans/config/src/main/
karaf/branches/karaf-2.2.x/management/mbeans/config/src/main/java/
karaf/branches/karaf-2.2.x/management/mbeans/config/src/main/java/org/
karaf/branches/karaf-2.2.x/management/mbeans/config/src/main/java/org/apache/
karaf/branches/karaf-2.2.x/management/mbeans/config/src/main/java/org/apache/karaf/
karaf/branches/karaf-2.2.x/management/mbeans/config/src/main/java/org/apache/karaf/management/
karaf/branches/karaf-2.2.x/management/mbeans/config/src/main/java/org/apache/karaf/management/mbeans/
karaf/branches/karaf-2.2.x/management/mbeans/config/src/main/java/org/apache/karaf/management/mbeans/config/
karaf/branches/karaf-2.2.x/management/mbeans/config/src/main/java/org/apache/karaf/management/mbeans/config/ConfigMBean.java
karaf/branches/karaf-2.2.x/management/mbeans/config/src/main/java/org/apache/karaf/management/mbeans/config/internal/
karaf/branches/karaf-2.2.x/management/mbeans/config/src/main/java/org/apache/karaf/management/mbeans/config/internal/ConfigMBeanImpl.java
karaf/branches/karaf-2.2.x/management/mbeans/config/src/main/resources/
karaf/branches/karaf-2.2.x/management/mbeans/config/src/main/resources/OSGI-INF/
karaf/branches/karaf-2.2.x/management/mbeans/config/src/main/resources/OSGI-INF/blueprint/
karaf/branches/karaf-2.2.x/management/mbeans/config/src/main/resources/OSGI-INF/blueprint/config-management.xml
karaf/branches/karaf-2.2.x/management/mbeans/config/src/main/resources/OSGI-INF/bundle.info
karaf/branches/karaf-2.2.x/management/mbeans/pom.xml
karaf/branches/karaf-2.2.x/management/server/
karaf/branches/karaf-2.2.x/management/server/NOTICE
- copied, changed from r1174005,
karaf/branches/karaf-2.2.x/management/NOTICE
karaf/branches/karaf-2.2.x/management/server/pom.xml
- copied, changed from r1174005,
karaf/branches/karaf-2.2.x/management/pom.xml
karaf/branches/karaf-2.2.x/management/server/src/
karaf/branches/karaf-2.2.x/management/server/src/main/
karaf/branches/karaf-2.2.x/management/server/src/main/java/
karaf/branches/karaf-2.2.x/management/server/src/main/java/org/
karaf/branches/karaf-2.2.x/management/server/src/main/java/org/apache/
karaf/branches/karaf-2.2.x/management/server/src/main/java/org/apache/karaf/
karaf/branches/karaf-2.2.x/management/server/src/main/java/org/apache/karaf/management/
karaf/branches/karaf-2.2.x/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
- copied, changed from r1174005,
karaf/branches/karaf-2.2.x/management/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
karaf/branches/karaf-2.2.x/management/server/src/main/java/org/apache/karaf/management/JaasAuthenticator.java
- copied, changed from r1174005,
karaf/branches/karaf-2.2.x/management/src/main/java/org/apache/karaf/management/JaasAuthenticator.java
karaf/branches/karaf-2.2.x/management/server/src/main/java/org/apache/karaf/management/MBeanRegistrer.java
- copied, changed from r1174005,
karaf/branches/karaf-2.2.x/management/src/main/java/org/apache/karaf/management/MBeanRegistrer.java
karaf/branches/karaf-2.2.x/management/server/src/main/java/org/apache/karaf/management/MBeanServerFactory.java
- copied, changed from r1174005,
karaf/branches/karaf-2.2.x/management/src/main/java/org/apache/karaf/management/MBeanServerFactory.java
karaf/branches/karaf-2.2.x/management/server/src/main/java/org/apache/karaf/management/RmiRegistryFactory.java
- copied, changed from r1174005,
karaf/branches/karaf-2.2.x/management/src/main/java/org/apache/karaf/management/RmiRegistryFactory.java
karaf/branches/karaf-2.2.x/management/server/src/main/resources/
karaf/branches/karaf-2.2.x/management/server/src/main/resources/OSGI-INF/
karaf/branches/karaf-2.2.x/management/server/src/main/resources/OSGI-INF/blueprint/
karaf/branches/karaf-2.2.x/management/server/src/main/resources/OSGI-INF/blueprint/karaf-management.xml
- copied, changed from r1174005,
karaf/branches/karaf-2.2.x/management/src/main/resources/OSGI-INF/blueprint/karaf-management.xml
karaf/branches/karaf-2.2.x/management/server/src/main/resources/OSGI-INF/bundle.info
- copied, changed from r1174005,
karaf/branches/karaf-2.2.x/management/src/main/resources/OSGI-INF/bundle.info
karaf/branches/karaf-2.2.x/management/server/src/main/resources/OSGI-INF/metatype/
karaf/branches/karaf-2.2.x/management/server/src/main/resources/OSGI-INF/metatype/metatype.properties
- copied, changed from r1174005,
karaf/branches/karaf-2.2.x/management/src/main/resources/OSGI-INF/metatype/metatype.properties
karaf/branches/karaf-2.2.x/management/server/src/main/resources/OSGI-INF/metatype/metatype.xml
- copied, changed from r1174005,
karaf/branches/karaf-2.2.x/management/src/main/resources/OSGI-INF/metatype/metatype.xml
karaf/branches/karaf-2.2.x/management/server/src/test/
karaf/branches/karaf-2.2.x/management/server/src/test/configs/
karaf/branches/karaf-2.2.x/management/server/src/test/configs/factories/
karaf/branches/karaf-2.2.x/management/server/src/test/configs/factories/management.properties
- copied, changed from r1174005,
karaf/branches/karaf-2.2.x/management/src/test/configs/factories/management.properties
karaf/branches/karaf-2.2.x/management/server/src/test/configs/services/
karaf/branches/karaf-2.2.x/management/server/src/test/configs/services/org.ops4j.pax.logging.properties
- copied, changed from r1174005,
karaf/branches/karaf-2.2.x/management/src/test/configs/services/org.ops4j.pax.logging.properties
karaf/branches/karaf-2.2.x/management/server/src/test/java/
karaf/branches/karaf-2.2.x/management/server/src/test/java/org/
karaf/branches/karaf-2.2.x/management/server/src/test/java/org/apache/
karaf/branches/karaf-2.2.x/management/server/src/test/java/org/apache/karaf/
karaf/branches/karaf-2.2.x/management/server/src/test/java/org/apache/karaf/management/
karaf/branches/karaf-2.2.x/management/server/src/test/java/org/apache/karaf/management/MBeanRegistererTest.java
- copied, changed from r1174005,
karaf/branches/karaf-2.2.x/management/src/test/java/org/apache/karaf/management/MBeanRegistererTest.java
Removed:
karaf/branches/karaf-2.2.x/management/NOTICE
karaf/branches/karaf-2.2.x/management/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
karaf/branches/karaf-2.2.x/management/src/main/java/org/apache/karaf/management/JaasAuthenticator.java
karaf/branches/karaf-2.2.x/management/src/main/java/org/apache/karaf/management/MBeanRegistrer.java
karaf/branches/karaf-2.2.x/management/src/main/java/org/apache/karaf/management/MBeanServerFactory.java
karaf/branches/karaf-2.2.x/management/src/main/java/org/apache/karaf/management/RmiRegistryFactory.java
karaf/branches/karaf-2.2.x/management/src/main/resources/OSGI-INF/blueprint/karaf-management.xml
karaf/branches/karaf-2.2.x/management/src/main/resources/OSGI-INF/bundle.info
karaf/branches/karaf-2.2.x/management/src/main/resources/OSGI-INF/metatype/metatype.properties
karaf/branches/karaf-2.2.x/management/src/main/resources/OSGI-INF/metatype/metatype.xml
karaf/branches/karaf-2.2.x/management/src/test/configs/factories/management.properties
karaf/branches/karaf-2.2.x/management/src/test/configs/services/org.ops4j.pax.logging.properties
karaf/branches/karaf-2.2.x/management/src/test/java/org/apache/karaf/management/MBeanRegistererTest.java
Modified:
karaf/branches/karaf-2.2.x/admin/management/pom.xml
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/pom.xml
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/startup.properties
karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml
karaf/branches/karaf-2.2.x/diagnostic/management/pom.xml
karaf/branches/karaf-2.2.x/features/management/pom.xml
karaf/branches/karaf-2.2.x/management/pom.xml
karaf/branches/karaf-2.2.x/pom.xml
Modified: karaf/branches/karaf-2.2.x/admin/management/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/admin/management/pom.xml?rev=1174071&r1=1174070&r2=1174071&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/admin/management/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/admin/management/pom.xml Thu Sep 22 11:35:37 2011
@@ -56,8 +56,8 @@
</dependency>
<dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.management</artifactId>
+ <groupId>org.apache.karaf.management</groupId>
+ <artifactId>org.apache.karaf.management.server</artifactId>
</dependency>
<dependency>
Modified: karaf/branches/karaf-2.2.x/assemblies/apache-karaf/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/pom.xml?rev=1174071&r1=1174070&r2=1174071&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/assemblies/apache-karaf/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/assemblies/apache-karaf/pom.xml Thu Sep 22
11:35:37 2011
@@ -167,8 +167,12 @@
<artifactId>org.apache.karaf.jaas.command</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.management</artifactId>
+ <groupId>org.apache.karaf.management</groupId>
+ <artifactId>org.apache.karaf.management.server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.management.mbeans</groupId>
+ <artifactId>org.apache.karaf.management.mbeans.config</artifactId>
</dependency>
<dependency>
<groupId>org.apache.karaf.webconsole</groupId>
Modified:
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/startup.properties
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/startup.properties?rev=1174071&r1=1174070&r2=1174071&view=diff
==============================================================================
---
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/startup.properties
(original)
+++
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/etc/startup.properties
Thu Sep 22 11:35:37 2011
@@ -56,7 +56,7 @@ org/apache/karaf/diagnostic/org.apache.k
org/apache/karaf/diagnostic/org.apache.karaf.diagnostic.command/${project.version}/org.apache.karaf.diagnostic.command-${project.version}.jar=30
org/apache/karaf/diagnostic/org.apache.karaf.diagnostic.management/${project.version}/org.apache.karaf.diagnostic.management-${project.version}.jar=30
-org/apache/karaf/org.apache.karaf.management/${project.version}/org.apache.karaf.management-${project.version}.jar=30
+org/apache/karaf/management/org.apache.karaf.management.server/${project.version}/org.apache.karaf.management.server-${project.version}.jar=30
org/apache/aries/jmx/org.apache.aries.jmx/${aries.jmx.version}/org.apache.aries.jmx-${aries.jmx.version}.jar=30
org/apache/aries/jmx/org.apache.aries.jmx.blueprint/${aries.jmx.version}/org.apache.aries.jmx.blueprint-${aries.jmx.version}.jar=30
Modified:
karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml?rev=1174071&r1=1174070&r2=1174071&view=diff
==============================================================================
---
karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml
(original)
+++
karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml
Thu Sep 22 11:35:37 2011
@@ -40,7 +40,7 @@
<bundle>mvn:org.apache.karaf.features/org.apache.karaf.features.core/${project.version}</bundle>
<bundle>mvn:org.apache.karaf.features/org.apache.karaf.features.command/${project.version}</bundle>
<bundle>mvn:org.apache.karaf.features/org.apache.karaf.features.management/${project.version}</bundle>
-
<bundle>mvn:org.apache.karaf/org.apache.karaf.management/${project.version}</bundle>
+
<bundle>mvn:org.apache.karaf.management/org.apache.karaf.management.server/${project.version}</bundle>
<bundle>mvn:org.apache.aries.jmx/org.apache.aries.jmx/${aries.jmx.version}</bundle>
<bundle>mvn:org.apache.aries.jmx/org.apache.aries.jmx.blueprint/${aries.jmx.version}</bundle>
</feature>
@@ -145,6 +145,7 @@
</feature>
<feature name="config" version="${project.version}">
<bundle
start-level='30'>mvn:org.apache.karaf.shell/org.apache.karaf.shell.config/${project.version}</bundle>
+ <bundle
start-level='30'>mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.config/${project.version}</bundle>
</feature>
<feature name="jetty" version="${jetty.version}" resolver="(obr)">
<bundle
dependency='true'>mvn:org.apache.geronimo.specs/geronimo-activation_1.1_spec/${geronimo.activation.version}</bundle>
@@ -223,7 +224,7 @@
<bundle>mvn:org.apache.karaf.shell/org.apache.karaf.shell.ssh/${project.version}</bundle>
</feature>
<feature name="management" version="${project.version}">
-
<bundle>mvn:org.apache.karaf/org.apache.karaf.management/${project.version}</bundle>
+
<bundle>mvn:org.apache.karaf.management/org.apache.karaf.management.server/${project.version}</bundle>
<bundle>mvn:org.apache.aries.jmx/org.apache.aries.jmx/${aries.jmx.version}</bundle>
<bundle>mvn:org.apache.aries.jmx/org.apache.aries.jmx.blueprint/${aries.jmx.version}</bundle>
</feature>
Modified: karaf/branches/karaf-2.2.x/diagnostic/management/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/diagnostic/management/pom.xml?rev=1174071&r1=1174070&r2=1174071&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/diagnostic/management/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/diagnostic/management/pom.xml Thu Sep 22
11:35:37 2011
@@ -53,8 +53,8 @@
<artifactId>org.apache.karaf.diagnostic.core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.management</artifactId>
+ <groupId>org.apache.karaf.management</groupId>
+ <artifactId>org.apache.karaf.management.server</artifactId>
</dependency>
</dependencies>
Modified: karaf/branches/karaf-2.2.x/features/management/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/features/management/pom.xml?rev=1174071&r1=1174070&r2=1174071&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/features/management/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/features/management/pom.xml Thu Sep 22 11:35:37
2011
@@ -71,8 +71,8 @@
</dependency>
<dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.management</artifactId>
+ <groupId>org.apache.karaf.management</groupId>
+ <artifactId>org.apache.karaf.management.server</artifactId>
</dependency>
<dependency>
Copied: karaf/branches/karaf-2.2.x/management/mbeans/config/NOTICE (from
r1174005, karaf/branches/karaf-2.2.x/management/NOTICE)
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/management/mbeans/config/NOTICE?p2=karaf/branches/karaf-2.2.x/management/mbeans/config/NOTICE&p1=karaf/branches/karaf-2.2.x/management/NOTICE&r1=1174005&r2=1174071&rev=1174071&view=diff
==============================================================================
(empty)
Copied: karaf/branches/karaf-2.2.x/management/mbeans/config/pom.xml (from
r1174005, karaf/branches/karaf-2.2.x/diagnostic/management/pom.xml)
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/management/mbeans/config/pom.xml?p2=karaf/branches/karaf-2.2.x/management/mbeans/config/pom.xml&p1=karaf/branches/karaf-2.2.x/diagnostic/management/pom.xml&r1=1174005&r2=1174071&rev=1174071&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/diagnostic/management/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/management/mbeans/config/pom.xml Thu Sep 22
11:35:37 2011
@@ -22,39 +22,33 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.karaf.diagnostic</groupId>
- <artifactId>diagnostic</artifactId>
+ <groupId>org.apache.karaf.management.mbeans</groupId>
+ <artifactId>mbeans</artifactId>
<version>2.2.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>org.apache.karaf.diagnostic.management</artifactId>
+ <artifactId>org.apache.karaf.management.mbeans.config</artifactId>
<packaging>bundle</packaging>
- <name>Apache Karaf :: Diagnostic :: Management</name>
- <description>Expose diagnostic MBeans via JMX.</description>
+ <name>Apache Karaf :: Management :: MBeans :: Config</name>
+ <description>This bundle provides a JMX MBean to manipulate the Karaf
ConfigAdmin layer.</description>
<properties>
-
<appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
+
<appendedResourcesDirectory>${project.basedir}/../../../etc/appended-resources</appendedResourcesDirectory>
</properties>
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.diagnostic</groupId>
- <artifactId>org.apache.karaf.diagnostic.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.management</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.utils</artifactId>
</dependency>
</dependencies>
@@ -80,22 +74,25 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>
- ${project.artifactId}*;version=${project.version}
+
org.apache.karaf.management.mbeans.config*;version=${project.version}
</Export-Package>
<Import-Package>
- !${project.artifactId}*,
+ !org.apache.karaf.management.mbeans.config*,
javax.management,
javax.management.loading,
+
org.apache.karaf.management;version=${project.version},
*
</Import-Package>
-
<Private-Package>org.apache.karaf.diagnostic.management.internal</Private-Package>
- <_versionpolicy>${bnd.version.policy}</_versionpolicy>
+ <Private-Package>
+ org.apache.karaf.management.mbeans.config.internal,
+ org.apache.felix.utils.properties,
+ !*
+ </Private-Package>
</instructions>
</configuration>
</plugin>
</plugins>
</build>
-</project>
+</project>
\ No newline at end of file
Added:
karaf/branches/karaf-2.2.x/management/mbeans/config/src/main/java/org/apache/karaf/management/mbeans/config/ConfigMBean.java
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/management/mbeans/config/src/main/java/org/apache/karaf/management/mbeans/config/ConfigMBean.java?rev=1174071&view=auto
==============================================================================
---
karaf/branches/karaf-2.2.x/management/mbeans/config/src/main/java/org/apache/karaf/management/mbeans/config/ConfigMBean.java
(added)
+++
karaf/branches/karaf-2.2.x/management/mbeans/config/src/main/java/org/apache/karaf/management/mbeans/config/ConfigMBean.java
Thu Sep 22 11:35:37 2011
@@ -0,0 +1,90 @@
+/*
+ * 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.
+ */
+
+package org.apache.karaf.management.mbeans.config;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * MBean to manipulate the Config layer.
+ */
+public interface ConfigMBean {
+
+ /**
+ * Get the list of all configuration PIDs.
+ *
+ * @return the list of all configuration PIDs.
+ * @throws Exception
+ */
+ List<String> list() throws Exception;
+
+ /**
+ * Create a new configuration for the given PID.
+ *
+ * @param pid the configuration PID.
+ * @throws Exception
+ */
+ void create(String pid) throws Exception;
+
+ /**
+ * Delete a configuration identified by the given PID.
+ *
+ * @param pid the configuration PID to delete.
+ * @throws Exception
+ */
+ void delete(String pid) throws Exception;
+
+ /**
+ * Get the list of properties for a configuration PID.
+ *
+ * @param pid the configuration PID.
+ * @return the list of properties.
+ * @throws Exception
+ */
+ Map<String, String> proplist(String pid) throws Exception;
+
+ /**
+ * Remove the configuration property identified by the given key.
+ *
+ * @param pid the configuration PID.
+ * @param key the property key.
+ * @param bypassStorage doesn't flush the change on the storage config
file.
+ * @throws Exception
+ */
+ void propdel(String pid, String key, boolean bypassStorage) throws
Exception;
+
+ /**
+ * Append (or add) a value for the given configuration key.
+ *
+ * @param pid the configuration PID.
+ * @param key the property key.
+ * @param value the value to append to the current property value.
+ * @param bypassStorage doesn't flush the change on the storage config
file.
+ * @throws Exception
+ */
+ void propappend(String pid, String key, String value, boolean
bypassStorage) throws Exception;
+
+ /**
+ * Set a configuration property.
+ *
+ * @param pid the configuration PID.
+ * @param key the property key.
+ * @param value the property value.
+ * @param bypassStorage doesn't flush the change on the storage config
file.
+ * @throws Exception
+ */
+ void propset(String pid, String key, String value, boolean bypassStorage)
throws Exception;
+
+}
Added:
karaf/branches/karaf-2.2.x/management/mbeans/config/src/main/java/org/apache/karaf/management/mbeans/config/internal/ConfigMBeanImpl.java
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/management/mbeans/config/src/main/java/org/apache/karaf/management/mbeans/config/internal/ConfigMBeanImpl.java?rev=1174071&view=auto
==============================================================================
---
karaf/branches/karaf-2.2.x/management/mbeans/config/src/main/java/org/apache/karaf/management/mbeans/config/internal/ConfigMBeanImpl.java
(added)
+++
karaf/branches/karaf-2.2.x/management/mbeans/config/src/main/java/org/apache/karaf/management/mbeans/config/internal/ConfigMBeanImpl.java
Thu Sep 22 11:35:37 2011
@@ -0,0 +1,187 @@
+/*
+ * 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.
+ */
+package org.apache.karaf.management.mbeans.config.internal;
+
+import org.apache.felix.utils.properties.Properties;
+import org.apache.karaf.management.mbeans.config.ConfigMBean;
+import org.osgi.framework.Constants;
+import org.osgi.service.cm.Configuration;
+import org.osgi.service.cm.ConfigurationAdmin;
+
+import javax.management.NotCompliantMBeanException;
+import javax.management.StandardMBean;
+import java.io.File;
+import java.util.*;
+
+/**
+ * Implementation of the ConfigMBean.
+ */
+public class ConfigMBeanImpl extends StandardMBean implements ConfigMBean {
+
+ private final String FELIX_FILEINSTALL_FILENAME =
"felix.fileinstall.filename";
+
+ private ConfigurationAdmin configurationAdmin;
+ private File storage;
+
+ public ConfigurationAdmin getConfigurationAdmin() {
+ return this.configurationAdmin;
+ }
+
+ public void setConfigurationAdmin(ConfigurationAdmin configurationAdmin) {
+ this.configurationAdmin = configurationAdmin;
+ }
+
+ public File getStorage() {
+ return this.storage;
+ }
+
+ public void setStorage(File storage) {
+ this.storage = storage;
+ }
+
+ public ConfigMBeanImpl() throws NotCompliantMBeanException {
+ super(ConfigMBean.class);
+ }
+
+ public List<String> list() throws Exception {
+ Configuration[] configurations =
configurationAdmin.listConfigurations(null);
+ List<String> pids = new ArrayList<String>();
+ for (int i = 0; i < configurations.length; i++) {
+ pids.add(configurations[i].getPid());
+ }
+ return pids;
+ }
+
+ public void create(String pid) throws Exception {
+ store(pid, new Hashtable(), false);
+ }
+
+ public void delete(String pid) throws Exception {
+ Configuration configuration = configurationAdmin.getConfiguration(pid);
+ if (configuration == null) {
+ throw new IllegalArgumentException("Configuration PID " + pid + "
doesn't exist");
+ }
+ configuration.delete();
+ }
+
+ public Map<String, String> proplist(String pid) throws Exception {
+ Configuration configuration = configurationAdmin.getConfiguration(pid);
+ if (configuration == null) {
+ throw new IllegalArgumentException("Configuration PID " + pid + "
doesn't exist");
+ }
+ Dictionary dictionary = configuration.getProperties();
+ Map<String, String> propertiesMap = new HashMap<String, String>();
+ for (Enumeration e = dictionary.keys(); e.hasMoreElements(); ) {
+ Object key = e.nextElement();
+ Object value = dictionary.get(key);
+ propertiesMap.put(key.toString(), value.toString());
+ }
+ return propertiesMap;
+ }
+
+ public void propdel(String pid, String key, boolean bypassStorage) throws
Exception {
+ Configuration configuration = configurationAdmin.getConfiguration(pid);
+ if (configuration == null) {
+ throw new IllegalArgumentException("Configuration PID " + pid + "
doesn't exist");
+ }
+ Dictionary dictionary = configuration.getProperties();
+ dictionary.remove(key);
+ store(pid, dictionary, bypassStorage);
+ }
+
+ public void propappend(String pid, String key, String value, boolean
bypassStorage) throws Exception {
+ Configuration configuration = configurationAdmin.getConfiguration(pid);
+ if (configuration == null) {
+ throw new IllegalArgumentException("Configuration PID " + pid + "
doesn't exist");
+ }
+ Dictionary dictionary = configuration.getProperties();
+ Object currentValue = dictionary.get(key);
+ if (currentValue == null) {
+ dictionary.put(key, value);
+ } else if (currentValue instanceof String) {
+ dictionary.put(key, currentValue + value);
+ } else {
+ throw new IllegalStateException("Current value is not a String");
+ }
+ store(pid, dictionary, bypassStorage);
+ }
+
+ public void propset(String pid, String key, String value, boolean
bypassStorage) throws Exception {
+ Configuration configuration = configurationAdmin.getConfiguration(pid);
+ if (configuration == null) {
+ throw new IllegalArgumentException("Configuration PID " + pid + "
doesn't exist");
+ }
+ Dictionary dictionary = configuration.getProperties();
+ dictionary.put(key, value);
+ store(pid, dictionary, bypassStorage);
+ }
+
+ /**
+ * Store/flush a configuration PID into the configuration file.
+ *
+ * @param pid the configuration PID.
+ * @param properties the configuration properties.
+ * @throws Exception
+ */
+ private void store(String pid, Dictionary properties, boolean
bypassStorage) throws Exception {
+ if (!bypassStorage && storage != null) {
+ File storageFile = new File(storage, pid + ".cfg");
+ Configuration configuration =
configurationAdmin.getConfiguration(pid, null);
+ if (configuration != null && configuration.getProperties() !=
null) {
+ Object val =
configuration.getProperties().get(FELIX_FILEINSTALL_FILENAME);
+ if (val instanceof String) {
+ if (((String) val).startsWith("file:")) {
+ val = ((String) val).substring("file:".length());
+ }
+ storageFile = new File((String) val);
+ }
+ }
+ Properties p = new Properties(storageFile);
+ for (Enumeration keys = properties.keys(); keys.hasMoreElements();
) {
+ Object key = keys.nextElement();
+ if (!Constants.SERVICE_PID.equals(key)
+ && !ConfigurationAdmin.SERVICE_FACTORYPID.equals(key)
+ && !FELIX_FILEINSTALL_FILENAME.equals(key)) {
+ p.put((String) key, (String) properties.get(key));
+ }
+ }
+ storage.mkdirs();
+ p.save();
+ } else {
+ Configuration cfg = configurationAdmin.getConfiguration(pid, null);
+ if (cfg.getProperties() == null) {
+ String[] pids = parsePid(pid);
+ if (pids[1] != null) {
+ cfg =
configurationAdmin.createFactoryConfiguration(pids[0], null);
+ }
+ }
+ if (cfg.getBundleLocation() != null) {
+ cfg.setBundleLocation(null);
+ }
+ cfg.update(properties);
+ }
+ }
+
+ private String[] parsePid(String pid) {
+ int n = pid.indexOf('-');
+ if (n > 0) {
+ String factoryPid = pid.substring(n + 1);
+ pid = pid.substring(0, n);
+ return new String[] { pid, factoryPid };
+ } else {
+ return new String[] { pid, null };
+ }
+ }
+
+}
Added:
karaf/branches/karaf-2.2.x/management/mbeans/config/src/main/resources/OSGI-INF/blueprint/config-management.xml
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/management/mbeans/config/src/main/resources/OSGI-INF/blueprint/config-management.xml?rev=1174071&view=auto
==============================================================================
---
karaf/branches/karaf-2.2.x/management/mbeans/config/src/main/resources/OSGI-INF/blueprint/config-management.xml
(added)
+++
karaf/branches/karaf-2.2.x/management/mbeans/config/src/main/resources/OSGI-INF/blueprint/config-management.xml
Thu Sep 22 11:35:37 2011
@@ -0,0 +1,50 @@
+<?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.
+-->
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0";
+
xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0";
+
xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0";>
+
+ <!-- Reference to the MBean server -->
+ <reference id="mbeanServer" interface="javax.management.MBeanServer">
+ <reference-listener ref="mbeanRegistrer"
bind-method="registerMBeanServer" unbind-method="unregisterMBeanServer"/>
+ </reference>
+
+ <!-- Reference to the configuration admin -->
+ <reference id="configurationAdmin"
interface="org.osgi.service.cm.ConfigurationAdmin" />
+
+ <!-- Config MBean -->
+ <bean id="configMBean"
class="org.apache.karaf.management.mbeans.config.internal.ConfigMBeanImpl">
+ <property name="configurationAdmin" ref="configurationAdmin"/>
+ <property name="storage" value="${storage}"/>
+ </bean>
+
+ <!-- Register MBean in the MBeanServer -->
+ <bean id="mbeanRegistrer"
class="org.apache.karaf.management.MBeanRegistrer">
+ <property name="mbeans">
+ <map>
+ <entry value="org.apache.karaf:type=config,name=${karaf.name}"
key-ref="configMBean"/>
+ </map>
+ </property>
+ </bean>
+
+ <ext:property-placeholder placeholder-prefix="$[" placeholder-suffix="]" />
+
+ <cm:property-placeholder persistent-id="org.apache.karaf.shell.config">
+ <cm:default-properties>
+ <cm:property name="storage" value="$[karaf.base]/etc/"/>
+ </cm:default-properties>
+ </cm:property-placeholder>
+
+</blueprint>
\ No newline at end of file
Added:
karaf/branches/karaf-2.2.x/management/mbeans/config/src/main/resources/OSGI-INF/bundle.info
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/management/mbeans/config/src/main/resources/OSGI-INF/bundle.info?rev=1174071&view=auto
==============================================================================
---
karaf/branches/karaf-2.2.x/management/mbeans/config/src/main/resources/OSGI-INF/bundle.info
(added)
+++
karaf/branches/karaf-2.2.x/management/mbeans/config/src/main/resources/OSGI-INF/bundle.info
Thu Sep 22 11:35:37 2011
@@ -0,0 +1,25 @@
+PSIS\u001B[0m
+ ${project.name}
+
+ ${project.description}
+
+ Maven URL:
+
\u001B[33mmvn:${project.groupId}/${project.artifactId}/${project.version}\u001B[0m
+
+\u001B[1mDESCRIPTION\u001B[0m
+ The config mbean management bundle exposes a Config MBean that you can use
with any JMX client (for instance JConsole).
+
+ The config MBean allows you quite the same actions that you can perform
using config:* commands:
+ \u001B[36mlist()\u001B[0m
+ \u001B[36mcreate(pid)\u001B[0m
+ \u001B[36mdelete(pid)\u001B[0m
+ \u001B[36mrproplist(pid)\u001B[0m
+ \u001B[36mrpropdel(pid,key,bypassStorage)\u001B[0m
+ \u001B[36mrpropappend(pid,key,value,bypassStorage)\u001B[0m
+ \u001B[36mrpropset(pid,key,value,bypassStorage)\u001B[0m
+
+ As config:* commands, the Config MBean is able to flush the changes into
the etc files.
+
+\u001B[1mSEE ALSO\u001B[0m
+ \u001B[36mDiagnostic\u001B[0m and \u001B[36mRemote Management via
JMX\u001B[0m for the Karaf User Guide.
+
Added: karaf/branches/karaf-2.2.x/management/mbeans/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/management/mbeans/pom.xml?rev=1174071&view=auto
==============================================================================
--- karaf/branches/karaf-2.2.x/management/mbeans/pom.xml (added)
+++ karaf/branches/karaf-2.2.x/management/mbeans/pom.xml Thu Sep 22 11:35:37
2011
@@ -0,0 +1,40 @@
+<?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";>
+
+ <!--
+
+ 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.management</groupId>
+ <artifactId>management</artifactId>
+ <version>2.2.4-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.karaf.management.mbeans</groupId>
+ <artifactId>mbeans</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Karaf :: Management :: MBeans</name>
+
+ <modules>
+ <module>config</module>
+ </modules>
+
+</project>
\ No newline at end of file
Modified: karaf/branches/karaf-2.2.x/management/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/management/pom.xml?rev=1174071&r1=1174070&r2=1174071&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/management/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/management/pom.xml Thu Sep 22 11:35:37 2011
@@ -28,75 +28,14 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>org.apache.karaf.management</artifactId>
- <packaging>bundle</packaging>
+ <groupId>org.apache.karaf.management</groupId>
+ <artifactId>management</artifactId>
+ <packaging>pom</packaging>
<name>Apache Karaf :: Management</name>
- <description>This bundle starts the Karaf embedded MBean server and RMI
registry allowing users to use JMX to manage Karaf.</description>
- <properties>
-
<appendedResourcesDirectory>${basedir}/../etc/appended-resources</appendedResourcesDirectory>
- </properties>
+ <modules>
+ <module>server</module>
+ <module>mbeans</module>
+ </modules>
- <dependencies>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
- <version>${easymock.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <resources>
- <resource>
- <directory>${project.basedir}/src/main/resources</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- <resource>
- <directory>${project.basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- <includes>
- <include>**/*.info</include>
- </includes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Import-Package>
- !${project.artifactId}*,
- javax.management,
- *
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
+</project>
\ No newline at end of file
Copied: karaf/branches/karaf-2.2.x/management/server/NOTICE (from r1174005,
karaf/branches/karaf-2.2.x/management/NOTICE)
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/management/server/NOTICE?p2=karaf/branches/karaf-2.2.x/management/server/NOTICE&p1=karaf/branches/karaf-2.2.x/management/NOTICE&r1=1174005&r2=1174071&rev=1174071&view=diff
==============================================================================
(empty)
Copied: karaf/branches/karaf-2.2.x/management/server/pom.xml (from r1174005,
karaf/branches/karaf-2.2.x/management/pom.xml)
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/management/server/pom.xml?p2=karaf/branches/karaf-2.2.x/management/server/pom.xml&p1=karaf/branches/karaf-2.2.x/management/pom.xml&r1=1174005&r2=1174071&rev=1174071&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/management/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/management/server/pom.xml Thu Sep 22 11:35:37
2011
@@ -22,13 +22,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.karaf</groupId>
- <artifactId>karaf</artifactId>
+ <groupId>org.apache.karaf.management</groupId>
+ <artifactId>management</artifactId>
<version>2.2.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>org.apache.karaf.management</artifactId>
+ <artifactId>org.apache.karaf.management.server</artifactId>
<packaging>bundle</packaging>
<name>Apache Karaf :: Management</name>
<description>This bundle starts the Karaf embedded MBean server and RMI
registry allowing users to use JMX to manage Karaf.</description>
@@ -88,6 +88,9 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
+ <Export-Package>
+
org.apache.karaf.management;version=${project.version}
+ </Export-Package>
<Import-Package>
!${project.artifactId}*,
javax.management,
Copied:
karaf/branches/karaf-2.2.x/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
(from r1174005,
karaf/branches/karaf-2.2.x/management/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java)
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java?p2=karaf/branches/karaf-2.2.x/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java&p1=karaf/branches/karaf-2.2.x/management/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java&r1=1174005&r2=1174071&rev=1174071&view=diff
==============================================================================
(empty)
Copied:
karaf/branches/karaf-2.2.x/management/server/src/main/java/org/apache/karaf/management/JaasAuthenticator.java
(from r1174005,
karaf/branches/karaf-2.2.x/management/src/main/java/org/apache/karaf/management/JaasAuthenticator.java)
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/management/server/src/main/java/org/apache/karaf/management/JaasAuthenticator.java?p2=karaf/branches/karaf-2.2.x/management/server/src/main/java/org/apache/karaf/management/JaasAuthenticator.java&p1=karaf/branches/karaf-2.2.x/management/src/main/java/org/apache/karaf/management/JaasAuthenticator.java&r1=1174005&r2=1174071&rev=1174071&view=diff
==============================================================================
(empty)
Copied:
karaf/branches/karaf-2.2.x/management/server/src/main/java/org/apache/karaf/management/MBeanRegistrer.java
(from r1174005,
karaf/branches/karaf-2.2.x/management/src/main/java/org/apache/karaf/management/MBeanRegistrer.java)
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/management/server/src/main/java/org/apache/karaf/management/MBeanRegistrer.java?p2=karaf/branches/karaf-2.2.x/management/server/src/main/java/org/apache/karaf/management/MBeanRegistrer.java&p1=karaf/branches/karaf-2.2.x/management/src/main/java/org/apache/karaf/management/MBeanRegistrer.java&r1=1174005&r2=1174071&rev=1174071&view=diff
==============================================================================
(empty)
Copied:
karaf/branches/karaf-2.2.x/management/server/src/main/java/org/apache/karaf/management/MBeanServerFactory.java
(from r1174005,
karaf/branches/karaf-2.2.x/management/src/main/java/org/apache/karaf/management/MBeanServerFactory.java)
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/management/server/src/main/java/org/apache/karaf/management/MBeanServerFactory.java?p2=karaf/branches/karaf-2.2.x/management/server/src/main/java/org/apache/karaf/management/MBeanServerFactory.java&p1=karaf/branches/karaf-2.2.x/management/src/main/java/org/apache/karaf/management/MBeanServerFactory.java&r1=1174005&r2=1174071&rev=1174071&view=diff
==============================================================================
(empty)
Copied:
karaf/branches/karaf-2.2.x/management/server/src/main/java/org/apache/karaf/management/RmiRegistryFactory.java
(from r1174005,
karaf/branches/karaf-2.2.x/management/src/main/java/org/apache/karaf/management/RmiRegistryFactory.java)
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/management/server/src/main/java/org/apache/karaf/management/RmiRegistryFactory.java?p2=karaf/branches/karaf-2.2.x/management/server/src/main/java/org/apache/karaf/management/RmiRegistryFactory.java&p1=karaf/branches/karaf-2.2.x/management/src/main/java/org/apache/karaf/management/RmiRegistryFactory.java&r1=1174005&r2=1174071&rev=1174071&view=diff
==============================================================================
(empty)
Copied:
karaf/branches/karaf-2.2.x/management/server/src/main/resources/OSGI-INF/blueprint/karaf-management.xml
(from r1174005,
karaf/branches/karaf-2.2.x/management/src/main/resources/OSGI-INF/blueprint/karaf-management.xml)
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/management/server/src/main/resources/OSGI-INF/blueprint/karaf-management.xml?p2=karaf/branches/karaf-2.2.x/management/server/src/main/resources/OSGI-INF/blueprint/karaf-management.xml&p1=karaf/branches/karaf-2.2.x/management/src/main/resources/OSGI-INF/blueprint/karaf-management.xml&r1=1174005&r2=1174071&rev=1174071&view=diff
==============================================================================
(empty)
Copied:
karaf/branches/karaf-2.2.x/management/server/src/main/resources/OSGI-INF/bundle.info
(from r1174005,
karaf/branches/karaf-2.2.x/management/src/main/resources/OSGI-INF/bundle.info)
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/management/server/src/main/resources/OSGI-INF/bundle.info?p2=karaf/branches/karaf-2.2.x/management/server/src/main/resources/OSGI-INF/bundle.info&p1=karaf/branches/karaf-2.2.x/management/src/main/resources/OSGI-INF/bundle.info&r1=1174005&r2=1174071&rev=1174071&view=diff
==============================================================================
(empty)
Copied:
karaf/branches/karaf-2.2.x/management/server/src/main/resources/OSGI-INF/metatype/metatype.properties
(from r1174005,
karaf/branches/karaf-2.2.x/management/src/main/resources/OSGI-INF/metatype/metatype.properties)
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/management/server/src/main/resources/OSGI-INF/metatype/metatype.properties?p2=karaf/branches/karaf-2.2.x/management/server/src/main/resources/OSGI-INF/metatype/metatype.properties&p1=karaf/branches/karaf-2.2.x/management/src/main/resources/OSGI-INF/metatype/metatype.properties&r1=1174005&r2=1174071&rev=1174071&view=diff
==============================================================================
(empty)
Copied:
karaf/branches/karaf-2.2.x/management/server/src/main/resources/OSGI-INF/metatype/metatype.xml
(from r1174005,
karaf/branches/karaf-2.2.x/management/src/main/resources/OSGI-INF/metatype/metatype.xml)
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/management/server/src/main/resources/OSGI-INF/metatype/metatype.xml?p2=karaf/branches/karaf-2.2.x/management/server/src/main/resources/OSGI-INF/metatype/metatype.xml&p1=karaf/branches/karaf-2.2.x/management/src/main/resources/OSGI-INF/metatype/metatype.xml&r1=1174005&r2=1174071&rev=1174071&view=diff
==============================================================================
(empty)
Copied:
karaf/branches/karaf-2.2.x/management/server/src/test/configs/factories/management.properties
(from r1174005,
karaf/branches/karaf-2.2.x/management/src/test/configs/factories/management.properties)
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/management/server/src/test/configs/factories/management.properties?p2=karaf/branches/karaf-2.2.x/management/server/src/test/configs/factories/management.properties&p1=karaf/branches/karaf-2.2.x/management/src/test/configs/factories/management.properties&r1=1174005&r2=1174071&rev=1174071&view=diff
==============================================================================
(empty)
Copied:
karaf/branches/karaf-2.2.x/management/server/src/test/configs/services/org.ops4j.pax.logging.properties
(from r1174005,
karaf/branches/karaf-2.2.x/management/src/test/configs/services/org.ops4j.pax.logging.properties)
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/management/server/src/test/configs/services/org.ops4j.pax.logging.properties?p2=karaf/branches/karaf-2.2.x/management/server/src/test/configs/services/org.ops4j.pax.logging.properties&p1=karaf/branches/karaf-2.2.x/management/src/test/configs/services/org.ops4j.pax.logging.properties&r1=1174005&r2=1174071&rev=1174071&view=diff
==============================================================================
(empty)
Copied:
karaf/branches/karaf-2.2.x/management/server/src/test/java/org/apache/karaf/management/MBeanRegistererTest.java
(from r1174005,
karaf/branches/karaf-2.2.x/management/src/test/java/org/apache/karaf/management/MBeanRegistererTest.java)
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/management/server/src/test/java/org/apache/karaf/management/MBeanRegistererTest.java?p2=karaf/branches/karaf-2.2.x/management/server/src/test/java/org/apache/karaf/management/MBeanRegistererTest.java&p1=karaf/branches/karaf-2.2.x/management/src/test/java/org/apache/karaf/management/MBeanRegistererTest.java&r1=1174005&r2=1174071&rev=1174071&view=diff
==============================================================================
---
karaf/branches/karaf-2.2.x/management/src/test/java/org/apache/karaf/management/MBeanRegistererTest.java
(original)
+++
karaf/branches/karaf-2.2.x/management/server/src/test/java/org/apache/karaf/management/MBeanRegistererTest.java
Thu Sep 22 11:35:37 2011
@@ -26,7 +26,6 @@ import static org.easymock.classextensio
import org.easymock.classextension.IMocksControl;
import junit.framework.TestCase;
-import org.junit.Assert;
public class MBeanRegistererTest extends TestCase {
public void testRegistration() throws Exception {
Modified: karaf/branches/karaf-2.2.x/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/pom.xml?rev=1174071&r1=1174070&r2=1174071&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/pom.xml Thu Sep 22 11:35:37 2011
@@ -264,8 +264,13 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.management</artifactId>
+ <groupId>org.apache.karaf.management</groupId>
+ <artifactId>org.apache.karaf.management.server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.management.mbeans</groupId>
+
<artifactId>org.apache.karaf.management.mbeans.config</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
