From svnnotify @ sourceforge.jp Wed Oct 1 13:46:46 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Wed, 01 Oct 2008 13:46:46 +0900 Subject: [pal-cvs 3460] [1194] i18ned wcm editor upload message Message-ID: <1222836406.580698.3775.nullmailer@users.sourceforge.jp> Revision: 1194 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1194 Author: sone Date: 2008-10-01 13:46:46 +0900 (Wed, 01 Oct 2008) Log Message: ----------- i18ned wcm editor upload message Modified Paths: -------------- pal-wcm/trunk/src/main/webapp/fckeditor/editor/dialog/fck_flash/fck_flash.js pal-wcm/trunk/src/main/webapp/fckeditor/editor/dialog/fck_image/fck_image.js pal-wcm/trunk/src/main/webapp/fckeditor/editor/dialog/fck_link/fck_link.js pal-wcm/trunk/src/main/webapp/fckeditor/editor/lang/en.js pal-wcm/trunk/src/main/webapp/fckeditor/editor/lang/ja.js -------------- next part -------------- Modified: pal-wcm/trunk/src/main/webapp/fckeditor/editor/dialog/fck_flash/fck_flash.js =================================================================== --- pal-wcm/trunk/src/main/webapp/fckeditor/editor/dialog/fck_flash/fck_flash.js 2008-09-28 00:51:43 UTC (rev 1193) +++ pal-wcm/trunk/src/main/webapp/fckeditor/editor/dialog/fck_flash/fck_flash.js 2008-10-01 04:46:46 UTC (rev 1194) @@ -243,7 +243,10 @@ switch ( errorNumber ) { case 0 : // No errors - alert( 'Your file has been successfully uploaded' ) ; + if(FCKLang.UploadSuccess == undefined) + alert( 'Your file has been successfully uploaded' ); + else + alert(FCKLang.UploadSuccess); // ja or en break ; case 1 : // Custom error alert( customMsg ) ; @@ -252,19 +255,34 @@ alert( customMsg ) ; break ; case 201 : - alert( 'A file with the same name is already available. The uploaded file has been renamed to "' + fileName + '"' ) ; + if(FCKLang.RenameFile == undefined) + alert( 'A file with the same name is already available. The uploaded file has been renamed to "' + fileName + '"' ) ; + else + alert(FCKLang.RenameFile + fileName + '"'); // ja or en break ; case 202 : - alert( 'Invalid file type' ) ; + if(FCKLang.InvalidFileType == undefined) + alert( 'Invalid file type' ) ; + else + alert(FCKLang.InvalidFileType); // ja or en return ; case 203 : - alert( "Security error. You probably don't have enough permissions to upload. Please check your server." ) ; + if(FCKLang.PermissionError == undefined) + alert( "Security error. You probably don't have enough permissions to upload. Please check your server." ) ; + else + alert(FCKLang.PermissionError); // ja or en return ; case 500 : - alert( 'The connector is disabled' ) ; + if(FCKLang.ConnectorDisabled == undefined) + alert( 'The connector is disabled' ) ; + else + alert(FCKLang.ConnectorDisabled); // ja or en break ; default : - alert( 'Error on file upload. Error number: ' + errorNumber ) ; + if(FCKLang.ErrorOnUpload == undefined) + alert( 'Error on file upload. Error number: ' + errorNumber ) ; + else + alert(FCKLang.ErrorOnUpload + errorNumber); // ja or en return ; } Modified: pal-wcm/trunk/src/main/webapp/fckeditor/editor/dialog/fck_image/fck_image.js =================================================================== --- pal-wcm/trunk/src/main/webapp/fckeditor/editor/dialog/fck_image/fck_image.js 2008-09-28 00:51:43 UTC (rev 1193) +++ pal-wcm/trunk/src/main/webapp/fckeditor/editor/dialog/fck_image/fck_image.js 2008-10-01 04:46:46 UTC (rev 1194) @@ -450,11 +450,13 @@ // Remove animation window.parent.Throbber.Hide() ; GetE( 'divUpload' ).style.display = '' ; - switch ( errorNumber ) { case 0 : // No errors - alert( 'Your file has been successfully uploaded' ) ; + if(FCKLang.UploadSuccess == undefined) + alert( 'Your file has been successfully uploaded' ); + else + alert(FCKLang.UploadSuccess); // ja or en break ; case 1 : // Custom error alert( customMsg ) ; @@ -463,19 +465,34 @@ alert( customMsg ) ; break ; case 201 : - alert( 'A file with the same name is already available. The uploaded file has been renamed to "' + fileName + '"' ) ; + if(FCKLang.RenameFile == undefined) + alert( 'A file with the same name is already available. The uploaded file has been renamed to "' + fileName + '"' ) ; + else + alert(FCKLang.RenameFile + fileName + '"'); // ja or en break ; case 202 : - alert( 'Invalid file type' ) ; + if(FCKLang.InvalidFileType == undefined) + alert( 'Invalid file type' ) ; + else + alert(FCKLang.InvalidFileType); // ja or en return ; case 203 : - alert( "Security error. You probably don't have enough permissions to upload. Please check your server." ) ; + if(FCKLang.PermissionError == undefined) + alert( "Security error. You probably don't have enough permissions to upload. Please check your server." ) ; + else + alert(FCKLang.PermissionError); // ja or en return ; case 500 : - alert( 'The connector is disabled' ) ; + if(FCKLang.ConnectorDisabled == undefined) + alert( 'The connector is disabled' ) ; + else + alert(FCKLang.ConnectorDisabled); // ja or en break ; default : - alert( 'Error on file upload. Error number: ' + errorNumber ) ; + if(FCKLang.ErrorOnUpload == undefined) + alert( 'Error on file upload. Error number: ' + errorNumber ) ; + else + alert(FCKLang.ErrorOnUpload + errorNumber); // ja or en return ; } Modified: pal-wcm/trunk/src/main/webapp/fckeditor/editor/dialog/fck_link/fck_link.js =================================================================== --- pal-wcm/trunk/src/main/webapp/fckeditor/editor/dialog/fck_link/fck_link.js 2008-09-28 00:51:43 UTC (rev 1193) +++ pal-wcm/trunk/src/main/webapp/fckeditor/editor/dialog/fck_link/fck_link.js 2008-10-01 04:46:46 UTC (rev 1194) @@ -809,11 +809,13 @@ // Remove animation window.parent.Throbber.Hide() ; GetE( 'divUpload' ).style.display = '' ; - switch ( errorNumber ) { case 0 : // No errors - alert( 'Your file has been successfully uploaded' ) ; + if(FCKLang.UploadSuccess == undefined) + alert( 'Your file has been successfully uploaded' ); + else + alert(FCKLang.UploadSuccess); // ja or en break ; case 1 : // Custom error alert( customMsg ) ; @@ -822,19 +824,34 @@ alert( customMsg ) ; break ; case 201 : - alert( 'A file with the same name is already available. The uploaded file has been renamed to "' + fileName + '"' ) ; + if(FCKLang.RenameFile == undefined) + alert( 'A file with the same name is already available. The uploaded file has been renamed to "' + fileName + '"' ) ; + else + alert(FCKLang.RenameFile + fileName + '"'); // ja or en break ; case 202 : - alert( 'Invalid file type' ) ; + if(FCKLang.InvalidFileType == undefined) + alert( 'Invalid file type' ) ; + else + alert(FCKLang.InvalidFileType); // ja or en return ; case 203 : - alert( "Security error. You probably don't have enough permissions to upload. Please check your server." ) ; + if(FCKLang.PermissionError == undefined) + alert( "Security error. You probably don't have enough permissions to upload. Please check your server." ) ; + else + alert(FCKLang.PermissionError); // ja or en return ; case 500 : - alert( 'The connector is disabled' ) ; + if(FCKLang.ConnectorDisabled == undefined) + alert( 'The connector is disabled' ) ; + else + alert(FCKLang.ConnectorDisabled); // ja or en break ; default : - alert( 'Error on file upload. Error number: ' + errorNumber ) ; + if(FCKLang.ErrorOnUpload == undefined) + alert( 'Error on file upload. Error number: ' + errorNumber ) ; + else + alert(FCKLang.ErrorOnUpload + errorNumber); // ja or en return ; } Modified: pal-wcm/trunk/src/main/webapp/fckeditor/editor/lang/en.js =================================================================== --- pal-wcm/trunk/src/main/webapp/fckeditor/editor/lang/en.js 2008-09-28 00:51:43 UTC (rev 1193) +++ pal-wcm/trunk/src/main/webapp/fckeditor/editor/lang/en.js 2008-10-01 04:46:46 UTC (rev 1194) @@ -522,5 +522,13 @@ DlgDivGeneralTab : "General", DlgDivAdvancedTab : "Advanced", DlgDivStyle : "Style", -DlgDivInlineStyle : "Inline Style" +DlgDivInlineStyle : "Inline Style", + +// Upload +UploadSuccess : "Your file has been successfully uploaded", +RenameFile : 'A file with the same name is already available. The uploaded file has been renamed to "', +InvalidFileType : "Invalid file type", +PermissionError : "Security error. You probably don't have enough permissions to upload. Please check your server.", +ConnectorDisabled : "The connector is disabled", +ErrorOnUpload : "Error on file upload. Error number: " }; Modified: pal-wcm/trunk/src/main/webapp/fckeditor/editor/lang/ja.js =================================================================== --- pal-wcm/trunk/src/main/webapp/fckeditor/editor/lang/ja.js 2008-09-28 00:51:43 UTC (rev 1193) +++ pal-wcm/trunk/src/main/webapp/fckeditor/editor/lang/ja.js 2008-10-01 04:46:46 UTC (rev 1194) @@ -522,5 +522,13 @@ DlgDivGeneralTab : "全般", DlgDivAdvancedTab : "高度な設定", DlgDivStyle : "スタイル", -DlgDivInlineStyle : "インラインスタイル" +DlgDivInlineStyle : "インラインスタイル", + +// Upload +UploadSuccess : "アップロードに成功しました", +RenameFile : '同じ名前のファイルがすでに存在します。アップロードされたファイルの名前を以下のように変更しました :"', +InvalidFileType : "無効なファイル形式です", +PermissionError : "セキュリティエラーです。アップロードするための権限があなたに与えられていない可能性があります。サーバーの設定を確認してください。", +ConnectorDisabled : "コネクターが無効です。", +ErrorOnUpload : "アップロードにおいてエラーが発生しました。エラー番号:" }; From svnnotify @ sourceforge.jp Wed Oct 1 16:21:21 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Wed, 01 Oct 2008 16:21:21 +0900 Subject: [pal-cvs 3461] [1195] fixed WCMViewer title in edit mode Message-ID: <1222845681.151404.22958.nullmailer@users.sourceforge.jp> Revision: 1195 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1195 Author: sone Date: 2008-10-01 16:21:20 +0900 (Wed, 01 Oct 2008) Log Message: ----------- fixed WCMViewer title in edit mode Modified Paths: -------------- pal-wcm/trunk/src/main/java/jp/sf/pal/wcm/portlet/WcmViewerPortlet.java -------------- next part -------------- Modified: pal-wcm/trunk/src/main/java/jp/sf/pal/wcm/portlet/WcmViewerPortlet.java =================================================================== --- pal-wcm/trunk/src/main/java/jp/sf/pal/wcm/portlet/WcmViewerPortlet.java 2008-10-01 04:46:46 UTC (rev 1194) +++ pal-wcm/trunk/src/main/java/jp/sf/pal/wcm/portlet/WcmViewerPortlet.java 2008-10-01 07:21:20 UTC (rev 1195) @@ -92,6 +92,30 @@ protected void doEdit(RenderRequest request, RenderResponse response) throws PortletException, IOException { response.setContentType("text/html"); + + Fragment fragment = getCurrentFragment(request); + + Locale currentLocale = request.getLocale(); + List localeList = getLocaleList(fragment); + String localeName = ""; + String language = currentLocale.getLanguage(); + String country = currentLocale.getCountry(); + String variant = currentLocale.getVariant(); + if (localeList.contains(language + "_" + country + "_" + variant)) { + localeName = WcmConstants.LOCALE_SEPARETER + language + "_" + + country + "_" + variant; + } else if (localeList.contains(language + "_" + country)) { + localeName = WcmConstants.LOCALE_SEPARETER + language + "_" + + country; + } else if (localeList.contains(language)) { + localeName = WcmConstants.LOCALE_SEPARETER + language; + } + + String title = getFragmentPreferenceValue(fragment, WcmConstants.TITLE + + localeName, ""); + + response.setTitle(title); + request.setAttribute(WcmConstants.PORTAL_CONTEXT_PATH, getPortalContextPath(request)); request From svnnotify @ sourceforge.jp Wed Oct 1 18:00:32 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Wed, 01 Oct 2008 18:00:32 +0900 Subject: [pal-cvs 3462] [1196] fixed WCM font size Message-ID: <1222851632.255200.15808.nullmailer@users.sourceforge.jp> Revision: 1196 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1196 Author: sone Date: 2008-10-01 18:00:32 +0900 (Wed, 01 Oct 2008) Log Message: ----------- fixed WCM font size Modified Paths: -------------- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/layout/wcm/css/styles.css pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/portlet/wcm/css/styles.css -------------- next part -------------- Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/layout/wcm/css/styles.css =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/layout/wcm/css/styles.css 2008-10-01 07:21:20 UTC (rev 1195) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/layout/wcm/css/styles.css 2008-10-01 09:00:32 UTC (rev 1196) @@ -2,6 +2,7 @@ body { font-family: Verdana, Helvetica, Arial, sans-serif; + font-size: 10pt; voice-family: "\"}\""; voice-family: inherit; padding: 0; Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/portlet/wcm/css/styles.css =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/portlet/wcm/css/styles.css 2008-10-01 07:21:20 UTC (rev 1195) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/portlet/wcm/css/styles.css 2008-10-01 09:00:32 UTC (rev 1196) @@ -252,7 +252,7 @@ font-family: Verdana, Helvetica, Arial, sans-serif; voice-family: "\"}\""; voice-family: inherit; - font-size: 10pt; + font-size: 12pt; } From svnnotify @ sourceforge.jp Wed Oct 1 18:01:35 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Wed, 01 Oct 2008 18:01:35 +0900 Subject: [pal-cvs 3463] [1197] fixed WCM font size Message-ID: <1222851695.310178.16467.nullmailer@users.sourceforge.jp> Revision: 1197 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1197 Author: sone Date: 2008-10-01 18:01:35 +0900 (Wed, 01 Oct 2008) Log Message: ----------- fixed WCM font size Modified Paths: -------------- pal-wcm/trunk/src/main/webapp/WEB-INF/view/editor/prefs.jsp -------------- next part -------------- Modified: pal-wcm/trunk/src/main/webapp/WEB-INF/view/editor/prefs.jsp =================================================================== --- pal-wcm/trunk/src/main/webapp/WEB-INF/view/editor/prefs.jsp 2008-10-01 09:00:32 UTC (rev 1196) +++ pal-wcm/trunk/src/main/webapp/WEB-INF/view/editor/prefs.jsp 2008-10-01 09:01:35 UTC (rev 1197) @@ -7,7 +7,7 @@
-
+
Preferences
From svnnotify @ sourceforge.jp Wed Oct 1 18:17:57 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Wed, 01 Oct 2008 18:17:57 +0900 Subject: [pal-cvs 3464] [1198] 1.1 snapshot. Message-ID: <1222852677.950007.32738.nullmailer@users.sourceforge.jp> Revision: 1198 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1198 Author: shinsuke Date: 2008-10-01 18:17:57 +0900 (Wed, 01 Oct 2008) Log Message: ----------- 1.1 snapshot. Modified Paths: -------------- pal-wcm/trunk/pom.xml -------------- next part -------------- Modified: pal-wcm/trunk/pom.xml =================================================================== --- pal-wcm/trunk/pom.xml 2008-10-01 09:01:35 UTC (rev 1197) +++ pal-wcm/trunk/pom.xml 2008-10-01 09:17:57 UTC (rev 1198) @@ -3,7 +3,7 @@ 4.0.0 jp.sf.pal pal-wcm - 1.0 + 1.1-SNAPSHOT war Web Content Management tools for PAL Portal From svnnotify @ sourceforge.jp Wed Oct 1 18:18:31 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Wed, 01 Oct 2008 18:18:31 +0900 Subject: [pal-cvs 3465] [1199] 1.3 snapshot. Message-ID: <1222852711.579432.1598.nullmailer@users.sourceforge.jp> Revision: 1199 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1199 Author: shinsuke Date: 2008-10-01 18:18:31 +0900 (Wed, 01 Oct 2008) Log Message: ----------- 1.3 snapshot. Modified Paths: -------------- pal-admin/trunk/pom.xml -------------- next part -------------- Modified: pal-admin/trunk/pom.xml =================================================================== --- pal-admin/trunk/pom.xml 2008-10-01 09:17:57 UTC (rev 1198) +++ pal-admin/trunk/pom.xml 2008-10-01 09:18:31 UTC (rev 1199) @@ -3,7 +3,7 @@ 4.0.0 jp.sf.pal pal-admin - 1.2 + 1.3-SNAPSHOT war Administration tools for PAL Portal From svnnotify @ sourceforge.jp Wed Oct 8 14:43:43 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Wed, 08 Oct 2008 14:43:43 +0900 Subject: [pal-cvs 3466] [1200] i18ned wcm viewer and wcm editor Message-ID: <1223444623.585819.13589.nullmailer@users.sourceforge.jp> Revision: 1200 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1200 Author: sone Date: 2008-10-08 14:43:43 +0900 (Wed, 08 Oct 2008) Log Message: ----------- i18ned wcm viewer and wcm editor Modified Paths: -------------- pal-wcm/trunk/src/main/resources/application.properties pal-wcm/trunk/src/main/resources/application_ja.properties pal-wcm/trunk/src/main/webapp/WEB-INF/view/editor/edit.jsp pal-wcm/trunk/src/main/webapp/WEB-INF/view/editor/error.jsp pal-wcm/trunk/src/main/webapp/WEB-INF/view/editor/index.jsp pal-wcm/trunk/src/main/webapp/WEB-INF/view/editor/prefs.jsp pal-wcm/trunk/src/main/webapp/WEB-INF/view/viewer/edit.jsp -------------- next part -------------- Modified: pal-wcm/trunk/src/main/resources/application.properties =================================================================== --- pal-wcm/trunk/src/main/resources/application.properties 2008-10-01 09:18:31 UTC (rev 1199) +++ pal-wcm/trunk/src/main/resources/application.properties 2008-10-08 05:43:43 UTC (rev 1200) @@ -32,6 +32,27 @@ errors.could_not_load_folder=Could not load folders: {0} errors.could_not_load_page=Could not load pages: {0} errors.failed_to_update_data=Failed to update data: {1} on {0} -errors.locale_already_exists=Locale({0}) already exists. -errors.locale_does_no_exist=Locale({0}) does not exist. -errors.locale_is_null=Locale is required. \ No newline at end of file +errors.locale_already_exists=Language({0}) already exists. +errors.locale_does_no_exist=Language({0}) does not exist. +errors.locale_is_null=Language is required. + +edit.contents=Edit this contents +edit.back=Back + +editor.fck.title=Title: +editor.fck.language=Language: +editor.fck.reload=Reload +editor.fck.save=Save +editor.path=Path: +editor.name=Name +editor.title=Title +editor.type=Type +editor.go=Go +editor.up=Up + +prefs.pref=Preferences +prefs.title.language=Language +prefs.label.language=Language: +prefs.add=Add +prefs.delete=Delete +prefs.language_list=Language List \ No newline at end of file Modified: pal-wcm/trunk/src/main/resources/application_ja.properties =================================================================== --- pal-wcm/trunk/src/main/resources/application_ja.properties 2008-10-01 09:18:31 UTC (rev 1199) +++ pal-wcm/trunk/src/main/resources/application_ja.properties 2008-10-08 05:43:43 UTC (rev 1200) @@ -16,13 +16,45 @@ errors.creditcard={0}\u306f\u30af\u30ec\u30b8\u30c3\u30c8\u30ab\u30fc\u30c9\u756a\u53f7\u3068\u3057\u3066\u4e0d\u6b63\u3067\u3059\u3002 errors.email={0}\u306f\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u3068\u3057\u3066\u4e0d\u6b63\u3067\u3059\u3002 errors.url={0}\u306fURL\u3068\u3057\u3066\u4e0d\u6b63\u3067\u3059\u3002 +labels.name=\u540d\u524d +success.store_content=\u5185\u5bb9\u3092\u4fdd\u5b58\u3057\u307e\u3057\u305f\u3002 +success.add_locale=\u8a00\u8a9e\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002 +success.delete_locale=\u8a00\u8a9e\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 + errors.required.other={0}\u306f{1}\u304c\u5165\u529b\u3055\u308c\u305f\u3068\u304d\u306f\u5fc5\u9808\u3067\u3059\u3002 errors.phone={0}\u306f\u96fb\u8a71\u756a\u53f7({1})\u3068\u3057\u3066\u4e0d\u6b63\u3067\u3059\u3002 errors.norole=\u9069\u5207\u306a\u30ed\u30fc\u30eb\u304c\u3042\u308a\u307e\u305b\u3093\u3002 errors.debug=\u4f8b\u5916\u306e\u30c7\u30d0\u30c3\u30b0\u7528\u3002 errors.upload.size=\u4e0a\u9650\u304c{0}\u30d0\u30a4\u30c8\u306a\u306e\u306b\u5b9f\u969b\u306f{1}\u30d0\u30a4\u30c8\u3060\u3063\u305f\u306e\u3067\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002 +errors.could_not_load_folder={0} \u3068\u3044\u3046\u30d5\u30a9\u30eb\u30c0\u306f\u5b58\u5728\u3057\u307e\u305b\u3093\u3002 +errors.could_not_load_page={0} \u3068\u3044\u3046\u30da\u30fc\u30b8\u306f\u5b58\u5728\u3057\u307e\u305b\u3093\u3002 +errors.locale_already_exists={0} \u3068\u3044\u3046\u8a00\u8a9e\u306f\u65e2\u306b\u5b58\u5728\u3057\u3066\u3044\u307e\u3059\u3002 +errors.locale_does_no_exist={0} \u3068\u3044\u3046\u8a00\u8a9e\u306f\u5b58\u5728\u3057\u307e\u305b\u3093\u3002 +errors.locale_is_null=\u8a00\u8a9e\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002 + messages.upload.complete={0}\u306b\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9\u3057\u307e\u3057\u305f\u3002 #labels.byteText=\u30d0\u30a4\u30c8\u30c6\u30ad\u30b9\u30c8 + +edit.contents=\u5185\u5bb9\u3092\u7de8\u96c6\u3059\u308b +edit.back=\u623b\u308b + +editor.fck.title=\u30bf\u30a4\u30c8\u30eb: +editor.fck.language=\u8a00\u8a9e: +editor.fck.reload=\u66f4\u65b0 +editor.fck.save=\u4fdd\u5b58 +editor.path=\u30d1\u30b9: +editor.name=\u540d\u524d +editor.title=\u30bf\u30a4\u30c8\u30eb +editor.type=\u30bf\u30a4\u30d7 +editor.go=\u79fb\u52d5 +editor.up=\u4e0a\u3078 + +prefs.pref=\u8a2d\u5b9a +prefs.title.language=\u8a00\u8a9e +prefs.label.language=\u8a00\u8a9e: +prefs.add=\u8ffd\u52a0 +prefs.delete=\u524a\u9664 +prefs.language_list=\u8a00\u8a9e\u30ea\u30b9\u30c8 \ No newline at end of file Modified: pal-wcm/trunk/src/main/webapp/WEB-INF/view/editor/edit.jsp =================================================================== --- pal-wcm/trunk/src/main/webapp/WEB-INF/view/editor/edit.jsp 2008-10-01 09:18:31 UTC (rev 1199) +++ pal-wcm/trunk/src/main/webapp/WEB-INF/view/editor/edit.jsp 2008-10-08 05:43:43 UTC (rev 1200) @@ -13,8 +13,9 @@
- Title: + + DEFAULT @@ -22,7 +23,7 @@
@@ -52,7 +53,7 @@
Modified: pal-wcm/trunk/src/main/webapp/WEB-INF/view/editor/error.jsp =================================================================== --- pal-wcm/trunk/src/main/webapp/WEB-INF/view/editor/error.jsp 2008-10-01 09:18:31 UTC (rev 1199) +++ pal-wcm/trunk/src/main/webapp/WEB-INF/view/editor/error.jsp 2008-10-08 05:43:43 UTC (rev 1200) @@ -6,6 +6,6 @@
-Back + Modified: pal-wcm/trunk/src/main/webapp/WEB-INF/view/editor/index.jsp =================================================================== --- pal-wcm/trunk/src/main/webapp/WEB-INF/view/editor/index.jsp 2008-10-01 09:18:31 UTC (rev 1199) +++ pal-wcm/trunk/src/main/webapp/WEB-INF/view/editor/index.jsp 2008-10-08 05:43:43 UTC (rev 1200) @@ -1,9 +1,9 @@ <%@page pageEncoding="UTF-8" %>
- Path: - - + + "/> + "/>
@@ -20,9 +20,9 @@ - - - + + + Modified: pal-wcm/trunk/src/main/webapp/WEB-INF/view/editor/prefs.jsp =================================================================== --- pal-wcm/trunk/src/main/webapp/WEB-INF/view/editor/prefs.jsp 2008-10-01 09:18:31 UTC (rev 1199) +++ pal-wcm/trunk/src/main/webapp/WEB-INF/view/editor/prefs.jsp 2008-10-08 05:43:43 UTC (rev 1200) @@ -8,14 +8,14 @@
- Preferences +
- Language +
@@ -28,10 +28,10 @@
- +
The format of Locale is xx_XX(ex. ja_JP). @@ -41,14 +41,14 @@
-
+
${f:h(l)}
Modified: pal-wcm/trunk/src/main/webapp/WEB-INF/view/viewer/edit.jsp =================================================================== --- pal-wcm/trunk/src/main/webapp/WEB-INF/view/viewer/edit.jsp 2008-10-01 09:18:31 UTC (rev 1199) +++ pal-wcm/trunk/src/main/webapp/WEB-INF/view/viewer/edit.jsp 2008-10-08 05:43:43 UTC (rev 1200) @@ -3,10 +3,10 @@
-
+
-

- - -

-
-

- - - - - - -

-
-

- - -

-
- -
+
NameTitleType
+ + + + + + + + + + + + + + + + + + + + + + + +
+ + - + +
+
+ +
+
"); - // VFSUtil - // .publishOutputHtml(""); - } else { - // TODO I18N - FacesMessageUtil - .addWarnMessage("The selected object is not FOLDER or FILE."); - } - } else { - // TODO I18N - FacesMessageUtil - .addWarnMessage("The selected object is not found."); - } - return null; - } - - public String delete() { - if (log.isDebugEnabled()) { - log.debug("delete()"); - } - if (!VFSUtil.checkPath(getUri())) { - // TODO i18n - FacesMessageUtil.addErrorMessage("access denied."); - setUri(VFSUtil.getDefaultUri()); - return VFSConstants.DISPLAY_FOLDER_LIST_PAGE; - } - - FacesContext context = FacesContext.getCurrentInstance(); - ExternalContext exContext = context.getExternalContext(); - Map map = exContext.getRequestMap(); - FileParameterHelper fileParam = (FileParameterHelper) map.get("item"); - if (fileParam != null) { - if (fileParam.isFolder()) { - try { - FileSystemManager fsManager = VFSUtil - .getFileSystemManager(); - FileObject fileObject = fsManager.resolveFile(fileParam - .getURI()); - - // TODO select FileSelector - int num = fileObject.delete(Selectors.SELECT_ALL); - if (num > 0) { - // TODO i18n - FacesMessageUtil.addInfoMessage("Deleted " + num - + " objects."); - } else { - // TODO i18n - FacesMessageUtil - .addErrorMessage("Failed delete action."); - } - } catch (FileSystemException e) { - // TODO i18n - FacesMessageUtil.addErrorMessage("Failed delete action."); - log.error("Failed delete action.", e); - } - } else if (fileParam.isFile()) { - try { - FileSystemManager fsManager = VFSUtil - .getFileSystemManager(); - FileObject fileObject = fsManager.resolveFile(fileParam - .getURI()); - - if (fileObject.delete()) { - // TODO i18n - FacesMessageUtil.addInfoMessage("Deleted the file: " - + fileParam.getURI()); - } else { - // TODO i18n - FacesMessageUtil - .addWarnMessage("Failed delete action."); - } - } catch (FileSystemException e) { - // TODO i18n - FacesMessageUtil.addErrorMessage("Failed delete action.", e - .toString()); - log.error("Failed delete action.", e); - } - } else { - // TODO I18N - FacesMessageUtil - .addWarnMessage("The selected object is not FOLDER or FILE."); - } - } else { - // TODO I18N - FacesMessageUtil - .addWarnMessage("The selected object is not found."); - } - return goDisplayFolderListPage(); - } - - public String go() { - if (log.isDebugEnabled()) { - log.debug("go()"); - } - if (!VFSUtil.checkPath(getUri())) { - // TODO i18n - FacesMessageUtil.addErrorMessage("access denied."); - setUri(VFSUtil.getDefaultUri()); - return VFSConstants.DISPLAY_FOLDER_LIST_PAGE; - } - - // update uri - return VFSConstants.DISPLAY_FOLDER_LIST_PAGE; - } - - public String openParent() { - if (log.isDebugEnabled()) { - log.debug("openParent()"); - } - if (!VFSUtil.checkPath(getUri())) { - // TODO i18n - FacesMessageUtil.addErrorMessage("access denied."); - setUri(VFSUtil.getDefaultUri()); - return VFSConstants.DISPLAY_FOLDER_LIST_PAGE; - } - - try { - FileSystemManager fsManager = VFSUtil.getFileSystemManager(); - FileObject currentDirectory = fsManager.resolveFile(getUri()); - FileObject parent = currentDirectory.getParent(); - if (parent != null) { - setUri(parent.getName().getURI()); - if (!VFSUtil.checkPath(getUri())) { - // TODO i18n - FacesMessageUtil.addErrorMessage("access denied."); - setUri(VFSUtil.getDefaultUri()); - return VFSConstants.DISPLAY_FOLDER_LIST_PAGE; - } - } else { - // TODO i18n - FacesMessageUtil - .addWarnMessage("The parent folder does not exist."); - } - } catch (FileSystemException e) { - // TODO i18n - FacesMessageUtil.addErrorMessage( - "Failed to open the parent directory.", e.toString()); - log.error("Failed to open the parent directory.", e); - } - - return VFSConstants.DISPLAY_FOLDER_LIST_PAGE; - } - - /** - * @return the outputHtml - */ - public String getOutputHtml() { - return VFSUtil.consumeOutputHtml(); - } -} Deleted: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/web/navigator/UploadFilePage.java =================================================================== --- vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/web/navigator/UploadFilePage.java 2008-10-24 08:00:54 UTC (rev 1236) +++ vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/web/navigator/UploadFilePage.java 2008-10-25 01:43:16 UTC (rev 1237) @@ -1,150 +0,0 @@ -/* - * Copyright 2005-2006 The Portal Application Laboratory Team. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package jp.sf.pal.vfs.web.navigator; - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; - -import jp.sf.pal.vfs.VFSConstants; -import jp.sf.pal.vfs.util.VFSUtil; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.commons.vfs.FileObject; -import org.apache.commons.vfs.FileSystemException; -import org.apache.commons.vfs.FileSystemManager; -import org.apache.myfaces.custom.fileupload.UploadedFile; -import org.seasar.framework.container.S2Container; - -import com.marevol.utils.faces.application.FacesMessageUtil; - -public class UploadFilePage extends DefaultPage { - /** - * Logger for this class - */ - private static final Log log = LogFactory.getLog(UploadFilePage.class); - - private static final int BLOCK_SIZE = 4096; - - private UploadedFile uploadedFile; - - public UploadFilePage(S2Container container) { - super(container); - } - - public String upload() { - if (!VFSUtil.checkPath(getUri())) { - // TODO i18n - FacesMessageUtil.addErrorMessage("access denied."); - setUri(VFSUtil.getDefaultUri()); - return VFSConstants.DISPLAY_FOLDER_LIST_PAGE; - } - - if (log.isDebugEnabled()) { - log.debug("upload() - start"); - log.debug("upload() - upload: getUploadedFile()=" - + getUploadedFile()); - log.debug("upload() - upload: filename=" - + getUploadedFile().getName()); - } - try { - // For Windows - String filename = getUploadedFile().getName(); - int index = filename.lastIndexOf("\\"); - if (index > 0) { - filename = filename.substring(index + 1); - } - if (log.isDebugEnabled()) { - log.debug("upload() - filename=" + filename); - } - - FileSystemManager fsManager = VFSUtil.getFileSystemManager(); - FileObject newFileObject = fsManager.resolveFile(getUri() + "/" - + filename); - // TODO add confirmation - if (newFileObject.exists()) { - // TODO I18N - FacesMessageUtil - .addWarnMessage(filename - + " exists. You need to delete it before uploading it. "); - return goDisplayFolderListPage(); - } - // TODO should catch exception to check if it's created - newFileObject.createFile(); - newFileObject.getContent().close(); - drain(getUploadedFile().getInputStream(), newFileObject - .getContent().getOutputStream()); - - // TODO I18N - FacesMessageUtil.addInfoMessage("Uploaded file: " + filename); - - setUploadedFile(null); - - if (log.isDebugEnabled()) { - log.debug("upload() - end"); - } - return goDisplayFolderListPage(); - } catch (FileSystemException e) { - // TODO I18N - FacesMessageUtil.addErrorMessage("Failed to update the file.", e - .toString()); - log.error("Failed to update the file.", e); - } catch (IOException e) { - // TODO I18N - FacesMessageUtil.addErrorMessage("Failed to update the file.", e - .toString()); - log.error("Failed to update the file.", e); - } - - if (log.isDebugEnabled()) { - log.debug("upload() - end"); - } - return null; - } - - private void drain(InputStream r, OutputStream w) throws IOException { - byte[] bytes = new byte[BLOCK_SIZE]; - try { - int length = r.read(bytes); - while (length != -1) { - if (length != 0) { - w.write(bytes, 0, length); - w.flush(); - } - length = r.read(bytes); - } - } finally { - bytes = null; - } - } - - /** - * @return Returns the uploadedFile. - */ - public UploadedFile getUploadedFile() { - return uploadedFile; - } - - /** - * @param uploadedFile - * The uploadedFile to set. - */ - public void setUploadedFile(UploadedFile uploadedFile) { - this.uploadedFile = uploadedFile; - } - -} Deleted: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/web/navigator/WriteNewFileContentPage.java =================================================================== --- vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/web/navigator/WriteNewFileContentPage.java 2008-10-24 08:00:54 UTC (rev 1236) +++ vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/web/navigator/WriteNewFileContentPage.java 2008-10-25 01:43:16 UTC (rev 1237) @@ -1,142 +0,0 @@ -/* - * Copyright 2005-2006 The Portal Application Laboratory Team. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - * either express or implied. See the License for the specific language - * governing permissions and limitations under the License. - */ -package jp.sf.pal.vfs.web.navigator; - -import java.io.IOException; -import java.io.OutputStreamWriter; -import java.io.UnsupportedEncodingException; -import java.io.Writer; -import java.util.Map; - -import javax.faces.context.FacesContext; - -import jp.sf.pal.vfs.VFSConstants; -import jp.sf.pal.vfs.util.VFSUtil; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.commons.vfs.FileObject; -import org.apache.commons.vfs.FileSystemException; -import org.apache.commons.vfs.FileSystemManager; -import org.seasar.framework.container.S2Container; - -import com.marevol.utils.faces.application.FacesMessageUtil; - -public class WriteNewFileContentPage extends DefaultPage { - /** - * Logger for this class - */ - private static final Log log = LogFactory - .getLog(WriteNewFileContentPage.class); - - private String text; - - public WriteNewFileContentPage(S2Container container) { - super(container); - } - - public String create() { - if (!VFSUtil.checkPath(getUri())) { - // TODO i18n - FacesMessageUtil.addErrorMessage("access denied."); - setUri(VFSUtil.getDefaultUri()); - return VFSConstants.DISPLAY_FOLDER_LIST_PAGE; - } - - if (log.isDebugEnabled()) { - log.debug("create() text=" + getText()); - } - - try { - FileSystemManager fsManager = VFSUtil.getFileSystemManager(); - FileObject newFileObject = fsManager.resolveFile(getUri() + "/" - + getNewFile()); - - // TODO add confirmation - // if (!newFileObject.exists()) - // { - // TODO should catch exception to check if it's created - newFileObject.createFile(); - Writer writer = null; - try { - writer = new OutputStreamWriter(newFileObject.getContent() - .getOutputStream(), "UTF-8"); - writer.write(getText()); - writer.flush(); - } catch (UnsupportedEncodingException e) { - log.warn("Wrong encoding."); - // TODO I18N - FacesMessageUtil.addWarnMessage("Wrong encoding."); - } catch (IOException e) { - log.warn("Cannot write the content."); - // TODO I18N - FacesMessageUtil.addWarnMessage("Cannot write the content."); - } finally { - if (writer != null) { - try { - writer.close(); - } catch (IOException e) { - } - } - } - - // TODO I18N - FacesMessageUtil - .addInfoMessage("Created new file: " + getNewFile()); - return goDisplayFolderListPage(); - // } - } catch (FileSystemException e) { - // TODO I18N - FacesMessageUtil.addInfoMessage("Failed to create the new file: " - + getNewFile(), e.toString()); - log.error("Failed to create the new file: " + getNewFile(), e); - } - return null; - } - - /** - * @return Returns the newFile. - */ - public String getNewFile() { - Map sessionMap = FacesContext.getCurrentInstance().getExternalContext() - .getSessionMap(); - return (String) sessionMap.get(VFSConstants.NEW_FILE_CONTENT_FILE_NAME); - } - - /** - * @return the type - */ - public String getType() { - Map sessionMap = FacesContext.getCurrentInstance().getExternalContext() - .getSessionMap(); - return (String) sessionMap.get(VFSConstants.NEW_FILE_CONTENT_FILE_TYPE); - } - - /** - * @return the text - */ - public String getText() { - return text; - } - - /** - * @param text - * the text to set - */ - public void setText(String text) { - this.text = text; - } -} Deleted: vfs-portlets/trunk/src/main/resources/aop.dicon =================================================================== --- vfs-portlets/trunk/src/main/resources/aop.dicon 2008-10-24 08:00:54 UTC (rev 1236) +++ vfs-portlets/trunk/src/main/resources/aop.dicon 2008-10-25 01:43:16 UTC (rev 1237) @@ -1,11 +0,0 @@ - - - - - - - \ No newline at end of file Modified: vfs-portlets/trunk/src/main/resources/app.dicon =================================================================== --- vfs-portlets/trunk/src/main/resources/app.dicon 2008-10-24 08:00:54 UTC (rev 1236) +++ vfs-portlets/trunk/src/main/resources/app.dicon 2008-10-25 01:43:16 UTC (rev 1237) @@ -1,9 +1,12 @@ - - - - - - - - + + + + + + + + + + + Added: vfs-portlets/trunk/src/main/resources/application.properties =================================================================== --- vfs-portlets/trunk/src/main/resources/application.properties (rev 0) +++ vfs-portlets/trunk/src/main/resources/application.properties 2008-10-25 01:43:16 UTC (rev 1237) @@ -0,0 +1,42 @@ +errors.header=
    +errors.footer=
+errors.prefix=
  • +errors.suffix=
  • +msg.header=
      +msg.footer=
    + +errors.invalid={0} is invalid. +errors.maxlength={0} can not be greater than {1} characters. +errors.minlength={0} can not be less than {1} characters. +errors.maxbytelength={0} can not be greater than {1} bytes. +errors.minbytelength={0} can not be less than {1} bytes. +errors.range={0} is not in the range {1} through {2}. +errors.required={0} is required. +errors.required.other={0} is required ({1}). +errors.byte={0} must be an byte. +errors.date={0} is not a date. +errors.double={0} must be an double. +errors.float={0} must be an float. +errors.integer={0} must be an integer. +errors.long={0} must be an long. +errors.short={0} must be an short. +errors.creditcard={0} is not a valid credit card number. +errors.email={0} is an invalid e-mail address. +errors.url={0} is an invalid url (web address). + +errors.access_denied=Access denied. +errors.file_system_error=The file system error occurs. +errors.failed_to_create_folder=Failed to create a new folder. +errors.invalid_access=Invalid access. +errors.file_exist={0} exists. Please delete it before uploading it. +errors.failed_to_upload_file=Failed to upload a file. +errors.file_not_found={0} is not found. +errors.invalid_user=Invalid access from an unknown user. +errors.failed_to_delete_folder=Failed to delete the folder. +errors.failed_to_delete_file=Failed to delete the file. +errors.unknow_object={0} is an unknown object. + +success.create_folder=Created a new folder. +success.upload_file=Upload the file. +success.delete_folder=Deleted the folder. +success.delete_file=Deleted the file. Property changes on: vfs-portlets/trunk/src/main/resources/application.properties ___________________________________________________________________ Name: svn:eol-style + native Modified: vfs-portlets/trunk/src/main/resources/convention.dicon =================================================================== --- vfs-portlets/trunk/src/main/resources/convention.dicon 2008-10-24 08:00:54 UTC (rev 1236) +++ vfs-portlets/trunk/src/main/resources/convention.dicon 2008-10-25 01:43:16 UTC (rev 1237) @@ -1,13 +1,13 @@ - - - - - - "jp.sf.pal.vfs" - - "/view" - ".jsp" - - + + + + + + "jp.sf.pal.vfs" + + + "jp.sf.pal.vfs.common.util" + + + Modified: vfs-portlets/trunk/src/main/resources/creator.dicon =================================================================== --- vfs-portlets/trunk/src/main/resources/creator.dicon 2008-10-24 08:00:54 UTC (rev 1236) +++ vfs-portlets/trunk/src/main/resources/creator.dicon 2008-10-25 01:43:16 UTC (rev 1237) @@ -1,19 +1,16 @@ + "http://www.seasar.org/dtd/components24.dtd"> - - - - - - - - - - - - - - + + + + + + + + + + + Modified: vfs-portlets/trunk/src/main/resources/customizer.dicon =================================================================== --- vfs-portlets/trunk/src/main/resources/customizer.dicon 2008-10-24 08:00:54 UTC (rev 1236) +++ vfs-portlets/trunk/src/main/resources/customizer.dicon 2008-10-25 01:43:16 UTC (rev 1237) @@ -1,65 +1,49 @@ + "http://www.seasar.org/dtd/components24.dtd"> - - "aop.classLoaderAwareTraceInterceptor" - - - "aop.classLoaderAwareTraceInterceptor" - "do.*, initialize, prerender" - - - "app_aop.actionSupportInterceptor" - "do.*, initialize, prerender" - + + + + + "aop.traceInterceptor" + + + "actionMessagesThrowsInterceptor" + + + + + + + + + + + + + + + + + + + "aop.traceInterceptor" + + + + + + + - - - commandAspectCustomizer - - - actionSupportAspectCustomizer - - - - - defaultCustomizer - - - - - - - defaultCustomizer - - - - - defaultCustomizer - - - - - defaultCustomizer - - - - - defaultCustomizer - - - - - defaultCustomizer - - - - - - - - - - - \ No newline at end of file + + + + Modified: vfs-portlets/trunk/src/main/resources/env.txt =================================================================== --- vfs-portlets/trunk/src/main/resources/env.txt 2008-10-24 08:00:54 UTC (rev 1236) +++ vfs-portlets/trunk/src/main/resources/env.txt 2008-10-25 01:43:16 UTC (rev 1237) @@ -1 +1 @@ -ut +product Added: vfs-portlets/trunk/src/main/resources/env_ut.txt =================================================================== --- vfs-portlets/trunk/src/main/resources/env_ut.txt (rev 0) +++ vfs-portlets/trunk/src/main/resources/env_ut.txt 2008-10-25 01:43:16 UTC (rev 1237) @@ -0,0 +1 @@ +ut \ No newline at end of file Property changes on: vfs-portlets/trunk/src/main/resources/env_ut.txt ___________________________________________________________________ Name: svn:eol-style + native Added: vfs-portlets/trunk/src/main/resources/jdbc.dicon =================================================================== --- vfs-portlets/trunk/src/main/resources/jdbc.dicon (rev 0) +++ vfs-portlets/trunk/src/main/resources/jdbc.dicon 2008-10-25 01:43:16 UTC (rev 1237) @@ -0,0 +1,171 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Deleted: vfs-portlets/trunk/src/main/resources/jp/sf/pal/vfs/VFS.dicon =================================================================== --- vfs-portlets/trunk/src/main/resources/jp/sf/pal/vfs/VFS.dicon 2008-10-24 08:00:54 UTC (rev 1236) +++ vfs-portlets/trunk/src/main/resources/jp/sf/pal/vfs/VFS.dicon 2008-10-25 01:43:16 UTC (rev 1237) @@ -1,7 +0,0 @@ - - - - - - - Modified: vfs-portlets/trunk/src/main/resources/s2container.dicon =================================================================== --- vfs-portlets/trunk/src/main/resources/s2container.dicon 2008-10-24 08:00:54 UTC (rev 1236) +++ vfs-portlets/trunk/src/main/resources/s2container.dicon 2008-10-25 01:43:16 UTC (rev 1237) @@ -1,8 +1,8 @@ - + - - - - + + + + \ No newline at end of file Deleted: vfs-portlets/trunk/src/main/resources/teedaCustomize.dicon =================================================================== --- vfs-portlets/trunk/src/main/resources/teedaCustomize.dicon 2008-10-24 08:00:54 UTC (rev 1236) +++ vfs-portlets/trunk/src/main/resources/teedaCustomize.dicon 2008-10-25 01:43:16 UTC (rev 1237) @@ -1,10 +0,0 @@ - - - - - - - Deleted: vfs-portlets/trunk/src/main/resources/teedaErrorPage.dicon =================================================================== --- vfs-portlets/trunk/src/main/resources/teedaErrorPage.dicon 2008-10-24 08:00:54 UTC (rev 1236) +++ vfs-portlets/trunk/src/main/resources/teedaErrorPage.dicon 2008-10-25 01:43:16 UTC (rev 1237) @@ -1,14 +0,0 @@ - - - - - - - - Added: vfs-portlets/trunk/src/main/resources/vfs.dicon =================================================================== --- vfs-portlets/trunk/src/main/resources/vfs.dicon (rev 0) +++ vfs-portlets/trunk/src/main/resources/vfs.dicon 2008-10-25 01:43:16 UTC (rev 1237) @@ -0,0 +1,7 @@ + + + + + + + Deleted: vfs-portlets/trunk/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- vfs-portlets/trunk/src/main/webapp/WEB-INF/faces-config.xml 2008-10-24 08:00:54 UTC (rev 1236) +++ vfs-portlets/trunk/src/main/webapp/WEB-INF/faces-config.xml 2008-10-25 01:43:16 UTC (rev 1237) @@ -1,48 +0,0 @@ - - - - - - en - ja - - - - - * - - DISPLAY_FOLDER_LIST_PAGE - /view/navigator/displayFolderList.jsp - - - - * - - CREATE_NEW_FILE_PAGE - /view/navigator/createNewFile.jsp - - - - * - - CREATE_NEW_FOLDER_PAGE - /view/navigator/createNewFolder.jsp - - - - * - - WRITE_NEW_FILE_CONTENT_PAGE - /view/navigator/writeNewFileContent.jsp - - - - * - - UPLOAD_FILE_PAGE - /view/navigator/uploadFile.jsp - - - - - Modified: vfs-portlets/trunk/src/main/webapp/WEB-INF/portlet.xml =================================================================== --- vfs-portlets/trunk/src/main/webapp/WEB-INF/portlet.xml 2008-10-24 08:00:54 UTC (rev 1236) +++ vfs-portlets/trunk/src/main/webapp/WEB-INF/portlet.xml 2008-10-25 01:43:16 UTC (rev 1237) @@ -1,68 +1,48 @@ - + - VFS Navigator - VFSNavigator - VFS Navigator - org.apache.portals.bridges.portletfilter.FilterPortlet + Display a file system. + VFSPortlet + VFS: Explorer + org.seasar.struts.portlet.SAStrutsPortlet - portlet-class - jp.sf.pal.vfs.portlets.VFSPortlet + viewPage + /list/ - portlet-filters - jp.sf.pal.facesresponse.FacesResponseFilter,org.seasar.portlet.filter.S2PortletFilter,org.seasar.portlet.filter.HotdeployPortletFilter,jp.sf.pal.tomahawk.filter.ExtensionsPortletFilter + scope + default - - view-page - /view/navigator/displayFolderList.jsp - - - default-uri - file:// - - - accept-paths - .* - - - render-create-new-file - true - - - render-create-new-folder - true - - - render-upload-file - true - + 0 text/html VIEW - + en + ja - VFS Navigator - VFS + VFS Explorer + Explorer + VFS,Explorer + Added: vfs-portlets/trunk/src/main/webapp/WEB-INF/struts-config.xml =================================================================== --- vfs-portlets/trunk/src/main/webapp/WEB-INF/struts-config.xml (rev 0) +++ vfs-portlets/trunk/src/main/webapp/WEB-INF/struts-config.xml 2008-10-25 01:43:16 UTC (rev 1237) @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Property changes on: vfs-portlets/trunk/src/main/webapp/WEB-INF/struts-config.xml ___________________________________________________________________ Name: svn:eol-style + native Added: vfs-portlets/trunk/src/main/webapp/WEB-INF/validator-rules.xml =================================================================== --- vfs-portlets/trunk/src/main/webapp/WEB-INF/validator-rules.xml (rev 0) +++ vfs-portlets/trunk/src/main/webapp/WEB-INF/validator-rules.xml 2008-10-25 01:43:16 UTC (rev 1237) @@ -0,0 +1,352 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Property changes on: vfs-portlets/trunk/src/main/webapp/WEB-INF/validator-rules.xml ___________________________________________________________________ Name: svn:eol-style + native Added: vfs-portlets/trunk/src/main/webapp/WEB-INF/vfs.xml =================================================================== --- vfs-portlets/trunk/src/main/webapp/WEB-INF/vfs.xml (rev 0) +++ vfs-portlets/trunk/src/main/webapp/WEB-INF/vfs.xml 2008-10-25 01:43:16 UTC (rev 1237) @@ -0,0 +1,3 @@ + + + Property changes on: vfs-portlets/trunk/src/main/webapp/WEB-INF/vfs.xml ___________________________________________________________________ Name: svn:eol-style + native Added: vfs-portlets/trunk/src/main/webapp/WEB-INF/view/common/common.jsp =================================================================== --- vfs-portlets/trunk/src/main/webapp/WEB-INF/view/common/common.jsp (rev 0) +++ vfs-portlets/trunk/src/main/webapp/WEB-INF/view/common/common.jsp 2008-10-25 01:43:16 UTC (rev 1237) @@ -0,0 +1,8 @@ +<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@taglib prefix="html" uri="http://struts.apache.org/tags-html"%> +<%@taglib prefix="bean" uri="http://struts.apache.org/tags-bean"%> +<%@taglib prefix="tiles" uri="http://jakarta.apache.org/struts/tags-tiles"%> +<%@taglib prefix="f" uri="http://sastruts.seasar.org/functions"%> +<%@taglib prefix="s" uri="http://sastruts.seasar.org/portlet"%> Property changes on: vfs-portlets/trunk/src/main/webapp/WEB-INF/view/common/common.jsp ___________________________________________________________________ Name: svn:eol-style + native Added: vfs-portlets/trunk/src/main/webapp/WEB-INF/view/list/downloadError.jsp =================================================================== --- vfs-portlets/trunk/src/main/webapp/WEB-INF/view/list/downloadError.jsp (rev 0) +++ vfs-portlets/trunk/src/main/webapp/WEB-INF/view/list/downloadError.jsp 2008-10-25 01:43:16 UTC (rev 1237) @@ -0,0 +1,9 @@ +<%@page pageEncoding="UTF-8" %> + + + + + + + + Property changes on: vfs-portlets/trunk/src/main/webapp/WEB-INF/view/list/downloadError.jsp ___________________________________________________________________ Name: svn:eol-style + native Added: vfs-portlets/trunk/src/main/webapp/WEB-INF/view/list/error.jsp =================================================================== --- vfs-portlets/trunk/src/main/webapp/WEB-INF/view/list/error.jsp (rev 0) +++ vfs-portlets/trunk/src/main/webapp/WEB-INF/view/list/error.jsp 2008-10-25 01:43:16 UTC (rev 1237) @@ -0,0 +1,11 @@ +<%@page pageEncoding="UTF-8" %> + + + + + + +
    +Back + + Property changes on: vfs-portlets/trunk/src/main/webapp/WEB-INF/view/list/error.jsp ___________________________________________________________________ Name: svn:eol-style + native Added: vfs-portlets/trunk/src/main/webapp/WEB-INF/view/list/index.jsp =================================================================== --- vfs-portlets/trunk/src/main/webapp/WEB-INF/view/list/index.jsp (rev 0) +++ vfs-portlets/trunk/src/main/webapp/WEB-INF/view/list/index.jsp 2008-10-25 01:43:16 UTC (rev 1237) @@ -0,0 +1,59 @@ +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8" %> + + + + + + +
    + +
    + +
    +Create New Folder +| +Upload File +
    +
    + +Path: + +
    +
    + + + + + + + + + + + + + + + + + + + +
    File NameSizeLast Updated 
    + + ${f:h(f.baseName)} + + + ${f:h(f.baseName)} + + ${f:h(f.formattedSize)} +  +K +M +G + ${f:h(f.formattedLastModifiedTime)}Delete
    +
    +
    + + + Property changes on: vfs-portlets/trunk/src/main/webapp/WEB-INF/view/list/index.jsp ___________________________________________________________________ Name: svn:eol-style + native Added: vfs-portlets/trunk/src/main/webapp/WEB-INF/view/newfolder/confirm.jsp =================================================================== --- vfs-portlets/trunk/src/main/webapp/WEB-INF/view/newfolder/confirm.jsp (rev 0) +++ vfs-portlets/trunk/src/main/webapp/WEB-INF/view/newfolder/confirm.jsp 2008-10-25 01:43:16 UTC (rev 1237) @@ -0,0 +1,38 @@ +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8" %> + + + + + + +
    +
    +
    + + + + + + + + + + + + + + + + + + + +
    Create Folder
    Path${f:h(uri)}
    Folder Name${f:h(name)}
    + + +
    +
    +
    +
    + + Property changes on: vfs-portlets/trunk/src/main/webapp/WEB-INF/view/newfolder/confirm.jsp ___________________________________________________________________ Name: svn:eol-style + native Added: vfs-portlets/trunk/src/main/webapp/WEB-INF/view/newfolder/edit.jsp =================================================================== --- vfs-portlets/trunk/src/main/webapp/WEB-INF/view/newfolder/edit.jsp (rev 0) +++ vfs-portlets/trunk/src/main/webapp/WEB-INF/view/newfolder/edit.jsp 2008-10-25 01:43:16 UTC (rev 1237) @@ -0,0 +1,45 @@ +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8" %> + + + + + + +
    +
    + +
    +List +| +Upload File +
    + +
    + + + + + + + + + + + + + + + + + + + +
    Create Folder
    Target Path${f:h(uri)}
    Folder Name
    + + +
    +
    +
    +
    + + Property changes on: vfs-portlets/trunk/src/main/webapp/WEB-INF/view/newfolder/edit.jsp ___________________________________________________________________ Name: svn:eol-style + native Added: vfs-portlets/trunk/src/main/webapp/WEB-INF/view/newfolder/error.jsp =================================================================== --- vfs-portlets/trunk/src/main/webapp/WEB-INF/view/newfolder/error.jsp (rev 0) +++ vfs-portlets/trunk/src/main/webapp/WEB-INF/view/newfolder/error.jsp 2008-10-25 01:43:16 UTC (rev 1237) @@ -0,0 +1,11 @@ +<%@page pageEncoding="UTF-8" %> + + + + + + +
    +Back + + Property changes on: vfs-portlets/trunk/src/main/webapp/WEB-INF/view/newfolder/error.jsp ___________________________________________________________________ Name: svn:eol-style + native Added: vfs-portlets/trunk/src/main/webapp/WEB-INF/view/upload/edit.jsp =================================================================== --- vfs-portlets/trunk/src/main/webapp/WEB-INF/view/upload/edit.jsp (rev 0) +++ vfs-portlets/trunk/src/main/webapp/WEB-INF/view/upload/edit.jsp 2008-10-25 01:43:16 UTC (rev 1237) @@ -0,0 +1,45 @@ +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8" %> + + + + + + +
    +
    + +
    +List +| +Create Folder +
    + +
    + + + + + + + + + + + + + + + + + + + +
    Upload File
    Target Path${f:h(uri)}
    Uploaded File
    + + +
    +
    +
    +
    + + Property changes on: vfs-portlets/trunk/src/main/webapp/WEB-INF/view/upload/edit.jsp ___________________________________________________________________ Name: svn:eol-style + native Added: vfs-portlets/trunk/src/main/webapp/WEB-INF/view/upload/error.jsp =================================================================== --- vfs-portlets/trunk/src/main/webapp/WEB-INF/view/upload/error.jsp (rev 0) +++ vfs-portlets/trunk/src/main/webapp/WEB-INF/view/upload/error.jsp 2008-10-25 01:43:16 UTC (rev 1237) @@ -0,0 +1,11 @@ +<%@page pageEncoding="UTF-8" %> + + + + + + +
    +Back + + Property changes on: vfs-portlets/trunk/src/main/webapp/WEB-INF/view/upload/error.jsp ___________________________________________________________________ Name: svn:eol-style + native Modified: vfs-portlets/trunk/src/main/webapp/WEB-INF/web.xml =================================================================== --- vfs-portlets/trunk/src/main/webapp/WEB-INF/web.xml 2008-10-24 08:00:54 UTC (rev 1236) +++ vfs-portlets/trunk/src/main/webapp/WEB-INF/web.xml 2008-10-25 01:43:16 UTC (rev 1237) @@ -1,32 +1,26 @@ - + - - + VFS Portlet - VFS Portlet + Display a file system as VFS. - javax.faces.DEFAULT_SUFFIX - .jsp + sastruts.VIEW_PREFIX + /WEB-INF/view - - javax.faces.STATE_SAVING_METHOD - server - - encodingfilter org.seasar.extension.filter.EncodingFilter @@ -36,1306 +30,152 @@ - MyFacesExtensionsFilter - org.apache.myfaces.webapp.filter.ExtensionsFilter - - maxFileSize - 20m - - Set the size limit for uploaded files. Format: 10 - 10 bytes 10k - - 10 KB 10m - 10 MB 1g - 1 GB - - + portletRequestFilter + org.seasar.struts.portlet.filter.PortletRequestFilter - s2filter - org.seasar.framework.container.filter.S2ContainerFilter + org.seasar.struts.portlet.filter.S2ContainerFilter hotdeployfilter - org.seasar.framework.container.hotdeploy.HotdeployFilter + org.seasar.struts.portlet.filter.HotdeployFilter - + + routingfilter + org.seasar.struts.filter.RoutingFilter + + jspDirectAccess + false + + + + portletRoutingfilter + org.seasar.struts.portlet.filter.PortletRoutingFilter + + jspDirectAccess + false + + + + securityConstraintFilter + jp.sf.pal.vfs.common.filter.SecurityConstraintFilter + + acceptUrlPaths + /list/download/.* + + encodingfilter /* - - MyFacesExtensionsFilter - - Faces Servlet + securityConstraintFilter + /* - s2filter /* + REQUEST + FORWARD + INCLUDE hotdeployfilter /* - + INCLUDE - - MyFacesExtensionsFilter - /faces/myFacesExtensionResource/* + routingfilter + /* + REQUEST - - - org.seasar.teeda.core.webapp.TeedaPortletExtendedConfigureListener - - - + + portletRoutingfilter + /* + INCLUDE + + + requestDumpFilter + *.do + REQUEST + FORWARD + INCLUDE + - Faces Servlet - javax.faces.webapp.FacesServlet + action + org.seasar.struts.portlet.servlet.ActionServlet + + config + /WEB-INF/struts-config.xml + + + configFactory + org.seasar.struts.config.S2ModuleConfigFactory + + 1 + + + s2container + org.seasar.framework.container.servlet.S2ContainerServlet 2 + + END: J2 --> - Faces Servlet - /faces/* + action + *.do - VFSFile - /FileServlet/* + s2container + /s2container - - - 123 - application/vnd.lotus-1-2-3 - - - 3g2 - video/3gpp2 - - - 3gp - video/3gpp - - - ai - application/postscript - - - aif - audio/x-aiff - - - aifc - audio/x-aiff - - - aiff - audio/x-aiff - - - album - application/album - - - amc - application/x-mpeg - - - api - application/x-httpd-isapi - - - asc - text/plain - - - asd - application/astound - - - asf - video/x-ms-asf - - - asis - httpd/send-as-is - - - asn - application/astound - - - asp - application/x-asap - - - asx - video/x-ms-asf - - - au - audio/basic - - - avi - video/x-msvideo - - - bcpio - application/x-bcpio - - - bin - application/octet-stream - - - bmp - image/bmp - - - cco - application/x-cocoa - - - cct - application/x-cct - - - cdf - application/x-netcdf - - - cgi - application/x-httpd-cgi - - - class - application/octet-stream - - - clp - application/x-msclip - - - cocoa - application/x-cocoa - - - com - application/octet-stream - - - cpio - application/x-cpio - - - cpt - application/mac-compactpro - - - crd - application/x-mscardfile - - - csh - application/x-csh - - - csm - chemical/x-csml - - - csml - chemical/x-csml - - - css - text/css - - - d96 - x-world/x-d96 - - - dcr - application/x-director - - - dir - application/x-director - - - dl - application/x-WebSync-plugin - - - dms - application/octet-stream - - - doc - application/msword - - - dot - application/x-dot - - - dvi - application/x-dvi - - - dwf - drawing/x-dwf - - - dwg - image/vnd - - - dxr - application/x-director - - - ebk - application/x-expandedbook - - - emb - chemical/x-embl-dl-nucleotide - - - embl - chemical/x-embl-dl-nucleotide - - - eps - application/postscript - - - es - audio/echospeech - - - esl - audio/echospeech - - - etc - application/x-earthtime - - - etx - text/x-setext - - - evy - application/x-envoy - - - exe - application/octet-stream - - - ez - application/andrew-inset - - - fdf - application/vnd - - - fgd - application/x-director - - - fif - image/fif - - - fm - application/x-maker - - - fvi - video/isivideo - - - gau - chemical/x-gaussian-input - - - gif - image/gif - - - gtar - application/x-gtar - - - gz - application/octet-stream - - - hdf - application/x-hdf - - - hdml - text/x-hdml;charset=Shift_JIS - - - hlp - application/winhlp - - - hqx - application/mac-binhex40 - - - htm - text/html - - - html - text/html - - - ice - x-conference/x-cooltalk - - - ief - image/ief - - - ifm - image/gif - - - ifs - image/ifs - - - iges - model/iges - - - igs - model/iges - - - ins - application/x-NET-Install - - - ips - application/x-ipscript - - - ipx - application/x-ipix - - - ivr - i-world/i-vrml - - - jbw - application/x-js-taro - - - jfw - application/x-js-taro - - - jnlp - application/x-java-jnlp-file - - - jpe - image/jpeg - - - jpeg - image/jpeg - - - jpg - image/jpeg - - - js - application/x-javascript - - - jtd - application/x-js-taro - - - kar - audio/midi - - - kjx - application/x-kjx - - - latex - application/x-latex - - - lcc - application/fastman - - - lcl - application/x-digitalloca - - - lcr - application/x-digitalloca - - - lha - application/octet-stream - - - LZH - application/octet-stream - - - lzh - application/octet-stream - - - m13 - application/x-msmediaview - - - m14 - application/x-msmediaview - - - m3u - audio/x-mpegurl - - - man - application/x-troff-man - - - map - application/x-httpd-imap - - - mbd - application/mbedlet - - - mcf - text/mcf - - - mcp - application/netmc - - - mct - application/x-mascot - - - mdb - application/x-msaccess - - - mdc - application/x-mediadesc - - - mdx - application/x-mediadesc - - - me - application/x-troff-me - - - mesh - model/mesh - - - MID - audio/midi - - - mid - audio/midi - - - midi - audio/midi - - - mif - application/vnd.mif - - - mio - audio/x-mio - - - mmf - application/x-smaf - - - mng - video/x-mng - - - mny - application/x-msmoney - - - mocha - application/x-mocha - - - mof - application/x-yumekara - - - mol - chemical/x-mdl-molfile - - - mop - chemical/x-mopac-input - - - mov - video/quicktime - - - movie - video/x-sgi-movie - - - mp2 - audio/mpeg - - - mp3 - audio/mpeg - - - mp4 - video/mp4 - - - mpe - video/mpeg - - - mpeg - video/mpeg - - - mpg - video/mpeg - - - mpg4 - video/mp4 - - - mpga - audio/mpeg - - - mpp - application/vnd.ms-project - - - mrl - text/x-mrml - - - ms - application/x-troff-ms - - - msh - model/mesh - - - mus - x-world/x-d96 - - - nc - application/x-netcdf - - - nm - application/x-nvat - - - nva - application/x-neva1 - - - nvat - application/x-nvat - - - oda - application/oda - - - oke - audio/karaoke - - - olh - application/x-onlivehead - - - olr - application/x-onlivereg - - - olv - x-world/x-vrml1.0 - - - pac - audio/x-pac - - - pae - audio/x-epac - - - pbm - image/x-portable-bitmap - - - pcv - application/x-pcnavi - - - pdb - chemical/x-pdb - - - pdf - application/pdf - - - pfr - application/font-tdpfr - - - pgm - image/x-portable-graymap - - - pgn - application/x-chess-pgn - - - pmd - application/x-pmd - - - png - image/png - - - pnm - image/x-portable-anymap - - - pot - application/vnd.ms-powerpoint - - - ppm - image/x-portable-pixmap - - - pps - application/vnd.ms-powerpoint - - - ppt - application/vnd.ms-powerpoint - - - prc - application/x-palmpilot - - - ps - application/postscript - - - pub - application/x-mspublisher - - - qcp - audio/vnd.qcelp - - - qt - video/quicktime - - - ra - audio/x-realaudio - - - ram - audio/x-pn-realaudio - - - ras - image/x-cmu-raster - - - rgb - image/x-rgb - - - rm - audio/x-pn-realaudio - - - roff - application/x-troff - - - rp - image/vnd.rn-realpix - - - rpm - audio/x-pn-realaudio-plugin - - - rt - text/vnd.rn-realtext - - - rtf - text/rtf - - - rtx - text/richtext - - - rv - video/vnd.rn-realvideo - - - rxnfile - chemical/x-mdl-rxnfile - - - scd - application/x-msschedule - - - sds - application/x-onlive - - - sea - application/octet-stream - - - sgm - text/sgml - - - sgml - text/sgml - - - sh - application/x-sh - - - shar - application/x-shar - - - shtml - text/x-server-parsed-html - - - silo - model/mesh - - - sit - application/x-stuffit - - - skd - application/x-koan - - - skm - application/x-koan - - - skp - application/x-koan - - - skt - application/x-koan - - - slc - application/x-salsa - - - smi - application/smil - - - smil - application/smil - - - smp - application/studiom - - - snd - audio/basic - - - spl - application/x-futuresplash - - - sprite - application/x-sprite - - - spt - application/x-spt - - - src - application/x-wais-source - - - sv4cpio - application/x-sv4cpio - - - sv4crc - application/x-sv4crc - - - svf - image/vnd - - - svi - application/softvision - - - svr - x-world/x-svr - - - swf - application/x-shockwave-flash - - - t - application/x-troff - - - talk - text/x-speech - - - tar - application/x-tar - - - tbp - application/x-timbuktu - - - tbt - application/timbuktu - - - tcl - application/x-tcl - - - tex - application/x-tex - - - texinfo - application/x-texinfo - - - tgf - chemical/x-mdl-tgf - - - tif - image/tiff - - - tiff - image/tiff - - - tki - application/x-tkined - - - tkined - application/x-tkined - - - tlk - application/x-tlk - - - tr - application/x-troff - - - trm - application/x-msterminal - - - tsp - application/dsptype - - - tsv - text/tab-separated-values - - - ttz - application/t-time - - - txt - text/plain - - - ustar - application/x-ustar - - - vcd - application/x-cdlink - - - vdo - video/vdo - - - vex - application/x-yumekara - - - vgm - video/x-videogram - - - vgp - video/x-videogram-plugin - - - vgx - video/x-videogram - - - vif - video/x-vif - - - viv - video/vnd.vivo - - - vivo - video/vnd.vivo - - - vqe - audio/x-twinvq-plugin - - - vqf - audio/x-twinvq - - - vql - audio/x-twinvq - - - vrml - model/vrml - - - vrt - x-world/x-vrt - - - wav - audio/x-wav - - - wax - audio/x-ms-wax - - - wbmp - image/vnd.wap.wbmp - - - wbxml - application/vnd.wap.wbxml - - - wfp - application/wfphelpap - - - wi - image/wavelet - - - wk1 - application/vnd.lotus-1-2-3 - - - wk3 - application/vnd.lotus-1-2-3 - - - wk4 - application/vnd.lotus-1-2-3 - - - wm - video/x-ms-wm - - - wma - audio/x-ms-wma - - - wmd - video/x-ms-wmd - - - wmf - application/x-msmetafile - - - wml - text/vnd.wap.wml;charset=Shift_JIS - - - wmlc - application/vnd.wap.wmlc - - - wmls - text/vnd.wap.wmlscript - - - wmlsc - application/vnd.wap.wmlscriptc - - - wmv - video/x-ms-wmv - - - wmx - video/x-ms-wmx - - - wmz - video/x-ms-wmz - - - wri - application/x-mswrite - - - wrl - model/vrml - - - ws2 - application/x-WebSync2-Plugin - - - wse - application/x-WebSync-plugin - - - wss - application/x-WebSync-plugin - - - wv - video/wavelet - - - wvh - video/x-webview-h - - - wvp - video/x-webview-p - - - wvx - video/x-ms-wvx - - - xbd - application/vnd.fujixerox.docuworks.binder - - - xbm - image/x-xbitmap - - - xdm - application/x-xdma - - - xdw - application/vnd.fujixerox.docuworks - - - xhm - application/xhtml+xml - - - xht - application/xhtml+xml - - - xhtm - application/xhtml+xml - - - xhtml - application/xhtml+xml - - - xla - application/vnd.ms-excel - - - xlc - application/vnd.ms-excel - - - xll - application/x-excel - - - xlm - application/vnd.ms-excel - - - xls - application/vnd.ms-excel - - - xlt - application/vnd.ms-excel - - - xlw - application/vnd.ms-excel - - - XML - text/xml - - - xml - text/xml - - - xpm - image/x-xpixmap - - - xsl - text/xml - - - xwd - image/x-xwindowdump - - - xyz - chemical/x-xyz - - - Z - application/octet-stream - - - zac - application/x-zaurus-zac - - - zip - application/zip - - + - index.jsf - index.jsp index.html + index.htm + index.jsp + + + + *.jsp + false + UTF-8 + false + /WEB-INF/view/common/common.jsp + + Deleted: vfs-portlets/trunk/src/main/webapp/view/navigator/createNewFile.jsp =================================================================== --- vfs-portlets/trunk/src/main/webapp/view/navigator/createNewFile.jsp 2008-10-24 08:00:54 UTC (rev 1236) +++ vfs-portlets/trunk/src/main/webapp/view/navigator/createNewFile.jsp 2008-10-25 01:43:16 UTC (rev 1237) @@ -1,52 +0,0 @@ -<%@ page contentType="text/html; charset=UTF-8"%> -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Deleted: vfs-portlets/trunk/src/main/webapp/view/navigator/createNewFolder.jsp =================================================================== --- vfs-portlets/trunk/src/main/webapp/view/navigator/createNewFolder.jsp 2008-10-24 08:00:54 UTC (rev 1236) +++ vfs-portlets/trunk/src/main/webapp/view/navigator/createNewFolder.jsp 2008-10-25 01:43:16 UTC (rev 1237) @@ -1,57 +0,0 @@ -<%@ page contentType="text/html; charset=UTF-8"%> -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    -
    - -
    - Deleted: vfs-portlets/trunk/src/main/webapp/view/navigator/displayFolderList.jsp =================================================================== --- vfs-portlets/trunk/src/main/webapp/view/navigator/displayFolderList.jsp 2008-10-24 08:00:54 UTC (rev 1236) +++ vfs-portlets/trunk/src/main/webapp/view/navigator/displayFolderList.jsp 2008-10-25 01:43:16 UTC (rev 1237) @@ -1,93 +0,0 @@ -<%@ page contentType="text/html; charset=UTF-8"%> -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Deleted: vfs-portlets/trunk/src/main/webapp/view/navigator/uploadFile.jsp =================================================================== --- vfs-portlets/trunk/src/main/webapp/view/navigator/uploadFile.jsp 2008-10-24 08:00:54 UTC (rev 1236) +++ vfs-portlets/trunk/src/main/webapp/view/navigator/uploadFile.jsp 2008-10-25 01:43:16 UTC (rev 1237) @@ -1,56 +0,0 @@ -<%@ page contentType="text/html; charset=UTF-8"%> -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - -
    - Deleted: vfs-portlets/trunk/src/main/webapp/view/navigator/writeNewFileContent.jsp =================================================================== --- vfs-portlets/trunk/src/main/webapp/view/navigator/writeNewFileContent.jsp 2008-10-24 08:00:54 UTC (rev 1236) +++ vfs-portlets/trunk/src/main/webapp/view/navigator/writeNewFileContent.jsp 2008-10-25 01:43:16 UTC (rev 1237) @@ -1,65 +0,0 @@ -<%@ page contentType="text/html; charset=UTF-8"%> -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From svnnotify @ sourceforge.jp Sat Oct 25 10:46:02 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Sat, 25 Oct 2008 10:46:02 +0900 Subject: [pal-cvs 3504] [1238] clean up more.. Message-ID: <1224899162.178622.2879.nullmailer@users.sourceforge.jp> Revision: 1238 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1238 Author: shinsuke Date: 2008-10-25 10:46:02 +0900 (Sat, 25 Oct 2008) Log Message: ----------- clean up more.. Removed Paths: ------------- vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/portlets/ vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/servlets/ vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/web/ vfs-portlets/trunk/src/main/resources/jp/ vfs-portlets/trunk/src/main/webapp/view/ -------------- next part -------------- From svnnotify @ sourceforge.jp Sat Oct 25 22:17:40 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Sat, 25 Oct 2008 22:17:40 +0900 Subject: [pal-cvs 3505] [1239] added config tool. Message-ID: <1224940660.094931.1621.nullmailer@users.sourceforge.jp> Revision: 1239 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1239 Author: shinsuke Date: 2008-10-25 22:17:39 +0900 (Sat, 25 Oct 2008) Log Message: ----------- added config tool. Modified Paths: -------------- vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/VFSConstants.java vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/action/ListAction.java vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/form/ListForm.java vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/helper/impl/FileParameterHelperImpl.java vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/util/VFSUtil.java vfs-portlets/trunk/src/main/resources/application.properties vfs-portlets/trunk/src/main/webapp/WEB-INF/portlet.xml vfs-portlets/trunk/src/main/webapp/WEB-INF/vfs.xml vfs-portlets/trunk/src/main/webapp/WEB-INF/view/list/index.jsp Added Paths: ----------- vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/action/ConfigAction.java vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/form/ConfigForm.java vfs-portlets/trunk/src/main/webapp/WEB-INF/jetspeed-portlet.xml vfs-portlets/trunk/src/main/webapp/WEB-INF/view/config/ vfs-portlets/trunk/src/main/webapp/WEB-INF/view/config/index.jsp -------------- next part -------------- Modified: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/VFSConstants.java =================================================================== --- vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/VFSConstants.java 2008-10-25 01:46:02 UTC (rev 1238) +++ vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/VFSConstants.java 2008-10-25 13:17:39 UTC (rev 1239) @@ -13,12 +13,20 @@ public class VFSConstants { public static final String CONSTANT_PREFIX = "jp.sf.pal.vfs."; + public static final String AVAILABLE = "available"; + public static final String DEFAULT_URI = "default-uri"; public static final String ACCEPT_PATHS = "accept-paths"; public static final String DENY_PATHS = "deny-paths"; + public static final String SHOW_PATH = "show-path"; + + public static final String SHOW_CREATE_FOLDER_LINK = "show-create-folder-link"; + + public static final String SHOW_UPLOAD_LINK = "show-upload-link"; + public static final String TRUE = "true"; public static final String FALSE = "false"; Added: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/action/ConfigAction.java =================================================================== --- vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/action/ConfigAction.java (rev 0) +++ vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/action/ConfigAction.java 2008-10-25 13:17:39 UTC (rev 1239) @@ -0,0 +1,104 @@ +package jp.sf.pal.vfs.action; + +import java.io.Serializable; + +import javax.servlet.http.HttpServletRequest; + +import jp.sf.pal.vfs.VFSConstants; +import jp.sf.pal.vfs.common.util.ConfigUtil; +import jp.sf.pal.vfs.common.util.SAStrutsUtil; +import jp.sf.pal.vfs.form.ConfigForm; +import jp.sf.pal.vfs.util.VFSUtil; + +import org.apache.commons.configuration.ConfigurationException; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.seasar.struts.annotation.ActionForm; +import org.seasar.struts.annotation.Execute; +import org.seasar.struts.exception.ActionMessagesException; + +public class ConfigAction implements Serializable { + + private static final long serialVersionUID = 1L; + + private static final Log log = LogFactory.getLog(ConfigAction.class); + + public String scope; + + @ActionForm + private ConfigForm configForm; + + private transient HttpServletRequest request; + + protected String displayIndex() { + scope = VFSUtil.getScope(request); + configForm.available = ConfigUtil.getString(scope + "." + + VFSConstants.AVAILABLE, "false"); + configForm.defaultUri = ConfigUtil.getString(scope + "." + + VFSConstants.DEFAULT_URI, "file:///"); + configForm.acceptPaths = ConfigUtil.getString(scope + "." + + VFSConstants.ACCEPT_PATHS, ""); + configForm.denyPaths = ConfigUtil.getString(scope + "." + + VFSConstants.DENY_PATHS, ""); + configForm.showPath = ConfigUtil.getString(scope + "." + + VFSConstants.SHOW_PATH, "true"); + configForm.showCreateFolderLink = ConfigUtil.getString(scope + "." + + VFSConstants.SHOW_CREATE_FOLDER_LINK, "true"); + configForm.showUploadLink = ConfigUtil.getString(scope + "." + + VFSConstants.SHOW_UPLOAD_LINK, "true"); + return "index.jsp"; + } + + @Execute(validator = false, input = "index.jsp") + public String index() { + ConfigUtil.init(request); + return displayIndex(); + } + + @Execute(validator = false, input = "index.jsp") + public String update() { + ConfigUtil.init(request); + String scope = VFSUtil.getScope(request); + ConfigUtil.setProperty(scope + "." + VFSConstants.AVAILABLE, + configForm.available); + ConfigUtil.setProperty(scope + "." + VFSConstants.DEFAULT_URI, + configForm.defaultUri); + ConfigUtil.setProperty(scope + "." + VFSConstants.ACCEPT_PATHS, + configForm.acceptPaths); + ConfigUtil.setProperty(scope + "." + VFSConstants.DENY_PATHS, + configForm.denyPaths); + ConfigUtil.setProperty(scope + "." + VFSConstants.SHOW_PATH, + configForm.showPath); + ConfigUtil.setProperty(scope + "." + + VFSConstants.SHOW_CREATE_FOLDER_LINK, + configForm.showCreateFolderLink); + ConfigUtil.setProperty(scope + "." + VFSConstants.SHOW_UPLOAD_LINK, + configForm.showUploadLink); + try { + ConfigUtil.save(); + SAStrutsUtil.addMessage(request, "success.update_config"); + + return displayIndex(); + } catch (ConfigurationException e) { + log.error(e.getMessage(), e); + throw new ActionMessagesException("errors.failed_to_update_config"); + } + } + + public ConfigForm getConfigForm() { + return configForm; + } + + public void setConfigForm(ConfigForm configForm) { + this.configForm = configForm; + } + + public HttpServletRequest getRequest() { + return request; + } + + public void setRequest(HttpServletRequest request) { + this.request = request; + } + +} Property changes on: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/action/ConfigAction.java ___________________________________________________________________ Name: svn:eol-style + native Modified: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/action/ListAction.java =================================================================== --- vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/action/ListAction.java 2008-10-25 01:46:02 UTC (rev 1238) +++ vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/action/ListAction.java 2008-10-25 13:17:39 UTC (rev 1239) @@ -39,6 +39,14 @@ public List fileItems; + public boolean available; + + public boolean showPath; + + public boolean showCreateFolderLink; + + public boolean showUploadLink; + @ActionForm private ListForm listForm; @@ -54,6 +62,14 @@ listForm.scope + "." + VFSConstants.USERNAME, request.getRemoteUser(), PortletSession.APPLICATION_SCOPE); fileItems = createFileItems(); + available = ConfigUtil.getBoolean(listForm.scope + "." + + VFSConstants.AVAILABLE, false); + showPath = ConfigUtil.getBoolean(listForm.scope + "." + + VFSConstants.SHOW_PATH); + showCreateFolderLink = ConfigUtil.getBoolean(listForm.scope + "." + + VFSConstants.SHOW_CREATE_FOLDER_LINK); + showUploadLink = ConfigUtil.getBoolean(listForm.scope + "." + + VFSConstants.SHOW_UPLOAD_LINK); return "index.jsp"; } Added: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/form/ConfigForm.java =================================================================== --- vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/form/ConfigForm.java (rev 0) +++ vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/form/ConfigForm.java 2008-10-25 13:17:39 UTC (rev 1239) @@ -0,0 +1,31 @@ +package jp.sf.pal.vfs.form; + +import java.io.Serializable; + +import org.seasar.struts.annotation.Required; + +public class ConfigForm implements Serializable { + + private static final long serialVersionUID = 1089309559852652620L; + + @Required(target = "update") + public String available; + + @Required(target = "update") + public String defaultUri; + + @Required(target = "update") + public String acceptPaths; + + @Required(target = "update") + public String denyPaths; + + @Required(target = "update") + public String showPath; + + @Required(target = "update") + public String showCreateFolderLink; + + @Required(target = "update") + public String showUploadLink; +} Property changes on: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/form/ConfigForm.java ___________________________________________________________________ Name: svn:eol-style + native Modified: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/form/ListForm.java =================================================================== --- vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/form/ListForm.java 2008-10-25 01:46:02 UTC (rev 1238) +++ vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/form/ListForm.java 2008-10-25 13:17:39 UTC (rev 1239) @@ -2,7 +2,6 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; import jp.sf.pal.vfs.VFSException; import jp.sf.pal.vfs.util.VFSUtil; Modified: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/helper/impl/FileParameterHelperImpl.java =================================================================== --- vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/helper/impl/FileParameterHelperImpl.java 2008-10-25 01:46:02 UTC (rev 1238) +++ vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/helper/impl/FileParameterHelperImpl.java 2008-10-25 13:17:39 UTC (rev 1239) @@ -21,7 +21,6 @@ import jp.sf.pal.vfs.helper.FileParameterHelper; import jp.sf.pal.vfs.util.VFSUtil; -import org.apache.commons.codec.binary.Base64; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.commons.vfs.FileObject; Modified: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/util/VFSUtil.java =================================================================== --- vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/util/VFSUtil.java 2008-10-25 01:46:02 UTC (rev 1238) +++ vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/util/VFSUtil.java 2008-10-25 13:17:39 UTC (rev 1239) @@ -26,6 +26,7 @@ import jp.sf.pal.vfs.common.util.SAStrutsUtil; import org.apache.commons.codec.binary.Base64; +import org.apache.commons.lang.StringUtils; import org.apache.commons.vfs.FileSystemManager; import org.seasar.framework.container.factory.SingletonS2ContainerFactory; @@ -74,7 +75,7 @@ public static String[] getAcceptPaths(String scope) { String acceptPathString = ConfigUtil.getString(scope + "." + VFSConstants.ACCEPT_PATHS); - if (acceptPathString == null) { + if (StringUtils.isEmpty(acceptPathString)) { return new String[0]; } else { return acceptPathString.split(","); @@ -95,7 +96,7 @@ public static String[] getDenyPaths(String scope) { String denyPathString = ConfigUtil.getString(scope + "." + VFSConstants.DENY_PATHS); - if (denyPathString == null) { + if (StringUtils.isEmpty(denyPathString)) { return new String[0]; } else { return denyPathString.split(","); Modified: vfs-portlets/trunk/src/main/resources/application.properties =================================================================== --- vfs-portlets/trunk/src/main/resources/application.properties 2008-10-25 01:46:02 UTC (rev 1238) +++ vfs-portlets/trunk/src/main/resources/application.properties 2008-10-25 13:17:39 UTC (rev 1239) @@ -24,6 +24,7 @@ errors.email={0} is an invalid e-mail address. errors.url={0} is an invalid url (web address). +errors.failed_to_update_config=Failed to update the configuration. errors.access_denied=Access denied. errors.file_system_error=The file system error occurs. errors.failed_to_create_folder=Failed to create a new folder. @@ -36,6 +37,7 @@ errors.failed_to_delete_file=Failed to delete the file. errors.unknow_object={0} is an unknown object. +success.update_config=Updated configuration. success.create_folder=Created a new folder. success.upload_file=Upload the file. success.delete_folder=Deleted the folder. Added: vfs-portlets/trunk/src/main/webapp/WEB-INF/jetspeed-portlet.xml =================================================================== --- vfs-portlets/trunk/src/main/webapp/WEB-INF/jetspeed-portlet.xml (rev 0) +++ vfs-portlets/trunk/src/main/webapp/WEB-INF/jetspeed-portlet.xml 2008-10-25 13:17:39 UTC (rev 1239) @@ -0,0 +1,51 @@ + + + + VFS Portlet + PAL Project + + VFSDefaultConfigurator + admin + + + Property changes on: vfs-portlets/trunk/src/main/webapp/WEB-INF/jetspeed-portlet.xml ___________________________________________________________________ Name: svn:eol-style + native Modified: vfs-portlets/trunk/src/main/webapp/WEB-INF/portlet.xml =================================================================== --- vfs-portlets/trunk/src/main/webapp/WEB-INF/portlet.xml 2008-10-25 01:46:02 UTC (rev 1238) +++ vfs-portlets/trunk/src/main/webapp/WEB-INF/portlet.xml 2008-10-25 13:17:39 UTC (rev 1239) @@ -20,7 +20,7 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"> Display a file system. - VFSPortlet + VFSDefaultExplorer VFS: Explorer org.seasar.struts.portlet.SAStrutsPortlet @@ -44,5 +44,31 @@ VFS,Explorer + + Manage a default configuration. + VFSDefaultConfigurator + VFS: Configurator + org.seasar.struts.portlet.SAStrutsPortlet + + viewPage + /config/ + + + scope + default + + 0 + + text/html + VIEW + + en + ja + + VFS Configurator + Configurator + VFS,Configuration + +
    Modified: vfs-portlets/trunk/src/main/webapp/WEB-INF/vfs.xml =================================================================== --- vfs-portlets/trunk/src/main/webapp/WEB-INF/vfs.xml 2008-10-25 01:46:02 UTC (rev 1238) +++ vfs-portlets/trunk/src/main/webapp/WEB-INF/vfs.xml 2008-10-25 13:17:39 UTC (rev 1239) @@ -1,3 +1,12 @@ + +false +file:/// + + +true +true +true + Added: vfs-portlets/trunk/src/main/webapp/WEB-INF/view/config/index.jsp =================================================================== --- vfs-portlets/trunk/src/main/webapp/WEB-INF/view/config/index.jsp (rev 0) +++ vfs-portlets/trunk/src/main/webapp/WEB-INF/view/config/index.jsp 2008-10-25 13:17:39 UTC (rev 1239) @@ -0,0 +1,72 @@ +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8" %> + + + + + + +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Configuration
    Scope${f:h(scope)}
    Available +True +False +
    Default URI
    Accepted Paths
    Denied Paths
    Show Path +True +False +
    Show Create Folder Link +True +False +
    Show Upload Link +True +False +
    + +
    +
    +
    +
    + + Property changes on: vfs-portlets/trunk/src/main/webapp/WEB-INF/view/config/index.jsp ___________________________________________________________________ Name: svn:eol-style + native Modified: vfs-portlets/trunk/src/main/webapp/WEB-INF/view/list/index.jsp =================================================================== --- vfs-portlets/trunk/src/main/webapp/WEB-INF/view/list/index.jsp 2008-10-25 01:46:02 UTC (rev 1238) +++ vfs-portlets/trunk/src/main/webapp/WEB-INF/view/list/index.jsp 2008-10-25 13:17:39 UTC (rev 1239) @@ -5,20 +5,27 @@ +
    + Create New Folder -| + +| + Upload File +
    +
    Path:
    +
    @@ -54,6 +61,11 @@
    - +
    + +
    +Not Available. +
    +
    From svnnotify @ sourceforge.jp Sun Oct 26 07:08:12 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Sun, 26 Oct 2008 07:08:12 +0900 Subject: [pal-cvs 3506] [1240] added personal folder portlet. Message-ID: <1224972492.635824.27457.nullmailer@users.sourceforge.jp> Revision: 1240 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1240 Author: shinsuke Date: 2008-10-26 07:08:12 +0900 (Sun, 26 Oct 2008) Log Message: ----------- added personal folder portlet. Modified Paths: -------------- vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/VFSConstants.java vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/action/ConfigAction.java vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/action/ListAction.java vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/action/NewfolderAction.java vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/action/UploadAction.java vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/form/ConfigForm.java vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/util/VFSUtil.java vfs-portlets/trunk/src/main/webapp/WEB-INF/portlet.xml vfs-portlets/trunk/src/main/webapp/WEB-INF/vfs.xml vfs-portlets/trunk/src/main/webapp/WEB-INF/view/config/index.jsp vfs-portlets/trunk/src/main/webapp/WEB-INF/view/list/index.jsp -------------- next part -------------- Modified: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/VFSConstants.java =================================================================== --- vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/VFSConstants.java 2008-10-25 13:17:39 UTC (rev 1239) +++ vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/VFSConstants.java 2008-10-25 22:08:12 UTC (rev 1240) @@ -17,6 +17,8 @@ public static final String DEFAULT_URI = "default-uri"; + public static final String ROOT_URI = "root-uri"; + public static final String ACCEPT_PATHS = "accept-paths"; public static final String DENY_PATHS = "deny-paths"; @@ -38,4 +40,6 @@ public static final String SCOPE = "scope"; public static final String USERNAME = CONSTANT_PREFIX + "Username"; + + public static final String PATH_PARAM_USERNAME = "__USERNAME__"; } Modified: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/action/ConfigAction.java =================================================================== --- vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/action/ConfigAction.java 2008-10-25 13:17:39 UTC (rev 1239) +++ vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/action/ConfigAction.java 2008-10-25 22:08:12 UTC (rev 1240) @@ -36,6 +36,8 @@ + VFSConstants.AVAILABLE, "false"); configForm.defaultUri = ConfigUtil.getString(scope + "." + VFSConstants.DEFAULT_URI, "file:///"); + configForm.rootUri = ConfigUtil.getString(scope + "." + + VFSConstants.ROOT_URI, "file:///"); configForm.acceptPaths = ConfigUtil.getString(scope + "." + VFSConstants.ACCEPT_PATHS, ""); configForm.denyPaths = ConfigUtil.getString(scope + "." @@ -59,10 +61,14 @@ public String update() { ConfigUtil.init(request); String scope = VFSUtil.getScope(request); + configForm.defaultUri = VFSUtil.rebuildUri(configForm.defaultUri); + configForm.defaultUri = VFSUtil.rebuildUri(configForm.rootUri); ConfigUtil.setProperty(scope + "." + VFSConstants.AVAILABLE, configForm.available); ConfigUtil.setProperty(scope + "." + VFSConstants.DEFAULT_URI, configForm.defaultUri); + ConfigUtil.setProperty(scope + "." + VFSConstants.ROOT_URI, + configForm.rootUri); ConfigUtil.setProperty(scope + "." + VFSConstants.ACCEPT_PATHS, configForm.acceptPaths); ConfigUtil.setProperty(scope + "." + VFSConstants.DENY_PATHS, Modified: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/action/ListAction.java =================================================================== --- vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/action/ListAction.java 2008-10-25 13:17:39 UTC (rev 1239) +++ vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/action/ListAction.java 2008-10-25 22:08:12 UTC (rev 1240) @@ -3,7 +3,9 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; +import java.util.HashMap; import java.util.List; +import java.util.Map; import javax.portlet.PortletSession; import javax.servlet.http.HttpServletRequest; @@ -47,6 +49,8 @@ public boolean showUploadLink; + public boolean parent; + @ActionForm private ListForm listForm; @@ -61,7 +65,6 @@ SAStrutsUtil.getPortletSession(request).setAttribute( listForm.scope + "." + VFSConstants.USERNAME, request.getRemoteUser(), PortletSession.APPLICATION_SCOPE); - fileItems = createFileItems(); available = ConfigUtil.getBoolean(listForm.scope + "." + VFSConstants.AVAILABLE, false); showPath = ConfigUtil.getBoolean(listForm.scope + "." @@ -70,6 +73,7 @@ + VFSConstants.SHOW_CREATE_FOLDER_LINK); showUploadLink = ConfigUtil.getBoolean(listForm.scope + "." + VFSConstants.SHOW_UPLOAD_LINK); + fileItems = createFileItems(); return "index.jsp"; } @@ -93,14 +97,21 @@ @Execute(validator = false, input = "index.jsp", urlPattern = "select/{encodedUri}/{encodedBaseName}") public String select() { listForm.uri = listForm.uri + "/" + listForm.baseName; - // TODO / + listForm.uri = VFSUtil.rebuildUri(listForm.uri); return displayIndex(); } + @Execute(validator = false, input = "index.jsp", urlPattern = "parent/{encodedUri}") + public String parent() { + listForm.uri = VFSUtil.getParentPath(listForm.uri); + return displayIndex(); + } + @Execute(validator = false, input = "index.jsp", urlPattern = "delete/{encodedUri}/{encodedBaseName}") public String delete() { listForm.scope = VFSUtil.getScope(request); - if (!VFSUtil.checkPath(listForm.scope, listForm.uri)) { + if (!VFSUtil.checkPath(listForm.scope, listForm.uri, + createPathParamMap())) { // i18n throw new ActionMessagesException("errors.access_denied"); } @@ -170,7 +181,8 @@ throw new ActionMessagesException("errors.invalid_user"); } - if (!VFSUtil.checkPath(listForm.scope, listForm.uri)) { + if (!VFSUtil.checkPath(listForm.scope, listForm.uri, + createPathParamMap())) { // i18n throw new ActionMessagesException("errors.access_denied"); } @@ -204,15 +216,32 @@ private List createFileItems() { if (StringUtils.isEmpty(listForm.uri)) { - listForm.uri = VFSUtil.getDefaultUri(listForm.scope); + listForm.uri = VFSUtil.getDefaultUri(listForm.scope, + createPathParamMap()); } + listForm.uri = VFSUtil.rebuildUri(listForm.uri); + FileSystemManager fsManager = VFSUtil.getFileSystemManager(); + // Get File System List objects = new ArrayList(); - if (VFSUtil.checkPath(listForm.scope, listForm.uri)) { + String rootUri = VFSUtil.getRootUri(listForm.scope, + createPathParamMap()); + if (!listForm.uri.equals(rootUri)) { + String parentPath = VFSUtil.getParentPath(listForm.uri); + if (parentPath != null) { + parent = true; + } else { + parent = false; + } + } else { + parent = false; + } + + if (VFSUtil.checkPath(listForm.scope, listForm.uri, + createPathParamMap())) { try { - FileSystemManager fsManager = VFSUtil.getFileSystemManager(); FileObject currentDirectory = fsManager .resolveFile(listForm.uri); @@ -270,6 +299,12 @@ return fileParam; } + private Map createPathParamMap() { + Map map = new HashMap(); + map.put(VFSConstants.PATH_PARAM_USERNAME, request.getRemoteUser()); + return map; + } + public ListForm getListForm() { return listForm; } Modified: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/action/NewfolderAction.java =================================================================== --- vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/action/NewfolderAction.java 2008-10-25 13:17:39 UTC (rev 1239) +++ vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/action/NewfolderAction.java 2008-10-25 22:08:12 UTC (rev 1240) @@ -1,9 +1,12 @@ package jp.sf.pal.vfs.action; import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; import javax.servlet.http.HttpServletRequest; +import jp.sf.pal.vfs.VFSConstants; import jp.sf.pal.vfs.common.util.SAStrutsUtil; import jp.sf.pal.vfs.form.NewfolderForm; import jp.sf.pal.vfs.util.VFSUtil; @@ -52,7 +55,7 @@ public String create() { String scope = VFSUtil.getScope(request); - if (!VFSUtil.checkPath(scope, newfolderForm.uri)) { + if (!VFSUtil.checkPath(scope, newfolderForm.uri, createPathParamMap())) { // i18n throw new ActionMessagesException("errors.access_denied"); } @@ -96,6 +99,12 @@ return "/list/index"; } + private Map createPathParamMap() { + Map map = new HashMap(); + map.put(VFSConstants.PATH_PARAM_USERNAME, request.getRemoteUser()); + return map; + } + public NewfolderForm getNewfolderForm() { return newfolderForm; } Modified: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/action/UploadAction.java =================================================================== --- vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/action/UploadAction.java 2008-10-25 13:17:39 UTC (rev 1239) +++ vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/action/UploadAction.java 2008-10-25 22:08:12 UTC (rev 1240) @@ -1,9 +1,12 @@ package jp.sf.pal.vfs.action; import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; import javax.servlet.http.HttpServletRequest; +import jp.sf.pal.vfs.VFSConstants; import jp.sf.pal.vfs.common.util.SAStrutsUtil; import jp.sf.pal.vfs.form.UploadForm; import jp.sf.pal.vfs.util.VFSUtil; @@ -51,7 +54,7 @@ public String upload() { String scope = VFSUtil.getScope(request); - if (!VFSUtil.checkPath(scope, uploadForm.uri)) { + if (!VFSUtil.checkPath(scope, uploadForm.uri, createPathParamMap())) { // i18n throw new ActionMessagesException("errors.access_denied"); } @@ -96,6 +99,12 @@ return "/list/index"; } + private Map createPathParamMap() { + Map map = new HashMap(); + map.put(VFSConstants.PATH_PARAM_USERNAME, request.getRemoteUser()); + return map; + } + public UploadForm getUploadForm() { return uploadForm; } Modified: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/form/ConfigForm.java =================================================================== --- vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/form/ConfigForm.java 2008-10-25 13:17:39 UTC (rev 1239) +++ vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/form/ConfigForm.java 2008-10-25 22:08:12 UTC (rev 1240) @@ -15,6 +15,9 @@ public String defaultUri; @Required(target = "update") + public String rootUri; + + @Required(target = "update") public String acceptPaths; @Required(target = "update") Modified: vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/util/VFSUtil.java =================================================================== --- vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/util/VFSUtil.java 2008-10-25 13:17:39 UTC (rev 1239) +++ vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/util/VFSUtil.java 2008-10-25 22:08:12 UTC (rev 1240) @@ -15,6 +15,7 @@ import java.io.OutputStream; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; +import java.util.Map; import javax.portlet.PortletContext; import javax.servlet.ServletContext; @@ -32,6 +33,8 @@ public class VFSUtil { + public static final String FILE_URI_PREFIX = "file://"; + public static String getScope(HttpServletRequest request) { String scope = SAStrutsUtil.getPortletConfig(request).getInitParameter( VFSConstants.SCOPE); @@ -41,12 +44,13 @@ return scope; } - public static boolean checkPath(String scope, String path) { + public static boolean checkPath(String scope, String path, + Map paramMap) { if (scope == null || path == null) { return false; } - String acceptPaths[] = getAcceptPaths(scope); - String denyPaths[] = getDenyPaths(scope); + String acceptPaths[] = getAcceptPaths(scope, paramMap); + String denyPaths[] = getDenyPaths(scope, paramMap); if (acceptPaths.length > 0) { for (int i = 0; i < acceptPaths.length; i++) { if (path.matches(acceptPaths[i])) { @@ -72,12 +76,17 @@ /** * @return Returns the acceptPath. */ - public static String[] getAcceptPaths(String scope) { + public static String[] getAcceptPaths(String scope, + Map paramMap) { String acceptPathString = ConfigUtil.getString(scope + "." + VFSConstants.ACCEPT_PATHS); if (StringUtils.isEmpty(acceptPathString)) { return new String[0]; } else { + for (Map.Entry entry : paramMap.entrySet()) { + acceptPathString = acceptPathString.replaceAll(entry.getKey(), + entry.getValue()); + } return acceptPathString.split(","); } } @@ -85,20 +94,43 @@ /** * @return Returns the defualtUrl. */ - public static String getDefaultUri(String scope) { - return ConfigUtil.getString(scope + "." + VFSConstants.DEFAULT_URI, - "file:///"); + public static String getDefaultUri(String scope, + Map paramMap) { + String value = ConfigUtil.getString(scope + "." + + VFSConstants.DEFAULT_URI, "file:///"); + if (value != null) { + for (Map.Entry entry : paramMap.entrySet()) { + value = value.replaceAll(entry.getKey(), entry.getValue()); + } + } + return value; } + public static String getRootUri(String scope, Map paramMap) { + String value = ConfigUtil.getString( + scope + "." + VFSConstants.ROOT_URI, "file:///"); + if (value != null) { + for (Map.Entry entry : paramMap.entrySet()) { + value = value.replaceAll(entry.getKey(), entry.getValue()); + } + } + return value; + } + /** * @return Returns the denyPaths. */ - public static String[] getDenyPaths(String scope) { + public static String[] getDenyPaths(String scope, + Map paramMap) { String denyPathString = ConfigUtil.getString(scope + "." + VFSConstants.DENY_PATHS); if (StringUtils.isEmpty(denyPathString)) { return new String[0]; } else { + for (Map.Entry entry : paramMap.entrySet()) { + denyPathString = denyPathString.replaceAll(entry.getKey(), + entry.getValue()); + } return denyPathString.split(","); } } @@ -161,4 +193,49 @@ throw new VFSException("errors.file_system_error", e); } } + + public static String rebuildUri(String uri) { + if (uri == null) { + return null; + } + + String uriPrefix = FILE_URI_PREFIX; + if (uri.startsWith(FILE_URI_PREFIX)) { + uriPrefix = FILE_URI_PREFIX; + uri = uri.substring(FILE_URI_PREFIX.length()); + } + + if (StringUtils.isEmpty(uri)) { + uri = "/"; + } + uri = uri.replaceAll("/+", "/"); + if (uri.length() > 1 && uri.endsWith("/")) { + uri = uri.substring(0, uri.length() - 1); + } + return uriPrefix + uri; + } + + public static String getParentPath(String uri) { + if (uri == null) { + return null; + } + + String uriPrefix = FILE_URI_PREFIX; + if (uri.startsWith(FILE_URI_PREFIX)) { + uriPrefix = FILE_URI_PREFIX; + uri = uri.substring(FILE_URI_PREFIX.length()); + } + + if (uri.length() > 1) { + uri = uri.substring(0, uri.lastIndexOf("/")); + if (uri.length() > 1 && uri.endsWith("/")) { + uri = uri.substring(0, uri.length() - 1); + } + if (StringUtils.isEmpty(uri)) { + uri = "/"; + } + return uriPrefix + uri; + } + return null; + } } Modified: vfs-portlets/trunk/src/main/webapp/WEB-INF/portlet.xml =================================================================== --- vfs-portlets/trunk/src/main/webapp/WEB-INF/portlet.xml 2008-10-25 13:17:39 UTC (rev 1239) +++ vfs-portlets/trunk/src/main/webapp/WEB-INF/portlet.xml 2008-10-25 22:08:12 UTC (rev 1240) @@ -70,5 +70,57 @@ VFS,Configuration + + Display a personal folder. + VFSPersonalFolderExplorer + VFS: Personal Folder Explorer + org.seasar.struts.portlet.SAStrutsPortlet + + viewPage + /list/ + + + scope + personal + + 0 + + text/html + VIEW + + en + ja + + Personal Folder + Personal + Personal,Explorer + + + + Manage a personal folder configuration. + VFSPersonalFolderConfigurator + VFS: Personal Folder Configurator + org.seasar.struts.portlet.SAStrutsPortlet + + viewPage + /config/ + + + scope + personal + + 0 + + text/html + VIEW + + en + ja + + Personal Folder Configurator + Configurator + Personal,Configuration + + Modified: vfs-portlets/trunk/src/main/webapp/WEB-INF/vfs.xml =================================================================== --- vfs-portlets/trunk/src/main/webapp/WEB-INF/vfs.xml 2008-10-25 13:17:39 UTC (rev 1239) +++ vfs-portlets/trunk/src/main/webapp/WEB-INF/vfs.xml 2008-10-25 22:08:12 UTC (rev 1240) @@ -2,11 +2,22 @@ false -file:/// true true true +file:/// +file:/// + +false +file:///tmp/vfs/__USERNAME__ +file:///tmp/vfs/__USERNAME__.* + +false +true +true +file:///tmp/vfs/__USERNAME__ + Modified: vfs-portlets/trunk/src/main/webapp/WEB-INF/view/config/index.jsp =================================================================== --- vfs-portlets/trunk/src/main/webapp/WEB-INF/view/config/index.jsp 2008-10-25 13:17:39 UTC (rev 1239) +++ vfs-portlets/trunk/src/main/webapp/WEB-INF/view/config/index.jsp 2008-10-25 22:08:12 UTC (rev 1240) @@ -28,6 +28,10 @@ + Root URI + + + Accepted Paths Modified: vfs-portlets/trunk/src/main/webapp/WEB-INF/view/list/index.jsp =================================================================== --- vfs-portlets/trunk/src/main/webapp/WEB-INF/view/list/index.jsp 2008-10-25 13:17:39 UTC (rev 1239) +++ vfs-portlets/trunk/src/main/webapp/WEB-INF/view/list/index.jsp 2008-10-25 22:08:12 UTC (rev 1240) @@ -37,6 +37,16 @@ + + + + .. + + + + + + From svnnotify @ sourceforge.jp Sun Oct 26 07:08:42 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Sun, 26 Oct 2008 07:08:42 +0900 Subject: [pal-cvs 3507] [1241] added personal folder portlet. Message-ID: <1224972522.662522.28527.nullmailer@users.sourceforge.jp> Revision: 1241 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1241 Author: shinsuke Date: 2008-10-26 07:08:42 +0900 (Sun, 26 Oct 2008) Log Message: ----------- added personal folder portlet. Modified Paths: -------------- vfs-portlets/trunk/src/main/webapp/WEB-INF/jetspeed-portlet.xml -------------- next part -------------- Modified: vfs-portlets/trunk/src/main/webapp/WEB-INF/jetspeed-portlet.xml =================================================================== --- vfs-portlets/trunk/src/main/webapp/WEB-INF/jetspeed-portlet.xml 2008-10-25 22:08:12 UTC (rev 1240) +++ vfs-portlets/trunk/src/main/webapp/WEB-INF/jetspeed-portlet.xml 2008-10-25 22:08:42 UTC (rev 1241) @@ -22,6 +22,10 @@ VFSDefaultConfigurator admin + + VFSPersonalFolderConfigurator + admin + Provides features for changing user's password. ユーザーパスワードを変更する機能を提供します。 From svnnotify @ sourceforge.jp Tue Oct 28 17:55:18 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Tue, 28 Oct 2008 17:55:18 +0900 Subject: [pal-cvs 3514] [1248] made application_jp.propertiles. Message-ID: <1225184118.197041.11616.nullmailer@users.sourceforge.jp> Revision: 1248 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1248 Author: takakura Date: 2008-10-28 17:55:17 +0900 (Tue, 28 Oct 2008) Log Message: ----------- made application_jp.propertiles. Added Paths: ----------- bookmark/trunk/src/main/resources/application_ja.properties -------------- next part -------------- Added: bookmark/trunk/src/main/resources/application_ja.properties =================================================================== --- bookmark/trunk/src/main/resources/application_ja.properties (rev 0) +++ bookmark/trunk/src/main/resources/application_ja.properties 2008-10-28 08:55:17 UTC (rev 1248) @@ -0,0 +1,45 @@ +errors.invalid={0} \u306b\u306f\u6b63\u3057\u3044\u5f62\u5f0f\u306e\u30c7\u30fc\u30bf\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +errors.maxlength={0} \u306f {1} \u6587\u5b57\u4ee5\u4e0b\u3067\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 +errors.minlength={0} \u306f {1} \u6587\u5b57\u4ee5\u4e0a\u5165\u529b\u3057\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 +errors.maxbytelength={0} \u306e\u30b5\u30a4\u30ba\u306f {1} \u30d0\u30a4\u30c8\u4ee5\u4e0b\u3067\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 +errors.minbytelength={0} \u306e\u30b5\u30a4\u30ba\u306f {1} \u30d0\u30a4\u30c8\u4ee5\u4e0b\u3067\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 +errors.range={0} \u306f {1} \u304b\u3089 {2} \u306e\u9593\u3067\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 +errors.required={0} \u306f\u5fc5\u305a\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +errors.required.other={0} \u306f\u5fc5\u305a\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002({1}) +errors.byte={0} \u306f\u30d0\u30a4\u30c8\u5f62\u5f0f\u306e\u30c7\u30fc\u30bf\u3067\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 +errors.date={0} \u306f\u65e5\u4ed8\u5f62\u5f0f\u306e\u30c7\u30fc\u30bf\u3067\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 +errors.double={0} \u306f\u6d6e\u52d5\u5c0f\u6570\u70b9\u578b (double \u578b) \u3067\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 +errors.float={0} \u306f\u6d6e\u52d5\u5c0f\u6570\u70b9\u578b (float \u578b) \u3067\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 +errors.integer={0} \u306f\u6574\u6570\u578b (2147483647 \u4ee5\u4e0b\u306e\u6574\u6570) \u3067\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 +errors.long={0} \u306f\u6574\u6570\u578b (9223372036854775807 \u4ee5\u4e0b\u306e\u6574\u6570) \u3067\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 +errors.short={0} \u306f\u6574\u6570\u578b (32767 \u4ee5\u4e0b\u306e\u6574\u6570) \u3067\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 +errors.creditcard={0} \u306f\u6b63\u3057\u3044\u30af\u30ec\u30b8\u30c3\u30c8\u30ab\u30fc\u30c9\u756a\u53f7\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002 +errors.email={0} \u306f\u6b63\u3057\u3044 E \u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002 +errors.url={0} \u306f\u6b63\u3057\u3044 URL (\u30db\u30fc\u30e0\u30da\u30fc\u30b8\u306e\u30a2\u30c9\u30ec\u30b9) \u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002 + +success.create_category=\u30ab\u30c6\u30b4\u30ea\u3092\u4f5c\u6210\u3057\u307e\u3057\u305f\u3002 +success.update_category=\u30ab\u30c6\u30b4\u30ea\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002 +success.delete_category=\u30ab\u30c6\u30b4\u30ea\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 +success.move_category_up=\u4e0a\u306b\u30ab\u30c6\u30b4\u30ea\u3092\u79fb\u52d5\u3057\u307e\u3057\u305f\u3002 +success.move_category_down=\u4e0b\u306b\u30ab\u30c6\u30b4\u30ea\u3092\u79fb\u52d5\u3057\u307e\u3057\u305f\u3002 +success.create_link=\u30ea\u30f3\u30af\u3092\u4f5c\u6210\u3057\u307e\u3057\u305f +success.update_link=\u30ea\u30f3\u30af\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002 +success.delete_link=\u30ea\u30f3\u30af\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 +success.move_link_up=\u4e0a\u306b\u30ea\u30f3\u30af\u3092\u79fb\u52d5\u3057\u307e\u3057\u305f\u3002 +success.move_link_down=\u4e0b\u306b\u30ea\u30f3\u30af\u3092\u79fb\u52d5\u3057\u307e\u3057\u305f\u3002 + +errors.invalid.mode=\u30e2\u30fc\u30c9\u304c\u9055\u3044\u307e\u3059\u3002(\u6b63\u3057\u3044\u5024\u306f {0} \u3067\u3059\u304c\u3001\u5165\u529b\u3055\u308c\u305f\u5024\u306f {1} \u306b\u306a\u3063\u3066\u3044\u307e\u3059) +errors.failed_to_create_category=\u30ab\u30c6\u30b4\u30ea\u306e\u4f5c\u6210\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +errors.failed_to_update_category=\u30ab\u30c6\u30b4\u30ea\u306e\u66f4\u65b0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +errors.failed_to_delete_category=\u30ab\u30c6\u30b4\u30ea\u306e\u524a\u9664\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +errors.could_not_find_category=\u30ab\u30c6\u30b4\u30ea\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002({0}) +errors.invalid.id=\u6b63\u3057\u304f\u306a\u3044 ID \u3067\u3059\u3002 +errors.could_not_find_category_for_moving_up=\u4e0a\u306b\u79fb\u52d5\u3059\u308b\u30ab\u30c6\u30b4\u30ea\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002 +errors.could_not_find_category_for_moving_down=\u4e0b\u306b\u79fb\u52d5\u3059\u308b\u30ab\u30c6\u30b4\u30ea\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002 +errors.invalid_category_id=\u6b63\u3057\u304f\u306a\u3044\u30ab\u30c6\u30b4\u30ea\u60c5\u5831\u3067\u3059\u3002 +errors.failed_to_create_link=\u30ea\u30f3\u30af\u306e\u4f5c\u6210\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +errors.failed_to_update_link=\u30ea\u30f3\u30af\u306e\u66f4\u65b0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +errors.failed_to_delete_link=\u30ea\u30f3\u30af\u306e\u524a\u9664\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +errors.could_not_find_link=\u30ea\u30f3\u30af\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002({0}) +errors.could_not_find_link_for_moving_up=\u4e0a\u306b\u79fb\u52d5\u3059\u308b\u30ea\u30f3\u30af\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002 +errors.could_not_find_link_for_moving_down=\u4e0b\u306b\u79fb\u52d5\u3059\u308b\u30ea\u30f3\u30af\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002 Property changes on: bookmark/trunk/src/main/resources/application_ja.properties ___________________________________________________________________ Name: svn:mime-type + text/plain From svnnotify @ sourceforge.jp Wed Oct 29 10:04:15 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Wed, 29 Oct 2008 10:04:15 +0900 Subject: [pal-cvs 3515] [1249] fixed SecurityException Message-ID: <1225242255.161043.6410.nullmailer@users.sourceforge.jp> Revision: 1249 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1249 Author: shinsuke Date: 2008-10-29 10:04:14 +0900 (Wed, 29 Oct 2008) Log Message: ----------- fixed SecurityException Modified Paths: -------------- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/profiler/impl/CreateUserTemplatePagesValveImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/_user/_template/_mediatype/html/default-page.psml pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/_user/_template/_mediatype/html/folder.metadata pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/_user/_template/folder.metadata -------------- next part -------------- Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/profiler/impl/CreateUserTemplatePagesValveImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/profiler/impl/CreateUserTemplatePagesValveImpl.java 2008-10-28 08:55:17 UTC (rev 1248) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/profiler/impl/CreateUserTemplatePagesValveImpl.java 2008-10-29 01:04:14 UTC (rev 1249) @@ -16,6 +16,8 @@ */ package org.apache.jetspeed.profiler.impl; +import java.util.ArrayList; + import jp.sf.pal.portal.logging.Log; import jp.sf.pal.portal.logging.LogFactory; @@ -122,6 +124,12 @@ public void invoke(RequestContext request, ValveContext context) throws PipelineException { + if (request.getRequest().getRemoteUser() == null) + { + context.invokeNext(request); + return; + } + boolean created = false; try @@ -186,6 +194,8 @@ Folder destFolder = this.pageManager.getFolder(userFolder); destFolder.setTitle(userName); destFolder.setShortTitle(userName); + destFolder.getSecurityConstraints().setSecurityConstraintsRefs( + new ArrayList()); this.pageManager.updateFolder(destFolder); created = true; Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/_user/_template/_mediatype/html/default-page.psml =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/_user/_template/_mediatype/html/default-page.psml 2008-10-28 08:55:17 UTC (rev 1248) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/_user/_template/_mediatype/html/default-page.psml 2008-10-29 01:04:14 UTC (rev 1249) @@ -1,8 +1,5 @@ @@ -54,7 +54,7 @@
    - 前へ + @@ -71,7 +71,7 @@ - 次へ +
    Modified: bookmark/trunk/src/main/webapp/WEB-INF/view/link/view/confirm.jsp =================================================================== --- bookmark/trunk/src/main/webapp/WEB-INF/view/link/view/confirm.jsp 2008-10-29 08:28:11 UTC (rev 1255) +++ bookmark/trunk/src/main/webapp/WEB-INF/view/link/view/confirm.jsp 2008-10-29 08:29:48 UTC (rev 1256) @@ -9,13 +9,13 @@
    -
    カテゴリ
    +
      -
    • (未分類)
    • +
    • -
    • (未分類)
    • +
    • @@ -35,36 +35,36 @@
      - + - + - + - + - + - + @@ -73,22 +73,22 @@ Modified: bookmark/trunk/src/main/webapp/WEB-INF/view/link/view/edit.jsp =================================================================== --- bookmark/trunk/src/main/webapp/WEB-INF/view/link/view/edit.jsp 2008-10-29 08:28:11 UTC (rev 1255) +++ bookmark/trunk/src/main/webapp/WEB-INF/view/link/view/edit.jsp 2008-10-29 08:29:48 UTC (rev 1256) @@ -9,13 +9,13 @@
      -
      カテゴリ
      +
        -
      • (未分類)
      • +
      • -
      • (未分類)
      • +
      • @@ -35,25 +35,25 @@
      リンクの登録の確認
      名前 ${f:h(name)}
      URL ${f:h(url)}
      メモ ${f:br(f:nbsp(f:h(memo)))}
      カテゴリ ${f:h(category.name)} -(未分類) -(共有) + +
      種類 -新規ウィンドウで開く -同一ウィンドウで開く + +
      - - + "/> + "/> - - + "/> + "/> - - + "/> + "/> - + "/> - - + "/> + "/>
      - + - + - + - + - + - + @@ -73,8 +73,8 @@ Modified: bookmark/trunk/src/main/webapp/WEB-INF/view/link/view/error.jsp =================================================================== --- bookmark/trunk/src/main/webapp/WEB-INF/view/link/view/error.jsp 2008-10-29 08:28:11 UTC (rev 1255) +++ bookmark/trunk/src/main/webapp/WEB-INF/view/link/view/error.jsp 2008-10-29 08:29:48 UTC (rev 1256) @@ -6,6 +6,6 @@
      -戻る + Modified: bookmark/trunk/src/main/webapp/WEB-INF/view/link/view/index.jsp =================================================================== --- bookmark/trunk/src/main/webapp/WEB-INF/view/link/view/index.jsp 2008-10-29 08:28:11 UTC (rev 1255) +++ bookmark/trunk/src/main/webapp/WEB-INF/view/link/view/index.jsp 2008-10-29 08:29:48 UTC (rev 1256) @@ -9,13 +9,13 @@
      -
      カテゴリ
      +
        -
      • (未分類)
      • +
      • -
      • (未分類)
      • +
      • @@ -28,10 +28,10 @@
        -
      • (共有)
      • +
      • -
      • (共有)
      • +
      @@ -39,15 +39,15 @@
      -リンク作成 + | -カテゴリ一覧 +
      リンクの登録
      名前
      URL
      メモ
      カテゴリ - + ${f:h(category.name)} @@ -61,11 +61,11 @@
      種類 -新規ウィンドウで開く -同一ウィンドウで開く + +
      - - + "/> + "/>
      - - + + @@ -61,13 +61,13 @@ @@ -76,7 +76,7 @@   - + @@ -85,7 +85,7 @@
      - 前へ + @@ -102,7 +102,7 @@ - 次へ +
      From svnnotify @ sourceforge.jp Wed Oct 29 22:05:24 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Wed, 29 Oct 2008 22:05:24 +0900 Subject: [pal-cvs 3523] [1257] a portlet title is saved in a session. Message-ID: <1225285524.912486.29068.nullmailer@users.sourceforge.jp> Revision: 1257 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1257 Author: shinsuke Date: 2008-10-29 22:05:24 +0900 (Wed, 29 Oct 2008) Log Message: ----------- a portlet title is saved in a session. Modified Paths: -------------- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/services/title/DynamicTitleServiceImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/pluto-factories.xml -------------- next part -------------- Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/services/title/DynamicTitleServiceImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/services/title/DynamicTitleServiceImpl.java 2008-10-29 08:29:48 UTC (rev 1256) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/services/title/DynamicTitleServiceImpl.java 2008-10-29 13:05:24 UTC (rev 1257) @@ -19,9 +19,12 @@ import java.util.Iterator; import java.util.Locale; +import javax.portlet.WindowState; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; import org.apache.jetspeed.PortalReservedParameters; +import org.apache.jetspeed.container.state.NavigationalState; import org.apache.jetspeed.request.RequestContext; import org.apache.pluto.om.common.Preference; import org.apache.pluto.om.entity.PortletEntity; @@ -30,6 +33,18 @@ public class DynamicTitleServiceImpl implements DynamicTitleService { + private boolean cachedTitle = false; + + public DynamicTitleServiceImpl() + { + this(false); + } + + public DynamicTitleServiceImpl(boolean cachedTitle) + { + this.cachedTitle = cachedTitle; + } + public void setDynamicTitle(PortletWindow window, HttpServletRequest request, String titleArg) { @@ -57,9 +72,33 @@ public String getDynamicTitle(PortletWindow window, HttpServletRequest request) { - return (String) request - .getAttribute(PortalReservedParameters.OVERRIDE_PORTLET_TITLE_ATTR - + "::window.id::" + window.getId()); + String key = PortalReservedParameters.OVERRIDE_PORTLET_TITLE_ATTR + + "::window.id::" + window.getId(); + if (cachedTitle) + { + RequestContext requestContext = (RequestContext) request + .getAttribute(PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE); + NavigationalState navState = requestContext.getPortalURL() + .getNavigationalState(); + WindowState windowState = navState.getState(window); + HttpSession session = request.getSession(); + if (!windowState.equals(WindowState.MINIMIZED)) + { + String title = (String) request.getAttribute(key); + session.setAttribute(key, title); + return title; + } + else + { + String title = (String) session.getAttribute(key); + if (title != null) { return title; } + return (String) request.getAttribute(key); + } + } + else + { + return (String) request.getAttribute(key); + } } protected final String getTitleFromPortletDefinition(PortletWindow window, Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/pluto-factories.xml =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/pluto-factories.xml 2008-10-29 08:29:48 UTC (rev 1256) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/pluto-factories.xml 2008-10-29 13:05:24 UTC (rev 1257) @@ -201,7 +201,11 @@ + class="org.apache.jetspeed.services.title.DynamicTitleServiceImpl" > + + true + + From svnnotify @ sourceforge.jp Thu Oct 30 09:27:55 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Thu, 30 Oct 2008 09:27:55 +0900 Subject: [pal-cvs 3524] [1258] fixed security issue. Message-ID: <1225326475.156219.22340.nullmailer@users.sourceforge.jp> Revision: 1258 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1258 Author: shinsuke Date: 2008-10-30 09:27:54 +0900 (Thu, 30 Oct 2008) Log Message: ----------- fixed security issue. Modified Paths: -------------- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/org/apache/jetspeed/security/JSSubject.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/WorkerImpl.java -------------- next part -------------- Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/org/apache/jetspeed/security/JSSubject.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/org/apache/jetspeed/security/JSSubject.java 2008-10-29 13:05:24 UTC (rev 1257) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/org/apache/jetspeed/security/JSSubject.java 2008-10-30 00:27:54 UTC (rev 1258) @@ -30,6 +30,8 @@ import java.security.AccessControlContext; import java.security.PrivilegedActionException; +import java.util.ArrayList; +import java.util.List; import javax.security.auth.Subject; @@ -38,7 +40,7 @@ private static final long serialVersionUID = -8308522755600156057L; - static ThreadLocal threadLocal = new ThreadLocal(); + static ThreadLocal> threadLocal = new ThreadLocal>(); /** * Get the Subject associated with the provided @@ -70,7 +72,15 @@ Subject s = null; try { - s = (Subject) threadLocal.get(); + List subjectList = threadLocal.get(); + if (subjectList != null) + { + int index = subjectList.size() - 1; + if (index >= 0) + { + s = subjectList.get(index); + } + } } catch (Exception e) { @@ -112,8 +122,15 @@ { Subject subject = subject1; if (subject == null) subject = JSSubject.getSubject(null); - threadLocal.set(subject); - return Subject.doAs(subject, action); + try + { + pushSubject(subject); + return Subject.doAs(subject, action); + } + finally + { + popSubject(); + } } /** @@ -154,11 +171,18 @@ { Subject subject = subject1; if (subject == null) subject = JSSubject.getSubject(null); - threadLocal.set(subject); - if (subject != null) - return Subject.doAs(subject, action); - else - return Subject.doAs(subject, action); + try + { + pushSubject(subject); + if (subject != null) + return Subject.doAs(subject, action); + else + return Subject.doAs(subject, action); + } + finally + { + popSubject(); + } } /** @@ -199,12 +223,18 @@ { Subject subject = subject1; if (subject == null) subject = JSSubject.getSubject(acc); - threadLocal.set(subject); - if (subject != null) - return Subject.doAsPrivileged(subject, action, acc); - else - return Subject.doAsPrivileged(subject, action, acc); - + try + { + pushSubject(subject); + if (subject != null) + return Subject.doAsPrivileged(subject, action, acc); + else + return Subject.doAsPrivileged(subject, action, acc); + } + finally + { + popSubject(); + } } /** @@ -251,12 +281,41 @@ { Subject s = subject; if (s == null) s = JSSubject.getSubject(acc); - threadLocal.set(s); - if (s != null) - return Subject.doAsPrivileged(s, action, acc); - else - return Subject.doAsPrivileged(s, action, acc); + try + { + pushSubject(s); + if (s != null) + return Subject.doAsPrivileged(s, action, acc); + else + return Subject.doAsPrivileged(s, action, acc); + } + finally + { + popSubject(); + } + } + protected static void pushSubject(Subject subject) + { + List subjectList = threadLocal.get(); + if (subjectList == null) + { + subjectList = new ArrayList(); + threadLocal.set(subjectList); + } + subjectList.add(subject); } + protected static Subject popSubject() + { + List subjectList = threadLocal.get(); + if (subjectList == null) + { + subjectList = new ArrayList(); + threadLocal.set(subjectList); + } + int index = subjectList.size() - 1; + if (index >= 0) { return subjectList.remove(index); } + return null; + } } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/WorkerImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/WorkerImpl.java 2008-10-29 13:05:24 UTC (rev 1257) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/WorkerImpl.java 2008-10-30 00:27:54 UTC (rev 1258) @@ -175,7 +175,8 @@ Subject subject = null; if (this.context != null) { - subject = JSSubject.getSubject(this.context); + // if uses JSSubject.getSubject(), a previous subject is returned. + subject = Subject.getSubject(this.context); } if (subject != null) { From svnnotify @ sourceforge.jp Thu Oct 30 10:15:48 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Thu, 30 Oct 2008 10:15:48 +0900 Subject: [pal-cvs 3525] [1259] if throws IllegalArgumentException, tomcat dumps the log(ex. Message-ID: <1225329348.820040.390.nullmailer@users.sourceforge.jp> Revision: 1259 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1259 Author: shinsuke Date: 2008-10-30 10:15:48 +0900 (Thu, 30 Oct 2008) Log Message: ----------- if throws IllegalArgumentException, tomcat dumps the log(ex. using a username as empty). Modified Paths: -------------- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/impl/LdapUserSecurityHandler.java -------------- next part -------------- Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/impl/LdapUserSecurityHandler.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/impl/LdapUserSecurityHandler.java 2008-10-30 00:27:54 UTC (rev 1258) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/impl/LdapUserSecurityHandler.java 2008-10-30 01:15:48 UTC (rev 1259) @@ -78,7 +78,7 @@ */ public boolean isUserPrincipal(String uid) { - verifyUid(uid); + if (!verifyUid(uid)) { return false; } return getUserPrincipal(uid) != null; } @@ -87,7 +87,7 @@ */ public Principal getUserPrincipal(String uid) { - verifyUid(uid); + if (!verifyUid(uid)) { return null; } try { String dn = ldap.lookupByUid(uid); @@ -110,10 +110,9 @@ * @param uid * The uid. */ - private void verifyUid(String uid) + private boolean verifyUid(String uid) { - if (StringUtils.isEmpty(uid)) { throw new IllegalArgumentException( - "The uid cannot be null or empty."); } + return !StringUtils.isEmpty(uid); } /** From svnnotify @ sourceforge.jp Thu Oct 30 10:26:45 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Thu, 30 Oct 2008 10:26:45 +0900 Subject: [pal-cvs 3526] [1260] set an exception to log. Message-ID: <1225330005.670005.10859.nullmailer@users.sourceforge.jp> Revision: 1260 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1260 Author: shinsuke Date: 2008-10-30 10:26:45 +0900 (Thu, 30 Oct 2008) Log Message: ----------- set an exception to log. Modified Paths: -------------- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/impl/DefaultLoginModule.java -------------- next part -------------- Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/impl/DefaultLoginModule.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/impl/DefaultLoginModule.java 2008-10-30 01:15:48 UTC (rev 1259) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/impl/DefaultLoginModule.java 2008-10-30 01:26:45 UTC (rev 1260) @@ -241,7 +241,7 @@ //ex.printStackTrace(System.out); Object[] args = new Object[] {ex.getMessage()}; - log.log("2100005", args); // REPLACED + log.log("2100005", args, ex); // REPLACED throw new LoginException(ex.getMessage()); } } From svnnotify @ sourceforge.jp Thu Oct 30 11:42:46 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Thu, 30 Oct 2008 11:42:46 +0900 Subject: [pal-cvs 3527] [1261] fixed exception handling, released request context, and initialized request parameters. Message-ID: <1225334566.403314.25944.nullmailer@users.sourceforge.jp> Revision: 1261 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1261 Author: shinsuke Date: 2008-10-30 11:42:46 +0900 (Thu, 30 Oct 2008) Log Message: ----------- fixed exception handling, released request context, and initialized request parameters. Modified Paths: -------------- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/engine/JetspeedEngine.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/engine/JetspeedServlet.java -------------- next part -------------- Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/engine/JetspeedEngine.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/engine/JetspeedEngine.java 2008-10-30 01:26:45 UTC (rev 1260) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/engine/JetspeedEngine.java 2008-10-30 02:42:46 UTC (rev 1261) @@ -256,14 +256,41 @@ else pipeline = getPipeline(); - context.setPipeline(pipeline); - // TODO Findbugs - pipeline.invoke(context); + try + { + if (pipeline == null) { throw new JetspeedException( + "Unknown pipeline: " + targetPipeline); } + context.setPipeline(pipeline); + context.getParameterMap(); // initialize request parameters + pipeline.invoke(context); + } + catch (JetspeedException e) + { + if (statistics != null) + { + long end = System.currentTimeMillis(); + statistics.logPageAccess(context, + PortalStatistics.HTTP_INTERNAL_ERROR, end - start); + } + throw e; + } + catch (Exception e) + { + if (statistics != null) + { + long end = System.currentTimeMillis(); + statistics.logPageAccess(context, + PortalStatistics.HTTP_INTERNAL_ERROR, end - start); + } + throw new JetspeedException(e); + } - long end = System.currentTimeMillis(); if (statistics != null) + { + long end = System.currentTimeMillis(); statistics.logPageAccess(context, PortalStatistics.HTTP_OK, end - start); + } } /** Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/engine/JetspeedServlet.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/engine/JetspeedServlet.java 2008-10-30 01:26:45 UTC (rev 1260) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/engine/JetspeedServlet.java 2008-10-30 02:42:46 UTC (rev 1261) @@ -316,8 +316,14 @@ // send request through pipeline RequestContext context = contextComponent.create(req, res, getServletConfig()); - engine.service(context); - contextComponent.release(context); + try + { + engine.service(context); + } + finally + { + contextComponent.release(context); + } } } From svnnotify @ sourceforge.jp Thu Oct 30 12:04:55 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Thu, 30 Oct 2008 12:04:55 +0900 Subject: [pal-cvs 3528] [1262] fixed npe on multithread env. Message-ID: <1225335895.530107.16347.nullmailer@users.sourceforge.jp> Revision: 1262 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1262 Author: shinsuke Date: 2008-10-30 12:04:55 +0900 (Thu, 30 Oct 2008) Log Message: ----------- fixed npe on multithread env. Modified Paths: -------------- pal-wcm/trunk/src/main/java/jp/sf/pal/wcm/portlet/WcmViewerPortlet.java -------------- next part -------------- Modified: pal-wcm/trunk/src/main/java/jp/sf/pal/wcm/portlet/WcmViewerPortlet.java =================================================================== --- pal-wcm/trunk/src/main/java/jp/sf/pal/wcm/portlet/WcmViewerPortlet.java 2008-10-30 02:42:46 UTC (rev 1261) +++ pal-wcm/trunk/src/main/java/jp/sf/pal/wcm/portlet/WcmViewerPortlet.java 2008-10-30 03:04:55 UTC (rev 1262) @@ -92,9 +92,9 @@ protected void doEdit(RenderRequest request, RenderResponse response) throws PortletException, IOException { response.setContentType("text/html"); - + Fragment fragment = getCurrentFragment(request); - + Locale currentLocale = request.getLocale(); List localeList = getLocaleList(fragment); String localeName = ""; @@ -110,12 +110,12 @@ } else if (localeList.contains(language)) { localeName = WcmConstants.LOCALE_SEPARETER + language; } - + String title = getFragmentPreferenceValue(fragment, WcmConstants.TITLE + localeName, ""); - + response.setTitle(title); - + request.setAttribute(WcmConstants.PORTAL_CONTEXT_PATH, getPortalContextPath(request)); request @@ -171,9 +171,11 @@ portletSession.setAttribute(WcmConstants.NAMESPACE_LIST, namespaceList, PortletSession.APPLICATION_SCOPE); } - namespaceList.add(fragment.getId()); - if (namespaceList.size() > nsListSize) { - namespaceList.remove(0); + synchronized (namespaceList) { + namespaceList.add(fragment.getId()); + if (namespaceList.size() > nsListSize) { + namespaceList.remove(0); + } } PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher( From svnnotify @ sourceforge.jp Thu Oct 30 15:10:05 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Thu, 30 Oct 2008 15:10:05 +0900 Subject: [pal-cvs 3529] [1263] applied patch: r705264 Message-ID: <1225347005.553564.28768.nullmailer@users.sourceforge.jp> Revision: 1263 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1263 Author: shinsuke Date: 2008-10-30 15:10:05 +0900 (Thu, 30 Oct 2008) Log Message: ----------- applied patch: r705264 Modified Paths: -------------- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/jp/sf/pal/portal/logging/resources/Messages.properties pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/cm/src/java/org/apache/jetspeed/cache/impl/EhCacheDistributedImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/cm/src/java/org/apache/jetspeed/cache/impl/EhCacheImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/file-cache/src/java/org/apache/jetspeed/cache/file/FileCache.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/file-cache/src/java/org/apache/jetspeed/cache/file/FileCacheEntryImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/file-cache/src/test/org/apache/jetspeed/cache/file/TestFileCache.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/test/org/apache/jetspeed/page/PageManagerTestShared.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/test/org/apache/jetspeed/page/document/psml/TestCastorFileSystemDocumentHandler.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/etc/db-ojb/ehcache.xml pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/cache/JetspeedCache.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/cache.xml pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/importer-page-manager.xml pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/jetspeed-base.xml pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/conf/jetspeed.properties -------------- next part -------------- Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/jp/sf/pal/portal/logging/resources/Messages.properties =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/jp/sf/pal/portal/logging/resources/Messages.properties 2008-10-30 03:04:55 UTC (rev 1262) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/jp/sf/pal/portal/logging/resources/Messages.properties 2008-10-30 06:10:05 UTC (rev 1263) @@ -85,7 +85,7 @@ 0400002=E[0400002] Exception in EhCacheDistributionImple.notifyElement 0400003=D[0400003] Cache={0} is not my cache={1} 0400004=E[0400004] Exception in EhCacheDistributionImple.notifyRemoveAll -0400005=E[0400005] Exception in EhCacheImple.notifyListeners +#0400005=E[0400005] Exception in EhCacheImple.notifyListeners 0400006=E[0400006] Exception in EhDecorationContentCacheImpl.puts 0400007=D[0400007] parsing webDescriptorFile: {0} 0400008=E[0400008] Failed to parse webDescriptorFile: {0} @@ -93,16 +93,21 @@ 0400010=E[0400010] Invalid url pattern: {0} 0400011=E[0400011] Exception occurred in ServletRule 0400012=E[0400012] Exception occurred in ServletMappingRule +0400013=E[0400002] Exception in EhCacheDistributionImple.notifyElement # 05: components/deploy-tool # 06: components/file-cache 0600001=E[0600001] Exception starting scanner -0600002=E[0600002] Exception getting file path: -0600003=W[0600003] Unable to evict cache entry. {0} -0600004=W[0600004] Unable to evict cache entry. {0} -0600005=E[0600005] Exception getting file path: -0600006=W[0600006] Unable to refresh cached document: {0} -0600007=E[0600007] FileCache Scanner: Error in iteration... -0600008=E[0600008] FileCacheScanner: recieved interruption, exiting. +#0600002=E[0600002] Exception getting file path: +#0600003=W[0600003] Unable to evict cache entry. {0} +#0600004=W[0600004] Unable to evict cache entry. {0} +#0600005=E[0600005] Exception getting file path: +#0600006=W[0600006] Unable to refresh cached document: {0} +#0600007=E[0600007] FileCache Scanner: Error in iteration... +#0600008=E[0600008] FileCacheScanner: recieved interruption, exiting. +0600009=D[0600009] page file has been updated: {0} +0600010=E[0600010] FileCache Scanner: Error in iteration... +0600011=E[0600011] FileCacheScanner: recieved interruption, exiting. +0600012=E[0600012] FileCacheScanner: Error in a listener refresh: {0} # 07: components/header-resource 0700001=E[0700001] HeaderResource.getNamedResourceContent() cannot include header section with unknown type; header-section-name= {0} header-section-type-id= {1} 0700002=D[0700002] header resource registry text for header section= {0} headerText= {1} Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/cm/src/java/org/apache/jetspeed/cache/impl/EhCacheDistributedImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/cm/src/java/org/apache/jetspeed/cache/impl/EhCacheDistributedImpl.java 2008-10-30 03:04:55 UTC (rev 1262) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/cm/src/java/org/apache/jetspeed/cache/impl/EhCacheDistributedImpl.java 2008-10-30 06:10:05 UTC (rev 1263) @@ -17,9 +17,11 @@ package org.apache.jetspeed.cache.impl; import java.io.Serializable; +import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.Iterator; +import java.util.List; import java.util.Map; import jp.sf.pal.portal.logging.Log; @@ -33,6 +35,7 @@ import org.apache.jetspeed.cache.CacheElement; import org.apache.jetspeed.cache.DistributedCacheObject; import org.apache.jetspeed.cache.JetspeedCache; +import org.apache.jetspeed.cache.JetspeedCacheEventListener; import org.apache.jetspeed.request.RequestContext; public class EhCacheDistributedImpl extends EhCacheImpl implements @@ -42,6 +45,10 @@ protected static final Log log = LogFactory .getLog(EhCacheDistributedImpl.class); + protected List localListeners = new ArrayList(); + + protected List remoteListeners = new ArrayList(); + private Map refList = Collections.synchronizedMap(new HashMap()); public EhCacheDistributedImpl(Ehcache ehcache) @@ -122,6 +129,30 @@ } + public void clear() + { + super.clear(); + notifyListeners(true, CacheElement.ActionRemoved, null, null); + } + + public void addEventListener(JetspeedCacheEventListener listener, + boolean local) + { + if (local) + localListeners.add(listener); + else + remoteListeners.add(listener); + } + + public void removeEventListener(JetspeedCacheEventListener listener, + boolean local) + { + if (local) + localListeners.remove(listener); + else + remoteListeners.remove(listener); + } + public void evictContentForUser(RequestContext context) { return; @@ -154,6 +185,43 @@ } } + protected void notifyListeners(boolean local, int action, Object key, + Object value) + { + List listeners = (local ? localListeners : remoteListeners); + for (int ix = 0; ix < listeners.size(); ix++) + { + try + { + JetspeedCacheEventListener listener = (JetspeedCacheEventListener) listeners + .get(ix); + switch (action) + { + case CacheElement.ActionAdded: + listener.notifyElementAdded(this, local, key, value); + break; + case CacheElement.ActionChanged: + listener.notifyElementChanged(this, local, key, value); + break; + case CacheElement.ActionRemoved: + listener.notifyElementRemoved(this, local, key, value); + break; + case CacheElement.ActionEvicted: + listener.notifyElementEvicted(this, local, key, value); + break; + case CacheElement.ActionExpired: + listener.notifyElementExpired(this, local, key, value); + break; + } + } + catch (Exception e) + { + // e.printStackTrace(); + log.log("0400013", e); // REPLACED + } + } + } + public void notifyElement(Ehcache cache, boolean local, Element arg1, int action) { Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/cm/src/java/org/apache/jetspeed/cache/impl/EhCacheImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/cm/src/java/org/apache/jetspeed/cache/impl/EhCacheImpl.java 2008-10-30 03:04:55 UTC (rev 1262) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/cm/src/java/org/apache/jetspeed/cache/impl/EhCacheImpl.java 2008-10-30 06:10:05 UTC (rev 1263) @@ -17,13 +17,15 @@ package org.apache.jetspeed.cache.impl; import java.io.Serializable; -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import jp.sf.pal.portal.logging.Log; import jp.sf.pal.portal.logging.LogFactory; import net.sf.ehcache.Ehcache; import net.sf.ehcache.Element; +import net.sf.ehcache.event.CacheEventListener; import org.apache.jetspeed.cache.CacheElement; import org.apache.jetspeed.cache.ContentCacheKey; @@ -36,15 +38,14 @@ protected Ehcache ehcache; - protected List localListeners = new ArrayList(); + protected Map cacheEventListenersMap; - protected List remoteListeners = new ArrayList(); - protected static final Log log = LogFactory.getLog(EhCacheImpl.class); public EhCacheImpl(Ehcache ehcache) { this.ehcache = ehcache; + this.cacheEventListenersMap = new HashMap(); } public CacheElement get(Object key) @@ -73,8 +74,6 @@ { EhCacheElementImpl impl = (EhCacheElementImpl) element; ehcache.put(impl.getImplElement()); - notifyListeners(true, CacheElement.ActionAdded, impl.getKey(), impl - .getContent()); } public CacheElement createElement(Object key, Object content) @@ -92,8 +91,6 @@ Element element = ehcache.get(key); if (element == null) return false; boolean isRemoved = ehcache.remove(key); - if (isRemoved) - notifyListeners(true, CacheElement.ActionRemoved, key, null); return isRemoved; } @@ -107,7 +104,6 @@ public void clear() { ehcache.removeAll(); - notifyListeners(true, CacheElement.ActionRemoved, null, null); } public void evictContentForUser(String username) @@ -120,26 +116,83 @@ return; } - public void addEventListener(JetspeedCacheEventListener listener, - boolean local) + public void addEventListener(final JetspeedCacheEventListener listener, + final boolean local) { - if (local) - localListeners.add(listener); - else - remoteListeners.add(listener); + CacheEventListener cacheEventListener = new CacheEventListener() + { + public void notifyElementEvicted(Ehcache cache, Element element) + { + listener.notifyElementEvicted(EhCacheImpl.this, local, element + .getKey(), element.getValue()); + } + + public void notifyElementExpired(Ehcache cache, Element element) + { + listener.notifyElementExpired(EhCacheImpl.this, local, element + .getKey(), element.getValue()); + } + + public void notifyElementPut(Ehcache cache, Element element) + { + listener.notifyElementAdded(EhCacheImpl.this, local, element + .getKey(), element.getValue()); + } + + public void notifyElementUpdated(Ehcache cache, Element element) + { + listener.notifyElementChanged(EhCacheImpl.this, local, element + .getKey(), element.getValue()); + } + + public void notifyElementRemoved(Ehcache cache, Element element) + { + listener.notifyElementRemoved(EhCacheImpl.this, local, element + .getKey(), null); + } + + public void notifyRemoveAll(Ehcache cache) + { + listener.notifyElementRemoved(EhCacheImpl.this, local, null, + null); + } + + public void dispose() + { + } + + public Object clone() + { + return this; + } + }; + + ehcache.getCacheEventNotificationService().registerListener( + cacheEventListener); } public void removeEventListener(JetspeedCacheEventListener listener, boolean local) { - if (local) - localListeners.remove(listener); - else - remoteListeners.remove(listener); + CacheEventListener cacheEventListener = this.cacheEventListenersMap + .get(listener); + if (cacheEventListener != null) + ehcache.getCacheEventNotificationService().unregisterListener( + cacheEventListener); } + public int getSize() + { + return ehcache.getSize(); + } + + public List getKeys() + { + return ehcache.getKeys(); + } + // ------------------------------------------------------ public Object clone() throws CloneNotSupportedException @@ -152,43 +205,6 @@ { } - protected void notifyListeners(boolean local, int action, Object key, - Object value) - { - List listeners = (local ? localListeners : remoteListeners); - for (int ix = 0; ix < listeners.size(); ix++) - { - try - { - JetspeedCacheEventListener listener = (JetspeedCacheEventListener) listeners - .get(ix); - switch (action) - { - case CacheElement.ActionAdded: - listener.notifyElementAdded(this, local, key, value); - break; - case CacheElement.ActionChanged: - listener.notifyElementChanged(this, local, key, value); - break; - case CacheElement.ActionRemoved: - listener.notifyElementRemoved(this, local, key, value); - break; - case CacheElement.ActionEvicted: - listener.notifyElementEvicted(this, local, key, value); - break; - case CacheElement.ActionExpired: - listener.notifyElementExpired(this, local, key, value); - break; - } - } - catch (Exception e) - { - // e.printStackTrace(); - log.log("0400005", e); // REPLACED - } - } - } - public ContentCacheKey createCacheKey(RequestContext rc, String windowId) { return null; // not implemented here Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/file-cache/src/java/org/apache/jetspeed/cache/file/FileCache.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/file-cache/src/java/org/apache/jetspeed/cache/file/FileCache.java 2008-10-30 03:04:55 UTC (rev 1262) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/file-cache/src/java/org/apache/jetspeed/cache/file/FileCache.java 2008-10-30 06:10:05 UTC (rev 1263) @@ -19,103 +19,66 @@ import java.io.File; import java.io.FileNotFoundException; -import java.util.Collection; -import java.util.Collections; import java.util.Date; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedList; import java.util.List; -import java.util.Map; import jp.sf.pal.portal.logging.Log; import jp.sf.pal.portal.logging.LogFactory; +import org.apache.jetspeed.cache.CacheElement; +import org.apache.jetspeed.cache.JetspeedCache; +import org.apache.jetspeed.cache.JetspeedCacheEventListener; + /** - * FileCache keeps a cache of files up-to-date with a most simple eviction - * policy. The eviction policy will keep n items in the cache, and then start - * evicting the items ordered-by least used first. The cache runs a thread to - * check for both evictions and refreshes. - * - * @author David S. Taylor David Sean - * Taylor - * @version $Id: FileCache.java 516448 2007-03-09 16:25:47Z ate $ + * FileCache keeps a cache of files up-to-date with a most simple eviction policy. + * The eviction policy will keep n items in the cache, and then start evicting + * the items ordered-by least used first. The cache runs a thread to check for + * both evictions and refreshes. + * + * @author David S. Taylor David Sean Taylor + * @version $Id$ */ -public class FileCache implements java.util.Comparator +public class FileCache { protected long scanRate = 300; // every 5 minutes - protected int maxSize = 100; // maximum of 100 items - - protected List listeners = new LinkedList(); - private FileCacheScanner scanner = null; - private Map cache = null; + private JetspeedCache cache = null; private final static Log log = LogFactory.getLog(FileCache.class); /** - * Default constructor. Use default values for scanReate and maxSize - * + * Set cache + * + * @param cache the physical cache implementation */ - public FileCache() + public FileCache(JetspeedCache cache) { - cache = Collections.synchronizedMap(new HashMap()); + this.cache = cache; this.scanner = new FileCacheScanner(); this.scanner.setDaemon(true); } /** - * Set scanRate and maxSize - * - * @param scanRate - * how often in seconds to refresh and evict from the cache - * @param maxSize - * the maximum allowed size of the cache before eviction starts + * Set cache, scanRate and maxSize + * + * @param cache the physical cache implementation + * @param scanRate how often in seconds to refresh and evict from the cache + * @param maxSize the maximum allowed size of the cache before eviction starts */ - public FileCache(long scanRate, int maxSize) + public FileCache(JetspeedCache cache, long scanRate) { - - cache = Collections.synchronizedMap(new HashMap()); - + this(cache); this.scanRate = scanRate; - this.maxSize = maxSize; - this.scanner = new FileCacheScanner(); - this.scanner.setDaemon(true); } /** - * Set all parameters on the cache - * - * @param initialCapacity - * the initial size of the cache as passed to HashMap - * @param loadFactor - * how full the hash table is allowed to get before increasing - * @param scanRate - * how often in seconds to refresh and evict from the cache - * @param maxSize - * the maximum allowed size of the cache before eviction starts - */ - public FileCache(int initialCapacity, int loadFactor, long scanRate, - int maxSize) - { - cache = Collections.synchronizedMap(new HashMap(initialCapacity, - loadFactor)); - - this.scanRate = scanRate; - this.maxSize = maxSize; - this.scanner = new FileCacheScanner(); - this.scanner.setDaemon(true); - } - - /** * Set the new refresh scan rate on managed files. - * - * @param scanRate - * the new scan rate in seconds + * + * @param scanRate the new scan rate in seconds */ public void setScanRate(long scanRate) { @@ -123,8 +86,8 @@ } /** - * Get the refresh scan rate - * + * Get the refresh scan rate + * * @return the current refresh scan rate in seconds */ public long getScanRate() @@ -133,118 +96,152 @@ } /** - * Set the new maximum size of the cache - * - * @param maxSize - * the maximum size of the cache - */ - public void setMaxSize(int maxSize) - { - this.maxSize = maxSize; - } - - /** - * Get the maximum size of the cache - * - * @return the current maximum size of the cache - */ - public int getMaxSize() - { - return maxSize; - } - - /** * Gets an entry from the cache given a key - * - * @param key - * the key to look up the entry by + * + * @param key the key to look up the entry by * @return the entry */ public FileCacheEntry get(String key) { - return (FileCacheEntry) cache.get(key); + FileCacheEntry entry = null; + CacheElement element = this.cache.get(key); + + if (element != null) + { + entry = (FileCacheEntry) element.getContent(); + } + + return entry; } /** * Gets an entry from the cache given a key - * - * @param key - * the key to look up the entry by + * + * @param key the key to look up the entry by * @return the entry */ public Object getDocument(String key) { - FileCacheEntry entry = (FileCacheEntry) cache.get(key); + FileCacheEntry entry = get(key); + if (entry != null) { return entry.getDocument(); } + return null; } /** * Puts a file entry in the file cache - * - * @param file - * The file to be put in the cache - * @param document - * the cached document + * + * @param file The file to be put in the cache + * @param document the cached document */ public void put(File file, Object document) throws java.io.IOException { if (!file.exists()) { throw new FileNotFoundException("File to cache: " + file.getAbsolutePath() + " does not exist."); } + FileCacheEntry entry = new FileCacheEntryImpl(file, document); - cache.put(file.getCanonicalPath(), entry); + CacheElement element = this.cache.createElement( + file.getCanonicalPath(), entry); + cache.put(element); } /** * Puts a file entry in the file cache - * - * @param path - * the full path name of the file - * @param document - * the cached document + * + * @param path the full path name of the file + * @param document the cached document */ public void put(String key, Object document, File rootFile) throws java.io.IOException { File file = new File(rootFile, key); + if (!file.exists()) { throw new FileNotFoundException("File to cache: " + file.getAbsolutePath() + " does not exist."); } + FileCacheEntry entry = new FileCacheEntryImpl(file, document); - cache.put(key, entry); + CacheElement element = this.cache.createElement(key, entry); + this.cache.put(element); } /** * Removes a file entry from the file cache - * - * @param key - * the full path name of the file + * + * @param key the full path name of the file * @return the entry removed */ public Object remove(String key) { - return cache.remove(key); + boolean removed = this.cache.remove(key); + return null; } /** - * Add a File Cache Event Listener - * - * @param listener - * the event listener + * Add a File Cache Event Listener + * + * @param listener the event listener */ - public void addListener(FileCacheEventListener listener) + public void addListener(final FileCacheEventListener listener) { - listeners.add(listener); + JetspeedCacheEventListener cacheEventListener = new JetspeedCacheEventListener() + { + + public void notifyElementRemoved(JetspeedCache cache, + boolean local, Object key, Object element) + { + } + + public void notifyElementAdded(JetspeedCache cache, boolean local, + Object key, Object element) + { + } + + public void notifyElementChanged(JetspeedCache cache, + boolean local, Object key, Object element) + { + try + { + listener.refresh((FileCacheEntry) element); + } + catch (Exception e) + { + // e.printStackTrace(); + Object[] args = new Object[] + {key}; + log.log("0600012", args, e); // REPLACED + } + } + + public void notifyElementEvicted(JetspeedCache cache, + boolean local, Object key, Object element) + { + try + { + listener.evict((FileCacheEntry) element); + } + catch (Exception e) + { + } + } + + public void notifyElementExpired(JetspeedCache cache, + boolean local, Object key, Object element) + { + } + }; + + this.cache.addEventListener(cacheEventListener, true); } /** * Start the file Scanner running at the current scan rate. - * + * */ public void startFileScanner() { try { - this.scanner.start(); } catch (java.lang.IllegalThreadStateException e) @@ -255,8 +252,8 @@ } /** - * Stop the file Scanner - * + * Stop the file Scanner + * */ public void stopFileScanner() { @@ -264,133 +261,18 @@ } /** - * Evicts entries based on last accessed time stamp - * - */ - protected void evict() - { - synchronized (cache) - { - if (this.getMaxSize() >= cache.size()) { return; } - - List list = new LinkedList(cache.values()); - Collections.sort(list, this); - - int count = 0; - int limit = cache.size() - this.getMaxSize(); - - for (Iterator it = list.iterator(); it.hasNext();) - { - if (count >= limit) - { - break; - } - - FileCacheEntry entry = (FileCacheEntry) it.next(); - String key = null; - try - { - key = entry.getFile().getCanonicalPath(); - } - catch (java.io.IOException e) - { - //log.error("Exception getting file path: ", e); - log.log("0600002", e); // REPLACED - } - // notify that eviction will soon take place - for (Iterator lit = this.listeners.iterator(); lit.hasNext();) - { - FileCacheEventListener listener = (FileCacheEventListener) lit - .next(); - try - { - listener.evict(entry); - } - catch (Exception e1) - { - //log.warn("Unable to evict cache entry. " - // + e1.toString(), e1); - Object[] args = new Object[] - {e1.toString()}; - log.log("0600003", args, e1); // REPLACED - } - } - cache.remove(key); - - count++; - } - } - } - - /** * Evicts all entries - * + * */ public void evictAll() { - synchronized (cache) - { - // evict all cache entries - List list = new LinkedList(cache.values()); - for (Iterator it = list.iterator(); it.hasNext();) - { - // evict cache entry - FileCacheEntry entry = (FileCacheEntry) it.next(); - // notify that eviction will soon take place - for (Iterator lit = this.listeners.iterator(); lit.hasNext();) - { - FileCacheEventListener listener = (FileCacheEventListener) lit - .next(); - try - { - listener.evict(entry); - } - catch (Exception e1) - { - //log.warn("Unable to evict cache entry. " - // + e1.toString(), e1); - Object[] args = new Object[] - {e1.toString()}; - log.log("0600004", args, e1); // REPLACED - } - } - // remove from cache by key - String key = null; - try - { - key = entry.getFile().getCanonicalPath(); - } - catch (java.io.IOException e) - { - //log.error("Exception getting file path: ", e); - log.log("0600005", e); // REPLACED - } - cache.remove(key); - } - } + this.cache.clear(); } /** - * Comparator function for sorting by last accessed during eviction - * + * inner class that runs as a thread to scan the cache for updates or evictions + * */ - public int compare(Object o1, Object o2) - { - FileCacheEntry e1 = (FileCacheEntry) o1; - FileCacheEntry e2 = (FileCacheEntry) o2; - if (e1.getLastAccessed() < e2.getLastAccessed()) - { - return -1; - } - else if (e1.getLastAccessed() == e2.getLastAccessed()) { return 0; } - return 1; - } - - /** - * inner class that runs as a thread to scan the cache for updates or - * evictions - * - */ protected class FileCacheScanner extends Thread { @@ -403,7 +285,7 @@ /** * Run the file scanner thread - * + * */ public void run() { @@ -415,58 +297,42 @@ { try { - int count = 0; - Collection values = FileCache.this.cache.values(); - synchronized (cache) // TODO check a performance + for (Object key : getKeys()) { - for (Iterator it = values.iterator(); it.hasNext();) + CacheElement element = cache.get(key); + + if (element != null) { - FileCacheEntry entry = (FileCacheEntry) it - .next(); - Date modified = new Date(entry.getFile() - .lastModified()); + FileCacheEntry entry = (FileCacheEntry) element + .getContent(); + File file = entry.getFile(); + Date modified = new Date(file.lastModified()); if (modified.after(entry.getLastModified())) { - for (Iterator lit = FileCache.this.listeners - .iterator(); lit.hasNext();) + FileCacheEntry updatedEntry = new FileCacheEntryImpl( + file, entry.getDocument()); + CacheElement updatedElement = cache + .createElement(key, updatedEntry); + cache.put(updatedElement); + + if (log.isDebugEnabled()) { - FileCacheEventListener listener = (FileCacheEventListener) lit - .next(); - try - { - listener.refresh(entry); - } - catch (Exception e1) - { - //log - // .warn( - // "Unable to refresh cached document: " - // + e1 - // .toString(), - // e1); - Object[] args = new Object[] - {e1.toString()}; - log.log("0600006", args, e1); // REPLACED - } - entry.setLastModified(modified); + // log.debug("page file has been updated: " + key); + Object[] args = new Object[] + {key}; + log.log("0600009", args); // REPLACED } } - count++; } } - if (count > FileCache.this.getMaxSize()) - { - FileCache.this.evict(); - } } catch (Exception e) { - //log - // .error( - // "FileCache Scanner: Error in iteration...", - // e); - log.log("0600007", e); // REPLACED + // log.error("FileCache Scanner: Error in iteration...", e); + Object[] args = new Object[] + {}; + log.log("0600010", args, e); // REPLACED } sleep(FileCache.this.getScanRate() * 1000); @@ -480,30 +346,31 @@ } catch (InterruptedException e) { - //log.error("FileCacheScanner: recieved interruption, exiting.", - // e); - log.log("0600008", e); // REPLACED + // log.error("FileCacheScanner: recieved interruption, exiting.", e); + Object[] args = new Object[] + {}; + log.log("0600011", args, e); // REPLACED } } - } // end inner class: FileCacheScanner + } // end inner class: FileCacheScanner /** * get an iterator over the cache values - * + * * @return iterator over the cache values */ - public Iterator getIterator() + public List getKeys() { - return cache.values().iterator(); + return cache.getKeys(); } /** * get the size of the cache - * + * * @return the size of the cache */ public int getSize() { - return cache.size(); + return cache.getSize(); } } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/file-cache/src/java/org/apache/jetspeed/cache/file/FileCacheEntryImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/file-cache/src/java/org/apache/jetspeed/cache/file/FileCacheEntryImpl.java 2008-10-30 03:04:55 UTC (rev 1262) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/file-cache/src/java/org/apache/jetspeed/cache/file/FileCacheEntryImpl.java 2008-10-30 06:10:05 UTC (rev 1263) @@ -18,6 +18,7 @@ package org.apache.jetspeed.cache.file; import java.io.File; +import java.io.Serializable; import java.util.Date; /** @@ -27,7 +28,7 @@ * @version $Id: FileCacheEntryImpl.java 516448 2007-03-09 16:25:47Z ate $ */ -public class FileCacheEntryImpl implements FileCacheEntry +public class FileCacheEntryImpl implements FileCacheEntry, Serializable { protected File file; Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/file-cache/src/test/org/apache/jetspeed/cache/file/TestFileCache.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/file-cache/src/test/org/apache/jetspeed/cache/file/TestFileCache.java 2008-10-30 03:04:55 UTC (rev 1262) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/file-cache/src/test/org/apache/jetspeed/cache/file/TestFileCache.java 2008-10-30 06:10:05 UTC (rev 1263) @@ -21,7 +21,7 @@ import java.io.File; import java.io.FileInputStream; import java.util.Date; -import java.util.Iterator; +import java.util.List; import junit.framework.Test; import junit.framework.TestCase; @@ -66,7 +66,7 @@ { super.setUp(); - cache = new FileCache(SCAN_RATE, CACHE_SIZE); + cache = new FileCache(null, SCAN_RATE); } /** @@ -113,7 +113,7 @@ assertTrue(cache.getSize() == 31); - dumpCache(cache.getIterator()); + dumpCache(cache.getKeys()); cache.addListener(this); @@ -124,7 +124,7 @@ assertTrue(cache.getSize() == 20); - dumpCache(cache.getIterator()); + dumpCache(cache.getKeys()); // Reload files array to get the files back in the correct order // because the cache CAN have reordered them while evicting. @@ -135,11 +135,11 @@ // Note: this is only an issue for the test itself and not for the // cache as such. - Iterator it = cache.getIterator(); - for (int ix = 0; it.hasNext(); ix++) + int ix = 0; + for (Object key : cache.getKeys()) { - FileCacheEntry entry = (FileCacheEntry) it.next(); - files[ix] = entry.getFile(); + FileCacheEntry entry = (FileCacheEntry) cache.get((String) key); + files[ix++] = entry.getFile(); } String stuff = (String) cache.getDocument(files[18] @@ -227,11 +227,11 @@ System.out.println("entry is evicting: " + entry.getFile().getName()); } - private void dumpCache(Iterator it) + private void dumpCache(List keys) { - for (; it.hasNext();) + for (Object key : keys) { - FileCacheEntry entry = (FileCacheEntry) it.next(); + FileCacheEntry entry = (FileCacheEntry) cache.get((String) key); System.out.println(entry.getFile().getName()); } } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/test/org/apache/jetspeed/page/PageManagerTestShared.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/test/org/apache/jetspeed/page/PageManagerTestShared.java 2008-10-30 03:04:55 UTC (rev 1262) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/test/org/apache/jetspeed/page/PageManagerTestShared.java 2008-10-30 06:10:05 UTC (rev 1263) @@ -135,7 +135,7 @@ dirHelper.copyFrom(webappPagesDirFile, noCVSorSVNorBackups); IdGenerator idGen = new JetspeedIdGenerator(65536, "P-", ""); - FileCache cache = new FileCache(10, 12); + FileCache cache = new FileCache(null, 10); DocumentHandler psmlHandler = new CastorFileSystemDocumentHandler( "/JETSPEED-INF/castor/page-mapping.xml", Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/test/org/apache/jetspeed/page/document/psml/TestCastorFileSystemDocumentHandler.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/test/org/apache/jetspeed/page/document/psml/TestCastorFileSystemDocumentHandler.java 2008-10-30 03:04:55 UTC (rev 1262) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/test/org/apache/jetspeed/page/document/psml/TestCastorFileSystemDocumentHandler.java 2008-10-30 06:10:05 UTC (rev 1263) @@ -58,7 +58,7 @@ folderMetaDataDocumentHandler = new CastorFileSystemDocumentHandler( "/JETSPEED-INF/castor/page-mapping.xml", "folder.metadata", - FolderMetaDataImpl.class, "testdata/pages", new FileCache()); + FolderMetaDataImpl.class, "testdata/pages", new FileCache(null)); Map handlerMap = new HashMap(); handlerMap.put("folder.metadata", folderMetaDataDocumentHandler); Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/etc/db-ojb/ehcache.xml =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/etc/db-ojb/ehcache.xml 2008-10-30 03:04:55 UTC (rev 1262) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/etc/db-ojb/ehcache.xml 2008-10-30 06:10:05 UTC (rev 1263) @@ -521,4 +521,24 @@ memoryStoreEvictionPolicy="LFU" /> + + + + Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/cache/JetspeedCache.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/cache/JetspeedCache.java 2008-10-30 03:04:55 UTC (rev 1262) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/cache/JetspeedCache.java 2008-10-30 06:10:05 UTC (rev 1263) @@ -16,6 +16,8 @@ */ package org.apache.jetspeed.cache; +import java.util.List; + import org.apache.jetspeed.request.RequestContext; /** @@ -129,4 +131,18 @@ void addEventListener(JetspeedCacheEventListener listener, boolean local); void removeEventListener(JetspeedCacheEventListener listener, boolean local); + + /** + * Returns a list of all elements in the cache, whether or not they are expired. + * The returned keys are unique and can be considered a set. + * @return the list of keys + */ + List getKeys(); + + /** + * get the size of the cache + * + * @return the size of the cache + */ + int getSize(); } \ No newline at end of file Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/cache.xml =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/cache.xml 2008-10-30 03:04:55 UTC (rev 1262) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/cache.xml 2008-10-30 06:10:05 UTC (rev 1263) @@ -213,4 +213,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/importer-page-manager.xml =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/importer-page-manager.xml 2008-10-30 03:04:55 UTC (rev 1262) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/importer-page-manager.xml 2008-10-30 06:10:05 UTC (rev 1263) @@ -96,13 +96,13 @@ - + - 10 + - + - 100 + ${page.file.cache.scanRate} Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/jetspeed-base.xml =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/jetspeed-base.xml 2008-10-30 03:04:55 UTC (rev 1262) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/jetspeed-base.xml 2008-10-30 06:10:05 UTC (rev 1263) @@ -36,13 +36,13 @@ - + - 10 + - + - 100 + ${page.file.cache.scanRate} Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/conf/jetspeed.properties =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/conf/jetspeed.properties 2008-10-30 03:04:55 UTC (rev 1262) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/conf/jetspeed.properties 2008-10-30 06:10:05 UTC (rev 1263) @@ -233,3 +233,7 @@ # Registration default profiling rules assigned during registration or new user creation # comma separated list registration.rules.default = + +# Page file cache +page.file.cache.scanRate=10 + From svnnotify @ sourceforge.jp Thu Oct 30 15:33:37 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Thu, 30 Oct 2008 15:33:37 +0900 Subject: [pal-cvs 3530] [1264] ignore exception. Message-ID: <1225348417.675446.20695.nullmailer@users.sourceforge.jp> Revision: 1264 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1264 Author: shinsuke Date: 2008-10-30 15:33:37 +0900 (Thu, 30 Oct 2008) Log Message: ----------- ignore exception. Modified Paths: -------------- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/services/title/DynamicTitleServiceImpl.java -------------- next part -------------- Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/services/title/DynamicTitleServiceImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/services/title/DynamicTitleServiceImpl.java 2008-10-30 06:10:05 UTC (rev 1263) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/services/title/DynamicTitleServiceImpl.java 2008-10-30 06:33:37 UTC (rev 1264) @@ -81,17 +81,25 @@ NavigationalState navState = requestContext.getPortalURL() .getNavigationalState(); WindowState windowState = navState.getState(window); - HttpSession session = request.getSession(); - if (!windowState.equals(WindowState.MINIMIZED)) + try { - String title = (String) request.getAttribute(key); - session.setAttribute(key, title); - return title; + HttpSession session = request.getSession(); + if (!windowState.equals(WindowState.MINIMIZED)) + { + String title = (String) request.getAttribute(key); + session.setAttribute(key, title); + return title; + } + else + { + String title = (String) session.getAttribute(key); + if (title != null) { return title; } + return (String) request.getAttribute(key); + } } - else + catch (Exception e) { - String title = (String) session.getAttribute(key); - if (title != null) { return title; } + // ignore exception return (String) request.getAttribute(key); } } From svnnotify @ sourceforge.jp Thu Oct 30 16:01:34 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Thu, 30 Oct 2008 16:01:34 +0900 Subject: [pal-cvs 3531] [1265] moved a location to get a file timestamp. Message-ID: <1225350094.286492.16531.nullmailer@users.sourceforge.jp> Revision: 1265 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1265 Author: shinsuke Date: 2008-10-30 16:01:34 +0900 (Thu, 30 Oct 2008) Log Message: ----------- moved a location to get a file timestamp. Modified Paths: -------------- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/deployment/impl/StandardDeploymentManager.java -------------- next part -------------- Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/deployment/impl/StandardDeploymentManager.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/deployment/impl/StandardDeploymentManager.java 2008-10-30 06:33:37 UTC (rev 1264) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/deployment/impl/StandardDeploymentManager.java 2008-10-30 07:01:34 UTC (rev 1265) @@ -246,6 +246,7 @@ File aFile = stagedFiles[i]; if (aFile.isFile() && !ignoreFile(aFile)) { + Long lastModified = Long.valueOf(aFile.lastModified()); DeploymentStatus status = null; Exception de = null; try @@ -310,8 +311,7 @@ } // DONE Findbugs // ignoredFiles.put(aFile.getAbsolutePath(), new Long(aFile - ignoredFiles.put(aFile.getAbsolutePath(), Long - .valueOf(aFile.lastModified())); + ignoredFiles.put(aFile.getAbsolutePath(), lastModified); } } } From svnnotify @ sourceforge.jp Thu Oct 30 17:12:16 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Thu, 30 Oct 2008 17:12:16 +0900 Subject: [pal-cvs 3532] [1266] Created Japanese Message File. Message-ID: <1225354336.666619.17797.nullmailer@users.sourceforge.jp> Revision: 1266 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1266 Author: takakura Date: 2008-10-30 17:12:16 +0900 (Thu, 30 Oct 2008) Log Message: ----------- Created Japanese Message File. Added Paths: ----------- vfs-portlets/trunk/src/main/resources/application_ja.properties -------------- next part -------------- Added: vfs-portlets/trunk/src/main/resources/application_ja.properties =================================================================== --- vfs-portlets/trunk/src/main/resources/application_ja.properties (rev 0) +++ vfs-portlets/trunk/src/main/resources/application_ja.properties 2008-10-30 08:12:16 UTC (rev 1266) @@ -0,0 +1,37 @@ +errors.invalid={0} \u306b\u306f\u6b63\u3057\u3044\u5f62\u5f0f\u306e\u30c7\u30fc\u30bf\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +errors.maxlength={0} \u306f {1} \u6587\u5b57\u4ee5\u4e0b\u3067\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 +errors.minlength={0} \u306f {1} \u6587\u5b57\u4ee5\u4e0a\u5165\u529b\u3057\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 +errors.maxbytelength={0} \u306e\u30b5\u30a4\u30ba\u306f {1} \u30d0\u30a4\u30c8\u4ee5\u4e0b\u3067\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 +errors.minbytelength={0} \u306e\u30b5\u30a4\u30ba\u306f {1} \u30d0\u30a4\u30c8\u4ee5\u4e0b\u3067\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 +errors.range={0} \u306f {1} \u304b\u3089 {2} \u306e\u9593\u3067\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 +errors.required={0} \u306f\u5fc5\u305a\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +errors.required.other={0} \u306f\u5fc5\u305a\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002({1}) +errors.byte={0} \u306f\u30d0\u30a4\u30c8\u5f62\u5f0f\u306e\u30c7\u30fc\u30bf\u3067\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 +errors.date={0} \u306f\u65e5\u4ed8\u5f62\u5f0f\u306e\u30c7\u30fc\u30bf\u3067\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 +errors.double={0} \u306f\u6d6e\u52d5\u5c0f\u6570\u70b9\u578b (double \u578b) \u3067\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 +errors.float={0} \u306f\u6d6e\u52d5\u5c0f\u6570\u70b9\u578b (float \u578b) \u3067\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 +errors.integer={0} \u306f\u6574\u6570\u578b (2147483647 \u4ee5\u4e0b\u306e\u6574\u6570) \u3067\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 +errors.long={0} \u306f\u6574\u6570\u578b (9223372036854775807 \u4ee5\u4e0b\u306e\u6574\u6570) \u3067\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 +errors.short={0} \u306f\u6574\u6570\u578b (32767 \u4ee5\u4e0b\u306e\u6574\u6570) \u3067\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 +errors.creditcard={0} \u306f\u6b63\u3057\u3044\u30af\u30ec\u30b8\u30c3\u30c8\u30ab\u30fc\u30c9\u756a\u53f7\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002 +errors.email={0} \u306f\u6b63\u3057\u3044\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002 +errors.url={0} \u306f\u6b63\u3057\u3044 URL (\u30db\u30fc\u30e0\u30da\u30fc\u30b8\u306e\u30a2\u30c9\u30ec\u30b9) \u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002 + +errors.failed_to_update_config=\u8a2d\u5b9a\u306e\u66f4\u65b0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +errors.access_denied=\u30a2\u30af\u30bb\u30b9\u306f\u62d2\u5426\u3055\u308c\u307e\u3057\u305f\u3002 +errors.file_system_error=\u30d5\u30a1\u30a4\u30eb\u30b7\u30b9\u30c6\u30e0\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002 +errors.failed_to_create_folder=\u30d5\u30a9\u30eb\u30c0\u306e\u4f5c\u6210\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +errors.invalid_access=\u4e0d\u6b63\u306a\u30a2\u30af\u30bb\u30b9\u3067\u3059\u3002 +errors.file_exist={0} \u304c\u3042\u308a\u307e\u305b\u3093\u3002\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9\u3059\u308b\u524d\u306b\u524a\u9664\u3057\u306a\u3044\u3067\u304f\u3060\u3055\u3044\u3002 +errors.failed_to_upload_file=\u30d5\u30a1\u30a4\u30eb\u306e\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +errors.file_not_found={0} \u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002 +errors.invalid_user=\u767b\u9332\u3055\u308c\u3066\u3044\u306a\u3044\u30e6\u30fc\u30b6\u304b\u3089\u306e\u30a2\u30af\u30bb\u30b9\u306f\u62d2\u5426\u3055\u308c\u3066\u3044\u307e\u3059\u3002 +errors.failed_to_delete_folder=\u30d5\u30a9\u30eb\u30c0\u306e\u524a\u9664\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +errors.failed_to_delete_file=\u30d5\u30a1\u30a4\u30eb\u306e\u524a\u9664\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +errors.unknow_object={0} \u306f\u672a\u77e5\u306e\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u3067\u3059\u3002 + +success.update_config=\u8a2d\u5b9a\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002 +success.create_folder=\u65b0\u898f\u30d5\u30a9\u30eb\u30c0\u3092\u4f5c\u6210\u3057\u307e\u3057\u305f\u3002 +success.upload_file=\u30d5\u30a1\u30a4\u30eb\u3092\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9\u3057\u307e\u3057\u305f\u3002 +success.delete_folder=\u30d5\u30a9\u30eb\u30c0\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 +success.delete_file=\u30d5\u30a1\u30a4\u30eb\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 Property changes on: vfs-portlets/trunk/src/main/resources/application_ja.properties ___________________________________________________________________ Name: svn:mime-type + text/plain From svnnotify @ sourceforge.jp Fri Oct 31 10:36:52 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Fri, 31 Oct 2008 10:36:52 +0900 Subject: [pal-cvs 3533] [1267] mt-safe. Message-ID: <1225417012.311713.9063.nullmailer@users.sourceforge.jp> Revision: 1267 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1267 Author: shinsuke Date: 2008-10-31 10:36:52 +0900 (Fri, 31 Oct 2008) Log Message: ----------- mt-safe. Modified Paths: -------------- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/om/folder/proxy/FolderProxy.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteRequestContextImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteView.java -------------- next part -------------- Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/om/folder/proxy/FolderProxy.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/om/folder/proxy/FolderProxy.java 2008-10-30 08:12:16 UTC (rev 1266) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/om/folder/proxy/FolderProxy.java 2008-10-31 01:36:52 UTC (rev 1267) @@ -971,43 +971,47 @@ // search for existing folders along search paths List searchPaths = getView().getSearchPaths(); searchFolders = new ArrayList(searchPaths.size()); - Iterator pathsIter = searchPaths.iterator(); - while (pathsIter.hasNext()) + synchronized (searchPaths) { - // construct folder paths - SiteViewSearchPath searchPath = (SiteViewSearchPath) pathsIter - .next(); - String path = searchPath.toString(); - if (!path.equals(Folder.PATH_SEPARATOR)) + Iterator pathsIter = searchPaths.iterator(); + while (pathsIter.hasNext()) { - path += getPath(); - } - else - { - path = getPath(); - } + // construct folder paths + SiteViewSearchPath searchPath = (SiteViewSearchPath) pathsIter + .next(); + String path = searchPath.toString(); + if (!path.equals(Folder.PATH_SEPARATOR)) + { + path += getPath(); + } + else + { + path = getPath(); + } - // get existing folders from PageManager, create - // corresponding search folder objects, and add to - // search folders list - try - { - Folder folder = getView().getPageManager().getFolder(path); - if (folder != null) + // get existing folders from PageManager, create + // corresponding search folder objects, and add to + // search folders list + try { - searchFolders.add(new SearchFolder(folder, searchPath - .getLocatorName())); + Folder folder = getView().getPageManager().getFolder( + path); + if (folder != null) + { + searchFolders.add(new SearchFolder(folder, + searchPath.getLocatorName())); + } } + catch (NodeException ne) + { + } + catch (NodeNotFoundException ne) + { + } + catch (SecurityException se) + { + } } - catch (NodeException ne) - { - } - catch (NodeNotFoundException ne) - { - } - catch (SecurityException se) - { - } } } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteRequestContextImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteRequestContextImpl.java 2008-10-30 08:12:16 UTC (rev 1266) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteRequestContextImpl.java 2008-10-31 01:36:52 UTC (rev 1267) @@ -559,8 +559,7 @@ if (sessionContext.getMenuDefinitionLocatorCache() == null) { sessionContext - .setMenuDefinitionLocatorCache(Collections - .synchronizedMap(new HashMap(8))); + .setMenuDefinitionLocatorCache(new HashMap(8)); } sessionContext.getMenuDefinitionLocatorCache().put(locator, menu); Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java 2008-10-30 08:12:16 UTC (rev 1266) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java 2008-10-31 01:36:52 UTC (rev 1267) @@ -19,6 +19,7 @@ import java.io.Serializable; import java.security.AccessController; import java.security.Principal; +import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -155,8 +156,8 @@ */ public PortalSiteRequestContext newRequestContext(Map requestProfileLocators) { - return new PortalSiteRequestContextImpl(this, requestProfileLocators, - true, true); + return new PortalSiteRequestContextImpl(this, Collections + .synchronizedMap(requestProfileLocators), true, true); } /** @@ -172,8 +173,8 @@ public PortalSiteRequestContext newRequestContext( Map requestProfileLocators, boolean requestFallback) { - return new PortalSiteRequestContextImpl(this, requestProfileLocators, - requestFallback, true); + return new PortalSiteRequestContextImpl(this, Collections + .synchronizedMap(requestProfileLocators), requestFallback, true); } /** @@ -237,8 +238,11 @@ // all locators should have identical request paths, (do // not execute profile locator though to determine path: // simply use the request path) - locator = (ProfileLocator) requestProfileLocators.values() - .iterator().next(); + synchronized (requestProfileLocators) + { + locator = (ProfileLocator) requestProfileLocators.values() + .iterator().next(); + } requestPath = locator.getRequestPath(); } @@ -314,18 +318,20 @@ // clear all history entries for fallback // request path in advance to make fallback // page selection more predictable - Iterator folderIter = getFolderPageHistory().keySet() - .iterator(); - while (folderIter.hasNext()) + Map fphMap = getFolderPageHistory(); + Iterator folderIter = fphMap.keySet().iterator(); + synchronized (fphMap) { - Folder folder = (Folder) folderIter.next(); - if (folder.getUrl().equals(fallbackRequestPath)) + while (folderIter.hasNext()) { - folderIter.remove(); - break; + Folder folder = (Folder) folderIter.next(); + if (folder.getUrl().equals(fallbackRequestPath)) + { + folderIter.remove(); + break; + } } } - // retry requested page access requestPath = fallbackRequestPath; } @@ -875,25 +881,28 @@ if (profileLocators != null) { boolean firstEntry = true; - Iterator entriesIter = profileLocators.entrySet() - .iterator(); - while (entriesIter.hasNext()) + synchronized (profileLocators) { - Map.Entry entry = (Map.Entry) entriesIter.next(); - String locatorName = (String) entry.getKey(); - ProfileLocator locator = (ProfileLocator) entry - .getValue(); - if (!firstEntry) + Iterator entriesIter = profileLocators.entrySet() + .iterator(); + while (entriesIter.hasNext()) { - debug.append(","); + Map.Entry entry = (Map.Entry) entriesIter.next(); + String locatorName = (String) entry.getKey(); + ProfileLocator locator = (ProfileLocator) entry + .getValue(); + if (!firstEntry) + { + debug.append(","); + } + else + { + firstEntry = false; + } + debug.append(locatorName); + debug.append("="); + debug.append(locator.toString()); } - else - { - firstEntry = false; - } - debug.append(locatorName); - debug.append("="); - debug.append(locator.toString()); } } else @@ -948,8 +957,11 @@ if ((siteView == null) && (pageManager != null) && (profileLocators != null)) { - // create new site view - siteView = new SiteView(pageManager, profileLocators); + synchronized (this) + { + // create new site view + siteView = new SiteView(pageManager, profileLocators); + } // log site view creation if (log.isDebugEnabled()) @@ -1065,7 +1077,6 @@ */ public Map getMenuDefinitionLocatorCache() { - // TODO Findbugs return menuDefinitionLocatorCache; } @@ -1077,7 +1088,7 @@ */ public void setMenuDefinitionLocatorCache(Map cache) { - menuDefinitionLocatorCache = cache; + menuDefinitionLocatorCache = Collections.synchronizedMap(cache); } /** @@ -1098,49 +1109,52 @@ // compare locator map sizes if (locators0.size() != locators1.size()) { return false; } - // compare locator map entries - Iterator entriesIter = locators0.entrySet().iterator(); - if (entriesIter.hasNext()) + synchronized (locators0) { - Map.Entry entry = (Map.Entry) entriesIter.next(); - ProfileLocator locator0 = (ProfileLocator) entry.getValue(); - ProfileLocator locator1 = (ProfileLocator) locators1.get(entry - .getKey()); - if (locator1 == null) { return false; } - - // compare locators using the most specific, - // (i.e. first), locator properties array - // returned by the locator iterator - ProfileLocatorProperty[] properties0 = (ProfileLocatorProperty[]) locator0 - .iterator().next(); - ProfileLocatorProperty[] properties1 = (ProfileLocatorProperty[]) locator1 - .iterator().next(); - if ((properties0 != null) || (properties1 != null)) + // compare locator map entries + Iterator entriesIter = locators0.entrySet().iterator(); + if (entriesIter.hasNext()) { - if ((properties0 == null) || (properties1 == null) - || (properties0.length != properties1.length)) { return false; } + Map.Entry entry = (Map.Entry) entriesIter.next(); + ProfileLocator locator0 = (ProfileLocator) entry.getValue(); + ProfileLocator locator1 = (ProfileLocator) locators1.get(entry + .getKey()); + if (locator1 == null) { return false; } - // compare ordered locator properties - for (int i = 0, limit = properties0.length; (i < limit); i++) + // compare locators using the most specific, + // (i.e. first), locator properties array + // returned by the locator iterator + ProfileLocatorProperty[] properties0 = (ProfileLocatorProperty[]) locator0 + .iterator().next(); + ProfileLocatorProperty[] properties1 = (ProfileLocatorProperty[]) locator1 + .iterator().next(); + if ((properties0 != null) || (properties1 != null)) { - // compare property names, control flags, navigation flags, - // and values. note: properties values are compared only for - // control or navigation properties; otherwise they are - // assumed to contain variable request paths that should - // be treated as equivalent - if (!properties0[i].getName().equals( - properties1[i].getName()) - || (properties0[i].isControl() && !properties1[i] - .isControl()) - || (properties0[i].isNavigation() && !properties1[i] - .isNavigation()) - || ((properties0[i].isControl() || properties0[i] - .isNavigation()) && (((properties0[i] - .getValue() == null) && (properties1[i] - .getValue() != null)) || ((properties0[i] - .getValue() != null) && !properties0[i] - .getValue().equals( - properties1[i].getValue()))))) { return false; } + if ((properties0 == null) || (properties1 == null) + || (properties0.length != properties1.length)) { return false; } + + // compare ordered locator properties + for (int i = 0, limit = properties0.length; (i < limit); i++) + { + // compare property names, control flags, navigation flags, + // and values. note: properties values are compared only for + // control or navigation properties; otherwise they are + // assumed to contain variable request paths that should + // be treated as equivalent + if (!properties0[i].getName().equals( + properties1[i].getName()) + || (properties0[i].isControl() && !properties1[i] + .isControl()) + || (properties0[i].isNavigation() && !properties1[i] + .isNavigation()) + || ((properties0[i].isControl() || properties0[i] + .isNavigation()) && (((properties0[i] + .getValue() == null) && (properties1[i] + .getValue() != null)) || ((properties0[i] + .getValue() != null) && !properties0[i] + .getValue().equals( + properties1[i].getValue()))))) { return false; } + } } } } @@ -1374,7 +1388,7 @@ { if (folderPageHistory == null) { - folderPageHistory = new HashMap(); + folderPageHistory = Collections.synchronizedMap(new HashMap()); } return folderPageHistory; } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteView.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteView.java 2008-10-30 08:12:16 UTC (rev 1266) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteView.java 2008-10-31 01:36:52 UTC (rev 1267) @@ -17,6 +17,7 @@ package org.apache.jetspeed.portalsite.view; import java.util.ArrayList; +import java.util.Collections; import java.util.HashSet; import java.util.Iterator; import java.util.List; @@ -146,7 +147,8 @@ if ((searchPaths != null) && !searchPaths.isEmpty()) { // validate search path format and existence - this.searchPaths = new ArrayList(searchPaths.size()); + this.searchPaths = Collections.synchronizedList(new ArrayList( + searchPaths.size())); StringBuffer searchPathsStringBuffer = new StringBuffer(); Iterator pathsIter = searchPaths.iterator(); while (pathsIter.hasNext()) @@ -350,18 +352,22 @@ { // DONE Findbugs // Iterator locatorNameIter = locators.keySet().iterator(); - Iterator locatorNameIter = locators.entrySet().iterator(); - while (locatorNameIter.hasNext()) + synchronized (locators) { - Map.Entry _entry = (Map.Entry) locatorNameIter.next(); - // String locatorName = (String) locatorNameIter.next(); - String locatorName = (String) _entry.getKey(); - if (!locatorName.equals(ProfileLocator.PAGE_LOCATOR)) + Iterator locatorNameIter = locators.entrySet().iterator(); + while (locatorNameIter.hasNext()) { - // add alternate locator search paths - mergeSearchPathList(locatorName, - // (ProfileLocator) locators.get(locatorName), - (ProfileLocator) _entry.getValue(), searchPaths); + Map.Entry _entry = (Map.Entry) locatorNameIter.next(); + // String locatorName = (String) locatorNameIter.next(); + String locatorName = (String) _entry.getKey(); + if (!locatorName.equals(ProfileLocator.PAGE_LOCATOR)) + { + // add alternate locator search paths + mergeSearchPathList(locatorName, + // (ProfileLocator) locators.get(locatorName), + (ProfileLocator) _entry.getValue(), + searchPaths); + } } } } From svnnotify @ sourceforge.jp Fri Oct 31 11:13:43 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Fri, 31 Oct 2008 11:13:43 +0900 Subject: [pal-cvs 3534] [1268] do not put a root folder in session. Message-ID: <1225419223.642880.8308.nullmailer@users.sourceforge.jp> Revision: 1268 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1268 Author: shinsuke Date: 2008-10-31 11:13:43 +0900 (Fri, 31 Oct 2008) Log Message: ----------- do not put a root folder in session. Modified Paths: -------------- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteView.java -------------- next part -------------- Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteView.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteView.java 2008-10-31 01:36:52 UTC (rev 1267) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteView.java 2008-10-31 02:13:43 UTC (rev 1268) @@ -129,11 +129,6 @@ private String searchPathsString; /** - * rootFolderProxy - root folder proxy instance - */ - private Folder rootFolderProxy; - - /** * SiteView - validating constructor * * @param pageManager @@ -704,39 +699,38 @@ public Folder getRootFolderProxy() throws FolderNotFoundException { // latently construct and return root folder proxy - if (rootFolderProxy == null) + Folder rootFolderProxy = null; + try { - try - { - // the folder and profile locator name of the root - // folder proxy in the view is the locator name of the - // first search path since search paths are valid - SiteViewSearchPath searchPath = (SiteViewSearchPath) searchPaths - .get(0); - String path = searchPath.toString(); - String locatorName = searchPath.getLocatorName(); + // the folder and profile locator name of the root + // folder proxy in the view is the locator name of the + // first search path since search paths are valid + SiteViewSearchPath searchPath = (SiteViewSearchPath) searchPaths + .get(0); + String path = searchPath.toString(); + String locatorName = searchPath.getLocatorName(); - // get concrete root folder from page manager - // and construct proxy - Folder rootFolder = pageManager.getFolder(path); - rootFolderProxy = FolderProxy.newInstance(this, locatorName, - null, rootFolder); - } - catch (NodeException ne) - { - FolderNotFoundException fnfe = new FolderNotFoundException( - "Root folder not found"); - fnfe.initCause(ne); - throw fnfe; - } - catch (NodeNotFoundException nnfe) - { - FolderNotFoundException fnfe = new FolderNotFoundException( - "Root folder not found"); - fnfe.initCause(nnfe); - throw fnfe; - } + // get concrete root folder from page manager + // and construct proxy + Folder rootFolder = pageManager.getFolder(path); + rootFolderProxy = FolderProxy.newInstance(this, locatorName, null, + rootFolder); } + catch (NodeException ne) + { + FolderNotFoundException fnfe = new FolderNotFoundException( + "Root folder not found"); + fnfe.initCause(ne); + throw fnfe; + } + catch (NodeNotFoundException nnfe) + { + FolderNotFoundException fnfe = new FolderNotFoundException( + "Root folder not found"); + fnfe.initCause(nnfe); + throw fnfe; + } + return rootFolderProxy; } From svnnotify @ sourceforge.jp Fri Oct 31 11:46:04 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Fri, 31 Oct 2008 11:46:04 +0900 Subject: [pal-cvs 3535] [1269] clean up error messages. Message-ID: <1225421164.343601.3265.nullmailer@users.sourceforge.jp> Revision: 1269 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1269 Author: shinsuke Date: 2008-10-31 11:46:04 +0900 (Fri, 31 Oct 2008) Log Message: ----------- clean up error messages. Modified Paths: -------------- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/resources/ContentFragmentResources.properties pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/resources/ContentFragmentResources_en.properties pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/resources/ContentFragmentResources_ja.properties pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/RenderingJobImpl.java -------------- next part -------------- Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/resources/ContentFragmentResources.properties =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/resources/ContentFragmentResources.properties 2008-10-31 02:13:43 UTC (rev 1268) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/resources/ContentFragmentResources.properties 2008-10-31 02:46:04 UTC (rev 1269) @@ -1,5 +1,4 @@ portlet.is.not.available=This content is not available now. Please try again later. -could.not.render.portlet=Sorry. Could not render this content. Please contact to a site administrator. could.not.access.portlet=Sorry, but we were unable access the requested content. Please contact to a site administrator. out.of.service=The content is not responding and has been taken out of service. -access.denied=Access denied. \ No newline at end of file +access.denied=Access denied. Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/resources/ContentFragmentResources_en.properties =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/resources/ContentFragmentResources_en.properties 2008-10-31 02:13:43 UTC (rev 1268) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/resources/ContentFragmentResources_en.properties 2008-10-31 02:46:04 UTC (rev 1269) @@ -1,5 +1,4 @@ portlet.is.not.available=This content is not available now. Please try again later. -could.not.render.portlet=Sorry. Could not render this content. Please contact to a site administrator. could.not.access.portlet=Sorry, but we were unable access the requested content. Please contact to a site administrator. out.of.service=The content is not responding and has been taken out of service. -access.denied=Access denied. \ No newline at end of file +access.denied=Access denied. Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/resources/ContentFragmentResources_ja.properties =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/resources/ContentFragmentResources_ja.properties 2008-10-31 02:13:43 UTC (rev 1268) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/resources/ContentFragmentResources_ja.properties 2008-10-31 02:46:04 UTC (rev 1269) @@ -1,5 +1,4 @@ portlet.is.not.available=\u73fe\u5728\u3001\u3053\u306e\u30b3\u30f3\u30c6\u30f3\u30c4\u306f\u5229\u7528\u53ef\u80fd\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002\u5f8c\u3067\u518d\u5ea6\u304a\u8a66\u3057\u304f\u3060\u3055\u3044\u3002 -could.not.render.portlet=\u3053\u306e\u30b3\u30f3\u30c6\u30f3\u30c4\u3092\u8868\u793a\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u30b5\u30a4\u30c8\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 could.not.access.portlet=\u3053\u306e\u30b3\u30f3\u30c6\u30f3\u30c4\u306b\u30a2\u30af\u30bb\u30b9\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u30b5\u30a4\u30c8\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 out.of.service=\u3053\u306e\u30b3\u30f3\u30c6\u30f3\u30c4\u306f\u30b5\u30fc\u30d3\u30b9\u505c\u6b62\u4e2d\u3067\u3059\u3002 access.denied=\u3053\u306e\u30b3\u30f3\u30c6\u30f3\u30c4\u306b\u30a2\u30af\u30bb\u30b9\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002 Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java 2008-10-31 02:13:43 UTC (rev 1268) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java 2008-10-31 02:46:04 UTC (rev 1269) @@ -254,7 +254,7 @@ {e.toString()}; log.log("1200011", args); // REPLACED - fragment.overrideRenderedContent("could.not.render.portlet"); + fragment.overrideRenderedContent("could.not.access.portlet"); } } @@ -307,7 +307,7 @@ {e.toString()}; log.log("1200012", args, e); // REPLACED - fragment.overrideRenderedContent("could.not.render.portlet"); + fragment.overrideRenderedContent("could.not.access.portlet"); } if (job != null) @@ -414,7 +414,7 @@ e1); } job.getFragment().overrideRenderedContent( - "could.not.render.portlet"); + "could.not.access.portlet"); } } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/RenderingJobImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/RenderingJobImpl.java 2008-10-31 02:13:43 UTC (rev 1268) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/RenderingJobImpl.java 2008-10-31 02:46:04 UTC (rev 1269) @@ -340,7 +340,7 @@ Object[] args = new Object[] {curWindow.getId()}; log.log("1200019", args, t); // REPLACED - fragment.overrideRenderedContent("could.not.render.portlet"); + fragment.overrideRenderedContent("could.not.access.portlet"); } } finally From svnnotify @ sourceforge.jp Fri Oct 31 15:06:34 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Fri, 31 Oct 2008 15:06:34 +0900 Subject: [pal-cvs 3536] [1270] updated styles. Message-ID: <1225433194.773263.17371.nullmailer@users.sourceforge.jp> Revision: 1270 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1270 Author: shinsuke Date: 2008-10-31 15:06:34 +0900 (Fri, 31 Oct 2008) Log Message: ----------- updated styles. Modified Paths: -------------- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/portlet/default/css/PLT-C.css pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/portlet/default/css/pal-extension.css -------------- next part -------------- Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/portlet/default/css/PLT-C.css =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/portlet/default/css/PLT-C.css 2008-10-31 02:46:04 UTC (rev 1269) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/portlet/default/css/PLT-C.css 2008-10-31 06:06:34 UTC (rev 1270) @@ -200,18 +200,17 @@ } .default .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; +border: 1px solid #cccccc; +background-color: #e8e8e8; +padding:5px; +margin:0; +font-weight: bold; +font-size:11pt; +color:#003366; clear: both; } .default .portlet-section-body { - background: #efefef; border: none; padding: 2px 3px; text-align: left; @@ -220,7 +219,7 @@ } .default .portlet-section-alternate { - background: #ddd; + background: #fffff8; border: none; padding: 2px 3px; text-align: left; @@ -294,11 +293,6 @@ } .default .portlet-form-button { - background-image:url(../images/button_background.gif); - background-color:#90d0ff; - color:#ffffff; - - font-weight: bold; } .default .portlet-icon-label { Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/portlet/default/css/pal-extension.css =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/portlet/default/css/pal-extension.css 2008-10-31 02:46:04 UTC (rev 1269) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/portlet/default/css/pal-extension.css 2008-10-31 06:06:34 UTC (rev 1270) @@ -132,3 +132,78 @@ empty-cells: show; } + +/* ---------------- */ +/* Tab */ +/* ---------------- */ +.default .tab-nav div { +height:25px; +line-height:23px; +margin:0; +padding:0; +width:100%; +} + +.default .tab-nav ul { +margin:0; +padding:0; +width:100%; +} + +.default .tab-nav ul li { +float:left; +height:25px; +line-height:23px; +list-style-image:none; +list-style-position:outside; +list-style-type:none; +} + +.default .tab-nav ul li a:visited { +color:#0000EE; +} + +.default .tab-nav ul li.first { +border-bottom:1px solid #A9A9A9; +width:10px; +} + +.default .tab-nav ul li.last { +border-bottom:1px solid #A9A9A9; +float:none; +padding-right:10px; +text-align:right; +} + +.default .tab-nav ul li.selected { +border-color:#A9A9A9 #A9A9A9 #FFFFFF; +border-style:solid; +border-width:1px; +display:block; +margin:-1px; +} + +.default .tab-nav ul li.selected span { +display:inline; +padding:0 10px; +white-space:pre; +} + +.default .tab-nav ul li.selectable { +background-color:#DCDCDC; +border:1px solid #A9A9A9; +display:block; +height:24px; +} + +.default .tab-nav ul li.selectable { +display:inline; +padding:0 10px; +white-space:pre; +} + +.default .tab-nav ul li.spacer { +border-bottom:1px solid #A9A9A9; +width:5px; +} + From svnnotify @ sourceforge.jp Fri Oct 31 15:08:31 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Fri, 31 Oct 2008 15:08:31 +0900 Subject: [pal-cvs 3537] [1271] updated styles. Message-ID: <1225433311.640237.19657.nullmailer@users.sourceforge.jp> Revision: 1271 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1271 Author: shinsuke Date: 2008-10-31 15:08:31 +0900 (Fri, 31 Oct 2008) Log Message: ----------- updated styles. Modified Paths: -------------- pal-admin/trunk/src/main/webapp/view/group/groupConfirm.html pal-admin/trunk/src/main/webapp/view/group/groupEdit.html pal-admin/trunk/src/main/webapp/view/group/groupList.html pal-admin/trunk/src/main/webapp/view/role/roleConfirm.html pal-admin/trunk/src/main/webapp/view/role/roleEdit.html pal-admin/trunk/src/main/webapp/view/role/roleList.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/userCreate.html pal-admin/trunk/src/main/webapp/view/user/userEdit.html pal-admin/trunk/src/main/webapp/view/user/userGroupEdit.html pal-admin/trunk/src/main/webapp/view/user/userList.html pal-admin/trunk/src/main/webapp/view/user/userProfilingRuleEdit.html pal-admin/trunk/src/main/webapp/view/user/userRoleEdit.html -------------- next part -------------- Modified: pal-admin/trunk/src/main/webapp/view/group/groupConfirm.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/group/groupConfirm.html 2008-10-31 06:06:34 UTC (rev 1270) +++ pal-admin/trunk/src/main/webapp/view/group/groupConfirm.html 2008-10-31 06:08:31 UTC (rev 1271) @@ -9,10 +9,16 @@
      -
      - User - Role - +
      +
      @@ -31,21 +37,28 @@
      +
      名前順序  
      - 下へ +   - 上へ +   詳細
      + - - - + + -
      groupgroup
      - -
      + + + +
      + + + +
      +
      Modified: pal-admin/trunk/src/main/webapp/view/group/groupEdit.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/group/groupEdit.html 2008-10-31 06:06:34 UTC (rev 1270) +++ pal-admin/trunk/src/main/webapp/view/group/groupEdit.html 2008-10-31 06:08:31 UTC (rev 1271) @@ -9,10 +9,16 @@
      -
      - User - Role - +
      +
      @@ -31,22 +37,29 @@
      +
      + - - - + + -
      - -
      + + + +
      + + + +
      +
      Modified: pal-admin/trunk/src/main/webapp/view/group/groupList.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/group/groupList.html 2008-10-31 06:06:34 UTC (rev 1270) +++ pal-admin/trunk/src/main/webapp/view/group/groupList.html 2008-10-31 06:08:31 UTC (rev 1271) @@ -9,10 +9,16 @@
      -
      - User - Role - +
      +
      @@ -41,22 +47,24 @@ Next>>
      +
      - - + + - - +
      group + group Delete
      +
      <<Previous Modified: pal-admin/trunk/src/main/webapp/view/role/roleConfirm.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/role/roleConfirm.html 2008-10-31 06:06:34 UTC (rev 1270) +++ pal-admin/trunk/src/main/webapp/view/role/roleConfirm.html 2008-10-31 06:08:31 UTC (rev 1271) @@ -9,10 +9,16 @@
      -
      - User - - Group +
      +
      @@ -31,21 +37,28 @@
      +
      + - - - + + -
      rolerole
      - -
      + + + +
      + + + +
      +
      Modified: pal-admin/trunk/src/main/webapp/view/role/roleEdit.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/role/roleEdit.html 2008-10-31 06:06:34 UTC (rev 1270) +++ pal-admin/trunk/src/main/webapp/view/role/roleEdit.html 2008-10-31 06:08:31 UTC (rev 1271) @@ -9,10 +9,16 @@
      -
      - User - - Group +
      +
      @@ -31,22 +37,29 @@
      +
      + - - - + + -
      - -
      + + + +
      + + + +
      +
      Modified: pal-admin/trunk/src/main/webapp/view/role/roleList.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/role/roleList.html 2008-10-31 06:06:34 UTC (rev 1270) +++ pal-admin/trunk/src/main/webapp/view/role/roleList.html 2008-10-31 06:08:31 UTC (rev 1271) @@ -9,10 +9,16 @@
      -
      - User - - Group +
      +
      @@ -43,22 +49,24 @@ te:rendered="#{role_roleListPage.nextPageNumber!=null}">Next>>
      +
      - - + + - - +
      role + role Delete
      +
      -
      - - Role - Group +
      +
      @@ -42,27 +48,33 @@ Profiling Rule
      +
      + - - - + + - - - + + -
      keykey
      valuevalue
      - - -
      + + + +
      + + + + +
      +
      Modified: pal-admin/trunk/src/main/webapp/view/user/userAttributeEdit.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userAttributeEdit.html 2008-10-31 06:06:34 UTC (rev 1270) +++ pal-admin/trunk/src/main/webapp/view/user/userAttributeEdit.html 2008-10-31 06:08:31 UTC (rev 1271) @@ -9,10 +9,16 @@
      -
      - - Role - Group +
      +
      @@ -42,31 +48,37 @@ Profiling Rule
      +
      + - - + - + - - - + + -
      +
      Key
      -
      - - -
      + + + +
      + + + + +
      +
      Modified: pal-admin/trunk/src/main/webapp/view/user/userAttributeList.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userAttributeList.html 2008-10-31 06:06:34 UTC (rev 1270) +++ pal-admin/trunk/src/main/webapp/view/user/userAttributeList.html 2008-10-31 06:08:31 UTC (rev 1271) @@ -9,10 +9,16 @@
      -
      - - Role - Group +
      +
      @@ -43,9 +49,12 @@
      -
      +
      +
      -
      +
      + +
      @@ -60,25 +69,27 @@ te:rendered="#{user_userAttributeListPage.nextPageNumber!=null}">Next>>
      +
      - - - + + + - - - + +
      keyvalue + keyvalue Edit Delete
      +
      -
      - - Role - Group +
      +
      @@ -31,42 +37,31 @@
      -
      +
      + - - - + + -
      useruser
      -
      - -
      - + - - - + + - - - + + - - - + + + + + - - - - -
      userTODO
      TODOtrue
      trueROLE
      ROLE
      -
      - -
      +
      @@ -78,7 +73,12 @@
      + + + +
      +
      Modified: pal-admin/trunk/src/main/webapp/view/user/userCreate.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userCreate.html 2008-10-31 06:06:34 UTC (rev 1270) +++ pal-admin/trunk/src/main/webapp/view/user/userCreate.html 2008-10-31 06:08:31 UTC (rev 1271) @@ -9,10 +9,16 @@
      -
      - - Role - Group +
      +
      @@ -30,46 +36,49 @@
      +
      + - - - + + - - - + + - - - + + - - - + + - - + - + -
      + -
      - -
      + + + +
      + + + +
      +
      Modified: pal-admin/trunk/src/main/webapp/view/user/userEdit.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userEdit.html 2008-10-31 06:06:34 UTC (rev 1270) +++ pal-admin/trunk/src/main/webapp/view/user/userEdit.html 2008-10-31 06:08:31 UTC (rev 1271) @@ -9,14 +9,16 @@
      -
      - - - Role - - - Group - +
      +
      @@ -46,61 +48,61 @@ Profiling Rule
      +
      + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - + - + - - - + + -
      USERNAMEUSERNAME
      April 7, 2007 6:44:43 AM JSTApril 7, 2007 6:44:43 AM JST
      + -
      April 7, 2007 6:44:43 AM JSTApril 7, 2007 6:44:43 AM JST
      - -
      + + + +
      + + + +
      +
      Modified: pal-admin/trunk/src/main/webapp/view/user/userGroupEdit.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userGroupEdit.html 2008-10-31 06:06:34 UTC (rev 1270) +++ pal-admin/trunk/src/main/webapp/view/user/userGroupEdit.html 2008-10-31 06:08:31 UTC (rev 1271) @@ -9,10 +9,16 @@
      -
      - - Role - Group +
      +
      @@ -42,20 +48,21 @@ Profiling Rule
      +
      + - - + - + - - + - + -
      + -
      +
      - -
      + + + + + + + +
      +
      Modified: pal-admin/trunk/src/main/webapp/view/user/userList.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userList.html 2008-10-31 06:06:34 UTC (rev 1270) +++ pal-admin/trunk/src/main/webapp/view/user/userList.html 2008-10-31 06:08:31 UTC (rev 1271) @@ -9,10 +9,16 @@
      -
      - - Role - Group +
      +
      @@ -31,11 +37,15 @@
      -
      +
      + +
      +
      +
      @@ -51,8 +61,9 @@ te:rendered="#{user_userListPage.nextPageNumber!=null}">Next>>
      +
      - + @@ -63,17 +74,18 @@ - - - - - + + + +
      userexpireslastLogon + userexpireslastLogon Edit Delete
      +
      -
      - - Role - Group +
      +
      @@ -42,10 +48,12 @@
      +
      + - - + - + - - + - + -
      + @@ -53,12 +61,11 @@ -
      +
      - -
      + + + + + + + +
      +
      Modified: pal-admin/trunk/src/main/webapp/view/user/userRoleEdit.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userRoleEdit.html 2008-10-31 06:06:34 UTC (rev 1270) +++ pal-admin/trunk/src/main/webapp/view/user/userRoleEdit.html 2008-10-31 06:08:31 UTC (rev 1271) @@ -9,10 +9,16 @@
      -
      - - Role - Group +
      +
      @@ -42,20 +48,21 @@ Profiling Rule
      +
      + - - + - + - - + - + -
      + -
      +
      - -
      + + + + + + + +
      +
      From svnnotify @ sourceforge.jp Fri Oct 31 15:23:03 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Fri, 31 Oct 2008 15:23:03 +0900 Subject: [pal-cvs 3538] [1272] disabled a form if a user does not have a permission.. Message-ID: <1225434183.794140.31980.nullmailer@users.sourceforge.jp> Revision: 1272 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1272 Author: shinsuke Date: 2008-10-31 15:23:03 +0900 (Fri, 31 Oct 2008) Log Message: ----------- disabled a form if a user does not have a permission.. Modified Paths: -------------- pal-admin/trunk/src/main/webapp/view/site/folderOrderEditor.html -------------- next part -------------- Modified: pal-admin/trunk/src/main/webapp/view/site/folderOrderEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/folderOrderEditor.html 2008-10-31 06:08:31 UTC (rev 1271) +++ pal-admin/trunk/src/main/webapp/view/site/folderOrderEditor.html 2008-10-31 06:23:03 UTC (rev 1272) @@ -79,6 +79,7 @@
      +
      @@ -88,6 +89,7 @@
      +

      From svnnotify @ sourceforge.jp Fri Oct 31 16:01:26 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Fri, 31 Oct 2008 16:01:26 +0900 Subject: [pal-cvs 3539] [1273] added internationalization property files & JSP files. Message-ID: <1225436486.880562.3476.nullmailer@users.sourceforge.jp> Revision: 1273 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1273 Author: takakura Date: 2008-10-31 16:01:26 +0900 (Fri, 31 Oct 2008) Log Message: ----------- added internationalization property files & JSP files. Modified Paths: -------------- vfs-portlets/trunk/src/main/resources/application.properties vfs-portlets/trunk/src/main/resources/application_ja.properties vfs-portlets/trunk/src/main/webapp/WEB-INF/view/config/index.jsp vfs-portlets/trunk/src/main/webapp/WEB-INF/view/list/error.jsp vfs-portlets/trunk/src/main/webapp/WEB-INF/view/list/index.jsp vfs-portlets/trunk/src/main/webapp/WEB-INF/view/newfolder/confirm.jsp vfs-portlets/trunk/src/main/webapp/WEB-INF/view/newfolder/edit.jsp vfs-portlets/trunk/src/main/webapp/WEB-INF/view/newfolder/error.jsp vfs-portlets/trunk/src/main/webapp/WEB-INF/view/upload/edit.jsp vfs-portlets/trunk/src/main/webapp/WEB-INF/view/upload/error.jsp -------------- next part -------------- Modified: vfs-portlets/trunk/src/main/resources/application.properties =================================================================== --- vfs-portlets/trunk/src/main/resources/application.properties 2008-10-31 06:23:03 UTC (rev 1272) +++ vfs-portlets/trunk/src/main/resources/application.properties 2008-10-31 07:01:26 UTC (rev 1273) @@ -12,7 +12,7 @@ errors.minbytelength={0} can not be less than {1} bytes. errors.range={0} is not in the range {1} through {2}. errors.required={0} is required. -errors.required.other={0} is required ({1}). +errors.required.other={0} is required ({1}). errors.byte={0} must be an byte. errors.date={0} is not a date. errors.double={0} must be an double. @@ -42,3 +42,39 @@ success.upload_file=Upload the file. success.delete_folder=Deleted the folder. success.delete_file=Deleted the file. + +labels.configuration=Configuration +labels.scope=Scope +labels.available=Available +labels.default_uri=Default URI +labels.root_uri=Root URI +labels.accepted_paths=Accepted Paths +labels.denied_paths=Denied Paths +labels.show_path=Show Path +labels.show_create_folder_link=Show Create Folder Link +labels.show_upload_link=Show Upload Link +labels.true=True +labels.false=False + +labels.detail=Detail +labels.create=Create +labels.update=Update +labels.delete=Delete +labels.back=Back +labels.edit=Edit +labels.confirm=Confirm + +labels.create_new_folder=Create New Folder +labels.upload_file=Upload File +labels.go=Go +labels.file_name=File Name +labels.size=Size +labels.last_updated=Last Updated +labels.not_available=Not Available. +labels.path=Path +labels.folder_name=Folder Name +labels.list=List +labels.create_folder=Create Folder +labels.target_path=Target Path +labels.uploaded_file=Uploaded File +labels.upload=Upload \ No newline at end of file Modified: vfs-portlets/trunk/src/main/resources/application_ja.properties =================================================================== --- vfs-portlets/trunk/src/main/resources/application_ja.properties 2008-10-31 06:23:03 UTC (rev 1272) +++ vfs-portlets/trunk/src/main/resources/application_ja.properties 2008-10-31 07:01:26 UTC (rev 1273) @@ -35,3 +35,39 @@ success.upload_file=\u30d5\u30a1\u30a4\u30eb\u3092\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9\u3057\u307e\u3057\u305f\u3002 success.delete_folder=\u30d5\u30a9\u30eb\u30c0\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 success.delete_file=\u30d5\u30a1\u30a4\u30eb\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 + +labels.configuration=\u8a2d\u5b9a +labels.scope=\u5bfe\u8c61 +labels.available=\u4f7f\u7528 +labels.default_uri=\u6a19\u6e96\u306e URI +labels.root_uri=\u30eb\u30fc\u30c8 URI +labels.accepted_paths=\u8a31\u53ef\u3059\u308b\u30d1\u30b9 +labels.denied_paths=\u7981\u6b62\u3059\u308b\u30d1\u30b9 +labels.show_path=\u30d1\u30b9\u306e\u8868\u793a +labels.show_create_folder_link=\u30d5\u30a9\u30eb\u30c0\u306e\u4f5c\u6210 +labels.show_upload_link=\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9 +labels.true=\u8a31\u53ef\u3059\u308b +labels.false=\u8a31\u53ef\u3057\u306a\u3044 + +labels.detail=\u8a73\u7d30 +labels.create=\u4f5c\u6210 +labels.update=\u66f4\u65b0 +labels.delete=\u524a\u9664 +labels.back=\u623b\u308b +labels.edit=\u7de8\u96c6 +labels.confirm=\u78ba\u8a8d + +labels.create_new_folder=\u30d5\u30a9\u30eb\u30c0\u306e\u4f5c\u6210 +labels.upload_file=\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9 +labels.go=\u79fb\u52d5 +labels.file_name=\u30d5\u30a1\u30a4\u30eb\u540d +labels.size=\u30b5\u30a4\u30ba +labels.last_updated=\u66f4\u65b0\u65e5\u6642 +labels.not_available=\u3053\u306e\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306f\u73fe\u5728\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093\u3002 +labels.path=\u30d1\u30b9 +labels.folder_name=\u30d5\u30a9\u30eb\u30c0\u540d +labels.list=\u4e00\u89a7 +labels.create_folder=\u30d5\u30a9\u30eb\u30c0\u306e\u4f5c\u6210 +labels.target_path=\u5bfe\u8c61\u306e\u30d1\u30b9 +labels.uploaded_file=\u5bfe\u8c61\u306e\u30d5\u30a1\u30a4\u30eb +labels.upload=\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9 \ No newline at end of file Modified: vfs-portlets/trunk/src/main/webapp/WEB-INF/view/config/index.jsp =================================================================== --- vfs-portlets/trunk/src/main/webapp/WEB-INF/view/config/index.jsp 2008-10-31 06:23:03 UTC (rev 1272) +++ vfs-portlets/trunk/src/main/webapp/WEB-INF/view/config/index.jsp 2008-10-31 07:01:26 UTC (rev 1273) @@ -10,61 +10,61 @@
      - + - + - + - + - + - + - + - + - + - + Modified: vfs-portlets/trunk/src/main/webapp/WEB-INF/view/list/error.jsp =================================================================== --- vfs-portlets/trunk/src/main/webapp/WEB-INF/view/list/error.jsp 2008-10-31 06:23:03 UTC (rev 1272) +++ vfs-portlets/trunk/src/main/webapp/WEB-INF/view/list/error.jsp 2008-10-31 07:01:26 UTC (rev 1273) @@ -6,6 +6,6 @@
      -Back + Modified: vfs-portlets/trunk/src/main/webapp/WEB-INF/view/list/index.jsp =================================================================== --- vfs-portlets/trunk/src/main/webapp/WEB-INF/view/list/index.jsp 2008-10-31 06:23:03 UTC (rev 1272) +++ vfs-portlets/trunk/src/main/webapp/WEB-INF/view/list/index.jsp 2008-10-31 07:01:26 UTC (rev 1273) @@ -12,11 +12,11 @@
      -Create New Folder + | -Upload File +
      @@ -30,9 +30,9 @@
      Configuration
      Scope ${f:h(scope)}
      Available -True -False + +
      Default URI
      Root URI
      Accepted Paths
      Denied Paths
      Show Path -True -False + +
      Show Create Folder Link -True -False + +
      Show Upload Link -True -False + +
      - +"/>
      - - - + + + @@ -64,7 +64,7 @@ G - + @@ -74,7 +74,7 @@
      -Not Available. +
      Modified: vfs-portlets/trunk/src/main/webapp/WEB-INF/view/newfolder/confirm.jsp =================================================================== --- vfs-portlets/trunk/src/main/webapp/WEB-INF/view/newfolder/confirm.jsp 2008-10-31 06:23:03 UTC (rev 1272) +++ vfs-portlets/trunk/src/main/webapp/WEB-INF/view/newfolder/confirm.jsp 2008-10-31 07:01:26 UTC (rev 1273) @@ -11,22 +11,22 @@
      File NameSizeLast Updated  
      ${f:h(f.formattedLastModifiedTime)}Delete
      - + - + - + Modified: vfs-portlets/trunk/src/main/webapp/WEB-INF/view/newfolder/edit.jsp =================================================================== --- vfs-portlets/trunk/src/main/webapp/WEB-INF/view/newfolder/edit.jsp 2008-10-31 06:23:03 UTC (rev 1272) +++ vfs-portlets/trunk/src/main/webapp/WEB-INF/view/newfolder/edit.jsp 2008-10-31 07:01:26 UTC (rev 1273) @@ -9,30 +9,30 @@
      -List + | -Upload File +
      Create Folder
      Path ${f:h(uri)}
      Folder Name ${f:h(name)}
      - - + "/> + "/>
      - + - + - + Modified: vfs-portlets/trunk/src/main/webapp/WEB-INF/view/newfolder/error.jsp =================================================================== --- vfs-portlets/trunk/src/main/webapp/WEB-INF/view/newfolder/error.jsp 2008-10-31 06:23:03 UTC (rev 1272) +++ vfs-portlets/trunk/src/main/webapp/WEB-INF/view/newfolder/error.jsp 2008-10-31 07:01:26 UTC (rev 1273) @@ -6,6 +6,6 @@
      -Back + Modified: vfs-portlets/trunk/src/main/webapp/WEB-INF/view/upload/edit.jsp =================================================================== --- vfs-portlets/trunk/src/main/webapp/WEB-INF/view/upload/edit.jsp 2008-10-31 06:23:03 UTC (rev 1272) +++ vfs-portlets/trunk/src/main/webapp/WEB-INF/view/upload/edit.jsp 2008-10-31 07:01:26 UTC (rev 1273) @@ -9,30 +9,30 @@
      -List + | -Create Folder +
      Create Folder
      Target Path ${f:h(uri)}
      Folder Name
      - + "/>
      - + - + - + Modified: vfs-portlets/trunk/src/main/webapp/WEB-INF/view/upload/error.jsp =================================================================== --- vfs-portlets/trunk/src/main/webapp/WEB-INF/view/upload/error.jsp 2008-10-31 06:23:03 UTC (rev 1272) +++ vfs-portlets/trunk/src/main/webapp/WEB-INF/view/upload/error.jsp 2008-10-31 07:01:26 UTC (rev 1273) @@ -6,6 +6,6 @@
      -Back + From svnnotify @ sourceforge.jp Fri Oct 31 18:14:06 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Fri, 31 Oct 2008 18:14:06 +0900 Subject: [pal-cvs 3540] [1274] i18ned, and fixed a rule criteria problem. Message-ID: <1225444446.809299.527.nullmailer@users.sourceforge.jp> Revision: 1274 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1274 Author: shinsuke Date: 2008-10-31 18:14:06 +0900 (Fri, 31 Oct 2008) Log Message: ----------- i18ned, and fixed a rule criteria problem. Modified Paths: -------------- pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/ProfilingRuleLogic.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/ProfilingRuleService.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleConfirmPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleCriterionConfirmPage.java pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/profiler/label.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/profiler/label_ja.properties pal-admin/trunk/src/main/webapp/view/profiler/ruleConfirm.html pal-admin/trunk/src/main/webapp/view/profiler/ruleCriterionConfirm.html pal-admin/trunk/src/main/webapp/view/profiler/ruleCriterionEdit.html pal-admin/trunk/src/main/webapp/view/profiler/ruleCriterionList.html pal-admin/trunk/src/main/webapp/view/profiler/ruleEdit.html pal-admin/trunk/src/main/webapp/view/profiler/ruleList.html -------------- next part -------------- Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/ProfilingRuleLogic.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/ProfilingRuleLogic.java 2008-10-31 07:01:26 UTC (rev 1273) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/ProfilingRuleLogic.java 2008-10-31 09:14:06 UTC (rev 1274) @@ -147,8 +147,8 @@ } - public RuleCriterion getRuleCriterion(String id, String name) { - if (id == null || name == null) { + public RuleCriterion getRuleCriterion(String id, String name, String type) { + if (id == null || name == null || type == null) { return null; } org.apache.jetspeed.profiler.rules.ProfilingRule rule = getProfiler() @@ -158,7 +158,8 @@ } for (Object obj : rule.getRuleCriteria()) { org.apache.jetspeed.profiler.rules.RuleCriterion ruleCriterion = (org.apache.jetspeed.profiler.rules.RuleCriterion) obj; - if (name.equals(ruleCriterion.getName())) { + if (name.equals(ruleCriterion.getName()) + && type.equals(ruleCriterion.getType())) { RuleCriterion entity = new RuleCriterion(); entity.setRuleName(id); entity.setName(ruleCriterion.getName()); @@ -201,17 +202,18 @@ if (rule == null) { throw new CommonException("profiling.rule.does.not.exist"); } - if (entity.getName() == null) { + if (entity.getName() == null || entity.getType() == null) { throw new CommonException("rule.criterion.does.not.exist"); } for (Object obj : rule.getRuleCriteria()) { org.apache.jetspeed.profiler.rules.RuleCriterion ruleCriterion = (org.apache.jetspeed.profiler.rules.RuleCriterion) obj; - if (entity.getName().equals(ruleCriterion.getName())) { + if (entity.getName().equals(ruleCriterion.getName()) + && entity.getType().equals(ruleCriterion.getType())) { try { - // ruleCriterion.setRuleId(entity.getRuleName()); - // ruleCriterion.setName(entity.getName()); + // ruleCriterion.setRuleId(entity.getRuleName()); + // ruleCriterion.setName(entity.getName()); ruleCriterion.setValue(entity.getValue()); - ruleCriterion.setType(entity.getType()); + // ruleCriterion.setType(entity.getType()); ruleCriterion.setFallbackType(entity.getFallbackType()); ruleCriterion.setFallbackOrder(entity.getFallbackOrder()); getProfiler().storeProfilingRule(rule); @@ -231,12 +233,13 @@ if (rule == null) { throw new CommonException("profiling.rule.does.not.exist"); } - if (entity.getName() == null) { + if (entity.getName() == null || entity.getType() == null) { throw new CommonException("rule.criterion.does.not.exist"); } for (Object obj : rule.getRuleCriteria()) { org.apache.jetspeed.profiler.rules.RuleCriterion ruleCriterion = (org.apache.jetspeed.profiler.rules.RuleCriterion) obj; - if (entity.getName().equals(ruleCriterion.getName())) { + if (entity.getName().equals(ruleCriterion.getName()) + && entity.getType().equals(ruleCriterion.getType())) { try { rule.getRuleCriteria().remove(ruleCriterion); getProfiler().storeProfilingRule(rule); Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/ProfilingRuleService.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/ProfilingRuleService.java 2008-10-31 07:01:26 UTC (rev 1273) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/ProfilingRuleService.java 2008-10-31 09:14:06 UTC (rev 1274) @@ -135,7 +135,8 @@ public void loadPage(RuleCriterionEditPage page) throws CommonException { if (page.isUpdate()) { RuleCriterion ruleCriterion = getProfilingRuleLogic() - .getRuleCriterion(page.getRuleName(), page.getName()); + .getRuleCriterion(page.getRuleName(), page.getName(), + page.getType()); if (ruleCriterion == null) { throw new CommonException("could.not.find.rule.criterion"); } @@ -155,7 +156,7 @@ public void loadPage(RuleCriterionConfirmPage page) throws CommonException { RuleCriterion ruleCriterion = getProfilingRuleLogic().getRuleCriterion( - page.getRuleName(), page.getName()); + page.getRuleName(), page.getName(), page.getType()); if (ruleCriterion == null) { throw new CommonException("could.not.find.rule.criterion"); } @@ -166,7 +167,7 @@ public void addRuleCriterion(AbstractRuleCriterionPage page) throws CommonException { RuleCriterion ruleCriterion = getProfilingRuleLogic().getRuleCriterion( - page.getRuleName(), page.getName()); + page.getRuleName(), page.getName(), page.getType()); if (ruleCriterion != null) { throw new CommonException("profiling.rule.already.exists"); } @@ -178,7 +179,7 @@ public void updateRuleCriterion(AbstractRuleCriterionPage page) throws CommonException { RuleCriterion ruleCriterion = getProfilingRuleLogic().getRuleCriterion( - page.getRuleName(), page.getName()); + page.getRuleName(), page.getName(), page.getType()); if (ruleCriterion == null) { throw new CommonException("profiling.rule.does.not.exist"); } @@ -189,7 +190,7 @@ public void deleteRuleCriterion(AbstractRuleCriterionPage page) throws CommonException { RuleCriterion ruleCriterion = getProfilingRuleLogic().getRuleCriterion( - page.getRuleName(), page.getName()); + page.getRuleName(), page.getName(), page.getType()); if (ruleCriterion == null) { throw new CommonException("profiling.rule.does.not.exist"); } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleConfirmPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleConfirmPage.java 2008-10-31 07:01:26 UTC (rev 1273) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleConfirmPage.java 2008-10-31 09:14:06 UTC (rev 1274) @@ -126,12 +126,19 @@ super.setTitle(title); } - public String getDoBackValue(){ + public String getDoBackValue() { return getLabelHelper().getLabelValue("back"); } - - public String getDoFinishValue(){ - return getLabelHelper().getLabelValue("create"); + + public String getDoFinishValue() { + if (isCreate()) { + return getLabelHelper().getLabelValue("create"); + } else if (isUpdate()) { + return getLabelHelper().getLabelValue("update"); + } else if (isDelete()) { + return getLabelHelper().getLabelValue("delete"); + } + return ""; } - + } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleCriterionConfirmPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleCriterionConfirmPage.java 2008-10-31 07:01:26 UTC (rev 1273) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleCriterionConfirmPage.java 2008-10-31 09:14:06 UTC (rev 1274) @@ -146,12 +146,19 @@ public void setFallbackType(Integer fallbackType) { super.setFallbackType(fallbackType); } - - public String getDoBackValue(){ + + public String getDoBackValue() { return getLabelHelper().getLabelValue("back"); } - - public String getDoOnceValue(){ - return getLabelHelper().getLabelValue("create"); + + public String getDoOnceValue() { + if (isCreate()) { + return getLabelHelper().getLabelValue("create"); + } else if (isUpdate()) { + return getLabelHelper().getLabelValue("update"); + } else if (isDelete()) { + return getLabelHelper().getLabelValue("delete"); + } + return ""; } } Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/profiler/label.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/profiler/label.properties 2008-10-31 07:01:26 UTC (rev 1273) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/profiler/label.properties 2008-10-31 09:14:06 UTC (rev 1274) @@ -1,9 +1,12 @@ listTab=List newTab=New -backTab=Back +profilingRuleTab=Profiling Rule List +editTab=Edit +editTab=Delete ruleList=Profiling Rule List ruleInformationLabel=Profiling Rule Information +ruleInformation=Profiling Rule Information ruleCriterionList=Rule Criterion List ruleCriterionInformation=Rule Criterion Information Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/profiler/label_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/profiler/label_ja.properties 2008-10-31 07:01:26 UTC (rev 1273) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/profiler/label_ja.properties 2008-10-31 09:14:06 UTC (rev 1274) @@ -1,7 +1,8 @@ -listTab=\u4e00\u89a7 +listTab=\u30eb\u30fc\u30eb\u57fa\u6e96\u4e00\u89a7 newTab=\u65b0\u898f -backTab=\u623b\u308b +profilingRuleTab=\u30d7\u30ed\u30d5\u30a1\u30a4\u30ea\u30f3\u30b0\u30eb\u30fc\u30eb\u4e00\u89a7 editTab=\u7de8\u96c6 +deleteTab=\u524a\u9664 ruleList=\u30d7\u30ed\u30d5\u30a1\u30a4\u30ea\u30f3\u30b0\u30eb\u30fc\u30eb\u4e00\u89a7 ruleInformationLabel=\u30d7\u30ed\u30d5\u30a1\u30a4\u30ea\u30f3\u30b0\u30eb\u30fc\u30eb @@ -21,7 +22,7 @@ create=\u767b\u9332 update=\u66f4\u65b0 back=\u623b\u308b -editCriterion=\u5224\u65ad\u57fa\u6e96 +editCriterion=\u30eb\u30fc\u30eb\u57fa\u6e96\u8a2d\u5b9a ruleCriterionList.newTab=\u65b0\u898f ruleCriterionList.name=\u30eb\u30fc\u30eb\u540d Modified: pal-admin/trunk/src/main/webapp/view/profiler/ruleConfirm.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/profiler/ruleConfirm.html 2008-10-31 07:01:26 UTC (rev 1273) +++ pal-admin/trunk/src/main/webapp/view/profiler/ruleConfirm.html 2008-10-31 09:14:06 UTC (rev 1274) @@ -9,7 +9,7 @@
      - List | + List | Modified: pal-admin/trunk/src/main/webapp/view/profiler/ruleCriterionConfirm.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/profiler/ruleCriterionConfirm.html 2008-10-31 07:01:26 UTC (rev 1273) +++ pal-admin/trunk/src/main/webapp/view/profiler/ruleCriterionConfirm.html 2008-10-31 09:14:06 UTC (rev 1274) @@ -9,11 +9,11 @@
      + Back to Rule List | List | - | - Back to Rule List +
      Modified: pal-admin/trunk/src/main/webapp/view/profiler/ruleCriterionEdit.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/profiler/ruleCriterionEdit.html 2008-10-31 07:01:26 UTC (rev 1273) +++ pal-admin/trunk/src/main/webapp/view/profiler/ruleCriterionEdit.html 2008-10-31 09:14:06 UTC (rev 1274) @@ -10,10 +10,9 @@
      @@ -30,10 +29,10 @@
      Modified: pal-admin/trunk/src/main/webapp/view/profiler/ruleEdit.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/profiler/ruleEdit.html 2008-10-31 07:01:26 UTC (rev 1273) +++ pal-admin/trunk/src/main/webapp/view/profiler/ruleEdit.html 2008-10-31 09:14:06 UTC (rev 1274) @@ -9,7 +9,7 @@
      - List | + List |
      Modified: pal-admin/trunk/src/main/webapp/view/profiler/ruleList.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/profiler/ruleList.html 2008-10-31 07:01:26 UTC (rev 1273) +++ pal-admin/trunk/src/main/webapp/view/profiler/ruleList.html 2008-10-31 09:14:06 UTC (rev 1274) @@ -9,7 +9,7 @@
      - | + | New
      From svnnotify @ sourceforge.jp Fri Oct 31 18:31:44 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Fri, 31 Oct 2008 18:31:44 +0900 Subject: [pal-cvs 3541] [1275] fixed duplicate issue. Message-ID: <1225445504.667544.17474.nullmailer@users.sourceforge.jp> Revision: 1275 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1275 Author: shinsuke Date: 2008-10-31 18:31:44 +0900 (Fri, 31 Oct 2008) Log Message: ----------- fixed duplicate issue. Modified Paths: -------------- pal-portal/branches/pal-portal-1.x/portal/files/etc/sql/min/j2-seed.xml -------------- next part -------------- Modified: pal-portal/branches/pal-portal-1.x/portal/files/etc/sql/min/j2-seed.xml =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/files/etc/sql/min/j2-seed.xml 2008-10-31 09:14:06 UTC (rev 1274) +++ pal-portal/branches/pal-portal-1.x/portal/files/etc/sql/min/j2-seed.xml 2008-10-31 09:31:44 UTC (rev 1275) @@ -389,17 +389,17 @@ - + - + - + @@ -415,17 +415,17 @@ - + - + - +
      Upload File
      Target Path ${f:h(uri)}
      Uploaded File
      - + "/>
      -
      +
      -
      +
      NAME
      @@ -58,10 +57,16 @@
      - - +
      + + +
      +
      + NAME + +
      Modified: pal-admin/trunk/src/main/webapp/view/profiler/ruleCriterionList.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/profiler/ruleCriterionList.html 2008-10-31 07:01:26 UTC (rev 1273) +++ pal-admin/trunk/src/main/webapp/view/profiler/ruleCriterionList.html 2008-10-31 09:14:06 UTC (rev 1274) @@ -9,9 +9,9 @@
      @@ -61,17 +61,17 @@ user
      - user + value - user + type - roles + fallbackOrder - Edit - Delete + Edit + Delete