You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2008/01/28 19:44:19 UTC
svn commit: r615986 - in /tapestry/tapestry5/trunk/tapestry-upload/src:
main/java/org/apache/tapestry/upload/internal/services/
main/java/org/apache/tapestry/upload/services/
main/resources/org/apache/tapestry/upload/internal/services/
main/resources/o...
Author: hlship
Date: Mon Jan 28 10:44:16 2008
New Revision: 615986
URL: http://svn.apache.org/viewvc?rev=615986&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/services/MultipartServletRequestFilter.java (contents, props changed)
- copied, changed from r614643, tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/MultipartServletRequestFilter.java
tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/ParameterValue.java (contents, props changed)
- copied, changed from r614643, tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/ParameterValue.java
tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/ParametersServletRequestWrapper.java (contents, props changed)
- copied, changed from r614643, tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/ParametersServletRequestWrapper.java
tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/UploadMessages.java (contents, props changed)
- copied, changed from r614643, tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/UploadMessages.java
tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/UploadedFileItem.java (contents, props changed)
- copied, changed from r614643, tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/UploadedFileItem.java
tapestry/tapestry5/trunk/tapestry-upload/src/main/resources/org/apache/tapestry/upload/internal/services/UploadStrings.properties (contents, props changed)
- copied, changed from r614643, tapestry/tapestry5/trunk/tapestry-upload/src/main/resources/org/apache/tapestry/upload/services/UploadStrings.properties
tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/internal/services/MultipartDecoderImplTest.java (contents, props changed)
- copied, changed from r614643, tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/services/MultipartDecoderImplTest.java
tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/internal/services/MultipartServletRequestFilterTest.java (contents, props changed)
- copied, changed from r614643, tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/services/MultipartServletRequestFilterTest.java
tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/internal/services/ParameterValueTest.java (contents, props changed)
- copied, changed from r614643, tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/services/ParameterValueTest.java
tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/internal/services/ParametersServletRequestWrapperTest.java (contents, props changed)
- copied, changed from r614643, tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/services/ParametersServletRequestWrapperTest.java
tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/internal/services/StubFileItem.java (contents, props changed)
- copied, changed from r614643, tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/services/StubFileItem.java
tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/internal/services/UploadedFileItemTest.java (contents, props changed)
- copied, changed from r614643, tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/services/UploadedFileItemTest.java
tapestry/tapestry5/trunk/tapestry-upload/src/test/webapp/Start.tml (contents, props changed)
- copied, changed from r614643, tapestry/tapestry5/trunk/tapestry-upload/src/test/webapp/WEB-INF/Start.tml
Removed:
tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/MultipartServletRequestFilter.java
tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/ParameterValue.java
tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/ParametersServletRequestWrapper.java
tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/UploadMessages.java
tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/UploadedFileItem.java
tapestry/tapestry5/trunk/tapestry-upload/src/main/resources/org/apache/tapestry/upload/services/UploadStrings.properties
tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/services/MultipartDecoderImplTest.java
tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/services/MultipartServletRequestFilterTest.java
tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/services/ParameterValueTest.java
tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/services/ParametersServletRequestWrapperTest.java
tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/services/StubFileItem.java
tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/services/UploadedFileItemTest.java
tapestry/tapestry5/trunk/tapestry-upload/src/test/webapp/WEB-INF/Start.tml
Copied: tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/MultipartServletRequestFilter.java (from r614643, tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/MultipartServletRequestFilter.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/MultipartServletRequestFilter.java?p2=tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/MultipartServletRequestFilter.java&p1=tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/MultipartServletRequestFilter.java&r1=614643&r2=615986&rev=615986&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/MultipartServletRequestFilter.java (original)
+++ tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/MultipartServletRequestFilter.java Mon Jan 28 10:44:16 2008
@@ -1,4 +1,4 @@
-// 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.
@@ -12,11 +12,12 @@
// 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.servlet.ServletFileUpload;
import org.apache.tapestry.services.HttpServletRequestFilter;
import org.apache.tapestry.services.HttpServletRequestHandler;
+import org.apache.tapestry.upload.services.MultipartDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Propchange: tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/MultipartServletRequestFilter.java
------------------------------------------------------------------------------
svn:executable = *
Copied: tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/ParameterValue.java (from r614643, tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/ParameterValue.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/ParameterValue.java?p2=tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/ParameterValue.java&p1=tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/ParameterValue.java&r1=614643&r2=615986&rev=615986&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/ParameterValue.java (original)
+++ tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/ParameterValue.java Mon Jan 28 10:44:16 2008
@@ -1,18 +1,18 @@
-// Copyright 2007 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.services;
+// 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.
+// 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.internal.services;
import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
Propchange: tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/ParameterValue.java
------------------------------------------------------------------------------
svn:executable = *
Copied: tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/ParametersServletRequestWrapper.java (from r614643, tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/ParametersServletRequestWrapper.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/ParametersServletRequestWrapper.java?p2=tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/ParametersServletRequestWrapper.java&p1=tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/ParametersServletRequestWrapper.java&r1=614643&r2=615986&rev=615986&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/ParametersServletRequestWrapper.java (original)
+++ tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/ParametersServletRequestWrapper.java Mon Jan 28 10:44:16 2008
@@ -1,18 +1,18 @@
-// Copyright 2007 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.services;
+// 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.
+// 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.internal.services;
import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
import org.apache.tapestry.services.Dispatcher;
@@ -25,8 +25,8 @@
import java.util.Map;
/**
- * Wrapper for HttpServletRequest that overrides the parameter methods of the wrapped request. i.e.
- * parameters are retrieved from the wrapper rather than the real request.
+ * Wrapper for HttpServletRequest that overrides the parameter methods of the wrapped request. i.e. parameters are
+ * retrieved from the wrapper rather than the real request.
*/
public class ParametersServletRequestWrapper extends HttpServletRequestWrapper
{
@@ -92,10 +92,9 @@
}
/**
- * Ignores any attempt to set the character encoding. Tapestry attempts to set the encoding
- * <em>after</em> the page name has been identified by the correct {@link Dispatcher}, and
- * that's too late from the perspective of the Servlet API as HttpServlet.getInputStream() will
- * already have been called.
+ * Ignores any attempt to set the character encoding. Tapestry attempts to set the encoding <em>after</em> the page
+ * name has been identified by the correct {@link Dispatcher}, and that's too late from the perspective of the
+ * Servlet API as HttpServlet.getInputStream() will already have been called.
*/
@Override
public void setCharacterEncoding(String enc) throws UnsupportedEncodingException
Propchange: tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/ParametersServletRequestWrapper.java
------------------------------------------------------------------------------
svn:executable = *
Copied: tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/UploadMessages.java (from r614643, tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/UploadMessages.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/UploadMessages.java?p2=tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/UploadMessages.java&p1=tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/UploadMessages.java&r1=614643&r2=615986&rev=615986&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/UploadMessages.java (original)
+++ tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/UploadMessages.java Mon Jan 28 10:44:16 2008
@@ -1,4 +1,4 @@
-// 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.
@@ -12,10 +12,11 @@
// 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.tapestry.ioc.Messages;
import org.apache.tapestry.ioc.internal.util.MessagesImpl;
+import org.apache.tapestry.upload.services.UploadedFile;
import java.io.File;
Propchange: tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/UploadMessages.java
------------------------------------------------------------------------------
svn:executable = *
Copied: tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/UploadedFileItem.java (from r614643, tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/UploadedFileItem.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/UploadedFileItem.java?p2=tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/UploadedFileItem.java&p1=tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/UploadedFileItem.java&r1=614643&r2=615986&rev=615986&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/UploadedFileItem.java (original)
+++ tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/UploadedFileItem.java Mon Jan 28 10:44:16 2008
@@ -1,28 +1,29 @@
-// Copyright 2007 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.services;
+// 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.
+// 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.internal.services;
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.io.FilenameUtils;
+import org.apache.tapestry.upload.services.UploadedFile;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
/**
- * Implentation of {@link UploadedFile} for FileItems.
+ * Implentation of {@link org.apache.tapestry.upload.services.UploadedFile} for FileItems.
*/
public class UploadedFileItem implements UploadedFile
{
Propchange: tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/UploadedFileItem.java
------------------------------------------------------------------------------
svn:executable = *
Copied: tapestry/tapestry5/trunk/tapestry-upload/src/main/resources/org/apache/tapestry/upload/internal/services/UploadStrings.properties (from r614643, tapestry/tapestry5/trunk/tapestry-upload/src/main/resources/org/apache/tapestry/upload/services/UploadStrings.properties)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/main/resources/org/apache/tapestry/upload/internal/services/UploadStrings.properties?p2=tapestry/tapestry5/trunk/tapestry-upload/src/main/resources/org/apache/tapestry/upload/internal/services/UploadStrings.properties&p1=tapestry/tapestry5/trunk/tapestry-upload/src/main/resources/org/apache/tapestry/upload/services/UploadStrings.properties&r1=614643&r2=615986&rev=615986&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-upload/src/main/resources/org/apache/tapestry/upload/services/UploadStrings.properties (original)
+++ tapestry/tapestry5/trunk/tapestry-upload/src/main/resources/org/apache/tapestry/upload/internal/services/UploadStrings.properties Mon Jan 28 10:44:16 2008
@@ -1,17 +1,17 @@
-# Copyright 2007 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.
-
+# 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.
+# 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.
+
unable-to-decode=Unable to decode multipart encoded request.
unsupported-encoding=Unsupported character encoding '%s' when decoding multipart encoded request
write-failure=Unable to write uploaded file content to %s
Propchange: tapestry/tapestry5/trunk/tapestry-upload/src/main/resources/org/apache/tapestry/upload/internal/services/UploadStrings.properties
------------------------------------------------------------------------------
svn:executable = *
Copied: tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/internal/services/MultipartDecoderImplTest.java (from r614643, tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/services/MultipartDecoderImplTest.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/internal/services/MultipartDecoderImplTest.java?p2=tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/internal/services/MultipartDecoderImplTest.java&p1=tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/services/MultipartDecoderImplTest.java&r1=614643&r2=615986&rev=615986&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/services/MultipartDecoderImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/internal/services/MultipartDecoderImplTest.java Mon Jan 28 10:44:16 2008
@@ -1,4 +1,4 @@
-// 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.
@@ -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.servlet.ServletFileUpload;
Propchange: tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/internal/services/MultipartDecoderImplTest.java
------------------------------------------------------------------------------
svn:executable = *
Copied: tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/internal/services/MultipartServletRequestFilterTest.java (from r614643, tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/services/MultipartServletRequestFilterTest.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/internal/services/MultipartServletRequestFilterTest.java?p2=tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/internal/services/MultipartServletRequestFilterTest.java&p1=tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/services/MultipartServletRequestFilterTest.java&r1=614643&r2=615986&rev=615986&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/services/MultipartServletRequestFilterTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/internal/services/MultipartServletRequestFilterTest.java Mon Jan 28 10:44:16 2008
@@ -1,21 +1,22 @@
-// Copyright 2007 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.services;
+// 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.
+// 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.internal.services;
import org.apache.tapestry.services.HttpServletRequestHandler;
import org.apache.tapestry.test.TapestryTestCase;
+import org.apache.tapestry.upload.services.MultipartDecoder;
import org.testng.annotations.Test;
import javax.servlet.http.HttpServletRequest;
Propchange: tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/internal/services/MultipartServletRequestFilterTest.java
------------------------------------------------------------------------------
svn:executable = *
Copied: tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/internal/services/ParameterValueTest.java (from r614643, tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/services/ParameterValueTest.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/internal/services/ParameterValueTest.java?p2=tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/internal/services/ParameterValueTest.java&p1=tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/services/ParameterValueTest.java&r1=614643&r2=615986&rev=615986&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/services/ParameterValueTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/internal/services/ParameterValueTest.java Mon Jan 28 10:44:16 2008
@@ -1,4 +1,4 @@
-// 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.
@@ -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 static org.testng.Assert.*;
import org.testng.annotations.Test;
Propchange: tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/internal/services/ParameterValueTest.java
------------------------------------------------------------------------------
svn:executable = *
Copied: tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/internal/services/ParametersServletRequestWrapperTest.java (from r614643, tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/services/ParametersServletRequestWrapperTest.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/internal/services/ParametersServletRequestWrapperTest.java?p2=tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/internal/services/ParametersServletRequestWrapperTest.java&p1=tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/services/ParametersServletRequestWrapperTest.java&r1=614643&r2=615986&rev=615986&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/services/ParametersServletRequestWrapperTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/internal/services/ParametersServletRequestWrapperTest.java Mon Jan 28 10:44:16 2008
@@ -1,4 +1,4 @@
-// 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.
@@ -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 static org.easymock.EasyMock.*;
import static org.testng.Assert.*;
Propchange: tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/internal/services/ParametersServletRequestWrapperTest.java
------------------------------------------------------------------------------
svn:executable = *
Copied: tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/internal/services/StubFileItem.java (from r614643, tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/services/StubFileItem.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/internal/services/StubFileItem.java?p2=tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/internal/services/StubFileItem.java&p1=tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/services/StubFileItem.java&r1=614643&r2=615986&rev=615986&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/services/StubFileItem.java (original)
+++ tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/internal/services/StubFileItem.java Mon Jan 28 10:44:16 2008
@@ -1,18 +1,18 @@
-// Copyright 2007 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.services;
+// 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.
+// 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.internal.services;
import org.apache.commons.fileupload.FileItem;
Propchange: tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/internal/services/StubFileItem.java
------------------------------------------------------------------------------
svn:executable = *
Copied: tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/internal/services/UploadedFileItemTest.java (from r614643, tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/services/UploadedFileItemTest.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/internal/services/UploadedFileItemTest.java?p2=tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/internal/services/UploadedFileItemTest.java&p1=tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/services/UploadedFileItemTest.java&r1=614643&r2=615986&rev=615986&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/services/UploadedFileItemTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/internal/services/UploadedFileItemTest.java Mon Jan 28 10:44:16 2008
@@ -1,18 +1,18 @@
-// Copyright 2007 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.services;
+// 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.
+// 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.internal.services;
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.io.input.NullInputStream;
Propchange: tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/internal/services/UploadedFileItemTest.java
------------------------------------------------------------------------------
svn:executable = *
Copied: tapestry/tapestry5/trunk/tapestry-upload/src/test/webapp/Start.tml (from r614643, tapestry/tapestry5/trunk/tapestry-upload/src/test/webapp/WEB-INF/Start.tml)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/test/webapp/Start.tml?p2=tapestry/tapestry5/trunk/tapestry-upload/src/test/webapp/Start.tml&p1=tapestry/tapestry5/trunk/tapestry-upload/src/test/webapp/WEB-INF/Start.tml&r1=614643&r2=615986&rev=615986&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-upload/src/test/webapp/WEB-INF/Start.tml (original)
+++ tapestry/tapestry5/trunk/tapestry-upload/src/test/webapp/Start.tml Mon Jan 28 10:44:16 2008
@@ -1,36 +1,36 @@
<html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
-<!--
- 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.
- You may obtain a copy of the License at
+ 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
+ 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.
--->
-<head>
- <title>Start Page</title>
-</head>
-<body>
-<p>
- This test of the upload component
-</p>
-<t:form>
- <t:errors/>
- <t:label for="file"/>
- <input t:type="upload" t:id="file" validate="required"/>
- <br/>
- <input type="submit" value="Upload"/>
-</t:form>
-<t:if test="file">
- <p>File: ${file.filePath}</p>
- <p>Size: ${file.size}</p>
-</t:if>
-</body>
+ 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.
+ -->
+ <head>
+ <title>Start Page</title>
+ </head>
+ <body>
+ <p>
+ This test of the upload component
+ </p>
+ <t:form>
+ <t:errors/>
+ <t:label for="file"/>
+ <input t:type="upload" t:id="file" validate="required"/>
+ <br/>
+ <input type="submit" value="Upload"/>
+ </t:form>
+ <t:if test="file">
+ <p>File: ${file.filePath}</p>
+ <p>Size: ${file.size}</p>
+ </t:if>
+ </body>
</html>
Propchange: tapestry/tapestry5/trunk/tapestry-upload/src/test/webapp/Start.tml
------------------------------------------------------------------------------
svn:executable = *