dims 01/06/14 04:13:11
Modified: src/org/apache/cocoon/environment/http Tag: cocoon_20_branch
RequestWrapper22.java RequestWrapper23.java
src/org/apache/cocoon/servlet Tag: cocoon_20_branch
CocoonServlet.java
src/org/apache/cocoon/sitemap Tag: cocoon_20_branch
AbstractSitemap.java
Added: src/org/apache/cocoon/acting Tag: cocoon_20_branch
HttpHeaderAction.java
Log:
Sync with 2.1 Latest code.
Revision Changes Path
No revision
No revision
1.1.2.1 +0 -0 xml-cocoon2/src/org/apache/cocoon/acting/HttpHeaderAction.java
Index: HttpHeaderAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/HttpHeaderAction.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
No revision
No revision
1.1.1.1.2.1 +2 -2
xml-cocoon2/src/org/apache/cocoon/environment/http/RequestWrapper22.java
Index: RequestWrapper22.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/http/RequestWrapper22.java,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- RequestWrapper22.java 2001/05/09 20:49:46 1.1.1.1
+++ RequestWrapper22.java 2001/06/14 11:13:02 1.1.1.1.2.1
@@ -28,9 +28,9 @@
public class RequestWrapper extends MaybeUploadRequestWrapper {
- public RequestWrapper(HttpServletRequest httpservletrequest, File file, boolean
flag, boolean flag1)
+ public RequestWrapper(HttpServletRequest httpservletrequest, boolean flag1,
File file, boolean flag2, boolean flag3, int size)
throws Exception {
- super(httpservletrequest, file, flag, flag1);
+ super(httpservletrequest, flag1, file, flag2, flag3, size);
}
}
1.1.1.1.2.1 +2 -2
xml-cocoon2/src/org/apache/cocoon/environment/http/RequestWrapper23.java
Index: RequestWrapper23.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/http/RequestWrapper23.java,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- RequestWrapper23.java 2001/05/09 20:49:46 1.1.1.1
+++ RequestWrapper23.java 2001/06/14 11:13:03 1.1.1.1.2.1
@@ -28,9 +28,9 @@
public class RequestWrapper extends MaybeUploadRequestWrapper implements
HttpServletRequest {
- public RequestWrapper(HttpServletRequest httpservletrequest, File file, boolean
flag, boolean flag1)
+ public RequestWrapper(HttpServletRequest httpservletrequest, boolean flag1,
File file, boolean flag2, boolean flag3, int size)
throws Exception {
- super(httpservletrequest, file, flag, flag1);
+ super(httpservletrequest, flag1, file, flag2, flag3, size);
}
public java.util.Map getParameterMap() {
No revision
No revision
1.13.2.2 +6 -2 xml-cocoon2/src/org/apache/cocoon/servlet/CocoonServlet.java
Index: CocoonServlet.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/servlet/CocoonServlet.java,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -u -r1.13.2.1 -r1.13.2.2
--- CocoonServlet.java 2001/06/08 14:33:12 1.13.2.1
+++ CocoonServlet.java 2001/06/14 11:13:06 1.13.2.2
@@ -58,7 +58,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Nicola Ken Barozzi</a> Aisa
* @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
- * @version CVS $Revision: 1.13.2.1 $ $Date: 2001/06/08 14:33:12 $
+ * @version CVS $Revision: 1.13.2.2 $ $Date: 2001/06/14 11:13:06 $
*/
public class CocoonServlet extends HttpServlet {
@@ -78,6 +78,8 @@
private static final boolean ALLOW_OVERWRITE = false;
private static final boolean SILENTLY_RENAME = true;
+ private static final boolean SAVE_UPLOADED_FILES_TO_DISK = true;
+ private static final int MAX_UPLOAD_SIZE = 10000000; // 10Mb
private File uploadDir;
private File workDir;
@@ -373,9 +375,11 @@
if (contentType.startsWith("multipart/form-data")) {
try {
req = new RequestWrapper(request,
+ CocoonServlet.SAVE_UPLOADED_FILES_TO_DISK,
this.uploadDir,
CocoonServlet.ALLOW_OVERWRITE,
- CocoonServlet.SILENTLY_RENAME);
+ CocoonServlet.SILENTLY_RENAME,
+ CocoonServlet.MAX_UPLOAD_SIZE);
} catch (Exception e) {
log.warn("Could not create RequestWrapper", e);
req = request;
No revision
No revision
1.4.2.8 +14 -18 xml-cocoon2/src/org/apache/cocoon/sitemap/AbstractSitemap.java
Index: AbstractSitemap.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/sitemap/AbstractSitemap.java,v
retrieving revision 1.4.2.7
retrieving revision 1.4.2.8
diff -u -r1.4.2.7 -r1.4.2.8
--- AbstractSitemap.java 2001/06/08 20:21:26 1.4.2.7
+++ AbstractSitemap.java 2001/06/14 11:13:09 1.4.2.8
@@ -43,7 +43,7 @@
* Base class for generated <code>Sitemap</code> classes
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
- * @version CVS $Revision: 1.4.2.7 $ $Date: 2001/06/08 20:21:26 $
+ * @version CVS $Revision: 1.4.2.8 $ $Date: 2001/06/14 11:13:09 $
*/
public abstract class AbstractSitemap extends AbstractLoggable implements Sitemap,
Disposable, ThreadSafe {
private Context context;
@@ -91,11 +91,7 @@
this.manager.setRoleManager(AbstractSitemap.roleManager);
try {
- if (AbstractSitemap.defaultConfig != null) {
- this.manager.configure(AbstractSitemap.defaultConfig);
- AbstractSitemap.defaultConfig = null;
- }
-
+ this.manager.configure(AbstractSitemap.defaultConfig);
this.urlFactory = (URLFactory)manager.lookup(Roles.URL_FACTORY);
// Create Sitemap Selectors
@@ -107,15 +103,6 @@
this.matchers = new SitemapComponentSelector();
this.selectors = new SitemapComponentSelector();
- // Setup the Selectors
- this.setupSelector(this.generators);
- this.setupSelector(this.transformers);
- this.setupSelector(this.serializers);
- this.setupSelector(this.readers);
- this.setupSelector(this.actions);
- this.setupSelector(this.matchers);
- this.setupSelector(this.selectors);
-
// Set Parent Sitemap Selectors
try {
this.generators.setParentSelector((SitemapComponentSelector)
this.manager.lookup(Roles.GENERATORS));
@@ -132,6 +119,15 @@
*/
}
+ // Setup the Selectors
+ this.setupSelector(this.generators);
+ this.setupSelector(this.transformers);
+ this.setupSelector(this.serializers);
+ this.setupSelector(this.readers);
+ this.setupSelector(this.actions);
+ this.setupSelector(this.matchers);
+ this.setupSelector(this.selectors);
+
// Add the Selectors
this.manager.addComponentInstance(Roles.GENERATORS, this.generators);
this.manager.addComponentInstance(Roles.TRANSFORMERS,
this.transformers);
@@ -285,12 +281,12 @@
}
m = s.lastIndexOf('/');
if (m == -1) {
- result.append((String)((Map)list.get(k)).get(s));
+ result.append(((Object)((Map)list.get(k)).get(s)).toString());
} else {
- result.append((String)((Map)list.get(k)).get(s.substring(m +
1)));
+ result.append(((Object)((Map)list.get(k)).get(s.substring(m +
1))).toString());
}
getLogger().debug("substitute evaluated value for " + ((m == -1) ?
s : s.substring(m + 1)) + " as " +
- (String)((Map)list.get(k)).get((m == -1) ? s : s.substring(m +
1)));
+ ((Object)((Map)list.get(k)).get((m == -1) ? s : s.substring(m +
1))).toString());
}
if (ii < expr.length()) {
result.append(expr.substring(ii));
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
