You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ge...@apache.org on 2010/06/29 09:45:13 UTC
svn commit: r958856 [2/8] - in /karaf/trunk: ./ admin/ admin/command/
admin/command/src/main/java/org/apache/felix/
admin/command/src/main/java/org/apache/karaf/
admin/command/src/main/java/org/apache/karaf/admin/command/
admin/command/src/main/java/or...
Modified: karaf/trunk/admin/core/src/main/java/org/apache/karaf/jpm/impl/ProcessBuilderFactoryImpl.java
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/core/src/main/java/org/apache/karaf/jpm/impl/ProcessBuilderFactoryImpl.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/admin/core/src/main/java/org/apache/karaf/jpm/impl/ProcessBuilderFactoryImpl.java (original)
+++ karaf/trunk/admin/core/src/main/java/org/apache/karaf/jpm/impl/ProcessBuilderFactoryImpl.java Tue Jun 29 07:45:00 2010
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.jpm.impl;
+package org.apache.karaf.jpm.impl;
-import org.apache.felix.karaf.jpm.ProcessBuilder;
-import org.apache.felix.karaf.jpm.ProcessBuilderFactory;
+import org.apache.karaf.jpm.ProcessBuilder;
+import org.apache.karaf.jpm.ProcessBuilderFactory;
public class ProcessBuilderFactoryImpl extends ProcessBuilderFactory {
Modified: karaf/trunk/admin/core/src/main/java/org/apache/karaf/jpm/impl/ProcessBuilderImpl.java
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/core/src/main/java/org/apache/karaf/jpm/impl/ProcessBuilderImpl.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/admin/core/src/main/java/org/apache/karaf/jpm/impl/ProcessBuilderImpl.java (original)
+++ karaf/trunk/admin/core/src/main/java/org/apache/karaf/jpm/impl/ProcessBuilderImpl.java Tue Jun 29 07:45:00 2010
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.jpm.impl;
+package org.apache.karaf.jpm.impl;
import java.io.File;
import java.io.IOException;
-import org.apache.felix.karaf.jpm.Process;
-import org.apache.felix.karaf.jpm.ProcessBuilder;
+import org.apache.karaf.jpm.Process;
+import org.apache.karaf.jpm.ProcessBuilder;
public class ProcessBuilderImpl implements ProcessBuilder {
Modified: karaf/trunk/admin/core/src/main/java/org/apache/karaf/jpm/impl/ProcessImpl.java
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/core/src/main/java/org/apache/karaf/jpm/impl/ProcessImpl.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/admin/core/src/main/java/org/apache/karaf/jpm/impl/ProcessImpl.java (original)
+++ karaf/trunk/admin/core/src/main/java/org/apache/karaf/jpm/impl/ProcessImpl.java Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.jpm.impl;
+package org.apache.karaf.jpm.impl;
import java.io.BufferedReader;
import java.io.File;
@@ -26,7 +26,7 @@ import java.io.InterruptedIOException;
import java.util.HashMap;
import java.util.Map;
-import org.apache.felix.karaf.jpm.Process;
+import org.apache.karaf.jpm.Process;
public class ProcessImpl implements Process {
Modified: karaf/trunk/admin/core/src/main/java/org/apache/karaf/jpm/impl/ScriptUtils.java
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/core/src/main/java/org/apache/karaf/jpm/impl/ScriptUtils.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/admin/core/src/main/java/org/apache/karaf/jpm/impl/ScriptUtils.java (original)
+++ karaf/trunk/admin/core/src/main/java/org/apache/karaf/jpm/impl/ScriptUtils.java Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.jpm.impl;
+package org.apache.karaf.jpm.impl;
import java.io.File;
import java.io.FileOutputStream;
Modified: karaf/trunk/admin/core/src/main/resources/OSGI-INF/blueprint/admin-core.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/core/src/main/resources/OSGI-INF/blueprint/admin-core.xml?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/admin/core/src/main/resources/OSGI-INF/blueprint/admin-core.xml (original)
+++ karaf/trunk/admin/core/src/main/resources/OSGI-INF/blueprint/admin-core.xml Tue Jun 29 07:45:00 2010
@@ -21,11 +21,11 @@
xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0"
default-activation="lazy">
- <bean id="adminService" class="org.apache.felix.karaf.admin.internal.AdminServiceImpl" init-method="init">
+ <bean id="adminService" class="org.apache.karaf.admin.internal.AdminServiceImpl" init-method="init">
<property name="storageLocation" value="${karaf.home}/instances" />
</bean>
- <service ref="adminService" interface="org.apache.felix.karaf.admin.AdminService" />
+ <service ref="adminService" interface="org.apache.karaf.admin.AdminService" />
<!-- Allow the use of system properties -->
<ext:property-placeholder />
Modified: karaf/trunk/admin/core/src/test/java/org/apache/karaf/admin/InstanceSettingsTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/core/src/test/java/org/apache/karaf/admin/InstanceSettingsTest.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/admin/core/src/test/java/org/apache/karaf/admin/InstanceSettingsTest.java (original)
+++ karaf/trunk/admin/core/src/test/java/org/apache/karaf/admin/InstanceSettingsTest.java Tue Jun 29 07:45:00 2010
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.admin;
+package org.apache.karaf.admin;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import junit.framework.TestCase;
-import org.apache.felix.karaf.admin.InstanceSettings;
+import org.apache.karaf.admin.InstanceSettings;
import org.junit.Assert;
public class InstanceSettingsTest extends TestCase {
Modified: karaf/trunk/admin/core/src/test/java/org/apache/karaf/admin/internal/AdminServiceImplTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/core/src/test/java/org/apache/karaf/admin/internal/AdminServiceImplTest.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/admin/core/src/test/java/org/apache/karaf/admin/internal/AdminServiceImplTest.java (original)
+++ karaf/trunk/admin/core/src/test/java/org/apache/karaf/admin/internal/AdminServiceImplTest.java Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.admin.internal;
+package org.apache.karaf.admin.internal;
import java.io.File;
import java.io.FileInputStream;
@@ -26,8 +26,8 @@ import java.util.Arrays;
import java.util.Properties;
import junit.framework.TestCase;
-import org.apache.felix.karaf.admin.Instance;
-import org.apache.felix.karaf.admin.InstanceSettings;
+import org.apache.karaf.admin.Instance;
+import org.apache.karaf.admin.InstanceSettings;
public class AdminServiceImplTest extends TestCase {
@@ -80,10 +80,10 @@ public class AdminServiceImplTest extend
assertFileExists(instance.getLocation(), "etc/startup.properties");
assertFileExists(instance.getLocation(), "etc/java.util.logging.properties");
- assertFileExists(instance.getLocation(), "etc/org.apache.felix.karaf.features.cfg");
+ assertFileExists(instance.getLocation(), "etc/org.apache.karaf.features.cfg");
assertFileExists(instance.getLocation(), "etc/org.apache.felix.fileinstall-deploy.cfg");
- assertFileExists(instance.getLocation(), "etc/org.apache.felix.karaf.log.cfg");
- assertFileExists(instance.getLocation(), "etc/org.apache.felix.karaf.management.cfg");
+ assertFileExists(instance.getLocation(), "etc/org.apache.karaf.log.cfg");
+ assertFileExists(instance.getLocation(), "etc/org.apache.karaf.management.cfg");
assertFileExists(instance.getLocation(), "etc/org.ops4j.pax.logging.cfg");
assertFileExists(instance.getLocation(), "etc/org.ops4j.pax.url.mvn.cfg");
}
Modified: karaf/trunk/admin/core/src/test/java/org/apache/karaf/jpm/MainTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/core/src/test/java/org/apache/karaf/jpm/MainTest.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/admin/core/src/test/java/org/apache/karaf/jpm/MainTest.java (original)
+++ karaf/trunk/admin/core/src/test/java/org/apache/karaf/jpm/MainTest.java Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.jpm;
+package org.apache.karaf.jpm;
public class MainTest {
Modified: karaf/trunk/admin/core/src/test/java/org/apache/karaf/jpm/ProcessTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/core/src/test/java/org/apache/karaf/jpm/ProcessTest.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/admin/core/src/test/java/org/apache/karaf/jpm/ProcessTest.java (original)
+++ karaf/trunk/admin/core/src/test/java/org/apache/karaf/jpm/ProcessTest.java Tue Jun 29 07:45:00 2010
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.jpm;
+package org.apache.karaf.jpm;
import java.io.File;
import junit.framework.TestCase;
-import org.apache.felix.karaf.jpm.impl.ScriptUtils;
-import org.apache.felix.karaf.jpm.ProcessBuilder;
+import org.apache.karaf.jpm.impl.ScriptUtils;
+import org.apache.karaf.jpm.ProcessBuilder;
public class ProcessTest extends TestCase {
@@ -42,7 +42,7 @@ public class ProcessTest extends TestCas
System.err.println("Executing: " + command.toString());
ProcessBuilder builder = ProcessBuilderFactory.newInstance().newBuilder();
- org.apache.felix.karaf.jpm.Process p = builder.command(command.toString()).start();
+ org.apache.karaf.jpm.Process p = builder.command(command.toString()).start();
assertNotNull(p);
System.err.println("Process: " + p.getPid());
assertNotNull(p.getPid());
Modified: karaf/trunk/admin/management/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/management/pom.xml?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/admin/management/pom.xml (original)
+++ karaf/trunk/admin/management/pom.xml Tue Jun 29 07:45:00 2010
@@ -21,16 +21,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.felix.karaf.admin</groupId>
+ <groupId>org.apache.karaf.admin</groupId>
<artifactId>admin</artifactId>
<version>1.7.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.felix.karaf.admin</groupId>
- <artifactId>org.apache.felix.karaf.admin.management</artifactId>
+ <groupId>org.apache.karaf.admin</groupId>
+ <artifactId>org.apache.karaf.admin.management</artifactId>
<packaging>bundle</packaging>
<version>1.7.0-SNAPSHOT</version>
- <name>Apache Felix Karaf :: Admin Management</name>
+ <name>Apache Karaf :: Admin Management</name>
<properties>
<appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
@@ -50,13 +50,13 @@
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.admin</groupId>
- <artifactId>org.apache.felix.karaf.admin.core</artifactId>
+ <groupId>org.apache.karaf.admin</groupId>
+ <artifactId>org.apache.karaf.admin.core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf</groupId>
- <artifactId>org.apache.felix.karaf.management</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.management</artifactId>
</dependency>
<dependency>
@@ -85,10 +85,10 @@
javax.management.loading,
org.osgi.service.command,
org.apache.felix.gogo.commands,
- org.apache.felix.karaf.shell.console,
+ org.apache.karaf.shell.console,
*
</Import-Package>
- <Private-Package>org.apache.felix.karaf.admin.management.internal</Private-Package>
+ <Private-Package>org.apache.karaf.admin.management.internal</Private-Package>
<_versionpolicy>${bnd.version.policy}</_versionpolicy>
</instructions>
</configuration>
Modified: karaf/trunk/admin/management/src/main/java/org/apache/karaf/admin/management/AdminServiceMBean.java
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/management/src/main/java/org/apache/karaf/admin/management/AdminServiceMBean.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/admin/management/src/main/java/org/apache/karaf/admin/management/AdminServiceMBean.java (original)
+++ karaf/trunk/admin/management/src/main/java/org/apache/karaf/admin/management/AdminServiceMBean.java Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.admin.management;
+package org.apache.karaf.admin.management;
import javax.management.openmbean.TabularData;
Modified: karaf/trunk/admin/management/src/main/java/org/apache/karaf/admin/management/codec/JmxInstance.java
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/management/src/main/java/org/apache/karaf/admin/management/codec/JmxInstance.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/admin/management/src/main/java/org/apache/karaf/admin/management/codec/JmxInstance.java (original)
+++ karaf/trunk/admin/management/src/main/java/org/apache/karaf/admin/management/codec/JmxInstance.java Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.admin.management.codec;
+package org.apache.karaf.admin.management.codec;
import java.util.List;
@@ -28,8 +28,8 @@ import javax.management.openmbean.Tabula
import javax.management.openmbean.TabularDataSupport;
import javax.management.openmbean.TabularType;
-import org.apache.felix.karaf.admin.management.AdminServiceMBean;
-import org.apache.felix.karaf.admin.Instance;
+import org.apache.karaf.admin.management.AdminServiceMBean;
+import org.apache.karaf.admin.Instance;
public class JmxInstance {
static final CompositeType INSTANCE;
Modified: karaf/trunk/admin/management/src/main/java/org/apache/karaf/admin/management/internal/AdminServiceMBeanImpl.java
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/management/src/main/java/org/apache/karaf/admin/management/internal/AdminServiceMBeanImpl.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/admin/management/src/main/java/org/apache/karaf/admin/management/internal/AdminServiceMBeanImpl.java (original)
+++ karaf/trunk/admin/management/src/main/java/org/apache/karaf/admin/management/internal/AdminServiceMBeanImpl.java Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.admin.management.internal;
+package org.apache.karaf.admin.management.internal;
import java.util.ArrayList;
import java.util.Arrays;
@@ -24,11 +24,11 @@ import javax.management.NotCompliantMBea
import javax.management.StandardMBean;
import javax.management.openmbean.TabularData;
-import org.apache.felix.karaf.admin.management.AdminServiceMBean;
-import org.apache.felix.karaf.admin.AdminService;
-import org.apache.felix.karaf.admin.Instance;
-import org.apache.felix.karaf.admin.InstanceSettings;
-import org.apache.felix.karaf.admin.management.codec.JmxInstance;
+import org.apache.karaf.admin.management.AdminServiceMBean;
+import org.apache.karaf.admin.AdminService;
+import org.apache.karaf.admin.Instance;
+import org.apache.karaf.admin.InstanceSettings;
+import org.apache.karaf.admin.management.codec.JmxInstance;
public class AdminServiceMBeanImpl extends StandardMBean implements AdminServiceMBean {
Modified: karaf/trunk/admin/management/src/main/resources/OSGI-INF/blueprint/admin-management.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/management/src/main/resources/OSGI-INF/blueprint/admin-management.xml?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/admin/management/src/main/resources/OSGI-INF/blueprint/admin-management.xml (original)
+++ karaf/trunk/admin/management/src/main/resources/OSGI-INF/blueprint/admin-management.xml Tue Jun 29 07:45:00 2010
@@ -19,20 +19,20 @@
-->
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
- <reference id="adminService" interface="org.apache.felix.karaf.admin.AdminService" />
+ <reference id="adminService" interface="org.apache.karaf.admin.AdminService" />
<reference id="mbeanServer" interface="javax.management.MBeanServer">
<reference-listener ref="mbeanRegister" bind-method="registerMBeanServer" unbind-method="unregisterMBeanServer" />
</reference>
- <bean id="mbeanImpl" class="org.apache.felix.karaf.admin.management.internal.AdminServiceMBeanImpl">
+ <bean id="mbeanImpl" class="org.apache.karaf.admin.management.internal.AdminServiceMBeanImpl">
<property name="adminService" ref="adminService" />
</bean>
- <bean id="mbeanRegister" class="org.apache.felix.karaf.management.MBeanRegistrer">
+ <bean id="mbeanRegister" class="org.apache.karaf.management.MBeanRegistrer">
<property name="mbeans">
<map>
- <entry value="org.apache.felix.karaf:type=admin,name=${karaf.name}"
+ <entry value="org.apache.karaf:type=admin,name=${karaf.name}"
key-ref="mbeanImpl" />
</map>
</property>
Modified: karaf/trunk/admin/management/src/test/java/org/apache/karaf/admin/management/codec/JmxInstanceTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/management/src/test/java/org/apache/karaf/admin/management/codec/JmxInstanceTest.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/admin/management/src/test/java/org/apache/karaf/admin/management/codec/JmxInstanceTest.java (original)
+++ karaf/trunk/admin/management/src/test/java/org/apache/karaf/admin/management/codec/JmxInstanceTest.java Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.admin.management.codec;
+package org.apache.karaf.admin.management.codec;
import java.util.Arrays;
import java.util.Collection;
@@ -27,8 +27,8 @@ import javax.management.openmbean.Tabula
import javax.management.openmbean.TabularType;
import junit.framework.TestCase;
-import org.apache.felix.karaf.admin.Instance;
-import org.apache.felix.karaf.admin.management.AdminServiceMBean;
+import org.apache.karaf.admin.Instance;
+import org.apache.karaf.admin.management.AdminServiceMBean;
import org.easymock.EasyMock;
import org.junit.Assert;
Modified: karaf/trunk/admin/management/src/test/java/org/apache/karaf/admin/management/internal/AdminServiceMBeanImplTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/management/src/test/java/org/apache/karaf/admin/management/internal/AdminServiceMBeanImplTest.java?rev=958856&r1=958851&r2=958856&view=diff
==============================================================================
--- karaf/trunk/admin/management/src/test/java/org/apache/karaf/admin/management/internal/AdminServiceMBeanImplTest.java (original)
+++ karaf/trunk/admin/management/src/test/java/org/apache/karaf/admin/management/internal/AdminServiceMBeanImplTest.java Tue Jun 29 07:45:00 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.karaf.admin.management.internal;
+package org.apache.karaf.admin.management.internal;
import java.util.Arrays;
import java.util.Collections;
@@ -23,9 +23,9 @@ import javax.management.openmbean.Compos
import javax.management.openmbean.TabularData;
import junit.framework.TestCase;
-import org.apache.felix.karaf.admin.AdminService;
-import org.apache.felix.karaf.admin.Instance;
-import org.apache.felix.karaf.admin.InstanceSettings;
+import org.apache.karaf.admin.AdminService;
+import org.apache.karaf.admin.Instance;
+import org.apache.karaf.admin.InstanceSettings;
import org.easymock.EasyMock;
import org.junit.Assert;
Modified: karaf/trunk/admin/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/pom.xml?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/admin/pom.xml (original)
+++ karaf/trunk/admin/pom.xml Tue Jun 29 07:45:00 2010
@@ -21,16 +21,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.felix.karaf</groupId>
+ <groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
<version>1.7.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.felix.karaf.admin</groupId>
+ <groupId>org.apache.karaf.admin</groupId>
<artifactId>admin</artifactId>
<packaging>pom</packaging>
<version>1.7.0-SNAPSHOT</version>
- <name>Apache Felix Karaf :: Admin</name>
+ <name>Apache Karaf :: Admin</name>
<modules>
<module>core</module>
Modified: karaf/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/pom.xml?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/assembly/pom.xml (original)
+++ karaf/trunk/assembly/pom.xml Tue Jun 29 07:45:00 2010
@@ -21,16 +21,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.felix.karaf</groupId>
+ <groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
<version>1.7.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.felix.karaf</groupId>
- <artifactId>apache-felix-karaf</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>apache-karaf</artifactId>
<packaging>pom</packaging>
<version>1.7.0-SNAPSHOT</version>
- <name>Apache Felix Karaf :: Assembly</name>
+ <name>Apache Karaf :: Assembly</name>
<properties>
<appendedResourcesDirectory>${basedir}/../etc/appended-resources</appendedResourcesDirectory>
@@ -38,118 +38,118 @@
<dependencies>
<dependency>
- <groupId>org.apache.felix.karaf</groupId>
+ <groupId>org.apache.karaf</groupId>
<artifactId>manual</artifactId>
<type>pdf</type>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf</groupId>
+ <groupId>org.apache.karaf</groupId>
<artifactId>manual</artifactId>
<type>html</type>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf</groupId>
- <artifactId>org.apache.felix.karaf.main</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.main</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf</groupId>
- <artifactId>org.apache.felix.karaf.exception</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.exception</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf</groupId>
- <artifactId>org.apache.felix.karaf.client</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.client</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.deployer</groupId>
- <artifactId>org.apache.felix.karaf.deployer.spring</artifactId>
+ <groupId>org.apache.karaf.deployer</groupId>
+ <artifactId>org.apache.karaf.deployer.spring</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.deployer</groupId>
- <artifactId>org.apache.felix.karaf.deployer.blueprint</artifactId>
+ <groupId>org.apache.karaf.deployer</groupId>
+ <artifactId>org.apache.karaf.deployer.blueprint</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.deployer</groupId>
- <artifactId>org.apache.felix.karaf.deployer.features</artifactId>
+ <groupId>org.apache.karaf.deployer</groupId>
+ <artifactId>org.apache.karaf.deployer.features</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.deployer</groupId>
- <artifactId>org.apache.felix.karaf.deployer.war</artifactId>
+ <groupId>org.apache.karaf.deployer</groupId>
+ <artifactId>org.apache.karaf.deployer.war</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.features</groupId>
- <artifactId>org.apache.felix.karaf.features.core</artifactId>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>org.apache.karaf.features.core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.features</groupId>
- <artifactId>org.apache.felix.karaf.features.command</artifactId>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>org.apache.karaf.features.command</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.features</groupId>
- <artifactId>org.apache.felix.karaf.features.management</artifactId>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>org.apache.karaf.features.management</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.admin</groupId>
- <artifactId>org.apache.felix.karaf.admin.core</artifactId>
+ <groupId>org.apache.karaf.admin</groupId>
+ <artifactId>org.apache.karaf.admin.core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.admin</groupId>
- <artifactId>org.apache.felix.karaf.admin.command</artifactId>
+ <groupId>org.apache.karaf.admin</groupId>
+ <artifactId>org.apache.karaf.admin.command</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.admin</groupId>
- <artifactId>org.apache.felix.karaf.admin.management</artifactId>
+ <groupId>org.apache.karaf.admin</groupId>
+ <artifactId>org.apache.karaf.admin.management</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.shell</groupId>
- <artifactId>org.apache.felix.karaf.shell.console</artifactId>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.console</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.shell</groupId>
- <artifactId>org.apache.felix.karaf.shell.obr</artifactId>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.obr</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.shell</groupId>
- <artifactId>org.apache.felix.karaf.shell.osgi</artifactId>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.osgi</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.shell</groupId>
- <artifactId>org.apache.felix.karaf.shell.log</artifactId>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.log</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.shell</groupId>
- <artifactId>org.apache.felix.karaf.shell.config</artifactId>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.config</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.shell</groupId>
- <artifactId>org.apache.felix.karaf.shell.packages</artifactId>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.packages</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.shell</groupId>
- <artifactId>org.apache.felix.karaf.shell.commands</artifactId>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.commands</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.shell</groupId>
- <artifactId>org.apache.felix.karaf.shell.ssh</artifactId>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.ssh</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.shell</groupId>
- <artifactId>org.apache.felix.karaf.shell.dev</artifactId>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.dev</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.jaas</groupId>
- <artifactId>org.apache.felix.karaf.jaas.boot</artifactId>
+ <groupId>org.apache.karaf.jaas</groupId>
+ <artifactId>org.apache.karaf.jaas.boot</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.jaas</groupId>
- <artifactId>org.apache.felix.karaf.jaas.config</artifactId>
+ <groupId>org.apache.karaf.jaas</groupId>
+ <artifactId>org.apache.karaf.jaas.config</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.jaas</groupId>
- <artifactId>org.apache.felix.karaf.jaas.modules</artifactId>
+ <groupId>org.apache.karaf.jaas</groupId>
+ <artifactId>org.apache.karaf.jaas.modules</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf</groupId>
- <artifactId>org.apache.felix.karaf.management</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.management</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.osgi</groupId>
@@ -338,32 +338,32 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>org.apache.felix.karaf</groupId>
- <artifactId>org.apache.felix.karaf.main</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.main</artifactId>
<outputDirectory>target/dependencies/lib</outputDirectory>
<destFileName>karaf.jar</destFileName>
</artifactItem>
<artifactItem>
- <groupId>org.apache.felix.karaf</groupId>
- <artifactId>org.apache.felix.karaf.client</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.client</artifactId>
<outputDirectory>target/dependencies/lib</outputDirectory>
<destFileName>karaf-client.jar</destFileName>
</artifactItem>
<artifactItem>
- <groupId>org.apache.felix.karaf.jaas</groupId>
- <artifactId>org.apache.felix.karaf.jaas.boot</artifactId>
+ <groupId>org.apache.karaf.jaas</groupId>
+ <artifactId>org.apache.karaf.jaas.boot</artifactId>
<outputDirectory>target/dependencies/lib</outputDirectory>
<destFileName>karaf-jaas-boot.jar</destFileName>
</artifactItem>
<artifactItem>
- <groupId>org.apache.felix.karaf</groupId>
+ <groupId>org.apache.karaf</groupId>
<artifactId>manual</artifactId>
<type>pdf</type>
<outputDirectory>target/dependencies</outputDirectory>
<destFileName>karaf-manual-${project.version}.pdf</destFileName>
</artifactItem>
<artifactItem>
- <groupId>org.apache.felix.karaf</groupId>
+ <groupId>org.apache.karaf</groupId>
<artifactId>manual</artifactId>
<type>html</type>
<outputDirectory>target/dependencies</outputDirectory>
Modified: karaf/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ karaf/trunk/assembly/src/main/descriptors/unix-bin.xml Tue Jun 29 07:45:00 2010
@@ -120,8 +120,8 @@
</file>
<file>
<source>${basedir}/target/classes/features.xml</source>
- <outputDirectory>/system/org/apache/felix/karaf/apache-felix-karaf/${project.version}</outputDirectory>
- <destName>apache-felix-karaf-${project.version}-features.xml</destName>
+ <outputDirectory>/system/org/apache/karaf/apache-karaf/${project.version}</outputDirectory>
+ <destName>apache-karaf-${project.version}-features.xml</destName>
<fileMode>0644</fileMode>
<lineEnding>unix</lineEnding>
</file>
@@ -133,7 +133,7 @@
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
<includes>
- <include>org.apache.felix.karaf:org.apache.felix.karaf.exception</include>
+ <include>org.apache.karaf:org.apache.karaf.exception</include>
</includes>
</dependencySet>
@@ -182,68 +182,68 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>org/apache/felix/karaf/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>org/apache/karaf/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
- <include>org.apache.felix.karaf:org.apache.felix.karaf.management</include>
+ <include>org.apache.karaf:org.apache.karaf.management</include>
</includes>
</dependencySet>
<dependencySet>
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>org/apache/felix/karaf/features/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>org/apache/karaf/features/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
- <include>org.apache.felix.karaf.features:org.apache.felix.karaf.features.core</include>
- <include>org.apache.felix.karaf.features:org.apache.felix.karaf.features.command</include>
- <include>org.apache.felix.karaf.features:org.apache.felix.karaf.features.management</include>
+ <include>org.apache.karaf.features:org.apache.karaf.features.core</include>
+ <include>org.apache.karaf.features:org.apache.karaf.features.command</include>
+ <include>org.apache.karaf.features:org.apache.karaf.features.management</include>
</includes>
</dependencySet>
<dependencySet>
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>org/apache/felix/karaf/admin/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>org/apache/karaf/admin/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
- <include>org.apache.felix.karaf.admin:org.apache.felix.karaf.admin.core</include>
- <include>org.apache.felix.karaf.admin:org.apache.felix.karaf.admin.command</include>
- <include>org.apache.felix.karaf.admin:org.apache.felix.karaf.admin.management</include>
+ <include>org.apache.karaf.admin:org.apache.karaf.admin.core</include>
+ <include>org.apache.karaf.admin:org.apache.karaf.admin.command</include>
+ <include>org.apache.karaf.admin:org.apache.karaf.admin.management</include>
</includes>
</dependencySet>
<dependencySet>
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>org/apache/felix/karaf/deployer/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>org/apache/karaf/deployer/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
- <include>org.apache.felix.karaf.deployer:org.apache.felix.karaf.deployer.spring</include>
- <include>org.apache.felix.karaf.deployer:org.apache.felix.karaf.deployer.blueprint</include>
- <include>org.apache.felix.karaf.deployer:org.apache.felix.karaf.deployer.features</include>
+ <include>org.apache.karaf.deployer:org.apache.karaf.deployer.spring</include>
+ <include>org.apache.karaf.deployer:org.apache.karaf.deployer.blueprint</include>
+ <include>org.apache.karaf.deployer:org.apache.karaf.deployer.features</include>
</includes>
</dependencySet>
<dependencySet>
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>org/apache/felix/karaf/shell/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>org/apache/karaf/shell/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
- <include>org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.console</include>
- <include>org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.dev</include>
- <include>org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.osgi</include>
- <include>org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.log</include>
- <include>org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.config</include>
- <include>org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.packages</include>
- <include>org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.ssh</include>
- <include>org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.commands</include>
+ <include>org.apache.karaf.shell:org.apache.karaf.shell.console</include>
+ <include>org.apache.karaf.shell:org.apache.karaf.shell.dev</include>
+ <include>org.apache.karaf.shell:org.apache.karaf.shell.osgi</include>
+ <include>org.apache.karaf.shell:org.apache.karaf.shell.log</include>
+ <include>org.apache.karaf.shell:org.apache.karaf.shell.config</include>
+ <include>org.apache.karaf.shell:org.apache.karaf.shell.packages</include>
+ <include>org.apache.karaf.shell:org.apache.karaf.shell.ssh</include>
+ <include>org.apache.karaf.shell:org.apache.karaf.shell.commands</include>
</includes>
</dependencySet>
<dependencySet>
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>org/apache/felix/karaf/jaas/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>org/apache/karaf/jaas/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
- <include>org.apache.felix.karaf.jaas:org.apache.felix.karaf.jaas.config</include>
- <include>org.apache.felix.karaf.jaas:org.apache.felix.karaf.jaas.modules</include>
+ <include>org.apache.karaf.jaas:org.apache.karaf.jaas.config</include>
+ <include>org.apache.karaf.jaas:org.apache.karaf.jaas.modules</include>
</includes>
</dependencySet>
<dependencySet>
Modified: karaf/trunk/assembly/src/main/descriptors/unix-src.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/descriptors/unix-src.xml?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/descriptors/unix-src.xml (original)
+++ karaf/trunk/assembly/src/main/descriptors/unix-src.xml Tue Jun 29 07:45:00 2010
@@ -54,7 +54,7 @@
<include>**/*.bin</include>
<include>**/*.jnilib</include>
<include>**/*.cert</include>
- <include>apache-felix-karaf/src/main/release/bin/*/wrapper</include>
+ <include>apache-karaf/src/main/release/bin/*/wrapper</include>
</includes>
<excludes>
<exclude>**/eclipse-classes/**</exclude>
@@ -84,7 +84,7 @@
<exclude>**/*.bin</exclude>
<exclude>**/*.jnilib</exclude>
<exclude>**/*.cert</exclude>
- <exclude>apache-felix-karaf/src/main/release/bin/*/wrapper</exclude>
+ <exclude>apache-karaf/src/main/release/bin/*/wrapper</exclude>
<exclude>**/target/**</exclude>
<exclude>**/build/**</exclude>
<exclude>activemq-data/**</exclude>
Modified: karaf/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ karaf/trunk/assembly/src/main/descriptors/windows-bin.xml Tue Jun 29 07:45:00 2010
@@ -112,8 +112,8 @@
</file>
<file>
<source>${basedir}/target/classes/features.xml</source>
- <outputDirectory>/system/org/apache/felix/karaf/apache-felix-karaf/${project.version}</outputDirectory>
- <destName>apache-felix-karaf-${project.version}-features.xml</destName>
+ <outputDirectory>/system/org/apache/karaf/apache-karaf/${project.version}</outputDirectory>
+ <destName>apache-karaf-${project.version}-features.xml</destName>
<fileMode>0644</fileMode>
<lineEnding>dos</lineEnding>
</file>
@@ -125,7 +125,7 @@
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
<includes>
- <include>org.apache.felix.karaf:org.apache.felix.karaf.exception</include>
+ <include>org.apache.karaf:org.apache.karaf.exception</include>
</includes>
</dependencySet>
@@ -174,68 +174,68 @@
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>org/apache/felix/karaf/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>org/apache/karaf/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
- <include>org.apache.felix.karaf:org.apache.felix.karaf.management</include>
+ <include>org.apache.karaf:org.apache.karaf.management</include>
</includes>
</dependencySet>
<dependencySet>
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>org/apache/felix/karaf/features/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>org/apache/karaf/features/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
- <include>org.apache.felix.karaf.features:org.apache.felix.karaf.features.core</include>
- <include>org.apache.felix.karaf.features:org.apache.felix.karaf.features.command</include>
- <include>org.apache.felix.karaf.features:org.apache.felix.karaf.features.management</include>
+ <include>org.apache.karaf.features:org.apache.karaf.features.core</include>
+ <include>org.apache.karaf.features:org.apache.karaf.features.command</include>
+ <include>org.apache.karaf.features:org.apache.karaf.features.management</include>
</includes>
</dependencySet>
<dependencySet>
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>org/apache/felix/karaf/admin/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>org/apache/karaf/admin/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
- <include>org.apache.felix.karaf.admin:org.apache.felix.karaf.admin.core</include>
- <include>org.apache.felix.karaf.admin:org.apache.felix.karaf.admin.command</include>
- <include>org.apache.felix.karaf.admin:org.apache.felix.karaf.admin.management</include>
+ <include>org.apache.karaf.admin:org.apache.karaf.admin.core</include>
+ <include>org.apache.karaf.admin:org.apache.karaf.admin.command</include>
+ <include>org.apache.karaf.admin:org.apache.karaf.admin.management</include>
</includes>
</dependencySet>
<dependencySet>
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>org/apache/felix/karaf/deployer/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>org/apache/karaf/deployer/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
- <include>org.apache.felix.karaf.deployer:org.apache.felix.karaf.deployer.spring</include>
- <include>org.apache.felix.karaf.deployer:org.apache.felix.karaf.deployer.blueprint</include>
- <include>org.apache.felix.karaf.deployer:org.apache.felix.karaf.deployer.features</include>
+ <include>org.apache.karaf.deployer:org.apache.karaf.deployer.spring</include>
+ <include>org.apache.karaf.deployer:org.apache.karaf.deployer.blueprint</include>
+ <include>org.apache.karaf.deployer:org.apache.karaf.deployer.features</include>
</includes>
</dependencySet>
<dependencySet>
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>org/apache/felix/karaf/shell/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>org/apache/karaf/shell/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
- <include>org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.console</include>
- <include>org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.dev</include>
- <include>org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.osgi</include>
- <include>org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.log</include>
- <include>org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.config</include>
- <include>org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.packages</include>
- <include>org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.ssh</include>
- <include>org.apache.felix.karaf.shell:org.apache.felix.karaf.shell.commands</include>
+ <include>org.apache.karaf.shell:org.apache.karaf.shell.console</include>
+ <include>org.apache.karaf.shell:org.apache.karaf.shell.dev</include>
+ <include>org.apache.karaf.shell:org.apache.karaf.shell.osgi</include>
+ <include>org.apache.karaf.shell:org.apache.karaf.shell.log</include>
+ <include>org.apache.karaf.shell:org.apache.karaf.shell.config</include>
+ <include>org.apache.karaf.shell:org.apache.karaf.shell.packages</include>
+ <include>org.apache.karaf.shell:org.apache.karaf.shell.ssh</include>
+ <include>org.apache.karaf.shell:org.apache.karaf.shell.commands</include>
</includes>
</dependencySet>
<dependencySet>
<outputDirectory>/system</outputDirectory>
<unpack>false</unpack>
<useProjectArtifact>false</useProjectArtifact>
- <outputFileNameMapping>org/apache/felix/karaf/jaas/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>org/apache/karaf/jaas/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
- <include>org.apache.felix.karaf.jaas:org.apache.felix.karaf.jaas.config</include>
- <include>org.apache.felix.karaf.jaas:org.apache.felix.karaf.jaas.modules</include>
+ <include>org.apache.karaf.jaas:org.apache.karaf.jaas.config</include>
+ <include>org.apache.karaf.jaas:org.apache.karaf.jaas.modules</include>
</includes>
</dependencySet>
<dependencySet>
Modified: karaf/trunk/assembly/src/main/descriptors/windows-src.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/descriptors/windows-src.xml?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/descriptors/windows-src.xml (original)
+++ karaf/trunk/assembly/src/main/descriptors/windows-src.xml Tue Jun 29 07:45:00 2010
@@ -54,7 +54,7 @@
<include>**/*.bin</include>
<include>**/*.jnilib</include>
<include>**/*.cert</include>
- <include>apache-felix-karaf/src/main/release/bin/*/wrapper</include>
+ <include>apache-karaf/src/main/release/bin/*/wrapper</include>
</includes>
<excludes>
<exclude>**/eclipse-classes/**</exclude>
@@ -84,7 +84,7 @@
<exclude>**/*.bin</exclude>
<exclude>**/*.jnilib</exclude>
<exclude>**/*.cert</exclude>
- <exclude>apache-felix-karaf/src/main/release/bin/*/wrapper</exclude>
+ <exclude>apache-karaf/src/main/release/bin/*/wrapper</exclude>
<exclude>**/target/**</exclude>
<exclude>**/build/**</exclude>
Modified: karaf/trunk/assembly/src/main/distribution/text/deploy/README
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/distribution/text/deploy/README?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/distribution/text/deploy/README (original)
+++ karaf/trunk/assembly/src/main/distribution/text/deploy/README Tue Jun 29 07:45:00 2010
@@ -15,4 +15,4 @@
* limitations under the License.
*/
-This folder can be used to deploy artifacts into the OSGi framework.
\ No newline at end of file
+This folder can be used to deploy artifacts into the OSGi framework.
Modified: karaf/trunk/assembly/src/main/distribution/text/lib/README
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/distribution/text/lib/README?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/distribution/text/lib/README (original)
+++ karaf/trunk/assembly/src/main/distribution/text/lib/README Tue Jun 29 07:45:00 2010
@@ -24,4 +24,4 @@ unless one of the org.osgi.framework.sys
org.osgi.framework.bootdelegation property in the etc/config.properties file
is modified to export or delegate the packages.
Please refer to the OSGi Core Specification for more informations on those
-properties and the OSGi classloading mechanism.
\ No newline at end of file
+properties and the OSGi classloading mechanism.
Modified: karaf/trunk/assembly/src/main/distribution/text/lib/endorsed/README
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/distribution/text/lib/endorsed/README?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/distribution/text/lib/endorsed/README (original)
+++ karaf/trunk/assembly/src/main/distribution/text/lib/endorsed/README Tue Jun 29 07:45:00 2010
@@ -20,4 +20,4 @@
This directory is the java endorsed directory.
Any jar in this folder will be used to override classes defined by the JVM.
For more informations, see:
- http://java.sun.com/j2se/1.5.0/docs/guide/standards/
\ No newline at end of file
+ http://java.sun.com/j2se/1.5.0/docs/guide/standards/
Modified: karaf/trunk/assembly/src/main/distribution/text/lib/ext/README
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/distribution/text/lib/ext/README?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/distribution/text/lib/ext/README (original)
+++ karaf/trunk/assembly/src/main/distribution/text/lib/ext/README Tue Jun 29 07:45:00 2010
@@ -20,4 +20,4 @@
This directory is the java extension directory.
Any jar in this folder will be used as a JVM extension.
For more informations, see
- http://java.sun.com/j2se/1.5.0/docs/guide/extensions/spec.html
\ No newline at end of file
+ http://java.sun.com/j2se/1.5.0/docs/guide/extensions/spec.html
Modified: karaf/trunk/assembly/src/main/distribution/unix-shell/bin/karaf
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/distribution/unix-shell/bin/karaf?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/distribution/unix-shell/bin/karaf (original)
+++ karaf/trunk/assembly/src/main/distribution/unix-shell/bin/karaf Tue Jun 29 07:45:00 2010
@@ -290,10 +290,10 @@ init() {
run() {
OPTS="-Dkaraf.startLocalConsole=true -Dkaraf.startRemoteShell=true"
- MAIN=org.apache.felix.karaf.main.Main
+ MAIN=org.apache.karaf.main.Main
case "$1" in
'stop')
- MAIN=org.apache.felix.karaf.main.Stop
+ MAIN=org.apache.karaf.main.Stop
shift
;;
'console')
Modified: karaf/trunk/assembly/src/main/distribution/windows-text/bin/karaf.bat
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/distribution/windows-text/bin/karaf.bat?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/distribution/windows-text/bin/karaf.bat (original)
+++ karaf/trunk/assembly/src/main/distribution/windows-text/bin/karaf.bat Tue Jun 29 07:45:00 2010
@@ -196,7 +196,7 @@ if "%KARAF_PROFILER%" == "" goto :RUN
:RUN
SET OPTS=-Dkaraf.startLocalConsole=true -Dkaraf.startRemoteShell=true
- SET MAIN=org.apache.felix.karaf.main.Main
+ SET MAIN=org.apache.karaf.main.Main
SET SHIFT=false
if "%1" == "stop" goto :EXECUTE_STOP
if "%1" == "console" goto :EXECUTE_CONSOLE
@@ -205,7 +205,7 @@ if "%KARAF_PROFILER%" == "" goto :RUN
goto :EXECUTE
:EXECUTE_STOP
- SET MAIN=org.apache.felix.karaf.main.Stop
+ SET MAIN=org.apache.karaf.main.Stop
SET SHIFT=true
goto :EXECUTE
Modified: karaf/trunk/assembly/src/main/distribution/windows-text/bin/start.bat
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/distribution/windows-text/bin/start.bat?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/distribution/windows-text/bin/start.bat (original)
+++ karaf/trunk/assembly/src/main/distribution/windows-text/bin/start.bat Tue Jun 29 07:45:00 2010
@@ -69,4 +69,4 @@ endlocal
if not "%PAUSE%" == "" pause
-:END_NO_PAUSE
\ No newline at end of file
+:END_NO_PAUSE
Modified: karaf/trunk/assembly/src/main/distribution/windows-text/bin/stop.bat
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/distribution/windows-text/bin/stop.bat?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/distribution/windows-text/bin/stop.bat (original)
+++ karaf/trunk/assembly/src/main/distribution/windows-text/bin/stop.bat Tue Jun 29 07:45:00 2010
@@ -69,4 +69,4 @@ endlocal
if not "%PAUSE%" == "" pause
-:END_NO_PAUSE
\ No newline at end of file
+:END_NO_PAUSE
Modified: karaf/trunk/assembly/src/main/filtered-resources/bin/admin
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/filtered-resources/bin/admin?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/filtered-resources/bin/admin (original)
+++ karaf/trunk/assembly/src/main/filtered-resources/bin/admin Tue Jun 29 07:45:00 2010
@@ -271,9 +271,9 @@ run() {
CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
fi
- CLASSPATH=${KARAF_HOME}/system/org/apache/felix/karaf/admin/org.apache.felix.karaf.admin.command/${project.version}/org.apache.felix.karaf.admin.command-${project.version}.jar:${KARAF_HOME}/system/org/apache/felix/karaf/admin/org.apache.felix.karaf.admin.core/${project.version}/org.apache.felix.karaf.admin.core-${project.version}.jar:${KARAF_HOME}/system/org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.console/${project.version}/org.apache.felix.karaf.shell.console-${project.version}.jar:${KARAF_HOME}/system/org/apache/felix/gogo/org.apache.felix.gogo.runtime/${felix.gogo.version}/org.apache.felix.gogo.runtime-${felix.gogo.version}.jar:${KARAF_HOME}/system/org/apache/aries/blueprint/org.apache.aries.blueprint/${aries.blueprint.version}/org.apache.aries.blueprint-${aries.blueprint.version}.jar:${KARAF_HOME}/system/org/ops4j/pax/logging/pax-logging-api/${pax.logging.version}/pax-logging-api-${pax.logging.version}.jar:${KARAF_HOME}/system/org/apache/felix/org.apach
e.felix.framework/${felix.framework.version}/org.apache.felix.framework-${felix.framework.version}.jar
+ CLASSPATH=${KARAF_HOME}/system/org/apache/karaf/admin/org.apache.karaf.admin.command/${project.version}/org.apache.karaf.admin.command-${project.version}.jar:${KARAF_HOME}/system/org/apache/karaf/admin/org.apache.karaf.admin.core/${project.version}/org.apache.karaf.admin.core-${project.version}.jar:${KARAF_HOME}/system/org/apache/karaf/shell/org.apache.karaf.shell.console/${project.version}/org.apache.karaf.shell.console-${project.version}.jar:${KARAF_HOME}/system/org/apache/felix/gogo/org.apache.felix.gogo.runtime/${felix.gogo.version}/org.apache.felix.gogo.runtime-${felix.gogo.version}.jar:${KARAF_HOME}/system/org/apache/aries/blueprint/org.apache.aries.blueprint/${aries.blueprint.version}/org.apache.aries.blueprint-${aries.blueprint.version}.jar:${KARAF_HOME}/system/org/ops4j/pax/logging/pax-logging-api/${pax.logging.version}/pax-logging-api-${pax.logging.version}.jar:${KARAF_HOME}/system/org/apache/felix/org.apache.felix.framework/${felix.framework.version}/org.apach
e.felix.framework-${felix.framework.version}.jar
- exec $JAVA $JAVA_OPTS -Dstorage.location="${KARAF_HOME}/instances" -Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE" -Djava.util.logging.config.file=$KARAF_BASE/etc/java.util.logging.properties $OPTS -classpath "$CLASSPATH" org.apache.felix.karaf.admin.main.Execute "$@"
+ exec $JAVA $JAVA_OPTS -Dstorage.location="${KARAF_HOME}/instances" -Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE" -Djava.util.logging.config.file=$KARAF_BASE/etc/java.util.logging.properties $OPTS -classpath "$CLASSPATH" org.apache.karaf.admin.main.Execute "$@"
}
main() {
Modified: karaf/trunk/assembly/src/main/filtered-resources/bin/admin.bat
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/filtered-resources/bin/admin.bat?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/filtered-resources/bin/admin.bat (original)
+++ karaf/trunk/assembly/src/main/filtered-resources/bin/admin.bat Tue Jun 29 07:45:00 2010
@@ -81,13 +81,13 @@ if "%KARAF_DEBUG%" == "" goto :KARAF_DEB
call :warn Enabling Java debug options: %JAVA_DEBUG_OPTS%
:KARAF_DEBUG_END
-set CLASSPATH=%KARAF_HOME%\system\org\apache\felix\karaf\admin\org.apache.felix.karaf.admin.command\${project.version}\org.apache.felix.karaf.admin.command-${project.version}.jar;%KARAF_HOME%\system\org\apache\felix\karaf\admin\org.apache.felix.karaf.admin.core\${project.version}\org.apache.felix.karaf.admin.core-${project.version}.jar;%KARAF_HOME%\system\org\apache\felix\karaf\shell\org.apache.felix.karaf.shell.console\${project.version}\org.apache.felix.karaf.shell.console-${project.version}.jar;%KARAF_HOME%\system\org\apache\felix\gogo\org.apache.felix.gogo.runtime\${felix.gogo.version}\org.apache.felix.gogo.runtime-${felix.gogo.version}.jar;%KARAF_HOME%\system\org\apache\aries\blueprint\org.apache.aries.blueprint\${aries.blueprint.version}\org.apache.aries.blueprint-${aries.blueprint.version}.jar;%KARAF_HOME%\system\org\ops4j\pax\logging\pax-logging-api\${pax.logging.version}\pax-logging-api-${pax.logging.version}.jar;%KARAF_HOME%\system\org\apache\felix\org.apache.felix
.framework\${felix.framework.version}\org.apache.felix.framework-${felix.framework.version}.jar
+set CLASSPATH=%KARAF_HOME%\system\org\apache\felix\karaf\admin\org.apache.karaf.admin.command\${project.version}\org.apache.karaf.admin.command-${project.version}.jar;%KARAF_HOME%\system\org\apache\felix\karaf\admin\org.apache.karaf.admin.core\${project.version}\org.apache.karaf.admin.core-${project.version}.jar;%KARAF_HOME%\system\org\apache\felix\karaf\shell\org.apache.karaf.shell.console\${project.version}\org.apache.karaf.shell.console-${project.version}.jar;%KARAF_HOME%\system\org\apache\felix\gogo\org.apache.felix.gogo.runtime\${felix.gogo.version}\org.apache.felix.gogo.runtime-${felix.gogo.version}.jar;%KARAF_HOME%\system\org\apache\aries\blueprint\org.apache.aries.blueprint\${aries.blueprint.version}\org.apache.aries.blueprint-${aries.blueprint.version}.jar;%KARAF_HOME%\system\org\ops4j\pax\logging\pax-logging-api\${pax.logging.version}\pax-logging-api-${pax.logging.version}.jar;%KARAF_HOME%\system\org\apache\felix\org.apache.felix.framework\${felix.framework.version
}\org.apache.felix.framework-${felix.framework.version}.jar
:EXECUTE
if "%SHIFT%" == "true" SET ARGS=%2 %3 %4 %5 %6 %7 %8
if not "%SHIFT%" == "true" SET ARGS=%1 %2 %3 %4 %5 %6 %7 %8
rem Execute the Java Virtual Machine
- "%JAVA%" %JAVA_OPTS% %OPTS% -classpath "%CLASSPATH%" -Dstorage.location="%KARAF_HOME%\instances" -Dkaraf.home="%KARAF_HOME%" -Dkaraf.base="%KARAF_BASE%" -Djava.util.logging.config.file="%KARAF_BASE%\etc\java.util.logging.properties" org.apache.felix.karaf.admin.main.Execute %ARGS%
+ "%JAVA%" %JAVA_OPTS% %OPTS% -classpath "%CLASSPATH%" -Dstorage.location="%KARAF_HOME%\instances" -Dkaraf.home="%KARAF_HOME%" -Dkaraf.base="%KARAF_BASE%" -Djava.util.logging.config.file="%KARAF_BASE%\etc\java.util.logging.properties" org.apache.karaf.admin.main.Execute %ARGS%
rem # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
Modified: karaf/trunk/assembly/src/main/filtered-resources/demos/web/README.txt
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/filtered-resources/demos/web/README.txt?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/filtered-resources/demos/web/README.txt (original)
+++ karaf/trunk/assembly/src/main/filtered-resources/demos/web/README.txt Tue Jun 29 07:45:00 2010
@@ -66,7 +66,7 @@ you should see the following printed to
Running a Client
----------------
-To test the example, you can use the Apache Felix Karaf client
+To test the example, you can use the Apache Karaf client
to connect to the server and issue a Karaf command. For example,
try executing the "features:list" command as follows:
@@ -105,5 +105,5 @@ container, by completing the following s
Maven builds the web application, web-${project.version}.war, and
saves it in the target directory of this example. Deploy this
WAR file to your favorite web container. Once the application
-is running, you can test it using the Apache Felix Karaf client
+is running, you can test it using the Apache Karaf client
as described in the "Running a Client" section above.
Modified: karaf/trunk/assembly/src/main/filtered-resources/etc/config.properties
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/filtered-resources/etc/config.properties?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/filtered-resources/etc/config.properties (original)
+++ karaf/trunk/assembly/src/main/filtered-resources/etc/config.properties Tue Jun 29 07:45:00 2010
@@ -41,8 +41,8 @@ org.osgi.framework.system.packages=org.o
${jre-${java.specification.version}}
org.osgi.framework.system.packages.extra=\
- org.apache.felix.karaf.jaas.boot; version=${karaf.osgi.version}, \
- org.apache.felix.karaf.version; version=${karaf.osgi.version}
+ org.apache.karaf.jaas.boot; version=${karaf.osgi.version}, \
+ org.apache.karaf.version; version=${karaf.osgi.version}
# javax.transaction is needed to avoid class loader constraint violation when using javax.sql
org.osgi.framework.bootdelegation=sun.*,com.sun.*,javax.transaction,javax.transaction.*
Copied: karaf/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg (from r958851, karaf/trunk/assembly/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg)
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg?p2=karaf/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg&p1=karaf/trunk/assembly/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg&r1=958851&r2=958856&rev=958856&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg (original)
+++ karaf/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg Tue Jun 29 07:45:00 2010
@@ -20,7 +20,7 @@
#
# Comma separated list of features repositories to register by default
#
-featuresRepositories=mvn:org.apache.felix.karaf/apache-felix-karaf/${project.version}/xml/features
+featuresRepositories=mvn:org.apache.karaf/apache-karaf/${project.version}/xml/features
#
# Comma separated list of features to install at startup
Modified: karaf/trunk/assembly/src/main/filtered-resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/filtered-resources/etc/startup.properties?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/filtered-resources/etc/startup.properties (original)
+++ karaf/trunk/assembly/src/main/filtered-resources/etc/startup.properties Tue Jun 29 07:45:00 2010
@@ -37,29 +37,29 @@ org/apache/felix/org.apache.felix.filein
org/apache/aries/blueprint/org.apache.aries.blueprint/${aries.blueprint.version}/org.apache.aries.blueprint-${aries.blueprint.version}.jar=20
org/apache/felix/gogo/org.apache.felix.gogo.runtime/${felix.gogo.version}/org.apache.felix.gogo.runtime-${felix.gogo.version}.jar=30
-org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.console/${project.version}/org.apache.felix.karaf.shell.console-${project.version}.jar=30
-org/apache/felix/karaf/deployer/org.apache.felix.karaf.deployer.spring/${project.version}/org.apache.felix.karaf.deployer.spring-${project.version}.jar=30
-org/apache/felix/karaf/deployer/org.apache.felix.karaf.deployer.blueprint/${project.version}/org.apache.felix.karaf.deployer.blueprint-${project.version}.jar=30
-org/apache/felix/karaf/deployer/org.apache.felix.karaf.deployer.features/${project.version}/org.apache.felix.karaf.deployer.features-${project.version}.jar=30
-org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.osgi/${project.version}/org.apache.felix.karaf.shell.osgi-${project.version}.jar=30
-org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.log/${project.version}/org.apache.felix.karaf.shell.log-${project.version}.jar=30
-org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.config/${project.version}/org.apache.felix.karaf.shell.config-${project.version}.jar=30
-org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.packages/${project.version}/org.apache.felix.karaf.shell.packages-${project.version}.jar=30
-org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.commands/${project.version}/org.apache.felix.karaf.shell.commands-${project.version}.jar=30
-org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.dev/${project.version}/org.apache.felix.karaf.shell.dev-${project.version}.jar=30
-org/apache/felix/karaf/jaas/org.apache.felix.karaf.jaas.config/${project.version}/org.apache.felix.karaf.jaas.config-${project.version}.jar=30
-org/apache/felix/karaf/jaas/org.apache.felix.karaf.jaas.modules/${project.version}/org.apache.felix.karaf.jaas.modules-${project.version}.jar=30
-org/apache/felix/karaf/admin/org.apache.felix.karaf.admin.core/${project.version}/org.apache.felix.karaf.admin.core-${project.version}.jar=30
-org/apache/felix/karaf/admin/org.apache.felix.karaf.admin.command/${project.version}/org.apache.felix.karaf.admin.command-${project.version}.jar=30
-org/apache/felix/karaf/admin/org.apache.felix.karaf.admin.management/${project.version}/org.apache.felix.karaf.admin.management-${project.version}.jar=30
-org/apache/felix/karaf/features/org.apache.felix.karaf.features.core/${project.version}/org.apache.felix.karaf.features.core-${project.version}.jar=30
-org/apache/felix/karaf/features/org.apache.felix.karaf.features.command/${project.version}/org.apache.felix.karaf.features.command-${project.version}.jar=30
-org/apache/felix/karaf/features/org.apache.felix.karaf.features.management/${project.version}/org.apache.felix.karaf.features.management-${project.version}.jar=30
+org/apache/karaf/shell/org.apache.karaf.shell.console/${project.version}/org.apache.karaf.shell.console-${project.version}.jar=30
+org/apache/karaf/deployer/org.apache.karaf.deployer.spring/${project.version}/org.apache.karaf.deployer.spring-${project.version}.jar=30
+org/apache/karaf/deployer/org.apache.karaf.deployer.blueprint/${project.version}/org.apache.karaf.deployer.blueprint-${project.version}.jar=30
+org/apache/karaf/deployer/org.apache.karaf.deployer.features/${project.version}/org.apache.karaf.deployer.features-${project.version}.jar=30
+org/apache/karaf/shell/org.apache.karaf.shell.osgi/${project.version}/org.apache.karaf.shell.osgi-${project.version}.jar=30
+org/apache/karaf/shell/org.apache.karaf.shell.log/${project.version}/org.apache.karaf.shell.log-${project.version}.jar=30
+org/apache/karaf/shell/org.apache.karaf.shell.config/${project.version}/org.apache.karaf.shell.config-${project.version}.jar=30
+org/apache/karaf/shell/org.apache.karaf.shell.packages/${project.version}/org.apache.karaf.shell.packages-${project.version}.jar=30
+org/apache/karaf/shell/org.apache.karaf.shell.commands/${project.version}/org.apache.karaf.shell.commands-${project.version}.jar=30
+org/apache/karaf/shell/org.apache.karaf.shell.dev/${project.version}/org.apache.karaf.shell.dev-${project.version}.jar=30
+org/apache/karaf/jaas/org.apache.karaf.jaas.config/${project.version}/org.apache.karaf.jaas.config-${project.version}.jar=30
+org/apache/karaf/jaas/org.apache.karaf.jaas.modules/${project.version}/org.apache.karaf.jaas.modules-${project.version}.jar=30
+org/apache/karaf/admin/org.apache.karaf.admin.core/${project.version}/org.apache.karaf.admin.core-${project.version}.jar=30
+org/apache/karaf/admin/org.apache.karaf.admin.command/${project.version}/org.apache.karaf.admin.command-${project.version}.jar=30
+org/apache/karaf/admin/org.apache.karaf.admin.management/${project.version}/org.apache.karaf.admin.management-${project.version}.jar=30
+org/apache/karaf/features/org.apache.karaf.features.core/${project.version}/org.apache.karaf.features.core-${project.version}.jar=30
+org/apache/karaf/features/org.apache.karaf.features.command/${project.version}/org.apache.karaf.features.command-${project.version}.jar=30
+org/apache/karaf/features/org.apache.karaf.features.management/${project.version}/org.apache.karaf.features.management-${project.version}.jar=30
-org/apache/felix/karaf/org.apache.felix.karaf.management/${project.version}/org.apache.felix.karaf.management-${project.version}.jar=30
+org/apache/karaf/org.apache.karaf.management/${project.version}/org.apache.karaf.management-${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
org/apache/mina/mina-core/${mina.version}/mina-core-${mina.version}.jar=30
org/apache/sshd/sshd-core/${sshd.version}/sshd-core-${sshd.version}.jar=30
-org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.ssh/${project.version}/org.apache.felix.karaf.shell.ssh-${project.version}.jar=30
+org/apache/karaf/shell/org.apache.karaf.shell.ssh/${project.version}/org.apache.karaf.shell.ssh-${project.version}.jar=30
Modified: karaf/trunk/assembly/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/filtered-resources/features.xml?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/filtered-resources/features.xml (original)
+++ karaf/trunk/assembly/src/main/filtered-resources/features.xml Tue Jun 29 07:45:00 2010
@@ -32,14 +32,14 @@
<bundle>mvn:org.springframework.osgi/spring-osgi-core/${spring.osgi.version}</bundle>
<bundle>mvn:org.springframework.osgi/spring-osgi-extender/${spring.osgi.version}</bundle>
<bundle>mvn:org.springframework.osgi/spring-osgi-annotation/${spring.osgi.version}</bundle>
- <bundle>mvn:org.apache.felix.karaf.deployer/org.apache.felix.karaf.deployer.spring/${project.version}</bundle>
+ <bundle>mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.spring/${project.version}</bundle>
</feature>
<feature name="wrapper" version="${project.version}">
- <bundle>mvn:org.apache.felix.karaf.shell/org.apache.felix.karaf.shell.wrapper/${project.version}</bundle>
+ <bundle>mvn:org.apache.karaf.shell/org.apache.karaf.shell.wrapper/${project.version}</bundle>
</feature>
<feature name="obr" version="${project.version}">
<bundle>mvn:org.apache.felix/org.apache.felix.bundlerepository/${felix.bundlerepository.version}</bundle>
- <bundle>mvn:org.apache.felix.karaf.shell/org.apache.felix.karaf.shell.obr/${project.version}</bundle>
+ <bundle>mvn:org.apache.karaf.shell/org.apache.karaf.shell.obr/${project.version}</bundle>
</feature>
<feature name="http" version="${project.version}">
<config name="org.ops4j.pax.web">
@@ -58,32 +58,32 @@
<bundle>mvn:org.ops4j.pax.web/pax-web-extender-war/${pax.web.version}</bundle>
<bundle>mvn:org.ops4j.pax.web/pax-web-extender-whiteboard/${pax.web.version}</bundle>
<bundle>mvn:org.ops4j.pax.url/pax-url-war/${pax.url.version}</bundle>
- <bundle>mvn:org.apache.felix.karaf.deployer/org.apache.felix.karaf.deployer.war/${project.version}</bundle>
+ <bundle>mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.war/${project.version}</bundle>
</feature>
<feature name="webconsole" version="${project.version}">
<feature version="${project.version}">http</feature>
- <config name="org.apache.felix.karaf.webconsole">
+ <config name="org.apache.karaf.webconsole">
realm=karaf
</config>
<bundle>mvn:org.apache.felix/org.apache.felix.metatype/${felix.metatype.version}</bundle>
- <bundle>mvn:org.apache.felix.karaf.webconsole/org.apache.felix.karaf.webconsole.branding/${project.version}</bundle>
+ <bundle>mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.branding/${project.version}</bundle>
<bundle>mvn:org.apache.felix/org.apache.felix.webconsole/${felix.webconsole.version}</bundle>
- <bundle>mvn:org.apache.felix.karaf.webconsole/org.apache.felix.karaf.webconsole.admin/${project.version}</bundle>
- <bundle>mvn:org.apache.felix.karaf.webconsole/org.apache.felix.karaf.webconsole.features/${project.version}</bundle>
- <bundle>mvn:org.apache.felix.karaf.webconsole/org.apache.felix.karaf.webconsole.gogo/${project.version}</bundle>
+ <bundle>mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.admin/${project.version}</bundle>
+ <bundle>mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.features/${project.version}</bundle>
+ <bundle>mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.gogo/${project.version}</bundle>
</feature>
<feature name="ssh" version="${project.version}">
- <config name="org.apache.felix.karaf.shell.ssh">
+ <config name="org.apache.karaf.shell.ssh">
sshPort=8101
sshHost=0.0.0.0
sshRealm=karaf
</config>
<bundle>mvn:org.apache.mina/mina-core/${mina.version}</bundle>
<bundle>mvn:org.apache.sshd/sshd-core/${sshd.version}</bundle>
- <bundle>mvn:org.apache.felix.karaf.shell/org.apache.felix.karaf.shell.ssh/${project.version}</bundle>
+ <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.felix.karaf/org.apache.felix.karaf.management/${project.version}</bundle>
+ <bundle>mvn:org.apache.karaf/org.apache.karaf.management/${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/trunk/client/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/client/pom.xml?rev=958856&r1=958855&r2=958856&view=diff
==============================================================================
--- karaf/trunk/client/pom.xml (original)
+++ karaf/trunk/client/pom.xml Tue Jun 29 07:45:00 2010
@@ -21,16 +21,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.felix.karaf</groupId>
+ <groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
<version>1.7.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.felix.karaf</groupId>
- <artifactId>org.apache.felix.karaf.client</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.client</artifactId>
<packaging>bundle</packaging>
<version>1.7.0-SNAPSHOT</version>
- <name>Apache Felix Karaf :: Client</name>
+ <name>Apache Karaf :: Client</name>
<properties>
<appendedResourcesDirectory>${basedir}/../etc/appended-resources</appendedResourcesDirectory>
@@ -42,8 +42,8 @@
<artifactId>sshd-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix.karaf.shell</groupId>
- <artifactId>org.apache.felix.karaf.shell.console</artifactId>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.console</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -62,17 +62,17 @@
<configuration>
<instructions>
<_donotcopy>(CVS|.svn|config.properties)</_donotcopy>
- <Main-Class>org.apache.felix.karaf.client.Main</Main-Class>
+ <Main-Class>org.apache.karaf.client.Main</Main-Class>
<!-- Do not use \r\n in the Class-Path header because the maven-bundle-plugin remove those -->
<Class-Path>
- ../system/org/apache/sshd/sshd-core/${sshd.version}/sshd-core-${sshd.version}.jar ../system/org/apache/mina/mina-core/${mina.version}/mina-core-${mina.version}.jar ../system/org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.console/${project.version}/org.apache.felix.karaf.shell.console-${project.version}.jar
+ ../system/org/apache/sshd/sshd-core/${sshd.version}/sshd-core-${sshd.version}.jar ../system/org/apache/mina/mina-core/${mina.version}/mina-core-${mina.version}.jar ../system/org/apache/karaf/shell/org.apache.karaf.shell.console/${project.version}/org.apache.karaf.shell.console-${project.version}.jar
</Class-Path>
- <Bundle-Name>Apache Felix Karaf Shell Client</Bundle-Name>
- <Bundle-Description>Shell client bundle for Apache Felix Karaf.</Bundle-Description>
+ <Bundle-Name>Apache Karaf Shell Client</Bundle-Name>
+ <Bundle-Description>Shell client bundle for Apache Karaf.</Bundle-Description>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>${project.artifactId}*;version=${project.version}</Export-Package>
<Private-Package>
- org.apache.felix.karaf.client;-split-package:=merge-first,
+ org.apache.karaf.client;-split-package:=merge-first,
org.slf4j;-split-package:=merge-first,
org.slf4j.spi;-split-package:=merge-first,
org.slf4j.helpers;-split-package:=merge-first,