From svnnotify ＠ sourceforge.jp Thu Nov 1 06:15:10 2007 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Thu, 01 Nov 2007 06:15:10 +0900 Subject: [pal-cvs 2933] [677] added required. Message-ID: <1193865310.038274.11924.nullmailer@users.sourceforge.jp> Revision: 677 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=677 Author: shinsuke Date: 2007-11-01 06:15:09 +0900 (Thu, 01 Nov 2007) Log Message: ----------- added required. Modified Paths: -------------- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionEditPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionEditPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionEditPage.java -------------- next part -------------- Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionEditPage.java 2007-10-31 10:06:48 UTC (rev 676) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionEditPage.java 2007-10-31 21:15:09 UTC (rev 677) @@ -20,6 +20,7 @@ import java.util.Map; import org.seasar.framework.log.Logger; +import org.seasar.teeda.extension.annotation.validator.Required; import jp.sf.pal.admin.PALAdminException; import jp.sf.pal.admin.service.PermissionManagementService; @@ -98,4 +99,33 @@ this.permissionManagementService = permissionManagementService; } + /* (non-Javadoc) + * @see jp.sf.pal.admin.web.permission.AbstractPermissionPage#setActionArray(java.lang.String[]) + */ + @Override + @Required + public void setActionArray(String[] actionArray) { + // TODO Auto-generated method stub + super.setActionArray(actionArray); + } + + /* (non-Javadoc) + * @see jp.sf.pal.admin.web.permission.AbstractPermissionPage#setName(java.lang.String) + */ + @Override + @Required + public void setName(String name) { + // TODO Auto-generated method stub + super.setName(name); + } + + /* (non-Javadoc) + * @see jp.sf.pal.admin.web.permission.AbstractPermissionPage#setRoleArray(java.lang.String[]) + */ + @Override + @Required + public void setRoleArray(String[] roleArray) { + // TODO Auto-generated method stub + super.setRoleArray(roleArray); + } } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionEditPage.java 2007-10-31 10:06:48 UTC (rev 676) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionEditPage.java 2007-10-31 21:15:09 UTC (rev 677) @@ -20,6 +20,7 @@ import java.util.Map; import org.seasar.framework.log.Logger; +import org.seasar.teeda.extension.annotation.validator.Required; import jp.sf.pal.admin.PALAdminException; import jp.sf.pal.admin.service.PermissionManagementService; @@ -97,4 +98,33 @@ this.permissionManagementService = permissionManagementService; } + /* (non-Javadoc) + * @see jp.sf.pal.admin.web.permission.AbstractPermissionPage#setActionArray(java.lang.String[]) + */ + @Override + @Required + public void setActionArray(String[] actionArray) { + // TODO Auto-generated method stub + super.setActionArray(actionArray); + } + + /* (non-Javadoc) + * @see jp.sf.pal.admin.web.permission.AbstractPermissionPage#setName(java.lang.String) + */ + @Override + @Required + public void setName(String name) { + // TODO Auto-generated method stub + super.setName(name); + } + + /* (non-Javadoc) + * @see jp.sf.pal.admin.web.permission.AbstractPermissionPage#setRoleArray(java.lang.String[]) + */ + @Override + @Required + public void setRoleArray(String[] roleArray) { + // TODO Auto-generated method stub + super.setRoleArray(roleArray); + } } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionEditPage.java 2007-10-31 10:06:48 UTC (rev 676) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionEditPage.java 2007-10-31 21:15:09 UTC (rev 677) @@ -20,6 +20,7 @@ import java.util.Map; import org.seasar.framework.log.Logger; +import org.seasar.teeda.extension.annotation.validator.Required; import jp.sf.pal.admin.PALAdminException; import jp.sf.pal.admin.service.PermissionManagementService; @@ -98,4 +99,34 @@ this.permissionManagementService = permissionManagementService; } + /* (non-Javadoc) + * @see jp.sf.pal.admin.web.permission.AbstractPermissionPage#setActionArray(java.lang.String[]) + */ + @Override + @Required + public void setActionArray(String[] actionArray) { + // TODO Auto-generated method stub + super.setActionArray(actionArray); + } + + /* (non-Javadoc) + * @see jp.sf.pal.admin.web.permission.AbstractPermissionPage#setName(java.lang.String) + */ + @Override + @Required + public void setName(String name) { + // TODO Auto-generated method stub + super.setName(name); + } + + /* (non-Javadoc) + * @see jp.sf.pal.admin.web.permission.AbstractPermissionPage#setRoleArray(java.lang.String[]) + */ + @Override + @Required + public void setRoleArray(String[] roleArray) { + // TODO Auto-generated method stub + super.setRoleArray(roleArray); + } + } From svnnotify ＠ sourceforge.jp Thu Nov 1 07:45:02 2007 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Thu, 01 Nov 2007 07:45:02 +0900 Subject: [pal-cvs 2934] [678] sync up with the latest j2. Message-ID: <1193870702.062469.5412.nullmailer@users.sourceforge.jp> Revision: 678 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=678 Author: shinsuke Date: 2007-11-01 07:45:01 +0900 (Thu, 01 Nov 2007) Log Message: ----------- sync up with the latest j2. Modified Paths: -------------- pal-portal/trunk/build.properties pal-portal/trunk/portal/patches/src/webapp/WEB-INF/jetspeed_macros.vm pal-portal/trunk/portal/patches/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm -------------- next part -------------- Modified: pal-portal/trunk/build.properties =================================================================== --- pal-portal/trunk/build.properties 2007-10-31 21:15:09 UTC (rev 677) +++ pal-portal/trunk/build.properties 2007-10-31 22:45:01 UTC (rev 678) @@ -67,7 +67,7 @@ # Jetspeed SVN revision #jetspeed2.svn.repository=http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/ jetspeed2.svn.repository=http://svn.apache.org/repos/asf/portals/jetspeed-2/branches/JETSPEED-2.1.3/ -jetspeed2.revision=584942 +jetspeed2.revision=590470 # Dependencies for Jetspeed jetspeed.version=2.1.2_pal-${portal.version} Modified: pal-portal/trunk/portal/patches/src/webapp/WEB-INF/jetspeed_macros.vm =================================================================== --- pal-portal/trunk/portal/patches/src/webapp/WEB-INF/jetspeed_macros.vm 2007-10-31 21:15:09 UTC (rev 677) +++ pal-portal/trunk/portal/patches/src/webapp/WEB-INF/jetspeed_macros.vm 2007-10-31 22:45:01 UTC (rev 678) @@ -1,8 +1,8 @@ Index: src/webapp/WEB-INF/jetspeed_macros.vm =================================================================== ---- src/webapp/WEB-INF/jetspeed_macros.vm (リビジョン 558601) +--- src/webapp/WEB-INF/jetspeed_macros.vm (リビジョン 590470) +++ src/webapp/WEB-INF/jetspeed_macros.vm (作業コピー) -@@ -138,7 +138,7 @@ +@@ -132,7 +132,7 @@
#if($_actions.size() >0) #foreach ($_action in $_actions) Modified: pal-portal/trunk/portal/patches/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm =================================================================== --- pal-portal/trunk/portal/patches/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm 2007-10-31 21:15:09 UTC (rev 677) +++ pal-portal/trunk/portal/patches/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm 2007-10-31 22:45:01 UTC (rev 678) @@ -1,8 +1,8 @@ Index: src/webapp/WEB-INF/templates/layout/html/columns/layout.vm =================================================================== ---- src/webapp/WEB-INF/templates/layout/html/columns/layout.vm (リビジョン 574906) +--- src/webapp/WEB-INF/templates/layout/html/columns/layout.vm (リビジョン 590470) +++ src/webapp/WEB-INF/templates/layout/html/columns/layout.vm (作業コピー) -@@ -55,237 +55,14 @@ +@@ -55,245 +55,14 @@
#if($editing) @@ -34,7 +34,11 @@ - #end - - #getIntProperty($maxLayoutNesting $rootDecorator "max.layout.nesting" 2) -- #if($request.getAttribute("fragmentNestingLevel") < $maxLayoutNesting) +- #set ($fnl = $request.getAttribute("fragmentNestingLevel")) +- #if (! $fnl) +- #set ($fnl = 0) +- #end +- #if($fnl < $maxLayoutNesting) - #set($allowAddLayout=true) - #else - #set($allowAddLayout=false) @@ -119,14 +123,18 @@ - ####### Take all fragments and apply style - #if($allowChangePortletDecorator) -
-- +- - - - - - @@ -247,7 +255,7 @@ #end #set ($dcnt = 0) -@@ -312,6 +89,10 @@ +@@ -320,6 +89,10 @@ ## editing block #if($editing) @@ -258,3 +266,8 @@
#set ($dcnt = $dcnt + 1)
+@@ -399,3 +172,4 @@ +
+ #parse($myFragment.decoration.footer) + #end ++ From svnnotify ＠ sourceforge.jp Fri Nov 2 07:08:56 2007 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 02 Nov 2007 07:08:56 +0900 Subject: [pal-cvs 2935] [679] added UserManager. Message-ID: <1193954936.051244.1644.nullmailer@users.sourceforge.jp> Revision: 679 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=679 Author: shinsuke Date: 2007-11-02 07:08:55 +0900 (Fri, 02 Nov 2007) Log Message: ----------- added UserManager. Modified Paths: -------------- pal-portal/trunk/build.properties Added Paths: ----------- pal-portal/trunk/portal/patches/layout-portlets/src/webapp/WEB-INF/jetspeed-portlet.xml -------------- next part -------------- Modified: pal-portal/trunk/build.properties =================================================================== --- pal-portal/trunk/build.properties 2007-10-31 22:45:01 UTC (rev 678) +++ pal-portal/trunk/build.properties 2007-11-01 22:08:55 UTC (rev 679) @@ -178,6 +178,7 @@ layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_en.properties,\ layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_ja.properties,\ layout-portlets/src/webapp/WEB-INF/portlet.xml,\ +layout-portlets/src/webapp/WEB-INF/jetspeed-portlet.xml,\ src/webapp/WEB-INF/assembly/jetspeed-services.xml,\ src/webapp/WEB-INF/assembly/portal-url-generation.xml,\ src/webapp/WEB-INF/assembly/pipelines.xml,\ Added: pal-portal/trunk/portal/patches/layout-portlets/src/webapp/WEB-INF/jetspeed-portlet.xml =================================================================== --- pal-portal/trunk/portal/patches/layout-portlets/src/webapp/WEB-INF/jetspeed-portlet.xml 2007-10-31 22:45:01 UTC (rev 678) +++ pal-portal/trunk/portal/patches/layout-portlets/src/webapp/WEB-INF/jetspeed-portlet.xml 2007-11-01 22:08:55 UTC (rev 679) @@ -0,0 +1,12 @@ +Index: layout-portlets/src/webapp/WEB-INF/jetspeed-portlet.xml +=================================================================== +--- layout-portlets/src/webapp/WEB-INF/jetspeed-portlet.xml (リビジョン 590470) ++++ layout-portlets/src/webapp/WEB-INF/jetspeed-portlet.xml (作業コピー) +@@ -28,6 +28,7 @@ + true + + ++ + + + Property changes on: pal-portal/trunk/portal/patches/layout-portlets/src/webapp/WEB-INF/jetspeed-portlet.xml ___________________________________________________________________ Name: svn:eol-style + native From svnnotify ＠ sourceforge.jp Mon Nov 5 10:23:42 2007 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Mon, 05 Nov 2007 10:23:42 +0900 Subject: [pal-cvs 2936] [680] create portletoutputoptimizer Message-ID: <1194225822.849419.16302.nullmailer@users.sourceforge.jp> Revision: 680 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=680 Author: shinsuke Date: 2007-11-05 10:23:42 +0900 (Mon, 05 Nov 2007) Log Message: ----------- create portletoutputoptimizer Added Paths: ----------- libraries/portletoutputoptimizer/ -------------- next part -------------- From svnnotify ＠ sourceforge.jp Mon Nov 5 10:24:13 2007 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Mon, 05 Nov 2007 10:24:13 +0900 Subject: [pal-cvs 2937] [681] created trunk Message-ID: <1194225853.081198.17185.nullmailer@users.sourceforge.jp> Revision: 681 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=681 Author: shinsuke Date: 2007-11-05 10:24:12 +0900 (Mon, 05 Nov 2007) Log Message: ----------- created trunk Added Paths: ----------- libraries/portletoutputoptimizer/trunk/ -------------- next part -------------- From svnnotify ＠ sourceforge.jp Mon Nov 5 10:38:37 2007 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Mon, 05 Nov 2007 10:38:37 +0900 Subject: [pal-cvs 2938] [682] added portletoutputoptimizer. Message-ID: <1194226717.632818.29453.nullmailer@users.sourceforge.jp> Revision: 682 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=682 Author: shinsuke Date: 2007-11-05 10:38:37 +0900 (Mon, 05 Nov 2007) Log Message: ----------- added portletoutputoptimizer. Added Paths: ----------- libraries/portletoutputoptimizer/trunk/.classpath libraries/portletoutputoptimizer/trunk/.project libraries/portletoutputoptimizer/trunk/.settings/ libraries/portletoutputoptimizer/trunk/.settings/org.eclipse.core.resources.prefs libraries/portletoutputoptimizer/trunk/.settings/org.eclipse.jdt.core.prefs libraries/portletoutputoptimizer/trunk/.settings/org.eclipse.jdt.ui.prefs libraries/portletoutputoptimizer/trunk/pom.xml libraries/portletoutputoptimizer/trunk/src/ libraries/portletoutputoptimizer/trunk/src/main/ libraries/portletoutputoptimizer/trunk/src/main/java/ libraries/portletoutputoptimizer/trunk/src/main/java/jp/ libraries/portletoutputoptimizer/trunk/src/main/java/jp/sf/ libraries/portletoutputoptimizer/trunk/src/main/java/jp/sf/pal/ libraries/portletoutputoptimizer/trunk/src/main/java/jp/sf/pal/pooptimizer/ libraries/portletoutputoptimizer/trunk/src/main/java/jp/sf/pal/pooptimizer/OptimizerFilter.java -------------- next part -------------- Added: libraries/portletoutputoptimizer/trunk/.classpath =================================================================== --- libraries/portletoutputoptimizer/trunk/.classpath 2007-11-05 01:24:12 UTC (rev 681) +++ libraries/portletoutputoptimizer/trunk/.classpath 2007-11-05 01:38:37 UTC (rev 682) @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file Property changes on: libraries/portletoutputoptimizer/trunk/.classpath ___________________________________________________________________ Name: svn:eol-style + native Added: libraries/portletoutputoptimizer/trunk/.project =================================================================== --- libraries/portletoutputoptimizer/trunk/.project 2007-11-05 01:24:12 UTC (rev 681) +++ libraries/portletoutputoptimizer/trunk/.project 2007-11-05 01:38:37 UTC (rev 682) @@ -0,0 +1,14 @@ + + portlet-output-optimizer + Portlet Filter To Rewrite HTML Response + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.jdt.core.javanature + + \ No newline at end of file Property changes on: libraries/portletoutputoptimizer/trunk/.project ___________________________________________________________________ Name: svn:eol-style + native Added: libraries/portletoutputoptimizer/trunk/.settings/org.eclipse.core.resources.prefs =================================================================== --- libraries/portletoutputoptimizer/trunk/.settings/org.eclipse.core.resources.prefs 2007-11-05 01:24:12 UTC (rev 681) +++ libraries/portletoutputoptimizer/trunk/.settings/org.eclipse.core.resources.prefs 2007-11-05 01:38:37 UTC (rev 682) @@ -0,0 +1,3 @@ +#Sat Feb 04 04:18:24 JST 2006 +eclipse.preferences.version=1 +encoding/=UTF-8 Added: libraries/portletoutputoptimizer/trunk/.settings/org.eclipse.jdt.core.prefs =================================================================== --- libraries/portletoutputoptimizer/trunk/.settings/org.eclipse.jdt.core.prefs 2007-11-05 01:24:12 UTC (rev 681) +++ libraries/portletoutputoptimizer/trunk/.settings/org.eclipse.jdt.core.prefs 2007-11-05 01:38:37 UTC (rev 682) @@ -0,0 +1,276 @@ +#Mon Nov 05 10:29:16 JST 2007 +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_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=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=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_javadoc_comments=false +org.eclipse.jdt.core.formatter.comment.format_line_comments=false +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=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=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 Added: libraries/portletoutputoptimizer/trunk/.settings/org.eclipse.jdt.ui.prefs =================================================================== --- libraries/portletoutputoptimizer/trunk/.settings/org.eclipse.jdt.ui.prefs 2007-11-05 01:24:12 UTC (rev 681) +++ libraries/portletoutputoptimizer/trunk/.settings/org.eclipse.jdt.ui.prefs 2007-11-05 01:38:37 UTC (rev 682) @@ -0,0 +1,14 @@ +#Mon Nov 05 10:29:16 JST 2007 +eclipse.preferences.version=1 +formatter_profile=_Seasar +formatter_settings_version=11 +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= Added: libraries/portletoutputoptimizer/trunk/pom.xml =================================================================== --- libraries/portletoutputoptimizer/trunk/pom.xml 2007-11-05 01:24:12 UTC (rev 681) +++ libraries/portletoutputoptimizer/trunk/pom.xml 2007-11-05 01:38:37 UTC (rev 682) @@ -0,0 +1,211 @@ + + + 4.0.0 + jp.sf.pal + portlet-output-optimizer + jar + 0.3-SNAPSHOT + Portlet Output OptimizerFilter + Portlet Filter To Rewrite HTML Response + http://pal.sourceforge.jp/ + 2005 + + + shinsuke + Shinsuke Sugaya + shinsuke_at_yahoo.co.jp + http://d.hatena.ne.jp/shinsuke_sugaya/ + + + +9 + + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + scm:cvs:pserver:anonymous ＠ cvs.sourceforge.jp:/cvsroot/pal:libraries/portletoutputoptimizer + + + scm:cvs:pserver:anonymous ＠ cvs.sourceforge.jp:/cvsroot/pal:libraries/portletoutputoptimizer + + http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/libraries/portletoutputoptimizer + + + Portal Application Laboratory + http://pal.sourceforge.jp/ + + + validate + + + + maven-compiler-plugin + + 1.4 + 1.4 + UTF-8 + + + + maven-deploy-plugin + + true + + + + org.codehaus.mojo + cobertura-maven-plugin + 2.0-SNAPSHOT + + + + clean + + + + + + + + + maven-source-plugin + + + source-jar + package + + jar + + + + + + + + + maven2.marevol.com + Maven2 Repository on marevol.com + http://maven2.marevol.com/ + + + maven.marevol.com + Maven1 Repository on marevol.com + http://maven.marevol.com/ + legacy + + + maven.seasar.org + The Seasar Foundation Maven2 Repository + http://maven.seasar.org/maven2 + + + + + people.apache.org m2-snapshot + http://people.apache.org/repo/m2-snapshot-repository + + true + + + false + + + + snapshots.repository.codehaus.org + http://snapshots.repository.codehaus.org + + true + + + false + + + + + + junit + junit + 3.8.1 + test + + + commons-logging + commons-logging + 1.0.4 + compile + + + javax.servlet + servlet-api + 2.3 + provided + + + portlet-api + portlet-api + 1.0 + provided + + + org.apache.portals.bridges + portals-bridges-portletfilter + 1.0.3 + + + logkit + logkit + + + avalon-framework + avalon-framework + + + javax.servlet + servlet-api + + + log4j + log4j + + + + + jp.sf.pal + faces-response-filter + 0.2 + + + + + + maven-project-info-reports-plugin + + + org.codehaus.mojo + changelog-maven-plugin + + + org.codehaus.mojo + taglist-maven-plugin + + + FIXME + TODO + XXX + + + + + org.codehaus.mojo + cobertura-maven-plugin + 2.0-SNAPSHOT + + + + Property changes on: libraries/portletoutputoptimizer/trunk/pom.xml ___________________________________________________________________ Name: svn:eol-style + native Added: libraries/portletoutputoptimizer/trunk/src/main/java/jp/sf/pal/pooptimizer/OptimizerFilter.java =================================================================== --- libraries/portletoutputoptimizer/trunk/src/main/java/jp/sf/pal/pooptimizer/OptimizerFilter.java 2007-11-05 01:24:12 UTC (rev 681) +++ libraries/portletoutputoptimizer/trunk/src/main/java/jp/sf/pal/pooptimizer/OptimizerFilter.java 2007-11-05 01:38:37 UTC (rev 682) @@ -0,0 +1,265 @@ +/* + * Copyright 2005-2007 Portal Application Laboratory project. + * + * 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.pooptimizer; + +import java.io.BufferedOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + +import javax.portlet.ActionRequest; +import javax.portlet.ActionResponse; +import javax.portlet.PortletException; +import javax.portlet.RenderRequest; +import javax.portlet.RenderResponse; + +import jp.sf.pal.facesresponse.io.BufferedResponseStream; +import jp.sf.pal.facesresponse.io.BufferedResponseStreamFactory; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.portals.bridges.portletfilter.PortletFilter; +import org.apache.portals.bridges.portletfilter.PortletFilterChain; +import org.apache.portals.bridges.portletfilter.PortletFilterConfig; + +/** + * @author shinsuke + * + */ +public class OptimizerFilter implements PortletFilter { + /** + * Logger for this class + */ + private static final Log log = LogFactory.getLog(OptimizerFilter.class); + + /** + * End of BODY tag. + */ + private static final String END_UPPER_BODY_TAG = ""; + + /* + * (non-Javadoc) + * + * @see org.apache.portals.bridges.portletfilter.PortletFilter#destroy() + */ + public void destroy() { + + } + + /* + * (non-Javadoc) + * + * @see org.apache.portals.bridges.portletfilter.PortletFilter#init(org.apache.portals.bridges.portletfilter.PortletFilterConfig) + */ + public void init(PortletFilterConfig config) throws PortletException { + String blockSizeStr = config.getInitParameter(BLOCK_SIZE_KEY); + if (blockSizeStr != null) { + try { + blockSize = Integer.parseInt(blockSizeStr); + } catch (NumberFormatException e) { + log.warn("Could not parse " + blockSizeStr, e); + } + } + + String namespaceForJavaScript = config + .getInitParameter(APPEND_NAMESPACE_FOR_JAVASCRIPT); + if (namespaceForJavaScript != null) { + if (namespaceForJavaScript.equalsIgnoreCase("true") + || namespaceForJavaScript.equalsIgnoreCase("yes")) { + appendNamespaceForJavaScript = true; + } + } + } + + /* + * (non-Javadoc) + * + * @see org.apache.portals.bridges.portletfilter.PortletFilter#processActionFilter(javax.portlet.ActionRequest, + * javax.portlet.ActionResponse, + * org.apache.portals.bridges.portletfilter.PortletFilterChain) + */ + public void processActionFilter(ActionRequest request, + ActionResponse response, PortletFilterChain chain) + throws PortletException, IOException { + if (log.isDebugEnabled()) { + log.debug("called processActionFilter."); + } + + // call next processActionFilter + chain.processActionFilter(request, response); + + } + + /* + * (non-Javadoc) + * + * @see org.apache.portals.bridges.portletfilter.PortletFilter#renderFilter(javax.portlet.RenderRequest, + * javax.portlet.RenderResponse, + * org.apache.portals.bridges.portletfilter.PortletFilterChain) + */ + public void renderFilter(RenderRequest request, RenderResponse response, + PortletFilterChain chain) throws PortletException, IOException { + if (log.isDebugEnabled()) { + log.debug("called renderFilter."); + } + + // call next rednerFilter + chain.renderFilter(request, response); + + BufferedResponseStream bufferedResponseStream = BufferedResponseStreamFactory + .getBufferedResponseStream(request); + if (bufferedResponseStream != null) { + if (log.isDebugEnabled()) { + log + .debug("renderFilter(RenderRequest, RenderResponse, PortletFilterChain) - bufferedResponseStream=" + + bufferedResponseStream); + } + + // just in case, commit it. + bufferedResponseStream.commit(); + + InputStream reader = bufferedResponseStream.getInputStream(); + BufferedOutputStream outputStream = new BufferedOutputStream( + bufferedResponseStream.getOutputStream()); + + byte[] bytes = new byte[blockSize]; + try { + // set namespace for javascript + if (appendNamespaceForJavaScript) { + appendNamespaceForJavaScript(outputStream, response + .getNamespace()); + } + + int length = reader.read(bytes); + if (log.isDebugEnabled()) { + log + .debug("renderFilter(RenderRequest, RenderResponse, PortletFilterChain) - length=" + + length); + } + if (length != -1) { + String str = new String(bytes, 0, length, ISO_8859_1); + if (log.isDebugEnabled()) { + log + .debug("renderFilter(RenderRequest, RenderResponse, PortletFilterChain) - str=" + + str); + } + int beginBodyIndex = str.indexOf(START_LOWER_BODY_TAG); + if (beginBodyIndex == -1) { + beginBodyIndex = str.indexOf(START_UPPER_BODY_TAG); + } + if (beginBodyIndex >= 0) { + int beginBodyIndexEnd = str + .indexOf(">", beginBodyIndex); + int endBodyIndex = str.indexOf(END_LOWER_BODY_TAG); + if (endBodyIndex == -1) { + endBodyIndex = str.indexOf(END_UPPER_BODY_TAG); + } + if (endBodyIndex > beginBodyIndex) { + outputStream.write(bytes, beginBodyIndexEnd + 1, + endBodyIndex - beginBodyIndexEnd - 1); + } else { + outputStream.write(bytes, beginBodyIndexEnd + 1, + length - beginBodyIndexEnd - 1); + length = reader.read(bytes); + while (length != -1) { + str = new String(bytes, 0, length, ISO_8859_1); + endBodyIndex = str.indexOf(END_LOWER_BODY_TAG); + if (endBodyIndex == -1) { + endBodyIndex = str + .indexOf(END_UPPER_BODY_TAG); + } + if (endBodyIndex >= 0) { + outputStream.write(bytes, 0, endBodyIndex); + break; + } else { + if (length > 0) { + outputStream.write(bytes, 0, length); + } + length = reader.read(bytes); + } + } + } + } else { + if (length != -1) { + outputStream.write(bytes, 0, length); + } + length = reader.read(bytes); + while (length != -1) { + str = new String(bytes, 0, length, + bufferedResponseStream.getEncoding()); + if (length > 0) { + outputStream.write(bytes, 0, length); + } + length = reader.read(bytes); + } + } + } + outputStream.flush(); + } finally { + bytes = null; + } + + bufferedResponseStream.commit(); + } else { + if (log.isWarnEnabled()) { + log.warn("BufferedResponseStream is null."); + } + } + } + + protected void appendNamespaceForJavaScript(OutputStream outputStream, + String namespace) throws IOException { + outputStream + .write(NAMESPACE_FOR_JAVASCRIPT_HEADER.getBytes(ISO_8859_1)); + outputStream.write(namespace.getBytes(ISO_8859_1)); + outputStream + .write(NAMESPACE_FOR_JAVASCRIPT_FOOTER.getBytes(ISO_8859_1)); + } +} Property changes on: libraries/portletoutputoptimizer/trunk/src/main/java/jp/sf/pal/pooptimizer/OptimizerFilter.java ___________________________________________________________________ Name: svn:eol-style + native From svnnotify ＠ sourceforge.jp Mon Nov 5 14:33:26 2007 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Mon, 05 Nov 2007 14:33:26 +0900 Subject: [pal-cvs 2939] [683] 0.3 release Message-ID: <1194240806.028575.24056.nullmailer@users.sourceforge.jp> Revision: 683 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=683 Author: shinsuke Date: 2007-11-05 14:33:25 +0900 (Mon, 05 Nov 2007) Log Message: ----------- 0.3 release Modified Paths: -------------- libraries/portletoutputoptimizer/trunk/pom.xml -------------- next part -------------- Modified: libraries/portletoutputoptimizer/trunk/pom.xml =================================================================== --- libraries/portletoutputoptimizer/trunk/pom.xml 2007-11-05 01:38:37 UTC (rev 682) +++ libraries/portletoutputoptimizer/trunk/pom.xml 2007-11-05 05:33:25 UTC (rev 683) @@ -4,7 +4,7 @@ jp.sf.pal portlet-output-optimizer jar - 0.3-SNAPSHOT + 0.3 Portlet Output OptimizerFilter Portlet Filter To Rewrite HTML Response http://pal.sourceforge.jp/ @@ -28,12 +28,8 @@ - - scm:cvs:pserver:anonymous ＠ cvs.sourceforge.jp:/cvsroot/pal:libraries/portletoutputoptimizer - - - scm:cvs:pserver:anonymous ＠ cvs.sourceforge.jp:/cvsroot/pal:libraries/portletoutputoptimizer - + scm:cvs:pserver:anonymous ＠ cvs.sourceforge.jp:/cvsroot/pal:libraries/portletoutputoptimizer + scm:cvs:pserver:anonymous ＠ cvs.sourceforge.jp:/cvsroot/pal:libraries/portletoutputoptimizer http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/libraries/portletoutputoptimizer From svnnotify ＠ sourceforge.jp Mon Nov 5 14:35:30 2007 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Mon, 05 Nov 2007 14:35:30 +0900 Subject: [pal-cvs 2940] [684] created branches/ Message-ID: <1194240930.321999.25291.nullmailer@users.sourceforge.jp> Revision: 684 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=684 Author: shinsuke Date: 2007-11-05 14:35:30 +0900 (Mon, 05 Nov 2007) Log Message: ----------- created branches/ Added Paths: ----------- libraries/portletoutputoptimizer/branches/ -------------- next part -------------- From svnnotify ＠ sourceforge.jp Mon Nov 5 14:36:18 2007 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Mon, 05 Nov 2007 14:36:18 +0900 Subject: [pal-cvs 2941] [685] 0.3 release Message-ID: <1194240978.705310.26217.nullmailer@users.sourceforge.jp> Revision: 685 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=685 Author: shinsuke Date: 2007-11-05 14:36:18 +0900 (Mon, 05 Nov 2007) Log Message: ----------- 0.3 release Added Paths: ----------- libraries/portletoutputoptimizer/branches/portletoutputoptimizer-0.3/ -------------- next part -------------- Copied: libraries/portletoutputoptimizer/branches/portletoutputoptimizer-0.3 (from rev 684, libraries/portletoutputoptimizer/trunk) From svnnotify ＠ sourceforge.jp Tue Nov 6 15:18:43 2007 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Tue, 06 Nov 2007 15:18:43 +0900 Subject: [pal-cvs 2942] [686] added messages. Message-ID: <1194329923.938503.16092.nullmailer@users.sourceforge.jp> Revision: 686 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=686 Author: shinsuke Date: 2007-11-06 15:18:43 +0900 (Tue, 06 Nov 2007) Log Message: ----------- added messages. Modified Paths: -------------- pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/checkout/label.properties pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/signup/label.properties -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/checkout/label.properties =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/checkout/label.properties 2007-11-05 05:36:18 UTC (rev 685) +++ pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/checkout/label.properties 2007-11-06 06:18:43 UTC (rev 686) @@ -1,3 +1,30 @@ +secondaryPostcode=\u90f5\u4fbf\u756a\u53f7\u306e\u4e0b4\u6841 +lastnameDescription=\u540d\u5b57[\u30d5\u30ea\u30ac\u30ca] +lastname=\u540d\u5b57 +streetAddress=\u305d\u308c\u4ee5\u964d\u306e\u4f4f\u6240 +city=\u90e1\u5e02\u533a (\u5cf6\u3001\u56fd) +userName=\u3054\u5e0c\u671b\u306e\u30e6\u30fc\u30b6\u30fcID +emailAddress=\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9 +firstname=\u540d\u524d +emailAddressConfirm=\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9(\u78ba\u8a8d) +firstnameDescription=\u540d\u524d[\u30d5\u30ea\u30ac\u30ca] +primaryPostcode=\u90f5\u4fbf\u756a\u53f7\u306e\u4e0a3\u6841 +userSecretAnswer=\u79d8\u5bc6\u306e\u7b54\u3048 +gender=\u6027\u5225 +yearOfDayOfBirth=\u8a95\u751f\u65e5(\u5e74) +monthOfDayOfBirth=\u8a95\u751f\u65e5(\u6708) +dateOfDayOfBirth=\u8a95\u751f\u65e5(\u65e5) +dayOfBirth=\u8a95\u751f\u65e5 +postcode=\u90f5\u4fbf\u756a\u53f7 +state=\u90fd\u9053\u5e9c\u770c +telephone=\u96fb\u8a71\u756a\u53f7 +fax=FAX +cellphone=\u643a\u5e2f\u96fb\u8a71\u756a\u53f7 +company=\u4f1a\u793e\u540d\u30fb\u56e3\u4f53\u540d +department=\u90e8\u7f72\u540d\u30fb\u5f79\u8077 +userSecretQuestionSelection=\u79d8\u5bc6\u306e\u8cea\u554f(\u9078\u629e\u80a2) +userSecretQuestion=\u79d8\u5bc6\u306e\u8cea\u554f + M=\u7537\u6027 F=\u5973\u6027 Modified: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/signup/label.properties =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/signup/label.properties 2007-11-05 05:36:18 UTC (rev 685) +++ pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/signup/label.properties 2007-11-06 06:18:43 UTC (rev 686) @@ -10,6 +10,20 @@ firstnameDescription=\u540d\u524d[\u30d5\u30ea\u30ac\u30ca] primaryPostcode=\u90f5\u4fbf\u756a\u53f7\u306e\u4e0a3\u6841 userSecretAnswer=\u79d8\u5bc6\u306e\u7b54\u3048 +gender=\u6027\u5225 +yearOfDayOfBirth=\u8a95\u751f\u65e5(\u5e74) +monthOfDayOfBirth=\u8a95\u751f\u65e5(\u6708) +dateOfDayOfBirth=\u8a95\u751f\u65e5(\u65e5) +dayOfBirth=\u8a95\u751f\u65e5 +postcode=\u90f5\u4fbf\u756a\u53f7 +state=\u90fd\u9053\u5e9c\u770c +telephone=\u96fb\u8a71\u756a\u53f7 +fax=FAX +cellphone=\u643a\u5e2f\u96fb\u8a71\u756a\u53f7 +company=\u4f1a\u793e\u540d\u30fb\u56e3\u4f53\u540d +department=\u90e8\u7f72\u540d\u30fb\u5f79\u8077 +userSecretQuestionSelection=\u79d8\u5bc6\u306e\u8cea\u554f(\u9078\u629e\u80a2) +userSecretQuestion=\u79d8\u5bc6\u306e\u8cea\u554f M=\u7537\u6027 F=\u5973\u6027 From svnnotify ＠ sourceforge.jp Tue Nov 6 15:20:39 2007 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Tue, 06 Nov 2007 15:20:39 +0900 Subject: [pal-cvs 2943] [687] added @BigDecimalConverter. Message-ID: <1194330039.830481.18005.nullmailer@users.sourceforge.jp> Revision: 687 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=687 Author: shinsuke Date: 2007-11-06 15:20:39 +0900 (Tue, 06 Nov 2007) Log Message: ----------- added @BigDecimalConverter. Modified Paths: -------------- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderConfirmPage.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderEditPage.java -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderConfirmPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderConfirmPage.java 2007-11-06 06:18:43 UTC (rev 686) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderConfirmPage.java 2007-11-06 06:20:39 UTC (rev 687) @@ -38,6 +38,17 @@ } /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setPaymentFee(java.math.BigDecimal) + */ + //TODO i18n + @BigDecimalConverter(pattern = "###,###") + @Override + public void setPaymentFee(BigDecimal paymentFee) { + // TODO Auto-generated method stub + super.setPaymentFee(paymentFee); + } + + /* (non-Javadoc) * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setCustomerDayOfBirth(java.util.Date) */ @DateTimeConverter(pattern = "yyyy/MM/dd") Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderEditPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderEditPage.java 2007-11-06 06:18:43 UTC (rev 686) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderEditPage.java 2007-11-06 06:20:39 UTC (rev 687) @@ -28,6 +28,17 @@ } /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setPaymentFee(java.math.BigDecimal) + */ + //TODO i18n + @BigDecimalConverter(pattern = "###,###") + @Override + public void setPaymentFee(BigDecimal paymentFee) { + // TODO Auto-generated method stub + super.setPaymentFee(paymentFee); + } + + /* (non-Javadoc) * @see jp.sf.pal.pompei.web.admin.order.AbstractOrderEditPage#setCustomerDayOfBirth(java.util.Date) */ @DateTimeConverter(pattern = "yyyy/MM/dd") From svnnotify ＠ sourceforge.jp Tue Nov 6 15:22:23 2007 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Tue, 06 Nov 2007 15:22:23 +0900 Subject: [pal-cvs 2944] [688] validator for radio button. Message-ID: <1194330143.713495.19452.nullmailer@users.sourceforge.jp> Revision: 688 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=688 Author: shinsuke Date: 2007-11-06 15:22:23 +0900 (Tue, 06 Nov 2007) Log Message: ----------- validator for radio button. Modified Paths: -------------- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupEditAction.java -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupEditAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupEditAction.java 2007-11-06 06:20:39 UTC (rev 687) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupEditAction.java 2007-11-06 06:22:23 UTC (rev 688) @@ -167,6 +167,12 @@ } public Class doConfirm() { + // TODO teeda bug? required validator for radio button does not work + if (getSignupEditPage().getGender() == null) { + FacesMessageUtil.addErrorMessage("need.to.select.gender"); + return null; + } + if (getSignupEditPage().getUserSecretQuestionSelection() != null) { getSignupEditPage().setUserSecretQuestion( getSignupEditPage().getUserSecretQuestionSelection()); From svnnotify ＠ sourceforge.jp Tue Nov 6 15:27:09 2007 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Tue, 06 Nov 2007 15:27:09 +0900 Subject: [pal-cvs 2945] [689] validator for radio button. Message-ID: <1194330429.186460.22088.nullmailer@users.sourceforge.jp> Revision: 689 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=689 Author: shinsuke Date: 2007-11-06 15:27:08 +0900 (Tue, 06 Nov 2007) Log Message: ----------- validator for radio button. Modified Paths: -------------- pompei/portlets/pompei-core/trunk/src/main/resources/appMessages.properties -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/src/main/resources/appMessages.properties =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/resources/appMessages.properties 2007-11-06 06:22:23 UTC (rev 688) +++ pompei/portlets/pompei-core/trunk/src/main/resources/appMessages.properties 2007-11-06 06:27:08 UTC (rev 689) @@ -131,6 +131,7 @@ # SignupEditAction.java could.not.read.term.of.service=\u5229\u7528\u898f\u7d04\u304c\u8aad\u307f\u8fbc\u3081\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 type.secret.question=\u79d8\u5bc6\u306e\u8cea\u554f\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\u79d8\u5bc6\u306e\u8cea\u554f\u3092\u9078\u629e\u307e\u305f\u306f\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +need.to.select.gender=\u6027\u5225\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002 # SignupEditConfirm.java could.not.encode.secret.password=\u30b7\u30b9\u30c6\u30e0\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 From svnnotify ＠ sourceforge.jp Tue Nov 6 15:36:19 2007 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Tue, 06 Nov 2007 15:36:19 +0900 Subject: [pal-cvs 2946] [690] added validators, changed to including tax, modified messages. Message-ID: <1194330979.516012.28118.nullmailer@users.sourceforge.jp> Revision: 690 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=690 Author: shinsuke Date: 2007-11-06 15:36:18 +0900 (Tue, 06 Nov 2007) Log Message: ----------- added validators, changed to including tax, modified messages. Modified Paths: -------------- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmPage.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/PaymentSelectAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserAddressSelectPage.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditPage.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsPage.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListPage.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupCompleteAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupCompletePage.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupConfirmAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupEditPage.java pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/insert_data.sql pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderEdit.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/cart/productList.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutConfirm.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userAddressSelect.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userInfoEdit.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productDetails.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupComplete.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupConfirm.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupEdit.html -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java 2007-11-06 06:27:08 UTC (rev 689) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java 2007-11-06 06:36:18 UTC (rev 690) @@ -11,7 +11,7 @@ public static final String VALUE = "value"; - public static final int DEFULAT_PAGE_SIZE = 25; + public static final int DEFULAT_PAGE_SIZE = 15; public static final int DEFULAT_PAGE_RANGE_SIZE = 5; Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmPage.java 2007-11-06 06:27:08 UTC (rev 689) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmPage.java 2007-11-06 06:36:18 UTC (rev 690) @@ -5,6 +5,8 @@ import java.util.List; import java.util.Map; +import jp.sf.pal.pompei.util.UrlBuilderUtil; + import org.seasar.teeda.extension.annotation.convert.BigDecimalConverter; import org.seasar.teeda.extension.util.LabelHelper; @@ -341,4 +343,8 @@ public void setPaymentFee(BigDecimal paymentFee) { this.paymentFee = paymentFee; } + + public String getMoveProductListOnclick() { + return "location.href='" + UrlBuilderUtil.createProductListUrl() + "'"; + } } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/PaymentSelectAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/PaymentSelectAction.java 2007-11-06 06:27:08 UTC (rev 689) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/PaymentSelectAction.java 2007-11-06 06:36:18 UTC (rev 690) @@ -127,6 +127,21 @@ .getCardTypeDescriptionList(); getPaymentSelectPage().setCardCodeItems(getCardTypeDxo().convert(ctd)); + // set default value + if (getPaymentSelectPage().getPaymentMethodItems() != null + && getPaymentSelectPage().getPaymentMethodItems().size() == 1) { + getPaymentSelectPage().setPaymentMethodId( + (BigDecimal) getPaymentSelectPage().getPaymentMethodItems() + .get(0).get("paymentMethodId")); + } + if (getPaymentSelectPage().getDeliveryMethodItems() != null + && getPaymentSelectPage().getDeliveryMethodItems().size() == 1) { + getPaymentSelectPage().setDeliveryMethodId( + (BigDecimal) getPaymentSelectPage() + .getDeliveryMethodItems().get(0).get( + "deliveryMethodId")); + } + // render FacesMessage FacesMessageUtil.renderMessages(); return null; Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserAddressSelectPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserAddressSelectPage.java 2007-11-06 06:27:08 UTC (rev 689) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserAddressSelectPage.java 2007-11-06 06:36:18 UTC (rev 690) @@ -4,6 +4,8 @@ import java.util.List; import java.util.Map; +import org.seasar.teeda.extension.annotation.validator.Length; +import org.seasar.teeda.extension.annotation.validator.RegularExpression; import org.seasar.teeda.extension.annotation.validator.Required; import org.seasar.teeda.extension.util.LabelHelper; @@ -24,45 +26,60 @@ private String addressBookId; + @RegularExpression(pattern = "[0-9]{1,4}-?[0-9]{1,4}-?[0-9]{1,4}") private String cellphone; @Required + @Length(maximum = 64) private String city; + @Length(maximum = 128) private String company; + @RegularExpression(pattern = "[0-9]{1,4}-?[0-9]{1,4}-?[0-9]{1,4}") private String fax; @Required + @Length(maximum = 40) private String firstname; @Required + @Length(maximum = 40) private String firstnameDescription; @Required + @Length(maximum = 40) private String lastname; @Required + @Length(maximum = 40) private String lastnameDescription; private String postcode; @Required + @RegularExpression(pattern = "[0-9]{3}") private String primaryPostcode; @Required + @RegularExpression(pattern = "[0-9]{4}") private String secondaryPostcode; private List> stateItems; @Required + @Length(maximum = 32) private String state; @Required + @Length(maximum = 255) private String streetAddress; + @Required + @RegularExpression(pattern = "[0-9]{1,4}-?[0-9]{1,4}-?[0-9]{1,4}") private String telephone; + @Length(maximum = 64) private String department; /** Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditPage.java 2007-11-06 06:27:08 UTC (rev 689) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditPage.java 2007-11-06 06:36:18 UTC (rev 690) @@ -10,6 +10,10 @@ import jp.sf.pal.pompei.util.UrlBuilderUtil; import org.seasar.teeda.extension.annotation.convert.DateTimeConverter; +import org.seasar.teeda.extension.annotation.validator.Email; +import org.seasar.teeda.extension.annotation.validator.Equal; +import org.seasar.teeda.extension.annotation.validator.Length; +import org.seasar.teeda.extension.annotation.validator.RegularExpression; import org.seasar.teeda.extension.annotation.validator.Required; import org.seasar.teeda.extension.util.LabelHelper; @@ -24,54 +28,75 @@ private String orderProcessId; + @RegularExpression(pattern = "[0-9]{1,4}-?[0-9]{1,4}-?[0-9]{1,4}") private String cellphone; @Required + @Length(maximum = 128) + @Email private String emailAddress; @Required + @Email + @Length(maximum = 129) + @Equal(targetId = "emailAddress") private String emailAddressConfirm; + @RegularExpression(pattern = "[0-9]{1,4}-?[0-9]{1,4}-?[0-9]{1,4}") private String fax; @Required + @Length(maximum = 40) private String firstname; @Required + @Length(maximum = 40) private String firstnameDescription; @Required + @Length(maximum = 1) private String gender; @Required + @Length(maximum = 40) private String lastname; @Required + @Length(maximum = 40) private String lastnameDescription; + @Required + @RegularExpression(pattern = "[0-9]{1,4}-?[0-9]{1,4}-?[0-9]{1,4}") private String telephone; @Required + @Length(maximum = 64) private String city; + @Length(maximum = 128) private String company; + @Length(maximum = 64) private String department; private String postcode; @Required + @RegularExpression(pattern = "[0-9]{3}") private String primaryPostcode; @Required + @RegularExpression(pattern = "[0-9]{4}") private String secondaryPostcode; private List> stateItems; @Required + @Length(maximum = 32) private String state; @Required + @Length(maximum = 255) private String streetAddress; private String portalId; Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsAction.java 2007-11-06 06:27:08 UTC (rev 689) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsAction.java 2007-11-06 06:36:18 UTC (rev 690) @@ -21,6 +21,7 @@ import jp.sf.pal.pompei.service.ProductService; import jp.sf.pal.pompei.util.SessionUtil; import jp.sf.pal.pompei.util.UploadedFileUtil; +import jp.sf.pal.pompei.util.UrlBuilderUtil; public class ProductDetailsAction implements Serializable { @@ -164,6 +165,18 @@ FacesMessageUtil.addInfoMessage("added.product.to.cart"); } + // jump to cart page + StringBuilder buf = new StringBuilder(); + buf.append("\n"); + getProductDetailsPage().setJumpToCart(buf.toString()); + return null; } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsPage.java 2007-11-06 06:27:08 UTC (rev 689) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsPage.java 2007-11-06 06:36:18 UTC (rev 690) @@ -3,7 +3,6 @@ import java.io.Serializable; import java.math.BigDecimal; -import jp.sf.pal.pompei.PompeiConstants; import jp.sf.pal.pompei.util.UrlBuilderUtil; import org.seasar.teeda.extension.annotation.convert.BigDecimalConverter; @@ -47,6 +46,8 @@ @BigDecimalConverter(pattern = "###,###") private BigDecimal price; + private String jumpToCart; + public String getManufacturersName() { return manufacturersName; } @@ -237,4 +238,25 @@ public String getOrderLinkHref() { return UrlBuilderUtil.createOrderUrl(); } + + public String getSignupLinkHref() { + return UrlBuilderUtil.createSignupUrl(); + } + + /** + * @return the cartUrl + */ + public String getJumpToCart() { + // return jumpToCart; + String buf = jumpToCart; + jumpToCart = null; + return buf; + } + + /** + * @param cartUrl the cartUrl to set + */ + public void setJumpToCart(String cartUrl) { + this.jumpToCart = cartUrl; + } } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListPage.java 2007-11-06 06:27:08 UTC (rev 689) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListPage.java 2007-11-06 06:36:18 UTC (rev 690) @@ -196,4 +196,5 @@ public String getThumbnailByListWithImageSrc() { return getThumbnailSrc(); } + } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupCompleteAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupCompleteAction.java 2007-11-06 06:27:08 UTC (rev 689) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupCompleteAction.java 2007-11-06 06:36:18 UTC (rev 690) @@ -10,19 +10,26 @@ * */ private static final long serialVersionUID = 2689633390570340463L; + /** * */ private SignupCompletePage signupCompletePage; + public Class initialize() { return null; } public Class prerender() { + getSignupCompletePage().setNotifiedEmailAddress( + getSignupCompletePage().getEmailAddress()); + getSignupCompletePage().setEmailAddress(null); + // render faces messages FacesMessageUtil.renderMessages(); return null; } + /** * @return the signupCompletePage */ Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupCompletePage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupCompletePage.java 2007-11-06 06:27:08 UTC (rev 689) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupCompletePage.java 2007-11-06 06:36:18 UTC (rev 690) @@ -10,8 +10,24 @@ */ private static final long serialVersionUID = 1424283975909978739L; + private String notifiedEmailAddress; + public boolean isSendEmail() { - return getEmailAddress() != null; + return getNotifiedEmailAddress() != null; } + /** + * @return the notifiedEmailAddress + */ + public String getNotifiedEmailAddress() { + return notifiedEmailAddress; + } + + /** + * @param notifiedEmailAddress the notifiedEmailAddress to set + */ + public void setNotifiedEmailAddress(String notifiedEmailAddress) { + this.notifiedEmailAddress = notifiedEmailAddress; + } + } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupConfirmAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupConfirmAction.java 2007-11-06 06:27:08 UTC (rev 689) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupConfirmAction.java 2007-11-06 06:36:18 UTC (rev 690) @@ -65,7 +65,7 @@ } @TakeOver(type = TakeOverType.INCLUDE, properties = "emailAddress") - public Class doCreate() { + public Class doOnceCreate() { // message digest try { Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupEditPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupEditPage.java 2007-11-06 06:27:08 UTC (rev 689) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupEditPage.java 2007-11-06 06:36:18 UTC (rev 690) @@ -4,6 +4,10 @@ import java.util.List; import java.util.Map; +import org.seasar.teeda.extension.annotation.validator.Email; +import org.seasar.teeda.extension.annotation.validator.Equal; +import org.seasar.teeda.extension.annotation.validator.Length; +import org.seasar.teeda.extension.annotation.validator.RegularExpression; import org.seasar.teeda.extension.annotation.validator.Required; public class SignupEditPage extends AbstractUsersignupPage implements @@ -102,6 +106,7 @@ * @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setCity(java.lang.String) */ @Required + @Length(maximum = 64) @Override public void setCity(String city) { // TODO Auto-generated method stub @@ -122,6 +127,8 @@ * @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setEmailAddress(java.lang.String) */ @Required + @Length(maximum = 128) + @Email @Override public void setEmailAddress(String emailAddress) { // TODO Auto-generated method stub @@ -132,6 +139,9 @@ * @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setEmailAddressConfirm(java.lang.String) */ @Required + @Email + @Length(maximum = 129) + @Equal(targetId = "emailAddress") @Override public void setEmailAddressConfirm(String emailAddressConfirm) { // TODO Auto-generated method stub @@ -142,6 +152,7 @@ * @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setFirstname(java.lang.String) */ @Required + @Length(maximum = 40) @Override public void setFirstname(String firstname) { // TODO Auto-generated method stub @@ -152,6 +163,7 @@ * @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setFirstnameDescription(java.lang.String) */ @Required + @Length(maximum = 40) @Override public void setFirstnameDescription(String firstnameDescription) { // TODO Auto-generated method stub @@ -162,6 +174,7 @@ * @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setGender(java.lang.String) */ @Required + @Length(maximum = 1) @Override public void setGender(String gender) { // TODO Auto-generated method stub @@ -172,6 +185,7 @@ * @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setLastname(java.lang.String) */ @Required + @Length(maximum = 40) @Override public void setLastname(String lastname) { // TODO Auto-generated method stub @@ -182,6 +196,7 @@ * @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setLastnameDescription(java.lang.String) */ @Required + @Length(maximum = 40) @Override public void setLastnameDescription(String lastnameDescription) { // TODO Auto-generated method stub @@ -202,6 +217,7 @@ * @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setPrimaryPostcode(java.lang.String) */ @Required + @RegularExpression(pattern = "[0-9]{3}") @Override public void setPrimaryPostcode(String primaryPostcode) { // TODO Auto-generated method stub @@ -212,6 +228,7 @@ * @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setSecondaryPostcode(java.lang.String) */ @Required + @RegularExpression(pattern = "[0-9]{4}") @Override public void setSecondaryPostcode(String secondaryPostcode) { // TODO Auto-generated method stub @@ -222,6 +239,7 @@ * @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setState(java.lang.String) */ @Required + @Length(maximum = 32) @Override public void setState(String state) { // TODO Auto-generated method stub @@ -232,6 +250,7 @@ * @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setStreetAddress(java.lang.String) */ @Required + @Length(maximum = 255) @Override public void setStreetAddress(String streetAddress) { // TODO Auto-generated method stub @@ -242,6 +261,8 @@ * @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setUserName(java.lang.String) */ @Required + @Length(minimum = 6, maximum = 32) + @RegularExpression(pattern = "[a-zA-Z0-9]+") @Override public void setUserName(String userName) { // TODO Auto-generated method stub @@ -252,6 +273,7 @@ * @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setUserSecretAnswer(java.lang.String) */ @Required + @Length(maximum = 255) @Override public void setUserSecretAnswer(String userSecretAnswer) { // TODO Auto-generated method stub @@ -268,4 +290,65 @@ super.setYearOfDayOfBirth(yearOfDayOfBirth); } + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setCellphone(java.lang.String) + */ + @Override + @RegularExpression(pattern = "[0-9]{1,4}-?[0-9]{1,4}-?[0-9]{1,4}") + public void setCellphone(String cellphone) { + // TODO Auto-generated method stub + super.setCellphone(cellphone); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setFax(java.lang.String) + */ + @RegularExpression(pattern = "[0-9]{1,4}-?[0-9]{1,4}-?[0-9]{1,4}") + @Override + public void setFax(String fax) { + // TODO Auto-generated method stub + super.setFax(fax); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setTelephone(java.lang.String) + */ + @Required + @RegularExpression(pattern = "[0-9]{1,4}-?[0-9]{1,4}-?[0-9]{1,4}") + @Override + public void setTelephone(String telephone) { + // TODO Auto-generated method stub + super.setTelephone(telephone); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setCompany(java.lang.String) + */ + @Length(maximum = 128) + @Override + public void setCompany(String company) { + // TODO Auto-generated method stub + super.setCompany(company); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setDepartment(java.lang.String) + */ + @Length(maximum = 64) + @Override + public void setDepartment(String department) { + // TODO Auto-generated method stub + super.setDepartment(department); + } + + /* (non-Javadoc) + * @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setUserSecretQuestion(java.lang.String) + */ + @Length(maximum = 255) + @Override + public void setUserSecretQuestion(String userSecretQuestion) { + // TODO Auto-generated method stub + super.setUserSecretQuestion(userSecretQuestion); + } + } Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/insert_data.sql =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/insert_data.sql 2007-11-06 06:27:08 UTC (rev 689) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/insert_data.sql 2007-11-06 06:36:18 UTC (rev 690) @@ -27,9 +27,11 @@ INSERT INTO ZONE VALUES (130,107,'JP','Japan'); -INSERT INTO TAX_CLASS VALUES (1, '消費税', '商品・製品の販売やサービスの提供などの取引に対して課税される税金', '2007-01-01 00:00:00', '2007-01-01 00:00:00'); +--INSERT INTO TAX_CLASS VALUES (1, '消費税', '商品・製品の販売やサービスの提供などの取引に対して課税される税金', '2007-01-01 00:00:00', '2007-01-01 00:00:00'); +INSERT INTO TAX_CLASS VALUES (1, '内税', '商品・製品の販売やサービスの提供などの取引に対して課税される税金', '2007-01-01 00:00:00', '2007-01-01 00:00:00'); -INSERT INTO TAX_RATE VALUES (1, 130, 1, 1, 5.0, '税率5.0%', '2007-01-01 00:00:00', '2007-01-01 00:00:00'); +--INSERT INTO TAX_RATE VALUES (1, 130, 1, 1, 5.0, '税率5.0%', '2007-01-01 00:00:00', '2007-01-01 00:00:00'); +INSERT INTO TAX_RATE VALUES (1, 130, 1, 1, 0, '税率5.0%', '2007-01-01 00:00:00', '2007-01-01 00:00:00'); INSERT INTO CATEGORY VALUES (1, '', null, 1, '2007-01-01 00:00:00', '2007-01-01 00:00:00'); Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderEdit.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderEdit.html 2007-11-06 06:27:08 UTC (rev 689) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderEdit.html 2007-11-06 06:36:18 UTC (rev 690) @@ -70,12 +70,14 @@ + 配送料金: Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/cart/productList.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/cart/productList.html 2007-11-06 06:27:08 UTC (rev 689) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/cart/productList.html 2007-11-06 06:36:18 UTC (rev 690) @@ -28,9 +28,11 @@ + @@ -63,9 +65,11 @@ + @@ -77,14 +81,14 @@ - + 10000 - + @@ -129,7 +133,7 @@

- ユーザー登録へ進む + ログインへ進む
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutConfirm.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutConfirm.html 2007-11-06 06:27:08 UTC (rev 689) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutConfirm.html 2007-11-06 06:36:18 UTC (rev 690) @@ -85,6 +85,7 @@ + 送料 @@ -241,7 +243,8 @@

- + +
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userAddressSelect.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userAddressSelect.html 2007-11-06 06:27:08 UTC (rev 689) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userAddressSelect.html 2007-11-06 06:36:18 UTC (rev 690) @@ -49,7 +49,7 @@
- +

@@ -149,6 +149,7 @@ + [必須] @@ -192,7 +193,7 @@
- +
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userInfoEdit.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userInfoEdit.html 2007-11-06 06:27:08 UTC (rev 689) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userInfoEdit.html 2007-11-06 06:36:18 UTC (rev 690) @@ -192,6 +192,7 @@ + [必須] @@ -239,11 +240,11 @@

- +
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productDetails.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productDetails.html 2007-11-06 06:27:08 UTC (rev 689) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productDetails.html 2007-11-06 06:36:18 UTC (rev 690) @@ -6,9 +6,9 @@ 商品詳細画面 -
+
- +
@@ -36,7 +36,7 @@ - + @@ -56,6 +56,8 @@
+
+ ログインへ進む
@@ -66,6 +68,7 @@ 説明
- + + \ No newline at end of file Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupComplete.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupComplete.html 2007-11-06 06:27:08 UTC (rev 689) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupComplete.html 2007-11-06 06:36:18 UTC (rev 690) @@ -27,7 +27,7 @@
- mail 宛に会員情報を送信しました。 + mail 宛に会員情報を送信しました。
メールに記述されている会員情報でログインして、ご利用ください。 Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupConfirm.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupConfirm.html 2007-11-06 06:27:08 UTC (rev 689) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupConfirm.html 2007-11-06 06:36:18 UTC (rev 690) @@ -219,7 +219,7 @@

- +
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupEdit.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupEdit.html 2007-11-06 06:27:08 UTC (rev 689) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupEdit.html 2007-11-06 06:36:18 UTC (rev 690) @@ -29,7 +29,7 @@ [必須]
@@ -177,6 +177,7 @@ From svnnotify ＠ sourceforge.jp Thu Nov 8 06:49:47 2007 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Thu, 08 Nov 2007 06:49:47 +0900 Subject: [pal-cvs 2950] [694] bug fixes. Message-ID: <1194472187.760388.17865.nullmailer@users.sourceforge.jp> Revision: 694 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=694 Author: shinsuke Date: 2007-11-08 06:49:47 +0900 (Thu, 08 Nov 2007) Log Message: ----------- bug fixes. Modified Paths: -------------- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionConfirmPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionConfirmPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionConfirmPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeConfirmPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserConfirmPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserEditPage.java pal-admin/trunk/src/main/resources/appMessages.properties pal-admin/trunk/src/main/resources/appMessages_ja.properties pal-admin/trunk/src/main/webapp/view/permission/folderPermissionConfirm.html pal-admin/trunk/src/main/webapp/view/permission/pagePermissionConfirm.html pal-admin/trunk/src/main/webapp/view/permission/portletPermissionConfirm.html -------------- next part -------------- Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionConfirmPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionConfirmPage.java 2007-11-06 07:29:16 UTC (rev 693) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionConfirmPage.java 2007-11-07 21:49:47 UTC (rev 694) @@ -17,14 +17,14 @@ import java.io.Serializable; -import org.apache.commons.lang.StringUtils; -import org.seasar.framework.log.Logger; - import jp.sf.pal.admin.PALAdminException; import jp.sf.pal.admin.service.PermissionManagementService; import jp.sf.pal.admin.web.CrudType; import jp.sf.pal.common.util.FacesMessageUtil; +import org.apache.commons.lang.StringUtils; +import org.seasar.framework.log.Logger; + public class FolderPermissionConfirmPage extends AbstractPermissionPage implements Serializable { @@ -109,8 +109,15 @@ return null; } - public Class doEdit() { - return FolderPermissionEditPage.class; + public Class doBack() { + if (isCreate()) { + return FolderPermissionEditPage.class; + } else if (isUpdate()) { + return FolderPermissionEditPage.class; + } else if (isDelete()) { + return FolderPermissionListPage.class; + } + return FolderPermissionListPage.class; } public boolean isComeFromList() { Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionConfirmPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionConfirmPage.java 2007-11-06 07:29:16 UTC (rev 693) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionConfirmPage.java 2007-11-07 21:49:47 UTC (rev 694) @@ -109,8 +109,15 @@ return null; } - public Class doEdit() { - return PagePermissionEditPage.class; + public Class doBack() { + if (isCreate()) { + return PagePermissionEditPage.class; + } else if (isUpdate()) { + return PagePermissionEditPage.class; + } else if (isDelete()) { + return PagePermissionListPage.class; + } + return PagePermissionListPage.class; } public boolean isComeFromList() { Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionConfirmPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionConfirmPage.java 2007-11-06 07:29:16 UTC (rev 693) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionConfirmPage.java 2007-11-07 21:49:47 UTC (rev 694) @@ -109,8 +109,15 @@ return null; } - public Class doEdit() { - return PortletPermissionEditPage.class; + public Class doBack() { + if (isCreate()) { + return PortletPermissionEditPage.class; + } else if (isUpdate()) { + return PortletPermissionEditPage.class; + } else if (isDelete()) { + return PortletPermissionListPage.class; + } + return PortletPermissionListPage.class; } public boolean isComeFromList() { Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeConfirmPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeConfirmPage.java 2007-11-06 07:29:16 UTC (rev 693) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeConfirmPage.java 2007-11-07 21:49:47 UTC (rev 694) @@ -86,7 +86,7 @@ case CrudType.UPDATE: try { getUserManagementService().update(this); - FacesMessageUtil.addInfoMessage("added.new.userattribute", + FacesMessageUtil.addInfoMessage("updated.new.userattribute", new Object[] { getName() }); } catch (PALAdminException e) { FacesMessageUtil.addErrorMessage( Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserConfirmPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserConfirmPage.java 2007-11-06 07:29:16 UTC (rev 693) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserConfirmPage.java 2007-11-07 21:49:47 UTC (rev 694) @@ -17,6 +17,8 @@ import java.io.Serializable; +import javax.faces.context.FacesContext; + import jp.sf.pal.admin.PALAdminException; import jp.sf.pal.admin.util.PALAdminUtil; import jp.sf.pal.admin.web.CrudType; @@ -80,6 +82,15 @@ } protected void deleteUser() { + // check current user + if (getName() != null + && getName().equals( + FacesContext.getCurrentInstance().getExternalContext() + .getRemoteUser())) { + FacesMessageUtil.addErrorMessage("cannot.delete.current.user"); + return; + } + try { getUserManagementService().delete(this); FacesMessageUtil.addInfoMessage("deleted.user", Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserEditPage.java 2007-11-06 07:29:16 UTC (rev 693) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserEditPage.java 2007-11-07 21:49:47 UTC (rev 694) @@ -189,6 +189,12 @@ } public Class doUpdate() { + // check password + if (getPassword() == null && getPasswordConfirm() != null) { + FacesMessageUtil.addErrorMessage("confirm.password.does.not.match"); + return null; + } + try { getUserManagementService().update(this); FacesMessageUtil.addInfoMessage("updated.user.information", Modified: pal-admin/trunk/src/main/resources/appMessages.properties =================================================================== --- pal-admin/trunk/src/main/resources/appMessages.properties 2007-11-06 07:29:16 UTC (rev 693) +++ pal-admin/trunk/src/main/resources/appMessages.properties 2007-11-07 21:49:47 UTC (rev 694) @@ -7,6 +7,7 @@ failed.to.add.new.user=Failed to add a new User({0}). deleted.user=Delete the User({0}). failed.to.delete.user=Failed to delete the User({0}). +cannot.delete.current.user=Cannot delete a current login user. added.new.role=Added a new Role({0}). failed.to.add.new.role=Failed to add a new Role({0}). @@ -19,6 +20,7 @@ failed.to.delete.group=Failed to delete the Group({0}). added.new.userattribute=Added a new User Attribute({0}). +updated.new.userattribute=Updated a new User Attribute({0}). failed.to.add.new.userattribute=Failed to add a new User Attribute({0}). deleted.userattribute=Delete the User Attribute({0}). failed.to.delete.userattribute=Failed to delete the User Attribute({0}). @@ -26,6 +28,7 @@ could.not.find.user=Could not find the target user. updated.user.information= Updated the target user information({0}). failed.to.update.user.information=Failed to updated the user information({0}). +confirm.password.does.not.match=The re-type password does not match. added.group.to.user= Added the group({1}) to the user({0}). failed.to.add.group.to.user=Failed to add the group({1}) to the user({0}). Modified: pal-admin/trunk/src/main/resources/appMessages_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/appMessages_ja.properties 2007-11-06 07:29:16 UTC (rev 693) +++ pal-admin/trunk/src/main/resources/appMessages_ja.properties 2007-11-07 21:49:47 UTC (rev 694) @@ -7,6 +7,7 @@ failed.to.add.new.user=\u65b0\u898f\u30e6\u30fc\u30b6\u30fc({0})\u306e\u8ffd\u52a0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 deleted.user=\u30e6\u30fc\u30b6\u30fc({0})\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 failed.to.delete.user=\u30e6\u30fc\u30b6\u30fc({0})\u306e\u524a\u9664\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +cannot.delete.current.user=\u73fe\u5728\u30ed\u30b0\u30a4\u30f3\u3057\u3066\u3044\u308b\u30e6\u30fc\u30b6\u30fc\u306f\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3002 added.new.role=\u65b0\u3057\u3044\u30ed\u30fc\u30eb({0})\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002 failed.to.add.new.role=\u65b0\u3057\u3044\u30ed\u30fc\u30eb({0})\u306e\u8ffd\u52a0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 @@ -19,6 +20,7 @@ failed.to.delete.group=\u30b0\u30eb\u30fc\u30d7{0})\u306e\u524a\u9664\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 added.new.userattribute=\u65b0\u898f\u30e6\u30fc\u30b6\u30fc\u5c5e\u6027({0})\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002 +updated.new.userattribute=\u65b0\u898f\u30e6\u30fc\u30b6\u30fc\u5c5e\u6027({0})\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002 failed.to.add.new.userattribute=\u65b0\u898f\u30e6\u30fc\u30b6\u30fc\u5c5e\u6027({0})\u306e\u8ffd\u52a0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 deleted.userattribute=\u30e6\u30fc\u30b6\u30fc\u5c5e\u6027({0})\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 failed.to.delete.userattribute=\u30e6\u30fc\u30b6\u30fc\u5c5e\u6027({0})\u306e\u524a\u9664\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 @@ -26,6 +28,7 @@ could.not.find.user=\u6307\u5b9a\u3057\u305f\u30e6\u30fc\u30b6\u30fc({0})\u3092\u898b\u3064\u3051\u308b\u4e8b\u304c\u51fa\u6765\u307e\u305b\u3093\u3002 updated.user.information= \u6307\u5b9a\u3057\u305f\u30e6\u30fc\u30b6\u30fc\u60c5\u5831({0})\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002 failed.to.update.user.information=\u6307\u5b9a\u3057\u305f\u30e6\u30fc\u30b6\u30fc\u60c5\u5831({0})\u306e\u66f4\u65b0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +confirm.password.does.not.match=\u78ba\u8a8d\u7528\u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u4e00\u81f4\u3057\u307e\u305b\u3093\u3002 added.group.to.user= \u30b0\u30eb\u30fc\u30d7({1})\u3092\u30e6\u30fc\u30b6\u30fc({0})\u306b\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002 failed.to.add.group.to.user=\u30b0\u30eb\u30fc\u30d7({1})\u3092\u30e6\u30fc\u30b6\u30fc({0})\u306b\u8ffd\u52a0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 Modified: pal-admin/trunk/src/main/webapp/view/permission/folderPermissionConfirm.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/permission/folderPermissionConfirm.html 2007-11-06 07:29:16 UTC (rev 693) +++ pal-admin/trunk/src/main/webapp/view/permission/folderPermissionConfirm.html 2007-11-07 21:49:47 UTC (rev 694) @@ -74,8 +74,8 @@
100 円100 円 (税込)
- +
+ [必須] From svnnotify ＠ sourceforge.jp Tue Nov 6 15:41:26 2007 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Tue, 06 Nov 2007 15:41:26 +0900 Subject: [pal-cvs 2947] [691] updated version. Message-ID: <1194331286.496734.30724.nullmailer@users.sourceforge.jp> Revision: 691 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=691 Author: shinsuke Date: 2007-11-06 15:41:26 +0900 (Tue, 06 Nov 2007) Log Message: ----------- updated version. Modified Paths: -------------- pompei/portlets/pompei-core/trunk/pom.xml -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/pom.xml =================================================================== --- pompei/portlets/pompei-core/trunk/pom.xml 2007-11-06 06:36:18 UTC (rev 690) +++ pompei/portlets/pompei-core/trunk/pom.xml 2007-11-06 06:41:26 UTC (rev 691) @@ -5,7 +5,7 @@ pompei-core war Pompei - 0.0.1-SNAPSHOT + 0.0.2-SNAPSHOT Portalet for constructing EC site http://pal.sourceforge.jp/ 2005 From svnnotify ＠ sourceforge.jp Tue Nov 6 15:49:41 2007 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Tue, 06 Nov 2007 15:49:41 +0900 Subject: [pal-cvs 2948] [692] updated message. Message-ID: <1194331781.834778.3619.nullmailer@users.sourceforge.jp> Revision: 692 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=692 Author: shinsuke Date: 2007-11-06 15:49:41 +0900 (Tue, 06 Nov 2007) Log Message: ----------- updated message. Modified Paths: -------------- pompei/portlets/pompei-core/trunk/src/main/resources/appMessages.properties -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/src/main/resources/appMessages.properties =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/resources/appMessages.properties 2007-11-06 06:41:26 UTC (rev 691) +++ pompei/portlets/pompei-core/trunk/src/main/resources/appMessages.properties 2007-11-06 06:49:41 UTC (rev 692) @@ -137,7 +137,7 @@ could.not.encode.secret.password=\u30b7\u30b9\u30c6\u30e0\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 error.lacking.password=\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u5165\u529b\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\u5165\u529b\u3057\u305f\u5024\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002 error.userid_already_exists=\u8981\u6c42\u3055\u308c\u305f\u30e6\u30fc\u30b6\u30fcID\u306f\u65e2\u306b\u5b58\u5728\u3057\u307e\u3059\u3002\u5225\u306e\u30e6\u30fc\u30b6\u30fcID\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002 -error.email_already_exists=\u8981\u6c42\u3055\u308c\u305f\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u306f\u65e2\u306b\u30b7\u30b9\u30c6\u30e0\u3067\u5229\u7528\u3055\u308c\u3066\u3044\u307e\u3059\u3002\u65e2\u306b\u30a2\u30ab\u30a6\u30f3\u30c8\u3092\u6240\u6709\u3057\u3066\u3044\u308b\u5834\u5408\u306f\u3001\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u53d6\u5f97\u3059\u308b\u305f\u3081\u306b\u30d1\u30b9\u30ef\u30fc\u30c9\u78ba\u8a8d\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306e\u4f7f\u7528\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +error.email_already_exists=\u8981\u6c42\u3055\u308c\u305f\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u306f\u65e2\u306b\u30b7\u30b9\u30c6\u30e0\u3067\u5229\u7528\u3055\u308c\u3066\u3044\u307e\u3059\u3002\u65e2\u306b\u30a2\u30ab\u30a6\u30f3\u30c8\u3092\u6240\u6709\u3057\u3066\u3044\u308b\u5834\u5408\u306f\u3001\u305d\u306e\u30a2\u30ab\u30a6\u30f3\u30c8\u3092\u5229\u7528\u3057\u3066\u3001\u30ed\u30b0\u30a4\u30f3\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u304a\u5fd8\u308c\u306e\u5834\u5408\u306b\u306f\u3001\u30ed\u30b0\u30a4\u30f3\u30da\u30fc\u30b8\u304b\u3089\u30d1\u30b9\u30ef\u30fc\u30c9\u518d\u767a\u884c\u30da\u30fc\u30b8\u306b\u884c\u304d\u3001\u518d\u767a\u884c\u624b\u7d9a\u304d\u3092\u884c\u3063\u3066\u304f\u3060\u3055\u3044\u3002 error.failed_to_generate_password=\u30b7\u30b9\u30c6\u30e0\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 error.two_passwords_do_not_match=\u78ba\u8a8d\u7528\u30d1\u30b9\u30ef\u30fc\u30c9\u3068\u4e00\u81f4\u3057\u307e\u305b\u3093\u3002\u518d\u5ea6\u3001\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002 error.failed_to_add=\u30e6\u30fc\u30b6\u30fc\u306e\u8ffd\u52a0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 From svnnotify ＠ sourceforge.jp Tue Nov 6 16:29:16 2007 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Tue, 06 Nov 2007 16:29:16 +0900 Subject: [pal-cvs 2949] [693] removed space. Message-ID: <1194334156.887235.477.nullmailer@users.sourceforge.jp> Revision: 693 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=693 Author: shinsuke Date: 2007-11-06 16:29:16 +0900 (Tue, 06 Nov 2007) Log Message: ----------- removed space. Modified Paths: -------------- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupEdit.html -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupEdit.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupEdit.html 2007-11-06 06:49:41 UTC (rev 692) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupEdit.html 2007-11-06 07:29:16 UTC (rev 693) @@ -249,8 +249,7 @@   -
- +
- - + +
Modified: pal-admin/trunk/src/main/webapp/view/permission/pagePermissionConfirm.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/permission/pagePermissionConfirm.html 2007-11-06 07:29:16 UTC (rev 693) +++ pal-admin/trunk/src/main/webapp/view/permission/pagePermissionConfirm.html 2007-11-07 21:49:47 UTC (rev 694) @@ -74,8 +74,8 @@
- - + +
Modified: pal-admin/trunk/src/main/webapp/view/permission/portletPermissionConfirm.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/permission/portletPermissionConfirm.html 2007-11-06 07:29:16 UTC (rev 693) +++ pal-admin/trunk/src/main/webapp/view/permission/portletPermissionConfirm.html 2007-11-07 21:49:47 UTC (rev 694) @@ -74,8 +74,8 @@
- - + +
From svnnotify ＠ sourceforge.jp Thu Nov 8 07:47:52 2007 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Thu, 08 Nov 2007 07:47:52 +0900 Subject: [pal-cvs 2951] [695] updated j2 Message-ID: <1194475672.507216.20399.nullmailer@users.sourceforge.jp> Revision: 695 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=695 Author: shinsuke Date: 2007-11-08 07:47:52 +0900 (Thu, 08 Nov 2007) Log Message: ----------- updated j2 Modified Paths: -------------- pal-portal/trunk/build.properties pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/pipelines.xml -------------- next part -------------- Modified: pal-portal/trunk/build.properties =================================================================== --- pal-portal/trunk/build.properties 2007-11-07 21:49:47 UTC (rev 694) +++ pal-portal/trunk/build.properties 2007-11-07 22:47:52 UTC (rev 695) @@ -67,7 +67,7 @@ # Jetspeed SVN revision #jetspeed2.svn.repository=http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/ jetspeed2.svn.repository=http://svn.apache.org/repos/asf/portals/jetspeed-2/branches/JETSPEED-2.1.3/ -jetspeed2.revision=590470 +jetspeed2.revision=592843 # Dependencies for Jetspeed jetspeed.version=2.1.2_pal-${portal.version} Modified: pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/pipelines.xml =================================================================== --- pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/pipelines.xml 2007-11-07 21:49:47 UTC (rev 694) +++ pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/pipelines.xml 2007-11-07 22:47:52 UTC (rev 695) @@ -1,8 +1,8 @@ Index: src/webapp/WEB-INF/assembly/pipelines.xml =================================================================== ---- src/webapp/WEB-INF/assembly/pipelines.xml (リビジョン 584942) +--- src/webapp/WEB-INF/assembly/pipelines.xml (リビジョン 592843) +++ src/webapp/WEB-INF/assembly/pipelines.xml (作業コピー) -@@ -419,6 +419,7 @@ +@@ -421,6 +421,7 @@ From svnnotify ＠ sourceforge.jp Fri Nov 9 08:27:03 2007 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 09 Nov 2007 08:27:03 +0900 Subject: [pal-cvs 2952] [696] updated j2(fixed JS2-800) Message-ID: <1194564423.493348.12490.nullmailer@users.sourceforge.jp> Revision: 696 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=696 Author: shinsuke Date: 2007-11-09 08:27:03 +0900 (Fri, 09 Nov 2007) Log Message: ----------- updated j2(fixed JS2-800) Modified Paths: -------------- pal-portal/trunk/build.properties -------------- next part -------------- Modified: pal-portal/trunk/build.properties =================================================================== --- pal-portal/trunk/build.properties 2007-11-07 22:47:52 UTC (rev 695) +++ pal-portal/trunk/build.properties 2007-11-08 23:27:03 UTC (rev 696) @@ -67,7 +67,7 @@ # Jetspeed SVN revision #jetspeed2.svn.repository=http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/ jetspeed2.svn.repository=http://svn.apache.org/repos/asf/portals/jetspeed-2/branches/JETSPEED-2.1.3/ -jetspeed2.revision=592843 +jetspeed2.revision=593340 # Dependencies for Jetspeed jetspeed.version=2.1.2_pal-${portal.version} From svnnotify ＠ sourceforge.jp Fri Nov 9 17:58:41 2007 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 09 Nov 2007 17:58:41 +0900 Subject: [pal-cvs 2953] [697] changed stock display. Message-ID: <1194598721.926226.12712.nullmailer@users.sourceforge.jp> Revision: 697 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=697 Author: shinsuke Date: 2007-11-09 17:58:41 +0900 (Fri, 09 Nov 2007) Log Message: ----------- changed stock display. Modified Paths: -------------- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsPage.java pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productDetails.html -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsPage.java 2007-11-08 23:27:03 UTC (rev 696) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsPage.java 2007-11-09 08:58:41 UTC (rev 697) @@ -259,4 +259,14 @@ public void setJumpToCart(String cartUrl) { this.jumpToCart = cartUrl; } + + public boolean isAvailable() { + if (getQuantity() == null) { + return true; + } + if (getQuantity().compareTo(BigDecimal.valueOf(0)) > 0) { + return true; + } + return false; + } } Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productDetails.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productDetails.html 2007-11-08 23:27:03 UTC (rev 696) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productDetails.html 2007-11-09 08:58:41 UTC (rev 697) @@ -39,14 +39,22 @@ 100 円 (税込) + + ありなし + +
- + + +
@@ -57,7 +65,7 @@

- ログインへ進む + 会員登録はこちら
From svnnotify ＠ sourceforge.jp Fri Nov 9 18:00:17 2007 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 09 Nov 2007 18:00:17 +0900 Subject: [pal-cvs 2954] [698] supported zone map. Message-ID: <1194598817.148992.13994.nullmailer@users.sourceforge.jp> Revision: 698 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=698 Author: shinsuke Date: 2007-11-09 18:00:16 +0900 (Fri, 09 Nov 2007) Log Message: ----------- supported zone map. Modified Paths: -------------- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/DefaultDeliveryMethodCalculator.java -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/DefaultDeliveryMethodCalculator.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/DefaultDeliveryMethodCalculator.java 2007-11-09 08:58:41 UTC (rev 697) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/DefaultDeliveryMethodCalculator.java 2007-11-09 09:00:16 UTC (rev 698) @@ -1,9 +1,11 @@ package jp.sf.pal.pompei.fee.impl; import java.math.BigDecimal; +import java.util.HashMap; import java.util.List; import java.util.Map; +import jp.sf.pal.pompei.PompeiConstants; import jp.sf.pal.pompei.exentity.AddressBook; import jp.sf.pal.pompei.exentity.CustomerBasket; import jp.sf.pal.pompei.fee.FeeCalculator; @@ -15,10 +17,57 @@ */ private static final long serialVersionUID = 4448477278188463956L; + private Map zoneMap; + + private BigDecimal defaultFee; + + private BigDecimal focPrice; + + public DefaultDeliveryMethodCalculator() { + this("0"); + } + + public DefaultDeliveryMethodCalculator(String defaultFee) { + // create zone map + this.zoneMap = new HashMap(); + + // default fee + this.defaultFee = BigDecimal.valueOf(Double.parseDouble(defaultFee)); + + // foc price + this.focPrice = BigDecimal.valueOf(0); + } + + public DefaultDeliveryMethodCalculator(Map zoneMap, + String defaultFee, String focPrice) { + // create zone map + this.zoneMap = new HashMap(); + for (Map.Entry entry : zoneMap.entrySet()) { + this.zoneMap.put(entry.getKey(), BigDecimal.valueOf(Double + .parseDouble(entry.getValue()))); + } + + // default fee + this.defaultFee = BigDecimal.valueOf(Double.parseDouble(defaultFee)); + + // foc price + this.focPrice = BigDecimal.valueOf(Double.parseDouble(focPrice)); + } + public BigDecimal calculate(List list, AddressBook deliveryAddressBook, Map informationMap) { - // TODO - return new BigDecimal(1000); + BigDecimal fee = defaultFee; + if (zoneMap.get(deliveryAddressBook.getState()) != null) { + fee = zoneMap.get(deliveryAddressBook.getState()); + } + + BigDecimal subTotalPrice = (BigDecimal) informationMap + .get(PompeiConstants.SUB_TOTAL_PRICE); + if (subTotalPrice != null && subTotalPrice.compareTo(focPrice) >= 0) { + return BigDecimal.valueOf(0); + } + + return fee; } } From svnnotify ＠ sourceforge.jp Fri Nov 9 18:00:33 2007 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 09 Nov 2007 18:00:33 +0900 Subject: [pal-cvs 2955] [699] supported e-collect. Message-ID: <1194598833.756171.14188.nullmailer@users.sourceforge.jp> Revision: 699 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=699 Author: shinsuke Date: 2007-11-09 18:00:33 +0900 (Fri, 09 Nov 2007) Log Message: ----------- supported e-collect. Added Paths: ----------- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/ECollectPaymentCalculator.java -------------- next part -------------- Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/ECollectPaymentCalculator.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/ECollectPaymentCalculator.java 2007-11-09 09:00:16 UTC (rev 698) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/ECollectPaymentCalculator.java 2007-11-09 09:00:33 UTC (rev 699) @@ -0,0 +1,115 @@ +package jp.sf.pal.pompei.fee.impl; + +import java.math.BigDecimal; +import java.util.List; +import java.util.Map; + +import jp.sf.pal.pompei.PompeiConstants; +import jp.sf.pal.pompei.exentity.AddressBook; +import jp.sf.pal.pompei.exentity.CustomerBasket; +import jp.sf.pal.pompei.fee.FeeCalculator; + +public class ECollectPaymentCalculator implements FeeCalculator { + + /** + * + */ + private static final long serialVersionUID = -8969173998476815297L; + + public static final String CASH = "CASH"; + + public static final String CREDITCARD = "CREDITCARD"; + + private String type; + + public BigDecimal calculate(List list, + AddressBook deliveryAddressBook, Map informationMap) { + + if (CASH.equals(getType())) { + return calculateForCash(list, deliveryAddressBook, informationMap); + } else if (CREDITCARD.equals(getType())) { + return calculateForCreditcard(list, deliveryAddressBook, + informationMap); + } + + return new BigDecimal(0); + } + + protected BigDecimal calculateForCash(List list, + AddressBook deliveryAddressBook, Map informationMap) { + return calculateCharge(list, deliveryAddressBook, informationMap).add( + calculateFiscal(list, deliveryAddressBook, informationMap)); + } + + protected BigDecimal calculateForCreditcard(List list, + AddressBook deliveryAddressBook, Map informationMap) { + return calculateCharge(list, deliveryAddressBook, informationMap); + } + + protected BigDecimal calculateCharge(List list, + AddressBook deliveryAddressBook, Map informationMap) { + BigDecimal subTotalPrice = (BigDecimal) informationMap + .get(PompeiConstants.SUB_TOTAL_PRICE); + // 代引金額 代引手数料（税込） + // 1万円まで 315円 + // 3万円まで 420円 + // 10万円まで 630円 + // 30万円まで 1,050円 + // 50万円まで 2,100円 + // 100万円まで 3,150円 + // 100万円を超える場合 4,200円 + if (subTotalPrice.compareTo(BigDecimal.valueOf(10000)) <= 0) { + return BigDecimal.valueOf(315); + } else if (subTotalPrice.compareTo(BigDecimal.valueOf(30000)) <= 0) { + return BigDecimal.valueOf(420); + } else if (subTotalPrice.compareTo(BigDecimal.valueOf(100000)) <= 0) { + return BigDecimal.valueOf(630); + } else if (subTotalPrice.compareTo(BigDecimal.valueOf(300000)) <= 0) { + return BigDecimal.valueOf(1050); + } else if (subTotalPrice.compareTo(BigDecimal.valueOf(500000)) <= 0) { + return BigDecimal.valueOf(2100); + } else if (subTotalPrice.compareTo(BigDecimal.valueOf(1000000)) <= 0) { + return BigDecimal.valueOf(3150); + } + return BigDecimal.valueOf(4200); + } + + protected BigDecimal calculateFiscal(List list, + AddressBook deliveryAddressBook, Map informationMap) { + BigDecimal subTotalPrice = (BigDecimal) informationMap + .get(PompeiConstants.SUB_TOTAL_PRICE); + // 消費税を除いた代引金額 収入印紙代相当額 + // 3万円以上〜100万円以下 200円 + // 200万円以下 400円 + // 300万円以下 600円 + // 500万円以下 1,000円 + if (subTotalPrice.compareTo(BigDecimal.valueOf(30000)) < 0) { + return BigDecimal.valueOf(0); + } else if (subTotalPrice.compareTo(BigDecimal.valueOf(1000000)) <= 0) { + return BigDecimal.valueOf(200); + } else if (subTotalPrice.compareTo(BigDecimal.valueOf(2000000)) <= 0) { + return BigDecimal.valueOf(400); + } else if (subTotalPrice.compareTo(BigDecimal.valueOf(3000000)) <= 0) { + return BigDecimal.valueOf(600); + } else if (subTotalPrice.compareTo(BigDecimal.valueOf(5000000)) <= 0) { + return BigDecimal.valueOf(1000); + } + //TODO ? + return BigDecimal.valueOf(1000); + } + + /** + * @return the type + */ + public String getType() { + return type; + } + + /** + * @param type the type to set + */ + public void setType(String type) { + this.type = type; + } + +} Property changes on: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/fee/impl/ECollectPaymentCalculator.java ___________________________________________________________________ Name: svn:eol-style + native From svnnotify ＠ sourceforge.jp Mon Nov 12 12:30:16 2007 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Mon, 12 Nov 2007 12:30:16 +0900 Subject: [pal-cvs 2956] [700] added delete status Message-ID: <1194838216.571366.12865.nullmailer@users.sourceforge.jp> Revision: 700 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=700 Author: shinsuke Date: 2007-11-12 12:30:16 +0900 (Mon, 12 Nov 2007) Log Message: ----------- added delete status Modified Paths: -------------- pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/insert_data.sql -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/insert_data.sql =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/insert_data.sql 2007-11-09 09:00:33 UTC (rev 699) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/insert_data.sql 2007-11-12 03:30:16 UTC (rev 700) @@ -12,6 +12,7 @@ INSERT INTO ORDER_STATUS VALUES ( 4,2,4,'2007-01-01 00:00:00','2007-01-01 00:00:00'); INSERT INTO ORDER_STATUS VALUES ( 5,3,5,'2007-01-01 00:00:00','2007-01-01 00:00:00'); INSERT INTO ORDER_STATUS VALUES ( 6,0,6,'2007-01-01 00:00:00','2007-01-01 00:00:00'); +INSERT INTO ORDER_STATUS VALUES ( 7,0,7,'2007-01-01 00:00:00','2007-01-01 00:00:00'); INSERT INTO ORDER_STATUS_DESCRIPTION VALUES ( 1, 1, '新規注文',''); INSERT INTO ORDER_STATUS_DESCRIPTION VALUES ( 2, 1, '入金処理',''); @@ -19,6 +20,7 @@ INSERT INTO ORDER_STATUS_DESCRIPTION VALUES ( 4, 1, '出荷処理',''); INSERT INTO ORDER_STATUS_DESCRIPTION VALUES ( 5, 1, '出荷完了',''); INSERT INTO ORDER_STATUS_DESCRIPTION VALUES ( 6, 1, '保留',''); +INSERT INTO ORDER_STATUS_DESCRIPTION VALUES ( 7, 1, '削除',''); INSERT INTO ORDER_NOTIFICATION VALUES ( 1, 1, null, 'new-order-to-customer.vm',1); INSERT INTO ORDER_NOTIFICATION VALUES ( 2, 5, null, 'completed-order-to-customer.vm',1); From svnnotify ＠ sourceforge.jp Mon Nov 12 12:35:49 2007 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Mon, 12 Nov 2007 12:35:49 +0900 Subject: [pal-cvs 2957] [701] parse categoryId in URL. Message-ID: <1194838549.440813.16380.nullmailer@users.sourceforge.jp> Revision: 701 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=701 Author: shinsuke Date: 2007-11-12 12:35:49 +0900 (Mon, 12 Nov 2007) Log Message: ----------- parse categoryId in URL. Modified Paths: -------------- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/CategoryListAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/CategoryListAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/CategoryListAction.java 2007-11-12 03:30:16 UTC (rev 700) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/CategoryListAction.java 2007-11-12 03:35:49 UTC (rev 701) @@ -6,6 +6,8 @@ import java.util.List; import java.util.Map; +import javax.faces.context.FacesContext; + import jp.sf.pal.pompei.PompeiConstants; import jp.sf.pal.pompei.dxo.CategoryDxo; import jp.sf.pal.pompei.service.CategoryService; @@ -31,9 +33,23 @@ return null; } + private BigDecimal getCurrentCategoryId() { + String categoryId = (String) FacesContext.getCurrentInstance() + .getExternalContext().getRequestParameterMap().get( + PompeiConstants.CATEGORY_ID); + if (categoryId != null) { + try { + return new BigDecimal(Long.parseLong(categoryId)); + } catch (NumberFormatException e) { + } + } + return (BigDecimal) SessionUtil + .getFromApplicationScope(PompeiConstants.CURRENT_CATEGORY_ID); + } + public Class prerender() { - BigDecimal currentCategoryId = (BigDecimal) SessionUtil - .getFromApplicationScope(PompeiConstants.CURRENT_CATEGORY_ID); + BigDecimal currentCategoryId = getCurrentCategoryId(); + // current category if (getCategoryListPage().getCategoryId() == null) { getCategoryListPage().setCategoryId(currentCategoryId); @@ -55,6 +71,8 @@ .getCategoryId()); } else if (!getCategoryListPage().getCategoryId().equals( currentCategoryId)) { + // update categoryId + getCategoryListPage().setCategoryId(currentCategoryId); // refresh breadcrumb List> breadcrumbItems = new ArrayList>(); getCategoryDxo().convert( Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java 2007-11-12 03:30:16 UTC (rev 700) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java 2007-11-12 03:35:49 UTC (rev 701) @@ -7,6 +7,8 @@ import java.util.List; import java.util.Map; +import javax.faces.context.FacesContext; + import jp.sf.pal.pompei.PompeiConstants; import jp.sf.pal.pompei.allcommon.cbean.PagingResultBean; import jp.sf.pal.pompei.dxo.CategoryDxo; @@ -57,10 +59,24 @@ return null; } + private BigDecimal getCurrentCategoryId() { + String categoryId = (String) FacesContext.getCurrentInstance() + .getExternalContext().getRequestParameterMap().get( + PompeiConstants.CATEGORY_ID); + if (categoryId != null) { + try { + return new BigDecimal(Long.parseLong(categoryId)); + } catch (NumberFormatException e) { + } + } + return (BigDecimal) SessionUtil + .getFromApplicationScope(PompeiConstants.CURRENT_CATEGORY_ID); + } + public Class prerender() { - BigDecimal currentCategoryId = (BigDecimal) SessionUtil - .getFromApplicationScope(PompeiConstants.CURRENT_CATEGORY_ID); + BigDecimal currentCategoryId = getCurrentCategoryId(); + if (currentCategoryId == null) { currentCategoryId = PompeiConstants.ROOT_CATEGORY_ID; //TODO should put it to session? From svnnotify ＠ sourceforge.jp Mon Nov 12 12:36:42 2007 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Mon, 12 Nov 2007 12:36:42 +0900 Subject: [pal-cvs 2958] [702] changed a width of product image. Message-ID: <1194838602.805224.17358.nullmailer@users.sourceforge.jp> Revision: 702 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=702 Author: shinsuke Date: 2007-11-12 12:36:42 +0900 (Mon, 12 Nov 2007) Log Message: ----------- changed a width of product image. Modified Paths: -------------- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productList.html -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productList.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productList.html 2007-11-12 03:35:49 UTC (rev 701) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productList.html 2007-11-12 03:36:42 UTC (rev 702) @@ -60,7 +60,7 @@
-
+
画像
@@ -74,7 +74,7 @@ - + From svnnotify ＠ sourceforge.jp Mon Nov 12 17:02:33 2007 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Mon, 12 Nov 2007 17:02:33 +0900 Subject: [pal-cvs 2959] [703] added portlet for displaying top products. Message-ID: <1194854553.221751.29476.nullmailer@users.sourceforge.jp> Revision: 703 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=703 Author: shinsuke Date: 2007-11-12 17:02:32 +0900 (Mon, 12 Nov 2007) Log Message: ----------- added portlet for displaying top products. Modified Paths: -------------- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/SystemUtil.java pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/jetspeed-portlet.xml pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/portlet.xml Added Paths: ----------- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/TopProductListAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/TopProductListPage.java pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/topProductList.html -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/SystemUtil.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/SystemUtil.java 2007-11-12 03:36:42 UTC (rev 702) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/SystemUtil.java 2007-11-12 08:02:32 UTC (rev 703) @@ -10,7 +10,6 @@ import jp.sf.pal.common.CommonException; import jp.sf.pal.pompei.PompeiConstants; -import org.apache.commons.lang.StringUtils; import org.apache.jetspeed.administration.PortalAdministration; import org.apache.jetspeed.page.PageManager; import org.apache.jetspeed.security.UserManager; @@ -126,4 +125,24 @@ .getRequestMap().get(PompeiConstants.PAGE_MANAGER_COMPONENT); } + public static String getTypeOfTopProducts() { + String typeOfTopProducts = getPortletConfig().getInitParameter( + PompeiConstants.TYPE_OF_TOP_PRODUCTS); + if (typeOfTopProducts == null) { + return PompeiConstants.DEFAULT_TYPE_OF_TOP_PRODUCTS; + } + return typeOfTopProducts; + } + + public static int getNumOfTopProducts() { + String count = getPortletConfig().getInitParameter( + PompeiConstants.TYPE_OF_TOP_PRODUCTS); + if (count != null) { + try { + return Integer.parseInt(count); + } catch (NumberFormatException e) { + } + } + return PompeiConstants.DEFAULT_NUM_OF_TOP_PRODUCTS; + } } Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/TopProductListAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/TopProductListAction.java 2007-11-12 03:36:42 UTC (rev 702) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/TopProductListAction.java 2007-11-12 08:02:32 UTC (rev 703) @@ -0,0 +1,129 @@ +package jp.sf.pal.pompei.web.user.product; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import jp.sf.pal.common.util.FacesMessageUtil; +import jp.sf.pal.pompei.PompeiConstants; +import jp.sf.pal.pompei.allcommon.cbean.PagingResultBean; +import jp.sf.pal.pompei.dxo.ProductDxo; +import jp.sf.pal.pompei.exentity.Product; +import jp.sf.pal.pompei.exentity.ProductImage; +import jp.sf.pal.pompei.service.ProductService; +import jp.sf.pal.pompei.util.SystemUtil; +import jp.sf.pal.pompei.util.UploadedFileUtil; + +public class TopProductListAction implements Serializable { + + /** + * + */ + private static final long serialVersionUID = -3171043762530754438L; + + /** + * + */ + private TopProductListPage topProductListPage; + + /** */ + private ProductService productService; + + /** */ + private ProductDxo productDxo; + + public Class initialize() { + return null; + } + + public Class prerender() { + + // TODO cache + String type = SystemUtil.getTypeOfTopProducts(); + int num = SystemUtil.getNumOfTopProducts(); + + //商品一覧の取得 + PagingResultBean productList = getProductService() + .getTopProductList(type, num); + List> sList = new ArrayList>(); + getProductDxo().convert(productList, sList); + getTopProductListPage().setProductItems(sList); + + // load thumbnail + loadThumbnail(sList); + + // render faces messages + FacesMessageUtil.renderMessages(); + return null; + } + + private void loadThumbnail(List> productList) { + for (Map map : productList) { + BigDecimal productId = (BigDecimal) map.get("productId"); + if (productId != null) { + // TODO improvement + ProductImage productImage = getProductService() + .getProductImageByProductIdAndType(productId, + PompeiConstants.THUMBNAIL_IMAGE_TYPE); + if (productImage != null) { + map.put(PompeiConstants.THUMBNAIL_IMAGE_URL, + UploadedFileUtil.getProductImageUrl(productImage + .getImageName())); + } else { + // set default image path + map + .put( + PompeiConstants.THUMBNAIL_IMAGE_URL, + UploadedFileUtil + .getProductImageUrl(PompeiConstants.DEFAULT_THUMBNAIL_IMAGE_NAME)); + } + + } + } + } + + /** + * @return the topProductListPage + */ + public TopProductListPage getTopProductListPage() { + return topProductListPage; + } + + /** + * @param topProductListPage the topProductListPage to set + */ + public void setTopProductListPage(TopProductListPage topProductListPage) { + this.topProductListPage = topProductListPage; + } + + /** + * @return the productService + */ + public ProductService getProductService() { + return productService; + } + + /** + * @param productService the productService to set + */ + public void setProductService(ProductService productService) { + this.productService = productService; + } + + /** + * @return the productDxo + */ + public ProductDxo getProductDxo() { + return productDxo; + } + + /** + * @param productDxo the productDxo to set + */ + public void setProductDxo(ProductDxo productDxo) { + this.productDxo = productDxo; + } + +} Property changes on: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/TopProductListAction.java ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/TopProductListPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/TopProductListPage.java 2007-11-12 03:36:42 UTC (rev 702) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/TopProductListPage.java 2007-11-12 08:02:32 UTC (rev 703) @@ -0,0 +1,144 @@ +package jp.sf.pal.pompei.web.user.product; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.List; +import java.util.Map; + +import jp.sf.pal.pompei.PompeiConstants; +import jp.sf.pal.pompei.exentity.ProductDescription; +import jp.sf.pal.pompei.service.LanguageService; +import jp.sf.pal.pompei.util.UrlBuilderUtil; + +import org.seasar.teeda.extension.annotation.convert.BigDecimalConverter; + +public class TopProductListPage implements Serializable { + + /** + * + */ + private static final long serialVersionUID = -8096518146757092176L; + + private int productIndex; + + private List> productItems; + + private BigDecimal productId; + + //TODO i18n + @BigDecimalConverter(pattern = "###,###") + private BigDecimal price; + + private LanguageService languageService; + + public int getProductIndex() { + return productIndex; + } + + public void setProductIndex(int productIndex) { + this.productIndex = productIndex; + } + + public List> getProductItems() { + return productItems; + } + + public void setProductItems(List> productItems) { + this.productItems = productItems; + } + + public BigDecimal getPrice() { + return price; + } + + public void setPrice(BigDecimal productsPrice) { + this.price = productsPrice; + } + + public BigDecimal getProductId() { + return productId; + } + + public void setProductId(BigDecimal productsId) { + this.productId = productsId; + } + + public String getCartLinkHref() { + return UrlBuilderUtil.createCartUrl(); + } + + /** + * @return languageService + */ + public LanguageService getLanguageService() { + return languageService; + } + + /** + * @param languageService 設定する languageService + */ + public void setLanguageService(LanguageService languageService) { + this.languageService = languageService; + } + + public String getProductName() { + //TODO + if (getProductItems() != null + && getProductIndex() < getProductItems().size()) { + List list = (List) productItems + .get(productIndex).get( + PompeiConstants.PRODUCT_DESCRIPTION_LIST); + for (ProductDescription pd : list) { + BigDecimal languagesId = getLanguageService() + .getCurrentLanguage().getLanguageId(); + if (pd.getLanguageId().equals(languagesId)) { + return pd.getName(); + } + } + // TODO need default lang? + } + return "-"; + } + + public String getProductTitle() { + //TODO + if (getProductItems() != null + && getProductIndex() < getProductItems().size()) { + List list = (List) productItems + .get(productIndex).get( + PompeiConstants.PRODUCT_DESCRIPTION_LIST); + for (ProductDescription pd : list) { + BigDecimal languagesId = getLanguageService() + .getCurrentLanguage().getLanguageId(); + if (pd.getLanguageId().equals(languagesId)) { + // TODO cut a long message? + return pd.getTitle(); + } + } + // TODO need default lang? + } + return "-"; + } + + public String getThumbnailImgSrc() { + if (getProductItems() != null + && getProductIndex() < getProductItems().size()) { + return (String) getProductItems().get(getProductIndex()).get( + PompeiConstants.THUMBNAIL_IMAGE_URL); + } + return ""; + } + + protected String getProductLinkHref() { + return UrlBuilderUtil.createProductListUrl() + "?productId=" + + getProductId(); + } + + public String getProductImageLinkHref() { + return getProductLinkHref(); + } + + public String getProductNameLinkHref() { + return getProductLinkHref(); + } +} Property changes on: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/TopProductListPage.java ___________________________________________________________________ Name: svn:eol-style + native Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/jetspeed-portlet.xml =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/jetspeed-portlet.xml 2007-11-12 03:36:42 UTC (rev 702) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/jetspeed-portlet.xml 2007-11-12 08:02:32 UTC (rev 703) @@ -40,6 +40,10 @@ OrderProducts public-view + + TopProductList + public-view + Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/portlet.xml =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/portlet.xml 2007-11-12 03:36:42 UTC (rev 702) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/portlet.xml 2007-11-12 08:02:32 UTC (rev 703) @@ -481,4 +481,37 @@ Signup + + Lists top products + トップ商品を一覧します + TopProductList + Pompei: Top Product List + Pompei: トップ商品一覧 + org.apache.portals.bridges.portletfilter.FilterPortlet + + portlet-class + org.seasar.teeda.core.portlet.FacesPortlet + + + portlet-filters + jp.sf.pal.facesresponse.FacesResponseFilter,jp.sf.pal.pooptimizer.OptimizerFilter,org.seasar.portlet.filter.S2PortletFilter,org.seasar.portlet.filter.HotdeployPortletFilter + + + view-page + /view/user/product/topProductList.html + + 0 + + text/html + VIEW + + en + ja + jp.sf.pal.pompei.web.user.product.ProductList + + Product List + Products + Product,List + + Added: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/topProductList.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/topProductList.html 2007-11-12 03:36:42 UTC (rev 702) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/topProductList.html 2007-11-12 08:02:32 UTC (rev 703) @@ -0,0 +1,24 @@ + + + + + +商品一覧画面 + + +
+
+
+
+ 画像 +
+ + AAAAAAA +
+ 価格円 +
+
+
+ + Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/topProductList.html ___________________________________________________________________ Name: svn:eol-style + native From svnnotify ＠ sourceforge.jp Mon Nov 12 17:04:26 2007 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Mon, 12 Nov 2007 17:04:26 +0900 Subject: [pal-cvs 2960] [704] parse productId in URL and bug fixes. Message-ID: <1194854666.681139.30953.nullmailer@users.sourceforge.jp> Revision: 704 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=704 Author: shinsuke Date: 2007-11-12 17:04:26 +0900 (Mon, 12 Nov 2007) Log Message: ----------- parse productId in URL and bug fixes. Modified Paths: -------------- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/pager/DefaultPager.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/ProductService.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/ProductServiceImpl.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderListAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/categoryList.html -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java 2007-11-12 08:02:32 UTC (rev 703) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java 2007-11-12 08:04:26 UTC (rev 704) @@ -11,11 +11,11 @@ public static final String VALUE = "value"; - public static final int DEFULAT_PAGE_SIZE = 15; + public static final int DEFAULT_PAGE_SIZE = 15; - public static final int DEFULAT_PAGE_RANGE_SIZE = 5; + public static final int DEFAULT_PAGE_RANGE_SIZE = 5; - public static final int DEFULAT_CURRENT_PAGE_NUMBER = 1; + public static final int DEFAULT_CURRENT_PAGE_NUMBER = 1; public static final String JPEG = ".jpg"; @@ -53,6 +53,8 @@ public static final String CATEGORY_ID = "categoryId"; + public static final String PRODUCT_ID = "productId"; + public static final String BREADCRUMB = "breadcrumb"; public static final String PRODUCT_DESCRIPTION_LIST = "productDescriptionList"; @@ -259,4 +261,20 @@ public static final String SUB_TOTAL_PRICE = PREFIX + "SubTotalPrice"; public static final String TAX = PREFIX + "Tax"; + + public static final String TYPE_OF_TOP_PRODUCTS = PREFIX + + "TypeOfTopProducts"; + + public static final String RATING = "rating"; + + public static final String ORDERED = "ordered"; + + public static final String REVIEDED = "reviewed"; + + public static final String DEFAULT_TYPE_OF_TOP_PRODUCTS = RATING; + + public static final String NUM_OF_TOP_PRODUCTS = PREFIX + + "NumOfTopProducts"; + + public static final int DEFAULT_NUM_OF_TOP_PRODUCTS = 8; } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/pager/DefaultPager.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/pager/DefaultPager.java 2007-11-12 08:02:32 UTC (rev 703) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/pager/DefaultPager.java 2007-11-12 08:04:26 UTC (rev 704) @@ -14,7 +14,7 @@ */ public int getPageSize() { if (pageSize <= 0) { - pageSize = PompeiConstants.DEFULAT_PAGE_SIZE; + pageSize = PompeiConstants.DEFAULT_PAGE_SIZE; } return pageSize; } @@ -31,7 +31,7 @@ */ public int getCurrentPageNumber() { if (currentPageNumber <= 0) { - currentPageNumber = PompeiConstants.DEFULAT_CURRENT_PAGE_NUMBER; + currentPageNumber = PompeiConstants.DEFAULT_CURRENT_PAGE_NUMBER; } return currentPageNumber; } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/ProductService.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/ProductService.java 2007-11-12 08:02:32 UTC (rev 703) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/ProductService.java 2007-11-12 08:04:26 UTC (rev 704) @@ -38,4 +38,6 @@ public ProductImage getProductImageByProductIdAndType(BigDecimal productId, BigDecimal type); + + public PagingResultBean getTopProductList(String type, int num); } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/ProductServiceImpl.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/ProductServiceImpl.java 2007-11-12 08:02:32 UTC (rev 703) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/ProductServiceImpl.java 2007-11-12 08:04:26 UTC (rev 704) @@ -290,6 +290,30 @@ return getProductImageBhv().selectEntity(cb); } + public PagingResultBean getTopProductList(String type, int num) { + ProductCB cb = new ProductCB(); + + // pager + cb.fetchFirst(num); + cb.fetchPage(1); + + // setup + cb.setupSelect_Manufacturer(); + + if (PompeiConstants.RATING.equals(type)) { + cb.query().addOrderBy_Rating_Desc(); + } else if (PompeiConstants.ORDERED.equals(type)) { + cb.query().addOrderBy_Ordered_Desc(); + } else if (PompeiConstants.REVIEDED.equals(type)) { + cb.query().addOrderBy_Reviewed_Desc(); + } + + PagingResultBean productList = getProductBhv().selectPage(cb); + //TODO there may be better method.. + getProductBhv().loadProductDescriptionList(productList); + return productList; + } + public ProductDescriptionBhv getProductDescriptionBhv() { return productDescriptionBhv; } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderListAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderListAction.java 2007-11-12 08:02:32 UTC (rev 703) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderListAction.java 2007-11-12 08:04:26 UTC (rev 704) @@ -84,7 +84,7 @@ getOrderListPage()); // page range - orderFormList.setPageRangeSize(PompeiConstants.DEFULAT_PAGE_RANGE_SIZE); + orderFormList.setPageRangeSize(PompeiConstants.DEFAULT_PAGE_RANGE_SIZE); int[] pageNumberArray = orderFormList.pageRange() .createPageNumberArray(); List> pageNumberItems = new ArrayList>(); Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsAction.java 2007-11-12 08:02:32 UTC (rev 703) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsAction.java 2007-11-12 08:04:26 UTC (rev 704) @@ -47,6 +47,21 @@ return null; } + private boolean isProductDetails() { + String productId = (String) FacesContext.getCurrentInstance() + .getExternalContext().getRequestParameterMap().get( + PompeiConstants.PRODUCT_ID); + if (productId != null) { + try { + long id = Long.parseLong(productId); + getProductDetailsPage().setProductId(BigDecimal.valueOf(id)); + return true; + } catch (NumberFormatException e) { + } + } + return false; + } + public Class prerender() { // check login @@ -79,8 +94,10 @@ } // check product - if (getProductDetailsPage().getProductId() == null) { - return ProductListPage.class; + if (!isProductDetails()) { + if (getProductDetailsPage().getProductId() == null) { + return ProductListPage.class; + } } ProductDescription description = productService Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java 2007-11-12 08:02:32 UTC (rev 703) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java 2007-11-12 08:04:26 UTC (rev 704) @@ -9,6 +9,7 @@ import javax.faces.context.FacesContext; +import jp.sf.pal.common.util.FacesMessageUtil; import jp.sf.pal.pompei.PompeiConstants; import jp.sf.pal.pompei.allcommon.cbean.PagingResultBean; import jp.sf.pal.pompei.dxo.CategoryDxo; @@ -73,7 +74,25 @@ .getFromApplicationScope(PompeiConstants.CURRENT_CATEGORY_ID); } + private boolean isProductDetails() { + String productId = (String) FacesContext.getCurrentInstance() + .getExternalContext().getRequestParameterMap().get( + PompeiConstants.PRODUCT_ID); + if (productId != null) { + try { + long id = Long.parseLong(productId); + getProductListPage().setProductId(BigDecimal.valueOf(id)); + return true; + } catch (NumberFormatException e) { + } + } + return false; + } + public Class prerender() { + if (isProductDetails()) { + return ProductDetailsPage.class; + } BigDecimal currentCategoryId = getCurrentCategoryId(); @@ -82,7 +101,16 @@ //TODO should put it to session? } - //TODO check previous category + // check previous category + BigDecimal previousCategoryId = (BigDecimal) SessionUtil + .getFromLocalScope(PompeiConstants.CURRENT_CATEGORY_ID); + if (previousCategoryId != null + && !previousCategoryId.equals(currentCategoryId)) { + // change category + getProductListPage().setPageNumber( + PompeiConstants.DEFAULT_CURRENT_PAGE_NUMBER); + getProductListPage().setPageSize(PompeiConstants.DEFAULT_PAGE_SIZE); + } // store category id to local session SessionUtil.putToLocalScope(PompeiConstants.CURRENT_CATEGORY_ID, @@ -134,7 +162,7 @@ getProductListPage()); // page range - productList.setPageRangeSize(PompeiConstants.DEFULAT_PAGE_RANGE_SIZE); + productList.setPageRangeSize(PompeiConstants.DEFAULT_PAGE_RANGE_SIZE); int[] pageNumberArray = productList.pageRange().createPageNumberArray(); List> pageNumberItems = new ArrayList>(); for (int i : pageNumberArray) { @@ -152,6 +180,9 @@ getProductListPage().setDisplayMode( PompeiConstants.THUMBNAIL_DISPLAY); } + + // render faces messages + FacesMessageUtil.renderMessages(); return null; } Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/categoryList.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/categoryList.html 2007-11-12 08:02:32 UTC (rev 703) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/categoryList.html 2007-11-12 08:04:26 UTC (rev 704) @@ -18,14 +18,14 @@
From svnnotify ＠ sourceforge.jp Tue Nov 13 16:40:43 2007 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Tue, 13 Nov 2007 16:40:43 +0900 Subject: [pal-cvs 2961] [705] fixed page navigation. Message-ID: <1194939643.527323.9622.nullmailer@users.sourceforge.jp> Revision: 705 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=705 Author: shinsuke Date: 2007-11-13 16:40:43 +0900 (Tue, 13 Nov 2007) Log Message: ----------- fixed page navigation. Modified Paths: -------------- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/CategoryListAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java 2007-11-12 08:04:26 UTC (rev 704) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java 2007-11-13 07:40:43 UTC (rev 705) @@ -277,4 +277,8 @@ + "NumOfTopProducts"; public static final int DEFAULT_NUM_OF_TOP_PRODUCTS = 8; + + public static final String IS_FROM_DETAILS_PAGE = PREFIX + + "IsFromDetailsPage"; + } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/CategoryListAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/CategoryListAction.java 2007-11-12 08:04:26 UTC (rev 704) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/CategoryListAction.java 2007-11-13 07:40:43 UTC (rev 705) @@ -43,8 +43,12 @@ } catch (NumberFormatException e) { } } - return (BigDecimal) SessionUtil + BigDecimal id = (BigDecimal) SessionUtil .getFromApplicationScope(PompeiConstants.CURRENT_CATEGORY_ID); + if (id != null) { + id = new BigDecimal(id.longValue()); + } + return id; } public Class prerender() { Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsAction.java 2007-11-12 08:04:26 UTC (rev 704) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsAction.java 2007-11-13 07:40:43 UTC (rev 705) @@ -90,12 +90,16 @@ || !ccid .equals(SessionUtil .getFromLocalScope(PompeiConstants.CURRENT_CATEGORY_ID))) { + SessionUtil.putToLocalScope(PompeiConstants.IS_FROM_DETAILS_PAGE, + Boolean.TRUE); return ProductListPage.class; } // check product if (!isProductDetails()) { if (getProductDetailsPage().getProductId() == null) { + SessionUtil.putToLocalScope( + PompeiConstants.IS_FROM_DETAILS_PAGE, Boolean.TRUE); return ProductListPage.class; } } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java 2007-11-12 08:04:26 UTC (rev 704) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java 2007-11-13 07:40:43 UTC (rev 705) @@ -70,8 +70,12 @@ } catch (NumberFormatException e) { } } - return (BigDecimal) SessionUtil + BigDecimal id = (BigDecimal) SessionUtil .getFromApplicationScope(PompeiConstants.CURRENT_CATEGORY_ID); + if (id != null) { + id = new BigDecimal(id.longValue()); + } + return id; } private boolean isProductDetails() { @@ -79,6 +83,12 @@ .getExternalContext().getRequestParameterMap().get( PompeiConstants.PRODUCT_ID); if (productId != null) { + if (SessionUtil + .getFromLocalScope(PompeiConstants.IS_FROM_DETAILS_PAGE) != null) { + SessionUtil + .removeFromLocalScope(PompeiConstants.IS_FROM_DETAILS_PAGE); + return false; + } try { long id = Long.parseLong(productId); getProductListPage().setProductId(BigDecimal.valueOf(id)); @@ -86,19 +96,17 @@ } catch (NumberFormatException e) { } } + SessionUtil.removeFromLocalScope(PompeiConstants.IS_FROM_DETAILS_PAGE); return false; } public Class prerender() { - if (isProductDetails()) { - return ProductDetailsPage.class; - } - BigDecimal currentCategoryId = getCurrentCategoryId(); if (currentCategoryId == null) { currentCategoryId = PompeiConstants.ROOT_CATEGORY_ID; - //TODO should put it to session? + SessionUtil.putToApplicationScope( + PompeiConstants.CURRENT_CATEGORY_ID, currentCategoryId); } // check previous category @@ -114,8 +122,13 @@ // store category id to local session SessionUtil.putToLocalScope(PompeiConstants.CURRENT_CATEGORY_ID, - currentCategoryId); + currentCategoryId != null ? new BigDecimal(currentCategoryId + .longValue()) : null); + if (isProductDetails()) { + return ProductDetailsPage.class; + } + // set page number and size if (getProductListPage().getPageNumber() != 0 && getProductListPage().getPageSize() != 0) { From svnnotify ＠ sourceforge.jp Mon Nov 19 18:02:20 2007 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Mon, 19 Nov 2007 18:02:20 +0900 Subject: [pal-cvs 2962] [706] many bug fixes for user management, site editor, change password, and permission editor. Message-ID: <1195462940.140145.6486.nullmailer@users.sourceforge.jp> Revision: 706 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=706 Author: shinsuke Date: 2007-11-19 18:02:17 +0900 (Mon, 19 Nov 2007) Log Message: ----------- many bug fixes for user management, site editor, change password, and permission editor. Modified Paths: -------------- pal-admin/trunk/src/main/java/jp/sf/pal/admin/PALAdminConstants.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SecurityProviderLogic.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/AbstractGroupPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/GroupConfirmPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/GroupEditPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/password/PasswordEditPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/AbstractPermissionPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionConfirmPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionEditPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionConfirmPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionEditPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionConfirmPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionEditPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/AbstractRolePage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleConfirmPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleEditPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderAddFolderAndPageEditorPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderInfoEditorPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPreferenceEditorPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPropertyEditorPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageInfoEditorPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPreferenceEditorPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPropertyEditorPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/AbstractUserAttributePage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/AbstractUserPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeConfirmPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeEditPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeListPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserConfirmPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserCreatePage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserEditPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserGroupEditPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserListPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserProfilingRuleEditPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserRoleEditPage.java pal-admin/trunk/src/main/resources/appMessages.properties pal-admin/trunk/src/main/resources/appMessages_ja.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/group/label.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/group/label_ja.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/label.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/label_ja.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/label.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/label_ja.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/role/label.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/role/label_ja.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label_ja.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/user/label.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/user/label_ja.properties pal-admin/trunk/src/main/webapp/WEB-INF/portlet.xml pal-admin/trunk/src/main/webapp/view/deployer/remotePortletList.html pal-admin/trunk/src/main/webapp/view/deployer/remoteRepositoryList.html pal-admin/trunk/src/main/webapp/view/group/groupConfirm.html pal-admin/trunk/src/main/webapp/view/group/groupList.html pal-admin/trunk/src/main/webapp/view/permission/folderPermissionList.html pal-admin/trunk/src/main/webapp/view/permission/pagePermissionList.html pal-admin/trunk/src/main/webapp/view/permission/portletPermissionList.html pal-admin/trunk/src/main/webapp/view/portletmanager/portletList.html pal-admin/trunk/src/main/webapp/view/role/roleConfirm.html pal-admin/trunk/src/main/webapp/view/role/roleList.html pal-admin/trunk/src/main/webapp/view/site/folderAddFolderAndPageEditor.html pal-admin/trunk/src/main/webapp/view/site/layoutPreferenceEditor.html pal-admin/trunk/src/main/webapp/view/site/layoutPropertyEditor.html pal-admin/trunk/src/main/webapp/view/site/portletPreferenceEditor.html pal-admin/trunk/src/main/webapp/view/site/portletPropertyEditor.html pal-admin/trunk/src/main/webapp/view/user/userAttributeConfirm.html pal-admin/trunk/src/main/webapp/view/user/userAttributeEdit.html pal-admin/trunk/src/main/webapp/view/user/userAttributeList.html pal-admin/trunk/src/main/webapp/view/user/userConfirm.html pal-admin/trunk/src/main/webapp/view/user/userList.html Added Paths: ----------- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/ChangePassword.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/ChangePassword_ja.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/ForgottenPassword.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/ForgottenPassword_ja.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/PermissionEditor.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/PermissionEditor_ja.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalWithdrawal.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalWithdrawal_ja.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/SiteEditor.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/SiteEditor_ja.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/UserManagement.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/UserManagement_ja.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/UserRegistration.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/UserRegistrationUpdate.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/UserRegistrationUpdate_ja.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/UserRegistration_ja.properties Removed Paths: ------------- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/password/ChangePassword.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/password/ChangePassword_ja.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/PermissionEditor.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/PermissionEditor_ja.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/ForgottenPassword.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/ForgottenPassword_ja.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/UserRegistration.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/UserRegistrationUpdate.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/UserRegistrationUpdate_ja.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/UserRegistration_ja.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/withdraw/PublicPortalWithdrawal.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/withdraw/PublicPortalWithdrawal_ja.properties -------------- next part -------------- Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/PALAdminConstants.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/PALAdminConstants.java 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/PALAdminConstants.java 2007-11-19 09:02:17 UTC (rev 706) @@ -78,8 +78,10 @@ public static final String NEXT_PAGE_NUMBER = "nextPageNumber"; //TODO move to portlet.xml file - public static final int DEFAULT_PAGER_LIMIT_SIZE = 25; + public static final int DEFAULT_PAGER_LIMIT_SIZE = 2; + // public static final int DEFAULT_PAGER_LIMIT_SIZE = 25; + public static final String DEFAULT_USER_TEMPLATE_FOLDER_NAME = "_template"; public static final String DEFAULT_USER_TEMPLATE_FOLDER = Folder.USER_FOLDER Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SecurityProviderLogic.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SecurityProviderLogic.java 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SecurityProviderLogic.java 2007-11-19 09:02:17 UTC (rev 706) @@ -286,7 +286,7 @@ fb.toString(), pager.getAuthenticationProviderName())); int startAtIndex = pager.getOffset() + 1; - int endAtIndex = startAtIndex + pager.getLimit(); + int endAtIndex = startAtIndex + pager.getLimit() - 1; fb.append(", startAtIndex=").append(startAtIndex).append( ", endAtIndex=").append(endAtIndex); Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/AbstractGroupPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/AbstractGroupPage.java 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/AbstractGroupPage.java 2007-11-19 09:02:17 UTC (rev 706) @@ -19,13 +19,16 @@ import jp.sf.pal.admin.web.AbstractCrudPage; import org.seasar.teeda.extension.annotation.validator.Required; +import org.seasar.teeda.extension.util.LabelHelper; -public class AbstractGroupPage extends AbstractCrudPage { +public abstract class AbstractGroupPage extends AbstractCrudPage { private String name; private GroupManagementService groupManagementService; + private LabelHelper labelHelper; + public AbstractGroupPage() { super(); } @@ -54,4 +57,18 @@ this.groupManagementService = groupManagementService; } + /** + * @return the labelHelper + */ + public LabelHelper getLabelHelper() { + return labelHelper; + } + + /** + * @param labelHelper the labelHelper to set + */ + public void setLabelHelper(LabelHelper labelHelper) { + this.labelHelper = labelHelper; + } + } \ No newline at end of file Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/GroupConfirmPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/GroupConfirmPage.java 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/GroupConfirmPage.java 2007-11-19 09:02:17 UTC (rev 706) @@ -22,6 +22,8 @@ import jp.sf.pal.common.util.FacesMessageUtil; import org.seasar.framework.log.Logger; +import org.seasar.teeda.extension.annotation.validator.Length; +import org.seasar.teeda.extension.annotation.validator.Required; public class GroupConfirmPage extends AbstractGroupPage implements Serializable { @@ -84,4 +86,26 @@ } + /* (non-Javadoc) + * @see jp.sf.pal.admin.web.group.AbstractGroupPage#setName(java.lang.String) + */ + @Override + @Required + @Length(maximum = 255) + public void setName(String groupName) { + super.setName(groupName); + } + + public String getJumpGroupListValue() { + return getLabelHelper().getLabelValue("backToGroupList"); + } + + public String getDoFinishValue() { + if (getCrudType() == CrudType.CREATE) { + return getLabelHelper().getLabelValue("create"); + } else if (getCrudType() == CrudType.DELETE) { + return getLabelHelper().getLabelValue("delete"); + } + throw new IllegalStateException("Invalid state."); + } } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/GroupEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/GroupEditPage.java 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/GroupEditPage.java 2007-11-19 09:02:17 UTC (rev 706) @@ -17,6 +17,9 @@ import java.io.Serializable; +import org.seasar.teeda.extension.annotation.validator.Length; +import org.seasar.teeda.extension.annotation.validator.Required; + import jp.sf.pal.common.util.FacesMessageUtil; public class GroupEditPage extends AbstractGroupPage implements Serializable { @@ -38,4 +41,21 @@ return null; } + public String getJumpGroupListValue() { + return getLabelHelper().getLabelValue("backToGroupList"); + } + + public String getGoGroupConfirmValue() { + return getLabelHelper().getLabelValue("confirm"); + } + + /* (non-Javadoc) + * @see jp.sf.pal.admin.web.group.AbstractGroupPage#setName(java.lang.String) + */ + @Override + @Required + @Length(maximum = 255) + public void setName(String groupName) { + super.setName(groupName); + } } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/password/PasswordEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/password/PasswordEditPage.java 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/password/PasswordEditPage.java 2007-11-19 09:02:17 UTC (rev 706) @@ -23,6 +23,7 @@ import org.seasar.framework.log.Logger; import org.seasar.teeda.extension.annotation.validator.Equal; +import org.seasar.teeda.extension.annotation.validator.Length; import org.seasar.teeda.extension.annotation.validator.Required; import org.seasar.teeda.extension.util.LabelHelper; @@ -40,9 +41,11 @@ .getLogger(PasswordEditPage.class); @Required + @Length(maximum = 255) private String currentPassword; @Required + @Length(maximum = 255) private String newPassword; @Required Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/AbstractPermissionPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/AbstractPermissionPage.java 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/AbstractPermissionPage.java 2007-11-19 09:02:17 UTC (rev 706) @@ -15,6 +15,9 @@ */ package jp.sf.pal.admin.web.permission; +import org.seasar.teeda.extension.util.LabelHelper; + +import jp.sf.pal.admin.service.PermissionManagementService; import jp.sf.pal.admin.web.AbstractCrudPage; public abstract class AbstractPermissionPage extends AbstractCrudPage { @@ -28,6 +31,10 @@ private String[] roleArray; + private PermissionManagementService permissionManagementService; + + private LabelHelper labelHelper; + public String getName() { return name; } @@ -91,4 +98,33 @@ public void setRoleArray(String[] roleArray) { this.roleArray = roleArray; } + + /** + * @return the permissionManagementService + */ + public PermissionManagementService getPermissionManagementService() { + return permissionManagementService; + } + + /** + * @param permissionManagementService the permissionManagementService to set + */ + public void setPermissionManagementService( + PermissionManagementService permissionManagementService) { + this.permissionManagementService = permissionManagementService; + } + + /** + * @return the labelHelper + */ + public LabelHelper getLabelHelper() { + return labelHelper; + } + + /** + * @param labelHelper the labelHelper to set + */ + public void setLabelHelper(LabelHelper labelHelper) { + this.labelHelper = labelHelper; + } } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionConfirmPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionConfirmPage.java 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionConfirmPage.java 2007-11-19 09:02:17 UTC (rev 706) @@ -18,12 +18,13 @@ import java.io.Serializable; import jp.sf.pal.admin.PALAdminException; -import jp.sf.pal.admin.service.PermissionManagementService; import jp.sf.pal.admin.web.CrudType; import jp.sf.pal.common.util.FacesMessageUtil; import org.apache.commons.lang.StringUtils; import org.seasar.framework.log.Logger; +import org.seasar.teeda.extension.annotation.validator.Length; +import org.seasar.teeda.extension.annotation.validator.Required; public class FolderPermissionConfirmPage extends AbstractPermissionPage implements Serializable { @@ -41,8 +42,6 @@ private String oldActions; - private PermissionManagementService permissionManagementService; - public Class initialize() { return null; } @@ -134,18 +133,46 @@ this.oldActions = oldActions; } - /** - * @return the permissionManagementService + /* (non-Javadoc) + * @see jp.sf.pal.admin.web.permission.AbstractPermissionPage#setActionArray(java.lang.String[]) */ - public PermissionManagementService getPermissionManagementService() { - return permissionManagementService; + @Override + @Required + public void setActionArray(String[] actionArray) { + super.setActionArray(actionArray); } - /** - * @param permissionManagementService the permissionManagementService to set + /* (non-Javadoc) + * @see jp.sf.pal.admin.web.permission.AbstractPermissionPage#setName(java.lang.String) */ - public void setPermissionManagementService( - PermissionManagementService permissionManagementService) { - this.permissionManagementService = permissionManagementService; + @Override + @Required + @Length(maximum = 255) + public void setName(String name) { + super.setName(name); } + + /* (non-Javadoc) + * @see jp.sf.pal.admin.web.permission.AbstractPermissionPage#setRoleArray(java.lang.String[]) + */ + @Override + @Required + public void setRoleArray(String[] roleArray) { + super.setRoleArray(roleArray); + } + + public String getDoFinishValue() { + if (isCreate()) { + return getLabelHelper().getLabelValue("create"); + } else if (isUpdate()) { + return getLabelHelper().getLabelValue("update"); + } else if (isDelete()) { + return getLabelHelper().getLabelValue("delete"); + } + throw new IllegalStateException("Invalid state."); + } + + public String getDoBackValue() { + return getLabelHelper().getLabelValue("back"); + } } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionEditPage.java 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionEditPage.java 2007-11-19 09:02:17 UTC (rev 706) @@ -19,13 +19,13 @@ import java.util.List; import java.util.Map; -import org.seasar.framework.log.Logger; -import org.seasar.teeda.extension.annotation.validator.Required; - import jp.sf.pal.admin.PALAdminException; -import jp.sf.pal.admin.service.PermissionManagementService; import jp.sf.pal.common.util.FacesMessageUtil; +import org.seasar.framework.log.Logger; +import org.seasar.teeda.extension.annotation.validator.Length; +import org.seasar.teeda.extension.annotation.validator.Required; + public class FolderPermissionEditPage extends AbstractPermissionPage implements Serializable { @@ -44,8 +44,6 @@ private List> roleArrayItems; - private PermissionManagementService permissionManagementService; - public Class doConfirm() { return FolderPermissionConfirmPage.class; } @@ -84,28 +82,12 @@ this.roleArrayItems = rolesItems; } - /** - * @return the permissionManagementService - */ - public PermissionManagementService getPermissionManagementService() { - return permissionManagementService; - } - - /** - * @param permissionManagementService the permissionManagementService to set - */ - public void setPermissionManagementService( - PermissionManagementService permissionManagementService) { - this.permissionManagementService = permissionManagementService; - } - /* (non-Javadoc) * @see jp.sf.pal.admin.web.permission.AbstractPermissionPage#setActionArray(java.lang.String[]) */ @Override @Required public void setActionArray(String[] actionArray) { - // TODO Auto-generated method stub super.setActionArray(actionArray); } @@ -114,8 +96,8 @@ */ @Override @Required + @Length(maximum = 255) public void setName(String name) { - // TODO Auto-generated method stub super.setName(name); } @@ -125,7 +107,14 @@ @Override @Required public void setRoleArray(String[] roleArray) { - // TODO Auto-generated method stub super.setRoleArray(roleArray); } + + public String getJumpFolderPermissionListValue() { + return getLabelHelper().getLabelValue("backToFolderPermissionList"); + } + + public String getDoConfirmValue() { + return getLabelHelper().getLabelValue("confirm"); + } } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionConfirmPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionConfirmPage.java 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionConfirmPage.java 2007-11-19 09:02:17 UTC (rev 706) @@ -17,14 +17,15 @@ import java.io.Serializable; -import org.apache.commons.lang.StringUtils; -import org.seasar.framework.log.Logger; - import jp.sf.pal.admin.PALAdminException; -import jp.sf.pal.admin.service.PermissionManagementService; import jp.sf.pal.admin.web.CrudType; import jp.sf.pal.common.util.FacesMessageUtil; +import org.apache.commons.lang.StringUtils; +import org.seasar.framework.log.Logger; +import org.seasar.teeda.extension.annotation.validator.Length; +import org.seasar.teeda.extension.annotation.validator.Required; + public class PagePermissionConfirmPage extends AbstractPermissionPage implements Serializable { @@ -41,8 +42,6 @@ private String oldActions; - private PermissionManagementService permissionManagementService; - public Class initialize() { return null; } @@ -134,18 +133,47 @@ this.oldActions = oldActions; } - /** - * @return the permissionManagementService + /* (non-Javadoc) + * @see jp.sf.pal.admin.web.permission.AbstractPermissionPage#setActionArray(java.lang.String[]) */ - public PermissionManagementService getPermissionManagementService() { - return permissionManagementService; + @Override + @Required + public void setActionArray(String[] actionArray) { + // TODO Auto-generated method stub + super.setActionArray(actionArray); } - /** - * @param permissionManagementService the permissionManagementService to set + /* (non-Javadoc) + * @see jp.sf.pal.admin.web.permission.AbstractPermissionPage#setName(java.lang.String) */ - public void setPermissionManagementService( - PermissionManagementService permissionManagementService) { - this.permissionManagementService = permissionManagementService; + @Override + @Required + @Length(maximum = 255) + public void setName(String name) { + super.setName(name); } + + /* (non-Javadoc) + * @see jp.sf.pal.admin.web.permission.AbstractPermissionPage#setRoleArray(java.lang.String[]) + */ + @Override + @Required + public void setRoleArray(String[] roleArray) { + super.setRoleArray(roleArray); + } + + public String getDoFinishValue() { + if (isCreate()) { + return getLabelHelper().getLabelValue("create"); + } else if (isUpdate()) { + return getLabelHelper().getLabelValue("update"); + } else if (isDelete()) { + return getLabelHelper().getLabelValue("delete"); + } + throw new IllegalStateException("Invalid state."); + } + + public String getDoBackValue() { + return getLabelHelper().getLabelValue("back"); + } } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionEditPage.java 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionEditPage.java 2007-11-19 09:02:17 UTC (rev 706) @@ -19,13 +19,13 @@ import java.util.List; import java.util.Map; -import org.seasar.framework.log.Logger; -import org.seasar.teeda.extension.annotation.validator.Required; - import jp.sf.pal.admin.PALAdminException; -import jp.sf.pal.admin.service.PermissionManagementService; import jp.sf.pal.common.util.FacesMessageUtil; +import org.seasar.framework.log.Logger; +import org.seasar.teeda.extension.annotation.validator.Length; +import org.seasar.teeda.extension.annotation.validator.Required; + public class PagePermissionEditPage extends AbstractPermissionPage implements Serializable { @@ -44,8 +44,6 @@ private List> roleArrayItems; - private PermissionManagementService permissionManagementService; - public Class doConfirm() { return PagePermissionConfirmPage.class; } @@ -83,21 +81,6 @@ this.roleArrayItems = rolesItems; } - /** - * @return the permissionManagementService - */ - public PermissionManagementService getPermissionManagementService() { - return permissionManagementService; - } - - /** - * @param permissionManagementService the permissionManagementService to set - */ - public void setPermissionManagementService( - PermissionManagementService permissionManagementService) { - this.permissionManagementService = permissionManagementService; - } - /* (non-Javadoc) * @see jp.sf.pal.admin.web.permission.AbstractPermissionPage#setActionArray(java.lang.String[]) */ @@ -113,8 +96,8 @@ */ @Override @Required + @Length(maximum = 255) public void setName(String name) { - // TODO Auto-generated method stub super.setName(name); } @@ -124,7 +107,14 @@ @Override @Required public void setRoleArray(String[] roleArray) { - // TODO Auto-generated method stub super.setRoleArray(roleArray); } + + public String getJumpPagePermissionListValue() { + return getLabelHelper().getLabelValue("backToPagePermissionList"); + } + + public String getDoConfirmValue() { + return getLabelHelper().getLabelValue("confirm"); + } } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionConfirmPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionConfirmPage.java 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionConfirmPage.java 2007-11-19 09:02:17 UTC (rev 706) @@ -17,14 +17,15 @@ import java.io.Serializable; -import org.apache.commons.lang.StringUtils; -import org.seasar.framework.log.Logger; - import jp.sf.pal.admin.PALAdminException; -import jp.sf.pal.admin.service.PermissionManagementService; import jp.sf.pal.admin.web.CrudType; import jp.sf.pal.common.util.FacesMessageUtil; +import org.apache.commons.lang.StringUtils; +import org.seasar.framework.log.Logger; +import org.seasar.teeda.extension.annotation.validator.Length; +import org.seasar.teeda.extension.annotation.validator.Required; + public class PortletPermissionConfirmPage extends AbstractPermissionPage implements Serializable { @@ -41,8 +42,6 @@ private String oldActions; - private PermissionManagementService permissionManagementService; - public Class initialize() { return null; } @@ -134,18 +133,46 @@ this.oldActions = oldActions; } - /** - * @return the permissionManagementService + /* (non-Javadoc) + * @see jp.sf.pal.admin.web.permission.AbstractPermissionPage#setActionArray(java.lang.String[]) */ - public PermissionManagementService getPermissionManagementService() { - return permissionManagementService; + @Override + @Required + public void setActionArray(String[] actionArray) { + super.setActionArray(actionArray); } - /** - * @param permissionManagementService the permissionManagementService to set + /* (non-Javadoc) + * @see jp.sf.pal.admin.web.permission.AbstractPermissionPage#setName(java.lang.String) */ - public void setPermissionManagementService( - PermissionManagementService permissionManagementService) { - this.permissionManagementService = permissionManagementService; + @Override + @Required + @Length(maximum = 255) + public void setName(String name) { + super.setName(name); } + + /* (non-Javadoc) + * @see jp.sf.pal.admin.web.permission.AbstractPermissionPage#setRoleArray(java.lang.String[]) + */ + @Override + @Required + public void setRoleArray(String[] roleArray) { + super.setRoleArray(roleArray); + } + + public String getDoFinishValue() { + if (isCreate()) { + return getLabelHelper().getLabelValue("create"); + } else if (isUpdate()) { + return getLabelHelper().getLabelValue("update"); + } else if (isDelete()) { + return getLabelHelper().getLabelValue("delete"); + } + throw new IllegalStateException("Invalid state."); + } + + public String getDoBackValue() { + return getLabelHelper().getLabelValue("back"); + } } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionEditPage.java 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionEditPage.java 2007-11-19 09:02:17 UTC (rev 706) @@ -19,13 +19,13 @@ import java.util.List; import java.util.Map; -import org.seasar.framework.log.Logger; -import org.seasar.teeda.extension.annotation.validator.Required; - import jp.sf.pal.admin.PALAdminException; -import jp.sf.pal.admin.service.PermissionManagementService; import jp.sf.pal.common.util.FacesMessageUtil; +import org.seasar.framework.log.Logger; +import org.seasar.teeda.extension.annotation.validator.Length; +import org.seasar.teeda.extension.annotation.validator.Required; + public class PortletPermissionEditPage extends AbstractPermissionPage implements Serializable { @@ -44,8 +44,6 @@ private List> roleArrayItems; - private PermissionManagementService permissionManagementService; - public Class doConfirm() { return PortletPermissionConfirmPage.class; } @@ -84,28 +82,12 @@ this.roleArrayItems = rolesItems; } - /** - * @return the permissionManagementService - */ - public PermissionManagementService getPermissionManagementService() { - return permissionManagementService; - } - - /** - * @param permissionManagementService the permissionManagementService to set - */ - public void setPermissionManagementService( - PermissionManagementService permissionManagementService) { - this.permissionManagementService = permissionManagementService; - } - /* (non-Javadoc) * @see jp.sf.pal.admin.web.permission.AbstractPermissionPage#setActionArray(java.lang.String[]) */ @Override @Required public void setActionArray(String[] actionArray) { - // TODO Auto-generated method stub super.setActionArray(actionArray); } @@ -114,8 +96,8 @@ */ @Override @Required + @Length(maximum = 255) public void setName(String name) { - // TODO Auto-generated method stub super.setName(name); } @@ -125,8 +107,15 @@ @Override @Required public void setRoleArray(String[] roleArray) { - // TODO Auto-generated method stub super.setRoleArray(roleArray); } + public String getJumpPortletPermissionListValue() { + return getLabelHelper().getLabelValue("backToPortletPermissionList"); + } + + public String getDoConfirmValue() { + return getLabelHelper().getLabelValue("confirm"); + } + } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/AbstractRolePage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/AbstractRolePage.java 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/AbstractRolePage.java 2007-11-19 09:02:17 UTC (rev 706) @@ -19,13 +19,16 @@ import jp.sf.pal.admin.web.AbstractCrudPage; import org.seasar.teeda.extension.annotation.validator.Required; +import org.seasar.teeda.extension.util.LabelHelper; -public class AbstractRolePage extends AbstractCrudPage { +public abstract class AbstractRolePage extends AbstractCrudPage { private String name; private RoleManagementService roleManagementService; + private LabelHelper labelHelper; + public AbstractRolePage() { super(); } @@ -54,4 +57,18 @@ this.roleManagementService = roleManagementService; } + /** + * @return the labelHelper + */ + public LabelHelper getLabelHelper() { + return labelHelper; + } + + /** + * @param labelHelper the labelHelper to set + */ + public void setLabelHelper(LabelHelper labelHelper) { + this.labelHelper = labelHelper; + } + } \ No newline at end of file Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleConfirmPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleConfirmPage.java 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleConfirmPage.java 2007-11-19 09:02:17 UTC (rev 706) @@ -22,6 +22,8 @@ import jp.sf.pal.common.util.FacesMessageUtil; import org.seasar.framework.log.Logger; +import org.seasar.teeda.extension.annotation.validator.Length; +import org.seasar.teeda.extension.annotation.validator.Required; public class RoleConfirmPage extends AbstractRolePage implements Serializable { /** @@ -81,7 +83,30 @@ public boolean isComeFromList() { return getCrudType() == CrudType.READ || getCrudType() == CrudType.DELETE; + } + /* (non-Javadoc) + * @see jp.sf.pal.admin.web.role.AbstractRolePage#setName(java.lang.String) + */ + // @RegularExpression(pattern = "[\\p{Alpha}\\p{Digit}\',. ＠ _]+") + @Override + @Required + @Length(maximum = 255) + public void setName(String roleName) { + super.setName(roleName); } + public String getJumpRoleListValue() { + return getLabelHelper().getLabelValue("backToRoleList"); + } + + public String getDoFinishValue() { + if (getCrudType() == CrudType.CREATE) { + return getLabelHelper().getLabelValue("create"); + } else if (getCrudType() == CrudType.DELETE) { + return getLabelHelper().getLabelValue("delete"); + } + throw new IllegalStateException("Invalid state."); + } + } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleEditPage.java 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleEditPage.java 2007-11-19 09:02:17 UTC (rev 706) @@ -17,6 +17,10 @@ import java.io.Serializable; +import org.seasar.teeda.extension.annotation.validator.Length; +import org.seasar.teeda.extension.annotation.validator.RegularExpression; +import org.seasar.teeda.extension.annotation.validator.Required; + import jp.sf.pal.common.util.FacesMessageUtil; public class RoleEditPage extends AbstractRolePage implements Serializable { @@ -38,4 +42,22 @@ return null; } + public String getJumpRoleListValue() { + return getLabelHelper().getLabelValue("backToRoleList"); + } + + public String getGoRoleConfirmValue() { + return getLabelHelper().getLabelValue("confirm"); + } + + /* (non-Javadoc) + * @see jp.sf.pal.admin.web.role.AbstractRolePage#setName(java.lang.String) + */ + // @RegularExpression(pattern = "[\\p{Alpha}\\p{Digit}\',. ＠ _]+") + @Override + @Required + @Length(maximum = 255) + public void setName(String roleName) { + super.setName(roleName); + } } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderAddFolderAndPageEditorPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderAddFolderAndPageEditorPage.java 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderAddFolderAndPageEditorPage.java 2007-11-19 09:02:17 UTC (rev 706) @@ -26,6 +26,8 @@ import org.seasar.framework.log.Logger; import org.seasar.teeda.extension.annotation.takeover.TakeOver; import org.seasar.teeda.extension.annotation.takeover.TakeOverType; +import org.seasar.teeda.extension.annotation.validator.Length; +import org.seasar.teeda.extension.annotation.validator.RegularExpression; import org.seasar.teeda.extension.annotation.validator.Required; public class FolderAddFolderAndPageEditorPage extends AbstractSiteEditorPage @@ -53,10 +55,16 @@ private boolean folderOrPageHidden; + @Required + @Length(maximum = 255) + @RegularExpression(pattern = "[\\w\\.-]+") private String folderOrPageName; + @Length(maximum = 255) private String folderOrPageShortTitle; + @Required + @Length(maximum = 1000) private String folderOrPageTitle; @Required Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderInfoEditorPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderInfoEditorPage.java 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderInfoEditorPage.java 2007-11-19 09:02:17 UTC (rev 706) @@ -26,6 +26,8 @@ import org.seasar.framework.log.Logger; import org.seasar.teeda.extension.annotation.takeover.TakeOver; import org.seasar.teeda.extension.annotation.takeover.TakeOverType; +import org.seasar.teeda.extension.annotation.validator.Length; +import org.seasar.teeda.extension.annotation.validator.Required; public class FolderInfoEditorPage extends AbstractSiteEditorPage implements Serializable { @@ -51,8 +53,11 @@ private boolean folderHidden; + @Length(maximum = 255) private String folderShortTitle; + @Required + @Length(maximum = 1000) private String folderTitle; private String portletDecorator; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPreferenceEditorPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPreferenceEditorPage.java 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPreferenceEditorPage.java 2007-11-19 09:02:17 UTC (rev 706) @@ -23,9 +23,12 @@ import jp.sf.pal.common.CommonException; import jp.sf.pal.common.util.FacesMessageUtil; +import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.lang.StringUtils; import org.seasar.framework.log.Logger; import org.seasar.teeda.extension.annotation.takeover.TakeOver; import org.seasar.teeda.extension.annotation.takeover.TakeOverType; +import org.seasar.teeda.extension.annotation.validator.Length; import org.seasar.teeda.extension.annotation.validator.Required; public class LayoutPreferenceEditorPage extends AbstractSiteEditorPage @@ -42,6 +45,8 @@ private static final Logger logger = Logger .getLogger(LayoutPreferenceEditorPage.class); + private static final int MAX_LENGTH_OF_STRING = 30; + private int propertyIndex; private List> propertyItems; @@ -51,6 +56,7 @@ private String propertyValue; @Required + @Length(maximum = 255) private String newPreferenceName; private String newPreferenceValue; @@ -172,6 +178,10 @@ return propertyName; } + public String getPreferenceNameForView() { + return StringUtils.abbreviate(propertyName, MAX_LENGTH_OF_STRING); + } + /** * @param propertyName the propertyName to set */ @@ -186,6 +196,11 @@ return propertyValue; } + public String getPreferenceValueForView() { + return StringUtils.abbreviate(StringEscapeUtils + .unescapeXml(propertyValue), MAX_LENGTH_OF_STRING); + } + /** * @param propertyValue the propertyValue to set */ @@ -234,4 +249,8 @@ public void setAction(String action) { this.action = action; } + + public String getdoAddValue() { + return getLabelHelper().getLabelValue("add"); + } } \ No newline at end of file Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPropertyEditorPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPropertyEditorPage.java 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPropertyEditorPage.java 2007-11-19 09:02:17 UTC (rev 706) @@ -23,9 +23,11 @@ import jp.sf.pal.common.CommonException; import jp.sf.pal.common.util.FacesMessageUtil; +import org.apache.commons.lang.StringUtils; import org.seasar.framework.log.Logger; import org.seasar.teeda.extension.annotation.takeover.TakeOver; import org.seasar.teeda.extension.annotation.takeover.TakeOverType; +import org.seasar.teeda.extension.annotation.validator.Length; import org.seasar.teeda.extension.annotation.validator.Required; public class LayoutPropertyEditorPage extends AbstractSiteEditorPage implements @@ -42,6 +44,8 @@ private static final Logger logger = Logger .getLogger(LayoutPropertyEditorPage.class); + private static final int MAX_LENGTH_OF_STRING = 30; + private int propertyIndex; private List> propertyItems; @@ -51,6 +55,7 @@ private String propertyValue; @Required + @Length(maximum = 255) private String newPropertyName; private String newPropertyValue; @@ -172,6 +177,10 @@ return propertyName; } + public String getPropertyNameForView() { + return StringUtils.abbreviate(propertyName, MAX_LENGTH_OF_STRING); + } + /** * @param propertyName the propertyName to set */ @@ -186,6 +195,10 @@ return propertyValue; } + public String getPropertyValueForView() { + return StringUtils.abbreviate(propertyValue, MAX_LENGTH_OF_STRING); + } + /** * @param propertyValue the propertyValue to set */ @@ -234,4 +247,8 @@ public void setAction(String action) { this.action = action; } + + public String getdoAddValue() { + return getLabelHelper().getLabelValue("add"); + } } \ No newline at end of file Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageInfoEditorPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageInfoEditorPage.java 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageInfoEditorPage.java 2007-11-19 09:02:17 UTC (rev 706) @@ -26,6 +26,7 @@ import org.seasar.framework.log.Logger; import org.seasar.teeda.extension.annotation.takeover.TakeOver; import org.seasar.teeda.extension.annotation.takeover.TakeOverType; +import org.seasar.teeda.extension.annotation.validator.Length; import org.seasar.teeda.extension.annotation.validator.Required; public class PageInfoEditorPage extends AbstractSiteEditorPage implements @@ -42,8 +43,11 @@ private static final Logger logger = Logger .getLogger(PageInfoEditorPage.class); + @Required + @Length(maximum = 1000) private String pageTitle; + @Length(maximum = 255) private String pageShortTitle; private List> pageDecoratorItems; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPreferenceEditorPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPreferenceEditorPage.java 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPreferenceEditorPage.java 2007-11-19 09:02:17 UTC (rev 706) @@ -23,9 +23,12 @@ import jp.sf.pal.common.CommonException; import jp.sf.pal.common.util.FacesMessageUtil; +import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.lang.StringUtils; import org.seasar.framework.log.Logger; import org.seasar.teeda.extension.annotation.takeover.TakeOver; import org.seasar.teeda.extension.annotation.takeover.TakeOverType; +import org.seasar.teeda.extension.annotation.validator.Length; import org.seasar.teeda.extension.annotation.validator.Required; public class PortletPreferenceEditorPage extends AbstractSiteEditorPage @@ -42,6 +45,8 @@ private static final Logger logger = Logger .getLogger(PortletPreferenceEditorPage.class); + private static final int MAX_LENGTH_OF_STRING = 30; + private int propertyIndex; private List> propertyItems; @@ -51,6 +56,7 @@ private String propertyValue; @Required + @Length(maximum = 255) private String newPreferenceName; private String newPreferenceValue; @@ -172,6 +178,10 @@ return propertyName; } + public String getPreferenceNameForView() { + return StringUtils.abbreviate(propertyName, MAX_LENGTH_OF_STRING); + } + /** * @param propertyName the propertyName to set */ @@ -186,6 +196,11 @@ return propertyValue; } + public String getPreferenceValueForView() { + return StringUtils.abbreviate(StringEscapeUtils + .unescapeXml(propertyValue), MAX_LENGTH_OF_STRING); + } + /** * @param propertyValue the propertyValue to set */ @@ -234,4 +249,8 @@ public void setAction(String action) { this.action = action; } + + public String getdoAddValue() { + return getLabelHelper().getLabelValue("add"); + } } \ No newline at end of file Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPropertyEditorPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPropertyEditorPage.java 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPropertyEditorPage.java 2007-11-19 09:02:17 UTC (rev 706) @@ -23,9 +23,11 @@ import jp.sf.pal.common.CommonException; import jp.sf.pal.common.util.FacesMessageUtil; +import org.apache.commons.lang.StringUtils; import org.seasar.framework.log.Logger; import org.seasar.teeda.extension.annotation.takeover.TakeOver; import org.seasar.teeda.extension.annotation.takeover.TakeOverType; +import org.seasar.teeda.extension.annotation.validator.Length; import org.seasar.teeda.extension.annotation.validator.Required; public class PortletPropertyEditorPage extends AbstractSiteEditorPage implements @@ -42,6 +44,8 @@ private static final Logger logger = Logger .getLogger(PortletPropertyEditorPage.class); + private static final int MAX_LENGTH_OF_STRING = 30; + private int propertyIndex; private List> propertyItems; @@ -51,6 +55,7 @@ private String propertyValue; @Required + @Length(maximum = 255) private String newPropertyName; private String newPropertyValue; @@ -172,6 +177,10 @@ return propertyName; } + public String getPropertyNameForView() { + return StringUtils.abbreviate(propertyName, MAX_LENGTH_OF_STRING); + } + /** * @param propertyName the propertyName to set */ @@ -186,6 +195,10 @@ return propertyValue; } + public String getPropertyValueForView() { + return StringUtils.abbreviate(propertyValue, MAX_LENGTH_OF_STRING); + } + /** * @param propertyValue the propertyValue to set */ @@ -234,4 +247,8 @@ public void setAction(String action) { this.action = action; } + + public String getdoAddValue() { + return getLabelHelper().getLabelValue("add"); + } } \ No newline at end of file Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/AbstractUserAttributePage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/AbstractUserAttributePage.java 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/AbstractUserAttributePage.java 2007-11-19 09:02:17 UTC (rev 706) @@ -15,10 +15,12 @@ */ package jp.sf.pal.admin.web.user; +import org.seasar.teeda.extension.util.LabelHelper; + import jp.sf.pal.admin.service.UserManagementService; import jp.sf.pal.admin.web.AbstractCrudPage; -public class AbstractUserAttributePage extends AbstractCrudPage { +public abstract class AbstractUserAttributePage extends AbstractCrudPage { private String name; @@ -28,6 +30,8 @@ private UserManagementService userManagementService; + private LabelHelper labelHelper; + public String getName() { return name; } @@ -73,4 +77,18 @@ this.userManagementService = userManagementService; } + /** + * @return the labelHelper + */ + public LabelHelper getLabelHelper() { + return labelHelper; + } + + /** + * @param labelHelper the labelHelper to set + */ + public void setLabelHelper(LabelHelper labelHelper) { + this.labelHelper = labelHelper; + } + } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/AbstractUserPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/AbstractUserPage.java 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/AbstractUserPage.java 2007-11-19 09:02:17 UTC (rev 706) @@ -19,8 +19,9 @@ import jp.sf.pal.admin.web.AbstractCrudPage; import org.seasar.teeda.extension.annotation.validator.Required; +import org.seasar.teeda.extension.util.LabelHelper; -public class AbstractUserPage extends AbstractCrudPage { +public abstract class AbstractUserPage extends AbstractCrudPage { private String name; @@ -32,6 +33,8 @@ private UserManagementService userManagementService; + private LabelHelper labelHelper; + public AbstractUserPage() { super(); } @@ -104,4 +107,18 @@ this.userManagementService = userManagementService; } + /** + * @return the labelHelper + */ + public LabelHelper getLabelHelper() { + return labelHelper; + } + + /** + * @param labelHelper the labelHelper to set + */ + public void setLabelHelper(LabelHelper labelHelper) { + this.labelHelper = labelHelper; + } + } \ No newline at end of file Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeConfirmPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeConfirmPage.java 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeConfirmPage.java 2007-11-19 09:02:17 UTC (rev 706) @@ -24,6 +24,8 @@ import org.seasar.framework.log.Logger; import org.seasar.teeda.extension.annotation.takeover.TakeOver; import org.seasar.teeda.extension.annotation.takeover.TakeOverType; +import org.seasar.teeda.extension.annotation.validator.Length; +import org.seasar.teeda.extension.annotation.validator.Required; public class UserAttributeConfirmPage extends AbstractUserAttributePage implements Serializable { @@ -74,39 +76,39 @@ try { getUserManagementService().insert(this); FacesMessageUtil.addInfoMessage("added.new.userattribute", - new Object[] { getName() }); + new Object[] { getKey() }); } catch (PALAdminException e) { FacesMessageUtil.addErrorMessage( "failed.to.add.new.userattribute", - new Object[] { getName() }); - logger.error( - "Failed to add a new user attribute: " + getName(), e); + new Object[] { getKey() }); + logger.error("Failed to add a new user attribute: " + getKey(), + e); } break; case CrudType.UPDATE: try { getUserManagementService().update(this); FacesMessageUtil.addInfoMessage("updated.new.userattribute", - new Object[] { getName() }); + new Object[] { getKey() }); } catch (PALAdminException e) { FacesMessageUtil.addErrorMessage( - "failed.to.add.new.userattribute", - new Object[] { getName() }); - logger.error( - "Failed to add a new user attribute: " + getName(), e); + "failed.to.update.new.userattribute", + new Object[] { getKey() }); + logger.error("Failed to update a new user attribute: " + getKey(), + e); } break; case CrudType.DELETE: try { getUserManagementService().delete(this); FacesMessageUtil.addInfoMessage("deleted.userattribute", - new Object[] { getName() }); + new Object[] { getKey() }); } catch (PALAdminException e) { FacesMessageUtil.addErrorMessage( "failed.to.delete.userattribute", - new Object[] { getName() }); + new Object[] { getKey() }); logger.error("Failed to delete a new user attribute: " - + getName(), e); + + getKey(), e); } break; default: @@ -121,4 +123,37 @@ } + /* (non-Javadoc) + * @see jp.sf.pal.admin.web.user.AbstractUserAttributePage#setKey(java.lang.String) + */ + @Override + @Required + @Length(maximum = 255) + public void setKey(String key) { + super.setKey(key); + } + + /* (non-Javadoc) + * @see jp.sf.pal.admin.web.user.AbstractUserAttributePage#setValue(java.lang.String) + */ + @Override + @Length(maximum = 255) + public void setValue(String value) { + super.setValue(value); + } + + public String getJumpUserAttributeListValue() { + return getLabelHelper().getLabelValue("back"); + } + + public String getDoUpdateValue() { + if (getCrudType() == CrudType.CREATE) { + return getLabelHelper().getLabelValue("create"); + } else if (getCrudType() == CrudType.UPDATE) { + return getLabelHelper().getLabelValue("update"); + } else if (getCrudType() == CrudType.DELETE) { + return getLabelHelper().getLabelValue("delete"); + } + throw new IllegalStateException("Invalid state."); + } } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeEditPage.java 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeEditPage.java 2007-11-19 09:02:17 UTC (rev 706) @@ -22,6 +22,8 @@ import jp.sf.pal.common.util.FacesMessageUtil; import org.seasar.framework.log.Logger; +import org.seasar.teeda.extension.annotation.validator.Length; +import org.seasar.teeda.extension.annotation.validator.Required; public class UserAttributeEditPage extends AbstractUserAttributePage implements Serializable { @@ -63,8 +65,35 @@ return null; } - public Class doBack() { - setCrudType(CrudType.READ); - return UserAttributeListPage.class; + // public Class doBack() { + // setCrudType(CrudType.READ); + // return UserAttributeListPage.class; + // } + + public String getJumpUserAttributeListValue() { + return getLabelHelper().getLabelValue("back"); } + + public String getGoUserAttributeConfirmValue() { + return getLabelHelper().getLabelValue("confirm"); + } + + /* (non-Javadoc) + * @see jp.sf.pal.admin.web.user.AbstractUserAttributePage#setKey(java.lang.String) + */ + @Override + @Required + @Length(maximum = 255) + public void setKey(String key) { + super.setKey(key); + } + + /* (non-Javadoc) + * @see jp.sf.pal.admin.web.user.AbstractUserAttributePage#setValue(java.lang.String) + */ + @Override + @Length(maximum = 255) + public void setValue(String value) { + super.setValue(value); + } } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeListPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeListPage.java 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeListPage.java 2007-11-19 09:02:17 UTC (rev 706) @@ -27,6 +27,7 @@ import org.seasar.framework.log.Logger; import org.seasar.teeda.extension.annotation.takeover.TakeOver; +import org.seasar.teeda.extension.util.LabelHelper; public class UserAttributeListPage extends AbstractPagerPage implements Serializable { @@ -42,6 +43,8 @@ private static final Logger logger = Logger .getLogger(UserAttributeListPage.class); + private LabelHelper labelHelper; + private String name; private String key; @@ -139,4 +142,21 @@ return null; } + /** + * @return the labelHelper + */ + public LabelHelper getLabelHelper() { + return labelHelper; + } + + /** + * @param labelHelper the labelHelper to set + */ + public void setLabelHelper(LabelHelper labelHelper) { + this.labelHelper = labelHelper; + } + + public String getDoCreateValue() { + return getLabelHelper().getLabelValue("create"); + } } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserConfirmPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserConfirmPage.java 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserConfirmPage.java 2007-11-19 09:02:17 UTC (rev 706) @@ -26,7 +26,6 @@ import org.seasar.framework.log.Logger; import org.seasar.teeda.extension.annotation.takeover.TakeOver; -import org.seasar.teeda.extension.annotation.takeover.TakeOverType; public class UserConfirmPage extends AbstractUserPage implements Serializable { /** @@ -50,8 +49,7 @@ return null; } - @TakeOver(type = TakeOverType.NEVER) - public Class doFinish() { + public Class doFinishCreate() { switch (getCrudType()) { case CrudType.CREATE: addUser(); @@ -64,6 +62,13 @@ default: break; } + + // clear + // TODO needed? + setName(null); + setRoleName(null); + setUpdateRequired(false); + return UserListPage.class; } @@ -114,4 +119,18 @@ } + public String getJumpUserListValue() { + return getLabelHelper().getLabelValue("backToUserList"); + } + + public String getDoCreateValue() { + return getLabelHelper().getLabelValue("backToEdit"); + } + + public String getDoFinishCreateValue() { + if (getCrudType() == CrudType.DELETE) { + return getLabelHelper().getLabelValue("delete"); + } + return getLabelHelper().getLabelValue("create"); + } } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserCreatePage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserCreatePage.java 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserCreatePage.java 2007-11-19 09:02:17 UTC (rev 706) @@ -24,6 +24,9 @@ import org.seasar.teeda.extension.annotation.takeover.TakeOver; import org.seasar.teeda.extension.annotation.validator.Equal; +import org.seasar.teeda.extension.annotation.validator.Length; +import org.seasar.teeda.extension.annotation.validator.RegularExpression; +import org.seasar.teeda.extension.annotation.validator.Required; public class UserCreatePage extends AbstractUserPage implements Serializable { /** @@ -34,8 +37,32 @@ private List> roleNameItems; @Equal(targetId = "password") + @Required + @Length(maximum = 255) private String passwordConfirm; + /* (non-Javadoc) + * @see jp.sf.pal.admin.web.user.AbstractUserPage#setName(java.lang.String) + */ + @Override + @Required + @Length(maximum = 255) + @RegularExpression(pattern = "[\\p{Alpha}\\p{Digit}\',. ＠ _]+") + public void setName(String userName) { + super.setName(userName); + } + + /* (non-Javadoc) + * @see jp.sf.pal.admin.web.user.AbstractUserPage#setPassword(java.lang.String) + */ + @Override + @Required + @Length(maximum = 255) + @RegularExpression(pattern = "[\\p{Alpha}\\p{Digit}\\p{Punct}]+") + public void setPassword(String password) { + super.setPassword(password); + } + /** * @return the roleItems */ @@ -85,4 +112,12 @@ public void setPasswordConfirm(String passwordConfrim) { this.passwordConfirm = passwordConfrim; } + + public String getJumpUserListValue() { + return getLabelHelper().getLabelValue("backToUserList"); + } + + public String getDoConfirmValue() { + return getLabelHelper().getLabelValue("confirm"); + } } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserEditPage.java 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserEditPage.java 2007-11-19 09:02:17 UTC (rev 706) @@ -27,6 +27,7 @@ import org.seasar.framework.log.Logger; import org.seasar.teeda.extension.annotation.validator.Equal; import org.seasar.teeda.extension.annotation.validator.Required; +import org.seasar.teeda.extension.util.LabelHelper; public class UserEditPage extends AbstractCrudPage implements Serializable { /** @@ -38,7 +39,7 @@ * Logger for this class */ private static final Logger logger = Logger.getLogger(UserEditPage.class); - +private LabelHelper labelHelper; private List> expiresItems; private int expiresIndex; @@ -221,4 +222,25 @@ public void setPasswordConfirm(String passwordConfrim) { this.passwordConfirm = passwordConfrim; } + public String getJumpUserListValue(){ +return getLabelHelper().getLabelValue("backToUserList"); + } + + public String getDoUpdateValue(){ + return getLabelHelper().getLabelValue("update"); + } + + /** + * @return the labelHelper + */ + public LabelHelper getLabelHelper() { + return labelHelper; + } + + /** + * @param labelHelper the labelHelper to set + */ + public void setLabelHelper(LabelHelper labelHelper) { + this.labelHelper = labelHelper; + } } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserGroupEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserGroupEditPage.java 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserGroupEditPage.java 2007-11-19 09:02:17 UTC (rev 706) @@ -27,6 +27,7 @@ import org.apache.commons.lang.StringUtils; import org.seasar.framework.log.Logger; +import org.seasar.teeda.extension.util.LabelHelper; public class UserGroupEditPage extends AbstractCrudPage implements Serializable { /** @@ -40,6 +41,8 @@ private static final Logger logger = Logger .getLogger(UserGroupEditPage.class); + private LabelHelper labelHelper; + private String name; private List> newGroupItems; @@ -188,6 +191,11 @@ } public Class doRemoveGroup() { + if (getGroups() == null || getGroups().length == 0) { + FacesMessageUtil.addWarnMessage("need.to.select.groups"); + return null; + } + try { getUserManagementService().removeGroupsFromUser(this); FacesMessageUtil.addInfoMessage("removed.groups.from.user", @@ -212,4 +220,30 @@ } return false; } + + /** + * @return the labelHelper + */ + public LabelHelper getLabelHelper() { + return labelHelper; + } + + /** + * @param labelHelper the labelHelper to set + */ + public void setLabelHelper(LabelHelper labelHelper) { + this.labelHelper = labelHelper; + } + + public String getDoAddGroupValue() { + return getLabelHelper().getLabelValue("add"); + } + + public String getJumpUserListValue() { + return getLabelHelper().getLabelValue("backToUserList"); + } + + public String getDoRemoveGroupValue() { + return getLabelHelper().getLabelValue("remove"); + } } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserListPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserListPage.java 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserListPage.java 2007-11-19 09:02:17 UTC (rev 706) @@ -244,4 +244,12 @@ public void setLabelHelper(LabelHelper labelHelper) { this.labelHelper = labelHelper; } + + public String getDoSearchValue() { + return getLabelHelper().getLabelValue("search"); + } + + public String getDoResetSearchValue() { + return getLabelHelper().getLabelValue("reset"); + } } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserProfilingRuleEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserProfilingRuleEditPage.java 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserProfilingRuleEditPage.java 2007-11-19 09:02:17 UTC (rev 706) @@ -29,7 +29,10 @@ import org.apache.commons.lang.StringUtils; import org.seasar.framework.log.Logger; +import org.seasar.teeda.extension.util.LabelHelper; +import sun.reflect.ReflectionFactory.GetReflectionFactoryAction; + public class UserProfilingRuleEditPage extends AbstractCrudPage implements Serializable { /** @@ -43,6 +46,8 @@ private static final Logger logger = Logger .getLogger(UserProfilingRuleEditPage.class); + private LabelHelper labelHelper; + private String name; private List> newProfilingRuleNameItems; @@ -225,6 +230,11 @@ } public Class doRemoveProfilingRule() { + if (getPrincipalRules() == null || getPrincipalRules().length == 0) { + FacesMessageUtil.addWarnMessage("need.to.select.profiling.rules"); + return null; + } + try { getUserManagementService().removePrincipalRulesFromUser(this); FacesMessageUtil @@ -267,4 +277,29 @@ return false; } + /** + * @return the labelHelper + */ + public LabelHelper getLabelHelper() { + return labelHelper; + } + + /** + * @param labelHelper the labelHelper to set + */ + public void setLabelHelper(LabelHelper labelHelper) { + this.labelHelper = labelHelper; + } + + public String getDoAddProfilingRuleValue() { + return getLabelHelper().getLabelValue("add"); + } + + public String getDoRemoveProfilingRuleValue() { + return getLabelHelper().getLabelValue("remove"); + } + + public String getJumpUserListValue() { + return getLabelHelper().getLabelValue("backToUserList"); + } } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserRoleEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserRoleEditPage.java 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserRoleEditPage.java 2007-11-19 09:02:17 UTC (rev 706) @@ -27,6 +27,7 @@ import org.apache.commons.lang.StringUtils; import org.seasar.framework.log.Logger; +import org.seasar.teeda.extension.util.LabelHelper; public class UserRoleEditPage extends AbstractCrudPage implements Serializable { /** @@ -40,6 +41,8 @@ private static final Logger logger = Logger .getLogger(UserGroupEditPage.class); + private LabelHelper labelHelper; + private String name; private List> newRoleItems; @@ -179,6 +182,11 @@ } public String doRemoveRole() { + if (getRoles() == null || getRoles().length == 0) { + FacesMessageUtil.addWarnMessage("need.to.select.roles"); + return null; + } + try { getUserManagementService().removeRolesFromUser(this); FacesMessageUtil.addInfoMessage("removed.roles.from.user", @@ -204,4 +212,29 @@ return false; } + /** + * @return the labelHelper + */ + public LabelHelper getLabelHelper() { + return labelHelper; + } + + /** + * @param labelHelper the labelHelper to set + */ + public void setLabelHelper(LabelHelper labelHelper) { + this.labelHelper = labelHelper; + } + + public String getDoAddRoleValue() { + return getLabelHelper().getLabelValue("add"); + } + + public String getJumpUserListValue() { + return getLabelHelper().getLabelValue("backToUserList"); + } + + public String getDoRemoveRoleValue() { + return getLabelHelper().getLabelValue("remove"); + } } Modified: pal-admin/trunk/src/main/resources/appMessages.properties =================================================================== --- pal-admin/trunk/src/main/resources/appMessages.properties 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/resources/appMessages.properties 2007-11-19 09:02:17 UTC (rev 706) @@ -20,8 +20,9 @@ failed.to.delete.group=Failed to delete the Group({0}). added.new.userattribute=Added a new User Attribute({0}). -updated.new.userattribute=Updated a new User Attribute({0}). +updated.new.userattribute=Updated a User Attribute({0}). failed.to.add.new.userattribute=Failed to add a new User Attribute({0}). +failed.to.update.new.userattribute=Failed to update a User Attribute({0}). deleted.userattribute=Delete the User Attribute({0}). failed.to.delete.userattribute=Failed to delete the User Attribute({0}). @@ -245,3 +246,8 @@ invalid.current.password=Invalid password. Please check a current password. invalid.new.password=Invalid new password. Please check a new password. password.already.used=The password is already used. + +need.to.select.groups=Please select groups to remove them. +need.to.select.roles=Please select roles to remove them. +need.to.select.profiling.rules=Please select profiling rules to remove them. + Modified: pal-admin/trunk/src/main/resources/appMessages_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/appMessages_ja.properties 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/resources/appMessages_ja.properties 2007-11-19 09:02:17 UTC (rev 706) @@ -16,12 +16,13 @@ added.new.group=\u65b0\u898f\u30b0\u30eb\u30fc\u30d7({0})\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002 failed.to.add.new.group=\u65b0\u898f\u30b0\u30eb\u30fc\u30d7({0})\u306e\u8ffd\u52a0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 -deleted.group=\u30b0\u30eb\u30fc\u30d7{0})\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 +deleted.group=\u30b0\u30eb\u30fc\u30d7({0})\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 failed.to.delete.group=\u30b0\u30eb\u30fc\u30d7{0})\u306e\u524a\u9664\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 added.new.userattribute=\u65b0\u898f\u30e6\u30fc\u30b6\u30fc\u5c5e\u6027({0})\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002 -updated.new.userattribute=\u65b0\u898f\u30e6\u30fc\u30b6\u30fc\u5c5e\u6027({0})\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002 +updated.new.userattribute=\u30e6\u30fc\u30b6\u30fc\u5c5e\u6027({0})\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002 failed.to.add.new.userattribute=\u65b0\u898f\u30e6\u30fc\u30b6\u30fc\u5c5e\u6027({0})\u306e\u8ffd\u52a0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +failed.to.update.new.userattribute=\u30e6\u30fc\u30b6\u30fc\u5c5e\u6027({0})\u306e\u66f4\u65b0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 deleted.userattribute=\u30e6\u30fc\u30b6\u30fc\u5c5e\u6027({0})\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 failed.to.delete.userattribute=\u30e6\u30fc\u30b6\u30fc\u5c5e\u6027({0})\u306e\u524a\u9664\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 @@ -199,4 +200,54 @@ could.not.remove.user=\u30e6\u30fc\u30b6\u30fc\u3092\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 invalid.password=\u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002 +could.not.find.property=\u30d7\u30ed\u30d1\u30c6\u30a3\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +added.property=\u30d7\u30ed\u30d1\u30c6\u30a3\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002 +could.not.add.property=\u30d7\u30ed\u30d1\u30c6\u30a3\u3092\u8ffd\u52a0\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +deleted.property=\u30d7\u30ed\u30d1\u30c6\u30a3\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 +could.not.delete.property=\u30d7\u30ed\u30d1\u30c6\u30a3\u3092\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +could.not.find.preference=\u30d7\u30ea\u30d5\u30a1\u30ec\u30f3\u30b9\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +added.preference=\u30d7\u30ea\u30d5\u30a1\u30ec\u30f3\u30b9\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002 +could.not.add.preference=\u30d7\u30ea\u30d5\u30a1\u30ec\u30f3\u30b9\u3092\u8ffd\u52a0\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +deleted.preference=\u30d7\u30ea\u30d5\u30a1\u30ec\u30f3\u30b9\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 +could.not.delete.preference=\u30d7\u30ea\u30d5\u30a1\u30ec\u30f3\u30b9\u3092\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 + +could.not.find.target.action=\u5bfe\u8c61\u306e\u64cd\u4f5c\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 + +could.not.find.portlet.permissions=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +could.not.find.portlet.permission=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +could.not.add.portlet.permission=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u304c\u8ffd\u52a0\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +could.not.update.portlet.permission=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u304c\u66f4\u65b0\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +could.not.delete.portlet.permission=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u304c\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +added.portlet.permission=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002 +updated.portlet.permission=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002 +deleted.portlet.permission=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 + +could.not.find.folder.permissions=\u30d5\u30a9\u30eb\u30c0\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +could.not.find.folder.permission=\u30d5\u30a9\u30eb\u30c0\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +could.not.add.folder.permission=\u30d5\u30a9\u30eb\u30c0\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u304c\u8ffd\u52a0\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +could.not.update.folder.permission=\u30d5\u30a9\u30eb\u30c0\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u304c\u66f4\u65b0\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +could.not.delete.folder.permission=\u30d5\u30a9\u30eb\u30c0\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u304c\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +added.folder.permission=\u30d5\u30a9\u30eb\u30c0\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002 +updated.folder.permission=\u30d5\u30a9\u30eb\u30c0\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002 +deleted.folder.permission=\u30d5\u30a9\u30eb\u30c0\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 + +could.not.find.page.permissions=\u30da\u30fc\u30b8\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +could.not.find.page.permission=\u30da\u30fc\u30b8\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +could.not.add.page.permission=\u30da\u30fc\u30b8\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u304c\u8ffd\u52a0\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +could.not.update.page.permission=\u30da\u30fc\u30b8\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u304c\u66f4\u65b0\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +could.not.delete.page.permission=\u30da\u30fc\u30b8\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u304c\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +added.page.permission=\u30da\u30fc\u30b8\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002 +updated.page.permission=\u30da\u30fc\u30b8\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002 +deleted.page.permission=\u30da\u30fc\u30b8\u306e\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 + +could.not.change.password=\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u5909\u66f4\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +changed.password=\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u5909\u66f4\u3057\u307e\u3057\u305f\u3002 +invalid.current.password=\u4e0d\u6b63\u306a\u30d1\u30b9\u30ef\u30fc\u30c9\u3067\u3059\u3002\u73fe\u5728\u306e\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u3054\u78ba\u8a8d\u304f\u3060\u3055\u3044\u3002 +invalid.new.password=\u65b0\u898f\u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u4e0d\u6b63\u3067\u3059\u3002\u65b0\u898f\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u3054\u78ba\u8a8d\u304f\u3060\u3055\u3044\u3002 +password.already.used=\u305d\u306e\u30d1\u30b9\u30ef\u30fc\u30c9\u306f\u65e2\u306b\u5229\u7528\u3055\u308c\u3066\u3044\u307e\u3059\u3002 + +need.to.select.groups=\u524a\u9664\u3059\u308b\u30b0\u30eb\u30fc\u30d7\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +need.to.select.roles=\u524a\u9664\u3059\u308b\u30ed\u30fc\u30eb\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +need.to.select.profiling.rules=\u524a\u9664\u3059\u308b\u30d7\u30ed\u30d5\u30a1\u30a4\u30ea\u30f3\u30b0\u30eb\u30fc\u30eb\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002 + Copied: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/ChangePassword.properties (from rev 659, pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/password/ChangePassword.properties) =================================================================== Copied: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/ChangePassword_ja.properties (from rev 659, pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/password/ChangePassword_ja.properties) Copied: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/ForgottenPassword.properties (from rev 237, pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/ForgottenPassword.properties) Copied: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/ForgottenPassword_ja.properties (from rev 237, pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/ForgottenPassword_ja.properties) Copied: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/PermissionEditor.properties (from rev 658, pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/PermissionEditor.properties) Copied: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/PermissionEditor_ja.properties (from rev 658, pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/PermissionEditor_ja.properties) Copied: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalWithdrawal.properties (from rev 501, pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/withdraw/PublicPortalWithdrawal.properties) Copied: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/PublicPortalWithdrawal_ja.properties (from rev 501, pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/withdraw/PublicPortalWithdrawal_ja.properties) Added: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/SiteEditor.properties =================================================================== Property changes on: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/SiteEditor.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/SiteEditor_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/SiteEditor_ja.properties 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/SiteEditor_ja.properties 2007-11-19 09:02:17 UTC (rev 706) @@ -0,0 +1,4 @@ +# portlet info +javax.portlet.title=\u30b5\u30a4\u30c8\u30a8\u30c7\u30a3\u30bf\u30fc +javax.portlet.short-title=\u30b5\u30a4\u30c8\u30a8\u30c7\u30a3\u30bf\u30fc +javax.portlet.keywords=\u30b5\u30a4\u30c8 Property changes on: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/SiteEditor_ja.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/UserManagement.properties =================================================================== Property changes on: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/UserManagement.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/UserManagement_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/UserManagement_ja.properties 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/UserManagement_ja.properties 2007-11-19 09:02:17 UTC (rev 706) @@ -0,0 +1,4 @@ +# portlet info +javax.portlet.title=\u30e6\u30fc\u30b6\u30fc\u7ba1\u7406 +javax.portlet.short-title=\u30e6\u30fc\u30b6\u30fc\u7ba1\u7406 +javax.portlet.keywords=\u30e6\u30fc\u30b6\u30fc,\u7ba1\u7406 Property changes on: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/UserManagement_ja.properties ___________________________________________________________________ Name: svn:eol-style + native Copied: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/UserRegistration.properties (from rev 237, pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/UserRegistration.properties) Copied: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/UserRegistrationUpdate.properties (from rev 237, pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/UserRegistrationUpdate.properties) Copied: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/UserRegistrationUpdate_ja.properties (from rev 237, pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/UserRegistrationUpdate_ja.properties) Copied: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/resources/UserRegistration_ja.properties (from rev 240, pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/UserRegistration_ja.properties) Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/group/label.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/group/label.properties 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/group/label.properties 2007-11-19 09:02:17 UTC (rev 706) @@ -2,6 +2,19 @@ groupName=Group Name groupList=Group List groupInformation=Group Information +listTab=List +newTab=New +editTab=Edit +groupAction=Action # groupList groupList.delete=Delete + +# groupEdit +groupEdit.backToGroupList=Back To Group List +groupEdit.confirm=Confirm + +# groupConfirm +groupConfirm.backToGroupList=Back To Group List +groupConfirm.create=Create +groupConfirm.delete=Delete Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/group/label_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/group/label_ja.properties 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/group/label_ja.properties 2007-11-19 09:02:17 UTC (rev 706) @@ -1,7 +1,20 @@ # Common groupName=\u30b0\u30eb\u30fc\u30d7\u540d -groupList=\u30b0\u30eb\u30fc\u30d7\u306e\u4e00\u89a7 +groupList=\u30b0\u30eb\u30fc\u30d7\u4e00\u89a7 groupInformation=\u30b0\u30eb\u30fc\u30d7\u60c5\u5831 +listTab=\u4e00\u89a7 +newTab=\u65b0\u898f +editTab=\u7de8\u96c6 +groupAction=\u30a2\u30af\u30b7\u30e7\u30f3 # groupList groupList.delete=\u524a\u9664 + +# groupEdit +groupEdit.backToGroupList=\u30b0\u30eb\u30fc\u30d7\u4e00\u89a7\u306b\u623b\u308b +groupEdit.confirm=\u78ba\u8a8d + +# groupConfirm +groupConfirm.backToGroupList=\u30b0\u30eb\u30fc\u30d7\u4e00\u89a7\u306b\u623b\u308b +groupConfirm.create=\u767b\u9332 +groupConfirm.delete=\u524a\u9664 \ No newline at end of file Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/label.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/label.properties 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/label.properties 2007-11-19 09:02:17 UTC (rev 706) @@ -5,8 +5,12 @@ portletsTab=Portlets deployerTab=Deployer -previousPage=<> action=Action: filter=Filter: Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/label_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/label_ja.properties 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/label_ja.properties 2007-11-19 09:02:17 UTC (rev 706) @@ -5,8 +5,12 @@ portletsTab=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8 deployerTab=\u30c7\u30d7\u30ed\u30a4\u30e4\u30fc -previousPage=<<\u623b\u308b +previousPage=\u524d\u3078 +nextPage=\u6b21\u3078 +previousPageAtHeader=\u524d\u3078 +nextPageAtHeader=\u6b21\u3078 +previousPageAtFooter=\u524d\u3078 +nextPageAtFooter=\u6b21\u3078 found= \u4ef6\u898b\u3064\u304b\u308a\u307e\u3057\u305f\u3002 -nextPage=\u6b21\u3078>> action=\u30a2\u30af\u30b7\u30e7\u30f3: filter=\u30d5\u30a3\u30eb\u30bf\u30fc: Deleted: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/password/ChangePassword.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/password/ChangePassword.properties 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/password/ChangePassword.properties 2007-11-19 09:02:17 UTC (rev 706) @@ -1,5 +0,0 @@ -# portlet info -javax.portlet.title=\u30d1\u30b9\u30ef\u30fc\u30c9\u5909\u66f4 -javax.portlet.short-title=\u30d1\u30b9\u30ef\u30fc\u30c9 -javax.portlet.keywords=\u30d1\u30b9\u30ef\u30fc\u30c9 - Deleted: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/password/ChangePassword_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/password/ChangePassword_ja.properties 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/password/ChangePassword_ja.properties 2007-11-19 09:02:17 UTC (rev 706) @@ -1,5 +0,0 @@ -# portlet info -javax.portlet.title=\u30d1\u30b9\u30ef\u30fc\u30c9\u5909\u66f4 -javax.portlet.short-title=\u30d1\u30b9\u30ef\u30fc\u30c9 -javax.portlet.keywords=\u30d1\u30b9\u30ef\u30fc\u30c9 - Deleted: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/PermissionEditor.properties =================================================================== Deleted: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/PermissionEditor_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/PermissionEditor_ja.properties 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/PermissionEditor_ja.properties 2007-11-19 09:02:17 UTC (rev 706) @@ -1,5 +0,0 @@ -# portlet info -javax.portlet.title=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u30a8\u30c7\u30a3\u30bf\u30fc -javax.portlet.short-title=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3 -javax.portlet.keywords=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3 - Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/label.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/label.properties 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/label.properties 2007-11-19 09:02:17 UTC (rev 706) @@ -18,3 +18,16 @@ delete=Delete edit=Edit + +backToPortletPermissionList=Back To Permission List +backToFolderPermissionList=Back To Permission List +backToPagePermissionList=Back To Permission List +confirm=Confirm +create=Create +update=Update +back=Back + +name=Resource Name +actionArrayItems=Actions +roleArrayItems=Roles + Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/label_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/label_ja.properties 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/permission/label_ja.properties 2007-11-19 09:02:17 UTC (rev 706) @@ -18,3 +18,15 @@ delete=\u524a\u9664 edit=\u7de8\u96c6 + +backToPortletPermissionList=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u4e00\u89a7\u306b\u623b\u308b +backToFolderPermissionList=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u4e00\u89a7\u306b\u623b\u308b +backToPagePermissionList=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u4e00\u89a7\u306b\u623b\u308b +confirm=\u78ba\u8a8d +create=\u767b\u9332 +update=\u66f4\u65b0 +back=\u623b\u308b + +name=\u30ea\u30bd\u30fc\u30b9\u540d +actionArrayItems=\u30a2\u30af\u30b7\u30e7\u30f3 +roleArrayItems=\u30ed\u30fc\u30eb Deleted: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/ForgottenPassword.properties =================================================================== Deleted: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/ForgottenPassword_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/ForgottenPassword_ja.properties 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/ForgottenPassword_ja.properties 2007-11-19 09:02:17 UTC (rev 706) @@ -1,5 +0,0 @@ -# portlet info -javax.portlet.title=\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u518d\u767a\u884c -javax.portlet.short-title=\u518d\u767a\u884c -javax.portlet.keywords=\u30d1\u30b9\u30ef\u30fc\u30c9,\u767b\u9332,\u30b5\u30a4\u30f3\u30a2\u30c3\u30d7,\u65b0\u898f\u30e6\u30fc\u30b6\u30fc - Deleted: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/UserRegistration.properties =================================================================== Deleted: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/UserRegistrationUpdate.properties =================================================================== Deleted: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/UserRegistrationUpdate_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/UserRegistrationUpdate_ja.properties 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/UserRegistrationUpdate_ja.properties 2007-11-19 09:02:17 UTC (rev 706) @@ -1,5 +0,0 @@ -# portlet info -javax.portlet.title=\u30e6\u30fc\u30b6\u30fc\u60c5\u5831\u66f4\u65b0 -javax.portlet.short-title=\u30e6\u30fc\u30b6\u30fc\u60c5\u5831\u66f4\u65b0 -javax.portlet.keywords=\u30d1\u30b9\u30ef\u30fc\u30c9,\u66f4\u65b0,\u30e6\u30fc\u30b6\u30fc\u60c5\u5831 - Deleted: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/UserRegistration_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/UserRegistration_ja.properties 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/registration/UserRegistration_ja.properties 2007-11-19 09:02:17 UTC (rev 706) @@ -1,5 +0,0 @@ -# portlet info -javax.portlet.title=\u30e6\u30fc\u30b6\u30fc\u767b\u9332 -javax.portlet.short-title=\u30e6\u30fc\u30b6\u30fc\u767b\u9332 -javax.portlet.keywords=\u30d1\u30b9\u30ef\u30fc\u30c9,\u767b\u9332,\u30e6\u30fc\u30b6\u30fc\u60c5\u5831 - Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/role/label.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/role/label.properties 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/role/label.properties 2007-11-19 09:02:17 UTC (rev 706) @@ -2,6 +2,20 @@ roleName=Role Name roleList=Role List roleInformation=Role Information +listTab=List +newTab=New +editTab=Edit +roleAction=Action # roleList roleList.delete=Delete + +# roleEdit +roleEdit.backToRoleList=Back To Role List +roleEdit.confirm=Confirm + +# roleConfirm +roleConfirm.backToRoleList=Back To Role List +roleConfirm.create=Create +roleConfirm.delete=Delete + Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/role/label_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/role/label_ja.properties 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/role/label_ja.properties 2007-11-19 09:02:17 UTC (rev 706) @@ -1,7 +1,21 @@ # Common roleName=\u30ed\u30fc\u30eb\u540d -roleList=\u30ed\u30fc\u30eb\u306e\u4e00\u89a7 +roleList=\u30ed\u30fc\u30eb\u4e00\u89a7 roleInformation=\u30ed\u30fc\u30eb\u60c5\u5831 +listTab=\u4e00\u89a7 +newTab=\u65b0\u898f +editTab=\u7de8\u96c6 +roleAction=\u30a2\u30af\u30b7\u30e7\u30f3 # roleList roleList.delete=\u524a\u9664 + +# roleEdit +roleEdit.backToRoleList=\u30ed\u30fc\u30eb\u4e00\u89a7\u306b\u623b\u308b +roleEdit.confirm=\u78ba\u8a8d + +# roleConfirm +roleConfirm.backToRoleList=\u30ed\u30fc\u30eb\u4e00\u89a7\u306b\u623b\u308b +roleConfirm.create=\u767b\u9332 +roleConfirm.delete=\u524a\u9664 + Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label.properties 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label.properties 2007-11-19 09:02:17 UTC (rev 706) @@ -5,100 +5,101 @@ orderTab=Order propertyTab=Property preferenceTab=Preference -path=Path: +path=Path finish=Finish securityConstraintType=Definition securityConstraintsRefType=Reference -pageInfoEditor.pageTitle=Title: -pageInfoEditor.pageShortTitle=Short Title: -pageInfoEditor.pageDecorator=Page Decorator: -pageInfoEditor.portletDecorator=Portlet Decorator: -pageInfoEditor.desktopTheme=Desktop Theme: -pageInfoEditor.pageHidden=Hide This Page?: +pageInfoEditor.pageTitle=Title +pageInfoEditor.pageShortTitle=Short Title +pageInfoEditor.pageDecorator=Page Decorator +pageInfoEditor.portletDecorator=Portlet Decorator +pageInfoEditor.desktopTheme=Desktop Theme +pageInfoEditor.pageHidden=Hide This Page? pageInfoEditor.jumpToThisPage=Jump To This Page pageInfoEditor.update=Update pageInfoEditor.delete=Delete -folderInfoEditor.folderTitle=Title: -folderInfoEditor.folderShortTitle=Short Title: -folderInfoEditor.pageDecorator=Page Decorator: -folderInfoEditor.portletDecorator=Portlet Decorator: -folderInfoEditor.desktopTheme=Desktop Theme: -folderInfoEditor.folderHidden=Hide This Folder?: +folderInfoEditor.folderTitle=Title +folderInfoEditor.folderShortTitle=Short Title +folderInfoEditor.pageDecorator=Page Decorator +folderInfoEditor.portletDecorator=Portlet Decorator +folderInfoEditor.desktopTheme=Desktop Theme +folderInfoEditor.folderHidden=Hide This Folder? folderInfoEditor.update=Update folderInfoEditor.delete=Delete -layoutInfoEditor.fragmentId=ID: -layoutInfoEditor.layoutName=Layout: -layoutInfoEditor.decorator=Decorator: -layoutInfoEditor.desktopTheme=Desktop Theme: +layoutInfoEditor.fragmentId=ID +layoutInfoEditor.layoutName=Layout +layoutInfoEditor.decorator=Decorator +layoutInfoEditor.desktopTheme=Desktop Theme layoutInfoEditor.update=Update layoutInfoEditor.delete=Delete -portletInfoEditor.fragmentId=ID: -portletInfoEditor.portletName=Portlet: -portletInfoEditor.decorator=Decorator: -portletInfoEditor.desktopTheme=Desktop Theme: +portletInfoEditor.fragmentId=ID +portletInfoEditor.portletName=Portlet +portletInfoEditor.decorator=Decorator +portletInfoEditor.desktopTheme=Desktop Theme portletInfoEditor.update=Update portletInfoEditor.delete=Delete -layoutAddPortletEditor.layoutName=Layout: -layoutAddPortletEditor.portletName=Portlet: +layoutAddPortletEditor.layoutName=Layout +layoutAddPortletEditor.portletName=Portlet layoutAddPortletEditor.addLayout=Add Layout layoutAddPortletEditor.addPortlet=Add Portlet -folderAddFolderAndPageEditor.folderOrPageName=Name: -folderAddFolderAndPageEditor.folderOrPageTitle=Title: -folderAddFolderAndPageEditor.folderOrPageShortTitle=Short Title: -folderAddFolderAndPageEditor.layoutName=Layout: -folderAddFolderAndPageEditor.pageDecorator=Page Decorator: -folderAddFolderAndPageEditor.portletDecorator=Portlet Decorator: -folderAddFolderAndPageEditor.desktopTheme=Desktop Theme: -folderAddFolderAndPageEditor.folderOrPageHidden=Hide This Folder/Page?: +folderAddFolderAndPageEditor.folderOrPageName=Name +folderAddFolderAndPageEditor.folderOrPageTitle=Title +folderAddFolderAndPageEditor.folderOrPageShortTitle=Short Title +folderAddFolderAndPageEditor.layoutName=Layout +folderAddFolderAndPageEditor.pageDecorator=Page Decorator +folderAddFolderAndPageEditor.portletDecorator=Portlet Decorator +folderAddFolderAndPageEditor.desktopTheme=Desktop Theme +folderAddFolderAndPageEditor.folderOrPageHidden=Hide This Folder/Page? folderAddFolderAndPageEditor.addFolder=Add Folder folderAddFolderAndPageEditor.addPage=Add Page +folderAddFolderAndPageEditor.alnumonly=(a-zA-Z0-9_-. only) pageSecurityEditor.securityConstraint= Security Constraint pageSecurityEditor.type= Type pageSecurityEditor.permission= Permission pageSecurityEditor.action=Action pageSecurityEditor.delete=Delete -pageSecurityEditor.users=Users: -pageSecurityEditor.groups=Groups: -pageSecurityEditor.roles=Roles: -pageSecurityEditor.permissions=Permissions: -pageSecurityEditor.securityConstraintsRef=Constraint Ref: +pageSecurityEditor.users=Users +pageSecurityEditor.groups=Groups +pageSecurityEditor.roles=Roles +pageSecurityEditor.permissions=Permissions +pageSecurityEditor.securityConstraintsRef=Constraint Ref folderSecurityEditor.securityConstraint= Security Constraint folderSecurityEditor.type= Type folderSecurityEditor.permission= Permission folderSecurityEditor.action=Action folderSecurityEditor.delete=Delete -folderSecurityEditor.users=Users: -folderSecurityEditor.groups=Groups: -folderSecurityEditor.roles=Roles: -folderSecurityEditor.permissions=Permissions: -folderSecurityEditor.securityConstraintsRef=Constraint Ref: +folderSecurityEditor.users=Users +folderSecurityEditor.groups=Groups +folderSecurityEditor.roles=Roles +folderSecurityEditor.permissions=Permissions +folderSecurityEditor.securityConstraintsRef=Constraint Ref folderSecurityEditor.addConstraint=Add Constraint folderSecurityEditor.addConstraintRef=Add Constraint Ref -folderOrderEditor.changeOrderTitle=Order Change: +folderOrderEditor.changeOrderTitle=Order Change folderOrderEditor.down=Down folderOrderEditor.up=Up folderOrderEditor.add=Add folderOrderEditor.delete=Delete -folderOrderEditor.documentName=Document Name: +folderOrderEditor.documentName=Document Name folderMetadataEditor.name=Name folderMetadataEditor.locale=Locale folderMetadataEditor.value=Value folderMetadataEditor.action=Action folderMetadataEditor.delete=Delete -folderMetadataEditor.newMetadataLocale=Locale: -folderMetadataEditor.newMetadataName=Name: -folderMetadataEditor.newMetadataValue=Value: +folderMetadataEditor.newMetadataLocale=Locale +folderMetadataEditor.newMetadataName=Name +folderMetadataEditor.newMetadataValue=Value folderMetadataEditor.add=Add pageMetadataEditor.name=Name @@ -106,40 +107,40 @@ pageMetadataEditor.value=Value pageMetadataEditor.action=Action pageMetadataEditor.delete=Delete -pageMetadataEditor.newMetadataLocale=Locale: -pageMetadataEditor.newMetadataName=Name: -pageMetadataEditor.newMetadataValue=Value: +pageMetadataEditor.newMetadataLocale=Locale +pageMetadataEditor.newMetadataName=Name +pageMetadataEditor.newMetadataValue=Value pageMetadataEditor.add=Add layoutPropertyEditor.name=Name layoutPropertyEditor.value=Value layoutPropertyEditor.action=Action layoutPropertyEditor.delete=Delete -layoutPropertyEditor.newPropertyName=Name: -layoutPropertyEditor.newPropertyValue=Value: +layoutPropertyEditor.newPropertyName=Name +layoutPropertyEditor.newPropertyValue=Value layoutPropertyEditor.add=Add portletPropertyEditor.name=Name portletPropertyEditor.value=Value portletPropertyEditor.action=Action portletPropertyEditor.delete=Delete -portletPropertyEditor.newPropertyName=Name: -portletPropertyEditor.newPropertyValue=Value: +portletPropertyEditor.newPropertyName=Name +portletPropertyEditor.newPropertyValue=Value portletPropertyEditor.add=Add layoutPreferenceEditor.name=Name layoutPreferenceEditor.value=Value layoutPreferenceEditor.action=Action layoutPreferenceEditor.delete=Delete -layoutPreferenceEditor.newPreferenceName=Name: -layoutPreferenceEditor.newPreferenceValue=Value: +layoutPreferenceEditor.newPreferenceName=Name +layoutPreferenceEditor.newPreferenceValue=Value layoutPreferenceEditor.add=Add portletPreferenceEditor.name=Name portletPreferenceEditor.value=Value portletPreferenceEditor.action=Action portletPreferenceEditor.delete=Delete -portletPreferenceEditor.newPreferenceName=Name: -portletPreferenceEditor.newPreferenceValue=Value: +portletPreferenceEditor.newPreferenceName=Name +portletPreferenceEditor.newPreferenceValue=Value portletPreferenceEditor.add=Add Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label_ja.properties 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label_ja.properties 2007-11-19 09:02:17 UTC (rev 706) @@ -5,71 +5,72 @@ orderTab=\u9806\u5e8f propertyTab=\u30d7\u30ed\u30d1\u30c6\u30a3 preferenceTab=\u30d7\u30ea\u30d5\u30a1\u30ec\u30f3\u30b9 -path=\u30d1\u30b9: +path=\u30d1\u30b9 finish=\u5b8c\u4e86 securityConstraintType=\u5b9a\u7fa9 securityConstraintsRefType=\u53c2\u7167 -pageInfoEditor.pageTitle=\u30bf\u30a4\u30c8\u30eb: -pageInfoEditor.pageShortTitle=\u77ed\u3044\u30bf\u30a4\u30c8\u30eb: -pageInfoEditor.pageDecorator=\u30da\u30fc\u30b8\u30c7\u30b3\u30ec\u30fc\u30bf:: -pageInfoEditor.portletDecorator=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30c7\u30b3\u30ec\u30fc\u30bf: -pageInfoEditor.desktopTheme=\u30c7\u30b9\u30af\u30c8\u30c3\u30d7\u30c6\u30fc\u30de: -pageInfoEditor.pageHidden=\u30da\u30fc\u30b8\u3092\u975e\u8868\u793a: +pageInfoEditor.pageTitle=\u30bf\u30a4\u30c8\u30eb +pageInfoEditor.pageShortTitle=\u77ed\u3044\u30bf\u30a4\u30c8\u30eb +pageInfoEditor.pageDecorator=\u30da\u30fc\u30b8\u30c7\u30b3\u30ec\u30fc\u30bf +pageInfoEditor.portletDecorator=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30c7\u30b3\u30ec\u30fc\u30bf +pageInfoEditor.desktopTheme=\u30c7\u30b9\u30af\u30c8\u30c3\u30d7\u30c6\u30fc\u30de +pageInfoEditor.pageHidden=\u30da\u30fc\u30b8\u3092\u975e\u8868\u793a pageInfoEditor.jumpToThisPage=\u3053\u306e\u30da\u30fc\u30b8\u306b\u79fb\u52d5 pageInfoEditor.update=\u66f4\u65b0 pageInfoEditor.delete=\u524a\u9664 -folderInfoEditor.folderTitle=\u30bf\u30a4\u30c8\u30eb: -folderInfoEditor.folderShortTitle=\u77ed\u3044\u30bf\u30a4\u30c8\u30eb: -folderInfoEditor.pageDecorator=\u30da\u30fc\u30b8\u30c7\u30b3\u30ec\u30fc\u30bf: -folderInfoEditor.portletDecorator=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30c7\u30b3\u30ec\u30fc\u30bf: -folderInfoEditor.desktopTheme=\u30c7\u30b9\u30af\u30c8\u30c3\u30d7\u30c6\u30fc\u30de: -folderInfoEditor.folderHidden=\u30d5\u30a9\u30eb\u30c0\u3092\u975e\u8868\u793a: +folderInfoEditor.folderTitle=\u30bf\u30a4\u30c8\u30eb +folderInfoEditor.folderShortTitle=\u77ed\u3044\u30bf\u30a4\u30c8\u30eb +folderInfoEditor.pageDecorator=\u30da\u30fc\u30b8\u30c7\u30b3\u30ec\u30fc\u30bf +folderInfoEditor.portletDecorator=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30c7\u30b3\u30ec\u30fc\u30bf +folderInfoEditor.desktopTheme=\u30c7\u30b9\u30af\u30c8\u30c3\u30d7\u30c6\u30fc\u30de +folderInfoEditor.folderHidden=\u30d5\u30a9\u30eb\u30c0\u3092\u975e\u8868\u793a folderInfoEditor.update=\u66f4\u65b0 folderInfoEditor.delete=\u524a\u9664 -layoutInfoEditor.fragmentId=ID: -layoutInfoEditor.layoutName=\u30ec\u30a4\u30a2\u30a6\u30c8: -layoutInfoEditor.decorator=\u30c7\u30b3\u30ec\u30fc\u30bf: -layoutInfoEditor.desktopTheme=\u30c7\u30b9\u30af\u30c8\u30c3\u30d7\u30c6\u30fc\u30de: +layoutInfoEditor.fragmentId=ID +layoutInfoEditor.layoutName=\u30ec\u30a4\u30a2\u30a6\u30c8 +layoutInfoEditor.decorator=\u30c7\u30b3\u30ec\u30fc\u30bf +layoutInfoEditor.desktopTheme=\u30c7\u30b9\u30af\u30c8\u30c3\u30d7\u30c6\u30fc\u30de layoutInfoEditor.update=\u66f4\u65b0 layoutInfoEditor.delete=\u524a\u9664 -portletInfoEditor.fragmentId=ID: -portletInfoEditor.portletName=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8: -portletInfoEditor.decorator=\u30c7\u30b3\u30ec\u30fc\u30bf: -portletInfoEditor.desktopTheme=\u30c7\u30b9\u30af\u30c8\u30c3\u30d7\u30c6\u30fc\u30de: +portletInfoEditor.fragmentId=ID +portletInfoEditor.portletName=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8 +portletInfoEditor.decorator=\u30c7\u30b3\u30ec\u30fc\u30bf +portletInfoEditor.desktopTheme=\u30c7\u30b9\u30af\u30c8\u30c3\u30d7\u30c6\u30fc\u30de portletInfoEditor.update=\u66f4\u65b0 portletInfoEditor.delete=\u524a\u9664 -layoutAddPortletEditor.layoutName=\u30ec\u30a4\u30a2\u30a6\u30c8: -layoutAddPortletEditor.portletName=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8: +layoutAddPortletEditor.layoutName=\u30ec\u30a4\u30a2\u30a6\u30c8 +layoutAddPortletEditor.portletName=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8 layoutAddPortletEditor.addLayout=\u30ec\u30a4\u30a2\u30a6\u30c8\u306e\u8ffd\u52a0 layoutAddPortletEditor.addPortlet=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306e\u8ffd\u52a0 -folderAddFolderAndPageEditor.folderOrPageName=\u540d\u524d: -folderAddFolderAndPageEditor.folderOrPageTitle=\u30bf\u30a4\u30c8\u30eb: -folderAddFolderAndPageEditor.folderOrPageShortTitle=\u77ed\u3044\u30bf\u30a4\u30c8\u30eb: -folderAddFolderAndPageEditor.layoutName=\u30ec\u30a4\u30a2\u30a6\u30c8: -folderAddFolderAndPageEditor.pageDecorator=\u30da\u30fc\u30b8\u30c7\u30b3\u30ec\u30fc\u30bf: -folderAddFolderAndPageEditor.portletDecorator=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30c7\u30b3\u30ec\u30fc\u30bf: -folderAddFolderAndPageEditor.desktopTheme=\u30c7\u30b9\u30af\u30c8\u30c3\u30d7\u30c6\u30fc\u30de: -folderAddFolderAndPageEditor.folderOrPageHidden=\u30d5\u30a9\u30eb\u30c0/\u30da\u30fc\u30b8\u3092\u975e\u8868\u793a: +folderAddFolderAndPageEditor.folderOrPageName=\u540d\u524d +folderAddFolderAndPageEditor.folderOrPageTitle=\u30bf\u30a4\u30c8\u30eb +folderAddFolderAndPageEditor.folderOrPageShortTitle=\u77ed\u3044\u30bf\u30a4\u30c8\u30eb +folderAddFolderAndPageEditor.layoutName=\u30ec\u30a4\u30a2\u30a6\u30c8 +folderAddFolderAndPageEditor.pageDecorator=\u30da\u30fc\u30b8\u30c7\u30b3\u30ec\u30fc\u30bf +folderAddFolderAndPageEditor.portletDecorator=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30c7\u30b3\u30ec\u30fc\u30bf +folderAddFolderAndPageEditor.desktopTheme=\u30c7\u30b9\u30af\u30c8\u30c3\u30d7\u30c6\u30fc\u30de +folderAddFolderAndPageEditor.folderOrPageHidden=\u30d5\u30a9\u30eb\u30c0/\u30da\u30fc\u30b8\u3092\u975e\u8868\u793a folderAddFolderAndPageEditor.addFolder=\u30d5\u30a9\u30eb\u30c0\u306e\u8ffd\u52a0 folderAddFolderAndPageEditor.addPage=\u30da\u30fc\u30b8\u306e\u8ffd\u52a0 +folderAddFolderAndPageEditor.alnumonly=(a-zA-Z0-9_-. \u306e\u307f) pageSecurityEditor.securityConstraint=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5236\u9650 pageSecurityEditor.type= \u7a2e\u985e pageSecurityEditor.permission= \u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3 pageSecurityEditor.action=\u30a2\u30af\u30b7\u30e7\u30f3 pageSecurityEditor.delete=\u524a\u9664 -pageSecurityEditor.users=\u30e6\u30fc\u30b6\u30fc: -pageSecurityEditor.groups=\u30b0\u30eb\u30fc\u30d7: -pageSecurityEditor.roles=\u30ed\u30fc\u30eb: -pageSecurityEditor.permissions=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3: -pageSecurityEditor.securityConstraintsRef=\u5236\u9650\u53c2\u7167: +pageSecurityEditor.users=\u30e6\u30fc\u30b6\u30fc +pageSecurityEditor.groups=\u30b0\u30eb\u30fc\u30d7 +pageSecurityEditor.roles=\u30ed\u30fc\u30eb +pageSecurityEditor.permissions=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3 +pageSecurityEditor.securityConstraintsRef=\u5236\u9650\u53c2\u7167 pageSecurityEditor.addConstraint=\u5236\u9650\u306e\u8ffd\u52a0 pageSecurityEditor.addConstraintRef=\u5236\u9650\u53c2\u7167\u306e\u8ffd\u52a0 @@ -78,29 +79,29 @@ folderSecurityEditor.permission= \u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3 folderSecurityEditor.action=\u30a2\u30af\u30b7\u30e7\u30f3 folderSecurityEditor.delete=\u524a\u9664 -folderSecurityEditor.users=\u30e6\u30fc\u30b6\u30fc: -folderSecurityEditor.groups=\u30b0\u30eb\u30fc\u30d7: -folderSecurityEditor.roles=\u30ed\u30fc\u30eb: -folderSecurityEditor.permissions=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3: -folderSecurityEditor.securityConstraintsRef=\u5236\u9650\u53c2\u7167: +folderSecurityEditor.users=\u30e6\u30fc\u30b6\u30fc +folderSecurityEditor.groups=\u30b0\u30eb\u30fc\u30d7 +folderSecurityEditor.roles=\u30ed\u30fc\u30eb +folderSecurityEditor.permissions=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3 +folderSecurityEditor.securityConstraintsRef=\u5236\u9650\u53c2\u7167 folderSecurityEditor.addConstraint=\u5236\u9650\u306e\u8ffd\u52a0 folderSecurityEditor.addConstraintRef=\u5236\u9650\u53c2\u7167\u306e\u8ffd\u52a0 -folderOrderEditor.changeOrderTitle=\u9806\u5e8f\u306e\u5909\u66f4: +folderOrderEditor.changeOrderTitle=\u9806\u5e8f\u306e\u5909\u66f4 folderOrderEditor.down=\u4e0b\u3078 folderOrderEditor.up=\u4e0a\u3078 folderOrderEditor.add=\u8ffd\u52a0 folderOrderEditor.delete=\u524a\u9664 -folderOrderEditor.documentName=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u540d: +folderOrderEditor.documentName=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u540d folderMetadataEditor.name=\u540d\u524d folderMetadataEditor.locale=\u30ed\u30b1\u30fc\u30eb folderMetadataEditor.value=\u5024 folderMetadataEditor.action=\u30a2\u30af\u30b7\u30e7\u30f3 folderMetadataEditor.delete=\u524a\u9664 -folderMetadataEditor.newMetadataLocale=\u30ed\u30b1\u30fc\u30eb: -folderMetadataEditor.newMetadataName=\u540d\u524d: -folderMetadataEditor.newMetadataValue=\u5024: +folderMetadataEditor.newMetadataLocale=\u30ed\u30b1\u30fc\u30eb +folderMetadataEditor.newMetadataName=\u540d\u524d +folderMetadataEditor.newMetadataValue=\u5024 folderMetadataEditor.add=\u8ffd\u52a0 pageMetadataEditor.name=\u540d\u524d @@ -108,40 +109,40 @@ pageMetadataEditor.value=\u5024 pageMetadataEditor.action=\u30a2\u30af\u30b7\u30e7\u30f3 pageMetadataEditor.delete=\u524a\u9664 -pageMetadataEditor.newMetadataLocale=\u30ed\u30b1\u30fc\u30eb: -pageMetadataEditor.newMetadataName=\u540d\u524d: -pageMetadataEditor.newMetadataValue=\u5024: +pageMetadataEditor.newMetadataLocale=\u30ed\u30b1\u30fc\u30eb +pageMetadataEditor.newMetadataName=\u540d\u524d +pageMetadataEditor.newMetadataValue=\u5024 pageMetadataEditor.add=\u8ffd\u52a0 layoutPropertyEditor.name=\u540d\u524d layoutPropertyEditor.value=\u5024 layoutPropertyEditor.action=\u30a2\u30af\u30b7\u30e7\u30f3 layoutPropertyEditor.delete=\u524a\u9664 -layoutPropertyEditor.newPropertyName=\u540d\u524d: -layoutPropertyEditor.newPropertyValue=\u5024: +layoutPropertyEditor.newPropertyName=\u540d\u524d +layoutPropertyEditor.newPropertyValue=\u5024 layoutPropertyEditor.add=\u8ffd\u52a0 portletPropertyEditor.name=\u540d\u524d portletPropertyEditor.value=\u5024 portletPropertyEditor.action=\u30a2\u30af\u30b7\u30e7\u30f3 portletPropertyEditor.delete=\u524a\u9664 -portletPropertyEditor.newPropertyName=\u540d\u524d: -portletPropertyEditor.newPropertyValue=\u5024: +portletPropertyEditor.newPropertyName=\u540d\u524d +portletPropertyEditor.newPropertyValue=\u5024 portletPropertyEditor.add=\u8ffd\u52a0 layoutPreferenceEditor.name=\u540d\u524d layoutPreferenceEditor.value=\u5024 layoutPreferenceEditor.action=\u30a2\u30af\u30b7\u30e7\u30f3 layoutPreferenceEditor.delete=\u524a\u9664 -layoutPreferenceEditor.newPreferenceName=\u540d\u524d: -layoutPreferenceEditor.newPreferenceValue=\u5024: +layoutPreferenceEditor.newPreferenceName=\u540d\u524d +layoutPreferenceEditor.newPreferenceValue=\u5024 layoutPreferenceEditor.add=\u8ffd\u52a0 portletPreferenceEditor.name=\u540d\u524d portletPreferenceEditor.value=\u5024 portletPreferenceEditor.action=\u30a2\u30af\u30b7\u30e7\u30f3 portletPreferenceEditor.delete=\u524a\u9664 -portletPreferenceEditor.newPreferenceName=\u540d\u524d: -portletPreferenceEditor.newPreferenceValue=\u5024: +portletPreferenceEditor.newPreferenceName=\u540d\u524d +portletPreferenceEditor.newPreferenceValue=\u5024 portletPreferenceEditor.add=\u8ffd\u52a0 Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/user/label.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/user/label.properties 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/user/label.properties 2007-11-19 09:02:17 UTC (rev 706) @@ -25,7 +25,15 @@ userList.active=Active userList.enabled=Enabled userList.disabled=Disabled +userList.search=Search +userList.reset=Reset +# userCreate +userCreate.name=User Name +userCreate.passwordConfirm=Re-type Password +userCreate.backToUserList=Back To User List +userCreate.confirm=Confirm + # userEdit userEdit.changePassword=Change Password on Next Login userEdit.userEnabled=User Enabled @@ -36,31 +44,58 @@ userEdit.Expired=Expired userEdit.Extend=Extend userEdit.ExtendUnlimited=Extend Unlimited +userEdit.backToUserList=Back To User List +userEdit.update=Update +# userConfirm +userConfirm.backToUserList=Back To User List +userConfirm.backToEdit=Back To Edit Page +userConfirm.delete=Delete +userConfirm.create=Create + # userGroupEdit userGroupEdit.newGroup=New Group userGroupEdit.group=Group userGroupEdit.notFound=Not found. +userGroupEdit.add=Add +userGroupEdit.backToUserList=Back To User List +userGroupEdit.remove=Remove # userRoleEdit userRoleEdit.newRole=New Role userRoleEdit.role=Role userRoleEdit.notFound=Not found. +userRoleEdit.add=Add +userRoleEdit.backToUserList=Back To User List +userRoleEdit.remove=Remove # userProfilingRuleEdit userProfilingRuleEdit.newProfilingRule=New Profiling Rule userProfilingRuleEdit.profilingrule=Profiling Rule userProfilingRuleEdit.notFound=Not found. +userProfilingRuleEdit.add=Add +userProfilingRuleEdit.backToUserList=Back To User List +userProfilingRuleEdit.remove=Remove # userAttributeList userAttributeList.userAttributeKey=Key userAttributeList.userAttributeValue=Value +userAttributeList.userAttributeAction=Action +userAttributeList.create=Create # userAttributeEdit userAttributeEdit.userAttributeKey=Key userAttributeEdit.userAttributeValue=Value +userAttributeEdit.back=Back +userAttributeEdit.confirm=Confirm +userAttributeEdit.key=Key +userAttributeEdit.value=Value # userAttributeConfirm userAttributeConfirm.userAttributeKey=Key userAttributeConfirm.userAttributeValue=Value +userAttributeConfirm.back=Back +userAttributeConfirm.create=Create +userAttributeConfirm.update=Update +userAttributeConfirm.delete=Delete Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/user/label_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/user/label_ja.properties 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/user/label_ja.properties 2007-11-19 09:02:17 UTC (rev 706) @@ -5,9 +5,9 @@ changePassword=\u521d\u671f\u30ed\u30b0\u30a4\u30f3\u6642\u306e\u30d1\u30b9\u30ef\u30fc\u30c9\u5909\u66f4 defaultRole=\u30c7\u30d5\u30a9\u30eb\u30c8\u30ed\u30fc\u30eb profilingRule=\u30d7\u30ed\u30d5\u30a1\u30a4\u30ea\u30f3\u30b0\u30eb\u30fc\u30eb -userList=\u30e6\u30fc\u30b6\u30fc\u306e\u4e00\u89a7 -userInformation=\u30e6\u30fc\u30b6\u30fc\u306e\u60c5\u5831 -userAttributeList=\u30e6\u30fc\u30b6\u30fc\u5c5e\u6027\u306e\u4e00\u89a7 +userList=\u30e6\u30fc\u30b6\u30fc\u4e00\u89a7 +userInformation=\u30e6\u30fc\u30b6\u30fc\u60c5\u5831 +userAttributeList=\u30e6\u30fc\u30b6\u30fc\u5c5e\u6027\u4e00\u89a7 basicTab=\u57fa\u672c\u60c5\u5831 profilingRuleTab=\u30d7\u30ed\u30d5\u30a1\u30a4\u30ea\u30f3\u30b0\u30eb\u30fc\u30eb userAttributeTab=\u30e6\u30fc\u30b6\u30fc\u5c5e\u6027 @@ -25,7 +25,15 @@ userList.active=\u6709\u52b9 userList.enabled=\u6709\u52b9 userList.disabled=\u7121\u52b9 +userList.search=\u691c\u7d22 +userList.reset=\u30ea\u30bb\u30c3\u30c8 +# userCreate +userCreate.name=\u30e6\u30fc\u30b6\u30fc\u540d +userCreate.passwordConfirm=\u30d1\u30b9\u30ef\u30fc\u30c9(\u78ba\u8a8d\u7528) +userCreate.backToUserList=\u30e6\u30fc\u30b6\u30fc\u4e00\u89a7\u3078\u623b\u308b +userCreate.confirm=\u78ba\u8a8d + # userEdit userEdit.changePassword=\u6b21\u56de\u30ed\u30b0\u30a4\u30f3\u6642\u306b\u30d1\u30b9\u30ef\u30fc\u30c9\u5909\u66f4 userEdit.userEnabled=\u5229\u7528\u53ef\u80fd\u72b6\u614b @@ -36,31 +44,58 @@ userEdit.Expired=\u671f\u9650\u5207\u308c userEdit.Extend=\u5ef6\u9577 userEdit.ExtendUnlimited=\u7121\u5236\u9650\u306b\u5ef6\u9577 +userEdit.backToUserList=\u30e6\u30fc\u30b6\u30fc\u4e00\u89a7\u3078\u623b\u308b +userEdit.update=\u66f4\u65b0 +# userConfirm +userConfirm.backToUserList=\u30e6\u30fc\u30b6\u30fc\u4e00\u89a7\u3078\u623b\u308b +userConfirm.backToEdit=\u7de8\u96c6\u306b\u623b\u308b +userConfirm.delete=\u524a\u9664 +userConfirm.create=\u767b\u9332 + # userGroupEdit userGroupEdit.newGroup=\u65b0\u898f\u30b0\u30eb\u30fc\u30d7 userGroupEdit.group=\u30b0\u30eb\u30fc\u30d7 userGroupEdit.notFound=\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002 +userGroupEdit.add=\u8ffd\u52a0 +userGroupEdit.backToUserList=\u30e6\u30fc\u30b6\u30fc\u4e00\u89a7\u3078\u623b\u308b +userGroupEdit.remove=\u524a\u9664 # userRoleEdit userRoleEdit.newRole=\u65b0\u898f\u30ed\u30fc\u30eb userRoleEdit.role=\u30ed\u30fc\u30eb userRoleEdit.notFound=\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002 +userRoleEdit.add=\u8ffd\u52a0 +userRoleEdit.backToUserList=\u30e6\u30fc\u30b6\u30fc\u4e00\u89a7\u3078\u623b\u308b +userRoleEdit.remove=\u524a\u9664 # userProfilingRuleEdit userProfilingRuleEdit.newProfilingRule=\u65b0\u898f\u30d7\u30ed\u30d5\u30a1\u30a4\u30ea\u30f3\u30b0\u30eb\u30fc\u30eb userProfilingRuleEdit.profilingrule=\u30d7\u30ed\u30d5\u30a1\u30a4\u30ea\u30f3\u30b0\u30eb\u30fc\u30eb userProfilingRuleEdit.notFound=\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002 +userProfilingRuleEdit.add=\u8ffd\u52a0 +userProfilingRuleEdit.backToUserList=\u30e6\u30fc\u30b6\u30fc\u4e00\u89a7\u3078\u623b\u308b +userProfilingRuleEdit.remove=\u524a\u9664 # userAttributeList userAttributeList.userAttributeKey=\u30ad\u30fc userAttributeList.userAttributeValue=\u5024 +userAttributeList.userAttributeAction=\u30a2\u30af\u30b7\u30e7\u30f3 +userAttributeList.create=\u4f5c\u6210 # userAttributeEdit userAttributeEdit.userAttributeKey=\u30ad\u30fc userAttributeEdit.userAttributeValue=\u5024 +userAttributeEdit.back=\u623b\u308b +userAttributeEdit.confirm=\u78ba\u8a8d +userAttributeEdit.key=\u30ad\u30fc +userAttributeEdit.value=\u5024 # userAttributeConfirm userAttributeConfirm.userAttributeKey=\u30ad\u30fc userAttributeConfirm.userAttributeValue=\u5024 +userAttributeConfirm.back=\u623b\u308b +userAttributeConfirm.create=\u767b\u9332 +userAttributeConfirm.update=\u66f4\u65b0 +userAttributeConfirm.delete=\u524a\u9664 Deleted: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/withdraw/PublicPortalWithdrawal.properties =================================================================== Deleted: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/withdraw/PublicPortalWithdrawal_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/withdraw/PublicPortalWithdrawal_ja.properties 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/withdraw/PublicPortalWithdrawal_ja.properties 2007-11-19 09:02:17 UTC (rev 706) @@ -1,5 +0,0 @@ -# portlet info -javax.portlet.title=\u9000\u4f1a\u7533\u8acb -javax.portlet.short-title=\u9000\u4f1a -javax.portlet.keywords=\u9000\u4f1a,\u30e6\u30fc\u30b6\u30fc\u60c5\u5831 - Modified: pal-admin/trunk/src/main/webapp/WEB-INF/portlet.xml =================================================================== --- pal-admin/trunk/src/main/webapp/WEB-INF/portlet.xml 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/webapp/WEB-INF/portlet.xml 2007-11-19 09:02:17 UTC (rev 706) @@ -45,7 +45,7 @@ en ja - + jp.sf.pal.admin.resources.UserManagement User Management Management @@ -155,7 +155,7 @@ en ja - jp.sf.pal.admin.web.registration.UserRegistration + jp.sf.pal.admin.resources.UserRegistration User Registration Registration @@ -202,7 +202,7 @@ en ja - jp.sf.pal.admin.web.registration.ForgottenPassword + jp.sf.pal.admin.resources.ForgottenPassword Forgotten Password Forgotten Password @@ -275,7 +275,7 @@ en ja - jp.sf.pal.admin.web.registration.UserRegistration + jp.sf.pal.admin.resources.UserRegistration User Registration Registration @@ -322,7 +322,7 @@ en ja - jp.sf.pal.admin.web.registration.ForgottenPassword + jp.sf.pal.admin.resources.ForgottenPassword Forgotten Password Forgotten Password @@ -355,7 +355,7 @@ en ja - jp.sf.pal.admin.web.registration.UserRegistrationUpdate + jp.sf.pal.admin.resources.UserRegistrationUpdate Update User Information Information Update @@ -388,7 +388,7 @@ en ja - jp.sf.pal.admin.web.site.SiteEditor + jp.sf.pal.admin.resources.SiteEditor Site Editor Editor @@ -461,7 +461,7 @@ en ja - jp.sf.pal.admin.web.registration.UserRegistration + jp.sf.pal.admin.resources.UserRegistration User Registration Registration @@ -494,7 +494,7 @@ en ja - jp.sf.pal.admin.web.registration.UserRegistrationUpdate + jp.sf.pal.admin.resources.UserRegistrationUpdate Update User Information Information Update @@ -535,7 +535,7 @@ en ja - jp.sf.pal.admin.web.withdraw.PublicPortalWithdrawal + jp.sf.pal.admin.resources.PublicPortalWithdrawal Withdrawal Withdrawal @@ -568,7 +568,7 @@ en ja - jp.sf.pal.admin.web.permission.PermissionEditor + jp.sf.pal.admin.resources.PermissionEditor Permission Editor Permission @@ -601,7 +601,7 @@ en ja - jp.sf.pal.admin.web.password.ChangePassword + jp.sf.pal.admin.resources.ChangePassword Change Password Password Modified: pal-admin/trunk/src/main/webapp/view/deployer/remotePortletList.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/deployer/remotePortletList.html 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/webapp/view/deployer/remotePortletList.html 2007-11-19 09:02:17 UTC (rev 706) @@ -53,11 +53,11 @@ @@ -94,11 +94,11 @@ Modified: pal-admin/trunk/src/main/webapp/view/deployer/remoteRepositoryList.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/deployer/remoteRepositoryList.html 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/webapp/view/deployer/remoteRepositoryList.html 2007-11-19 09:02:17 UTC (rev 706) @@ -48,11 +48,11 @@ @@ -94,11 +94,11 @@ Modified: pal-admin/trunk/src/main/webapp/view/group/groupConfirm.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/group/groupConfirm.html 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/webapp/view/group/groupConfirm.html 2007-11-19 09:02:17 UTC (rev 706) @@ -44,10 +44,8 @@
写真写真 商品名 価格
-
- -
Modified: pal-admin/trunk/src/main/webapp/view/group/groupList.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/group/groupList.html 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/webapp/view/group/groupList.html 2007-11-19 09:02:17 UTC (rev 706) @@ -43,19 +43,19 @@ - + - - + + @@ -71,11 +71,11 @@ Modified: pal-admin/trunk/src/main/webapp/view/permission/folderPermissionList.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/permission/folderPermissionList.html 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/webapp/view/permission/folderPermissionList.html 2007-11-19 09:02:17 UTC (rev 706) @@ -37,10 +37,10 @@

@@ -80,10 +80,10 @@
Modified: pal-admin/trunk/src/main/webapp/view/permission/pagePermissionList.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/permission/pagePermissionList.html 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/webapp/view/permission/pagePermissionList.html 2007-11-19 09:02:17 UTC (rev 706) @@ -37,10 +37,10 @@
@@ -80,10 +80,10 @@
Modified: pal-admin/trunk/src/main/webapp/view/permission/portletPermissionList.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/permission/portletPermissionList.html 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/webapp/view/permission/portletPermissionList.html 2007-11-19 09:02:17 UTC (rev 706) @@ -37,10 +37,10 @@
@@ -80,10 +80,10 @@
Modified: pal-admin/trunk/src/main/webapp/view/portletmanager/portletList.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/portletmanager/portletList.html 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/webapp/view/portletmanager/portletList.html 2007-11-19 09:02:17 UTC (rev 706) @@ -40,11 +40,11 @@ @@ -107,11 +107,11 @@
Modified: pal-admin/trunk/src/main/webapp/view/role/roleConfirm.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/role/roleConfirm.html 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/webapp/view/role/roleConfirm.html 2007-11-19 09:02:17 UTC (rev 706) @@ -44,10 +44,8 @@
-
- -
Modified: pal-admin/trunk/src/main/webapp/view/role/roleList.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/role/roleList.html 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/webapp/view/role/roleList.html 2007-11-19 09:02:17 UTC (rev 706) @@ -42,25 +42,21 @@
- <<Previous - + te:rendered="#{role_roleListPage.previousPageNumber!=null}"><<Previous - Next>> - + te:rendered="#{role_roleListPage.nextPageNumber!=null}">Next>>
- + - - + + - + @@ -70,13 +66,9 @@
- <<Previous - + te:rendered="#{role_roleListPage.previousPageNumber!=null}"><<Previous - Next>> - + te:rendered="#{role_roleListPage.nextPageNumber!=null}">Next>>
Modified: pal-admin/trunk/src/main/webapp/view/site/folderAddFolderAndPageEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/folderAddFolderAndPageEditor.html 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/webapp/view/site/folderAddFolderAndPageEditor.html 2007-11-19 09:02:17 UTC (rev 706) @@ -59,7 +59,7 @@
- +
Modified: pal-admin/trunk/src/main/webapp/view/site/layoutPreferenceEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/layoutPreferenceEditor.html 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/webapp/view/site/layoutPreferenceEditor.html 2007-11-19 09:02:17 UTC (rev 706) @@ -69,15 +69,15 @@

rolerole Delete
- - + + - - + +
NVNV
Modified: pal-admin/trunk/src/main/webapp/view/site/layoutPropertyEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/layoutPropertyEditor.html 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/webapp/view/site/layoutPropertyEditor.html 2007-11-19 09:02:17 UTC (rev 706) @@ -69,15 +69,15 @@ - - + + - - + +
NVNV
Modified: pal-admin/trunk/src/main/webapp/view/site/portletPreferenceEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/portletPreferenceEditor.html 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/webapp/view/site/portletPreferenceEditor.html 2007-11-19 09:02:17 UTC (rev 706) @@ -66,15 +66,15 @@ - - + + - - + +
NVNV
Modified: pal-admin/trunk/src/main/webapp/view/site/portletPropertyEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/portletPropertyEditor.html 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/webapp/view/site/portletPropertyEditor.html 2007-11-19 09:02:17 UTC (rev 706) @@ -66,15 +66,15 @@ - - + + - - + +
NVNV
Modified: pal-admin/trunk/src/main/webapp/view/user/userAttributeConfirm.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userAttributeConfirm.html 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/webapp/view/user/userAttributeConfirm.html 2007-11-19 09:02:17 UTC (rev 706) @@ -69,10 +69,8 @@
-
- -
Modified: pal-admin/trunk/src/main/webapp/view/user/userAttributeEdit.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userAttributeEdit.html 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/webapp/view/user/userAttributeEdit.html 2007-11-19 09:02:17 UTC (rev 706) @@ -72,7 +72,7 @@
-
- <<Previous - + te:rendered="#{user_userAttributeListPage.previousPageNumber!=null}"><<Previous - Next>> - + te:rendered="#{user_userAttributeListPage.nextPageNumber!=null}">Next>>
- + - - - + + + @@ -98,13 +94,9 @@
- <<Previous - + te:rendered="#{user_userAttributeListPage.previousPageNumber!=null}"><<Previous - Next>> - + te:rendered="#{user_userAttributeListPage.nextPageNumber!=null}">Next>>
Modified: pal-admin/trunk/src/main/webapp/view/user/userConfirm.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userConfirm.html 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/webapp/view/user/userConfirm.html 2007-11-19 09:02:17 UTC (rev 706) @@ -80,7 +80,7 @@ onclick="location.href='userCreate.html'" class="portlet-form-button"/>
- +
Modified: pal-admin/trunk/src/main/webapp/view/user/userList.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userList.html 2007-11-13 07:40:43 UTC (rev 705) +++ pal-admin/trunk/src/main/webapp/view/user/userList.html 2007-11-19 09:02:17 UTC (rev 706) @@ -50,13 +50,9 @@
- <<Previous - + te:rendered="#{user_userListPage.previousPageNumber!=null}"><<Previous - Next>> - + te:rendered="#{user_userListPage.nextPageNumber!=null}">Next>>

@@ -85,13 +81,9 @@
- <<Previous - + te:rendered="#{user_userListPage.previousPageNumber!=null}"><<Previous - Next>> - + te:rendered="#{user_userListPage.nextPageNumber!=null}">Next>>
From svnnotify ＠ sourceforge.jp Mon Nov 19 21:57:49 2007 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Mon, 19 Nov 2007 21:57:49 +0900 Subject: [pal-cvs 2963] [707] added max length validator. Message-ID: <1195477069.503248.17105.nullmailer@users.sourceforge.jp> Revision: 707 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=707 Author: shinsuke Date: 2007-11-19 21:57:49 +0900 (Mon, 19 Nov 2007) Log Message: ----------- added max length validator. Modified Paths: -------------- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderMetadataEditorPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageMetadataEditorPage.java -------------- next part -------------- Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderMetadataEditorPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderMetadataEditorPage.java 2007-11-19 09:02:17 UTC (rev 706) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderMetadataEditorPage.java 2007-11-19 12:57:49 UTC (rev 707) @@ -26,6 +26,7 @@ import org.seasar.framework.log.Logger; import org.seasar.teeda.extension.annotation.takeover.TakeOver; import org.seasar.teeda.extension.annotation.takeover.TakeOverType; +import org.seasar.teeda.extension.annotation.validator.Length; import org.seasar.teeda.extension.annotation.validator.Required; public class FolderMetadataEditorPage extends AbstractSiteEditorPage implements @@ -55,11 +56,14 @@ private String metadataValue; @Required + @Length(maximum = 64) private String newMetadataLocale; @Required + @Length(maximum = 255) private String newMetadataName; + @Length(maximum = 255) private String newMetadataValue; private String action; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageMetadataEditorPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageMetadataEditorPage.java 2007-11-19 09:02:17 UTC (rev 706) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageMetadataEditorPage.java 2007-11-19 12:57:49 UTC (rev 707) @@ -26,6 +26,7 @@ import org.seasar.framework.log.Logger; import org.seasar.teeda.extension.annotation.takeover.TakeOver; import org.seasar.teeda.extension.annotation.takeover.TakeOverType; +import org.seasar.teeda.extension.annotation.validator.Length; import org.seasar.teeda.extension.annotation.validator.Required; public class PageMetadataEditorPage extends AbstractSiteEditorPage implements @@ -55,11 +56,14 @@ private String metadataValue; @Required + @Length(maximum = 64) private String newMetadataLocale; @Required + @Length(maximum = 255) private String newMetadataName; + @Length(maximum = 255) private String newMetadataValue; private String action; From svnnotify ＠ sourceforge.jp Tue Nov 20 09:06:14 2007 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Tue, 20 Nov 2007 09:06:14 +0900 Subject: [pal-cvs 2964] [708] contribution from N2SM. Message-ID: <1195517174.369259.25737.nullmailer@users.sourceforge.jp> Revision: 708 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=708 Author: shinsuke Date: 2007-11-20 09:06:13 +0900 (Tue, 20 Nov 2007) Log Message: ----------- contribution from N2SM. Modified Paths: -------------- pal-portal/trunk/docs/ja/administration-guide/xdocs/navigation.xml Added Paths: ----------- pal-portal/trunk/docs/ja/administration-guide/xdocs/forgotten-password-portlet-guide.xml pal-portal/trunk/docs/ja/administration-guide/xdocs/images/confirm.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/finish.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/form.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_add1.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_add2.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_add3.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_add4.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_add5.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_add6.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_add7.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng0.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng1.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng10.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng11.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng12.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng2.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng3.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng4.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng5.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng6.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng7.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng8.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng9.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_withdrawal1.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_withdrawal2.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit0.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit1.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit10.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit11.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit12.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit13.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit2.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit3.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit4.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit5.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit6.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit7.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit8.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit9.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng0.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng1.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng10.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng11.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng12.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng13.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng14.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng15.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng16.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng17.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng18.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng19.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng2.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng20.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng21.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng22.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng23.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng24.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng25.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng26.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng3.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng4.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng5.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng6.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng7.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng8.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng9.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usertab.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/portal-registration-portlet-guide.xml pal-portal/trunk/docs/ja/administration-guide/xdocs/portal-registration-update-portlet-guide.xml pal-portal/trunk/docs/ja/administration-guide/xdocs/portlet-addition-guide.xml pal-portal/trunk/docs/ja/administration-guide/xdocs/portlet-management-guide.xml pal-portal/trunk/docs/ja/administration-guide/xdocs/public-portal-forgotten-password-portlet-guide.xml pal-portal/trunk/docs/ja/administration-guide/xdocs/public-portal-registration-portlet-guide.xml pal-portal/trunk/docs/ja/administration-guide/xdocs/public-portal-registration-update-portlet-guide.xml pal-portal/trunk/docs/ja/administration-guide/xdocs/public-portal-withdrawal-portlet-guide.xml pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor-portlet-guide.xml pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management-guide.xml pal-portal/trunk/docs/ja/administration-guide/xdocs/user-registration-portlet-guide.xml -------------- next part -------------- Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/forgotten-password-portlet-guide.xml =================================================================== --- pal-portal/trunk/docs/ja/administration-guide/xdocs/forgotten-password-portlet-guide.xml 2007-11-19 12:57:49 UTC (rev 707) +++ pal-portal/trunk/docs/ja/administration-guide/xdocs/forgotten-password-portlet-guide.xml 2007-11-20 00:06:13 UTC (rev 708) @@ -0,0 +1,53 @@ + + + + + ダミー + ダミー + + + + + +
+

+ No1_このドキュメントは、PALポータルのポータル管理作業を担当する管理者を対象にしています。 +

+
+
+

+

+
+
+

+ ダウンロード、専門的サービス、サポート、その他の開発者情報については、次にアクセスしてください。 +

+

+
+
+

+ 本製品に関する技術的質問で、ドキュメント内に解決策が得られない場合は、次にアクセスしてください。 +

+

+
+ + Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/forgotten-password-portlet-guide.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/confirm.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/confirm.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/finish.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/finish.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/form.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/form.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_add1.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_add1.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_add2.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_add2.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_add3.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_add3.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_add4.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_add4.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_add5.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_add5.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_add6.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_add6.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_add7.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_add7.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng0.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng0.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng1.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng1.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng10.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng10.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng11.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng11.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng12.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng12.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng2.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng2.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng3.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng3.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng4.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng4.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng5.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng5.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng6.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng6.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng7.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng7.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng8.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng8.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng9.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng9.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_withdrawal1.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_withdrawal1.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_withdrawal2.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_withdrawal2.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit0.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit0.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit1.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit1.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit10.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit10.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit11.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit11.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit12.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit12.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit13.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit13.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit2.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit2.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit3.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit3.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit4.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit4.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit5.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit5.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit6.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit6.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit7.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit7.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit8.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit8.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit9.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit9.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng0.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng0.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng1.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng1.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng10.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng10.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng11.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng11.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng12.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng12.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng13.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng13.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng14.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng14.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng15.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng15.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng16.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng16.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng17.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng17.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng18.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng18.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng19.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng19.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng2.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng2.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng20.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng20.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng21.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng21.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng22.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng22.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng23.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng23.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng24.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng24.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng25.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng25.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng26.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng26.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng3.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng3.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng4.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng4.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng5.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng5.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng6.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng6.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng7.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng7.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng8.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng8.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng9.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng9.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usertab.jpg =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usertab.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Modified: pal-portal/trunk/docs/ja/administration-guide/xdocs/navigation.xml =================================================================== --- pal-portal/trunk/docs/ja/administration-guide/xdocs/navigation.xml 2007-11-19 12:57:49 UTC (rev 707) +++ pal-portal/trunk/docs/ja/administration-guide/xdocs/navigation.xml 2007-11-20 00:06:13 UTC (rev 708) @@ -23,6 +23,21 @@ + paladminガイド + + + + + + + + + + + + + + + + + ダミー + ダミー + + + + + +
+

+ No1_このドキュメントは、PALポータルのポータル管理作業を担当する管理者を対象にしています。 +

+
+
+

+

+
+
+

+ ダウンロード、専門的サービス、サポート、その他の開発者情報については、次にアクセスしてください。 +

+

+
+
+

+ 本製品に関する技術的質問で、ドキュメント内に解決策が得られない場合は、次にアクセスしてください。 +

+

+
+ + Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/portal-registration-portlet-guide.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/portal-registration-update-portlet-guide.xml =================================================================== --- pal-portal/trunk/docs/ja/administration-guide/xdocs/portal-registration-update-portlet-guide.xml 2007-11-19 12:57:49 UTC (rev 707) +++ pal-portal/trunk/docs/ja/administration-guide/xdocs/portal-registration-update-portlet-guide.xml 2007-11-20 00:06:13 UTC (rev 708) @@ -0,0 +1,53 @@ + + + + + ダミー + ダミー + + + + + +
+

+ No1_このドキュメントは、PALポータルのポータル管理作業を担当する管理者を対象にしています。 +

+
+
+

+

+
+
+

+ ダウンロード、専門的サービス、サポート、その他の開発者情報については、次にアクセスしてください。 +

+

+
+
+

+ 本製品に関する技術的質問で、ドキュメント内に解決策が得られない場合は、次にアクセスしてください。 +

+

+
+ + Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/portal-registration-update-portlet-guide.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/portlet-addition-guide.xml =================================================================== --- pal-portal/trunk/docs/ja/administration-guide/xdocs/portlet-addition-guide.xml 2007-11-19 12:57:49 UTC (rev 707) +++ pal-portal/trunk/docs/ja/administration-guide/xdocs/portlet-addition-guide.xml 2007-11-20 00:06:13 UTC (rev 708) @@ -0,0 +1,71 @@ + + + + + ポートレット追加手順 + ポートレット追加手順 + + + + + +
+

+ PALポータルのユーザーごとに、自由にポートレットを配置・使用することができます。以下はその手順となります。 +

+
+
+ +

+ ログイン後、初期表示画面の「編集」を選択し、編集モードへ切り替えます。 +

+ + + +

+ 画面右上の表示内容が変わるので、「レイアウト設定」を選択します。 +

+ + + +

+ 「Site Editor」画面左部分で、該当ユーザーの「VelocityOneColumn」を選択します。 +

+ + + +

+ 「追加」タブを選択します。 + ポートレットのリストから追加したいポートレットを選択し、「ポートレットの追加」ボタンを押下します。 + 追加したいポートレットが複数ある場合は、同様にリストから選択し、「ポートレットの追加」ボタンを押下してください。 + 追加処理を完了するには、右上にある「完了」を選択してください。 +

+ + + +

+ 画面には、追加したポートレットが表示されます。（「パスワードの変更」ポートレットを追加した例） +

+ +

+ 最後に編集モードから表示モードへ切り替えるために、画面右側の「表示」を選択します。 +

+ + +
+ + Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/portlet-addition-guide.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/portlet-management-guide.xml =================================================================== --- pal-portal/trunk/docs/ja/administration-guide/xdocs/portlet-management-guide.xml 2007-11-19 12:57:49 UTC (rev 707) +++ pal-portal/trunk/docs/ja/administration-guide/xdocs/portlet-management-guide.xml 2007-11-20 00:06:13 UTC (rev 708) @@ -0,0 +1,85 @@ + + + + + ポートレット管理 + ダミー + + + + + +
+ +

+ ポートレット管理者は、公開するポートレットのアプリケーションを「Portlet Management」から、 + 配備することが可能です。「Portlet Management」の「デプロイヤー」タブを選択してください。 + 画面は「配備されたポートレット一覧」から「ポートレットアプリケーションの配備」へと変わります。 +

+

+

    +
  • 配備されたポートレット一覧
    • +
+ +

+

+

    +
  • ポートレットアプリケーションの配備
    • +
+ +

+ + +

+ ポートレットのアプリケーションがローカル環境にあれば「ローカル」を選択してください。 + リモートのリポジトリから選択する場合は「リモート」を選択してください。（以降は、リモートを例にした説明です。） + 「リモート」を選択すると、利用可能なリポジトリ、ポートレットアプリケーションが一覧で表示されます。 + 配備するポートレットの「配備」を選択すると、確認画面が表示されます。「Finish」ボタンを押下すると、ポートレットの配備は完了します。 + ポートレットが配備されていても、自動で開始されない場合がありますので、その際は、ポートレットの一覧から対象を「開始」してください。 +

+

+

    +
  • 一覧の表示
    • +
+ +

+

+

    +
  • ポートレット配備の確認
    • +
+ +

+ +
+
+

+ ポートレットの開始・停止・配備解除・削除を行うには、「Portlet Management」のポートレットタブ + を選択するとポートレットアプリケーションの一覧が表示されます。それぞれ行う対象操作のリンクを選択してください。 +

+ +
+
+

+ ポートレットが配備・開始されていれば、利用者はそのポートレットを利用することができます。 + 詳細は以下のポートレットガイドの「ポートレット追加手順」を参照ください。 +

+

+
+ + Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/portlet-management-guide.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/public-portal-forgotten-password-portlet-guide.xml =================================================================== --- pal-portal/trunk/docs/ja/administration-guide/xdocs/public-portal-forgotten-password-portlet-guide.xml 2007-11-19 12:57:49 UTC (rev 707) +++ pal-portal/trunk/docs/ja/administration-guide/xdocs/public-portal-forgotten-password-portlet-guide.xml 2007-11-20 00:06:13 UTC (rev 708) @@ -0,0 +1,53 @@ + + + + + ダミー + ダミー + + + + + +
+

+ No1_このドキュメントは、PALポータルのポータル管理作業を担当する管理者を対象にしています。 +

+
+
+

+

+
+
+

+ ダウンロード、専門的サービス、サポート、その他の開発者情報については、次にアクセスしてください。 +

+

+
+
+

+ 本製品に関する技術的質問で、ドキュメント内に解決策が得られない場合は、次にアクセスしてください。 +

+

+
+ + Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/public-portal-forgotten-password-portlet-guide.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/public-portal-registration-portlet-guide.xml =================================================================== --- pal-portal/trunk/docs/ja/administration-guide/xdocs/public-portal-registration-portlet-guide.xml 2007-11-19 12:57:49 UTC (rev 707) +++ pal-portal/trunk/docs/ja/administration-guide/xdocs/public-portal-registration-portlet-guide.xml 2007-11-20 00:06:13 UTC (rev 708) @@ -0,0 +1,53 @@ + + + + + ダミー + ダミー + + + + + +
+

+ No1_このドキュメントは、PALポータルのポータル管理作業を担当する管理者を対象にしています。 +

+
+
+

+

+
+
+

+ ダウンロード、専門的サービス、サポート、その他の開発者情報については、次にアクセスしてください。 +

+

+
+
+

+ 本製品に関する技術的質問で、ドキュメント内に解決策が得られない場合は、次にアクセスしてください。 +

+

+
+ + Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/public-portal-registration-portlet-guide.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/public-portal-registration-update-portlet-guide.xml =================================================================== --- pal-portal/trunk/docs/ja/administration-guide/xdocs/public-portal-registration-update-portlet-guide.xml 2007-11-19 12:57:49 UTC (rev 707) +++ pal-portal/trunk/docs/ja/administration-guide/xdocs/public-portal-registration-update-portlet-guide.xml 2007-11-20 00:06:13 UTC (rev 708) @@ -0,0 +1,53 @@ + + + + + ダミー + ダミー + + + + + +
+

+ No1_このドキュメントは、PALポータルのポータル管理作業を担当する管理者を対象にしています。 +

+
+
+

+

+
+
+

+ ダウンロード、専門的サービス、サポート、その他の開発者情報については、次にアクセスしてください。 +

+

+
+
+

+ 本製品に関する技術的質問で、ドキュメント内に解決策が得られない場合は、次にアクセスしてください。 +

+

+
+ + Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/public-portal-registration-update-portlet-guide.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/public-portal-withdrawal-portlet-guide.xml =================================================================== --- pal-portal/trunk/docs/ja/administration-guide/xdocs/public-portal-withdrawal-portlet-guide.xml 2007-11-19 12:57:49 UTC (rev 707) +++ pal-portal/trunk/docs/ja/administration-guide/xdocs/public-portal-withdrawal-portlet-guide.xml 2007-11-20 00:06:13 UTC (rev 708) @@ -0,0 +1,47 @@ + + + + + ユーザー退会 + ユーザー退会 + + + + + +
+

+ 現在ログインしているユーザーの退会処理を行います。以下はその手順となります。 +

+
+
+ +

+ 現在ログインしているユーザーで退会したい場合、「退会する」ボタンを押下します。 +

+ +

+ 「退会する」ボタンを押下すると以下のパスワード入力の画面へ移行します。 +

+ +

+ 退会する場合は「パスワード」の項目に登録しているパスワードを入力し、「退会する」ボタンを押下します。「退会する」ボタン押下後は、自動でHOMEへ戻ります。 +

+ +
+ + Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/public-portal-withdrawal-portlet-guide.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor-portlet-guide.xml =================================================================== --- pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor-portlet-guide.xml 2007-11-19 12:57:49 UTC (rev 707) +++ pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor-portlet-guide.xml 2007-11-20 00:06:13 UTC (rev 708) @@ -0,0 +1,122 @@ + + + + + サイトエディター + ダミー + + + + + +
+

+ ポートレットアプリケーション「サイトエディター」を利用することにより、共通・ロール・ユーザー等の単位で、ページの表示および表示内容を制御することが可能です。 +

+
+
+

admin権限ユーザーでシステムへログインし、「サイトエディター」の構成を見てみますと、 + 「サイトエディター」のルートフォルダには、「_role」「_user」「system」のフォルダと「default-page.psml」、「my-account.psml」のファイルが配置され + ていることが分かります。この構成に基づき、操作内容例を下記に列挙いたします。 +

+ + +

+ ここでは、ブラウザに表示されるタイトル、および、パンくずリストに表示されるタイトルを編集し、それを実際に画面表示させた例です。 + デフォルトページをベースとして説明いたします。「サイトエディター」左側「default-page.psml」を選択し、 + 「タイトル」、「短いタイトル」に画面に表示させたい文字を入力します。「更新」ボタンを押下すると、同画面上部にあるように、 + 編集されたタイトルを確認することができます。(admin権限ユーザーが共通のデフォルトページを編集し、自身が参照している状態) +

+ + + +

+ role「user」をもつユーザーに「サイトエディター」機能は使わせるが、「my-account.psml」のファイルを表示したくないといった、特定の制限を + 付加することができます。下記イメージは、管理者が設定する「サイトエディター」画面と、role「user」をもつユーザーが「サイトエディター」を編集モードで画面表示 + した場合の画面です。 +

+
    +
  • 管理者による制限付与の操作手順
    • +
+

+ 1.「編集」リンクを押下し、編集モードに切り替えます。 +

+ +

+ 2.「レイアウト設定」リンクを押下します。 +

+ +

+ 3.「Site Editor」の「default-page.psml」→「セキュリティ」タブを押下します。次に制限参照から「admin」を選択し、「制限参照の追加」を押下します。 +

+ +

+ 4.「default-page.psml」の制限参照に対して、「admin」が正常に設定されました。 +

+ +
    +
  • role「user」をもつユーザーによる上記「default-page.psmlの制限参照」の検証
    • +
+

+ 1.role「admin」ではないユーザーでログイン後、「編集」を押下し、編集モードに切り替えます。 +

+ +

+ 2.「レイアウト設定」リンクを押下します。 +

+ +

+ 3.「サイトエディター」表示（上記の制限があるため、はファイル「my-account.psml」を参照できない。） +

+ + + +

+ 管理者は、ユーザーごとにログイン後の初期表示画面を構成することができます。下記は設定画面です。 +

+
    +
  • 管理者によるユーザー「a001」に対する設定内容（３つのポートレットアプリケーションを組み込んでいます。※1）
    • +
+ +
    +
  • 管理者によるユーザー「a002」に対する設定内容（１つのポートレットアプリケーションを組み込んでいます。※1）
    • +
+ +

+ (※1) ポートレットアプリケーションの追加手順に関しては下記リンク先を参照ください。 +

+

+ + +

+ 上記「03.特定ユーザー制御例（前編）」の内容で設定された後の、ユーザーによるログイン後の初期表示画面が下記の通りです。 + （各ユーザーのログイン後画面での検証） +

+
    +
  • ユーザー「a001」によるログイン後の初期表示画面（管理者によって設定された３つのポートレットアプリケーションが表示・使用可となっている）
    • +
+ +
    +
  • ユーザー「a002」によるログイン後の初期表示画面（管理者によって設定された１つのポートレットアプリケーションが表示・使用可となっている）
    • +
+ + +
+ + Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor-portlet-guide.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management-guide.xml =================================================================== --- pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management-guide.xml 2007-11-19 12:57:49 UTC (rev 707) +++ pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management-guide.xml 2007-11-20 00:06:13 UTC (rev 708) @@ -0,0 +1,212 @@ + + + + + ユーザー管理 + ユーザー管理 + + + + + +
+

+ このドキュメントは、PALポータルのユーザー管理作業を担当する管理者を対象にしています。 + ユーザー管理には「ユーザー管理」、「ロール管理」、「グループ管理」の３つの機能があります。 + それぞれの管理機能を使用する場合は、「User Management」のそれぞれのタブを選択して作業を行います。 +

+ +
+
+ +

+ 「ユーザー」タブを選択し、「新規」リンクを押下します。 +

+ + + +

+ 入力フォームが画面表示されます。 + 「ユーザー名」、「パスワード」、「パスワード(確認用)」、「初期ログイン時のパスワード変更」、 + 「デフォルトロール」を入力します。 + そのまま登録へ進むには、「Confirm」ボタンを押下します。 + 編集を中断する場合は「Back」ボタンを押下します。 +

+ + + +

+ 登録内容を確認し、登録を完了させるために、「Finish」ボタンを押下します。 + 編集を中断する場合は「Back」ボタンを押下します。 +

+ + + +

+ 登録処理が完了し、画面には正常に完了した旨のメッセージが表示されます。 +

+ + +
+
+ +

+ 「ユーザーの一覧」で表示されている内容から、更新するユーザーの「編集」リンクを押下します。 +

+ + + +

+ 内容を編集した後、「Update」を押下します。 +

+ + + +

+ 編集処理が完了し、画面には正常に完了した旨のメッセージが表示されます。 +

+ + +
+
+ +

+ 「ユーザーの一覧」で表示されている内容から、削除するユーザーの「削除」リンクを押下します。 +

+ + + +

+ 削除の最終確認を行い、「Finish」を押下します。中止する場合は、「Back」を押下します。 +

+ + + +

+ 削除処理が完了し、画面には正常に完了した旨のメッセージが表示されます。 +

+ + +
+
+ +

+ ロールを新規で登録する場合は、「User Management」の「ロール」タブを選択し、「New」リンクを押下します。 +

+ + + +

+ 入力フォームが画面表示されます。 + 「ロール名」を入力します。 + そのまま登録へ進むには、「Confirm」ボタンを押下します。 + 編集を中断する場合は「Back」ボタンを押下します。 +

+ + + +

+ 登録内容を確認し、登録を完了させるために、「Finish」ボタンを押下します。 +

+ + + +

+ 登録処理が完了し、画面には正常に完了した旨のメッセージが表示されます。 +

+ + +

+ 登録されたロールは下記図のように、ユーザー新規登録でのロール指定等で使用可能となります。 +

+ +
+
+ +

+ 「ロールの一覧」で表示されている内容から、削除するロールの「削除」リンクを押下します。 +

+ + + +

+ 削除の最終確認を行い、「Finish」を押下します。中止する場合は、「Back」を押下します。 +

+ + + +

+ 削除処理が完了し、画面には正常に完了した旨のメッセージが表示されます。 +

+ + +
+
+ +

+ グループを新規で登録する場合は、「User Management」の「グループ」タブを選択し、「New」リンクを押下します。 +

+ + + +

+ 入力フォームが画面表示されます。 + 「グループ名」を入力します。 + そのまま登録へ進むには、「Confirm」ボタンを押下します。 + 編集を中断する場合は「Back」ボタンを押下します。 +

+ + + +

+ 登録内容を確認し、登録を完了させるために、「Finish」ボタンを押下します。 +

+ + + +

+ 登録処理が完了し、画面には正常に完了した旨のメッセージが表示されます。 +

+ +

+ 登録されたグループは下記図のように、ユーザー更新でのグループ指定等で使用可能となります。 +

+ + +
+
+ +

+ 「グループの一覧」で表示されている内容から、削除するグループの「削除」リンクを押下します。 +

+ + + +

+ 削除の最終確認を行い、「Finish」を押下します。中止する場合は、「Back」を押下します。 +

+ + + +

+ 削除処理が完了し、画面には正常に完了した旨のメッセージが表示されます。 +

+ + +
+ + Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management-guide.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/user-registration-portlet-guide.xml =================================================================== --- pal-portal/trunk/docs/ja/administration-guide/xdocs/user-registration-portlet-guide.xml 2007-11-19 12:57:49 UTC (rev 707) +++ pal-portal/trunk/docs/ja/administration-guide/xdocs/user-registration-portlet-guide.xml 2007-11-20 00:06:13 UTC (rev 708) @@ -0,0 +1,53 @@ + + + + + ダミー + ダミー + + + + + +
+

+ No1_このドキュメントは、PALポータルのポータル管理作業を担当する管理者を対象にしています。 +

+
+
+

+

+
+
+

+ ダウンロード、専門的サービス、サポート、その他の開発者情報については、次にアクセスしてください。 +

+

+
+
+

+ 本製品に関する技術的質問で、ドキュメント内に解決策が得られない場合は、次にアクセスしてください。 +

+

+
+ + Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/user-registration-portlet-guide.xml ___________________________________________________________________ Name: svn:eol-style + native From svnnotify ＠ sourceforge.jp Tue Nov 20 10:23:35 2007 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Tue, 20 Nov 2007 10:23:35 +0900 Subject: [pal-cvs 2965] [709] removed link from title. Message-ID: <1195521815.325361.13914.nullmailer@users.sourceforge.jp> Revision: 709 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=709 Author: shinsuke Date: 2007-11-20 10:23:34 +0900 (Tue, 20 Nov 2007) Log Message: ----------- removed link from title. Modified Paths: -------------- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productList.html -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productList.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productList.html 2007-11-20 00:06:13 UTC (rev 708) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productList.html 2007-11-20 01:23:34 UTC (rev 709) @@ -86,9 +86,10 @@ From svnnotify ＠ sourceforge.jp Tue Nov 20 10:42:59 2007 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Tue, 20 Nov 2007 10:42:59 +0900 Subject: [pal-cvs 2966] [710] change portlet title dynamically. Message-ID: <1195522979.325757.25357.nullmailer@users.sourceforge.jp> Revision: 710 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=710 Author: shinsuke Date: 2007-11-20 10:42:58 +0900 (Tue, 20 Nov 2007) Log Message: ----------- change portlet title dynamically. Modified Paths: -------------- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/SystemUtil.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsPage.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListPage.java pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/product/label.properties -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/SystemUtil.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/SystemUtil.java 2007-11-20 01:23:34 UTC (rev 709) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/SystemUtil.java 2007-11-20 01:42:58 UTC (rev 710) @@ -6,6 +6,7 @@ import javax.faces.context.FacesContext; import javax.portlet.PortletConfig; +import javax.portlet.RenderResponse; import jp.sf.pal.common.CommonException; import jp.sf.pal.pompei.PompeiConstants; @@ -145,4 +146,11 @@ } return PompeiConstants.DEFAULT_NUM_OF_TOP_PRODUCTS; } + + public static void setWindowTitle(String title) { + Object response = getFacesContext().getExternalContext().getResponse(); + if (response instanceof RenderResponse) { + ((RenderResponse) response).setTitle(title); + } + } } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsAction.java 2007-11-20 01:23:34 UTC (rev 709) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsAction.java 2007-11-20 01:42:58 UTC (rev 710) @@ -20,6 +20,7 @@ import jp.sf.pal.pompei.service.CustomerService; import jp.sf.pal.pompei.service.ProductService; import jp.sf.pal.pompei.util.SessionUtil; +import jp.sf.pal.pompei.util.SystemUtil; import jp.sf.pal.pompei.util.UploadedFileUtil; import jp.sf.pal.pompei.util.UrlBuilderUtil; @@ -129,6 +130,10 @@ .getProductImageUrl(PompeiConstants.DEFAULT_DETAILS_IMAGE_NAME)); } + // set title + SystemUtil.setWindowTitle(getProductDetailsPage().getLabelHelper() + .getLabelValue("windowTitle")); + // render faces messages FacesMessageUtil.renderMessages(); return null; Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsPage.java 2007-11-20 01:23:34 UTC (rev 709) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsPage.java 2007-11-20 01:42:58 UTC (rev 710) @@ -6,6 +6,7 @@ import jp.sf.pal.pompei.util.UrlBuilderUtil; import org.seasar.teeda.extension.annotation.convert.BigDecimalConverter; +import org.seasar.teeda.extension.util.LabelHelper; public class ProductDetailsPage implements Serializable { @@ -14,6 +15,8 @@ */ private static final long serialVersionUID = 1811488036598264012L; + private LabelHelper labelHelper; + private String manufacturersName; private BigDecimal productId; @@ -269,4 +272,18 @@ } return false; } + + /** + * @return the labelHelper + */ + public LabelHelper getLabelHelper() { + return labelHelper; + } + + /** + * @param labelHelper the labelHelper to set + */ + public void setLabelHelper(LabelHelper labelHelper) { + this.labelHelper = labelHelper; + } } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java 2007-11-20 01:23:34 UTC (rev 709) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java 2007-11-20 01:42:58 UTC (rev 710) @@ -22,6 +22,7 @@ import jp.sf.pal.pompei.service.ProductService; import jp.sf.pal.pompei.util.PagingResultBeanWrapper; import jp.sf.pal.pompei.util.SessionUtil; +import jp.sf.pal.pompei.util.SystemUtil; import jp.sf.pal.pompei.util.UploadedFileUtil; import org.seasar.teeda.extension.util.LabelHelper; @@ -194,6 +195,10 @@ PompeiConstants.THUMBNAIL_DISPLAY); } + // set title + SystemUtil.setWindowTitle(getProductListPage().getLabelHelper() + .getLabelValue("windowTitle")); + // render faces messages FacesMessageUtil.renderMessages(); return null; Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListPage.java 2007-11-20 01:23:34 UTC (rev 709) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListPage.java 2007-11-20 01:42:58 UTC (rev 710) @@ -11,6 +11,7 @@ import jp.sf.pal.pompei.web.PagingResultPage; import org.seasar.teeda.extension.annotation.convert.BigDecimalConverter; +import org.seasar.teeda.extension.util.LabelHelper; public class ProductListPage extends PagingResultPage { @@ -19,6 +20,8 @@ */ private static final long serialVersionUID = -2356477849446203183L; + private LabelHelper labelHelper; + private int productIndex; private List> productItems; @@ -197,4 +200,18 @@ return getThumbnailSrc(); } + /** + * @return the labelHelper + */ + public LabelHelper getLabelHelper() { + return labelHelper; + } + + /** + * @param labelHelper the labelHelper to set + */ + public void setLabelHelper(LabelHelper labelHelper) { + this.labelHelper = labelHelper; + } + } Modified: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/product/label.properties =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/product/label.properties 2007-11-20 01:23:34 UTC (rev 709) +++ pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/product/label.properties 2007-11-20 01:42:58 UTC (rev 710) @@ -5,3 +5,6 @@ productDetails.productsmodel=\u578b\u756a productDetails.productsprice=\u4fa1\u683c productDetails.manufacturersname=\u30e1\u30fc\u30ab\u30fc + +productList.windowTitle=\u5546\u54c1\u4e00\u89a7 +productDetails.windowTitle=\u5546\u54c1\u8a73\u7d30 From svnnotify ＠ sourceforge.jp Tue Nov 20 11:40:16 2007 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Tue, 20 Nov 2007 11:40:16 +0900 Subject: [pal-cvs 2967] [711] added tel example. Message-ID: <1195526416.689424.7102.nullmailer@users.sourceforge.jp> Revision: 711 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=711 Author: shinsuke Date: 2007-11-20 11:40:16 +0900 (Tue, 20 Nov 2007) Log Message: ----------- added tel example. Modified Paths: -------------- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userAddressSelect.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userInfoEdit.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupEdit.html -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userAddressSelect.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userAddressSelect.html 2007-11-20 01:42:58 UTC (rev 710) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userAddressSelect.html 2007-11-20 02:40:16 UTC (rev 711) @@ -153,6 +153,7 @@ @@ -161,6 +162,7 @@ @@ -169,6 +171,7 @@ Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userInfoEdit.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userInfoEdit.html 2007-11-20 01:42:58 UTC (rev 710) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userInfoEdit.html 2007-11-20 02:40:16 UTC (rev 711) @@ -196,6 +196,7 @@ @@ -204,6 +205,7 @@ @@ -212,6 +214,7 @@ Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupEdit.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupEdit.html 2007-11-20 01:42:58 UTC (rev 710) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupEdit.html 2007-11-20 02:40:16 UTC (rev 711) @@ -181,6 +181,7 @@ @@ -189,6 +190,7 @@ @@ -197,6 +199,7 @@ From svnnotify ＠ sourceforge.jp Tue Nov 20 11:41:53 2007 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Tue, 20 Nov 2007 11:41:53 +0900 Subject: [pal-cvs 2968] [712] added height. Message-ID: <1195526513.060556.7443.nullmailer@users.sourceforge.jp> Revision: 712 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=712 Author: shinsuke Date: 2007-11-20 11:41:52 +0900 (Tue, 20 Nov 2007) Log Message: ----------- added height. Modified Paths: -------------- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productList.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/topProductList.html -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productList.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productList.html 2007-11-20 02:40:16 UTC (rev 711) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productList.html 2007-11-20 02:41:52 UTC (rev 712) @@ -60,7 +60,7 @@
-
+
画像
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/topProductList.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/topProductList.html 2007-11-20 02:40:16 UTC (rev 711) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/topProductList.html 2007-11-20 02:41:52 UTC (rev 712) @@ -10,7 +10,7 @@
-
+
画像
From svnnotify ＠ sourceforge.jp Tue Nov 20 12:39:02 2007 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Tue, 20 Nov 2007 12:39:02 +0900 Subject: [pal-cvs 2969] [713] display larger image from details page. Message-ID: <1195529942.933194.24689.nullmailer@users.sourceforge.jp> Revision: 713 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=713 Author: shinsuke Date: 2007-11-20 12:39:02 +0900 (Tue, 20 Nov 2007) Log Message: ----------- display larger image from details page. Modified Paths: -------------- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsPage.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productDetails.html -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java 2007-11-20 02:41:52 UTC (rev 712) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java 2007-11-20 03:39:02 UTC (rev 713) @@ -121,6 +121,8 @@ public static final BigDecimal DETAILS_IMAGE_TYPE = new BigDecimal(2); + public static final BigDecimal LARGE_IMAGE_TYPE = new BigDecimal(3); + public static final String THUMBNAIL_IMAGE_URL = "thumbnailImageUrl"; public static final String DEFAULT_THUMBNAIL_IMAGE_NAME = "noimage.png"; Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsAction.java 2007-11-20 02:41:52 UTC (rev 712) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsAction.java 2007-11-20 03:39:02 UTC (rev 713) @@ -130,6 +130,23 @@ .getProductImageUrl(PompeiConstants.DEFAULT_DETAILS_IMAGE_NAME)); } + // large image + ProductImage largeProductImage = getProductService() + .getProductImageByProductIdAndType( + productDetailsPage.getProductId(), + PompeiConstants.LARGE_IMAGE_TYPE); + if (largeProductImage != null) { + getProductDetailsPage().setLargeImageUrl( + UploadedFileUtil.getProductImageUrl(largeProductImage + .getImageName())); + } else { + // default image + getProductDetailsPage() + .setLargeImageUrl( + UploadedFileUtil + .getProductImageUrl(PompeiConstants.DEFAULT_DETAILS_IMAGE_NAME)); + } + // set title SystemUtil.setWindowTitle(getProductDetailsPage().getLabelHelper() .getLabelValue("windowTitle")); Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsPage.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsPage.java 2007-11-20 02:41:52 UTC (rev 712) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsPage.java 2007-11-20 03:39:02 UTC (rev 713) @@ -41,6 +41,8 @@ private String detailsImageUrl; + private String largeImageUrl; + private boolean user; private boolean login; @@ -224,6 +226,10 @@ return getDetailsImageUrl(); } + public String getDetailsImageAlt() { + return getTitle(); + } + /** * @return detailsImageUrl */ @@ -286,4 +292,26 @@ public void setLabelHelper(LabelHelper labelHelper) { this.labelHelper = labelHelper; } + + /** + * @return the largeImageUrl + */ + public String getLargeImageUrl() { + return largeImageUrl; + } + + /** + * @param largeImageUrl the largeImageUrl to set + */ + public void setLargeImageUrl(String largeImageUrl) { + this.largeImageUrl = largeImageUrl; + } + + public String getLargeImageHref() { + return getLargeImageUrl(); + } + + public String getLargeImageTitle() { + return getName(); + } } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java 2007-11-20 02:41:52 UTC (rev 712) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java 2007-11-20 03:39:02 UTC (rev 713) @@ -110,15 +110,13 @@ PompeiConstants.CURRENT_CATEGORY_ID, currentCategoryId); } + boolean isChangeCategory = false; // check previous category BigDecimal previousCategoryId = (BigDecimal) SessionUtil .getFromLocalScope(PompeiConstants.CURRENT_CATEGORY_ID); if (previousCategoryId != null && !previousCategoryId.equals(currentCategoryId)) { - // change category - getProductListPage().setPageNumber( - PompeiConstants.DEFAULT_CURRENT_PAGE_NUMBER); - getProductListPage().setPageSize(PompeiConstants.DEFAULT_PAGE_SIZE); + isChangeCategory = true; } // store category id to local session @@ -126,14 +124,22 @@ currentCategoryId != null ? new BigDecimal(currentCategoryId .longValue()) : null); - if (isProductDetails()) { - return ProductDetailsPage.class; - } + if (isChangeCategory) { + // change category + getProductListPage().setPageNumber( + PompeiConstants.DEFAULT_CURRENT_PAGE_NUMBER); + getProductListPage().setPageSize(PompeiConstants.DEFAULT_PAGE_SIZE); - // set page number and size - if (getProductListPage().getPageNumber() != 0 - && getProductListPage().getPageSize() != 0) { - getPagerDxo().convert(getProductListPage(), getProductPager()); + } else { + if (isProductDetails()) { + return ProductDetailsPage.class; + } + + // set page number and size + if (getProductListPage().getPageNumber() != 0 + && getProductListPage().getPageSize() != 0) { + getPagerDxo().convert(getProductListPage(), getProductPager()); + } } // set display mode Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productDetails.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productDetails.html 2007-11-20 02:41:52 UTC (rev 712) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productDetails.html 2007-11-20 03:39:02 UTC (rev 713) @@ -13,7 +13,7 @@
- AAAAAAA
- AAAAAAA + AAAAAAA +
+ AAAAAAA 		価格円
+
+
+
+
+
+
+
+
+
- +
画像画像
タイトル
From svnnotify ＠ sourceforge.jp Tue Nov 20 12:48:31 2007 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Tue, 20 Nov 2007 12:48:31 +0900 Subject: [pal-cvs 2970] [714] clear session value. Message-ID: <1195530511.679881.1317.nullmailer@users.sourceforge.jp> Revision: 714 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=714 Author: shinsuke Date: 2007-11-20 12:48:31 +0900 (Tue, 20 Nov 2007) Log Message: ----------- clear session value. Modified Paths: -------------- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java 2007-11-20 03:39:02 UTC (rev 713) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListAction.java 2007-11-20 03:48:31 UTC (rev 714) @@ -97,6 +97,7 @@ } catch (NumberFormatException e) { } } + // clear flag from details page SessionUtil.removeFromLocalScope(PompeiConstants.IS_FROM_DETAILS_PAGE); return false; } @@ -130,6 +131,9 @@ PompeiConstants.DEFAULT_CURRENT_PAGE_NUMBER); getProductListPage().setPageSize(PompeiConstants.DEFAULT_PAGE_SIZE); + // clear flag from details page + SessionUtil + .removeFromLocalScope(PompeiConstants.IS_FROM_DETAILS_PAGE); } else { if (isProductDetails()) { return ProductDetailsPage.class; From svnnotify ＠ sourceforge.jp Tue Nov 20 13:14:12 2007 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Tue, 20 Nov 2007 13:14:12 +0900 Subject: [pal-cvs 2971] [715] encoded secret answer. Message-ID: <1195532052.242715.19000.nullmailer@users.sourceforge.jp> Revision: 715 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=715 Author: shinsuke Date: 2007-11-20 13:14:11 +0900 (Tue, 20 Nov 2007) Log Message: ----------- encoded secret answer. Modified Paths: -------------- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupConfirmAction.java -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupConfirmAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupConfirmAction.java 2007-11-20 03:48:31 UTC (rev 714) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupConfirmAction.java 2007-11-20 04:14:11 UTC (rev 715) @@ -67,17 +67,6 @@ @TakeOver(type = TakeOverType.INCLUDE, properties = "emailAddress") public Class doOnceCreate() { - // message digest - try { - getSignupConfirmPage().setUserSecretAnswer( - SystemUtil.getMessageDigest(getSignupConfirmPage() - .getUserSecretAnswer())); - } catch (CommonException e) { - FacesMessageUtil.addErrorMessage(e.getMessageId()); - logger.log(e); - return null; - } - // new Date now = new Date(); Customer customer = new Customer(); @@ -101,8 +90,19 @@ Map userInfo = new HashMap(); // put user attribute - userInfo.put(PompeiConstants.USER_SECRET_ANSWER, (String) SessionUtil - .getFromLocalScope(PompeiConstants.USER_SECRET_ANSWER)); + try { + // message digest + userInfo + .put( + PompeiConstants.USER_SECRET_ANSWER, + SystemUtil + .getMessageDigest((String) SessionUtil + .getFromLocalScope(PompeiConstants.USER_SECRET_ANSWER))); + } catch (CommonException e) { + FacesMessageUtil.addErrorMessage(e.getMessageId()); + logger.log(e); + return null; + } userInfo.put(PompeiConstants.USER_NAME, getSignupConfirmPage() .getUserName()); userInfo.put(PompeiConstants.USER_BUSINESS_INFO_ONLINE_EMAIL, From svnnotify ＠ sourceforge.jp Tue Nov 20 15:04:26 2007 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Tue, 20 Nov 2007 15:04:26 +0900 Subject: [pal-cvs 2972] [716] convert to jis. Message-ID: <1195538666.017656.30069.nullmailer@users.sourceforge.jp> Revision: 716 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=716 Author: shinsuke Date: 2007-11-20 15:04:25 +0900 (Tue, 20 Nov 2007) Log Message: ----------- convert to jis. Modified Paths: -------------- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/SystemUtil.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserAddressSelectAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditAction.java pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupConfirmAction.java -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/SystemUtil.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/SystemUtil.java 2007-11-20 04:14:11 UTC (rev 715) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/SystemUtil.java 2007-11-20 06:04:25 UTC (rev 716) @@ -153,4 +153,40 @@ ((RenderResponse) response).setTitle(title); } } + + public static String convertToJIS(String s) { + if (s == null) { + return null; + } + StringBuilder sb = new StringBuilder(); + char c; + for (int i = 0; i < s.length(); i++) { + c = s.charAt(i); + switch (c) { + case 0xff3c: // FULLWIDTH REVERSE SOLIDUS -> + c = 0x005c; // REVERSE SOLIDUS + break; + case 0xff5e: // FULLWIDTH TILDE -> + c = 0x301c; // WAVE DASH + break; + case 0x2225: // PARALLEL TO -> + c = 0x2016; // DOUBLE VERTICAL LINE + break; + case 0xff0d: // FULLWIDTH HYPHEN-MINUS -> + c = 0x2212; // MINUS SIGN + break; + case 0xffe0: // FULLWIDTH CENT SIGN -> + c = 0x00a2; // CENT SIGN + break; + case 0xffe1: // FULLWIDTH POUND SIGN -> + c = 0x00a3; // POUND SIGN + break; + case 0xffe2: // FULLWIDTH NOT SIGN -> + c = 0x00ac; // NOT SIGN + break; + } + sb.append(c); + } + return new String(sb); + } } Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserAddressSelectAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserAddressSelectAction.java 2007-11-20 04:14:11 UTC (rev 715) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserAddressSelectAction.java 2007-11-20 06:04:25 UTC (rev 716) @@ -18,6 +18,7 @@ import jp.sf.pal.pompei.service.CustomerService; import jp.sf.pal.pompei.service.LanguageService; import jp.sf.pal.pompei.util.SessionUtil; +import jp.sf.pal.pompei.util.SystemUtil; import org.seasar.teeda.extension.annotation.takeover.TakeOver; import org.seasar.teeda.extension.annotation.takeover.TakeOverType; @@ -131,6 +132,11 @@ @TakeOver(type = TakeOverType.INCLUDE, properties = "orderProcessId") public Class doAdd() { + // convert cp932 to jis + getUserAddressSelectPage().setStreetAddress( + SystemUtil.convertToJIS(getUserAddressSelectPage() + .getStreetAddress())); + // check login String remoteUser = FacesContext.getCurrentInstance() .getExternalContext().getRemoteUser(); Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditAction.java 2007-11-20 04:14:11 UTC (rev 715) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditAction.java 2007-11-20 06:04:25 UTC (rev 716) @@ -23,6 +23,7 @@ import jp.sf.pal.pompei.service.CustomerService; import jp.sf.pal.pompei.service.LanguageService; import jp.sf.pal.pompei.util.SessionUtil; +import jp.sf.pal.pompei.util.SystemUtil; import org.seasar.teeda.extension.annotation.takeover.TakeOver; import org.seasar.teeda.extension.annotation.takeover.TakeOverType; @@ -183,6 +184,11 @@ } public Class doUpdate() { + // convert cp932 to jis + getUserInfoEditPage().setStreetAddress( + SystemUtil.convertToJIS(getUserInfoEditPage() + .getStreetAddress())); + // check email if (!getUserInfoEditPage().getEmailAddress().equals( getUserInfoEditPage().getEmailAddressConfirm())) { Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupConfirmAction.java =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupConfirmAction.java 2007-11-20 04:14:11 UTC (rev 715) +++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupConfirmAction.java 2007-11-20 06:04:25 UTC (rev 716) @@ -66,6 +66,10 @@ @TakeOver(type = TakeOverType.INCLUDE, properties = "emailAddress") public Class doOnceCreate() { + // convert cp932 to jis + getSignupConfirmPage().setStreetAddress( + SystemUtil.convertToJIS(getSignupConfirmPage() + .getStreetAddress())); // new Date now = new Date(); From svnnotify ＠ sourceforge.jp Tue Nov 20 17:01:22 2007 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Tue, 20 Nov 2007 17:01:22 +0900 Subject: [pal-cvs 2973] [717] use css. Message-ID: <1195545682.278119.22190.nullmailer@users.sourceforge.jp> Revision: 717 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=717 Author: shinsuke Date: 2007-11-20 17:01:21 +0900 (Tue, 20 Nov 2007) Log Message: ----------- use css. Modified Paths: -------------- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutComplete.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutConfirm.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/paymentSelect.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userAddressSelect.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userInfoEdit.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupComplete.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupConfirm.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupEdit.html -------------- next part -------------- Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutComplete.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutComplete.html 2007-11-20 06:04:25 UTC (rev 716) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutComplete.html 2007-11-20 08:01:21 UTC (rev 717) @@ -10,15 +10,15 @@
- + - + - + - + - +
1. 会員情報の確認会員情報の
確認		 >2. お届け先の選択お届け先の
選択		 >3. 支払方法とお届け方法の選択支払方法と
お届け方法の
選択		 >4. ご注文内容の確認ご注文内容の
確認		 >5. ご注文完了ご注文完了

@@ -29,11 +29,11 @@
-
5. ご注文が完了しました
+
5. ご注文が完了しました
- - +
  +   Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutConfirm.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutConfirm.html 2007-11-20 06:04:25 UTC (rev 716) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutConfirm.html 2007-11-20 08:01:21 UTC (rev 717) @@ -10,15 +10,15 @@
- + - + - + - + - +
1. 会員情報の確認会員情報の
確認		 >2. お届け先の選択お届け先の
選択		 >3. 支払方法とお届け方法の選択支払方法と
お届け方法の
選択		 >4. ご注文内容の確認ご注文内容の
確認		 >5. ご注文完了ご注文完了

@@ -30,11 +30,11 @@
-
4. ご注文内容をご確認ください
+
4. ご注文内容をご確認ください
- - +
  +   @@ -122,8 +122,8 @@
- - +
  +   @@ -220,8 +220,8 @@
- - +
  +   @@ -231,8 +231,8 @@
- - +
  +   Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/paymentSelect.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/paymentSelect.html 2007-11-20 06:04:25 UTC (rev 716) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/paymentSelect.html 2007-11-20 08:01:21 UTC (rev 717) @@ -22,15 +22,15 @@
- + - + - + - + - +
1. 会員情報の確認会員情報の
確認		 >2. お届け先の選択お届け先の
選択		 >3. 支払方法とお届け方法の選択支払方法と
お届け方法の
選択		 >4. ご注文内容の確認ご注文内容の
確認		 >5. ご注文完了ご注文完了

@@ -42,11 +42,11 @@
-
3-1. 配送方法を選択してください
+
3-1. 配送方法を選択してください
- - +
  +   @@ -77,11 +77,11 @@

-
3-2. お支払い方法を選択してください
+
3-2. お支払い方法を選択してください
- - +
  +   @@ -113,11 +113,11 @@

-
3-3. クレジットカード情報を入力してください (カード払いの場合のみ)
+
3-3. クレジットカード情報を入力してください (カード払いの場合のみ)
- - +
  +   Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userAddressSelect.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userAddressSelect.html 2007-11-20 06:04:25 UTC (rev 716) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userAddressSelect.html 2007-11-20 08:01:21 UTC (rev 717) @@ -10,15 +10,15 @@
- + - + - + - + - +
1. 会員情報の確認会員情報の
確認		 >2. お届け先の選択お届け先の
選択		 >3. 支払方法とお届け方法の選択支払方法と
お届け方法の
選択		 >4. ご注文内容の確認ご注文内容の
確認		 >5. ご注文完了ご注文完了

@@ -31,11 +31,11 @@

-
2-1. お届け先を選択してください
+
2-1. お届け先を選択してください
- - +
  +   @@ -60,11 +60,11 @@
-
2-2. お届け先を追加する (追加する場合のみ)
+
2-2. お届け先を追加する (追加する場合のみ)
- - +
  +   Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userInfoEdit.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userInfoEdit.html 2007-11-20 06:04:25 UTC (rev 716) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userInfoEdit.html 2007-11-20 08:01:21 UTC (rev 717) @@ -10,15 +10,15 @@
- + - + - + - + - +
1. 会員情報の確認会員情報の
確認		 >2. お届け先の選択お届け先の
選択		 >3. 支払方法とお届け方法の選択支払方法と
お届け方法の
選択		 >4. ご注文内容の確認ご注文内容の
確認		 >5. ご注文完了ご注文完了

@@ -37,11 +37,11 @@
-
1-1. 会員情報を入力してください
+
1-1. 会員情報を入力してください
- - +
  +   @@ -138,11 +138,11 @@


-
1-2. お届け先を入力してください
+
1-2. お届け先を入力してください
- - +
  +   @@ -251,11 +251,11 @@
-
1-1. 会員情報をご確認ください
+
1-1. 会員情報をご確認ください
- - +
  +   @@ -324,11 +324,11 @@


-
1-2. お届け先をご確認ください
+
1-2. お届け先をご確認ください
- - +
  +   Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupComplete.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupComplete.html 2007-11-20 06:04:25 UTC (rev 716) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupComplete.html 2007-11-20 08:01:21 UTC (rev 717) @@ -14,11 +14,11 @@
-
会員登録が完了しました
+
会員登録が完了しました
- - +
  +   Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupConfirm.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupConfirm.html 2007-11-20 06:04:25 UTC (rev 716) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupConfirm.html 2007-11-20 08:01:21 UTC (rev 717) @@ -13,11 +13,11 @@
-
1. 会員情報を確認してください
+
1. 会員情報を確認してください
- - +
  +   @@ -94,11 +94,11 @@


-
2. お届け先を確認してください
+
2. お届け先を確認してください
- - +
  +   @@ -184,11 +184,11 @@


-
3. 秘密の質問と答えを確認してください
+
3. 秘密の質問と答えを確認してください
- - +
  +   Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupEdit.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupEdit.html 2007-11-20 06:04:25 UTC (rev 716) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupEdit.html 2007-11-20 08:01:21 UTC (rev 717) @@ -13,11 +13,11 @@
-
1. 会員情報を入力してください
+
1. 会員情報を入力してください
- - +
  +   @@ -123,11 +123,11 @@


-
2. お届け先を入力してください
+
2. お届け先を入力してください
- - +
  +   @@ -226,11 +226,11 @@


-
3. 秘密の質問と答えを入力してください
+
3. 秘密の質問と答えを入力してください
- - +
  +   @@ -271,7 +271,7 @@


-
4. 利用規約をご確認ください。
+
4. 利用規約をご確認ください。
From svnnotify ＠ sourceforge.jp Tue Nov 20 17:59:45 2007 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Tue, 20 Nov 2007 17:59:45 +0900 Subject: [pal-cvs 2974] [718] fixed limit size. Message-ID: <1195549185.476083.26693.nullmailer@users.sourceforge.jp> Revision: 718 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=718 Author: shinsuke Date: 2007-11-20 17:59:45 +0900 (Tue, 20 Nov 2007) Log Message: ----------- fixed limit size. Modified Paths: -------------- pal-admin/trunk/src/main/java/jp/sf/pal/admin/PALAdminConstants.java -------------- next part -------------- Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/PALAdminConstants.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/PALAdminConstants.java 2007-11-20 08:01:21 UTC (rev 717) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/PALAdminConstants.java 2007-11-20 08:59:45 UTC (rev 718) @@ -78,10 +78,8 @@ public static final String NEXT_PAGE_NUMBER = "nextPageNumber"; //TODO move to portlet.xml file - public static final int DEFAULT_PAGER_LIMIT_SIZE = 2; + public static final int DEFAULT_PAGER_LIMIT_SIZE = 25; - // public static final int DEFAULT_PAGER_LIMIT_SIZE = 25; - public static final String DEFAULT_USER_TEMPLATE_FOLDER_NAME = "_template"; public static final String DEFAULT_USER_TEMPLATE_FOLDER = Folder.USER_FOLDER From svnnotify ＠ sourceforge.jp Tue Nov 20 18:00:10 2007 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Tue, 20 Nov 2007 18:00:10 +0900 Subject: [pal-cvs 2975] [719] fixed NPE. Message-ID: <1195549210.606543.27639.nullmailer@users.sourceforge.jp> Revision: 719 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=719 Author: shinsuke Date: 2007-11-20 18:00:10 +0900 (Tue, 20 Nov 2007) Log Message: ----------- fixed NPE. Modified Paths: -------------- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionConfirmPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionConfirmPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionConfirmPage.java -------------- next part -------------- Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionConfirmPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionConfirmPage.java 2007-11-20 08:59:45 UTC (rev 718) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionConfirmPage.java 2007-11-20 09:00:10 UTC (rev 719) @@ -112,6 +112,7 @@ if (isCreate()) { return FolderPermissionEditPage.class; } else if (isUpdate()) { + setActions(getOldActions()); return FolderPermissionEditPage.class; } else if (isDelete()) { return FolderPermissionListPage.class; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionConfirmPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionConfirmPage.java 2007-11-20 08:59:45 UTC (rev 718) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionConfirmPage.java 2007-11-20 09:00:10 UTC (rev 719) @@ -112,6 +112,7 @@ if (isCreate()) { return PagePermissionEditPage.class; } else if (isUpdate()) { + setActions(getOldActions()); return PagePermissionEditPage.class; } else if (isDelete()) { return PagePermissionListPage.class; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionConfirmPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionConfirmPage.java 2007-11-20 08:59:45 UTC (rev 718) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionConfirmPage.java 2007-11-20 09:00:10 UTC (rev 719) @@ -112,6 +112,7 @@ if (isCreate()) { return PortletPermissionEditPage.class; } else if (isUpdate()) { + setActions(getOldActions()); return PortletPermissionEditPage.class; } else if (isDelete()) { return PortletPermissionListPage.class; From svnnotify ＠ sourceforge.jp Tue Nov 20 21:38:34 2007 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Tue, 20 Nov 2007 21:38:34 +0900 Subject: [pal-cvs 2976] [720] updated scm info. Message-ID: <1195562314.672477.23121.nullmailer@users.sourceforge.jp> Revision: 720 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=720 Author: shinsuke Date: 2007-11-20 21:38:34 +0900 (Tue, 20 Nov 2007) Log Message: ----------- updated scm info. Modified Paths: -------------- pal-admin/trunk/pom.xml -------------- next part -------------- Modified: pal-admin/trunk/pom.xml =================================================================== --- pal-admin/trunk/pom.xml 2007-11-20 09:00:10 UTC (rev 719) +++ pal-admin/trunk/pom.xml 2007-11-20 12:38:34 UTC (rev 720) @@ -28,9 +28,9 @@ - scm:cvs:pserver:anonymous ＠ cvs.sourceforge.jp:/cvsroot/pal:pal-admin - scm:cvs:pserver:anonymous ＠ cvs.sourceforge.jp:/cvsroot/pal:pal-admin - http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/pal-admin + scm:svn:http://svn.sourceforge.jp/svnroot/pal/pal-admin/trunk/ + scm:svn:svn+ssh://${username}@svn.sourceforge.jp/svnroot/pal/pal-admin/trunk/ + http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi/pal-admin/trunk/?root=pal Portal Application Laboratory @@ -118,7 +118,7 @@ - + org.apache.portals.jetspeed-2 jetspeed-api 2.1.2_pal-1.0-beta6 - + provided - + org.apache.portals.jetspeed-2 @@ -256,9 +256,9 @@ org.apache.pluto pluto 1.0.1 - + provided - + org.seasar.container @@ -299,7 +299,7 @@ maven-project-info-reports-plugin - - Build Installer"> - - - - Modified: pal-portal/trunk/installer/etc/ant-installer/antinstall-config.xml =================================================================== --- pal-portal/trunk/installer/etc/ant-installer/antinstall-config.xml 2007-11-29 22:15:42 UTC (rev 731) +++ pal-portal/trunk/installer/etc/ant-installer/antinstall-config.xml 2007-11-29 22:16:26 UTC (rev 732) @@ -1,6 +1,6 @@ - - - - - - - - + + + + + + + + + + - - - - - + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - + + + + + + + + + + + + + + + - - - - - + + + + + - - - + + - - - - + + + + - - - - - - - - - - + + + + + + - - - - + + + + - - - - - - - - - - + + + + + + - - - - + + + + - - - - - - - - - - + + + + + + - - - - + + + + - - - - - - - - - - + + + + + + - - - - + + + + - - - - - - - - - - + + + + + + - - - - + + + + - - - - - - - - - - + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + Modified: pal-portal/trunk/installer/etc/ant-installer/build.xml =================================================================== --- pal-portal/trunk/installer/etc/ant-installer/build.xml 2007-11-29 22:15:42 UTC (rev 731) +++ pal-portal/trunk/installer/etc/ant-installer/build.xml 2007-11-29 22:16:26 UTC (rev 732) @@ -1,5 +1,6 @@ + - - - - - - - - Starting the installation - - - - - - Deleting all content from the installation target directory - + + Installing Tomcat + + + + + + + + + + ---> - - Installing PAL Portal + + + + + Installing Portal Configuration for Tomcat + + + + + + + + + + + + + Copying index.jsp + + + + + + + + + + Installing Portal + - - - + + @@ -49,44 +72,50 @@ - - + + + + + + + + + + + + Setting up the database configuration - + - - - - + + + - - - - - - + + + + + + Setting up the Jetspeed database (if selected) - + - + - - + - + - + starting Mail server configuration - + @@ -97,5 +126,120 @@ Mail server configuration done! - + + + Upgrade Portal + + + + + + The path is empty.. + Portal does not exist. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Modified: pal-portal/trunk/installer/etc/ant-installer/lib/ant-installer.jar =================================================================== (Binary files differ) Deleted: pal-portal/trunk/installer/etc/ant-installer/resources/feather-small.png =================================================================== (Binary files differ) Copied: pal-portal/trunk/installer/etc/ant-installer/resources/icon.png (from rev 729, pal-portal/trunk/installer/etc/ant-installer/resources/feather-small.png) Copied: pal-portal/trunk/installer/etc/ant-installer/resources/logo.gif (from rev 729, pal-portal/trunk/installer/etc/ant-installer/resources/palportal.gif) Deleted: pal-portal/trunk/installer/etc/ant-installer/resources/palportal.gif =================================================================== (Binary files differ) Modified: pal-portal/trunk/installer/etc/database/build.xml =================================================================== --- pal-portal/trunk/installer/etc/database/build.xml 2007-11-29 22:15:42 UTC (rev 731) +++ pal-portal/trunk/installer/etc/database/build.xml 2007-11-29 22:16:26 UTC (rev 732) @@ -1,10 +1,12 @@ + @@ -64,7 +66,7 @@ - + @@ -72,12 +74,12 @@ - - - + + + - + @@ -183,7 +185,6 @@ - @@ -195,6 +196,7 @@ + Copied: pal-portal/trunk/installer/etc/portal/temp (from rev 729, pal-portal/trunk/installer/etc/tomcat/temp) Deleted: pal-portal/trunk/installer/etc/tomcat/temp/administration.xml =================================================================== --- pal-portal/trunk/installer/etc/tomcat/temp/administration.xml 2007-11-29 22:15:42 UTC (rev 731) +++ pal-portal/trunk/installer/etc/tomcat/temp/administration.xml 2007-11-29 22:16:26 UTC (rev 732) @@ -1,142 +0,0 @@ - - - - - - @MAIL_SERVER@ - @MAIL_USERNAME@ - @MAIL_PASSWORD@ - - - @MAIL_AUTH@ - - - - - - /WEB-INF/templates/ - - - - org.apache.jetspeed.webapp.logging.velocity.CommonsLoggingLog4JLogSystem - velocity - - - - - - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.apache.jetspeed.administration.PortalAdministration - - - - - - - - PROPAGATION_REQUIRED,-org.apache.jetspeed.administration.RegistrationException - - - - - - - - - - - 2 - - - - - - - - false - - - - 0 - - - - /login/logout - - - - - - - - - - - org.apache.jetspeed.login.username - org.apache.jetspeed.login.password - org.apache.jetspeed.login.destination - org.apache.jetspeed.login.retrycount - org.apache.jetspeed.login.errorcode - org.apache.jetspeed.login.check - org.apache.jetspeed.theme.override - - - - - Copied: pal-portal/trunk/installer/etc/tomcat/temp/index.jsp (from rev 729, pal-portal/trunk/installer/etc/tomcat/webapps/ROOT/index.jsp) =================================================================== --- pal-portal/trunk/installer/etc/tomcat/webapps/ROOT/index.jsp 2007-11-27 13:57:32 UTC (rev 729) +++ pal-portal/trunk/installer/etc/tomcat/temp/index.jsp 2007-11-29 22:16:26 UTC (rev 732) @@ -0,0 +1,16 @@ +<%-- +Copyright 2005-2007 Portal Application Laboratory + +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. +--%> +<% response.sendRedirect("/@PORTAL_CONTEXT@"); %> Deleted: pal-portal/trunk/installer/etc/tomcat/webapps/ROOT/index.jsp =================================================================== --- pal-portal/trunk/installer/etc/tomcat/webapps/ROOT/index.jsp 2007-11-29 22:15:42 UTC (rev 731) +++ pal-portal/trunk/installer/etc/tomcat/webapps/ROOT/index.jsp 2007-11-29 22:16:26 UTC (rev 732) @@ -1,16 +0,0 @@ -<%-- -Copyright 2004 The Apache Software Foundation - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. ---%> -<% response.sendRedirect("/palportal"); %> Modified: pal-portal/trunk/installer/maven.xml =================================================================== --- pal-portal/trunk/installer/maven.xml 2007-11-29 22:15:42 UTC (rev 731) +++ pal-portal/trunk/installer/maven.xml 2007-11-29 22:16:26 UTC (rev 732) @@ -1,5 +1,6 @@ + - - + - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - + + + - - - - - - - + + + + + + + + + + - - - - - - + + + + + - - - - - - - - - - - - - - - - + + + - - - - + + + + + + - - - - + + + - - - - + + + + + - - - - + + + + + - - - - + + + + + - - + + + + + - - - - - - - - - - - - + + + + + - - - - - - + + + + + - - + + + + + + + + + - + - + - + - + - - - - - - - - - - - - - - - - - - - portalName=${org.apache.jetspeed.portal.artifactId} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - + + + + - - - - - - - - - - - - - - + portalName=${org.apache.jetspeed.portal.artifactId} + + - - + + - portalName=${org.apache.jetspeed.portal.artifactId} - - - + + - - + + + + + + + + - - + + - + - - - - + + + + - + - + - - - + + + + + From svnnotify ＠ sourceforge.jp Fri Nov 30 07:17:00 2007 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 30 Nov 2007 07:17:00 +0900 Subject: [pal-cvs 2989] [733] updated installer. Message-ID: <1196374620.100994.4534.nullmailer@users.sourceforge.jp> Revision: 733 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=733 Author: shinsuke Date: 2007-11-30 07:16:59 +0900 (Fri, 30 Nov 2007) Log Message: ----------- updated installer. Added Paths: ----------- pal-portal/trunk/installer/etc/ant-installer/resources/LanguagePack.properties pal-portal/trunk/installer/etc/ant-installer/resources/LanguagePack_ja.properties -------------- next part -------------- Added: pal-portal/trunk/installer/etc/ant-installer/resources/LanguagePack.properties =================================================================== --- pal-portal/trunk/installer/etc/ant-installer/resources/LanguagePack.properties 2007-11-29 22:16:26 UTC (rev 732) +++ pal-portal/trunk/installer/etc/ant-installer/resources/LanguagePack.properties 2007-11-29 22:16:59 UTC (rev 733) @@ -0,0 +1,204 @@ +### Ant Installer - language pack auto generated on Thu Nov 29 21:40:13 JST 2007 + +finishButtonText = Install + + +## Text from Page:intro +page.intro.displayText = Welcome to the @PORTAL_NAME@ +#comment.1.displayText = +comment.2.displayText = This installer will guide you through setting up the @PORTAL_NAME ＠ . +#portalContext.displayText = +#mailServer.displayText = +#msUsername.displayText = +#msPassword.displayText = +#msAuth.displayText = + +## Text from Page:license +page.license.displayText = License Conditions + +## Text from Page:installationSelection +page.installationSelection.displayText = Installation selection +comment.8.displayText = Please select the installation type. +installType.displayText = Installation type +installType.1.displayText = New Installation +installType.2.displayText = Upgrade Installation + +## Text from Page:properties +page.properties.displayText = Installation Location +installDir.displayText = Select an installation directory +#comment.11.displayText = +comment.12.displayText = Warning\: on Windows, the location must not contain spaces. + +## Text from Page:requiredComponents +page.requiredComponents.displayText = Components Selection +comment.13.displayText = @PORTAL_NAME@ +install.tomcat.displayText = Tomcat 5.5.23 +install.portal.displayText = @PORTAL_NAME@ +install.tomcat.config.displayText = @PORTAL_NAME@ Configration for Tomcat +mailServerConfiguration.displayText = Mail Server Configuration +dummy.displayText = DB Configuration +dbImportPsml.displayText = Store PSML in DB + +## Text from Page:requiredComponents +page.requiredUpgradeComponents.displayText = Components Selection +comment.20.displayText = @PORTAL_NAME@ +portalContext.displayText = Portal Context +upgrade.portal.displayText = @PORTAL_NAME@ +upgrade.portlets.displayText = Portlets +use.old.pages.displayText = Not Update PSML Files +use.old.conf.displayText = Not Update Configuration files +use.old.assembly.displayText = Not Update Component files +use.old.decorations.displayText = Not Update Decorator files +clean.up.upgrade.displayText = Clean up + +## Text from Page:mailServerConfig +page.mailServerConfig.displayText = Mail Server Configuration +comment.29.displayText = Please fill in the fields below with the approriate mail server information. The default values should work +mailServer.displayText = Mail server name +msUsername.displayText = User name +msPassword.displayText = Password +msAuth.displayText = User authentication + +## Text from Page:databaseSelection +page.databaseSelection.displayText = Database Selection +#checkdb.displayText = +#dbvalid.displayText = +#db.type.displayText = +#dbDisplayName.displayText = +#setupDBAntTarget.displayText = +comment.39.displayText = Please select the target database type you want to use for the portal. +dbName.displayText = Database type +dbName.1.displayText = DB2 +dbName.2.displayText = Derby +dbName.3.displayText = MSSQL +dbName.4.displayText = MySql +dbName.5.displayText = PostgreSQL +dbName.6.displayText = Oracle (9i or higher) +dbName.7.displayText = SapDB +dbName.8.displayText = Manual database setup + +## Text from Page:mysql +page.mysql.displayText = MySQL Database Connection Parameters +#checkdb.displayText = +#dbvalid.displayText = +#dbDisplayName.displayText = +comment.44.displayText = Please fill in the fields below for connecting to the MySQL database. +dbUser.displayText = Database User Name +dbPassword.displayText = Database Password +jdbcUrl.displayText = JDBC Connection String +jdbcDriverClass.displayText = JDBC Driver Classname +jdbcDriverJar.displayText = JDBC driver + +## Text from Page:postgres +page.postgres.displayText = PostgreSQL Database Connection Parameters +#checkdb.displayText = +#dbvalid.displayText = +#dbDisplayName.displayText = +comment.53.displayText = Please fill in the fields below for connecting to the PostgreSQL database. +dbUser.displayText = Database User Name +dbPassword.displayText = Database Password +jdbcUrl.displayText = JDBC Connection String +jdbcDriverClass.displayText = JDBC Driver Classname +jdbcDriverJar.displayText = JDBC driver + +## Text from Page:sapdb +page.sapdb.displayText = SapDB Database Connection Parameters +#checkdb.displayText = +#dbvalid.displayText = +#dbDisplayName.displayText = +comment.62.displayText = Please fill in the fields below for connecting to the SapDB database. +dbUser.displayText = Database User Name +dbPassword.displayText = Database Password +jdbcUrl.displayText = JDBC Connection String +jdbcDriverClass.displayText = JDBC Driver Classname +jdbcDriverJar.displayText = JDBC driver + +## Text from Page:oracle +page.oracle.displayText = Oracle Database Connection Parameters +#checkdb.displayText = +#dbvalid.displayText = +#dbDisplayName.displayText = +comment.71.displayText = Please fill in the fields below for connecting to the Oracle database. +dbUser.displayText = Database User Name +dbPassword.displayText = Database Password +jdbcUrl.displayText = JDBC Connection String +jdbcDriverClass.displayText = JDBC Driver Classname +jdbcDriverJar.displayText = JDBC driver + +## Text from Page:mssql +page.mssql.displayText = Microsoft SQL Server Connection Parameters +#checkdb.displayText = +#dbvalid.displayText = +#dbDisplayName.displayText = +comment.80.displayText = Please fill in the fields below for connecting to the Microsoft SQL Server. +dbUser.displayText = Database User Name +dbPassword.displayText = Database Password +jdbcUrl.displayText = JDBC Connection String +jdbcDriverClass.displayText = JDBC Driver Classname +jdbcDriverJar.displayText = JDBC driver + +## Text from Page:db2 +page.db2.displayText = DB2 Database Connection Parameters +#checkdb.displayText = +#dbvalid.displayText = +#dbDisplayName.displayText = +comment.89.displayText = Please fill in the fields below for connecting to the DB2 database. +dbUser.displayText = Database User Name +dbPassword.displayText = Database Password +jdbcUrl.displayText = JDBC Connection String +jdbcDriverClass.displayText = JDBC Driver Classname +jdbcDriverJar.displayText = JDBC driver + +## Text from Page:preDBCheck +page.preDBCheck.displayText = Testing Database Connection +#db.type.displayText = +#db.username.displayText = +#db.password.displayText = +#jdbc.url.displayText = +#jdbc.driver.class.displayText = +#jdbc.driver.jar.displayText = +#setupDBAntTarget.displayText = +comment.102.displayText = Press Next to test the database connection ... + +## Text from Page:dbCheckFailed +page.dbCheckFailed.displayText = Connection to Database Failed +#checkdb.displayText = +#setupDBAntTarget.displayText = +comment.105.displayText = Please go back and specify the correct database configurtion parameters. +#comment.106.displayText = +comment.107.displayText = Continuing now will otherwise require manual setup of the database. + +## Text from Page:beforeInstall +page.beforeInstall.displayText = Before Your Install ... +#db.username.displayText = +#db.password.displayText = +#jdbc.url.displayText = +#jdbc.driver.class.displayText = +#jdbc.driver.jar.displayText = +#setupDBAntTarget.displayText = +comment.114.displayText = @PORTAL_NAME@ will be installed without yet an configured database to\: +comment.115.displayText = \ + +## Text from Page:beforeInstall +page.beforeInstall.displayText = Before Your Install ... +#db.username.displayText = +#db.password.displayText = +#jdbc.url.displayText = +#jdbc.driver.class.displayText = +#jdbc.driver.jar.displayText = +#setupDBAntTarget.displayText = +comment.122.displayText = @PORTAL_NAME@ will be installed without yet an configured database to\: +#comment.123.displayText = \ + +## Text from Page:beforeInstall +page.beforeInstall.displayText = Before Your Install ... +comment.124.displayText = @PORTAL_NAME@ will be installed using a database to\: +#comment.125.displayText = \ + +## Text from Page:beforeUpgrade +page.beforeUpgrade.displayText = Before Your Upgrade... +comment.126.displayText = @PORTAL_NAME@ will be upgraded\: +#comment.127.displayText = \ + +## Text from Page:progress +page.progress.displayText = Installation Progress Property changes on: pal-portal/trunk/installer/etc/ant-installer/resources/LanguagePack.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/installer/etc/ant-installer/resources/LanguagePack_ja.properties =================================================================== --- pal-portal/trunk/installer/etc/ant-installer/resources/LanguagePack_ja.properties 2007-11-29 22:16:26 UTC (rev 732) +++ pal-portal/trunk/installer/etc/ant-installer/resources/LanguagePack_ja.properties 2007-11-29 22:16:59 UTC (rev 733) @@ -0,0 +1,204 @@ +### Ant Installer - language pack auto generated on Thu Nov 29 21:40:13 JST 2007 + +finishButtonText = \u30a4\u30f3\u30b9\u30c8\u30fc\u30eb + + +## Text from Page:intro +page.intro.displayText = @PORTAL_NAME@ \u3092\u3054\u5229\u7528\u3044\u305f\u3060\u304d\u3001\u3042\u308a\u304c\u3068\u3046\u3054\u3056\u3044\u307e\u3059\u3002 +#comment.1.displayText = +comment.2.displayText = \u3053\u306e\u30a4\u30f3\u30b9\u30c8\u30fc\u30e9\u3067 @PORTAL_NAME@ \u3092\u30bb\u30c3\u30c8\u30a2\u30c3\u30d7\u3057\u307e\u3059\u3002 +#portalContext.displayText = +#mailServer.displayText = +#msUsername.displayText = +#msPassword.displayText = +#msAuth.displayText = + +## Text from Page:license +page.license.displayText = \u30e9\u30a4\u30bb\u30f3\u30b9\u6761\u9805 + +## Text from Page:installationSelection +page.installationSelection.displayText = \u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u65b9\u6cd5\u306e\u9078\u629e +comment.8.displayText = \u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u65b9\u6cd5\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +installType.displayText = \u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u65b9\u6cd5 +installType.1.displayText = \u65b0\u898f\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb +installType.2.displayText = \u30a2\u30c3\u30d7\u30b0\u30ec\u30fc\u30c9\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb + +## Text from Page:properties +page.properties.displayText = \u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u5148 +installDir.displayText = \u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u5148\u306e\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +#comment.11.displayText = +comment.12.displayText = \u6ce8\u610f\: Windows\u3067\u306f\u3001\u30b9\u30da\u30fc\u30b9\u3092\u542b\u3081\u306a\u3044\u3067\u304f\u3060\u3055\u3044\u3002 + +## Text from Page:requiredComponents +page.requiredComponents.displayText = \u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u306e\u9078\u629e +comment.13.displayText = @PORTAL_NAME@ +install.tomcat.displayText = Tomcat 5.5.25 +install.portal.displayText = @PORTAL_NAME@ +install.tomcat.config.displayText = Tomcat \u7528 @PORTAL_NAME@ \u8a2d\u5b9a +mailServerConfiguration.displayText = \u30e1\u30fc\u30eb\u30b5\u30fc\u30d0\u8a2d\u5b9a +dummy.displayText = DB \u8a2d\u5b9a +dbImportPsml.displayText = DB \u306b PSML \u306e\u4fdd\u5b58 + +## Text from Page:requiredComponents +page.requiredUpgradeComponents.displayText = \u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u306e\u9078\u629e +comment.20.displayText = @PORTAL_NAME@ +portalContext.displayText = \u30dd\u30fc\u30bf\u30eb\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u540d +upgrade.portal.displayText = @PORTAL_NAME@ +upgrade.portlets.displayText = \u30dd\u30fc\u30c8\u30ec\u30c3\u30c8 +use.old.pages.displayText = PSML \u30d5\u30a1\u30a4\u30eb\u3092\u66f4\u65b0\u3057\u306a\u3044 +use.old.conf.displayText = \u8a2d\u5b9a\u30d5\u30a1\u30a4\u30eb\u3092\u66f4\u65b0\u3057\u306a\u3044 +use.old.assembly.displayText = \u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u30d5\u30a1\u30a4\u30eb\u3092\u66f4\u65b0\u3057\u306a\u3044 +use.old.decorations.displayText = \u30c7\u30b3\u30ec\u30fc\u30bf +clean.up.upgrade.displayText = \u30af\u30ea\u30fc\u30f3\u30a2\u30c3\u30d7 + +## Text from Page:mailServerConfig +page.mailServerConfig.displayText = \u30e1\u30fc\u30eb\u30b5\u30fc\u30d0\u8a2d\u5b9a +comment.29.displayText = \u9069\u5207\u306a\u30e1\u30fc\u30eb\u30b5\u30fc\u30d0\u60c5\u5831\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u30c7\u30d5\u30a9\u30eb\u30c8\u5024\u3067\u3082\u52d5\u4f5c\u3057\u307e\u3059\u3002 +mailServer.displayText = \u30e1\u30fc\u30eb\u30b5\u30fc\u30d0\u540d +msUsername.displayText = \u30e6\u30fc\u30b6\u540d +msPassword.displayText = \u30d1\u30b9\u30ef\u30fc\u30c9 +msAuth.displayText = \u30e6\u30fc\u30b6\u8a8d\u8a3c + +## Text from Page:databaseSelection +page.databaseSelection.displayText = \u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u9078\u629e +#checkdb.displayText = +#dbvalid.displayText = +#db.type.displayText = +#dbDisplayName.displayText = +#setupDBAntTarget.displayText = +comment.39.displayText = \u30dd\u30fc\u30bf\u30eb\u7528\u306b\u5229\u7528\u3059\u308b\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +dbName.displayText = \u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u7a2e\u985e +dbName.1.displayText = DB2 +dbName.2.displayText = Derby +dbName.3.displayText = MSSQL +dbName.4.displayText = MySql +dbName.5.displayText = PostgreSQL +dbName.6.displayText = Oracle (9i or higher) +dbName.7.displayText = SapDB +dbName.8.displayText = \u624b\u52d5\u3067\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u30bb\u30c3\u30c8\u30a2\u30c3\u30d7 + +## Text from Page:mysql +page.mysql.displayText = MySQL \u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u63a5\u7d9a\u30d1\u30e9\u30e1\u30fc\u30bf +#checkdb.displayText = +#dbvalid.displayText = +#dbDisplayName.displayText = +comment.44.displayText = MySQL \u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306b\u63a5\u7d9a\u3059\u308b\u305f\u3081\u306b\u4ee5\u4e0b\u306e\u30d5\u30a3\u30fc\u30eb\u30c9\u306b\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +dbUser.displayText = \u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30e6\u30fc\u30b6\u540d +dbPassword.displayText = \u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30d1\u30b9\u30ef\u30fc\u30c9 +jdbcUrl.displayText = JDBC \u63a5\u7d9a\u6587\u5b57\u5217 +jdbcDriverClass.displayText = JDBC \u30c9\u30e9\u30a4\u30d0\u30af\u30e9\u30b9\u540d +jdbcDriverJar.displayText = JDBC \u30c9\u30e9\u30a4\u30d0 + +## Text from Page:postgres +page.postgres.displayText = PostgreSQL \u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u63a5\u7d9a\u30d1\u30e9\u30e1\u30fc\u30bf +#checkdb.displayText = +#dbvalid.displayText = +#dbDisplayName.displayText = +comment.53.displayText = PostgreSQL \u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306b\u63a5\u7d9a\u3059\u308b\u305f\u3081\u306b\u4ee5\u4e0b\u306e\u30d5\u30a3\u30fc\u30eb\u30c9\u306b\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +dbUser.displayText = \u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30e6\u30fc\u30b6\u540d +dbPassword.displayText = \u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30d1\u30b9\u30ef\u30fc\u30c9 +jdbcUrl.displayText = JDBC \u63a5\u7d9a\u6587\u5b57\u5217 +jdbcDriverClass.displayText = JDBC \u30c9\u30e9\u30a4\u30d0\u30af\u30e9\u30b9\u540d +jdbcDriverJar.displayText = JDBC \u30c9\u30e9\u30a4\u30d0 + +## Text from Page:sapdb +page.sapdb.displayText = SapDB \u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u63a5\u7d9a\u30d1\u30e9\u30e1\u30fc\u30bf +#checkdb.displayText = +#dbvalid.displayText = +#dbDisplayName.displayText = +comment.62.displayText = SapDB \u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306b\u63a5\u7d9a\u3059\u308b\u305f\u3081\u306b\u4ee5\u4e0b\u306e\u30d5\u30a3\u30fc\u30eb\u30c9\u306b\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +dbUser.displayText = \u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30e6\u30fc\u30b6\u540d +dbPassword.displayText = \u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30d1\u30b9\u30ef\u30fc\u30c9 +jdbcUrl.displayText = JDBC \u63a5\u7d9a\u6587\u5b57\u5217 +jdbcDriverClass.displayText = JDBC \u30c9\u30e9\u30a4\u30d0\u30af\u30e9\u30b9\u540d +jdbcDriverJar.displayText = JDBC \u30c9\u30e9\u30a4\u30d0 + +## Text from Page:oracle +page.oracle.displayText = Oracle \u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u63a5\u7d9a\u30d1\u30e9\u30e1\u30fc\u30bf +#checkdb.displayText = +#dbvalid.displayText = +#dbDisplayName.displayText = +comment.71.displayText = Oracle \u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306b\u63a5\u7d9a\u3059\u308b\u305f\u3081\u306b\u4ee5\u4e0b\u306e\u30d5\u30a3\u30fc\u30eb\u30c9\u306b\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +dbUser.displayText = \u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30e6\u30fc\u30b6\u540d +dbPassword.displayText = \u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30d1\u30b9\u30ef\u30fc\u30c9 +jdbcUrl.displayText = JDBC \u63a5\u7d9a\u6587\u5b57\u5217 +jdbcDriverClass.displayText = JDBC \u30c9\u30e9\u30a4\u30d0\u30af\u30e9\u30b9\u540d +jdbcDriverJar.displayText = JDBC \u30c9\u30e9\u30a4\u30d0 + +## Text from Page:mssql +page.mssql.displayText = Microsoft SQL Server \u63a5\u7d9a\u30d1\u30e9\u30e1\u30fc\u30bf +#checkdb.displayText = +#dbvalid.displayText = +#dbDisplayName.displayText = +comment.80.displayText = Microsoft SQL Server \u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306b\u63a5\u7d9a\u3059\u308b\u305f\u3081\u306b\u4ee5\u4e0b\u306e\u30d5\u30a3\u30fc\u30eb\u30c9\u306b\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +dbUser.displayText = \u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30e6\u30fc\u30b6\u540d +dbPassword.displayText = \u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30d1\u30b9\u30ef\u30fc\u30c9 +jdbcUrl.displayText = JDBC \u63a5\u7d9a\u6587\u5b57\u5217 +jdbcDriverClass.displayText = JDBC \u30c9\u30e9\u30a4\u30d0\u30af\u30e9\u30b9\u540d +jdbcDriverJar.displayText = JDBC \u30c9\u30e9\u30a4\u30d0 + +## Text from Page:db2 +page.db2.displayText = DB2 \u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u63a5\u7d9a\u30d1\u30e9\u30e1\u30fc\u30bf +#checkdb.displayText = +#dbvalid.displayText = +#dbDisplayName.displayText = +comment.89.displayText = DB2 \u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306b\u63a5\u7d9a\u3059\u308b\u305f\u3081\u306b\u4ee5\u4e0b\u306e\u30d5\u30a3\u30fc\u30eb\u30c9\u306b\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +dbUser.displayText = \u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30e6\u30fc\u30b6\u540d +dbPassword.displayText = \u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30d1\u30b9\u30ef\u30fc\u30c9 +jdbcUrl.displayText = JDBC \u63a5\u7d9a\u6587\u5b57\u5217 +jdbcDriverClass.displayText = JDBC \u30c9\u30e9\u30a4\u30d0\u30af\u30e9\u30b9\u540d +jdbcDriverJar.displayText = JDBC \u30c9\u30e9\u30a4\u30d0 + +## Text from Page:preDBCheck +page.preDBCheck.displayText = \u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u63a5\u7d9a\u30c6\u30b9\u30c8 +#db.type.displayText = +#db.username.displayText = +#db.password.displayText = +#jdbc.url.displayText = +#jdbc.driver.class.displayText = +#jdbc.driver.jar.displayText = +#setupDBAntTarget.displayText = +comment.102.displayText = \u6b21\u3078\u3092\u30af\u30ea\u30c3\u30af\u3057\u3066\u3001\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u63a5\u7d9a\u30c6\u30b9\u30c8\u3092\u3057\u307e\u3059... + +## Text from Page:dbCheckFailed +page.dbCheckFailed.displayText = \u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u63a5\u7d9a\u306b\u5931\u6557\u3057\u307e\u3057\u305f +#checkdb.displayText = +#setupDBAntTarget.displayText = +comment.105.displayText = \u623b\u3063\u3066\u3001\u6b63\u3057\u3044\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u8a2d\u5b9a\u30d1\u30e9\u30e1\u30fc\u30bf\u3092\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +#comment.106.displayText = +comment.107.displayText = \u305d\u3046\u3067\u306a\u3051\u308c\u3070\u3001\u7d99\u7d9a\u3057\u3066\u3001\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u624b\u52d5\u3067\u30bb\u30c3\u30c8\u30a2\u30c3\u30d7\u3057\u3066\u304f\u3060\u3055\u3044\u3002 + +## Text from Page:beforeInstall +page.beforeInstall.displayText = \u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u306e\u78ba\u8a8d +#db.username.displayText = +#db.password.displayText = +#jdbc.url.displayText = +#jdbc.driver.class.displayText = +#jdbc.driver.jar.displayText = +#setupDBAntTarget.displayText = +comment.114.displayText = @PORTAL_NAME@ \u3092\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u8a2d\u5b9a\u3092\u306a\u3057\u306b\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3057\u307e\u3059\: +comment.115.displayText = \ + +## Text from Page:beforeInstall +page.beforeInstall.displayText = \u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u306e\u78ba\u8a8d +#db.username.displayText = +#db.password.displayText = +#jdbc.url.displayText = +#jdbc.driver.class.displayText = +#jdbc.driver.jar.displayText = +#setupDBAntTarget.displayText = +comment.122.displayText = @PORTAL_NAME@ \u3092\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u8a2d\u5b9a\u3092\u306a\u3057\u306b\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3057\u307e\u3059\: +#comment.123.displayText = \ + +## Text from Page:beforeInstall +page.beforeInstall.displayText = \u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u306e\u78ba\u8a8d +comment.124.displayText = @PORTAL_NAME@ \u3092\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3057\u307e\u3059\: +#comment.125.displayText = \ + +## Text from Page:beforeUpgrade +page.beforeUpgrade.displayText = \u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u306e\u78ba\u8a8d +comment.126.displayText = @PORTAL_NAME@ \u3092\u30a2\u30c3\u30d7\u30b0\u30ec\u30fc\u30c9\u3057\u307e\u3059\: +#comment.127.displayText = \ + +## Text from Page:progress +page.progress.displayText = \u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u72b6\u6cc1 Property changes on: pal-portal/trunk/installer/etc/ant-installer/resources/LanguagePack_ja.properties ___________________________________________________________________ Name: svn:eol-style + native From svnnotify ＠ sourceforge.jp Fri Nov 30 07:18:36 2007 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 30 Nov 2007 07:18:36 +0900 Subject: [pal-cvs 2990] [734] updated j2 revision. Message-ID: <1196374716.248007.5592.nullmailer@users.sourceforge.jp> Revision: 734 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=734 Author: shinsuke Date: 2007-11-30 07:18:35 +0900 (Fri, 30 Nov 2007) Log Message: ----------- updated j2 revision. updated installer. Modified Paths: -------------- pal-portal/trunk/build.properties pal-portal/trunk/build.xml pal-portal/trunk/portal/build.xml pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/pipelines.xml -------------- next part -------------- Modified: pal-portal/trunk/build.properties =================================================================== --- pal-portal/trunk/build.properties 2007-11-29 22:16:59 UTC (rev 733) +++ pal-portal/trunk/build.properties 2007-11-29 22:18:35 UTC (rev 734) @@ -4,7 +4,7 @@ container.name=PAL Portal container.separator=/ container.version.major=1 -container.version.minor=0.1 +container.version.minor=0.2-dev container.info.file=commons/src/java/org/apache/jetspeed/container/resources/ContainerInfo.properties portlets.home=${basedir}/portlets portlets.build.dir=${portlets.home}/build @@ -27,20 +27,11 @@ installer.portlets.dir=${installer.target.dir}/portlets dist.name.prefix=PALPortal dist.version=${portal.version} -dist.dir=${basedir}/dist -dist.build.dir=${dist.dir}/build -dist.temp.dir=${dist.dir}/temp -dist.database.dir=${dist.dir}/database -dist.selfextract.dir=${dist.dir}/selfextract -dist.portal.dir=${dist.dir}/portalserver -dist.installpack.file=${dist.build.dir}/installpack.zip +#dist.tomcat.version=5.5.25 dist.tomcat.version=5.5.23 -dist.tomcat.base.file=${dist.build.dir}/apache-tomcat-${dist.tomcat.version}.zip -dist.tomcat.compat.file=${dist.build.dir}/apache-tomcat-${dist.tomcat.version}-compat.zip -dist.tomcat.base.dir=${dist.build.dir}/apache-tomcat -dist.tomcat.compat.dir=${dist.build.dir}/apache-tomcat-compat -dist.tomcat.base.url=http://www.ibiblio.org/pub/mirrors/apache/tomcat/tomcat-5/v${dist.tomcat.version}/bin/apache-tomcat-${dist.tomcat.version}.zip -dist.tomcat.compat.url=http://www.ibiblio.org/pub/mirrors/apache/tomcat/tomcat-5/v${dist.tomcat.version}/bin/apache-tomcat-${dist.tomcat.version}-compat.zip +dist.tomcat.base.file=${installer.target.dir}/apache-tomcat-${dist.tomcat.version}.zip +#dist.tomcat.base.url=http://ftp.riken.jp/net/apache/tomcat/tomcat-5/v${dist.tomcat.version}/bin/apache-tomcat-${dist.tomcat.version}.zip +dist.tomcat.base.url=http://archive.apache.org/dist/tomcat/tomcat-5/v5.5.23/bin/apache-tomcat-5.5.23.zip dist.server.home=${dist.portal.dir} dist.server.shared=${dist.server.home}/shared/lib dist.server.war.dir=${dist.server.home}/webapps/ @@ -67,7 +58,7 @@ # Jetspeed SVN revision #jetspeed2.svn.repository=http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/ jetspeed2.svn.repository=http://svn.apache.org/repos/asf/portals/jetspeed-2/branches/JETSPEED-2.1.3/ -jetspeed2.revision=593340 +jetspeed2.revision=598994 # Dependencies for Jetspeed jetspeed.version=2.1.3-dev_pal-${portal.version} @@ -156,11 +147,16 @@ -Dorg.apache.jetspeed.portal.artifactId="${org.apache.jetspeed.portal.artifactId}" \ -Dorg.apache.jetspeed.portal.name="${org.apache.jetspeed.portal.name}" \ -Dorg.apache.jetspeed.portal.currentVersion="${org.apache.jetspeed.portal.currentVersion}" \ --Ddist.name.prefix="${dist.name.prefix}" \ --Ddist.version="${dist.version}" \ -Djetspeed.version="${jetspeed.version}" \ -Dportal.psml.dir="${portal.psml.dir}" \ -Dportal.psml.name="${portal.psml.name}" \ +-Ddist.name.prefix="${dist.name.prefix}" \ +-Ddist.version="${dist.version}" \ +-Ddist.tomcat.base.url=${dist.tomcat.base.url} \ +-Ddist.tomcat.base.file=${dist.tomcat.base.file} \ +-Ddist.tomcat.version=${dist.tomcat.version} \ +-Dinstaller.target.dir=${installer.target.dir} \ +-Dcontainer.name="${container.name}" \ portal.patch.files=\ components/capability/src/java/org/apache/jetspeed/capabilities/impl/JetspeedCapabilities.java,\ @@ -180,7 +176,6 @@ layout-portlets/src/webapp/WEB-INF/portlet.xml,\ layout-portlets/src/webapp/WEB-INF/jetspeed-portlet.xml,\ src/webapp/WEB-INF/assembly/jetspeed-services.xml,\ -src/webapp/WEB-INF/assembly/portal-url-generation.xml,\ src/webapp/WEB-INF/assembly/pipelines.xml,\ src/webapp/WEB-INF/conf/Log4j.properties,\ src/webapp/WEB-INF/jetspeed_macros.vm,\ @@ -220,30 +215,6 @@ jp/sf/pal/pal-admin,\ jp/sf/pal/pal-wcm,\ -# Portlet List -jp/sf/pal/cms-portlets,\ -jp/sf/pal/jstock,\ -jp/sf/pal/webparts,\ -jp/sf/pal/blog,\ -jp/sf/pal/addresslist,\ -jp/sf/pal/vfs-portlets,\ -jp/sf/pal/todolist,\ -jp/sf/pal/searchselector,\ -jp/sf/pal/weather,\ -jp/sf/pal/notepad,\ -jp/sf/pal/jmap,\ -jp/sf/pal/helloworld,\ -jp/sf/pal/jsfhelloworld,\ -jp/sf/pal/teeda-ajax-portlet,\ -jp/sf/pal/charttest,\ -jp/sf/pal/s2helloworld,\ -jp/sf/pal/googlegadgets,\ -jp/sf/pal/blogparts,\ -com/sun/portal/bookmarkportlet,\ -com/sun/portal/rssportlet,\ -com/sun/portal/showtimeportlet,\ -com/sun/portal/notepadportlet,\ - # Custom Files and Patches additional.portal.delete.files= additional.portal.delete.directories= Modified: pal-portal/trunk/build.xml =================================================================== --- pal-portal/trunk/build.xml 2007-11-29 22:16:59 UTC (rev 733) +++ pal-portal/trunk/build.xml 2007-11-29 22:18:35 UTC (rev 734) @@ -223,18 +223,6 @@ - - - - - - - - - - - @@ -248,14 +236,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Modified: pal-portal/trunk/portal/build.xml =================================================================== --- pal-portal/trunk/portal/build.xml 2007-11-29 22:16:59 UTC (rev 733) +++ pal-portal/trunk/portal/build.xml 2007-11-29 22:18:35 UTC (rev 734) @@ -309,26 +309,5 @@ - - - - - - - - - - - - Modified: pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/pipelines.xml =================================================================== --- pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/pipelines.xml 2007-11-29 22:16:59 UTC (rev 733) +++ pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/pipelines.xml 2007-11-29 22:18:35 UTC (rev 734) @@ -1,8 +1,8 @@ Index: src/webapp/WEB-INF/assembly/pipelines.xml =================================================================== ---- src/webapp/WEB-INF/assembly/pipelines.xml (リビジョン 593340) +--- src/webapp/WEB-INF/assembly/pipelines.xml (リビジョン 598994) +++ src/webapp/WEB-INF/assembly/pipelines.xml (作業コピー) -@@ -421,6 +421,7 @@ +@@ -444,6 +444,7 @@ From svnnotify ＠ sourceforge.jp Fri Nov 30 10:43:34 2007 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 30 Nov 2007 10:43:34 +0900 Subject: [pal-cvs 2991] [735] added screen spec and mock. Message-ID: <1196387014.017405.19407.nullmailer@users.sourceforge.jp> Revision: 735 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=735 Author: shinsuke Date: 2007-11-30 10:43:31 +0900 (Fri, 30 Nov 2007) Log Message: ----------- added screen spec and mock. Modified Paths: -------------- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/address/addressConfirm.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/address/addressEdit.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/address/addressList.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/customer/customerConfirm.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/customer/customerEdit.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/customer/customerList.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/deliveryMethodEdit.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/deliveryMethodList.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderConfirm.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderEdit.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderList.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderNotificationSelect.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/categoryEdit.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/categoryList.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/manufacturerEdit.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/manufacturerList.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/productConfirm.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/productEdit.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/product/productList.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/error/error.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/index.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/cart/productList.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutComplete.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutConfirm.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/paymentSelect.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userAddressSelect.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userInfoEdit.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/categoryList.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productDetails.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productList.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/topProductList.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/search/search.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupComplete.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupConfirm.html pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupEdit.html Added Paths: ----------- pompei/portlets/pompei-core/trunk/docs/ pompei/portlets/pompei-core/trunk/docs/pompei-screen-spec.xls pompei/portlets/pompei-core/trunk/src/main/webapp/mock/ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/css/ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/css/portal.css pompei/portlets/pompei-core/trunk/src/main/webapp/mock/css/portlet.css pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/address/ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/address/address/ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/address/address/addressList.txt pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/address/addressConfirm.txt pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/address/addressEdit.txt pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/customer/ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/customer/customerConfirm.txt pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/customer/customerEdit.txt pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/customer/customerList.txt pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/order/ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/order/deliveryMethodEdit.txt pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/order/deliveryMethodList.txt pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/order/orderConfirm.txt pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/order/orderEdit.txt pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/order/orderList.txt pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/order/orderNotificationSelect.txt pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/product/ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/product/categoryEdit.txt pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/product/categoryList.txt pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/product/manufacturerEdit.txt pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/product/manufacturerList.txt pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/product/productConfirm.txt pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/product/productEdit.txt pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/product/productList.txt pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/error/ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/error/error.txt pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/index.txt pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/cart/ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/cart/productList.txt pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/checkout/ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/checkout/checkoutComplete.txt pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/checkout/checkoutConfirm.txt pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/checkout/paymentSelect.txt pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/checkout/userAddressSelect.txt pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/checkout/userInfoEdit.txt pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/product/ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/product/categoryList.txt pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/product/productDetails.txt pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/product/productList.txt pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/product/topProductList.txt pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/search/ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/search/search.txt pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/signup/ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/signup/signupComplete.txt pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/signup/signupConfirm.txt pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/signup/signupEdit.txt pompei/portlets/pompei-core/trunk/src/main/webapp/mock/footer.html pompei/portlets/pompei-core/trunk/src/main/webapp/mock/header.html pompei/portlets/pompei-core/trunk/src/main/webapp/mock/images/ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/images/coreback.gif pompei/portlets/pompei-core/trunk/src/main/webapp/mock/images/fileview.png pompei/portlets/pompei-core/trunk/src/main/webapp/mock/images/footer_bg.gif pompei/portlets/pompei-core/trunk/src/main/webapp/mock/images/header_bg.gif pompei/portlets/pompei-core/trunk/src/main/webapp/mock/images/logo.png pompei/portlets/pompei-core/trunk/src/main/webapp/mock/images/readmore_arrow.gif pompei/portlets/pompei-core/trunk/src/main/webapp/mock/images/readmore_over.gif pompei/portlets/pompei-core/trunk/src/main/webapp/mock/images/tab_bg.gif pompei/portlets/pompei-core/trunk/src/main/webapp/mock/index.html pompei/portlets/pompei-core/trunk/src/main/webapp/mock/js/ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/js/doc.js -------------- next part -------------- Added: pompei/portlets/pompei-core/trunk/docs/pompei-screen-spec.xls =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/docs/pompei-screen-spec.xls ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/css/portal.css =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/mock/css/portal.css 2007-11-29 22:18:35 UTC (rev 734) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/css/portal.css 2007-11-30 01:43:31 UTC (rev 735) @@ -0,0 +1,311 @@ +/* +Copyright 2004 The Apache Software Foundation + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +/*@import url("../../css/portal-standard.css");*/ + +body { + height: auto; + background: #FFF; + color: #000000; + font-family: Arial, Helvetica, sans-serif; + font-size: 10px; +} + +/** + This white-space setting is VERY important as it keeps content from "spilling" + outside of portlets. + */ + +a:link, a:visited { + color: #335599; + text-decoration: underline; +} + +a:hover { + color: #4466aa; +} + +body.layout-nextgen +{ + margin: 0; + padding: 0; +} + + +#portal-page-actions A img +{ + display: inline; +} + +#portal-page-actions +{ + text-align:right; +} + +.layout-nextgen .layout-edit-bar +{ + width: 100%; + padding-top: 5px; + font-size: 8pt; + color: blue; + overflow:hidden; + clip:auto; +} + +.layout-nextgen .layout-edit-bar label, +.layout-nextgen .layout-edit-bar input, +.layout-nextgen .layout-edit-bar select +{ + font-size: 8pt; + color: blue; +} + +.layout-nextgen .layout-edit-bar input +{ + font-size: 8pt; +} + +.layout-nextgen .layout-edit-bar-left +{ + display:inline; + float:left; +} + +.layout-nextgen .layout-edit-bar-right +{ + display:inline; + float:right; + padding-right: 5px; +} + +.layout-nextgen .portlet-edit-bar select +{ + font-size: 8pt; + color: blue; +} + + + +/* site specific styling */ + + +/* the container centers the page */ +.layout-nextgen #container { + width: 800px; + height: auto; + margin: 0 auto 0 20px; + text-align:left; +} + + +/* the header that contains the big image */ +.layout-nextgen #header { + top:25px; + width:800px; + height:100px; + background-image: url(../images/header_bg.gif); + background-repeat: repeat-y; + background-position: right center; + position: relative; + border: 1px solid #dedede; + z-index:1; +} + +.layout-nextgen #header img { + position: absolute; + top: 5px; + left: 20px; +} + +.layout-nextgen #header .info { + display:inline; + position: absolute; + top: 0px; + right: 0px; + text-align:right; +} + +.layout-nextgen #header .info .action { + padding: 2px 0px; +} + +.layout-nextgen #header .info .action a { + padding: 0px 3px; + text-decoration: none; +} + +.layout-nextgen #header .info .action a:hover { + color:#0000ff; +} + +/* the navigationbar in the header */ +.layout-nextgen #navbar { + position:relative; + top:25px; + margin:0px; + padding:0px; + width:800px; + height:30px; + background-image: url(../images/tab_bg.gif); +} + +/* the links in the navigationbar are an unordered list */ +.layout-nextgen #navbar ul { + margin:0px; + padding:0px; +} + +.layout-nextgen #navbar li { + list-style: none; + margin:0px; + padding:0px; + height:30px; + float: left; +} +.layout-nextgen #navbar a { + float: left; + text-decoration: none; + margin:0px; + padding: 8px 5px; + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 11px; + font-weight: bold; + color: #ffffff; +} +.layout-nextgen #navbar a:hover { + background: #71758a; + color: #ffffff; +} +.layout-nextgen #navbar span { + float: left; + text-decoration: none; + margin:0px; + padding: 8px 5px; + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 11px; + font-weight: bold; + color: #ffffff; +} + +.layout-nextgen #navbar img { + background-color:#ffffff; + float:right; + margin:0px; + padding: 0px; +} + +/* the core contains all the site contents */ +.layout-nextgen #core { + clear:both; + position:relative; + top:30px; + width: 800px; + height: auto; + margin-top: 5px; + padding:0px 1px; +} + +.layout-nextgen #breadcrumbs { + border-top: 1px dotted #666; + border-bottom: 1px dotted #666; + voice-family: "\"}\""; + voice-family: inherit; + font-size: x-small; + padding: 3px 8px; + margin: 3px; +} + +.layout-nextgen #breadcrumbs a { + text-decoration: none; + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 10px; + color:#12248d; +} + +/* the navigationbar in the header */ +.layout-nextgen #subnavbar { + position:relative; + top:25px; + margin:0px; + padding:0px; + width:800px; + height:30px; +} + +/* the links in the navigationbar are an unordered list */ +.layout-nextgen #subnavbar ul { + margin:0px; + padding:0px; +} + +.layout-nextgen #subnavbar li { + list-style: none; + margin:0px; + padding:0px; + height:30px; + float: left; +} +.layout-nextgen #subnavbar span { + float: left; + text-decoration: none; + margin:0px; + padding: 5px 2px; + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 11px; + font-weight: bold; + color: #666666; +} +.layout-nextgen #subnavbar a { + text-decoration: none; +} +.layout-nextgen #subnavbar a:hover { + color: #0000ff; +} + +/* the corecenter contains the center part of the core */ +.layout-nextgen #corecenter { + margin:2px; + width: 796px; + height: auto; +} +.layout-nextgen #corecenter .portlet { + margin:1px; +} + +/* the footer contains all copyright info etcetera */ +.layout-nextgen #footer { + clear: both; + width: 800px; + height: 30px; + vertical-align: middle; + text-align: right; + font-family: Arial Black, Verdana, Arial, Helvetica, sans-serif; + font-size: 10px; + background-image: url(../images/footer_bg.gif); + border: 1px solid #dedede; + margin-bottom:10px; + margin-top:10px; + /*position:relative;*/ + /*top:30px;*/ +} +.layout-nextgen #footer div { + color: #666666; + padding: 5px 20px; +} +.layout-nextgen #footer a { + color: #666666; +} + Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/css/portal.css ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/css/portlet.css =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/mock/css/portlet.css 2007-11-29 22:18:35 UTC (rev 734) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/css/portlet.css 2007-11-30 01:43:31 UTC (rev 735) @@ -0,0 +1,595 @@ +/* +Copyright 2004 The Apache Software Foundation + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + + + +.nextgen .PTitle +{ + /*background-image:url(../images/title_background.gif);*/ + color:#0080b0; + + margin:2px 0px; + padding:2px 4px; + height:20px; + border: 1px solid #aaaaaa; +} + +.nextgen .PTitleContent +{ + font-weight:bold; + display: inline; + float: left; + white-space: normal; + color:#444444; +} + +.nextgen .PActionBar +{ + float: right; + display: inline; +} + +.nextgen .PContentBorder +{ +} + +.nextgen .PContent +{ + clear:both; + margin:0px; + padding:0px; + white-space: normal; + background-color: #ffffff; + font-size: 10pt; + position:static; + overflow:auto; +} + +.nextgen .PContent form { + margin:0px; + padding:0px; +} + +/* font */ +.nextgen .PTitleLeft, +.nextgen .PTitle, +.nextgen .PTitleContent, +.nextgen .PTitleRight, +.nextgen .PContentLeft, +.nextgen .PContent, +.nextgen .PContentRight, +.nextgen .PBottomLeft, +.nextgen .PBottom, +.nextgen .PBottomRight +{ + font-family: Verdana, Helvetica, Arial, sans-serif; + + voice-family: inherit; + font-size: 10pt; +} + + + +/* --------------------------------- */ +/* PLT.C.1 Links (Anchor) */ +/* --------------------------------- */ + +.nextgen A:link, +.nextgen A:visited { + text-decoration: underline; +} + +.nextgen A:hover, +.nextgen A:active { + text-decoration: underline; +} + +/* font */ +.nextgen A:link, +.nextgen A:visited, +.nextgen A:hover, +.nextgen A:active +{ + font-family: Verdana, Helvetica, Arial, sans-serif; + voice-family: "\"}\""; + voice-family: inherit; + font-size: 10pt; +} + + +/* --------------------------------- */ +/* PLT.C.2 Fonts */ +/* --------------------------------- */ + +.nextgen .portlet-font { + color: black; +} +.nextgen .portlet-font-dim { + color: gray; +} + +/* font */ +.nextgen .portlet-font, +.nextgen .portlet-font-dim +{ + font-family: Verdana, Helvetica, Arial, sans-serif; + voice-family: "\"}\""; + voice-family: inherit; + font-size: 10pt; +} + + + +/* --------------------------------- */ +/* PLT.C.3 Messages */ +/* --------------------------------- */ +.nextgen .portlet-msg-status, +.nextgen .portlet-msg-info { + background: url(../images/icon_info_sml.gif); + background-repeat: no-repeat; + padding-left: 20px; + min-height: 15px; +} + +.nextgen .portlet-msg-error { + background: url(../images/icon_error_sml.gif); + background-repeat: no-repeat; + padding-left: 20px; + min-height: 15px; +} + +.nextgen .portlet-msg-alert { + background: url(../images/icon_warning_sml.gif); + background-repeat: no-repeat; + padding-left: 20px; + min-height: 15px; +} + +.nextgen .portlet-msg-success { + background: url(../images/icon_success_sml.gif); + background-repeat: no-repeat; + padding-left: 20px; + min-height: 15px; +} + +/* font */ +.nextgen .portlet-msg-status, +.nextgen .portlet-msg-info, +.nextgen .portlet-msg-error, +.nextgen .portlet-msg-alert, +.nextgen .portlet-msg-success +{ + font-family: Verdana, Helvetica, Arial, sans-serif; + voice-family: "\"}\""; + voice-family: inherit; + font-size: 10pt; +} + + +/* --------------------------------- */ +/* PLT.C.4 Sections */ +/* --------------------------------- */ +.nextgen .portlet-section-header { + background-image:url(../images/header_background.gif); + background-repeat: repeat-x; + background-color:#113377; + color: #fff; + padding: 5px; + margin-right: 2px; + margin-left: 2px; + clear: both; +} + +.nextgen .portlet-section-body { + background: #efefef; + border: none; + padding: 2px 3px; + text-align: left; + vertical-align: top; + text-align: left; +} + +.nextgen .portlet-section-alternate { + background: #ddd; + border: none; + padding: 2px 3px; + text-align: left; + vertical-align: top; + text-align: left; +} + +.nextgen .portlet-section-selected { + /* TODO : ex. change color */ + background: #ffe; + border: none; + padding: 2px 3px; + text-align: left; + vertical-align: top; + text-align: left; + font-weight:bold; +} + +.nextgen .portlet-section-subheader { + background-image:url(../images/subheader_background.gif); + background-repeat: repeat-x; + background-color:#88aacc; + color: #000099; + padding: 5px; + margin-right: 2px; + margin-left: 2px; + clear: both; +} + +.nextgen .portlet-section-footer { + background-image:url(../images/footer_background.gif); + background-repeat: repeat-x; + background-color:#c0e0f0; + background-position: top left; + color: #000099; + padding: 5px; + margin-right: 2px; + margin-left: 2px; + clear: both; +} + +.nextgen .portlet-section-text { + padding: 1em; + padding-bottom: .3em; + padding-left: 1em; +} + +/* font */ +.nextgen .portlet-section-header, +.nextgen .portlet-section-body, +.nextgen .portlet-section-alternate, +.nextgen .portlet-section-selected, +.nextgen .portlet-section-subheader, +.nextgen .portlet-section-footer, +.nextgen .portlet-section-text +{ + font-family: Verdana, Helvetica, Arial, sans-serif; + voice-family: "\"}\""; + voice-family: inherit; + font-size: 10pt; +} + + +/* --------------------------------- */ +/* PLT.C.5 Forms */ +/* --------------------------------- */ +.nextgen .portlet-form-label { +} + +.nextgen .portlet-form-input-field { + background-color:#90d0ff; +} + +.nextgen .portlet-form-button { + background-image:url(../images/button_background.gif); + background-color:#90d0ff; + color:#ffffff; + + font-weight: bold; +} + +.nextgen .portlet-icon-label { +} + +.nextgen .portlet-dlg-icon-label { +} + +.nextgen .portlet-form-field-label { +} + +.nextgen .portlet-form-field { +} + +/* font */ +.nextgen .portlet-form-label, +.nextgen .portlet-form-input-field, +.nextgen .portlet-form-button, +.nextgen .portlet-icon-label, +.nextgen .portlet-dlg-icon-label, +.nextgen .portlet-form-field-label, +.nextgen .portlet-form-field +{ + font-family: Verdana, Helvetica, Arial, sans-serif; + voice-family: "\"}\""; + voice-family: inherit; + font-size: 10pt; +} + + +/* --------------------------------- */ +/* PLT.C.6 Menus */ +/* --------------------------------- */ +.nextgen .portlet-menu { + background: #efefef; + margin-bottom: 6px; + border-right: 1px solid #aaa; + border-bottom: 1px solid #aaa; + padding: 4px 4px 4px 0; + padding-bottom: .3em; + padding-left: 1em; +} + +.nextgen .portlet-menu-item { + text-decoration: none; + color: blue; +} + +.nextgen .portlet-menu-item-selected { + text-decoration: none; + color: #555 !important; +} + +.nextgen .portlet-menu-item-hover { + text-decoration: none; + color: #f30 !important; +} + +.nextgen .portlet-menu-item-hover-selected { + text-decoration: none; + color: #555 !important; + font-weight: bold; +} + +.nextgen .portlet-menu-cascade-item { + text-decoration: none; + margin-top: .3em; + padding-bottom: 0; + color: blue; +} + +.nextgen .portlet-menu-cascade-item-selected { + text-decoration: none; + color: #555 !important; + font-weight: bold; +} + +.nextgen .portlet-menu-description { +} + +.nextgen .portlet-menu-caption { + border-bottom: 1px solid #666; + border-right: 1px solid #666; + background: #ddd; + color: #555; + padding: 4px; +} + +/* font */ +.nextgen .portlet-menu, +.nextgen .portlet-menu-item, +.nextgen .portlet-menu-item-selected, +.nextgen .portlet-menu-item-hover, +.nextgen .portlet-menu-item-hover-selected, +.nextgen .portlet-menu-cascade-item, +.nextgen .portlet-menu-cascade-item-selected, +.nextgen .portlet-menu-description, +.nextgen .portlet-menu-caption +{ + font-family: Verdana, Helvetica, Arial, sans-serif; + voice-family: "\"}\""; + voice-family: inherit; + font-size: 10pt; +} + + +/* --------------------------------- */ +/* PLT.C.6 Menus (arrowfolder style) */ +/* --------------------------------- */ +.nextgen .arrowfolder .portlet-menu { + background: #efefef; + margin-bottom: 6px; + border-right: 1px solid #aaa; + border-bottom: 1px solid #aaa; + padding: 4px 4px 4px 0; + padding-bottom: .3em; + padding-left: 1em; +} + +.nextgen .arrowfolder .portlet-menu-item { + text-decoration: none; + color: blue; + padding-left: 34px; + background-image: url(../images/icon_arrowdoc_sml.gif); + background-repeat: no-repeat; + +} + +.nextgen .arrowfolder .portlet-menu-item-selected { + text-decoration: none; + color: #555 !important; + padding-left: 34px; + background-image: url(../images/icon_arrowdoc_sml.gif); + background-repeat: no-repeat; +} + +.nextgen .arrowfolder .portlet-menu-item-hover { + text-decoration: none; + color: #f30 !important; + padding-left: 34px; + background-image: url(../images/icon_arrowdoc_sml.gif); + background-repeat: no-repeat; +} + +.nextgen .arrowfolder .portlet-menu-item-hover-selected { + text-decoration: none; + color: #555 !important; + font-weight: bold; + padding-left: 34px; + background-image: url(../images/icon_arrowdoc_sml.gif); + background-repeat: no-repeat; +} + +.nextgen .arrowfolder .portlet-menu-cascade-item { + text-decoration: none; + margin-top: .3em; + padding-bottom: 0; + color: blue; + padding-left: 34px; + background-image: url(../images/icon_arrowfolderclosed1_sml.gif); + background-repeat: no-repeat; +} + +.nextgen .arrowfolder .portlet-menu-cascade-item-selected { + text-decoration: none; + color: #555 !important; + font-weight: bold; + padding-left: 34px; + background-image: url(../images/icon_arrowfolderopen2_sml.gif); + background-repeat: no-repeat; +} + +.nextgen .arrowfolder .portlet-menu-description { +} + +.nextgen .arrowfolder .portlet-menu-caption { + border-bottom: 1px solid #666; + border-right: 1px solid #666; + background: #ddd; + color: #555; + padding: 4px; +} + +/* font */ +.nextgen .arrowfolder .portlet-menu, +.nextgen .arrowfolder .portlet-menu-item, +.nextgen .arrowfolder .portlet-menu-item-selected, +.nextgen .arrowfolder .portlet-menu-item-hover, +.nextgen .arrowfolder .portlet-menu-item-hover-selected, +.nextgen .arrowfolder .portlet-menu-cascade-item, +.nextgen .arrowfolder .portlet-menu-cascade-item-selected, +.nextgen .arrowfolder .portlet-menu-description, +.nextgen .arrowfolder .portlet-menu-caption +{ + font-family: Verdana, Helvetica, Arial, sans-serif; + voice-family: "\"}\""; + voice-family: inherit; + font-size: 10pt; +} + +/* --------------------------------- */ +/* Tree component */ +/* --------------------------------- */ + +.nextgen .tree { + lineheight: 18px; + font-family: arial, sans-serif; +} + +.nextgen .tree-node { + padding: 2px 15px 2px 5px; +} + +.nextgen .tree-node a { + text-decoration: none; +} + +.nextgen .tree-node-selected { + padding: 2px 15px 2px 5px; +} + +.nextgen .tree-node-selected a { + text-decoration: none; + font-weight: bold; +} + +/* --------------------------------- */ +/* Portlet Table */ +/* --------------------------------- */ +.nextgen th, td, input { + font-family: Verdana, Helvetica, Arial, sans-serif; +} + +.nextgen table, +.nextgen th, +.nextgen td { + vertical-align: top; + font-size: 10pt; + white-space: normal; + /* action buttons shifts right a few millimeters by the following */ +} + +.nextgen th +{ + font-size: 10pt; +} + +.nextgen .portlet-table-header { + background-image:url(../images/header_background.gif); + background-repeat: repeat-x; + background-color:#113377; + color: #fff; + + border: 0.75px solid #fff; + padding: 2px 3px; + text-align: left; +} + +.nextgen .portlet-table-footer { + background-image:url(../images/footer_background.gif); + background-repeat: repeat-x; + background-color:#c0e0f0; + color: #0080b0; + + font-size: 10pt; + padding: 5px; + margin: .67em 2px; + margin-top: 0; +} + + +.nextgen .portlet-table-row1 td { + font-size: 10pt; + background: #ddd; + border-bottom: 1px solid #fff; +} + +.nextgen .portlet-table-row2 td { + font-size: 10pt; + background: #efefef; + border-bottom: 1px solid #fff; +} + +.nextgen .portlet-table-col1 { + border-right: 1px solid #fff; + padding: 2px 15px 2px 5px; +} + +.nextgen .portlet-table-col2 { + border-left: 1px solid #fff; + padding: 2px 15px 2px 5px; +} + +/* --------------------------------- */ +/* Portlet Data Scroller Table */ +/* --------------------------------- */ + +.nextgen .portlet-scroller-grid td { + horizontal-align: center; +} + +.nextgen .portlet-scroller { + horizontal-align: center; +} + +.nextgen .portlet-paginator { + horizontal-align: center; +} + + Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/css/portlet.css ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/address/address/addressList.txt =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/address/address/addressList.txt 2007-11-29 22:18:35 UTC (rev 734) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/address/address/addressList.txt 2007-11-30 01:43:31 UTC (rev 735) @@ -0,0 +1,35 @@ +住所一覧 +----------------------------------------------------------- + +■概要 +------------------ + + + +■コンテンツ +------------------ + + + +■リンク +------------------ + + + +■アクション +------------------ + + + +■遷移先(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ + + +■遷移元(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ + + +■その他 +------------------ + + Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/address/address/addressList.txt ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/address/addressConfirm.txt =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/address/addressConfirm.txt 2007-11-29 22:18:35 UTC (rev 734) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/address/addressConfirm.txt 2007-11-30 01:43:31 UTC (rev 735) @@ -0,0 +1,35 @@ +住所一覧 +----------------------------------------------------------- + +■概要 +------------------ + + + +■コンテンツ +------------------ + + + +■リンク +------------------ + + + +■アクション +------------------ + + + +■遷移先(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ + + +■遷移元(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ + + +■その他 +------------------ + + Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/address/addressConfirm.txt ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/address/addressEdit.txt =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/address/addressEdit.txt 2007-11-29 22:18:35 UTC (rev 734) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/address/addressEdit.txt 2007-11-30 01:43:31 UTC (rev 735) @@ -0,0 +1,35 @@ +住所登録 +----------------------------------------------------------- + +■概要 +------------------ + + + +■コンテンツ +------------------ + + + +■リンク +------------------ + + + +■アクション +------------------ + + + +■遷移先(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ + + +■遷移元(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ + + +■その他 +------------------ + + Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/address/addressEdit.txt ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/customer/customerConfirm.txt =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/customer/customerConfirm.txt 2007-11-29 22:18:35 UTC (rev 734) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/customer/customerConfirm.txt 2007-11-30 01:43:31 UTC (rev 735) @@ -0,0 +1,38 @@ +会員情報編集内容確認 +----------------------------------------------------------- + +■概要 +------------------ +会員情報の編集内容確認画面。 + + +■コンテンツ +------------------ + + + +■リンク +------------------ + + + +■アクション +------------------ +・「完了」ボタンをクリックすることで会員情報を更新して会員一覧画面に遷移。 +・「一覧に戻る」ボタンをクリックすることで会員一覧画面に遷移。 + + +■遷移先(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ +・商品管理一覧 + + +■遷移元(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ +・会員一覧 + + +■その他 +------------------ + + Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/customer/customerConfirm.txt ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/customer/customerEdit.txt =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/customer/customerEdit.txt 2007-11-29 22:18:35 UTC (rev 734) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/customer/customerEdit.txt 2007-11-30 01:43:31 UTC (rev 735) @@ -0,0 +1,38 @@ +会員情報編集 +----------------------------------------------------------- + +■概要 +------------------ +会員情報を編集する画面。 + + +■コンテンツ +------------------ + + + +■リンク +------------------ + + + +■アクション +------------------ +・「確認画面へ」ボタンをクリックすることで会員情報編集内容確認画面に遷移。 +・「一覧に戻る」ボタンをクリックすることで会員一覧画面に遷移。 + + +■遷移先(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ +・商品管理一覧 + + +■遷移元(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ +・会員一覧 + + +■その他 +------------------ + + Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/customer/customerEdit.txt ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/customer/customerList.txt =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/customer/customerList.txt 2007-11-29 22:18:35 UTC (rev 734) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/customer/customerList.txt 2007-11-30 01:43:31 UTC (rev 735) @@ -0,0 +1,38 @@ +会員一覧 +----------------------------------------------------------- + +■概要 +------------------ +会員情報を一覧表示、管理する画面。 + + +■コンテンツ +------------------ + + + +■リンク +------------------ +・「編集」をクリックすることで会員情報編集画面へ遷移。 +・「削除」をクリックすることで確認画面を表示し、削除する。 + + +■アクション +------------------ + + + +■遷移先(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ +・会員情報編集 +・会員情報編集内容確認 + + +■遷移元(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ + + +■その他 +------------------ + + Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/customer/customerList.txt ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/order/deliveryMethodEdit.txt =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/order/deliveryMethodEdit.txt 2007-11-29 22:18:35 UTC (rev 734) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/order/deliveryMethodEdit.txt 2007-11-30 01:43:31 UTC (rev 735) @@ -0,0 +1,35 @@ +配送方法登録/編集 +----------------------------------------------------------- + +■概要 +------------------ + + + +■コンテンツ +------------------ + + + +■リンク +------------------ + + + +■アクション +------------------ + + + +■遷移先(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ + + +■遷移元(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ + + +■その他 +------------------ + + Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/order/deliveryMethodEdit.txt ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/order/deliveryMethodList.txt =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/order/deliveryMethodList.txt 2007-11-29 22:18:35 UTC (rev 734) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/order/deliveryMethodList.txt 2007-11-30 01:43:31 UTC (rev 735) @@ -0,0 +1,35 @@ +配送方法設定 +----------------------------------------------------------- + +■概要 +------------------ + + + +■コンテンツ +------------------ + + + +■リンク +------------------ + + + +■アクション +------------------ + + + +■遷移先(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ + + +■遷移元(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ + + +■その他 +------------------ + + Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/order/deliveryMethodList.txt ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/order/orderConfirm.txt =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/order/orderConfirm.txt 2007-11-29 22:18:35 UTC (rev 734) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/order/orderConfirm.txt 2007-11-30 01:43:31 UTC (rev 735) @@ -0,0 +1,38 @@ +注文情報確認 +----------------------------------------------------------- + +■概要 +------------------ +注文情報の編集内容確認画面。 + + +■コンテンツ +------------------ + + + +■リンク +------------------ + + + +■アクション +------------------ +・「完了」ボタンをクリックすることで注文情報を更新して管理用注文一覧に遷移。 +・「一覧に戻る」ボタンをクリックすることで管理用注文一覧画面に遷移。 + + +■遷移先(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ +・管理用注文一覧 + + +■遷移元(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ +・注文情報編集 + + +■その他 +------------------ + + Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/order/orderConfirm.txt ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/order/orderEdit.txt =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/order/orderEdit.txt 2007-11-29 22:18:35 UTC (rev 734) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/order/orderEdit.txt 2007-11-30 01:43:31 UTC (rev 735) @@ -0,0 +1,39 @@ +注文情報編集 +----------------------------------------------------------- + +■概要 +------------------ +注文情報の編集画面。 + + +■コンテンツ +------------------ + + + +■リンク +------------------ + + + +■アクション +------------------ +・「確認画面へ」ボタンをクリックすることで注文情報確認画面に遷移。 +・「一覧に戻る」ボタンをクリックすることで管理用注文一覧画面に遷移。 + + +■遷移先(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ +・管理用注文一覧 +・注文情報確認 + + +■遷移元(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ +・管理用注文一覧 + + +■その他 +------------------ + + Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/order/orderEdit.txt ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/order/orderList.txt =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/order/orderList.txt 2007-11-29 22:18:35 UTC (rev 734) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/order/orderList.txt 2007-11-30 01:43:31 UTC (rev 735) @@ -0,0 +1,44 @@ +管理用注文一覧 +----------------------------------------------------------- + +■概要 +------------------ +注文情報の管理用一覧画面。 +状態で絞りこむ。 + + +■コンテンツ +------------------ +・各項目、▲をクリックで昇順、▼をクリックで降順に並び替える。 +・前へ、次へは遷移可能な場合のみリンクを有効にする。 + + +■リンク +------------------ +・「通知」をクリックすることで注文通知選択画面へ遷移。 +・「編集」をクリックすることで注文情報編集画面へ遷移。 +・「削除」をクリックすることで確認画面を表示し、削除する。 + + +■アクション +------------------ +・「状態」を選択し「絞りこみ」をクリックすることで一覧を更新。 + + +■遷移先(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ +・注文通知選択 +・注文情報編集 + + +■遷移元(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ +・注文通知選択 +・注文情報確認 +・注文情報編集 + + +■その他 +------------------ + + Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/order/orderList.txt ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/order/orderNotificationSelect.txt =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/order/orderNotificationSelect.txt 2007-11-29 22:18:35 UTC (rev 734) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/order/orderNotificationSelect.txt 2007-11-30 01:43:31 UTC (rev 735) @@ -0,0 +1,38 @@ +注文通知選択 +----------------------------------------------------------- + +■概要 +------------------ +通知の送信先選択画面。 + + +■コンテンツ +------------------ + + + +■リンク +------------------ + + + +■アクション +------------------ +・「選択した通知を送信する」ボタンをクリックすることで通知を送信。 +・「一覧に戻る」ボタンをクリックすることで管理用注文一覧画面に遷移。 + + +■遷移先(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ +・管理用注文一覧 + + +■遷移元(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ +・管理用注文一覧 + + +■その他 +------------------ + + Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/order/orderNotificationSelect.txt ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/product/categoryEdit.txt =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/product/categoryEdit.txt 2007-11-29 22:18:35 UTC (rev 734) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/product/categoryEdit.txt 2007-11-30 01:43:31 UTC (rev 735) @@ -0,0 +1,40 @@ +カテゴリ登録/編集 +----------------------------------------------------------- + +■概要 +------------------ +カテゴリを登録または編集する画面。 + + +■コンテンツ +------------------ +・編集中のカテゴリの親カテゴリを表示。 +・「カテゴリを追加する」ボタンをクリックして表示された場合は新規登録する。 +・「編集」ボタンをクリックして表示された場合は、そのカテゴリの情報を編集する。 + + +■リンク +------------------ + + + +■アクション +------------------ +・「登録する」ボタンをクリックすることでカテゴリ情報を更新し、カテゴリ一覧画面に戻る。 +・「一覧に戻る」ボタンをクリックすることでカテゴリ一覧画面に遷移。 + + +■遷移先(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ +・カテゴリ一覧 + + +■遷移元(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ +・カテゴリ一覧 + + +■その他 +------------------ + + Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/product/categoryEdit.txt ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/product/categoryList.txt =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/product/categoryList.txt 2007-11-29 22:18:35 UTC (rev 734) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/product/categoryList.txt 2007-11-30 01:43:31 UTC (rev 735) @@ -0,0 +1,40 @@ +カテゴリ一覧 +----------------------------------------------------------- + +■概要 +------------------ +カテゴリの一覧を表示、管理する画面。 + + +■コンテンツ +------------------ +・表示中のカテゴリの親カテゴリを表示。 +・カテゴリの一覧。 + + +■リンク +------------------ +・カテゴリ名をクリックすることで、そのサブカテゴリの一覧に遷移。 + + +■アクション +------------------ +・「編集」ボタンをクリックすることでカテゴリ登録/編集画面に遷移。 +・「削除」ボタンをクリックすることで確認画面を表示し、削除する。 +・「メーカーを追加する」ボタンをクリックすることでメーカー登録/編集画面に遷移。 + + +■遷移先(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ +・カテゴリ登録/編集 + + +■遷移元(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ +・カテゴリ登録/編集 + + +■その他 +------------------ + + Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/product/categoryList.txt ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/product/manufacturerEdit.txt =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/product/manufacturerEdit.txt 2007-11-29 22:18:35 UTC (rev 734) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/product/manufacturerEdit.txt 2007-11-30 01:43:31 UTC (rev 735) @@ -0,0 +1,38 @@ +メーカー登録/編集 +----------------------------------------------------------- + +■概要 +------------------ + + + +■コンテンツ +------------------ + + + +■リンク +------------------ + + + +■アクション +------------------ +・「登録する」ボタンをクリックすることでメーカー情報を更新し、メーカー一覧画面に戻る。 +・「一覧に戻る」ボタンをクリックすることでメーカー一覧画面に戻る。 + + +■遷移先(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ +・メーカー一覧 + + +■遷移元(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ +・メーカー一覧 + + +■その他 +------------------ + + Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/product/manufacturerEdit.txt ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/product/manufacturerList.txt =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/product/manufacturerList.txt 2007-11-29 22:18:35 UTC (rev 734) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/product/manufacturerList.txt 2007-11-30 01:43:31 UTC (rev 735) @@ -0,0 +1,39 @@ +メーカー一覧 +----------------------------------------------------------- + +■概要 +------------------ +メーカーの一覧を表示、管理する画面。 + + +■コンテンツ +------------------ +・メーカー名、説明の一覧。 + + +■リンク +------------------ + + + +■アクション +------------------ +・「編集」ボタンをクリックすることでメーカー登録/編集画面に遷移。 +・「削除」ボタンをクリックすることで確認画面を表示し、削除する。 +・「メーカーを追加する」ボタンをクリックすることでメーカー登録/編集画面に遷移。 + + +■遷移先(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ +・メーカー登録/編集 + + +■遷移元(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ +・メーカー登録/編集 + + +■その他 +------------------ + + Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/product/manufacturerList.txt ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/product/productConfirm.txt =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/product/productConfirm.txt 2007-11-29 22:18:35 UTC (rev 734) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/product/productConfirm.txt 2007-11-30 01:43:31 UTC (rev 735) @@ -0,0 +1,39 @@ +商品登録内容確認 +----------------------------------------------------------- + +■概要 +------------------ +商品の登録内容確認画面。 + + +■コンテンツ +------------------ + + + +■リンク +------------------ + + + +■アクション +------------------ +・「登録」ボタンをクリックすることで商品情報を更新して商品管理一覧画面に遷移。 +・「戻る」ボタンをクリックすることで商品登録/編集画面に遷移。 + + +■遷移先(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ +・商品管理一覧 +・商品登録/編集 + + +■遷移元(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ +・商品登録/編集 + + +■その他 +------------------ + + Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/product/productConfirm.txt ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/product/productEdit.txt =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/product/productEdit.txt 2007-11-29 22:18:35 UTC (rev 734) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/product/productEdit.txt 2007-11-30 01:43:31 UTC (rev 735) @@ -0,0 +1,40 @@ +商品登録/編集 +----------------------------------------------------------- + +■概要 +------------------ +商品情報を登録、編集する画面。 + + +■コンテンツ +------------------ + + + +■リンク +------------------ + + + +■アクション +------------------ +・「登録する」ボタンをクリックすることで商品登録内容確認画面に遷移。 +・「一覧に戻る」ボタンをクリックすることで商品管理一覧画面に遷移。 + + +■遷移先(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ +・商品管理一覧 +・商品登録内容確認 + + +■遷移元(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ +・商品管理一覧 +・商品登録内容確認 + + +■その他 +------------------ + + Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/product/productEdit.txt ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/product/productList.txt =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/product/productList.txt 2007-11-29 22:18:35 UTC (rev 734) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/product/productList.txt 2007-11-30 01:43:31 UTC (rev 735) @@ -0,0 +1,41 @@ +商品管理一覧 +----------------------------------------------------------- + +■概要 +------------------ +商品情報を一覧表示、管理する画面。 + + +■コンテンツ +------------------ + + + +■リンク +------------------ +・「編集」をクリックすることで商品登録/編集画面へ遷移。 +・「削除」をクリックすることで確認画面を表示し、削除する。 + + +■アクション +------------------ +・「商品を追加する」ボタンをクリックすることで商品登録/編集画面に遷移。 + + +■遷移先(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ +・商品登録/編集 + + +■遷移元(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ +・会員情報編集 +・会員情報編集内容確認 +・商品登録/編集 +・商品登録内容確認 + + +■その他 +------------------ + + Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/admin/product/productList.txt ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/error/error.txt =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/error/error.txt 2007-11-29 22:18:35 UTC (rev 734) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/error/error.txt 2007-11-30 01:43:31 UTC (rev 735) @@ -0,0 +1,35 @@ +エラー画面 +----------------------------------------------------------- + +■概要 +------------------ + + + +■コンテンツ +------------------ + + + +■リンク +------------------ + + + +■アクション +------------------ + + + +■遷移先(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ + + +■遷移元(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ + + +■その他 +------------------ + + Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/error/error.txt ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/index.txt =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/index.txt 2007-11-29 22:18:35 UTC (rev 734) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/index.txt 2007-11-30 01:43:31 UTC (rev 735) @@ -0,0 +1,46 @@ +管理用インデックス +----------------------------------------------------------- + +■概要 +------------------ + + + +■コンテンツ +------------------ + + + +■リンク +------------------ + + + +■アクション +------------------ + + + +■遷移先(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ +・カテゴリ一覧 +・メーカー一覧 +・商品一覧 +・会員一覧 +・管理用注文一覧 +・配送方法設定 +・商品管理一覧 +・カテゴリ一覧 +・ショッピングカート確認 +・注文手続き: ユーザー情報確認 +・会員登録 + + +■遷移元(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ + + +■その他 +------------------ + + Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/index.txt ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/cart/productList.txt =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/cart/productList.txt ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/checkout/checkoutComplete.txt =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/checkout/checkoutComplete.txt 2007-11-29 22:18:35 UTC (rev 734) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/checkout/checkoutComplete.txt 2007-11-30 01:43:31 UTC (rev 735) @@ -0,0 +1,37 @@ +注文手続き: 注文完了 +----------------------------------------------------------- + +■概要 +------------------ + + + +■コンテンツ +------------------ + + + +■リンク +------------------ + + + +■アクション +------------------ + + + +■遷移先(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ +・商品一覧 + + +■遷移元(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ +・注文手続き: 注文確認 + + +■その他 +------------------ + + Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/checkout/checkoutComplete.txt ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/checkout/checkoutConfirm.txt =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/checkout/checkoutConfirm.txt 2007-11-29 22:18:35 UTC (rev 734) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/checkout/checkoutConfirm.txt 2007-11-30 01:43:31 UTC (rev 735) @@ -0,0 +1,31 @@ +注文手続き: 注文確認 +----------------------------------------------------------- + +■概要 +------------------ +注文商品、お届け先、お支払い方法、配送方法の確認画面。 + + +■コンテンツ +------------------ + + + +■リンク +------------------ + + + +■アクション +------------------ +・「注文手続きを取り消す」ボタンをクリックすることで、user/checkout/checkoutEdit.htmlに遷移。 +・「お買い物に戻る」ボタンをクリックすることで、商品一覧画面に遷移。 +・「注文を完了する」ボタンをクリックすることで、注文手続き: 注文完了画面へ遷移。 +・ +・ +・ + + + +■遷移先(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/checkout/checkoutConfirm.txt ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/checkout/paymentSelect.txt =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/checkout/paymentSelect.txt 2007-11-29 22:18:35 UTC (rev 734) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/checkout/paymentSelect.txt 2007-11-30 01:43:31 UTC (rev 735) @@ -0,0 +1,37 @@ +注文手続き: 支払方法選択 +----------------------------------------------------------- + +■概要 +------------------ +商品の配送方法、お支払い方法、クレジットカード情報を入力する画面。 + + +■コンテンツ +------------------ +・クレジットカードでの支払いが選択できる場合、クレジットカード情報の入力欄を表示。 + + +■リンク +------------------ + + + +■アクション +------------------ +「ご注文内容の確認へ」ボタンをクリックすることで、注文手続き: 注文確認画面へ遷移。 + + +■遷移先(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ +・注文手続き: 注文確認 + + +■遷移元(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ +・注文手続き: 住所選択 + + +■その他 +------------------ + + Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/checkout/paymentSelect.txt ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/checkout/userAddressSelect.txt =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/checkout/userAddressSelect.txt 2007-11-29 22:18:35 UTC (rev 734) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/checkout/userAddressSelect.txt 2007-11-30 01:43:31 UTC (rev 735) @@ -0,0 +1,39 @@ +注文手続き: 住所選択 +----------------------------------------------------------- + +■概要 +------------------ +商品のお届け先を追加、選択する画面。 + + +■コンテンツ +------------------ + + + +■リンク +------------------ + + + +■アクション +------------------ +・「お届け先住所」を選択し、「選択したお届け先を削除する」ボタンをクリックすることで、会員情報を更新して注文手続き: 住所選択画面に遷移。 +・「支払方法とお届け方法の選択へ」ボタンをクリックすることで、注文手続き: 支払方法選択画面に遷移。 +・「上記の会員情報を追加する」ボタンをクリックすることで、お届け先を追加して注文手続き: 住所選択画面に遷移。 + + +■遷移先(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ +・注文手続き: 支払方法選択 + + +■遷移元(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ +・注文手続き: ユーザー情報確認 + + +■その他 +------------------ + + Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/checkout/userAddressSelect.txt ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/checkout/userInfoEdit.txt =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/checkout/userInfoEdit.txt 2007-11-29 22:18:35 UTC (rev 734) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/checkout/userInfoEdit.txt 2007-11-30 01:43:31 UTC (rev 735) @@ -0,0 +1,47 @@ +注文手続き: ユーザー情報確認 +----------------------------------------------------------- + +■概要 +------------------ +ユーザー情報を確認、編集、登録する画面。 + + +■コンテンツ +------------------ +・ログインされていない場合、「カートに入れた商品を注文していただくには、ログインする必要があります。」と表示。 +・会員登録されていない場合、または会員情報を修正を選択して来た場合は、会員情報、お届け先の入力画面を表示。 +・すでに会員登録されている場合は、会員情報、お届け先の確認画面を表示。 +・カートに商品が入っていない場合、「カートに商品が入っていません。」「お買い物を続ける」と表示。 + + +■リンク +------------------ +カートに商品が入っていない場合、「お買い物を続ける」をクリックすることで商品一覧画面へ遷移。 + + +■アクション +------------------ +・会員登録されていない場合、「上記の会員情報を登録する」ボタンを表示。 +　⇒「上記の会員情報を登録する」ボタンをクリックすることで、注文手続き: ユーザー情報確認画面へ遷移。 +・会員上方を修正を選択して来た場合、「上記の会員情報で更新する」、「会員情報の更新を取り消す」ボタンを表示。 +　⇒「上記の会員情報で更新する」ボタン、「会員情報の更新を取り消す」ボタンをクリックすることで、注文手続き: ユーザー情報確認画面へ遷移。 +・すでに会員登録されている場合は、「上記の会員情報を修正する」、「お届け先の選択へ」ボタンを表示する。 +　⇒「上記の会員情報を修正する」ボタンをクリックすることで、注文手続き: ユーザー情報確認画面へ遷移。 +　⇒「お届け先の選択へ」ボタンをクリックすることで、注文手続き: 住所選択画面へ遷移。 + + +■遷移先(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ +・注文手続き: 住所選択 +・商品一覧 + + +■遷移元(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ +・ショッピングカート確認 + + +■その他 +------------------ + + Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/checkout/userInfoEdit.txt ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/product/categoryList.txt =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/product/categoryList.txt 2007-11-29 22:18:35 UTC (rev 734) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/product/categoryList.txt 2007-11-30 01:43:31 UTC (rev 735) @@ -0,0 +1,37 @@ +カテゴリ一覧 +----------------------------------------------------------- + +■概要 +------------------ +登録されたカテゴリの一覧を表示する。 + + +■コンテンツ +------------------ +・カテゴリの一覧を表示 +・選択中のカテゴリ名は通常のテキストとして、それ以外のカテゴリ名はリンクとして表示する。 +・リンクとなっているカテゴリ名をクリックすることで、右フレーム内の一覧画面をそのカテゴリで絞り込んで表示する。 + + +■リンク +------------------ + + + +■アクション +------------------ + + + +■遷移先(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ + + +■遷移元(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ + + +■その他 +------------------ + + Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/product/categoryList.txt ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/product/productDetails.txt =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/product/productDetails.txt ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/product/productList.txt =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/product/productList.txt ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/product/topProductList.txt =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/product/topProductList.txt 2007-11-29 22:18:35 UTC (rev 734) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/product/topProductList.txt 2007-11-30 01:43:31 UTC (rev 735) @@ -0,0 +1,35 @@ + +----------------------------------------------------------- + +■概要 +------------------ + + + +■コンテンツ +------------------ + + + +■リンク +------------------ + + + +■アクション +------------------ + + + +■遷移先(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ + + +■遷移元(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ + + +■その他 +------------------ + + Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/product/topProductList.txt ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/search/search.txt =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/search/search.txt 2007-11-29 22:18:35 UTC (rev 734) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/search/search.txt 2007-11-30 01:43:31 UTC (rev 735) @@ -0,0 +1,37 @@ +商品検索 +----------------------------------------------------------- + +■概要 +------------------ +商品の検索画面。 +カテゴリ、メーカー、商品名、価格帯から検索。 + + +■コンテンツ +------------------ +・カテゴリ、メーカー、商品名、価格を指定し、「検索」ボタンをクリックすることで、画面下に検索結果を表示。 + + +■リンク +------------------ +・検索結果一覧の商品名のリンクをクリックすることで、商品詳細画面に遷移。 + + +■アクション +------------------ + + + +■遷移先(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ +・商品詳細 + + +■遷移元(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ + + +■その他 +------------------ + + Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/search/search.txt ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/signup/signupComplete.txt =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/signup/signupComplete.txt 2007-11-29 22:18:35 UTC (rev 734) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/signup/signupComplete.txt 2007-11-30 01:43:31 UTC (rev 735) @@ -0,0 +1,37 @@ +会員登録完了 +----------------------------------------------------------- + +■概要 +------------------ +会員登録の完了とメールへの通知を知らせる画面。 + + +■コンテンツ +------------------ + + + +■リンク +------------------ + + + +■アクション +------------------ + + + +■遷移先(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ +・会員登録 + + +■遷移元(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ +・会員登録確認 + + +■その他 +------------------ + + Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/signup/signupComplete.txt ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/signup/signupConfirm.txt =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/signup/signupConfirm.txt 2007-11-29 22:18:35 UTC (rev 734) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/signup/signupConfirm.txt 2007-11-30 01:43:31 UTC (rev 735) @@ -0,0 +1,39 @@ +会員登録確認 +----------------------------------------------------------- + +■概要 +------------------ +入力した会員登録情報を確認する画面。 + + +■コンテンツ +------------------ +・会員登録画面で入力した値を表示する。編集不可。 + + +■リンク +------------------ + + + +■アクション +------------------ +・「上記の情報を登録する」ボタンをクリックすると会員登録完了画面に遷移し、登録されたメールアドレスに登録完了メールを送る。 +・「再編集する」ボタンをクリックすると会員登録画面へ遷移する。 + + +■遷移先(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ +・会員登録完了 +・会員登録 + + +■遷移元(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ +・会員登録 + + +■その他 +------------------ + + Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/signup/signupConfirm.txt ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/signup/signupEdit.txt =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/signup/signupEdit.txt 2007-11-29 22:18:35 UTC (rev 734) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/signup/signupEdit.txt 2007-11-30 01:43:31 UTC (rev 735) @@ -0,0 +1,40 @@ +会員登録 +----------------------------------------------------------- + +■概要 +------------------ +会員登録のための情報入力と利用規約の画面。 + + +■コンテンツ +------------------ +・［必須］の欄を記入しないで登録しようとすると、エラーを表示する。 + + +■リンク +------------------ + + + +■アクション +------------------ + + + +■遷移先(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ +・会員登録確認 + + +■遷移元(ヘッダー、フッター及びナビゲーションバーを除く) +------------------ +・会員登録完了 +・会員登録確認 +・商品詳細 +・ショッピングカート確認 + + +■その他 +------------------ + + Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/doc/user/signup/signupEdit.txt ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/footer.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/mock/footer.html 2007-11-29 22:18:35 UTC (rev 734) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/footer.html 2007-11-30 01:43:31 UTC (rev 735) @@ -0,0 +1,20 @@ + + + + + + + Footer + + +
+
+
+ +
+
+
+ + Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/footer.html ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/header.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/mock/header.html 2007-11-29 22:18:35 UTC (rev 734) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/header.html 2007-11-30 01:43:31 UTC (rev 735) @@ -0,0 +1,36 @@ + + + + + + + Header + + +
+ +
+ + Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/header.html ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/images/coreback.gif =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/images/coreback.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/images/fileview.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/images/fileview.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/images/footer_bg.gif =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/images/footer_bg.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/images/header_bg.gif =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/images/header_bg.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/images/logo.png =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/images/logo.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/images/readmore_arrow.gif =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/images/readmore_arrow.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/images/readmore_over.gif =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/images/readmore_over.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/images/tab_bg.gif =================================================================== (Binary files differ) Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/images/tab_bg.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/index.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/mock/index.html 2007-11-29 22:18:35 UTC (rev 734) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/index.html 2007-11-30 01:43:31 UTC (rev 735) @@ -0,0 +1,16 @@ + + + + + 画面設計書 + + + + + + + + + + + Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/index.html ___________________________________________________________________ Name: svn:eol-style + native Added: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/js/doc.js =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/mock/js/doc.js 2007-11-29 22:18:35 UTC (rev 734) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/mock/js/doc.js 2007-11-30 01:43:31 UTC (rev 735) @@ -0,0 +1,5 @@ +function init(){ + var path = self.web.location.href; + var docPath = path.replace("/view/","/mock/doc/").replace(".html",".txt"); + self.txt.location.href = docPath; +} Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/mock/js/doc.js ___________________________________________________________________ Name: svn:eol-style + native Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/address/addressConfirm.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/address/addressConfirm.html 2007-11-29 22:18:35 UTC (rev 734) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/address/addressConfirm.html 2007-11-30 01:43:31 UTC (rev 735) @@ -5,7 +5,7 @@ 住所一覧 - +
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/address/addressEdit.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/address/addressEdit.html 2007-11-29 22:18:35 UTC (rev 734) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/address/addressEdit.html 2007-11-30 01:43:31 UTC (rev 735) @@ -5,7 +5,7 @@ 住所登録 - +
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/address/addressList.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/address/addressList.html 2007-11-29 22:18:35 UTC (rev 734) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/address/addressList.html 2007-11-30 01:43:31 UTC (rev 735) @@ -5,7 +5,7 @@ 住所一覧 - +
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/customer/customerConfirm.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/customer/customerConfirm.html 2007-11-29 22:18:35 UTC (rev 734) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/customer/customerConfirm.html 2007-11-30 01:43:31 UTC (rev 735) @@ -5,7 +5,7 @@ 会員情報編集画面 - + Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/customer/customerEdit.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/customer/customerEdit.html 2007-11-29 22:18:35 UTC (rev 734) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/customer/customerEdit.html 2007-11-30 01:43:31 UTC (rev 735) @@ -5,7 +5,7 @@ 会員情報編集画面 - + Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/customer/customerList.html =================================================================== --- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/customer/customerList.html 2007-11-29 22:18:35 UTC (rev 734) +++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/customer/customerList.html 2007-11-30 01:43:31 UTC (rev 735) @@ -5,7 +5,7 @@ 会員一覧 - +