Author: sgoeschl
Date: Tue Feb 16 10:55:30 2010
New Revision: 910466
URL: http://svn.apache.org/viewvc?rev=910466&view=rev
Log:
Cleaning up the code and preparing for a release
Removed:
turbine/fulcrum/trunk/jetty/jetty-with-jsp.xml
Modified:
turbine/fulcrum/trunk/jetty/pom.xml
turbine/fulcrum/trunk/jetty/src/java/org/apache/fulcrum/jetty/JettyService.java
turbine/fulcrum/trunk/jetty/src/test/org/apache/fulcrum/jetty/JettyServiceTest.java
turbine/fulcrum/trunk/jetty/src/test/org/apache/fulcrum/jetty/JettyTestRunner.java
turbine/fulcrum/trunk/jetty/xdocs/changes.xml
turbine/fulcrum/trunk/jetty/xdocs/index.xml
Modified: turbine/fulcrum/trunk/jetty/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/jetty/pom.xml?rev=910466&r1=910465&r2=910466&view=diff
==============================================================================
--- turbine/fulcrum/trunk/jetty/pom.xml (original)
+++ turbine/fulcrum/trunk/jetty/pom.xml Tue Feb 16 10:55:30 2010
@@ -72,12 +72,10 @@
<artifactId>jetty</artifactId>
<version>${jetty.version}</version>
</dependency>
- <!-- Optional Jetty dependencies -->
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-plus</artifactId>
<version>${jetty.version}</version>
- <optional>true</optional>
<exclusions>
<exclusion>
<groupId>geronimo-spec</groupId>
@@ -85,6 +83,12 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jsp-2.1</artifactId>
+ <version>${jetty.version}</version>
+ <scope>optional</scope>
+ </dependency>
<!-- testing dependencies -->
<dependency>
<groupId>org.apache.fulcrum</groupId>
@@ -98,92 +102,6 @@
<version>1.0.6</version>
<scope>test</scope>
</dependency>
- <!-- JSP 2.0 dependencies running JDK 1.4 for testing JSPs -->
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.6.5</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-el</groupId>
- <artifactId>commons-el</artifactId>
- <version>1.0</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.3.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.3.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.3.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-compiler</artifactId>
- <version>${jetty.jasper.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-compiler-jdt</artifactId>
- <version>${jetty.jasper.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-runtime</artifactId>
- <version>${jetty.jasper.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <!-- not sure if those deps are really needed but keep them around -->
- <!--
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- <version>${jetty.xerces.version}</version>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>${jetty.xerces.version}</version>
- </dependency>
- -->
</dependencies>
<build>
@@ -204,15 +122,9 @@
<properties>
<!-- Default configuration for compiler source and target JVM -->
<maven.compile.source>1.4</maven.compile.source>
- <maven.compile.target>1.4</maven.compile.target>
- <!-- the Jasper version to pick up -->
- <jetty.jasper.version>5.5.15</jetty.jasper.version>
- <!-- the Jasper version to pick up -->
- <jetty.xerces.version>2.6.2</jetty.xerces.version>
- <!-- the JSP version to pick up -->
- <jetty.jsp.version>2.0</jetty.jsp.version>
+ <maven.compile.target>1.5</maven.compile.target>
<!-- the Jetty version to pick up -->
- <jetty.version>6.1.11</jetty.version>
+ <jetty.version>6.1.14</jetty.version>
</properties>
-</project>
\ No newline at end of file
+</project>
Modified:
turbine/fulcrum/trunk/jetty/src/java/org/apache/fulcrum/jetty/JettyService.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/jetty/src/java/org/apache/fulcrum/jetty/JettyService.java?rev=910466&r1=910465&r2=910466&view=diff
==============================================================================
---
turbine/fulcrum/trunk/jetty/src/java/org/apache/fulcrum/jetty/JettyService.java
(original)
+++
turbine/fulcrum/trunk/jetty/src/java/org/apache/fulcrum/jetty/JettyService.java
Tue Feb 16 10:55:30 2010
@@ -1,7 +1,5 @@
package org.apache.fulcrum.jetty;
-import org.mortbay.jetty.Server;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -21,14 +19,20 @@
* under the License.
*/
+import org.mortbay.jetty.Server;
+
/**
- * Starts an instance of the Spring Service Framework as Avalon service.
+ * Starts a Jetty servlet container as Avalon service.
*
* @author <a href="mailto:[email protected]";>Siegfried Goeschl</a>
*/
public interface JettyService
{
- /** @return the underlying Jetty server instance */
+ /**
+ * Get the underlying Jetty server instance.
+ *
+ * @return the Jetty server instance
+ */
Server getServer();
}
\ No newline at end of file
Modified:
turbine/fulcrum/trunk/jetty/src/test/org/apache/fulcrum/jetty/JettyServiceTest.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/jetty/src/test/org/apache/fulcrum/jetty/JettyServiceTest.java?rev=910466&r1=910465&r2=910466&view=diff
==============================================================================
---
turbine/fulcrum/trunk/jetty/src/test/org/apache/fulcrum/jetty/JettyServiceTest.java
(original)
+++
turbine/fulcrum/trunk/jetty/src/test/org/apache/fulcrum/jetty/JettyServiceTest.java
Tue Feb 16 10:55:30 2010
@@ -32,7 +32,9 @@
import java.io.InputStreamReader;
/**
- * Testing the embedded Jetty container.
+ * Testing the embedded Jetty container. We are basically
+ * invoking the various URL to make sure that everything
+ * is properly wired.
*
* @author <a href="mailto:[email protected]";>Siegfried Goeschl</a>
*/
@@ -95,7 +97,9 @@
/////////////////////////////////////////////////////////////////////////
/**
- * Ensure that we start Jetty properly
+ * Ensure that we start Jetty properly.
+ *
+ * @throws Exception the test failed
*/
public void testGetJettyService() throws Exception
{
@@ -103,7 +107,9 @@
}
/**
- * Fetch the start page
+ * Fetch the start page.
+ *
+ * @throws Exception the test failed
*/
public void testGetIndexPage() throws Exception
{
@@ -112,7 +118,9 @@
}
/**
- * Invoke all servlet examples
+ * Invoke all servlet examples.
+ *
+ * @throws Exception the test failed
*/
public void testInvokeTestServlets() throws Exception
{
@@ -136,7 +144,9 @@
}
/**
- * Invoke a JSP examples
+ * Invoke a JSP examples.
+ *
+ * @throws Exception the test failed
*/
public void testInvokeTestJsps() throws Exception
{
@@ -153,7 +163,9 @@
}
/**
- * Reconfigure a running Jetty using the Avalon Lifycyle 'stop',
'reconfigure', 'start'
+ * Reconfigure a running Jetty using the Avalon Lifycyle 'stop',
'reconfigure', 'start'.
+ *
+ * @throws Exception the test failed
*/
public void testStartStop() throws Exception
{
Modified:
turbine/fulcrum/trunk/jetty/src/test/org/apache/fulcrum/jetty/JettyTestRunner.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/jetty/src/test/org/apache/fulcrum/jetty/JettyTestRunner.java?rev=910466&r1=910465&r2=910466&view=diff
==============================================================================
---
turbine/fulcrum/trunk/jetty/src/test/org/apache/fulcrum/jetty/JettyTestRunner.java
(original)
+++
turbine/fulcrum/trunk/jetty/src/test/org/apache/fulcrum/jetty/JettyTestRunner.java
Tue Feb 16 10:55:30 2010
@@ -19,16 +19,8 @@
* under the License.
*/
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.fulcrum.testcontainer.BaseUnitTest;
-import java.net.URL;
-import java.io.InputStream;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-
/**
* Testing the embedded Jetty container.
*
@@ -69,7 +61,9 @@
/////////////////////////////////////////////////////////////////////////
/**
- * Run the Jetty instance for 600 seconds to do some manual testing
+ * Run the Jetty instance for 600 seconds to do some manual testing.
+ *
+ * @throws Exception the test failed
*/
public void testRunJetty() throws Exception
{
Modified: turbine/fulcrum/trunk/jetty/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/jetty/xdocs/changes.xml?rev=910466&r1=910465&r2=910466&view=diff
==============================================================================
--- turbine/fulcrum/trunk/jetty/xdocs/changes.xml (original)
+++ turbine/fulcrum/trunk/jetty/xdocs/changes.xml Tue Feb 16 10:55:30 2010
@@ -25,6 +25,9 @@
<body>
<release version="1.0.0-SNAPSHOT" date="as in SVN">
+ <action dev="sgoeschl" type="update" date="2010-02-16">
+ Upgrading from jetty-6.1.11 to jetty-6.1.14
+ </action>
<action dev="sgoeschl" type="add">
First cut for an embeddable Jetty server
</action>
Modified: turbine/fulcrum/trunk/jetty/xdocs/index.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/jetty/xdocs/index.xml?rev=910466&r1=910465&r2=910466&view=diff
==============================================================================
--- turbine/fulcrum/trunk/jetty/xdocs/index.xml (original)
+++ turbine/fulcrum/trunk/jetty/xdocs/index.xml Tue Feb 16 10:55:30 2010
@@ -27,8 +27,8 @@
<p>
The Fulcrum Jetty Service allows embedding a Jetty HTTP server to serve
HTTP request. The main focus is to add HTTP support to an existing
- non-web application. The tests also exercise JSPs and JAAS integration
to make
- sure that everything is properly wired.
+ non-web application, e.g. for exposing web services. The tests also
+ exercise JSPs and JAAS integration to make sure that everything is
properly wired.
</p>
</section>
<section name="How to Test Manually">
@@ -36,97 +36,22 @@
To make sure that Jetty is properly integrated run the following
command line
</p>
<source><![CDATA[
-mvn -Pstandalone test
- ]]></source>
+mvn -Pstandalone test
+ ]]></source>
<p>
This will start the embedded Jetty and allows manual testing using
<a href="http://localhost:9080/test/";>http://localhost:9080/test/</a>.
- </p>
- </section>
+ </p>
+ </section>
<section name="JSP Support">
<p>
- The fulcrum-jetty library ships without JSP support because
+ The fulcrum-jetty library ships with optional JSP support because
<ul>
<li>most people plainly don't need it and it adds a lot of
baggage</li>
<li>for supporting JDK 1.4 and 1.5 different libraries are
required</li>
- </ul>
- To help you with evaluating this options a 'jetty-with-jsp.xml' pom is
- provided which uses Maven profiles to build the library using JSP 2.0
- and JSP 2.1.
- </p>
- <subsection name="JSP 2.0 Support for JDK 1.4">
- <p>
- These dependencies are required for running JSP 2.0 on JDK 1.4
- </p>
- <source><![CDATA[
-<!-- JSP 2.0 dependencies for JDK 1.4 -->
-<dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.6.5</version>
-</dependency>
-<dependency>
- <groupId>commons-el</groupId>
- <artifactId>commons-el</artifactId>
- <version>1.0</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
-</dependency>
-<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.3.1</version>
-</dependency>
-<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.3.1</version>
-</dependency>
-<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl104-over-slf4j</artifactId>
- <version>1.3.1</version>
-</dependency>
-<dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-compiler</artifactId>
- <version>${jetty.jasper.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- </exclusions>
-</dependency>
-<dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-compiler-jdt</artifactId>
- <version>${jetty.jasper.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>core</artifactId>
- </exclusion>
- </exclusions>
-</dependency>
-<dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-runtime</artifactId>
- <version>${jetty.jasper.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- </exclusions>
-</dependency>
- ]]></source>
- </subsection>
- <subsection name="JSP 2.1 Support for JDK 1.5">
+ </ul>
+ </p>
+ <subsection name="JSP 2.1 Support for JDK 1.5">
<p>
These dependencies are required for running JSP 2.1 on JDK 1.5
</p>
@@ -134,7 +59,7 @@
<!-- JSP 2.1 dependencies for JDK 1.5 -->
<dependency>
<groupId>org.mortbay.jetty</groupId>
- <artifactId>jsp-${jetty.jsp.version}</artifactId>
+ <artifactId>jsp-2.1</artifactId>
<version>${jetty.version}</version>
</dependency>
]]></source>
