[1237] refactoring.. (pal-cvs 3503) - Portal Application Laboratory

Revision: 1237
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1237
Author:   shinsuke
Date:     2008-10-25 10:43:16 +0900 (Sat, 25 Oct 2008)

Log Message:
-----------
refactoring.. changed to sastruts app.

Modified Paths:
--------------
    vfs-portlets/trunk/.classpath
    vfs-portlets/trunk/.project
    vfs-portlets/trunk/.settings/org.eclipse.jdt.core.prefs
    vfs-portlets/trunk/.settings/org.eclipse.jdt.ui.prefs
    vfs-portlets/trunk/pom.xml
    vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/VFSConstants.java
    vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/helper/DownloadHelper.java
    vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/helper/FileParameterHelper.java
    vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/helper/impl/DownloadHelperImpl.java
    vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/helper/impl/FileParameterHelperImpl.java
    vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/util/FileParameterHelperComparator.java
    vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/util/VFSUtil.java
    vfs-portlets/trunk/src/main/resources/app.dicon
    vfs-portlets/trunk/src/main/resources/convention.dicon
    vfs-portlets/trunk/src/main/resources/creator.dicon
    vfs-portlets/trunk/src/main/resources/customizer.dicon
    vfs-portlets/trunk/src/main/resources/env.txt
    vfs-portlets/trunk/src/main/resources/s2container.dicon
    vfs-portlets/trunk/src/main/webapp/WEB-INF/portlet.xml
    vfs-portlets/trunk/src/main/webapp/WEB-INF/web.xml

Added Paths:
-----------
    vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/VFSException.java
    vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/action/
    vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/action/ListAction.java
    vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/action/NewfolderAction.java
    vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/action/UploadAction.java
    vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/common/
    vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/common/CommonException.java
    vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/common/filter/
    vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/common/filter/SecurityConstraintFilter.java
    vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/common/form/
    vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/common/form/PagingResultForm.java
    vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/common/util/
    vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/common/util/ConfigUtil.java
    vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/common/util/DateUtil.java
    vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/common/util/SAStrutsUtil.java
    vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/form/
    vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/form/ListForm.java
    vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/form/NewfolderForm.java
    vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/form/UploadForm.java
    vfs-portlets/trunk/src/main/resources/application.properties
    vfs-portlets/trunk/src/main/resources/env_ut.txt
    vfs-portlets/trunk/src/main/resources/jdbc.dicon
    vfs-portlets/trunk/src/main/resources/vfs.dicon
    vfs-portlets/trunk/src/main/webapp/WEB-INF/struts-config.xml
    vfs-portlets/trunk/src/main/webapp/WEB-INF/validator-rules.xml
    vfs-portlets/trunk/src/main/webapp/WEB-INF/vfs.xml
    vfs-portlets/trunk/src/main/webapp/WEB-INF/view/
    vfs-portlets/trunk/src/main/webapp/WEB-INF/view/common/
    vfs-portlets/trunk/src/main/webapp/WEB-INF/view/common/common.jsp
    vfs-portlets/trunk/src/main/webapp/WEB-INF/view/list/
    vfs-portlets/trunk/src/main/webapp/WEB-INF/view/list/downloadError.jsp
    vfs-portlets/trunk/src/main/webapp/WEB-INF/view/list/error.jsp
    vfs-portlets/trunk/src/main/webapp/WEB-INF/view/list/index.jsp
    vfs-portlets/trunk/src/main/webapp/WEB-INF/view/newfolder/
    vfs-portlets/trunk/src/main/webapp/WEB-INF/view/newfolder/confirm.jsp
    vfs-portlets/trunk/src/main/webapp/WEB-INF/view/newfolder/edit.jsp
    vfs-portlets/trunk/src/main/webapp/WEB-INF/view/newfolder/error.jsp
    vfs-portlets/trunk/src/main/webapp/WEB-INF/view/upload/
    vfs-portlets/trunk/src/main/webapp/WEB-INF/view/upload/edit.jsp
    vfs-portlets/trunk/src/main/webapp/WEB-INF/view/upload/error.jsp

Removed Paths:
-------------
    vfs-portlets/trunk/.settings/org.eclipse.core.resources.prefs
    vfs-portlets/trunk/.tomcatplugin
    vfs-portlets/trunk/build.xml
    vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/portlets/VFSPortlet.java
    vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/servlets/FileServlet.java
    vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/web/navigator/CreateNewFilePage.java
    vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/web/navigator/CreateNewFolderPage.java
    vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/web/navigator/DefaultPage.java
    vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/web/navigator/DisplayFolderListPage.java
    vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/web/navigator/UploadFilePage.java
    vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/web/navigator/WriteNewFileContentPage.java
    vfs-portlets/trunk/src/main/resources/aop.dicon
    vfs-portlets/trunk/src/main/resources/jp/sf/pal/vfs/VFS.dicon
    vfs-portlets/trunk/src/main/resources/teedaCustomize.dicon
    vfs-portlets/trunk/src/main/resources/teedaErrorPage.dicon
    vfs-portlets/trunk/src/main/webapp/WEB-INF/faces-config.xml
    vfs-portlets/trunk/src/main/webapp/images/
    vfs-portlets/trunk/src/main/webapp/view/navigator/createNewFile.jsp
    vfs-portlets/trunk/src/main/webapp/view/navigator/createNewFolder.jsp
    vfs-portlets/trunk/src/main/webapp/view/navigator/displayFolderList.jsp
    vfs-portlets/trunk/src/main/webapp/view/navigator/uploadFile.jsp
    vfs-portlets/trunk/src/main/webapp/view/navigator/writeNewFileContent.jsp


-------------- next part --------------
Modified: vfs-portlets/trunk/.classpath
===================================================================

--- vfs-portlets/trunk/.classpath	2008-10-24 08:00:54 UTC (rev 1236)
+++ vfs-portlets/trunk/.classpath	2008-10-25 01:43:16 UTC (rev 1237)
@@ -1,42 +1,44 @@
-<?xml version="1.0"?>
 <classpath>
-  <classpathentry kind="src" output="src/main/webapp/WEB-INF/classes" path="src/main/java"/>
-  <classpathentry kind="src" output="src/main/webapp/WEB-INF/classes" path="src/main/resources"/>
-  <classpathentry kind="src" path="src/main/webapp/view"/>
-  <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-  <classpathentry kind="var" path="M2_REPO/com/marevol/marevol-faces-utils/0.3/marevol-faces-utils-0.3.jar"/>
-  <classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" sourcepath="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-sources.jar"/>
+    <classpathentry kind="src" output="src/main/webapp/WEB-INF/classes" path="src/main/java"/>
+    <classpathentry kind="src" output="src/main/webapp/WEB-INF/classes" path="src/main/resources"/>
+    <classpathentry kind="src" path="src/main/webapp/WEB-INF/view"/>
+    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+
+  <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/portlet-api/portlet-api/1.0/portlet-api-1.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/seasar/container/s2-extension/2.4.5/s2-extension-2.4.5.jar"/>
-  <classpathentry kind="var" path="M2_REPO/poi/poi/2.5.1-final-20040804/poi-2.5.1-final-20040804.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/seasar/portlet/s2-portlet/1.0.6/s2-portlet-1.0.6.jar"/>
-  <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar"/>
+  <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/javax/servlet/jstl/1.1.2/jstl-1.1.2.jar" sourcepath="M2_REPO/javax/servlet/jstl/1.1.2/jstl-1.1.2-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/taglibs/standard/1.1.2/standard-1.1.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-vfs/1.0/commons-vfs-1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.3/commons-codec-1.3.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.3/commons-codec-1.3-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-configuration/commons-configuration/1.5/commons-configuration-1.5.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-el/commons-el/1.0/commons-el-1.0.jar" sourcepath="M2_REPO/commons-el/commons-el/1.0/commons-el-1.0-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.2.1/commons-fileupload-1.2.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.3/commons-io-1.3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.3/commons-lang-2.3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.jar" sourcepath="M2_REPO/commons-validator/commons-validator/1.2.0/commons-validator-1.2.0-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" sourcepath="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/jboss/javassist/3.3.ga/javassist-3.3.ga.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-digester/commons-digester/1.6/commons-digester-1.6.jar" sourcepath="M2_REPO/commons-digester/commons-digester/1.6/commons-digester-1.6-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar" sourcepath="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/oro/oro/2.0.8/oro-2.0.8.jar" sourcepath="M2_REPO/oro/oro/2.0.8/oro-2.0.8-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/seasar/container/s2-framework/2.4.5/s2-framework-2.4.5.jar"/>
-  <classpathentry kind="var" path="M2_REPO/commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.jar" sourcepath="M2_REPO/commons-validator/commons-validator/1.2.0/commons-validator-1.2.0-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/myfaces/tomahawk/tomahawk/1.1.3/tomahawk-1.1.3.jar"/>
-  <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.1/commons-io-1.1.jar" sourcepath="M2_REPO/commons-io/commons-io/1.1/commons-io-1.1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.3.03/xml-apis-1.3.03.jar"/>
-  <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.3/commons-codec-1.3.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.3/commons-codec-1.3-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.1/commons-fileupload-1.1.jar" sourcepath="M2_REPO/commons-fileupload/commons-fileupload/1.1/commons-fileupload-1.1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.8.1/xercesImpl-2.8.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/jp/sf/pal/faces-response-filter/0.1/faces-response-filter-0.1.jar" sourcepath="M2_REPO/jp/sf/pal/faces-response-filter/0.1/faces-response-filter-0.1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.9/log4j-1.2.9.jar"/>
-  <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar"/>
-  <classpathentry kind="var" path="M2_REPO/jp/sf/pal/tomahawk-bridge/0.9/tomahawk-bridge-0.9.jar" sourcepath="M2_REPO/jp/sf/pal/tomahawk-bridge/0.9/tomahawk-bridge-0.9-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-vfs/1.0-RC8/commons-vfs-1.0-RC8.jar"/>
-  <classpathentry kind="var" path="M2_REPO/ognl/ognl/2.6.7/ognl-2.6.7.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/seasar/teeda/teeda-core/1.0.3-20061215/teeda-core-1.0.3-20061215.jar" sourcepath="M2_REPO/org/seasar/teeda/teeda-core/1.0.3-20061215/teeda-core-1.0.3-20061215-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/commons-el/commons-el/1.0/commons-el-1.0.jar" sourcepath="M2_REPO/commons-el/commons-el/1.0/commons-el-1.0-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/portals/bridges/portals-bridges-portletfilter/1.0.1-20061109/portals-bridges-portletfilter-1.0.1-20061109.jar"/>
+  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar" sourcepath="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/seasar/container/s2-extension/2.4.29/s2-extension-2.4.29.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/seasar/container/s2-framework/2.4.29/s2-framework-2.4.29.jar"/>
+  <classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" sourcepath="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jboss/javassist/3.4.ga/javassist-3.4.ga.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ognl/ognl/2.6.9-patch-20070908/ognl-2.6.9-patch-20070908.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/poi/poi/3.0-FINAL/poi-3.0-FINAL.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/seasar/container/s2-tiger/2.4.29/s2-tiger-2.4.29.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/seasar/sastruts/sa-struts-portlet/1.0.0-rc3/sa-struts-portlet-1.0.0-rc3.jar" sourcepath="M2_REPO/org/seasar/sastruts/sa-struts-portlet/1.0.0-rc3/sa-struts-portlet-1.0.0-rc3-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/struts/struts/1.2.9/struts-1.2.9.jar"/>
+  <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.2/antlr-2.7.2.jar" sourcepath="M2_REPO/antlr/antlr/2.7.2/antlr-2.7.2-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xalan/xalan/2.5.1/xalan-2.5.1.jar" sourcepath="M2_REPO/xalan/xalan/2.5.1/xalan-2.5.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/seasar/sastruts/sa-struts/1.0.4-sp1/sa-struts-1.0.4-sp1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-annotation_1.0_spec/1.1.1/geronimo-annotation_1.0_spec-1.1.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-ejb_3.0_spec/1.0/geronimo-ejb_3.0_spec-1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-interceptor_3.0_spec/1.0/geronimo-interceptor_3.0_spec-1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jta_1.1_spec/1.0/geronimo-jta_1.1_spec-1.0.jar"/>
 </classpath>

Modified: vfs-portlets/trunk/.project
===================================================================
--- vfs-portlets/trunk/.project	2008-10-24 08:00:54 UTC (rev 1236)
+++ vfs-portlets/trunk/.project	2008-10-25 01:43:16 UTC (rev 1237)
@@ -10,6 +10,5 @@
   </buildSpec>
   <natures>
     <nature>org.eclipse.jdt.core.javanature</nature>
-    <nature>com.sysdeo.eclipse.tomcat.tomcatnature</nature>
   </natures>
 </projectDescription>
\ No newline at end of file

Deleted: vfs-portlets/trunk/.settings/org.eclipse.core.resources.prefs
===================================================================
--- vfs-portlets/trunk/.settings/org.eclipse.core.resources.prefs	2008-10-24 08:00:54 UTC (rev 1236)
+++ vfs-portlets/trunk/.settings/org.eclipse.core.resources.prefs	2008-10-25 01:43:16 UTC (rev 1237)
@@ -1,3 +0,0 @@
-#Sat Feb 04 04:18:24 JST 2006
-eclipse.preferences.version=1
-encoding/<project>=UTF-8

Modified: vfs-portlets/trunk/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- vfs-portlets/trunk/.settings/org.eclipse.jdt.core.prefs	2008-10-24 08:00:54 UTC (rev 1236)
+++ vfs-portlets/trunk/.settings/org.eclipse.jdt.core.prefs	2008-10-25 01:43:16 UTC (rev 1237)
@@ -1,261 +1,261 @@
-#Thu Jun 08 15:03:10 JST 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.4
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=1
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines=false
-org.eclipse.jdt.core.formatter.comment.format_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=false
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=80
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=space
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+#Mon Sep 22 17:05:09 JST 2008
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=1
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=true
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=true
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
+org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=80
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=space
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

Modified: vfs-portlets/trunk/.settings/org.eclipse.jdt.ui.prefs
===================================================================
--- vfs-portlets/trunk/.settings/org.eclipse.jdt.ui.prefs	2008-10-24 08:00:54 UTC (rev 1236)
+++ vfs-portlets/trunk/.settings/org.eclipse.jdt.ui.prefs	2008-10-25 01:43:16 UTC (rev 1237)
@@ -1,13 +1,4 @@
-#Thu Jun 08 20:38:39 JST 2006
-eclipse.preferences.version=1
-formatter_settings_version=8
-internal.default.compliance=user
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?>\r\n<templates><template id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment" description\="Comment for getter method" context\="gettercomment_context" enabled\="true" deleted\="false" autoinsert\="true">/**\r\n * @return Returns the ${bare_field_name}.\r\n */</template><template id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment" description\="Comment for setter method" context\="settercomment_context" enabled\="true" deleted\="false" autoinsert\="true">/**\r\n * @param ${param} The ${bare_field_name} to set.\r\n */</template><template id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment" description\="Comment for created constructors" context\="constructorcomment_context" enabled\="true" deleted\="false" autoinsert\="true">/**\r\n * ${tags}\r\n */</template><template id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment" description\="Comment for created Java files" context\="filecomment_context" enabled\="true" deleted\="false" autoinsert\="false">/*\r\n * Copyright 2004-2006 The Portal Application Laboratory Team.\r\n *\r\n * Licensed under the Apache License, Version 2.0 (the "License");\r\n * you may not use this file except in compliance with the License.\r\n * You may obtain a copy of the License at\r\n *\r\n *     http\://www.apache.org/licenses/LICENSE-2.0\r\n *\r\n * Unless required by applicable law or agreed to in writing, software\r\n * distributed under the License is distributed on an "AS IS" BASIS,\r\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, \r\n * either express or implied. See the License for the specific language\r\n * governing permissions and limitations under the License.\r\n */</template><template id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment" description\="Comment for created types" context\="typecomment_context" enabled\="true" deleted\="false" autoinsert\="true">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment" description\="Comment for fields" context\="fieldcomment_context" enabled\="true" deleted\="false" autoinsert\="true">/**\r\n * \r\n */</template><template id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment" description\="Comment for non-overriding methods" context\="methodcomment_context" enabled\="true" deleted\="false" autoinsert\="true">/**\r\n * ${tags}\r\n */</template><template id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment" description\="Comment for overriding methods" context\="overridecomment_context" enabled\="true" deleted\="false" autoinsert\="true">/* (non-Javadoc)\r\n * ${see_to_overridden}\r\n */</template><template id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype" description\="Newly created files" context\="newtype_context" enabled\="true" deleted\="false" autoinsert\="false">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock" description\="Code in new catch blocks" context\="catchblock_context" enabled\="true" deleted\="false" autoinsert\="true">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody" description\="Code in created method stubs" context\="methodbody_context" enabled\="true" deleted\="false" autoinsert\="true">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody" description\="Code in created constructor stubs" context\="constructorbody_context" enabled\="true" deleted\="false" autoinsert\="true">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody" description\="Code in created getters" context\="getterbody_context" enabled\="true" deleted\="false" autoinsert\="true">return ${field};</template><template id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody" description\="Code in created setters" context\="setterbody_context" enabled\="true" deleted\="false" autoinsert\="true">${field} \= ${param};</template></templates>
+#Mon Sep 22 17:05:09 JST 2008
+eclipse.preferences.version=1
+formatter_profile=_PAL Project
+formatter_settings_version=11

Deleted: vfs-portlets/trunk/.tomcatplugin
===================================================================
--- vfs-portlets/trunk/.tomcatplugin	2008-10-24 08:00:54 UTC (rev 1236)
+++ vfs-portlets/trunk/.tomcatplugin	2008-10-25 01:43:16 UTC (rev 1237)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tomcatProjectProperties>
-    <rootDir>src/main/webapp/</rootDir>
-    <exportSource>false</exportSource>
-    <reloadable>false</reloadable>
-    <redirectLogger>true</redirectLogger>
-    <updateXml>true</updateXml>
-    <warLocation></warLocation>
-    <extraInfo></extraInfo>
-    <webPath>/vfs-portlets</webPath>
-</tomcatProjectProperties>

Deleted: vfs-portlets/trunk/build.xml
===================================================================
--- vfs-portlets/trunk/build.xml	2008-10-24 08:00:54 UTC (rev 1236)
+++ vfs-portlets/trunk/build.xml	2008-10-25 01:43:16 UTC (rev 1237)
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="build" default="all" basedir=".">
-
-  <property name="war.name" value="vfs-portlets"/>
-  <property name="src.main.webapp.webinf.classes" value="${basedir}/src/main/webapp/WEB-INF/classes"/>
-  <property name="src.main.webapp.webinf.lib" value="${basedir}/src/main/webapp/WEB-INF/lib"/>
-  <property name="target.webapp.webinf.lib" value="${basedir}/target/${war.name}/WEB-INF/lib"/>
-  <property name="target.webapp.webinf.classes" value="${basedir}/target/${war.name}/WEB-INF/classes"/>
-
-  <property name="shell.cmd" value="sh"/>
-  <property name="shell.options" value="-c"/>
-
-  <target name="check.os" 
-          description="--> Check OS">
-    <condition property="isWindows">
-      <os family="windows" />
-    </condition>
-  </target>
-
-  <target name="setup.shell" depends="check.os" if="isWindows"
-          description="--> Setup shell parameters">
-    <property name="shell.cmd" value="cmd.exe"/>
-    <property name="shell.options" value="/c"/>
-  </target>
-
-  <target name="clean" 
-          description="--> Clean Directories">
-    <delete dir="${src.main.webapp.webinf.classes}"/>
-    <delete dir="${src.main.webapp.webinf.lib}"/>
-  </target>
-
-  <!-- =================================================================== -->
-  <!-- SERVLET DEVELOPMENT ENVRIONMENT                                     -->
-  <!-- =================================================================== -->
-
-  <target name="servlet" depends="setup.shell,clean"
-          description="--> Setup Servlet Delopment Environment">
-
-    <delete dir="${basedir}/target"/>
-    <delete dir="${basedir}/work"/>
-
-    <!-- pom.xml -->
-    <replace
-        file="${basedir}/pom.xml"
-        token="&lt;!-- SERVLET DEV: BEGIN @@@"
-        value="&lt;!-- SERVLET DEV: BEGIN --&gt;"
-        >
-    </replace>
-    <replace
-        file="${basedir}/pom.xml"
-        token="@@@@ SERVLET DEV: END --&gt;"
-        value="&lt;!-- SERVLET DEV: END --&gt;"
-        >
-    </replace>
-
-    <!-- web.xml -->
-    <replace
-        file="${basedir}/src/main/webapp/WEB-INF/web.xml"
-        token="&lt;!-- SERVLET DEV: BEGIN @@@"
-        value="&lt;!-- SERVLET DEV: BEGIN --&gt;"
-        >
-    </replace>
-    <replace
-        file="${basedir}/src/main/webapp/WEB-INF/web.xml"
-        token="@@@@ SERVLET DEV: END --&gt;"
-        value="&lt;!-- SERVLET DEV: END --&gt;"
-        >
-    </replace>
-
-    <exec
-      executable="${shell.cmd}"
-      failonerror="true"
-      dir="${basedir}"
-      >
-      <arg line="${shell.options} 'mvn install'"/>
-    </exec>
-
-    <mkdir dir="${src.main.webapp.webinf.classes}"/>
-    <mkdir dir="${src.main.webapp.webinf.lib}"/>
-
-    <copy todir="${src.main.webapp.webinf.lib}">
-      <fileset dir="${target.webapp.webinf.lib}">
-        <include name="*.jar"/>
-      </fileset>
-    </copy>
-    <copy todir="${src.main.webapp.webinf.classes}">
-      <fileset dir="${target.webapp.webinf.classes}">
-        <include name="**"/>
-      </fileset>
-    </copy>
-
-    <delete dir="${basedir}/target"/>
-
-  </target>
-
-  <!-- =================================================================== -->
-  <!-- PORTLET DEVELOPMENT ENVRIONMENT                                     -->
-  <!-- =================================================================== -->
-
-  <target name="portlet" depends="setup.shell,clean"
-          description="--> Setup Portlet Delopment Environment">
-
-    <delete dir="${basedir}/target"/>
-    <delete dir="${basedir}/work"/>
-
-    <!-- pom.xml -->
-    <replace
-        file="${basedir}/pom.xml"
-        token="&lt;!-- SERVLET DEV: BEGIN --&gt;"
-        value="&lt;!-- SERVLET DEV: BEGIN @@@"
-        >
-    </replace>
-    <replace
-        file="${basedir}/pom.xml"
-        token="&lt;!-- SERVLET DEV: END --&gt;"
-        value="@@@@ SERVLET DEV: END --&gt;" 
-        >
-    </replace>
-
-    <!-- web.xml -->
-    <replace
-        file="${basedir}/src/main/webapp/WEB-INF/web.xml"
-        token="&lt;!-- SERVLET DEV: BEGIN --&gt;"
-        value="&lt;!-- SERVLET DEV: BEGIN @@@"
-        >
-    </replace>
-    <replace
-        file="${basedir}/src/main/webapp/WEB-INF/web.xml"
-        token="&lt;!-- SERVLET DEV: END --&gt;"
-        value="@@@@ SERVLET DEV: END --&gt;" 
-        >
-    </replace>
-
-  </target>
-
-</project>
-

Modified: vfs-portlets/trunk/pom.xml
===================================================================
--- vfs-portlets/trunk/pom.xml	2008-10-24 08:00:54 UTC (rev 1236)
+++ vfs-portlets/trunk/pom.xml	2008-10-25 01:43:16 UTC (rev 1237)
@@ -1,11 +1,11 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>jp.sf.pal</groupId>
   <artifactId>vfs-portlets</artifactId>
+  <version>2.0-SNAPSHOT</version>
   <packaging>war</packaging>
-  <version>1.5-SNAPSHOT</version>
-  <name>VFS Portlet Project</name>
+  <name>VFS Portlet</name>
   <description/>
   <url>http://pal.sourceforge.jp/</url>
   <inceptionYear>2005</inceptionYear>
@@ -37,15 +37,15 @@
     <url>http://pal.sourceforge.jp/</url>
   </organization>
   <build>
-    <finalName>vfs-portlets</finalName>
+    <finalName>vfs-portlet</finalName>
     <defaultGoal>validate</defaultGoal>
     <pluginManagement>
       <plugins>
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
           <configuration>
-            <source>1.4</source>
-            <target>1.4</target>
+            <source>1.5</source>
+            <target>1.5</target>
             <encoding>UTF-8</encoding>
           </configuration>
         </plugin>
@@ -55,20 +55,6 @@
             <updateReleaseInfo>true</updateReleaseInfo>
           </configuration>
         </plugin>
-<!--
-                    <plugin>
-                    <artifactId>maven-site-plugin</artifactId>
-                    <configuration>
-                    <outputEncodinf>UTF-8</outputEncodinf>
-                    </configuration>
-                    </plugin>
-                    <plugin>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <configuration>
-                    <forkMode>none</forkMode>
-                    </configuration>
-                    </plugin>
-                -->
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>cobertura-maven-plugin</artifactId>
@@ -96,23 +82,6 @@
           </execution>
         </executions>
       </plugin>
-<!--
-                <plugin>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <executions>
-                <execution>
-                <id>javadoc-jar</id>
-                <phase>package</phase>
-                <goals>
-                <goal>jar</goal>
-                </goals>
-                </execution>
-                </executions>
-                <configuration>
-                <charset>UTF-8</charset>
-                </configuration>
-                </plugin>
-            -->
     </plugins>
   </build>
   <repositories>
@@ -122,74 +91,13 @@
       <url>http://maven2.marevol.com/</url>
     </repository>
     <repository>
-      <id>maven.marevol.com</id>
-      <name>Maven1 Repository on marevol.com</name>
-      <url>http://maven.marevol.com/</url>
-      <layout>legacy</layout>
-    </repository>
-    <repository>
       <id>maven.seasar.org</id>
       <name>The Seasar Foundation Maven2 Repository</name>
       <url>http://maven.seasar.org/maven2</url>
     </repository>
-<!--
-    <repository>
-      <id>java.net</id>
-      <url>https://maven-repository.dev.java.net/nonav/repository</url>
-      <layout>legacy</layout>
-    </repository>
--->
   </repositories>
-  <pluginRepositories>
-    <pluginRepository>
-      <id>people.apache.org m2-snapshot</id>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-    </pluginRepository>
-    <pluginRepository>
-      <id>snapshots.repository.codehaus.org</id>
-      <url>http://snapshots.repository.codehaus.org</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-    </pluginRepository>
-  </pluginRepositories>
   <dependencies>
-<!--
     <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.9</version>
-    </dependency>
--->
-<!-- SERVLET DEV: BEGIN @@@
-    <dependency>
-      <groupId>jp.sf.pal</groupId>
-      <artifactId>faces-dev-filter</artifactId>
-      <version>0.1</version>
-      <scope>compile</scope>
-    </dependency>
-@@@@ SERVLET DEV: END -->
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
-      <version>2.8.1</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
       <version>2.3</version>
@@ -212,85 +120,159 @@
       <version>1.1.2</version>
     </dependency>
     <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.0.4</version>
-      <scope>compile</scope>
+      <groupId>taglibs</groupId>
+      <artifactId>standard</artifactId>
+      <version>1.1.2</version>
     </dependency>
     <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      <version>2.1</version>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-vfs</artifactId>
+      <version>1.0</version>
     </dependency>
     <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <version>1.3</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>3.2</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-configuration</groupId>
+      <artifactId>commons-configuration</artifactId>
+      <version>1.5</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-el</groupId>
+      <artifactId>commons-el</artifactId>
+      <version>1.0</version>
+    </dependency>
+    <dependency>
       <groupId>commons-fileupload</groupId>
       <artifactId>commons-fileupload</artifactId>
-      <version>1.1</version>
+      <version>1.2.1</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.portals.bridges</groupId>
-      <artifactId>portals-bridges-portletfilter</artifactId>
-      <version>1.0.2-dev</version>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>1.3</version>
     </dependency>
     <dependency>
-      <groupId>jp.sf.pal</groupId>
-      <artifactId>faces-response-filter</artifactId>
-      <version>0.2</version>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>2.3</version>
     </dependency>
     <dependency>
-      <groupId>jp.sf.pal</groupId>
-      <artifactId>tomahawk-bridge</artifactId>
-      <version>0.9.1</version>
+      <groupId>commons-validator</groupId>
+      <artifactId>commons-validator</artifactId>
+      <version>1.2.0</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.myfaces.tomahawk</groupId>
-      <artifactId>tomahawk</artifactId>
-      <version>1.1.3</version>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.0.4</version>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.13</version>
+      <type>jar</type>
+    </dependency>
+<!-- SAStruts -->
+    <dependency>
+      <groupId>org.seasar.container</groupId>
+      <artifactId>s2-extension</artifactId>
+      <version>2.4.29</version>
       <exclusions>
         <exclusion>
-          <groupId>struts</groupId>
-          <artifactId>struts</artifactId>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>com.marevol</groupId>
-      <artifactId>marevol-faces-utils</artifactId>
-      <version>0.3</version>
+      <groupId>org.seasar.container</groupId>
+      <artifactId>s2-tiger</artifactId>
+      <version>2.4.29</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.easymock</groupId>
+          <artifactId>easymock</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
-<!--
     <dependency>
-      <groupId>org.seasar.container</groupId>
-      <artifactId>s2-framework</artifactId>
-      <version>2.4.9</version>
+      <groupId>org.seasar.sastruts</groupId>
+      <artifactId>sa-struts-portlet</artifactId>
+      <version>1.0.0-rc3</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.easymock</groupId>
+          <artifactId>easymock</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.seasar.container</groupId>
-      <artifactId>s2-extension</artifactId>
-      <version>2.4.9</version>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-annotation_1.0_spec</artifactId>
+      <version>1.1.1</version>
+      <exclusions>
+        <exclusion>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
--->
     <dependency>
-      <groupId>org.seasar.teeda</groupId>
-      <artifactId>teeda-core</artifactId>
-      <version>1.0.12-SNAPSHOT</version>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-ejb_3.0_spec</artifactId>
+      <version>1.0</version>
       <exclusions>
         <exclusion>
-          <groupId>rhino</groupId>
-          <artifactId>rhino</artifactId>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.seasar.portlet</groupId>
-      <artifactId>s2-portlet</artifactId>
-      <version>1.0.7</version>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-interceptor_3.0_spec</artifactId>
+      <version>1.0</version>
+      <exclusions>
+        <exclusion>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
-<!-- VFS -->
     <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-vfs</artifactId>
-      <version>1.0-RC8</version>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jta_1.1_spec</artifactId>
+      <version>1.0</version>
+      <exclusions>
+        <exclusion>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
   <reporting>
@@ -298,12 +280,6 @@
       <plugin>
         <artifactId>maven-project-info-reports-plugin</artifactId>
       </plugin>
-<!--
-                <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>surefire-report-maven-plugin</artifactId>
-                </plugin>
-            -->
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>changelog-maven-plugin</artifactId>
@@ -323,26 +299,7 @@
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>cobertura-maven-plugin</artifactId>
         <version>2.0-SNAPSHOT</version>
-<!--
-                    <configuration>
-                    <outputDirectory>${project.build.directory}/site/cobertura</outputDirectory>
-                    </configuration>
-                -->
       </plugin>
-<!--
-                <plugin>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                </plugin>
-                <plugin>
-                <artifactId>maven-clover-plugin</artifactId>
-                </plugin>
-                <plugin>
-                <artifactId>maven-pmd-plugin</artifactId>
-                </plugin>
-                <plugin>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-                </plugin>
-            -->
     </plugins>
   </reporting>
 </project>

Modified: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/VFSConstants.java
===================================================================
--- vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/VFSConstants.java	2008-10-24 08:00:54 UTC (rev 1236)
+++ vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/VFSConstants.java	2008-10-25 01:43:16 UTC (rev 1237)
@@ -1,16 +1,11 @@
 /*
- * Copyright 2005-2006 The Portal Application Laboratory Team.
- *
- * 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
+ * Copyright 2005-2006 The Portal Application Laboratory Team. 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 jp.sf.pal.vfs;
@@ -18,42 +13,8 @@
 public class VFSConstants {
     public static final String CONSTANT_PREFIX = "jp.sf.pal.vfs.";
 
-    public static long MAX_DEFAULT_EXPIRE_TIME = 5000;
+    public static final String DEFAULT_URI = "default-uri";
 
-    public static int DOWNLOAD_CACHE_SIZE = 1024;
-
-    public static int MAX_ID_LENGTH = 100;
-
-    public static String DOWNLOAD_OBJECT = CONSTANT_PREFIX + "DOWNLOAD_OBJECT";
-
-    public static String NEW_FILE_CONTENT_FILE_NAME = CONSTANT_PREFIX
-            + "NEW_FILE_CONTENT_FILE_NAME";
-
-    public static String NEW_FILE_CONTENT_FILE_TYPE = CONSTANT_PREFIX
-            + "NEW_FILE_CONTENT_FILE_TYPE";
-
-    public static String URI = CONSTANT_PREFIX + "URI";
-
-    public static String DEFAULT_URI = "default-uri";
-
-    public static String OUTPUT_HTML = CONSTANT_PREFIX + "OUTPUT_HTML";
-
-    public static final String DISPLAY_FOLDER_LIST_PAGE = "DISPLAY_FOLDER_LIST_PAGE";
-
-    public static final String CREATE_NEW_FILE_PAGE = "CREATE_NEW_FILE_PAGE";
-
-    public static final String WRITE_NEW_FILE_CONTENT_PAGE = "WRITE_NEW_FILE_CONTENT_PAGE";
-
-    public static final String CREATE_NEW_FOLDER_PAGE = "CREATE_NEW_FOLDER_PAGE";
-
-    public static final String UPLOAD_FILE_PAGE = "UPLOAD_FILE_PAGE";
-
-    public static final String RENDER_CREATE_NEW_FILE = "render-create-new-file";
-
-    public static final String RENDER_CREATE_NEW_FOLDER = "render-create-new-folder";
-
-    public static final String RENDER_UPLOAD_FILE = "render-upload-file";
-
     public static final String ACCEPT_PATHS = "accept-paths";
 
     public static final String DENY_PATHS = "deny-paths";
@@ -65,4 +26,8 @@
     public static final String OCTET_STREAM = "application/octet-stream";
 
     public static final String NULL_VALUE = "---";
+
+    public static final String SCOPE = "scope";
+
+    public static final String USERNAME = CONSTANT_PREFIX + "Username";
 }

Added: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/VFSException.java
===================================================================
--- vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/VFSException.java	                        (rev 0)
+++ vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/VFSException.java	2008-10-25 01:43:16 UTC (rev 1237)
@@ -0,0 +1,50 @@
+package jp.sf.pal.vfs;
+
+import jp.sf.pal.vfs.common.CommonException;
+
+public class VFSException extends CommonException {
+
+    private static final long serialVersionUID = 7888789167249221888L;
+
+    public VFSException(String messageId, Object[] args, String message,
+            Throwable cause) {
+        super(messageId, args, message, cause);
+        // TODO Auto-generated constructor stub
+    }
+
+    public VFSException(String messageId, Object[] args, String message) {
+        super(messageId, args, message);
+        // TODO Auto-generated constructor stub
+    }
+
+    public VFSException(String messageId, Object[] args, Throwable cause) {
+        super(messageId, args, cause);
+        // TODO Auto-generated constructor stub
+    }
+
+    public VFSException(String messageId, Object[] args) {
+        super(messageId, args);
+        // TODO Auto-generated constructor stub
+    }
+
+    public VFSException(String messageId, String message, Throwable cause) {
+        super(messageId, message, cause);
+        // TODO Auto-generated constructor stub
+    }
+
+    public VFSException(String messageId, String message) {
+        super(messageId, message);
+        // TODO Auto-generated constructor stub
+    }
+
+    public VFSException(String messageId, Throwable cause) {
+        super(messageId, cause);
+        // TODO Auto-generated constructor stub
+    }
+
+    public VFSException(String messageId) {
+        super(messageId);
+        // TODO Auto-generated constructor stub
+    }
+
+}


Property changes on: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/VFSException.java
___________________________________________________________________
Name: svn:eol-style
   + native

Added: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/action/ListAction.java
===================================================================
--- vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/action/ListAction.java	                        (rev 0)
+++ vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/action/ListAction.java	2008-10-25 01:43:16 UTC (rev 1237)
@@ -0,0 +1,289 @@
+package jp.sf.pal.vfs.action;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import javax.portlet.PortletSession;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import jp.sf.pal.vfs.VFSConstants;
+import jp.sf.pal.vfs.common.util.ConfigUtil;
+import jp.sf.pal.vfs.common.util.SAStrutsUtil;
+import jp.sf.pal.vfs.form.ListForm;
+import jp.sf.pal.vfs.helper.DownloadHelper;
+import jp.sf.pal.vfs.helper.FileParameterHelper;
+import jp.sf.pal.vfs.util.FileParameterHelperComparator;
+import jp.sf.pal.vfs.util.VFSUtil;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.vfs.FileObject;
+import org.apache.commons.vfs.FileSystemException;
+import org.apache.commons.vfs.FileSystemManager;
+import org.apache.commons.vfs.FileType;
+import org.apache.commons.vfs.Selectors;
+import org.seasar.framework.container.S2Container;
+import org.seasar.struts.annotation.ActionForm;
+import org.seasar.struts.annotation.Execute;
+import org.seasar.struts.exception.ActionMessagesException;
+
+public class ListAction implements Serializable {
+
+    private static final long serialVersionUID = 2943756733312576741L;
+
+    private static final Log log = LogFactory.getLog(ListAction.class);
+
+    public List<FileParameterHelper> fileItems;
+
+    @ActionForm
+    private ListForm listForm;
+
+    private transient S2Container container;
+
+    private transient HttpServletRequest request;
+
+    private transient HttpServletResponse response;
+
+    protected String displayIndex() {
+        listForm.scope = VFSUtil.getScope(request);
+        SAStrutsUtil.getPortletSession(request).setAttribute(
+                listForm.scope + "." + VFSConstants.USERNAME,
+                request.getRemoteUser(), PortletSession.APPLICATION_SCOPE);
+        fileItems = createFileItems();
+        return "index.jsp";
+    }
+
+    @Execute(validator = false, input = "index.jsp")
+    public String index() {
+        ConfigUtil.init(request);
+
+        return displayIndex();
+    }
+
+    @Execute(validator = false, input = "index.jsp", urlPattern = "jump/{encodedUri}")
+    public String jump() {
+        return displayIndex();
+    }
+
+    @Execute(validator = false, input = "index.jsp")
+    public String go() {
+        return displayIndex();
+    }
+
+    @Execute(validator = false, input = "index.jsp", urlPattern = "select/{encodedUri}/{encodedBaseName}")
+    public String select() {
+        listForm.uri = listForm.uri + "/" + listForm.baseName;
+        // TODO /
+        return displayIndex();
+    }
+
+    @Execute(validator = false, input = "index.jsp", urlPattern = "delete/{encodedUri}/{encodedBaseName}")
+    public String delete() {
+        listForm.scope = VFSUtil.getScope(request);
+        if (!VFSUtil.checkPath(listForm.scope, listForm.uri)) {
+            // i18n
+            throw new ActionMessagesException("errors.access_denied");
+        }
+
+        displayIndex();
+
+        try {
+            FileSystemManager fsManager = VFSUtil.getFileSystemManager();
+            FileObject fileObject = fsManager.resolveFile(listForm.uri + "/"
+                    + listForm.baseName);
+
+            if (!fileObject.exists()) {
+                throw new ActionMessagesException("errors.file_not_found",
+                        new Object[] { listForm.uri + "/" + listForm.baseName });
+            }
+
+            if (fileObject.getType() == FileType.FOLDER) {
+                try {
+                    // TODO select FileSelector
+                    int num = fileObject.delete(Selectors.SELECT_ALL);
+                    if (num > 0) {
+                        SAStrutsUtil.addMessage(request,
+                                "success.delete_folder");
+                    } else {
+                        throw new ActionMessagesException(
+                                "errors.failed_to_delete_folder");
+                    }
+                } catch (FileSystemException e) {
+                    log.error("Failed delete action.", e);
+                    throw new ActionMessagesException(
+                            "errors.failed_to_delete_folder");
+                }
+            } else if (fileObject.getType() == FileType.FILE) {
+                try {
+
+                    if (fileObject.delete()) {
+                        SAStrutsUtil.addMessage(request, "success.delete_file");
+                    } else {
+                        throw new ActionMessagesException(
+                                "errors.failed_to_delete_file");
+                    }
+                } catch (FileSystemException e) {
+                    log.error("Failed delete action.", e);
+                    throw new ActionMessagesException(
+                            "errors.failed_to_delete_file");
+                }
+            } else {
+                throw new ActionMessagesException("errors.unknow_object",
+                        new Object[] { listForm.uri + "/" + listForm.baseName });
+            }
+        } catch (FileSystemException e) {
+            log.error("The file system error occurs.", e);
+            throw new ActionMessagesException("errors.file_system_error");
+        }
+
+        displayIndex();
+        return "index.jsp";
+    }
+
+    @Execute(validator = false, input = "downloadError.jsp", urlPattern = "download/{scope}/{downloadUri}")
+    public String download() {
+        ConfigUtil.init(request);
+
+        String username = (String) request.getSession().getAttribute(
+                listForm.scope + "." + VFSConstants.USERNAME);
+        if (username == null) {
+            throw new ActionMessagesException("errors.invalid_user");
+        }
+
+        if (!VFSUtil.checkPath(listForm.scope, listForm.uri)) {
+            // i18n
+            throw new ActionMessagesException("errors.access_denied");
+        }
+
+        FileSystemManager fsManager = VFSUtil.getFileSystemManager();
+        try {
+            FileObject currentObject = fsManager.resolveFile(listForm.uri);
+
+            if (currentObject.exists()) {
+                FileParameterHelper fileParam = createFileParameterHelper(currentObject);
+
+                DownloadHelper downloadHelper = (DownloadHelper) container
+                        .getComponent(DownloadHelper.class);
+
+                downloadHelper.setContentType(fileParam.getContentType());
+                downloadHelper.setFilename(fileParam.getBaseName());
+                downloadHelper.writeResponse(currentObject.getContent()
+                        .getInputStream());
+                return null;
+            }
+        } catch (Exception e) {
+            log.error("The file system error occurs.", e);
+            throw new ActionMessagesException("errors.file_system_error");
+        }
+
+        throw new ActionMessagesException("errors.file_not_found",
+                new Object[] { listForm.uri });
+
+    }
+
+    private List<FileParameterHelper> createFileItems() {
+
+        if (StringUtils.isEmpty(listForm.uri)) {
+            listForm.uri = VFSUtil.getDefaultUri(listForm.scope);
+        }
+
+        // Get File System
+        List<FileParameterHelper> objects = new ArrayList<FileParameterHelper>();
+
+        if (VFSUtil.checkPath(listForm.scope, listForm.uri)) {
+            try {
+                FileSystemManager fsManager = VFSUtil.getFileSystemManager();
+                FileObject currentDirectory = fsManager
+                        .resolveFile(listForm.uri);
+
+                FileObject[] children = currentDirectory.getChildren();
+                ArrayList<FileParameterHelper> folderList = new ArrayList<FileParameterHelper>();
+                ArrayList<FileParameterHelper> fileList = new ArrayList<FileParameterHelper>();
+                for (int i = 0; i < children.length; i++) {
+                    try {
+                        if (children[i].getType() == FileType.FOLDER) {
+                            folderList
+                                    .add(createFileParameterHelper(children[i]));
+                        } else {
+                            fileList
+                                    .add(createFileParameterHelper(children[i]));
+                        }
+                    } catch (FileSystemException e) {
+                        fileList.add(createFileParameterHelper(children[i]));
+                    }
+                }
+                FileParameterHelper[] folders = folderList
+                        .toArray(new FileParameterHelper[] {});
+                // TODO Comparator
+                sort(folders);
+                for (int i = 0; i < folders.length; i++) {
+                    objects.add(folders[i]);
+                }
+                FileParameterHelper[] files = fileList
+                        .toArray(new FileParameterHelper[] {});
+                // TODO Comparator
+                sort(files);
+                for (int i = 0; i < files.length; i++) {
+                    objects.add(files[i]);
+                }
+            } catch (FileSystemException e) {
+                // i18n
+                log.error("The file system error occurs.", e);
+                throw new ActionMessagesException("errors.file_system_error");
+            }
+        } else {
+            // i18n
+            throw new ActionMessagesException("errors.access_denied");
+        }
+        return objects;
+
+    }
+
+    private void sort(FileParameterHelper[] files) {
+        Arrays.sort(files, new FileParameterHelperComparator());
+    }
+
+    private FileParameterHelper createFileParameterHelper(FileObject fObject) {
+        FileParameterHelper fileParam = (FileParameterHelper) container
+                .getComponent(FileParameterHelper.class);
+        fileParam.setFileObject(fObject);
+        return fileParam;
+    }
+
+    public ListForm getListForm() {
+        return listForm;
+    }
+
+    public void setListForm(ListForm listForm) {
+        this.listForm = listForm;
+    }
+
+    public S2Container getContainer() {
+        return container;
+    }
+
+    public void setContainer(S2Container container) {
+        this.container = container;
+    }
+
+    public HttpServletRequest getRequest() {
+        return request;
+    }
+
+    public void setRequest(HttpServletRequest request) {
+        this.request = request;
+    }
+
+    public HttpServletResponse getResponse() {
+        return response;
+    }
+
+    public void setResponse(HttpServletResponse response) {
+        this.response = response;
+    }
+
+}


Property changes on: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/action/ListAction.java
___________________________________________________________________
Name: svn:eol-style
   + native

Added: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/action/NewfolderAction.java
===================================================================
--- vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/action/NewfolderAction.java	                        (rev 0)
+++ vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/action/NewfolderAction.java	2008-10-25 01:43:16 UTC (rev 1237)
@@ -0,0 +1,114 @@
+package jp.sf.pal.vfs.action;
+
+import java.io.Serializable;
+
+import javax.servlet.http.HttpServletRequest;
+
+import jp.sf.pal.vfs.common.util.SAStrutsUtil;
+import jp.sf.pal.vfs.form.NewfolderForm;
+import jp.sf.pal.vfs.util.VFSUtil;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.vfs.FileObject;
+import org.apache.commons.vfs.FileSystemException;
+import org.apache.commons.vfs.FileSystemManager;
+import org.seasar.struts.annotation.ActionForm;
+import org.seasar.struts.annotation.Execute;
+import org.seasar.struts.exception.ActionMessagesException;
+
+public class NewfolderAction implements Serializable {
+
+    private static final long serialVersionUID = -1967535744210573670L;
+
+    private static final Log log = LogFactory.getLog(NewfolderAction.class);
+
+    @ActionForm
+    protected NewfolderForm newfolderForm;
+
+    protected transient HttpServletRequest request;
+
+    @Execute(validator = false, input = "error.jsp")
+    public String index() {
+        throw new ActionMessagesException("errors.invalid_access");
+    }
+
+    @Execute(validator = false, input = "error.jsp", urlPattern = "createpage/{encodedUri}")
+    public String createpage() {
+        // page navi
+        newfolderForm.initialize();
+
+        // update edit page
+
+        return "edit.jsp";
+    }
+
+    @Execute(validator = true, input = "edit.jsp")
+    public String confirm() {
+        return "confirm.jsp";
+    }
+
+    @Execute(validator = true, input = "edit.jsp")
+    public String create() {
+        String scope = VFSUtil.getScope(request);
+
+        if (!VFSUtil.checkPath(scope, newfolderForm.uri)) {
+            // i18n
+            throw new ActionMessagesException("errors.access_denied");
+        }
+
+        try {
+            FileSystemManager fsManager = VFSUtil.getFileSystemManager();
+            FileObject newFileObject = fsManager.resolveFile(newfolderForm.uri
+                    + "/" + newfolderForm.name);
+            // TODO add confirmation
+            // if (!newFileObject.exists())
+            // {
+            // TODO should catch exception to check if it's created
+            newFileObject.createFolder();
+
+            // TODO I18N
+            SAStrutsUtil.addMessage(request, "success.create_folder");
+
+            // }
+
+            // TODO check sa-struts-portlet
+            // return "/list/index";
+
+            return createpage();
+        } catch (FileSystemException e) {
+            // TODO I18N
+            log.error("Failed to create a new folder.", e);
+            throw new ActionMessagesException("errors.failed_to_create_folder");
+        }
+
+    }
+
+    @Execute(validator = false, input = "error.jsp")
+    public String editagain() {
+        return "edit.jsp";
+    }
+
+    @Execute(validator = false, input = "error.jsp")
+    public String back() {
+        // reset edit page
+        // TODO check sa-struts-portlet
+        return "/list/index";
+    }
+
+    public NewfolderForm getNewfolderForm() {
+        return newfolderForm;
+    }
+
+    public void setNewfolderForm(NewfolderForm newfolderForm) {
+        this.newfolderForm = newfolderForm;
+    }
+
+    public HttpServletRequest getRequest() {
+        return request;
+    }
+
+    public void setRequest(HttpServletRequest request) {
+        this.request = request;
+    }
+}


Property changes on: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/action/NewfolderAction.java
___________________________________________________________________
Name: svn:eol-style
   + native

Added: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/action/UploadAction.java
===================================================================
--- vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/action/UploadAction.java	                        (rev 0)
+++ vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/action/UploadAction.java	2008-10-25 01:43:16 UTC (rev 1237)
@@ -0,0 +1,114 @@
+package jp.sf.pal.vfs.action;
+
+import java.io.Serializable;
+
+import javax.servlet.http.HttpServletRequest;
+
+import jp.sf.pal.vfs.common.util.SAStrutsUtil;
+import jp.sf.pal.vfs.form.UploadForm;
+import jp.sf.pal.vfs.util.VFSUtil;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.vfs.FileObject;
+import org.apache.commons.vfs.FileSystemManager;
+import org.seasar.struts.annotation.ActionForm;
+import org.seasar.struts.annotation.Execute;
+import org.seasar.struts.exception.ActionMessagesException;
+
+public class UploadAction implements Serializable {
+
+    private static final long serialVersionUID = -1967535744210573670L;
+
+    private static final Log log = LogFactory.getLog(UploadAction.class);
+
+    @ActionForm
+    protected UploadForm uploadForm;
+
+    protected transient HttpServletRequest request;
+
+    @Execute(validator = false, input = "error.jsp")
+    public String index() {
+        throw new ActionMessagesException("errors.invalid_access");
+    }
+
+    @Execute(validator = false, input = "error.jsp", urlPattern = "createpage/{encodedUri}")
+    public String createpage() {
+        // page navi
+        uploadForm.initialize();
+
+        // update edit page
+
+        return "edit.jsp";
+    }
+
+    // @Execute(validator = true, input = "edit.jsp")
+    // public String confirm() {
+    // return "confirm.jsp";
+    // }
+
+    @Execute(validator = true, input = "edit.jsp")
+    public String upload() {
+        String scope = VFSUtil.getScope(request);
+
+        if (!VFSUtil.checkPath(scope, uploadForm.uri)) {
+            // i18n
+            throw new ActionMessagesException("errors.access_denied");
+        }
+
+        try {
+            // For Windows
+            String filename = uploadForm.uploadedFile.getFileName();
+            if (log.isDebugEnabled()) {
+                log.debug("filename=" + filename);
+            }
+
+            FileSystemManager fsManager = VFSUtil.getFileSystemManager();
+            FileObject newFileObject = fsManager.resolveFile(uploadForm.uri
+                    + "/" + filename);
+            // TODO add confirmation
+            if (newFileObject.exists()) {
+                throw new ActionMessagesException("errors.file_exist",
+                        new Object[] { filename });
+            }
+            // TODO should catch exception to check if it's created
+            newFileObject.createFile();
+            newFileObject.getContent().close();
+            VFSUtil.drain(uploadForm.uploadedFile.getInputStream(),
+                    newFileObject.getContent().getOutputStream());
+
+            // I18N
+            SAStrutsUtil.addMessage(request, "success.upload_file");
+
+            return createpage();
+        } catch (Exception e) {
+            // TODO I18N
+            log.error("Failed to upload the file.", e);
+            throw new ActionMessagesException("errors.failed_to_upload_file");
+        }
+
+    }
+
+    @Execute(validator = false, input = "error.jsp")
+    public String back() {
+        // reset edit page
+        // TODO check sa-struts-portlet
+        return "/list/index";
+    }
+
+    public UploadForm getUploadForm() {
+        return uploadForm;
+    }
+
+    public void setUploadForm(UploadForm newfolderForm) {
+        this.uploadForm = newfolderForm;
+    }
+
+    public HttpServletRequest getRequest() {
+        return request;
+    }
+
+    public void setRequest(HttpServletRequest request) {
+        this.request = request;
+    }
+}


Property changes on: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/action/UploadAction.java
___________________________________________________________________
Name: svn:eol-style
   + native

Added: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/common/CommonException.java
===================================================================
--- vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/common/CommonException.java	                        (rev 0)
+++ vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/common/CommonException.java	2008-10-25 01:43:16 UTC (rev 1237)
@@ -0,0 +1,103 @@
+/*
+ * 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 jp.sf.pal.vfs.common;
+
+/**
+ * @author shinsuke
+ */
+public class CommonException extends Exception {
+
+    /**
+     * Serial Version UID
+     */
+    private static final long serialVersionUID = 4564000116499132363L;
+
+    private String messageId;
+
+    private Object[] args;
+
+    /**
+     * @return Returns the messageId.
+     */
+    public String getMessageId() {
+        return messageId;
+    }
+
+    /**
+     * @param messageId The messageId to set.
+     */
+    public void setMessageId(String messageId) {
+        this.messageId = messageId;
+    }
+
+    /**
+     * @return Returns the args.
+     */
+    public Object[] getArgs() {
+        return args;
+    }
+
+    /**
+     * @param args The args to set.
+     */
+    public void setArgs(Object[] args) {
+        this.args = args;
+    }
+
+    public CommonException(String messageId) {
+        super(messageId);
+        this.messageId = messageId;
+    }
+
+    public CommonException(String messageId, Object[] args) {
+        super(messageId);
+        this.messageId = messageId;
+        this.args = args;
+    }
+
+    public CommonException(String messageId, String message, Throwable cause) {
+        super(message, cause);
+        this.messageId = messageId;
+    }
+
+    public CommonException(String messageId, Object[] args, String message,
+            Throwable cause) {
+        super(message, cause);
+        this.messageId = messageId;
+        this.args = args;
+    }
+
+    public CommonException(String messageId, String message) {
+        super(message);
+        this.messageId = messageId;
+    }
+
+    public CommonException(String messageId, Object[] args, String message) {
+        super(message);
+        this.messageId = messageId;
+        this.args = args;
+    }
+
+    public CommonException(String messageId, Throwable cause) {
+        super(cause);
+        this.messageId = messageId;
+    }
+
+    public CommonException(String messageId, Object[] args, Throwable cause) {
+        super(cause);
+        this.messageId = messageId;
+        this.args = args;
+    }
+
+}


Property changes on: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/common/CommonException.java
___________________________________________________________________
Name: svn:eol-style
   + native

Added: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/common/filter/SecurityConstraintFilter.java
===================================================================
--- vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/common/filter/SecurityConstraintFilter.java	                        (rev 0)
+++ vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/common/filter/SecurityConstraintFilter.java	2008-10-25 01:43:16 UTC (rev 1237)
@@ -0,0 +1,50 @@
+package jp.sf.pal.vfs.common.filter;
+
+import java.io.IOException;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class SecurityConstraintFilter implements Filter {
+    private static final String ACCEPT_URL_PATHS = "acceptUrlPaths";
+
+    private String[] acceptUrlPaths;
+
+    public void init(FilterConfig config) throws ServletException {
+        String value = config.getInitParameter(ACCEPT_URL_PATHS);
+        if (value != null) {
+            acceptUrlPaths = value.split(",");
+        } else {
+            acceptUrlPaths = new String[0];
+        }
+    }
+
+    public void destroy() {
+
+    }
+
+    public void doFilter(ServletRequest request, ServletResponse response,
+            FilterChain chain) throws IOException, ServletException {
+        boolean accept = false;
+        HttpServletRequest hRequest = (HttpServletRequest) request;
+        for (int i = 0; i < acceptUrlPaths.length; i++) {
+            String servletPath = hRequest.getServletPath();
+            if (servletPath != null && servletPath.matches(acceptUrlPaths[i])) {
+                accept = true;
+            }
+        }
+        if (accept) {
+            chain.doFilter(request, response);
+        } else {
+            ((HttpServletResponse) response)
+                    .sendError(HttpServletResponse.SC_FORBIDDEN);
+        }
+    }
+
+}


Property changes on: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/common/filter/SecurityConstraintFilter.java
___________________________________________________________________
Name: svn:eol-style
   + native

Added: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/common/form/PagingResultForm.java
===================================================================
--- vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/common/form/PagingResultForm.java	                        (rev 0)
+++ vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/common/form/PagingResultForm.java	2008-10-25 01:43:16 UTC (rev 1237)
@@ -0,0 +1,5 @@
+package jp.sf.pal.vfs.common.form;
+
+public interface PagingResultForm {
+
+}


Property changes on: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/common/form/PagingResultForm.java
___________________________________________________________________
Name: svn:eol-style
   + native

Added: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/common/util/ConfigUtil.java
===================================================================
--- vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/common/util/ConfigUtil.java	                        (rev 0)
+++ vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/common/util/ConfigUtil.java	2008-10-25 01:43:16 UTC (rev 1237)
@@ -0,0 +1,207 @@
+package jp.sf.pal.vfs.common.util;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.configuration.XMLConfiguration;
+
+public class ConfigUtil {
+
+    public static final String CONFIG_PATH = "/WEB-INF/vfs.xml";
+
+    private static XMLConfiguration config;
+
+    public static void init(HttpServletRequest request) {
+        if (config == null) {
+            synchronized (ConfigUtil.class) {
+                if (config == null) {
+                    try {
+                        config = new XMLConfiguration(SAStrutsUtil.getRealPath(
+                                request, CONFIG_PATH));
+                    } catch (ConfigurationException e) {
+                        throw new IllegalStateException(
+                                "Could not load a config file: "
+                                        + SAStrutsUtil.getRealPath(request,
+                                                CONFIG_PATH), e);
+                    }
+                }
+            }
+        }
+    }
+
+    public static void save() throws ConfigurationException {
+        config.save();
+    }
+
+    public static void addProperty(String s, Object obj) {
+        config.addProperty(s, obj);
+    }
+
+    public static void clear() {
+        config.clear();
+    }
+
+    public static void clearProperty(String s) {
+        config.clearProperty(s);
+    }
+
+    public static boolean containsKey(String s) {
+        return config.containsKey(s);
+    }
+
+    public static BigDecimal getBigDecimal(String s, BigDecimal bigdecimal) {
+        return config.getBigDecimal(s, bigdecimal);
+    }
+
+    public static BigDecimal getBigDecimal(String s) {
+        return config.getBigDecimal(s);
+    }
+
+    public static BigInteger getBigInteger(String s, BigInteger biginteger) {
+        return config.getBigInteger(s, biginteger);
+    }
+
+    public static BigInteger getBigInteger(String s) {
+        return config.getBigInteger(s);
+    }
+
+    public static boolean getBoolean(String s, boolean flag) {
+        return config.getBoolean(s, flag);
+    }
+
+    public static Boolean getBoolean(String s, Boolean boolean1) {
+        return config.getBoolean(s, boolean1);
+    }
+
+    public static boolean getBoolean(String s) {
+        return config.getBoolean(s);
+    }
+
+    public static byte getByte(String s, byte byte0) {
+        return config.getByte(s, byte0);
+    }
+
+    public static Byte getByte(String s, Byte byte1) {
+        return config.getByte(s, byte1);
+    }
+
+    public static byte getByte(String s) {
+        return config.getByte(s);
+    }
+
+    public static double getDouble(String s, double d) {
+        return config.getDouble(s, d);
+    }
+
+    public static Double getDouble(String s, Double double1) {
+        return config.getDouble(s, double1);
+    }
+
+    public static double getDouble(String s) {
+        return config.getDouble(s);
+    }
+
+    public static float getFloat(String s, float f) {
+        return config.getFloat(s, f);
+    }
+
+    public static Float getFloat(String s, Float float1) {
+        return config.getFloat(s, float1);
+    }
+
+    public static float getFloat(String s) {
+        return config.getFloat(s);
+    }
+
+    public static int getInt(String s, int i) {
+        return config.getInt(s, i);
+    }
+
+    public static int getInt(String s) {
+        return config.getInt(s);
+    }
+
+    public static Integer getInteger(String s, Integer integer) {
+        return config.getInteger(s, integer);
+    }
+
+    public static Iterator getKeys() {
+        return config.getKeys();
+    }
+
+    public static Iterator getKeys(String s) {
+        return config.getKeys(s);
+    }
+
+    public static List getList(String s, List list) {
+        return config.getList(s, list);
+    }
+
+    public static List getList(String s) {
+        return config.getList(s);
+    }
+
+    public static long getLong(String s, long l) {
+        return config.getLong(s, l);
+    }
+
+    public static Long getLong(String s, Long long1) {
+        return config.getLong(s, long1);
+    }
+
+    public static long getLong(String s) {
+        return config.getLong(s);
+    }
+
+    public static Properties getProperties(String s) {
+        return config.getProperties(s);
+    }
+
+    public static Object getProperty(String s) {
+        return config.getProperty(s);
+    }
+
+    public static short getShort(String s, short word0) {
+        return config.getShort(s, word0);
+    }
+
+    public static Short getShort(String s, Short short1) {
+        return config.getShort(s, short1);
+    }
+
+    public static short getShort(String s) {
+        return config.getShort(s);
+    }
+
+    public static String getString(String s, String s1) {
+        return config.getString(s, s1);
+    }
+
+    public static String getString(String s) {
+        return config.getString(s);
+    }
+
+    public static String[] getStringArray(String s) {
+        return config.getStringArray(s);
+    }
+
+    public static boolean isEmpty() {
+        return config.isEmpty();
+    }
+
+    public static void setProperty(String s, Object obj) {
+        config.setProperty(s, obj);
+    }
+
+    public static Configuration subset(String s) {
+        return config.subset(s);
+    }
+
+}


Property changes on: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/common/util/ConfigUtil.java
___________________________________________________________________
Name: svn:eol-style
   + native

Added: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/common/util/DateUtil.java
===================================================================
--- vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/common/util/DateUtil.java	                        (rev 0)
+++ vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/common/util/DateUtil.java	2008-10-25 01:43:16 UTC (rev 1237)
@@ -0,0 +1,251 @@
+/*
+ * Copyright 2004-2007 The Portal Application Laboratory Team. 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 jp.sf.pal.vfs.common.util;
+
+import java.util.Calendar;
+import java.util.Date;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+public class DateUtil {
+    /**
+     * Logger for this class
+     */
+    private static final Log log = LogFactory.getLog(DateUtil.class);
+
+    /**
+     * Allocates a Date object and initializes it so that it represents
+     * midnight, local time, at the beginning of the day specified by the year,
+     * month, and date arguments.
+     * 
+     * @param year
+     * @param month
+     * @param date
+     * @return
+     */
+    public static Date get(int year, int month, int date) {
+        if (log.isDebugEnabled()) {
+            log.debug("get(int, int, int) -  : year=" + year + ", month="
+                    + month + ", date=" + date);
+        }
+
+        return get(year, month, date, 0, 0);
+    }
+
+    /**
+     * Allocates a Date object and initializes it so that it represents the
+     * instant at the start of the minute specified by the year, month, date,
+     * hrs, and min arguments, in the local time zone.
+     * 
+     * @param year
+     * @param month
+     * @param date
+     * @param hrs
+     * @param min
+     * @return
+     */
+    public static Date get(int year, int month, int date, int hrs, int min) {
+        if (log.isDebugEnabled()) {
+            log.debug("get(int, int, int, int, int) -  : year=" + year
+                    + ", month=" + month + ", date=" + date + ", hrs=" + hrs
+                    + ", min=" + min);
+        }
+
+        return get(year, month, date, hrs, min, 0);
+    }
+
+    /**
+     * Allocates a Date object and initializes it so that it represents the
+     * instant at the start of the second specified by the year, month, date,
+     * hrs, min, and sec arguments, in the local time zone.
+     * 
+     * @param year
+     * @param month
+     * @param date
+     * @param hrs
+     * @param min
+     * @param sec
+     * @return
+     */
+    public static Date get(int year, int month, int date, int hrs, int min,
+            int sec) {
+        if (log.isDebugEnabled()) {
+            log.debug("get(int, int, int, int, int, int) -  : year=" + year
+                    + ", month=" + month + ", date=" + date + ", hrs=" + hrs
+                    + ", min=" + min + ", sec=" + sec);
+        }
+
+        return get(year, month, date, hrs, min, sec, 0);
+
+    }
+
+    /**
+     * Allocates a Date object and initializes it so that it represents the
+     * instant at the start of the second specified by the year, month, date,
+     * hrs, min, sec and millisec arguments, in the local time zone.
+     * 
+     * @param year
+     * @param month
+     * @param date
+     * @param hrs
+     * @param min
+     * @param sec
+     * @param millisec
+     * @return
+     */
+    public static Date get(int year, int month, int date, int hrs, int min,
+            int sec, int millisec) {
+        if (log.isDebugEnabled()) {
+            log.debug("get(int, int, int, int, int, int) -  : year=" + year
+                    + ", month=" + month + ", date=" + date + ", hrs=" + hrs
+                    + ", min=" + min + ", sec=" + sec + ", millisec="
+                    + millisec);
+        }
+
+        Calendar cal = Calendar.getInstance();
+        cal.set(year + 1900, month, date, hrs, min, sec);
+        cal.set(Calendar.MILLISECOND, millisec);
+        return cal.getTime();
+
+    }
+
+    /**
+     * Returns a value that is the result of subtracting 1900 from the year that
+     * contains or begins with the instant in time represented by this Date
+     * object, as interpreted in the local time zone.
+     * 
+     * @param d
+     * @return
+     */
+    public static int getYear(Date d) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(d);
+        return cal.get(Calendar.YEAR) - 1900;
+    }
+
+    /**
+     * Returns a number representing the month that contains or begins with the
+     * instant in time represented by this Date object. The value returned is
+     * between 0 and 11, with the value 0 representing January.
+     * 
+     * @param d
+     * @return
+     */
+    public static int getMonth(Date d) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(d);
+        return cal.get(Calendar.MONTH);
+    }
+
+    /**
+     * Returns the day of the month represented by this Date object. The value
+     * returned is between 1 and 31 representing the day of the month that
+     * contains or begins with the instant in time represented by this Date
+     * object, as interpreted in the local time zone.
+     * 
+     * @param d
+     * @return
+     */
+    public static int getDate(Date d) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(d);
+        return cal.get(Calendar.DAY_OF_MONTH);
+    }
+
+    /**
+     * Returns the day of the week represented by this date. The returned value
+     * (0 = Sunday, 1 = Monday, 2 = Tuesday, 3 = Wednesday, 4 = Thursday, 5 =
+     * Friday, 6 = Saturday) represents the day of the week that contains or
+     * begins with the instant in time represented by this Date object, as
+     * interpreted in the local time zone.
+     * 
+     * @param d
+     * @return
+     */
+    public static int getDay(Date d) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(d);
+        return cal.get(Calendar.DAY_OF_WEEK) - 1;
+    }
+
+    /**
+     * Returns the hour represented by this Date object. The returned value is a
+     * number (0 through 23) representing the hour within the day that contains
+     * or begins with the instant in time represented by this Date object, as
+     * interpreted in the local time zone.
+     * 
+     * @param d
+     * @return
+     */
+    public static int getHours(Date d) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(d);
+        return cal.get(Calendar.HOUR_OF_DAY);
+    }
+
+    /**
+     * Returns the number of minutes past the hour represented by this date, as
+     * interpreted in the local time zone. The value returned is between 0 and
+     * 59.
+     * 
+     * @param d
+     * @return
+     */
+    public static int getMinutes(Date d) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(d);
+        return cal.get(Calendar.MINUTE);
+    }
+
+    /**
+     * Returns the number of seconds past the minute represented by this date.
+     * The value returned is between 0 and 61. The values 60 and 61 can only
+     * occur on those Java Virtual Machines that take leap seconds into account.
+     * 
+     * @param d
+     * @return
+     */
+    public static int getSeconds(Date d) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(d);
+        return cal.get(Calendar.SECOND);
+    }
+
+    public static Integer calculateAge(Date date) {
+        if (date == null) {
+            return null;
+        }
+        Date now = Calendar.getInstance().getTime();
+        int age = DateUtil.getYear(now) - DateUtil.getYear(date);
+        if (age > 0) {
+            if (DateUtil.getMonth(now) < DateUtil.getMonth(date)) {
+                if (DateUtil.getDate(now) < DateUtil.getDate(date)) {
+                    age--;
+                }
+            }
+            return Integer.valueOf(age);
+        }
+        return null;
+    }
+
+    public static Date calculateDate(Integer age) {
+        if (age == null) {
+            return null;
+        }
+        Date now = Calendar.getInstance().getTime();
+        int year = DateUtil.getYear(now) - age.intValue();
+
+        return DateUtil.get(year, DateUtil.getMonth(now),
+                DateUtil.getDate(now), 0, 0, 0, 0);
+    }
+
+}


Property changes on: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/common/util/DateUtil.java
___________________________________________________________________
Name: svn:eol-style
   + native

Added: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/common/util/SAStrutsUtil.java
===================================================================
--- vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/common/util/SAStrutsUtil.java	                        (rev 0)
+++ vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/common/util/SAStrutsUtil.java	2008-10-25 01:43:16 UTC (rev 1237)
@@ -0,0 +1,86 @@
+package jp.sf.pal.vfs.common.util;
+
+import java.util.Map;
+
+import javax.portlet.PortletConfig;
+import javax.portlet.PortletContext;
+import javax.portlet.PortletRequest;
+import javax.portlet.PortletSession;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
+import org.seasar.struts.portlet.util.PortletUtil;
+import org.seasar.struts.util.ActionMessagesUtil;
+
+public class SAStrutsUtil {
+
+    public static PortletRequest getPortletRequest(HttpServletRequest request) {
+        PortletRequest portletRequest = (PortletRequest) request
+                .getAttribute(PortletUtil.PORTLET_REQUEST);
+        if (portletRequest != null) {
+            return portletRequest;
+        }
+        return null;
+    }
+
+    public static PortletConfig getPortletConfig(HttpServletRequest request) {
+        PortletConfig portletConfig = (PortletConfig) request
+                .getAttribute(PortletUtil.PORTLET_CONFIG);
+        if (portletConfig != null) {
+            return portletConfig;
+        }
+        return null;
+    }
+
+    public static PortletContext getPortletContext(HttpServletRequest request) {
+        PortletConfig portletConfig = (PortletConfig) request
+                .getAttribute(PortletUtil.PORTLET_CONFIG);
+        if (portletConfig != null) {
+            return portletConfig.getPortletContext();
+        }
+        return null;
+    }
+
+    public static String getRealPath(HttpServletRequest request, String path) {
+        PortletContext portletContext = getPortletContext(request);
+        if (portletContext != null) {
+            return portletContext.getRealPath(path);
+        }
+        return path;
+    }
+
+    public static PortletSession getPortletSession(HttpServletRequest request) {
+        PortletRequest portletRequest = (PortletRequest) request
+                .getAttribute(PortletUtil.PORTLET_REQUEST);
+        if (portletRequest != null) {
+            return portletRequest.getPortletSession();
+        }
+        return null;
+    }
+
+    public static void addMessage(HttpServletRequest request, String key) {
+        ActionMessages msgs = new ActionMessages();
+        msgs.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(key));
+        ActionMessagesUtil.saveMessages(request, msgs);
+    }
+
+    public static String getRequestParameter(HttpServletRequest request,
+            String key) {
+        PortletRequest portletRequest = (PortletRequest) request
+                .getAttribute(PortletUtil.PORTLET_REQUEST);
+        if (portletRequest != null) {
+            return portletRequest.getParameter(key);
+        }
+        return null;
+    }
+
+    public static String getUserInfo(HttpServletRequest request, String key,
+            String defaultValue) {
+        Map userInfo = (Map) request.getAttribute(PortletRequest.USER_INFO);
+        String value = (userInfo != null) ? (String) userInfo.get(key)
+                : defaultValue;
+        return value != null ? value : defaultValue;
+    }
+
+}


Property changes on: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/common/util/SAStrutsUtil.java
___________________________________________________________________
Name: svn:eol-style
   + native

Added: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/form/ListForm.java
===================================================================
--- vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/form/ListForm.java	                        (rev 0)
+++ vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/form/ListForm.java	2008-10-25 01:43:16 UTC (rev 1237)
@@ -0,0 +1,56 @@
+package jp.sf.pal.vfs.form;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+
+import jp.sf.pal.vfs.VFSException;
+import jp.sf.pal.vfs.util.VFSUtil;
+
+import org.apache.commons.codec.binary.Base64;
+import org.seasar.struts.annotation.Required;
+
+public class ListForm implements Serializable {
+
+    private static final long serialVersionUID = 908618911617859042L;
+
+    @Required(target = "go")
+    public String uri;
+
+    @Required(target = "select")
+    public String baseName;
+
+    @Required(target = "download")
+    public String scope;
+
+    public String getEncodedUri() throws VFSException {
+        return VFSUtil.getEncodedValue(uri);
+    }
+
+    public void setEncodedUri(String u) throws VFSException {
+        uri = VFSUtil.getDencodedValue(u);
+    }
+
+    public String getDownloadUri() throws VFSException {
+        return VFSUtil.getEncodedValue(uri);
+    }
+
+    public void setDownloadUri(String u) throws VFSException {
+        if (u == null) {
+            return;
+        }
+        try {
+            uri = new String(Base64.decodeBase64(u.getBytes("UTF-8")), "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            throw new VFSException("errors.file_system_error", e);
+        }
+    }
+
+    public String getEncodedBaseName() throws VFSException {
+        return VFSUtil.getEncodedValue(baseName);
+    }
+
+    public void setEncodedBaseName(String v) throws VFSException {
+        baseName = VFSUtil.getDencodedValue(v);
+    }
+}


Property changes on: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/form/ListForm.java
___________________________________________________________________
Name: svn:eol-style
   + native

Added: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/form/NewfolderForm.java
===================================================================
--- vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/form/NewfolderForm.java	                        (rev 0)
+++ vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/form/NewfolderForm.java	2008-10-25 01:43:16 UTC (rev 1237)
@@ -0,0 +1,31 @@
+package jp.sf.pal.vfs.form;
+
+import java.io.Serializable;
+
+import jp.sf.pal.vfs.VFSException;
+import jp.sf.pal.vfs.util.VFSUtil;
+
+import org.seasar.struts.annotation.Required;
+
+public class NewfolderForm implements Serializable {
+
+    private static final long serialVersionUID = -117524817830257255L;
+
+    @Required
+    public String uri;
+
+    @Required
+    public String name;
+
+    public void initialize() {
+        name = null;
+    }
+
+    public String getEncodedUri() throws VFSException {
+        return VFSUtil.getEncodedValue(uri);
+    }
+
+    public void setEncodedUri(String u) throws VFSException {
+        uri = VFSUtil.getDencodedValue(u);
+    }
+}


Property changes on: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/form/NewfolderForm.java
___________________________________________________________________
Name: svn:eol-style
   + native

Added: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/form/UploadForm.java
===================================================================
--- vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/form/UploadForm.java	                        (rev 0)
+++ vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/form/UploadForm.java	2008-10-25 01:43:16 UTC (rev 1237)
@@ -0,0 +1,32 @@
+package jp.sf.pal.vfs.form;
+
+import java.io.Serializable;
+
+import jp.sf.pal.vfs.VFSException;
+import jp.sf.pal.vfs.util.VFSUtil;
+
+import org.apache.struts.upload.FormFile;
+import org.seasar.struts.annotation.Required;
+
+public class UploadForm implements Serializable {
+
+    private static final long serialVersionUID = 7719542278739595763L;
+
+    @Required
+    public String uri;
+
+    @Required(target = "upload")
+    public transient FormFile uploadedFile;
+
+    public void initialize() {
+        uploadedFile = null;
+    }
+
+    public String getEncodedUri() throws VFSException {
+        return VFSUtil.getEncodedValue(uri);
+    }
+
+    public void setEncodedUri(String u) throws VFSException {
+        uri = VFSUtil.getDencodedValue(u);
+    }
+}


Property changes on: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/form/UploadForm.java
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/helper/DownloadHelper.java
===================================================================
--- vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/helper/DownloadHelper.java	2008-10-24 08:00:54 UTC (rev 1236)
+++ vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/helper/DownloadHelper.java	2008-10-25 01:43:16 UTC (rev 1237)
@@ -1,28 +1,23 @@
 /*
- * Copyright 2004-2006 The Portal Application Laboratory Team.
- *
- * 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
+ * Copyright 2004-2006 The Portal Application Laboratory Team. 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 jp.sf.pal.vfs.helper;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.Serializable;
 
 /**
  * @author shinsuke
- * 
  */
-public interface DownloadHelper {
+public interface DownloadHelper extends Serializable {
 
     public abstract void setContentType(String type);
 

Modified: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/helper/FileParameterHelper.java
===================================================================
--- vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/helper/FileParameterHelper.java	2008-10-24 08:00:54 UTC (rev 1236)
+++ vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/helper/FileParameterHelper.java	2008-10-25 01:43:16 UTC (rev 1237)
@@ -1,27 +1,25 @@
 /*
- * Copyright 2004-2006 The Portal Application Laboratory Team.
- *
- * 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
+ * Copyright 2004-2006 The Portal Application Laboratory Team. 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 jp.sf.pal.vfs.helper;
 
+import java.io.Serializable;
+
+import jp.sf.pal.vfs.VFSException;
+
 import org.apache.commons.vfs.FileObject;
 
 /**
  * @author shinsuke
- *
  */
-public interface FileParameterHelper {
+public interface FileParameterHelper extends Serializable {
 
     /**
      * @return
@@ -57,9 +55,10 @@
     public abstract long getTime();
 
     /**
-     * @param time
-     *            The time to set.
+     * @param time The time to set.
      */
     public abstract void setTime(long time);
 
+    public abstract String getDownloadUri() throws VFSException;
+
 }
\ No newline at end of file

Modified: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/helper/impl/DownloadHelperImpl.java
===================================================================
--- vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/helper/impl/DownloadHelperImpl.java	2008-10-24 08:00:54 UTC (rev 1236)
+++ vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/helper/impl/DownloadHelperImpl.java	2008-10-25 01:43:16 UTC (rev 1237)
@@ -1,23 +1,15 @@
 /*
- * Copyright 2004-2006 The Portal Application Laboratory Team.
- *
- * 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
+ * Copyright 2004-2006 The Portal Application Laboratory Team. 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 jp.sf.pal.vfs.helper.impl;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -30,27 +22,34 @@
 
 import jp.sf.pal.vfs.helper.DownloadHelper;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 /**
  * @author shinsuke
- * 
  */
 public class DownloadHelperImpl implements DownloadHelper {
     /**
+     * 
+     */
+    private static final long serialVersionUID = 8201423698545356526L;
+
+    /**
      * Logger for this class
      */
     private static final Log log = LogFactory.getLog(DownloadHelperImpl.class);
 
     private static final int BLOCK_SIZE = 4096;
 
-    private HttpServletRequest request;
+    private transient HttpServletRequest request;
 
-    private HttpServletResponse response;
+    private transient HttpServletResponse response;
 
     /*
      * (non-Javadoc)
-     * 
-     * @see jp.sf.pal.vfs.helper.impl.DownloadHelper#setContentType(javax.servlet.http.HttpServletResponse,
-     *      java.lang.String)
+     * @see
+     * jp.sf.pal.vfs.helper.impl.DownloadHelper#setContentType(javax.servlet
+     * .http.HttpServletResponse, java.lang.String)
      */
     public void setContentType(String type) {
         response.setContentType(type);
@@ -58,9 +57,9 @@
 
     /*
      * (non-Javadoc)
-     * 
-     * @see jp.sf.pal.vfs.helper.impl.DownloadHelper#setFilename(javax.servlet.http.HttpServletResponse,
-     *      java.lang.String)
+     * @see
+     * jp.sf.pal.vfs.helper.impl.DownloadHelper#setFilename(javax.servlet.http
+     * .HttpServletResponse, java.lang.String)
      */
     public void setFilename(String filename) {
         if (isMSIE()) {
@@ -95,9 +94,9 @@
 
     /*
      * (non-Javadoc)
-     * 
-     * @see jp.sf.pal.vfs.helper.impl.DownloadHelper#writeResponse(javax.servlet.http.HttpServletResponse,
-     *      java.io.InputStream)
+     * @see
+     * jp.sf.pal.vfs.helper.impl.DownloadHelper#writeResponse(javax.servlet.
+     * http.HttpServletResponse, java.io.InputStream)
      */
     public void writeResponse(InputStream in) throws IOException {
         drain(in, response.getOutputStream());
@@ -127,8 +126,7 @@
     }
 
     /**
-     * @param response
-     *            The response to set.
+     * @param response The response to set.
      */
     public void setResponse(HttpServletResponse response) {
         this.response = response;
@@ -142,8 +140,7 @@
     }
 
     /**
-     * @param request
-     *            The request to set.
+     * @param request The request to set.
      */
     public void setRequest(HttpServletRequest request) {
         this.request = request;

Modified: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/helper/impl/FileParameterHelperImpl.java
===================================================================
--- vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/helper/impl/FileParameterHelperImpl.java	2008-10-24 08:00:54 UTC (rev 1236)
+++ vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/helper/impl/FileParameterHelperImpl.java	2008-10-25 01:43:16 UTC (rev 1237)
@@ -1,17 +1,12 @@
 /*
- * Copyright 2005-2006 The Portal Application Laboratory Team.
- *
- * 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 2005-2008 The Portal Application Laboratory Team. 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 jp.sf.pal.vfs.helper.impl;
 
@@ -19,14 +14,14 @@
 import java.util.Date;
 import java.util.Locale;
 
-import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
-import javax.portlet.PortletRequest;
+import javax.servlet.http.HttpServletRequest;
 
 import jp.sf.pal.vfs.VFSConstants;
+import jp.sf.pal.vfs.VFSException;
 import jp.sf.pal.vfs.helper.FileParameterHelper;
 import jp.sf.pal.vfs.util.VFSUtil;
 
+import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.commons.vfs.FileObject;
@@ -38,6 +33,9 @@
  * @author <a href="mailto:shins****@users*****">Shinsuke Sugaya</a>
  */
 public class FileParameterHelperImpl implements FileParameterHelper {
+
+    private static final long serialVersionUID = -6971724084974772480L;
+
     /**
      * Logger for this class
      */
@@ -46,17 +44,20 @@
 
     private static final long THOUSAND = 1000;
 
-    private FileObject fileObject;
+    private transient FileObject fileObject;
 
     private long time = 0;
 
+    private String sizeUnit;
+
+    private transient HttpServletRequest request;
+
     public FileParameterHelperImpl(FileObject fObject) {
         setFileObject(fObject);
     }
 
     /*
      * (non-Javadoc)
-     * 
      * @see jp.sf.pal.vfs.helper.impl.FileParameterHelper#getFileObject()
      */
     public FileObject getFileObject() {
@@ -65,8 +66,9 @@
 
     /*
      * (non-Javadoc)
-     * 
-     * @see jp.sf.pal.vfs.helper.impl.FileParameterHelper#setFileObject(org.apache.commons.vfs.FileObject)
+     * @see
+     * jp.sf.pal.vfs.helper.impl.FileParameterHelper#setFileObject(org.apache
+     * .commons.vfs.FileObject)
      */
     public void setFileObject(FileObject object) {
         fileObject = object;
@@ -74,7 +76,6 @@
 
     /*
      * (non-Javadoc)
-     * 
      * @see jp.sf.pal.vfs.helper.impl.FileParameterHelper#getBaseName()
      */
     public String getBaseName() {
@@ -83,7 +84,6 @@
 
     /*
      * (non-Javadoc)
-     * 
      * @see jp.sf.pal.vfs.helper.impl.FileParameterHelper#getURI()
      */
     public String getURI() {
@@ -92,7 +92,6 @@
 
     /*
      * (non-Javadoc)
-     * 
      * @see jp.sf.pal.vfs.helper.impl.FileParameterHelper#getParentURI()
      */
     public String getParentURI() {
@@ -105,7 +104,6 @@
 
     /*
      * (non-Javadoc)
-     * 
      * @see jp.sf.pal.vfs.helper.impl.FileParameterHelper#getSize()
      */
     public long getSize() {
@@ -120,7 +118,6 @@
 
     /*
      * (non-Javadoc)
-     * 
      * @see jp.sf.pal.vfs.helper.impl.FileParameterHelper#isFolder()
      */
     public boolean isFolder() {
@@ -137,7 +134,6 @@
 
     /*
      * (non-Javadoc)
-     * 
      * @see jp.sf.pal.vfs.helper.impl.FileParameterHelper#isFile()
      */
     public boolean isFile() {
@@ -154,7 +150,6 @@
 
     /*
      * (non-Javadoc)
-     * 
      * @see jp.sf.pal.vfs.helper.impl.FileParameterHelper#getFormattedSize()
      */
     public String getFormattedSize() {
@@ -164,47 +159,50 @@
         }
 
         if (size == -1) {
-            // TODO I18N
             return VFSConstants.NULL_VALUE;
         } else if (size < THOUSAND) {
-            // TODO I18N
-            return new String(size + "byte");
+            sizeUnit = "B";
+            return String.valueOf(size);
         } else if (size < THOUSAND * THOUSAND) {
+            sizeUnit = "K";
             long value = (long) (size / (THOUSAND));
-            // TODO I18N
-            return new String(value + "K byte");
+            return String.valueOf(value + "K byte");
         } else if (size < THOUSAND * THOUSAND * THOUSAND) {
+            sizeUnit = "M";
             long value = (long) (size / (THOUSAND * THOUSAND));
-            // TODO I18N
-            return new String(value + "M byte");
+            return String.valueOf(value);
         } else if (size < THOUSAND * THOUSAND * THOUSAND * THOUSAND) {
+            sizeUnit = "G";
             long value = (long) (size / (THOUSAND * THOUSAND * THOUSAND));
-            // TODO I18N
-            return new String(value + "G byte");
+            return String.valueOf(value);
         }
-        // TODO I18N
-        return new String(size + "byte");
+
+        sizeUnit = "B";
+        return String.valueOf(size);
     }
 
+    public String getSizeUnit() {
+        return sizeUnit;
+    }
+
     /*
      * (non-Javadoc)
-     * 
      * @see jp.sf.pal.vfs.helper.impl.FileParameterHelper#getContentType()
      */
     public String getContentType() {
-        FacesContext facesContext = FacesContext.getCurrentInstance();
+        // FacesContext facesContext = FacesContext.getCurrentInstance();
         if (isFolder()) {
             return VFSConstants.NULL_VALUE;
         }
         String mimeType = null;
-        if (facesContext != null) {
-            mimeType = VFSUtil.getMimeType(facesContext.getExternalContext()
-                    .getContext(), getBaseName());
-        } else {
-            mimeType = VFSUtil.getMimeType(SingletonS2ContainerFactory
-                    .getContainer().getExternalContext().getApplication(),
-                    getBaseName());
-        }
+        // if (facesContext != null) {
+        // mimeType = VFSUtil.getMimeType(facesContext.getExternalContext()
+        // .getContext(), getBaseName());
+        // } else {
+        mimeType = VFSUtil.getMimeType(SingletonS2ContainerFactory
+                .getContainer().getExternalContext().getApplication(),
+                getBaseName());
+        // }
         if (mimeType == null) {
             return VFSConstants.OCTET_STREAM;
         }
@@ -213,8 +211,9 @@
 
     /*
      * (non-Javadoc)
-     * 
-     * @see jp.sf.pal.vfs.helper.impl.FileParameterHelper#getFormattedLastModifiedTime()
+     * @see
+     * jp.sf.pal.vfs.helper.impl.FileParameterHelper#getFormattedLastModifiedTime
+     * ()
      */
     public String getFormattedLastModifiedTime() {
         try {
@@ -227,9 +226,11 @@
             }
             long time = fileObject.getContent().getLastModifiedTime();
 
-            FacesContext context = FacesContext.getCurrentInstance();
-            ExternalContext exContext = context.getExternalContext();
-            PortletRequest request = (PortletRequest) exContext.getRequest();
+            // FacesContext context = FacesContext.getCurrentInstance();
+            // ExternalContext exContext = context.getExternalContext();
+            // PortletRequest request = (PortletRequest) exContext.getRequest();
+            // Locale locale = request.getLocale();
+            // TODO
             Locale locale = request.getLocale();
             DateFormat df = DateFormat.getDateTimeInstance(DateFormat.DEFAULT,
                     DateFormat.DEFAULT, locale);
@@ -245,9 +246,24 @@
         return VFSConstants.NULL_VALUE;
     }
 
+    public String getDownloadUri() throws VFSException {
+        try {
+            return VFSUtil.getEncodedValue(fileObject.getURL().toString());
+        } catch (Exception e) {
+            throw new VFSException("errors.file_system_error", e);
+        }
+    }
+
+    public String getEncodedBaseName() throws VFSException {
+        try {
+            return VFSUtil.getEncodedValue(getBaseName());
+        } catch (Exception e) {
+            throw new VFSException("errors.file_system_error", e);
+        }
+    }
+
     /*
      * (non-Javadoc)
-     * 
      * @see jp.sf.pal.vfs.helper.impl.FileParameterHelper#getTime()
      */
     public long getTime() {
@@ -256,10 +272,17 @@
 
     /*
      * (non-Javadoc)
-     * 
      * @see jp.sf.pal.vfs.helper.impl.FileParameterHelper#setTime(long)
      */
     public void setTime(long time) {
         this.time = time;
     }
+
+    public HttpServletRequest getRequest() {
+        return request;
+    }
+
+    public void setRequest(HttpServletRequest request) {
+        this.request = request;
+    }
 }

Deleted: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/portlets/VFSPortlet.java
===================================================================
--- vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/portlets/VFSPortlet.java	2008-10-24 08:00:54 UTC (rev 1236)
+++ vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/portlets/VFSPortlet.java	2008-10-25 01:43:16 UTC (rev 1237)
@@ -1,22 +0,0 @@
-/*
- * Copyright 2005-2006 The Portal Application Laboratory Team.
- *
- * 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 jp.sf.pal.vfs.portlets;
-
-import org.seasar.teeda.core.portlet.FacesPortlet;
-
-public class VFSPortlet extends FacesPortlet {
-
-}

Deleted: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/servlets/FileServlet.java
===================================================================
--- vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/servlets/FileServlet.java	2008-10-24 08:00:54 UTC (rev 1236)
+++ vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/servlets/FileServlet.java	2008-10-25 01:43:16 UTC (rev 1237)
@@ -1,82 +0,0 @@
-/*
- * Copyright 2005-2006 The Portal Application Laboratory Team.
- *
- * 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 jp.sf.pal.vfs.servlets;
-
-import java.io.IOException;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import jp.sf.pal.vfs.VFSConstants;
-import jp.sf.pal.vfs.helper.DownloadHelper;
-import jp.sf.pal.vfs.helper.FileParameterHelper;
-import jp.sf.pal.vfs.util.VFSUtil;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.vfs.FileObject;
-import org.apache.commons.vfs.FileSystemManager;
-import org.seasar.framework.container.factory.SingletonS2ContainerFactory;
-
-public class FileServlet extends HttpServlet {
-    /**
-     * serialVersionUID
-     */
-    private static final long serialVersionUID = -6698034002750044219L;
-
-    /**
-     * Logger for this class
-     */
-    private static final Log log = LogFactory.getLog(FileServlet.class);
-
-    public void doGet(HttpServletRequest request, HttpServletResponse response)
-            throws IOException, ServletException {
-        // String uri = request.getParameter("uri");
-        String id = (String) request.getParameter("id");
-        if (log.isDebugEnabled()) {
-            log.debug("doGet() - id=" + id);
-        }
-
-        FileParameterHelper fileParam = (FileParameterHelper) request
-                .getSession().getAttribute(VFSConstants.DOWNLOAD_OBJECT);
-        if (fileParam != null) {
-            FileSystemManager fsManager = VFSUtil.getFileSystemManager();
-            FileObject currentObject = fsManager
-                    .resolveFile(fileParam.getURI());
-
-            if (currentObject.exists()) {
-                DownloadHelper downloadHelper = (DownloadHelper) SingletonS2ContainerFactory
-                        .getContainer().getComponent(DownloadHelper.class);
-
-                downloadHelper.setContentType(fileParam.getContentType());
-                downloadHelper.setFilename(fileParam.getBaseName());
-                downloadHelper.writeResponse(currentObject.getContent()
-                        .getInputStream());
-            } else {
-                // TODO i18n
-                response.sendError(HttpServletResponse.SC_NOT_FOUND,
-                        "Cannot find " + fileParam.getURI());
-            }
-        } else {
-            // TODO i18n
-            response.sendError(HttpServletResponse.SC_NOT_FOUND, "Invalid id: "
-                    + id);
-        }
-    }
-
-}

Modified: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/util/FileParameterHelperComparator.java
===================================================================
--- vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/util/FileParameterHelperComparator.java	2008-10-24 08:00:54 UTC (rev 1236)
+++ vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/util/FileParameterHelperComparator.java	2008-10-25 01:43:16 UTC (rev 1237)
@@ -1,43 +1,35 @@
 /*
- * Copyright 2004-2006 The Portal Application Laboratory Team.
- *
- * 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
+ * Copyright 2004-2006 The Portal Application Laboratory Team. 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 jp.sf.pal.vfs.util;
 
+import java.io.Serializable;
 import java.util.Comparator;
 
 import jp.sf.pal.vfs.helper.FileParameterHelper;
 
 /**
  * @author shinsuke
- * 
  */
-public class FileParameterHelperComparator implements Comparator {
+public class FileParameterHelperComparator implements
+        Comparator<FileParameterHelper>, Serializable {
 
+    private static final long serialVersionUID = -7204792298602506823L;
+
     /*
      * (non-Javadoc)
-     * 
      * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
      */
-    public int compare(Object arg0, Object arg1) {
-        if (arg0 instanceof FileParameterHelper
-                && arg1 instanceof FileParameterHelper) {
-            FileParameterHelper param0 = (FileParameterHelper) arg0;
-            FileParameterHelper param1 = (FileParameterHelper) arg1;
-            if (param0.getBaseName() != null && param1.getBaseName() != null) {
-                return param0.getBaseName().compareTo(param1.getBaseName());
-            }
+    public int compare(FileParameterHelper param0, FileParameterHelper param1) {
+        if (param0.getBaseName() != null && param1.getBaseName() != null) {
+            return param0.getBaseName().compareTo(param1.getBaseName());
         }
         return 0;
     }

Modified: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/util/VFSUtil.java
===================================================================
--- vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/util/VFSUtil.java	2008-10-24 08:00:54 UTC (rev 1236)
+++ vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/util/VFSUtil.java	2008-10-25 01:43:16 UTC (rev 1237)
@@ -1,47 +1,51 @@
 /*
- * Copyright 2005-2006 The Portal Application Laboratory Team.
- *
- * 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 2005-2006 The Portal Application Laboratory Team. 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 jp.sf.pal.vfs.util;
 
-import java.util.Map;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
 
-import javax.faces.context.FacesContext;
-import javax.portlet.PortletConfig;
 import javax.portlet.PortletContext;
 import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
 
 import jp.sf.pal.vfs.VFSConstants;
+import jp.sf.pal.vfs.VFSException;
+import jp.sf.pal.vfs.common.util.ConfigUtil;
+import jp.sf.pal.vfs.common.util.SAStrutsUtil;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.vfs.FileSystemManager;
 import org.seasar.framework.container.factory.SingletonS2ContainerFactory;
 
 public class VFSUtil {
-    /**
-     * Logger for this class
-     */
-    private static final Log log = LogFactory.getLog(VFSUtil.class);
 
-    private static String loadConfig(String key) {
-        return getPortletConfig().getInitParameter(key);
+    public static String getScope(HttpServletRequest request) {
+        String scope = SAStrutsUtil.getPortletConfig(request).getInitParameter(
+                VFSConstants.SCOPE);
+        if (scope == null) {
+            return "default";
+        }
+        return scope;
     }
 
-    public static boolean checkPath(String path) {
-        String acceptPaths[] = getAcceptPaths();
-        String denyPaths[] = getDenyPaths();
+    public static boolean checkPath(String scope, String path) {
+        if (scope == null || path == null) {
+            return false;
+        }
+        String acceptPaths[] = getAcceptPaths(scope);
+        String denyPaths[] = getDenyPaths(scope);
         if (acceptPaths.length > 0) {
             for (int i = 0; i < acceptPaths.length; i++) {
                 if (path.matches(acceptPaths[i])) {
@@ -67,8 +71,9 @@
     /**
      * @return Returns the acceptPath.
      */
-    public static String[] getAcceptPaths() {
-        String acceptPathString = loadConfig(VFSConstants.ACCEPT_PATHS);
+    public static String[] getAcceptPaths(String scope) {
+        String acceptPathString = ConfigUtil.getString(scope + "."
+                + VFSConstants.ACCEPT_PATHS);
         if (acceptPathString == null) {
             return new String[0];
         } else {
@@ -79,19 +84,17 @@
     /**
      * @return Returns the defualtUrl.
      */
-    public static String getDefaultUri() {
-        String defaultUri = loadConfig(VFSConstants.DEFAULT_URI);
-        if (defaultUri == null) {
-            defaultUri = "file:///";
-        }
-        return defaultUri;
+    public static String getDefaultUri(String scope) {
+        return ConfigUtil.getString(scope + "." + VFSConstants.DEFAULT_URI,
+                "file:///");
     }
 
     /**
      * @return Returns the denyPaths.
      */
-    public static String[] getDenyPaths() {
-        String denyPathString = loadConfig(VFSConstants.DENY_PATHS);
+    public static String[] getDenyPaths(String scope) {
+        String denyPathString = ConfigUtil.getString(scope + "."
+                + VFSConstants.DENY_PATHS);
         if (denyPathString == null) {
             return new String[0];
         } else {
@@ -99,28 +102,6 @@
         }
     }
 
-    public static PortletConfig getPortletConfig() {
-        String name = "javax.portlet.PortletConfig";
-        return (PortletConfig) FacesContext.getCurrentInstance()
-                .getExternalContext().getRequestMap().get(name);
-    }
-
-    public static void publishOutputHtml(String output) {
-        FacesContext.getCurrentInstance().getExternalContext().getSessionMap()
-                .put(VFSConstants.OUTPUT_HTML, output);
-    }
-
-    public static String consumeOutputHtml() {
-        Map sessionMap = FacesContext.getCurrentInstance().getExternalContext()
-                .getSessionMap();
-        String outputHtml = (String) sessionMap.get(VFSConstants.OUTPUT_HTML);
-        sessionMap.remove(VFSConstants.OUTPUT_HTML);
-        if (outputHtml == null) {
-            outputHtml = "";
-        }
-        return outputHtml;
-    }
-
     public static FileSystemManager getFileSystemManager() {
         return (FileSystemManager) SingletonS2ContainerFactory.getContainer()
                 .getComponent(FileSystemManager.class);
@@ -136,4 +117,47 @@
         }
         return null;
     }
+
+    private static final int BLOCK_SIZE = 4096;
+
+    public static void drain(InputStream r, OutputStream w) throws IOException {
+        byte[] bytes = new byte[BLOCK_SIZE];
+        try {
+            int length = r.read(bytes);
+            while (length != -1) {
+                if (length != 0) {
+                    w.write(bytes, 0, length);
+                    w.flush();
+                }
+                length = r.read(bytes);
+            }
+        } finally {
+            bytes = null;
+        }
+    }
+
+    public static String getEncodedValue(String value) throws VFSException {
+        if (value == null) {
+            return null;
+        }
+
+        try {
+            return new String(Base64.encodeBase64(value.getBytes("UTF-8")),
+                    "UTF-8");
+        } catch (Exception e) {
+            throw new VFSException("errors.file_system_error", e);
+        }
+    }
+
+    public static String getDencodedValue(String value) throws VFSException {
+        if (value == null) {
+            return null;
+        }
+        try {
+            return new String(Base64.decodeBase64(URLDecoder.decode(value,
+                    "UTF-8").getBytes("UTF-8")), "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            throw new VFSException("errors.file_system_error", e);
+        }
+    }
 }

Deleted: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/web/navigator/CreateNewFilePage.java
===================================================================
--- vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/web/navigator/CreateNewFilePage.java	2008-10-24 08:00:54 UTC (rev 1236)
+++ vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/web/navigator/CreateNewFilePage.java	2008-10-25 01:43:16 UTC (rev 1237)
@@ -1,102 +0,0 @@
-/*
- * Copyright 2005-2006 The Portal Application Laboratory Team.
- *
- * 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 jp.sf.pal.vfs.web.navigator;
-
-import java.util.Map;
-
-import javax.faces.context.FacesContext;
-import javax.faces.model.SelectItem;
-
-import jp.sf.pal.vfs.VFSConstants;
-import jp.sf.pal.vfs.util.VFSUtil;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.seasar.framework.container.S2Container;
-
-import com.marevol.utils.faces.application.FacesMessageUtil;
-
-public class CreateNewFilePage extends DefaultPage {
-    /**
-     * Logger for this class
-     */
-    private static final Log log = LogFactory.getLog(CreateNewFilePage.class);
-
-    private String newFile;
-
-    private String type;
-
-    public CreateNewFilePage(S2Container container) {
-        super(container);
-    }
-
-    public String next() {
-        if (!VFSUtil.checkPath(getUri())) {
-            // TODO i18n
-            FacesMessageUtil.addErrorMessage("access denied.");
-            setUri(VFSUtil.getDefaultUri());
-            return VFSConstants.DISPLAY_FOLDER_LIST_PAGE;
-        }
-
-        Map sessionMap = FacesContext.getCurrentInstance().getExternalContext()
-                .getSessionMap();
-        sessionMap.put(VFSConstants.NEW_FILE_CONTENT_FILE_NAME, getNewFile());
-        sessionMap.put(VFSConstants.NEW_FILE_CONTENT_FILE_TYPE, getType());
-
-        if (log.isDebugEnabled()) {
-            log.debug("next() newFile=" + newFile);
-            log.debug("next() type=" + type);
-        }
-
-        return goWriteNewFileContentPage();
-    }
-
-    public SelectItem[] getTypes() {
-        // TODO I18N
-        return new SelectItem[] { new SelectItem("TEXT", "Text"),
-                new SelectItem("HTML", "Html") };
-    }
-
-    /**
-     * @return Returns the newFile.
-     */
-    public String getNewFile() {
-        return newFile;
-    }
-
-    /**
-     * @param newFile
-     *            The newFile to set.
-     */
-    public void setNewFile(String newFile) {
-        this.newFile = newFile;
-    }
-
-    /**
-     * @return the type
-     */
-    public String getType() {
-        return type;
-    }
-
-    /**
-     * @param type
-     *            the type to set
-     */
-    public void setType(String type) {
-        this.type = type;
-    }
-}

Deleted: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/web/navigator/CreateNewFolderPage.java
===================================================================
--- vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/web/navigator/CreateNewFolderPage.java	2008-10-24 08:00:54 UTC (rev 1236)
+++ vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/web/navigator/CreateNewFolderPage.java	2008-10-25 01:43:16 UTC (rev 1237)
@@ -1,89 +0,0 @@
-/*
- * Copyright 2005-2006 The Portal Application Laboratory Team.
- *
- * 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 jp.sf.pal.vfs.web.navigator;
-
-import jp.sf.pal.vfs.VFSConstants;
-import jp.sf.pal.vfs.util.VFSUtil;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.vfs.FileObject;
-import org.apache.commons.vfs.FileSystemException;
-import org.apache.commons.vfs.FileSystemManager;
-import org.seasar.framework.container.S2Container;
-
-import com.marevol.utils.faces.application.FacesMessageUtil;
-
-public class CreateNewFolderPage extends DefaultPage {
-    /**
-     * Logger for this class
-     */
-    private static final Log log = LogFactory.getLog(CreateNewFolderPage.class);
-
-    private String newFolder;
-
-    public CreateNewFolderPage(S2Container container) {
-        super(container);
-    }
-
-    public String create() {
-        if (!VFSUtil.checkPath(getUri())) {
-            // TODO i18n
-            FacesMessageUtil.addErrorMessage("access denied.");
-            setUri(VFSUtil.getDefaultUri());
-            return VFSConstants.DISPLAY_FOLDER_LIST_PAGE;
-        }
-
-        try {
-            FileSystemManager fsManager = VFSUtil.getFileSystemManager();
-            FileObject newFileObject = fsManager.resolveFile(getUri() + "/"
-                    + getNewFolder());
-            // TODO add confirmation
-            // if (!newFileObject.exists())
-            // {
-            // TODO should catch exception to check if it's created
-            newFileObject.createFolder();
-
-            // TODO I18N
-            FacesMessageUtil.addInfoMessage("Created new folder: "
-                    + getNewFolder());
-            return goDisplayFolderListPage();
-            // }
-        } catch (FileSystemException e) {
-            // TODO I18N
-            FacesMessageUtil.addInfoMessage("Failed to create the new folder.",
-                    e.toString());
-            log.error("Failed to create the new folder.", e);
-        }
-        return null;
-    }
-
-    /**
-     * @return Returns the newFolder.
-     */
-    public String getNewFolder() {
-        return newFolder;
-    }
-
-    /**
-     * @param newFolder
-     *            The newFolder to set.
-     */
-    public void setNewFolder(String newFolder) {
-        this.newFolder = newFolder;
-    }
-
-}

Deleted: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/web/navigator/DefaultPage.java
===================================================================
--- vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/web/navigator/DefaultPage.java	2008-10-24 08:00:54 UTC (rev 1236)
+++ vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/web/navigator/DefaultPage.java	2008-10-25 01:43:16 UTC (rev 1237)
@@ -1,190 +0,0 @@
-/*
- * Copyright 2005-2006 The Portal Application Laboratory Team.
- *
- * 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 jp.sf.pal.vfs.web.navigator;
-
-import javax.faces.context.FacesContext;
-import javax.portlet.PortletConfig;
-
-import jp.sf.pal.vfs.VFSConstants;
-import jp.sf.pal.vfs.util.VFSUtil;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.seasar.framework.container.S2Container;
-
-public class DefaultPage {
-    /**
-     * Logger for this class
-     */
-    private static final Log log = LogFactory.getLog(DefaultPage.class);
-
-    private S2Container container;
-
-    public DefaultPage(S2Container container) {
-        setContainer(container);
-    }
-
-    /**
-     * @return the uri
-     */
-    public String getUri() {
-        String uri = (String) FacesContext.getCurrentInstance()
-                .getExternalContext().getSessionMap().get(VFSConstants.URI);
-        if (uri == null) {
-            uri = VFSUtil.getDefaultUri();
-        }
-        return uri;
-    }
-
-    /**
-     * @param uri
-     *            the uri to set
-     */
-    public void setUri(String uri) {
-        FacesContext.getCurrentInstance().getExternalContext().getSessionMap()
-                .put(VFSConstants.URI, uri);
-    }
-
-    public String goDisplayFolderListPage() {
-        if (log.isDebugEnabled()) {
-            log.debug("goToListViewPage()");
-        }
-
-        return VFSConstants.DISPLAY_FOLDER_LIST_PAGE;
-    }
-
-    public String goWriteNewFileContentPage() {
-        if (log.isDebugEnabled()) {
-            log.debug("goToNewFilePage()");
-        }
-
-        return VFSConstants.WRITE_NEW_FILE_CONTENT_PAGE;
-    }
-
-    public String goCreateNewFilePage() {
-        if (log.isDebugEnabled()) {
-            log.debug("goToNewFilePage()");
-        }
-
-        return VFSConstants.CREATE_NEW_FILE_PAGE;
-    }
-
-    public String goCreateNewFolderPage() {
-        if (log.isDebugEnabled()) {
-            log.debug("goToNewFolderPage()");
-        }
-
-        return VFSConstants.CREATE_NEW_FOLDER_PAGE;
-    }
-
-    public String goUploadFilePage() {
-        return VFSConstants.UPLOAD_FILE_PAGE;
-    }
-
-    public String getCreateNewFileImage() {
-        String path = FacesContext.getCurrentInstance().getExternalContext()
-                .getRequestContextPath()
-                + "/images/accessories-text-editor.png";
-        return FacesContext.getCurrentInstance().getExternalContext()
-                .encodeResourceURL(path);
-    }
-
-    public String getCreateNewFolderImage() {
-        String path = FacesContext.getCurrentInstance().getExternalContext()
-                .getRequestContextPath()
-                + "/images/folder.png";
-        return FacesContext.getCurrentInstance().getExternalContext()
-                .encodeResourceURL(path);
-    }
-
-    public String getUploadFileImage() {
-        String path = FacesContext.getCurrentInstance().getExternalContext()
-                .getRequestContextPath()
-                + "/images/document-save.png";
-        return FacesContext.getCurrentInstance().getExternalContext()
-                .encodeResourceURL(path);
-    }
-
-    public String getTrashImage() {
-        String path = FacesContext.getCurrentInstance().getExternalContext()
-                .getRequestContextPath()
-                + "/images/user-trash.png";
-        return FacesContext.getCurrentInstance().getExternalContext()
-                .encodeResourceURL(path);
-    }
-
-    public String getOpenParentImage() {
-        String path = FacesContext.getCurrentInstance().getExternalContext()
-                .getRequestContextPath()
-                + "/images/go-up.png";
-        return FacesContext.getCurrentInstance().getExternalContext()
-                .encodeResourceURL(path);
-    }
-
-    /**
-     * @return Returns the container.
-     */
-    public S2Container getContainer() {
-        return container;
-    }
-
-    /**
-     * @param container
-     *            The container to set.
-     */
-    public void setContainer(S2Container container) {
-        this.container = container;
-    }
-
-    public boolean isRenderCreateNewFile() {
-        PortletConfig config = VFSUtil.getPortletConfig();
-        if (config != null) {
-            String value = config
-                    .getInitParameter(VFSConstants.RENDER_CREATE_NEW_FILE);
-            if (VFSConstants.TRUE.equalsIgnoreCase(value)) {
-                return true;
-            }
-            return false;
-        }
-        return true;
-    }
-
-    public boolean isRenderCreateNewFolder() {
-        PortletConfig config = VFSUtil.getPortletConfig();
-        if (config != null) {
-            String value = config
-                    .getInitParameter(VFSConstants.RENDER_CREATE_NEW_FOLDER);
-            if (VFSConstants.TRUE.equalsIgnoreCase(value)) {
-                return true;
-            }
-            return false;
-        }
-        return true;
-    }
-
-    public boolean isRenderUploadFile() {
-        PortletConfig config = VFSUtil.getPortletConfig();
-        if (config != null) {
-            String value = config
-                    .getInitParameter(VFSConstants.RENDER_UPLOAD_FILE);
-            if (VFSConstants.TRUE.equalsIgnoreCase(value)) {
-                return true;
-            }
-            return false;
-        }
-        return true;
-    }
-}

Deleted: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/web/navigator/DisplayFolderListPage.java
===================================================================
--- vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/web/navigator/DisplayFolderListPage.java	2008-10-24 08:00:54 UTC (rev 1236)
+++ vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/web/navigator/DisplayFolderListPage.java	2008-10-25 01:43:16 UTC (rev 1237)
@@ -1,298 +0,0 @@
-/*
- * Copyright 2005-2006 The Portal Application Laboratory Team.
- *
- * 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 jp.sf.pal.vfs.web.navigator;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
-import javax.portlet.PortletSession;
-
-import jp.sf.pal.vfs.VFSConstants;
-import jp.sf.pal.vfs.helper.FileParameterHelper;
-import jp.sf.pal.vfs.util.FileParameterHelperComparator;
-import jp.sf.pal.vfs.util.VFSUtil;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.vfs.FileObject;
-import org.apache.commons.vfs.FileSystemException;
-import org.apache.commons.vfs.FileSystemManager;
-import org.apache.commons.vfs.FileType;
-import org.apache.commons.vfs.Selectors;
-import org.seasar.framework.container.S2Container;
-import org.seasar.portlet.util.PortletRequestUtil;
-
-import com.marevol.utils.faces.application.FacesMessageUtil;
-
-public class DisplayFolderListPage extends DefaultPage {
-    /**
-     * Logger for this class
-     */
-    private static final Log log = LogFactory
-            .getLog(DisplayFolderListPage.class);
-
-    public DisplayFolderListPage(S2Container container) {
-        super(container);
-    }
-
-    private FileParameterHelper createFileParameterHelper(FileObject fObject) {
-        FileParameterHelper fileParam = (FileParameterHelper) getContainer()
-                .getComponent(FileParameterHelper.class);
-        fileParam.setFileObject(fObject);
-        return fileParam;
-    }
-
-    public List getObjects() {
-        if (log.isDebugEnabled()) {
-            log.debug("getObjects()");
-        }
-
-        String uri = getUri();
-        // Get File System
-        ArrayList objects = new ArrayList();
-        if (log.isDebugEnabled()) {
-            log.debug("getObjects() - uri=" + uri);
-        }
-        if (VFSUtil.checkPath(uri)) {
-            try {
-                FileSystemManager fsManager = VFSUtil.getFileSystemManager();
-                FileObject currentDirectory = fsManager.resolveFile(uri);
-
-                FileObject[] children = currentDirectory.getChildren();
-                ArrayList folderList = new ArrayList();
-                ArrayList fileList = new ArrayList();
-                for (int i = 0; i < children.length; i++) {
-                    try {
-                        if (children[i].getType() == FileType.FOLDER) {
-                            folderList
-                                    .add(createFileParameterHelper(children[i]));
-                        } else {
-                            fileList
-                                    .add(createFileParameterHelper(children[i]));
-                        }
-                    } catch (FileSystemException e) {
-                        fileList.add(createFileParameterHelper(children[i]));
-                    }
-                }
-                Object[] folders = folderList.toArray();
-                // TODO Comparator
-                Arrays.sort(folders, new FileParameterHelperComparator());
-                for (int i = 0; i < folders.length; i++) {
-                    objects.add(folders[i]);
-                }
-                Object[] files = fileList.toArray();
-                // TODO Comparator
-                Arrays.sort(files, new FileParameterHelperComparator());
-                for (int i = 0; i < files.length; i++) {
-                    objects.add(files[i]);
-                }
-            } catch (FileSystemException e) {
-                // TODO i18n
-                FacesMessageUtil.addErrorMessage(
-                        "The file system error occurs.", e.toString());
-                log.error("The file system error occurs.", e);
-            }
-        } else {
-            // TODO i18n
-            FacesMessageUtil.addErrorMessage("access denied.");
-        }
-        return (List) objects;
-
-    }
-
-    public String select() {
-        if (log.isDebugEnabled()) {
-            log.debug("select()");
-        }
-        if (!VFSUtil.checkPath(getUri())) {
-            // TODO i18n
-            FacesMessageUtil.addErrorMessage("access denied.");
-            setUri(VFSUtil.getDefaultUri());
-            return VFSConstants.DISPLAY_FOLDER_LIST_PAGE;
-        }
-
-        FacesContext context = FacesContext.getCurrentInstance();
-        ExternalContext exContext = context.getExternalContext();
-        Map map = exContext.getRequestMap();
-        FileParameterHelper fileParam = (FileParameterHelper) map.get("item");
-        if (fileParam != null) {
-            if (fileParam.isFolder()) {
-                setUri(fileParam.getURI());
-            } else if (fileParam.isFile()) {
-                PortletRequestUtil.getPortletSession().setAttribute(
-                        VFSConstants.DOWNLOAD_OBJECT, fileParam,
-                        PortletSession.APPLICATION_SCOPE);
-                // TODO I18N
-                VFSUtil
-                        .publishOutputHtml("<script language=\"javascript\">\n<!--\nwindow.open(\""
-                                + exContext.getRequestContextPath()
-                                + "/FileServlet\", \"_blank\");\n//--></script>");
-                // VFSUtil
-                // .publishOutputHtml("<script
-                // language=\"javascript\">\n<!--\nlocation.href=\""
-                // + exContext.getRequestContextPath()
-                // + "/FileServlet\";\n//--></script>");
-            } else {
-                // TODO I18N
-                FacesMessageUtil
-                        .addWarnMessage("The selected object is not FOLDER or FILE.");
-            }
-        } else {
-            // TODO I18N
-            FacesMessageUtil
-                    .addWarnMessage("The selected object is not found.");
-        }
-        return null;
-    }
-
-    public String delete() {
-        if (log.isDebugEnabled()) {
-            log.debug("delete()");
-        }
-        if (!VFSUtil.checkPath(getUri())) {
-            // TODO i18n
-            FacesMessageUtil.addErrorMessage("access denied.");
-            setUri(VFSUtil.getDefaultUri());
-            return VFSConstants.DISPLAY_FOLDER_LIST_PAGE;
-        }
-
-        FacesContext context = FacesContext.getCurrentInstance();
-        ExternalContext exContext = context.getExternalContext();
-        Map map = exContext.getRequestMap();
-        FileParameterHelper fileParam = (FileParameterHelper) map.get("item");
-        if (fileParam != null) {
-            if (fileParam.isFolder()) {
-                try {
-                    FileSystemManager fsManager = VFSUtil
-                            .getFileSystemManager();
-                    FileObject fileObject = fsManager.resolveFile(fileParam
-                            .getURI());
-
-                    // TODO select FileSelector
-                    int num = fileObject.delete(Selectors.SELECT_ALL);
-                    if (num > 0) {
-                        // TODO i18n
-                        FacesMessageUtil.addInfoMessage("Deleted " + num
-                                + " objects.");
-                    } else {
-                        // TODO i18n
-                        FacesMessageUtil
-                                .addErrorMessage("Failed delete action.");
-                    }
-                } catch (FileSystemException e) {
-                    // TODO i18n
-                    FacesMessageUtil.addErrorMessage("Failed delete action.");
-                    log.error("Failed delete action.", e);
-                }
-            } else if (fileParam.isFile()) {
-                try {
-                    FileSystemManager fsManager = VFSUtil
-                            .getFileSystemManager();
-                    FileObject fileObject = fsManager.resolveFile(fileParam
-                            .getURI());
-
-                    if (fileObject.delete()) {
-                        // TODO i18n
-                        FacesMessageUtil.addInfoMessage("Deleted the file: "
-                                + fileParam.getURI());
-                    } else {
-                        // TODO i18n
-                        FacesMessageUtil
-                                .addWarnMessage("Failed delete action.");
-                    }
-                } catch (FileSystemException e) {
-                    // TODO i18n
-                    FacesMessageUtil.addErrorMessage("Failed delete action.", e
-                            .toString());
-                    log.error("Failed delete action.", e);
-                }
-            } else {
-                // TODO I18N
-                FacesMessageUtil
-                        .addWarnMessage("The selected object is not FOLDER or FILE.");
-            }
-        } else {
-            // TODO I18N
-            FacesMessageUtil
-                    .addWarnMessage("The selected object is not found.");
-        }
-        return goDisplayFolderListPage();
-    }
-
-    public String go() {
-        if (log.isDebugEnabled()) {
-            log.debug("go()");
-        }
-        if (!VFSUtil.checkPath(getUri())) {
-            // TODO i18n
-            FacesMessageUtil.addErrorMessage("access denied.");
-            setUri(VFSUtil.getDefaultUri());
-            return VFSConstants.DISPLAY_FOLDER_LIST_PAGE;
-        }
-
-        // update uri
-        return VFSConstants.DISPLAY_FOLDER_LIST_PAGE;
-    }
-
-    public String openParent() {
-        if (log.isDebugEnabled()) {
-            log.debug("openParent()");
-        }
-        if (!VFSUtil.checkPath(getUri())) {
-            // TODO i18n
-            FacesMessageUtil.addErrorMessage("access denied.");
-            setUri(VFSUtil.getDefaultUri());
-            return VFSConstants.DISPLAY_FOLDER_LIST_PAGE;
-        }
-
-        try {
-            FileSystemManager fsManager = VFSUtil.getFileSystemManager();
-            FileObject currentDirectory = fsManager.resolveFile(getUri());
-            FileObject parent = currentDirectory.getParent();
-            if (parent != null) {
-                setUri(parent.getName().getURI());
-                if (!VFSUtil.checkPath(getUri())) {
-                    // TODO i18n
-                    FacesMessageUtil.addErrorMessage("access denied.");
-                    setUri(VFSUtil.getDefaultUri());
-                    return VFSConstants.DISPLAY_FOLDER_LIST_PAGE;
-                }
-            } else {
-                // TODO i18n
-                FacesMessageUtil
-                        .addWarnMessage("The parent folder does not exist.");
-            }
-        } catch (FileSystemException e) {
-            // TODO i18n
-            FacesMessageUtil.addErrorMessage(
-                    "Failed to open the parent directory.", e.toString());
-            log.error("Failed to open the parent directory.", e);
-        }
-
-        return VFSConstants.DISPLAY_FOLDER_LIST_PAGE;
-    }
-
-    /**
-     * @return the outputHtml
-     */
-    public String getOutputHtml() {
-        return VFSUtil.consumeOutputHtml();
-    }
-}

Deleted: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/web/navigator/UploadFilePage.java
===================================================================
--- vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/web/navigator/UploadFilePage.java	2008-10-24 08:00:54 UTC (rev 1236)
+++ vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/web/navigator/UploadFilePage.java	2008-10-25 01:43:16 UTC (rev 1237)
@@ -1,150 +0,0 @@
-/*
- * Copyright 2005-2006 The Portal Application Laboratory Team.
- *
- * 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 jp.sf.pal.vfs.web.navigator;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import jp.sf.pal.vfs.VFSConstants;
-import jp.sf.pal.vfs.util.VFSUtil;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.vfs.FileObject;
-import org.apache.commons.vfs.FileSystemException;
-import org.apache.commons.vfs.FileSystemManager;
-import org.apache.myfaces.custom.fileupload.UploadedFile;
-import org.seasar.framework.container.S2Container;
-
-import com.marevol.utils.faces.application.FacesMessageUtil;
-
-public class UploadFilePage extends DefaultPage {
-    /**
-     * Logger for this class
-     */
-    private static final Log log = LogFactory.getLog(UploadFilePage.class);
-
-    private static final int BLOCK_SIZE = 4096;
-
-    private UploadedFile uploadedFile;
-
-    public UploadFilePage(S2Container container) {
-        super(container);
-    }
-
-    public String upload() {
-        if (!VFSUtil.checkPath(getUri())) {
-            // TODO i18n
-            FacesMessageUtil.addErrorMessage("access denied.");
-            setUri(VFSUtil.getDefaultUri());
-            return VFSConstants.DISPLAY_FOLDER_LIST_PAGE;
-        }
-
-        if (log.isDebugEnabled()) {
-            log.debug("upload() - start");
-            log.debug("upload() - upload: getUploadedFile()="
-                    + getUploadedFile());
-            log.debug("upload() - upload: filename="
-                    + getUploadedFile().getName());
-        }
-        try {
-            // For Windows
-            String filename = getUploadedFile().getName();
-            int index = filename.lastIndexOf("\\");
-            if (index > 0) {
-                filename = filename.substring(index + 1);
-            }
-            if (log.isDebugEnabled()) {
-                log.debug("upload() - filename=" + filename);
-            }
-
-            FileSystemManager fsManager = VFSUtil.getFileSystemManager();
-            FileObject newFileObject = fsManager.resolveFile(getUri() + "/"
-                    + filename);
-            // TODO add confirmation
-            if (newFileObject.exists()) {
-                // TODO I18N
-                FacesMessageUtil
-                        .addWarnMessage(filename
-                                + " exists. You need to delete it before uploading it. ");
-                return goDisplayFolderListPage();
-            }
-            // TODO should catch exception to check if it's created
-            newFileObject.createFile();
-            newFileObject.getContent().close();
-            drain(getUploadedFile().getInputStream(), newFileObject
-                    .getContent().getOutputStream());
-
-            // TODO I18N
-            FacesMessageUtil.addInfoMessage("Uploaded file: " + filename);
-
-            setUploadedFile(null);
-
-            if (log.isDebugEnabled()) {
-                log.debug("upload() - end");
-            }
-            return goDisplayFolderListPage();
-        } catch (FileSystemException e) {
-            // TODO I18N
-            FacesMessageUtil.addErrorMessage("Failed to update the file.", e
-                    .toString());
-            log.error("Failed to update the file.", e);
-        } catch (IOException e) {
-            // TODO I18N
-            FacesMessageUtil.addErrorMessage("Failed to update the file.", e
-                    .toString());
-            log.error("Failed to update the file.", e);
-        }
-
-        if (log.isDebugEnabled()) {
-            log.debug("upload() - end");
-        }
-        return null;
-    }
-
-    private void drain(InputStream r, OutputStream w) throws IOException {
-        byte[] bytes = new byte[BLOCK_SIZE];
-        try {
-            int length = r.read(bytes);
-            while (length != -1) {
-                if (length != 0) {
-                    w.write(bytes, 0, length);
-                    w.flush();
-                }
-                length = r.read(bytes);
-            }
-        } finally {
-            bytes = null;
-        }
-    }
-
-    /**
-     * @return Returns the uploadedFile.
-     */
-    public UploadedFile getUploadedFile() {
-        return uploadedFile;
-    }
-
-    /**
-     * @param uploadedFile
-     *            The uploadedFile to set.
-     */
-    public void setUploadedFile(UploadedFile uploadedFile) {
-        this.uploadedFile = uploadedFile;
-    }
-
-}

Deleted: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/web/navigator/WriteNewFileContentPage.java
===================================================================
--- vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/web/navigator/WriteNewFileContentPage.java	2008-10-24 08:00:54 UTC (rev 1236)
+++ vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/web/navigator/WriteNewFileContentPage.java	2008-10-25 01:43:16 UTC (rev 1237)
@@ -1,142 +0,0 @@
-/*
- * Copyright 2005-2006 The Portal Application Laboratory Team.
- *
- * 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 jp.sf.pal.vfs.web.navigator;
-
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.UnsupportedEncodingException;
-import java.io.Writer;
-import java.util.Map;
-
-import javax.faces.context.FacesContext;
-
-import jp.sf.pal.vfs.VFSConstants;
-import jp.sf.pal.vfs.util.VFSUtil;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.vfs.FileObject;
-import org.apache.commons.vfs.FileSystemException;
-import org.apache.commons.vfs.FileSystemManager;
-import org.seasar.framework.container.S2Container;
-
-import com.marevol.utils.faces.application.FacesMessageUtil;
-
-public class WriteNewFileContentPage extends DefaultPage {
-    /**
-     * Logger for this class
-     */
-    private static final Log log = LogFactory
-            .getLog(WriteNewFileContentPage.class);
-
-    private String text;
-
-    public WriteNewFileContentPage(S2Container container) {
-        super(container);
-    }
-
-    public String create() {
-        if (!VFSUtil.checkPath(getUri())) {
-            // TODO i18n
-            FacesMessageUtil.addErrorMessage("access denied.");
-            setUri(VFSUtil.getDefaultUri());
-            return VFSConstants.DISPLAY_FOLDER_LIST_PAGE;
-        }
-
-        if (log.isDebugEnabled()) {
-            log.debug("create() text=" + getText());
-        }
-
-        try {
-            FileSystemManager fsManager = VFSUtil.getFileSystemManager();
-            FileObject newFileObject = fsManager.resolveFile(getUri() + "/"
-                    + getNewFile());
-
-            // TODO add confirmation
-            // if (!newFileObject.exists())
-            // {
-            // TODO should catch exception to check if it's created
-            newFileObject.createFile();
-            Writer writer = null;
-            try {
-                writer = new OutputStreamWriter(newFileObject.getContent()
-                        .getOutputStream(), "UTF-8");
-                writer.write(getText());
-                writer.flush();
-            } catch (UnsupportedEncodingException e) {
-                log.warn("Wrong encoding.");
-                // TODO I18N
-                FacesMessageUtil.addWarnMessage("Wrong encoding.");
-            } catch (IOException e) {
-                log.warn("Cannot write the content.");
-                // TODO I18N
-                FacesMessageUtil.addWarnMessage("Cannot write the content.");
-            } finally {
-                if (writer != null) {
-                    try {
-                        writer.close();
-                    } catch (IOException e) {
-                    }
-                }
-            }
-
-            // TODO I18N
-            FacesMessageUtil
-                    .addInfoMessage("Created new file: " + getNewFile());
-            return goDisplayFolderListPage();
-            // }
-        } catch (FileSystemException e) {
-            // TODO I18N
-            FacesMessageUtil.addInfoMessage("Failed to create the new file: "
-                    + getNewFile(), e.toString());
-            log.error("Failed to create the new file: " + getNewFile(), e);
-        }
-        return null;
-    }
-
-    /**
-     * @return Returns the newFile.
-     */
-    public String getNewFile() {
-        Map sessionMap = FacesContext.getCurrentInstance().getExternalContext()
-                .getSessionMap();
-        return (String) sessionMap.get(VFSConstants.NEW_FILE_CONTENT_FILE_NAME);
-    }
-
-    /**
-     * @return the type
-     */
-    public String getType() {
-        Map sessionMap = FacesContext.getCurrentInstance().getExternalContext()
-                .getSessionMap();
-        return (String) sessionMap.get(VFSConstants.NEW_FILE_CONTENT_FILE_TYPE);
-    }
-
-    /**
-     * @return the text
-     */
-    public String getText() {
-        return text;
-    }
-
-    /**
-     * @param text
-     *            the text to set
-     */
-    public void setText(String text) {
-        this.text = text;
-    }
-}

Deleted: vfs-portlets/trunk/src/main/resources/aop.dicon
===================================================================
--- vfs-portlets/trunk/src/main/resources/aop.dicon	2008-10-24 08:00:54 UTC (rev 1236)
+++ vfs-portlets/trunk/src/main/resources/aop.dicon	2008-10-25 01:43:16 UTC (rev 1237)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE components PUBLIC "-//SEASAR//DTD S2Container 2.4//EN"
-	"http://www.seasar.org/dtd/components24.dtd">
-<components namespace="aop">
-	<component name="traceInterceptor"
-		class="org.seasar.framework.aop.interceptors.TraceInterceptor"/>
-	<component name="traceThrowsInterceptor"
-		class="org.seasar.framework.aop.interceptors.TraceThrowsInterceptor"/>
-	<component name="classLoaderAwareTraceInterceptor"
-		class="org.seasar.framework.aop.interceptors.ClassLoaderAwareTraceInterceptor"/>
-</components>
\ No newline at end of file

Modified: vfs-portlets/trunk/src/main/resources/app.dicon
===================================================================
--- vfs-portlets/trunk/src/main/resources/app.dicon	2008-10-24 08:00:54 UTC (rev 1236)
+++ vfs-portlets/trunk/src/main/resources/app.dicon	2008-10-25 01:43:16 UTC (rev 1237)
@@ -1,9 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE components PUBLIC "-//SEASAR//DTD S2Container 2.4//EN"
-    "http://www.seasar.org/dtd/components24.dtd">
-<components>
-    <include path="convention.dicon" />
-    <include path="aop.dicon" />
-    <include path="teeda.dicon" />
-    <include path="jp/sf/pal/vfs/VFS.dicon" />
-</components>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE components PUBLIC "-//SEASAR//DTD S2Container 2.4//EN"
+	"http://www.seasar.org/dtd/components24.dtd">
+<components>
+	<include path="convention.dicon"/>
+	<include path="aop.dicon"/>
+    <include path="j2ee.dicon"/>
+
+    <include path="vfs.dicon"/>
+
+    <component name="actionMessagesThrowsInterceptor" class="org.seasar.struts.interceptor.ActionMessagesThrowsInterceptor"/>
+</components>

Added: vfs-portlets/trunk/src/main/resources/application.properties
===================================================================
--- vfs-portlets/trunk/src/main/resources/application.properties	                        (rev 0)
+++ vfs-portlets/trunk/src/main/resources/application.properties	2008-10-25 01:43:16 UTC (rev 1237)
@@ -0,0 +1,42 @@
+errors.header=<ul>
+errors.footer=</ul>
+errors.prefix=<li style="portlet-msg-error">
+errors.suffix=</li>
+msg.header=<ul>
+msg.footer=</ul>
+
+errors.invalid={0} is invalid.
+errors.maxlength={0} can not be greater than {1} characters.
+errors.minlength={0} can not be less than {1} characters.
+errors.maxbytelength={0} can not be greater than {1} bytes.
+errors.minbytelength={0} can not be less than {1} bytes.
+errors.range={0} is not in the range {1} through {2}.
+errors.required={0} is required.
+errors.required.other={0} is required ({1}). 
+errors.byte={0} must be an byte.
+errors.date={0} is not a date.
+errors.double={0} must be an double.
+errors.float={0} must be an float.
+errors.integer={0} must be an integer.
+errors.long={0} must be an long.
+errors.short={0} must be an short.
+errors.creditcard={0} is not a valid credit card number.
+errors.email={0} is an invalid e-mail address.
+errors.url={0} is an invalid url (web address).
+
+errors.access_denied=Access denied.
+errors.file_system_error=The file system error occurs.
+errors.failed_to_create_folder=Failed to create a new folder.
+errors.invalid_access=Invalid access.
+errors.file_exist={0} exists. Please delete it before uploading it.
+errors.failed_to_upload_file=Failed to upload a file.
+errors.file_not_found={0} is not found.
+errors.invalid_user=Invalid access from an unknown user.
+errors.failed_to_delete_folder=Failed to delete the folder.
+errors.failed_to_delete_file=Failed to delete the file.
+errors.unknow_object={0} is an unknown object.
+
+success.create_folder=Created a new folder.
+success.upload_file=Upload the file.
+success.delete_folder=Deleted the folder.
+success.delete_file=Deleted the file.


Property changes on: vfs-portlets/trunk/src/main/resources/application.properties
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: vfs-portlets/trunk/src/main/resources/convention.dicon
===================================================================
--- vfs-portlets/trunk/src/main/resources/convention.dicon	2008-10-24 08:00:54 UTC (rev 1236)
+++ vfs-portlets/trunk/src/main/resources/convention.dicon	2008-10-25 01:43:16 UTC (rev 1237)
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE components PUBLIC "-//SEASAR//DTD S2Container 2.4//EN"
-	"http://www.seasar.org/dtd/components24.dtd">
-<components>
-    <component
-        class="org.seasar.framework.convention.impl.NamingConventionImpl">
-        <initMethod name="addRootPackageName">
-            <arg>"jp.sf.pal.vfs"</arg>
-        </initMethod>
-        <property name="viewRootPath">"/view"</property>
-        <property name="viewExtension">".jsp"</property>
-    </component>
-</components>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE components PUBLIC "-//SEASAR//DTD S2Container 2.4//EN" 
+	"http://www.seasar.org/dtd/components24.dtd">
+<components>
+	<component class="org.seasar.framework.convention.impl.NamingConventionImpl">
+		<initMethod name="addRootPackageName">
+			<arg>"jp.sf.pal.vfs"</arg>
+		</initMethod>
+		<initMethod name="addIgnorePackageName">
+			<arg>"jp.sf.pal.vfs.common.util"</arg>
+		</initMethod>
+	</component>
+</components>

Modified: vfs-portlets/trunk/src/main/resources/creator.dicon
===================================================================
--- vfs-portlets/trunk/src/main/resources/creator.dicon	2008-10-24 08:00:54 UTC (rev 1236)
+++ vfs-portlets/trunk/src/main/resources/creator.dicon	2008-10-25 01:43:16 UTC (rev 1237)
@@ -1,19 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE components PUBLIC "-//SEASAR//DTD S2Container 2.4//EN" 
-	"http://www.seasar.org/dtd/components24.dtd">
+    "http://www.seasar.org/dtd/components24.dtd">
 <components>
-	<include path="convention.dicon"/>
-	<include path="customizer.dicon"/>
-	<component class="org.seasar.framework.container.creator.ActionCreator"/>
-	<component class="org.seasar.framework.container.creator.DaoCreator"/>
-	<component class="org.seasar.framework.container.creator.DtoCreator"/>
-	<component class="org.seasar.framework.container.creator.DxoCreator"/>
-	<component class="org.seasar.framework.container.creator.HelperCreator"/>
-	<component class="org.seasar.framework.container.creator.LogicCreator"/>
-	<component class="org.seasar.framework.container.creator.PageCreator"/>
-	<component class="org.seasar.framework.container.creator.ServiceCreator"/>
-	<component class="org.seasar.framework.container.creator.InterceptorCreator"/>
-	<component class="org.seasar.framework.container.creator.ValidatorCreator"/>
-	<component class="org.seasar.framework.container.creator.ConverterCreator"/>
-	<component class="org.seasar.framework.container.creator.ConnectorCreator"/>
+    <include path="convention.dicon"/>
+    <include path="customizer.dicon"/>
+	
+    <component class="org.seasar.framework.container.creator.ActionCreator"/>
+    <component class="org.seasar.struts.creator.FormCreator"/>
+    <component class="org.seasar.framework.container.creator.ServiceCreator"/>
+    <!--component class="org.seasar.framework.container.creator.DtoCreator"/-->
+    <component class="org.seasar.framework.container.creator.InterceptorCreator"/>
+
+    <component class="org.seasar.framework.container.creator.HelperCreator"/>
+
 </components>

Modified: vfs-portlets/trunk/src/main/resources/customizer.dicon
===================================================================
--- vfs-portlets/trunk/src/main/resources/customizer.dicon	2008-10-24 08:00:54 UTC (rev 1236)
+++ vfs-portlets/trunk/src/main/resources/customizer.dicon	2008-10-25 01:43:16 UTC (rev 1237)
@@ -1,65 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE components PUBLIC "-//SEASAR//DTD S2Container 2.4//EN" 
-	"http://www.seasar.org/dtd/components24.dtd">
+    "http://www.seasar.org/dtd/components24.dtd">
 <components>
-	<component name="defaultCustomizer" class="org.seasar.framework.container.customizer.AspectCustomizer">
-		<property name="interceptorName">"aop.classLoaderAwareTraceInterceptor"</property>
-	</component>
-	<component name="commandAspectCustomizer" class="org.seasar.framework.container.customizer.AspectCustomizer">
-		<property name="interceptorName">"aop.classLoaderAwareTraceInterceptor"</property>
-		<property name="pointcut">"do.*, initialize, prerender"</property>
-	</component>
-	<component name="actionSupportAspectCustomizer" class="org.seasar.framework.container.customizer.AspectCustomizer">
-		<property name="interceptorName">"app_aop.actionSupportInterceptor"</property>
-		<property name="pointcut">"do.*, initialize, prerender"</property>
-	</component>
+    <include path="default-customizer.dicon"/>
+	
+    <component name="actionCustomizer"
+        class="org.seasar.framework.container.customizer.CustomizerChain">
+        <initMethod name="addAspectCustomizer">
+            <arg>"aop.traceInterceptor"</arg>
+        </initMethod>
+        <initMethod name="addAspectCustomizer">
+            <arg>"actionMessagesThrowsInterceptor"</arg>
+        </initMethod>
+        <initMethod name="addCustomizer">
+            <arg>
+                <component
+                    class="org.seasar.framework.container.customizer.TxAttributeCustomizer"/>
+            </arg>
+        </initMethod>
+        <initMethod name="addCustomizer">
+            <arg>
+                <component
+                    class="org.seasar.struts.customizer.ActionCustomizer"/>
+            </arg>
+        </initMethod>
+    </component>
+    
+    <component name="formCustomizer"
+        class="org.seasar.framework.container.customizer.CustomizerChain">
+    </component>
+	
+    <component name="serviceCustomizer"
+        class="org.seasar.framework.container.customizer.CustomizerChain">
+        <initMethod name="addAspectCustomizer">
+            <arg>"aop.traceInterceptor"</arg>
+        </initMethod>
+        <initMethod name="addCustomizer">
+            <arg>
+                <component
+                    class="org.seasar.framework.container.customizer.TxAttributeCustomizer"/>
+            </arg>
+        </initMethod>
+    </component>
 
-	<component name="actionCustomizer" class="org.seasar.framework.container.customizer.CustomizerChain">
-		<initMethod name="addCustomizer">
-			<arg>commandAspectCustomizer</arg>
-		</initMethod>
-		<initMethod name="addCustomizer">
-			<arg>actionSupportAspectCustomizer</arg>
-		</initMethod>
-	</component>
-	<component name="daoCustomizer" class="org.seasar.framework.container.customizer.CustomizerChain">
-		<initMethod name="addCustomizer">
-			<arg>defaultCustomizer</arg>
-		</initMethod>
-	</component>
-	<component name="dtoCustomizer" class="org.seasar.framework.container.customizer.CustomizerChain">
-	</component>
-	<component name="dxoCustomizer" class="org.seasar.framework.container.customizer.CustomizerChain">
-		<initMethod name="addCustomizer">
-			<arg>defaultCustomizer</arg>
-		</initMethod>
-	</component>
-	<component name="helperCustomizer" class="org.seasar.framework.container.customizer.CustomizerChain">
-		<initMethod name="addCustomizer">
-			<arg>defaultCustomizer</arg>
-		</initMethod>
-	</component>
-	<component name="logicCustomizer" class="org.seasar.framework.container.customizer.CustomizerChain">
-		<initMethod name="addCustomizer">
-			<arg>defaultCustomizer</arg>
-		</initMethod>
-	</component>
-	<component name="pageCustomizer" class="org.seasar.framework.container.customizer.CustomizerChain">
-		<initMethod name="addCustomizer">
-			<arg>defaultCustomizer</arg>
-		</initMethod>
-	</component>
-	<component name="serviceCustomizer" class="org.seasar.framework.container.customizer.CustomizerChain">
-		<initMethod name="addCustomizer">
-			<arg>defaultCustomizer</arg>
-		</initMethod>
-	</component>
-	<component name="interceptorCustomizer" class="org.seasar.framework.container.customizer.CustomizerChain">
-	</component>
-	<component name="validatorCustomizer" class="org.seasar.framework.container.customizer.CustomizerChain">
-	</component>
-	<component name="converterCustomizer" class="org.seasar.framework.container.customizer.CustomizerChain">
-	</component>
-	<component name="connectorCustomizer" class="org.seasar.framework.container.customizer.CustomizerChain">
-	</component>
-</components>
\ No newline at end of file
+    <component name="pagerCustomizer" class="org.seasar.framework.container.customizer.CustomizerChain">
+    </component>
+
+</components>

Modified: vfs-portlets/trunk/src/main/resources/env.txt
===================================================================
--- vfs-portlets/trunk/src/main/resources/env.txt	2008-10-24 08:00:54 UTC (rev 1236)
+++ vfs-portlets/trunk/src/main/resources/env.txt	2008-10-25 01:43:16 UTC (rev 1237)
@@ -1 +1 @@
-ut
+product

Added: vfs-portlets/trunk/src/main/resources/env_ut.txt
===================================================================
--- vfs-portlets/trunk/src/main/resources/env_ut.txt	                        (rev 0)
+++ vfs-portlets/trunk/src/main/resources/env_ut.txt	2008-10-25 01:43:16 UTC (rev 1237)
@@ -0,0 +1 @@
+ut
\ No newline at end of file


Property changes on: vfs-portlets/trunk/src/main/resources/env_ut.txt
___________________________________________________________________
Name: svn:eol-style
   + native

Added: vfs-portlets/trunk/src/main/resources/jdbc.dicon
===================================================================
--- vfs-portlets/trunk/src/main/resources/jdbc.dicon	                        (rev 0)
+++ vfs-portlets/trunk/src/main/resources/jdbc.dicon	2008-10-25 01:43:16 UTC (rev 1237)
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE components PUBLIC "-//SEASAR2.1//DTD S2Container//EN"
+	"http://www.seasar.org/dtd/components21.dtd">
+<components namespace="jdbc">
+	<include path="jta.dicon"/>
+
+	<!-- for HSQLDB -->
+	<!--
+	<component name="xaDataSource"
+		class="org.seasar.extension.dbcp.impl.XADataSourceImpl">
+		<property name="driverClassName">
+			"org.hsqldb.jdbcDriver"
+		</property>
+		<property name="URL">
+			"jdbc:hsqldb:file:"
+				+ @org.seasar.framework.util.ResourceUtil ＠ getBuildDir('app.dicon').getCanonicalPath()
+				+ "/data/test"
+		</property>
+		<property name="user">"sa"</property>
+		<property name="password">""</property>
+	</component>
+	-->
+	
+	<!-- for H2 -->
+	<!--
+	<component name="xaDataSource"
+		class="org.seasar.extension.dbcp.impl.XADataSourceImpl">
+		<property name="driverClassName">
+			"org.h2.Driver"
+		</property>
+		<property name="URL">
+			"jdbc:h2:file:"
+				+ @org.seasar.framework.util.ResourceUtil ＠ getBuildDir(@examples.entity.JdbcManagerTest ＠ class).getCanonicalPath()
+				+ "/data/demo;DB_CLOSE_ON_EXIT=FALSE"
+		</property>
+		<property name="user">"sa"</property>
+		<property name="password"></property>
+	</component>
+	-->
+	
+	<!-- for Oracle -->
+	<!--
+	<component name="xaDataSource"
+		class="org.seasar.extension.dbcp.impl.XADataSourceImpl">
+		<property name="driverClassName">
+			"oracle.jdbc.driver.OracleDriver"
+		</property>
+		<property name="URL">
+			"jdbc:oracle:thin:@xxx:1521:xxx"
+		</property>
+		<property name="user">"xxx"</property>
+		<property name="password">"xxx"</property>
+	</component>
+	-->
+
+	<!-- for DB2 -->
+	<!--
+	<component name="xaDataSource"
+		class="org.seasar.extension.dbcp.impl.XADataSourceImpl">
+		<property name="driverClassName">
+			"com.ibm.db2.jcc.DB2Driver"
+		</property>
+		<property name="URL">
+			"jdbc:db2://foo.bar.com:50000/SAMPLE"
+		</property>
+		<property name="user">"db2user"</property>
+		<property name="password">"db2password"</property>
+		<initMethod name="addProperty">
+			<arg>"currentSchema"</arg>
+			<arg>"SCHEMA"</arg>
+		</initMethod>
+	</component>
+	-->
+	
+	<!-- for PostgreSQL -->
+	<!--
+	<component name="xaDataSource"
+		class="org.seasar.extension.dbcp.impl.XADataSourceImpl">
+		<property name="driverClassName">
+			"org.postgresql.Driver"
+        </property>
+        <property name="URL">
+          "jdbc:postgresql://localhost/TEST"
+        </property>
+        <property name="user">"xxxx"</property>
+        <property name="password">"xxxx"</property>
+    </component>
+    -->
+
+	<!-- MySQL
+	- MySQL4.0以下でマルチバイト文字を扱う場合には，URL指定の後に，
+		以下の接続パラメータを追加で指定してください．
+		useUnicode=true
+		characterEncoding=[MySQLのエンコーディングに対応した
+		Javaのエンコーディング名]
+		例："jdbc:mysql://localhost:3306/test?useUnicode=true" +
+		"&amp;characterEncoding=Windows-31J"
+		
+	- MySQL5.0以降で，エンコーディングがeucjpmsの列を扱う場合には，
+		URL指定の後に，以下の接続パラメータを追加で指定してください．
+		characterEncoding=UTF-8またはWindows-31J
+		characterSetResults=UTF-8またはWindows-31J
+		例："jdbc:mysql://localhost:3306/test?characterEncoding=UTF-8" +
+		"&amp;characterSetResults=UTF-8"
+		この指定をしない場合，Java側でUCS-2⇔EUC_JP_Solarisの変換が
+		行なわれるため，ユーザー定義外字などの一部の文字が化けます．
+		この指定をすることで，MySQL側でeucjpms⇔ucs2⇔utf8(cp932)の
+		変換が行なわれ，Java側でUCS-2⇔UTF-8(Windows-31J)の変換が
+		行なわれるようになります．この結果，文字化けを防げます．
+		なおJIS X 0212(補助漢字)を使用する場合は，Windows-31Jではなく
+		UTF-8を指定する必要があります．
+		
+	- 上記以外の場合は，my.cnfでdefault-character-setの設定を適切に
+		(cp932やutf8など．デフォルトのlatin1は不可)行なっていれば，
+		文字化けは防げます．
+	<component name="xaDataSource"
+		class="org.seasar.extension.dbcp.impl.XADataSourceImpl">
+		<property name="driverClassName">
+			"com.mysql.jdbc.Driver"
+		</property>
+		<property name="URL">
+			"jdbc:mysql://localhost:3306/test"
+		</property>
+		<property name="user">"xxx"</property>
+		<property name="password">"xxx"</property>
+	</component>
+	-->
+
+	<!-- for SQLServer -->
+	<!--
+	<component name="xaDataSource"
+		class="org.seasar.extension.dbcp.impl.XADataSourceImpl">
+		<property name="driverClassName">
+			"net.sourceforge.jtds.jdbc.Driver"
+        </property>
+        <property name="URL">
+            "jdbc:jtds:sqlserver://localhost/TEST;instance=SQLEXPRESS"
+        </property>
+        <property name="user">"xxxx"</property>
+        <property name="password">"xxxx"</property>
+    </component>
+	-->
+
+	<!--
+	<component name="connectionPool"
+		class="org.seasar.extension.dbcp.impl.ConnectionPoolImpl">
+		<property name="timeout">600</property>
+		<property name="maxPoolSize">10</property>
+		<property name="allowLocalTx">true</property>
+		<destroyMethod name="close"/>
+	</component>
+
+	<component name="DataSource"
+		class="org.seasar.extension.dbcp.impl.DataSourceImpl"
+	/>
+	-->
+
+	<!-- from JNDI -->
+	<!--
+	<component name="DataSource"
+		class="javax.sql.DataSource">
+		@org.seasar.extension.j2ee.JndiResourceLocator ＠ lookup("java:comp/env/jdbc/DataSource")
+	</component>
+	-->
+
+	<!--
+	<component name="dataSource"
+		class="org.seasar.extension.datasource.impl.SelectableDataSourceProxy"/>
+	-->
+
+</components>

Deleted: vfs-portlets/trunk/src/main/resources/jp/sf/pal/vfs/VFS.dicon
===================================================================
--- vfs-portlets/trunk/src/main/resources/jp/sf/pal/vfs/VFS.dicon	2008-10-24 08:00:54 UTC (rev 1236)
+++ vfs-portlets/trunk/src/main/resources/jp/sf/pal/vfs/VFS.dicon	2008-10-25 01:43:16 UTC (rev 1237)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE components PUBLIC "-//SEASAR//DTD S2Container 2.4//EN" "http://www.seasar.org/dtd/components24.dtd">
-<components>
-  <component class="org.apache.commons.vfs.impl.StandardFileSystemManager" instance="singleton">
-    <initMethod name="init"/>
-  </component>
-</components>

Modified: vfs-portlets/trunk/src/main/resources/s2container.dicon
===================================================================
--- vfs-portlets/trunk/src/main/resources/s2container.dicon	2008-10-24 08:00:54 UTC (rev 1236)
+++ vfs-portlets/trunk/src/main/resources/s2container.dicon	2008-10-25 01:43:16 UTC (rev 1237)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE components PUBLIC "-//SEASAR//DTD S2Container 2.4//EN"
-    "http://www.seasar.org/dtd/components24.dtd">
+<!DOCTYPE components PUBLIC "-//SEASAR//DTD S2Container 2.4//EN" 
+	"http://www.seasar.org/dtd/components24.dtd">
 <components>
-    <include condition="#ENV == 'ut'" path="hotdeploy.dicon"/>
-    <include condition="#ENV == 'ct' || #ENV == 'it'" path="warmdeploy.dicon"/>
-    <include condition="#ENV == 'product'" path="cooldeploy.dicon"/>
-</components>
+    <include condition="#ENV == 'ut'" path="warmdeploy.dicon"/>
+    <include condition="#ENV == 'ct'" path="hotdeploy.dicon"/>
+    <include condition="#ENV != 'ut' and #ENV != 'ct'" path="cooldeploy.dicon"/>
+</components>
\ No newline at end of file

Deleted: vfs-portlets/trunk/src/main/resources/teedaCustomize.dicon
===================================================================
--- vfs-portlets/trunk/src/main/resources/teedaCustomize.dicon	2008-10-24 08:00:54 UTC (rev 1236)
+++ vfs-portlets/trunk/src/main/resources/teedaCustomize.dicon	2008-10-25 01:43:16 UTC (rev 1237)
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE components PUBLIC "-//SEASAR//DTD S2Container 2.4//EN"
-	"http://www.seasar.org/dtd/components24.dtd">
-<components>
-	<!--
-	<component class="org.seasar.teeda.core.render.JsfSpecComponentIdLookupStrategy" />
-	-->
-	<component class="org.seasar.teeda.core.render.DefaultComponentIdLookupStrategy" />
-	<component class="org.seasar.teeda.core.application.impl.DefaultComponentLookupStrategy" />
-</components>

Deleted: vfs-portlets/trunk/src/main/resources/teedaErrorPage.dicon
===================================================================
--- vfs-portlets/trunk/src/main/resources/teedaErrorPage.dicon	2008-10-24 08:00:54 UTC (rev 1236)
+++ vfs-portlets/trunk/src/main/resources/teedaErrorPage.dicon	2008-10-25 01:43:16 UTC (rev 1237)
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE components PUBLIC "-//SEASAR//DTD S2Container 2.4//EN"
-	"http://www.seasar.org/dtd/components24.dtd">
-<components namespace="teedaErrorPage" >
-
-	<component class="org.seasar.teeda.core.util.ServletErrorPageManagerImpl">
-		<!--
-		<initMethod name="addErrorPage">
-			<arg>@java.lang.Throwable ＠ class</arg>
-			<arg>"/aaa/bbb.html"</arg>
-		</initMethod>
-		-->
-	</component>
-</components>

Added: vfs-portlets/trunk/src/main/resources/vfs.dicon
===================================================================
--- vfs-portlets/trunk/src/main/resources/vfs.dicon	                        (rev 0)
+++ vfs-portlets/trunk/src/main/resources/vfs.dicon	2008-10-25 01:43:16 UTC (rev 1237)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE components PUBLIC "-//SEASAR//DTD S2Container 2.4//EN" "http://www.seasar.org/dtd/components24.dtd">
+<components>
+  <component class="org.apache.commons.vfs.impl.StandardFileSystemManager" instance="singleton">
+    <initMethod name="init"/>
+  </component>
+</components>

Deleted: vfs-portlets/trunk/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- vfs-portlets/trunk/src/main/webapp/WEB-INF/faces-config.xml	2008-10-24 08:00:54 UTC (rev 1236)
+++ vfs-portlets/trunk/src/main/webapp/WEB-INF/faces-config.xml	2008-10-25 01:43:16 UTC (rev 1237)
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN" "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
-<faces-config>
-    <application>
-        <locale-config>
-            <default-locale>en</default-locale>
-            <supported-locale>ja</supported-locale>
-        </locale-config>
-    </application>
-
-    <navigation-rule>
-        <from-view-id>*</from-view-id>
-        <navigation-case>
-            <from-outcome>DISPLAY_FOLDER_LIST_PAGE</from-outcome>
-            <to-view-id>/view/navigator/displayFolderList.jsp</to-view-id>
-        </navigation-case>
-    </navigation-rule>
-    <navigation-rule>
-        <from-view-id>*</from-view-id>
-        <navigation-case>
-            <from-outcome>CREATE_NEW_FILE_PAGE</from-outcome>
-            <to-view-id>/view/navigator/createNewFile.jsp</to-view-id>
-        </navigation-case>
-    </navigation-rule>
-    <navigation-rule>
-        <from-view-id>*</from-view-id>
-        <navigation-case>
-            <from-outcome>CREATE_NEW_FOLDER_PAGE</from-outcome>
-            <to-view-id>/view/navigator/createNewFolder.jsp</to-view-id>
-        </navigation-case>
-    </navigation-rule>
-    <navigation-rule>
-        <from-view-id>*</from-view-id>
-        <navigation-case>
-            <from-outcome>WRITE_NEW_FILE_CONTENT_PAGE</from-outcome>
-            <to-view-id>/view/navigator/writeNewFileContent.jsp</to-view-id>
-        </navigation-case>
-    </navigation-rule>
-    <navigation-rule>
-        <from-view-id>*</from-view-id>
-        <navigation-case>
-            <from-outcome>UPLOAD_FILE_PAGE</from-outcome>
-            <to-view-id>/view/navigator/uploadFile.jsp</to-view-id>
-        </navigation-case>
-    </navigation-rule>
-
-
-</faces-config>

Modified: vfs-portlets/trunk/src/main/webapp/WEB-INF/portlet.xml
===================================================================
--- vfs-portlets/trunk/src/main/webapp/WEB-INF/portlet.xml	2008-10-24 08:00:54 UTC (rev 1236)
+++ vfs-portlets/trunk/src/main/webapp/WEB-INF/portlet.xml	2008-10-25 01:43:16 UTC (rev 1237)
@@ -1,68 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright 2005-2006 The Portal Application Laboratory Team.
-    
-    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 2004-2008 PAL Project and the Others.
+ *
+ * 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.
 -->
-<portlet-app version="1.0">
+<portlet-app version="1.0" 
+    xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" 
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd">
   <portlet>
-    <description>VFS Navigator</description>
-    <portlet-name>VFSNavigator</portlet-name>
-    <display-name>VFS Navigator</display-name>
-    <portlet-class>org.apache.portals.bridges.portletfilter.FilterPortlet</portlet-class>
+    <description>Display a file system.</description>
+    <portlet-name>VFSPortlet</portlet-name>
+    <display-name>VFS: Explorer</display-name>
+    <portlet-class>org.seasar.struts.portlet.SAStrutsPortlet</portlet-class>
     <init-param>
-      <name>portlet-class</name>
-      <value>jp.sf.pal.vfs.portlets.VFSPortlet</value>
+      <name>viewPage</name>
+      <value>/list/</value>
     </init-param>
     <init-param>
-      <name>portlet-filters</name>
-      <value>jp.sf.pal.facesresponse.FacesResponseFilter,org.seasar.portlet.filter.S2PortletFilter,org.seasar.portlet.filter.HotdeployPortletFilter,jp.sf.pal.tomahawk.filter.ExtensionsPortletFilter</value>
+      <name>scope</name>
+      <value>default</value>
     </init-param>
-    <init-param>
-      <name>view-page</name>
-      <value>/view/navigator/displayFolderList.jsp</value>
-    </init-param>
-    <init-param>
-      <name>default-uri</name>
-      <value>file://</value>
-    </init-param>
-    <init-param>
-      <name>accept-paths</name>
-      <value>.*</value>
-    </init-param>
-    <init-param>
-      <name>render-create-new-file</name>
-      <value>true</value>
-    </init-param>
-    <init-param>
-      <name>render-create-new-folder</name>
-      <value>true</value>
-    </init-param>
-    <init-param>
-      <name>render-upload-file</name>
-      <value>true</value>
-    </init-param>
+    <expiration-cache>0</expiration-cache>
     <supports>
       <mime-type>text/html</mime-type>
       <portlet-mode>VIEW</portlet-mode>
-<!--
-      <portlet-mode>EDIT</portlet-mode>
-      <portlet-mode>HELP</portlet-mode>
--->
     </supports>
+    <supported-locale>en</supported-locale>
+    <supported-locale>ja</supported-locale>
     <portlet-info>
-      <title>VFS Navigator</title>
-      <short-title>VFS</short-title>
+      <title>VFS Explorer</title>
+      <short-title>Explorer</short-title>
+      <keywords>VFS,Explorer</keywords>
     </portlet-info>
   </portlet>
 </portlet-app>
+

Added: vfs-portlets/trunk/src/main/webapp/WEB-INF/struts-config.xml
===================================================================
--- vfs-portlets/trunk/src/main/webapp/WEB-INF/struts-config.xml	                        (rev 0)
+++ vfs-portlets/trunk/src/main/webapp/WEB-INF/struts-config.xml	2008-10-25 01:43:16 UTC (rev 1237)
@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE struts-config PUBLIC
+          "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN"
+          "http://jakarta.apache.org/struts/dtds/struts-config_1_2.dtd">
+
+<struts-config>
+
+<!-- ======================================== Form Bean Definitions -->
+
+    <form-beans>
+    </form-beans>
+
+<!-- ================================= Global Exception Definitions -->
+
+    <global-exceptions>
+    	<exception path="/WEB-INF/view/error/norole.jsp" key="errors.norole" type="org.seasar.struts.exception.NoRoleRuntimeException"/>
+    </global-exceptions>
+
+<!-- =================================== Global Forward Definitions -->
+
+    <global-forwards>
+    </global-forwards>
+
+<!-- =================================== Action Mapping Definitions -->
+
+    <action-mappings>
+    </action-mappings>
+    
+
+<!-- ===================================== Controller Configuration -->
+
+    <controller
+        maxFileSize="1024K"
+        bufferSize="1024"
+        processorClass="org.seasar.struts.portlet.action.S2RequestProcessor"
+        multipartClass="org.seasar.struts.upload.S2MultipartRequestHandler"/>
+<!-- REPLACED:
+        processorClass="org.seasar.struts.action.S2RequestProcessor"
+-->
+
+
+<!-- ================================ Message Resources Definitions -->
+
+    <message-resources parameter="application"
+        factory="org.seasar.struts.util.S2PropertyMessageResourcesFactory"/>
+
+<!-- ======================================= Plug Ins Configuration -->
+
+    <plug-in className="org.seasar.struts.validator.S2ValidatorPlugIn">
+        <set-property
+          property="pathnames"
+          value="/WEB-INF/validator-rules.xml"/>
+    </plug-in>
+</struts-config>
+


Property changes on: vfs-portlets/trunk/src/main/webapp/WEB-INF/struts-config.xml
___________________________________________________________________
Name: svn:eol-style
   + native

Added: vfs-portlets/trunk/src/main/webapp/WEB-INF/validator-rules.xml
===================================================================
--- vfs-portlets/trunk/src/main/webapp/WEB-INF/validator-rules.xml	                        (rev 0)
+++ vfs-portlets/trunk/src/main/webapp/WEB-INF/validator-rules.xml	2008-10-25 01:43:16 UTC (rev 1237)
@@ -0,0 +1,352 @@
+<!DOCTYPE form-validation PUBLIC
+          "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.1.3//EN"
+          "http://jakarta.apache.org/commons/dtds/validator_1_1_3.dtd">
+<!--
+
+   This file contains the default Struts Validator pluggable validator
+   definitions.  It should be placed somewhere under /WEB-INF and
+   referenced in the struts-config.xml under the plug-in element
+   for the ValidatorPlugIn.
+
+      <plug-in className="org.apache.struts.validator.ValidatorPlugIn">
+        <set-property property="pathnames" value="/WEB-INF/validator-rules.xml,
+                                                  /WEB-INF/validation.xml"/>
+      </plug-in>
+
+   These are the default error messages associated with
+   each validator defined in this file.  They should be
+   added to your projects ApplicationResources.properties
+   file or you can associate new ones by modifying the
+   pluggable validators msg attributes in this file.
+
+   # Struts Validator Error Messages
+   errors.required={0} is required.
+   errors.minlength={0} can not be less than {1} characters.
+   errors.maxlength={0} can not be greater than {1} characters.
+   errors.invalid={0} is invalid.
+
+   errors.byte={0} must be a byte.
+   errors.short={0} must be a short.
+   errors.integer={0} must be an integer.
+   errors.long={0} must be a long.
+   errors.float={0} must be a float.
+   errors.double={0} must be a double.
+
+   errors.date={0} is not a date.
+   errors.range={0} is not in the range {1} through {2}.
+   errors.creditcard={0} is an invalid credit card number.
+   errors.email={0} is an invalid e-mail address.
+   errors.url={0} is an invalid url (web address).
+
+   errors.minbytelength={0} can not be less than {1} bytes.
+   errors.maxbytelength={0} can not be greater than {1} bytes.
+   
+   Note: Starting in Struts 1.2.0 the default javascript definitions have
+         been consolidated to commons-validator. The default can be overridden
+         by supplying a <javascript> element with a CDATA section, just as
+         in struts 1.1.
+
+-->
+
+<form-validation>
+
+   <global>
+
+      <validator name="required"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateRequired"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
+                       javax.servlet.http.HttpServletRequest"
+                  msg="errors.required"/>
+
+      <validator name="requiredif"
+                 classname="org.apache.struts.validator.FieldChecks"
+                 method="validateRequiredIf"
+                 methodParams="java.lang.Object,
+                               org.apache.commons.validator.ValidatorAction,
+                               org.apache.commons.validator.Field,
+                               org.apache.struts.action.ActionMessages,
+                               org.apache.commons.validator.Validator,
+                               javax.servlet.http.HttpServletRequest"
+                 msg="errors.required"/>
+
+      <validator name="validwhen"
+          msg="errors.required"
+                 classname="org.apache.struts.validator.validwhen.ValidWhen"
+                 method="validateValidWhen"
+                 methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
+                       javax.servlet.http.HttpServletRequest"/>
+
+
+      <validator name="minlength"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateMinLength"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.minlength"
+           jsFunction="org.apache.commons.validator.javascript.validateMinLength"/>
+
+
+      <validator name="maxlength"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateMaxLength"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.maxlength"
+           jsFunction="org.apache.commons.validator.javascript.validateMaxLength"/>
+
+
+
+      <validator name="mask"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateMask"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.invalid"/>
+
+
+      <validator name="byte"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateByte"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.byte"
+       jsFunctionName="ByteValidations"/>
+
+
+      <validator name="short"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateShort"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.short"
+       jsFunctionName="ShortValidations"/>
+
+
+      <validator name="integer"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateInteger"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.integer"
+       jsFunctionName="IntegerValidations"/>
+
+
+
+      <validator name="long"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateLong"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.long"/>
+
+
+      <validator name="float"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateFloat"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.float"
+       jsFunctionName="FloatValidations"/>
+
+      <validator name="double"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateDouble"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.double"/>
+
+
+      <validator name="date"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateDate"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.date"
+       jsFunctionName="DateValidations"/>
+
+
+      <validator name="intRange"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateIntRange"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
+                       javax.servlet.http.HttpServletRequest"
+              depends="integer"
+                  msg="errors.range"/>
+
+
+      <validator name="floatRange"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateFloatRange"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
+                       javax.servlet.http.HttpServletRequest"
+              depends="float"
+                  msg="errors.range"/>
+
+      <validator name="doubleRange"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateDoubleRange"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
+                       javax.servlet.http.HttpServletRequest"
+              depends="double"
+                  msg="errors.range"/>
+
+      <validator name="creditCard"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateCreditCard"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.creditcard"/>
+
+
+      <validator name="email"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateEmail"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.email"/>
+
+      <validator name="url"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateUrl"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.url"/>
+
+      <validator name="minbytelength"
+            classname="org.seasar.struts.validator.S2FieldChecks"
+               method="validateMinByteLength"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.minbytelength"/>
+
+
+      <validator name="maxbytelength"
+            classname="org.seasar.struts.validator.S2FieldChecks"
+               method="validateMaxByteLength"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.maxbytelength"/>
+                  
+     <validator name="longRange"
+            classname="org.seasar.struts.validator.S2FieldChecks"
+               method="validateLongRange"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionMessages,
+                       org.apache.commons.validator.Validator,
+                       javax.servlet.http.HttpServletRequest"
+              depends="long"
+                  msg="errors.range"/>
+
+     <!--
+       This simply allows struts to include the validateUtilities into a page, it should
+       not be used as a validation rule.
+     -->
+     <validator name="includeJavaScriptUtilities"
+            classname=""
+               method=""
+         methodParams=""
+              depends=""
+                  msg=""
+           jsFunction="org.apache.commons.validator.javascript.validateUtilities"/>
+
+   </global>
+
+</form-validation>


Property changes on: vfs-portlets/trunk/src/main/webapp/WEB-INF/validator-rules.xml
___________________________________________________________________
Name: svn:eol-style
   + native

Added: vfs-portlets/trunk/src/main/webapp/WEB-INF/vfs.xml
===================================================================
--- vfs-portlets/trunk/src/main/webapp/WEB-INF/vfs.xml	                        (rev 0)
+++ vfs-portlets/trunk/src/main/webapp/WEB-INF/vfs.xml	2008-10-25 01:43:16 UTC (rev 1237)
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+</configuration>


Property changes on: vfs-portlets/trunk/src/main/webapp/WEB-INF/vfs.xml
___________________________________________________________________
Name: svn:eol-style
   + native

Added: vfs-portlets/trunk/src/main/webapp/WEB-INF/view/common/common.jsp
===================================================================
--- vfs-portlets/trunk/src/main/webapp/WEB-INF/view/common/common.jsp	                        (rev 0)
+++ vfs-portlets/trunk/src/main/webapp/WEB-INF/view/common/common.jsp	2008-10-25 01:43:16 UTC (rev 1237)
@@ -0,0 +1,8 @@
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
+<%@taglib prefix="html" uri="http://struts.apache.org/tags-html"%>  
+<%@taglib prefix="bean" uri="http://struts.apache.org/tags-bean"%>  
+<%@taglib prefix="tiles" uri="http://jakarta.apache.org/struts/tags-tiles"%>
+<%@taglib prefix="f" uri="http://sastruts.seasar.org/functions"%>
+<%@taglib prefix="s" uri="http://sastruts.seasar.org/portlet"%>


Property changes on: vfs-portlets/trunk/src/main/webapp/WEB-INF/view/common/common.jsp
___________________________________________________________________
Name: svn:eol-style
   + native

Added: vfs-portlets/trunk/src/main/webapp/WEB-INF/view/list/downloadError.jsp
===================================================================
--- vfs-portlets/trunk/src/main/webapp/WEB-INF/view/list/downloadError.jsp	                        (rev 0)
+++ vfs-portlets/trunk/src/main/webapp/WEB-INF/view/list/downloadError.jsp	2008-10-25 01:43:16 UTC (rev 1237)
@@ -0,0 +1,9 @@
+<%@page pageEncoding="UTF-8" %>
+<html>
+<head>
+<title></title>
+</head>
+<body>
+<html:errors/>
+</body>
+</html>


Property changes on: vfs-portlets/trunk/src/main/webapp/WEB-INF/view/list/downloadError.jsp
___________________________________________________________________
Name: svn:eol-style
   + native

Added: vfs-portlets/trunk/src/main/webapp/WEB-INF/view/list/error.jsp
===================================================================
--- vfs-portlets/trunk/src/main/webapp/WEB-INF/view/list/error.jsp	                        (rev 0)
+++ vfs-portlets/trunk/src/main/webapp/WEB-INF/view/list/error.jsp	2008-10-25 01:43:16 UTC (rev 1237)
@@ -0,0 +1,11 @@
+<%@page pageEncoding="UTF-8" %>
+<html>
+<head>
+<title></title>
+</head>
+<body>
+<html:errors/>
+<br>
+<s:link href="/list/index">Back</s:link>
+</body>
+</html>


Property changes on: vfs-portlets/trunk/src/main/webapp/WEB-INF/view/list/error.jsp
___________________________________________________________________
Name: svn:eol-style
   + native

Added: vfs-portlets/trunk/src/main/webapp/WEB-INF/view/list/index.jsp
===================================================================
--- vfs-portlets/trunk/src/main/webapp/WEB-INF/view/list/index.jsp	                        (rev 0)
+++ vfs-portlets/trunk/src/main/webapp/WEB-INF/view/list/index.jsp	2008-10-25 01:43:16 UTC (rev 1237)
@@ -0,0 +1,59 @@
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8" %>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+<title></title>
+</head>
+<body>
+<div style="padding:3px;">
+
+<div><html:messages id="msg" message="true"><bean:write name="msg" ignore="true"/></html:messages><html:errors/></div>
+
+<div style="margin:5px;">
+<s:link href="/newfolder/createpage/${f:u(encodedUri)}">Create New Folder</s:link>
+|
+<s:link href="/upload/createpage/${f:u(encodedUri)}">Upload File</s:link>
+</div>
+<div style="margin:5px;">
+<s:form>
+Path: <html:text property="uri" size="50"/><input type="submit" name="go" value="Go"/>
+</s:form>
+</div>
+<div class="list-table">
+<table border="1">
+	<thead>
+		<tr>
+			<th style="width:200px;text-align: center;">File Name</th>
+			<th style="width:50px;text-align: center;"">Size</th>
+			<th style="width:200px;text-align: center;"">Last Updated</th>
+			<th style="width:50px;text-align: center;">&nbsp;</th>
+		</tr>
+	</thead>
+	<tbody>
+		<c:forEach var="f" varStatus="s" items="${fileItems}">
+		<tr class="${s.index %2 == 0 ? 'row1' : 'row2'}">
+			<td>
+<c:if test="${f.folder}">
+				<s:link href="select/${f:u(encodedUri)}/${f:u(f.encodedBaseName)}">${f:h(f.baseName)}</s:link>
+</c:if>
+<c:if test="${f.file}">
+				<a href="${f:url('download')}/${f:u(scope)}/${f:u(f.downloadUri)}">${f:h(f.baseName)}</a>
+</c:if>
+			</td>
+			<td style="text-align: right;">${f:h(f.formattedSize)}
+<c:if test="B">&nbsp;</c:if>
+<c:if test="K">K</c:if>
+<c:if test="M">M</c:if>
+<c:if test="G">G</c:if>
+			</td>
+			<td style="text-align: center;">${f:h(f.formattedLastModifiedTime)}</td>
+			<td style="text-align: center;"><s:link href="delete/${f:u(encodedUri)}/${f:u(f.encodedBaseName)}">Delete</s:link></td>
+		</tr>
+		</c:forEach>
+	</tbody>
+</table>
+</div>
+</div>
+
+</body>
+</html>


Property changes on: vfs-portlets/trunk/src/main/webapp/WEB-INF/view/list/index.jsp
___________________________________________________________________
Name: svn:eol-style
   + native

Added: vfs-portlets/trunk/src/main/webapp/WEB-INF/view/newfolder/confirm.jsp
===================================================================
--- vfs-portlets/trunk/src/main/webapp/WEB-INF/view/newfolder/confirm.jsp	                        (rev 0)
+++ vfs-portlets/trunk/src/main/webapp/WEB-INF/view/newfolder/confirm.jsp	2008-10-25 01:43:16 UTC (rev 1237)
@@ -0,0 +1,38 @@
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8" %>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+<title></title>
+</head>
+<body>
+<div style="padding:3px;">
+<div><html:messages id="msg" message="true"><bean:write name="msg" ignore="true"/></html:messages><html:errors/></div>
+<div class="form-table">
+	<s:form>
+		<html:hidden property="uri"/>
+		<table style="width: 500px">
+			<caption>Create Folder</caption>
+			<tbody>
+				<tr>
+					<th style="width: 100px;">Path</th>
+					<td>${f:h(uri)}</td>
+				</tr>
+				<tr>
+					<th style="width: 100px;">Folder Name</th>
+					<td>${f:h(name)}<html:hidden property="name"/></td>
+				</tr>
+			</tbody>
+			<tfoot>
+				<tr>
+					<td colspan="2">
+						<input type="submit" name="create" value="Create"/>
+						<input type="submit" name="editagain" value="Back"/>
+					</td>
+				</tr>
+			</tfoot>
+		</table>
+	</s:form>
+</div>
+</div>
+</body>
+</html>


Property changes on: vfs-portlets/trunk/src/main/webapp/WEB-INF/view/newfolder/confirm.jsp
___________________________________________________________________
Name: svn:eol-style
   + native

Added: vfs-portlets/trunk/src/main/webapp/WEB-INF/view/newfolder/edit.jsp
===================================================================
--- vfs-portlets/trunk/src/main/webapp/WEB-INF/view/newfolder/edit.jsp	                        (rev 0)
+++ vfs-portlets/trunk/src/main/webapp/WEB-INF/view/newfolder/edit.jsp	2008-10-25 01:43:16 UTC (rev 1237)
@@ -0,0 +1,45 @@
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8" %>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+<title></title>
+</head>
+<body>
+<div style="padding:3px;">
+<div><html:messages id="msg" message="true"><bean:write name="msg" ignore="true"/></html:messages><html:errors/></div>
+
+<div style="margin:5px;">
+<s:link href="/list/jump/${f:u(encodedUri)}">List</s:link>
+|
+<s:link href="/upload/createpage/${f:u(encodedUri)}">Upload File</s:link>
+</div>
+
+<div class="form-table">
+	<s:form>
+		<html:hidden property="uri"/>
+		<table style="width: 500px">
+			<caption>Create Folder</caption>
+			<tbody>
+				<tr>
+					<th style="width: 100px;">Target Path</th>
+					<td>${f:h(uri)}</td>
+				</tr>
+				<tr>
+					<th style="width: 100px;">Folder Name</th>
+					<td><html:text property="name" size="40"/></td>
+				</tr>
+			</tbody>
+			<tfoot>
+				<tr>
+					<td colspan="2">
+		<input type="submit" name="confirm" value="Confirm"/>
+		<!-- input type="submit" name="back" value="Back"/ -->
+					</td>
+				</tr>
+			</tfoot>
+		</table>
+	</s:form>
+</div>
+</div>
+</body>
+</html>


Property changes on: vfs-portlets/trunk/src/main/webapp/WEB-INF/view/newfolder/edit.jsp
___________________________________________________________________
Name: svn:eol-style
   + native

Added: vfs-portlets/trunk/src/main/webapp/WEB-INF/view/newfolder/error.jsp
===================================================================
--- vfs-portlets/trunk/src/main/webapp/WEB-INF/view/newfolder/error.jsp	                        (rev 0)
+++ vfs-portlets/trunk/src/main/webapp/WEB-INF/view/newfolder/error.jsp	2008-10-25 01:43:16 UTC (rev 1237)
@@ -0,0 +1,11 @@
+<%@page pageEncoding="UTF-8" %>
+<html>
+<head>
+<title></title>
+</head>
+<body>
+<html:errors/>
+<br>
+<s:link href="/list/index">Back</s:link>
+</body>
+</html>


Property changes on: vfs-portlets/trunk/src/main/webapp/WEB-INF/view/newfolder/error.jsp
___________________________________________________________________
Name: svn:eol-style
   + native

Added: vfs-portlets/trunk/src/main/webapp/WEB-INF/view/upload/edit.jsp
===================================================================
--- vfs-portlets/trunk/src/main/webapp/WEB-INF/view/upload/edit.jsp	                        (rev 0)
+++ vfs-portlets/trunk/src/main/webapp/WEB-INF/view/upload/edit.jsp	2008-10-25 01:43:16 UTC (rev 1237)
@@ -0,0 +1,45 @@
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8" %>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+<title></title>
+</head>
+<body>
+<div style="padding:3px;">
+<div><html:messages id="msg" message="true"><bean:write name="msg" ignore="true"/></html:messages><html:errors/></div>
+
+<div style="margin:5px;">
+<s:link href="/list/jump/${f:u(encodedUri)}">List</s:link>
+|
+<s:link href="/newfolder/createpage/${f:u(encodedUri)}">Create Folder</s:link>
+</div>
+
+<div class="form-table">
+	<s:form enctype="multipart/form-data">
+		<html:hidden property="uri"/>
+		<table style="width: 500px">
+			<caption>Upload File</caption>
+			<tbody>
+				<tr>
+					<th style="width: 100px;">Target Path</th>
+					<td>${f:h(uri)}</td>
+				</tr>
+				<tr>
+					<th style="width: 100px;">Uploaded File</th>
+					<td><input type="file" name="uploadedFile" /></td>
+				</tr>
+			</tbody>
+			<tfoot>
+				<tr>
+					<td colspan="2">
+		<input type="submit" name="upload" value="Upload"/>
+		<!-- input type="submit" name="back" value="Back"/ -->
+					</td>
+				</tr>
+			</tfoot>
+		</table>
+	</s:form>
+</div>
+</div>
+</body>
+</html>


Property changes on: vfs-portlets/trunk/src/main/webapp/WEB-INF/view/upload/edit.jsp
___________________________________________________________________
Name: svn:eol-style
   + native

Added: vfs-portlets/trunk/src/main/webapp/WEB-INF/view/upload/error.jsp
===================================================================
--- vfs-portlets/trunk/src/main/webapp/WEB-INF/view/upload/error.jsp	                        (rev 0)
+++ vfs-portlets/trunk/src/main/webapp/WEB-INF/view/upload/error.jsp	2008-10-25 01:43:16 UTC (rev 1237)
@@ -0,0 +1,11 @@
+<%@page pageEncoding="UTF-8" %>
+<html>
+<head>
+<title></title>
+</head>
+<body>
+<html:errors/>
+<br>
+<s:link href="/list/index">Back</s:link>
+</body>
+</html>


Property changes on: vfs-portlets/trunk/src/main/webapp/WEB-INF/view/upload/error.jsp
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: vfs-portlets/trunk/src/main/webapp/WEB-INF/web.xml
===================================================================
--- vfs-portlets/trunk/src/main/webapp/WEB-INF/web.xml	2008-10-24 08:00:54 UTC (rev 1236)
+++ vfs-portlets/trunk/src/main/webapp/WEB-INF/web.xml	2008-10-25 01:43:16 UTC (rev 1237)
@@ -1,32 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright 2005-2006 The Portal Application Laboratory Team.
-
-    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 2004-2008 PAL Project and the Others.
+ *
+ * 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.
 -->
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
   <display-name>VFS Portlet</display-name>
-  <description>VFS Portlet</description>
+  <description>Display a file system as VFS.</description>
   <context-param>
-    <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
-    <param-value>.jsp</param-value>
+    <param-name>sastruts.VIEW_PREFIX</param-name>
+    <param-value>/WEB-INF/view</param-value>
   </context-param>
-  <context-param>
-    <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
-    <param-value>server</param-value>
-  </context-param>
-<!-- Filter -->
   <filter>
     <filter-name>encodingfilter</filter-name>
     <filter-class>org.seasar.extension.filter.EncodingFilter</filter-class>
@@ -36,1306 +30,152 @@
     </init-param>
   </filter>
   <filter>
-    <filter-name>MyFacesExtensionsFilter</filter-name>
-    <filter-class>org.apache.myfaces.webapp.filter.ExtensionsFilter</filter-class>
-    <init-param>
-      <param-name>maxFileSize</param-name>
-      <param-value>20m</param-value>
-      <description>
-        Set the size limit for uploaded files. Format: 10 - 10 bytes 10k
-        - 10 KB 10m - 10 MB 1g - 1 GB
-      </description>
-    </init-param>
+    <filter-name>portletRequestFilter</filter-name>
+    <filter-class>org.seasar.struts.portlet.filter.PortletRequestFilter</filter-class>
   </filter>
-<!-- SERVLET DEV: BEGIN @@@
   <filter>
-    <filter-name>facesdevfilter</filter-name>
-    <filter-class>jp.sf.pal.facesdevfilter.FacesDevFilter</filter-class>
+    <filter-name>requestDumpFilter</filter-name>
+    <filter-class>org.seasar.extension.filter.RequestDumpFilter</filter-class>
   </filter>
-@@@@ SERVLET DEV: END -->
   <filter>
     <filter-name>s2filter</filter-name>
-    <filter-class>org.seasar.framework.container.filter.S2ContainerFilter</filter-class>
+    <filter-class>org.seasar.struts.portlet.filter.S2ContainerFilter</filter-class>
   </filter>
   <filter>
     <filter-name>hotdeployfilter</filter-name>
-    <filter-class>org.seasar.framework.container.hotdeploy.HotdeployFilter</filter-class>
+    <filter-class>org.seasar.struts.portlet.filter.HotdeployFilter</filter-class>
   </filter>
-<!-- Filter Mapping -->
+  <filter>
+    <filter-name>routingfilter</filter-name>
+    <filter-class>org.seasar.struts.filter.RoutingFilter</filter-class>
+    <init-param>
+      <param-name>jspDirectAccess</param-name>
+      <param-value>false</param-value>
+    </init-param>
+  </filter>
+  <filter>
+    <filter-name>portletRoutingfilter</filter-name>
+    <filter-class>org.seasar.struts.portlet.filter.PortletRoutingFilter</filter-class>
+    <init-param>
+      <param-name>jspDirectAccess</param-name>
+      <param-value>false</param-value>
+    </init-param>
+  </filter>
+  <filter>
+    <filter-name>securityConstraintFilter</filter-name>
+    <filter-class>jp.sf.pal.vfs.common.filter.SecurityConstraintFilter</filter-class>
+    <init-param>
+      <param-name>acceptUrlPaths</param-name>
+      <param-value>/list/download/.*</param-value>
+    </init-param>
+  </filter>
   <filter-mapping>
     <filter-name>encodingfilter</filter-name>
     <url-pattern>/*</url-pattern>
   </filter-mapping>
-<!-- extension mapping for adding <script/>, <link/>, and other resource tags to JSF-pages  -->
   <filter-mapping>
-    <filter-name>MyFacesExtensionsFilter</filter-name>
-<!-- servlet-name must match the name of your javax.faces.webapp.FacesServlet entry -->
-    <servlet-name>Faces Servlet</servlet-name>
+    <filter-name>securityConstraintFilter</filter-name>
+    <url-pattern>/*</url-pattern>
   </filter-mapping>
-<!-- SERVLET DEV: BEGIN @@@
   <filter-mapping>
-    <filter-name>facesdevfilter</filter-name>
-    <url-pattern>/faces/*</url-pattern>
+    <filter-name>portletRequestFilter</filter-name>
+    <url-pattern>/*</url-pattern>
+    <dispatcher>INCLUDE</dispatcher>
   </filter-mapping>
-@@@@ SERVLET DEV: END -->
   <filter-mapping>
     <filter-name>s2filter</filter-name>
     <url-pattern>/*</url-pattern>
+    <dispatcher>REQUEST</dispatcher>
+    <dispatcher>FORWARD</dispatcher>
+    <dispatcher>INCLUDE</dispatcher>
   </filter-mapping>
   <filter-mapping>
     <filter-name>hotdeployfilter</filter-name>
     <url-pattern>/*</url-pattern>
-<!--
     <dispatcher>REQUEST</dispatcher>
     <dispatcher>FORWARD</dispatcher>
--->
+    <dispatcher>INCLUDE</dispatcher>
   </filter-mapping>
-<!-- extension mapping for serving page-independent resources (javascript, stylesheets, images, etc.)  -->
   <filter-mapping>
-    <filter-name>MyFacesExtensionsFilter</filter-name>
-    <url-pattern>/faces/myFacesExtensionResource/*</url-pattern>
+    <filter-name>routingfilter</filter-name>
+    <url-pattern>/*</url-pattern>
+    <dispatcher>REQUEST</dispatcher>
   </filter-mapping>
-<!-- Listener -->
-  <listener>
-    <listener-class>org.seasar.teeda.core.webapp.TeedaPortletExtendedConfigureListener</listener-class>
-  </listener>
-<!--
-        org.seasar.teeda.core.webapp.TeedaConfigureListener
--->
-<!-- Servlet -->
+  <filter-mapping>
+    <filter-name>portletRoutingfilter</filter-name>
+    <url-pattern>/*</url-pattern>
+    <dispatcher>INCLUDE</dispatcher>
+  </filter-mapping>
+  <filter-mapping>
+    <filter-name>requestDumpFilter</filter-name>
+    <url-pattern>*.do</url-pattern>
+    <dispatcher>REQUEST</dispatcher>
+    <dispatcher>FORWARD</dispatcher>
+    <dispatcher>INCLUDE</dispatcher>
+  </filter-mapping>
   <servlet>
-    <servlet-name>Faces Servlet</servlet-name>
-    <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+    <servlet-name>action</servlet-name>
+    <servlet-class>org.seasar.struts.portlet.servlet.ActionServlet</servlet-class>
+    <init-param>
+      <param-name>config</param-name>
+      <param-value>/WEB-INF/struts-config.xml</param-value>
+    </init-param>
+    <init-param>
+      <param-name>configFactory</param-name>
+      <param-value>org.seasar.struts.config.S2ModuleConfigFactory</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  <servlet>
+    <servlet-name>s2container</servlet-name>
+    <servlet-class>org.seasar.framework.container.servlet.S2ContainerServlet</servlet-class>
     <load-on-startup>2</load-on-startup>
   </servlet>
+<!-- BEGIN: J2 
   <servlet>
-    <servlet-name>VFSFile</servlet-name>
-    <display-name>VFS File servlet</display-name>
-    <description>Servlet used to view a document</description>
-    <servlet-class>jp.sf.pal.vfs.servlets.FileServlet</servlet-class>
+    <description>MVC Servlet for Jetspeed Portlet Applications</description>
+    <display-name>Jetspeed Container</display-name>
+    <servlet-name>JetspeedContainer</servlet-name>
+    <servlet-class>org.apache.jetspeed.container.JetspeedContainerServlet</servlet-class>
+    <init-param>
+      <param-name>contextName</param-name>
+      <param-value>vfs-portlet</param-value>
+    </init-param>
+    <load-on-startup>0</load-on-startup>
   </servlet>
-<!-- Servlet Mapping -->
+ END: J2 -->
   <servlet-mapping>
-    <servlet-name>Faces Servlet</servlet-name>
-    <url-pattern>/faces/*</url-pattern>
+    <servlet-name>action</servlet-name>
+    <url-pattern>*.do</url-pattern>
   </servlet-mapping>
   <servlet-mapping>
-    <servlet-name>VFSFile</servlet-name>
-    <url-pattern>/FileServlet/*</url-pattern>
+    <servlet-name>s2container</servlet-name>
+    <url-pattern>/s2container</url-pattern>
   </servlet-mapping>
-<!-- MIME type mapping -->
-  <mime-mapping>
-    <extension>123</extension>
-    <mime-type>application/vnd.lotus-1-2-3</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>3g2</extension>
-    <mime-type>video/3gpp2</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>3gp</extension>
-    <mime-type>video/3gpp</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>ai</extension>
-    <mime-type>application/postscript</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>aif</extension>
-    <mime-type>audio/x-aiff</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>aifc</extension>
-    <mime-type>audio/x-aiff</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>aiff</extension>
-    <mime-type>audio/x-aiff</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>album</extension>
-    <mime-type>application/album</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>amc</extension>
-    <mime-type>application/x-mpeg</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>api</extension>
-    <mime-type>application/x-httpd-isapi</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>asc</extension>
-    <mime-type>text/plain</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>asd</extension>
-    <mime-type>application/astound</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>asf</extension>
-    <mime-type>video/x-ms-asf</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>asis</extension>
-    <mime-type>httpd/send-as-is</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>asn</extension>
-    <mime-type>application/astound</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>asp</extension>
-    <mime-type>application/x-asap</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>asx</extension>
-    <mime-type>video/x-ms-asf</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>au</extension>
-    <mime-type>audio/basic</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>avi</extension>
-    <mime-type>video/x-msvideo</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>bcpio</extension>
-    <mime-type>application/x-bcpio</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>bin</extension>
-    <mime-type>application/octet-stream</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>bmp</extension>
-    <mime-type>image/bmp</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>cco</extension>
-    <mime-type>application/x-cocoa</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>cct</extension>
-    <mime-type>application/x-cct</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>cdf</extension>
-    <mime-type>application/x-netcdf</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>cgi</extension>
-    <mime-type>application/x-httpd-cgi</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>class</extension>
-    <mime-type>application/octet-stream</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>clp</extension>
-    <mime-type>application/x-msclip</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>cocoa</extension>
-    <mime-type>application/x-cocoa</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>com</extension>
-    <mime-type>application/octet-stream</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>cpio</extension>
-    <mime-type>application/x-cpio</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>cpt</extension>
-    <mime-type>application/mac-compactpro</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>crd</extension>
-    <mime-type>application/x-mscardfile</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>csh</extension>
-    <mime-type>application/x-csh</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>csm</extension>
-    <mime-type>chemical/x-csml</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>csml</extension>
-    <mime-type>chemical/x-csml</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>css</extension>
-    <mime-type>text/css</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>d96</extension>
-    <mime-type>x-world/x-d96</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>dcr</extension>
-    <mime-type>application/x-director</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>dir</extension>
-    <mime-type>application/x-director</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>dl</extension>
-    <mime-type>application/x-WebSync-plugin</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>dms</extension>
-    <mime-type>application/octet-stream</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>doc</extension>
-    <mime-type>application/msword</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>dot</extension>
-    <mime-type>application/x-dot</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>dvi</extension>
-    <mime-type>application/x-dvi</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>dwf</extension>
-    <mime-type>drawing/x-dwf</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>dwg</extension>
-    <mime-type>image/vnd</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>dxr</extension>
-    <mime-type>application/x-director</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>ebk</extension>
-    <mime-type>application/x-expandedbook</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>emb</extension>
-    <mime-type>chemical/x-embl-dl-nucleotide</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>embl</extension>
-    <mime-type>chemical/x-embl-dl-nucleotide</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>eps</extension>
-    <mime-type>application/postscript</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>es</extension>
-    <mime-type>audio/echospeech</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>esl</extension>
-    <mime-type>audio/echospeech</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>etc</extension>
-    <mime-type>application/x-earthtime</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>etx</extension>
-    <mime-type>text/x-setext</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>evy</extension>
-    <mime-type>application/x-envoy</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>exe</extension>
-    <mime-type>application/octet-stream</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>ez</extension>
-    <mime-type>application/andrew-inset</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>fdf</extension>
-    <mime-type>application/vnd</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>fgd</extension>
-    <mime-type>application/x-director</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>fif</extension>
-    <mime-type>image/fif</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>fm</extension>
-    <mime-type>application/x-maker</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>fvi</extension>
-    <mime-type>video/isivideo</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>gau</extension>
-    <mime-type>chemical/x-gaussian-input</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>gif</extension>
-    <mime-type>image/gif</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>gtar</extension>
-    <mime-type>application/x-gtar</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>gz</extension>
-    <mime-type>application/octet-stream</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>hdf</extension>
-    <mime-type>application/x-hdf</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>hdml</extension>
-    <mime-type>text/x-hdml;charset=Shift_JIS</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>hlp</extension>
-    <mime-type>application/winhlp</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>hqx</extension>
-    <mime-type>application/mac-binhex40</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>htm</extension>
-    <mime-type>text/html</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>html</extension>
-    <mime-type>text/html</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>ice</extension>
-    <mime-type>x-conference/x-cooltalk</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>ief</extension>
-    <mime-type>image/ief</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>ifm</extension>
-    <mime-type>image/gif</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>ifs</extension>
-    <mime-type>image/ifs</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>iges</extension>
-    <mime-type>model/iges</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>igs</extension>
-    <mime-type>model/iges</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>ins</extension>
-    <mime-type>application/x-NET-Install</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>ips</extension>
-    <mime-type>application/x-ipscript</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>ipx</extension>
-    <mime-type>application/x-ipix</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>ivr</extension>
-    <mime-type>i-world/i-vrml</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>jbw</extension>
-    <mime-type>application/x-js-taro</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>jfw</extension>
-    <mime-type>application/x-js-taro</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>jnlp</extension>
-    <mime-type>application/x-java-jnlp-file</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>jpe</extension>
-    <mime-type>image/jpeg</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>jpeg</extension>
-    <mime-type>image/jpeg</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>jpg</extension>
-    <mime-type>image/jpeg</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>js</extension>
-    <mime-type>application/x-javascript</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>jtd</extension>
-    <mime-type>application/x-js-taro</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>kar</extension>
-    <mime-type>audio/midi</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>kjx</extension>
-    <mime-type>application/x-kjx</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>latex</extension>
-    <mime-type>application/x-latex</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>lcc</extension>
-    <mime-type>application/fastman</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>lcl</extension>
-    <mime-type>application/x-digitalloca</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>lcr</extension>
-    <mime-type>application/x-digitalloca</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>lha</extension>
-    <mime-type>application/octet-stream</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>LZH</extension>
-    <mime-type>application/octet-stream</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>lzh</extension>
-    <mime-type>application/octet-stream</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>m13</extension>
-    <mime-type>application/x-msmediaview</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>m14</extension>
-    <mime-type>application/x-msmediaview</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>m3u</extension>
-    <mime-type>audio/x-mpegurl</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>man</extension>
-    <mime-type>application/x-troff-man</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>map</extension>
-    <mime-type>application/x-httpd-imap</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>mbd</extension>
-    <mime-type>application/mbedlet</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>mcf</extension>
-    <mime-type>text/mcf</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>mcp</extension>
-    <mime-type>application/netmc</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>mct</extension>
-    <mime-type>application/x-mascot</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>mdb</extension>
-    <mime-type>application/x-msaccess</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>mdc</extension>
-    <mime-type>application/x-mediadesc</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>mdx</extension>
-    <mime-type>application/x-mediadesc</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>me</extension>
-    <mime-type>application/x-troff-me</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>mesh</extension>
-    <mime-type>model/mesh</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>MID</extension>
-    <mime-type>audio/midi</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>mid</extension>
-    <mime-type>audio/midi</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>midi</extension>
-    <mime-type>audio/midi</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>mif</extension>
-    <mime-type>application/vnd.mif</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>mio</extension>
-    <mime-type>audio/x-mio</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>mmf</extension>
-    <mime-type>application/x-smaf</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>mng</extension>
-    <mime-type>video/x-mng</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>mny</extension>
-    <mime-type>application/x-msmoney</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>mocha</extension>
-    <mime-type>application/x-mocha</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>mof</extension>
-    <mime-type>application/x-yumekara</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>mol</extension>
-    <mime-type>chemical/x-mdl-molfile</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>mop</extension>
-    <mime-type>chemical/x-mopac-input</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>mov</extension>
-    <mime-type>video/quicktime</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>movie</extension>
-    <mime-type>video/x-sgi-movie</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>mp2</extension>
-    <mime-type>audio/mpeg</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>mp3</extension>
-    <mime-type>audio/mpeg</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>mp4</extension>
-    <mime-type>video/mp4</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>mpe</extension>
-    <mime-type>video/mpeg</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>mpeg</extension>
-    <mime-type>video/mpeg</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>mpg</extension>
-    <mime-type>video/mpeg</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>mpg4</extension>
-    <mime-type>video/mp4</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>mpga</extension>
-    <mime-type>audio/mpeg</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>mpp</extension>
-    <mime-type>application/vnd.ms-project</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>mrl</extension>
-    <mime-type>text/x-mrml</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>ms</extension>
-    <mime-type>application/x-troff-ms</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>msh</extension>
-    <mime-type>model/mesh</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>mus</extension>
-    <mime-type>x-world/x-d96</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>nc</extension>
-    <mime-type>application/x-netcdf</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>nm</extension>
-    <mime-type>application/x-nvat</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>nva</extension>
-    <mime-type>application/x-neva1</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>nvat</extension>
-    <mime-type>application/x-nvat</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>oda</extension>
-    <mime-type>application/oda</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>oke</extension>
-    <mime-type>audio/karaoke</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>olh</extension>
-    <mime-type>application/x-onlivehead</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>olr</extension>
-    <mime-type>application/x-onlivereg</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>olv</extension>
-    <mime-type>x-world/x-vrml1.0</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>pac</extension>
-    <mime-type>audio/x-pac</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>pae</extension>
-    <mime-type>audio/x-epac</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>pbm</extension>
-    <mime-type>image/x-portable-bitmap</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>pcv</extension>
-    <mime-type>application/x-pcnavi</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>pdb</extension>
-    <mime-type>chemical/x-pdb</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>pdf</extension>
-    <mime-type>application/pdf</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>pfr</extension>
-    <mime-type>application/font-tdpfr</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>pgm</extension>
-    <mime-type>image/x-portable-graymap</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>pgn</extension>
-    <mime-type>application/x-chess-pgn</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>pmd</extension>
-    <mime-type>application/x-pmd</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>png</extension>
-    <mime-type>image/png</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>pnm</extension>
-    <mime-type>image/x-portable-anymap</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>pot</extension>
-    <mime-type>application/vnd.ms-powerpoint</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>ppm</extension>
-    <mime-type>image/x-portable-pixmap</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>pps</extension>
-    <mime-type>application/vnd.ms-powerpoint</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>ppt</extension>
-    <mime-type>application/vnd.ms-powerpoint</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>prc</extension>
-    <mime-type>application/x-palmpilot</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>ps</extension>
-    <mime-type>application/postscript</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>pub</extension>
-    <mime-type>application/x-mspublisher</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>qcp</extension>
-    <mime-type>audio/vnd.qcelp</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>qt</extension>
-    <mime-type>video/quicktime</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>ra</extension>
-    <mime-type>audio/x-realaudio</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>ram</extension>
-    <mime-type>audio/x-pn-realaudio</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>ras</extension>
-    <mime-type>image/x-cmu-raster</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>rgb</extension>
-    <mime-type>image/x-rgb</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>rm</extension>
-    <mime-type>audio/x-pn-realaudio</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>roff</extension>
-    <mime-type>application/x-troff</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>rp</extension>
-    <mime-type>image/vnd.rn-realpix</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>rpm</extension>
-    <mime-type>audio/x-pn-realaudio-plugin</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>rt</extension>
-    <mime-type>text/vnd.rn-realtext</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>rtf</extension>
-    <mime-type>text/rtf</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>rtx</extension>
-    <mime-type>text/richtext</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>rv</extension>
-    <mime-type>video/vnd.rn-realvideo</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>rxnfile</extension>
-    <mime-type>chemical/x-mdl-rxnfile</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>scd</extension>
-    <mime-type>application/x-msschedule</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>sds</extension>
-    <mime-type>application/x-onlive</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>sea</extension>
-    <mime-type>application/octet-stream</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>sgm</extension>
-    <mime-type>text/sgml</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>sgml</extension>
-    <mime-type>text/sgml</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>sh</extension>
-    <mime-type>application/x-sh</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>shar</extension>
-    <mime-type>application/x-shar</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>shtml</extension>
-    <mime-type>text/x-server-parsed-html</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>silo</extension>
-    <mime-type>model/mesh</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>sit</extension>
-    <mime-type>application/x-stuffit</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>skd</extension>
-    <mime-type>application/x-koan</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>skm</extension>
-    <mime-type>application/x-koan</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>skp</extension>
-    <mime-type>application/x-koan</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>skt</extension>
-    <mime-type>application/x-koan</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>slc</extension>
-    <mime-type>application/x-salsa</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>smi</extension>
-    <mime-type>application/smil</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>smil</extension>
-    <mime-type>application/smil</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>smp</extension>
-    <mime-type>application/studiom</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>snd</extension>
-    <mime-type>audio/basic</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>spl</extension>
-    <mime-type>application/x-futuresplash</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>sprite</extension>
-    <mime-type>application/x-sprite</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>spt</extension>
-    <mime-type>application/x-spt</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>src</extension>
-    <mime-type>application/x-wais-source</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>sv4cpio</extension>
-    <mime-type>application/x-sv4cpio</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>sv4crc</extension>
-    <mime-type>application/x-sv4crc</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>svf</extension>
-    <mime-type>image/vnd</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>svi</extension>
-    <mime-type>application/softvision</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>svr</extension>
-    <mime-type>x-world/x-svr</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>swf</extension>
-    <mime-type>application/x-shockwave-flash</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>t</extension>
-    <mime-type>application/x-troff</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>talk</extension>
-    <mime-type>text/x-speech</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>tar</extension>
-    <mime-type>application/x-tar</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>tbp</extension>
-    <mime-type>application/x-timbuktu</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>tbt</extension>
-    <mime-type>application/timbuktu</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>tcl</extension>
-    <mime-type>application/x-tcl</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>tex</extension>
-    <mime-type>application/x-tex</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>texinfo</extension>
-    <mime-type>application/x-texinfo</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>tgf</extension>
-    <mime-type>chemical/x-mdl-tgf</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>tif</extension>
-    <mime-type>image/tiff</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>tiff</extension>
-    <mime-type>image/tiff</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>tki</extension>
-    <mime-type>application/x-tkined</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>tkined</extension>
-    <mime-type>application/x-tkined</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>tlk</extension>
-    <mime-type>application/x-tlk</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>tr</extension>
-    <mime-type>application/x-troff</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>trm</extension>
-    <mime-type>application/x-msterminal</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>tsp</extension>
-    <mime-type>application/dsptype</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>tsv</extension>
-    <mime-type>text/tab-separated-values</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>ttz</extension>
-    <mime-type>application/t-time</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>txt</extension>
-    <mime-type>text/plain</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>ustar</extension>
-    <mime-type>application/x-ustar</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>vcd</extension>
-    <mime-type>application/x-cdlink</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>vdo</extension>
-    <mime-type>video/vdo</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>vex</extension>
-    <mime-type>application/x-yumekara</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>vgm</extension>
-    <mime-type>video/x-videogram</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>vgp</extension>
-    <mime-type>video/x-videogram-plugin</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>vgx</extension>
-    <mime-type>video/x-videogram</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>vif</extension>
-    <mime-type>video/x-vif</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>viv</extension>
-    <mime-type>video/vnd.vivo</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>vivo</extension>
-    <mime-type>video/vnd.vivo</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>vqe</extension>
-    <mime-type>audio/x-twinvq-plugin</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>vqf</extension>
-    <mime-type>audio/x-twinvq</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>vql</extension>
-    <mime-type>audio/x-twinvq</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>vrml</extension>
-    <mime-type>model/vrml</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>vrt</extension>
-    <mime-type>x-world/x-vrt</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>wav</extension>
-    <mime-type>audio/x-wav</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>wax</extension>
-    <mime-type>audio/x-ms-wax</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>wbmp</extension>
-    <mime-type>image/vnd.wap.wbmp</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>wbxml</extension>
-    <mime-type>application/vnd.wap.wbxml</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>wfp</extension>
-    <mime-type>application/wfphelpap</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>wi</extension>
-    <mime-type>image/wavelet</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>wk1</extension>
-    <mime-type>application/vnd.lotus-1-2-3</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>wk3</extension>
-    <mime-type>application/vnd.lotus-1-2-3</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>wk4</extension>
-    <mime-type>application/vnd.lotus-1-2-3</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>wm</extension>
-    <mime-type>video/x-ms-wm</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>wma</extension>
-    <mime-type>audio/x-ms-wma</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>wmd</extension>
-    <mime-type>video/x-ms-wmd</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>wmf</extension>
-    <mime-type>application/x-msmetafile</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>wml</extension>
-    <mime-type>text/vnd.wap.wml;charset=Shift_JIS</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>wmlc</extension>
-    <mime-type>application/vnd.wap.wmlc</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>wmls</extension>
-    <mime-type>text/vnd.wap.wmlscript</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>wmlsc</extension>
-    <mime-type>application/vnd.wap.wmlscriptc</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>wmv</extension>
-    <mime-type>video/x-ms-wmv</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>wmx</extension>
-    <mime-type>video/x-ms-wmx</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>wmz</extension>
-    <mime-type>video/x-ms-wmz</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>wri</extension>
-    <mime-type>application/x-mswrite</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>wrl</extension>
-    <mime-type>model/vrml</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>ws2</extension>
-    <mime-type>application/x-WebSync2-Plugin</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>wse</extension>
-    <mime-type>application/x-WebSync-plugin</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>wss</extension>
-    <mime-type>application/x-WebSync-plugin</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>wv</extension>
-    <mime-type>video/wavelet</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>wvh</extension>
-    <mime-type>video/x-webview-h</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>wvp</extension>
-    <mime-type>video/x-webview-p</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>wvx</extension>
-    <mime-type>video/x-ms-wvx</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>xbd</extension>
-    <mime-type>application/vnd.fujixerox.docuworks.binder</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>xbm</extension>
-    <mime-type>image/x-xbitmap</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>xdm</extension>
-    <mime-type>application/x-xdma</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>xdw</extension>
-    <mime-type>application/vnd.fujixerox.docuworks</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>xhm</extension>
-    <mime-type>application/xhtml+xml</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>xht</extension>
-    <mime-type>application/xhtml+xml</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>xhtm</extension>
-    <mime-type>application/xhtml+xml</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>xhtml</extension>
-    <mime-type>application/xhtml+xml</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>xla</extension>
-    <mime-type>application/vnd.ms-excel</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>xlc</extension>
-    <mime-type>application/vnd.ms-excel</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>xll</extension>
-    <mime-type>application/x-excel</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>xlm</extension>
-    <mime-type>application/vnd.ms-excel</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>xls</extension>
-    <mime-type>application/vnd.ms-excel</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>xlt</extension>
-    <mime-type>application/vnd.ms-excel</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>xlw</extension>
-    <mime-type>application/vnd.ms-excel</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>XML</extension>
-    <mime-type>text/xml</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>xml</extension>
-    <mime-type>text/xml</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>xpm</extension>
-    <mime-type>image/x-xpixmap</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>xsl</extension>
-    <mime-type>text/xml</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>xwd</extension>
-    <mime-type>image/x-xwindowdump</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>xyz</extension>
-    <mime-type>chemical/x-xyz</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>Z</extension>
-    <mime-type>application/octet-stream</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>zac</extension>
-    <mime-type>application/x-zaurus-zac</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>zip</extension>
-    <mime-type>application/zip</mime-type>
-  </mime-mapping>
-<!-- Welcome files -->
+<!-- BEGIN: J2 
+  <servlet-mapping>
+    <servlet-name>JetspeedContainer</servlet-name>
+    <url-pattern>/container/*</url-pattern>
+  </servlet-mapping>
+ END: J2 -->
   <welcome-file-list>
-    <welcome-file>index.jsf</welcome-file>
-    <welcome-file>index.jsp</welcome-file>
     <welcome-file>index.html</welcome-file>
+    <welcome-file>index.htm</welcome-file>
+    <welcome-file>index.jsp</welcome-file>
   </welcome-file-list>
+  <jsp-config>
+<!-- BEGIN: J2 
+    <taglib>
+      <taglib-uri>http://java.sun.com/portlet</taglib-uri>
+      <taglib-location>/WEB-INF/tld/portlet.tld</taglib-location>
+    </taglib>
+ END: J2 -->
+    <jsp-property-group>
+      <url-pattern>*.jsp</url-pattern>
+      <el-ignored>false</el-ignored>
+      <page-encoding>UTF-8</page-encoding>
+      <scripting-invalid>false</scripting-invalid>
+      <include-prelude>/WEB-INF/view/common/common.jsp</include-prelude>
+    </jsp-property-group>
+  </jsp-config>
 </web-app>

Deleted: vfs-portlets/trunk/src/main/webapp/view/navigator/createNewFile.jsp
===================================================================
--- vfs-portlets/trunk/src/main/webapp/view/navigator/createNewFile.jsp	2008-10-24 08:00:54 UTC (rev 1236)
+++ vfs-portlets/trunk/src/main/webapp/view/navigator/createNewFile.jsp	2008-10-25 01:43:16 UTC (rev 1237)
@@ -1,52 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
-
-<f:view>
-
-	<h:form>
-	<t:div style="text-align: left;width: 100%;">
-
-		<h:commandButton image="#{navigator_createNewFilePage.createNewFileImage}"
-			alt="Create New File" title="Create New File" rendered="#{navigator_createNewFilePage.renderCreateNewFile}"
-			action="#{navigator_createNewFilePage.goCreateNewFilePage}" immediate="true" />
-		<h:commandButton image="#{navigator_createNewFilePage.createNewFolderImage}"
-			alt="Create New Folder" title="Create New Folder" rendered="#{navigator_createNewFilePage.renderCreateNewFolder}"
-			action="#{navigator_createNewFilePage.goCreateNewFolderPage}" immediate="true" />
-		<h:commandButton image="#{navigator_createNewFilePage.uploadFileImage}"
-			alt="Upload File" title="Upload File" rendered="#{navigator_createNewFilePage.renderUploadFile}"
-			action="#{navigator_createNewFilePage.goUploadFilePage}" immediate="true" />
-
-	</t:div>
-
-	<t:div style="text-align: left;width: 100%;">
-		<h:panelGrid columns="3">
-
-				<h:outputText value="URI:" styleClass="portlet-form-field" />
-				<h:outputText value="#{navigator_createNewFilePage.uri}" styleClass="portlet-form-field" />
-				<h:commandButton type="submit" value="Back" immediate="true"
-					action="#{navigator_createNewFilePage.goDisplayFolderListPage}" styleClass="portlet-form-button" />
-
-		</h:panelGrid>
-	</t:div>
-
-	<h:messages styleClass="portlet-msg-success"
-		errorClass="portlet-msg-error" fatalClass="portlet-msg-error"
-		warnClass="portlet-msg-alert" infoClass="portlet-msg-info" />
-
-		<h:panelGrid columns="2">
-			<h:outputText value="New File:" styleClass="portlet-form-field" />
-			<h:inputText id="newFile" value="#{navigator_createNewFilePage.newFile}"
-				required="true" styleClass="portlet-form-field-label" />
-
-			<h:selectOneMenu value="#{navigator_createNewFilePage.type}">
-				<f:selectItems value="#{navigator_createNewFilePage.types}" />
-			</h:selectOneMenu>
-			<h:commandButton value="Next" action="#{navigator_createNewFilePage.next}"
-				styleClass="portlet-form-button" />
-		</h:panelGrid>
-	</h:form>
-
-</f:view>
-

Deleted: vfs-portlets/trunk/src/main/webapp/view/navigator/createNewFolder.jsp
===================================================================
--- vfs-portlets/trunk/src/main/webapp/view/navigator/createNewFolder.jsp	2008-10-24 08:00:54 UTC (rev 1236)
+++ vfs-portlets/trunk/src/main/webapp/view/navigator/createNewFolder.jsp	2008-10-25 01:43:16 UTC (rev 1237)
@@ -1,57 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
-
-<f:view>
-
-	<h:form>
-	<t:div style="text-align: left;width: 100%;">
-
-		<h:commandButton image="#{navigator_createNewFolderPage.createNewFileImage}"
-			alt="Create New File" title="Create New File" rendered="#{navigator_createNewFilePage.renderCreateNewFile}"
-			action="#{navigator_createNewFolderPage.goCreateNewFilePage}" immediate="true" />
-		<h:commandButton image="#{navigator_createNewFolderPage.createNewFolderImage}"
-			alt="Create New Folder" title="Create New Folder" rendered="#{navigator_createNewFilePage.renderCreateNewFolder}"
-			action="#{navigator_createNewFolderPage.goCreateNewFolderPage}" immediate="true" />
-		<h:commandButton image="#{navigator_createNewFolderPage.uploadFileImage}"
-			alt="Upload File" title="Upload File" rendered="#{navigator_createNewFilePage.renderUploadFile}"
-			action="#{navigator_createNewFolderPage.goUploadFilePage}" immediate="true" />
-
-	</t:div>
-
-	<t:div style="text-align: left;width: 100%;">
-		<h:panelGrid columns="3">
-
-				<h:outputText value="URI:" styleClass="portlet-form-field" />
-				<h:outputText value="#{navigator_createNewFolderPage.uri}" styleClass="portlet-form-field" />
-				<h:commandButton type="submit" value="Back" immediate="true"
-					action="#{navigator_createNewFolderPage.goDisplayFolderListPage}" styleClass="portlet-form-button" />
-
-		</h:panelGrid>
-	</t:div>
-
-	<h:messages styleClass="portlet-msg-success"
-		errorClass="portlet-msg-error" fatalClass="portlet-msg-error"
-		warnClass="portlet-msg-alert" infoClass="portlet-msg-info" />
-
-
-		<table border="0">
-			<tr>
-				<td><h:outputText value="New Folder:"
-					styleClass="portlet-form-field" /></td>
-				<td><h:inputText id="newFolder"
-					value="#{navigator_createNewFolderPage.newFolder}"
-					styleClass="portlet-form-field-label" required="true"/></td>
-			</tr>
-			<tr>
-				<td align="center" colspan="2">
-				<h:commandButton
-					value="Create New Folder" action="#{navigator_createNewFolderPage.create}"
-					styleClass="portlet-form-button" /></td>
-			</tr>
-		</table>
-	</h:form>
-
-</f:view>
-

Deleted: vfs-portlets/trunk/src/main/webapp/view/navigator/displayFolderList.jsp
===================================================================
--- vfs-portlets/trunk/src/main/webapp/view/navigator/displayFolderList.jsp	2008-10-24 08:00:54 UTC (rev 1236)
+++ vfs-portlets/trunk/src/main/webapp/view/navigator/displayFolderList.jsp	2008-10-25 01:43:16 UTC (rev 1237)
@@ -1,93 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
-
-<f:view>
-
-	<h:form>
-
-	<t:div style="text-align: left;width: 100%;">
-
-		<h:commandButton image="#{navigator_displayFolderListPage.createNewFileImage}"
-			alt="Create New File" title="Create New File" rendered="#{navigator_createNewFilePage.renderCreateNewFile}"
-			action="#{navigator_displayFolderListPage.goCreateNewFilePage}" immediate="true" />
-		<h:commandButton image="#{navigator_displayFolderListPage.createNewFolderImage}"
-			alt="Create New Folder" title="Create New Folder" rendered="#{navigator_createNewFilePage.renderCreateNewFolder}"
-			action="#{navigator_displayFolderListPage.goCreateNewFolderPage}" immediate="true" />
-		<h:commandButton image="#{navigator_displayFolderListPage.uploadFileImage}"
-			alt="Upload File" title="Upload File" rendered="#{navigator_createNewFilePage.renderUploadFile}"
-			action="#{navigator_displayFolderListPage.goUploadFilePage}" immediate="true" />
-
-	</t:div>
-
-	<t:div style="text-align: left;width: 100%;">
-		<h:panelGrid columns="4">
-
-			<h:outputLabel for="uri">
-				<h:outputText value="URI:" styleClass="portlet-form-field" />
-			</h:outputLabel>
-			<h:inputText id="uri" value="#{navigator_displayFolderListPage.uri}"
-				styleClass="portlet-form-field-label" size="50" />
-			<h:panelGrid columns="2">
-				<h:commandButton type="submit" value="Go"
-					action="#{navigator_displayFolderListPage.go}" styleClass="portlet-form-button" />
-			</h:panelGrid>
-			<h:commandButton image="#{navigator_displayFolderListPage.openParentImage}"
-				alt="Go to Parent Folder" title="Go to Parent Folder"
-				action="#{navigator_displayFolderListPage.openParent}" immediate="true" />
-
-		</h:panelGrid>
-	</t:div>
-
-	<h:messages styleClass="portlet-msg-success"
-		errorClass="portlet-msg-error" fatalClass="portlet-msg-error"
-		warnClass="portlet-msg-alert" infoClass="portlet-msg-info" />
-
-	<h:outputText value="#{navigator_displayFolderListPage.outputHtml}" escape="false" />
-
-
-		<!-- Table -->
-		<h:dataTable id="fileList" border="1" var="item" width="100%"
-			value="#{navigator_displayFolderListPage.objects}" headerClass="portlet-section-header"
-			rowClasses="portlet-section-body,portlet-section-alternate">
-			<h:column>
-				<f:facet name="header">
-					<h:outputText value="File Name" />
-				</f:facet>
-				<h:commandLink action="#{navigator_displayFolderListPage.select}">
-					<h:outputText id="name" value="#{item.baseName}" />
-				</h:commandLink>
-			</h:column>
-			<h:column>
-				<f:facet name="header">
-					<h:outputText value="Size" />
-				</f:facet>
-				<h:outputText id="size" value="#{item.formattedSize}" />
-			</h:column>
-			<h:column>
-				<f:facet name="header">
-					<h:outputText value="Content Type" />
-				</f:facet>
-				<h:outputText id="contentType" value="#{item.contentType}" />
-			</h:column>
-			<h:column>
-				<f:facet name="header">
-					<h:outputText value="Date" />
-				</f:facet>
-				<h:outputText id="date" value="#{item.formattedLastModifiedTime}" />
-			</h:column>
-			<h:column>
-				<f:facet name="header">
-					<h:outputText value="Action" />
-				</f:facet>
-				<h:commandButton type="submit" alt="Delete" title="Delete"
-					image="#{navigator_displayFolderListPage.trashImage}"
-					action="#{navigator_displayFolderListPage.delete}"
-					onclick="if(!confirm('Do you want to delete this file/directory?')) return false;" />
-			</h:column>
-		</h:dataTable>
-
-	</h:form>
-</f:view>
-

Deleted: vfs-portlets/trunk/src/main/webapp/view/navigator/uploadFile.jsp
===================================================================
--- vfs-portlets/trunk/src/main/webapp/view/navigator/uploadFile.jsp	2008-10-24 08:00:54 UTC (rev 1236)
+++ vfs-portlets/trunk/src/main/webapp/view/navigator/uploadFile.jsp	2008-10-25 01:43:16 UTC (rev 1237)
@@ -1,56 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
-
-<f:view>
-
-<h:form>
-	<t:div style="text-align: left;width: 100%;">
-
-		<h:commandButton image="#{navigator_uploadFilePage.createNewFileImage}"
-			alt="Create New File" title="Create New File" rendered="#{navigator_createNewFilePage.renderCreateNewFile}"
-			action="#{navigator_uploadFilePage.goCreateNewFilePage}" immediate="true" />
-		<h:commandButton image="#{navigator_uploadFilePage.createNewFolderImage}"
-			alt="Create New Folder" title="Create New Folder" rendered="#{navigator_createNewFilePage.renderCreateNewFolder}"
-			action="#{navigator_uploadFilePage.goCreateNewFolderPage}" immediate="true" />
-		<h:commandButton image="#{navigator_uploadFilePage.uploadFileImage}"
-			alt="Upload File" title="Upload File" rendered="#{navigator_createNewFilePage.renderUploadFile}"
-			action="#{navigator_uploadFilePage.goUploadFilePage}" immediate="true" />
-
-	</t:div>
-
-	<t:div style="text-align: left;width: 100%;">
-		<h:panelGrid columns="3">
-
-				<h:outputText value="URI:" styleClass="portlet-form-field" />
-				<h:outputText value="#{navigator_uploadFilePage.uri}" styleClass="portlet-form-field" />
-				<h:commandButton type="submit" value="Back" immediate="true"
-					action="#{navigator_uploadFilePage.goDisplayFolderListPage}" styleClass="portlet-form-button" />
-
-		</h:panelGrid>
-	</t:div>
-
-	<h:messages styleClass="portlet-msg-success"
-		errorClass="portlet-msg-error" fatalClass="portlet-msg-error"
-		warnClass="portlet-msg-alert" infoClass="portlet-msg-info" />
-
-</h:form>
-
-	<h:form enctype="multipart/form-data">
-		<table border="0">
-			<tr>
-				<td><h:outputText value="File:" styleClass="portlet-form-field" /></td>
-				<td><t:inputFileUpload id="fileupload"
-					value="#{navigator_uploadFilePage.uploadedFile}" storage="file"
-					required="true" styleClass="portlet-form-field-label" size="40" /></td>
-			</tr>
-			<tr>
-				<td align="center" colspan="2"><h:commandButton value="Upload"
-					action="#{navigator_uploadFilePage.upload}" styleClass="portlet-form-button" /></td>
-			</tr>
-		</table>
-	</h:form>
-
-</f:view>
-

Deleted: vfs-portlets/trunk/src/main/webapp/view/navigator/writeNewFileContent.jsp
===================================================================
--- vfs-portlets/trunk/src/main/webapp/view/navigator/writeNewFileContent.jsp	2008-10-24 08:00:54 UTC (rev 1236)
+++ vfs-portlets/trunk/src/main/webapp/view/navigator/writeNewFileContent.jsp	2008-10-25 01:43:16 UTC (rev 1237)
@@ -1,65 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
-
-<f:view>
-
-	<h:form>
-	<t:div style="text-align: left;width: 100%;">
-
-		<h:commandButton image="#{navigator_writeNewFileContentPage.createNewFileImage}"
-			alt="Create New File" title="Create New File" rendered="#{navigator_createNewFilePage.renderCreateNewFile}"
-			action="#{navigator_writeNewFileContentPage.goCreateNewFilePage}" immediate="true" />
-		<h:commandButton image="#{navigator_writeNewFileContentPage.createNewFolderImage}"
-			alt="Create New Folder" title="Create New Folder" rendered="#{navigator_createNewFilePage.renderCreateNewFolder}"
-			action="#{navigator_writeNewFileContentPage.goCreateNewFolderPage}" immediate="true" />
-		<h:commandButton image="#{navigator_writeNewFileContentPage.uploadFileImage}"
-			alt="Upload File" title="Upload File" rendered="#{navigator_createNewFilePage.renderUploadFile}"
-			action="#{navigator_writeNewFileContentPage.goUploadFilePage}" immediate="true" />
-
-	</t:div>
-
-	<t:div style="text-align: left;width: 100%;">
-		<h:panelGrid columns="3">
-
-				<h:outputText value="URI:" styleClass="portlet-form-field" />
-				<h:outputText value="#{navigator_writeNewFileContentPage.uri}" styleClass="portlet-form-field" />
-				<h:commandButton type="submit" value="Back" immediate="true"
-					action="#{navigator_writeNewFileContentPage.goDisplayFolderListPage}" styleClass="portlet-form-button" />
-
-		</h:panelGrid>
-	</t:div>
-
-	<h:messages styleClass="portlet-msg-success"
-		errorClass="portlet-msg-error" fatalClass="portlet-msg-error"
-		warnClass="portlet-msg-alert" infoClass="portlet-msg-info" />
-
-		<t:htmlTag value="div">
-			<h:panelGrid columns="3">
-				<h:outputText value="File Name:" styleClass="portlet-form-field" />
-				<h:outputText value="#{navigator_writeNewFileContentPage.newFile}"
-					styleClass="portlet-form-field" />
-				<h:commandButton value="Create New File"
-					action="#{navigator_writeNewFileContentPage.create}"
-					styleClass="portlet-form-button" />
-			</h:panelGrid>
-		</t:htmlTag>
-
-		<t:htmlTag value="div" rendered="#{navigator_writeNewFileContentPage.type == 'TEXT'}">
-			<h:inputTextarea value="#{navigator_writeNewFileContentPage.text}"
-				style="height: 400px; width: 100%" />
-		</t:htmlTag>
-
-		<t:htmlTag value="div" rendered="#{navigator_writeNewFileContentPage.type == 'HTML'}">
-			<t:inputHtml value="#{navigator_writeNewFileContentPage.text}"
-				style="height: 400px; width: 100%" allowEditSource="true"
-				showPropertiesToolBox="true" showLinksToolBox="true"
-				showImagesToolBox="true" showTablesToolBox="true"
-				showCleanupExpressionsToolBox="true" showDebugToolBox="false" />
-		</t:htmlTag>
-
-	</h:form>
-
-</f:view>
-


Portal Application Laboratory

[pal-cvs 3503] [1237] refactoring..