mcconnell 2004/02/02 13:10:52
Modified: merlin maven.xml
merlin/facilities/http/test/src/java/test/http
TestServlet.java
merlin/logging/logkit/api/src/java/org/apache/avalon/logging/logkit
package.html
merlin/logging/logkit/impl/src/java/org/apache/avalon/logging/logkit
package.html
Log:
Housekeeping.
Revision Changes Path
1.45 +1 -1 avalon/merlin/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/maven.xml,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- maven.xml 28 Jan 2004 14:41:49 -0000 1.44
+++ maven.xml 2 Feb 2004 21:10:52 -0000 1.45
@@ -87,7 +87,7 @@
-->
<goal name="avalon:build" description="Build Merlin."
-
prereqs="avalon:build-logging,avalon:build-main,avalon:build-kernel,avalon:build-plugin"/>
+
prereqs="avalon:build-logging,avalon:build-main,avalon:build-kernel,avalon:build-plugin,avalon:build-facilities"/>
<goal name="avalon:build-logging" description="Build Logging.">
1.3 +8 -1
avalon/merlin/facilities/http/test/src/java/test/http/TestServlet.java
Index: TestServlet.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/facilities/http/test/src/java/test/http/TestServlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestServlet.java 2 Feb 2004 19:27:17 -0000 1.2
+++ TestServlet.java 2 Feb 2004 21:10:52 -0000 1.3
@@ -81,7 +81,14 @@
writer.println("<title>Test Servlet Info</title>" );
writer.println("</head>");
writer.println("<body>" );
- writer.println("<p>I exist!!</p>");
+ writer.println("<hr/>");
+ writer.println("<h3>Hello.</h3>");
+ writer.println("<hr/>");
+ writer.println("<p>I'm an Avalon component.<br/>");
+ writer.println("I'm also a Servlet.<br/>");
+ writer.println("I exist!!<br/>");
+ writer.println("Therefore I am.</p>");
+ writer.println("<hr/>");
writer.println("</body>");
writer.println("</html>");
}
1.2 +2 -4
avalon/merlin/logging/logkit/api/src/java/org/apache/avalon/logging/logkit/package.html
Index: package.html
===================================================================
RCS file:
/home/cvs/avalon/merlin/logging/logkit/api/src/java/org/apache/avalon/logging/logkit/package.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- package.html 24 Jan 2004 23:25:32 -0000 1.1
+++ package.html 2 Feb 2004 21:10:52 -0000 1.2
@@ -1,8 +1,6 @@
<body>
<p>The <code>logging</code> package contains the
[EMAIL PROTECTED] org.apache.avalon.composition.logging.impl.DefaultLoggingManager}
which
[EMAIL PROTECTED] org.apache.avalon.logging.LoggingManager} interface which
is an initial bootstrap logging mananager that uses mata information
-about logging targets and catagories. This class is subject to
-refactoring to bring in into a component model to enable easy
-specialization and/or replacement.</p>
+about logging targets and catagories.</p>
</body>
1.2 +2 -2
avalon/merlin/logging/logkit/impl/src/java/org/apache/avalon/logging/logkit/package.html
Index: package.html
===================================================================
RCS file:
/home/cvs/avalon/merlin/logging/logkit/impl/src/java/org/apache/avalon/logging/logkit/package.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- package.html 24 Jan 2004 23:25:33 -0000 1.1
+++ package.html 2 Feb 2004 21:10:52 -0000 1.2
@@ -1,6 +1,6 @@
<body>
-<p>The <code>logging</code> package contains the
[EMAIL PROTECTED] org.apache.avalon.composition.logging.impl.DefaultLoggingManager}
which
+<p>The <code>logkit/impl</code> package contains the
[EMAIL PROTECTED] org.apache.avalon.logging.logkit.impl.DefaultLoggingManager} which
is an initial bootstrap logging mananager that uses mata information
about logging targets and catagories. This class is subject to
refactoring to bring in into a component model to enable easy
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
