FELIX-1116: Renaming packages and changing artifact/group ids in the POMs
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@770981 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/karaf/deployer/filemonitor/pom.xml b/karaf/deployer/filemonitor/pom.xml
index 7817bc2..7a46dc8 100644
--- a/karaf/deployer/filemonitor/pom.xml
+++ b/karaf/deployer/filemonitor/pom.xml
@@ -22,16 +22,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix.kernel.deployer</groupId>
+ <groupId>org.apache.felix.karaf.deployer</groupId>
<artifactId>deployer</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.servicemix.kernel.deployer</groupId>
- <artifactId>org.apache.servicemix.kernel.deployer.filemonitor</artifactId>
+ <groupId>org.apache.felix.karaf.deployer</groupId>
+ <artifactId>org.apache.felix.karaf.deployer.filemonitor</artifactId>
<packaging>bundle</packaging>
<version>1.2.0-SNAPSHOT</version>
- <name>Apache ServiceMix Kernel :: File Monitor</name>
+ <name>Apache Felix Karaf :: File Monitor</name>
<description>This bundle monitors the deploy directory for new OSGi bundles in jar form, expanded form or for
configuration file changes and undeploys/redeploys them
@@ -75,7 +75,7 @@
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Export-Package>${pom.artifactId}</Export-Package>
- <Bundle-Activator>org.apache.servicemix.kernel.deployer.filemonitor.FileMonitorActivator
+ <Bundle-Activator>org.apache.felix.karaf.deployer.filemonitor.FileMonitorActivator
</Bundle-Activator>
</instructions>
</configuration>
@@ -83,4 +83,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/karaf/deployer/filemonitor/src/main/java/org/apache/servicemix/kernel/deployer/filemonitor/DeploymentListener.java b/karaf/deployer/filemonitor/src/main/java/org/apache/felix/karaf/deployer/filemonitor/DeploymentListener.java
similarity index 94%
rename from karaf/deployer/filemonitor/src/main/java/org/apache/servicemix/kernel/deployer/filemonitor/DeploymentListener.java
rename to karaf/deployer/filemonitor/src/main/java/org/apache/felix/karaf/deployer/filemonitor/DeploymentListener.java
index 18486c9..f0098af 100644
--- a/karaf/deployer/filemonitor/src/main/java/org/apache/servicemix/kernel/deployer/filemonitor/DeploymentListener.java
+++ b/karaf/deployer/filemonitor/src/main/java/org/apache/felix/karaf/deployer/filemonitor/DeploymentListener.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.deployer.filemonitor;
+package org.apache.felix.karaf.deployer.filemonitor;
import java.io.File;
diff --git a/karaf/deployer/filemonitor/src/main/java/org/apache/servicemix/kernel/deployer/filemonitor/FileMonitor.java b/karaf/deployer/filemonitor/src/main/java/org/apache/felix/karaf/deployer/filemonitor/FileMonitor.java
similarity index 99%
rename from karaf/deployer/filemonitor/src/main/java/org/apache/servicemix/kernel/deployer/filemonitor/FileMonitor.java
rename to karaf/deployer/filemonitor/src/main/java/org/apache/felix/karaf/deployer/filemonitor/FileMonitor.java
index 2a08990..ac00c45 100644
--- a/karaf/deployer/filemonitor/src/main/java/org/apache/servicemix/kernel/deployer/filemonitor/FileMonitor.java
+++ b/karaf/deployer/filemonitor/src/main/java/org/apache/felix/karaf/deployer/filemonitor/FileMonitor.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.deployer.filemonitor;
+package org.apache.felix.karaf.deployer.filemonitor;
import java.io.Closeable;
import java.io.File;
diff --git a/karaf/deployer/filemonitor/src/main/java/org/apache/servicemix/kernel/deployer/filemonitor/FileMonitorActivator.java b/karaf/deployer/filemonitor/src/main/java/org/apache/felix/karaf/deployer/filemonitor/FileMonitorActivator.java
similarity index 97%
rename from karaf/deployer/filemonitor/src/main/java/org/apache/servicemix/kernel/deployer/filemonitor/FileMonitorActivator.java
rename to karaf/deployer/filemonitor/src/main/java/org/apache/felix/karaf/deployer/filemonitor/FileMonitorActivator.java
index a700523..8ce5eee 100644
--- a/karaf/deployer/filemonitor/src/main/java/org/apache/servicemix/kernel/deployer/filemonitor/FileMonitorActivator.java
+++ b/karaf/deployer/filemonitor/src/main/java/org/apache/felix/karaf/deployer/filemonitor/FileMonitorActivator.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.deployer.filemonitor;
+package org.apache.felix.karaf.deployer.filemonitor;
import java.util.Collection;
import java.util.Dictionary;
@@ -94,7 +94,7 @@
// ManagedServiceFactory interface
// -------------------------------------------------------------------------
public String getName() {
- return "org.apache.servicemix.kernel.deployer.filemonitor.FileMonitor";
+ return "org.apache.felix.karaf.deployer.filemonitor.FileMonitor";
}
public void updated(String pid, Dictionary properties) throws ConfigurationException {
diff --git a/karaf/deployer/filemonitor/src/main/java/org/apache/servicemix/kernel/deployer/filemonitor/JarUtil.java b/karaf/deployer/filemonitor/src/main/java/org/apache/felix/karaf/deployer/filemonitor/JarUtil.java
similarity index 98%
rename from karaf/deployer/filemonitor/src/main/java/org/apache/servicemix/kernel/deployer/filemonitor/JarUtil.java
rename to karaf/deployer/filemonitor/src/main/java/org/apache/felix/karaf/deployer/filemonitor/JarUtil.java
index dff9e5c..ecf5bb9 100644
--- a/karaf/deployer/filemonitor/src/main/java/org/apache/servicemix/kernel/deployer/filemonitor/JarUtil.java
+++ b/karaf/deployer/filemonitor/src/main/java/org/apache/felix/karaf/deployer/filemonitor/JarUtil.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.deployer.filemonitor;
+package org.apache.felix.karaf.deployer.filemonitor;
import java.io.BufferedOutputStream;
import java.io.File;
diff --git a/karaf/deployer/filemonitor/src/main/java/org/apache/servicemix/kernel/deployer/filemonitor/Scanner.java b/karaf/deployer/filemonitor/src/main/java/org/apache/felix/karaf/deployer/filemonitor/Scanner.java
similarity index 99%
rename from karaf/deployer/filemonitor/src/main/java/org/apache/servicemix/kernel/deployer/filemonitor/Scanner.java
rename to karaf/deployer/filemonitor/src/main/java/org/apache/felix/karaf/deployer/filemonitor/Scanner.java
index 239a1a8..0c109a0 100644
--- a/karaf/deployer/filemonitor/src/main/java/org/apache/servicemix/kernel/deployer/filemonitor/Scanner.java
+++ b/karaf/deployer/filemonitor/src/main/java/org/apache/felix/karaf/deployer/filemonitor/Scanner.java
@@ -12,7 +12,7 @@
//See the License for the specific language governing permissions and
//limitations under the License.
//========================================================================
-package org.apache.servicemix.kernel.deployer.filemonitor;
+package org.apache.felix.karaf.deployer.filemonitor;
import java.io.File;
import java.io.FilenameFilter;
diff --git a/karaf/deployer/filemonitor/src/test/java/org/apache/servicemix/kernel/deployer/filemonitor/BundlePackerTest.java b/karaf/deployer/filemonitor/src/test/java/org/apache/felix/karaf/deployer/filemonitor/BundlePackerTest.java
similarity index 95%
rename from karaf/deployer/filemonitor/src/test/java/org/apache/servicemix/kernel/deployer/filemonitor/BundlePackerTest.java
rename to karaf/deployer/filemonitor/src/test/java/org/apache/felix/karaf/deployer/filemonitor/BundlePackerTest.java
index 83109ed..b710a30 100644
--- a/karaf/deployer/filemonitor/src/test/java/org/apache/servicemix/kernel/deployer/filemonitor/BundlePackerTest.java
+++ b/karaf/deployer/filemonitor/src/test/java/org/apache/felix/karaf/deployer/filemonitor/BundlePackerTest.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.deployer.filemonitor;
+package org.apache.felix.karaf.deployer.filemonitor;
import java.io.File;
diff --git a/karaf/deployer/filemonitor/src/test/java/org/apache/felix/karaf/deployer/filemonitor/FileMonitorTest.java b/karaf/deployer/filemonitor/src/test/java/org/apache/felix/karaf/deployer/filemonitor/FileMonitorTest.java
new file mode 100644
index 0000000..0db1953
--- /dev/null
+++ b/karaf/deployer/filemonitor/src/test/java/org/apache/felix/karaf/deployer/filemonitor/FileMonitorTest.java
@@ -0,0 +1,100 @@
+/**
+ *
+ * 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.
+ */
+package org.apache.felix.karaf.deployer.filemonitor;
+
+import junit.framework.TestCase;
+import org.apache.felix.karaf.deployer.filemonitor.FileMonitor;
+
+/**
+ * FileMonitor Tester.
+ *
+ * @author <Authors name>
+ * @version 1.0
+ * @since <pre>07/02/2008</pre>
+ */
+public class FileMonitorTest extends TestCase {
+
+ public FileMonitorTest(String name) {
+ super(name);
+ }
+
+ public void setUp() throws Exception {
+ super.setUp();
+ }
+
+ public void tearDown() throws Exception {
+ super.tearDown();
+ }
+
+ public void testFilePathsMatch() throws Exception {
+ assertTrue(FileMonitor.filePathsMatch(
+ "C:/Apps/apache-felix-karaf-1.0.0-rc1/src/README.txt",
+ "C:/Apps/apache-felix-karaf-1.0.0-rc1/src/README.txt"));
+
+ assertTrue(FileMonitor.filePathsMatch(
+ "C:\\Apps\\apache-felix-karaf-1.0.0-rc1\\src\\README.txt",
+ "C:\\Apps\\apache-felix-karaf-1.0.0-rc1\\src\\README.txt"));
+
+ assertTrue(FileMonitor.filePathsMatch(
+ "C:/Apps/apache-felix-karaf-1.0.0-rc1/src/README.txt",
+ "C:\\Apps\\apache-felix-karaf-1.0.0-rc1\\src\\README.txt"));
+
+ assertTrue(FileMonitor.filePathsMatch(
+ "file:/C:/Apps/apache-felix-karaf-1.0.0-rc1/src/README.txt",
+ "C:\\Apps\\apache-felix-karaf-1.0.0-rc1\\src\\README.txt"));
+
+ assertTrue(FileMonitor.filePathsMatch(
+ "file://C:/Apps/apache-felix-karaf-1.0.0-rc1/src/README.txt",
+ "C:\\Apps\\apache-felix-karaf-1.0.0-rc1\\src\\README.txt"));
+ }
+
+ public void testNormalizeFilePath() throws Exception {
+ assertEquals(
+ "C:/Apps/apache-felix-karaf-1.0.0-rc1/src/README.txt",
+ FileMonitor.normalizeFilePath("C:/Apps/apache-felix-karaf-1.0.0-rc1/src/README.txt"));
+
+ assertEquals(
+ "C:/Apps/apache-felix-karaf-1.0.0-rc1/src/README.txt",
+ FileMonitor.normalizeFilePath("C:/Apps//apache-felix-karaf-1.0.0-rc1////src/////README.txt"));
+
+ assertEquals(
+ "C:/Apps/apache-felix-karaf-1.0.0-rc1/src/README.txt",
+ FileMonitor.normalizeFilePath("C:\\Apps\\apache-felix-karaf-1.0.0-rc1\\src\\README.txt"));
+
+ assertEquals(
+ "C:/Apps/apache-felix-karaf-1.0.0-rc1/src/README.txt",
+ FileMonitor.normalizeFilePath("C:\\\\Apps\\\\apache-felix-karaf-1.0.0-rc1\\\\src\\\\README.txt"));
+
+ assertEquals(
+ "C:/Apps/apache-felix-karaf-1.0.0-rc1/src/README.txt",
+ FileMonitor.normalizeFilePath("C:\\Apps\\//apache-felix-karaf-1.0.0-rc1\\/\\src///\\\\README.txt"));
+
+ assertEquals(
+ "C:/Apps/apache-felix-karaf-1.0.0-rc1/src/README.txt",
+ FileMonitor.normalizeFilePath("file:C:/Apps/apache-felix-karaf-1.0.0-rc1/src/README.txt"));
+
+ assertEquals(
+ "C:/Apps/apache-felix-karaf-1.0.0-rc1/src/README.txt",
+ FileMonitor.normalizeFilePath("file:/C:/Apps/apache-felix-karaf-1.0.0-rc1/src/README.txt"));
+
+ assertEquals(
+ "C:/Apps/apache-felix-karaf-1.0.0-rc1/src/README.txt",
+ FileMonitor.normalizeFilePath("file://C:/Apps/apache-felix-karaf-1.0.0-rc1/src/README.txt"));
+ }
+
+}
diff --git a/karaf/deployer/filemonitor/src/test/java/org/apache/servicemix/kernel/deployer/filemonitor/FileMonitorTest.java b/karaf/deployer/filemonitor/src/test/java/org/apache/servicemix/kernel/deployer/filemonitor/FileMonitorTest.java
deleted file mode 100644
index 998ca84..0000000
--- a/karaf/deployer/filemonitor/src/test/java/org/apache/servicemix/kernel/deployer/filemonitor/FileMonitorTest.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- *
- * 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.
- */
-package org.apache.servicemix.kernel.deployer.filemonitor;
-
-import junit.framework.TestCase;
-import org.apache.servicemix.kernel.deployer.filemonitor.FileMonitor;
-
-/**
- * FileMonitor Tester.
- *
- * @author <Authors name>
- * @version 1.0
- * @since <pre>07/02/2008</pre>
- */
-public class FileMonitorTest extends TestCase {
-
- public FileMonitorTest(String name) {
- super(name);
- }
-
- public void setUp() throws Exception {
- super.setUp();
- }
-
- public void tearDown() throws Exception {
- super.tearDown();
- }
-
- public void testFilePathsMatch() throws Exception {
- assertTrue(FileMonitor.filePathsMatch(
- "C:/Apps/apache-servicemix-kernel-1.0.0-rc1/src/README.txt",
- "C:/Apps/apache-servicemix-kernel-1.0.0-rc1/src/README.txt"));
-
- assertTrue(FileMonitor.filePathsMatch(
- "C:\\Apps\\apache-servicemix-kernel-1.0.0-rc1\\src\\README.txt",
- "C:\\Apps\\apache-servicemix-kernel-1.0.0-rc1\\src\\README.txt"));
-
- assertTrue(FileMonitor.filePathsMatch(
- "C:/Apps/apache-servicemix-kernel-1.0.0-rc1/src/README.txt",
- "C:\\Apps\\apache-servicemix-kernel-1.0.0-rc1\\src\\README.txt"));
-
- assertTrue(FileMonitor.filePathsMatch(
- "file:/C:/Apps/apache-servicemix-kernel-1.0.0-rc1/src/README.txt",
- "C:\\Apps\\apache-servicemix-kernel-1.0.0-rc1\\src\\README.txt"));
-
- assertTrue(FileMonitor.filePathsMatch(
- "file://C:/Apps/apache-servicemix-kernel-1.0.0-rc1/src/README.txt",
- "C:\\Apps\\apache-servicemix-kernel-1.0.0-rc1\\src\\README.txt"));
- }
-
- public void testNormalizeFilePath() throws Exception {
- assertEquals(
- "C:/Apps/apache-servicemix-kernel-1.0.0-rc1/src/README.txt",
- FileMonitor.normalizeFilePath("C:/Apps/apache-servicemix-kernel-1.0.0-rc1/src/README.txt"));
-
- assertEquals(
- "C:/Apps/apache-servicemix-kernel-1.0.0-rc1/src/README.txt",
- FileMonitor.normalizeFilePath("C:/Apps//apache-servicemix-kernel-1.0.0-rc1////src/////README.txt"));
-
- assertEquals(
- "C:/Apps/apache-servicemix-kernel-1.0.0-rc1/src/README.txt",
- FileMonitor.normalizeFilePath("C:\\Apps\\apache-servicemix-kernel-1.0.0-rc1\\src\\README.txt"));
-
- assertEquals(
- "C:/Apps/apache-servicemix-kernel-1.0.0-rc1/src/README.txt",
- FileMonitor.normalizeFilePath("C:\\\\Apps\\\\apache-servicemix-kernel-1.0.0-rc1\\\\src\\\\README.txt"));
-
- assertEquals(
- "C:/Apps/apache-servicemix-kernel-1.0.0-rc1/src/README.txt",
- FileMonitor.normalizeFilePath("C:\\Apps\\//apache-servicemix-kernel-1.0.0-rc1\\/\\src///\\\\README.txt"));
-
- assertEquals(
- "C:/Apps/apache-servicemix-kernel-1.0.0-rc1/src/README.txt",
- FileMonitor.normalizeFilePath("file:C:/Apps/apache-servicemix-kernel-1.0.0-rc1/src/README.txt"));
-
- assertEquals(
- "C:/Apps/apache-servicemix-kernel-1.0.0-rc1/src/README.txt",
- FileMonitor.normalizeFilePath("file:/C:/Apps/apache-servicemix-kernel-1.0.0-rc1/src/README.txt"));
-
- assertEquals(
- "C:/Apps/apache-servicemix-kernel-1.0.0-rc1/src/README.txt",
- FileMonitor.normalizeFilePath("file://C:/Apps/apache-servicemix-kernel-1.0.0-rc1/src/README.txt"));
- }
-
-}