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/09/21 12:27:32 UTC
svn commit: r1173559 [2/2] - in /karaf/trunk: admin/ admin/command/
admin/core/ admin/management/ archetypes/ archetypes/command/
archetypes/feature/ archetypes/itests/ assemblies/
assemblies/apache-karaf-full/ assemblies/apache-karaf-minimal/ assembli...
Added: karaf/trunk/management/mbeans/config/src/main/resources/OSGI-INF/blueprint/config-management.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/management/mbeans/config/src/main/resources/OSGI-INF/blueprint/config-management.xml?rev=1173559&view=auto
==============================================================================
--- karaf/trunk/management/mbeans/config/src/main/resources/OSGI-INF/blueprint/config-management.xml (added)
+++ karaf/trunk/management/mbeans/config/src/main/resources/OSGI-INF/blueprint/config-management.xml Wed Sep 21 10:27:28 2011
@@ -0,0 +1,39 @@
+<?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">
+
+ <!-- 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"/>
+ </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>
+
+</blueprint>
\ No newline at end of file
Copied: karaf/trunk/management/mbeans/pom.xml (from r1171423, karaf/trunk/jaas/pom.xml)
URL: http://svn.apache.org/viewvc/karaf/trunk/management/mbeans/pom.xml?p2=karaf/trunk/management/mbeans/pom.xml&p1=karaf/trunk/jaas/pom.xml&r1=1171423&r2=1173559&rev=1173559&view=diff
==============================================================================
--- karaf/trunk/jaas/pom.xml (original)
+++ karaf/trunk/management/mbeans/pom.xml Wed Sep 21 10:27:28 2011
@@ -22,22 +22,19 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.karaf</groupId>
- <artifactId>karaf</artifactId>
+ <groupId>org.apache.karaf.management</groupId>
+ <artifactId>management</artifactId>
<version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.karaf.jaas</groupId>
- <artifactId>jaas</artifactId>
+ <groupId>org.apache.karaf.management.mbeans</groupId>
+ <artifactId>mbeans</artifactId>
<packaging>pom</packaging>
- <name>Apache Karaf :: JAAS</name>
+ <name>Apache Karaf :: Management :: MBeans</name>
<modules>
- <module>boot</module>
<module>config</module>
- <module>modules</module>
- <module>jasypt</module>
- <module>command</module>
</modules>
-</project>
+</project>
\ No newline at end of file
Modified: karaf/trunk/management/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/management/pom.xml?rev=1173559&r1=1173558&r2=1173559&view=diff
==============================================================================
--- karaf/trunk/management/pom.xml (original)
+++ karaf/trunk/management/pom.xml Wed Sep 21 10:27:28 2011
@@ -25,79 +25,17 @@
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
<version>3.0.0-SNAPSHOT</version>
+ <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/trunk/management/server/NOTICE (from r1171423, karaf/trunk/management/NOTICE)
URL: http://svn.apache.org/viewvc/karaf/trunk/management/server/NOTICE?p2=karaf/trunk/management/server/NOTICE&p1=karaf/trunk/management/NOTICE&r1=1171423&r2=1173559&rev=1173559&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/management/server/pom.xml (from r1171423, karaf/trunk/management/pom.xml)
URL: http://svn.apache.org/viewvc/karaf/trunk/management/server/pom.xml?p2=karaf/trunk/management/server/pom.xml&p1=karaf/trunk/management/pom.xml&r1=1171423&r2=1173559&rev=1173559&view=diff
==============================================================================
--- karaf/trunk/management/pom.xml (original)
+++ karaf/trunk/management/server/pom.xml Wed Sep 21 10:27:28 2011
@@ -22,12 +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>3.0.0-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
Copied: karaf/trunk/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java (from r1171423, karaf/trunk/management/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java?p2=karaf/trunk/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java&p1=karaf/trunk/management/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java&r1=1171423&r2=1173559&rev=1173559&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/management/server/src/main/java/org/apache/karaf/management/JaasAuthenticator.java (from r1171423, karaf/trunk/management/src/main/java/org/apache/karaf/management/JaasAuthenticator.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/management/server/src/main/java/org/apache/karaf/management/JaasAuthenticator.java?p2=karaf/trunk/management/server/src/main/java/org/apache/karaf/management/JaasAuthenticator.java&p1=karaf/trunk/management/src/main/java/org/apache/karaf/management/JaasAuthenticator.java&r1=1171423&r2=1173559&rev=1173559&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/management/server/src/main/java/org/apache/karaf/management/MBeanRegistrer.java (from r1171423, karaf/trunk/management/src/main/java/org/apache/karaf/management/MBeanRegistrer.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/management/server/src/main/java/org/apache/karaf/management/MBeanRegistrer.java?p2=karaf/trunk/management/server/src/main/java/org/apache/karaf/management/MBeanRegistrer.java&p1=karaf/trunk/management/src/main/java/org/apache/karaf/management/MBeanRegistrer.java&r1=1171423&r2=1173559&rev=1173559&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/management/server/src/main/java/org/apache/karaf/management/MBeanServerFactory.java (from r1171423, karaf/trunk/management/src/main/java/org/apache/karaf/management/MBeanServerFactory.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/management/server/src/main/java/org/apache/karaf/management/MBeanServerFactory.java?p2=karaf/trunk/management/server/src/main/java/org/apache/karaf/management/MBeanServerFactory.java&p1=karaf/trunk/management/src/main/java/org/apache/karaf/management/MBeanServerFactory.java&r1=1171423&r2=1173559&rev=1173559&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/management/server/src/main/java/org/apache/karaf/management/RmiRegistryFactory.java (from r1171423, karaf/trunk/management/src/main/java/org/apache/karaf/management/RmiRegistryFactory.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/management/server/src/main/java/org/apache/karaf/management/RmiRegistryFactory.java?p2=karaf/trunk/management/server/src/main/java/org/apache/karaf/management/RmiRegistryFactory.java&p1=karaf/trunk/management/src/main/java/org/apache/karaf/management/RmiRegistryFactory.java&r1=1171423&r2=1173559&rev=1173559&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/management/server/src/main/resources/OSGI-INF/blueprint/karaf-management.xml (from r1171423, karaf/trunk/management/src/main/resources/OSGI-INF/blueprint/karaf-management.xml)
URL: http://svn.apache.org/viewvc/karaf/trunk/management/server/src/main/resources/OSGI-INF/blueprint/karaf-management.xml?p2=karaf/trunk/management/server/src/main/resources/OSGI-INF/blueprint/karaf-management.xml&p1=karaf/trunk/management/src/main/resources/OSGI-INF/blueprint/karaf-management.xml&r1=1171423&r2=1173559&rev=1173559&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/management/server/src/main/resources/OSGI-INF/bundle.info (from r1171423, karaf/trunk/management/src/main/resources/OSGI-INF/bundle.info)
URL: http://svn.apache.org/viewvc/karaf/trunk/management/server/src/main/resources/OSGI-INF/bundle.info?p2=karaf/trunk/management/server/src/main/resources/OSGI-INF/bundle.info&p1=karaf/trunk/management/src/main/resources/OSGI-INF/bundle.info&r1=1171423&r2=1173559&rev=1173559&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/management/server/src/main/resources/OSGI-INF/metatype/metatype.properties (from r1171423, karaf/trunk/management/src/main/resources/OSGI-INF/metatype/metatype.properties)
URL: http://svn.apache.org/viewvc/karaf/trunk/management/server/src/main/resources/OSGI-INF/metatype/metatype.properties?p2=karaf/trunk/management/server/src/main/resources/OSGI-INF/metatype/metatype.properties&p1=karaf/trunk/management/src/main/resources/OSGI-INF/metatype/metatype.properties&r1=1171423&r2=1173559&rev=1173559&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/management/server/src/main/resources/OSGI-INF/metatype/metatype.xml (from r1171423, karaf/trunk/management/src/main/resources/OSGI-INF/metatype/metatype.xml)
URL: http://svn.apache.org/viewvc/karaf/trunk/management/server/src/main/resources/OSGI-INF/metatype/metatype.xml?p2=karaf/trunk/management/server/src/main/resources/OSGI-INF/metatype/metatype.xml&p1=karaf/trunk/management/src/main/resources/OSGI-INF/metatype/metatype.xml&r1=1171423&r2=1173559&rev=1173559&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/management/server/src/test/configs/factories/management.properties (from r1171423, karaf/trunk/management/src/test/configs/factories/management.properties)
URL: http://svn.apache.org/viewvc/karaf/trunk/management/server/src/test/configs/factories/management.properties?p2=karaf/trunk/management/server/src/test/configs/factories/management.properties&p1=karaf/trunk/management/src/test/configs/factories/management.properties&r1=1171423&r2=1173559&rev=1173559&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/management/server/src/test/configs/services/org.ops4j.pax.logging.properties (from r1171423, karaf/trunk/management/src/test/configs/services/org.ops4j.pax.logging.properties)
URL: http://svn.apache.org/viewvc/karaf/trunk/management/server/src/test/configs/services/org.ops4j.pax.logging.properties?p2=karaf/trunk/management/server/src/test/configs/services/org.ops4j.pax.logging.properties&p1=karaf/trunk/management/src/test/configs/services/org.ops4j.pax.logging.properties&r1=1171423&r2=1173559&rev=1173559&view=diff
==============================================================================
(empty)
Copied: karaf/trunk/management/server/src/test/java/org/apache/karaf/management/MBeanRegistererTest.java (from r1171423, karaf/trunk/management/src/test/java/org/apache/karaf/management/MBeanRegistererTest.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/management/server/src/test/java/org/apache/karaf/management/MBeanRegistererTest.java?p2=karaf/trunk/management/server/src/test/java/org/apache/karaf/management/MBeanRegistererTest.java&p1=karaf/trunk/management/src/test/java/org/apache/karaf/management/MBeanRegistererTest.java&r1=1171423&r2=1173559&rev=1173559&view=diff
==============================================================================
--- karaf/trunk/management/src/test/java/org/apache/karaf/management/MBeanRegistererTest.java (original)
+++ karaf/trunk/management/server/src/test/java/org/apache/karaf/management/MBeanRegistererTest.java Wed Sep 21 10:27:28 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/trunk/manual/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/pom.xml?rev=1173559&r1=1173558&r2=1173559&view=diff
==============================================================================
--- karaf/trunk/manual/pom.xml (original)
+++ karaf/trunk/manual/pom.xml Wed Sep 21 10:27:28 2011
@@ -1,34 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (C) 2009-2010 the original author or authors.
- See the notice.md file distributed with this work for additional
- information regarding copyright ownership.
-
- 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
+<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/maven-v4_0_0.xsd">
- 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.
+ <!--
--->
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
<version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
-
<artifactId>manual</artifactId>
<name>Apache Karaf :: Manual</name>
<packaging>war</packaging>
Modified: karaf/trunk/scheduler/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/scheduler/core/pom.xml?rev=1173559&r1=1173558&r2=1173559&view=diff
==============================================================================
--- karaf/trunk/scheduler/core/pom.xml (original)
+++ karaf/trunk/scheduler/core/pom.xml Wed Sep 21 10:27:28 2011
@@ -1,30 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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>
<artifactId>scheduler</artifactId>
<groupId>org.apache.karaf</groupId>
<version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.karaf.scheduler</groupId>
<artifactId>org.apache.karaf.scheduler.core</artifactId>
@@ -71,13 +73,11 @@
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
</dependency>
-
</dependencies>
</project>
\ No newline at end of file
Modified: karaf/trunk/scheduler/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/scheduler/pom.xml?rev=1173559&r1=1173558&r2=1173559&view=diff
==============================================================================
--- karaf/trunk/scheduler/pom.xml (original)
+++ karaf/trunk/scheduler/pom.xml Wed Sep 21 10:27:28 2011
@@ -25,6 +25,7 @@
<artifactId>karaf</artifactId>
<groupId>org.apache.karaf</groupId>
<version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.karaf</groupId>
Modified: karaf/trunk/shell/commands/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/pom.xml?rev=1173559&r1=1173558&r2=1173559&view=diff
==============================================================================
--- karaf/trunk/shell/commands/pom.xml (original)
+++ karaf/trunk/shell/commands/pom.xml Wed Sep 21 10:27:28 2011
@@ -25,6 +25,7 @@
<groupId>org.apache.karaf.shell</groupId>
<artifactId>shell</artifactId>
<version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.apache.karaf.shell.commands</artifactId>
@@ -110,4 +111,5 @@
</plugin>
</plugins>
</build>
+
</project>
Modified: karaf/trunk/shell/config/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/config/pom.xml?rev=1173559&r1=1173558&r2=1173559&view=diff
==============================================================================
--- karaf/trunk/shell/config/pom.xml (original)
+++ karaf/trunk/shell/config/pom.xml Wed Sep 21 10:27:28 2011
@@ -25,6 +25,7 @@
<groupId>org.apache.karaf.shell</groupId>
<artifactId>shell</artifactId>
<version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.apache.karaf.shell.config</artifactId>
@@ -105,4 +106,5 @@
</plugin>
</plugins>
</build>
+
</project>
Modified: karaf/trunk/shell/console/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/pom.xml?rev=1173559&r1=1173558&r2=1173559&view=diff
==============================================================================
--- karaf/trunk/shell/console/pom.xml (original)
+++ karaf/trunk/shell/console/pom.xml Wed Sep 21 10:27:28 2011
@@ -25,6 +25,7 @@
<groupId>org.apache.karaf.shell</groupId>
<artifactId>shell</artifactId>
<version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.apache.karaf.shell.console</artifactId>
@@ -165,4 +166,5 @@
</plugin>
</plugins>
</build>
+
</project>
Modified: karaf/trunk/shell/dev/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/dev/pom.xml?rev=1173559&r1=1173558&r2=1173559&view=diff
==============================================================================
--- karaf/trunk/shell/dev/pom.xml (original)
+++ karaf/trunk/shell/dev/pom.xml Wed Sep 21 10:27:28 2011
@@ -25,6 +25,7 @@
<artifactId>shell</artifactId>
<groupId>org.apache.karaf.shell</groupId>
<version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.apache.karaf.shell.dev</artifactId>
Modified: karaf/trunk/shell/http/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/http/pom.xml?rev=1173559&r1=1173558&r2=1173559&view=diff
==============================================================================
--- karaf/trunk/shell/http/pom.xml (original)
+++ karaf/trunk/shell/http/pom.xml Wed Sep 21 10:27:28 2011
@@ -1,5 +1,5 @@
-<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">
+<?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">
<!--
@@ -22,16 +22,15 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>shell</artifactId>
<groupId>org.apache.karaf.shell</groupId>
+ <artifactId>shell</artifactId>
<version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.http</artifactId>
<packaging>bundle</packaging>
<name>Apache Karaf :: Shell :: Http Commands</name>
- <version>3.0.0-SNAPSHOT</version>
<description>This bundle provides Karaf shell commands to list details of the http service.</description>
<properties>
Modified: karaf/trunk/shell/log/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/log/pom.xml?rev=1173559&r1=1173558&r2=1173559&view=diff
==============================================================================
--- karaf/trunk/shell/log/pom.xml (original)
+++ karaf/trunk/shell/log/pom.xml Wed Sep 21 10:27:28 2011
@@ -25,6 +25,7 @@
<groupId>org.apache.karaf.shell</groupId>
<artifactId>shell</artifactId>
<version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.apache.karaf.shell.log</artifactId>
@@ -100,4 +101,5 @@
</plugin>
</plugins>
</build>
+
</project>
Modified: karaf/trunk/shell/obr/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/obr/pom.xml?rev=1173559&r1=1173558&r2=1173559&view=diff
==============================================================================
--- karaf/trunk/shell/obr/pom.xml (original)
+++ karaf/trunk/shell/obr/pom.xml Wed Sep 21 10:27:28 2011
@@ -25,6 +25,7 @@
<groupId>org.apache.karaf.shell</groupId>
<artifactId>shell</artifactId>
<version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.apache.karaf.shell.obr</artifactId>
@@ -111,4 +112,5 @@
</plugin>
</plugins>
</build>
+
</project>
Modified: karaf/trunk/shell/osgi/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/osgi/pom.xml?rev=1173559&r1=1173558&r2=1173559&view=diff
==============================================================================
--- karaf/trunk/shell/osgi/pom.xml (original)
+++ karaf/trunk/shell/osgi/pom.xml Wed Sep 21 10:27:28 2011
@@ -25,6 +25,7 @@
<groupId>org.apache.karaf.shell</groupId>
<artifactId>shell</artifactId>
<version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.apache.karaf.shell.osgi</artifactId>
@@ -123,4 +124,5 @@
</plugin>
</plugins>
</build>
+
</project>
Modified: karaf/trunk/shell/packages/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/packages/pom.xml?rev=1173559&r1=1173558&r2=1173559&view=diff
==============================================================================
--- karaf/trunk/shell/packages/pom.xml (original)
+++ karaf/trunk/shell/packages/pom.xml Wed Sep 21 10:27:28 2011
@@ -25,6 +25,7 @@
<groupId>org.apache.karaf.shell</groupId>
<artifactId>shell</artifactId>
<version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.apache.karaf.shell.packages</artifactId>
@@ -90,4 +91,5 @@
</plugin>
</plugins>
</build>
+
</project>
Modified: karaf/trunk/shell/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/pom.xml?rev=1173559&r1=1173558&r2=1173559&view=diff
==============================================================================
--- karaf/trunk/shell/pom.xml (original)
+++ karaf/trunk/shell/pom.xml Wed Sep 21 10:27:28 2011
@@ -25,6 +25,7 @@
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
<version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.karaf.shell</groupId>
Modified: karaf/trunk/shell/ssh/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/ssh/pom.xml?rev=1173559&r1=1173558&r2=1173559&view=diff
==============================================================================
--- karaf/trunk/shell/ssh/pom.xml (original)
+++ karaf/trunk/shell/ssh/pom.xml Wed Sep 21 10:27:28 2011
@@ -25,6 +25,7 @@
<groupId>org.apache.karaf.shell</groupId>
<artifactId>shell</artifactId>
<version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.apache.karaf.shell.ssh</artifactId>
@@ -109,4 +110,5 @@
</plugin>
</plugins>
</build>
+
</project>
Modified: karaf/trunk/shell/web/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/web/pom.xml?rev=1173559&r1=1173558&r2=1173559&view=diff
==============================================================================
--- karaf/trunk/shell/web/pom.xml (original)
+++ karaf/trunk/shell/web/pom.xml Wed Sep 21 10:27:28 2011
@@ -1,18 +1,36 @@
-<?xml version="1.0"?>
+<?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>
<artifactId>shell</artifactId>
<groupId>org.apache.karaf.shell</groupId>
<version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.apache.karaf.shell.web</artifactId>
<packaging>bundle</packaging>
<name>Apache Karaf :: Shell :: Web Commands</name>
- <version>3.0.0-SNAPSHOT</version>
<description>This bundle provides Karaf shell commands to manipulate web application bundles.</description>
<properties>
@@ -89,4 +107,5 @@
</plugin>
</plugins>
</build>
+
</project>
Modified: karaf/trunk/shell/wrapper/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/wrapper/pom.xml?rev=1173559&r1=1173558&r2=1173559&view=diff
==============================================================================
--- karaf/trunk/shell/wrapper/pom.xml (original)
+++ karaf/trunk/shell/wrapper/pom.xml Wed Sep 21 10:27:28 2011
@@ -25,6 +25,7 @@
<groupId>org.apache.karaf.shell</groupId>
<artifactId>shell</artifactId>
<version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.apache.karaf.shell.wrapper</artifactId>
@@ -113,4 +114,5 @@
</plugin>
</plugins>
</build>
+
</project>
Modified: karaf/trunk/tooling/karaf-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/pom.xml?rev=1173559&r1=1173558&r2=1173559&view=diff
==============================================================================
--- karaf/trunk/tooling/karaf-maven-plugin/pom.xml (original)
+++ karaf/trunk/tooling/karaf-maven-plugin/pom.xml Wed Sep 21 10:27:28 2011
@@ -25,16 +25,13 @@
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>tooling</artifactId>
<version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>karaf-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
<name>Apache Karaf :: Tooling :: Maven Karaf Plugin</name>
- <description>
- A Maven plugin for working with karaf.
- </description>
-
<properties>
<appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
</properties>
@@ -186,4 +183,5 @@
</plugin>
</plugins>
</reporting>
+
</project>
Modified: karaf/trunk/tooling/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/pom.xml?rev=1173559&r1=1173558&r2=1173559&view=diff
==============================================================================
--- karaf/trunk/tooling/pom.xml (original)
+++ karaf/trunk/tooling/pom.xml Wed Sep 21 10:27:28 2011
@@ -25,6 +25,7 @@
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
<version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.karaf.tooling</groupId>
Modified: karaf/trunk/tooling/testing/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/testing/pom.xml?rev=1173559&r1=1173558&r2=1173559&view=diff
==============================================================================
--- karaf/trunk/tooling/testing/pom.xml (original)
+++ karaf/trunk/tooling/testing/pom.xml Wed Sep 21 10:27:28 2011
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,22 +19,20 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
+
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.karaf.tooling</groupId>
- <artifactId>tooling</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>tooling</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.apache.karaf.tooling.testing</artifactId>
<packaging>bundle</packaging>
<name>Apache Karaf :: Tooling :: Testing Environment</name>
-
- <description>
- A bundle to help using Pax-Exam and Karaf.
- </description>
+ <description>A bundle to help using Pax-Exam and Karaf.</description>
<properties>
<appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
@@ -42,23 +41,23 @@
<dependencies>
<!-- The assembly and all the dependencies -->
<dependency>
- <groupId>org.apache.karaf.assemblies</groupId>
- <artifactId>apache-karaf-full</artifactId>
- <classifier>bin</classifier>
- <type>zip</type>
+ <groupId>org.apache.karaf.assemblies</groupId>
+ <artifactId>apache-karaf-full</artifactId>
+ <classifier>bin</classifier>
+ <type>zip</type>
</dependency>
<!-- Feature Files -->
<dependency>
- <groupId>org.apache.karaf.assemblies.features</groupId>
- <artifactId>org.apache.karaf.feature.standard</artifactId>
- <type>xml</type>
- <classifier>features</classifier>
+ <groupId>org.apache.karaf.assemblies.features</groupId>
+ <artifactId>org.apache.karaf.feature.standard</artifactId>
+ <type>xml</type>
+ <classifier>features</classifier>
</dependency>
<dependency>
- <groupId>org.apache.karaf.assemblies.features</groupId>
- <artifactId>org.apache.karaf.feature.enterprise</artifactId>
- <type>xml</type>
- <classifier>features</classifier>
+ <groupId>org.apache.karaf.assemblies.features</groupId>
+ <artifactId>org.apache.karaf.feature.enterprise</artifactId>
+ <type>xml</type>
+ <classifier>features</classifier>
</dependency>
<!-- Pax EXAM -->
<dependency>
Modified: karaf/trunk/util/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/util/pom.xml?rev=1173559&r1=1173558&r2=1173559&view=diff
==============================================================================
--- karaf/trunk/util/pom.xml (original)
+++ karaf/trunk/util/pom.xml Wed Sep 21 10:27:28 2011
@@ -25,16 +25,13 @@
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
<version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.apache.karaf.util</artifactId>
<packaging>jar</packaging>
<name>Apache Karaf :: Util</name>
-
- <description>
- Karaf Util contains utility classes used in different
- Karaf modules.
- </description>
+ <description>Karaf Util contains utility classes used in different Karaf modules.</description>
<properties>
<appendedResourcesDirectory>${basedir}/../etc/appended-resources</appendedResourcesDirectory>
Modified: karaf/trunk/webconsole/admin/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/admin/pom.xml?rev=1173559&r1=1173558&r2=1173559&view=diff
==============================================================================
--- karaf/trunk/webconsole/admin/pom.xml (original)
+++ karaf/trunk/webconsole/admin/pom.xml Wed Sep 21 10:27:28 2011
@@ -25,6 +25,7 @@
<groupId>org.apache.karaf.webconsole</groupId>
<artifactId>webconsole</artifactId>
<version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.apache.karaf.webconsole.admin</artifactId>
Modified: karaf/trunk/webconsole/branding/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/branding/pom.xml?rev=1173559&r1=1173558&r2=1173559&view=diff
==============================================================================
--- karaf/trunk/webconsole/branding/pom.xml (original)
+++ karaf/trunk/webconsole/branding/pom.xml Wed Sep 21 10:27:28 2011
@@ -25,6 +25,7 @@
<groupId>org.apache.karaf.webconsole</groupId>
<artifactId>webconsole</artifactId>
<version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.apache.karaf.webconsole.branding</artifactId>
Modified: karaf/trunk/webconsole/console/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/console/pom.xml?rev=1173559&r1=1173558&r2=1173559&view=diff
==============================================================================
--- karaf/trunk/webconsole/console/pom.xml (original)
+++ karaf/trunk/webconsole/console/pom.xml Wed Sep 21 10:27:28 2011
@@ -25,13 +25,13 @@
<groupId>org.apache.karaf.webconsole</groupId>
<artifactId>webconsole</artifactId>
<version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.apache.karaf.webconsole.console</artifactId>
<packaging>bundle</packaging>
<name>Apache Karaf :: Web Console :: Console</name>
- <description>This bundle is a repackaging of the Felix Web console with small security
- related changed.</description>
+ <description>This bundle is a repackaging of the Felix Web console with small security related changed.</description>
<properties>
<appendedResourcesDirectory>${project.basedir}/../../etc/appended-resources</appendedResourcesDirectory>
@@ -170,5 +170,4 @@
</plugins>
</build>
-
</project>
Modified: karaf/trunk/webconsole/features/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/features/pom.xml?rev=1173559&r1=1173558&r2=1173559&view=diff
==============================================================================
--- karaf/trunk/webconsole/features/pom.xml (original)
+++ karaf/trunk/webconsole/features/pom.xml Wed Sep 21 10:27:28 2011
@@ -25,6 +25,7 @@
<groupId>org.apache.karaf.webconsole</groupId>
<artifactId>webconsole</artifactId>
<version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.apache.karaf.webconsole.features</artifactId>
Modified: karaf/trunk/webconsole/gogo/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/gogo/pom.xml?rev=1173559&r1=1173558&r2=1173559&view=diff
==============================================================================
--- karaf/trunk/webconsole/gogo/pom.xml (original)
+++ karaf/trunk/webconsole/gogo/pom.xml Wed Sep 21 10:27:28 2011
@@ -25,6 +25,7 @@
<groupId>org.apache.karaf.webconsole</groupId>
<artifactId>webconsole</artifactId>
<version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.apache.karaf.webconsole.gogo</artifactId>
Modified: karaf/trunk/webconsole/http/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/http/pom.xml?rev=1173559&r1=1173558&r2=1173559&view=diff
==============================================================================
--- karaf/trunk/webconsole/http/pom.xml (original)
+++ karaf/trunk/webconsole/http/pom.xml Wed Sep 21 10:27:28 2011
@@ -25,6 +25,7 @@
<groupId>org.apache.karaf.webconsole</groupId>
<artifactId>webconsole</artifactId>
<version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.apache.karaf.webconsole.http</artifactId>
Modified: karaf/trunk/webconsole/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/pom.xml?rev=1173559&r1=1173558&r2=1173559&view=diff
==============================================================================
--- karaf/trunk/webconsole/pom.xml (original)
+++ karaf/trunk/webconsole/pom.xml Wed Sep 21 10:27:28 2011
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<!--
@@ -19,26 +20,27 @@
limitations under the License.
-->
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.karaf</groupId>
- <artifactId>karaf</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.karaf.webconsole</groupId>
- <artifactId>webconsole</artifactId>
- <packaging>pom</packaging>
- <name>Apache Karaf :: Web Console</name>
-
- <modules>
- <module>console</module>
- <module>branding</module>
- <module>features</module>
- <module>gogo</module>
- <module>http</module>
- <module>admin</module>
- </modules>
-
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>karaf</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.karaf.webconsole</groupId>
+ <artifactId>webconsole</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Karaf :: Web Console</name>
+
+ <modules>
+ <module>console</module>
+ <module>branding</module>
+ <module>features</module>
+ <module>gogo</module>
+ <module>http</module>
+ <module>admin</module>
+ </modules>
+
</project>