You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2008/01/28 19:28:14 UTC
svn commit: r615978 - in /tapestry/tapestry5/trunk: src/site/apt/dev/
tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/
tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/
tapestry-upload/src/main/java/org/apach...
Author: hlship
Date: Mon Jan 28 10:28:10 2008
New Revision: 615978
URL: http://svn.apache.org/viewvc?rev=615978&view=rev
Log:
TAPESTRY-2094: Exception when creating service MultipartDecoder prevents the use of the Upload component
Added:
tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/
tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/
tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/MultipartDecoderImpl.java (contents, props changed)
- copied, changed from r615326, tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/MultipartDecoderImpl.java
tapestry/tapestry5/trunk/tapestry-upload/src/main/resources/org/apache/tapestry/upload/internal/
tapestry/tapestry5/trunk/tapestry-upload/src/main/resources/org/apache/tapestry/upload/internal/services/
tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/RunJettyUpload.java
tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/internal/
tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/internal/services/
Removed:
tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/MultipartDecoderImpl.java
Modified:
tapestry/tapestry5/trunk/src/site/apt/dev/checklist.apt
tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/UploadModule.java
tapestry/tapestry5/trunk/tapestry-upload/src/test/conf/testng.xml
tapestry/tapestry5/trunk/tapestry-upload/src/test/webapp/WEB-INF/web.xml
Modified: tapestry/tapestry5/trunk/src/site/apt/dev/checklist.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/src/site/apt/dev/checklist.apt?rev=615978&r1=615977&r2=615978&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/src/site/apt/dev/checklist.apt (original)
+++ tapestry/tapestry5/trunk/src/site/apt/dev/checklist.apt Mon Jan 28 10:28:10 2008
@@ -174,11 +174,8 @@
----
> cd ~hlship/public_html/tapestry-ibiblio-rsynch-repository/
-> tar cf - * | ( cd /www/people.apache.org/repo/m2-ibiblio-rsync-repository && tar xvf - )
+> rsync -av * /www/people.apache.org/repo/m2-ibiblio-rsync-repository
----
-
- This is an old hack for merging one directory into another. <Could this be done easier using rsync?>
-
The aritfacts copied to m2-ibiblio-rsync-repository will (eventually) by copied to the central Maven ibiblio repository, where they will be
visible to every Maven user.
Copied: tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/MultipartDecoderImpl.java (from r615326, tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/MultipartDecoderImpl.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/MultipartDecoderImpl.java?p2=tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/MultipartDecoderImpl.java&p1=tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/MultipartDecoderImpl.java&r1=615326&r2=615978&rev=615978&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/MultipartDecoderImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/MultipartDecoderImpl.java Mon Jan 28 10:28:10 2008
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.upload.services;
+package org.apache.tapestry.upload.internal.services;
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.FileItemFactory;
@@ -23,6 +23,9 @@
import org.apache.tapestry.ioc.annotations.Symbol;
import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
import org.apache.tapestry.ioc.services.ThreadCleanupListener;
+import org.apache.tapestry.upload.services.MultipartDecoder;
+import org.apache.tapestry.upload.services.UploadSymbols;
+import org.apache.tapestry.upload.services.UploadedFile;
import javax.servlet.http.HttpServletRequest;
import java.io.File;
@@ -33,7 +36,7 @@
/**
* Implementation of multipart decoder for servlets. This implementation is perthread scope.
*/
-class MultipartDecoderImpl implements MultipartDecoder, ThreadCleanupListener
+public class MultipartDecoderImpl implements MultipartDecoder, ThreadCleanupListener
{
private final Map<String, UploadedFileItem> _uploads = newMap();
Propchange: tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/MultipartDecoderImpl.java
------------------------------------------------------------------------------
svn:executable = *
Modified: tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/UploadModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/UploadModule.java?rev=615978&r1=615977&r2=615978&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/UploadModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/UploadModule.java Mon Jan 28 10:28:10 2008
@@ -23,6 +23,8 @@
import org.apache.tapestry.ioc.services.ThreadCleanupHub;
import org.apache.tapestry.services.HttpServletRequestFilter;
import org.apache.tapestry.services.LibraryMapping;
+import org.apache.tapestry.upload.internal.services.MultipartDecoderImpl;
+import org.apache.tapestry.upload.internal.services.MultipartServletRequestFilter;
import java.util.concurrent.atomic.AtomicBoolean;
Modified: tapestry/tapestry5/trunk/tapestry-upload/src/test/conf/testng.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/test/conf/testng.xml?rev=615978&r1=615977&r2=615978&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-upload/src/test/conf/testng.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-upload/src/test/conf/testng.xml Mon Jan 28 10:28:10 2008
@@ -1,6 +1,6 @@
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
<!--
- Copyright 2007 The Apache Software Foundation
+ Copyright 2007, 2008 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.
@@ -20,7 +20,7 @@
<parameter name="tapestry.integration-webapp" value="src/test/webapp"/>
<packages>
<package name="org.apache.tapestry.upload.components"/>
- <package name="org.apache.tapestry.upload.services"/>
+ <package name="org.apache.tapestry.upload.internal.services"/>
<!-- One day might be able to run this too -->
<!--package name="org.apache.tapestry.upload.integration"/-->
</packages>
Added: tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/RunJettyUpload.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/RunJettyUpload.java?rev=615978&view=auto
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/RunJettyUpload.java (added)
+++ tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/RunJettyUpload.java Mon Jan 28 10:28:10 2008
@@ -0,0 +1,29 @@
+// Copyright 2008 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.tapestry.upload;
+
+import org.apache.tapestry.test.JettyRunner;
+
+import java.io.File;
+
+public class RunJettyUpload
+{
+ public static void main(String[] args) throws InterruptedException
+ {
+ File workingDir = new File(System.getProperty("user.dir"));
+
+ new JettyRunner(workingDir, "/", 8080, "src/test/webapp");
+ }
+}
Modified: tapestry/tapestry5/trunk/tapestry-upload/src/test/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/test/webapp/WEB-INF/web.xml?rev=615978&r1=615977&r2=615978&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-upload/src/test/webapp/WEB-INF/web.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-upload/src/test/webapp/WEB-INF/web.xml Mon Jan 28 10:28:10 2008
@@ -1,6 +1,6 @@
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- <!--
- Copyright 2007 The Apache Software Foundation
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006, 2008 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.
@@ -15,19 +15,22 @@
limitations under the License.
-->
- <web-app>
- <display-name>Tapestry-Upload Integration Test Application</display-name>
- <context-param>
+<!DOCTYPE web-app
+ PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+ <display-name>Tapestry-Upload Integration Test Application</display-name>
+ <context-param>
<param-name>tapestry.app-package</param-name>
<param-value>org.example.upload</param-value>
- </context-param>
- <filter>
+ </context-param>
+ <filter>
<filter-name>app</filter-name>
<filter-class>org.apache.tapestry.TapestryFilter</filter-class>
- </filter>
- <filter-mapping>
+ </filter>
+ <filter-mapping>
<filter-name>app</filter-name>
<url-pattern>/*</url-pattern>
- </filter-mapping>
+ </filter-mapping>
- </web-app>
+</web-app>