From svnnotify ＠ sourceforge.jp Sun Feb 1 08:59:00 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sun, 01 Feb 2009 08:59:00 +0900 Subject: [pal-cvs 3975] [1710] fixed encoded path. Message-ID: <1233446340.910133.24012.nullmailer@users.sourceforge.jp> Revision: 1710 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1710 Author: shinsuke Date: 2009-02-01 08:59:00 +0900 (Sun, 01 Feb 2009) Log Message: ----------- fixed encoded path. Modified Paths: -------------- vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/util/VFSUtil.java -------------- next part -------------- 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 2009-01-30 23:23:43 UTC (rev 1709) +++ vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/util/VFSUtil.java 2009-01-31 23:59:00 UTC (rev 1710) @@ -14,7 +14,6 @@ import java.io.InputStream; import java.io.OutputStream; import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; import java.util.Map; import javax.portlet.PortletContext; @@ -176,7 +175,7 @@ try { return new String(Base64.encodeBase64(value.getBytes("UTF-8")), - "UTF-8"); + "UTF-8").replaceAll("/", "__SLASH__"); } catch (Exception e) { throw new VFSException("errors.file_system_error", e); } @@ -187,8 +186,8 @@ return null; } try { - return new String(Base64.decodeBase64(URLDecoder.decode(value, - "UTF-8").getBytes("UTF-8")), "UTF-8"); + return new String(Base64.decodeBase64(value.replaceAll("__SLASH__", + "/").getBytes("UTF-8")), "UTF-8"); } catch (UnsupportedEncodingException e) { throw new VFSException("errors.file_system_error", e); } From svnnotify ＠ sourceforge.jp Mon Feb 2 06:17:40 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Mon, 02 Feb 2009 06:17:40 +0900 Subject: [pal-cvs 3976] [1711] fixed decode process. Message-ID: <1233523060.348286.5111.nullmailer@users.sourceforge.jp> Revision: 1711 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1711 Author: shinsuke Date: 2009-02-02 06:17:40 +0900 (Mon, 02 Feb 2009) Log Message: ----------- fixed decode process. Modified Paths: -------------- vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/form/ListForm.java -------------- next part -------------- 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 2009-01-31 23:59:00 UTC (rev 1710) +++ vfs-portlets/trunk/src/main/java/jp/sf/pal/vfs/form/ListForm.java 2009-02-01 21:17:40 UTC (rev 1711) @@ -1,12 +1,10 @@ package jp.sf.pal.vfs.form; import java.io.Serializable; -import java.io.UnsupportedEncodingException; import jp.sf.pal.vfs.VFSException; import jp.sf.pal.vfs.util.VFSUtil; -import org.apache.commons.codec.binary.Base64; import org.seasar.struts.annotation.Required; public class ListForm implements Serializable { @@ -35,14 +33,7 @@ } public void setDownloadUri(String u) throws VFSException { - if (u == null) { - return; - } - try { - uri = new String(Base64.decodeBase64(u.getBytes("UTF-8")), "UTF-8"); - } catch (UnsupportedEncodingException e) { - throw new VFSException("errors.file_system_error", e); - } + uri = VFSUtil.getDencodedValue(u); } public String getEncodedBaseName() throws VFSException { From svnnotify ＠ sourceforge.jp Tue Feb 3 21:49:55 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Tue, 03 Feb 2009 21:49:55 +0900 Subject: [pal-cvs 3977] [1712] fixed npe. Message-ID: <1233665395.187661.17620.nullmailer@users.sourceforge.jp> Revision: 1712 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1712 Author: shinsuke Date: 2009-02-03 21:49:55 +0900 (Tue, 03 Feb 2009) Log Message: ----------- fixed npe. Modified Paths: -------------- 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/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 2009-02-01 21:17:40 UTC (rev 1711) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/RenderingJobImpl.java 2009-02-03 12:49:55 UTC (rev 1712) @@ -285,8 +285,9 @@ PortletDefinition curPortletDefinition = (PortletDefinition) CurrentWorkerContext .getAttribute(PortalReservedParameters.PORTLET_DEFINITION_ATTRIBUTE); - if (!oldPortletDefinition.getId().equals( - curPortletDefinition.getId())) + if (oldPortletDefinition == null + || !oldPortletDefinition.getId().equals( + curPortletDefinition.getId())) { curEntity.setPortletDefinition(curPortletDefinition); } From svnnotify ＠ sourceforge.jp Tue Feb 3 22:24:26 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Tue, 03 Feb 2009 22:24:26 +0900 Subject: [pal-cvs 3978] [1713] updated tomcat version, minor fixes. Message-ID: <1233667466.149697.26088.nullmailer@users.sourceforge.jp> Revision: 1713 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1713 Author: shinsuke Date: 2009-02-03 22:24:26 +0900 (Tue, 03 Feb 2009) Log Message: ----------- updated tomcat version, minor fixes. Modified Paths: -------------- pal-portal/docs/ja/groupware-guide/trunk/build.xml pal-portal/docs/ja/installation-guide/trunk/src/tex/guide-cli-install-steps.tex pal-portal/docs/ja/installation-guide/trunk/src/tex/guide-gui-install-steps.tex pal-portal/docs/ja/installation-guide/trunk/src/tex/index.tex -------------- next part -------------- Modified: pal-portal/docs/ja/groupware-guide/trunk/build.xml =================================================================== --- pal-portal/docs/ja/groupware-guide/trunk/build.xml 2009-02-03 12:49:55 UTC (rev 1712) +++ pal-portal/docs/ja/groupware-guide/trunk/build.xml 2009-02-03 13:24:26 UTC (rev 1713) @@ -1,6 +1,6 @@ - + Modified: pal-portal/docs/ja/installation-guide/trunk/src/tex/guide-cli-install-steps.tex =================================================================== --- pal-portal/docs/ja/installation-guide/trunk/src/tex/guide-cli-install-steps.tex 2009-02-03 12:49:55 UTC (rev 1712) +++ pal-portal/docs/ja/installation-guide/trunk/src/tex/guide-cli-install-steps.tex 2009-02-03 13:24:26 UTC (rev 1713) @@ -170,7 +170,7 @@ PAL PORTAL Install the following component? -Tomcat 5.5.23 [default:true] +Tomcat 5.5.27 [default:true] Install the following component? @@ -192,7 +192,7 @@ \end{screen} 各項目ごとに true もしくは false を入力し、Enter キーを押下して、コンポーネントを選択します。 - 「Tomcat 5.5.23」の項目に true を入力すると、PALポータルが利用するための Tomcat がインストールされます。 + 「Tomcat 5.5.27」の項目に true を入力すると、PALポータルが利用するための Tomcat がインストールされます。 「Tomcat用PALポータル設定」の項目に true を入力すると、Tomcat 用の設定ファイルがインストールされます。 「メールサーバ設定」の項目に true を入力すると、PALポータルが利用するメールサーバの設定が行えます。 Modified: pal-portal/docs/ja/installation-guide/trunk/src/tex/guide-gui-install-steps.tex =================================================================== --- pal-portal/docs/ja/installation-guide/trunk/src/tex/guide-gui-install-steps.tex 2009-02-03 12:49:55 UTC (rev 1712) +++ pal-portal/docs/ja/installation-guide/trunk/src/tex/guide-gui-install-steps.tex 2009-02-03 13:24:26 UTC (rev 1713) @@ -125,7 +125,7 @@ \end{figure} - 「Tomcat 5.5.23」を選択すると、PALポータルが利用するための Tomcat がインストールされます。 + 「Tomcat 5.5.27」を選択すると、PALポータルが利用するための Tomcat がインストールされます。 「Tomcat用PALポータル設定」を選択すると、Tomcat 用の設定ファイルがインストールされます。 「メールサーバ設定」を選択すると、PALポータルが利用するメールサーバの設定が行えます。 コンポーネント選択して、「次へ」ボタンをクリックします。 Modified: pal-portal/docs/ja/installation-guide/trunk/src/tex/index.tex =================================================================== --- pal-portal/docs/ja/installation-guide/trunk/src/tex/index.tex 2009-02-03 12:49:55 UTC (rev 1712) +++ pal-portal/docs/ja/installation-guide/trunk/src/tex/index.tex 2009-02-03 13:24:26 UTC (rev 1713) @@ -45,11 +45,12 @@ 本製品に関する技術的質問で、ドキュメント内に解決策が得られない場合は、次にアクセスしてください。 -公開フォーラム:http://sourceforge.jp/forum/?group\_id=1972 -メーリングリスト:http://sourceforge.jp/mail/?group\_id=1972 +\begin{itemize} +\item 公開フォーラム:http://sourceforge.jp/forum/?group\_id=1972 +\item メーリングリスト:http://sourceforge.jp/mail/?group\_id=1972 +\end{itemize} - \section{関連サードパーティー Web サイトの参照} Portal Application Laboratoryプロジェクトでは、このドキュメントに記載されているサードパーティーの Web サイトの有効性については責任を持ちません。 From svnnotify ＠ sourceforge.jp Tue Feb 3 23:10:35 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Tue, 03 Feb 2009 23:10:35 +0900 Subject: [pal-cvs 3979] [1714] minor fixes Message-ID: <1233670235.363999.16336.nullmailer@users.sourceforge.jp> Revision: 1714 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1714 Author: shinsuke Date: 2009-02-03 23:10:35 +0900 (Tue, 03 Feb 2009) Log Message: ----------- minor fixes Modified Paths: -------------- pal-portal/docs/ja/installation-guide/trunk/src/tex/index.tex -------------- next part -------------- Modified: pal-portal/docs/ja/installation-guide/trunk/src/tex/index.tex =================================================================== --- pal-portal/docs/ja/installation-guide/trunk/src/tex/index.tex 2009-02-03 13:24:26 UTC (rev 1713) +++ pal-portal/docs/ja/installation-guide/trunk/src/tex/index.tex 2009-02-03 14:10:35 UTC (rev 1714) @@ -37,10 +37,11 @@ ダウンロード、専門的サービス、サポート、その他の開発者情報については、次にアクセスしてください。 -プロジェクトサイト:http://pal.sourceforge.jp/ +\begin{itemize} +\item プロジェクトサイト:http://pal.sourceforge.jp/ +\end{itemize} - \section{技術的なサポートの連絡先} 本製品に関する技術的質問で、ドキュメント内に解決策が得られない場合は、次にアクセスしてください。 @@ -62,7 +63,9 @@ Portal Application Laboratoryプロジェクトは、このドキュメントの改善に努めており、読者からのコメントおよび提案などを歓迎しています。 -メーリングリスト:http://sourceforge.jp/mail/?group\_id=1972 +\begin{itemize} +\item メーリングリスト:http://sourceforge.jp/mail/?group\_id=1972 +\end{itemize} From svnnotify ＠ sourceforge.jp Wed Feb 4 06:30:54 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Wed, 04 Feb 2009 06:30:54 +0900 Subject: [pal-cvs 3980] [1715] a minor fix. Message-ID: <1233696654.826700.4572.nullmailer@users.sourceforge.jp> Revision: 1715 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1715 Author: shinsuke Date: 2009-02-04 06:30:54 +0900 (Wed, 04 Feb 2009) Log Message: ----------- a minor fix. Modified Paths: -------------- pal-portal/docs/ja/configuration-guide/trunk/src/tex/index.tex -------------- next part -------------- Modified: pal-portal/docs/ja/configuration-guide/trunk/src/tex/index.tex =================================================================== --- pal-portal/docs/ja/configuration-guide/trunk/src/tex/index.tex 2009-02-03 14:10:35 UTC (rev 1714) +++ pal-portal/docs/ja/configuration-guide/trunk/src/tex/index.tex 2009-02-03 21:30:54 UTC (rev 1715) @@ -36,7 +36,9 @@ \subsection{オンラインでのアクセス} ダウンロード、専門的サービス、サポート、その他の開発者情報については、次にアクセスしてください。 -プロジェクトサイト:http://pal.sourceforge.jp/ +\begin{itemize} +\item プロジェクトサイト:http://pal.sourceforge.jp/ +\end{itemize} \subsection{技術的なサポートの連絡先} @@ -60,7 +62,6 @@ Portal Application Laboratoryプロジェクトは、このドキュメントの改善に努めており、読者からのコメントおよび提案などを歓迎しています。 \begin{itemize} - \item メーリングリスト:http://sourceforge.jp/mail/?group\_id=1972 \end{itemize} From svnnotify ＠ sourceforge.jp Wed Feb 4 22:30:38 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Wed, 04 Feb 2009 22:30:38 +0900 Subject: [pal-cvs 3981] [1716] set userid. Message-ID: <1233754238.354198.3502.nullmailer@users.sourceforge.jp> Revision: 1716 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1716 Author: shinsuke Date: 2009-02-04 22:30:38 +0900 (Wed, 04 Feb 2009) Log Message: ----------- set userid. Modified Paths: -------------- addresslist/trunk/src/main/java/jp/sf/pal/addresslist/action/admin/CompanyAction.java -------------- next part -------------- Modified: addresslist/trunk/src/main/java/jp/sf/pal/addresslist/action/admin/CompanyAction.java =================================================================== --- addresslist/trunk/src/main/java/jp/sf/pal/addresslist/action/admin/CompanyAction.java 2009-02-03 21:30:54 UTC (rev 1715) +++ addresslist/trunk/src/main/java/jp/sf/pal/addresslist/action/admin/CompanyAction.java 2009-02-04 13:30:38 UTC (rev 1716) @@ -279,14 +279,15 @@ "errors.could_not_find_company", new Object[] { companyForm.id }); } + companyDxo.convertFromFormToCompany(companyForm, company); company.setUpdatedBy(userId); } else { company = new Company(); + companyDxo.convertFromFormToCompany(companyForm, company); company.setUserId(userId); company.setUpdatedBy(userId); company.setCreatedBy(userId); } - companyDxo.convertFromFormToCompany(companyForm, company); return company; } From svnnotify ＠ sourceforge.jp Wed Feb 4 22:37:17 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Wed, 04 Feb 2009 22:37:17 +0900 Subject: [pal-cvs 3982] [1717] added type property as hidden. Message-ID: <1233754637.434931.11868.nullmailer@users.sourceforge.jp> Revision: 1717 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1717 Author: shinsuke Date: 2009-02-04 22:37:17 +0900 (Wed, 04 Feb 2009) Log Message: ----------- added type property as hidden. Modified Paths: -------------- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/facilitylist.jsp -------------- next part -------------- Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/facilitylist.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/facilitylist.jsp 2009-02-04 13:30:38 UTC (rev 1716) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/facilitylist.jsp 2009-02-04 13:37:17 UTC (rev 1717) @@ -47,6 +47,7 @@ + From svnnotify ＠ sourceforge.jp Wed Feb 4 22:48:35 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Wed, 04 Feb 2009 22:48:35 +0900 Subject: [pal-cvs 3983] [1718] check an empty value. Message-ID: <1233755315.291937.25852.nullmailer@users.sourceforge.jp> Revision: 1718 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1718 Author: shinsuke Date: 2009-02-04 22:48:35 +0900 (Wed, 04 Feb 2009) Log Message: ----------- check an empty value. Modified Paths: -------------- scheduler/trunk/src/main/java/jp/sf/pal/scheduler/util/SchedulerUtil.java -------------- next part -------------- Modified: scheduler/trunk/src/main/java/jp/sf/pal/scheduler/util/SchedulerUtil.java =================================================================== --- scheduler/trunk/src/main/java/jp/sf/pal/scheduler/util/SchedulerUtil.java 2009-02-04 13:37:17 UTC (rev 1717) +++ scheduler/trunk/src/main/java/jp/sf/pal/scheduler/util/SchedulerUtil.java 2009-02-04 13:48:35 UTC (rev 1718) @@ -29,12 +29,12 @@ public static boolean compare(String yyyymmdd1, String HHmm1, String yyyymmdd2, String HHmm2) { - if (yyyymmdd1 == null) { + if (StringUtils.isEmpty(yyyymmdd1)) { // invalid state return false; } - if (yyyymmdd2 != null) { + if (!StringUtils.isEmpty(yyyymmdd2)) { if (yyyymmdd1.equals(yyyymmdd2)) { if (HHmm1 == null || HHmm2 == null) { return true; @@ -58,7 +58,7 @@ } } } else { - if (HHmm1 != null && HHmm2 != null) { + if (!StringUtils.isEmpty(HHmm1) && !StringUtils.isEmpty(HHmm2)) { // compare time Date date1 = parseHHmm(HHmm1); Date date2 = parseHHmm(HHmm2); From svnnotify ＠ sourceforge.jp Thu Feb 5 22:09:24 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Thu, 05 Feb 2009 22:09:24 +0900 Subject: [pal-cvs 3984] [1719] fixed error handling. Message-ID: <1233839364.528125.9788.nullmailer@users.sourceforge.jp> Revision: 1719 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1719 Author: shinsuke Date: 2009-02-05 22:09:24 +0900 (Thu, 05 Feb 2009) Log Message: ----------- fixed error handling. Modified Paths: -------------- scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/facility/OnetimeScheduleAction.java scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/facility/RepeatScheduleAction.java scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/onetimeSchedule/error.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/repeatSchedule/error.jsp -------------- next part -------------- Modified: scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/facility/OnetimeScheduleAction.java =================================================================== --- scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/facility/OnetimeScheduleAction.java 2009-02-04 13:48:35 UTC (rev 1718) +++ scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/facility/OnetimeScheduleAction.java 2009-02-05 13:09:24 UTC (rev 1719) @@ -438,7 +438,7 @@ return "userlist.jsp"; } - @Execute(validator = true, input = "error.jsp") + @Execute(validator = true, input = "userlist.jsp") public String changeusergroup() { if (onetimeScheduleForm.userGroup == null) { // TODO Modified: scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/facility/RepeatScheduleAction.java =================================================================== --- scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/facility/RepeatScheduleAction.java 2009-02-04 13:48:35 UTC (rev 1718) +++ scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/facility/RepeatScheduleAction.java 2009-02-05 13:09:24 UTC (rev 1719) @@ -481,7 +481,7 @@ return "userlist.jsp"; } - @Execute(validator = true, input = "error.jsp") + @Execute(validator = true, input = "userlist.jsp") public String changeusergroup() { if (repeatScheduleForm.userGroup == null) { String userId = request.getRemoteUser(); Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/onetimeSchedule/error.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/onetimeSchedule/error.jsp 2009-02-04 13:48:35 UTC (rev 1718) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/onetimeSchedule/error.jsp 2009-02-05 13:09:24 UTC (rev 1719) @@ -39,7 +39,7 @@
- + Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/repeatSchedule/error.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/repeatSchedule/error.jsp 2009-02-04 13:48:35 UTC (rev 1718) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/repeatSchedule/error.jsp 2009-02-05 13:09:24 UTC (rev 1719) @@ -39,7 +39,7 @@
- + From svnnotify ＠ sourceforge.jp Fri Feb 6 22:30:54 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 06 Feb 2009 22:30:54 +0900 Subject: [pal-cvs 3985] [1720] added background color. Message-ID: <1233927054.242674.12888.nullmailer@users.sourceforge.jp> Revision: 1720 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1720 Author: shinsuke Date: 2009-02-06 22:30:54 +0900 (Fri, 06 Feb 2009) Log Message: ----------- added background color. Modified Paths: -------------- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/portlet/default/css/PLT-C.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 2009-02-05 13:09:24 UTC (rev 1719) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/portlet/default/css/PLT-C.css 2009-02-06 13:30:54 UTC (rev 1720) @@ -36,6 +36,7 @@ .default .PTitle { color:#0080b0; + background:#ffffff; cursor: move; margin:2px 7px; padding:5px 4px 0px 4px; From svnnotify ＠ sourceforge.jp Fri Feb 6 22:41:43 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 06 Feb 2009 22:41:43 +0900 Subject: [pal-cvs 3986] [1721] checked an empty value. Message-ID: <1233927703.039992.23588.nullmailer@users.sourceforge.jp> Revision: 1721 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1721 Author: shinsuke Date: 2009-02-06 22:41:42 +0900 (Fri, 06 Feb 2009) Log Message: ----------- checked an empty value. Modified Paths: -------------- scheduler/trunk/src/main/java/jp/sf/pal/scheduler/util/SchedulerUtil.java -------------- next part -------------- Modified: scheduler/trunk/src/main/java/jp/sf/pal/scheduler/util/SchedulerUtil.java =================================================================== --- scheduler/trunk/src/main/java/jp/sf/pal/scheduler/util/SchedulerUtil.java 2009-02-06 13:30:54 UTC (rev 1720) +++ scheduler/trunk/src/main/java/jp/sf/pal/scheduler/util/SchedulerUtil.java 2009-02-06 13:41:42 UTC (rev 1721) @@ -36,7 +36,7 @@ if (!StringUtils.isEmpty(yyyymmdd2)) { if (yyyymmdd1.equals(yyyymmdd2)) { - if (HHmm1 == null || HHmm2 == null) { + if (StringUtils.isEmpty(HHmm1) || StringUtils.isEmpty(HHmm2)) { return true; } // compare time From svnnotify ＠ sourceforge.jp Fri Feb 6 22:59:19 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 06 Feb 2009 22:59:19 +0900 Subject: [pal-cvs 3987] [1722] fixed ie design problem. Message-ID: <1233928759.033229.10110.nullmailer@users.sourceforge.jp> Revision: 1722 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1722 Author: shinsuke Date: 2009-02-06 22:59:18 +0900 (Fri, 06 Feb 2009) Log Message: ----------- fixed ie design problem. Modified Paths: -------------- notepad/trunk/src/main/webapp/WEB-INF/view/admin/notepad/confirm.jsp -------------- next part -------------- Modified: notepad/trunk/src/main/webapp/WEB-INF/view/admin/notepad/confirm.jsp =================================================================== --- notepad/trunk/src/main/webapp/WEB-INF/view/admin/notepad/confirm.jsp 2009-02-06 13:41:42 UTC (rev 1721) +++ notepad/trunk/src/main/webapp/WEB-INF/view/admin/notepad/confirm.jsp 2009-02-06 13:59:18 UTC (rev 1722) @@ -45,8 +45,8 @@ - - ${f:h(title)} + + ${f:h(title)} From svnnotify ＠ sourceforge.jp Mon Feb 9 06:27:25 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Mon, 09 Feb 2009 06:27:25 +0900 Subject: [pal-cvs 3988] [1723] modified a label. Message-ID: <1234128445.708035.24132.nullmailer@users.sourceforge.jp> Revision: 1723 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1723 Author: shinsuke Date: 2009-02-09 06:27:25 +0900 (Mon, 09 Feb 2009) Log Message: ----------- modified a label. Modified Paths: -------------- board/trunk/src/main/webapp/WEB-INF/view/category/edit/confirm.jsp -------------- next part -------------- Modified: board/trunk/src/main/webapp/WEB-INF/view/category/edit/confirm.jsp =================================================================== --- board/trunk/src/main/webapp/WEB-INF/view/category/edit/confirm.jsp 2009-02-06 13:59:18 UTC (rev 1722) +++ board/trunk/src/main/webapp/WEB-INF/view/category/edit/confirm.jsp 2009-02-08 21:27:25 UTC (rev 1723) @@ -42,7 +42,7 @@ "/> - "/> + "/> "/> From svnnotify ＠ sourceforge.jp Wed Feb 11 10:07:12 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Wed, 11 Feb 2009 10:07:12 +0900 Subject: [pal-cvs 3989] [1724] updated db scheme, and fixed bugs. Message-ID: <1234314432.982844.28567.nullmailer@users.sourceforge.jp> Revision: 1724 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1724 Author: shinsuke Date: 2009-02-11 10:07:12 +0900 (Wed, 11 Feb 2009) Log Message: ----------- updated db scheme, and fixed bugs. Modified Paths: -------------- scheduler/trunk/src/main/config/erd/scheduler.erd scheduler/trunk/src/main/config/sql/scheduler.ddl scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/facility/OnetimeScheduleAction.java scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/facility/RepeatScheduleAction.java scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/schedule/OnetimeScheduleAction.java scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/schedule/RepeatScheduleAction.java scheduler/trunk/src/main/java/jp/sf/pal/scheduler/db/bsbhv/BsEventScheduleBhv.java scheduler/trunk/src/main/java/jp/sf/pal/scheduler/db/bsentity/BsEventSchedule.java scheduler/trunk/src/main/java/jp/sf/pal/scheduler/db/bsentity/dbmeta/EventScheduleDbm.java scheduler/trunk/src/main/java/jp/sf/pal/scheduler/db/cbean/bs/BsEventScheduleCB.java scheduler/trunk/src/main/java/jp/sf/pal/scheduler/db/cbean/cq/bs/AbstractBsEventScheduleCQ.java scheduler/trunk/src/main/java/jp/sf/pal/scheduler/db/cbean/cq/bs/BsEventScheduleCQ.java scheduler/trunk/src/main/java/jp/sf/pal/scheduler/db/cbean/cq/ciq/EventScheduleCIQ.java scheduler/trunk/src/main/java/jp/sf/pal/scheduler/form/admin/schedule/OnetimeScheduleForm.java scheduler/trunk/src/main/java/jp/sf/pal/scheduler/form/admin/schedule/RepeatScheduleForm.java scheduler/trunk/src/main/java/jp/sf/pal/scheduler/form/user/facility/RepeatScheduleForm.java scheduler/trunk/src/main/java/jp/sf/pal/scheduler/service/OnetimeScheduleService.java scheduler/trunk/src/main/java/jp/sf/pal/scheduler/service/RepeatScheduleService.java scheduler/trunk/src/main/resources/application.properties scheduler/trunk/src/main/resources/application_ja.properties scheduler/trunk/src/main/webapp/WEB-INF/db/scheduler.1.log.db scheduler/trunk/src/main/webapp/WEB-INF/db/scheduler.data.db scheduler/trunk/src/main/webapp/WEB-INF/template/ja/create-onetime-facility.vm scheduler/trunk/src/main/webapp/WEB-INF/template/ja/create-repeat-facility.vm scheduler/trunk/src/main/webapp/WEB-INF/template/ja/update-onetime-facility.vm scheduler/trunk/src/main/webapp/WEB-INF/template/ja/update-repeat-facility.vm scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/confirm.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/edit.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/facilitylist.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/userlist.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/confirm.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/edit.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/facilitylist.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/userlist.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/onetimeSchedule/facilitylist.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/repeatSchedule/facilitylist.jsp scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/repeatSchedule/facilitylist.jsp -------------- next part -------------- Modified: scheduler/trunk/src/main/config/erd/scheduler.erd =================================================================== --- scheduler/trunk/src/main/config/erd/scheduler.erd 2009-02-08 21:27:25 UTC (rev 1723) +++ scheduler/trunk/src/main/config/erd/scheduler.erd 2009-02-11 01:07:12 UTC (rev 1724) @@ -1152,6 +1152,22 @@ + is_facility + Is Facility + + VARCHAR + String + true + 12 + + 1 + true + false + + false + 'F' + + parent_id Parent ID @@ -1197,7 +1213,7 @@ updated_time Updated Time - + 10 true false @@ -1219,7 +1235,7 @@ deleted_time Deleted Time - + 10 false false @@ -1496,7 +1512,7 @@ created_time Created Time - + 10 true false @@ -1518,7 +1534,7 @@ updated_time Updated Time - + 10 true false @@ -1540,7 +1556,7 @@ deleted_time Deleted Time - + 10 false false @@ -1636,7 +1652,7 @@ created_time Created Time - + 10 true false @@ -1658,7 +1674,7 @@ updated_time Updated Time - + 10 true false @@ -1680,7 +1696,7 @@ deleted_time Deleted Time - + 10 false false Modified: scheduler/trunk/src/main/config/sql/scheduler.ddl =================================================================== --- scheduler/trunk/src/main/config/sql/scheduler.ddl 2009-02-08 21:27:25 UTC (rev 1723) +++ scheduler/trunk/src/main/config/sql/scheduler.ddl 2009-02-11 01:07:12 UTC (rev 1724) @@ -115,6 +115,7 @@ end_time TIME, secret VARCHAR(1) DEFAULT 'F' NOT NULL, type VARCHAR(10) NOT NULL, + is_facility VARCHAR(1) DEFAULT 'F' NOT NULL, parent_id BIGINT(20), created_time TIMESTAMP NOT NULL, created_by VARCHAR(255) NOT NULL, Modified: scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/facility/OnetimeScheduleAction.java =================================================================== --- scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/facility/OnetimeScheduleAction.java 2009-02-08 21:27:25 UTC (rev 1723) +++ scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/facility/OnetimeScheduleAction.java 2009-02-11 01:07:12 UTC (rev 1724) @@ -207,7 +207,7 @@ return "edit.jsp"; } - @Execute(validator = false, input = "error.jsp", urlPattern = "editpageforonetime/{returnType}//{facilityId}/{year}/{month}/{date}/{parentId}/{tYear}/{tMonth}/{tDate}") + @Execute(validator = false, input = "error.jsp", urlPattern = "editpageforonetime/{returnType}/{facilityId}/{year}/{month}/{date}/{parentId}/{tYear}/{tMonth}/{tDate}") public String editpageforonetime() { onetimeScheduleForm.mode = SchedulerConstants.EDIT_ONE_DAY_MODE; @@ -618,11 +618,15 @@ // update for one-time event onetimeScheduleForm.startDateY = onetimeScheduleForm.tYear; - onetimeScheduleForm.startDateM = onetimeScheduleForm.tMonth; - onetimeScheduleForm.startDateD = onetimeScheduleForm.tDate; - onetimeScheduleForm.endDateY = onetimeScheduleForm.tYear; - onetimeScheduleForm.endDateM = onetimeScheduleForm.tMonth; - onetimeScheduleForm.endDateD = onetimeScheduleForm.tDate; + onetimeScheduleForm.startDateM = onetimeScheduleForm.tMonth.length() == 1 ? "0" + + onetimeScheduleForm.tMonth + : onetimeScheduleForm.tMonth; + onetimeScheduleForm.startDateD = onetimeScheduleForm.tDate.length() == 1 ? "0" + + onetimeScheduleForm.tDate + : onetimeScheduleForm.tDate; + onetimeScheduleForm.endDateY = onetimeScheduleForm.startDateY; + onetimeScheduleForm.endDateM = onetimeScheduleForm.startDateM; + onetimeScheduleForm.endDateD = onetimeScheduleForm.startDateD; onetimeScheduleForm.parentId = onetimeScheduleForm.id; onetimeScheduleForm.id = null; @@ -652,6 +656,10 @@ onetimeScheduleDxo.convertFromFormToEventSchedule(onetimeScheduleForm, eventSchedule); + if (StringUtils.isEmpty(eventSchedule.getIsFacility())) { + eventSchedule.setIsFacility(CommonConstants.TRUE); + } + return eventSchedule; } @@ -670,6 +678,7 @@ deletedEventSchedule.setUpdatedBy(userId); deletedEventSchedule.setCreatedBy(userId); deletedEventSchedule.setTitle("DELETE"); + deletedEventSchedule.setIsFacility(eventSchedule.getIsFacility()); // mapping List esmList = eventSchedule Modified: scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/facility/RepeatScheduleAction.java =================================================================== --- scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/facility/RepeatScheduleAction.java 2009-02-08 21:27:25 UTC (rev 1723) +++ scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/facility/RepeatScheduleAction.java 2009-02-11 01:07:12 UTC (rev 1724) @@ -303,6 +303,14 @@ loadEventSchedule(); + repeatScheduleForm.tYear = repeatScheduleForm.year; + repeatScheduleForm.tMonth = repeatScheduleForm.month.length() == 1 ? "0" + + repeatScheduleForm.month + : repeatScheduleForm.month; + repeatScheduleForm.tDate = repeatScheduleForm.date.length() == 1 ? "0" + + repeatScheduleForm.date + : repeatScheduleForm.date; + return "confirm.jsp"; } catch (ActionMessagesException e) { log.error(e.getMessage(), e); @@ -452,10 +460,10 @@ // reset edit page loadListPageParameters(); - return "/user/schedule/calendar/" + repeatScheduleForm.returnType - + "/" + repeatScheduleForm.year + "/" - + repeatScheduleForm.month + "/" + repeatScheduleForm.date - + "?redirect=true"; + return "/user/facility/calendar/" + repeatScheduleForm.returnType + + "/" + repeatScheduleForm.facilityId + "/" + + repeatScheduleForm.year + "/" + repeatScheduleForm.month + + "/" + repeatScheduleForm.date + "?redirect=true"; // return displayList(); } catch (ActionMessagesException e) { log.error(e.getMessage(), e); @@ -664,6 +672,10 @@ repeatScheduleDxo.convertFromFormToEventSchedule(repeatScheduleForm, eventSchedule); + if (StringUtils.isEmpty(eventSchedule.getIsFacility())) { + eventSchedule.setIsFacility(CommonConstants.TRUE); + } + return eventSchedule; } @@ -690,6 +702,7 @@ deletedEventSchedule.setUpdatedBy(userId); deletedEventSchedule.setCreatedBy(userId); deletedEventSchedule.setTitle("DELETE"); + deletedEventSchedule.setIsFacility(eventSchedule.getIsFacility()); // mapping List esmList = eventSchedule Modified: scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/schedule/OnetimeScheduleAction.java =================================================================== --- scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/schedule/OnetimeScheduleAction.java 2009-02-08 21:27:25 UTC (rev 1723) +++ scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/schedule/OnetimeScheduleAction.java 2009-02-11 01:07:12 UTC (rev 1724) @@ -610,11 +610,15 @@ // update for one-time event onetimeScheduleForm.startDateY = onetimeScheduleForm.tYear; - onetimeScheduleForm.startDateM = onetimeScheduleForm.tMonth; - onetimeScheduleForm.startDateD = onetimeScheduleForm.tDate; - onetimeScheduleForm.endDateY = onetimeScheduleForm.tYear; - onetimeScheduleForm.endDateM = onetimeScheduleForm.tMonth; - onetimeScheduleForm.endDateD = onetimeScheduleForm.tDate; + onetimeScheduleForm.startDateM = onetimeScheduleForm.tMonth.length() == 1 ? "0" + + onetimeScheduleForm.tMonth + : onetimeScheduleForm.tMonth; + onetimeScheduleForm.startDateD = onetimeScheduleForm.tDate.length() == 1 ? "0" + + onetimeScheduleForm.tDate + : onetimeScheduleForm.tDate; + onetimeScheduleForm.endDateY = onetimeScheduleForm.startDateY; + onetimeScheduleForm.endDateM = onetimeScheduleForm.startDateM; + onetimeScheduleForm.endDateD = onetimeScheduleForm.startDateD; onetimeScheduleForm.parentId = onetimeScheduleForm.id; onetimeScheduleForm.id = null; @@ -644,6 +648,10 @@ onetimeScheduleDxo.convertFromFormToEventSchedule(onetimeScheduleForm, eventSchedule); + if (StringUtils.isEmpty(eventSchedule.getIsFacility())) { + eventSchedule.setIsFacility(CommonConstants.FALSE); + } + return eventSchedule; } @@ -662,6 +670,7 @@ deletedEventSchedule.setUpdatedBy(userId); deletedEventSchedule.setCreatedBy(userId); deletedEventSchedule.setTitle("DELETE"); + deletedEventSchedule.setIsFacility(eventSchedule.getIsFacility()); // mapping List esmList = eventSchedule Modified: scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/schedule/RepeatScheduleAction.java =================================================================== --- scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/schedule/RepeatScheduleAction.java 2009-02-08 21:27:25 UTC (rev 1723) +++ scheduler/trunk/src/main/java/jp/sf/pal/scheduler/action/user/schedule/RepeatScheduleAction.java 2009-02-11 01:07:12 UTC (rev 1724) @@ -296,6 +296,14 @@ loadEventSchedule(); + repeatScheduleForm.tYear = repeatScheduleForm.year; + repeatScheduleForm.tMonth = repeatScheduleForm.month.length() == 1 ? "0" + + repeatScheduleForm.month + : repeatScheduleForm.month; + repeatScheduleForm.tDate = repeatScheduleForm.date.length() == 1 ? "0" + + repeatScheduleForm.date + : repeatScheduleForm.date; + return "confirm.jsp"; } catch (ActionMessagesException e) { log.error(e.getMessage(), e); @@ -656,6 +664,10 @@ repeatScheduleDxo.convertFromFormToEventSchedule(repeatScheduleForm, eventSchedule); + if (StringUtils.isEmpty(eventSchedule.getIsFacility())) { + eventSchedule.setIsFacility(CommonConstants.FALSE); + } + return eventSchedule; } @@ -682,6 +694,7 @@ deletedEventSchedule.setUpdatedBy(userId); deletedEventSchedule.setCreatedBy(userId); deletedEventSchedule.setTitle("DELETE"); + deletedEventSchedule.setIsFacility(eventSchedule.getIsFacility()); // mapping List esmList = eventSchedule Modified: scheduler/trunk/src/main/java/jp/sf/pal/scheduler/db/bsbhv/BsEventScheduleBhv.java =================================================================== --- scheduler/trunk/src/main/java/jp/sf/pal/scheduler/db/bsbhv/BsEventScheduleBhv.java 2009-02-08 21:27:25 UTC (rev 1723) +++ scheduler/trunk/src/main/java/jp/sf/pal/scheduler/db/bsbhv/BsEventScheduleBhv.java 2009-02-11 01:07:12 UTC (rev 1724) @@ -34,7 +34,7 @@ * ID * * [column] - * ID, TITLE, LOCATION, START_DATE, START_TIME, END_DATE, END_TIME, SECRET, TYPE, PARENT_ID, CREATED_TIME, CREATED_BY, UPDATED_TIME, UPDATED_BY, DELETED_TIME, DELETED_BY, VERSIONNO + * ID, TITLE, LOCATION, START_DATE, START_TIME, END_DATE, END_TIME, SECRET, TYPE, IS_FACILITY, PARENT_ID, CREATED_TIME, CREATED_BY, UPDATED_TIME, UPDATED_BY, DELETED_TIME, DELETED_BY, VERSIONNO * * [sequence] * Modified: scheduler/trunk/src/main/java/jp/sf/pal/scheduler/db/bsentity/BsEventSchedule.java =================================================================== --- scheduler/trunk/src/main/java/jp/sf/pal/scheduler/db/bsentity/BsEventSchedule.java 2009-02-08 21:27:25 UTC (rev 1723) +++ scheduler/trunk/src/main/java/jp/sf/pal/scheduler/db/bsentity/BsEventSchedule.java 2009-02-11 01:07:12 UTC (rev 1724) @@ -19,7 +19,7 @@ * ID * * [column] - * ID, TITLE, LOCATION, START_DATE, START_TIME, END_DATE, END_TIME, SECRET, TYPE, PARENT_ID, CREATED_TIME, CREATED_BY, UPDATED_TIME, UPDATED_BY, DELETED_TIME, DELETED_BY, VERSIONNO + * ID, TITLE, LOCATION, START_DATE, START_TIME, END_DATE, END_TIME, SECRET, TYPE, IS_FACILITY, PARENT_ID, CREATED_TIME, CREATED_BY, UPDATED_TIME, UPDATED_BY, DELETED_TIME, DELETED_BY, VERSIONNO * * [sequence] * @@ -97,6 +97,9 @@ /** TYPE: {NotNull : VARCHAR(10)} */ protected String _type; + /** IS_FACILITY: {NotNull : VARCHAR(1) : Default=[F]} */ + protected String _isFacility; + /** PARENT_ID: {BIGINT} */ protected Long _parentId; @@ -360,6 +363,7 @@ sb.append(delimiter).append(getEndTime()); sb.append(delimiter).append(getSecret()); sb.append(delimiter).append(getType()); + sb.append(delimiter).append(getIsFacility()); sb.append(delimiter).append(getParentId()); sb.append(delimiter).append(getCreatedTime()); sb.append(delimiter).append(getCreatedBy()); @@ -578,6 +582,28 @@ this._type = type; } + /** The column annotation for S2Dao. {NotNull : VARCHAR(1) : Default=[F]} */ + public static final String isFacility_COLUMN = "IS_FACILITY"; + + /** + * IS_FACILITY: {NotNull : VARCHAR(1) : Default=[F]}
+ * + * @return The value of the column 'IS_FACILITY'. (Nullable) + */ + public String getIsFacility() { + return _isFacility; + } + + /** + * IS_FACILITY: {NotNull : VARCHAR(1) : Default=[F]}
+ * + * @param isFacility The value of the column 'IS_FACILITY'. (Nullable) + */ + public void setIsFacility(String isFacility) { + _modifiedProperties.addPropertyName("isFacility"); + this._isFacility = isFacility; + } + /** The column annotation for S2Dao. {BIGINT} */ public static final String parentId_COLUMN = "PARENT_ID"; Modified: scheduler/trunk/src/main/java/jp/sf/pal/scheduler/db/bsentity/dbmeta/EventScheduleDbm.java =================================================================== --- scheduler/trunk/src/main/java/jp/sf/pal/scheduler/db/bsentity/dbmeta/EventScheduleDbm.java 2009-02-08 21:27:25 UTC (rev 1723) +++ scheduler/trunk/src/main/java/jp/sf/pal/scheduler/db/bsentity/dbmeta/EventScheduleDbm.java 2009-02-11 01:07:12 UTC (rev 1724) @@ -75,6 +75,9 @@ protected ColumnInfo _columnType = cci("TYPE", "type", String.class, false, 10, 0); + protected ColumnInfo _columnIsFacility = cci("IS_FACILITY", "isFacility", + String.class, false, 1, 0); + protected ColumnInfo _columnParentId = cci("PARENT_ID", "parentId", Long.class, false, null, null); @@ -135,6 +138,10 @@ return _columnType; } + public ColumnInfo columnIsFacility() { + return _columnIsFacility; + } + public ColumnInfo columnParentId() { return _columnParentId; } @@ -363,6 +370,7 @@ setupEps(_epsMap, new EpsEndTime(), columnEndTime()); setupEps(_epsMap, new EpsSecret(), columnSecret()); setupEps(_epsMap, new EpsType(), columnType()); + setupEps(_epsMap, new EpsIsFacility(), columnIsFacility()); setupEps(_epsMap, new EpsParentId(), columnParentId()); setupEps(_epsMap, new EpsCreatedTime(), columnCreatedTime()); setupEps(_epsMap, new EpsCreatedBy(), columnCreatedBy()); @@ -436,6 +444,12 @@ } } + public static class EpsIsFacility implements Eps { + public void setup(EventSchedule e, Object v) { + e.setIsFacility((String) v); + } + } + public static class EpsParentId implements Eps { public void setup(EventSchedule e, Object v) { e.setParentId((Long) v); Modified: scheduler/trunk/src/main/java/jp/sf/pal/scheduler/db/cbean/bs/BsEventScheduleCB.java =================================================================== --- scheduler/trunk/src/main/java/jp/sf/pal/scheduler/db/cbean/bs/BsEventScheduleCB.java 2009-02-08 21:27:25 UTC (rev 1723) +++ scheduler/trunk/src/main/java/jp/sf/pal/scheduler/db/cbean/bs/BsEventScheduleCB.java 2009-02-11 01:07:12 UTC (rev 1724) @@ -248,6 +248,10 @@ doColumn("TYPE"); } + public void columnIsFacility() { + doColumn("IS_FACILITY"); + } + public void columnParentId() { doColumn("PARENT_ID"); } Modified: scheduler/trunk/src/main/java/jp/sf/pal/scheduler/db/cbean/cq/bs/AbstractBsEventScheduleCQ.java =================================================================== --- scheduler/trunk/src/main/java/jp/sf/pal/scheduler/db/cbean/cq/bs/AbstractBsEventScheduleCQ.java 2009-02-08 21:27:25 UTC (rev 1723) +++ scheduler/trunk/src/main/java/jp/sf/pal/scheduler/db/cbean/cq/bs/AbstractBsEventScheduleCQ.java 2009-02-11 01:07:12 UTC (rev 1724) @@ -1278,6 +1278,130 @@ abstract protected ConditionValue getCValueType(); /** + * Equal(=). And NullOrEmptyIgnored, OnlyOnceRegistered. {NotNull : + * VARCHAR(1) : Default=[F]} + * + * @param isFacility The value of isFacility as equal. + */ + public void setIsFacility_Equal(String isFacility) { + regIsFacility(CK_EQ, fRES(isFacility)); + } + + /** + * NotEqual(!=). And NullOrEmptyIgnored, OnlyOnceRegistered. + * + * @param isFacility The value of isFacility as notEqual. + */ + public void setIsFacility_NotEqual(String isFacility) { + regIsFacility(CK_NE, fRES(isFacility)); + } + + /** + * GreaterThan(>). And NullOrEmptyIgnored, OnlyOnceRegistered. + * + * @param isFacility The value of isFacility as greaterThan. + */ + public void setIsFacility_GreaterThan(String isFacility) { + regIsFacility(CK_GT, fRES(isFacility)); + } + + /** + * LessThan(<). And NullOrEmptyIgnored, OnlyOnceRegistered. + * + * @param isFacility The value of isFacility as lessThan. + */ + public void setIsFacility_LessThan(String isFacility) { + regIsFacility(CK_LT, fRES(isFacility)); + } + + /** + * GreaterEqual(>=). And NullOrEmptyIgnored, OnlyOnceRegistered. + * + * @param isFacility The value of isFacility as greaterEqual. + */ + public void setIsFacility_GreaterEqual(String isFacility) { + regIsFacility(CK_GE, fRES(isFacility)); + } + + /** + * LessEqual(<=). And NullOrEmptyIgnored, OnlyOnceRegistered. + * + * @param isFacility The value of isFacility as lessEqual. + */ + public void setIsFacility_LessEqual(String isFacility) { + regIsFacility(CK_LE, fRES(isFacility)); + } + + /** + * PrefixSearch(like 'xxx%'). And NullOrEmptyIgnored, OnlyOnceRegistered. + * + * @param isFacility The value of isFacility as prefixSearch. + */ + public void setIsFacility_PrefixSearch(String isFacility) { + regIsFacility(CK_PS, fRES(isFacility)); + } + + /** + * InScope(in ('a', 'b')). And NullOrEmptyIgnored, + * NullOrEmptyElementIgnored, SeveralRegistered. + * + * @param isFacilityList The collection of isFacility as inScope. + */ + public void setIsFacility_InScope(Collection isFacilityList) { + regIsFacility(CK_INS, cTL(isFacilityList)); + } + + /** + * NotInScope(not in ('a', 'b')). And NullOrEmptyIgnored, + * NullOrEmptyElementIgnored, SeveralRegistered. + * + * @param isFacilityList The collection of isFacility as notInScope. + */ + public void setIsFacility_NotInScope(Collection isFacilityList) { + regIsFacility(CK_NINS, cTL(isFacilityList)); + } + + /** + * LikeSearch(like 'xxx%' escape ...). And NullOrEmptyIgnored, + * SeveralRegistered. + * + * @param isFacility The value of isFacility as likeSearch. + * @param likeSearchOption The option of like-search. (NotNull) + */ + public void setIsFacility_LikeSearch( + String isFacility, + jp.sf.pal.scheduler.db.allcommon.cbean.coption.LikeSearchOption likeSearchOption) { + regLSQ(CK_LS, fRES(isFacility), getCValueIsFacility(), "IS_FACILITY", + "IsFacility", "isFacility", likeSearchOption); + } + + /** + * NotLikeSearch(not like 'xxx%' escape ...). And NullOrEmptyIgnored, + * SeveralRegistered. + * + * @param isFacility The value of isFacility as notLikeSearch. + * @param likeSearchOption The option of not-like-search. (NotNull) + */ + public void setIsFacility_NotLikeSearch( + String isFacility, + jp.sf.pal.scheduler.db.allcommon.cbean.coption.LikeSearchOption likeSearchOption) { + regLSQ(CK_NLS, fRES(isFacility), getCValueIsFacility(), "IS_FACILITY", + "IsFacility", "isFacility", likeSearchOption); + } + + protected void regIsFacility(ConditionKey key, Object value) { + registerQuery(key, value, getCValueIsFacility(), "IS_FACILITY", + "IsFacility", "isFacility"); + } + + protected void registerInlineIsFacility(ConditionKey key, Object value) { + registerInlineQuery(key, value, getCValueIsFacility(), "IS_FACILITY", + "IsFacility", "isFacility"); + } + + abstract protected ConditionValue getCValueIsFacility(); + + /** * Equal(=). And NullIgnored, OnlyOnceRegistered. {BIGINT} * * @param parentId The value of parentId as equal. Modified: scheduler/trunk/src/main/java/jp/sf/pal/scheduler/db/cbean/cq/bs/BsEventScheduleCQ.java =================================================================== --- scheduler/trunk/src/main/java/jp/sf/pal/scheduler/db/cbean/cq/bs/BsEventScheduleCQ.java 2009-02-08 21:27:25 UTC (rev 1723) +++ scheduler/trunk/src/main/java/jp/sf/pal/scheduler/db/cbean/cq/bs/BsEventScheduleCQ.java 2009-02-11 01:07:12 UTC (rev 1724) @@ -520,6 +520,29 @@ return this; } + protected ConditionValue _isFacility; + + public ConditionValue getIsFacility() { + if (_isFacility == null) { + _isFacility = new ConditionValue(); + } + return _isFacility; + } + + protected ConditionValue getCValueIsFacility() { + return getIsFacility(); + } + + public BsEventScheduleCQ addOrderBy_IsFacility_Asc() { + regOBA("IS_FACILITY"); + return this; + } + + public BsEventScheduleCQ addOrderBy_IsFacility_Desc() { + regOBD("IS_FACILITY"); + return this; + } + protected ConditionValue _parentId; public ConditionValue getParentId() { Modified: scheduler/trunk/src/main/java/jp/sf/pal/scheduler/db/cbean/cq/ciq/EventScheduleCIQ.java =================================================================== --- scheduler/trunk/src/main/java/jp/sf/pal/scheduler/db/cbean/cq/ciq/EventScheduleCIQ.java 2009-02-08 21:27:25 UTC (rev 1723) +++ scheduler/trunk/src/main/java/jp/sf/pal/scheduler/db/cbean/cq/ciq/EventScheduleCIQ.java 2009-02-11 01:07:12 UTC (rev 1724) @@ -211,6 +211,10 @@ return _myCQ.getType(); } + protected ConditionValue getCValueIsFacility() { + return _myCQ.getIsFacility(); + } + protected ConditionValue getCValueParentId() { return _myCQ.getParentId(); } Modified: scheduler/trunk/src/main/java/jp/sf/pal/scheduler/form/admin/schedule/OnetimeScheduleForm.java =================================================================== --- scheduler/trunk/src/main/java/jp/sf/pal/scheduler/form/admin/schedule/OnetimeScheduleForm.java 2009-02-08 21:27:25 UTC (rev 1723) +++ scheduler/trunk/src/main/java/jp/sf/pal/scheduler/form/admin/schedule/OnetimeScheduleForm.java 2009-02-11 01:07:12 UTC (rev 1724) @@ -77,6 +77,9 @@ public String[] selectedFacilities; + @Required + public String isFacility; + @IntegerType public String pageNumber; @@ -106,5 +109,6 @@ removedFacilities = null; selectedFacilities = null; parentId = null; + isFacility = null; } } Modified: scheduler/trunk/src/main/java/jp/sf/pal/scheduler/form/admin/schedule/RepeatScheduleForm.java =================================================================== --- scheduler/trunk/src/main/java/jp/sf/pal/scheduler/form/admin/schedule/RepeatScheduleForm.java 2009-02-08 21:27:25 UTC (rev 1723) +++ scheduler/trunk/src/main/java/jp/sf/pal/scheduler/form/admin/schedule/RepeatScheduleForm.java 2009-02-11 01:07:12 UTC (rev 1724) @@ -80,6 +80,9 @@ public String[] selectedFacilities; + @Required + public String isFacility; + @IntegerType public String pageNumber; @@ -110,5 +113,6 @@ removedFacilities = null; selectedFacilities = null; parentId = null; + isFacility = null; } } Modified: scheduler/trunk/src/main/java/jp/sf/pal/scheduler/form/user/facility/RepeatScheduleForm.java =================================================================== --- scheduler/trunk/src/main/java/jp/sf/pal/scheduler/form/user/facility/RepeatScheduleForm.java 2009-02-08 21:27:25 UTC (rev 1723) +++ scheduler/trunk/src/main/java/jp/sf/pal/scheduler/form/user/facility/RepeatScheduleForm.java 2009-02-11 01:07:12 UTC (rev 1724) @@ -180,9 +180,6 @@ startDateM = month.length() == 1 ? "0" + month : month; startDateD = date.length() == 1 ? "0" + date : date; } - startDateY = year; - startDateM = month; - startDateD = date; startTimeH = null; startTimeM = null; endDateY = null; Modified: scheduler/trunk/src/main/java/jp/sf/pal/scheduler/service/OnetimeScheduleService.java =================================================================== --- scheduler/trunk/src/main/java/jp/sf/pal/scheduler/service/OnetimeScheduleService.java 2009-02-08 21:27:25 UTC (rev 1723) +++ scheduler/trunk/src/main/java/jp/sf/pal/scheduler/service/OnetimeScheduleService.java 2009-02-11 01:07:12 UTC (rev 1724) @@ -7,6 +7,7 @@ import java.util.List; import jp.sf.pal.scheduler.SchedulerConstants; +import jp.sf.pal.scheduler.common.CommonConstants; import jp.sf.pal.scheduler.common.dxo.PagerDxo; import jp.sf.pal.scheduler.common.util.PagingResultBeanWrapper; import jp.sf.pal.scheduler.db.allcommon.bhv.setup.ConditionBeanSetupper; @@ -51,6 +52,8 @@ cb.query().queryEventSchedule().setDeletedBy_IsNull(); cb.query().queryEventSchedule().setStartDate_LessEqual(toDate); cb.query().queryEventSchedule().setEndDate_GreaterEqual(fromDate); + cb.query().queryEventSchedule().setIsFacility_Equal( + CommonConstants.TRUE); cb.query().queryEventSchedule().setType_Equal( SchedulerConstants.ONETIME_SCHEDULE); @@ -87,6 +90,8 @@ cb.query().queryEventSchedule().setDeletedBy_IsNull(); cb.query().queryEventSchedule().setStartDate_LessEqual(toDate); cb.query().queryEventSchedule().setEndDate_GreaterEqual(fromDate); + cb.query().queryEventSchedule().setIsFacility_Equal( + CommonConstants.FALSE); cb.query().queryEventSchedule().setType_Equal( SchedulerConstants.ONETIME_SCHEDULE); Modified: scheduler/trunk/src/main/java/jp/sf/pal/scheduler/service/RepeatScheduleService.java =================================================================== --- scheduler/trunk/src/main/java/jp/sf/pal/scheduler/service/RepeatScheduleService.java 2009-02-08 21:27:25 UTC (rev 1723) +++ scheduler/trunk/src/main/java/jp/sf/pal/scheduler/service/RepeatScheduleService.java 2009-02-11 01:07:12 UTC (rev 1724) @@ -7,6 +7,7 @@ import java.util.List; import jp.sf.pal.scheduler.SchedulerConstants; +import jp.sf.pal.scheduler.common.CommonConstants; import jp.sf.pal.scheduler.common.dxo.PagerDxo; import jp.sf.pal.scheduler.common.util.PagingResultBeanWrapper; import jp.sf.pal.scheduler.db.allcommon.bhv.setup.ConditionBeanSetupper; @@ -53,6 +54,8 @@ cb.query().queryEventSchedule().setDeletedBy_IsNull(); cb.query().queryEventSchedule().setStartDate_LessEqual(toDate); cb.query().queryEventSchedule().setEndDate_GreaterEqual(fromDate); + cb.query().queryEventSchedule().setIsFacility_Equal( + CommonConstants.TRUE); cb.query().queryEventSchedule().setType_NotEqual( SchedulerConstants.ONETIME_SCHEDULE); cb.unionAll(new UnionQuery() { @@ -62,6 +65,8 @@ unionCB.query().queryEventSchedule().setStartDate_LessEqual( toDate); unionCB.query().queryEventSchedule().setEndDate_IsNull(); + unionCB.query().queryEventSchedule().setIsFacility_Equal( + CommonConstants.TRUE); unionCB.query().queryEventSchedule().setType_NotEqual( SchedulerConstants.ONETIME_SCHEDULE); unionCB.query().queryEventSchedule().addOrderBy_StartDate_Asc(); @@ -100,6 +105,8 @@ cb.query().queryEventSchedule().setDeletedBy_IsNull(); cb.query().queryEventSchedule().setStartDate_LessEqual(toDate); cb.query().queryEventSchedule().setEndDate_GreaterEqual(fromDate); + cb.query().queryEventSchedule().setIsFacility_Equal( + CommonConstants.FALSE); cb.query().queryEventSchedule().setType_NotEqual( SchedulerConstants.ONETIME_SCHEDULE); cb.unionAll(new UnionQuery() { @@ -109,6 +116,8 @@ unionCB.query().queryEventSchedule().setStartDate_LessEqual( toDate); unionCB.query().queryEventSchedule().setEndDate_IsNull(); + unionCB.query().queryEventSchedule().setIsFacility_Equal( + CommonConstants.FALSE); unionCB.query().queryEventSchedule().setType_NotEqual( SchedulerConstants.ONETIME_SCHEDULE); unionCB.query().queryEventSchedule().addOrderBy_StartDate_Asc(); Modified: scheduler/trunk/src/main/resources/application.properties =================================================================== --- scheduler/trunk/src/main/resources/application.properties 2009-02-08 21:27:25 UTC (rev 1723) +++ scheduler/trunk/src/main/resources/application.properties 2009-02-11 01:07:12 UTC (rev 1724) @@ -244,3 +244,6 @@ labels.body_encoding=Encoding for Email Body labels.default_from_email=Default Email Address +labels.is_facility_event=Is Facility Event +labels.false=FALSE +labels.true=TRUE Modified: scheduler/trunk/src/main/resources/application_ja.properties =================================================================== --- scheduler/trunk/src/main/resources/application_ja.properties 2009-02-08 21:27:25 UTC (rev 1723) +++ scheduler/trunk/src/main/resources/application_ja.properties 2009-02-11 01:07:12 UTC (rev 1724) @@ -235,3 +235,7 @@ labels.subject_encoding=\u30e1\u30fc\u30eb\u4ef6\u540d\u306e\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0 labels.body_encoding=\u30e1\u30fc\u30eb\u672c\u6587\u306e\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0 labels.default_from_email=\u5dee\u51fa\u4eba\u306e\u30c7\u30d5\u30a9\u30eb\u30c8\u30a2\u30c9\u30ec\u30b9 + +labels.is_facility_event=\u65bd\u8a2d\u3068\u3057\u3066\u767b\u9332 +labels.false=FALSE +labels.true=TRUE \ No newline at end of file Modified: scheduler/trunk/src/main/webapp/WEB-INF/db/scheduler.1.log.db =================================================================== (Binary files differ) Modified: scheduler/trunk/src/main/webapp/WEB-INF/db/scheduler.data.db =================================================================== (Binary files differ) Modified: scheduler/trunk/src/main/webapp/WEB-INF/template/ja/create-onetime-facility.vm =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/template/ja/create-onetime-facility.vm 2009-02-08 21:27:25 UTC (rev 1723) +++ scheduler/trunk/src/main/webapp/WEB-INF/template/ja/create-onetime-facility.vm 2009-02-11 01:07:12 UTC (rev 1724) @@ -1,4 +1,4 @@ -[施設]: 施設予約登録 (${fromUserInfo.nameArg1} ${fromUserInfo.nameArg0}) +[施設] 施設予約登録 (${fromUserInfo.nameArg1} ${fromUserInfo.nameArg0}) ${fromUserInfo.nameArg1} ${fromUserInfo.nameArg0} さんは以下の施設予約を登録しました。 タイトル: ${event.title} Modified: scheduler/trunk/src/main/webapp/WEB-INF/template/ja/create-repeat-facility.vm =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/template/ja/create-repeat-facility.vm 2009-02-08 21:27:25 UTC (rev 1723) +++ scheduler/trunk/src/main/webapp/WEB-INF/template/ja/create-repeat-facility.vm 2009-02-11 01:07:12 UTC (rev 1724) @@ -1,4 +1,4 @@ -[施設]: 施設予約登録 (${fromUserInfo.nameArg1} ${fromUserInfo.nameArg0}) +[施設] 施設予約登録 (${fromUserInfo.nameArg1} ${fromUserInfo.nameArg0}) ${fromUserInfo.nameArg0} ${fromUserInfo.nameArg1} さんは以下の施設予約を登録しました。 タイトル: ${event.title} Modified: scheduler/trunk/src/main/webapp/WEB-INF/template/ja/update-onetime-facility.vm =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/template/ja/update-onetime-facility.vm 2009-02-08 21:27:25 UTC (rev 1723) +++ scheduler/trunk/src/main/webapp/WEB-INF/template/ja/update-onetime-facility.vm 2009-02-11 01:07:12 UTC (rev 1724) @@ -1,4 +1,4 @@ -[施設]: 施設予約更新 (${fromUserInfo.nameArg1} ${fromUserInfo.nameArg0}) +[施設] 施設予約更新 (${fromUserInfo.nameArg1} ${fromUserInfo.nameArg0}) ${fromUserInfo.nameArg0} ${fromUserInfo.nameArg1} さんは以下の施設予約を更新しました。 タイトル: ${event.title} Modified: scheduler/trunk/src/main/webapp/WEB-INF/template/ja/update-repeat-facility.vm =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/template/ja/update-repeat-facility.vm 2009-02-08 21:27:25 UTC (rev 1723) +++ scheduler/trunk/src/main/webapp/WEB-INF/template/ja/update-repeat-facility.vm 2009-02-11 01:07:12 UTC (rev 1724) @@ -1,4 +1,4 @@ -[施設]: 施設予約更新 (${fromUserInfo.nameArg1} ${fromUserInfo.nameArg0}) +[施設] 施設予約更新 (${fromUserInfo.nameArg1} ${fromUserInfo.nameArg0}) ${fromUserInfo.nameArg0} ${fromUserInfo.nameArg1} さんは以下の施設予約を更新しました。 タイトル: ${event.title} Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/confirm.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/confirm.jsp 2009-02-08 21:27:25 UTC (rev 1723) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/confirm.jsp 2009-02-11 01:07:12 UTC (rev 1724) @@ -83,6 +83,14 @@ + + + + + + + + Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/edit.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/edit.jsp 2009-02-08 21:27:25 UTC (rev 1723) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/edit.jsp 2009-02-11 01:07:12 UTC (rev 1724) @@ -84,6 +84,15 @@ + + + +
+ + + + +
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/facilitylist.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/facilitylist.jsp 2009-02-08 21:27:25 UTC (rev 1723) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/facilitylist.jsp 2009-02-11 01:07:12 UTC (rev 1724) @@ -48,6 +48,7 @@ + Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/userlist.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/userlist.jsp 2009-02-08 21:27:25 UTC (rev 1723) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/onetimeSchedule/userlist.jsp 2009-02-11 01:07:12 UTC (rev 1724) @@ -48,6 +48,7 @@ + @@ -76,8 +77,8 @@
- - + >>"/> +"/>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/confirm.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/confirm.jsp 2009-02-08 21:27:25 UTC (rev 1723) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/confirm.jsp 2009-02-11 01:07:12 UTC (rev 1724) @@ -96,6 +96,14 @@ + + + +
+ + + +
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/edit.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/edit.jsp 2009-02-08 21:27:25 UTC (rev 1723) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/edit.jsp 2009-02-11 01:07:12 UTC (rev 1724) @@ -98,6 +98,15 @@ + + + +
+ + + + +
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/facilitylist.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/facilitylist.jsp 2009-02-08 21:27:25 UTC (rev 1723) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/facilitylist.jsp 2009-02-11 01:07:12 UTC (rev 1724) @@ -49,6 +49,7 @@ + @@ -107,7 +108,7 @@ Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/userlist.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/userlist.jsp 2009-02-08 21:27:25 UTC (rev 1723) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/admin/schedule/repeatSchedule/userlist.jsp 2009-02-11 01:07:12 UTC (rev 1724) @@ -49,6 +49,7 @@ + @@ -107,7 +108,7 @@ Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/onetimeSchedule/facilitylist.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/onetimeSchedule/facilitylist.jsp 2009-02-08 21:27:25 UTC (rev 1723) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/onetimeSchedule/facilitylist.jsp 2009-02-11 01:07:12 UTC (rev 1724) @@ -86,7 +86,7 @@ @@ -94,7 +94,7 @@
- +"/>
- +"/>
- +"/>
- + Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/repeatSchedule/facilitylist.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/repeatSchedule/facilitylist.jsp 2009-02-08 21:27:25 UTC (rev 1723) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/facility/repeatSchedule/facilitylist.jsp 2009-02-11 01:07:12 UTC (rev 1724) @@ -111,8 +111,8 @@
Facility List
- - + >>"/> +"/>
Modified: scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/repeatSchedule/facilitylist.jsp =================================================================== --- scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/repeatSchedule/facilitylist.jsp 2009-02-08 21:27:25 UTC (rev 1723) +++ scheduler/trunk/src/main/webapp/WEB-INF/view/user/schedule/repeatSchedule/facilitylist.jsp 2009-02-11 01:07:12 UTC (rev 1724) @@ -110,8 +110,8 @@
- - + >>"/> +"/>
From svnnotify ＠ sourceforge.jp Wed Feb 11 10:11:41 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Wed, 11 Feb 2009 10:11:41 +0900 Subject: [pal-cvs 3990] [1725] added is_facility column. Message-ID: <1234314701.509304.32468.nullmailer@users.sourceforge.jp> Revision: 1725 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1725 Author: shinsuke Date: 2009-02-11 10:11:41 +0900 (Wed, 11 Feb 2009) Log Message: ----------- added is_facility column. Modified Paths: -------------- userinfo/trunk/src/main/config/sql/others/scheduler.ddl userinfo/trunk/src/main/webapp/WEB-INF/db/userinfo.1.log.db userinfo/trunk/src/main/webapp/WEB-INF/db/userinfo.data.db -------------- next part -------------- Modified: userinfo/trunk/src/main/config/sql/others/scheduler.ddl =================================================================== --- userinfo/trunk/src/main/config/sql/others/scheduler.ddl 2009-02-11 01:07:12 UTC (rev 1724) +++ userinfo/trunk/src/main/config/sql/others/scheduler.ddl 2009-02-11 01:11:41 UTC (rev 1725) @@ -11,6 +11,7 @@ end_time TIME, secret VARCHAR(1) DEFAULT 'F' NOT NULL, type VARCHAR(10) NOT NULL, + is_facility VARCHAR(1) DEFAULT 'F' NOT NULL, parent_id BIGINT(20), created_time TIMESTAMP NOT NULL, created_by VARCHAR(255) NOT NULL, Modified: userinfo/trunk/src/main/webapp/WEB-INF/db/userinfo.1.log.db =================================================================== (Binary files differ) Modified: userinfo/trunk/src/main/webapp/WEB-INF/db/userinfo.data.db =================================================================== (Binary files differ) From svnnotify ＠ sourceforge.jp Wed Feb 11 22:08:15 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Wed, 11 Feb 2009 22:08:15 +0900 Subject: [pal-cvs 3991] [1726] disabled notification for an admin tool. Message-ID: <1234357695.460182.27943.nullmailer@users.sourceforge.jp> Revision: 1726 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1726 Author: shinsuke Date: 2009-02-11 22:08:15 +0900 (Wed, 11 Feb 2009) Log Message: ----------- disabled notification for an admin tool. Modified Paths: -------------- timecard/trunk/src/main/java/jp/sf/pal/timecard/action/admin/TimecardAction.java timecard/trunk/src/main/java/jp/sf/pal/timecard/service/ReportService.java -------------- next part -------------- Modified: timecard/trunk/src/main/java/jp/sf/pal/timecard/action/admin/TimecardAction.java =================================================================== --- timecard/trunk/src/main/java/jp/sf/pal/timecard/action/admin/TimecardAction.java 2009-02-11 01:11:41 UTC (rev 1725) +++ timecard/trunk/src/main/java/jp/sf/pal/timecard/action/admin/TimecardAction.java 2009-02-11 13:08:15 UTC (rev 1726) @@ -319,7 +319,7 @@ public String create() { try { DailyReport dailyReport = createDailyReport(); - reportService.store(dailyReport); + reportService.store(dailyReport, false); SAStrutsUtil.addMessage(request, "success.create_daily_report"); // reset edit page @@ -357,7 +357,7 @@ try { DailyReport dailyReport = createDailyReport(); - reportService.store(dailyReport); + reportService.store(dailyReport, false); SAStrutsUtil.addMessage(request, "success.update_daily_report"); // reset edit page Modified: timecard/trunk/src/main/java/jp/sf/pal/timecard/service/ReportService.java =================================================================== --- timecard/trunk/src/main/java/jp/sf/pal/timecard/service/ReportService.java 2009-02-11 01:11:41 UTC (rev 1725) +++ timecard/trunk/src/main/java/jp/sf/pal/timecard/service/ReportService.java 2009-02-11 13:08:15 UTC (rev 1726) @@ -278,6 +278,10 @@ } public void store(DailyReport dailyReport) { + store(dailyReport, true); + } + + public void store(DailyReport dailyReport, boolean send) { boolean isUpdate = dailyReport.getId() != null; Timestamp now = new Timestamp(System.currentTimeMillis()); @@ -308,7 +312,7 @@ .getUserInfoByUsername(); UserInfo manager = monthlyReport.getEmployee() .getUserInfoByManager(); - if (manager != null && manager.getEmail() != null) { + if (manager != null && manager.getEmail() != null && send) { String toEmail = manager.getEmail(); String fromEmail = ConfigUtil.getString( TimecardConstants.SYSTEM_EMAIL, toEmail); From svnnotify ＠ sourceforge.jp Thu Feb 12 06:25:37 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Thu, 12 Feb 2009 06:25:37 +0900 Subject: [pal-cvs 3992] [1727] added startTime to orderby. Message-ID: <1234387537.098772.29053.nullmailer@users.sourceforge.jp> Revision: 1727 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1727 Author: shinsuke Date: 2009-02-12 06:25:36 +0900 (Thu, 12 Feb 2009) Log Message: ----------- added startTime to orderby. Modified Paths: -------------- scheduler/trunk/src/main/java/jp/sf/pal/scheduler/service/OnetimeScheduleService.java scheduler/trunk/src/main/java/jp/sf/pal/scheduler/service/RepeatScheduleService.java -------------- next part -------------- Modified: scheduler/trunk/src/main/java/jp/sf/pal/scheduler/service/OnetimeScheduleService.java =================================================================== --- scheduler/trunk/src/main/java/jp/sf/pal/scheduler/service/OnetimeScheduleService.java 2009-02-11 13:08:15 UTC (rev 1726) +++ scheduler/trunk/src/main/java/jp/sf/pal/scheduler/service/OnetimeScheduleService.java 2009-02-11 21:25:36 UTC (rev 1727) @@ -58,6 +58,7 @@ SchedulerConstants.ONETIME_SCHEDULE); cb.query().queryEventSchedule().addOrderBy_StartDate_Asc(); + cb.query().queryEventSchedule().addOrderBy_StartTime_Asc(); List fsmList = facilityScheduleMappingBhv .selectList(cb); @@ -96,6 +97,7 @@ SchedulerConstants.ONETIME_SCHEDULE); cb.query().queryEventSchedule().addOrderBy_StartDate_Asc(); + cb.query().queryEventSchedule().addOrderBy_StartTime_Asc(); return eventScheduleMappingBhv.selectList(cb); } Modified: scheduler/trunk/src/main/java/jp/sf/pal/scheduler/service/RepeatScheduleService.java =================================================================== --- scheduler/trunk/src/main/java/jp/sf/pal/scheduler/service/RepeatScheduleService.java 2009-02-11 13:08:15 UTC (rev 1726) +++ scheduler/trunk/src/main/java/jp/sf/pal/scheduler/service/RepeatScheduleService.java 2009-02-11 21:25:36 UTC (rev 1727) @@ -70,9 +70,11 @@ unionCB.query().queryEventSchedule().setType_NotEqual( SchedulerConstants.ONETIME_SCHEDULE); unionCB.query().queryEventSchedule().addOrderBy_StartDate_Asc(); + unionCB.query().queryEventSchedule().addOrderBy_StartTime_Asc(); } }); cb.query().queryEventSchedule().addOrderBy_StartDate_Asc(); + cb.query().queryEventSchedule().addOrderBy_StartTime_Asc(); List fsmList = facilityScheduleMappingBhv .selectList(cb); @@ -121,9 +123,11 @@ unionCB.query().queryEventSchedule().setType_NotEqual( SchedulerConstants.ONETIME_SCHEDULE); unionCB.query().queryEventSchedule().addOrderBy_StartDate_Asc(); + unionCB.query().queryEventSchedule().addOrderBy_StartTime_Asc(); } }); cb.query().queryEventSchedule().addOrderBy_StartDate_Asc(); + cb.query().queryEventSchedule().addOrderBy_StartTime_Asc(); return eventScheduleMappingBhv.selectList(cb); } From svnnotify ＠ sourceforge.jp Fri Feb 13 06:33:41 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 13 Feb 2009 06:33:41 +0900 Subject: [pal-cvs 3993] [1728] fixed editagain page. Message-ID: <1234474421.963955.13994.nullmailer@users.sourceforge.jp> Revision: 1728 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1728 Author: shinsuke Date: 2009-02-13 06:33:41 +0900 (Fri, 13 Feb 2009) Log Message: ----------- fixed editagain page. Modified Paths: -------------- board/trunk/src/main/java/jp/sf/pal/board/action/message/AdminAction.java board/trunk/src/main/java/jp/sf/pal/board/action/message/ViewAction.java -------------- next part -------------- Modified: board/trunk/src/main/java/jp/sf/pal/board/action/message/AdminAction.java =================================================================== --- board/trunk/src/main/java/jp/sf/pal/board/action/message/AdminAction.java 2009-02-11 21:25:36 UTC (rev 1727) +++ board/trunk/src/main/java/jp/sf/pal/board/action/message/AdminAction.java 2009-02-12 21:33:41 UTC (rev 1728) @@ -146,10 +146,7 @@ public String editagain() { categoryItems = categoryService.getCategoryList(userInfoService .getCategoryAccessNameList(request.getRemoteUser()), null); - - messageAttachmentItems = messageService.getMessageAttachmentList(Long - .parseLong(adminForm.id)); - + return "edit.jsp"; } Modified: board/trunk/src/main/java/jp/sf/pal/board/action/message/ViewAction.java =================================================================== --- board/trunk/src/main/java/jp/sf/pal/board/action/message/ViewAction.java 2009-02-11 21:25:36 UTC (rev 1727) +++ board/trunk/src/main/java/jp/sf/pal/board/action/message/ViewAction.java 2009-02-12 21:33:41 UTC (rev 1728) @@ -151,9 +151,6 @@ .getCategoryAccessNameList(request.getRemoteUser()), BoardConstants.ACCESS_TYPE_VIEW_ONLY); - messageAttachmentItems = messageService.getMessageAttachmentList(Long - .parseLong(viewForm.id)); - return "edit.jsp"; } From svnnotify ＠ sourceforge.jp Fri Feb 13 22:54:05 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 13 Feb 2009 22:54:05 +0900 Subject: [pal-cvs 3994] [1729] fixed minor bugs. Message-ID: <1234533245.748466.9935.nullmailer@users.sourceforge.jp> Revision: 1729 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1729 Author: shinsuke Date: 2009-02-13 22:54:05 +0900 (Fri, 13 Feb 2009) Log Message: ----------- fixed minor bugs. Modified Paths: -------------- board/trunk/src/main/java/jp/sf/pal/board/action/message/AdminAction.java board/trunk/src/main/java/jp/sf/pal/board/action/message/ViewAction.java board/trunk/src/main/webapp/WEB-INF/web.xml -------------- next part -------------- Modified: board/trunk/src/main/java/jp/sf/pal/board/action/message/AdminAction.java =================================================================== --- board/trunk/src/main/java/jp/sf/pal/board/action/message/AdminAction.java 2009-02-12 21:33:41 UTC (rev 1728) +++ board/trunk/src/main/java/jp/sf/pal/board/action/message/AdminAction.java 2009-02-13 13:54:05 UTC (rev 1729) @@ -146,7 +146,7 @@ public String editagain() { categoryItems = categoryService.getCategoryList(userInfoService .getCategoryAccessNameList(request.getRemoteUser()), null); - + return "edit.jsp"; } @@ -351,7 +351,7 @@ owner = true; // clear - adminForm.replyDisplayName = null; + // adminForm.replyDisplayName = null; adminForm.replyContent = null; return "confirm.jsp"; @@ -437,6 +437,9 @@ SAStrutsUtil.addMessage(request, "success.create_message_attachment"); + // clear + adminForm.memo = null; + return editpage(); } catch (ActionMessagesException e) { log.error(e.getMessage(), e); Modified: board/trunk/src/main/java/jp/sf/pal/board/action/message/ViewAction.java =================================================================== --- board/trunk/src/main/java/jp/sf/pal/board/action/message/ViewAction.java 2009-02-12 21:33:41 UTC (rev 1728) +++ board/trunk/src/main/java/jp/sf/pal/board/action/message/ViewAction.java 2009-02-13 13:54:05 UTC (rev 1729) @@ -389,7 +389,7 @@ } // clear - viewForm.replyDisplayName = null; + // viewForm.replyDisplayName = null; viewForm.replyContent = null; return "confirm.jsp"; @@ -479,6 +479,9 @@ SAStrutsUtil.addMessage(request, "success.create_message_attachment"); + // clear + viewForm.memo = null; + return editpage(); } catch (ActionMessagesException e) { log.error(e.getMessage(), e); Modified: board/trunk/src/main/webapp/WEB-INF/web.xml =================================================================== --- board/trunk/src/main/webapp/WEB-INF/web.xml 2009-02-12 21:33:41 UTC (rev 1728) +++ board/trunk/src/main/webapp/WEB-INF/web.xml 2009-02-13 13:54:05 UTC (rev 1729) @@ -65,7 +65,7 @@ jp.sf.pal.board.common.filter.SecurityConstraintFilter acceptUrlPaths - /message/view/download/.*,/css/.* + /message/view/download/.*,/message/admin/download/.*,/css/.* From svnnotify ＠ sourceforge.jp Fri Feb 13 23:25:36 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 13 Feb 2009 23:25:36 +0900 Subject: [pal-cvs 3995] [1730] 1.0-PR2 Message-ID: <1234535136.828747.6663.nullmailer@users.sourceforge.jp> Revision: 1730 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1730 Author: shinsuke Date: 2009-02-13 23:25:36 +0900 (Fri, 13 Feb 2009) Log Message: ----------- 1.0-PR2 Modified Paths: -------------- addresslist/trunk/pom.xml -------------- next part -------------- Modified: addresslist/trunk/pom.xml =================================================================== --- addresslist/trunk/pom.xml 2009-02-13 13:54:05 UTC (rev 1729) +++ addresslist/trunk/pom.xml 2009-02-13 14:25:36 UTC (rev 1730) @@ -3,7 +3,7 @@ 4.0.0 jp.sf.pal addresslist - 1.0-PR2-SNAPSHOT + 1.0-PR2 war Address List @@ -160,7 +160,7 @@ org.seasar.sastruts sa-struts-portlet - 1.0.0-SNAPSHOT + 1.0.0 org.apache.geronimo.specs From svnnotify ＠ sourceforge.jp Fri Feb 13 23:30:49 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 13 Feb 2009 23:30:49 +0900 Subject: [pal-cvs 3996] [1731] 1.0-PR2 Message-ID: <1234535449.580263.15250.nullmailer@users.sourceforge.jp> Revision: 1731 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1731 Author: shinsuke Date: 2009-02-13 23:30:49 +0900 (Fri, 13 Feb 2009) Log Message: ----------- 1.0-PR2 Modified Paths: -------------- userinfo/plugins/userinfo-blank-plugin/trunk/pom.xml -------------- next part -------------- Modified: userinfo/plugins/userinfo-blank-plugin/trunk/pom.xml =================================================================== --- userinfo/plugins/userinfo-blank-plugin/trunk/pom.xml 2009-02-13 14:25:36 UTC (rev 1730) +++ userinfo/plugins/userinfo-blank-plugin/trunk/pom.xml 2009-02-13 14:30:49 UTC (rev 1731) @@ -4,7 +4,7 @@ jp.sf.pal userinfo-blank-plugin jar - 1.0-PR2-SNAPSHOT + 1.0-PR2 userinfo-blank-plugin validate From svnnotify ＠ sourceforge.jp Fri Feb 13 23:37:25 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 13 Feb 2009 23:37:25 +0900 Subject: [pal-cvs 3997] [1732] 1.0-PR2 release. Message-ID: <1234535845.594755.22813.nullmailer@users.sourceforge.jp> Revision: 1732 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1732 Author: shinsuke Date: 2009-02-13 23:37:25 +0900 (Fri, 13 Feb 2009) Log Message: ----------- 1.0-PR2 release. Modified Paths: -------------- board/trunk/pom.xml -------------- next part -------------- Modified: board/trunk/pom.xml =================================================================== --- board/trunk/pom.xml 2009-02-13 14:30:49 UTC (rev 1731) +++ board/trunk/pom.xml 2009-02-13 14:37:25 UTC (rev 1732) @@ -3,7 +3,7 @@ 4.0.0 jp.sf.pal board - 1.0-PR2-SNAPSHOT + 1.0-PR2 war Message Board @@ -160,7 +160,7 @@ org.seasar.sastruts sa-struts-portlet - 1.0.0-SNAPSHOT + 1.0.0 org.apache.geronimo.specs From svnnotify ＠ sourceforge.jp Fri Feb 13 23:37:28 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 13 Feb 2009 23:37:28 +0900 Subject: [pal-cvs 3998] [1735] 1.0-PR2 release. Message-ID: <1234535848.412091.22913.nullmailer@users.sourceforge.jp> Revision: 1735 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1735 Author: shinsuke Date: 2009-02-13 23:37:28 +0900 (Fri, 13 Feb 2009) Log Message: ----------- 1.0-PR2 release. Modified Paths: -------------- googlegadgets/trunk/pom.xml -------------- next part -------------- Modified: googlegadgets/trunk/pom.xml =================================================================== --- googlegadgets/trunk/pom.xml 2009-02-13 14:37:27 UTC (rev 1734) +++ googlegadgets/trunk/pom.xml 2009-02-13 14:37:28 UTC (rev 1735) @@ -3,7 +3,7 @@ 4.0.0 jp.sf.pal googlegadgets - 1.1-SNAPSHOT + 1.1 war Google Gadgets Portlet @@ -160,7 +160,7 @@ org.seasar.sastruts sa-struts-portlet - 1.0.0-SNAPSHOT + 1.0.0 org.apache.geronimo.specs From svnnotify ＠ sourceforge.jp Fri Feb 13 23:37:29 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 13 Feb 2009 23:37:29 +0900 Subject: [pal-cvs 3999] [1736] 1.0-PR2 release. Message-ID: <1234535849.426918.22941.nullmailer@users.sourceforge.jp> Revision: 1736 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1736 Author: shinsuke Date: 2009-02-13 23:37:29 +0900 (Fri, 13 Feb 2009) Log Message: ----------- 1.0-PR2 release. Modified Paths: -------------- netvibes-widgets/trunk/pom.xml -------------- next part -------------- Modified: netvibes-widgets/trunk/pom.xml =================================================================== --- netvibes-widgets/trunk/pom.xml 2009-02-13 14:37:28 UTC (rev 1735) +++ netvibes-widgets/trunk/pom.xml 2009-02-13 14:37:29 UTC (rev 1736) @@ -3,7 +3,7 @@ 4.0.0 jp.sf.pal netvibes-widgets - 1.1-SNAPSHOT + 1.1 war Netvibes Widget Portlet @@ -160,7 +160,7 @@ org.seasar.sastruts sa-struts-portlet - 1.0.0-SNAPSHOT + 1.0.0 org.apache.geronimo.specs From svnnotify ＠ sourceforge.jp Fri Feb 13 23:37:27 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 13 Feb 2009 23:37:27 +0900 Subject: [pal-cvs 4000] [1734] 1.0-PR2 release. Message-ID: <1234535847.422019.22884.nullmailer@users.sourceforge.jp> Revision: 1734 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1734 Author: shinsuke Date: 2009-02-13 23:37:27 +0900 (Fri, 13 Feb 2009) Log Message: ----------- 1.0-PR2 release. Modified Paths: -------------- chat/trunk/pom.xml -------------- next part -------------- Modified: chat/trunk/pom.xml =================================================================== --- chat/trunk/pom.xml 2009-02-13 14:37:26 UTC (rev 1733) +++ chat/trunk/pom.xml 2009-02-13 14:37:27 UTC (rev 1734) @@ -3,7 +3,7 @@ 4.0.0 jp.sf.pal.chat chat - 1.0-PR2-SNAPSHOT + 1.0-PR2 war chat @@ -119,7 +119,7 @@ org.seasar.sastruts sa-struts-portlet - 1.0.0-SNAPSHOT + 1.0.0 From svnnotify ＠ sourceforge.jp Fri Feb 13 23:37:30 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 13 Feb 2009 23:37:30 +0900 Subject: [pal-cvs 4001] [1737] 1.0-PR2 release. Message-ID: <1234535850.452072.22970.nullmailer@users.sourceforge.jp> Revision: 1737 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1737 Author: shinsuke Date: 2009-02-13 23:37:30 +0900 (Fri, 13 Feb 2009) Log Message: ----------- 1.0-PR2 release. Modified Paths: -------------- notepad/trunk/pom.xml -------------- next part -------------- Modified: notepad/trunk/pom.xml =================================================================== --- notepad/trunk/pom.xml 2009-02-13 14:37:29 UTC (rev 1736) +++ notepad/trunk/pom.xml 2009-02-13 14:37:30 UTC (rev 1737) @@ -3,7 +3,7 @@ 4.0.0 jp.sf.pal notepad - 1.0-PR2-SNAPSHOT + 1.0-PR2 war Notepad @@ -162,7 +162,7 @@ org.seasar.sastruts sa-struts-portlet - 1.0.0-SNAPSHOT + 1.0.0 org.apache.geronimo.specs From svnnotify ＠ sourceforge.jp Fri Feb 13 23:37:31 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 13 Feb 2009 23:37:31 +0900 Subject: [pal-cvs 4002] [1738] 1.0-PR2 release. Message-ID: <1234535851.400108.23001.nullmailer@users.sourceforge.jp> Revision: 1738 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1738 Author: shinsuke Date: 2009-02-13 23:37:31 +0900 (Fri, 13 Feb 2009) Log Message: ----------- 1.0-PR2 release. Modified Paths: -------------- scheduler/trunk/pom.xml -------------- next part -------------- Modified: scheduler/trunk/pom.xml =================================================================== --- scheduler/trunk/pom.xml 2009-02-13 14:37:30 UTC (rev 1737) +++ scheduler/trunk/pom.xml 2009-02-13 14:37:31 UTC (rev 1738) @@ -3,7 +3,7 @@ 4.0.0 jp.sf.pal scheduler - 1.0-PR2-SNAPSHOT + 1.0-PR2 war Scheduler @@ -166,7 +166,7 @@ org.seasar.sastruts sa-struts-portlet - 1.0.0-SNAPSHOT + 1.0.0 org.apache.geronimo.specs From svnnotify ＠ sourceforge.jp Fri Feb 13 23:37:26 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 13 Feb 2009 23:37:26 +0900 Subject: [pal-cvs 4003] [1733] 1.0-PR2 release. Message-ID: <1234535846.435597.22843.nullmailer@users.sourceforge.jp> Revision: 1733 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1733 Author: shinsuke Date: 2009-02-13 23:37:26 +0900 (Fri, 13 Feb 2009) Log Message: ----------- 1.0-PR2 release. Modified Paths: -------------- bookmark/trunk/pom.xml -------------- next part -------------- Modified: bookmark/trunk/pom.xml =================================================================== --- bookmark/trunk/pom.xml 2009-02-13 14:37:25 UTC (rev 1732) +++ bookmark/trunk/pom.xml 2009-02-13 14:37:26 UTC (rev 1733) @@ -3,7 +3,7 @@ 4.0.0 jp.sf.pal bookmark - 1.0-PR2-SNAPSHOT + 1.0-PR2 war Bookmark @@ -162,7 +162,7 @@ org.seasar.sastruts sa-struts-portlet - 1.0.0-SNAPSHOT + 1.0.0 org.apache.geronimo.specs From svnnotify ＠ sourceforge.jp Fri Feb 13 23:37:33 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 13 Feb 2009 23:37:33 +0900 Subject: [pal-cvs 4004] [1740] 1.0-PR2 release. Message-ID: <1234535853.459108.23111.nullmailer@users.sourceforge.jp> Revision: 1740 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1740 Author: shinsuke Date: 2009-02-13 23:37:33 +0900 (Fri, 13 Feb 2009) Log Message: ----------- 1.0-PR2 release. Modified Paths: -------------- todolist/trunk/pom.xml -------------- next part -------------- Modified: todolist/trunk/pom.xml =================================================================== --- todolist/trunk/pom.xml 2009-02-13 14:37:32 UTC (rev 1739) +++ todolist/trunk/pom.xml 2009-02-13 14:37:33 UTC (rev 1740) @@ -3,7 +3,7 @@ 4.0.0 jp.sf.pal todolist - 1.0-PR2-SNAPSHOT + 1.0-PR2 war ToDo List @@ -160,7 +160,7 @@ org.seasar.sastruts sa-struts-portlet - 1.0.0-SNAPSHOT + 1.0.0 org.apache.geronimo.specs From svnnotify ＠ sourceforge.jp Fri Feb 13 23:37:34 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 13 Feb 2009 23:37:34 +0900 Subject: [pal-cvs 4005] [1741] 1.0-PR2 release. Message-ID: <1234535854.436165.23154.nullmailer@users.sourceforge.jp> Revision: 1741 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1741 Author: shinsuke Date: 2009-02-13 23:37:34 +0900 (Fri, 13 Feb 2009) Log Message: ----------- 1.0-PR2 release. Modified Paths: -------------- userinfo/trunk/pom.xml -------------- next part -------------- Modified: userinfo/trunk/pom.xml =================================================================== --- userinfo/trunk/pom.xml 2009-02-13 14:37:33 UTC (rev 1740) +++ userinfo/trunk/pom.xml 2009-02-13 14:37:34 UTC (rev 1741) @@ -3,7 +3,7 @@ 4.0.0 jp.sf.pal userinfo - 1.0-PR2-SNAPSHOT + 1.0-PR2 war User Info @@ -104,7 +104,7 @@ jp.sf.pal userinfo-palportal-plugin - 1.0-PR2-SNAPSHOT + 1.0-PR2 runtime @@ -200,7 +200,7 @@ org.seasar.sastruts sa-struts-portlet - 1.0.0-SNAPSHOT + 1.0.0 org.apache.geronimo.specs From svnnotify ＠ sourceforge.jp Fri Feb 13 23:37:32 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 13 Feb 2009 23:37:32 +0900 Subject: [pal-cvs 4006] [1739] 1.0-PR2 release. Message-ID: <1234535852.428153.23031.nullmailer@users.sourceforge.jp> Revision: 1739 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1739 Author: shinsuke Date: 2009-02-13 23:37:32 +0900 (Fri, 13 Feb 2009) Log Message: ----------- 1.0-PR2 release. Modified Paths: -------------- timecard/trunk/pom.xml -------------- next part -------------- Modified: timecard/trunk/pom.xml =================================================================== --- timecard/trunk/pom.xml 2009-02-13 14:37:31 UTC (rev 1738) +++ timecard/trunk/pom.xml 2009-02-13 14:37:32 UTC (rev 1739) @@ -3,7 +3,7 @@ 4.0.0 jp.sf.pal timecard - 1.0-PR2-SNAPSHOT + 1.0-PR2 war Timecard @@ -166,7 +166,7 @@ org.seasar.sastruts sa-struts-portlet - 1.0.0-SNAPSHOT + 1.0.0 org.apache.geronimo.specs From svnnotify ＠ sourceforge.jp Fri Feb 13 23:37:35 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 13 Feb 2009 23:37:35 +0900 Subject: [pal-cvs 4007] [1742] 1.0-PR2 release. Message-ID: <1234535855.399646.23182.nullmailer@users.sourceforge.jp> Revision: 1742 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1742 Author: shinsuke Date: 2009-02-13 23:37:35 +0900 (Fri, 13 Feb 2009) Log Message: ----------- 1.0-PR2 release. Modified Paths: -------------- vfs-portlets/trunk/pom.xml -------------- next part -------------- Modified: vfs-portlets/trunk/pom.xml =================================================================== --- vfs-portlets/trunk/pom.xml 2009-02-13 14:37:34 UTC (rev 1741) +++ vfs-portlets/trunk/pom.xml 2009-02-13 14:37:35 UTC (rev 1742) @@ -3,7 +3,7 @@ 4.0.0 jp.sf.pal vfs-portlets - 2.0 + 2.0.1 war VFS Portlet @@ -193,7 +193,7 @@ org.seasar.sastruts sa-struts-portlet - 1.0.0-SNAPSHOT + 1.0.0 org.apache.geronimo.specs From svnnotify ＠ sourceforge.jp Fri Feb 13 23:41:17 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 13 Feb 2009 23:41:17 +0900 Subject: [pal-cvs 4008] [1743] 1.0-PR2 Message-ID: <1234536077.548410.27032.nullmailer@users.sourceforge.jp> Revision: 1743 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1743 Author: shinsuke Date: 2009-02-13 23:41:17 +0900 (Fri, 13 Feb 2009) Log Message: ----------- 1.0-PR2 Modified Paths: -------------- userinfo/plugins/userinfo-blank-plugin/trunk/pom.xml -------------- next part -------------- Modified: userinfo/plugins/userinfo-blank-plugin/trunk/pom.xml =================================================================== --- userinfo/plugins/userinfo-blank-plugin/trunk/pom.xml 2009-02-13 14:37:35 UTC (rev 1742) +++ userinfo/plugins/userinfo-blank-plugin/trunk/pom.xml 2009-02-13 14:41:17 UTC (rev 1743) @@ -68,7 +68,7 @@ jp.sf.pal userinfo - 1.0-PR2-SNAPSHOT + 1.0-PR2 provided From svnnotify ＠ sourceforge.jp Fri Feb 13 23:41:18 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 13 Feb 2009 23:41:18 +0900 Subject: [pal-cvs 4009] [1744] 1.0-PR2 Message-ID: <1234536078.465611.27063.nullmailer@users.sourceforge.jp> Revision: 1744 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1744 Author: shinsuke Date: 2009-02-13 23:41:18 +0900 (Fri, 13 Feb 2009) Log Message: ----------- 1.0-PR2 Modified Paths: -------------- userinfo/plugins/userinfo-j2-plugin/trunk/pom.xml -------------- next part -------------- Modified: userinfo/plugins/userinfo-j2-plugin/trunk/pom.xml =================================================================== --- userinfo/plugins/userinfo-j2-plugin/trunk/pom.xml 2009-02-13 14:41:17 UTC (rev 1743) +++ userinfo/plugins/userinfo-j2-plugin/trunk/pom.xml 2009-02-13 14:41:18 UTC (rev 1744) @@ -4,7 +4,7 @@ jp.sf.pal userinfo-j2-plugin jar - 1.0-PR2-SNAPSHOT + 1.0-PR2 userinfo-j2-plugin validate @@ -68,7 +68,7 @@ jp.sf.pal userinfo - 1.0-PR2-SNAPSHOT + 1.0-PR2 provided From svnnotify ＠ sourceforge.jp Fri Feb 13 23:41:19 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 13 Feb 2009 23:41:19 +0900 Subject: [pal-cvs 4010] [1745] 1.0-PR2 Message-ID: <1234536079.437513.27090.nullmailer@users.sourceforge.jp> Revision: 1745 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1745 Author: shinsuke Date: 2009-02-13 23:41:19 +0900 (Fri, 13 Feb 2009) Log Message: ----------- 1.0-PR2 Modified Paths: -------------- userinfo/plugins/userinfo-j2-plugin/trunk/src/main/java/jp/sf/pal/userinfo/plugin/impl/PortalPluginImpl.java -------------- next part -------------- Modified: userinfo/plugins/userinfo-j2-plugin/trunk/src/main/java/jp/sf/pal/userinfo/plugin/impl/PortalPluginImpl.java =================================================================== --- userinfo/plugins/userinfo-j2-plugin/trunk/src/main/java/jp/sf/pal/userinfo/plugin/impl/PortalPluginImpl.java 2009-02-13 14:41:18 UTC (rev 1744) +++ userinfo/plugins/userinfo-j2-plugin/trunk/src/main/java/jp/sf/pal/userinfo/plugin/impl/PortalPluginImpl.java 2009-02-13 14:41:19 UTC (rev 1745) @@ -55,7 +55,7 @@ UserManager userManager = getUserManager(); if (userManager.userExists(userInfo.getUserId())) { - throw new PortalException("errors.user_already_exists", "User(" + throw new PortalException("errors.user_already_exists_on_portal", "User(" + userInfo.getUserId() + ") already exists."); } @@ -147,7 +147,7 @@ UserManager userManager = getUserManager(); if (!userManager.userExists(userInfo.getUserId())) { - throw new PortalException("errors.user_does_not_exist", "User(" + throw new PortalException("errors.user_does_not_exist_on_portal", "User(" + userInfo.getUserId() + ") does not exist."); } @@ -201,7 +201,7 @@ UserManager userManager = getUserManager(); if (!userManager.userExists(userInfo.getUserId())) { - throw new PortalException("errors.user_does_not_exist", "User(" + throw new PortalException("errors.user_does_not_exist_on_portal", "User(" + userInfo.getUserId() + ") does not exist."); } @@ -270,7 +270,7 @@ RoleManager roleManager = getRoleManager(); try { if (roleManager.roleExists(roleInfo.getRoleId())) { - throw new PortalException("errors.role_already_exists", "Role(" + throw new PortalException("errors.role_already_exists_on_portal", "Role(" + roleInfo.getRoleId() + ") already exists."); } roleManager.addRole(roleInfo.getRoleId()); @@ -292,7 +292,7 @@ RoleManager roleManager = getRoleManager(); try { if (!roleManager.roleExists(roleInfo.getRoleId())) { - throw new PortalException("errors.role_does_not_exist", "Role(" + throw new PortalException("errors.role_does_not_exist_on_portal", "Role(" + roleInfo.getRoleId() + ") does not exist."); } roleManager.removeRole(roleInfo.getRoleId()); @@ -330,7 +330,7 @@ GroupManager groupManager = getGroupManager(); try { if (groupManager.groupExists(groupInfo.getGroupId())) { - throw new PortalException("errors.group_already_exists", + throw new PortalException("errors.group_already_exists_on_portal", "Group(" + groupInfo.getGroupId() + ") already exists."); } groupManager.addGroup(groupInfo.getGroupId()); @@ -352,7 +352,7 @@ GroupManager groupManager = getGroupManager(); try { if (!groupManager.groupExists(groupInfo.getGroupId())) { - throw new PortalException("errors.group_does_not_exist", + throw new PortalException("errors.group_does_not_exist_on_portal", "Group(" + groupInfo.getGroupId() + ") does not exist."); } groupManager.removeGroup(groupInfo.getGroupId()); From svnnotify ＠ sourceforge.jp Fri Feb 13 23:41:20 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 13 Feb 2009 23:41:20 +0900 Subject: [pal-cvs 4011] [1746] 1.0-PR2 Message-ID: <1234536080.409553.27121.nullmailer@users.sourceforge.jp> Revision: 1746 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1746 Author: shinsuke Date: 2009-02-13 23:41:20 +0900 (Fri, 13 Feb 2009) Log Message: ----------- 1.0-PR2 Modified Paths: -------------- userinfo/plugins/userinfo-palportal-plugin/trunk/pom.xml -------------- next part -------------- Modified: userinfo/plugins/userinfo-palportal-plugin/trunk/pom.xml =================================================================== --- userinfo/plugins/userinfo-palportal-plugin/trunk/pom.xml 2009-02-13 14:41:19 UTC (rev 1745) +++ userinfo/plugins/userinfo-palportal-plugin/trunk/pom.xml 2009-02-13 14:41:20 UTC (rev 1746) @@ -4,7 +4,7 @@ jp.sf.pal userinfo-palportal-plugin jar - 1.0-PR2-SNAPSHOT + 1.0-PR2 userinfo-palportal-plugin validate @@ -68,7 +68,7 @@ jp.sf.pal userinfo - 1.0-PR2-SNAPSHOT + 1.0-PR2 provided From svnnotify ＠ sourceforge.jp Fri Feb 13 23:44:57 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 13 Feb 2009 23:44:57 +0900 Subject: [pal-cvs 4012] [1747] 1.0-PR2 Message-ID: <1234536297.576881.31142.nullmailer@users.sourceforge.jp> Revision: 1747 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1747 Author: shinsuke Date: 2009-02-13 23:44:57 +0900 (Fri, 13 Feb 2009) Log Message: ----------- 1.0-PR2 Added Paths: ----------- addresslist/tags/addresslist-1.0-PR2/ -------------- next part -------------- From svnnotify ＠ sourceforge.jp Fri Feb 13 23:45:46 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 13 Feb 2009 23:45:46 +0900 Subject: [pal-cvs 4013] [1748] 1.0-PR2 Message-ID: <1234536346.283472.31540.nullmailer@users.sourceforge.jp> Revision: 1748 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1748 Author: shinsuke Date: 2009-02-13 23:45:46 +0900 (Fri, 13 Feb 2009) Log Message: ----------- 1.0-PR2 Added Paths: ----------- board/tags/board-1.0-PR2/ -------------- next part -------------- From svnnotify ＠ sourceforge.jp Fri Feb 13 23:46:43 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 13 Feb 2009 23:46:43 +0900 Subject: [pal-cvs 4014] [1749] 1.0-PR2 Message-ID: <1234536403.204216.346.nullmailer@users.sourceforge.jp> Revision: 1749 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1749 Author: shinsuke Date: 2009-02-13 23:46:43 +0900 (Fri, 13 Feb 2009) Log Message: ----------- 1.0-PR2 Added Paths: ----------- bookmark/tags/bookmark-1.0-PR2/ -------------- next part -------------- From svnnotify ＠ sourceforge.jp Fri Feb 13 23:47:11 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 13 Feb 2009 23:47:11 +0900 Subject: [pal-cvs 4015] [1750] 1.0-PR2 Message-ID: <1234536431.706227.520.nullmailer@users.sourceforge.jp> Revision: 1750 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1750 Author: shinsuke Date: 2009-02-13 23:47:11 +0900 (Fri, 13 Feb 2009) Log Message: ----------- 1.0-PR2 Added Paths: ----------- chat/tags/chat-1.0-PR2/ -------------- next part -------------- From svnnotify ＠ sourceforge.jp Fri Feb 13 23:47:32 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 13 Feb 2009 23:47:32 +0900 Subject: [pal-cvs 4016] [1751] 1.0-PR2 Message-ID: <1234536452.786491.1462.nullmailer@users.sourceforge.jp> Revision: 1751 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1751 Author: shinsuke Date: 2009-02-13 23:47:32 +0900 (Fri, 13 Feb 2009) Log Message: ----------- 1.0-PR2 Added Paths: ----------- notepad/tags/notepad-1.0-PR2/ -------------- next part -------------- From svnnotify ＠ sourceforge.jp Fri Feb 13 23:47:52 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 13 Feb 2009 23:47:52 +0900 Subject: [pal-cvs 4017] [1752] 1.0-PR2 Message-ID: <1234536472.461041.1662.nullmailer@users.sourceforge.jp> Revision: 1752 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1752 Author: shinsuke Date: 2009-02-13 23:47:52 +0900 (Fri, 13 Feb 2009) Log Message: ----------- 1.0-PR2 Added Paths: ----------- scheduler/tags/scheduler-1.0-PR2/ -------------- next part -------------- From svnnotify ＠ sourceforge.jp Fri Feb 13 23:48:10 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 13 Feb 2009 23:48:10 +0900 Subject: [pal-cvs 4018] [1753] 1.0-PR2 Message-ID: <1234536490.071689.2796.nullmailer@users.sourceforge.jp> Revision: 1753 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1753 Author: shinsuke Date: 2009-02-13 23:48:10 +0900 (Fri, 13 Feb 2009) Log Message: ----------- 1.0-PR2 Added Paths: ----------- timecard/tags/timecard-1.0-PR2/ -------------- next part -------------- From svnnotify ＠ sourceforge.jp Fri Feb 13 23:48:26 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 13 Feb 2009 23:48:26 +0900 Subject: [pal-cvs 4019] [1754] 1.0-PR2 Message-ID: <1234536506.733370.2959.nullmailer@users.sourceforge.jp> Revision: 1754 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1754 Author: shinsuke Date: 2009-02-13 23:48:26 +0900 (Fri, 13 Feb 2009) Log Message: ----------- 1.0-PR2 Added Paths: ----------- todolist/tags/todolist-1.0-PR2/ -------------- next part -------------- From svnnotify ＠ sourceforge.jp Fri Feb 13 23:48:55 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 13 Feb 2009 23:48:55 +0900 Subject: [pal-cvs 4020] [1755] 1.0-PR2 Message-ID: <1234536535.888683.3138.nullmailer@users.sourceforge.jp> Revision: 1755 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1755 Author: shinsuke Date: 2009-02-13 23:48:55 +0900 (Fri, 13 Feb 2009) Log Message: ----------- 1.0-PR2 Added Paths: ----------- userinfo/tags/userinfo-1.0-PR2/ -------------- next part -------------- From svnnotify ＠ sourceforge.jp Fri Feb 13 23:49:53 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 13 Feb 2009 23:49:53 +0900 Subject: [pal-cvs 4021] [1756] 1.0-PR2 Message-ID: <1234536593.439754.3525.nullmailer@users.sourceforge.jp> Revision: 1756 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1756 Author: shinsuke Date: 2009-02-13 23:49:53 +0900 (Fri, 13 Feb 2009) Log Message: ----------- 1.0-PR2 Added Paths: ----------- vfs-portlets/tags/vfs-portlets-2.0.1/ -------------- next part -------------- From svnnotify ＠ sourceforge.jp Fri Feb 13 23:51:04 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 13 Feb 2009 23:51:04 +0900 Subject: [pal-cvs 4022] [1757] 1.1 Message-ID: <1234536664.855513.5386.nullmailer@users.sourceforge.jp> Revision: 1757 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1757 Author: shinsuke Date: 2009-02-13 23:51:04 +0900 (Fri, 13 Feb 2009) Log Message: ----------- 1.1 Added Paths: ----------- netvibes-widgets/tags/netvibes-widgets-1.1/ -------------- next part -------------- From svnnotify ＠ sourceforge.jp Fri Feb 13 23:51:33 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 13 Feb 2009 23:51:33 +0900 Subject: [pal-cvs 4023] [1758] 1.1 Message-ID: <1234536693.606821.5660.nullmailer@users.sourceforge.jp> Revision: 1758 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1758 Author: shinsuke Date: 2009-02-13 23:51:33 +0900 (Fri, 13 Feb 2009) Log Message: ----------- 1.1 Added Paths: ----------- googlegadgets/tags/googlegadgets-1.1/ -------------- next part -------------- From svnnotify ＠ sourceforge.jp Fri Feb 13 23:57:10 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 13 Feb 2009 23:57:10 +0900 Subject: [pal-cvs 4024] [1759] 1.1 Message-ID: <1234537030.141513.11231.nullmailer@users.sourceforge.jp> Revision: 1759 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1759 Author: shinsuke Date: 2009-02-13 23:57:09 +0900 (Fri, 13 Feb 2009) Log Message: ----------- 1.1 Modified Paths: -------------- pal-wcm/trunk/pom.xml -------------- next part -------------- Modified: pal-wcm/trunk/pom.xml =================================================================== --- pal-wcm/trunk/pom.xml 2009-02-13 14:51:33 UTC (rev 1758) +++ pal-wcm/trunk/pom.xml 2009-02-13 14:57:09 UTC (rev 1759) @@ -3,7 +3,7 @@ 4.0.0 jp.sf.pal pal-wcm - 1.1-SNAPSHOT + 1.1 war Web Content Management tools for PAL Portal @@ -170,7 +170,7 @@ org.seasar.sastruts sa-struts-portlet - 1.0.0-rc4 + 1.0.0 org.apache.geronimo.specs From svnnotify ＠ sourceforge.jp Sat Feb 14 07:01:00 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sat, 14 Feb 2009 07:01:00 +0900 Subject: [pal-cvs 4025] [1760] replaced with a blank plugin. Message-ID: <1234562460.709342.5498.nullmailer@users.sourceforge.jp> Revision: 1760 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1760 Author: shinsuke Date: 2009-02-14 07:01:00 +0900 (Sat, 14 Feb 2009) Log Message: ----------- replaced with a blank plugin. Modified Paths: -------------- userinfo/tags/userinfo-1.0-PR2/pom.xml -------------- next part -------------- Modified: userinfo/tags/userinfo-1.0-PR2/pom.xml =================================================================== --- userinfo/tags/userinfo-1.0-PR2/pom.xml 2009-02-13 14:57:09 UTC (rev 1759) +++ userinfo/tags/userinfo-1.0-PR2/pom.xml 2009-02-13 22:01:00 UTC (rev 1760) @@ -103,7 +103,7 @@ jp.sf.pal - userinfo-palportal-plugin + userinfo-blank-plugin 1.0-PR2 runtime From svnnotify ＠ sourceforge.jp Sat Feb 14 07:01:42 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sat, 14 Feb 2009 07:01:42 +0900 Subject: [pal-cvs 4026] [1761] replaced with a blank plugin. Message-ID: <1234562502.348258.5889.nullmailer@users.sourceforge.jp> Revision: 1761 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1761 Author: shinsuke Date: 2009-02-14 07:01:42 +0900 (Sat, 14 Feb 2009) Log Message: ----------- replaced with a blank plugin. Modified Paths: -------------- userinfo/trunk/pom.xml -------------- next part -------------- Modified: userinfo/trunk/pom.xml =================================================================== --- userinfo/trunk/pom.xml 2009-02-13 22:01:00 UTC (rev 1760) +++ userinfo/trunk/pom.xml 2009-02-13 22:01:42 UTC (rev 1761) @@ -103,7 +103,7 @@ jp.sf.pal - userinfo-palportal-plugin + userinfo-blank-plugin 1.0-PR2 runtime From svnnotify ＠ sourceforge.jp Sat Feb 14 07:34:18 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sat, 14 Feb 2009 07:34:18 +0900 Subject: [pal-cvs 4027] [1762] reverted sa-struts-portlet version. Message-ID: <1234564458.439243.6649.nullmailer@users.sourceforge.jp> Revision: 1762 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1762 Author: shinsuke Date: 2009-02-14 07:34:18 +0900 (Sat, 14 Feb 2009) Log Message: ----------- reverted sa-struts-portlet version. Modified Paths: -------------- pal-wcm/trunk/pom.xml -------------- next part -------------- Modified: pal-wcm/trunk/pom.xml =================================================================== --- pal-wcm/trunk/pom.xml 2009-02-13 22:01:42 UTC (rev 1761) +++ pal-wcm/trunk/pom.xml 2009-02-13 22:34:18 UTC (rev 1762) @@ -170,7 +170,7 @@ org.seasar.sastruts sa-struts-portlet - 1.0.0 + 1.0.0-rc4 org.apache.geronimo.specs From svnnotify ＠ sourceforge.jp Sat Feb 14 07:38:09 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sat, 14 Feb 2009 07:38:09 +0900 Subject: [pal-cvs 4028] [1763] 1.1 Message-ID: <1234564689.780699.11139.nullmailer@users.sourceforge.jp> Revision: 1763 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1763 Author: shinsuke Date: 2009-02-14 07:38:09 +0900 (Sat, 14 Feb 2009) Log Message: ----------- 1.1 Added Paths: ----------- pal-wcm/tags/pal-wcm-1.1/ -------------- next part -------------- From svnnotify ＠ sourceforge.jp Sat Feb 14 07:38:44 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sat, 14 Feb 2009 07:38:44 +0900 Subject: [pal-cvs 4029] [1764] 1.3 Message-ID: <1234564724.455349.11429.nullmailer@users.sourceforge.jp> Revision: 1764 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1764 Author: shinsuke Date: 2009-02-14 07:38:44 +0900 (Sat, 14 Feb 2009) Log Message: ----------- 1.3 Added Paths: ----------- pal-admin/tags/pal-admin-1.3/ -------------- next part -------------- From svnnotify ＠ sourceforge.jp Sun Feb 15 09:52:50 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sun, 15 Feb 2009 09:52:50 +0900 Subject: [pal-cvs 4030] [1765] modified category handling. Message-ID: <1234659170.576712.22551.nullmailer@users.sourceforge.jp> Revision: 1765 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1765 Author: shinsuke Date: 2009-02-15 09:52:50 +0900 (Sun, 15 Feb 2009) Log Message: ----------- modified category handling. Modified Paths: -------------- bookmark/trunk/src/main/config/sql/bookmark.dml bookmark/trunk/src/main/java/jp/sf/pal/bookmark/BookmarkConstants.java bookmark/trunk/src/main/java/jp/sf/pal/bookmark/action/admin/CategoryAction.java bookmark/trunk/src/main/java/jp/sf/pal/bookmark/action/admin/LinkAction.java bookmark/trunk/src/main/java/jp/sf/pal/bookmark/action/user/CategoryAction.java bookmark/trunk/src/main/java/jp/sf/pal/bookmark/action/user/LinkAction.java bookmark/trunk/src/main/java/jp/sf/pal/bookmark/pager/LinkPager.java bookmark/trunk/src/main/java/jp/sf/pal/bookmark/service/CategoryService.java bookmark/trunk/src/main/java/jp/sf/pal/bookmark/service/LinkService.java bookmark/trunk/src/main/resources/application.properties bookmark/trunk/src/main/resources/application_ja.properties bookmark/trunk/src/main/webapp/WEB-INF/db/bookmark.1.log.db bookmark/trunk/src/main/webapp/WEB-INF/db/bookmark.data.db bookmark/trunk/src/main/webapp/WEB-INF/db/bookmark.index.db bookmark/trunk/src/main/webapp/WEB-INF/view/admin/category/confirm.jsp bookmark/trunk/src/main/webapp/WEB-INF/view/admin/category/edit.jsp bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/confirm.jsp bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/edit.jsp bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/index.jsp -------------- next part -------------- Modified: bookmark/trunk/src/main/config/sql/bookmark.dml =================================================================== --- bookmark/trunk/src/main/config/sql/bookmark.dml 2009-02-13 22:38:44 UTC (rev 1764) +++ bookmark/trunk/src/main/config/sql/bookmark.dml 2009-02-15 00:52:50 UTC (rev 1765) @@ -1,3 +1 @@ insert into user_info (USER_ID, CREATED_TIME, CREATED_BY, UPDATED_TIME, UPDATED_BY, VERSIONNO, STATUS) values ('admin', '2008-10-15 17:17:37', 'admin', '2008-10-15 17:17:37', 'admin', 0, 'A'); -insert into BOOKMARK_CATEGORY (ID, NAME, CREATED_TIME, CREATED_BY, SORT_ORDER, UPDATED_TIME, UPDATED_BY, VERSIONNO, MEMO, TYPE) values (1, '(Unclassified)', '2008-10-15 17:17:37', 'admin', 1, '2008-10-15 17:17:37', 'admin', 0, '', 'P'); -insert into BOOKMARK_CATEGORY (ID, NAME, CREATED_TIME, CREATED_BY, SORT_ORDER, UPDATED_TIME, UPDATED_BY, VERSIONNO, MEMO, TYPE) values (2, '(Shared)', '2008-10-15 17:17:37', 'admin', 1, '2008-10-15 17:17:37', 'admin', 0, '', 'P'); Modified: bookmark/trunk/src/main/java/jp/sf/pal/bookmark/BookmarkConstants.java =================================================================== --- bookmark/trunk/src/main/java/jp/sf/pal/bookmark/BookmarkConstants.java 2009-02-13 22:38:44 UTC (rev 1764) +++ bookmark/trunk/src/main/java/jp/sf/pal/bookmark/BookmarkConstants.java 2009-02-15 00:52:50 UTC (rev 1765) @@ -18,11 +18,6 @@ public static final String FALSE = "F"; - // TODO remove - public static final Integer DEFAULT_CATEGORY_ID = Integer.valueOf(1); - - public static final String DEFAULT_CATEGORY = "D"; - public static final String PUBLIC_CATEGORY = "P"; public static final String PRIVATE_CATEGORY = "R"; Modified: bookmark/trunk/src/main/java/jp/sf/pal/bookmark/action/admin/CategoryAction.java =================================================================== --- bookmark/trunk/src/main/java/jp/sf/pal/bookmark/action/admin/CategoryAction.java 2009-02-13 22:38:44 UTC (rev 1764) +++ bookmark/trunk/src/main/java/jp/sf/pal/bookmark/action/admin/CategoryAction.java 2009-02-15 00:52:50 UTC (rev 1765) @@ -48,7 +48,7 @@ protected String displayList() { // page navi categoryPager.setCreatedBy(null); - categoryItems = categoryService.getCategoryList(categoryPager); + categoryItems = categoryService.getCategoryList(categoryPager, true); return "index.jsp"; } @@ -140,12 +140,8 @@ if (categoryForm.id == null) { throw new ActionMessagesException("errors.invalid.id"); } - BookmarkCategory category = categoryService.getCategory(Integer + BookmarkCategory category = getBookmarkCategory(Integer .parseInt(categoryForm.id)); - if (category == null) { - throw new ActionMessagesException("errors.could_not_find_category", - new Object[] { categoryForm.id }); - } try { categoryService.moveDown(category); BookmarkUtil.addMessage(request, "success.move_category_up"); @@ -164,12 +160,8 @@ if (categoryForm.id == null) { throw new ActionMessagesException("errors.invalid.id"); } - BookmarkCategory category = categoryService.getCategory(Integer + BookmarkCategory category = getBookmarkCategory(Integer .parseInt(categoryForm.id)); - if (category == null) { - throw new ActionMessagesException("errors.could_not_find_category", - new Object[] { categoryForm.id }); - } try { categoryService.moveUp(category); BookmarkUtil.addMessage(request, "success.move_category_down"); @@ -240,12 +232,7 @@ private void loadCategory() { Integer categoryId = Integer.parseInt(categoryForm.id); - BookmarkCategory category = categoryService.getCategory(categoryId); - if (category == null) { - // throw an exception - throw new ActionMessagesException("errors.could_not_find_category", - new Object[] { categoryId }); - } + BookmarkCategory category = getBookmarkCategory(categoryId); categoryDxo.convertFromCategoryToForm(category, categoryForm); } @@ -254,7 +241,7 @@ BookmarkCategory category; if (categoryForm.mode == BookmarkConstants.EDIT_MODE) { Integer categoryId = Integer.parseInt(categoryForm.id); - category = categoryService.getCategory(categoryId); + category = getBookmarkCategory(categoryId); category.setUpdatedBy(request.getRemoteUser()); } else { category = new BookmarkCategory(); @@ -268,6 +255,16 @@ } + private BookmarkCategory getBookmarkCategory(Integer id) { + BookmarkCategory category = categoryService.getCategory(id); + if (category == null) { + throw new ActionMessagesException("errors.could_not_find_category", + new Object[] { categoryForm.id }); + } + + return category; + } + /** * @return the request */ Modified: bookmark/trunk/src/main/java/jp/sf/pal/bookmark/action/admin/LinkAction.java =================================================================== --- bookmark/trunk/src/main/java/jp/sf/pal/bookmark/action/admin/LinkAction.java 2009-02-13 22:38:44 UTC (rev 1764) +++ bookmark/trunk/src/main/java/jp/sf/pal/bookmark/action/admin/LinkAction.java 2009-02-15 00:52:50 UTC (rev 1765) @@ -52,7 +52,7 @@ // page navi linkPager.setCreatedBy(null); linkPager.setCategoryId(null); - linkItems = linkService.getLinkList(linkPager); + linkItems = linkService.getLinkList(linkPager, true); return "index.jsp"; } @@ -208,15 +208,19 @@ } } + private BookmarkLink getBookmarkLink(Long id) { + BookmarkLink link = linkService.getLink(id); + if (link == null) { + throw new ActionMessagesException("errors.could_not_find_link", + new Object[] { linkForm.id }); + } + return link; + } + private void loadLink() { Long linkId = Long.parseLong(linkForm.id); - BookmarkLink link = linkService.getLink(linkId); - if (link == null) { - // throw an exception - throw new ActionMessagesException("errors.could_not_find_link", - new Object[] { linkId }); - } + BookmarkLink link = getBookmarkLink(linkId); linkDxo.convertFromLinkToForm(link, linkForm); } @@ -225,7 +229,7 @@ BookmarkLink link; if (linkForm.mode == BookmarkConstants.EDIT_MODE) { Long linkId = Long.parseLong(linkForm.id); - link = linkService.getLink(linkId); + link = getBookmarkLink(linkId); link.setUpdatedBy(request.getRemoteUser()); } else { link = new BookmarkLink(); Modified: bookmark/trunk/src/main/java/jp/sf/pal/bookmark/action/user/CategoryAction.java =================================================================== --- bookmark/trunk/src/main/java/jp/sf/pal/bookmark/action/user/CategoryAction.java 2009-02-13 22:38:44 UTC (rev 1764) +++ bookmark/trunk/src/main/java/jp/sf/pal/bookmark/action/user/CategoryAction.java 2009-02-15 00:52:50 UTC (rev 1765) @@ -140,12 +140,8 @@ if (categoryForm.id == null) { throw new ActionMessagesException("errors.invalid.id"); } - BookmarkCategory category = categoryService.getCategory(Integer + BookmarkCategory category = getBookmarkCategory(Integer .parseInt(categoryForm.id)); - if (category == null) { - throw new ActionMessagesException("errors.could_not_find_category", - new Object[] { categoryForm.id }); - } try { categoryService.moveDown(category); BookmarkUtil.addMessage(request, "success.move_category_down"); @@ -164,12 +160,8 @@ if (categoryForm.id == null) { throw new ActionMessagesException("errors.invalid.id"); } - BookmarkCategory category = categoryService.getCategory(Integer + BookmarkCategory category = getBookmarkCategory(Integer .parseInt(categoryForm.id)); - if (category == null) { - throw new ActionMessagesException("errors.could_not_find_category", - new Object[] { categoryForm.id }); - } try { categoryService.moveUp(category); BookmarkUtil.addMessage(request, "success.move_category_up"); @@ -240,12 +232,7 @@ private void loadCategory() { Integer categoryId = Integer.parseInt(categoryForm.id); - BookmarkCategory category = categoryService.getCategory(categoryId); - if (category == null) { - // throw an exception - throw new ActionMessagesException("errors.could_not_find_category", - new Object[] { categoryId }); - } + BookmarkCategory category = getBookmarkCategory(categoryId); categoryDxo.convertFromCategoryToForm(category, categoryForm); } @@ -254,7 +241,7 @@ BookmarkCategory category; if (categoryForm.mode == BookmarkConstants.EDIT_MODE) { Integer categoryId = Integer.parseInt(categoryForm.id); - category = categoryService.getCategory(categoryId); + category = getBookmarkCategory(categoryId); category.setUpdatedBy(request.getRemoteUser()); } else { category = new BookmarkCategory(); @@ -268,6 +255,24 @@ } + private BookmarkCategory getBookmarkCategory(Integer id) { + BookmarkCategory category = categoryService.getCategory(id); + if (category == null) { + throw new ActionMessagesException("errors.could_not_find_category", + new Object[] { categoryForm.id }); + } + if (!category.getCreatedBy().equals(getUserId())) { + throw new ActionMessagesException( + "errors.no_permission_for_bookmarkcategory", + new Object[] { categoryForm.id }); + } + return category; + } + + private String getUserId() { + return request.getRemoteUser(); + } + /** * @return the request */ Modified: bookmark/trunk/src/main/java/jp/sf/pal/bookmark/action/user/LinkAction.java =================================================================== --- bookmark/trunk/src/main/java/jp/sf/pal/bookmark/action/user/LinkAction.java 2009-02-13 22:38:44 UTC (rev 1764) +++ bookmark/trunk/src/main/java/jp/sf/pal/bookmark/action/user/LinkAction.java 2009-02-15 00:52:50 UTC (rev 1765) @@ -111,6 +111,11 @@ @Execute(validator = false, input = "error.jsp") public String createpage() { + List categoryList = getEditableCategoryItems(); + if (categoryList == null || categoryList.isEmpty()) { + throw new ActionMessagesException("errors.need_to_create_category"); + } + // page navi linkForm.initialize(); linkForm.mode = BookmarkConstants.CREATE_MODE; @@ -155,11 +160,7 @@ if (linkForm.id == null) { throw new ActionMessagesException("errors.invalid.id"); } - BookmarkLink link = linkService.getLink(Long.parseLong(linkForm.id)); - if (link == null) { - throw new ActionMessagesException("errors.could_not_find_link", - new Object[] { linkForm.id }); - } + BookmarkLink link = getBookmarkLink(Long.parseLong(linkForm.id)); try { linkService.moveDown(link); BookmarkUtil.addMessage(request, "success.move_link_down"); @@ -177,11 +178,7 @@ if (linkForm.id == null) { throw new ActionMessagesException("errors.invalid.id"); } - BookmarkLink link = linkService.getLink(Long.parseLong(linkForm.id)); - if (link == null) { - throw new ActionMessagesException("errors.could_not_find_link", - new Object[] { linkForm.id }); - } + BookmarkLink link = getBookmarkLink(Long.parseLong(linkForm.id)); try { linkService.moveUp(link); BookmarkUtil.addMessage(request, "success.move_link_up"); @@ -257,12 +254,7 @@ private void loadLink() { Long linkId = Long.parseLong(linkForm.id); - BookmarkLink link = linkService.getLink(linkId); - if (link == null) { - // throw an exception - throw new ActionMessagesException("errors.could_not_find_link", - new Object[] { linkId }); - } + BookmarkLink link = getBookmarkLink(linkId); linkDxo.convertFromLinkToForm(link, linkForm); } @@ -271,7 +263,7 @@ BookmarkLink link; if (linkForm.mode == BookmarkConstants.EDIT_MODE) { Long linkId = Long.parseLong(linkForm.id); - link = linkService.getLink(linkId); + link = getBookmarkLink(linkId); link.setUpdatedBy(request.getRemoteUser()); } else { link = new BookmarkLink(); @@ -307,14 +299,9 @@ public boolean isEditable() { String type = linkForm.categoryType; if (type != null) { - String userId = request.getRemoteUser(); - if (BookmarkConstants.DEFAULT_CATEGORY.equals(type)) { - if (userId != null && userId.equals(linkForm.createdBy)) { - return true; - } - } String createdBy = linkForm.categoryCreatedBy; if (createdBy != null) { + String userId = request.getRemoteUser(); if (userId != null && userId.equals(createdBy)) { return true; } @@ -324,6 +311,29 @@ return false; } + private BookmarkLink getBookmarkLink(Long id) { + BookmarkLink link = linkService.getLink(id); + if (link == null) { + throw new ActionMessagesException("errors.could_not_find_link", + new Object[] { linkForm.id }); + } + if (link.getCategoryId() == null + || BookmarkConstants.PRIVATE_CATEGORY.equals(link + .getBookmarkCategory().getType())) { + if (!link.getCreatedBy().equals(getUserId())) { + throw new ActionMessagesException( + "errors.no_permission_for_bookmarklink", + new Object[] { id }); + } + return link; + } else if (BookmarkConstants.PUBLIC_CATEGORY.equals(link + .getBookmarkCategory().getType())) { + return link; + } + throw new ActionMessagesException( + "errors.illegal_state_for_bookmaklink", new Object[] { id }); + } + /** * @return the request */ Modified: bookmark/trunk/src/main/java/jp/sf/pal/bookmark/pager/LinkPager.java =================================================================== --- bookmark/trunk/src/main/java/jp/sf/pal/bookmark/pager/LinkPager.java 2009-02-13 22:38:44 UTC (rev 1764) +++ bookmark/trunk/src/main/java/jp/sf/pal/bookmark/pager/LinkPager.java 2009-02-15 00:52:50 UTC (rev 1765) @@ -1,6 +1,5 @@ package jp.sf.pal.bookmark.pager; -import jp.sf.pal.bookmark.BookmarkConstants; import jp.sf.pal.bookmark.common.pager.DefaultPager; public class LinkPager extends DefaultPager { @@ -13,7 +12,7 @@ public LinkPager() { createdBy = null; - categoryId = BookmarkConstants.DEFAULT_CATEGORY_ID; + categoryId = null; } protected int getDefaultPageSize() { @@ -25,7 +24,13 @@ } public void setCategoryId(Integer categoryId) { - this.categoryId = categoryId; + if (categoryId != null) { + if (categoryId.intValue() > 0) { + this.categoryId = categoryId; + return; + } + } + this.categoryId = null; } public String getCreatedBy() { Modified: bookmark/trunk/src/main/java/jp/sf/pal/bookmark/service/CategoryService.java =================================================================== --- bookmark/trunk/src/main/java/jp/sf/pal/bookmark/service/CategoryService.java 2009-02-13 22:38:44 UTC (rev 1764) +++ bookmark/trunk/src/main/java/jp/sf/pal/bookmark/service/CategoryService.java 2009-02-15 00:52:50 UTC (rev 1765) @@ -2,6 +2,7 @@ import java.io.Serializable; import java.sql.Timestamp; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -49,7 +50,16 @@ } public List getCategoryList(CategoryPager categoryPager) { + return getCategoryList(categoryPager, false); + } + public List getCategoryList(CategoryPager categoryPager, + boolean permission) { + if (!permission && categoryPager.getCreatedBy() == null) { + // no permission + return new ArrayList(); + } + HotdeployUtil.rebuildValue(categoryPager); BookmarkCategoryCB cb = new BookmarkCategoryCB(); @@ -86,6 +96,7 @@ cb.query().setId_Equal(id); return bookmarkCategoryBhv.selectEntity(cb); + // need to check a permission of this entity. } public void store(BookmarkCategory category) { @@ -203,14 +214,16 @@ cb.query().setDeletedBy_IsNull(); cb.query().setType_NotEqual(BookmarkConstants.PRIVATE_CATEGORY); - cb.unionAll(new UnionQuery() { - public void query(BookmarkCategoryCB unionCB) { - unionCB.query().setDeletedBy_IsNull(); - unionCB.query().setType_Equal( - BookmarkConstants.PRIVATE_CATEGORY); - unionCB.query().setCreatedBy_Equal(createdBy); - } - }); + if (createdBy != null) { + cb.unionAll(new UnionQuery() { + public void query(BookmarkCategoryCB unionCB) { + unionCB.query().setDeletedBy_IsNull(); + unionCB.query().setType_Equal( + BookmarkConstants.PRIVATE_CATEGORY); + unionCB.query().setCreatedBy_Equal(createdBy); + } + }); + } cb.query().addOrderBy_Type_Asc(); cb.query().addOrderBy_SortOrder_Asc(); @@ -226,14 +239,6 @@ cb.query().setDeletedBy_IsNull(); cb.query().setCreatedBy_Equal(createdBy); - cb.unionAll(new UnionQuery() { - public void query(BookmarkCategoryCB unionCB) { - unionCB.query().setDeletedBy_IsNull(); - unionCB.query().setType_Equal( - BookmarkConstants.DEFAULT_CATEGORY); - unionCB.query().setCreatedBy_NotEqual(createdBy); - } - }); cb.query().addOrderBy_Type_Asc(); cb.query().addOrderBy_SortOrder_Asc(); Modified: bookmark/trunk/src/main/java/jp/sf/pal/bookmark/service/LinkService.java =================================================================== --- bookmark/trunk/src/main/java/jp/sf/pal/bookmark/service/LinkService.java 2009-02-13 22:38:44 UTC (rev 1764) +++ bookmark/trunk/src/main/java/jp/sf/pal/bookmark/service/LinkService.java 2009-02-15 00:52:50 UTC (rev 1765) @@ -2,6 +2,7 @@ import java.io.Serializable; import java.sql.Timestamp; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -9,6 +10,7 @@ import jp.sf.pal.bookmark.common.dxo.PagerDxo; import jp.sf.pal.bookmark.common.util.PagingResultBeanWrapper; import jp.sf.pal.bookmark.db.allcommon.cbean.PagingResultBean; +import jp.sf.pal.bookmark.db.allcommon.cbean.UnionQuery; import jp.sf.pal.bookmark.db.cbean.BookmarkLinkCB; import jp.sf.pal.bookmark.db.cbean.UserInfoCB; import jp.sf.pal.bookmark.db.exbhv.BookmarkLinkBhv; @@ -51,7 +53,16 @@ } public List getLinkList(LinkPager linkPager) { + return getLinkList(linkPager, false); + } + public List getLinkList(final LinkPager linkPager, + boolean permission) { + if (!permission && linkPager.getCreatedBy() == null) { + // no permission + return new ArrayList(); + } + HotdeployUtil.rebuildValue(linkPager); BookmarkLinkCB cb = new BookmarkLinkCB(); @@ -66,20 +77,34 @@ if (linkPager.getCreatedBy() != null) { if (linkPager.getCategoryId() != null) { + cb.query().setCategoryId_Equal(linkPager.getCategoryId()); + BookmarkCategory bookmarkCategory = categoryService .getCategory(linkPager.getCategoryId()); - if (BookmarkConstants.DEFAULT_CATEGORY.equals(bookmarkCategory + if (BookmarkConstants.PRIVATE_CATEGORY.equals(bookmarkCategory .getType())) { cb.query().setCreatedBy_Equal(linkPager.getCreatedBy()); - } else if (BookmarkConstants.PRIVATE_CATEGORY + cb.query().queryBookmarkCategory().setCreatedBy_Equal( + linkPager.getCreatedBy()); + } else if (BookmarkConstants.PUBLIC_CATEGORY .equals(bookmarkCategory.getType())) { - cb.query().setCreatedBy_Equal(linkPager.getCreatedBy()); + cb.query().queryBookmarkCategory().setType_Equal( + BookmarkConstants.PUBLIC_CATEGORY); } } else { + // All links cb.query().setCreatedBy_Equal(linkPager.getCreatedBy()); + cb.unionAll(new UnionQuery() { + public void query(BookmarkLinkCB unionCB) { + unionCB.query().setDeletedBy_IsNull(); + unionCB.query().queryBookmarkCategory().setType_Equal( + BookmarkConstants.PUBLIC_CATEGORY); + unionCB.query().setCreatedBy_NotEqual( + linkPager.getCreatedBy()); + } + }); } - } - if (linkPager.getCategoryId() != null) { + } else if (linkPager.getCategoryId() != null) { cb.query().setCategoryId_Equal(linkPager.getCategoryId()); } cb.query().setDeletedBy_IsNull(); @@ -108,6 +133,7 @@ cb.query().setId_Equal(id); return bookmarkLinkBhv.selectEntity(cb); + // need to check a permission of this entity. } public void store(BookmarkLink link) { Modified: bookmark/trunk/src/main/resources/application.properties =================================================================== --- bookmark/trunk/src/main/resources/application.properties 2009-02-13 22:38:44 UTC (rev 1764) +++ bookmark/trunk/src/main/resources/application.properties 2009-02-15 00:52:50 UTC (rev 1765) @@ -87,6 +87,11 @@ errors.could_not_find_link_for_moving_up=Could not find the link information for moving it up. errors.could_not_find_link_for_moving_down=Could not find the link information for moving it down. +errors.no_permission_for_bookmarklink=No permission for this link: {0} +errors.illegal_state_for_bookmaklink=This link is an illegal state: {0} +errors.no_permission_for_bookmarkcategory=No permission for this category: {0} +errors.need_to_create_category=Please create a category. + labels.default=Default labels.categoryId=Category ID @@ -95,3 +100,6 @@ labels.tab_link=Link labels.tab_category=Category + +labels.category_all=All +labels.category_unclassified=Unclassified Modified: bookmark/trunk/src/main/resources/application_ja.properties =================================================================== --- bookmark/trunk/src/main/resources/application_ja.properties 2009-02-13 22:38:44 UTC (rev 1764) +++ bookmark/trunk/src/main/resources/application_ja.properties 2009-02-15 00:52:50 UTC (rev 1765) @@ -81,6 +81,11 @@ 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 +errors.no_permission_for_bookmarklink=\u3053\u306e\u30ea\u30f3\u30af\u306b\u5bfe\u3059\u308b\u6a29\u9650\u306f\u3042\u308a\u307e\u305b\u3093: {0} +errors.illegal_state_for_bookmaklink=\u3053\u306e\u30ea\u30f3\u30af\u306e\u72b6\u614b\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093: {0} +errors.no_permission_for_bookmarkcategory=\u3053\u306e\u30ab\u30c6\u30b4\u30ea\u306b\u5bfe\u3059\u308b\u6a29\u9650\u306f\u3042\u308a\u307e\u305b\u3093: {0} +errors.need_to_create_category=\u30ab\u30c6\u30b4\u30ea\u3092\u4f5c\u6210\u3057\u3066\u304f\u3060\u3055\u3044\u3002 + labels.default=\u30c7\u30d5\u30a9\u30eb\u30c8 labels.categoryId=\u30ab\u30c6\u30b4\u30ea ID @@ -89,3 +94,6 @@ labels.tab_link=\u30ea\u30f3\u30af labels.tab_category=\u30ab\u30c6\u30b4\u30ea + +labels.category_all=\u3059\u3079\u3066 +labels.category_unclassified=\u672a\u5206\u985e Modified: bookmark/trunk/src/main/webapp/WEB-INF/db/bookmark.1.log.db =================================================================== (Binary files differ) Modified: bookmark/trunk/src/main/webapp/WEB-INF/db/bookmark.data.db =================================================================== (Binary files differ) Modified: bookmark/trunk/src/main/webapp/WEB-INF/db/bookmark.index.db =================================================================== (Binary files differ) Modified: bookmark/trunk/src/main/webapp/WEB-INF/view/admin/category/confirm.jsp =================================================================== --- bookmark/trunk/src/main/webapp/WEB-INF/view/admin/category/confirm.jsp 2009-02-13 22:38:44 UTC (rev 1764) +++ bookmark/trunk/src/main/webapp/WEB-INF/view/admin/category/confirm.jsp 2009-02-15 00:52:50 UTC (rev 1765) @@ -58,7 +58,6 @@ Modified: bookmark/trunk/src/main/webapp/WEB-INF/view/admin/category/edit.jsp =================================================================== --- bookmark/trunk/src/main/webapp/WEB-INF/view/admin/category/edit.jsp 2009-02-13 22:38:44 UTC (rev 1764) +++ bookmark/trunk/src/main/webapp/WEB-INF/view/admin/category/edit.jsp 2009-02-15 00:52:50 UTC (rev 1765) @@ -60,7 +60,6 @@ - Modified: bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/confirm.jsp =================================================================== --- bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/confirm.jsp 2009-02-13 22:38:44 UTC (rev 1764) +++ bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/confirm.jsp 2009-02-15 00:52:50 UTC (rev 1765) @@ -44,6 +44,12 @@ From svnnotify ＠ sourceforge.jp Sun Feb 15 09:54:50 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sun, 15 Feb 2009 09:54:50 +0900 Subject: [pal-cvs 4031] [1766] removed. Message-ID: <1234659290.022117.25189.nullmailer@users.sourceforge.jp> Revision: 1766 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1766 Author: shinsuke Date: 2009-02-15 09:54:49 +0900 (Sun, 15 Feb 2009) Log Message: ----------- removed. Removed Paths: ------------- bookmark/tags/bookmark-1.0-PR2/ -------------- next part -------------- From svnnotify ＠ sourceforge.jp Sun Feb 15 09:55:09 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sun, 15 Feb 2009 09:55:09 +0900 Subject: [pal-cvs 4032] [1767] updated 1.0-PR2 Message-ID: <1234659309.288954.25428.nullmailer@users.sourceforge.jp> Revision: 1767 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1767 Author: shinsuke Date: 2009-02-15 09:55:09 +0900 (Sun, 15 Feb 2009) Log Message: ----------- updated 1.0-PR2 Added Paths: ----------- bookmark/tags/bookmark-1.0-PR2/ -------------- next part -------------- From svnnotify ＠ sourceforge.jp Sun Feb 15 16:55:16 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sun, 15 Feb 2009 16:55:16 +0900 Subject: [pal-cvs 4033] [1768] fixed category handling. Message-ID: <1234684516.652558.6163.nullmailer@users.sourceforge.jp> Revision: 1768 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1768 Author: shinsuke Date: 2009-02-15 16:55:16 +0900 (Sun, 15 Feb 2009) Log Message: ----------- fixed category handling. Modified Paths: -------------- notepad/trunk/src/main/java/jp/sf/pal/notepad/NotepadConstants.java notepad/trunk/src/main/java/jp/sf/pal/notepad/action/admin/CategoryAction.java notepad/trunk/src/main/java/jp/sf/pal/notepad/action/admin/NotepadAction.java notepad/trunk/src/main/java/jp/sf/pal/notepad/action/user/CategoryAction.java notepad/trunk/src/main/java/jp/sf/pal/notepad/action/user/NotepadAction.java notepad/trunk/src/main/java/jp/sf/pal/notepad/pager/NotepadPager.java notepad/trunk/src/main/java/jp/sf/pal/notepad/service/CategoryService.java notepad/trunk/src/main/java/jp/sf/pal/notepad/service/NotepadService.java notepad/trunk/src/main/resources/application.properties notepad/trunk/src/main/resources/application_ja.properties notepad/trunk/src/main/webapp/WEB-INF/db/notepad.1.log.db notepad/trunk/src/main/webapp/WEB-INF/db/notepad.data.db notepad/trunk/src/main/webapp/WEB-INF/db/notepad.index.db notepad/trunk/src/main/webapp/WEB-INF/view/admin/category/confirm.jsp notepad/trunk/src/main/webapp/WEB-INF/view/admin/category/edit.jsp notepad/trunk/src/main/webapp/WEB-INF/view/user/notepad/confirm.jsp notepad/trunk/src/main/webapp/WEB-INF/view/user/notepad/edit.jsp notepad/trunk/src/main/webapp/WEB-INF/view/user/notepad/index.jsp -------------- next part -------------- Modified: notepad/trunk/src/main/java/jp/sf/pal/notepad/NotepadConstants.java =================================================================== --- notepad/trunk/src/main/java/jp/sf/pal/notepad/NotepadConstants.java 2009-02-15 00:55:09 UTC (rev 1767) +++ notepad/trunk/src/main/java/jp/sf/pal/notepad/NotepadConstants.java 2009-02-15 07:55:16 UTC (rev 1768) @@ -18,10 +18,6 @@ public static final String FALSE = "F"; - public static final Integer DEFAULT_CATEGORY_ID = Integer.valueOf(1); - - public static final String DEFAULT_CATEGORY = "D"; - public static final String PUBLIC_CATEGORY = "P"; public static final String PRIVATE_CATEGORY = "R"; Modified: notepad/trunk/src/main/java/jp/sf/pal/notepad/action/admin/CategoryAction.java =================================================================== --- notepad/trunk/src/main/java/jp/sf/pal/notepad/action/admin/CategoryAction.java 2009-02-15 00:55:09 UTC (rev 1767) +++ notepad/trunk/src/main/java/jp/sf/pal/notepad/action/admin/CategoryAction.java 2009-02-15 07:55:16 UTC (rev 1768) @@ -48,7 +48,7 @@ protected String displayList() { // page navi categoryPager.setCreatedBy(null); - categoryItems = categoryService.getCategoryList(categoryPager); + categoryItems = categoryService.getCategoryList(categoryPager, true); return "index.jsp"; } @@ -140,12 +140,8 @@ if (categoryForm.id == null) { throw new ActionMessagesException("errors.invalid.id"); } - NotepadCategory category = categoryService.getCategory(Integer + NotepadCategory category = getNotepadCategory(Integer .parseInt(categoryForm.id)); - if (category == null) { - throw new ActionMessagesException("errors.could_not_find_category", - new Object[] { categoryForm.id }); - } try { categoryService.moveDown(category); NotepadUtil.addMessage(request, "success.move_category_up"); @@ -164,12 +160,8 @@ if (categoryForm.id == null) { throw new ActionMessagesException("errors.invalid.id"); } - NotepadCategory category = categoryService.getCategory(Integer + NotepadCategory category = getNotepadCategory(Integer .parseInt(categoryForm.id)); - if (category == null) { - throw new ActionMessagesException("errors.could_not_find_category", - new Object[] { categoryForm.id }); - } try { categoryService.moveUp(category); NotepadUtil.addMessage(request, "success.move_category_down"); @@ -240,12 +232,7 @@ private void loadCategory() { Integer categoryId = Integer.parseInt(categoryForm.id); - NotepadCategory category = categoryService.getCategory(categoryId); - if (category == null) { - // throw an exception - throw new ActionMessagesException("errors.could_not_find_category", - new Object[] { categoryId }); - } + NotepadCategory category = getNotepadCategory(categoryId); categoryDxo.convertFromCategoryToForm(category, categoryForm); } @@ -254,7 +241,7 @@ NotepadCategory category; if (categoryForm.mode == NotepadConstants.EDIT_MODE) { Integer categoryId = Integer.parseInt(categoryForm.id); - category = categoryService.getCategory(categoryId); + category = getNotepadCategory(categoryId); category.setUpdatedBy(request.getRemoteUser()); } else { category = new NotepadCategory(); @@ -268,6 +255,15 @@ } + private NotepadCategory getNotepadCategory(Integer id) { + NotepadCategory category = categoryService.getCategory(id); + if (category == null) { + throw new ActionMessagesException("errors.could_not_find_category", + new Object[] { id }); + } + return category; + } + /** * @return the request */ Modified: notepad/trunk/src/main/java/jp/sf/pal/notepad/action/admin/NotepadAction.java =================================================================== --- notepad/trunk/src/main/java/jp/sf/pal/notepad/action/admin/NotepadAction.java 2009-02-15 00:55:09 UTC (rev 1767) +++ notepad/trunk/src/main/java/jp/sf/pal/notepad/action/admin/NotepadAction.java 2009-02-15 07:55:16 UTC (rev 1768) @@ -52,7 +52,7 @@ // page navi notepadPager.setCreatedBy(null); notepadPager.setCategoryId(null); - notepadItems = notepadService.getNotepadList(notepadPager); + notepadItems = notepadService.getNotepadList(notepadPager, true); return "index.jsp"; } @@ -211,12 +211,7 @@ private void loadLink() { Long linkId = Long.parseLong(notepadForm.id); - Notepad link = notepadService.getNotepad(linkId); - if (link == null) { - // throw an exception - throw new ActionMessagesException("errors.could_not_find_notepad", - new Object[] { linkId }); - } + Notepad link = getNotepad(linkId); notepadDxo.convertFromNotepadToForm(link, notepadForm); } @@ -225,7 +220,7 @@ Notepad link; if (notepadForm.mode == NotepadConstants.EDIT_MODE) { Long linkId = Long.parseLong(notepadForm.id); - link = notepadService.getNotepad(linkId); + link = getNotepad(linkId); link.setUpdatedBy(request.getRemoteUser()); } else { link = new Notepad(); @@ -238,6 +233,16 @@ return link; } + private Notepad getNotepad(Long id) { + Notepad notepad = notepadService.getNotepad(id); + if (notepad == null) { + // throw an exception + throw new ActionMessagesException("errors.could_not_find_notepad", + new Object[] { id }); + } + return notepad; + } + private void loadListPageParameters() { } Modified: notepad/trunk/src/main/java/jp/sf/pal/notepad/action/user/CategoryAction.java =================================================================== --- notepad/trunk/src/main/java/jp/sf/pal/notepad/action/user/CategoryAction.java 2009-02-15 00:55:09 UTC (rev 1767) +++ notepad/trunk/src/main/java/jp/sf/pal/notepad/action/user/CategoryAction.java 2009-02-15 07:55:16 UTC (rev 1768) @@ -140,12 +140,8 @@ if (categoryForm.id == null) { throw new ActionMessagesException("errors.invalid.id"); } - NotepadCategory category = categoryService.getCategory(Integer + NotepadCategory category = getNotepadCategory(Integer .parseInt(categoryForm.id)); - if (category == null) { - throw new ActionMessagesException("errors.could_not_find_category", - new Object[] { categoryForm.id }); - } try { categoryService.moveDown(category); NotepadUtil.addMessage(request, "success.move_category_down"); @@ -164,12 +160,8 @@ if (categoryForm.id == null) { throw new ActionMessagesException("errors.invalid.id"); } - NotepadCategory category = categoryService.getCategory(Integer + NotepadCategory category = getNotepadCategory(Integer .parseInt(categoryForm.id)); - if (category == null) { - throw new ActionMessagesException("errors.could_not_find_category", - new Object[] { categoryForm.id }); - } try { categoryService.moveUp(category); NotepadUtil.addMessage(request, "success.move_category_up"); @@ -240,12 +232,7 @@ private void loadCategory() { Integer categoryId = Integer.parseInt(categoryForm.id); - NotepadCategory category = categoryService.getCategory(categoryId); - if (category == null) { - // throw an exception - throw new ActionMessagesException("errors.could_not_find_category", - new Object[] { categoryId }); - } + NotepadCategory category = getNotepadCategory(categoryId); categoryDxo.convertFromCategoryToForm(category, categoryForm); } @@ -254,7 +241,7 @@ NotepadCategory category; if (categoryForm.mode == NotepadConstants.EDIT_MODE) { Integer categoryId = Integer.parseInt(categoryForm.id); - category = categoryService.getCategory(categoryId); + category = getNotepadCategory(categoryId); category.setUpdatedBy(request.getRemoteUser()); } else { category = new NotepadCategory(); @@ -268,6 +255,24 @@ } + private NotepadCategory getNotepadCategory(Integer id) { + NotepadCategory category = categoryService.getCategory(id); + if (category == null) { + throw new ActionMessagesException("errors.could_not_find_category", + new Object[] { id }); + } + if (!category.getCreatedBy().equals(getUserId())) { + throw new ActionMessagesException( + "errors.no_permission_for_notepadcategory", + new Object[] { id }); + } + return category; + } + + private String getUserId() { + return request.getRemoteUser(); + } + /** * @return the request */ Modified: notepad/trunk/src/main/java/jp/sf/pal/notepad/action/user/NotepadAction.java =================================================================== --- notepad/trunk/src/main/java/jp/sf/pal/notepad/action/user/NotepadAction.java 2009-02-15 00:55:09 UTC (rev 1767) +++ notepad/trunk/src/main/java/jp/sf/pal/notepad/action/user/NotepadAction.java 2009-02-15 07:55:16 UTC (rev 1768) @@ -111,6 +111,11 @@ @Execute(validator = false, input = "error.jsp") public String createpage() { + List categoryList = getEditableCategoryItems(); + if (categoryList == null || categoryList.isEmpty()) { + throw new ActionMessagesException("errors.need_to_create_category"); + } + // page navi notepadForm.initialize(); notepadForm.mode = NotepadConstants.CREATE_MODE; @@ -155,12 +160,7 @@ if (notepadForm.id == null) { throw new ActionMessagesException("errors.invalid.id"); } - Notepad notepad = notepadService.getNotepad(Long - .parseLong(notepadForm.id)); - if (notepad == null) { - throw new ActionMessagesException("errors.could_not_find_notepad", - new Object[] { notepadForm.id }); - } + Notepad notepad = getNotepad(Long.parseLong(notepadForm.id)); try { notepadService.moveDown(notepad); NotepadUtil.addMessage(request, "success.move_notepad_down"); @@ -178,12 +178,7 @@ if (notepadForm.id == null) { throw new ActionMessagesException("errors.invalid.id"); } - Notepad notepad = notepadService.getNotepad(Long - .parseLong(notepadForm.id)); - if (notepad == null) { - throw new ActionMessagesException("errors.could_not_find_notepad", - new Object[] { notepadForm.id }); - } + Notepad notepad = getNotepad(Long.parseLong(notepadForm.id)); try { notepadService.moveUp(notepad); NotepadUtil.addMessage(request, "success.move_notepad_up"); @@ -259,12 +254,7 @@ private void loadNotepad() { Long notepadId = Long.parseLong(notepadForm.id); - Notepad notepad = notepadService.getNotepad(notepadId); - if (notepad == null) { - // throw an exception - throw new ActionMessagesException("errors.could_not_find_notepad", - new Object[] { notepadId }); - } + Notepad notepad = getNotepad(notepadId); notepadDxo.convertFromNotepadToForm(notepad, notepadForm); } @@ -273,7 +263,7 @@ Notepad notepad; if (notepadForm.mode == NotepadConstants.EDIT_MODE) { Long notepadId = Long.parseLong(notepadForm.id); - notepad = notepadService.getNotepad(notepadId); + notepad = getNotepad(notepadId); notepad.setUpdatedBy(request.getRemoteUser()); } else { notepad = new Notepad(); @@ -306,8 +296,7 @@ String type = notepadForm.type; if (type != null) { if (NotepadConstants.PRIVATE_CATEGORY.equals(type) - || NotepadConstants.PUBLIC_CATEGORY.equals(type) - || NotepadConstants.DEFAULT_CATEGORY.equals(type)) { + || NotepadConstants.PUBLIC_CATEGORY.equals(type)) { String userId = request.getRemoteUser(); if (userId != null && userId.equals(notepadForm.createdBy)) { return true; @@ -319,6 +308,31 @@ return false; } + private Notepad getNotepad(Long id) { + Notepad notepad = notepadService.getNotepad(id); + if (notepad == null) { + // throw an exception + throw new ActionMessagesException("errors.could_not_find_notepad", + new Object[] { id }); + } + if (notepad.getCategoryId() == null + || NotepadConstants.PRIVATE_CATEGORY.equals(notepad + .getNotepadCategory().getType())) { + if (!notepad.getCreatedBy().equals(getUserId())) { + throw new ActionMessagesException( + "errors.no_permission_for_notepad", new Object[] { id }); + } + return notepad; + } else if (NotepadConstants.PUBLIC_CATEGORY.equals(notepad + .getNotepadCategory().getType()) + || NotepadConstants.SHARED_CATEGORY.equals(notepad + .getNotepadCategory().getType())) { + return notepad; + } + throw new ActionMessagesException("errors.illegal_state_for_notepad", + new Object[] { id }); + } + public String getUserId() { return request.getRemoteUser(); } Modified: notepad/trunk/src/main/java/jp/sf/pal/notepad/pager/NotepadPager.java =================================================================== --- notepad/trunk/src/main/java/jp/sf/pal/notepad/pager/NotepadPager.java 2009-02-15 00:55:09 UTC (rev 1767) +++ notepad/trunk/src/main/java/jp/sf/pal/notepad/pager/NotepadPager.java 2009-02-15 07:55:16 UTC (rev 1768) @@ -1,6 +1,5 @@ package jp.sf.pal.notepad.pager; -import jp.sf.pal.notepad.NotepadConstants; import jp.sf.pal.notepad.common.pager.DefaultPager; public class NotepadPager extends DefaultPager { @@ -13,7 +12,7 @@ public NotepadPager() { createdBy = null; - categoryId = NotepadConstants.DEFAULT_CATEGORY_ID; + categoryId = null; } protected int getDefaultPageSize() { @@ -25,7 +24,13 @@ } public void setCategoryId(Integer categoryId) { - this.categoryId = categoryId; + if (categoryId != null) { + if (categoryId.intValue() > 0) { + this.categoryId = categoryId; + return; + } + } + this.categoryId = null; } public String getCreatedBy() { Modified: notepad/trunk/src/main/java/jp/sf/pal/notepad/service/CategoryService.java =================================================================== --- notepad/trunk/src/main/java/jp/sf/pal/notepad/service/CategoryService.java 2009-02-15 00:55:09 UTC (rev 1767) +++ notepad/trunk/src/main/java/jp/sf/pal/notepad/service/CategoryService.java 2009-02-15 07:55:16 UTC (rev 1768) @@ -2,6 +2,7 @@ import java.io.Serializable; import java.sql.Timestamp; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -49,7 +50,16 @@ } public List getCategoryList(CategoryPager categoryPager) { + return getCategoryList(categoryPager, false); + } + public List getCategoryList(CategoryPager categoryPager, + boolean permission) { + if (!permission && categoryPager.getCreatedBy() == null) { + // no permission + return new ArrayList(); + } + HotdeployUtil.rebuildValue(categoryPager); NotepadCategoryCB cb = new NotepadCategoryCB(); @@ -86,6 +96,7 @@ cb.query().setId_Equal(id); return notepadCategoryBhv.selectEntity(cb); + // need to check a permission of this entity. } public void store(NotepadCategory category) { @@ -227,8 +238,10 @@ cb.unionAll(new UnionQuery() { public void query(NotepadCategoryCB unionCB) { unionCB.query().setDeletedBy_IsNull(); - unionCB.query() - .setType_Equal(NotepadConstants.PRIVATE_CATEGORY); + List typeList = new ArrayList(); + typeList.add(NotepadConstants.PRIVATE_CATEGORY); + typeList.add(NotepadConstants.PUBLIC_CATEGORY); + unionCB.query().setType_InScope(typeList); unionCB.query().setCreatedBy_Equal(createdBy); } }); Modified: notepad/trunk/src/main/java/jp/sf/pal/notepad/service/NotepadService.java =================================================================== --- notepad/trunk/src/main/java/jp/sf/pal/notepad/service/NotepadService.java 2009-02-15 00:55:09 UTC (rev 1767) +++ notepad/trunk/src/main/java/jp/sf/pal/notepad/service/NotepadService.java 2009-02-15 07:55:16 UTC (rev 1768) @@ -2,6 +2,7 @@ import java.io.Serializable; import java.sql.Timestamp; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -9,6 +10,7 @@ import jp.sf.pal.notepad.common.dxo.PagerDxo; import jp.sf.pal.notepad.common.util.PagingResultBeanWrapper; import jp.sf.pal.notepad.db.allcommon.cbean.PagingResultBean; +import jp.sf.pal.notepad.db.allcommon.cbean.UnionQuery; import jp.sf.pal.notepad.db.cbean.NotepadCB; import jp.sf.pal.notepad.db.cbean.UserInfoCB; import jp.sf.pal.notepad.db.exbhv.NotepadBhv; @@ -53,8 +55,17 @@ } } - public List getNotepadList(NotepadPager notepadPager) { + public List getNotepadList(final NotepadPager notepadPager) { + return getNotepadList(notepadPager, false); + } + public List getNotepadList(final NotepadPager notepadPager, + boolean permission) { + if (!permission && notepadPager.getCreatedBy() == null) { + // no permission + return new ArrayList(); + } + HotdeployUtil.rebuildValue(notepadPager); NotepadCB cb = new NotepadCB(); @@ -69,24 +80,46 @@ if (notepadPager.getCreatedBy() != null) { if (notepadPager.getCategoryId() != null) { + cb.query().setCategoryId_Equal(notepadPager.getCategoryId()); + NotepadCategory notepadCategory = categoryService .getCategory(notepadPager.getCategoryId()); - if (NotepadConstants.DEFAULT_CATEGORY.equals(notepadCategory + if (NotepadConstants.PRIVATE_CATEGORY.equals(notepadCategory .getType())) { cb.query().setCreatedBy_Equal(notepadPager.getCreatedBy()); - } else if (NotepadConstants.PRIVATE_CATEGORY + cb.query().queryNotepadCategory().setCreatedBy_Equal( + notepadPager.getCreatedBy()); + } else if (NotepadConstants.PUBLIC_CATEGORY .equals(notepadCategory.getType())) { - cb.query().setCreatedBy_Equal(notepadPager.getCreatedBy()); + cb.query().queryNotepadCategory().setType_Equal( + NotepadConstants.PUBLIC_CATEGORY); + } else if (NotepadConstants.SHARED_CATEGORY + .equals(notepadCategory.getType())) { + cb.query().queryNotepadCategory().setType_Equal( + NotepadConstants.SHARED_CATEGORY); } } else { + // All cb.query().setCreatedBy_Equal(notepadPager.getCreatedBy()); + cb.unionAll(new UnionQuery() { + public void query(NotepadCB unionCB) { + unionCB.query().setDeletedBy_IsNull(); + List typeList = new ArrayList(); + typeList.add(NotepadConstants.PUBLIC_CATEGORY); + typeList.add(NotepadConstants.SHARED_CATEGORY); + unionCB.query().queryNotepadCategory().setType_InScope( + typeList); + unionCB.query().setCreatedBy_NotEqual( + notepadPager.getCreatedBy()); + } + }); } - } - if (notepadPager.getCategoryId() != null) { + } else if (notepadPager.getCategoryId() != null) { cb.query().setCategoryId_Equal(notepadPager.getCategoryId()); } cb.query().setDeletedBy_IsNull(); + cb.query().addOrderBy_CategoryId_Asc(); cb.query().addOrderBy_SortOrder_Asc(); PagingResultBean messageList = notepadBhv.selectPage(cb); @@ -111,6 +144,7 @@ cb.query().setId_Equal(id); return notepadBhv.selectEntity(cb); + // need to check a permission of this entity. } public void store(Notepad notepad) { @@ -177,10 +211,6 @@ cb.query().setSortOrder_GreaterEqual(notepad.getSortOrder()); cb.query().addOrderBy_SortOrder_Asc(); cb.query().setCategoryId_Equal(notepad.getCategoryId()); - if (NotepadConstants.DEFAULT_CATEGORY.equals(notepad - .getNotepadCategory().getType())) { - cb.query().setCreatedBy_Equal(notepad.getCreatedBy()); - } List notepadList = notepadBhv.selectPage(cb); if (notepadList != null && !notepadList.isEmpty()) { Notepad targetNotepad = notepadList.get(0); @@ -210,10 +240,6 @@ cb.query().setSortOrder_LessEqual(notepad.getSortOrder()); cb.query().addOrderBy_SortOrder_Desc(); cb.query().setCategoryId_Equal(notepad.getCategoryId()); - if (NotepadConstants.DEFAULT_CATEGORY.equals(notepad - .getNotepadCategory().getType())) { - cb.query().setCreatedBy_Equal(notepad.getCreatedBy()); - } List notepadList = notepadBhv.selectPage(cb); if (notepadList != null && !notepadList.isEmpty()) { Notepad targetNotepad = notepadList.get(0); Modified: notepad/trunk/src/main/resources/application.properties =================================================================== --- notepad/trunk/src/main/resources/application.properties 2009-02-15 00:55:09 UTC (rev 1767) +++ notepad/trunk/src/main/resources/application.properties 2009-02-15 07:55:16 UTC (rev 1768) @@ -65,18 +65,18 @@ labels.to_next=Next Page labels.to_back=Back Page labels.create_category=Create category -labels.link_list=Note List +labels.note_list=Note List success.create_category=Created a category information. success.update_category=Updated the category information. success.delete_category=Deleted the category information. success.move_category_up=Moved the category information up. success.move_category_down=Moved the category information down. -success.create_notepad=Created a link information. -success.update_notepad=Updated the link information. -success.delete_notepad=Deleted the link information. -success.move_notepad_up=Moved the link information up. -success.move_notepad_down=Moved the link information down. +success.create_notepad=Created a note information. +success.update_notepad=Updated the note information. +success.delete_notepad=Deleted the note information. +success.move_notepad_up=Moved the note information up. +success.move_notepad_down=Moved the note information down. errors.invalid.mode=Invalid mode(expected value is {0}, but it's {1}). errors.failed_to_create_category=Failed to create a new category information. @@ -87,13 +87,18 @@ errors.could_not_find_category_for_moving_up=Could not find the category information for moving it up. errors.could_not_find_category_for_moving_down=Could not find the category information for moving it down. errors.invalid_category_id=Invalid category information. -errors.failed_to_create_notepad=Failed to create a new link information. -errors.failed_to_update_notepad=Failed to update the link information. -errors.failed_to_delete_notepad=Failed to delete the link information. -errors.could_not_find_notepad=Could not find the link information({0}). -errors.could_not_find_notepad_for_moving_up=Could not find the link information for moving it up. -errors.could_not_find_notepad_for_moving_down=Could not find the link information for moving it down. +errors.failed_to_create_notepad=Failed to create a new note information. +errors.failed_to_update_notepad=Failed to update the note information. +errors.failed_to_delete_notepad=Failed to delete the note information. +errors.could_not_find_notepad=Could not find the note information({0}). +errors.could_not_find_notepad_for_moving_up=Could not find the note information for moving it up. +errors.could_not_find_notepad_for_moving_down=Could not find the note information for moving it down. +errors.no_permission_for_notepad=No permission for this note: {0} +errors.illegal_state_for_notepad=This note is an illegal state: {0} +errors.no_permission_for_notepadcategory=No permission for this category: {0} +errors.need_to_create_category=Please create a category. + labels.createdBy=Created By labels.default_category=Default labels.shared=Shared @@ -107,3 +112,5 @@ labels.tab_notepad=Notepad labels.tab_category=Category +labels.category_all=\u3059\u3079\u3066 +labels.category_unclassified=\u672a\u5206\u985e Modified: notepad/trunk/src/main/resources/application_ja.properties =================================================================== --- notepad/trunk/src/main/resources/application_ja.properties 2009-02-15 00:55:09 UTC (rev 1767) +++ notepad/trunk/src/main/resources/application_ja.properties 2009-02-15 07:55:16 UTC (rev 1768) @@ -88,6 +88,11 @@ errors.could_not_find_notepad_for_moving_up=\u4e0a\u306b\u79fb\u52d5\u3059\u308b\u30e1\u30e2\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002 errors.could_not_find_notepad_for_moving_down=\u4e0b\u306b\u79fb\u52d5\u3059\u308b\u30e1\u30e2\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002 +errors.no_permission_for_notepad=\u3053\u306e\u30e1\u30e2\u306b\u5bfe\u3059\u308b\u6a29\u9650\u306f\u3042\u308a\u307e\u305b\u3093: {0} +errors.illegal_state_for_notepad=\u3053\u306e\u30e1\u30e2\u306e\u72b6\u614b\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093: {0} +errors.no_permission_for_notepadcategory=\u3053\u306e\u30ab\u30c6\u30b4\u30ea\u306b\u5bfe\u3059\u308b\u6a29\u9650\u306f\u3042\u308a\u307e\u305b\u3093: {0} +errors.need_to_create_category=\u30ab\u30c6\u30b4\u30ea\u3092\u4f5c\u6210\u3057\u3066\u304f\u3060\u3055\u3044\u3002 + labels.createdBy=\u4f5c\u6210\u8005 labels.default_category=\u30c7\u30d5\u30a9\u30eb\u30c8 labels.shared=\u5171\u6709 @@ -100,3 +105,7 @@ labels.tab_notepad=\u30e1\u30e2 labels.tab_category=\u30ab\u30c6\u30b4\u30ea + +labels.category_all=All +labels.category_unclassified=Unclassified + Modified: notepad/trunk/src/main/webapp/WEB-INF/db/notepad.1.log.db =================================================================== (Binary files differ) Modified: notepad/trunk/src/main/webapp/WEB-INF/db/notepad.data.db =================================================================== (Binary files differ) Modified: notepad/trunk/src/main/webapp/WEB-INF/db/notepad.index.db =================================================================== (Binary files differ) Modified: notepad/trunk/src/main/webapp/WEB-INF/view/admin/category/confirm.jsp =================================================================== --- notepad/trunk/src/main/webapp/WEB-INF/view/admin/category/confirm.jsp 2009-02-15 00:55:09 UTC (rev 1767) +++ notepad/trunk/src/main/webapp/WEB-INF/view/admin/category/confirm.jsp 2009-02-15 07:55:16 UTC (rev 1768) @@ -55,7 +55,6 @@ - Modified: notepad/trunk/src/main/webapp/WEB-INF/view/admin/category/edit.jsp =================================================================== --- notepad/trunk/src/main/webapp/WEB-INF/view/admin/category/edit.jsp 2009-02-15 00:55:09 UTC (rev 1767) +++ notepad/trunk/src/main/webapp/WEB-INF/view/admin/category/edit.jsp 2009-02-15 07:55:16 UTC (rev 1768) @@ -57,7 +57,6 @@ - Modified: notepad/trunk/src/main/webapp/WEB-INF/view/user/notepad/confirm.jsp =================================================================== --- notepad/trunk/src/main/webapp/WEB-INF/view/user/notepad/confirm.jsp 2009-02-15 00:55:09 UTC (rev 1767) +++ notepad/trunk/src/main/webapp/WEB-INF/view/user/notepad/confirm.jsp 2009-02-15 07:55:16 UTC (rev 1768) @@ -44,6 +44,12 @@
-
    + +
  • ?
    • +     + +
    • +
  • ?${f:h(c.name)}
    • Modified: bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/edit.jsp =================================================================== --- bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/edit.jsp 2009-02-13 22:38:44 UTC (rev 1764) +++ bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/edit.jsp 2009-02-15 00:52:50 UTC (rev 1765) @@ -44,6 +44,12 @@
    + +
  • ?
    • +     + +
    • +
  • ?${f:h(c.name)}
    • Modified: bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/index.jsp =================================================================== --- bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/index.jsp 2009-02-13 22:38:44 UTC (rev 1764) +++ bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/index.jsp 2009-02-15 00:52:50 UTC (rev 1765) @@ -44,6 +44,12 @@
    + +
  • ?
    • +     + +
    • +
  • ?${f:h(c.name)}
    • @@ -76,6 +82,7 @@
${f:h(l.name)} + @@ -94,6 +101,7 @@
+  
    + +
  • ?
    • +     + +
    • +
  • ?${f:h(c.name)}
    • @@ -78,7 +84,7 @@
- + ${f:h(category.name)} Modified: notepad/trunk/src/main/webapp/WEB-INF/view/user/notepad/edit.jsp =================================================================== --- notepad/trunk/src/main/webapp/WEB-INF/view/user/notepad/edit.jsp 2009-02-15 00:55:09 UTC (rev 1767) +++ notepad/trunk/src/main/webapp/WEB-INF/view/user/notepad/edit.jsp 2009-02-15 07:55:16 UTC (rev 1768) @@ -44,6 +44,12 @@
    + +
  • ?
    • +     + +
    • +
  • ?${f:h(c.name)}
    • @@ -79,7 +85,7 @@
- + ${f:h(category.name)} Modified: notepad/trunk/src/main/webapp/WEB-INF/view/user/notepad/index.jsp =================================================================== --- notepad/trunk/src/main/webapp/WEB-INF/view/user/notepad/index.jsp 2009-02-15 00:55:09 UTC (rev 1767) +++ notepad/trunk/src/main/webapp/WEB-INF/view/user/notepad/index.jsp 2009-02-15 07:55:16 UTC (rev 1768) @@ -44,6 +44,12 @@
    + +
  • ?
    • +     + +
    • +
  • ?${f:h(c.name)}
    • @@ -78,6 +84,7 @@
${f:h(l.title)} + @@ -96,6 +103,7 @@
+   		From svnnotify ＠ sourceforge.jp Sun Feb 15 16:56:42 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sun, 15 Feb 2009 16:56:42 +0900 Subject: [pal-cvs 4034] [1769] removed. Message-ID: <1234684602.650911.8061.nullmailer@users.sourceforge.jp> Revision: 1769 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1769 Author: shinsuke Date: 2009-02-15 16:56:42 +0900 (Sun, 15 Feb 2009) Log Message: ----------- removed. Removed Paths: ------------- notepad/tags/notepad-1.0-PR2/ -------------- next part -------------- From svnnotify ＠ sourceforge.jp Sun Feb 15 16:57:05 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sun, 15 Feb 2009 16:57:05 +0900 Subject: [pal-cvs 4035] [1770] updated 1.0-PR2 Message-ID: <1234684625.200974.8196.nullmailer@users.sourceforge.jp> Revision: 1770 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1770 Author: shinsuke Date: 2009-02-15 16:57:05 +0900 (Sun, 15 Feb 2009) Log Message: ----------- updated 1.0-PR2 Added Paths: ----------- notepad/tags/notepad-1.0-PR2/ -------------- next part -------------- From svnnotify ＠ sourceforge.jp Sun Feb 15 17:09:35 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sun, 15 Feb 2009 17:09:35 +0900 Subject: [pal-cvs 4036] [1771] version 1.1.1 Message-ID: <1234685375.966899.22699.nullmailer@users.sourceforge.jp> Revision: 1771 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1771 Author: shinsuke Date: 2009-02-15 17:09:35 +0900 (Sun, 15 Feb 2009) Log Message: ----------- version 1.1.1 Modified Paths: -------------- pal-portal/branches/pal-portal-1.x/build.properties -------------- next part -------------- Modified: pal-portal/branches/pal-portal-1.x/build.properties =================================================================== --- pal-portal/branches/pal-portal-1.x/build.properties 2009-02-15 07:57:05 UTC (rev 1770) +++ pal-portal/branches/pal-portal-1.x/build.properties 2009-02-15 08:09:35 UTC (rev 1771) @@ -4,7 +4,7 @@ container.name=PAL Portal container.separator=/ container.version.major=1 -container.version.minor=1.1-dev +container.version.minor=1.1 container.info.file=commons/src/java/org/apache/jetspeed/container/resources/ContainerInfo.properties override.prop.file=src/webapp/WEB-INF/conf/override.properties portlets.home=${basedir}/portlets From svnnotify ＠ sourceforge.jp Sun Feb 15 17:11:27 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sun, 15 Feb 2009 17:11:27 +0900 Subject: [pal-cvs 4037] [1772] version 1.1.1 Message-ID: <1234685487.831521.24506.nullmailer@users.sourceforge.jp> Revision: 1772 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1772 Author: shinsuke Date: 2009-02-15 17:11:27 +0900 (Sun, 15 Feb 2009) Log Message: ----------- version 1.1.1 Added Paths: ----------- pal-portal/tags/pal-portal-1.1.1/ -------------- next part -------------- From svnnotify ＠ sourceforge.jp Sun Feb 15 17:17:52 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sun, 15 Feb 2009 17:17:52 +0900 Subject: [pal-cvs 4038] [1773] removed bookmark and notepad dml files. Message-ID: <1234685872.502384.32274.nullmailer@users.sourceforge.jp> Revision: 1773 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1773 Author: shinsuke Date: 2009-02-15 17:17:52 +0900 (Sun, 15 Feb 2009) Log Message: ----------- removed bookmark and notepad dml files. Modified Paths: -------------- userinfo/trunk/src/main/webapp/WEB-INF/db/userinfo.1.log.db userinfo/trunk/src/main/webapp/WEB-INF/db/userinfo.data.db userinfo/trunk/src/main/webapp/WEB-INF/db/userinfo.index.db Removed Paths: ------------- userinfo/trunk/src/main/config/sql/others/bookmark.dml userinfo/trunk/src/main/config/sql/others/notepad.dml -------------- next part -------------- Deleted: userinfo/trunk/src/main/config/sql/others/bookmark.dml =================================================================== --- userinfo/trunk/src/main/config/sql/others/bookmark.dml 2009-02-15 08:11:27 UTC (rev 1772) +++ userinfo/trunk/src/main/config/sql/others/bookmark.dml 2009-02-15 08:17:52 UTC (rev 1773) @@ -1,2 +0,0 @@ -insert into BOOKMARK_CATEGORY (ID, NAME, CREATED_TIME, CREATED_BY, SORT_ORDER, UPDATED_TIME, UPDATED_BY, VERSIONNO, MEMO, TYPE) values (1, '(Unclassified)', '2008-10-15 17:17:37', 'admin', 1, '2008-10-15 17:17:37', 'admin', 0, '', 'P'); -insert into BOOKMARK_CATEGORY (ID, NAME, CREATED_TIME, CREATED_BY, SORT_ORDER, UPDATED_TIME, UPDATED_BY, VERSIONNO, MEMO, TYPE) values (2, '(Shared)', '2008-10-15 17:17:37', 'admin', 1, '2008-10-15 17:17:37', 'admin', 0, '', 'P'); Deleted: userinfo/trunk/src/main/config/sql/others/notepad.dml =================================================================== --- userinfo/trunk/src/main/config/sql/others/notepad.dml 2009-02-15 08:11:27 UTC (rev 1772) +++ userinfo/trunk/src/main/config/sql/others/notepad.dml 2009-02-15 08:17:52 UTC (rev 1773) @@ -1,2 +0,0 @@ -insert into NOTEPAD_CATEGORY (ID, NAME, CREATED_TIME, CREATED_BY, SORT_ORDER, UPDATED_TIME, UPDATED_BY, VERSIONNO, TYPE) values (1, '(Unclassified)', '2008-10-15 17:17:37', 'admin', 1, '2008-10-15 17:17:37', 'admin', 0, 'P'); -insert into NOTEPAD_CATEGORY (ID, NAME, CREATED_TIME, CREATED_BY, SORT_ORDER, UPDATED_TIME, UPDATED_BY, VERSIONNO, TYPE) values (2, '(Shared)', '2008-10-15 17:17:37', 'admin', 1, '2008-10-15 17:17:37', 'admin', 0, 'P'); Modified: userinfo/trunk/src/main/webapp/WEB-INF/db/userinfo.1.log.db =================================================================== (Binary files differ) Modified: userinfo/trunk/src/main/webapp/WEB-INF/db/userinfo.data.db =================================================================== (Binary files differ) Modified: userinfo/trunk/src/main/webapp/WEB-INF/db/userinfo.index.db =================================================================== (Binary files differ) From svnnotify ＠ sourceforge.jp Sun Feb 15 17:18:20 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sun, 15 Feb 2009 17:18:20 +0900 Subject: [pal-cvs 4039] [1774] removed. Message-ID: <1234685900.952160.951.nullmailer@users.sourceforge.jp> Revision: 1774 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1774 Author: shinsuke Date: 2009-02-15 17:18:20 +0900 (Sun, 15 Feb 2009) Log Message: ----------- removed. Removed Paths: ------------- userinfo/tags/userinfo-1.0-PR2/ -------------- next part -------------- From svnnotify ＠ sourceforge.jp Sun Feb 15 17:18:41 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sun, 15 Feb 2009 17:18:41 +0900 Subject: [pal-cvs 4040] [1775] updated 1.0-PR2 Message-ID: <1234685921.000625.1740.nullmailer@users.sourceforge.jp> Revision: 1775 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1775 Author: shinsuke Date: 2009-02-15 17:18:40 +0900 (Sun, 15 Feb 2009) Log Message: ----------- updated 1.0-PR2 Added Paths: ----------- userinfo/tags/userinfo-1.0-PR2/ -------------- next part -------------- From svnnotify ＠ sourceforge.jp Sun Feb 15 20:16:06 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sun, 15 Feb 2009 20:16:06 +0900 Subject: [pal-cvs 4041] [1776] fixed wrong translation. Message-ID: <1234696566.466087.14354.nullmailer@users.sourceforge.jp> Revision: 1776 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1776 Author: shinsuke Date: 2009-02-15 20:16:06 +0900 (Sun, 15 Feb 2009) Log Message: ----------- fixed wrong translation. Modified Paths: -------------- notepad/trunk/src/main/resources/application.properties notepad/trunk/src/main/resources/application_ja.properties -------------- next part -------------- Modified: notepad/trunk/src/main/resources/application.properties =================================================================== --- notepad/trunk/src/main/resources/application.properties 2009-02-15 08:18:40 UTC (rev 1775) +++ notepad/trunk/src/main/resources/application.properties 2009-02-15 11:16:06 UTC (rev 1776) @@ -112,5 +112,4 @@ labels.tab_notepad=Notepad labels.tab_category=Category -labels.category_all=\u3059\u3079\u3066 -labels.category_unclassified=\u672a\u5206\u985e +labels.category_all=All Modified: notepad/trunk/src/main/resources/application_ja.properties =================================================================== --- notepad/trunk/src/main/resources/application_ja.properties 2009-02-15 08:18:40 UTC (rev 1775) +++ notepad/trunk/src/main/resources/application_ja.properties 2009-02-15 11:16:06 UTC (rev 1776) @@ -106,6 +106,5 @@ labels.tab_notepad=\u30e1\u30e2 labels.tab_category=\u30ab\u30c6\u30b4\u30ea -labels.category_all=All -labels.category_unclassified=Unclassified +labels.category_all=\u3059\u3079\u3066 From svnnotify ＠ sourceforge.jp Sun Feb 15 20:17:22 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sun, 15 Feb 2009 20:17:22 +0900 Subject: [pal-cvs 4042] [1777] fixed wrong translation. Message-ID: <1234696642.700655.14915.nullmailer@users.sourceforge.jp> Revision: 1777 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1777 Author: shinsuke Date: 2009-02-15 20:17:22 +0900 (Sun, 15 Feb 2009) Log Message: ----------- fixed wrong translation. Modified Paths: -------------- notepad/tags/notepad-1.0-PR2/src/main/resources/application.properties notepad/tags/notepad-1.0-PR2/src/main/resources/application_ja.properties -------------- next part -------------- Modified: notepad/tags/notepad-1.0-PR2/src/main/resources/application.properties =================================================================== --- notepad/tags/notepad-1.0-PR2/src/main/resources/application.properties 2009-02-15 11:16:06 UTC (rev 1776) +++ notepad/tags/notepad-1.0-PR2/src/main/resources/application.properties 2009-02-15 11:17:22 UTC (rev 1777) @@ -112,5 +112,4 @@ labels.tab_notepad=Notepad labels.tab_category=Category -labels.category_all=\u3059\u3079\u3066 -labels.category_unclassified=\u672a\u5206\u985e +labels.category_all=All Modified: notepad/tags/notepad-1.0-PR2/src/main/resources/application_ja.properties =================================================================== --- notepad/tags/notepad-1.0-PR2/src/main/resources/application_ja.properties 2009-02-15 11:16:06 UTC (rev 1776) +++ notepad/tags/notepad-1.0-PR2/src/main/resources/application_ja.properties 2009-02-15 11:17:22 UTC (rev 1777) @@ -106,6 +106,5 @@ labels.tab_notepad=\u30e1\u30e2 labels.tab_category=\u30ab\u30c6\u30b4\u30ea -labels.category_all=All -labels.category_unclassified=Unclassified +labels.category_all=\u3059\u3079\u3066 From svnnotify ＠ sourceforge.jp Sun Feb 15 20:53:19 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sun, 15 Feb 2009 20:53:19 +0900 Subject: [pal-cvs 4043] [1778] updated doc title. Message-ID: <1234698799.999100.26824.nullmailer@users.sourceforge.jp> Revision: 1778 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1778 Author: shinsuke Date: 2009-02-15 20:53:19 +0900 (Sun, 15 Feb 2009) Log Message: ----------- updated doc title. Modified Paths: -------------- pal-portal/docs/ja/installation-guide/trunk/src/tex/installation-guide.tex -------------- next part -------------- Modified: pal-portal/docs/ja/installation-guide/trunk/src/tex/installation-guide.tex =================================================================== --- pal-portal/docs/ja/installation-guide/trunk/src/tex/installation-guide.tex 2009-02-15 11:17:22 UTC (rev 1777) +++ pal-portal/docs/ja/installation-guide/trunk/src/tex/installation-guide.tex 2009-02-15 11:53:19 UTC (rev 1778) @@ -9,7 +9,7 @@ \setlength{\textwidth}{47zw} -\title{インストールガイド} +\title{PALポータル インストールガイド} \author{Portal Application Laboratory} \begin{document} From svnnotify ＠ sourceforge.jp Sun Feb 15 20:54:05 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sun, 15 Feb 2009 20:54:05 +0900 Subject: [pal-cvs 4044] [1779] updated doc title. Message-ID: <1234698845.483765.28820.nullmailer@users.sourceforge.jp> Revision: 1779 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1779 Author: shinsuke Date: 2009-02-15 20:54:05 +0900 (Sun, 15 Feb 2009) Log Message: ----------- updated doc title. Modified Paths: -------------- pal-portal/docs/ja/administration-guide/trunk/src/tex/administration-guide.tex -------------- next part -------------- Modified: pal-portal/docs/ja/administration-guide/trunk/src/tex/administration-guide.tex =================================================================== --- pal-portal/docs/ja/administration-guide/trunk/src/tex/administration-guide.tex 2009-02-15 11:53:19 UTC (rev 1778) +++ pal-portal/docs/ja/administration-guide/trunk/src/tex/administration-guide.tex 2009-02-15 11:54:05 UTC (rev 1779) @@ -8,7 +8,7 @@ \setlength{\textwidth}{47zw} -\title{管理ガイド} +\title{PALポータル 管理ガイド} \author{Portal Application Laboratory} \begin{document} From svnnotify ＠ sourceforge.jp Sun Feb 15 21:18:28 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sun, 15 Feb 2009 21:18:28 +0900 Subject: [pal-cvs 4045] [1780] separated docs for startup/shutdown. Message-ID: <1234700308.813276.25698.nullmailer@users.sourceforge.jp> Revision: 1780 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1780 Author: shinsuke Date: 2009-02-15 21:18:28 +0900 (Sun, 15 Feb 2009) Log Message: ----------- separated docs for startup/shutdown. Modified Paths: -------------- pal-portal/docs/ja/installation-guide/trunk/src/tex/guide-cli-install-steps.tex pal-portal/docs/ja/installation-guide/trunk/src/tex/guide-gui-install-steps.tex pal-portal/docs/ja/installation-guide/trunk/src/tex/installation-guide.tex Added Paths: ----------- pal-portal/docs/ja/installation-guide/trunk/src/tex/guide-run.tex -------------- next part -------------- Modified: pal-portal/docs/ja/installation-guide/trunk/src/tex/guide-cli-install-steps.tex =================================================================== --- pal-portal/docs/ja/installation-guide/trunk/src/tex/guide-cli-install-steps.tex 2009-02-15 11:54:05 UTC (rev 1779) +++ pal-portal/docs/ja/installation-guide/trunk/src/tex/guide-cli-install-steps.tex 2009-02-15 12:18:28 UTC (rev 1780) @@ -26,24 +26,24 @@ \if0 PAL PORTAL ONLY: BEGIN \fi \section{PALPortal-install-[version].jar のダウンロード} -http://sourceforge.jp/projects/pal/files/から PALポータルのインストーラー(jarファイル)をダウンロードしてください。 - インストーラーのファイル名は、PALPortal-[version]-installer.jar になります([version]は PALポータルのバージョンです)。 +http://sourceforge.jp/projects/pal/files/ から PALポータルのインストーラー(jarファイル)をダウンロードしてください。 +インストーラーのファイル名は、PALPortal-[version]-installer.jar になります([version]は PALポータルのバージョンです)。 \if0 PAL PORTAL ONLY: END \fi \section{インストーラの実行} - コマンドライン上で +コマンドライン上で \begin{screen} \$ java -jar PALPortal-[version]-installer.jar \end{screen} - を実行します(java コマンドが含まれるディレクトリは、環境変数 PATH で指定されている必要があります)。 - 実行するとインストーラーが起動します。 +を実行します(java コマンドが含まれるディレクトリは、環境変数 PATH で指定されている必要があります)。 +実行するとインストーラーが起動します。 - 日本語以外の端末を利用している場合は、ロケールの設定を C または en\_US.UTF-8 に変更してください。 +日本語以外の端末を利用している場合は、ロケールの設定を C または en\_US.UTF-8 に変更してください。 \begin{screen} \begin{footnotesize} @@ -66,7 +66,7 @@ \section{ライセンスの確認} - ライセンスを確認します。 +ライセンスを確認します。 \begin{screen} \begin{footnotesize} @@ -94,15 +94,15 @@ \end{footnotesize} \end{screen} - ライセンスに同意する場合は、Enter キーを押下します。 - 同意できない場合は、「N」を入力した上で Enter キーを押下して、インストールを終了してください。 +ライセンスに同意する場合は、Enter キーを押下します。 +同意できない場合は、「N」を入力した上で Enter キーを押下して、インストールを終了してください。 \section{インストール方法の選択} - インストール方法を選択します。 - 新規にインストールする場合は「新規インストール」を選択します。 - アップグレードインストールする場合は「アップグレードインストール」を選択します。 +インストール方法を選択します。 +新規にインストールする場合は「新規インストール」を選択します。 +アップグレードインストールする場合は「アップグレードインストール」を選択します。 \begin{screen} \begin{footnotesize} @@ -122,13 +122,13 @@ \end{footnotesize} \end{screen} - 「1」を入力して、Enterキーを押下してください。 +「1」を入力して、Enterキーを押下してください。 \section{インストール場所の選択} - インストールする場所を選択してください。 - インストールするパスを入力して、インストールする場所を指定します。 +インストールする場所を選択してください。 +インストールするパスを入力して、インストールする場所を指定します。 \begin{screen} \begin{footnotesize} @@ -152,12 +152,12 @@ \end{footnotesize} \end{screen} - Enter キーを押下します。 +Enter キーを押下します。 \section{インストールするコンポーネントの確認} - インストールされるコンポーネントの一覧が表示されます。 +インストールされるコンポーネントの一覧が表示されます。 \begin{screen} \begin{footnotesize} @@ -191,18 +191,18 @@ \end{footnotesize} \end{screen} - 各項目ごとに true もしくは false を入力し、Enter キーを押下して、コンポーネントを選択します。 - 「Tomcat 5.5.27」の項目に true を入力すると、PALポータルが利用するための Tomcat がインストールされます。 - 「Tomcat用PALポータル設定」の項目に true を入力すると、Tomcat 用の設定ファイルがインストールされます。 - 「メールサーバ設定」の項目に true を入力すると、PALポータルが利用するメールサーバの設定が行えます。 +各項目ごとに true もしくは false を入力し、Enter キーを押下して、コンポーネントを選択します。 +「Tomcat 5.5.27」の項目に true を入力すると、PALポータルが利用するための Tomcat がインストールされます。 +「Tomcat用PALポータル設定」の項目に true を入力すると、Tomcat 用の設定ファイルがインストールされます。 +「メールサーバ設定」の項目に true を入力すると、PALポータルが利用するメールサーバの設定が行えます。 \section{メールサーバーの指定} - PALポータルで利用するメールサーバーを指定します。 - 「メールサーバ名」の項目にメールサーバー名を指定します。 - メールサーバーがユーザー認証を利用している場合には、 - ユーザー名とパスワードを入力した上で、「ユーザ認証」の項目で true を選択します。 +PALポータルで利用するメールサーバーを指定します。 +「メールサーバ名」の項目にメールサーバー名を指定します。 +メールサーバーがユーザー認証を利用している場合には、 +ユーザー名とパスワードを入力した上で、「ユーザ認証」の項目で true を選択します。 \begin{screen} \begin{footnotesize} @@ -230,14 +230,14 @@ \end{footnotesize} \end{screen} - Enter キーを押下します。 +Enter キーを押下します。 \section{データベースの選択} - 利用するデータベースを指定します。 - デフォルトの DB を利用する場合は、Derby を選択してください。 - Derby 以外のデータベースを利用する場合は、「CLI インストールの DB 設定」を参照してください。 +利用するデータベースを指定します。 +デフォルトの DB を利用する場合は、Derby を選択してください。 +Derby 以外のデータベースを利用する場合は、「CLI インストールの DB 設定」を参照してください。 \begin{screen} \begin{footnotesize} @@ -264,13 +264,13 @@ \end{footnotesize} \end{screen} - Enter キーを押下します。 +Enter キーを押下します。 \section{インストール前の確認} - インストールを実行する前に、インストール先のディレクトリを確認してください。 - 指定されたディレクトリが削除されます。 +インストールを実行する前に、インストール先のディレクトリを確認してください。 +指定されたディレクトリが削除されます。 \begin{screen} \begin{footnotesize} @@ -289,13 +289,13 @@ \end{footnotesize} \end{screen} - Enter キーを押下します。 +Enter キーを押下します。 \section{インストールの実行} - Enter キーを押下するとインストールが実行されます。 - なお、GUI インストールとは異なり、インストール時のログは必ず表示されます。 +Enter キーを押下するとインストールが実行されます。 +なお、GUI インストールとは異なり、インストール時のログは必ず表示されます。 \begin{framed} %\begin{screen} @@ -405,7 +405,7 @@ \section{インストールの完了} - インストールが完了すると、以下のメッセージが表示されます。 +インストールが完了すると、以下のメッセージが表示されます。 \begin{screen} \begin{footnotesize} @@ -419,51 +419,9 @@ \end{footnotesize} \end{screen} - インストールに失敗した場合は、ログでエラー内容を確認してください。 +インストールに失敗した場合は、ログでエラー内容を確認してください。 - 自動的にインストーラーが終了します。 +自動的にインストーラーが終了します。 -\section{PALポータルの実行} - - - - 端末エミュレータ上で - -\begin{screen} -\$ [インストール場所]/bin/startup.sh -\end{screen} - - を実行して、PALポータルを起動してください。起動後、http://localhost:8080/ にアクセスして、PALポータルのトップページが表示されることを確認してください。 - -\if0 - -% N2 Portal 2.0 - -ただし、N2 Portal 2.0 の場合、N2 Collabo が組み込まれているため、 - -コマンドライン上で - -\begin{screen} -\$ sh [インストール場所]/database/bin/run.sh -\end{screen} - -を実行し、N2 Collabo の DB を起動してからポータルを起動してください。 - -\fi - - -\begin{figure}[ht] -\begin{center} -\includegraphics[width=120mm]{images/palportal_top.eps} -\caption{PALポータルのトップページ} -\label{fig:palportal_top} -\end{center} -\end{figure} - - - デフォルトで、登録されている管理者は、ユーザー名 admin 、パスワード admin です。 - - - Modified: pal-portal/docs/ja/installation-guide/trunk/src/tex/guide-gui-install-steps.tex =================================================================== --- pal-portal/docs/ja/installation-guide/trunk/src/tex/guide-gui-install-steps.tex 2009-02-15 11:54:05 UTC (rev 1779) +++ pal-portal/docs/ja/installation-guide/trunk/src/tex/guide-gui-install-steps.tex 2009-02-15 12:18:28 UTC (rev 1780) @@ -26,14 +26,14 @@ \if0 PAL PORTAL ONLY: BEGIN \fi \section{PALPortal-[version]-installer.jar のダウンロード} -http://sourceforge.jp/projects/pal/files/から PALポータルのインストーラー(jarファイル)をダウンロードしてください。 - インストーラーのファイル名は、PALPortal-[version]-installer.jar になります([version]は PALポータルのバージョンです)。 +http://sourceforge.jp/projects/pal/files/ から PALポータルのインストーラー(jarファイル)をダウンロードしてください。 +インストーラーのファイル名は、PALPortal-[version]-installer.jar になります([version]は PALポータルのバージョンです)。 \if0 PAL PORTAL ONLY: END \fi \section{インストーラの実行} - 端末エミュレータ(Windows の場合は DOS 窓)上で +端末エミュレータ(Windows の場合は DOS 窓)上で \begin{screen} \begin{small} @@ -46,8 +46,8 @@ \end{small} \end{screen} - を実行します(java コマンドが含まれるディレクトリは、環境変数 PATH で指定されている必要があります)。 - 実行するとインストーラーが起動します。 +を実行します(java コマンドが含まれるディレクトリは、環境変数 PATH で指定されている必要があります)。 +実行するとインストーラーが起動します。 \begin{figure}[ht] \begin{center} @@ -58,12 +58,12 @@ \end{figure} - 「次へ」ボタンをクリックします。 +「次へ」ボタンをクリックします。 \section{ライセンスの確認} - ライセンスを確認します。 +ライセンスを確認します。 \begin{figure}[ht] \begin{center} @@ -74,15 +74,15 @@ \end{figure} - ライセンスに同意する場合は、「同意する」ボタンをクリックします。 - 同意できない場合は、「同意しない」ボタンをクリックして、インストールを終了してください。 +ライセンスに同意する場合は、「同意する」ボタンをクリックします。 +同意できない場合は、「同意しない」ボタンをクリックして、インストールを終了してください。 \section{インストール方法の選択} - インストール方法を選択します。 - 新規にインストールする場合は「新規インストール」を選択します。 - アップグレードインストールする場合は「アップグレードインストール」を選択します。 +インストール方法を選択します。 +新規にインストールする場合は「新規インストール」を選択します。 +アップグレードインストールする場合は「アップグレードインストール」を選択します。 \begin{figure}[ht] \begin{center} @@ -93,12 +93,12 @@ \end{figure} - 「新規インストール」を選択して、「次へ」ボタンをクリックしてください。 +「新規インストール」を選択して、「次へ」ボタンをクリックしてください。 \section{インストール場所の選択} - インストールする場所を選択してください。テキストフィールド欄にインストールするパスを入力するか、「フォルダの選択」ボタンをクリックして、インストールする場所を指定します。 +インストールする場所を選択してください。テキストフィールド欄にインストールするパスを入力するか、「フォルダの選択」ボタンをクリックして、インストールする場所を指定します。 \begin{figure}[ht] \begin{center} @@ -109,12 +109,12 @@ \end{figure} - 「次へ」ボタンをクリックします。 +「次へ」ボタンをクリックします。 \section{インストールするコンポーネントの確認} - インストールされるコンポーネントの一覧が表示されます。 +インストールされるコンポーネントの一覧が表示されます。 \begin{figure}[ht] \begin{center} @@ -125,17 +125,17 @@ \end{figure} - 「Tomcat 5.5.27」を選択すると、PALポータルが利用するための Tomcat がインストールされます。 - 「Tomcat用PALポータル設定」を選択すると、Tomcat 用の設定ファイルがインストールされます。 - 「メールサーバ設定」を選択すると、PALポータルが利用するメールサーバの設定が行えます。 - コンポーネント選択して、「次へ」ボタンをクリックします。 +「Tomcat 5.5.27」を選択すると、PALポータルが利用するための Tomcat がインストールされます。 +「Tomcat用PALポータル設定」を選択すると、Tomcat 用の設定ファイルがインストールされます。 +「メールサーバ設定」を選択すると、PALポータルが利用するメールサーバの設定が行えます。 +コンポーネント選択して、「次へ」ボタンをクリックします。 \section{メールサーバーの指定} - PALポータルで利用するメールサーバーを指定します。 - 「メールサーバ名」テキストフィールドにメールサーバー名を指定します。 - メールサーバーがユーザー認証を利用している場合には、「ユーザ認証」チェックボックスを選択して、ユーザー名とパスワードを入力します。 +PALポータルで利用するメールサーバーを指定します。 +「メールサーバ名」テキストフィールドにメールサーバー名を指定します。 +メールサーバーがユーザー認証を利用している場合には、「ユーザ認証」チェックボックスを選択して、ユーザー名とパスワードを入力します。 \begin{figure}[ht] \begin{center} @@ -146,14 +146,14 @@ \end{figure} - 「次へ」ボタンをクリックします。 +「次へ」ボタンをクリックします。 \section{データベースの選択} - 利用するデータベースを指定します。 - デフォルトの DB を利用する場合は、Derby を選択してください。 - Derby 以外のデータベースを利用する場合は、「GUI インストールの DB 設定」を参照してください。 +利用するデータベースを指定します。 +デフォルトの DB を利用する場合は、Derby を選択してください。 +Derby 以外のデータベースを利用する場合は、「GUI インストールの DB 設定」を参照してください。 \begin{figure}[ht] \begin{center} @@ -164,13 +164,13 @@ \end{figure} - 「次へ」ボタンをクリックします。 +「次へ」ボタンをクリックします。 \section{インストール前の確認} - インストールを実行する前に、インストール先のディレクトリを確認してください。 - 指定されたディレクトリが削除されます。 +インストールを実行する前に、インストール先のディレクトリを確認してください。 +指定されたディレクトリが削除されます。 \begin{figure}[ht] \begin{center} @@ -181,13 +181,13 @@ \end{figure} - 「次へ」ボタンをクリックします。 +「次へ」ボタンをクリックします。 \section{インストールの実行} - 「インストール」ボタンをクリックするとインストールが実行されます。 - 「詳細の表示」ボタンをクリックすると、インストール時のログを確認することができます。 +「インストール」ボタンをクリックするとインストールが実行されます。 +「詳細の表示」ボタンをクリックすると、インストール時のログを確認することができます。 \begin{figure}[ht] \begin{center} @@ -198,7 +198,7 @@ \end{figure} - 「インストール」ボタンをクリックします。 +「インストール」ボタンをクリックします。 \begin{figure}[ht] \begin{center} @@ -211,7 +211,7 @@ \section{インストールの完了} - インストールが完了すると、「完了しました。」というメッセージが表示されます。 +インストールが完了すると、「完了しました。」というメッセージが表示されます。 \begin{figure}[ht] \begin{center} @@ -222,7 +222,7 @@ \end{figure} - インストールに失敗した場合は、ログでエラー内容を確認してください。 +インストールに失敗した場合は、ログでエラー内容を確認してください。 \begin{figure}[ht] \begin{center} @@ -233,57 +233,6 @@ \end{figure} - 「終了」ボタンをインストーラーを終了します。 +「終了」ボタンをインストーラーを終了します。 -\section{PALポータルの実行} - - 端末エミュレータ(Windows の場合は DOS 窓)上で - -\begin{screen} -\begin{small} -% \begin{verbatim} -(Unix 系 OS の場合) \\ -\$ [インストール場所]/bin/startup.sh \\ -(Windows の場合) \\ -$>$ [インストール場所]\yen bin\yen startup.bat -% \end{verbatim} -\end{small} -\end{screen} - - を実行して、PALポータルを起動してください。起動後、http://localhost:8080/ にアクセスして、PALポータルのトップページが表示されることを確認してください。 - -\if0 - -% N2 Portal 2.0 - -ただし、N2 Portal 2.0 の場合、N2 Collabo が組み込まれているため、 -端末エミュレータ(Windows の場合は DOS 窓)上で - -\begin{screen} -\begin{small} -(Unix 系 OS の場合) \\ -\$ sh [インストール場所]/database/bin/run.sh \\ -(Windows の場合) \\ -$>$ [インストール場所]\yen database\yen bin\yen run.bat -\end{small} -\end{screen} - -を実行し、N2 Collabo の DB を起動してからポータルを起動してください。 - -\fi - - -\begin{figure}[ht] -\begin{center} -\includegraphics[width=120mm]{images/palportal_top.eps} -\caption{PALポータルのトップページ} -\label{fig:palportal_top} -\end{center} -\end{figure} - - - デフォルトで、登録されている管理者は、ユーザー名 admin 、パスワード admin です。 - - - Added: pal-portal/docs/ja/installation-guide/trunk/src/tex/guide-run.tex =================================================================== --- pal-portal/docs/ja/installation-guide/trunk/src/tex/guide-run.tex (rev 0) +++ pal-portal/docs/ja/installation-guide/trunk/src/tex/guide-run.tex 2009-02-15 12:18:28 UTC (rev 1780) @@ -0,0 +1,68 @@ + +\if0 + Copyright 2004 The Apache Software Foundation + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +\fi + + + +\chapter{PALポータルの起動と停止の手順} + +\section{PALポータルの起動} + +端末エミュレータ(Windows の場合は DOS 窓)上で + +\begin{screen} +\begin{small} +% \begin{verbatim} +(Unix 系 OS の場合) \\ +\$ [インストール場所]/bin/startup.sh \\ +(Windows の場合) \\ +$>$ [インストール場所]\yen bin\yen startup.bat +% \end{verbatim} +\end{small} +\end{screen} + +を実行して、PALポータルを起動してください。起動後、http://localhost:8080/ にアクセスして、PALポータルのトップページが表示されることを確認してください。 + +\begin{figure}[ht] +\begin{center} +\includegraphics[width=120mm]{images/palportal_top.eps} +\caption{PALポータルのトップページ} +\label{fig:palportal_top} +\end{center} +\end{figure} + + +デフォルトで、登録されている管理者は、ユーザー名 admin 、パスワード admin です。 + + +\section{PALポータルの停止} + +端末エミュレータ(Windows の場合は DOS 窓)上で + +\begin{screen} +\begin{small} +% \begin{verbatim} +(Unix 系 OS の場合) \\ +\$ [インストール場所]/bin/shutdown.sh \\ +(Windows の場合) \\ +$>$ [インストール場所]\yen bin\yen shutdown.bat +% \end{verbatim} +\end{small} +\end{screen} + +を実行ください。 + + Modified: pal-portal/docs/ja/installation-guide/trunk/src/tex/installation-guide.tex =================================================================== --- pal-portal/docs/ja/installation-guide/trunk/src/tex/installation-guide.tex 2009-02-15 11:54:05 UTC (rev 1779) +++ pal-portal/docs/ja/installation-guide/trunk/src/tex/installation-guide.tex 2009-02-15 12:18:28 UTC (rev 1780) @@ -32,6 +32,7 @@ \input{guide-cli-install} \input{guide-cli-install-steps} \input{guide-cli-install-dbsetup} +\input{guide-run} \input{guide-uninstall-for-unix} \input{guide-uninstall-for-win} \input{guide-gui-upgrade} From svnnotify ＠ sourceforge.jp Wed Feb 25 13:31:46 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Wed, 25 Feb 2009 13:31:46 +0900 Subject: [pal-cvs 4046] [1781] updated docs Message-ID: <1235536306.556143.26619.nullmailer@users.sourceforge.jp> Revision: 1781 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1781 Author: sone Date: 2009-02-25 13:31:46 +0900 (Wed, 25 Feb 2009) Log Message: ----------- updated docs Modified Paths: -------------- pal-portal/docs/ja/administration-guide/trunk/src/images/palportal_top.png pal-portal/docs/ja/administration-guide/trunk/src/images/port_add1.png pal-portal/docs/ja/administration-guide/trunk/src/images/port_add3.png pal-portal/docs/ja/administration-guide/trunk/src/images/port_add4.png pal-portal/docs/ja/administration-guide/trunk/src/images/port_add6.png pal-portal/docs/ja/administration-guide/trunk/src/images/port_mng0.png pal-portal/docs/ja/administration-guide/trunk/src/images/port_mng1.png pal-portal/docs/ja/administration-guide/trunk/src/images/port_mng10.png pal-portal/docs/ja/administration-guide/trunk/src/images/port_mng12.png pal-portal/docs/ja/administration-guide/trunk/src/images/port_mng2.png pal-portal/docs/ja/administration-guide/trunk/src/images/site_page1.png pal-portal/docs/ja/administration-guide/trunk/src/images/site_page2.png pal-portal/docs/ja/administration-guide/trunk/src/images/site_user1.png pal-portal/docs/ja/administration-guide/trunk/src/images/site_user2.png pal-portal/docs/ja/administration-guide/trunk/src/images/site_user3.png pal-portal/docs/ja/administration-guide/trunk/src/images/site_user4.png pal-portal/docs/ja/administration-guide/trunk/src/images/site_user5.png pal-portal/docs/ja/administration-guide/trunk/src/images/site_user6.png pal-portal/docs/ja/administration-guide/trunk/src/images/site_vhost1.png pal-portal/docs/ja/administration-guide/trunk/src/images/siteeditor_changelayout1.png pal-portal/docs/ja/administration-guide/trunk/src/images/siteeditor_changelayout2.png pal-portal/docs/ja/administration-guide/trunk/src/images/siteeditor_changelayout3.png pal-portal/docs/ja/administration-guide/trunk/src/images/siteeditor_changelayout4.png pal-portal/docs/ja/administration-guide/trunk/src/images/siteeditor_changelayout5.png pal-portal/docs/ja/administration-guide/trunk/src/images/wcm_edit1.png pal-portal/docs/ja/administration-guide/trunk/src/images/wcm_edit2.png pal-portal/docs/ja/administration-guide/trunk/src/tex/portlet-management/deploy-portlet.tex pal-portal/docs/ja/administration-guide/trunk/src/tex/portlet-management/deploy-remote-portlet.tex pal-portal/docs/ja/administration-guide/trunk/src/tex/portlet-management/manage-portlet.tex pal-portal/docs/ja/administration-guide/trunk/src/tex/site/site-user.tex pal-portal/docs/ja/administration-guide/trunk/src/tex/site-editor/add-portlet.tex pal-portal/docs/ja/administration-guide/trunk/src/tex/site-editor/change-layout.tex pal-portal/docs/ja/administration-guide/trunk/src/tex/wcm/edit.tex pal-portal/docs/ja/administration-guide/trunk/src/tex/wcm/view.tex Added Paths: ----------- pal-portal/docs/ja/administration-guide/trunk/src/images/port_add__1.png pal-portal/docs/ja/administration-guide/trunk/src/images/port_add__2.png -------------- next part -------------- Modified: pal-portal/docs/ja/administration-guide/trunk/src/images/palportal_top.png =================================================================== (Binary files differ) Modified: pal-portal/docs/ja/administration-guide/trunk/src/images/port_add1.png =================================================================== (Binary files differ) Modified: pal-portal/docs/ja/administration-guide/trunk/src/images/port_add3.png =================================================================== (Binary files differ) Modified: pal-portal/docs/ja/administration-guide/trunk/src/images/port_add4.png =================================================================== (Binary files differ) Modified: pal-portal/docs/ja/administration-guide/trunk/src/images/port_add6.png =================================================================== (Binary files differ) Added: pal-portal/docs/ja/administration-guide/trunk/src/images/port_add__1.png =================================================================== (Binary files differ) Property changes on: pal-portal/docs/ja/administration-guide/trunk/src/images/port_add__1.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: pal-portal/docs/ja/administration-guide/trunk/src/images/port_add__2.png =================================================================== (Binary files differ) Property changes on: pal-portal/docs/ja/administration-guide/trunk/src/images/port_add__2.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: pal-portal/docs/ja/administration-guide/trunk/src/images/port_mng0.png =================================================================== (Binary files differ) Modified: pal-portal/docs/ja/administration-guide/trunk/src/images/port_mng1.png =================================================================== (Binary files differ) Modified: pal-portal/docs/ja/administration-guide/trunk/src/images/port_mng10.png =================================================================== (Binary files differ) Modified: pal-portal/docs/ja/administration-guide/trunk/src/images/port_mng12.png =================================================================== (Binary files differ) Modified: pal-portal/docs/ja/administration-guide/trunk/src/images/port_mng2.png =================================================================== (Binary files differ) Modified: pal-portal/docs/ja/administration-guide/trunk/src/images/site_page1.png =================================================================== (Binary files differ) Modified: pal-portal/docs/ja/administration-guide/trunk/src/images/site_page2.png =================================================================== (Binary files differ) Modified: pal-portal/docs/ja/administration-guide/trunk/src/images/site_user1.png =================================================================== (Binary files differ) Modified: pal-portal/docs/ja/administration-guide/trunk/src/images/site_user2.png =================================================================== (Binary files differ) Modified: pal-portal/docs/ja/administration-guide/trunk/src/images/site_user3.png =================================================================== (Binary files differ) Modified: pal-portal/docs/ja/administration-guide/trunk/src/images/site_user4.png =================================================================== (Binary files differ) Modified: pal-portal/docs/ja/administration-guide/trunk/src/images/site_user5.png =================================================================== (Binary files differ) Modified: pal-portal/docs/ja/administration-guide/trunk/src/images/site_user6.png =================================================================== (Binary files differ) Modified: pal-portal/docs/ja/administration-guide/trunk/src/images/site_vhost1.png =================================================================== (Binary files differ) Modified: pal-portal/docs/ja/administration-guide/trunk/src/images/siteeditor_changelayout1.png =================================================================== (Binary files differ) Modified: pal-portal/docs/ja/administration-guide/trunk/src/images/siteeditor_changelayout2.png =================================================================== (Binary files differ) Modified: pal-portal/docs/ja/administration-guide/trunk/src/images/siteeditor_changelayout3.png =================================================================== (Binary files differ) Modified: pal-portal/docs/ja/administration-guide/trunk/src/images/siteeditor_changelayout4.png =================================================================== (Binary files differ) Modified: pal-portal/docs/ja/administration-guide/trunk/src/images/siteeditor_changelayout5.png =================================================================== (Binary files differ) Modified: pal-portal/docs/ja/administration-guide/trunk/src/images/wcm_edit1.png =================================================================== (Binary files differ) Modified: pal-portal/docs/ja/administration-guide/trunk/src/images/wcm_edit2.png =================================================================== (Binary files differ) Modified: pal-portal/docs/ja/administration-guide/trunk/src/tex/portlet-management/deploy-portlet.tex =================================================================== --- pal-portal/docs/ja/administration-guide/trunk/src/tex/portlet-management/deploy-portlet.tex 2009-02-15 12:18:28 UTC (rev 1780) +++ pal-portal/docs/ja/administration-guide/trunk/src/tex/portlet-management/deploy-portlet.tex 2009-02-25 04:31:46 UTC (rev 1781) @@ -26,7 +26,7 @@ \subsection{ポートレットの配備手順} - ポートレット管理ツールの「デプロイヤー」機能により行います。 + ポートレット管理ツールの「配備」機能により行います。 \subsection{ポートレットアプリケーションファイルの準備} @@ -37,12 +37,12 @@ \subsection{ポートレットアプリケーションの選択} ポータル管理者は、公開するポートレットのアプリケーションを「ポートレット管理」から配備することが可能です。 - 「ポートレット管理」の「デプロイヤー」タブを選択してください。 + 「ポートレット管理」の「配備」タブを選択してください。 \begin{figure}[ht] \begin{center} -\includegraphics[width=120mm]{images/port_mng0.eps} -\caption{「デプロイヤー」タブを選択} +\includegraphics[width=60mm]{images/port_mng0.eps} +\caption{「配備」タブを選択} \label{fig:port_mng0_} \end{center} \end{figure} @@ -52,7 +52,7 @@ \begin{figure}[ht] \begin{center} -\includegraphics[width=120mm]{images/port_mng1.eps} +\includegraphics[width=90mm]{images/port_mng1.eps} \caption{ポートレットアプリケーションの配備} \label{fig:port_mng1} \end{center} Modified: pal-portal/docs/ja/administration-guide/trunk/src/tex/portlet-management/deploy-remote-portlet.tex =================================================================== --- pal-portal/docs/ja/administration-guide/trunk/src/tex/portlet-management/deploy-remote-portlet.tex 2009-02-15 12:18:28 UTC (rev 1780) +++ pal-portal/docs/ja/administration-guide/trunk/src/tex/portlet-management/deploy-remote-portlet.tex 2009-02-25 04:31:46 UTC (rev 1781) @@ -32,12 +32,12 @@ \subsection{ポートレットアプリケーションの選択} ポータル管理者は、公開するポートレットのアプリケーションを「ポートレット管理」から配備することが可能です。 - 「ポートレット管理」の「デプロイヤー」タブを選択してください。 + 「ポートレット管理」の「配備」タブを選択してください。 \begin{figure}[htb] \begin{center} -\includegraphics[width=120mm]{images/port_mng0.eps} -\caption{「デプロイヤー」タブを選択} +\includegraphics[width=60mm]{images/port_mng0.eps} +\caption{「配備」タブを選択} \label{fig:port_mng0} \end{center} \end{figure} @@ -52,7 +52,7 @@ \begin{figure}[htb] \begin{center} -\includegraphics[width=120mm]{images/port_mng2.eps} +\includegraphics[width=110mm]{images/port_mng2.eps} \caption{配備可能なリモートリポジトリのポートレット一覧} \label{fig:port_mng2} \end{center} @@ -64,7 +64,7 @@ \begin{figure}[ht] \begin{center} -\includegraphics[width=120mm]{images/port_mng10.eps} +\includegraphics[width=60mm]{images/port_mng10.eps} \caption{「配備」ボタンを押下で配備完了} \label{fig:port_mng10} \end{center} Modified: pal-portal/docs/ja/administration-guide/trunk/src/tex/portlet-management/manage-portlet.tex =================================================================== --- pal-portal/docs/ja/administration-guide/trunk/src/tex/portlet-management/manage-portlet.tex 2009-02-15 12:18:28 UTC (rev 1780) +++ pal-portal/docs/ja/administration-guide/trunk/src/tex/portlet-management/manage-portlet.tex 2009-02-25 04:31:46 UTC (rev 1781) @@ -36,7 +36,7 @@ \begin{figure}[ht] \begin{center} -\includegraphics[width=120mm]{images/port_mng12.eps} +\includegraphics[width=100mm]{images/port_mng12.eps} \caption{ポートレット一覧} \label{fig:port_mng12} \end{center} Modified: pal-portal/docs/ja/administration-guide/trunk/src/tex/site/site-user.tex =================================================================== --- pal-portal/docs/ja/administration-guide/trunk/src/tex/site/site-user.tex 2009-02-15 12:18:28 UTC (rev 1780) +++ pal-portal/docs/ja/administration-guide/trunk/src/tex/site/site-user.tex 2009-02-25 04:31:46 UTC (rev 1781) @@ -39,7 +39,7 @@ \begin{figure}[!htb] \begin{center} -\includegraphics[width=100mm]{images/site_user1.eps} +\includegraphics[width=90mm]{images/site_user1.eps} \caption{ユーザー管理画面} \label{fig:site_user1} \end{center} @@ -50,7 +50,7 @@ \begin{figure}[!htb] \begin{center} -\includegraphics[width=90mm]{images/site_user2.eps} +\includegraphics[width=80mm]{images/site_user2.eps} \caption{ユーザーの新規作成} \label{fig:site_user2} \end{center} @@ -64,7 +64,7 @@ \begin{figure}[!htb] \begin{center} -\includegraphics[width=100mm]{images/site_user3.eps} +\includegraphics[width=85mm]{images/site_user3.eps} \caption{ユーザーの登録} \label{fig:site_user3} \end{center} @@ -81,7 +81,7 @@ \begin{figure}[!htb] \begin{center} -\includegraphics[width=100mm]{images/site_user4.eps} +\includegraphics[width=90mm]{images/site_user4.eps} \caption{対象ユーザーの編集画面} \label{fig:site_user4} \end{center} @@ -103,7 +103,7 @@ \begin{figure}[!htb] \begin{center} -\includegraphics[width=100mm]{images/site_user6.eps} +\includegraphics[width=90mm]{images/site_user6.eps} \caption{siteadminロールの追加} \label{fig:site_user6} \end{center} @@ -113,6 +113,3 @@ 「ロール」リストに「siteadmin」が追加されます。 「siteadmin」ロールを持つユーザーは、/\_\_subsite-root 以下のコンテンツを編集することができます。 - - - Modified: pal-portal/docs/ja/administration-guide/trunk/src/tex/site-editor/add-portlet.tex =================================================================== --- pal-portal/docs/ja/administration-guide/trunk/src/tex/site-editor/add-portlet.tex 2009-02-15 12:18:28 UTC (rev 1780) +++ pal-portal/docs/ja/administration-guide/trunk/src/tex/site-editor/add-portlet.tex 2009-02-25 04:31:46 UTC (rev 1781) @@ -21,18 +21,40 @@ +\subsection{「コンテンツを追加」から選択する場合} +ログイン後、編集可能なページで「コンテンツを追加」をクリック後、プルダウンメニューから +配置可能なポートレットを選択することができます(図\ref{fig:port_add__1})。 +\begin{figure}[ht] +\begin{center} +\includegraphics[width=90mm]{images/port_add__1.eps} +\caption{「コンテンツを追加」リンクをクリック後、ポートレットを選択} +\label{fig:port_add__1} +\end{center} +\end{figure} -\subsection{ポートレット追加手順} - サイトエディターの「ページ管理」機能を利用することで、PALポータルのユーザーごとに、自由にポートレットをページに配置することができます。 +\begin{figure}[ht] +\begin{center} +\includegraphics[width=120mm]{images/port_add__2.eps} +\caption{「パスワードの再発行」ポートレットを追加した例} +\label{fig:port_add__2} +\end{center} +\end{figure} -\subsection{サイトエディターの表示} +\subsection{サイトエディターの「ページ管理」機能を利用する場合} - ログイン後、編集可能なページで「ページを編集」リンクを選択し、サイトエディターを表示します(図\ref{fig:port_add1})。 +\subsubsection{ポートレット追加手順} + +サイトエディターの「ページ管理」機能を利用することで、PALポータルのユーザーごとに、自由にポートレットをページに配置することができます。 + +\subsubsection{サイトエディターの表示} + +ログイン後、編集可能なページで「ページを編集」リンクを選択し、サイトエディターを表示します(図\ref{fig:port_add1})。 + \begin{figure}[ht] \begin{center} \includegraphics[width=120mm]{images/port_add1.eps} @@ -42,10 +64,10 @@ \end{figure} -\subsection{ポートレット追加するレイアウトを選択} +\subsubsection{ポートレット追加するレイアウトを選択} - 「サイトエディター」画面の左側のツリー表示部分から、ポートレットを追加したいページを選択して、レイアウトを選択します(図\ref{fig:port_add1})。 - ここでは「2 列レイアウト(50/50)」を選択します(図\ref{fig:port_add3})。 +「サイトエディター」画面の左側のツリー表示部分から、ポートレットを追加したいページを選択して、レイアウトを選択します(図\ref{fig:port_add1})。 +ここでは「2 列レイアウト(50/50)」を選択します(図\ref{fig:port_add3})。 \begin{figure}[ht] \begin{center} @@ -56,7 +78,7 @@ \end{figure} -\subsection{追加するポートレットの選択} +\subsubsection{追加するポートレットの選択} 「追加」タブを選択します。 @@ -76,7 +98,7 @@ 追加処理を完了するには、右上にある「完了」を選択してください。 -\subsection{ポートレットの追加完了} +\subsubsection{ポートレットの追加完了} 画面には、追加したポートレットが表示されます。 (図\ref{fig:port_add6}は「ユーザー登録」ポートレットを追加した例) @@ -89,6 +111,3 @@ \end{center} \end{figure} - - - Modified: pal-portal/docs/ja/administration-guide/trunk/src/tex/site-editor/change-layout.tex =================================================================== --- pal-portal/docs/ja/administration-guide/trunk/src/tex/site-editor/change-layout.tex 2009-02-15 12:18:28 UTC (rev 1780) +++ pal-portal/docs/ja/administration-guide/trunk/src/tex/site-editor/change-layout.tex 2009-02-25 04:31:46 UTC (rev 1781) @@ -57,7 +57,7 @@ ページ内に含まれている変更したいレイアウトを選択します。 - ここでは、「VelocityOneColumn」を選択します(図\ref{fig:siteeditor_changelayout3})。 + ここでは、「一列レイアウト」を選択します(図\ref{fig:siteeditor_changelayout3})。 \begin{figure}[htb] \begin{center} Modified: pal-portal/docs/ja/administration-guide/trunk/src/tex/wcm/edit.tex =================================================================== --- pal-portal/docs/ja/administration-guide/trunk/src/tex/wcm/edit.tex 2009-02-15 12:18:28 UTC (rev 1780) +++ pal-portal/docs/ja/administration-guide/trunk/src/tex/wcm/edit.tex 2009-02-25 04:31:46 UTC (rev 1781) @@ -34,7 +34,7 @@ \begin{figure}[htb] \begin{center} -\includegraphics[width=120mm]{images/wcm_edit1.eps} +\includegraphics[width=70mm]{images/wcm_edit1.eps} \caption{編集対象のコンテンツ} \label{fig:wcm_edit1} \end{center} @@ -47,7 +47,7 @@ \begin{figure}[htb] \begin{center} -\includegraphics[width=90mm]{images/wcm_edit2.eps} +\includegraphics[width=70mm]{images/wcm_edit2.eps} \caption{「内容を編集する」ボタンをクリック} \label{fig:wcm_edit2} \end{center} Modified: pal-portal/docs/ja/administration-guide/trunk/src/tex/wcm/view.tex =================================================================== --- pal-portal/docs/ja/administration-guide/trunk/src/tex/wcm/view.tex 2009-02-15 12:18:28 UTC (rev 1780) +++ pal-portal/docs/ja/administration-guide/trunk/src/tex/wcm/view.tex 2009-02-25 04:31:46 UTC (rev 1781) @@ -43,8 +43,10 @@ 「コンテンツ」プルダウンボックスから WCM ビューアーを選択して、「追加」ボタンをクリックします。 - WCM ビューアーがページ上に表示されます(図\ref{fig:wcm_view1})。 + WCM ビューアーがページ上に表示されます。 +\if0 + \begin{figure}[ht] \begin{center} \includegraphics[width=120mm]{images/wcm_view2.eps} @@ -53,6 +55,7 @@ \end{center} \end{figure} +\fi 表示するコンテンツを編集するためには、次節の「コンテンツの編集」を参照してください。 From svnnotify ＠ sourceforge.jp Wed Feb 25 15:31:18 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Wed, 25 Feb 2009 15:31:18 +0900 Subject: [pal-cvs 4047] [1782] applied patch 'r726026: Fixing export jetspeed Object issue' Message-ID: <1235543478.532633.18787.nullmailer@users.sourceforge.jp> Revision: 1782 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1782 Author: sone Date: 2009-02-25 15:31:18 +0900 (Wed, 25 Feb 2009) Log Message: ----------- applied patch 'r726026: Fixing export jetspeed Object issue' Modified Paths: -------------- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/ExportObject.java -------------- next part -------------- Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/ExportObject.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/ExportObject.java 2009-02-25 04:31:46 UTC (rev 1781) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/ExportObject.java 2009-02-25 06:31:18 UTC (rev 1782) @@ -78,7 +78,7 @@ { boolean success = true; String status = "success"; - String userName = requestContext.getUserPrincipal().toString(); + String userName = requestContext.getUserPrincipal().getName(); try { resultMap.put(ACTION, "export"); From svnnotify ＠ sourceforge.jp Wed Feb 25 22:25:16 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Wed, 25 Feb 2009 22:25:16 +0900 Subject: [pal-cvs 4048] [1783] version 1.1.2-dev. Message-ID: <1235568316.466074.21787.nullmailer@users.sourceforge.jp> Revision: 1783 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1783 Author: shinsuke Date: 2009-02-25 22:25:16 +0900 (Wed, 25 Feb 2009) Log Message: ----------- version 1.1.2-dev. Modified Paths: -------------- pal-portal/branches/pal-portal-1.x/build.properties -------------- next part -------------- Modified: pal-portal/branches/pal-portal-1.x/build.properties =================================================================== --- pal-portal/branches/pal-portal-1.x/build.properties 2009-02-25 06:31:18 UTC (rev 1782) +++ pal-portal/branches/pal-portal-1.x/build.properties 2009-02-25 13:25:16 UTC (rev 1783) @@ -4,7 +4,7 @@ container.name=PAL Portal container.separator=/ container.version.major=1 -container.version.minor=1.1 +container.version.minor=1.2-dev container.info.file=commons/src/java/org/apache/jetspeed/container/resources/ContainerInfo.properties override.prop.file=src/webapp/WEB-INF/conf/override.properties portlets.home=${basedir}/portlets From svnnotify ＠ sourceforge.jp Wed Feb 25 22:40:55 2009 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Wed, 25 Feb 2009 22:40:55 +0900 Subject: [pal-cvs 4049] [1784] removed http://maven.marevol.com/ Message-ID: <1235569255.716372.15556.nullmailer@users.sourceforge.jp> Revision: 1784 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1784 Author: shinsuke Date: 2009-02-25 22:40:55 +0900 (Wed, 25 Feb 2009) Log Message: ----------- removed http://maven.marevol.com/ Modified Paths: -------------- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/project.properties -------------- next part -------------- Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/project.properties =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/project.properties 2009-02-25 13:25:16 UTC (rev 1783) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/project.properties 2009-02-25 13:40:55 UTC (rev 1784) @@ -52,7 +52,7 @@ derby.include=true maven.mode.online = true -maven.repo.remote = http://www.bluesunrise.com/maven/, http://mirrors.ibiblio.org/pub/mirrors/maven/, http://dist.codehaus.org/, http://people.apache.org/repository/, http://maven.marevol.com/ +maven.repo.remote = http://www.bluesunrise.com/maven/, http://mirrors.ibiblio.org/pub/mirrors/maven/, http://dist.codehaus.org/, http://people.apache.org/repository/ # xdocs themes maven.xdoc.theme = j2