You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2010/06/29 21:44:26 UTC
svn commit: r959081 - in /karaf/trunk:
assembly/src/main/filtered-resources/bin/admin.bat
demos/web/src/main/webapp/WEB-INF/web.xml demos/web/src/main/webapp/index.jsp
management/src/test/configs/factories/management.properties
Author: gnodet
Date: Tue Jun 29 19:44:25 2010
New Revision: 959081
URL: http://svn.apache.org/viewvc?rev=959081&view=rev
Log:
Remove remaining references to 'Felix Karaf'
Modified:
karaf/trunk/assembly/src/main/filtered-resources/bin/admin.bat
karaf/trunk/demos/web/src/main/webapp/WEB-INF/web.xml
karaf/trunk/demos/web/src/main/webapp/index.jsp
karaf/trunk/management/src/test/configs/factories/management.properties
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=959081&r1=959080&r2=959081&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 19:44:25 2010
@@ -81,7 +81,7 @@ 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.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
+set 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.apache.felix
.framework-${felix.framework.version}.jar
:EXECUTE
if "%SHIFT%" == "true" SET ARGS=%2 %3 %4 %5 %6 %7 %8
Modified: karaf/trunk/demos/web/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/demos/web/src/main/webapp/WEB-INF/web.xml?rev=959081&r1=959080&r2=959081&view=diff
==============================================================================
--- karaf/trunk/demos/web/src/main/webapp/WEB-INF/web.xml (original)
+++ karaf/trunk/demos/web/src/main/webapp/WEB-INF/web.xml Tue Jun 29 19:44:25 2010
@@ -26,7 +26,7 @@
<display-name>Karaf Embedded Example</display-name>
<listener>
- <listener-class>org.apache.felix.karaf.web.WebAppListener</listener-class>
+ <listener-class>org.apache.karaf.web.WebAppListener</listener-class>
</listener>
<welcome-file-list>
Modified: karaf/trunk/demos/web/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/karaf/trunk/demos/web/src/main/webapp/index.jsp?rev=959081&r1=959080&r2=959081&view=diff
==============================================================================
--- karaf/trunk/demos/web/src/main/webapp/index.jsp (original)
+++ karaf/trunk/demos/web/src/main/webapp/index.jsp Tue Jun 29 19:44:25 2010
@@ -16,7 +16,7 @@
--%>
<html>
<head>
-<title>Apache Felix Karaf</title>
+<title>Apache Karaf</title>
</head>
<body>
@@ -27,7 +27,7 @@ Welcome to Apache Karaf web application
</p>
<p>
-You can find more information about Karaf on the <a href="http://felix.apache.org/site/apache-felix-karaf.html">Apache Karaf Site</a>
+You can find more information about Karaf on the <a href="http://karaf.apache.org/">Apache Karaf Site</a>
</p>
</body>
</html>
Modified: karaf/trunk/management/src/test/configs/factories/management.properties
URL: http://svn.apache.org/viewvc/karaf/trunk/management/src/test/configs/factories/management.properties?rev=959081&r1=959080&r2=959081&view=diff
==============================================================================
--- karaf/trunk/management/src/test/configs/factories/management.properties (original)
+++ karaf/trunk/management/src/test/configs/factories/management.properties Tue Jun 29 19:44:25 2010
@@ -17,7 +17,7 @@
#
################################################################################
-service.pid=org.apache.felix.karaf.management.JmxConnectorServiceFactory
+service.pid=org.apache.karaf.management.JmxConnectorServiceFactory
instances=1
keys=objectName,serviceUrl,threaded,daemon,
objectName.1=connector:name=rmi