Author: anierbeck
Date: Mon Jul 25 22:00:44 2011
New Revision: 1150930
URL: http://svn.apache.org/viewvc?rev=1150930&view=rev
Log:
[KARAF-764] - Correct links to ops4j in documentation
thanx to Glen for providing a patch
Modified:
karaf/branches/karaf-2.2.x/manual/src/main/webapp/developers-guide/writing-tests.conf
karaf/branches/karaf-2.2.x/manual/src/main/webapp/users-guide/http.conf
karaf/branches/karaf-2.2.x/manual/src/main/webapp/users-guide/logging-system.conf
karaf/branches/karaf-2.2.x/manual/src/main/webapp/users-guide/web-applications.conf
karaf/trunk/manual/src/main/webapp/developers-guide/writing-tests.conf
karaf/trunk/manual/src/main/webapp/users-guide/http.conf
karaf/trunk/manual/src/main/webapp/users-guide/logging-system.conf
karaf/trunk/manual/src/main/webapp/users-guide/web-applications.conf
Modified:
karaf/branches/karaf-2.2.x/manual/src/main/webapp/developers-guide/writing-tests.conf
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/manual/src/main/webapp/developers-guide/writing-tests.conf?rev=1150930&r1=1150929&r2=1150930&view=diff
==============================================================================
---
karaf/branches/karaf-2.2.x/manual/src/main/webapp/developers-guide/writing-tests.conf
(original)
+++
karaf/branches/karaf-2.2.x/manual/src/main/webapp/developers-guide/writing-tests.conf
Mon Jul 25 22:00:44 2011
@@ -2,7 +2,8 @@
h1. Writing integration tests
-We recommend using [PAX Exam|http://wiki.ops4j.org/display/paxexam/Pax+Exam]
to write integration tests when developing applications using Karaf.
+We recommend using [PAX
Exam|http://team.ops4j.org/wiki/display/paxexam/Pax+Exam] to write integration
tests when developing
+applications using Karaf.
Karaf provides an helper library to help writing such integration tests.
{pygmentize:java}
Modified:
karaf/branches/karaf-2.2.x/manual/src/main/webapp/users-guide/http.conf
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/manual/src/main/webapp/users-guide/http.conf?rev=1150930&r1=1150929&r2=1150930&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/manual/src/main/webapp/users-guide/http.conf
(original)
+++ karaf/branches/karaf-2.2.x/manual/src/main/webapp/users-guide/http.conf Mon
Jul 25 22:00:44 2011
@@ -51,4 +51,5 @@ So it is much more convenient than regis
The above snippet publishes the Servlet MyServlet on
http://localhost:8080/myServlet.
-Please keep in mind that the Whiteboard pattern for Servlets is not
standardized and only works with Pax Web.
\ No newline at end of file
+Please keep in mind that the Whiteboard pattern for Servlets is not
standardized and only works with Pax Web.
+
Modified:
karaf/branches/karaf-2.2.x/manual/src/main/webapp/users-guide/logging-system.conf
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/manual/src/main/webapp/users-guide/logging-system.conf?rev=1150930&r1=1150929&r2=1150930&view=diff
==============================================================================
---
karaf/branches/karaf-2.2.x/manual/src/main/webapp/users-guide/logging-system.conf
(original)
+++
karaf/branches/karaf-2.2.x/manual/src/main/webapp/users-guide/logging-system.conf
Mon Jul 25 22:00:44 2011
@@ -1,7 +1,7 @@
h1. Logging system
-Karaf provides a powerful logging system based on [OPS4j Pax
Logging|http://wiki.ops4j.org/display/paxlogging/Pax+Logging].
+Karaf provides a powerful logging system based on [OPS4j Pax
Logging|http://team.ops4j.org/wiki/display/paxlogging/Pax+Logging].
In addition to being a standard OSGi Log service, it supports the following
APIs:
* Apache Commons Logging
Modified:
karaf/branches/karaf-2.2.x/manual/src/main/webapp/users-guide/web-applications.conf
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/manual/src/main/webapp/users-guide/web-applications.conf?rev=1150930&r1=1150929&r2=1150930&view=diff
==============================================================================
---
karaf/branches/karaf-2.2.x/manual/src/main/webapp/users-guide/web-applications.conf
(original)
+++
karaf/branches/karaf-2.2.x/manual/src/main/webapp/users-guide/web-applications.conf
Mon Jul 25 22:00:44 2011
@@ -88,7 +88,7 @@ h2. Deploying a WAR to the installed web
The following steps will describe how to install a simple WAR file (with JSPs
or Servlets) to the just installed web feature.
# To deploy a WAR (JSP or Servlet) to Jetty, update its MANIFEST.MF to include
the required OSGi headers as described here - \\
-[http://wiki.ops4j.org/confluence/display/ops4j/Pax+Web+Extender+-+War+-+OSGi-fy]
+[http://team.ops4j.org/wiki/display/ops4j/Pax+Web+Extender+-+War+-+OSGi-fy]
# Copy the updated WAR (archive or extracted files) to the _deploy_ directory.
If you want to deploy a sample web application into Karaf, you could use the
following command:
Modified: karaf/trunk/manual/src/main/webapp/developers-guide/writing-tests.conf
URL:
http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/developers-guide/writing-tests.conf?rev=1150930&r1=1150929&r2=1150930&view=diff
==============================================================================
--- karaf/trunk/manual/src/main/webapp/developers-guide/writing-tests.conf
(original)
+++ karaf/trunk/manual/src/main/webapp/developers-guide/writing-tests.conf Mon
Jul 25 22:00:44 2011
@@ -1,6 +1,6 @@
h1. Writing integration tests
-We recommend using [PAX Exam|http://wiki.ops4j.org/display/paxexam/Pax+Exam]
to write integration tests when developing
+We recommend using [PAX
Exam|http://team.ops4j.org/wiki/display/paxexam/Pax+Exam] to write integration
tests when developing
applications using Karaf.
Karaf provides an helper library to help writing such integration tests.
Modified: karaf/trunk/manual/src/main/webapp/users-guide/http.conf
URL:
http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/users-guide/http.conf?rev=1150930&r1=1150929&r2=1150930&view=diff
==============================================================================
--- karaf/trunk/manual/src/main/webapp/users-guide/http.conf (original)
+++ karaf/trunk/manual/src/main/webapp/users-guide/http.conf Mon Jul 25
22:00:44 2011
@@ -33,7 +33,7 @@ The Pax Web whiteboard extender is an en
root@karaf> features:install http-whiteboard
{code}
-The [Pax Web
whiteboard|http://wiki.ops4j.org/display/ops4j/Pax+Web+Extender+-+Whiteboard]
extender listens to services
+The [Pax Web
whiteboard|http://team.ops4j.org/wiki/display/ops4j/Pax+Web+Extender+-+Whiteboard]
extender listens to services
of interface type HttpServlet and Filter.
It will register each of these interfaces with the HttpService and remove them
as soon as the service goes down.
So it is much more convenient than registering with the HttpService directly.
@@ -51,4 +51,5 @@ So it is much more convenient than regis
The above snippet publishes the Servlet MyServlet on
http://localhost:8080/myServlet.
-Please keep in mind that the Whiteboard pattern for Servlets is not
standardized and only works with Pax Web.
\ No newline at end of file
+Please keep in mind that the Whiteboard pattern for Servlets is not
standardized and only works with Pax Web.
+
Modified: karaf/trunk/manual/src/main/webapp/users-guide/logging-system.conf
URL:
http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/users-guide/logging-system.conf?rev=1150930&r1=1150929&r2=1150930&view=diff
==============================================================================
--- karaf/trunk/manual/src/main/webapp/users-guide/logging-system.conf
(original)
+++ karaf/trunk/manual/src/main/webapp/users-guide/logging-system.conf Mon Jul
25 22:00:44 2011
@@ -1,7 +1,7 @@
h1. Logging system
-Karaf provides a powerful logging system based on [OPS4j Pax
Logging|http://wiki.ops4j.org/display/paxlogging/Pax+Logging].
+Karaf provides a powerful logging system based on [OPS4j Pax
Logging|http://team.ops4j.org/wiki/display/paxlogging/Pax+Logging].
In addition to being a standard OSGi Log service, it supports the following
APIs:
* Apache Commons Logging
Modified: karaf/trunk/manual/src/main/webapp/users-guide/web-applications.conf
URL:
http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/users-guide/web-applications.conf?rev=1150930&r1=1150929&r2=1150930&view=diff
==============================================================================
--- karaf/trunk/manual/src/main/webapp/users-guide/web-applications.conf
(original)
+++ karaf/trunk/manual/src/main/webapp/users-guide/web-applications.conf Mon
Jul 25 22:00:44 2011
@@ -88,7 +88,7 @@ h2. Deploying a WAR to the installed web
The following steps will describe how to install a simple WAR file (with JSPs
or Servlets) to the just installed web feature.
# To deploy a WAR (JSP or Servlet) to Jetty, update its MANIFEST.MF to include
the required OSGi headers as described here - \\
-[http://wiki.ops4j.org/confluence/display/ops4j/Pax+Web+Extender+-+War+-+OSGi-fy]
+[http://team.ops4j.org/wiki/display/ops4j/Pax+Web+Extender+-+War+-+OSGi-fy]
# Copy the updated WAR (archive or extracted files) to the _deploy_ directory.
If you want to deploy a sample web application into Karaf, you could use the
following command:
