Author: jochen
Date: Mon Jun 21 09:48:31 2010
New Revision: 956520
URL: http://svn.apache.org/viewvc?rev=956520&view=rev
Log: (empty)
Removed:
commons/sandbox/commons-fileupload2/doap_fileupload.rdf
Modified:
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/FileItemIterator.java
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/FileItemStore.java
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/FileSizeMaxException.java
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/InvalidContentTypeException.java
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/RequestSizeMaxException.java
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/StoredFileItem.java
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/UploadRequest.java
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/disk/DiskFileItem.java
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/disk/DiskFileItemStore.java
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/disk/TrackingDiskFileItemStore.java
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/impl/AbstractFileItem.java
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/impl/AbstractStoredFileItem.java
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/impl/DefaultEventListener.java
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/impl/FileItemIteratorImpl.java
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/impl/FileUploadBodyDescriptor.java
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/impl/FileUploadBodyDescriptorFactory.java
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/impl/MemoryCapableFileItemStore.java
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/impl/MemoryFileItem.java
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/impl/WritableFileItem.java
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/portlet/PortletFileTracker.java
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/portlet/PortletUploadRequest.java
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/servlet/HttpServletUploadRequest.java
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/servlet/ServletFileTracker.java
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/util/FileUploadUtils.java
commons/sandbox/commons-fileupload2/src/site/apt/index.apt
commons/sandbox/commons-fileupload2/src/site/apt/using.apt
commons/sandbox/commons-fileupload2/src/site/site.xml
Modified:
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/FileItemIterator.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/FileItemIterator.java?rev=956520&r1=956519&r2=956520&view=diff
==============================================================================
---
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/FileItemIterator.java
(original)
+++
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/FileItemIterator.java
Mon Jun 21 09:48:31 2010
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.commons.fileupload2;
import java.io.IOException;
Modified:
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/FileItemStore.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/FileItemStore.java?rev=956520&r1=956519&r2=956520&view=diff
==============================================================================
---
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/FileItemStore.java
(original)
+++
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/FileItemStore.java
Mon Jun 21 09:48:31 2010
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.commons.fileupload2;
import java.io.IOException;
Modified:
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/FileSizeMaxException.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/FileSizeMaxException.java?rev=956520&r1=956519&r2=956520&view=diff
==============================================================================
---
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/FileSizeMaxException.java
(original)
+++
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/FileSizeMaxException.java
Mon Jun 21 09:48:31 2010
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.commons.fileupload2;
Modified:
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/InvalidContentTypeException.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/InvalidContentTypeException.java?rev=956520&r1=956519&r2=956520&view=diff
==============================================================================
---
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/InvalidContentTypeException.java
(original)
+++
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/InvalidContentTypeException.java
Mon Jun 21 09:48:31 2010
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.commons.fileupload2;
Modified:
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/RequestSizeMaxException.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/RequestSizeMaxException.java?rev=956520&r1=956519&r2=956520&view=diff
==============================================================================
---
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/RequestSizeMaxException.java
(original)
+++
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/RequestSizeMaxException.java
Mon Jun 21 09:48:31 2010
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.commons.fileupload2;
Modified:
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/StoredFileItem.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/StoredFileItem.java?rev=956520&r1=956519&r2=956520&view=diff
==============================================================================
---
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/StoredFileItem.java
(original)
+++
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/StoredFileItem.java
Mon Jun 21 09:48:31 2010
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.commons.fileupload2;
import java.io.IOException;
Modified:
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/UploadRequest.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/UploadRequest.java?rev=956520&r1=956519&r2=956520&view=diff
==============================================================================
---
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/UploadRequest.java
(original)
+++
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/UploadRequest.java
Mon Jun 21 09:48:31 2010
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.commons.fileupload2;
import java.io.IOException;
Modified:
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/disk/DiskFileItem.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/disk/DiskFileItem.java?rev=956520&r1=956519&r2=956520&view=diff
==============================================================================
---
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/disk/DiskFileItem.java
(original)
+++
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/disk/DiskFileItem.java
Mon Jun 21 09:48:31 2010
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.commons.fileupload2.disk;
import java.io.File;
Modified:
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/disk/DiskFileItemStore.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/disk/DiskFileItemStore.java?rev=956520&r1=956519&r2=956520&view=diff
==============================================================================
---
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/disk/DiskFileItemStore.java
(original)
+++
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/disk/DiskFileItemStore.java
Mon Jun 21 09:48:31 2010
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.commons.fileupload2.disk;
import java.io.File;
Modified:
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/disk/TrackingDiskFileItemStore.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/disk/TrackingDiskFileItemStore.java?rev=956520&r1=956519&r2=956520&view=diff
==============================================================================
---
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/disk/TrackingDiskFileItemStore.java
(original)
+++
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/disk/TrackingDiskFileItemStore.java
Mon Jun 21 09:48:31 2010
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.commons.fileupload2.disk;
import java.io.File;
Modified:
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/impl/AbstractFileItem.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/impl/AbstractFileItem.java?rev=956520&r1=956519&r2=956520&view=diff
==============================================================================
---
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/impl/AbstractFileItem.java
(original)
+++
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/impl/AbstractFileItem.java
Mon Jun 21 09:48:31 2010
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.commons.fileupload2.impl;
import java.io.IOException;
Modified:
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/impl/AbstractStoredFileItem.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/impl/AbstractStoredFileItem.java?rev=956520&r1=956519&r2=956520&view=diff
==============================================================================
---
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/impl/AbstractStoredFileItem.java
(original)
+++
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/impl/AbstractStoredFileItem.java
Mon Jun 21 09:48:31 2010
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.commons.fileupload2.impl;
import java.io.IOException;
Modified:
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/impl/DefaultEventListener.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/impl/DefaultEventListener.java?rev=956520&r1=956519&r2=956520&view=diff
==============================================================================
---
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/impl/DefaultEventListener.java
(original)
+++
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/impl/DefaultEventListener.java
Mon Jun 21 09:48:31 2010
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.commons.fileupload2.impl;
import java.io.IOException;
Modified:
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/impl/FileItemIteratorImpl.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/impl/FileItemIteratorImpl.java?rev=956520&r1=956519&r2=956520&view=diff
==============================================================================
---
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/impl/FileItemIteratorImpl.java
(original)
+++
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/impl/FileItemIteratorImpl.java
Mon Jun 21 09:48:31 2010
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.commons.fileupload2.impl;
import java.io.IOException;
Modified:
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/impl/FileUploadBodyDescriptor.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/impl/FileUploadBodyDescriptor.java?rev=956520&r1=956519&r2=956520&view=diff
==============================================================================
---
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/impl/FileUploadBodyDescriptor.java
(original)
+++
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/impl/FileUploadBodyDescriptor.java
Mon Jun 21 09:48:31 2010
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.commons.fileupload2.impl;
import java.util.Collections;
Modified:
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/impl/FileUploadBodyDescriptorFactory.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/impl/FileUploadBodyDescriptorFactory.java?rev=956520&r1=956519&r2=956520&view=diff
==============================================================================
---
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/impl/FileUploadBodyDescriptorFactory.java
(original)
+++
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/impl/FileUploadBodyDescriptorFactory.java
Mon Jun 21 09:48:31 2010
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.commons.fileupload2.impl;
import org.apache.james.mime4j.codec.DecodeMonitor;
Modified:
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/impl/MemoryCapableFileItemStore.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/impl/MemoryCapableFileItemStore.java?rev=956520&r1=956519&r2=956520&view=diff
==============================================================================
---
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/impl/MemoryCapableFileItemStore.java
(original)
+++
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/impl/MemoryCapableFileItemStore.java
Mon Jun 21 09:48:31 2010
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.commons.fileupload2.impl;
import java.io.ByteArrayOutputStream;
Modified:
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/impl/MemoryFileItem.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/impl/MemoryFileItem.java?rev=956520&r1=956519&r2=956520&view=diff
==============================================================================
---
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/impl/MemoryFileItem.java
(original)
+++
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/impl/MemoryFileItem.java
Mon Jun 21 09:48:31 2010
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.commons.fileupload2.impl;
import java.io.ByteArrayInputStream;
Modified:
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/impl/WritableFileItem.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/impl/WritableFileItem.java?rev=956520&r1=956519&r2=956520&view=diff
==============================================================================
---
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/impl/WritableFileItem.java
(original)
+++
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/impl/WritableFileItem.java
Mon Jun 21 09:48:31 2010
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.commons.fileupload2.impl;
import java.io.IOException;
Modified:
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/portlet/PortletFileTracker.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/portlet/PortletFileTracker.java?rev=956520&r1=956519&r2=956520&view=diff
==============================================================================
---
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/portlet/PortletFileTracker.java
(original)
+++
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/portlet/PortletFileTracker.java
Mon Jun 21 09:48:31 2010
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.commons.fileupload2.portlet;
import javax.portlet.PortletContext;
Modified:
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/portlet/PortletUploadRequest.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/portlet/PortletUploadRequest.java?rev=956520&r1=956519&r2=956520&view=diff
==============================================================================
---
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/portlet/PortletUploadRequest.java
(original)
+++
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/portlet/PortletUploadRequest.java
Mon Jun 21 09:48:31 2010
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.commons.fileupload2.portlet;
import java.io.IOException;
Modified:
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/servlet/HttpServletUploadRequest.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/servlet/HttpServletUploadRequest.java?rev=956520&r1=956519&r2=956520&view=diff
==============================================================================
---
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/servlet/HttpServletUploadRequest.java
(original)
+++
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/servlet/HttpServletUploadRequest.java
Mon Jun 21 09:48:31 2010
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.commons.fileupload2.servlet;
import java.io.IOException;
Modified:
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/servlet/ServletFileTracker.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/servlet/ServletFileTracker.java?rev=956520&r1=956519&r2=956520&view=diff
==============================================================================
---
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/servlet/ServletFileTracker.java
(original)
+++
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/servlet/ServletFileTracker.java
Mon Jun 21 09:48:31 2010
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.commons.fileupload2.servlet;
import javax.servlet.ServletContext;
Modified:
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/util/FileUploadUtils.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/util/FileUploadUtils.java?rev=956520&r1=956519&r2=956520&view=diff
==============================================================================
---
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/util/FileUploadUtils.java
(original)
+++
commons/sandbox/commons-fileupload2/src/java/org/apache/commons/fileupload2/util/FileUploadUtils.java
Mon Jun 21 09:48:31 2010
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.commons.fileupload2.util;
import java.io.IOException;
Modified: commons/sandbox/commons-fileupload2/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/commons/sandbox/commons-fileupload2/src/site/apt/index.apt?rev=956520&r1=956519&r2=956520&view=diff
==============================================================================
--- commons/sandbox/commons-fileupload2/src/site/apt/index.apt (original)
+++ commons/sandbox/commons-fileupload2/src/site/apt/index.apt Mon Jun 21
09:48:31 2010
@@ -37,12 +37,16 @@ Documentation
The following documentation is available:
* {{{using.html}User Guide}}
+
* {{{streaming.html}Streaming API}}
- * {{faq.html}Frequently Asked Questions}}
+
+ * {{{faq.html}Frequently Asked Questions}}
+
* {{{apidocs/index.html}JavaDoc API}}
+
* {{{project-reports.html}Project Reports}}
- You can also {{source-usage.html}browse}} the Subversion repository.
+ You can also {{{source-repository.html}browse}} the Subversion repository.
Support
Modified: commons/sandbox/commons-fileupload2/src/site/apt/using.apt
URL:
http://svn.apache.org/viewvc/commons/sandbox/commons-fileupload2/src/site/apt/using.apt?rev=956520&r1=956519&r2=956520&view=diff
==============================================================================
--- commons/sandbox/commons-fileupload2/src/site/apt/using.apt (original)
+++ commons/sandbox/commons-fileupload2/src/site/apt/using.apt Mon Jun 21
09:48:31 2010
@@ -33,7 +33,7 @@ Using Commons FileUpload 2
some of the simpler - and most common - usage patterns. Customization of
FileUpload is described {{{customizing.html}elsewhere}}.
-How it works
+* How it works
A file upload request comprises an ordered list of <<items>> that
are encoded according to {{{http://www.ietf.org/rfc/rfc1867.txt}RFC 1867}},
@@ -57,15 +57,15 @@ How it works
and to access the data in the most appropriate manner.
FileUpload creates new file items using a <<FileItemStore>>. This is what
- gives FileUpload most of its flexibility. The factory has ultimate control
- over how each item is created and stored. The factory implementation that
+ gives FileUpload most of its flexibility. The store has ultimate control
+ over how each item is created and stored. The store implementation that
currently ships with FileUpload stores the item's data in memory or
on disk, depending on the size of the item (i.e. bytes of data). However,
this behavior can be customized to suit your application.
-Servlets and Portlets
+* Servlets and Portlets
- Starting with version 1.1, FileUpload supports file upload requests in
+ Since version 1.1, FileUpload supports file upload requests in
both servlet and portlet environments. The usage is almost identical in
the two environments, so the remainder of this document refers only to
the servlet environment.
@@ -75,10 +75,11 @@ Servlets and Portlets
* Where you see references to the <<HttpServletUploadRequest>> class,
substitute the <<PortletUploadRequest>> class.
+
* Where you see references to the <<HttpServletRequest>> class,
substitute the <<ActionRequest>> class.
-Parsing the request
+* Parsing the request
Before you can work with the uploaded items, of course, you need to parse
the request itself. Ensuring that the request is actually a file upload
@@ -92,22 +93,27 @@ Parsing the request
Now we are ready to parse the request into its constituent items.
-The simplest case
+* The simplest case
The simplest usage scenario is the following:
* Uploaded items should be retained in memory as long as they are reasonably
small.
+
* Larger items should be written to a temporary file on disk.
+
* Very large upload requests should not be permitted.
+
* The built-in defaults for the maximum size of an item to be retained in
memory, the maximum permitted size of an upload request, and the location
of temporary files are acceptable.
+ []
+
Handling a request in this scenario couldn't be much simpler:
---------------------------------------------------------------------------
- // Create a factory for disk-based file items
+ // Create a store for disk-based file items
DiskFileItemStore store = new DiskFileItemStore();
// Create a new file upload handler
FileUpload upload = new FileUpload();
@@ -119,22 +125,23 @@ The simplest case
That's all that's needed. Really!
The result of the parse is a <<List>> of file items, each of which
- implements the <<StoredFileItem>>> interface. Processing these items
- is discussed below.
+ implements the
+
{{{apidocs/org/apache/commons/fileupload2/StoredFileItem.html}StoredFileItem}}
+ interface. Processing these items is discussed below.
-Exercising more control
+* Exercising more control
If your usage scenario is close to the simplest case, described above,
but you need a little more control, you can easily customize the
- behavior of the upload handler or the file item factory or both. The
+ behavior of the upload handler or the file item store or both. The
following example shows several configuration options:
---------------------------------------------------------------------------
- // Create a factory for disk-based file items
- DiskFileItemStore factory = new DiskFileItemStore();
- // Set factory constraints
- factory.setThreshold(yourMaxMemorySize);
- factory.setRepository(yourTempDirectory);
+ // Create a store for disk-based file items
+ DiskFileItemStore store = new DiskFileItemStore();
+ // Set store constraints
+ store.setThreshold(yourMaxMemorySize);
+ store.setRepository(yourTempDirectory);
// Create a new file upload handler
FileUpload upload = new FileUpload();
@@ -146,15 +153,11 @@ Exercising more control
---------------------------------------------------------------------------
Of course, each of the configuration methods is independent of the
- others.
-
----------------------------------------------------------------------------
-
- Should you need further control over the parsing of the request, such
- as storing the items elsewhere - for example, in a database - you will
+ others. Should you need further control over the parsing of the request,
+ such as storing the items elsewhere - for example, in a database - you will
need to look into {{{customizing.html}customizing}} FileUpload.
-Processing the uploaded items
+* Processing the uploaded items
Once the parse has completed, you will have a <<List>> of file items
that you need to process. In most cases, you will want to handle
@@ -232,7 +235,7 @@ Processing the uploaded items
byte[] data = Streams.asByteArray(item);
---------------------------------------------------------------------------
-Resource cleanup
+* Resource cleanup
This section applies only, if you are using the
{{{apidocs/org/apache/commons/fileupload2/disk/DiskFileItemStore.html}DiskFileItemStore}}.
@@ -288,27 +291,27 @@ Resource cleanup
---------------------------------------------------------------------------
-Creating a DiskFileItemFactory
+* Creating a DiskFileItemStore
The <<<ServletFileTracker>>> provides an instance of
<<<org.apache.commons.io.FileCleaningTracker>>>. This instance must
- be used when creating a
{{{apidocs/org/apache/commons/fileupload2/disk/DiskFileItemFactory.html}DiskFileItemFactory}}.
+ be used when creating a
{{{apidocs/org/apache/commons/fileupload2/disk/DiskFileItemStore.html}DiskFileItemStore}}.
This should be done by calling a method like the following:
---------------------------------------------------------------------------
- public static DiskFileItemFactory newDiskFileItemFactory(ServletContext pCtx,
- File pRepository) {
+ public static DiskFileItemStore newDiskFileItemStore(ServletContext pCtx,
+ File pRepository) {
FileCleaningTracker tracker = ServletFileTracker.getFileTracker(pCtx);
- DiskFileItemFactory factory = new DiskFileItemFactory();
- factory.setRepository(pRepository);
- factory.setTracker(tracker);
- return factory;
+ DiskFileItemStore store = new DiskFileItemStore();
+ store.setRepository(pRepository);
+ store.setTracker(tracker);
+ return store;
}
---------------------------------------------------------------------------
-Disabling cleanup of temporary files
+* Disabling cleanup of temporary files
To disable tracking of temporary files, you may set the
<<<FileCleaningTracker>>> to null. Consequently, created files will no
@@ -316,7 +319,7 @@ Disabling cleanup of temporary files
automatically.
-Interaction with virus scanners
+* Interaction with virus scanners
Virus scanners running on the same system as the web container can cause
some unexpected behaviours for applications using FileUpload. This section
@@ -347,7 +350,7 @@ Interaction with virus scanners
application are outside the scope of this document.
-Watching progress
+* Watching progress
If you expect really large file uploads, then it would be nice to report
to your users, how much is already received. Even HTML pages allow to
@@ -398,7 +401,7 @@ Watching progress
A typical solution might be, to reduce the event listeners activity
by increasing the value of APPROXIMATE_EVENT_INTERVAL.
-What's next
+* What's next
Hopefully this page has provided you with a good idea of how to use
FileUpload in your own applications. For more detail on the methods
Modified: commons/sandbox/commons-fileupload2/src/site/site.xml
URL:
http://svn.apache.org/viewvc/commons/sandbox/commons-fileupload2/src/site/site.xml?rev=956520&r1=956519&r2=956520&view=diff
==============================================================================
--- commons/sandbox/commons-fileupload2/src/site/site.xml (original)
+++ commons/sandbox/commons-fileupload2/src/site/site.xml Mon Jun 21 09:48:31
2010
@@ -37,5 +37,6 @@
<item name="SVN repository" href="source-repository.html"/>
</menu>
+ <menu ref="parent"/>
</body>
</project>
