From svnnotify @ sourceforge.jp Tue Feb 5 12:17:11 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Tue, 05 Feb 2008 12:17:11 +0900 Subject: [pal-cvs 3057] [802] jboss as support. Message-ID: <1202181431.659423.26545.nullmailer@users.sourceforge.jp> Revision: 802 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=802 Author: shinsuke Date: 2008-02-05 12:17:10 +0900 (Tue, 05 Feb 2008) Log Message: ----------- jboss as support. Modified Paths: -------------- pal-admin/trunk/src/main/webapp/WEB-INF/web.xml pal-admin/trunk/src/main/webapp/view/deployer/remotePortletList.html pal-admin/trunk/src/main/webapp/view/deployer/remoteRepositoryList.html pal-admin/trunk/src/main/webapp/view/group/groupList.html pal-admin/trunk/src/main/webapp/view/permission/folderPermissionList.html pal-admin/trunk/src/main/webapp/view/permission/pagePermissionList.html pal-admin/trunk/src/main/webapp/view/permission/portletPermissionList.html pal-admin/trunk/src/main/webapp/view/portletmanager/portletList.html pal-admin/trunk/src/main/webapp/view/profiler/ruleList.html pal-admin/trunk/src/main/webapp/view/role/roleList.html pal-admin/trunk/src/main/webapp/view/securityconstraint/globalSecurityConstraintList.html pal-admin/trunk/src/main/webapp/view/securityconstraint/securityDefinitionList.html pal-admin/trunk/src/main/webapp/view/site/folderAddFolderAndPageEditor.html pal-admin/trunk/src/main/webapp/view/site/folderInfoEditor.html pal-admin/trunk/src/main/webapp/view/site/folderMetadataEditor.html pal-admin/trunk/src/main/webapp/view/site/folderOrderEditor.html pal-admin/trunk/src/main/webapp/view/site/folderSecurityEditor.html pal-admin/trunk/src/main/webapp/view/site/layoutAddPortletEditor.html pal-admin/trunk/src/main/webapp/view/site/layoutInfoEditor.html pal-admin/trunk/src/main/webapp/view/site/layoutPreferenceEditor.html pal-admin/trunk/src/main/webapp/view/site/layoutPropertyEditor.html pal-admin/trunk/src/main/webapp/view/site/pageInfoEditor.html pal-admin/trunk/src/main/webapp/view/site/pageMetadataEditor.html pal-admin/trunk/src/main/webapp/view/site/pageSecurityEditor.html pal-admin/trunk/src/main/webapp/view/site/portletInfoEditor.html pal-admin/trunk/src/main/webapp/view/site/portletPreferenceEditor.html pal-admin/trunk/src/main/webapp/view/site/portletPropertyEditor.html pal-admin/trunk/src/main/webapp/view/user/userAttributeConfirm.html pal-admin/trunk/src/main/webapp/view/user/userAttributeEdit.html pal-admin/trunk/src/main/webapp/view/user/userAttributeList.html pal-admin/trunk/src/main/webapp/view/user/userEdit.html pal-admin/trunk/src/main/webapp/view/user/userGroupEdit.html pal-admin/trunk/src/main/webapp/view/user/userList.html pal-admin/trunk/src/main/webapp/view/user/userProfilingRuleEdit.html pal-admin/trunk/src/main/webapp/view/user/userRoleEdit.html Removed Paths: ------------- pal-admin/trunk/src/main/resources/META-INF/ -------------- next part -------------- Modified: pal-admin/trunk/src/main/webapp/WEB-INF/web.xml =================================================================== --- pal-admin/trunk/src/main/webapp/WEB-INF/web.xml 2008-01-28 21:55:49 UTC (rev 801) +++ pal-admin/trunk/src/main/webapp/WEB-INF/web.xml 2008-02-05 03:17:10 UTC (rev 802) @@ -16,6 +16,10 @@ --> + + org.jboss.jbossfaces.WAR_BUNDLES_JSF_IMPL + true +
| - New + New
@@ -72,8 +72,8 @@ roles - Edit - Delete + Edit + Delete Modified: pal-admin/trunk/src/main/webapp/view/permission/pagePermissionList.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/permission/pagePermissionList.html 2008-01-28 21:55:49 UTC (rev 801) +++ pal-admin/trunk/src/main/webapp/view/permission/pagePermissionList.html 2008-02-05 03:17:10 UTC (rev 802) @@ -20,7 +20,7 @@
| - New + New
@@ -72,8 +72,8 @@ roles - Edit - Delete + Edit + Delete Modified: pal-admin/trunk/src/main/webapp/view/permission/portletPermissionList.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/permission/portletPermissionList.html 2008-01-28 21:55:49 UTC (rev 801) +++ pal-admin/trunk/src/main/webapp/view/permission/portletPermissionList.html 2008-02-05 03:17:10 UTC (rev 802) @@ -20,7 +20,7 @@
| - New + New
@@ -72,8 +72,8 @@ roles - Edit - Delete + Edit + Delete Modified: pal-admin/trunk/src/main/webapp/view/portletmanager/portletList.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/portletmanager/portletList.html 2008-01-28 21:55:49 UTC (rev 801) +++ pal-admin/trunk/src/main/webapp/view/portletmanager/portletList.html 2008-02-05 03:17:10 UTC (rev 802) @@ -76,25 +76,25 @@
- Start + Start
- Stop + Stop
Modified: pal-admin/trunk/src/main/webapp/view/profiler/ruleList.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/profiler/ruleList.html 2008-01-28 21:55:49 UTC (rev 801) +++ pal-admin/trunk/src/main/webapp/view/profiler/ruleList.html 2008-02-05 03:17:10 UTC (rev 802) @@ -9,7 +9,7 @@
| - New + New
@@ -49,9 +49,9 @@ user - Edit - Edit - Delete + Edit + Edit + Delete Modified: pal-admin/trunk/src/main/webapp/view/role/roleList.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/role/roleList.html 2008-01-28 21:55:49 UTC (rev 801) +++ pal-admin/trunk/src/main/webapp/view/role/roleList.html 2008-02-05 03:17:10 UTC (rev 802) @@ -21,7 +21,7 @@
| - New + New
@@ -58,7 +58,7 @@ role - Delete + Delete Modified: pal-admin/trunk/src/main/webapp/view/securityconstraint/globalSecurityConstraintList.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/securityconstraint/globalSecurityConstraintList.html 2008-01-28 21:55:49 UTC (rev 801) +++ pal-admin/trunk/src/main/webapp/view/securityconstraint/globalSecurityConstraintList.html 2008-02-05 03:17:10 UTC (rev 802) @@ -17,7 +17,7 @@
| - New + New
@@ -57,7 +57,7 @@ user - Delete + Delete Modified: pal-admin/trunk/src/main/webapp/view/securityconstraint/securityDefinitionList.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/securityconstraint/securityDefinitionList.html 2008-01-28 21:55:49 UTC (rev 801) +++ pal-admin/trunk/src/main/webapp/view/securityconstraint/securityDefinitionList.html 2008-02-05 03:17:10 UTC (rev 802) @@ -17,7 +17,7 @@
| - New + New
@@ -57,8 +57,8 @@ user - Edit - Delete + Edit + Delete Modified: pal-admin/trunk/src/main/webapp/view/site/folderAddFolderAndPageEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/folderAddFolderAndPageEditor.html 2008-01-28 21:55:49 UTC (rev 801) +++ pal-admin/trunk/src/main/webapp/view/site/folderAddFolderAndPageEditor.html 2008-02-05 03:17:10 UTC (rev 802) @@ -13,13 +13,13 @@
- + Name @@ -39,17 +39,17 @@
Modified: pal-admin/trunk/src/main/webapp/view/site/folderInfoEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/folderInfoEditor.html 2008-01-28 21:55:49 UTC (rev 801) +++ pal-admin/trunk/src/main/webapp/view/site/folderInfoEditor.html 2008-02-05 03:17:10 UTC (rev 802) @@ -13,13 +13,13 @@
- + Name @@ -40,16 +40,16 @@
Modified: pal-admin/trunk/src/main/webapp/view/site/folderMetadataEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/folderMetadataEditor.html 2008-01-28 21:55:49 UTC (rev 801) +++ pal-admin/trunk/src/main/webapp/view/site/folderMetadataEditor.html 2008-02-05 03:17:10 UTC (rev 802) @@ -13,13 +13,13 @@
- + Name @@ -39,17 +39,17 @@
@@ -73,7 +73,7 @@ V Modified: pal-admin/trunk/src/main/webapp/view/site/folderOrderEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/folderOrderEditor.html 2008-01-28 21:55:49 UTC (rev 801) +++ pal-admin/trunk/src/main/webapp/view/site/folderOrderEditor.html 2008-02-05 03:17:10 UTC (rev 802) @@ -13,13 +13,13 @@
- + Name @@ -43,17 +43,17 @@
Modified: pal-admin/trunk/src/main/webapp/view/site/folderSecurityEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/folderSecurityEditor.html 2008-01-28 21:55:49 UTC (rev 801) +++ pal-admin/trunk/src/main/webapp/view/site/folderSecurityEditor.html 2008-02-05 03:17:10 UTC (rev 802) @@ -13,13 +13,13 @@
- + Name @@ -39,16 +39,16 @@
- + Info - + Add - + Order - + Metadata @@ -73,7 +73,7 @@ Type Modified: pal-admin/trunk/src/main/webapp/view/site/layoutAddPortletEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/layoutAddPortletEditor.html 2008-01-28 21:55:49 UTC (rev 801) +++ pal-admin/trunk/src/main/webapp/view/site/layoutAddPortletEditor.html 2008-02-05 03:17:10 UTC (rev 802) @@ -13,25 +13,25 @@
Modified: pal-admin/trunk/src/main/webapp/view/site/layoutInfoEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/layoutInfoEditor.html 2008-01-28 21:55:49 UTC (rev 801) +++ pal-admin/trunk/src/main/webapp/view/site/layoutInfoEditor.html 2008-02-05 03:17:10 UTC (rev 802) @@ -13,25 +13,25 @@
- + Name @@ -52,13 +52,13 @@
Modified: pal-admin/trunk/src/main/webapp/view/site/layoutPreferenceEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/layoutPreferenceEditor.html 2008-01-28 21:55:49 UTC (rev 801) +++ pal-admin/trunk/src/main/webapp/view/site/layoutPreferenceEditor.html 2008-02-05 03:17:10 UTC (rev 802) @@ -13,25 +13,25 @@
- + Information - + Add - + Property @@ -80,7 +80,7 @@ V Modified: pal-admin/trunk/src/main/webapp/view/site/layoutPropertyEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/layoutPropertyEditor.html 2008-01-28 21:55:49 UTC (rev 801) +++ pal-admin/trunk/src/main/webapp/view/site/layoutPropertyEditor.html 2008-02-05 03:17:10 UTC (rev 802) @@ -13,25 +13,25 @@
@@ -80,7 +80,7 @@ V Modified: pal-admin/trunk/src/main/webapp/view/site/pageInfoEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/pageInfoEditor.html 2008-01-28 21:55:49 UTC (rev 801) +++ pal-admin/trunk/src/main/webapp/view/site/pageInfoEditor.html 2008-02-05 03:17:10 UTC (rev 802) @@ -13,25 +13,25 @@
- + Name @@ -52,10 +52,10 @@
Modified: pal-admin/trunk/src/main/webapp/view/site/pageMetadataEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/pageMetadataEditor.html 2008-01-28 21:55:49 UTC (rev 801) +++ pal-admin/trunk/src/main/webapp/view/site/pageMetadataEditor.html 2008-02-05 03:17:10 UTC (rev 802) @@ -13,25 +13,25 @@
@@ -79,7 +79,7 @@ V Modified: pal-admin/trunk/src/main/webapp/view/site/pageSecurityEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/pageSecurityEditor.html 2008-01-28 21:55:49 UTC (rev 801) +++ pal-admin/trunk/src/main/webapp/view/site/pageSecurityEditor.html 2008-02-05 03:17:10 UTC (rev 802) @@ -13,25 +13,25 @@
- + Info - + Metadata @@ -79,7 +79,7 @@ Type Modified: pal-admin/trunk/src/main/webapp/view/site/portletInfoEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/portletInfoEditor.html 2008-01-28 21:55:49 UTC (rev 801) +++ pal-admin/trunk/src/main/webapp/view/site/portletInfoEditor.html 2008-02-05 03:17:10 UTC (rev 802) @@ -13,25 +13,25 @@
- + Name @@ -52,10 +52,10 @@
Modified: pal-admin/trunk/src/main/webapp/view/site/portletPreferenceEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/portletPreferenceEditor.html 2008-01-28 21:55:49 UTC (rev 801) +++ pal-admin/trunk/src/main/webapp/view/site/portletPreferenceEditor.html 2008-02-05 03:17:10 UTC (rev 802) @@ -13,25 +13,25 @@
- + Information - + Property @@ -77,7 +77,7 @@ V Modified: pal-admin/trunk/src/main/webapp/view/site/portletPropertyEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/portletPropertyEditor.html 2008-01-28 21:55:49 UTC (rev 801) +++ pal-admin/trunk/src/main/webapp/view/site/portletPropertyEditor.html 2008-02-05 03:17:10 UTC (rev 802) @@ -13,25 +13,25 @@
@@ -77,7 +77,7 @@ V Modified: pal-admin/trunk/src/main/webapp/view/user/userAttributeConfirm.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userAttributeConfirm.html 2008-01-28 21:55:49 UTC (rev 801) +++ pal-admin/trunk/src/main/webapp/view/user/userAttributeConfirm.html 2008-02-05 03:17:10 UTC (rev 802) @@ -35,21 +35,21 @@
Modified: pal-admin/trunk/src/main/webapp/view/user/userAttributeEdit.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userAttributeEdit.html 2008-01-28 21:55:49 UTC (rev 801) +++ pal-admin/trunk/src/main/webapp/view/user/userAttributeEdit.html 2008-02-05 03:17:10 UTC (rev 802) @@ -35,21 +35,21 @@
Modified: pal-admin/trunk/src/main/webapp/view/user/userAttributeList.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userAttributeList.html 2008-01-28 21:55:49 UTC (rev 801) +++ pal-admin/trunk/src/main/webapp/view/user/userAttributeList.html 2008-02-05 03:17:10 UTC (rev 802) @@ -35,21 +35,21 @@
@@ -66,9 +66,9 @@
@@ -85,17 +85,17 @@ key value - Edit - Delete + Edit + Delete
Modified: pal-admin/trunk/src/main/webapp/view/user/userEdit.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userEdit.html 2008-01-28 21:55:49 UTC (rev 801) +++ pal-admin/trunk/src/main/webapp/view/user/userEdit.html 2008-02-05 03:17:10 UTC (rev 802) @@ -37,19 +37,19 @@ Modified: pal-admin/trunk/src/main/webapp/view/user/userGroupEdit.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userGroupEdit.html 2008-01-28 21:55:49 UTC (rev 801) +++ pal-admin/trunk/src/main/webapp/view/user/userGroupEdit.html 2008-02-05 03:17:10 UTC (rev 802) @@ -35,21 +35,21 @@
Modified: pal-admin/trunk/src/main/webapp/view/user/userList.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userList.html 2008-01-28 21:55:49 UTC (rev 801) +++ pal-admin/trunk/src/main/webapp/view/user/userList.html 2008-02-05 03:17:10 UTC (rev 802) @@ -21,7 +21,7 @@
| - New + New
@@ -72,8 +72,8 @@ expires lastLogon - Edit - Delete + Edit + Delete Modified: pal-admin/trunk/src/main/webapp/view/user/userProfilingRuleEdit.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userProfilingRuleEdit.html 2008-01-28 21:55:49 UTC (rev 801) +++ pal-admin/trunk/src/main/webapp/view/user/userProfilingRuleEdit.html 2008-02-05 03:17:10 UTC (rev 802) @@ -35,19 +35,19 @@
- + Basic | - + Role | - + Group | - + User Attribute | Modified: pal-admin/trunk/src/main/webapp/view/user/userRoleEdit.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userRoleEdit.html 2008-01-28 21:55:49 UTC (rev 801) +++ pal-admin/trunk/src/main/webapp/view/user/userRoleEdit.html 2008-02-05 03:17:10 UTC (rev 802) @@ -35,21 +35,21 @@
From tigercat @ users.sourceforge.jp Wed Feb 6 12:53:02 2008 From: tigercat @ users.sourceforge.jp (TigerCat) Date: Wed, 06 Feb 2008 12:53:02 +0900 Subject: [pal-cvs 3058] CVS-Update: blog/src/java/jp/sf/pal/blog committed by tigercat Message-ID: <1202269982.012257.407.nullmailer@users.sourceforge.jp> Update of /cvsroot/pal/blog/src/java/jp/sf/pal/blog In directory sf-cvs:/tmp/cvs-serv404/java/jp/sf/pal/blog Modified Files: BlogConstants.java Log Message: Changed to check the owner of the message that previous selected, to prevent showing message from the others blog in case there are two or more blogs in the portal. http://sourceforge.jp/tracker/index.php?func=detail&aid=10409&group_id=1972&atid=7332 blog/src/java/jp/sf/pal/blog/BlogConstants.java 1.16 -> 1.17 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/blog/src/java/jp/sf/pal/blog/BlogConstants.java.diff?r1=1.16&r2=1.17 =================================================================== RCS file: blog/src/java/jp/sf/pal/blog/BlogConstants.java,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- BlogConstants.java 2006/07/01 00:45:34 1.16 +++ BlogConstants.java 2008/02/06 03:53:01 1.17 @@ -1,5 +1,5 @@ /* - * Copyright 2005-2006 The Portal Application Laboratory Team. + * Copyright 2005-2008 The Portal Application Laboratory Team. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -51,6 +51,8 @@ public static final String BLOG_REDIRECT_ID = "blogid"; + public static final String BLOG_REDIRECT_OWNER = "blogowner"; + // for Portlet Messaging public static final String BLOG_ALL_TOPIC = "BLOG_ALL_TOPIC"; @@ -61,6 +63,8 @@ public static final String BLOG_MESSAGE_ID = "BLOG_MESSAGE_ID"; + public static final String BLOG_MESSAGING_TOKEN_SEPARATOR = "|"; + // View Mode public static final String BLOG_LIST_VIEW = "ListView"; From tigercat @ users.sourceforge.jp Wed Feb 6 12:53:02 2008 From: tigercat @ users.sourceforge.jp (TigerCat) Date: Wed, 06 Feb 2008 12:53:02 +0900 Subject: [pal-cvs 3059] CVS-Update: blog/src/java/jp/sf/pal/blog/bean committed by tigercat Message-ID: <1202269982.135427.418.nullmailer@users.sourceforge.jp> Update of /cvsroot/pal/blog/src/java/jp/sf/pal/blog/bean In directory sf-cvs:/tmp/cvs-serv404/java/jp/sf/pal/blog/bean Modified Files: BlogCommentTitleViewPageBean.java BlogEditPageBean.java BlogTitleViewPageBean.java BlogTrackbackTitleViewPageBean.java BlogViewPageBean.java Log Message: Changed to check the owner of the message that previous selected, to prevent showing message from the others blog in case there are two or more blogs in the portal. http://sourceforge.jp/tracker/index.php?func=detail&aid=10409&group_id=1972&atid=7332 blog/src/java/jp/sf/pal/blog/bean/BlogCommentTitleViewPageBean.java 1.2 -> 1.3 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/blog/src/java/jp/sf/pal/blog/bean/BlogCommentTitleViewPageBean.java.diff?r1=1.2&r2=1.3 blog/src/java/jp/sf/pal/blog/bean/BlogEditPageBean.java 1.14 -> 1.15 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/blog/src/java/jp/sf/pal/blog/bean/BlogEditPageBean.java.diff?r1=1.14&r2=1.15 blog/src/java/jp/sf/pal/blog/bean/BlogTitleViewPageBean.java 1.12 -> 1.13 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/blog/src/java/jp/sf/pal/blog/bean/BlogTitleViewPageBean.java.diff?r1=1.12&r2=1.13 blog/src/java/jp/sf/pal/blog/bean/BlogTrackbackTitleViewPageBean.java 1.2 -> 1.3 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/blog/src/java/jp/sf/pal/blog/bean/BlogTrackbackTitleViewPageBean.java.diff?r1=1.2&r2=1.3 blog/src/java/jp/sf/pal/blog/bean/BlogViewPageBean.java 1.15 -> 1.16 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/blog/src/java/jp/sf/pal/blog/bean/BlogViewPageBean.java.diff?r1=1.15&r2=1.16 =================================================================== RCS file: blog/src/java/jp/sf/pal/blog/bean/BlogCommentTitleViewPageBean.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- BlogCommentTitleViewPageBean.java 2006/03/24 22:10:05 1.2 +++ BlogCommentTitleViewPageBean.java 2008/02/06 03:53:02 1.3 @@ -1,5 +1,5 @@ /* - * Copyright 2005-2006 The Portal Application Laboratory Team. + * Copyright 2005-2008 The Portal Application Laboratory Team. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,6 +26,7 @@ import jp.sf.pal.blog.BlogConstants; import jp.sf.pal.blog.model.BlogComment; import jp.sf.pal.blog.util.BlogMessaging; +import jp.sf.pal.blog.util.BlogMessagingKeyToken; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -60,9 +61,12 @@ BlogComment blogMsg = (BlogComment) blogMap.get("0"); if (blogMsg != null) { + BlogMessagingKeyToken keyToken = new BlogMessagingKeyToken(); + keyToken.setPrefix(BlogConstants.BLOG_MESSAGE_ID); + keyToken.setOwner(getCommentTitleViewSession().getOwner()); try { - BlogMessaging.publishToAll(BlogConstants.BLOG_MESSAGE_ID, + BlogMessaging.publishToAll(keyToken.toString(), blogMsg.getBlogMessage().getId()); } catch (NotSerializableException e) =================================================================== RCS file: blog/src/java/jp/sf/pal/blog/bean/BlogEditPageBean.java,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- BlogEditPageBean.java 2006/07/01 00:45:34 1.14 +++ BlogEditPageBean.java 2008/02/06 03:53:02 1.15 @@ -1,5 +1,5 @@ /* - * Copyright 2005-2006 The Portal Application Laboratory Team. + * Copyright 2005-2008 The Portal Application Laboratory Team. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,10 +30,10 @@ import jp.sf.pal.blog.BlogConstants; import jp.sf.pal.blog.converter.Converter; -import jp.sf.pal.blog.importer.Importer; import jp.sf.pal.blog.model.BlogMessage; import jp.sf.pal.blog.util.BlogDaoUtil; import jp.sf.pal.blog.util.BlogMessaging; +import jp.sf.pal.blog.util.BlogMessagingKeyToken; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -67,10 +67,14 @@ public BlogEditPageBean() { Long id = null; + BlogMessagingKeyToken keyToken = new BlogMessagingKeyToken(); + keyToken.setPrefix(BlogConstants.BLOG_MESSAGE_ID); + ExternalContext externalContext = FacesContext.getCurrentInstance() + .getExternalContext(); + keyToken.setOwner(externalContext.getRemoteUser()); try { - id = (Long) BlogMessaging - .receiveForEdit(BlogConstants.BLOG_MESSAGE_ID); + id = (Long) BlogMessaging.receiveForEdit(keyToken.toString()); } catch (ClassCastException e) { @@ -219,7 +223,12 @@ { if (getId() != null) { - BlogMessaging.cancelForEdit(BlogConstants.BLOG_MESSAGE_ID); + BlogMessagingKeyToken keyToken = new BlogMessagingKeyToken(); + keyToken.setPrefix(BlogConstants.BLOG_MESSAGE_ID); + ExternalContext externalContext = FacesContext.getCurrentInstance() + .getExternalContext(); + keyToken.setOwner(externalContext.getRemoteUser()); + BlogMessaging.cancelForEdit(keyToken.toString()); // i18n FacesMessageUtil.addInfoMessage(PortletResourceBundleUtil .getString(LocaleUtil.getLocale(), =================================================================== RCS file: blog/src/java/jp/sf/pal/blog/bean/BlogTitleViewPageBean.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- BlogTitleViewPageBean.java 2006/03/24 22:10:05 1.12 +++ BlogTitleViewPageBean.java 2008/02/06 03:53:02 1.13 @@ -1,5 +1,5 @@ /* - * Copyright 2005-2006 The Portal Application Laboratory Team. + * Copyright 2005-2008 The Portal Application Laboratory Team. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,6 +26,7 @@ import jp.sf.pal.blog.BlogConstants; import jp.sf.pal.blog.model.BlogMessage; import jp.sf.pal.blog.util.BlogMessaging; +import jp.sf.pal.blog.util.BlogMessagingKeyToken; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -60,9 +61,12 @@ BlogMessage blogMsg = (BlogMessage) blogMap.get("0"); if (blogMsg != null) { + BlogMessagingKeyToken keyToken = new BlogMessagingKeyToken(); + keyToken.setPrefix(BlogConstants.BLOG_MESSAGE_ID); + keyToken.setOwner(getTitleViewSession().getOwner()); try { - BlogMessaging.publishToAll(BlogConstants.BLOG_MESSAGE_ID, + BlogMessaging.publishToAll(keyToken.toString(), blogMsg.getId()); } catch (NotSerializableException e) =================================================================== RCS file: blog/src/java/jp/sf/pal/blog/bean/BlogTrackbackTitleViewPageBean.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- BlogTrackbackTitleViewPageBean.java 2006/03/24 22:10:05 1.2 +++ BlogTrackbackTitleViewPageBean.java 2008/02/06 03:53:02 1.3 @@ -1,5 +1,5 @@ /* - * Copyright 2005-2006 The Portal Application Laboratory Team. + * Copyright 2005-2008 The Portal Application Laboratory Team. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,6 +26,7 @@ import jp.sf.pal.blog.BlogConstants; import jp.sf.pal.blog.model.BlogTrackback; import jp.sf.pal.blog.util.BlogMessaging; +import jp.sf.pal.blog.util.BlogMessagingKeyToken; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -60,9 +61,12 @@ BlogTrackback blogMsg = (BlogTrackback) blogMap.get("0"); if (blogMsg != null) { + BlogMessagingKeyToken keyToken = new BlogMessagingKeyToken(); + keyToken.setPrefix(BlogConstants.BLOG_MESSAGE_ID); + keyToken.setOwner(getTrackbackTitleViewSession().getOwner()); try { - BlogMessaging.publishToAll(BlogConstants.BLOG_MESSAGE_ID, + BlogMessaging.publishToAll(keyToken.toString(), blogMsg.getBlogMessage().getId()); } catch (NotSerializableException e) =================================================================== RCS file: blog/src/java/jp/sf/pal/blog/bean/BlogViewPageBean.java,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- BlogViewPageBean.java 2006/09/19 21:35:10 1.15 +++ BlogViewPageBean.java 2008/02/06 03:53:02 1.16 @@ -1,5 +1,5 @@ /* - * Copyright 2005-2006 The Portal Application Laboratory Team. + * Copyright 2005-2008 The Portal Application Laboratory Team. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,6 +30,7 @@ import jp.sf.pal.blog.model.BlogTrackback; import jp.sf.pal.blog.util.BlogDaoUtil; import jp.sf.pal.blog.util.BlogMessaging; +import jp.sf.pal.blog.util.BlogMessagingKeyToken; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -66,10 +67,13 @@ mode = BlogConstants.BLOG_LIST_VIEW; Long id = null; + BlogMessagingKeyToken keyToken = new BlogMessagingKeyToken(); + keyToken.setPrefix(BlogConstants.BLOG_MESSAGE_ID); + keyToken.setOwner(new BlogViewSessionBean().getOwner()); try { id = (Long) BlogMessaging - .receiveForView(BlogConstants.BLOG_MESSAGE_ID); + .receiveForView(keyToken.toString()); if (log.isDebugEnabled()) { log.debug("BlogViewPageBean() - : id=" + id); @@ -96,7 +100,10 @@ log.debug("listView() - start"); } - BlogMessaging.cancelForView(BlogConstants.BLOG_MESSAGE_ID); + BlogMessagingKeyToken keyToken = new BlogMessagingKeyToken(); + keyToken.setPrefix(BlogConstants.BLOG_MESSAGE_ID); + keyToken.setOwner(getViewSession().getOwner()); + BlogMessaging.cancelForView(keyToken.toString()); if (log.isDebugEnabled()) { @@ -119,9 +126,12 @@ BlogMessage blogMsg = (BlogMessage) blogMap.get("0"); if (blogMsg != null) { + BlogMessagingKeyToken keyToken = new BlogMessagingKeyToken(); + keyToken.setPrefix(BlogConstants.BLOG_MESSAGE_ID); + keyToken.setOwner(getViewSession().getOwner()); try { - BlogMessaging.publishForView(BlogConstants.BLOG_MESSAGE_ID, + BlogMessaging.publishForView(keyToken.toString(), blogMsg.getId()); } catch (NotSerializableException e) @@ -148,11 +158,14 @@ public String postComment() { Long id = null; + BlogMessagingKeyToken keyToken = new BlogMessagingKeyToken(); + keyToken.setPrefix(BlogConstants.BLOG_MESSAGE_ID); + keyToken.setOwner(getViewSession().getOwner()); try { - //TODO replace with request parameter. because session might be expired.. + //TODO replace with request parameter. because session might be expired. id = (Long) BlogMessaging - .receiveForView(BlogConstants.BLOG_MESSAGE_ID); + .receiveForView(keyToken.toString()); if (id != null) { @@ -483,7 +496,8 @@ ExternalContext exContext = FacesContext.getCurrentInstance() .getExternalContext(); - return "" + "\n"; + + exContext.encodeNamespace("redirectForm") + + "'].elements[0].value = blogid;" + + "\n" + + " }" + + "\n" + + " }" + + "\n" + + " }" + + "\n" + + " if (blogid != \"\") {" + + "\n" + + " document.forms['" + + exContext.encodeNamespace("redirectForm") + + "'].submit();" + + "\n" + + " }" + + "\n" + + " }" + + "\n" + + " " + + exContext.encodeNamespace("redirect") + + "();" + + "\n" + + "//-->" + + "\n" + + "" + + "\n"; } } From tigercat @ users.sourceforge.jp Wed Feb 6 12:53:02 2008 From: tigercat @ users.sourceforge.jp (TigerCat) Date: Wed, 06 Feb 2008 12:53:02 +0900 Subject: [pal-cvs 3060] CVS-Update: blog/src/java/jp/sf/pal/blog/model committed by tigercat Message-ID: <1202269982.324765.441.nullmailer@users.sourceforge.jp> Update of /cvsroot/pal/blog/src/java/jp/sf/pal/blog/model In directory sf-cvs:/tmp/cvs-serv404/java/jp/sf/pal/blog/model Modified Files: BlogMessage.java Log Message: Changed to check the owner of the message that previous selected, to prevent showing message from the others blog in case there are two or more blogs in the portal. http://sourceforge.jp/tracker/index.php?func=detail&aid=10409&group_id=1972&atid=7332 blog/src/java/jp/sf/pal/blog/model/BlogMessage.java 1.20 -> 1.21 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/blog/src/java/jp/sf/pal/blog/model/BlogMessage.java.diff?r1=1.20&r2=1.21 =================================================================== RCS file: blog/src/java/jp/sf/pal/blog/model/BlogMessage.java,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- BlogMessage.java 2006/11/04 03:20:28 1.20 +++ BlogMessage.java 2008/02/06 03:53:02 1.21 @@ -1,468 +1,470 @@ -/* - * Copyright 2005-2006 The Portal Application Laboratory Team. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package jp.sf.pal.blog.model; - -import java.io.BufferedReader; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.UnsupportedEncodingException; -import java.util.Date; -import java.util.Iterator; -import java.util.List; -import java.util.Set; -import java.util.TreeSet; - -import javax.faces.context.FacesContext; - -import jp.sf.grizzly.pipeline.PipelineException; -import jp.sf.grizzly.storage.StreamStorage; -import jp.sf.grizzly.storage.StreamStorageException; -import jp.sf.grizzly.storage.impl.ByteArrayStreamStorageImpl; -import jp.sf.pal.blog.BlogConstants; -import jp.sf.pal.blog.converter.Converter; -import jp.sf.pal.blog.util.BlogCommentComparator; -import jp.sf.pal.blog.util.BlogTrackbackComparator; - -import org.apache.commons.lang.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.seasar.framework.container.S2Container; -import org.seasar.framework.container.factory.SingletonS2ContainerFactory; -import org.seasar.portlet.util.RenderResponseUtil; - -import com.marevol.utils.faces.util.DateFormatUtil; - -/** - * BlogMessage generated by hbm2java - */ -public class BlogMessage implements java.io.Serializable -{ - /** - * Logger for this class - */ - private static final Log log = LogFactory.getLog(BlogMessage.class); - - /** - * - */ - private static final long serialVersionUID = -5551793167782445984L; - - public static final String ID = "id"; - - public static final String OWNER = "owner"; - - public static final String TITLE = "title"; - - public static final String MESSAGE = "message"; - - public static final String CREATEDTIME = "createdtime"; - - public static final String UPDATEDTIME = "updatedtime"; - - // Fields - - private Long id; - - private BlogCategory blogcategory; - - private String owner; - - private String title; - - private String message; - - private String formattype; - - private Date createdtime; - - private Date updatedtime; - - private Set blogcomments; - - private Set blogtrackbacks; - - // Constructors - - /** default constructor */ - public BlogMessage() - { - } - - /** constructor with id */ - public BlogMessage(Long id) - { - this.id = id; - } - - // Property accessors - - /** - * - */ - public Long getId() - { - return this.id; - } - - public void setId(Long id) - { - this.id = id; - } - - /** - * - */ - public BlogCategory getBlogCategory() - { - return this.blogcategory; - } - - public void setBlogCategory(BlogCategory blogcategory) - { - this.blogcategory = blogcategory; - } - - /** - * - */ - public String getOwner() - { - return this.owner; - } - - public void setOwner(String owner) - { - this.owner = owner; - } - - /** - * - */ - public String getTitle() - { - return this.title; - } - - public void setTitle(String title) - { - this.title = title; - } - - /** - * - */ - public String getMessage() - { - return this.message; - } - - public void setMessage(String message) - { - this.message = message; - } - - /** - * - */ - public String getFormattype() - { - return this.formattype; - } - - public void setFormattype(String formattype) - { - this.formattype = formattype; - } - - /** - * - */ - public Date getCreatedtime() - { - return this.createdtime; - } - - public void setCreatedtime(Date createdtime) - { - this.createdtime = createdtime; - } - - /** - * - */ - public Date getUpdatedtime() - { - return this.updatedtime; - } - - public void setUpdatedtime(Date updatedtime) - { - this.updatedtime = updatedtime; - } - - /** - * - */ - public Set getBlogComments() - { - return this.blogcomments; - } - - public void setBlogComments(Set blogcomments) - { - this.blogcomments = blogcomments; - } - - /** - * - */ - public Set getBlogTrackbacks() - { - return this.blogtrackbacks; - } - - public void setBlogTrackbacks(Set blogtrackbacks) - { - this.blogtrackbacks = blogtrackbacks; - } - - public String getRedirectUrl() - { - StringBuffer redirectUrl = new StringBuffer(); - String url = RenderResponseUtil.createRenderURL().toString(); - String fragment = null; - int fragmentIndex = url.indexOf("#"); - if (fragmentIndex >= 0) - { - redirectUrl.append(url.substring(0, fragmentIndex)); - fragment = url.substring(fragmentIndex); - } - else - { - redirectUrl.append(url); - fragment = ""; - } - if (url.indexOf("?") < 0) - { - redirectUrl.append("?"); - } - else - { - redirectUrl.append("&"); - } - redirectUrl.append(FacesContext.getCurrentInstance() - .getExternalContext().encodeNamespace( - BlogConstants.BLOG_REDIRECT_ID)); - redirectUrl.append("="); - redirectUrl.append(getId().toString()); - - redirectUrl.append(fragment); - - if (log.isDebugEnabled()) - { - log.debug("getRedirectUrl() - redirectUrl=" + redirectUrl - + ", url=" + url + ", fragment=" + fragment - + ", fragmentIndex=" + fragmentIndex); - } - - return redirectUrl.toString(); - } - - public void setRedirectUrl(String url) - { - // NONE - } - - public String getFormattedMessage() - { - - S2Container container = SingletonS2ContainerFactory.getContainer(); - - List list = (List) container.getComponent(BlogConstants.CONVERTER_LIST); - Iterator ite = list.iterator(); - while (ite.hasNext()) - { - Object obj = ite.next(); - if (obj instanceof Converter) - { - Converter converter = (Converter) obj; - if (converter.getFormatType().equals(getFormattype())) - { - StringBuffer buffer = new StringBuffer(); - try - { - StreamStorage storage; - try - { - storage = new ByteArrayStreamStorageImpl( - new ByteArrayInputStream(getMessage() - .getBytes(BlogConstants.UTF_8)), - BlogConstants.UTF_8); - } - catch (UnsupportedEncodingException e1) - { - log.warn("Unsupported encoding. ", e1); - storage = new ByteArrayStreamStorageImpl( - new ByteArrayInputStream(getMessage() - .getBytes()), BlogConstants.UTF_8); - } - converter.getConverter().invoke(storage); - - BufferedReader r = null; - try - { - r = new BufferedReader(new InputStreamReader( - storage.getResultInputStream(), storage - .getEncoding())); - String l = null; - while ((l = r.readLine()) != null) - { - buffer.append(l); - buffer.append("\n"); - } - } - catch (UnsupportedEncodingException e) - { - log.warn("Unsupported Encoding. ", e); - } - catch (StreamStorageException e) - { - log.warn("Stream Storage Exception. ", e); - } - catch (IOException e) - { - log.error("I/O Exception. ", e); - } - finally - { - if (r != null) - { - try - { - r.close(); - } - catch (IOException e) - { - } - } - } - storage.destroy(); - return buffer.toString(); - } - catch (StreamStorageException e) - { - log.error("StreamStorage Exception.", e); - return getMessage(); - } - catch (PipelineException e) - { - log.error("Pipeline Exception.", e); - return getMessage(); - } - } - } - else - { - log.warn("Invalid converter: " + obj); - return getMessage(); - } - } - - return getMessage(); - } - - public String getFormattedUpdatedtime() - { - return DateFormatUtil.getMediumFormattedDateTime(getUpdatedtime()); - } - - public String getFormattedCreatedtime() - { - return DateFormatUtil.getMediumFormattedDateTime(getCreatedtime()); - } - - public String getAbbreviatedTitle() - { - return getAbbreviatedTitle(BlogConstants.DEFAULT_TITLE_MAX_LENGTH); - } - - public String getAbbreviatedTitle(int maxLength) - { - return StringUtils.abbreviate(getTitle(), maxLength); - } - - public void setAbbreviatedTitle(String title) - { - setTitle(title); - } - - public int getBlogCommentSize() - { - if (getBlogComments() != null) - { - return getBlogComments().size(); - } - return 0; - } - - public int getBlogTrackbackSize() - { - if (getBlogTrackbacks() != null) - { - return getBlogTrackbacks().size(); - } - return 0; - } - - public String getTrackbackUrl() - { - return FacesContext.getCurrentInstance().getExternalContext() - .getRequestContextPath() - + "/trackback/" + getId(); - } - - public Set getSortedBlogComments() - { - TreeSet ts = new TreeSet(new BlogCommentComparator( - BlogCommentComparator.ASC)); - ts.addAll(getBlogComments()); - return (Set) ts; - } - - public Set getSortedBlogTrackbacks() - { - TreeSet ts = new TreeSet(new BlogTrackbackComparator( - BlogTrackbackComparator.ASC)); - ts.addAll(getBlogTrackbacks()); - return (Set) ts; - } - - /** - * @return Returns the emptyTitle. - */ - public boolean isEmptyTitle() - { - return StringUtils.isEmpty(getTitle()); - } - - /** - * @param emptyTitle The emptyTitle to set. - */ - public void setEmptyTitle(boolean emptyTitle) - { - } -} +/* + * Copyright 2005-2008 The Portal Application Laboratory Team. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package jp.sf.pal.blog.model; + +import java.io.BufferedReader; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.util.Iterator; +import java.util.List; +import java.util.Set; +import java.util.TreeSet; + +import javax.faces.context.ExternalContext; +import javax.faces.context.FacesContext; + +import jp.sf.grizzly.pipeline.PipelineException; +import jp.sf.grizzly.storage.StreamStorage; +import jp.sf.grizzly.storage.StreamStorageException; +import jp.sf.grizzly.storage.impl.ByteArrayStreamStorageImpl; +import jp.sf.pal.blog.BlogConstants; +import jp.sf.pal.blog.converter.Converter; +import jp.sf.pal.blog.util.BlogCommentComparator; +import jp.sf.pal.blog.util.BlogTrackbackComparator; + +import org.apache.commons.lang.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.seasar.framework.container.S2Container; +import org.seasar.framework.container.factory.SingletonS2ContainerFactory; +import org.seasar.portlet.util.RenderResponseUtil; + +import com.marevol.utils.faces.util.DateFormatUtil; + +/** + * BlogMessage generated by hbm2java + */ +public class BlogMessage implements java.io.Serializable +{ + /** + * Logger for this class + */ + private static final Log log = LogFactory.getLog(BlogMessage.class); + + /** + * + */ + private static final long serialVersionUID = -5551793167782445984L; + + public static final String ID = "id"; + + public static final String OWNER = "owner"; + + public static final String TITLE = "title"; + + public static final String MESSAGE = "message"; + + public static final String CREATEDTIME = "createdtime"; + + public static final String UPDATEDTIME = "updatedtime"; + + // Fields + + private Long id; + + private BlogCategory blogcategory; + + private String owner; + + private String title; + + private String message; + + private String formattype; + + private Date createdtime; + + private Date updatedtime; + + private Set blogcomments; + + private Set blogtrackbacks; + + // Constructors + + /** default constructor */ + public BlogMessage() + { + } + + /** constructor with id */ + public BlogMessage(Long id) + { + this.id = id; + } + + // Property accessors + + /** + * + */ + public Long getId() + { + return this.id; + } + + public void setId(Long id) + { + this.id = id; + } + + /** + * + */ + public BlogCategory getBlogCategory() + { + return this.blogcategory; + } + + public void setBlogCategory(BlogCategory blogcategory) + { + this.blogcategory = blogcategory; + } + + /** + * + */ + public String getOwner() + { + return this.owner; + } + + public void setOwner(String owner) + { + this.owner = owner; + } + + /** + * + */ + public String getTitle() + { + return this.title; + } + + public void setTitle(String title) + { + this.title = title; + } + + /** + * + */ + public String getMessage() + { + return this.message; + } + + public void setMessage(String message) + { + this.message = message; + } + + /** + * + */ + public String getFormattype() + { + return this.formattype; + } + + public void setFormattype(String formattype) + { + this.formattype = formattype; + } + + /** + * + */ + public Date getCreatedtime() + { + return this.createdtime; + } + + public void setCreatedtime(Date createdtime) + { + this.createdtime = createdtime; + } + + /** + * + */ + public Date getUpdatedtime() + { + return this.updatedtime; + } + + public void setUpdatedtime(Date updatedtime) + { + this.updatedtime = updatedtime; + } + + /** + * + */ + public Set getBlogComments() + { + return this.blogcomments; + } + + public void setBlogComments(Set blogcomments) + { + this.blogcomments = blogcomments; + } + + /** + * + */ + public Set getBlogTrackbacks() + { + return this.blogtrackbacks; + } + + public void setBlogTrackbacks(Set blogtrackbacks) + { + this.blogtrackbacks = blogtrackbacks; + } + + public String getRedirectUrl() + { + StringBuffer redirectUrl = new StringBuffer(); + String url = RenderResponseUtil.createRenderURL().toString(); + String fragment = null; + int fragmentIndex = url.indexOf("#"); + if (fragmentIndex >= 0) + { + redirectUrl.append(url.substring(0, fragmentIndex)); + fragment = url.substring(fragmentIndex); + } + else + { + redirectUrl.append(url); + fragment = ""; + } + if (url.indexOf("?") < 0) + { + redirectUrl.append("?"); + } + else + { + redirectUrl.append("&"); + } + ExternalContext exContext = FacesContext.getCurrentInstance() + .getExternalContext(); + redirectUrl.append(exContext.encodeNamespace( + BlogConstants.BLOG_REDIRECT_ID)); + redirectUrl.append("="); + redirectUrl.append(getId().toString()); + + redirectUrl.append(fragment); + + if (log.isDebugEnabled()) + { + log.debug("getRedirectUrl() - redirectUrl=" + redirectUrl + + ", url=" + url + ", fragment=" + fragment + + ", fragmentIndex=" + fragmentIndex); + } + + return redirectUrl.toString(); + } + + public void setRedirectUrl(String url) + { + // NONE + } + + public String getFormattedMessage() + { + + S2Container container = SingletonS2ContainerFactory.getContainer(); + + List list = (List) container.getComponent(BlogConstants.CONVERTER_LIST); + Iterator ite = list.iterator(); + while (ite.hasNext()) + { + Object obj = ite.next(); + if (obj instanceof Converter) + { + Converter converter = (Converter) obj; + if (converter.getFormatType().equals(getFormattype())) + { + StringBuffer buffer = new StringBuffer(); + try + { + StreamStorage storage; + try + { + storage = new ByteArrayStreamStorageImpl( + new ByteArrayInputStream(getMessage() + .getBytes(BlogConstants.UTF_8)), + BlogConstants.UTF_8); + } + catch (UnsupportedEncodingException e1) + { + log.warn("Unsupported encoding. ", e1); + storage = new ByteArrayStreamStorageImpl( + new ByteArrayInputStream(getMessage() + .getBytes()), BlogConstants.UTF_8); + } + converter.getConverter().invoke(storage); + + BufferedReader r = null; + try + { + r = new BufferedReader(new InputStreamReader( + storage.getResultInputStream(), storage + .getEncoding())); + String l = null; + while ((l = r.readLine()) != null) + { + buffer.append(l); + buffer.append("\n"); + } + } + catch (UnsupportedEncodingException e) + { + log.warn("Unsupported Encoding. ", e); + } + catch (StreamStorageException e) + { + log.warn("Stream Storage Exception. ", e); + } + catch (IOException e) + { + log.error("I/O Exception. ", e); + } + finally + { + if (r != null) + { + try + { + r.close(); + } + catch (IOException e) + { + } + } + } + storage.destroy(); + return buffer.toString(); + } + catch (StreamStorageException e) + { + log.error("StreamStorage Exception.", e); + return getMessage(); + } + catch (PipelineException e) + { + log.error("Pipeline Exception.", e); + return getMessage(); + } + } + } + else + { + log.warn("Invalid converter: " + obj); + return getMessage(); + } + } + + return getMessage(); + } + + public String getFormattedUpdatedtime() + { + return DateFormatUtil.getMediumFormattedDateTime(getUpdatedtime()); + } + + public String getFormattedCreatedtime() + { + return DateFormatUtil.getMediumFormattedDateTime(getCreatedtime()); + } + + public String getAbbreviatedTitle() + { + return getAbbreviatedTitle(BlogConstants.DEFAULT_TITLE_MAX_LENGTH); + } + + public String getAbbreviatedTitle(int maxLength) + { + return StringUtils.abbreviate(getTitle(), maxLength); + } + + public void setAbbreviatedTitle(String title) + { + setTitle(title); + } + + public int getBlogCommentSize() + { + if (getBlogComments() != null) + { + return getBlogComments().size(); + } + return 0; + } + + public int getBlogTrackbackSize() + { + if (getBlogTrackbacks() != null) + { + return getBlogTrackbacks().size(); + } + return 0; + } + + public String getTrackbackUrl() + { + return FacesContext.getCurrentInstance().getExternalContext() + .getRequestContextPath() + + "/trackback/" + getId(); + } + + public Set getSortedBlogComments() + { + TreeSet ts = new TreeSet(new BlogCommentComparator( + BlogCommentComparator.ASC)); + ts.addAll(getBlogComments()); + return (Set) ts; + } + + public Set getSortedBlogTrackbacks() + { + TreeSet ts = new TreeSet(new BlogTrackbackComparator( + BlogTrackbackComparator.ASC)); + ts.addAll(getBlogTrackbacks()); + return (Set) ts; + } + + /** + * @return Returns the emptyTitle. + */ + public boolean isEmptyTitle() + { + return StringUtils.isEmpty(getTitle()); + } + + /** + * @param emptyTitle The emptyTitle to set. + */ + public void setEmptyTitle(boolean emptyTitle) + { + } +} From tigercat @ users.sourceforge.jp Wed Feb 6 12:53:02 2008 From: tigercat @ users.sourceforge.jp (TigerCat) Date: Wed, 06 Feb 2008 12:53:02 +0900 Subject: [pal-cvs 3061] CVS-Update: blog/src/java/jp/sf/pal/blog/portlet committed by tigercat Message-ID: <1202269982.521384.448.nullmailer@users.sourceforge.jp> Update of /cvsroot/pal/blog/src/java/jp/sf/pal/blog/portlet In directory sf-cvs:/tmp/cvs-serv404/java/jp/sf/pal/blog/portlet Modified Files: BlogViewPortlet.java Log Message: Changed to check the owner of the message that previous selected, to prevent showing message from the others blog in case there are two or more blogs in the portal. http://sourceforge.jp/tracker/index.php?func=detail&aid=10409&group_id=1972&atid=7332 blog/src/java/jp/sf/pal/blog/portlet/BlogViewPortlet.java 1.3 -> 1.4 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/blog/src/java/jp/sf/pal/blog/portlet/BlogViewPortlet.java.diff?r1=1.3&r2=1.4 =================================================================== RCS file: blog/src/java/jp/sf/pal/blog/portlet/BlogViewPortlet.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- BlogViewPortlet.java 2006/06/30 12:29:21 1.3 +++ BlogViewPortlet.java 2008/02/06 03:53:02 1.4 @@ -1,5 +1,5 @@ /* - * Copyright 2005-2006 The Portal Application Laboratory Team. + * Copyright 2005-2008 The Portal Application Laboratory Team. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,9 +15,6 @@ */ package jp.sf.pal.blog.portlet; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import java.io.IOException; import java.util.Iterator; @@ -27,6 +24,10 @@ import jp.sf.pal.blog.BlogConstants; import jp.sf.pal.blog.util.BlogMessaging; +import jp.sf.pal.blog.util.BlogMessagingKeyToken; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; public class BlogViewPortlet extends BlogGenericPortlet { @@ -44,6 +45,7 @@ super.processAction(request, response); //TODO String blogId = null; + String blogOwner = null; Iterator ite = request.getParameterMap().keySet().iterator(); while (ite.hasNext()) { @@ -60,17 +62,23 @@ { blogId = request.getParameter(key); } + else if (key.indexOf(BlogConstants.BLOG_REDIRECT_OWNER) >= 0) + { + blogOwner = request.getParameter(key); + } } if (log.isDebugEnabled()) { log .debug("processAction(ActionRequest, ActionResponse) - : blogId=" - + blogId); + + blogId + " : blogOwner=" + blogOwner); } - if (blogId != null) + if (blogId != null && blogOwner != null) { - BlogMessaging.publishForView(BlogConstants.BLOG_MESSAGE_ID, - new Long(blogId)); + BlogMessagingKeyToken keyToken = new BlogMessagingKeyToken(); + keyToken.setPrefix(BlogConstants.BLOG_MESSAGE_ID); + keyToken.setOwner(blogOwner); + BlogMessaging.publishForView(keyToken.toString(), new Long(blogId)); } } From tigercat @ users.sourceforge.jp Wed Feb 6 12:53:02 2008 From: tigercat @ users.sourceforge.jp (TigerCat) Date: Wed, 06 Feb 2008 12:53:02 +0900 Subject: [pal-cvs 3062] CVS-Update: blog/src/webapp/WEB-INF/jsp committed by tigercat Message-ID: <1202269982.666346.455.nullmailer@users.sourceforge.jp> Update of /cvsroot/pal/blog/src/webapp/WEB-INF/jsp In directory sf-cvs:/tmp/cvs-serv404/webapp/WEB-INF/jsp Modified Files: BlogView.jsp Log Message: Changed to check the owner of the message that previous selected, to prevent showing message from the others blog in case there are two or more blogs in the portal. http://sourceforge.jp/tracker/index.php?func=detail&aid=10409&group_id=1972&atid=7332 blog/src/webapp/WEB-INF/jsp/BlogView.jsp 1.18 -> 1.19 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/blog/src/webapp/WEB-INF/jsp/BlogView.jsp.diff?r1=1.18&r2=1.19 =================================================================== RCS file: blog/src/webapp/WEB-INF/jsp/BlogView.jsp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- BlogView.jsp 2006/09/18 21:54:11 1.18 +++ BlogView.jsp 2008/02/06 03:53:02 1.19 @@ -8,6 +8,7 @@ var="msgs" /> + From tigercat @ users.sourceforge.jp Wed Feb 6 12:53:02 2008 From: tigercat @ users.sourceforge.jp (TigerCat) Date: Wed, 06 Feb 2008 12:53:02 +0900 Subject: [pal-cvs 3063] CVS-Update: blog/src/java/jp/sf/pal/blog/util committed by tigercat Message-ID: <1202269982.790880.462.nullmailer@users.sourceforge.jp> Update of /cvsroot/pal/blog/src/java/jp/sf/pal/blog/util In directory sf-cvs:/tmp/cvs-serv404/java/jp/sf/pal/blog/util Added Files: BlogMessagingKeyToken.java Log Message: Changed to check the owner of the message that previous selected, to prevent showing message from the others blog in case there are two or more blogs in the portal. http://sourceforge.jp/tracker/index.php?func=detail&aid=10409&group_id=1972&atid=7332 blog/src/java/jp/sf/pal/blog/util/BlogMessagingKeyToken.java NONE -> 1.1 (added) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/blog/src/java/jp/sf/pal/blog/util/BlogMessagingKeyToken.java?rev=1.1&content-type=text/vnd.viewcvs-markup From tigercat @ users.sourceforge.jp Wed Feb 6 14:40:49 2008 From: tigercat @ users.sourceforge.jp (TigerCat) Date: Wed, 06 Feb 2008 14:40:49 +0900 Subject: [pal-cvs 3064] CVS-Update: blog/src/java/jp/sf/pal/blog/converter committed by tigercat Message-ID: <1202276449.819148.31231.nullmailer@users.sourceforge.jp> Update of /cvsroot/pal/blog/src/java/jp/sf/pal/blog/converter In directory sf-cvs:/tmp/cvs-serv31228/java/jp/sf/pal/blog/converter Modified Files: Converter.java Log Message: Changed to output formatted text in comment entries as well as in blog entries. blog/src/java/jp/sf/pal/blog/converter/Converter.java 1.1 -> 1.2 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/blog/src/java/jp/sf/pal/blog/converter/Converter.java.diff?r1=1.1&r2=1.2 =================================================================== RCS file: blog/src/java/jp/sf/pal/blog/converter/Converter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Converter.java 2006/07/01 00:45:34 1.1 +++ Converter.java 2008/02/06 05:40:49 1.2 @@ -1,11 +1,44 @@ +/* + * Copyright 2005-2008 The Portal Application Laboratory Team. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package jp.sf.pal.blog.converter; +import java.io.BufferedReader; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.UnsupportedEncodingException; import java.util.Map; import jp.sf.grizzly.pipeline.GrizzlyPipeline; +import jp.sf.grizzly.pipeline.PipelineException; +import jp.sf.grizzly.storage.StreamStorage; +import jp.sf.grizzly.storage.StreamStorageException; +import jp.sf.grizzly.storage.impl.ByteArrayStreamStorageImpl; +import jp.sf.pal.blog.BlogConstants; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; public class Converter { + /** + * Logger for this class + */ + private static final Log log = LogFactory.getLog(Converter.class); + private String formatType; private Map localizedName; @@ -67,4 +100,80 @@ this.formatType = name; } + /** + * @param sourceText The sourceText to set. + */ + public String convert(String sourceText) + { + StringBuffer buffer = new StringBuffer(); + try + { + StreamStorage storage; + try + { + storage = new ByteArrayStreamStorageImpl( + new ByteArrayInputStream(sourceText + .getBytes(BlogConstants.UTF_8)), + BlogConstants.UTF_8); + } + catch (UnsupportedEncodingException e1) + { + log.warn("Unsupported encoding. ", e1); + storage = new ByteArrayStreamStorageImpl( + new ByteArrayInputStream(sourceText.getBytes()), + BlogConstants.UTF_8); + } + getConverter().invoke(storage); + + BufferedReader r = null; + try + { + r = new BufferedReader(new InputStreamReader(storage + .getResultInputStream(), storage.getEncoding())); + String l = null; + while ((l = r.readLine()) != null) + { + buffer.append(l); + buffer.append("\n"); + } + } + catch (UnsupportedEncodingException e) + { + log.warn("Unsupported Encoding. ", e); + } + catch (StreamStorageException e) + { + log.warn("Stream Storage Exception. ", e); + } + catch (IOException e) + { + log.error("I/O Exception. ", e); + } + finally + { + if (r != null) + { + try + { + r.close(); + } + catch (IOException e) + { + } + } + } + storage.destroy(); + return buffer.toString(); + } + catch (StreamStorageException e) + { + log.error("StreamStorage Exception.", e); + return null; + } + catch (PipelineException e) + { + log.error("Pipeline Exception.", e); + return null; + } + } } From tigercat @ users.sourceforge.jp Wed Feb 6 14:40:49 2008 From: tigercat @ users.sourceforge.jp (TigerCat) Date: Wed, 06 Feb 2008 14:40:49 +0900 Subject: [pal-cvs 3065] CVS-Update: blog/src/java/jp/sf/pal/blog/model committed by tigercat Message-ID: <1202276449.951923.31240.nullmailer@users.sourceforge.jp> Update of /cvsroot/pal/blog/src/java/jp/sf/pal/blog/model In directory sf-cvs:/tmp/cvs-serv31228/java/jp/sf/pal/blog/model Modified Files: BlogComment.java BlogMessage.java Log Message: Changed to output formatted text in comment entries as well as in blog entries. blog/src/java/jp/sf/pal/blog/model/BlogComment.java 1.10 -> 1.11 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/blog/src/java/jp/sf/pal/blog/model/BlogComment.java.diff?r1=1.10&r2=1.11 blog/src/java/jp/sf/pal/blog/model/BlogMessage.java 1.21 -> 1.22 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/blog/src/java/jp/sf/pal/blog/model/BlogMessage.java.diff?r1=1.21&r2=1.22 =================================================================== RCS file: blog/src/java/jp/sf/pal/blog/model/BlogComment.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- BlogComment.java 2006/06/30 12:29:21 1.10 +++ BlogComment.java 2008/02/06 05:40:49 1.11 @@ -1,259 +1,277 @@ -/* - * Copyright 2005-2006 The Portal Application Laboratory Team. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package jp.sf.pal.blog.model; - -import java.util.Date; - -import javax.faces.context.FacesContext; - -import jp.sf.pal.blog.BlogConstants; - -import org.apache.commons.lang.StringUtils; - -import com.marevol.utils.faces.util.DateFormatUtil; - -/** - * BlogComment generated by hbm2java - */ -public class BlogComment implements java.io.Serializable -{ - - // Fields - - /** - * - */ - private static final long serialVersionUID = 562524292609035239L; - - public static final String ID = "id"; - - public static final String NAME = "name"; - - public static final String EMAIL = "email"; - - public static final String URL = "url"; - - public static final String MESSAGE = "message"; - - public static final String CREATEDTIME = "createdtime"; - - private Long id; - - private BlogMessage blogMessage; - - private String name; - - private String email; - - private String url; - - private String message; - - private Date createdtime; - - // Constructors - - /** default constructor */ - public BlogComment() - { - } - - /** constructor with id */ - public BlogComment(Long id) - { - this.id = id; - } - - // Property accessors - - /** - * - */ - public Long getId() - { - return this.id; - } - - public void setId(Long id) - { - this.id = id; - } - - /** - * - */ - public BlogMessage getBlogMessage() - { - return this.blogMessage; - } - - public void setBlogMessage(BlogMessage blogMessage) - { - this.blogMessage = blogMessage; - } - - /** - * - */ - public String getName() - { - return this.name; - } - - public void setName(String name) - { - this.name = name; - } - - /** - * - */ - public String getEmail() - { - return this.email; - } - - public void setEmail(String email) - { - this.email = email; - } - - /** - * - */ - public String getUrl() - { - if (url != null - && (url.startsWith("http://") || url.startsWith("https://"))) - { - return this.url; - } - return ""; - } - - public void setUrl(String url) - { - this.url = url; - } - - /** - * - */ - public String getMessage() - { - return this.message; - } - - public void setMessage(String message) - { - this.message = message; - } - - /** - * - */ - public Date getCreatedtime() - { - return this.createdtime; - } - - public void setCreatedtime(Date createdtime) - { - this.createdtime = createdtime; - } - - public Boolean getDeleteEnabled() - { - String user = FacesContext.getCurrentInstance().getExternalContext() - .getRemoteUser(); - if (user == null) - { - return Boolean.FALSE; - } - - if (user.equals(getBlogMessage().getOwner())) - { - return Boolean.TRUE; - } - return Boolean.FALSE; - - } - - public String getFormattedCreatedtime() - { - return DateFormatUtil.getMediumFormattedDateTime(getCreatedtime()); - } - - public String getAbbreviatedMessage() - { - return getAbbreviatedMessage(BlogConstants.DEFAULT_TITLE_MAX_LENGTH); - } - - public String getAbbreviatedMessage(int maxLength) - { - return StringUtils.abbreviate(getMessage(), maxLength); - } - - public void setAbbreviatedMessage(String msg) - { - setMessage(msg); - } - - /** - * @return Returns the emptyComment. - */ - public boolean isEmptyMessage() - { - return StringUtils.isEmpty(getMessage()); - } - - /** - * @param emptyComment The emptyComment to set. - */ - public void setEmptyMessage(boolean emptyMessage) - { - } - - /** - * @return Returns the emptyEmail. - */ - public boolean isEmptyEmail() - { - return StringUtils.isEmpty(getEmail()); - } - - /** - * @param emptyEmail The emptyEmail to set. - */ - public void setEmptyEmail(boolean emptyEmail) - { - } - - /** - * @return Returns the emptyUrl. - */ - public boolean isEmptyUrl() - { - return StringUtils.isEmpty(getUrl()); - } - - /** - * @param emptyUrl The emptyUrl to set. - */ - public void setEmptyUrl(boolean emptyUrl) - { - } -} +/* + * Copyright 2005-2008 The Portal Application Laboratory Team. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package jp.sf.pal.blog.model; + +import java.util.Date; + +import javax.faces.context.FacesContext; + +import jp.sf.pal.blog.BlogConstants; +import jp.sf.pal.blog.converter.Converter; + +import org.apache.commons.lang.StringUtils; +import org.seasar.framework.container.S2Container; +import org.seasar.framework.container.factory.SingletonS2ContainerFactory; + +import com.marevol.utils.faces.util.DateFormatUtil; + +/** + * BlogComment generated by hbm2java + */ +public class BlogComment implements java.io.Serializable +{ + + // Fields + + /** + * + */ + private static final long serialVersionUID = 562524292609035239L; + + public static final String ID = "id"; + + public static final String NAME = "name"; + + public static final String EMAIL = "email"; + + public static final String URL = "url"; + + public static final String MESSAGE = "message"; + + public static final String CREATEDTIME = "createdtime"; + + public static final String DEFAULT_FORMAT_CONVERTER = "TextConverter"; + + private Long id; + + private BlogMessage blogMessage; + + private String name; + + private String email; + + private String url; + + private String message; + + private Date createdtime; + + // Constructors + + /** default constructor */ + public BlogComment() + { + } + + /** constructor with id */ + public BlogComment(Long id) + { + this.id = id; + } + + // Property accessors + + /** + * + */ + public Long getId() + { + return this.id; + } + + public void setId(Long id) + { + this.id = id; + } + + /** + * + */ + public BlogMessage getBlogMessage() + { + return this.blogMessage; + } + + public void setBlogMessage(BlogMessage blogMessage) + { + this.blogMessage = blogMessage; + } + + /** + * + */ + public String getName() + { + return this.name; + } + + public void setName(String name) + { + this.name = name; + } + + /** + * + */ + public String getEmail() + { + return this.email; + } + + public void setEmail(String email) + { + this.email = email; + } + + /** + * + */ + public String getUrl() + { + if (url != null + && (url.startsWith("http://") || url.startsWith("https://"))) + { + return this.url; + } + return ""; + } + + public void setUrl(String url) + { + this.url = url; + } + + /** + * + */ + public String getMessage() + { + return this.message; + } + + public void setMessage(String message) + { + this.message = message; + } + + /** + * + */ + public Date getCreatedtime() + { + return this.createdtime; + } + + public void setCreatedtime(Date createdtime) + { + this.createdtime = createdtime; + } + + public Boolean getDeleteEnabled() + { + String user = FacesContext.getCurrentInstance().getExternalContext() + .getRemoteUser(); + if (user == null) + { + return Boolean.FALSE; + } + + if (user.equals(getBlogMessage().getOwner())) + { + return Boolean.TRUE; + } + return Boolean.FALSE; + + } + + public String getFormattedMessage() + { + S2Container container = SingletonS2ContainerFactory.getContainer(); + Converter converter = (Converter)container + .getComponent(DEFAULT_FORMAT_CONVERTER); + String formattedMessage = converter.convert(getMessage()); + if (formattedMessage == null) + { + return getMessage(); + } + return formattedMessage; + } + + public String getFormattedCreatedtime() + { + return DateFormatUtil.getMediumFormattedDateTime(getCreatedtime()); + } + + public String getAbbreviatedMessage() + { + return getAbbreviatedMessage(BlogConstants.DEFAULT_TITLE_MAX_LENGTH); + } + + public String getAbbreviatedMessage(int maxLength) + { + return StringUtils.abbreviate(getMessage(), maxLength); + } + + public void setAbbreviatedMessage(String msg) + { + setMessage(msg); + } + + /** + * @return Returns the emptyComment. + */ + public boolean isEmptyMessage() + { + return StringUtils.isEmpty(getMessage()); + } + + /** + * @param emptyComment The emptyComment to set. + */ + public void setEmptyMessage(boolean emptyMessage) + { + } + + /** + * @return Returns the emptyEmail. + */ + public boolean isEmptyEmail() + { + return StringUtils.isEmpty(getEmail()); + } + + /** + * @param emptyEmail The emptyEmail to set. + */ + public void setEmptyEmail(boolean emptyEmail) + { + } + + /** + * @return Returns the emptyUrl. + */ + public boolean isEmptyUrl() + { + return StringUtils.isEmpty(getUrl()); + } + + /** + * @param emptyUrl The emptyUrl to set. + */ + public void setEmptyUrl(boolean emptyUrl) + { + } +} =================================================================== RCS file: blog/src/java/jp/sf/pal/blog/model/BlogMessage.java,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- BlogMessage.java 2008/02/06 03:53:02 1.21 +++ BlogMessage.java 2008/02/06 05:40:49 1.22 @@ -304,77 +304,12 @@ Converter converter = (Converter) obj; if (converter.getFormatType().equals(getFormattype())) { - StringBuffer buffer = new StringBuffer(); - try + String formattedMessage = converter.convert(getMessage()); + if (formattedMessage == null) { - StreamStorage storage; - try - { - storage = new ByteArrayStreamStorageImpl( - new ByteArrayInputStream(getMessage() - .getBytes(BlogConstants.UTF_8)), - BlogConstants.UTF_8); - } - catch (UnsupportedEncodingException e1) - { - log.warn("Unsupported encoding. ", e1); - storage = new ByteArrayStreamStorageImpl( - new ByteArrayInputStream(getMessage() - .getBytes()), BlogConstants.UTF_8); - } - converter.getConverter().invoke(storage); - - BufferedReader r = null; - try - { - r = new BufferedReader(new InputStreamReader( - storage.getResultInputStream(), storage - .getEncoding())); - String l = null; - while ((l = r.readLine()) != null) - { - buffer.append(l); - buffer.append("\n"); - } - } - catch (UnsupportedEncodingException e) - { - log.warn("Unsupported Encoding. ", e); - } - catch (StreamStorageException e) - { - log.warn("Stream Storage Exception. ", e); - } - catch (IOException e) - { - log.error("I/O Exception. ", e); - } - finally - { - if (r != null) - { - try - { - r.close(); - } - catch (IOException e) - { - } - } - } - storage.destroy(); - return buffer.toString(); - } - catch (StreamStorageException e) - { - log.error("StreamStorage Exception.", e); - return getMessage(); - } - catch (PipelineException e) - { - log.error("Pipeline Exception.", e); return getMessage(); } + return formattedMessage; } } else From tigercat @ users.sourceforge.jp Wed Feb 6 14:40:50 2008 From: tigercat @ users.sourceforge.jp (TigerCat) Date: Wed, 06 Feb 2008 14:40:50 +0900 Subject: [pal-cvs 3066] CVS-Update: blog/src/webapp/WEB-INF/jsp committed by tigercat Message-ID: <1202276450.088134.31253.nullmailer@users.sourceforge.jp> Update of /cvsroot/pal/blog/src/webapp/WEB-INF/jsp In directory sf-cvs:/tmp/cvs-serv31228/webapp/WEB-INF/jsp Modified Files: BlogView.jsp Log Message: Changed to output formatted text in comment entries as well as in blog entries. blog/src/webapp/WEB-INF/jsp/BlogView.jsp 1.19 -> 1.20 (modified) http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/pal/blog/src/webapp/WEB-INF/jsp/BlogView.jsp.diff?r1=1.19&r2=1.20 =================================================================== RCS file: blog/src/webapp/WEB-INF/jsp/BlogView.jsp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- BlogView.jsp 2008/02/06 03:53:02 1.19 +++ BlogView.jsp 2008/02/06 05:40:49 1.20 @@ -142,8 +142,8 @@ rendered="#{viewPage.blogMessage.blogCommentSize>0}"> - + From svnnotify @ sourceforge.jp Mon Feb 11 07:32:45 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Mon, 11 Feb 2008 07:32:45 +0900 Subject: [pal-cvs 3067] [803] added weblogic support Message-ID: <1202682765.315967.29592.nullmailer@users.sourceforge.jp> Revision: 803 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=803 Author: shinsuke Date: 2008-02-11 07:32:44 +0900 (Mon, 11 Feb 2008) Log Message: ----------- added weblogic support Added Paths: ----------- pal-admin/trunk/src/main/webapp/WEB-INF/weblogic.xml -------------- next part -------------- Added: pal-admin/trunk/src/main/webapp/WEB-INF/weblogic.xml =================================================================== --- pal-admin/trunk/src/main/webapp/WEB-INF/weblogic.xml 2008-02-05 03:17:10 UTC (rev 802) +++ pal-admin/trunk/src/main/webapp/WEB-INF/weblogic.xml 2008-02-10 22:32:44 UTC (rev 803) @@ -0,0 +1,10 @@ + + + + + -1 + -1 + true + true + + Property changes on: pal-admin/trunk/src/main/webapp/WEB-INF/weblogic.xml ___________________________________________________________________ Name: svn:eol-style + native From svnnotify @ sourceforge.jp Mon Feb 11 07:33:21 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Mon, 11 Feb 2008 07:33:21 +0900 Subject: [pal-cvs 3068] [804] updated version Message-ID: <1202682801.182773.29746.nullmailer@users.sourceforge.jp> Revision: 804 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=804 Author: shinsuke Date: 2008-02-11 07:33:20 +0900 (Mon, 11 Feb 2008) Log Message: ----------- updated version Modified Paths: -------------- pal-wcm/trunk/pom.xml -------------- next part -------------- Modified: pal-wcm/trunk/pom.xml =================================================================== --- pal-wcm/trunk/pom.xml 2008-02-10 22:32:44 UTC (rev 803) +++ pal-wcm/trunk/pom.xml 2008-02-10 22:33:20 UTC (rev 804) @@ -3,7 +3,7 @@ 4.0.0 jp.sf.pal pal-wcm - 0.2 + 0.3-SNAPSHOT war Web Content Management tools for PAL Portal From svnnotify @ sourceforge.jp Mon Feb 11 07:33:50 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Mon, 11 Feb 2008 07:33:50 +0900 Subject: [pal-cvs 3069] [805] added weblogic support Message-ID: <1202682830.084873.29853.nullmailer@users.sourceforge.jp> Revision: 805 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=805 Author: shinsuke Date: 2008-02-11 07:33:49 +0900 (Mon, 11 Feb 2008) Log Message: ----------- added weblogic support Added Paths: ----------- pal-wcm/trunk/src/main/webapp/WEB-INF/weblogic.xml -------------- next part -------------- Added: pal-wcm/trunk/src/main/webapp/WEB-INF/weblogic.xml =================================================================== --- pal-wcm/trunk/src/main/webapp/WEB-INF/weblogic.xml 2008-02-10 22:33:20 UTC (rev 804) +++ pal-wcm/trunk/src/main/webapp/WEB-INF/weblogic.xml 2008-02-10 22:33:49 UTC (rev 805) @@ -0,0 +1,10 @@ + + + + + -1 + -1 + true + true + + Property changes on: pal-wcm/trunk/src/main/webapp/WEB-INF/weblogic.xml ___________________________________________________________________ Name: svn:eol-style + native From svnnotify @ sourceforge.jp Mon Feb 11 08:11:33 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Mon, 11 Feb 2008 08:11:33 +0900 Subject: [pal-cvs 3070] [806] updated methods. Message-ID: <1202685093.655614.20473.nullmailer@users.sourceforge.jp> Revision: 806 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=806 Author: shinsuke Date: 2008-02-11 08:11:33 +0900 (Mon, 11 Feb 2008) Log Message: ----------- updated methods. Modified Paths: -------------- pompei/libraries/pompei-db/trunk/src/main/java/jp/sf/pal/pompei/service/impl/CustomerServiceImpl.java pompei/libraries/pompei-db/trunk/src/test/java/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest.java pompei/libraries/pompei-db/trunk/src/test/resources/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest.xls pompei/libraries/pompei-db/trunk/src/test/resources/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest_getCustomerList_Expected.xls Added Paths: ----------- pompei/libraries/pompei-db/trunk/src/test/resources/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest_getAddressBookList_Expected.xls -------------- next part -------------- Modified: pompei/libraries/pompei-db/trunk/src/main/java/jp/sf/pal/pompei/service/impl/CustomerServiceImpl.java =================================================================== --- pompei/libraries/pompei-db/trunk/src/main/java/jp/sf/pal/pompei/service/impl/CustomerServiceImpl.java 2008-02-10 22:33:49 UTC (rev 805) +++ pompei/libraries/pompei-db/trunk/src/main/java/jp/sf/pal/pompei/service/impl/CustomerServiceImpl.java 2008-02-10 23:11:33 UTC (rev 806) @@ -1,13 +1,18 @@ package jp.sf.pal.pompei.service.impl; import java.math.BigDecimal; +import java.sql.Timestamp; +import java.util.Calendar; import java.util.List; import java.util.Map; import jp.sf.pal.pompei.PompeiDBConstants; import jp.sf.pal.pompei.PompeiDBException; +import jp.sf.pal.pompei.cbean.AddressBookCB; +import jp.sf.pal.pompei.cbean.BasketCB; import jp.sf.pal.pompei.cbean.CustomerCB; import jp.sf.pal.pompei.exbhv.AddressBookBhv; +import jp.sf.pal.pompei.exbhv.BasketBhv; import jp.sf.pal.pompei.exbhv.CustomerBhv; import jp.sf.pal.pompei.exentity.AddressBook; import jp.sf.pal.pompei.exentity.Basket; @@ -22,6 +27,8 @@ private AddressBookBhv addressBookBhv; + private BasketBhv basketBhv; + public List getCustomerList() { CustomerCB customerCB = new CustomerCB(); customerCB.query().addOrderBy_LastnameDescription_Asc(); @@ -34,8 +41,8 @@ getAddressBookBhv().insert(addressBook); } - public void addBasket(Basket customerBaskets) { - // TODO Auto-generated method stub + public void addBasket(Basket basket) { + getBasketBhv().insert(basket); } @@ -51,42 +58,260 @@ public void addCustomer(Map userInfo, Customer customers, AddressBook addressBook) throws PompeiDBException { - // TODO Auto-generated method stub - + // String password = userInfo.remove(PompeiDBConstants.USER_PASSWORD); + // String verifyPassword = userInfo + // .remove(PompeiDBConstants.USER_VERIFY_PASSWORD); + // if (!UserRegistrationUtil + // .getBoolean(PompeiDBConstants.FORCE_GENERATED_PASSWORD)) { + // if (password == null || password.equals("")) { + // throw new PompeiDBException("error.lacking.password", + // "The password is null."); + // } + // } + // + // if (UserRegistrationUtil + // .getBoolean(PompeiDBConstants.FORCE_USE_EMAIL_AS_USERNAME)) { + // // force user.name to be same as email + // userInfo.put(PompeiDBConstants.USER_NAME, userInfo + // .get(PompeiDBConstants.USER_BUSINESS_INFO_ONLINE_EMAIL)); + // } + // + // boolean userIdExistsFlag = true; + // try { + // SystemUtil.getUserManager().getUser( + // userInfo.get(PompeiDBConstants.USER_NAME)); + // } catch (org.apache.jetspeed.security.SecurityException e) { + // userIdExistsFlag = false; + // } + // + // if (userIdExistsFlag) { + // throw new PompeiDBException("error.userid_already_exists", + // "The user id already exists."); + // } + // + // if (UserRegistrationUtil.getBoolean(PompeiDBConstants.FORCE_UNIQUE_EMAIL)) { + // boolean emailExistsFlag = true; + // User user = null; + // try { + // user = SystemUtil + // .getPortalAdministration() + // .lookupUserFromEmail( + // userInfo + // .get(PompeiDBConstants.USER_BUSINESS_INFO_ONLINE_EMAIL)); + // } catch (AdministrationEmailException e) { + // emailExistsFlag = false; + // } + // if ((emailExistsFlag) || (user != null)) { + // throw new PompeiDBException("error.email_already_exists", + // "The email already exists."); + // } + // + // } + // + // if (UserRegistrationUtil + // .getBoolean(PompeiDBConstants.FORCE_GENERATED_PASSWORD)) { + // try { + // password = SystemUtil.getPortalAdministration() + // .generatePassword(); + // } catch (Exception e) { + // throw new PompeiDBException("error.failed_to_generate_password", + // "Could not create password.", e); + // } + // } else { + // if (verifyPassword == null || !verifyPassword.equals(password)) { + // throw new PompeiDBException("error.two_passwords_do_not_match", + // "Two passwords do not match."); + // } + // } + // + // String userName = userInfo.get(PompeiDBConstants.USER_NAME); + // Customer c=getCustomerByPortalId(userName); + // if(c!=null){ + // deleteCustomer(c.getCustomerId()); + // } + // + // try { + // SystemUtil.getPortalAdministration().registerUser( + // userName, + // password, + // UserRegistrationUtil.getStringList(PompeiDBConstants.ROLES), + // UserRegistrationUtil.getStringList(PompeiDBConstants.GROUPS), + // userInfo, // note use of only + // // PLT.D values here. + // UserRegistrationUtil.getStringMap(PompeiDBConstants.RULES), + // PompeiDBConstants.DEFAULT_USER_TEMPLATE_FOLDER); // TODO default template path + // } catch (Exception e) { + // cancelToAddCustomer(userInfo, customer, addressBook); + // throw new PompeiDBException("error.failed_to_add", + // "Could not register a user.", e); + // } + // + // // set security constraint + // String userhome = Folder.USER_FOLDER + userName; + // try { + // PageManager pageManager = SystemUtil.getPageManager(); + // SecurityConstraint sc = pageManager.newPageSecurityConstraint(); + // sc.setUsers(parseCSVList(userName)); + // List permissions = new ArrayList(); + // permissions.add(JetspeedActions.VIEW); + // permissions.add(JetspeedActions.EDIT); + // permissions.add(JetspeedActions.HELP); + // sc.setPermissions(permissions); + // Folder userFolder = pageManager.getFolder(userhome); + // + // if (userFolder.getSecurityConstraints() == null) { + // userFolder.setSecurityConstraints(pageManager + // .newSecurityConstraints()); + // } + // userFolder.getSecurityConstraints().getSecurityConstraints() + // .add(sc); + // + // pageManager.updateFolder(userFolder); + // pageManager.reset(); + // } catch (Exception e) { + // cancelToAddCustomer(userInfo, customer, addressBook); + // throw new PompeiDBException("could.not.access.folder", + // "Could not access a folder: " + userhome, e); + // } + // + // // set portal id + // customer.setPortalId(userName); + // + // try { + // // create customer + // getCustomerBhv().insert(customer); + // addressBook.setCustomerId(customer.getCustomerId()); + // getAddressBookBhv().insert(addressBook); + // } catch (Exception e) { + // cancelToAddCustomer(userInfo, customer, addressBook); + // throw new PompeiDBException("could.not.insert.customer.data", + // "Could not insert customer data. ", e); + // } + // + // if (UserRegistrationUtil.getBoolean(PompeiDBConstants.SEND_MAIL)) { + // if (password != null) { + // userInfo.put("password", password); + // } + // + // try { + // // template + // // String templ = getTemplatePath(FacesContext + // // .getCurrentInstance()); + // // + // // if (templ == null) { + // // cancelToAddCustomer(userInfo, customer, addressBook); + // // throw new PompeiDBException( + // // "error.registration_completed_but_could_not_find_template", + // // "Email template is not available."); + // // } + // // SystemUtil + // // .getPortalAdministration() + // // .sendEmail( + // // (PortletConfig) FacesContext + // // .getCurrentInstance() + // // .getExternalContext().getRequestMap() + // // .get("javax.portlet.PortletConfig"), + // // userInfo + // // .get(PompeiDBConstants.USER_BUSINESS_INFO_ONLINE_EMAIL), + // // emailSubject, templ, userInfo); + // //TODO move user-signup.vm to init-param + //// sendSignupMail(userInfo, userInfo + //// .get(PompeiDBConstants.USER_BUSINESS_INFO_ONLINE_EMAIL), + //// SystemUtil.getAdministratorEmail(), "user-signup.vm"); + // } catch (Exception e) { + // cancelToAddCustomer(userInfo, customer, addressBook); + // throw new PompeiDBException( + // "error.registration_completed_but_could_not_send", + // "Could not send a registration mail.", e); + // } + // } } public void cleanupBasket(BigDecimal customerId) { - // TODO Auto-generated method stub + // TODO set expire time + Calendar yesterday = Calendar.getInstance(); + yesterday.add(Calendar.DATE, -1); + BasketCB basketCB = new BasketCB(); + basketCB.query().setCustomerId_Equal(customerId); + basketCB.query().setUpdatedDate_LessEqual( + new Timestamp(yesterday.getTimeInMillis())); + List basketList = getBasketBhv().selectList(basketCB); + if (basketList.size() > 0) { + getBasketBhv().delegateDeleteList(basketList); + } } public void deleteAddressBook(AddressBook addressBook) { getAddressBookBhv().delete(addressBook); } - public void deleteBasket(BigDecimal customerBasketId) { - // TODO Auto-generated method stub + public void deleteBasket(Basket basket) { + getBasketBhv().delete(basket); } + public void deleteBasket(BigDecimal basketId) { + BasketCB cb = new BasketCB(); + cb.query().setBasketId_Equal(basketId); + Basket basket = getBasketBhv().selectEntity(cb); + getBasketBhv().delete(basket); + + } + public void deleteCustomer(BigDecimal customersId) { - // TODO Auto-generated method stub + Customer customer = getCustomer(customersId); + // address book + AddressBookCB addressBookCB = new AddressBookCB(); + addressBookCB.query().setCustomerId_Equal(customer.getCustomerId()); + List addressBookList = addressBookBhv + .selectList(addressBookCB); + if (addressBookList != null && !addressBookList.isEmpty()) { + addressBookBhv.delegateDeleteList(addressBookList); + } + + // basket + BasketCB basketCB = new BasketCB(); + basketCB.query().setCustomerId_Equal(customer.getCustomerId()); + List basketList = getBasketBhv().selectList(basketCB); + if (basketList != null && !basketList.isEmpty()) { + getBasketBhv().delegateDeleteList(basketList); + } + + customerBhv.delete(customer); } public AddressBook getAddressBook(BigDecimal addressBookId) { - // TODO Auto-generated method stub - return null; + AddressBookCB cb = new AddressBookCB(); + cb.setupSelect_Customer(); + //TODO needed? + cb.setupSelect_Country(); + // needed(for tax) + cb.setupSelect_DeliveryZone(); + cb.query().setAddressBookId_Equal(addressBookId); + return getAddressBookBhv().selectEntity(cb); } public List getAddressBookList(BigDecimal customerId) { - // TODO Auto-generated method stub - return null; + AddressBookCB cb = new AddressBookCB(); + cb.setupSelect_Customer(); + //TODO needed? + cb.setupSelect_Country(); + // needed(for tax) + cb.setupSelect_DeliveryZone(); + cb.query().setCustomerId_Equal(customerId); + return getAddressBookBhv().selectList(cb); } public Basket getBasket(BigDecimal customerId, BigDecimal productId) { // TODO Auto-generated method stub - return null; + BasketCB cb = new BasketCB(); + cb.setupSelect_Customer(); + cb.setupSelect_Product(); + cb.query().setCustomerId_Equal(customerId); + cb.query().setProductId_Equal(productId); + return getBasketBhv().selectEntity(cb); } public List getBasketList(BigDecimal customerId) { @@ -95,28 +320,53 @@ } public Customer getCustomer(BigDecimal customersId) { - // TODO Auto-generated method stub - return null; + CustomerCB cb = new CustomerCB(); + cb.query().setCustomerId_Equal(customersId); + Customer customers = customerBhv.selectEntity(cb); + return customers; } public Customer getCustomerByPortalId(String portalId) { - // TODO Auto-generated method stub - return null; + CustomerCB cb = new CustomerCB(); + // cb.setupSelect_CustomerInfoAsOne(); + cb.query().setPortalId_Equal(portalId); + List customers = customerBhv.selectList(cb); + if (customers.isEmpty()) { + return null; + } + return customers.get(0); } public AddressBook getDefaultAddressBook(BigDecimal customerId) { - // TODO Auto-generated method stub + AddressBookCB cb = new AddressBookCB(); + //TODO needed? + cb.setupSelect_Customer(); + //TODO needed? + cb.setupSelect_Country(); + // needed(for tax) + cb.setupSelect_DeliveryZone(); + //TODO needed? + + cb.query().setCustomerId_Equal(customerId); + for (AddressBook ab : getAddressBookBhv().selectList(cb)) { + if (PompeiDBConstants.TRUE.equals(ab.getDefaultAddress())) { + return ab; + } + } return null; } - public void updateBasket(Basket customerBasket) { - // TODO Auto-generated method stub + public void updateBasket(Basket basket) { + getBasketBhv().update(basket); } public void updateCustomer(Customer customer, AddressBook addressBook) { - // TODO Auto-generated method stub + getCustomerBhv().update(customer); + if (addressBook != null) { + getAddressBookBhv().update(addressBook); + } } public CustomerBhv getCustomerBhv() { @@ -134,4 +384,13 @@ public void setAddressBookBhv(AddressBookBhv addressBookBhv) { this.addressBookBhv = addressBookBhv; } + + public BasketBhv getBasketBhv() { + return basketBhv; + } + + public void setBasketBhv(BasketBhv basketBhv) { + this.basketBhv = basketBhv; + } + } Modified: pompei/libraries/pompei-db/trunk/src/test/java/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest.java =================================================================== --- pompei/libraries/pompei-db/trunk/src/test/java/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest.java 2008-02-10 22:33:49 UTC (rev 805) +++ pompei/libraries/pompei-db/trunk/src/test/java/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest.java 2008-02-10 23:11:33 UTC (rev 806) @@ -2,8 +2,10 @@ import static org.seasar.framework.unit.S2Assert.assertEquals; +import java.math.BigDecimal; import java.util.List; +import jp.sf.pal.pompei.exentity.AddressBook; import jp.sf.pal.pompei.exentity.Customer; import jp.sf.pal.pompei.service.CustomerService; @@ -21,4 +23,10 @@ List customerList = customerService.getCustomerList(); assertEquals("1", ctx.getExpected(), customerList); } + + public void getAddressBookList() throws Exception { + List addressBookList = customerService + .getAddressBookList(BigDecimal.ONE); + assertEquals("1", ctx.getExpected(), addressBookList); + } } Modified: pompei/libraries/pompei-db/trunk/src/test/resources/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest.xls =================================================================== (Binary files differ) Added: pompei/libraries/pompei-db/trunk/src/test/resources/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest_getAddressBookList_Expected.xls =================================================================== (Binary files differ) Property changes on: pompei/libraries/pompei-db/trunk/src/test/resources/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest_getAddressBookList_Expected.xls ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: pompei/libraries/pompei-db/trunk/src/test/resources/jp/sf/pal/pompei/service/impl/CustomerServiceImplTest_getCustomerList_Expected.xls =================================================================== (Binary files differ) From svnnotify @ sourceforge.jp Fri Feb 15 08:01:30 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Fri, 15 Feb 2008 08:01:30 +0900 Subject: [pal-cvs 3071] [807] updated revision(fixed JS2-852) Message-ID: <1203030090.589709.22546.nullmailer@users.sourceforge.jp> Revision: 807 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=807 Author: shinsuke Date: 2008-02-15 08:01:30 +0900 (Fri, 15 Feb 2008) Log Message: ----------- updated revision(fixed JS2-852) Modified Paths: -------------- pal-portal/trunk/build.properties -------------- next part -------------- Modified: pal-portal/trunk/build.properties =================================================================== --- pal-portal/trunk/build.properties 2008-02-10 23:11:33 UTC (rev 806) +++ pal-portal/trunk/build.properties 2008-02-14 23:01:30 UTC (rev 807) @@ -4,7 +4,7 @@ container.name=PAL Portal container.separator=/ container.version.major=1 -container.version.minor=0.2 +container.version.minor=0.3-dev container.info.file=commons/src/java/org/apache/jetspeed/container/resources/ContainerInfo.properties portlets.home=${basedir}/portlets portlets.build.dir=${portlets.home}/build @@ -57,8 +57,9 @@ # Jetspeed SVN revision #jetspeed2.svn.repository=http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/ -jetspeed2.svn.repository=http://svn.apache.org/repos/asf/portals/jetspeed-2/branches/JETSPEED-2.1.3/ -jetspeed2.revision=606388 +#jetspeed2.svn.repository=http://svn.apache.org/repos/asf/portals/jetspeed-2/branches/JETSPEED-2.1.3/ +jetspeed2.svn.repository=http://svn.apache.org/repos/asf/portals/jetspeed-2/branches/JETSPEED-2.1.3-POSTRELEASE/ +jetspeed2.revision=619718 # Dependencies for Jetspeed jetspeed.version=2.1.3_pal-${portal.version} From svnnotify @ sourceforge.jp Fri Feb 15 12:13:53 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Fri, 15 Feb 2008 12:13:53 +0900 Subject: [pal-cvs 3072] [808] added db setup page. Message-ID: <1203045233.218828.31766.nullmailer@users.sourceforge.jp> Revision: 808 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=808 Author: shinsuke Date: 2008-02-15 12:13:52 +0900 (Fri, 15 Feb 2008) Log Message: ----------- added db setup page. Modified Paths: -------------- pal-portal/trunk/docs/ja/installation-guide/xdocs/guide-gui-install-steps.xml pal-portal/trunk/docs/ja/installation-guide/xdocs/navigation.xml Added Paths: ----------- pal-portal/trunk/docs/ja/installation-guide/xdocs/guide-gui-install-dbsetup.xml -------------- next part -------------- Added: pal-portal/trunk/docs/ja/installation-guide/xdocs/guide-gui-install-dbsetup.xml =================================================================== --- pal-portal/trunk/docs/ja/installation-guide/xdocs/guide-gui-install-dbsetup.xml 2008-02-14 23:01:30 UTC (rev 807) +++ pal-portal/trunk/docs/ja/installation-guide/xdocs/guide-gui-install-dbsetup.xml 2008-02-15 03:13:52 UTC (rev 808) @@ -0,0 +1,63 @@ + + + + + PALポータル インストールガイド + GUI によるインストール時の DB 設定 + + + + + +
+

+ デフォルトの Derby 以外のデータベースを利用する場合は、GUI によるインストール手順の「データベースの選択」で利用したいデータベースを選択してください。 + 利用するデータベースは、インストール前に環境構築されている必要があります。 + インストールプロセスの中で、データベース内にテーブルや必要な情報が挿入されます。 +

+ +

+ 今回は、MySQL を例に進めていきますので、「MySql」を選択して、「次へ」ボタンをクリックします。 +

+
+
+

+ 利用するデータベースのパラメータを設定します。 +

+ +

+ 「データベースユーザ名」と「データベースパスワード」はデータベースにアクセスするためのユーザー名とパスワードになります。 + 「JDBC接続文字列」はデータベースへのアクセスするパスになります。 + 「JDBCドライバクラス名」と「JDBCドライバ」は利用するデータベースのドキュメントを参照してください。 +

+

+ 設定後、「次へ」ボタンをクリックします。 +

+
+
+

+ 設定した DB パラメータの確認をします。 +

+ +

+ 「次へ」ボタンをクリックしてください。 + 設定が正しくない場合はエラーが表示されるので、再度、設定したパラメータを確認してください。 + データベースに正常に接続できた場合は、GUI によるインストール手順の「インストール前の確認」になります。 +

+
+ +
Property changes on: pal-portal/trunk/docs/ja/installation-guide/xdocs/guide-gui-install-dbsetup.xml ___________________________________________________________________ Name: svn:eol-style + native Modified: pal-portal/trunk/docs/ja/installation-guide/xdocs/guide-gui-install-steps.xml =================================================================== --- pal-portal/trunk/docs/ja/installation-guide/xdocs/guide-gui-install-steps.xml 2008-02-14 23:01:30 UTC (rev 807) +++ pal-portal/trunk/docs/ja/installation-guide/xdocs/guide-gui-install-steps.xml 2008-02-15 03:13:52 UTC (rev 808) @@ -109,13 +109,13 @@

利用するデータベースを指定します。 デフォルトの DB を利用する場合は、Derby を選択してください。 + Derby 以外のデータベースを利用する場合は、「GUI インストールの DB 設定」を参照してください。

「次へ」ボタンをクリックします。

-

インストールを実行する前に、インストール先のディレクトリを確認してください。 Modified: pal-portal/trunk/docs/ja/installation-guide/xdocs/navigation.xml =================================================================== --- pal-portal/trunk/docs/ja/installation-guide/xdocs/navigation.xml 2008-02-14 23:01:30 UTC (rev 807) +++ pal-portal/trunk/docs/ja/installation-guide/xdocs/navigation.xml 2008-02-15 03:13:52 UTC (rev 808) @@ -26,6 +26,7 @@

+ From svnnotify @ sourceforge.jp Thu Feb 21 21:46:21 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Thu, 21 Feb 2008 21:46:21 +0900 Subject: [pal-cvs 3073] [809] glassfish support Message-ID: <1203597981.132325.26516.nullmailer@users.sourceforge.jp> Revision: 809 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=809 Author: shinsuke Date: 2008-02-21 21:46:20 +0900 (Thu, 21 Feb 2008) Log Message: ----------- glassfish support Added Paths: ----------- pal-admin/trunk/src/main/webapp/WEB-INF/sun-web.xml -------------- next part -------------- Added: pal-admin/trunk/src/main/webapp/WEB-INF/sun-web.xml =================================================================== --- pal-admin/trunk/src/main/webapp/WEB-INF/sun-web.xml 2008-02-15 03:13:52 UTC (rev 808) +++ pal-admin/trunk/src/main/webapp/WEB-INF/sun-web.xml 2008-02-21 12:46:20 UTC (rev 809) @@ -0,0 +1,7 @@ + + + + + + Property changes on: pal-admin/trunk/src/main/webapp/WEB-INF/sun-web.xml ___________________________________________________________________ Name: svn:eol-style + native From svnnotify @ sourceforge.jp Thu Feb 21 21:47:30 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Thu, 21 Feb 2008 21:47:30 +0900 Subject: [pal-cvs 3074] [810] updated teeda version. Message-ID: <1203598050.034870.26851.nullmailer@users.sourceforge.jp> Revision: 810 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=810 Author: shinsuke Date: 2008-02-21 21:47:29 +0900 (Thu, 21 Feb 2008) Log Message: ----------- updated teeda version. Modified Paths: -------------- pal-admin/trunk/.classpath pal-admin/trunk/pom.xml -------------- next part -------------- Modified: pal-admin/trunk/.classpath =================================================================== --- pal-admin/trunk/.classpath 2008-02-21 12:46:20 UTC (rev 809) +++ pal-admin/trunk/.classpath 2008-02-21 12:47:29 UTC (rev 810) @@ -7,34 +7,32 @@ - - - - - + + + - - + - + - + + - - + + - - - + + + Modified: pal-admin/trunk/pom.xml =================================================================== --- pal-admin/trunk/pom.xml 2008-02-21 12:46:20 UTC (rev 809) +++ pal-admin/trunk/pom.xml 2008-02-21 12:47:29 UTC (rev 810) @@ -141,17 +141,17 @@ org.seasar.teeda teeda-core - 1.0.12-rc1 + 1.0.13-rc1 org.seasar.teeda teeda-extension - 1.0.12-rc1 + 1.0.13-rc1 org.seasar.teeda teeda-tiger - 1.0.12-rc1 + 1.0.12-sp1 org.apache.geronimo.specs @@ -202,19 +202,14 @@ 0.2 - jp.sf.pal - jsf4portlet - 0.1 - - commons-fileupload commons-fileupload - 1.1.1 + 1.2 commons-io commons-io - 1.1 + 1.3.2 commons-lang From svnnotify @ sourceforge.jp Thu Feb 21 21:48:28 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Thu, 21 Feb 2008 21:48:28 +0900 Subject: [pal-cvs 3075] [811] replaced with teeda fileupload. Message-ID: <1203598108.404757.27709.nullmailer@users.sourceforge.jp> Revision: 811 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=811 Author: shinsuke Date: 2008-02-21 21:48:27 +0900 (Thu, 21 Feb 2008) Log Message: ----------- replaced with teeda fileupload. Modified Paths: -------------- pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PortletDeploymentService.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/DeployerEditPage.java pal-admin/trunk/src/main/webapp/WEB-INF/portlet.xml pal-admin/trunk/src/main/webapp/view/deployer/deployerEdit.html -------------- next part -------------- Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PortletDeploymentService.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PortletDeploymentService.java 2008-02-21 12:47:29 UTC (rev 810) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PortletDeploymentService.java 2008-02-21 12:48:27 UTC (rev 811) @@ -39,7 +39,7 @@ import jp.sf.pal.admin.web.deployer.RemotePortletDeployConfirmPage; import jp.sf.pal.admin.web.deployer.RemotePortletListPage; -import jp.sf.pal.jsf.custom.fileupload.UploadedFile; +import org.seasar.teeda.extension.util.UploadedFile; public class PortletDeploymentService implements Serializable { /** Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/DeployerEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/DeployerEditPage.java 2008-02-21 12:47:29 UTC (rev 810) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/DeployerEditPage.java 2008-02-21 12:48:27 UTC (rev 811) @@ -23,7 +23,7 @@ import jp.sf.pal.admin.service.PortletDeploymentService; import jp.sf.pal.admin.web.AbstractCrudPage; -import jp.sf.pal.jsf.custom.fileupload.UploadedFile; +import org.seasar.teeda.extension.util.UploadedFile; public class DeployerEditPage extends AbstractCrudPage implements Serializable { /** Modified: pal-admin/trunk/src/main/webapp/WEB-INF/portlet.xml =================================================================== --- pal-admin/trunk/src/main/webapp/WEB-INF/portlet.xml 2008-02-21 12:47:29 UTC (rev 810) +++ pal-admin/trunk/src/main/webapp/WEB-INF/portlet.xml 2008-02-21 12:48:27 UTC (rev 811) @@ -65,9 +65,13 @@ portlet-filters - jp.sf.pal.admin.filter.PortletManagementFilter,jp.sf.pal.facesresponse.FacesResponseFilter,jp.sf.pal.pooptimizer.OptimizerFilter,org.seasar.portlet.filter.S2PortletFilter,org.seasar.portlet.filter.HotdeployPortletFilter,jp.sf.pal.jsf.filter.FileUploadPortletFilter + jp.sf.pal.admin.filter.PortletManagementFilter,jp.sf.pal.facesresponse.FacesResponseFilter,jp.sf.pal.pooptimizer.OptimizerFilter,org.seasar.portlet.filter.S2PortletFilter,org.seasar.portlet.filter.HotdeployPortletFilter,org.seasar.teeda.extension.portlet.MultipartFormDataFilter + org.seasar.teeda.extension.portlet.MultipartFormDataFilter:encoding + UTF-8 + + view-page /view/portletmanager/portletList.html Modified: pal-admin/trunk/src/main/webapp/view/deployer/deployerEdit.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/deployer/deployerEdit.html 2008-02-21 12:47:29 UTC (rev 810) +++ pal-admin/trunk/src/main/webapp/view/deployer/deployerEdit.html 2008-02-21 12:48:27 UTC (rev 811) @@ -1,6 +1,6 @@ - + @@ -38,7 +38,7 @@ - + From svnnotify @ sourceforge.jp Thu Feb 21 21:49:34 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Thu, 21 Feb 2008 21:49:34 +0900 Subject: [pal-cvs 3076] [812] glassfish support Message-ID: <1203598174.686645.27926.nullmailer@users.sourceforge.jp> Revision: 812 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=812 Author: shinsuke Date: 2008-02-21 21:49:34 +0900 (Thu, 21 Feb 2008) Log Message: ----------- glassfish support Added Paths: ----------- pal-wcm/trunk/src/main/webapp/WEB-INF/sun-web.xml -------------- next part -------------- Added: pal-wcm/trunk/src/main/webapp/WEB-INF/sun-web.xml =================================================================== --- pal-wcm/trunk/src/main/webapp/WEB-INF/sun-web.xml 2008-02-21 12:48:27 UTC (rev 811) +++ pal-wcm/trunk/src/main/webapp/WEB-INF/sun-web.xml 2008-02-21 12:49:34 UTC (rev 812) @@ -0,0 +1,6 @@ + + + + + Property changes on: pal-wcm/trunk/src/main/webapp/WEB-INF/sun-web.xml ___________________________________________________________________ Name: svn:eol-style + native From svnnotify @ sourceforge.jp Fri Feb 22 12:08:49 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Fri, 22 Feb 2008 12:08:49 +0900 Subject: [pal-cvs 3077] [813] added glassfish support. Message-ID: <1203649729.426278.15534.nullmailer@users.sourceforge.jp> Revision: 813 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=813 Author: shinsuke Date: 2008-02-22 12:08:45 +0900 (Fri, 22 Feb 2008) Log Message: ----------- added glassfish support. Added Paths: ----------- pal-portal/trunk/components/ pal-portal/trunk/components/jetspeed-security-glassfish/ pal-portal/trunk/components/jetspeed-security-glassfish/.classpath pal-portal/trunk/components/jetspeed-security-glassfish/.project pal-portal/trunk/components/jetspeed-security-glassfish/lib/ pal-portal/trunk/components/jetspeed-security-glassfish/lib/appserv-rt.jar pal-portal/trunk/components/jetspeed-security-glassfish/pom.xml pal-portal/trunk/components/jetspeed-security-glassfish/src/ pal-portal/trunk/components/jetspeed-security-glassfish/src/main/ pal-portal/trunk/components/jetspeed-security-glassfish/src/main/java/ pal-portal/trunk/components/jetspeed-security-glassfish/src/main/java/org/ pal-portal/trunk/components/jetspeed-security-glassfish/src/main/java/org/apache/ pal-portal/trunk/components/jetspeed-security-glassfish/src/main/java/org/apache/jetspeed/ pal-portal/trunk/components/jetspeed-security-glassfish/src/main/java/org/apache/jetspeed/security/ pal-portal/trunk/components/jetspeed-security-glassfish/src/main/java/org/apache/jetspeed/security/impl/ pal-portal/trunk/components/jetspeed-security-glassfish/src/main/java/org/apache/jetspeed/security/impl/GlassFishLoginModule.java pal-portal/trunk/components/jetspeed-security-glassfish/src/main/java/org/apache/jetspeed/security/impl/GlassFishRealm.java pal-portal/trunk/portal/files/components/portal/src/java/org/apache/jetspeed/container/ pal-portal/trunk/portal/files/components/portal/src/java/org/apache/jetspeed/container/url/ pal-portal/trunk/portal/files/components/portal/src/java/org/apache/jetspeed/container/url/impl/ pal-portal/trunk/portal/files/components/portal/src/java/org/apache/jetspeed/container/url/impl/GlassFishPathInfoEncodingPortalURL.java pal-portal/trunk/portal/files/components/portal/src/java/org/apache/jetspeed/tools/ pal-portal/trunk/portal/files/components/portal/src/java/org/apache/jetspeed/tools/pamanager/ pal-portal/trunk/portal/files/components/portal/src/java/org/apache/jetspeed/tools/pamanager/servletcontainer/ pal-portal/trunk/portal/files/components/portal/src/java/org/apache/jetspeed/tools/pamanager/servletcontainer/GlassFishManager.java pal-portal/trunk/portal/files/src/webapp/WEB-INF/sun-web.xml -------------- next part -------------- Added: pal-portal/trunk/components/jetspeed-security-glassfish/.classpath =================================================================== --- pal-portal/trunk/components/jetspeed-security-glassfish/.classpath 2008-02-21 12:49:34 UTC (rev 812) +++ pal-portal/trunk/components/jetspeed-security-glassfish/.classpath 2008-02-22 03:08:45 UTC (rev 813) @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Property changes on: pal-portal/trunk/components/jetspeed-security-glassfish/.classpath ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/components/jetspeed-security-glassfish/.project =================================================================== --- pal-portal/trunk/components/jetspeed-security-glassfish/.project 2008-02-21 12:49:34 UTC (rev 812) +++ pal-portal/trunk/components/jetspeed-security-glassfish/.project 2008-02-22 03:08:45 UTC (rev 813) @@ -0,0 +1,14 @@ + + jetspeed-security-glassfish + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.jdt.core.javanature + + \ No newline at end of file Property changes on: pal-portal/trunk/components/jetspeed-security-glassfish/.project ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/components/jetspeed-security-glassfish/lib/appserv-rt.jar =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/components/jetspeed-security-glassfish/lib/appserv-rt.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: pal-portal/trunk/components/jetspeed-security-glassfish/pom.xml =================================================================== --- pal-portal/trunk/components/jetspeed-security-glassfish/pom.xml 2008-02-21 12:49:34 UTC (rev 812) +++ pal-portal/trunk/components/jetspeed-security-glassfish/pom.xml 2008-02-22 03:08:45 UTC (rev 813) @@ -0,0 +1,36 @@ + + + 4.0.0 + org.apache.portals.jetspeed-2 + jetspeed-security-glassfish + jar + 2.1.3 + jetspeed-security-glassfish + + + com.sun.appserv + appserv-rt + 2.0 + system + ${basedir}/lib/appserv-rt.jar + + + org.apache.portals.jetspeed-2 + jetspeed-api + 2.1.3 + provided + + + org.apache.portals.jetspeed-2 + jetspeed-security + 2.1.3 + provided + + + junit + junit + 3.8.1 + test + + + Property changes on: pal-portal/trunk/components/jetspeed-security-glassfish/pom.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/components/jetspeed-security-glassfish/src/main/java/org/apache/jetspeed/security/impl/GlassFishLoginModule.java =================================================================== --- pal-portal/trunk/components/jetspeed-security-glassfish/src/main/java/org/apache/jetspeed/security/impl/GlassFishLoginModule.java 2008-02-21 12:49:34 UTC (rev 812) +++ pal-portal/trunk/components/jetspeed-security-glassfish/src/main/java/org/apache/jetspeed/security/impl/GlassFishLoginModule.java 2008-02-22 03:08:45 UTC (rev 813) @@ -0,0 +1,95 @@ +package org.apache.jetspeed.security.impl; + +import java.security.Principal; +import java.util.List; + +import javax.security.auth.Subject; +import javax.security.auth.login.FailedLoginException; +import javax.security.auth.login.LoginException; + +import org.apache.jetspeed.security.LoginModuleProxy; +import org.apache.jetspeed.security.RolePrincipal; +import org.apache.jetspeed.security.SecurityException; +import org.apache.jetspeed.security.SecurityHelper; +import org.apache.jetspeed.security.User; +import org.apache.jetspeed.security.UserManager; +import org.apache.jetspeed.security.UserPrincipal; + +import com.sun.appserv.security.AppservPasswordLoginModule; + +public class GlassFishLoginModule extends AppservPasswordLoginModule { + /**

InternalUserPrincipal manager service.

*/ + protected UserManager userManager; + + /** The portal user role. */ + protected String portalUserRole; + + public GlassFishLoginModule() { + LoginModuleProxy loginModuleProxy = LoginModuleProxyImpl.loginModuleProxy; + if (loginModuleProxy != null) { + this.userManager = loginModuleProxy.getUserManager(); + this.portalUserRole = loginModuleProxy.getPortalUserRole(); + } + + } + + protected void authenticateUser() throws LoginException { + + refreshProxy(); + boolean success = userManager.authenticate(_username, _password); + if (!success) { + throw new FailedLoginException( + "Authentication failed: Password does not match"); + } + + try { + commitPrincipals(_subject, userManager.getUser(_username)); + } catch (SecurityException e) { + throw new LoginException(e.getMessage()); + } + + } + + protected void refreshProxy() { + if (this.userManager == null) { + LoginModuleProxy loginModuleProxy = LoginModuleProxyImpl.loginModuleProxy; + if (loginModuleProxy != null) { + this.userManager = loginModuleProxy.getUserManager(); + } + } + } + + protected void commitPrincipals(Subject subject, User user) { + // add user specific portal user name and roles + subject.getPrincipals().add(getUserPrincipal(user)); + subject.getPrincipals().addAll(getUserRolePrincipals(user)); + + // add portal user role: used in web.xml authorization to + // detect authenticated portal users + subject.getPrincipals().add(new RolePrincipalImpl(portalUserRole)); + + commitUserAuthentication(getUserRoles(user)); + } + + protected Principal getUserPrincipal(User user) { + return SecurityHelper.getPrincipal(user.getSubject(), + UserPrincipal.class); + } + + protected List getUserRolePrincipals(User user) { + return SecurityHelper.getPrincipals(user.getSubject(), + RolePrincipal.class); + } + + protected String[] getUserRoles(User user) { + List rolePrincipals = getUserRolePrincipals(user); + int size = rolePrincipals.size() + 1; + String[] roles = new String[size]; + for (int i = 0; i < size - 1; i++) { + roles[i] = ((Principal) rolePrincipals.get(i)).getName(); + } + roles[size -1] = portalUserRole; + return roles; + } + +} Property changes on: pal-portal/trunk/components/jetspeed-security-glassfish/src/main/java/org/apache/jetspeed/security/impl/GlassFishLoginModule.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/components/jetspeed-security-glassfish/src/main/java/org/apache/jetspeed/security/impl/GlassFishRealm.java =================================================================== --- pal-portal/trunk/components/jetspeed-security-glassfish/src/main/java/org/apache/jetspeed/security/impl/GlassFishRealm.java 2008-02-21 12:49:34 UTC (rev 812) +++ pal-portal/trunk/components/jetspeed-security-glassfish/src/main/java/org/apache/jetspeed/security/impl/GlassFishRealm.java 2008-02-22 03:08:45 UTC (rev 813) @@ -0,0 +1,74 @@ +package org.apache.jetspeed.security.impl; + +import java.util.Enumeration; +import java.util.Properties; + +import com.sun.appserv.security.AppservRealm; +import com.sun.enterprise.security.auth.realm.BadRealmException; +import com.sun.enterprise.security.auth.realm.InvalidOperationException; +import com.sun.enterprise.security.auth.realm.NoSuchRealmException; +import com.sun.enterprise.security.auth.realm.NoSuchUserException; + +public class GlassFishRealm extends AppservRealm { + private static String AUTH_TYPE = "Jetspeed"; + + private static String AUTH_TYPE_PARAM = "auth-type"; + + private String authType = null; + + // protected UserManager userManager; + + public GlassFishRealm() { + // LoginModuleProxy loginModuleProxy = LoginModuleProxyImpl.loginModuleProxy; + // if (loginModuleProxy != null) { + // this.userManager = loginModuleProxy.getUserManager(); + // } + } + + protected void init(Properties props) throws BadRealmException, + NoSuchRealmException { + super.init(props); + + String jaasCtx = props.getProperty(AppservRealm.JAAS_CONTEXT_PARAM); + this.setProperty(AppservRealm.JAAS_CONTEXT_PARAM, jaasCtx); + + String authTypeProp = props.getProperty(AUTH_TYPE_PARAM); + if (authTypeProp != null) { + this.authType = authTypeProp; + } else { + this.authType = AUTH_TYPE; + } + } + + public String getAuthType() { + return authType; + } + + public Enumeration getGroupNames(String arg0) + throws InvalidOperationException, NoSuchUserException { + // try { + // List rolePrincipals = getUserRolePrincipals(userManager + // .getUser(arg0)); + // int size = rolePrincipals.size(); + // Vector roles = new Vector(); + // for (int i = 0; i < size; i++) { + // roles.add(((Principal) rolePrincipals.get(i)).getName()); + // } + // return roles.elements(); + // } catch (SecurityException e) { + // throw new NoSuchUserException(e.getMessage()); + // } + try { + throw new Exception(); + } catch (Exception e) { + System.out.println("CHECK: Stacktrace..."); + e.printStackTrace(); + } + return null; + } + + // protected List getUserRolePrincipals(User user) { + // return SecurityHelper.getPrincipals(user.getSubject(), + // RolePrincipal.class); + // } +} Property changes on: pal-portal/trunk/components/jetspeed-security-glassfish/src/main/java/org/apache/jetspeed/security/impl/GlassFishRealm.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/files/components/portal/src/java/org/apache/jetspeed/container/url/impl/GlassFishPathInfoEncodingPortalURL.java =================================================================== --- pal-portal/trunk/portal/files/components/portal/src/java/org/apache/jetspeed/container/url/impl/GlassFishPathInfoEncodingPortalURL.java 2008-02-21 12:49:34 UTC (rev 812) +++ pal-portal/trunk/portal/files/components/portal/src/java/org/apache/jetspeed/container/url/impl/GlassFishPathInfoEncodingPortalURL.java 2008-02-22 03:08:45 UTC (rev 813) @@ -0,0 +1,121 @@ +package org.apache.jetspeed.container.url.impl; + +import java.io.UnsupportedEncodingException; +import java.util.Map; +import java.util.StringTokenizer; + +import javax.portlet.PortletMode; +import javax.portlet.WindowState; +import javax.servlet.http.HttpServletRequest; + +import org.apache.jetspeed.PortalContext; +import org.apache.jetspeed.container.state.NavigationalState; +import org.apache.jetspeed.container.url.BasePortalURL; +import org.apache.pluto.om.window.PortletWindow; + +public class GlassFishPathInfoEncodingPortalURL extends AbstractPortalURL { + public GlassFishPathInfoEncodingPortalURL(NavigationalState navState, + PortalContext portalContext, BasePortalURL base) { + super(navState, portalContext, base); + } + + public GlassFishPathInfoEncodingPortalURL(NavigationalState navState, + PortalContext portalContext) { + super(navState, portalContext); + } + + public GlassFishPathInfoEncodingPortalURL(String characterEncoding, + NavigationalState navState, PortalContext portalContext) { + super(characterEncoding, navState, portalContext); + } + + public GlassFishPathInfoEncodingPortalURL(HttpServletRequest request, + String characterEncoding, NavigationalState navState, + PortalContext portalContext) { + super(request, characterEncoding, navState, portalContext); + } + + protected String getNavigationalStateParameterSeparator() { + return "-"; + } + + public String createNavigationalEncoding(PortletWindow window, + Map parameters, PortletMode mode, WindowState state, boolean action) { + try { + return getNavigationalStateParameterName() + + getNavigationalStateParameterSeparator() + + getNavigationalState().encode(window, parameters, mode, + state, action); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + return ""; + } + } + + public String createNavigationalEncoding(PortletWindow window, + PortletMode mode, WindowState state) { + try { + return getNavigationalStateParameterName() + + getNavigationalStateParameterSeparator() + + getNavigationalState().encode(window, mode, state); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + return ""; + } + } + + protected void decodePathAndNavigationalState(HttpServletRequest request) { + String path = null; + String encodedNavState = null; + + String pathInfo = request.getPathInfo(); + if (pathInfo != null) { + StringTokenizer tokenizer = new StringTokenizer(request + .getPathInfo(), "/"); + StringBuffer buffer = new StringBuffer(); + String token; + boolean foundNavState = false; + String navStatePrefix = getNavigationalStateParameterName() + + getNavigationalStateParameterSeparator(); + while (tokenizer.hasMoreTokens()) { + token = tokenizer.nextToken(); + if (!foundNavState && token.startsWith(navStatePrefix)) { + foundNavState = true; + if (token.length() > navStatePrefix.length()) { + encodedNavState = token.substring(navStatePrefix + .length()); + } + } else { + buffer.append("/"); + buffer.append(token); + } + } + if (buffer.length() > 0) { + path = buffer.toString(); + } else { + path = "/"; + } + } + setPath(path); + setEncodedNavigationalState(encodedNavState); + } + + protected String createPortletURL(String encodedNavState, boolean secure) { + StringBuffer buffer = new StringBuffer(getBaseURL(secure)); + buffer.append(getBasePath()); + if (encodedNavState != null) { + buffer.append("/"); + buffer.append(getNavigationalStateParameterName()); + buffer.append(getNavigationalStateParameterSeparator()); + buffer.append(encodedNavState); + } + if (getPath() != null) { + buffer.append(getPath()); + } + return buffer.toString(); + } + + public boolean isPathInfoEncodingNavState() { + return true; + } +} Property changes on: pal-portal/trunk/portal/files/components/portal/src/java/org/apache/jetspeed/container/url/impl/GlassFishPathInfoEncodingPortalURL.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/files/components/portal/src/java/org/apache/jetspeed/tools/pamanager/servletcontainer/GlassFishManager.java =================================================================== --- pal-portal/trunk/portal/files/components/portal/src/java/org/apache/jetspeed/tools/pamanager/servletcontainer/GlassFishManager.java 2008-02-21 12:49:34 UTC (rev 812) +++ pal-portal/trunk/portal/files/components/portal/src/java/org/apache/jetspeed/tools/pamanager/servletcontainer/GlassFishManager.java 2008-02-22 03:08:45 UTC (rev 813) @@ -0,0 +1,88 @@ +package org.apache.jetspeed.tools.pamanager.servletcontainer; + +import java.io.IOException; +import java.io.InputStream; + +public class GlassFishManager implements ApplicationServerManager { + + /* (non-Javadoc) + * @see org.apache.jetspeed.tools.pamanager.servletcontainer.ApplicationServerManager#start(java.lang.String) + */ + public ApplicationServerManagerResult start(String appPath) + throws IOException { + // TODO Auto-generated method stub + return null; + } + + /* (non-Javadoc) + * @see org.apache.jetspeed.tools.pamanager.servletcontainer.ApplicationServerManager#stop(java.lang.String) + */ + public ApplicationServerManagerResult stop(String appPath) + throws IOException { + // TODO Auto-generated method stub + return null; + } + + /* (non-Javadoc) + * @see org.apache.jetspeed.tools.pamanager.servletcontainer.ApplicationServerManager#reload(java.lang.String) + */ + public ApplicationServerManagerResult reload(String appPath) + throws IOException { + // TODO Auto-generated method stub + return null; + } + + /* (non-Javadoc) + * @see org.apache.jetspeed.tools.pamanager.servletcontainer.ApplicationServerManager#undeploy(java.lang.String) + */ + public ApplicationServerManagerResult undeploy(String appPath) + throws IOException { + // TODO Auto-generated method stub + return null; + } + + /* (non-Javadoc) + * @see org.apache.jetspeed.tools.pamanager.servletcontainer.ApplicationServerManager#deploy(java.lang.String, java.io.InputStream, int) + */ + public ApplicationServerManagerResult deploy(String appPath, + InputStream is, int size) throws IOException { + // TODO Auto-generated method stub + return null; + } + + /* (non-Javadoc) + * @see org.apache.jetspeed.tools.pamanager.servletcontainer.ApplicationServerManager#getHostPort() + */ + public int getHostPort() { + // TODO Auto-generated method stub + return 0; + } + + /* (non-Javadoc) + * @see org.apache.jetspeed.tools.pamanager.servletcontainer.ApplicationServerManager#getHostUrl() + */ + public String getHostUrl() { + // TODO Auto-generated method stub + return null; + } + + /* (non-Javadoc) + * @see org.apache.jetspeed.tools.pamanager.servletcontainer.ApplicationServerManager#isConnected() + */ + public boolean isConnected() { + // TODO Auto-generated method stub + return false; + } + + /* (non-Javadoc) + * @see groovy.swing.impl.Startable#start() + */ + public void start() { + // TODO Auto-generated method stub + + } + + public String getAppServerTarget(String appName) { + return appName + ".war"; + } +} Property changes on: pal-portal/trunk/portal/files/components/portal/src/java/org/apache/jetspeed/tools/pamanager/servletcontainer/GlassFishManager.java ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/files/src/webapp/WEB-INF/sun-web.xml =================================================================== --- pal-portal/trunk/portal/files/src/webapp/WEB-INF/sun-web.xml 2008-02-21 12:49:34 UTC (rev 812) +++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/sun-web.xml 2008-02-22 03:08:45 UTC (rev 813) @@ -0,0 +1,16 @@ + + + + + portal-user + portal-user + portal-user + + + admin + admin + admin + + + Property changes on: pal-portal/trunk/portal/files/src/webapp/WEB-INF/sun-web.xml ___________________________________________________________________ Name: svn:eol-style + native From svnnotify @ sourceforge.jp Fri Feb 22 12:09:32 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Fri, 22 Feb 2008 12:09:32 +0900 Subject: [pal-cvs 3078] [814] updated j2 revision Message-ID: <1203649772.701906.15689.nullmailer@users.sourceforge.jp> Revision: 814 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=814 Author: shinsuke Date: 2008-02-22 12:09:32 +0900 (Fri, 22 Feb 2008) Log Message: ----------- updated j2 revision Modified Paths: -------------- pal-portal/trunk/build.properties -------------- next part -------------- Modified: pal-portal/trunk/build.properties =================================================================== --- pal-portal/trunk/build.properties 2008-02-22 03:08:45 UTC (rev 813) +++ pal-portal/trunk/build.properties 2008-02-22 03:09:32 UTC (rev 814) @@ -59,7 +59,7 @@ #jetspeed2.svn.repository=http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/ #jetspeed2.svn.repository=http://svn.apache.org/repos/asf/portals/jetspeed-2/branches/JETSPEED-2.1.3/ jetspeed2.svn.repository=http://svn.apache.org/repos/asf/portals/jetspeed-2/branches/JETSPEED-2.1.3-POSTRELEASE/ -jetspeed2.revision=619718 +jetspeed2.revision=628183 # Dependencies for Jetspeed jetspeed.version=2.1.3_pal-${portal.version} From svnnotify @ sourceforge.jp Fri Feb 22 13:54:31 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Fri, 22 Feb 2008 13:54:31 +0900 Subject: [pal-cvs 3079] [815] minor fixes. Message-ID: <1203656071.067018.12924.nullmailer@users.sourceforge.jp> Revision: 815 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=815 Author: shinsuke Date: 2008-02-22 13:54:30 +0900 (Fri, 22 Feb 2008) Log Message: ----------- minor fixes. Modified Paths: -------------- pal-portal/trunk/docs/ja/administration-guide/xdocs/overview/administration.xml pal-portal/trunk/docs/ja/administration-guide/xdocs/overview/architecture.xml pal-portal/trunk/docs/ja/administration-guide/xdocs/overview/index.xml pal-portal/trunk/docs/ja/administration-guide/xdocs/overview/portal.xml pal-portal/trunk/docs/ja/administration-guide/xdocs/portlet-management/deploy-portlet.xml pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/guide.xml pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/open-siteeditor.xml pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/create-role.xml pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/create-user.xml pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/delete-group.xml pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/delete-role.xml pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/delete-user.xml pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/guide.xml pal-portal/trunk/docs/ja/installation-guide/xdocs/guide-gui-install-dbsetup.xml pal-portal/trunk/docs/ja/installation-guide/xdocs/guide-gui-install-steps.xml pal-portal/trunk/docs/ja/installation-guide/xdocs/guide-gui-upgrade-steps.xml pal-portal/trunk/docs/ja/installation-guide/xdocs/guide-gui-upgrade.xml -------------- next part -------------- Modified: pal-portal/trunk/docs/ja/administration-guide/xdocs/overview/administration.xml =================================================================== --- pal-portal/trunk/docs/ja/administration-guide/xdocs/overview/administration.xml 2008-02-22 03:09:32 UTC (rev 814) +++ pal-portal/trunk/docs/ja/administration-guide/xdocs/overview/administration.xml 2008-02-22 04:54:30 UTC (rev 815) @@ -38,12 +38,12 @@

admin ユーザーでログインして、「ポートレット管理」にアクセスすると、ポートレット管理ツールを利用することができます。 - このツールを利用して、ポートレットの配備・削除やリモートリポジトリからポートレットを直接配備することができます。 + このツールを利用して、ポートレットを配備や削除したり、リモートリポジトリからポートレットを直接配備することができます。

- admin ユーザーでログインして、「サイトエディタ」にアクセスするか、ユーザーでログインして、ページの編集をクリックすることで、サイトエディタが利用することができます。 + admin ユーザーでログインして、「サイトエディタ」にアクセスするか、ユーザーでログインして、ページの編集をクリックすることで、サイトエディタを利用することができます。 このツールを利用して、ページやフォルダの追加・削除が行えます。 また、ページやフォルダごとのセキュリティ設定もこのツールにより行うことができます。

@@ -56,7 +56,7 @@

- ページに WCM ポートレットを配備することで、配備したポートレット内のコンテンツを WYSIWYG HTMLエディタにより、ブラウザ上でコンテンツを編集することができます。 + ページに WCM ポートレットを配備することで、配備したポートレット内のコンテンツを WYSIWYG HTMLエディタによりブラウザ上で編集することができます。

Modified: pal-portal/trunk/docs/ja/administration-guide/xdocs/overview/architecture.xml =================================================================== --- pal-portal/trunk/docs/ja/administration-guide/xdocs/overview/architecture.xml 2008-02-22 03:09:32 UTC (rev 814) +++ pal-portal/trunk/docs/ja/administration-guide/xdocs/overview/architecture.xml 2008-02-22 04:54:30 UTC (rev 815) @@ -26,8 +26,8 @@

PALポータルは、Apache Software Foundation にて開発をされている、企業情報ポータルのオープンソースの実装 Jetspeed 2 をベースとして、構築されています。 - そのため、企業ポータルの基盤となる部分の開発は多くの開発者により、適切な仕様に基づき、柔軟で拡張が可能な設計が行われています。 - 柔軟に機能を拡張・変更が行えるので、PALポータルは企業内ポータルに限らず、オンラインショップやブログなどの様々なユーザーポータル構築に対応することができます。 + そのため、企業ポータルの基盤となる部分の開発は多くの開発者により、適切な仕様に基づき、柔軟かつ拡張可能な設計が行われています。 + PALポータルは柔軟に機能を拡張や変更できるので、企業内ポータルに限らず、オンラインショップやブログなどの様々なユーザーポータル構築に対応することができます。

PALポータルは、ウェブアプリケーションコンテナ、ユーザー認証、データストレージを PALポータル自体に実装するのではなく、外部システムを利用することが可能です。 Modified: pal-portal/trunk/docs/ja/administration-guide/xdocs/overview/index.xml =================================================================== --- pal-portal/trunk/docs/ja/administration-guide/xdocs/overview/index.xml 2008-02-22 03:09:32 UTC (rev 814) +++ pal-portal/trunk/docs/ja/administration-guide/xdocs/overview/index.xml 2008-02-22 04:54:30 UTC (rev 815) @@ -25,7 +25,7 @@

- PALポータルは、企業情報ポータルとして、利用者に必要としているサービスを特定のユーザーまたはグループ用にコンテンツをパーソナライズして提供し、Web ブラウザなどの特定ユーザーのデバイスに合わせて集約されたリソースを最大限に利用できる環境を構築するソフトウェア製品です。 + PALポータルは、企業情報ポータルとして、利用者が必要としているサービスを特定のユーザーまたはグループ用にコンテンツをパーソナライズして提供し、Web ブラウザなどの特定ユーザーのデバイスに合わせて、集約されたリソースを最大限に利用できる環境を構築するソフトウェア製品です。

この章では、製品のアーキテクチャー、ポータルのエンドユーザーインタフェース、製品の管理に使用するツールについて簡単に説明します。 Modified: pal-portal/trunk/docs/ja/administration-guide/xdocs/overview/portal.xml =================================================================== --- pal-portal/trunk/docs/ja/administration-guide/xdocs/overview/portal.xml 2008-02-22 03:09:32 UTC (rev 814) +++ pal-portal/trunk/docs/ja/administration-guide/xdocs/overview/portal.xml 2008-02-22 04:54:30 UTC (rev 815) @@ -30,7 +30,7 @@

- 各ユーザーはログイン後のページをサイトエディタと呼ばれるツールを利用して、パーソナライズできます。 + 各ユーザーはログイン後のページを、サイトエディタと呼ばれるツールを利用してパーソナライズできます。 ユーザーはパーソナライズするページを追加するだけでなく、フォルダを作成することで作成したページを階層的に分類することもできます。

@@ -41,7 +41,7 @@

ユーザーは、複数のロールやグループに属することができます。 ロールは管理者などの役割にあたり、グループは部門や課などを割り当てることが考えられます。 - ユーザーに適切なロールやグループを割り当てることで、ページのセキュリティもユーザーごとやグループごとなどに指定することが可能であるため、閲覧者を制限することが可能です。 + ユーザーに適切なロールやグループを割り当てることで、ページのセキュリティもユーザーごとやグループごとなどに指定できるので、閲覧者を制限することが可能です。

Modified: pal-portal/trunk/docs/ja/administration-guide/xdocs/portlet-management/deploy-portlet.xml =================================================================== --- pal-portal/trunk/docs/ja/administration-guide/xdocs/portlet-management/deploy-portlet.xml 2008-02-22 03:09:32 UTC (rev 814) +++ pal-portal/trunk/docs/ja/administration-guide/xdocs/portlet-management/deploy-portlet.xml 2008-02-22 04:54:30 UTC (rev 815) @@ -41,7 +41,7 @@

- 画面は「配備されたポートレット一覧」から「ポートレットアプリケーションの配備」が表示されます。 + 「ポートレットアプリケーションの配備」が表示されます。

@@ -55,7 +55,7 @@

- 「ポートレット」タブをクリックして、「配備されたポートレット一覧」を表示して、配備したポートレットアプリケーションが一覧に表示されていることを確認してください。 + 「ポートレット」タブをクリックして、「配備されたポートレット一覧」を表示し、配備したポートレットアプリケーションが一覧に表示されていることを確認してください。

Modified: pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/guide.xml =================================================================== --- pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/guide.xml 2008-02-22 03:09:32 UTC (rev 814) +++ pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/guide.xml 2008-02-22 04:54:30 UTC (rev 815) @@ -27,7 +27,7 @@

この章は、PALポータルのサイト編集作業について説明しています。 - サイトエディターでは、「フォルダの追加・編集・削除」、「ページの追加・編集・削除」の機能があります。 + サイトエディターには「フォルダの追加・編集・削除」および「ページの追加・編集・削除」の機能があります。 サイトエディターを利用することにより、ユーザー・ロール・グループの単位で、フォルダやページの表示を制御することが可能です。

@@ -44,7 +44,7 @@

- まず、ページは、ブラウザでポータルにアクセスしたときに表示される HTML ページに対応しています。 + まず、ページはブラウザでポータルにアクセスしたときに表示される HTML ページに対応しています。 ページは、ページのタイトルや見た目のデザインの情報を保持しています。 また、ページはレイアウトを子として持ちます。 ページは、デフォルトで、ポータルの WEB-INF/pages 以下に .psml ファイルとして保存されます(設定によりデータベースに保存することも可能)。 @@ -67,7 +67,7 @@

PALポータルでは、プロファイリングルールを用いて、様々なページをユーザー、ロール、グループごとに表示することができます。 - たとえば、標準に j2 プロファイリングルールでは、http://localhost:8080/palportal/default-page.psml にアクセスされた場合、以下の順で .psml ファイルを探します。 + たとえば、標準の j2 プロファイリングルールでは、http://localhost:8080/palportal/default-page.psml にアクセスされた場合、以下の順で .psml ファイルを探します。

  • /_user/ユーザー名/_mediatype/html/_language/ja/_country/JP/default-page.psml
  • /_user/ユーザー名/_mediatype/html/_language/ja/default-page.psml
  • Modified: pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/open-siteeditor.xml =================================================================== --- pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/open-siteeditor.xml 2008-02-22 03:09:32 UTC (rev 814) +++ pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/open-siteeditor.xml 2008-02-22 04:54:30 UTC (rev 815) @@ -35,13 +35,13 @@

- ログインして表示されるトップページにサイトエディターアイコンが表示されているので、サイトエディターを選択して利用できます。 + ログインして表示されるトップページにサイトエディターのアイコンが表示されているので、サイトエディターを選択して利用できます。

- 一般ユーザーでログインして、ページを編集する権限を持っている場合、「編集」リンクが表示されます。 + 一般ユーザーでログインすると、ページを編集する権限を持っている場合、「編集」リンクが表示されます。 「編集」リンクをクリックすることで、サイトエディターを利用することができます。

Modified: pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/create-role.xml =================================================================== --- pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/create-role.xml 2008-02-22 03:09:32 UTC (rev 814) +++ pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/create-role.xml 2008-02-22 04:54:30 UTC (rev 815) @@ -40,7 +40,7 @@ 新規ロール入力フォームが画面表示されます。 「ロール名」を入力します。 そのまま登録へ進むには、「確認」ボタンを押下します。 - 編集を中断する場合は「ロー類治乱に戻る」ボタンを押下します。 + 編集を中断する場合は「ロール一覧に戻る」ボタンを押下します。

Modified: pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/create-user.xml =================================================================== --- pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/create-user.xml 2008-02-22 03:09:32 UTC (rev 814) +++ pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/create-user.xml 2008-02-22 04:54:30 UTC (rev 815) @@ -31,13 +31,13 @@

- 「ユーザー」タブを選択してユーザー情報一覧を表示して、「新規」リンクを押下します。 + 「ユーザー」タブを選択してユーザー情報一覧を表示し、「新規」リンクを押下します。

- 新規ユーザー入力フォームが画面表示されます。 + 新規ユーザー入力フォームが表示されます。 「ユーザー名」、「パスワード」、「パスワード(確認用)」、「初期ログイン時のパスワード変更」、「デフォルトロール」を入力します。 「確認」ボタンを押下して、入力内容確認ページを表示します。 編集を中断する場合は「ユーザー一覧へ戻る」ボタンを押下します。 Modified: pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/delete-group.xml =================================================================== --- pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/delete-group.xml 2008-02-22 03:09:32 UTC (rev 814) +++ pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/delete-group.xml 2008-02-22 04:54:30 UTC (rev 815) @@ -37,7 +37,7 @@

- 削除の最終確認を行い、「削除」を押下します。中止する場合は、「グループ一覧に戻るを押下します。 + 削除の最終確認を行い、「削除」ボタンを押下します。中止する場合は、「グループ一覧に戻る」ボタンを押下します。

Modified: pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/delete-role.xml =================================================================== --- pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/delete-role.xml 2008-02-22 03:09:32 UTC (rev 814) +++ pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/delete-role.xml 2008-02-22 04:54:30 UTC (rev 815) @@ -37,7 +37,7 @@

- 削除の最終確認を行い、「削除」を押下します。中止する場合は、「ロール一覧に戻る」を押下します。 + 削除の最終確認を行い、「削除」ボタンを押下します。中止する場合は、「ロール一覧に戻る」ボタンを押下します。

Modified: pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/delete-user.xml =================================================================== --- pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/delete-user.xml 2008-02-22 03:09:32 UTC (rev 814) +++ pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/delete-user.xml 2008-02-22 04:54:30 UTC (rev 815) @@ -37,7 +37,7 @@

- 削除の最終確認を行い、「削除」を押下します。中止する場合は、「ユーザー一覧へ戻る」を押下します。 + 削除の最終確認を行い、「削除」ボタンを押下します。中止する場合は、「ユーザー一覧へ戻る」ボタンを押下します。

Modified: pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/guide.xml =================================================================== --- pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/guide.xml 2008-02-22 03:09:32 UTC (rev 814) +++ pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/guide.xml 2008-02-22 04:54:30 UTC (rev 815) @@ -35,7 +35,7 @@ PALポータルの「ユーザー/ロール/グループ管理」では、ユーザー、ロール、グループの情報を管理しています。 ポータルに認証されたユーザーは、ログイン後、パーソナライズ可能なページを保持することができます。 ログインせずに、PALポータルにアクセスできますが、その場合は guest ユーザーとして扱われます。 - ユーザーにロールやグループをあたえることで、複数のユーザーに特定の権限をまとめてあたえることなどもできます。 + ユーザーにロールやグループを付加することで、複数のユーザーに特定の権限をまとめて与えることなどもできます。 ロールは管理者などの役割にあたり、グループは部門や課などを割り当てることが考えられます。 ユーザーに適切なロールやグループを割り当てることで、ユーザー・ロール・グループ単位のセキュリティを設定することができます。

Modified: pal-portal/trunk/docs/ja/installation-guide/xdocs/guide-gui-install-dbsetup.xml =================================================================== --- pal-portal/trunk/docs/ja/installation-guide/xdocs/guide-gui-install-dbsetup.xml 2008-02-22 03:09:32 UTC (rev 814) +++ pal-portal/trunk/docs/ja/installation-guide/xdocs/guide-gui-install-dbsetup.xml 2008-02-22 04:54:30 UTC (rev 815) @@ -56,7 +56,7 @@

「次へ」ボタンをクリックしてください。 設定が正しくない場合はエラーが表示されるので、再度、設定したパラメータを確認してください。 - データベースに正常に接続できた場合は、GUI によるインストール手順の「インストール前の確認」になります。 + データベースに正常に接続できた場合は、GUI によるインストール手順の「インストール前の確認」を参照してください。

Modified: pal-portal/trunk/docs/ja/installation-guide/xdocs/guide-gui-install-steps.xml =================================================================== --- pal-portal/trunk/docs/ja/installation-guide/xdocs/guide-gui-install-steps.xml 2008-02-22 03:09:32 UTC (rev 814) +++ pal-portal/trunk/docs/ja/installation-guide/xdocs/guide-gui-install-steps.xml 2008-02-22 04:54:30 UTC (rev 815) @@ -88,7 +88,7 @@

- 「Tomcat」を選択すると、PALポータルが利用するための Tomcat がインストールされます。 + 「Tomcat 5.5.23」を選択すると、PALポータルが利用するための Tomcat がインストールされます。 「Tomcat用PALポータル設定」を選択すると、Tomcat 用の設定ファイルがインストールされます。 「メールサーバ設定」を選択すると、PALポータルが利用するメールサーバの設定が行えます。 コンポーネント選択して、「次へ」ボタンをクリックします。 Modified: pal-portal/trunk/docs/ja/installation-guide/xdocs/guide-gui-upgrade-steps.xml =================================================================== --- pal-portal/trunk/docs/ja/installation-guide/xdocs/guide-gui-upgrade-steps.xml 2008-02-22 03:09:32 UTC (rev 814) +++ pal-portal/trunk/docs/ja/installation-guide/xdocs/guide-gui-upgrade-steps.xml 2008-02-22 04:54:30 UTC (rev 815) @@ -100,7 +100,6 @@

アップグレードインストールを実行する前に、インストール先のディレクトリを確認してください。 - 指定されたディレクトリが削除されます。

@@ -128,7 +127,7 @@

- 「終了」ボタンをインストーラーを終了します。 + 「終了」ボタンを押下してインストーラーを終了します。

Modified: pal-portal/trunk/docs/ja/installation-guide/xdocs/guide-gui-upgrade.xml =================================================================== --- pal-portal/trunk/docs/ja/installation-guide/xdocs/guide-gui-upgrade.xml 2008-02-22 03:09:32 UTC (rev 814) +++ pal-portal/trunk/docs/ja/installation-guide/xdocs/guide-gui-upgrade.xml 2008-02-22 04:54:30 UTC (rev 815) @@ -17,13 +17,13 @@ PALポータル インストールガイド - GUI によるインストール + GUI によるアップグレード -
+

PALポータルは、Unix(Linux を含む) または Windows の OS 上でグラフィカルユーザーインターフェース (GUI) によるアップグレードインストールをサポートしています。 この章では、GUI によるアップグレードインストール手順について説明しています。 From svnnotify @ sourceforge.jp Fri Feb 22 15:09:28 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Fri, 22 Feb 2008 15:09:28 +0900 Subject: [pal-cvs 3080] [816] renamed a filename. Message-ID: <1203660568.275705.27741.nullmailer@users.sourceforge.jp> Revision: 816 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=816 Author: shinsuke Date: 2008-02-22 15:09:27 +0900 (Fri, 22 Feb 2008) Log Message: ----------- renamed a filename. Modified Paths: -------------- pal-portal/trunk/docs/ja/administration-guide/xdocs/portlet-management/deploy-portlet.xml pal-portal/trunk/docs/ja/administration-guide/xdocs/portlet-management/deploy-remote-portlet.xml pal-portal/trunk/docs/ja/administration-guide/xdocs/portlet-management/manage-portlet.xml pal-portal/trunk/docs/ja/administration-guide/xdocs/public-portal-withdrawal-portlet-guide.xml pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/add-portlet.xml pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/open-siteeditor.xml pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/create-group.xml pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/create-role.xml pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/create-user.xml pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/delete-group.xml pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/delete-role.xml pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/delete-user.xml pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/guide.xml pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/update-user.xml Added Paths: ----------- pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_add1.gif pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_add3.gif pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_add4.gif pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_add6.gif pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng0.gif pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng1.gif pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng10.gif pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng12.gif pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng2.gif pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_withdrawal1.gif pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_withdrawal2.gif pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng0.gif pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng1.gif pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng10.gif pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng11.gif pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng12.gif pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng13.gif pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng14.gif pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng15.gif pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng16.gif pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng17.gif pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng18.gif pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng19.gif pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng2.gif pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng20.gif pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng21.gif pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng22.gif pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng23.gif pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng24.gif pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng25.gif pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng26.gif pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng3.gif pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng4.gif pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng5.gif pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng6.gif pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng7.gif pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng8.gif pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng9.gif Removed Paths: ------------- pal-portal/trunk/docs/ja/administration-guide/xdocs/images/confirm.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/finish.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/form.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_add1.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_add2.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_add3.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_add4.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_add5.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_add6.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_add7.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng0.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng1.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng10.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng11.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng12.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng2.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng3.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng4.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng5.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng6.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng7.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng8.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng9.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_withdrawal1.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_withdrawal2.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit0.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit1.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit10.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit11.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit12.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit13.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit2.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit3.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit4.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit5.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit6.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit7.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit8.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit9.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng0.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng1.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng10.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng11.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng12.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng13.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng14.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng15.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng16.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng17.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng18.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng19.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng2.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng20.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng21.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng22.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng23.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng24.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng25.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng26.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng3.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng4.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng5.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng6.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng7.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng8.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng9.jpg pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usertab.jpg -------------- next part -------------- Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/confirm.jpg =================================================================== (Binary files differ) Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/finish.jpg =================================================================== (Binary files differ) Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/form.jpg =================================================================== (Binary files differ) Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_add1.gif =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_add1.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_add1.jpg =================================================================== (Binary files differ) Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_add2.jpg =================================================================== (Binary files differ) Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_add3.gif =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_add3.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_add3.jpg =================================================================== (Binary files differ) Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_add4.gif =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_add4.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_add4.jpg =================================================================== (Binary files differ) Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_add5.jpg =================================================================== (Binary files differ) Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_add6.gif =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_add6.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_add6.jpg =================================================================== (Binary files differ) Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_add7.jpg =================================================================== (Binary files differ) Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng0.gif =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng0.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng0.jpg =================================================================== (Binary files differ) Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng1.gif =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng1.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng1.jpg =================================================================== (Binary files differ) Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng10.gif =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng10.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng10.jpg =================================================================== (Binary files differ) Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng11.jpg =================================================================== (Binary files differ) Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng12.gif =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng12.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng12.jpg =================================================================== (Binary files differ) Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng2.gif =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng2.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng2.jpg =================================================================== (Binary files differ) Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng3.jpg =================================================================== (Binary files differ) Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng4.jpg =================================================================== (Binary files differ) Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng5.jpg =================================================================== (Binary files differ) Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng6.jpg =================================================================== (Binary files differ) Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng7.jpg =================================================================== (Binary files differ) Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng8.jpg =================================================================== (Binary files differ) Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_mng9.jpg =================================================================== (Binary files differ) Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_withdrawal1.gif =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_withdrawal1.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_withdrawal1.jpg =================================================================== (Binary files differ) Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_withdrawal2.gif =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_withdrawal2.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/port_withdrawal2.jpg =================================================================== (Binary files differ) Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit0.jpg =================================================================== (Binary files differ) Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit1.jpg =================================================================== (Binary files differ) Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit10.jpg =================================================================== (Binary files differ) Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit11.jpg =================================================================== (Binary files differ) Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit12.jpg =================================================================== (Binary files differ) Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit13.jpg =================================================================== (Binary files differ) Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit2.jpg =================================================================== (Binary files differ) Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit3.jpg =================================================================== (Binary files differ) Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit4.jpg =================================================================== (Binary files differ) Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit5.jpg =================================================================== (Binary files differ) Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit6.jpg =================================================================== (Binary files differ) Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit7.jpg =================================================================== (Binary files differ) Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit8.jpg =================================================================== (Binary files differ) Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/site_edit9.jpg =================================================================== (Binary files differ) Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng0.gif =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng0.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng0.jpg =================================================================== (Binary files differ) Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng1.gif =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng1.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng1.jpg =================================================================== (Binary files differ) Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng10.gif =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng10.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng10.jpg =================================================================== (Binary files differ) Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng11.gif =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng11.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng11.jpg =================================================================== (Binary files differ) Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng12.gif =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng12.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng12.jpg =================================================================== (Binary files differ) Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng13.gif =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng13.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng13.jpg =================================================================== (Binary files differ) Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng14.gif =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng14.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng14.jpg =================================================================== (Binary files differ) Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng15.gif =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng15.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng15.jpg =================================================================== (Binary files differ) Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng16.gif =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng16.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng16.jpg =================================================================== (Binary files differ) Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng17.gif =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng17.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng17.jpg =================================================================== (Binary files differ) Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng18.gif =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng18.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng18.jpg =================================================================== (Binary files differ) Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng19.gif =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng19.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng19.jpg =================================================================== (Binary files differ) Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng2.gif =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng2.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng2.jpg =================================================================== (Binary files differ) Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng20.gif =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng20.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng20.jpg =================================================================== (Binary files differ) Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng21.gif =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng21.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng21.jpg =================================================================== (Binary files differ) Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng22.gif =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng22.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng22.jpg =================================================================== (Binary files differ) Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng23.gif =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng23.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng23.jpg =================================================================== (Binary files differ) Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng24.gif =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng24.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng24.jpg =================================================================== (Binary files differ) Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng25.gif =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng25.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng25.jpg =================================================================== (Binary files differ) Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng26.gif =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng26.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng26.jpg =================================================================== (Binary files differ) Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng3.gif =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng3.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng3.jpg =================================================================== (Binary files differ) Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng4.gif =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng4.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng4.jpg =================================================================== (Binary files differ) Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng5.gif =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng5.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng5.jpg =================================================================== (Binary files differ) Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng6.gif =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng6.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng6.jpg =================================================================== (Binary files differ) Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng7.gif =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng7.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng7.jpg =================================================================== (Binary files differ) Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng8.gif =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng8.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng8.jpg =================================================================== (Binary files differ) Added: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng9.gif =================================================================== (Binary files differ) Property changes on: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng9.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usermng9.jpg =================================================================== (Binary files differ) Deleted: pal-portal/trunk/docs/ja/administration-guide/xdocs/images/usertab.jpg =================================================================== (Binary files differ) Modified: pal-portal/trunk/docs/ja/administration-guide/xdocs/portlet-management/deploy-portlet.xml =================================================================== --- pal-portal/trunk/docs/ja/administration-guide/xdocs/portlet-management/deploy-portlet.xml 2008-02-22 04:54:30 UTC (rev 815) +++ pal-portal/trunk/docs/ja/administration-guide/xdocs/portlet-management/deploy-portlet.xml 2008-02-22 06:09:27 UTC (rev 816) @@ -39,11 +39,11 @@ ポータル管理者は、公開するポートレットのアプリケーションを「ポートレット管理」から配備することが可能です。 「ポートレット管理」の「デプロイヤー」タブを選択してください。

- +

「ポートレットアプリケーションの配備」が表示されます。

- +

Modified: pal-portal/trunk/docs/ja/administration-guide/xdocs/portlet-management/deploy-remote-portlet.xml =================================================================== --- pal-portal/trunk/docs/ja/administration-guide/xdocs/portlet-management/deploy-remote-portlet.xml 2008-02-22 04:54:30 UTC (rev 815) +++ pal-portal/trunk/docs/ja/administration-guide/xdocs/portlet-management/deploy-remote-portlet.xml 2008-02-22 06:09:27 UTC (rev 816) @@ -34,7 +34,7 @@ ポータル管理者は、公開するポートレットのアプリケーションを「ポートレット管理」から配備することが可能です。 「ポートレット管理」の「デプロイヤー」タブを選択してください。

- +

次に「リモート」を選択して、「リポジトリのポートレット」画面を表示します。

@@ -43,12 +43,12 @@

「リモート」を選択すると、利用可能なリポジトリ、ポートレットアプリケーションが一覧で表示されます。

- +

配備したいポートレットの「配備」を選択すると、確認画面が表示されます。 「配備」ボタンを押下すると、ポートレットの配備は完了します。

- +

リモートリポジトリからの配備では、リモートリポジトリのサイトからポートレットをダウンロードして、その後、ポータルへ配備されます。 そのため、リモートリポジトリからの配備には時間がかかる場合があります(配備プロセスの時間はファイルサイズなどに依存します)。 Modified: pal-portal/trunk/docs/ja/administration-guide/xdocs/portlet-management/manage-portlet.xml =================================================================== --- pal-portal/trunk/docs/ja/administration-guide/xdocs/portlet-management/manage-portlet.xml 2008-02-22 04:54:30 UTC (rev 815) +++ pal-portal/trunk/docs/ja/administration-guide/xdocs/portlet-management/manage-portlet.xml 2008-02-22 06:09:27 UTC (rev 816) @@ -34,7 +34,7 @@ ポートレットの開始・停止・配備解除・削除を行うには、「ポートレット管理」の「ポートレット」タブを選択します。 選択後、ポートレットアプリケーションの一覧が表示されます。それぞれ行う対象操作のリンクを選択してください。

- +
Modified: pal-portal/trunk/docs/ja/administration-guide/xdocs/public-portal-withdrawal-portlet-guide.xml =================================================================== --- pal-portal/trunk/docs/ja/administration-guide/xdocs/public-portal-withdrawal-portlet-guide.xml 2008-02-22 04:54:30 UTC (rev 815) +++ pal-portal/trunk/docs/ja/administration-guide/xdocs/public-portal-withdrawal-portlet-guide.xml 2008-02-22 06:09:27 UTC (rev 816) @@ -33,11 +33,11 @@

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

- +

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

- +

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

Modified: pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/add-portlet.xml =================================================================== --- pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/add-portlet.xml 2008-02-22 04:54:30 UTC (rev 815) +++ pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/add-portlet.xml 2008-02-22 06:09:27 UTC (rev 816) @@ -33,20 +33,20 @@

ログイン後、編集可能なページで「編集」を選択し、サイトエディターを表示します。

- +

「サイトエディター」画面の左側のツリー表示部分から、ポートレットを追加したいページを選択して、レイアウトを選択します。 ここでは「VelocityOneColumn」を選択します。

- +

「追加」タブを選択します。

- +

ポートレットのリストから追加したいポートレットを選択し、「ポートレットの追加」ボタンを押下します。 追加したいポートレットが複数ある場合は、同様にリストから選択し、再度、「ポートレットの追加」ボタンを押下してください。 @@ -60,7 +60,7 @@ 画面には、追加したポートレットが表示されます。 (「パスワードの変更」ポートレットを追加した例)

- +
Modified: pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/open-siteeditor.xml =================================================================== --- pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/open-siteeditor.xml 2008-02-22 04:54:30 UTC (rev 815) +++ pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/open-siteeditor.xml 2008-02-22 06:09:27 UTC (rev 816) @@ -41,8 +41,8 @@

- 一般ユーザーでログインすると、ページを編集する権限を持っている場合、「編集」リンクが表示されます。 - 「編集」リンクをクリックすることで、サイトエディターを利用することができます。 + 一般ユーザーでログインすると、ページを編集する権限を持っている場合、「ページを編集」リンクが表示されます。 + 「ページを編集」リンクをクリックすることで、サイトエディターを利用することができます。

Modified: pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/create-group.xml =================================================================== --- pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/create-group.xml 2008-02-22 04:54:30 UTC (rev 815) +++ pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/create-group.xml 2008-02-22 06:09:27 UTC (rev 816) @@ -33,7 +33,7 @@

グループを新規で登録する場合は、「ユーザー/ロール/グループ管理」の「グループ」タブを選択し、「新規」リンクを押下します。

- +

@@ -42,25 +42,25 @@ そのまま登録へ進むには、「確認」ボタンを押下します。 編集を中断する場合は「グループ一覧に戻る」ボタンを押下します。

- +

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

- +

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

- +

- 登録されたグループは下記図のように、ユーザー更新でのグループ指定等で使用可能となります。 + 登録されたグループは下記図のように、ユーザー情報の編集でのグループを指定することができます。

- +
Modified: pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/create-role.xml =================================================================== --- pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/create-role.xml 2008-02-22 04:54:30 UTC (rev 815) +++ pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/create-role.xml 2008-02-22 06:09:27 UTC (rev 816) @@ -33,7 +33,7 @@

ロールを新規で登録する場合は、「ユーザー/ロール/グループ管理」の「ロール」タブを選択し、「新規」リンクを押下します。

- +

@@ -42,25 +42,32 @@ そのまま登録へ進むには、「確認」ボタンを押下します。 編集を中断する場合は「ロール一覧に戻る」ボタンを押下します。

- +

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

- +

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

- +
-
+

- 登録されたロールは下記図のように、ユーザー新規登録でのロール指定等で使用可能となります。 + 新規に登録したロールは、新規ユーザー登録時に選択するか、ユーザー情報の編集でロールを追加することができます。

- +

+ 新規ユーザー登録時に選択する場合は、登録されたロールは下記図のようにロール指定で利用することができます。 +

+ +

+ ユーザー情報の編集から登録したロールを追加する場合は、ユーザー情報編集画面でロールを選択することで下記図のようにロールを追加することができます。 +

+
Modified: pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/create-user.xml =================================================================== --- pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/create-user.xml 2008-02-22 04:54:30 UTC (rev 815) +++ pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/create-user.xml 2008-02-22 06:09:27 UTC (rev 816) @@ -33,7 +33,7 @@

「ユーザー」タブを選択してユーザー情報一覧を表示し、「新規」リンクを押下します。

- +

@@ -42,20 +42,20 @@ 「確認」ボタンを押下して、入力内容確認ページを表示します。 編集を中断する場合は「ユーザー一覧へ戻る」ボタンを押下します。

- +

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

- +

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

- +
Modified: pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/delete-group.xml =================================================================== --- pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/delete-group.xml 2008-02-22 04:54:30 UTC (rev 815) +++ pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/delete-group.xml 2008-02-22 06:09:27 UTC (rev 816) @@ -33,19 +33,19 @@

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

- +

削除の最終確認を行い、「削除」ボタンを押下します。中止する場合は、「グループ一覧に戻る」ボタンを押下します。

- +

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

- +
Modified: pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/delete-role.xml =================================================================== --- pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/delete-role.xml 2008-02-22 04:54:30 UTC (rev 815) +++ pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/delete-role.xml 2008-02-22 06:09:27 UTC (rev 816) @@ -33,19 +33,19 @@

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

- +

削除の最終確認を行い、「削除」ボタンを押下します。中止する場合は、「ロール一覧に戻る」ボタンを押下します。

- +

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

- +
Modified: pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/delete-user.xml =================================================================== --- pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/delete-user.xml 2008-02-22 04:54:30 UTC (rev 815) +++ pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/delete-user.xml 2008-02-22 06:09:27 UTC (rev 816) @@ -33,19 +33,19 @@

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

- +

削除の最終確認を行い、「削除」ボタンを押下します。中止する場合は、「ユーザー一覧へ戻る」ボタンを押下します。

- +

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

- +
Modified: pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/guide.xml =================================================================== --- pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/guide.xml 2008-02-22 04:54:30 UTC (rev 815) +++ pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/guide.xml 2008-02-22 06:09:27 UTC (rev 816) @@ -30,7 +30,7 @@ ユーザー管理には「ユーザー管理」、「ロール管理」、「グループ管理」の3つの機能があります。 それぞれの管理機能を使用する場合は、「ユーザー/ロール/グループ管理」のそれぞれのタブを選択して作業を行います。

- +

PALポータルの「ユーザー/ロール/グループ管理」では、ユーザー、ロール、グループの情報を管理しています。 ポータルに認証されたユーザーは、ログイン後、パーソナライズ可能なページを保持することができます。 Modified: pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/update-user.xml =================================================================== --- pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/update-user.xml 2008-02-22 04:54:30 UTC (rev 815) +++ pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/update-user.xml 2008-02-22 06:09:27 UTC (rev 816) @@ -33,19 +33,19 @@

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

- +

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

- +

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

- +
From svnnotify @ sourceforge.jp Fri Feb 22 15:39:51 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Fri, 22 Feb 2008 15:39:51 +0900 Subject: [pal-cvs 3081] [817] updated content. Message-ID: <1203662391.250827.13966.nullmailer@users.sourceforge.jp> Revision: 817 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=817 Author: shinsuke Date: 2008-02-22 15:39:51 +0900 (Fri, 22 Feb 2008) Log Message: ----------- updated content. Modified Paths: -------------- pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/add-portlet.xml -------------- next part -------------- Modified: pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/add-portlet.xml =================================================================== --- pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/add-portlet.xml 2008-02-22 06:09:27 UTC (rev 816) +++ pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/add-portlet.xml 2008-02-22 06:39:51 UTC (rev 817) @@ -31,14 +31,14 @@

- ログイン後、編集可能なページで「編集」を選択し、サイトエディターを表示します。 + ログイン後、編集可能なページで「ページを編集」リンクを選択し、サイトエディターを表示します。

「サイトエディター」画面の左側のツリー表示部分から、ポートレットを追加したいページを選択して、レイアウトを選択します。 - ここでは「VelocityOneColumn」を選択します。 + ここでは「2 列レイアウト(50/50)」を選択します。

@@ -58,7 +58,7 @@

画面には、追加したポートレットが表示されます。 - (「パスワードの変更」ポートレットを追加した例) + (「ユーザー登録」ポートレットを追加した例)

From svnnotify @ sourceforge.jp Fri Feb 22 16:00:20 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Fri, 22 Feb 2008 16:00:20 +0900 Subject: [pal-cvs 3082] [818] updated doc. Message-ID: <1203663620.315514.25596.nullmailer@users.sourceforge.jp> Revision: 818 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=818 Author: shinsuke Date: 2008-02-22 16:00:19 +0900 (Fri, 22 Feb 2008) Log Message: ----------- updated doc. Modified Paths: -------------- pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/change-layout.xml pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/create-folder.xml pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/create-page.xml pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/delete-folder.xml pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/delete-page.xml pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/edit-folder.xml pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/edit-page.xml pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/guide.xml pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/open-siteeditor.xml pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/guide.xml -------------- next part -------------- Modified: pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/change-layout.xml =================================================================== --- pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/change-layout.xml 2008-02-22 06:39:51 UTC (rev 817) +++ pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/change-layout.xml 2008-02-22 07:00:19 UTC (rev 818) @@ -32,7 +32,7 @@

admin ユーザーでシステムへログインし、「サイトエディター」ページを表示するとサイトエディターが表示されます。 - または、各ユーザーで編集可能なページを表示して、「編集」リンクをクリックして「サイトエディター」を表示します。 + または、各ユーザーで編集可能なページを表示して、「ページを編集」リンクをクリックして「サイトエディター」を表示します。

Modified: pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/create-folder.xml =================================================================== --- pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/create-folder.xml 2008-02-22 06:39:51 UTC (rev 817) +++ pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/create-folder.xml 2008-02-22 07:00:19 UTC (rev 818) @@ -32,7 +32,7 @@

admin ユーザーでシステムへログインし、「サイトエディター」フォルダを表示するとサイトエディターが表示されます。 - または、各ユーザーで編集可能なフォルダを表示して、「編集」リンクをクリックして「サイトエディター」を表示します。 + または、各ユーザーで編集可能なフォルダを表示して、「ページを編集」リンクをクリックして「サイトエディター」を表示します。

Modified: pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/create-page.xml =================================================================== --- pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/create-page.xml 2008-02-22 06:39:51 UTC (rev 817) +++ pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/create-page.xml 2008-02-22 07:00:19 UTC (rev 818) @@ -32,7 +32,7 @@

admin ユーザーでシステムへログインし、「サイトエディター」ページを表示するとサイトエディターが表示されます。 - または、各ユーザーで編集可能なページを表示して、「編集」リンクをクリックして「サイトエディター」を表示します。 + または、各ユーザーで編集可能なページを表示して、「ページを編集」リンクをクリックして「サイトエディター」を表示します。

Modified: pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/delete-folder.xml =================================================================== --- pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/delete-folder.xml 2008-02-22 06:39:51 UTC (rev 817) +++ pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/delete-folder.xml 2008-02-22 07:00:19 UTC (rev 818) @@ -32,7 +32,7 @@

admin ユーザーでシステムへログインし、「サイトエディター」フォルダを表示するとサイトエディターが表示されます。 - または、各ユーザーで編集可能なフォルダを表示して、「編集」リンクをクリックして「サイトエディター」を表示します。 + または、各ユーザーで編集可能なフォルダを表示して、「ページを編集」リンクをクリックして「サイトエディター」を表示します。

Modified: pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/delete-page.xml =================================================================== --- pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/delete-page.xml 2008-02-22 06:39:51 UTC (rev 817) +++ pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/delete-page.xml 2008-02-22 07:00:19 UTC (rev 818) @@ -32,7 +32,7 @@

admin ユーザーでシステムへログインし、「サイトエディター」ページを表示するとサイトエディターが表示されます。 - または、各ユーザーで編集可能なページを表示して、「編集」リンクをクリックして「サイトエディター」を表示します。 + または、各ユーザーで編集可能なページを表示して、「ページを編集」リンクをクリックして「サイトエディター」を表示します。

Modified: pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/edit-folder.xml =================================================================== --- pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/edit-folder.xml 2008-02-22 06:39:51 UTC (rev 817) +++ pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/edit-folder.xml 2008-02-22 07:00:19 UTC (rev 818) @@ -32,7 +32,7 @@

admin ユーザーでシステムへログインし、「サイトエディター」フォルダを表示するとサイトエディターが表示されます。 - または、各ユーザーで編集可能なフォルダを表示して、「編集」リンクをクリックして「サイトエディター」を表示します。 + または、各ユーザーで編集可能なフォルダを表示して、「ページを編集」リンクをクリックして「サイトエディター」を表示します。

Modified: pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/edit-page.xml =================================================================== --- pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/edit-page.xml 2008-02-22 06:39:51 UTC (rev 817) +++ pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/edit-page.xml 2008-02-22 07:00:19 UTC (rev 818) @@ -32,7 +32,7 @@

admin ユーザーでシステムへログインし、「サイトエディター」ページを表示するとサイトエディターが表示されます。 - または、各ユーザーで編集可能なページを表示して、「編集」リンクをクリックして「サイトエディター」を表示します。 + または、各ユーザーで編集可能なページを表示して、「ページを編集」リンクをクリックして「サイトエディター」を表示します。

Modified: pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/guide.xml =================================================================== --- pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/guide.xml 2008-02-22 06:39:51 UTC (rev 817) +++ pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/guide.xml 2008-02-22 07:00:19 UTC (rev 818) @@ -33,7 +33,7 @@

admin ユーザーでログインして、サイトエディターを利用する場合、すべてのフォルダおよびページを編集することができます。 また、admin ユーザーでない場合は、ログインしているユーザーの権限に応じたフォルダおよびページを編集することができます。 - 編集可能なページでは、各ページに「編集」リンクが表示されているので、それをクリックすることでサイトエディターが表示されます。 + 編集可能なページでは、各ページに「ページを編集」リンクが表示されているので、それをクリックすることでサイトエディターが表示されます。

Modified: pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/open-siteeditor.xml =================================================================== --- pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/open-siteeditor.xml 2008-02-22 06:39:51 UTC (rev 817) +++ pal-portal/trunk/docs/ja/administration-guide/xdocs/site-editor/open-siteeditor.xml 2008-02-22 07:00:19 UTC (rev 818) @@ -29,7 +29,7 @@ サイトエディターは以下の2つの方法で利用することができます。
  • 管理者ユーザー(admin)でログインして、メニューからサイトエディターを表示する
  • -
  • 一般ユーザーでログインすると、表示可能なページでは「編集」リンクが表示されているので、「編集」リンクをクリックして表示する。
  • +
  • 一般ユーザーでログインすると、表示可能なページでは「ページを編集」リンクが表示されているので、「ページを編集」リンクをクリックして表示する。

Modified: pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/guide.xml =================================================================== --- pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/guide.xml 2008-02-22 06:39:51 UTC (rev 817) +++ pal-portal/trunk/docs/ja/administration-guide/xdocs/user-management/guide.xml 2008-02-22 07:00:19 UTC (rev 818) @@ -40,5 +40,15 @@ ユーザーに適切なロールやグループを割り当てることで、ユーザー・ロール・グループ単位のセキュリティを設定することができます。

+
+

+ PALポータルのインストール後には以下のユーザーが登録されています。 +

    +
  • admin: ポータル管理ユーザー(初期パスワード: admin)
  • +
  • site: ログインしていない状態のページを編集可能なユーザー(パスワード: site)
  • +
  • guest: ゲストユーザー(パスワードなし)
  • +
+

+
From svnnotify @ sourceforge.jp Wed Feb 27 17:35:18 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Wed, 27 Feb 2008 17:35:18 +0900 Subject: [pal-cvs 3083] [819] updated repository path. Message-ID: <1204101318.475837.6803.nullmailer@users.sourceforge.jp> Revision: 819 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=819 Author: shinsuke Date: 2008-02-27 17:35:18 +0900 (Wed, 27 Feb 2008) Log Message: ----------- updated repository path. Modified Paths: -------------- pal-portal/trunk/build.properties -------------- next part -------------- Modified: pal-portal/trunk/build.properties =================================================================== --- pal-portal/trunk/build.properties 2008-02-22 07:00:19 UTC (rev 818) +++ pal-portal/trunk/build.properties 2008-02-27 08:35:18 UTC (rev 819) @@ -58,7 +58,7 @@ # Jetspeed SVN revision #jetspeed2.svn.repository=http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/ #jetspeed2.svn.repository=http://svn.apache.org/repos/asf/portals/jetspeed-2/branches/JETSPEED-2.1.3/ -jetspeed2.svn.repository=http://svn.apache.org/repos/asf/portals/jetspeed-2/branches/JETSPEED-2.1.3-POSTRELEASE/ +jetspeed2.svn.repository=http://svn.apache.org/repos/asf/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/ jetspeed2.revision=628183 # Dependencies for Jetspeed From svnnotify @ sourceforge.jp Wed Feb 27 17:55:13 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Wed, 27 Feb 2008 17:55:13 +0900 Subject: [pal-cvs 3084] [820] updated messages. Message-ID: <1204102513.838310.17618.nullmailer@users.sourceforge.jp> Revision: 820 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=820 Author: shinsuke Date: 2008-02-27 17:55:13 +0900 (Wed, 27 Feb 2008) Log Message: ----------- updated messages. Modified Paths: -------------- pal-admin/trunk/src/main/resources/appMessages_ja.properties -------------- next part -------------- Modified: pal-admin/trunk/src/main/resources/appMessages_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/appMessages_ja.properties 2008-02-27 08:35:18 UTC (rev 819) +++ pal-admin/trunk/src/main/resources/appMessages_ja.properties 2008-02-27 08:55:13 UTC (rev 820) @@ -162,17 +162,17 @@ need.to.specify.permissions=\u30d1\u30fc\u30df\u30c3\u30b7\u30e7\u30f3\u3092\u6307\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 need.to.specify.security.constraint.ref=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u898f\u5b9a\u53c2\u7167\u3092\u6307\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 -added.page.security=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30da\u30fc\u30b8\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002 -could.not.add.page.security=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30da\u30fc\u30b8\u3092\u8ffd\u52a0\u3067\u304d\u307e\u305b\u3093\u3002\u3057\u3070\u3089\u304f\u305f\u3063\u3066\u304b\u3089\u3001\u518d\u5ea6\u3001\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 -could.not.find.page.security=\u8a72\u5f53\u3059\u308b\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30da\u30fc\u30b8\u304c\u3042\u308a\u307e\u305b\u3093\u3002\u3057\u3070\u3089\u304f\u305f\u3063\u3066\u304b\u3089\u3001\u518d\u5ea6\u3001\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 -removed.page.security=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30da\u30fc\u30b8\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 -could.not.remove.page.security=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30da\u30fc\u30b8\u3092\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3002\u3057\u3070\u3089\u304f\u305f\u3063\u3066\u304b\u3089\u3001\u518d\u5ea6\u3001\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +added.page.security=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5236\u7d04\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002 +could.not.add.page.security=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5236\u7d04\u3092\u8ffd\u52a0\u3067\u304d\u307e\u305b\u3093\u3002\u3057\u3070\u3089\u304f\u305f\u3063\u3066\u304b\u3089\u3001\u518d\u5ea6\u3001\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +could.not.find.page.security=\u8a72\u5f53\u3059\u308b\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5236\u7d04\u304c\u3042\u308a\u307e\u305b\u3093\u3002\u3057\u3070\u3089\u304f\u305f\u3063\u3066\u304b\u3089\u3001\u518d\u5ea6\u3001\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +removed.page.security=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5236\u7d04\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 +could.not.remove.page.security=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5236\u7d04\u3092\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3002\u3057\u3070\u3089\u304f\u305f\u3063\u3066\u304b\u3089\u3001\u518d\u5ea6\u3001\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 -added.folder.security=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30d5\u30a9\u30eb\u30c0\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002 -could.not.add.folder.security=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30d5\u30a9\u30eb\u30c0\u3092\u8ffd\u52a0\u3067\u304d\u307e\u305b\u3093\u3002\u3057\u3070\u3089\u304f\u305f\u3063\u3066\u304b\u3089\u3001\u518d\u5ea6\u3001\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 -could.not.find.folder.security=\u8a72\u5f53\u3059\u308b\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30d5\u30a9\u30eb\u30c0\u304c\u3042\u308a\u307e\u305b\u3093\u3002\u3057\u3070\u3089\u304f\u305f\u3063\u3066\u304b\u3089\u3001\u518d\u5ea6\u3001\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 -removed.folder.security=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30d5\u30a9\u30eb\u30c0\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 -could.not.remove.folder.security=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30d5\u30a9\u30eb\u30c0\u3092\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3002\u3057\u3070\u3089\u304f\u305f\u3063\u3066\u304b\u3089\u3001\u518d\u5ea6\u3001\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +added.folder.security=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5236\u7d04\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f\u3002 +could.not.add.folder.security=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5236\u7d04\u3092\u8ffd\u52a0\u3067\u304d\u307e\u305b\u3093\u3002\u3057\u3070\u3089\u304f\u305f\u3063\u3066\u304b\u3089\u3001\u518d\u5ea6\u3001\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +could.not.find.folder.security=\u8a72\u5f53\u3059\u308b\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5236\u7d04\u304c\u3042\u308a\u307e\u305b\u3093\u3002\u3057\u3070\u3089\u304f\u305f\u3063\u3066\u304b\u3089\u3001\u518d\u5ea6\u3001\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +removed.folder.security=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5236\u7d04\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 +could.not.remove.folder.security=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5236\u7d04\u3092\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3002\u3057\u3070\u3089\u304f\u305f\u3063\u3066\u304b\u3089\u3001\u518d\u5ea6\u3001\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 invalid.path=\u7121\u52b9\u306a\u30d1\u30b9\u3067\u3059\u3002\u3057\u3070\u3089\u304f\u305f\u3063\u3066\u304b\u3089\u3001\u518d\u5ea6\u3001\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 could.not.access.path=\u30d1\u30b9\u306b\u30a2\u30af\u30bb\u30b9\u3067\u304d\u307e\u305b\u3093\u3002 From svnnotify @ sourceforge.jp Thu Feb 28 10:07:51 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Thu, 28 Feb 2008 10:07:51 +0900 Subject: [pal-cvs 3085] [821] fixed typo. Message-ID: <1204160871.918620.24625.nullmailer@users.sourceforge.jp> Revision: 821 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=821 Author: shinsuke Date: 2008-02-28 10:07:51 +0900 (Thu, 28 Feb 2008) Log Message: ----------- fixed typo. Modified Paths: -------------- pal-admin/trunk/src/main/resources/appMessages.properties pal-admin/trunk/src/main/resources/appMessages_ja.properties -------------- next part -------------- Modified: pal-admin/trunk/src/main/resources/appMessages.properties =================================================================== --- pal-admin/trunk/src/main/resources/appMessages.properties 2008-02-27 08:55:13 UTC (rev 820) +++ pal-admin/trunk/src/main/resources/appMessages.properties 2008-02-28 01:07:51 UTC (rev 821) @@ -149,7 +149,7 @@ could.not.delete.layout=Could not delete the layout. Please try again. If you see this error message again, please contact a site administrator. deleted.layout=Deleted layout. -could.not.delete.root.layout=Cannot delete a root folder. +could.not.delete.root.layout=Cannot delete a root layout. could.not.delete.portlet=Could not delete the portlet. Please try again. If you see this error message again, please contact a site administrator. deleted.portlet=Deleted portlet. Modified: pal-admin/trunk/src/main/resources/appMessages_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/appMessages_ja.properties 2008-02-27 08:55:13 UTC (rev 820) +++ pal-admin/trunk/src/main/resources/appMessages_ja.properties 2008-02-28 01:07:51 UTC (rev 821) @@ -140,7 +140,7 @@ could.not.change.page.order=\u30da\u30fc\u30b8\u306e\u9806\u756a\u3092\u5909\u66f4\u3067\u304d\u307e\u305b\u3093\u3002\u3057\u3070\u3089\u304f\u305f\u3063\u3066\u304b\u3089\u3001\u518d\u5ea6\u3001\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 need.to.specify.page.name=\u30da\u30fc\u30b8\u540d\u3092\u6307\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 -could.not.delete.root.folder=\u30eb\u30fc\u30c8\u30d5\u30a9\u30eb\u30c0\u3092\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3002 +could.not.delete.root.folder=\u30eb\u30fc\u30c8\u30d5\u30a9\u30eb\u30c0\u306f\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3002 could.not.delete.folder=\u30d5\u30a9\u30eb\u30c0\u3092\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3002\u3057\u3070\u3089\u304f\u305f\u3063\u3066\u304b\u3089\u3001\u518d\u5ea6\u3001\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 deleted.folder=\u30d5\u30a9\u30eb\u30c0\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 @@ -149,7 +149,7 @@ could.not.delete.layout=\u30ec\u30a4\u30a2\u30a6\u30c8\u3092\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3002\u3057\u3070\u3089\u304f\u305f\u3063\u3066\u304b\u3089\u3001\u518d\u5ea6\u3001\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 deleted.layout=\u30ec\u30a4\u30a2\u30a6\u30c8\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 -could.not.delete.root.layout=\u30eb\u30fc\u30c8\u30d5\u30a9\u30eb\u30c0\u3092\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3002 +could.not.delete.root.layout=\u30eb\u30fc\u30c8\u30ec\u30a4\u30a2\u30a6\u30c8\u306f\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3002 could.not.delete.portlet=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u3092\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3002\u3057\u3070\u3089\u304f\u305f\u3063\u3066\u304b\u3089\u3001\u518d\u5ea6\u3001\u8a66\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 deleted.portlet=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u3092\u524a\u9664\u3057\u307e\u3057\u305f\u3002 From svnnotify @ sourceforge.jp Thu Feb 28 12:01:45 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Thu, 28 Feb 2008 12:01:45 +0900 Subject: [pal-cvs 3086] [822] version 0.6 Message-ID: <1204167705.298348.8626.nullmailer@users.sourceforge.jp> Revision: 822 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=822 Author: shinsuke Date: 2008-02-28 12:01:45 +0900 (Thu, 28 Feb 2008) Log Message: ----------- version 0.6 Modified Paths: -------------- pal-admin/trunk/pom.xml -------------- next part -------------- Modified: pal-admin/trunk/pom.xml =================================================================== --- pal-admin/trunk/pom.xml 2008-02-28 01:07:51 UTC (rev 821) +++ pal-admin/trunk/pom.xml 2008-02-28 03:01:45 UTC (rev 822) @@ -3,7 +3,7 @@ 4.0.0 jp.sf.pal pal-admin - 0.6-SNAPSHOT + 0.6 war Administration tools for PAL Portal From svnnotify @ sourceforge.jp Thu Feb 28 12:02:43 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Thu, 28 Feb 2008 12:02:43 +0900 Subject: [pal-cvs 3087] [823] version 0.3 Message-ID: <1204167763.325772.9512.nullmailer@users.sourceforge.jp> Revision: 823 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=823 Author: shinsuke Date: 2008-02-28 12:02:43 +0900 (Thu, 28 Feb 2008) Log Message: ----------- version 0.3 Modified Paths: -------------- pal-wcm/trunk/pom.xml -------------- next part -------------- Modified: pal-wcm/trunk/pom.xml =================================================================== --- pal-wcm/trunk/pom.xml 2008-02-28 03:01:45 UTC (rev 822) +++ pal-wcm/trunk/pom.xml 2008-02-28 03:02:43 UTC (rev 823) @@ -3,7 +3,7 @@ 4.0.0 jp.sf.pal pal-wcm - 0.3-SNAPSHOT + 0.3 war Web Content Management tools for PAL Portal From svnnotify @ sourceforge.jp Fri Feb 29 06:27:04 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Fri, 29 Feb 2008 06:27:04 +0900 Subject: [pal-cvs 3088] [824] version 0.6 Message-ID: <1204234024.626937.6193.nullmailer@users.sourceforge.jp> Revision: 824 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=824 Author: shinsuke Date: 2008-02-29 06:27:03 +0900 (Fri, 29 Feb 2008) Log Message: ----------- version 0.6 Added Paths: ----------- pal-admin/tags/pal-admin-0.6/ -------------- next part -------------- Copied: pal-admin/tags/pal-admin-0.6 (from rev 823, pal-admin/trunk) From svnnotify @ sourceforge.jp Fri Feb 29 06:28:42 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Fri, 29 Feb 2008 06:28:42 +0900 Subject: [pal-cvs 3089] [825] created tags. Message-ID: <1204234122.747575.7145.nullmailer@users.sourceforge.jp> Revision: 825 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=825 Author: shinsuke Date: 2008-02-29 06:28:42 +0900 (Fri, 29 Feb 2008) Log Message: ----------- created tags. Added Paths: ----------- pal-wcm/tags/ -------------- next part -------------- From svnnotify @ sourceforge.jp Fri Feb 29 06:29:22 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Fri, 29 Feb 2008 06:29:22 +0900 Subject: [pal-cvs 3090] [826] version 0.3 Message-ID: <1204234162.866826.7257.nullmailer@users.sourceforge.jp> Revision: 826 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=826 Author: shinsuke Date: 2008-02-29 06:29:22 +0900 (Fri, 29 Feb 2008) Log Message: ----------- version 0.3 Added Paths: ----------- pal-wcm/tags/pal-wcm-0.3/ -------------- next part -------------- Copied: pal-wcm/tags/pal-wcm-0.3 (from rev 825, pal-wcm/trunk) From svnnotify @ sourceforge.jp Fri Feb 29 06:40:36 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Fri, 29 Feb 2008 06:40:36 +0900 Subject: [pal-cvs 3091] [827] updated version Message-ID: <1204234836.520984.14010.nullmailer@users.sourceforge.jp> Revision: 827 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=827 Author: shinsuke Date: 2008-02-29 06:40:36 +0900 (Fri, 29 Feb 2008) Log Message: ----------- updated version Modified Paths: -------------- pal-portal/trunk/portlets/resources/jp/sf/pal/pal-admin.properties pal-portal/trunk/portlets/resources/jp/sf/pal/pal-wcm.properties -------------- next part -------------- Modified: pal-portal/trunk/portlets/resources/jp/sf/pal/pal-admin.properties =================================================================== --- pal-portal/trunk/portlets/resources/jp/sf/pal/pal-admin.properties 2008-02-28 21:29:22 UTC (rev 826) +++ pal-portal/trunk/portlets/resources/jp/sf/pal/pal-admin.properties 2008-02-28 21:40:36 UTC (rev 827) @@ -11,7 +11,7 @@ # SVN #svn.repository.path=http://svn.sourceforge.jp/svnroot/pal/pal-admin/trunk/ -svn.repository.path=http://svn.sourceforge.jp/svnroot/pal/pal-admin/branches/pal-admin-0.5 +svn.repository.path=http://svn.sourceforge.jp/svnroot/pal/pal-admin/tags/pal-admin-0.6 svn.revision=HEAD svn.module.name=pal-admin Modified: pal-portal/trunk/portlets/resources/jp/sf/pal/pal-wcm.properties =================================================================== --- pal-portal/trunk/portlets/resources/jp/sf/pal/pal-wcm.properties 2008-02-28 21:29:22 UTC (rev 826) +++ pal-portal/trunk/portlets/resources/jp/sf/pal/pal-wcm.properties 2008-02-28 21:40:36 UTC (rev 827) @@ -11,7 +11,7 @@ # SVN #svn.repository.path=http://svn.sourceforge.jp/svnroot/pal/pal-wcm/trunk/ -svn.repository.path=http://svn.sourceforge.jp/svnroot/pal/pal-wcm/branches/pal-wcm-0.2 +svn.repository.path=http://svn.sourceforge.jp/svnroot/pal/pal-wcm/tags/pal-wcm-0.3 svn.revision=HEAD svn.module.name=pal-wcm From svnnotify @ sourceforge.jp Fri Feb 29 06:41:10 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Fri, 29 Feb 2008 06:41:10 +0900 Subject: [pal-cvs 3092] [828] version 1.0.3 Message-ID: <1204234870.836216.14137.nullmailer@users.sourceforge.jp> Revision: 828 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=828 Author: shinsuke Date: 2008-02-29 06:41:10 +0900 (Fri, 29 Feb 2008) Log Message: ----------- version 1.0.3 Modified Paths: -------------- pal-portal/trunk/build.properties -------------- next part -------------- Modified: pal-portal/trunk/build.properties =================================================================== --- pal-portal/trunk/build.properties 2008-02-28 21:40:36 UTC (rev 827) +++ pal-portal/trunk/build.properties 2008-02-28 21:41:10 UTC (rev 828) @@ -4,7 +4,7 @@ container.name=PAL Portal container.separator=/ container.version.major=1 -container.version.minor=0.3-dev +container.version.minor=0.3 container.info.file=commons/src/java/org/apache/jetspeed/container/resources/ContainerInfo.properties portlets.home=${basedir}/portlets portlets.build.dir=${portlets.home}/build From svnnotify @ sourceforge.jp Fri Feb 29 06:44:01 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Fri, 29 Feb 2008 06:44:01 +0900 Subject: [pal-cvs 3093] [829] updated version Message-ID: <1204235041.574743.15371.nullmailer@users.sourceforge.jp> Revision: 829 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=829 Author: shinsuke Date: 2008-02-29 06:44:01 +0900 (Fri, 29 Feb 2008) Log Message: ----------- updated version Modified Paths: -------------- pal-portal/trunk/components/jetspeed-security-glassfish/pom.xml -------------- next part -------------- Modified: pal-portal/trunk/components/jetspeed-security-glassfish/pom.xml =================================================================== --- pal-portal/trunk/components/jetspeed-security-glassfish/pom.xml 2008-02-28 21:41:10 UTC (rev 828) +++ pal-portal/trunk/components/jetspeed-security-glassfish/pom.xml 2008-02-28 21:44:01 UTC (rev 829) @@ -4,7 +4,7 @@ org.apache.portals.jetspeed-2 jetspeed-security-glassfish jar - 2.1.3 + 2.1.3_pal-1.0.3 jetspeed-security-glassfish From svnnotify @ sourceforge.jp Fri Feb 29 13:26:52 2008 From: svnnotify @ sourceforge.jp (svnnotify @ sourceforge.jp) Date: Fri, 29 Feb 2008 13:26:52 +0900 Subject: [pal-cvs 3094] [830] changed j2 path. Message-ID: <1204259212.811996.1044.nullmailer@users.sourceforge.jp> Revision: 830 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=830 Author: shinsuke Date: 2008-02-29 13:26:52 +0900 (Fri, 29 Feb 2008) Log Message: ----------- changed j2 path. Modified Paths: -------------- pal-portal/branches/pal-portal-1.0.1/build.properties -------------- next part -------------- Modified: pal-portal/branches/pal-portal-1.0.1/build.properties =================================================================== --- pal-portal/branches/pal-portal-1.0.1/build.properties 2008-02-28 21:44:01 UTC (rev 829) +++ pal-portal/branches/pal-portal-1.0.1/build.properties 2008-02-29 04:26:52 UTC (rev 830) @@ -66,7 +66,7 @@ # Jetspeed SVN revision #jetspeed2.svn.repository=http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/ -jetspeed2.svn.repository=http://svn.apache.org/repos/asf/portals/jetspeed-2/branches/JETSPEED-2.1.3/ +jetspeed2.svn.repository=http://svn.apache.org/repos/asf/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3/ jetspeed2.revision=593340 # Dependencies for Jetspeed