Author: jvermillard
Date: Tue Feb 26 13:44:17 2008
New Revision: 631395
URL: http://svn.apache.org/viewvc?rev=631395&view=rev
Log:
moving file example to it's own module (continued)
Added:
mina/asyncweb/trunk/examples/src/main/java/org/apache/asyncweb/examples/fileservice/
mina/asyncweb/trunk/examples/src/main/java/org/apache/asyncweb/examples/fileservice/FileMain.java
- copied, changed from r631390,
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/FileMain.java
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/cache/
- copied from r631390,
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/examples/file/cache/
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/
- copied from r631390,
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/examples/file/fileloader/
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/index/
- copied from r631390,
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/examples/file/index/
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/mimetype/
- copied from r631390,
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/examples/file/mimetype/
Removed:
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/examples/file/cache/
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/examples/file/fileloader/
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/examples/file/index/
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/examples/file/mimetype/
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/FileMain.java
Modified:
mina/asyncweb/trunk/examples/pom.xml
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/FileHttpService.java
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/cache/CachingPolicy.java
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/cache/SimpleCachingPolicy.java
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/FileLoader.java
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/MmapFileLoader.java
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/SimpleFileLoader.java
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/index/DefaultDirectoryIndexGenerator.java
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/index/DirectoryIndexGenerator.java
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/mimetype/MimeMap.java
mina/asyncweb/trunk/fileservice/src/test/java/org/apache/asyncweb/fileservice/fileloader/MmapFileLoaderTest.java
mina/asyncweb/trunk/fileservice/src/test/java/org/apache/asyncweb/fileservice/fileloader/SimpleFileLoaderTest.java
mina/asyncweb/trunk/pom.xml
Modified: mina/asyncweb/trunk/examples/pom.xml
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/examples/pom.xml?rev=631395&r1=631394&r2=631395&view=diff
==============================================================================
--- mina/asyncweb/trunk/examples/pom.xml (original)
+++ mina/asyncweb/trunk/examples/pom.xml Tue Feb 26 13:44:17 2008
@@ -55,7 +55,10 @@
<groupId>${groupId}</groupId>
<artifactId>asyncweb-server</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>asyncweb-fileservice</artifactId>
+ </dependency>
<dependency>
<groupId>${groupId}</groupId>
<artifactId>asyncweb-spring</artifactId>
Copied:
mina/asyncweb/trunk/examples/src/main/java/org/apache/asyncweb/examples/fileservice/FileMain.java
(from r631390,
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/FileMain.java)
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/examples/src/main/java/org/apache/asyncweb/examples/fileservice/FileMain.java?p2=mina/asyncweb/trunk/examples/src/main/java/org/apache/asyncweb/examples/fileservice/FileMain.java&p1=mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/FileMain.java&r1=631390&r2=631395&rev=631395&view=diff
==============================================================================
---
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/FileMain.java
(original)
+++
mina/asyncweb/trunk/examples/src/main/java/org/apache/asyncweb/examples/fileservice/FileMain.java
Tue Feb 26 13:44:17 2008
@@ -17,8 +17,9 @@
* under the License.
*
*/
-package org.apache.asyncweb.fileservice;
+package org.apache.asyncweb.examples.fileservice;
+import org.apache.asyncweb.fileservice.FileHttpService;
import org.apache.asyncweb.server.BasicServiceContainer;
import org.apache.asyncweb.server.HttpServiceHandler;
import org.apache.asyncweb.server.resolver.PatternMatchResolver;
Modified:
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/FileHttpService.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/FileHttpService.java?rev=631395&r1=631394&r2=631395&view=diff
==============================================================================
---
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/FileHttpService.java
(original)
+++
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/FileHttpService.java
Tue Feb 26 13:44:17 2008
@@ -29,13 +29,13 @@
import org.apache.asyncweb.common.DefaultHttpResponse;
import org.apache.asyncweb.common.HttpResponseStatus;
import org.apache.asyncweb.common.MutableHttpResponse;
-import org.apache.asyncweb.examples.file.cache.CachingPolicy;
-import org.apache.asyncweb.examples.file.cache.SimpleCachingPolicy;
-import org.apache.asyncweb.examples.file.fileloader.FileLoader;
-import org.apache.asyncweb.examples.file.fileloader.SimpleFileLoader;
-import org.apache.asyncweb.examples.file.index.DefaultDirectoryIndexGenerator;
-import org.apache.asyncweb.examples.file.index.DirectoryIndexGenerator;
-import org.apache.asyncweb.examples.file.mimetype.MimeMap;
+import org.apache.asyncweb.fileservice.cache.CachingPolicy;
+import org.apache.asyncweb.fileservice.cache.SimpleCachingPolicy;
+import org.apache.asyncweb.fileservice.fileloader.FileLoader;
+import org.apache.asyncweb.fileservice.fileloader.SimpleFileLoader;
+import org.apache.asyncweb.fileservice.index.DefaultDirectoryIndexGenerator;
+import org.apache.asyncweb.fileservice.index.DirectoryIndexGenerator;
+import org.apache.asyncweb.fileservice.mimetype.MimeMap;
import org.apache.asyncweb.server.HttpService;
import org.apache.asyncweb.server.HttpServiceContext;
import org.apache.mina.common.IoBuffer;
Modified:
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/cache/CachingPolicy.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/cache/CachingPolicy.java?rev=631395&r1=631390&r2=631395&view=diff
==============================================================================
---
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/cache/CachingPolicy.java
(original)
+++
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/cache/CachingPolicy.java
Tue Feb 26 13:44:17 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.asyncweb.examples.file.cache;
+package org.apache.asyncweb.fileservice.cache;
import java.io.File;
Modified:
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/cache/SimpleCachingPolicy.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/cache/SimpleCachingPolicy.java?rev=631395&r1=631390&r2=631395&view=diff
==============================================================================
---
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/cache/SimpleCachingPolicy.java
(original)
+++
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/cache/SimpleCachingPolicy.java
Tue Feb 26 13:44:17 2008
@@ -18,7 +18,7 @@
*
*/
-package org.apache.asyncweb.examples.file.cache;
+package org.apache.asyncweb.fileservice.cache;
import java.io.File;
import java.text.SimpleDateFormat;
Modified:
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/FileLoader.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/FileLoader.java?rev=631395&r1=631390&r2=631395&view=diff
==============================================================================
---
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/FileLoader.java
(original)
+++
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/FileLoader.java
Tue Feb 26 13:44:17 2008
@@ -18,7 +18,7 @@
*
*/
-package org.apache.asyncweb.examples.file.fileloader;
+package org.apache.asyncweb.fileservice.fileloader;
import java.io.File;
import java.io.IOException;
Modified:
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/MmapFileLoader.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/MmapFileLoader.java?rev=631395&r1=631390&r2=631395&view=diff
==============================================================================
---
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/MmapFileLoader.java
(original)
+++
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/MmapFileLoader.java
Tue Feb 26 13:44:17 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.asyncweb.examples.file.fileloader;
+package org.apache.asyncweb.fileservice.fileloader;
import java.io.File;
import java.io.IOException;
Modified:
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/SimpleFileLoader.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/SimpleFileLoader.java?rev=631395&r1=631390&r2=631395&view=diff
==============================================================================
---
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/SimpleFileLoader.java
(original)
+++
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/fileloader/SimpleFileLoader.java
Tue Feb 26 13:44:17 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.asyncweb.examples.file.fileloader;
+package org.apache.asyncweb.fileservice.fileloader;
import java.io.File;
import java.io.IOException;
Modified:
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/index/DefaultDirectoryIndexGenerator.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/index/DefaultDirectoryIndexGenerator.java?rev=631395&r1=631390&r2=631395&view=diff
==============================================================================
---
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/index/DefaultDirectoryIndexGenerator.java
(original)
+++
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/index/DefaultDirectoryIndexGenerator.java
Tue Feb 26 13:44:17 2008
@@ -17,13 +17,13 @@
* under the License.
*
*/
-package org.apache.asyncweb.examples.file.index;
+package org.apache.asyncweb.fileservice.index;
import java.io.File;
import java.io.UnsupportedEncodingException;
import java.util.Date;
-import org.apache.asyncweb.examples.file.mimetype.MimeMap;
+import org.apache.asyncweb.fileservice.mimetype.MimeMap;
import org.apache.asyncweb.server.errorReporting.CSS;
import org.apache.asyncweb.server.util.StringBundle;
import org.apache.mina.common.IoBuffer;
Modified:
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/index/DirectoryIndexGenerator.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/index/DirectoryIndexGenerator.java?rev=631395&r1=631390&r2=631395&view=diff
==============================================================================
---
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/index/DirectoryIndexGenerator.java
(original)
+++
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/index/DirectoryIndexGenerator.java
Tue Feb 26 13:44:17 2008
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.asyncweb.examples.file.index;
+package org.apache.asyncweb.fileservice.index;
import java.io.File;
Modified:
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/mimetype/MimeMap.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/mimetype/MimeMap.java?rev=631395&r1=631390&r2=631395&view=diff
==============================================================================
---
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/mimetype/MimeMap.java
(original)
+++
mina/asyncweb/trunk/fileservice/src/main/java/org/apache/asyncweb/fileservice/mimetype/MimeMap.java
Tue Feb 26 13:44:17 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.asyncweb.examples.file.mimetype;
+package org.apache.asyncweb.fileservice.mimetype;
import java.net.*;
import java.util.*;
Modified:
mina/asyncweb/trunk/fileservice/src/test/java/org/apache/asyncweb/fileservice/fileloader/MmapFileLoaderTest.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/fileservice/src/test/java/org/apache/asyncweb/fileservice/fileloader/MmapFileLoaderTest.java?rev=631395&r1=631394&r2=631395&view=diff
==============================================================================
---
mina/asyncweb/trunk/fileservice/src/test/java/org/apache/asyncweb/fileservice/fileloader/MmapFileLoaderTest.java
(original)
+++
mina/asyncweb/trunk/fileservice/src/test/java/org/apache/asyncweb/fileservice/fileloader/MmapFileLoaderTest.java
Tue Feb 26 13:44:17 2008
@@ -6,8 +6,8 @@
import java.io.FileOutputStream;
import java.util.Random;
-import org.apache.asyncweb.examples.file.fileloader.FileLoader;
-import org.apache.asyncweb.examples.file.fileloader.MmapFileLoader;
+import org.apache.asyncweb.fileservice.fileloader.FileLoader;
+import org.apache.asyncweb.fileservice.fileloader.MmapFileLoader;
import org.apache.mina.common.IoBuffer;
import org.junit.Test;
Modified:
mina/asyncweb/trunk/fileservice/src/test/java/org/apache/asyncweb/fileservice/fileloader/SimpleFileLoaderTest.java
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/fileservice/src/test/java/org/apache/asyncweb/fileservice/fileloader/SimpleFileLoaderTest.java?rev=631395&r1=631394&r2=631395&view=diff
==============================================================================
---
mina/asyncweb/trunk/fileservice/src/test/java/org/apache/asyncweb/fileservice/fileloader/SimpleFileLoaderTest.java
(original)
+++
mina/asyncweb/trunk/fileservice/src/test/java/org/apache/asyncweb/fileservice/fileloader/SimpleFileLoaderTest.java
Tue Feb 26 13:44:17 2008
@@ -6,7 +6,7 @@
import java.io.FileOutputStream;
import java.util.Random;
-import org.apache.asyncweb.examples.file.fileloader.SimpleFileLoader;
+import org.apache.asyncweb.fileservice.fileloader.SimpleFileLoader;
import org.apache.mina.common.IoBuffer;
import org.junit.Test;
Modified: mina/asyncweb/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/mina/asyncweb/trunk/pom.xml?rev=631395&r1=631394&r2=631395&view=diff
==============================================================================
--- mina/asyncweb/trunk/pom.xml (original)
+++ mina/asyncweb/trunk/pom.xml Tue Feb 26 13:44:17 2008
@@ -247,6 +247,12 @@
<artifactId>asyncweb-client</artifactId>
<version>${pom.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>asyncweb-fileservice</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
<!-- ===================== -->
<!-- External Dependencies -->
