FELIX-1116: remove some remaining references to servicemix
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@771229 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/karaf/assembly/pom.xml b/karaf/assembly/pom.xml
index baf5bec..c9f4cc0 100644
--- a/karaf/assembly/pom.xml
+++ b/karaf/assembly/pom.xml
@@ -271,19 +271,19 @@
<groupId>org.apache.felix.karaf</groupId>
<artifactId>org.apache.felix.karaf.main</artifactId>
<outputDirectory>target/dependencies</outputDirectory>
- <destFileName>servicemix.jar</destFileName>
+ <destFileName>karaf.jar</destFileName>
</artifactItem>
<artifactItem>
<groupId>org.apache.felix.karaf</groupId>
<artifactId>org.apache.felix.karaf.client</artifactId>
<outputDirectory>target/dependencies</outputDirectory>
- <destFileName>servicemix-client.jar</destFileName>
+ <destFileName>karaf-client.jar</destFileName>
</artifactItem>
<artifactItem>
<groupId>org.apache.felix.karaf.jaas</groupId>
<artifactId>org.apache.felix.karaf.jaas.boot</artifactId>
<outputDirectory>target/dependencies</outputDirectory>
- <destFileName>servicemix-jaas-boot.jar</destFileName>
+ <destFileName>karaf-jaas-boot.jar</destFileName>
</artifactItem>
</artifactItems>
</configuration>
diff --git a/karaf/assembly/src/main/descriptors/unix-src.xml b/karaf/assembly/src/main/descriptors/unix-src.xml
index 9227d56..4385030 100644
--- a/karaf/assembly/src/main/descriptors/unix-src.xml
+++ b/karaf/assembly/src/main/descriptors/unix-src.xml
@@ -52,7 +52,7 @@
<include>**/*.bin</include>
<include>**/*.jnilib</include>
<include>**/*.cert</include>
- <include>apache-servicemix/src/main/release/bin/*/wrapper</include>
+ <include>apache-felix-karaf/src/main/release/bin/*/wrapper</include>
</includes>
<excludes>
<exclude>**/eclipse-classes/**</exclude>
@@ -82,7 +82,7 @@
<exclude>**/*.bin</exclude>
<exclude>**/*.jnilib</exclude>
<exclude>**/*.cert</exclude>
- <exclude>apache-servicemix/src/main/release/bin/*/wrapper</exclude>
+ <exclude>apache-felix-karaf/src/main/release/bin/*/wrapper</exclude>
<exclude>**/target/**</exclude>
<exclude>**/build/**</exclude>
<exclude>activemq-data/**</exclude>
diff --git a/karaf/assembly/src/main/descriptors/windows-src.xml b/karaf/assembly/src/main/descriptors/windows-src.xml
index 4d0c6ae..15b969f 100644
--- a/karaf/assembly/src/main/descriptors/windows-src.xml
+++ b/karaf/assembly/src/main/descriptors/windows-src.xml
@@ -52,7 +52,7 @@
<include>**/*.bin</include>
<include>**/*.jnilib</include>
<include>**/*.cert</include>
- <include>apache-servicemix/src/main/release/bin/*/wrapper</include>
+ <include>apache-felix-karaf/src/main/release/bin/*/wrapper</include>
</includes>
<excludes>
<exclude>**/eclipse-classes/**</exclude>
@@ -82,7 +82,7 @@
<exclude>**/*.bin</exclude>
<exclude>**/*.jnilib</exclude>
<exclude>**/*.cert</exclude>
- <exclude>apache-servicemix/src/main/release/bin/*/wrapper</exclude>
+ <exclude>apache-felix-karaf/src/main/release/bin/*/wrapper</exclude>
<exclude>**/target/**</exclude>
<exclude>**/build/**</exclude>
diff --git a/karaf/assembly/src/main/distribution/unix-shell/bin/karaf b/karaf/assembly/src/main/distribution/unix-shell/bin/karaf
index a5771c9..4016399 100755
--- a/karaf/assembly/src/main/distribution/unix-shell/bin/karaf
+++ b/karaf/assembly/src/main/distribution/unix-shell/bin/karaf
@@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-# $Id: servicemix 979 2005-11-30 22:50:55Z bsnyder $
+# $Id: karaf 979 2005-11-30 22:50:55Z bsnyder $
#
DIRNAME=`dirname $0`
diff --git a/karaf/assembly/src/main/distribution/windows-text/bin/karaf.bat b/karaf/assembly/src/main/distribution/windows-text/bin/karaf.bat
index 475663b..189dd1c 100755
--- a/karaf/assembly/src/main/distribution/windows-text/bin/karaf.bat
+++ b/karaf/assembly/src/main/distribution/windows-text/bin/karaf.bat
@@ -17,7 +17,7 @@
rem limitations under the License.
rem
rem
-rem $Id: servicemix.bat 979 2005-11-30 22:50:55Z bsnyder $
+rem $Id: karaf.bat 979 2005-11-30 22:50:55Z bsnyder $
rem
if not "%ECHO%" == "" echo %ECHO%