You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by vm...@apache.org on 2004/05/22 18:39:34 UTC
cvs commit: jakarta-cactus/framework/src/java/j2ee-13 .keepit
vmassol 2004/05/22 09:39:34
Modified: framework build.xml build.properties.sample .cvsignore
framework/src/java/share-12-13-14/org/apache/cactus/server
AbstractHttpServletRequestWrapper.java
documentation/docs/xdocs changes.xml
. build.properties.sample build.properties.vmassol
Added: framework/src/java/share-13-14/org/apache/cactus/server
AbstractHttpServletRequestWrapper23.java
AbstractPageContextWrapper23.java
framework/src/java/j2ee-14/org/apache/cactus/server
HttpServletRequestWrapper.java
PageContextWrapper.java
framework/src/java/j2ee-13/org/apache/cactus/server
PageContextWrapper.java
HttpServletRequestWrapper.java
Removed: framework/src/java/share-13-14/org/apache/cactus/server
HttpServletRequestWrapper.java
PageContextWrapper.java
framework/src/java/j2ee-14 .keepit
framework/src/java/j2ee-13 .keepit
Log:
- The framework/ project can now be built for Servlet API 2.4/JSP API 2.0
- We still need to implement support for the simulated URL (setURL()) in the Cactus HttpServletRequestWrapper for Servlet API 2.4
- Added new jsp.jar jar (the jakarta servletapi project has split the servlet-api jar in 2 : servlet-api and jsp-api)
- I still need to fix the master build to use the new jsp.jar jar
Revision Changes Path
1.1 jakarta-cactus/framework/src/java/share-13-14/org/apache/cactus/server/AbstractHttpServletRequestWrapper23.java
Index: AbstractHttpServletRequestWrapper23.java
===================================================================
/*
* ========================================================================
*
* Copyright 2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* ========================================================================
*/
package org.apache.cactus.server;
import java.io.UnsupportedEncodingException;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import org.apache.cactus.ServletURL;
/**
* Extends {@link AbstractHttpServletRequestWrapper} by adding the new methods
* of the Servlet 2.3 API specifications.
*
* @see AbstractHttpServletRequestWrapper
* @version $Id: AbstractHttpServletRequestWrapper23.java,v 1.1 2004/05/22 16:39:34 vmassol Exp $
*/
public abstract class AbstractHttpServletRequestWrapper23
extends AbstractHttpServletRequestWrapper
{
/**
* Construct a {@link HttpServletRequest} instance that delegates
* it's method calls to the request object passed as parameter and that
* uses the URL passed as parameter to simulate a URL from which the
* request would come from.
*
* @param theRequest the real HTTP request
* @param theURL the URL to simulate or <code>null</code> if none
*/
public AbstractHttpServletRequestWrapper23(HttpServletRequest theRequest,
ServletURL theURL)
{
super(theRequest, theURL);
}
// Unmodified methods --------------------------------------------------
/**
* @return the URL from the simulated URL or the real URL
* if a simulation URL has not been defined.
* @see HttpServletRequest#getRequestURL()
*/
public StringBuffer getRequestURL()
{
StringBuffer result;
if (this.url != null)
{
result = new StringBuffer(this.url.getProtocol() + "://"
+ getServerName() + ":" + getServerPort()
+ getRequestURI());
}
else
{
result = this.request.getRequestURL();
}
return result;
}
/**
* @see HttpServletRequest#setCharacterEncoding(String)
*/
public void setCharacterEncoding(String theEnvironment)
throws UnsupportedEncodingException
{
this.request.setCharacterEncoding(theEnvironment);
}
/**
* @see HttpServletRequest#getParameterMap()
*/
public Map getParameterMap()
{
return this.request.getParameterMap();
}
}
1.1 jakarta-cactus/framework/src/java/share-13-14/org/apache/cactus/server/AbstractPageContextWrapper23.java
Index: AbstractPageContextWrapper23.java
===================================================================
/*
* ========================================================================
*
* Copyright 2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* ========================================================================
*/
package org.apache.cactus.server;
import java.io.IOException;
import javax.servlet.ServletException;
import javax.servlet.jsp.PageContext;
import org.apache.cactus.ServletURL;
/**
* Extends {@link AbstractPageContextWrapper} by adding the new methods
* of the Servlet 2.3 API specifications.
*
* @see AbstractPageContextWrapper
* @version $Id: AbstractPageContextWrapper23.java,v 1.1 2004/05/22 16:39:34 vmassol Exp $
*/
public abstract class AbstractPageContextWrapper23
extends AbstractPageContextWrapper
{
/**
* Construct a {@link PageContext} instance that delegates
* it's method calls to the page context object passed as parameter and
* that uses the URL passed as parameter to simulate a URL from which
* the request would come from.
*
* @param theOriginalPageContext the real page context
* @param theURL the URL to simulate or <code>null</code> if none
*/
public AbstractPageContextWrapper23(PageContext theOriginalPageContext,
ServletURL theURL)
{
super(theOriginalPageContext, theURL);
}
// Unmodified overridden methods -----------------------------------------
/**
* @see PageContext#handlePageException(Throwable)
*/
public void handlePageException(Throwable theThrowable)
throws ServletException, IOException
{
this.originalPageContext.handlePageException(theThrowable);
}
}
1.87 +4 -1 jakarta-cactus/framework/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/build.xml,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- build.xml 22 May 2004 11:34:49 -0000 1.86
+++ build.xml 22 May 2004 16:39:34 -0000 1.87
@@ -98,6 +98,7 @@
<echo> httpunit.jar = [${httpunit.jar}]</echo>
<echo> j2ee.jar = [${j2ee.jar}]</echo>
<echo> servlet.jar = [${servlet.jar}]</echo>
+ <echo> jsp.jar = [${jsp.jar}]</echo>
<echo> junit.jar = [${junit.jar}]</echo>
<echo> mockobjects.jar = [${mockobjects.jar}]</echo>
<echo> jetty.jar = [${jetty.jar}]</echo>
@@ -116,6 +117,7 @@
<pathelement location="${httpunit.jar}"/>
<pathelement location="${j2ee.jar}"/>
<pathelement location="${servlet.jar}"/>
+ <pathelement location="${jsp.jar}"/>
<pathelement location="${junit.jar}"/>
<pathelement location="${xmlapis.jar}"/>
</path>
@@ -128,6 +130,7 @@
<available file="${httpunit.jar}"/>
<available file="${j2ee.jar}"/>
<available file="${servlet.jar}"/>
+ <available file="${jsp.jar}"/>
<available file="${junit.jar}"/>
<available file="${mockobjects.jar}"/>
<available file="${jetty.jar}"/>
1.40 +45 -11 jakarta-cactus/framework/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/build.properties.sample,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- build.properties.sample 22 May 2004 11:41:39 -0000 1.39
+++ build.properties.sample 22 May 2004 16:39:34 -0000 1.40
@@ -12,6 +12,9 @@
# WARNING: The relative paths below are relative to the parent directory
# of this file
+# Note: Most of the libraries defined below can be automatically downloaded by
+# typing "ant -f download.xml".
+
# -----------------------------------------------------------------------------
# Mandatory properties
# -----------------------------------------------------------------------------
@@ -26,16 +29,47 @@
# the Cactus jar will contain the Filter Redirector which is only available for
# Servlet 2.3+ (part of J2EE 1.3+).
#
-# Note: In the future we'll work towards using the JSR jars provided by
-# the Geronimo project.
-# - For J2EE 1.3: http://java.sun.com/j2ee/sdk_1.3/
-# - For J2EE 1.2: http://java.sun.com/j2ee/sdk_1.2.1/
-j2ee.jar = ${lib.repo}/jboss/jars/jboss-j2ee-3.2.3.jar
-#j2ee.jar = ${lib.repo}/j2ee/jars/j2ee-1.2.jar
-
-# Location of the Servlet API jar.
-servlet.jar = ${lib.repo}/servletapi/jars/servletapi-2.3.jar
-#servlet.jar = ${lib.repo}/servletapi/jars/servletapi-2.2.jar
+# Note: If you're using J2EE 1.2, you won't be able to automatically download
+# the jar file as it's only available through the Sun website and is not
+# redistributable. You can download it manually here:
+# http://java.sun.com/j2ee/sdk_1.2.1/
+
+# List all available J2EE API versions. Note that it is required to list all
+# versions if you wish to call "ant release" in jakarta-cactus. If you only
+# wish to build a single Cactus project you only need to list the version you
+# wish to use.
+j2ee.12.jar = ${lib.repo}/j2ee/jars/j2ee-1.2.jar
+j2ee.13.jar = ${lib.repo}/jboss/jars/jboss-j2ee-3.2.3.jar
+j2ee.14.jar = ${lib.repo}/jboss/jars/jboss-j2ee-4.0.0DR4.jar
+
+# The J2EE API version to use
+j2ee.jar = ${j2ee.13.jar}
+
+# Location of the Servlet API jars.
+
+# List all available Servlet versions. Note that it is required to list all
+# versions if you wish to call "ant release" in jakarta-cactus. If you only
+# wish to build a single Cactus project you only need to list the version you
+# wish to use.
+servlet.22.jar = ${lib.repo}/servletapi/jars/servletapi-2.2.jar
+servlet.23.jar = ${lib.repo}/servletapi/jars/servletapi-2.3.jar
+servlet.24.jar = ${lib.repo}/servletapi/jars/servlet-api-2.4-20040521.jar
+
+# The Servlet API version to use
+servlet.jar = ${servlet.23.jar}
+
+# Location of the JSP API jars.
+
+# List all available JSP versions. Note that it is required to list all
+# versions if you wish to call "ant release" in jakarta-cactus. If you only
+# wish to build a single Cactus project you only need to list the version you
+# wish to use.
+jsp.11.jar = ${servlet.22.jar}
+jsp.12.jar = ${servlet.23.jar}
+jsp.20.jar = ${lib.repo}/jspapi/jars/jsp-api-2.0-20040521.jar
+
+# The Servlet API version to use
+jsp.jar = ${jsp.12.jar}
# The location of the Commons Logging jar
commons.logging.jar = ${lib.repo}/commons-logging/jars/commons-logging-1.0.3.jar
1.8 +3 -0 jakarta-cactus/framework/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 13 Oct 2003 20:48:32 -0000 1.7
+++ .cvsignore 22 May 2004 16:39:34 -0000 1.8
@@ -2,10 +2,13 @@
logging.properties
dist-12
dist-13
+dist-14
target-12
target-13
+target-14
release-12
release-13
+release-14
ant.bat
target
.classpath
1.1 jakarta-cactus/framework/src/java/j2ee-14/org/apache/cactus/server/HttpServletRequestWrapper.java
Index: HttpServletRequestWrapper.java
===================================================================
/*
* ========================================================================
*
* Copyright 2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* ========================================================================
*/
package org.apache.cactus.server;
import javax.servlet.http.HttpServletRequest;
import org.apache.cactus.ServletURL;
/**
* Provide implementation of
* {@link javax.servlet.http.HttpServletRequest} for the Servlet 2.4
* API specifications.
*
* @see AbstractHttpServletRequestWrapper23
* @version $Id: HttpServletRequestWrapper.java,v 1.1 2004/05/22 16:39:34 vmassol Exp $
*/
public class HttpServletRequestWrapper
extends AbstractHttpServletRequestWrapper23
{
/**
* @see AbstractHttpServletRequestWrapper23#AbstractHttpServletRequestWrapper23(HttpServletRequest, ServletURL)
*/
public HttpServletRequestWrapper(HttpServletRequest theRequest,
ServletURL theURL)
{
super(theRequest, theURL);
}
// Unmodified methods --------------------------------------------------
/**
* @see javax.servlet.ServletRequest#getRemotePort()
*/
public int getRemotePort()
{
// TODO: Support simulation URL
return this.request.getRemotePort();
}
/**
* @see javax.servlet.ServletRequest#getLocalName()
*/
public String getLocalName()
{
// TODO: Support simulation URL
return this.request.getLocalName();
}
/**
* @see javax.servlet.ServletRequest#getLocalAddr()
*/
public String getLocalAddr()
{
// TODO: Support simulation URL
return this.request.getLocalAddr();
}
/**
* @see javax.servlet.ServletRequest#getLocalPort()
*/
public int getLocalPort()
{
// TODO: Support simulation URL
return this.request.getLocalPort();
}
}
1.1 jakarta-cactus/framework/src/java/j2ee-14/org/apache/cactus/server/PageContextWrapper.java
Index: PageContextWrapper.java
===================================================================
/*
* ========================================================================
*
* Copyright 2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* ========================================================================
*/
package org.apache.cactus.server;
import java.io.IOException;
import javax.servlet.ServletException;
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.el.ExpressionEvaluator;
import javax.servlet.jsp.el.VariableResolver;
import org.apache.cactus.ServletURL;
/**
* Provide implementation of
* {@link javax.servlet.jsp.PageContext} for the Servlet 2.4
* API specifications.
*
* @see AbstractPageContextWrapper23
* @version $Id: PageContextWrapper.java,v 1.1 2004/05/22 16:39:34 vmassol Exp $
*/
public class PageContextWrapper extends AbstractPageContextWrapper23
{
/**
* @see AbstractPageContextWrapper23#AbstractPageContextWrapper23(PageContext, ServletURL)
*/
public PageContextWrapper(PageContext theOriginalPageContext,
ServletURL theURL)
{
super(theOriginalPageContext, theURL);
}
// Unmodified methods --------------------------------------------------
/**
* @see PageContext#include(java.lang.String, boolean)
*/
public void include(String theRelativeUrlPath, boolean isToBeFlushed)
throws ServletException, IOException
{
// TODO: Support simulation URL
this.originalPageContext.include(theRelativeUrlPath, isToBeFlushed);
}
/**
* @see javax.servlet.jsp.JspContext#getExpressionEvaluator()
*/
public ExpressionEvaluator getExpressionEvaluator()
{
return this.originalPageContext.getExpressionEvaluator();
}
/**
* @see javax.servlet.jsp.JspContext#getVariableResolver()
*/
public VariableResolver getVariableResolver()
{
return this.originalPageContext.getVariableResolver();
}
}
1.2 +12 -4 jakarta-cactus/framework/src/java/share-12-13-14/org/apache/cactus/server/AbstractHttpServletRequestWrapper.java
Index: AbstractHttpServletRequestWrapper.java
===================================================================
RCS file: /home/cvs/jakarta-cactus/framework/src/java/share-12-13-14/org/apache/cactus/server/AbstractHttpServletRequestWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractHttpServletRequestWrapper.java 22 May 2004 11:34:48 -0000 1.1
+++ AbstractHttpServletRequestWrapper.java 22 May 2004 16:39:34 -0000 1.2
@@ -1,7 +1,7 @@
/*
* ========================================================================
*
- * Copyright 2001-2003 The Apache Software Foundation.
+ * Copyright 2001-2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -39,8 +39,16 @@
import org.apache.commons.logging.LogFactory;
/**
- * Abstract wrapper around <code>HttpServletRequest</code>. This class provides
- * a common implementation of the wrapper for the different servlet API.
+ * Abstract wrapper around {@link HttpServletRequest}. This class provides
+ * a common implementation of the wrapper for the different Servlet APIs.
+ * This is an implementation that delegates all the call to the
+ * {@link HttpServletRequest} object passed in the constructor except for
+ * some overidden methods which are use to simulate a URL. This is to be able
+ * to simulate any URL that would have been used to call the test method : if
+ * this was not done, the URL that would be returned (by calling the
+ * {@link HttpServletRequest#getRequestURI()} method or others alike) would be
+ * the URL of the Cactus redirector servlet and not a URL that the test case
+ * want to simulate.
*
* @version $Id$
*/
1.194 +3 -0 jakarta-cactus/documentation/docs/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/changes.xml,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- changes.xml 16 May 2004 09:43:20 -0000 1.193
+++ changes.xml 22 May 2004 16:39:34 -0000 1.194
@@ -90,6 +90,9 @@
</devs>
<release version="1.7dev" date="in CVS">
+ <action dev="VMA" type="change">
+ Building Cactus from the sources now requires Ant 1.6.1+.
+ </action>
<action dev="VMA" type="update" issue="CACTUS-120">
Ensure faster shutdown times with WebLogic 7.x by using the
<code>FORCESHUTDOWN</code> WebLogic command instead of the graceful
1.112 +45 -23 jakarta-cactus/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-cactus/build.properties.sample,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- build.properties.sample 22 May 2004 11:41:39 -0000 1.111
+++ build.properties.sample 22 May 2004 16:39:34 -0000 1.112
@@ -33,6 +33,9 @@
# WARNING: The relative paths below are relative to the directory where the
# build.xml file is located.
+# Note: Most of the libraries defined below can be automatically downloaded by
+# typing "ant -f download.xml".
+
# -----------------------------------------------------------------------------
# Mandatory properties shared by several subprojects
# -----------------------------------------------------------------------------
@@ -47,16 +50,47 @@
# the Cactus jar will contain the Filter Redirector which is only available for
# Servlet 2.3+ (part of J2EE 1.3+).
#
-# Note: In the future we'll work towards using the JSR jars provided by
-# the Geronimo project.
-# - For J2EE 1.3: http://java.sun.com/j2ee/sdk_1.3/
-# - For J2EE 1.2: http://java.sun.com/j2ee/sdk_1.2.1/
-j2ee.jar = ${lib.repo}/jboss/jars/jboss-j2ee-3.2.3.jar
-#j2ee.jar = ${lib.repo}/j2ee/jars/j2ee-1.2.jar
-
-# Location of the Servlet API jar.
-servlet.jar = ${lib.repo}/servletapi/jars/servletapi-2.3.jar
-#servlet.jar = ${lib.repo}/servletapi/jars/servletapi-2.2.jar
+# Note: If you're using J2EE 1.2, you won't be able to automatically download
+# the jar file as it's only available through the Sun website and is not
+# redistributable. You can download it manually here:
+# http://java.sun.com/j2ee/sdk_1.2.1/
+
+# List all available J2EE API versions. Note that it is required to list all
+# versions if you wish to call "ant release" in jakarta-cactus. If you only
+# wish to build a single Cactus project you only need to list the version you
+# wish to use.
+j2ee.12.jar = ${lib.repo}/j2ee/jars/j2ee-1.2.jar
+j2ee.13.jar = ${lib.repo}/jboss/jars/jboss-j2ee-3.2.3.jar
+j2ee.14.jar = ${lib.repo}/jboss/jars/jboss-j2ee-4.0.0DR4.jar
+
+# The J2EE API version to use
+j2ee.jar = ${j2ee.13.jar}
+
+# Location of the Servlet API jars.
+
+# List all available Servlet versions. Note that it is required to list all
+# versions if you wish to call "ant release" in jakarta-cactus. If you only
+# wish to build a single Cactus project you only need to list the version you
+# wish to use.
+servlet.22.jar = ${lib.repo}/servletapi/jars/servletapi-2.2.jar
+servlet.23.jar = ${lib.repo}/servletapi/jars/servletapi-2.3.jar
+servlet.24.jar = ${lib.repo}/servletapi/jars/servlet-api-2.4-20040521.jar
+
+# The Servlet API version to use
+servlet.jar = ${servlet.23.jar}
+
+# Location of the JSP API jars.
+
+# List all available JSP versions. Note that it is required to list all
+# versions if you wish to call "ant release" in jakarta-cactus. If you only
+# wish to build a single Cactus project you only need to list the version you
+# wish to use.
+jsp.11.jar = ${servlet.22.jar}
+jsp.12.jar = ${servlet.23.jar}
+jsp.20.jar = ${lib.repo}/jspapi/jars/jsp-api-2.0-20040521.jar
+
+# The Servlet API version to use
+jsp.jar = ${jsp.12.jar}
# The location of the Commons Logging jar
commons.logging.jar = ${lib.repo}/commons-logging/jars/commons-logging-1.0.3.jar
@@ -135,18 +169,6 @@
eclipse.swt.jar = ${eclipse.home}/plugins/org.eclipse.swt.win32_2.1.2/ws/win32/swt.jar
eclipse.ui.externaltools.jar = ${eclipse.home}/plugins/org.eclipse.ui.externaltools_2.1.1/externaltools.jar
eclipse.ui.workbench.jar = ${eclipse.home}/plugins/org.eclipse.ui.workbench_2.1.1/workbench.jar
-
-# -----------------------------------------------------------------------------
-# Optional properties for the main Cactus build
-# -----------------------------------------------------------------------------
-
-# Location of J2EE API jars for the "*.all" targets
-j2ee.12.jar = ${lib.repo}/j2ee/jars/j2ee-1.2.jar
-j2ee.13.jar = ${lib.repo}/jboss/jars/jboss-j2ee-3.2.3.jar
-
-# Location of Servlet API jars for the "*.all" targets
-servlet.22.jar = ${lib.repo}/servletapi/jars/servletapi-2.2.jar
-servlet.23.jar = ${lib.repo}/servletapi/jars/servletapi-2.3.jar
# -----------------------------------------------------------------------------
# Optional properties share by several subprojects
1.24 +45 -23 jakarta-cactus/build.properties.vmassol
Index: build.properties.vmassol
===================================================================
RCS file: /home/cvs/jakarta-cactus/build.properties.vmassol,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- build.properties.vmassol 22 May 2004 11:41:39 -0000 1.23
+++ build.properties.vmassol 22 May 2004 16:39:34 -0000 1.24
@@ -26,6 +26,9 @@
# WARNING: The relative paths below are relative to the directory where the
# build.xml file is located.
+# Note: Most of the libraries defined below can be automatically downloaded by
+# typing "ant -f download.xml".
+
# -----------------------------------------------------------------------------
# Mandatory properties shared by several subprojects
# -----------------------------------------------------------------------------
@@ -40,16 +43,47 @@
# the Cactus jar will contain the Filter Redirector which is only available for
# Servlet 2.3+ (part of J2EE 1.3+).
#
-# Note: In the future we'll work towards using the JSR jars provided by
-# the Geronimo project.
-# - For J2EE 1.3: http://java.sun.com/j2ee/sdk_1.3/
-# - For J2EE 1.2: http://java.sun.com/j2ee/sdk_1.2.1/
-j2ee.jar = ${lib.repo}/jboss/jars/jboss-j2ee-3.2.3.jar
-#j2ee.jar = ${lib.repo}/j2ee/jars/j2ee-1.2.jar
-
-# Location of the Servlet API jar.
-servlet.jar = ${lib.repo}/servletapi/jars/servletapi-2.3.jar
-#servlet.jar = ${lib.repo}/servletapi/jars/servletapi-2.2.jar
+# Note: If you're using J2EE 1.2, you won't be able to automatically download
+# the jar file as it's only available through the Sun website and is not
+# redistributable. You can download it manually here:
+# http://java.sun.com/j2ee/sdk_1.2.1/
+
+# List all available J2EE API versions. Note that it is required to list all
+# versions if you wish to call "ant release" in jakarta-cactus. If you only
+# wish to build a single Cactus project you only need to list the version you
+# wish to use.
+j2ee.12.jar = ${lib.repo}/j2ee/jars/j2ee-1.2.jar
+j2ee.13.jar = ${lib.repo}/jboss/jars/jboss-j2ee-3.2.3.jar
+j2ee.14.jar = ${lib.repo}/jboss/jars/jboss-j2ee-4.0.0DR4.jar
+
+# The J2EE API version to use
+j2ee.jar = ${j2ee.13.jar}
+
+# Location of the Servlet API jars.
+
+# List all available Servlet versions. Note that it is required to list all
+# versions if you wish to call "ant release" in jakarta-cactus. If you only
+# wish to build a single Cactus project you only need to list the version you
+# wish to use.
+servlet.22.jar = ${lib.repo}/servletapi/jars/servletapi-2.2.jar
+servlet.23.jar = ${lib.repo}/servletapi/jars/servletapi-2.3.jar
+servlet.24.jar = ${lib.repo}/servletapi/jars/servlet-api-2.4-20040521.jar
+
+# The Servlet API version to use
+servlet.jar = ${servlet.23.jar}
+
+# Location of the JSP API jars.
+
+# List all available JSP versions. Note that it is required to list all
+# versions if you wish to call "ant release" in jakarta-cactus. If you only
+# wish to build a single Cactus project you only need to list the version you
+# wish to use.
+jsp.11.jar = ${servlet.22.jar}
+jsp.12.jar = ${servlet.23.jar}
+jsp.20.jar = ${lib.repo}/jspapi/jars/jsp-api-2.0-20040521.jar
+
+# The Servlet API version to use
+jsp.jar = ${jsp.12.jar}
# The location of the Commons Logging jar
commons.logging.jar = ${lib.repo}/commons-logging/jars/commons-logging-1.0.3.jar
@@ -128,18 +162,6 @@
eclipse.swt.jar = ${eclipse.home}/plugins/org.eclipse.swt.win32_2.1.0/ws/win32/swt.jar
eclipse.ui.workbench.jar = ${eclipse.home}/plugins/org.eclipse.ui.workbench_2.1.0/workbench.jar
eclipse.ui.externaltools.jar = ${eclipse.home}/plugins/org.eclipse.ui.externaltools_2.1.0/externaltools.jar
-
-# -----------------------------------------------------------------------------
-# Optional properties for the main Cactus build
-# -----------------------------------------------------------------------------
-
-# Location of J2EE API jars for the "*.all" targets
-j2ee.12.jar = ${lib.repo}/j2ee/jars/j2ee-1.2.jar
-j2ee.13.jar = ${lib.repo}/jboss/jars/jboss-j2ee-3.2.3.jar
-
-# Location of Servlet API jars for the "*.all" targets
-servlet.22.jar = ${lib.repo}/servletapi/jars/servletapi-2.2.jar
-servlet.23.jar = ${lib.repo}/servletapi/jars/servletapi-2.3.jar
# -----------------------------------------------------------------------------
# Optional properties share by several subprojects
1.1 jakarta-cactus/framework/src/java/j2ee-13/org/apache/cactus/server/PageContextWrapper.java
Index: PageContextWrapper.java
===================================================================
/*
* ========================================================================
*
* Copyright 2001-2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* ========================================================================
*/
package org.apache.cactus.server;
import javax.servlet.jsp.PageContext;
import org.apache.cactus.ServletURL;
/**
* Provide implementation of
* {@link javax.servlet.jsp.PageContext} for the Servlet 2.3
* API specifications.
*
* @see AbstractPageContextWrapper23
* @version $Id: PageContextWrapper.java,v 1.1 2004/05/22 16:39:34 vmassol Exp $
*/
public class PageContextWrapper extends AbstractPageContextWrapper23
{
/**
* @see AbstractPageContextWrapper23#AbstractPageContextWrapper23(PageContext, ServletURL)
*/
public PageContextWrapper(PageContext theOriginalPageContext,
ServletURL theURL)
{
super(theOriginalPageContext, theURL);
}
}
1.1 jakarta-cactus/framework/src/java/j2ee-13/org/apache/cactus/server/HttpServletRequestWrapper.java
Index: HttpServletRequestWrapper.java
===================================================================
/*
* ========================================================================
*
* Copyright 2001-2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* ========================================================================
*/
package org.apache.cactus.server;
import javax.servlet.http.HttpServletRequest;
import org.apache.cactus.ServletURL;
/**
* Provide implementation of
* {@link javax.servlet.http.HttpServletRequestWrapper} for the Servlet 2.3
* API specifications.
*
* @see AbstractHttpServletRequestWrapper23
* @version $Id: HttpServletRequestWrapper.java,v 1.1 2004/05/22 16:39:34 vmassol Exp $
*/
public class HttpServletRequestWrapper
extends AbstractHttpServletRequestWrapper23
{
/**
* @see AbstractHttpServletRequestWrapper23#AbstractHttpServletRequestWrapper23(HttpServletRequest, ServletURL)
*/
public HttpServletRequestWrapper(HttpServletRequest theRequest,
ServletURL theURL)
{
super(theRequest, theURL);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org