svnno****@sourc*****
svnno****@sourc*****
2008年 7月 7日 (月) 13:38:27 JST
Revision: 1015
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1015
Author: shinsuke
Date: 2008-07-07 13:38:27 +0900 (Mon, 07 Jul 2008)
Log Message:
-----------
modified logging.
Modified Paths:
--------------
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/RemotePortletDeployConfirmPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemotePortletListPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemoteRepositoryConfirmPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemoteRepositoryEditPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/GroupConfirmPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/GroupEditPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/GroupListPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/password/PasswordEditPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/AbstractPermissionPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionConfirmPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionEditPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionListPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionConfirmPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionEditPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionListPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionConfirmPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionEditPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionListPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/portletmanager/PortletActionConfirmPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/portletmanager/PortletListPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/AbstractRuleCriterionPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleConfirmPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleCriterionConfirmPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleCriterionEditPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleCriterionListPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleEditPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleListPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/ForgottenPasswordPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/UserRegistrationPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleConfirmPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleEditPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleListPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/AbstractGlobalSecurityConstraintPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/GlobalSecurityConstraintConfirmPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/GlobalSecurityConstraintEditPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/GlobalSecurityConstraintListPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/SecurityDefinitionConfirmPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/SecurityDefinitionConstraintListPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/SecurityDefinitionEditPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/SecurityDefinitionListPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderAddFolderAndPageEditorPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderInfoEditorPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderMetadataEditorPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderOrderEditorPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderSecurityEditorPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutAddPortletEditorPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutInfoEditorPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPreferenceEditorPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPropertyEditorPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageInfoEditorPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageMetadataEditorPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageSecurityEditorPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletInfoEditorPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPreferenceEditorPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPropertyEditorPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/AbstractUserAttributePage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeConfirmPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeEditPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeListPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserConfirmPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserCreatePage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserEditPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserGroupEditPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserListPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserProfilingRuleEditPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserRoleEditPage.java
pal-admin/trunk/src/main/resources/PAMessages.properties
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/java/jp/sf/pal/admin/web/deployer/DeployerEditPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/DeployerEditPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/DeployerEditPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -22,14 +22,19 @@
import jp.sf.pal.admin.web.AbstractCrudPage;
import jp.sf.pal.common.util.FacesMessageUtil;
+import org.seasar.framework.log.Logger;
import org.seasar.teeda.extension.util.LabelHelper;
import org.seasar.teeda.extension.util.UploadedFile;
public class DeployerEditPage extends AbstractCrudPage implements Serializable {
+
+ private static final long serialVersionUID = -1591324603578689328L;
+
/**
- *
+ * Logger for this class
*/
- private static final long serialVersionUID = -1591324603578689328L;
+ private static final Logger logger = Logger
+ .getLogger(DeployerEditPage.class);
// @Required
private transient UploadedFile portletApplicationFile;
@@ -87,9 +92,10 @@
} catch (PALAdminException e) {
FacesMessageUtil
.addErrorMessage("failed.to.start.portlet.application.deployment");
+ logger.log("EPA0168", null, e);
}
} else {
- FacesMessageUtil.addErrorMessage("invalid.upload.file");
+ FacesMessageUtil.addWarnMessage("invalid.upload.file");
}
return null;
}
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemotePortletDeployConfirmPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemotePortletDeployConfirmPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemotePortletDeployConfirmPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -17,21 +17,25 @@
import java.io.Serializable;
-import org.seasar.teeda.extension.util.LabelHelper;
-
import jp.sf.pal.admin.PALAdminException;
import jp.sf.pal.admin.service.PortletDeploymentService;
import jp.sf.pal.admin.web.AbstractCrudPage;
import jp.sf.pal.admin.web.CrudType;
import jp.sf.pal.common.util.FacesMessageUtil;
+import org.seasar.framework.log.Logger;
+import org.seasar.teeda.extension.util.LabelHelper;
+
public class RemotePortletDeployConfirmPage extends AbstractCrudPage implements
Serializable {
+ private static final long serialVersionUID = -2270772566560001373L;
+
/**
- *
+ * Logger for this class
*/
- private static final long serialVersionUID = -2270772566560001373L;
+ private static final Logger logger = Logger
+ .getLogger(RemotePortletDeployConfirmPage.class);
private String artifactId;
@@ -121,6 +125,8 @@
} catch (PALAdminException e) {
FacesMessageUtil
.addErrorMessage("failed.to.start.portlet.application.deployment");
+ logger.log("EPA0169", new Object[] { getGroupId(),
+ getArtifactId(), getVersion(), getPackaging() }, e);
}
}
return RemotePortletListPage.class;
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemotePortletListPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemotePortletListPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemotePortletListPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -29,9 +29,6 @@
public class RemotePortletListPage extends AbstractPagerPage implements
Serializable {
- /**
- *
- */
private static final long serialVersionUID = -109222720193261550L;
private String publisherName;
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemoteRepositoryConfirmPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemoteRepositoryConfirmPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemoteRepositoryConfirmPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -15,18 +15,30 @@
*/
package jp.sf.pal.admin.web.deployer;
+import java.io.Serializable;
+
import jp.sf.pal.admin.PALAdminException;
import jp.sf.pal.admin.service.RepositoryManagementService;
import jp.sf.pal.admin.web.AbstractCrudPage;
import jp.sf.pal.admin.web.CrudType;
import jp.sf.pal.common.util.FacesMessageUtil;
+import org.seasar.framework.log.Logger;
import org.seasar.teeda.extension.annotation.takeover.TakeOver;
import org.seasar.teeda.extension.annotation.takeover.TakeOverType;
import org.seasar.teeda.extension.util.LabelHelper;
-public class RemoteRepositoryConfirmPage extends AbstractCrudPage {
+public class RemoteRepositoryConfirmPage extends AbstractCrudPage implements
+ Serializable {
+ private static final long serialVersionUID = -9059482570471139265L;
+
+ /**
+ * Logger for this class
+ */
+ private static final Logger logger = Logger
+ .getLogger(RemoteRepositoryConfirmPage.class);
+
private String name;
private String configPath;
@@ -93,6 +105,7 @@
public Class<?> doFinish() {
if (getName() == null) {
FacesMessageUtil.addWarnMessage("invalid.repository.parameters");
+ logger.log("EPA0170", null);
return RemoteRepositoryListPage.class;
}
@@ -104,6 +117,7 @@
} catch (PALAdminException e) {
FacesMessageUtil
.addErrorMessage("failed.to.add.new.repository");
+ logger.log("EPA0171", null, e);
}
break;
case CrudType.UPDATE:
@@ -112,6 +126,7 @@
FacesMessageUtil.addInfoMessage("updated.repository");
} catch (PALAdminException e) {
FacesMessageUtil.addErrorMessage("failed.to.update.repository");
+ logger.log("EPA0172", null, e);
}
break;
case CrudType.DELETE:
@@ -120,6 +135,7 @@
FacesMessageUtil.addInfoMessage("deleted.repository");
} catch (PALAdminException e) {
FacesMessageUtil.addErrorMessage("failed.to.delete.repository");
+ logger.log("EPA0173", null, e);
}
break;
default:
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemoteRepositoryEditPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemoteRepositoryEditPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemoteRepositoryEditPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -17,19 +17,23 @@
import java.io.Serializable;
-import org.seasar.teeda.extension.util.LabelHelper;
-
import jp.sf.pal.admin.service.RepositoryManagementService;
import jp.sf.pal.admin.web.AbstractCrudPage;
import jp.sf.pal.common.util.FacesMessageUtil;
+import org.seasar.framework.log.Logger;
+import org.seasar.teeda.extension.util.LabelHelper;
+
public class RemoteRepositoryEditPage extends AbstractCrudPage implements
Serializable {
+ private static final long serialVersionUID = -5296937640583502536L;
+
/**
- *
+ * Logger for this class
*/
- private static final long serialVersionUID = -5296937640583502536L;
+ private static final Logger logger = Logger
+ .getLogger(RemoteRepositoryEditPage.class);
private String name;
@@ -93,6 +97,7 @@
if (getName() == null) {
FacesMessageUtil
.addErrorMessage("invalid.repository.parameters");
+ logger.log("EPA0174", null);
return RemoteRepositoryListPage.class;
}
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/GroupConfirmPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/GroupConfirmPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/GroupConfirmPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -27,9 +27,6 @@
public class GroupConfirmPage extends AbstractGroupPage implements Serializable {
- /**
- *
- */
private static final long serialVersionUID = -283173697251156241L;
/**
@@ -58,7 +55,7 @@
} catch (PALAdminException e) {
FacesMessageUtil.addErrorMessage("failed.to.add.new.group",
new Object[] { getName() });
- logger.error("Failed to add a new group: " + getName(), e);
+ logger.log("EPA0160", new Object[] { getName() }, e);
}
break;
// case CrudType.UPDATE:
@@ -71,7 +68,7 @@
} catch (PALAdminException e) {
FacesMessageUtil.addErrorMessage("failed.to.delete.group",
new Object[] { getName() });
- logger.error("Failed to delete a new group: " + getName(), e);
+ logger.log("EPA0161", new Object[] { getName() }, e);
}
break;
default:
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/GroupEditPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/GroupEditPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/GroupEditPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -17,16 +17,13 @@
import java.io.Serializable;
+import jp.sf.pal.common.util.FacesMessageUtil;
+
import org.seasar.teeda.extension.annotation.validator.Length;
import org.seasar.teeda.extension.annotation.validator.Required;
-import jp.sf.pal.common.util.FacesMessageUtil;
-
public class GroupEditPage extends AbstractGroupPage implements Serializable {
- /**
- *
- */
private static final long serialVersionUID = 666316850285389222L;
public String initialize() {
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/GroupListPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/GroupListPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/GroupListPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -23,12 +23,16 @@
import jp.sf.pal.admin.web.AbstractPagerPage;
import jp.sf.pal.common.util.FacesMessageUtil;
+import org.seasar.framework.log.Logger;
+
public class GroupListPage extends AbstractPagerPage implements Serializable {
+ private static final long serialVersionUID = 2827788757965933167L;
+
/**
- *
+ * Logger for this class
*/
- private static final long serialVersionUID = 2827788757965933167L;
+ private static final Logger logger = Logger.getLogger(GroupListPage.class);
private int groupIndex;
@@ -82,7 +86,12 @@
}
public String prerender() {
- getGroupManagementService().loadPage(this);
+ try {
+ getGroupManagementService().loadPage(this);
+ } catch (Exception e) {
+ FacesMessageUtil.addErrorMessage("failed.to.get.groups");
+ logger.log("EPA0162", null, e);
+ }
// render FacesMessages
FacesMessageUtil.renderMessages();
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/password/PasswordEditPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/password/PasswordEditPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/password/PasswordEditPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -29,9 +29,6 @@
public class PasswordEditPage implements Serializable {
- /**
- *
- */
private static final long serialVersionUID = 8299805833656409820L;
/**
@@ -71,8 +68,8 @@
try {
username = getPasswordManagementService().getUsername();
} catch (CommonException e) {
- logger.log("EPA0047", new Object[] {}, e);
FacesMessageUtil.addErrorMessage(e.getMessageId());
+ logger.log("EPA0047", new Object[] {}, e);
}
if (username == null) {
@@ -82,6 +79,7 @@
if (!getPasswordManagementService().validate(username, currentPassword,
newPassword)) {
FacesMessageUtil.addErrorMessage("invalid.new.password");
+ logger.log("EPA0167", null);
return null;
}
@@ -90,8 +88,8 @@
currentPassword, newPassword);
FacesMessageUtil.addInfoMessage("changed.password");
} catch (CommonException e) {
- logger.log("EPA0046", new Object[] {}, e);
FacesMessageUtil.addErrorMessage(e.getMessageId());
+ logger.log("EPA0046", new Object[] {}, e);
}
return null;
}
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/AbstractPermissionPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/AbstractPermissionPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/AbstractPermissionPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -15,11 +15,11 @@
*/
package jp.sf.pal.admin.web.permission;
-import org.seasar.teeda.extension.util.LabelHelper;
-
import jp.sf.pal.admin.service.PermissionManagementService;
import jp.sf.pal.admin.web.AbstractCrudPage;
+import org.seasar.teeda.extension.util.LabelHelper;
+
public abstract class AbstractPermissionPage extends AbstractCrudPage {
private String name;
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionConfirmPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionConfirmPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionConfirmPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -29,9 +29,6 @@
public class FolderPermissionConfirmPage extends AbstractPermissionPage
implements Serializable {
- /**
- *
- */
private static final long serialVersionUID = 9023563142910966532L;
/**
@@ -51,9 +48,9 @@
try {
getPermissionManagementService().loadPage(this);
} catch (PALAdminException e) {
- logger.error("EPA0036", e);
FacesMessageUtil
.addErrorMessage("could.not.find.folder.permission");
+ logger.log("EPA0036", null, e);
}
} else {
if (isUpdate()) {
@@ -76,9 +73,9 @@
FacesMessageUtil.addInfoMessage("added.folder.permission");
return FolderPermissionListPage.class;
} catch (PALAdminException e) {
- logger.error("EPA0037", e);
FacesMessageUtil
.addErrorMessage("could.not.add.folder.permission");
+ logger.log("EPA0037", null, e);
}
} else if (isUpdate()) {
// update
@@ -87,9 +84,9 @@
FacesMessageUtil.addInfoMessage("updated.folder.permission");
return FolderPermissionListPage.class;
} catch (PALAdminException e) {
- logger.error("EPA0038", e);
FacesMessageUtil
.addErrorMessage("could.not.update.folder.permission");
+ logger.log("EPA0038", null, e);
}
} else if (isDelete()) {
// delete
@@ -98,12 +95,14 @@
FacesMessageUtil.addInfoMessage("deleted.folder.permission");
return FolderPermissionListPage.class;
} catch (PALAdminException e) {
- logger.error("EPA0039", e);
FacesMessageUtil
.addErrorMessage("could.not.delete.folder.permission");
+ logger.log("EPA0039", null, e);
}
} else {
FacesMessageUtil.addWarnMessage("could.not.find.target.action");
+ logger.log("WPA0023",
+ new Object[] { Integer.valueOf(getCrudType()) });
}
return null;
}
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionEditPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionEditPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionEditPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -29,9 +29,6 @@
public class FolderPermissionEditPage extends AbstractPermissionPage implements
Serializable {
- /**
- *
- */
private static final long serialVersionUID = -4575207464231801908L;
/**
@@ -56,9 +53,9 @@
try {
getPermissionManagementService().loadPage(this);
} catch (PALAdminException e) {
- logger.error("EPA0035", e);
FacesMessageUtil
.addErrorMessage("could.not.find.folder.permission");
+ logger.log("EPA0035", null, e);
}
// render faces message
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionListPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionListPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionListPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -29,9 +29,6 @@
public class FolderPermissionListPage extends AbstractPagerPage implements
Serializable {
- /**
- *
- */
private static final long serialVersionUID = 2457037062742678960L;
/**
@@ -61,9 +58,9 @@
try {
getPermissionManagementService().loadPage(this);
} catch (PALAdminException e) {
- logger.error("EPA0034", e);
FacesMessageUtil
.addErrorMessage("could.not.find.folder.permissions");
+ logger.log("EPA0034", null, e);
}
// render faces message
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionConfirmPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionConfirmPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionConfirmPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -29,9 +29,6 @@
public class PagePermissionConfirmPage extends AbstractPermissionPage implements
Serializable {
- /**
- *
- */
private static final long serialVersionUID = 525599648048090961L;
/**
@@ -51,9 +48,9 @@
try {
getPermissionManagementService().loadPage(this);
} catch (PALAdminException e) {
- logger.error("EPA0042", e);
FacesMessageUtil
.addErrorMessage("could.not.find.page.permission");
+ logger.log("EPA0042", null, e);
}
} else {
if (isUpdate()) {
@@ -76,9 +73,9 @@
FacesMessageUtil.addInfoMessage("added.page.permission");
return PagePermissionListPage.class;
} catch (PALAdminException e) {
- logger.error("EPA0043", e);
FacesMessageUtil
.addErrorMessage("could.not.add.page.permission");
+ logger.log("EPA0043", null, e);
}
} else if (isUpdate()) {
// update
@@ -87,9 +84,9 @@
FacesMessageUtil.addInfoMessage("updated.page.permission");
return PagePermissionListPage.class;
} catch (PALAdminException e) {
- logger.error("EPA0044", e);
FacesMessageUtil
.addErrorMessage("could.not.update.page.permission");
+ logger.log("EPA0044", null, e);
}
} else if (isDelete()) {
// delete
@@ -98,12 +95,14 @@
FacesMessageUtil.addInfoMessage("deleted.page.permission");
return PagePermissionListPage.class;
} catch (PALAdminException e) {
- logger.error("EPA0045", e);
FacesMessageUtil
.addErrorMessage("could.not.delete.page.permission");
+ logger.log("EPA0045", null, e);
}
} else {
FacesMessageUtil.addWarnMessage("could.not.find.target.action");
+ logger.log("WPA0024",
+ new Object[] { Integer.valueOf(getCrudType()) });
}
return null;
}
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionEditPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionEditPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionEditPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -29,9 +29,6 @@
public class PagePermissionEditPage extends AbstractPermissionPage implements
Serializable {
- /**
- *
- */
private static final long serialVersionUID = -6276578931150134498L;
/**
@@ -56,8 +53,8 @@
try {
getPermissionManagementService().loadPage(this);
} catch (PALAdminException e) {
- logger.error("EPA0041", e);
FacesMessageUtil.addErrorMessage("could.not.find.page.permission");
+ logger.log("EPA0041", null, e);
}
// render faces message
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionListPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionListPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionListPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -29,9 +29,6 @@
public class PagePermissionListPage extends AbstractPagerPage implements
Serializable {
- /**
- *
- */
private static final long serialVersionUID = -5318877226955302854L;
/**
@@ -61,8 +58,8 @@
try {
getPermissionManagementService().loadPage(this);
} catch (PALAdminException e) {
- logger.error("EPA0024", e);
FacesMessageUtil.addErrorMessage("could.not.find.page.permissions");
+ logger.log("EPA0024", null, e);
}
// render faces message
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionConfirmPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionConfirmPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionConfirmPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -29,9 +29,6 @@
public class PortletPermissionConfirmPage extends AbstractPermissionPage
implements Serializable {
- /**
- *
- */
private static final long serialVersionUID = 7198440443223185603L;
/**
@@ -51,9 +48,9 @@
try {
getPermissionManagementService().loadPage(this);
} catch (PALAdminException e) {
- logger.error("EPA0030", e);
FacesMessageUtil
.addErrorMessage("could.not.find.portlet.permission");
+ logger.log("EPA0030", null, e);
}
} else {
if (isUpdate()) {
@@ -76,9 +73,9 @@
FacesMessageUtil.addInfoMessage("added.portlet.permission");
return PortletPermissionListPage.class;
} catch (PALAdminException e) {
- logger.error("EPA0031", e);
FacesMessageUtil
.addErrorMessage("could.not.add.portlet.permission");
+ logger.log("EPA0031", null, e);
}
} else if (isUpdate()) {
// update
@@ -87,9 +84,9 @@
FacesMessageUtil.addInfoMessage("updated.portlet.permission");
return PortletPermissionListPage.class;
} catch (PALAdminException e) {
- logger.error("EPA0032", e);
FacesMessageUtil
.addErrorMessage("could.not.update.portlet.permission");
+ logger.log("EPA0032", null, e);
}
} else if (isDelete()) {
// delete
@@ -98,12 +95,14 @@
FacesMessageUtil.addInfoMessage("deleted.portlet.permission");
return PortletPermissionListPage.class;
} catch (PALAdminException e) {
- logger.error("EPA0033", e);
FacesMessageUtil
.addErrorMessage("could.not.delete.portlet.permission");
+ logger.log("EPA0033", null, e);
}
} else {
FacesMessageUtil.addWarnMessage("could.not.find.target.action");
+ logger.log("WPA0025",
+ new Object[] { Integer.valueOf(getCrudType()) });
}
return null;
}
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionEditPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionEditPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionEditPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -29,9 +29,6 @@
public class PortletPermissionEditPage extends AbstractPermissionPage implements
Serializable {
- /**
- *
- */
private static final long serialVersionUID = 2408447311367739937L;
/**
@@ -56,9 +53,9 @@
try {
getPermissionManagementService().loadPage(this);
} catch (PALAdminException e) {
- logger.error("EPA0029", e);
FacesMessageUtil
.addErrorMessage("could.not.find.portlet.permission");
+ logger.log("EPA0029", null, e);
}
// render faces message
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionListPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionListPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionListPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -29,9 +29,6 @@
public class PortletPermissionListPage extends AbstractPagerPage implements
Serializable {
- /**
- *
- */
private static final long serialVersionUID = -3454682306082731012L;
/**
@@ -61,9 +58,9 @@
try {
getPermissionManagementService().loadPage(this);
} catch (PALAdminException e) {
- logger.error("EPA0028", e);
FacesMessageUtil
.addErrorMessage("could.not.find.portlet.permissions");
+ logger.log("EPA0028", null, e);
}
// render faces message
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/portletmanager/PortletActionConfirmPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/portletmanager/PortletActionConfirmPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/portletmanager/PortletActionConfirmPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -17,21 +17,25 @@
import java.io.Serializable;
-import org.seasar.teeda.extension.util.LabelHelper;
-
import jp.sf.pal.admin.PALAdminConstants;
import jp.sf.pal.admin.PALAdminException;
import jp.sf.pal.admin.service.PortletManagementService;
import jp.sf.pal.admin.web.AbstractCrudPage;
import jp.sf.pal.common.util.FacesMessageUtil;
+import org.seasar.framework.log.Logger;
+import org.seasar.teeda.extension.util.LabelHelper;
+
public class PortletActionConfirmPage extends AbstractCrudPage implements
Serializable {
+ private static final long serialVersionUID = -9103369009857828750L;
+
/**
- *
+ * Logger for this class
*/
- private static final long serialVersionUID = -9103369009857828750L;
+ private static final Logger logger = Logger
+ .getLogger(PortletActionConfirmPage.class);
private String name;
@@ -103,6 +107,7 @@
} catch (PALAdminException e) {
FacesMessageUtil
.addErrorMessage("failed.to.start.portlet.application");
+ logger.log("EPA0163", new Object[] { getName() }, e);
}
} else if (isStopAction()) {
try {
@@ -111,6 +116,7 @@
} catch (PALAdminException e) {
FacesMessageUtil
.addErrorMessage("failed.to.stop.portlet.application");
+ logger.log("EPA0164", new Object[] { getName() }, e);
}
} else if (isUndeployAction()) {
try {
@@ -120,6 +126,7 @@
} catch (PALAdminException e) {
FacesMessageUtil
.addErrorMessage("failed.to.undeploy.portlet.application");
+ logger.log("EPA0165", new Object[] { getName() }, e);
}
} else if (isDeleteAction()) {
try {
@@ -128,10 +135,13 @@
} catch (PALAdminException e) {
FacesMessageUtil
.addErrorMessage("failed.to.delete.portlet.application");
+ logger.log("EPA0166", new Object[] { getName() }, e);
}
} else {
FacesMessageUtil
.addWarnMessage("invalid.action.for.portlet.application");
+ logger.log("WPA0022", null);
+ return null;
}
return PortletListPage.class;
}
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/portletmanager/PortletListPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/portletmanager/PortletListPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/portletmanager/PortletListPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -26,9 +26,6 @@
public class PortletListPage extends AbstractPagerPage implements Serializable {
- /**
- *
- */
private static final long serialVersionUID = -4766951315413321520L;
private String name;
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/AbstractRuleCriterionPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/AbstractRuleCriterionPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/AbstractRuleCriterionPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -1,10 +1,10 @@
package jp.sf.pal.admin.web.profiler;
-import org.seasar.teeda.extension.util.LabelHelper;
-
import jp.sf.pal.admin.service.ProfilingRuleService;
import jp.sf.pal.admin.web.AbstractCrudPage;
+import org.seasar.teeda.extension.util.LabelHelper;
+
public class AbstractRuleCriterionPage extends AbstractCrudPage {
private Integer fallbackOrder;
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleConfirmPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleConfirmPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleConfirmPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -30,7 +30,7 @@
getProfilingRuleService().loadPage(this);
} catch (CommonException e) {
FacesMessageUtil.addErrorMessage(e.getMessageId());
- logger.error("EPA0065", e);
+ logger.log("EPA0065", null, e);
}
} else {
// update or create
@@ -61,7 +61,7 @@
return RuleListPage.class;
} catch (CommonException e) {
FacesMessageUtil.addErrorMessage(e.getMessageId());
- logger.error("EPA0066", e);
+ logger.log("EPA0066", null, e);
}
} else if (isUpdate()) {
// update
@@ -71,7 +71,7 @@
return RuleListPage.class;
} catch (CommonException e) {
FacesMessageUtil.addErrorMessage(e.getMessageId());
- logger.error("EPA0067", e);
+ logger.log("EPA0067", null, e);
}
} else if (isDelete()) {
// delete
@@ -81,10 +81,11 @@
return RuleListPage.class;
} catch (CommonException e) {
FacesMessageUtil.addErrorMessage(e.getMessageId());
- logger.error("EPA0068", e);
+ logger.log("EPA0068", null, e);
}
} else {
FacesMessageUtil.addWarnMessage("could.not.find.target.action");
+ logger.log("WPA0020", null);
}
return null;
}
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleCriterionConfirmPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleCriterionConfirmPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleCriterionConfirmPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -2,6 +2,10 @@
import java.io.Serializable;
+import jp.sf.pal.admin.util.PALAdminUtil;
+import jp.sf.pal.common.CommonException;
+import jp.sf.pal.common.util.FacesMessageUtil;
+
import org.seasar.framework.log.Logger;
import org.seasar.teeda.extension.annotation.takeover.TakeOver;
import org.seasar.teeda.extension.annotation.takeover.TakeOverType;
@@ -9,10 +13,6 @@
import org.seasar.teeda.extension.annotation.validator.RegularExpression;
import org.seasar.teeda.extension.annotation.validator.Required;
-import jp.sf.pal.admin.util.PALAdminUtil;
-import jp.sf.pal.common.CommonException;
-import jp.sf.pal.common.util.FacesMessageUtil;
-
public class RuleCriterionConfirmPage extends AbstractRuleCriterionPage
implements Serializable {
@@ -34,7 +34,7 @@
getProfilingRuleService().loadPage(this);
} catch (CommonException e) {
FacesMessageUtil.addErrorMessage(e.getMessageId());
- logger.error("EPA0070", e);
+ logger.log("EPA0070", null, e);
}
} else {
// update or create
@@ -66,7 +66,7 @@
return RuleCriterionListPage.class;
} catch (CommonException e) {
FacesMessageUtil.addErrorMessage(e.getMessageId());
- logger.error("EPA0071", e);
+ logger.log("EPA0071", null, e);
}
} else if (isUpdate()) {
// update
@@ -76,7 +76,7 @@
return RuleCriterionListPage.class;
} catch (CommonException e) {
FacesMessageUtil.addErrorMessage(e.getMessageId());
- logger.error("EPA0072", e);
+ logger.log("EPA0072", null, e);
}
} else if (isDelete()) {
// delete
@@ -86,10 +86,11 @@
return RuleCriterionListPage.class;
} catch (CommonException e) {
FacesMessageUtil.addErrorMessage(e.getMessageId());
- logger.error("EPA0073", e);
+ logger.log("EPA0073", null, e);
}
} else {
FacesMessageUtil.addWarnMessage("could.not.find.target.action");
+ logger.log("WPA0021", null);
}
return null;
}
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleCriterionEditPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleCriterionEditPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleCriterionEditPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -4,14 +4,14 @@
import java.util.List;
import java.util.Map;
+import jp.sf.pal.common.CommonException;
+import jp.sf.pal.common.util.FacesMessageUtil;
+
import org.seasar.framework.log.Logger;
import org.seasar.teeda.extension.annotation.validator.Length;
import org.seasar.teeda.extension.annotation.validator.RegularExpression;
import org.seasar.teeda.extension.annotation.validator.Required;
-import jp.sf.pal.common.CommonException;
-import jp.sf.pal.common.util.FacesMessageUtil;
-
public class RuleCriterionEditPage extends AbstractRuleCriterionPage implements
Serializable {
@@ -37,7 +37,7 @@
getProfilingRuleService().loadPage(this);
} catch (CommonException e) {
FacesMessageUtil.addErrorMessage(e.getMessageId());
- logger.error("EPA0064", e);
+ logger.log("EPA0064", null, e);
}
// render faces messages
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleCriterionListPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleCriterionListPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleCriterionListPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -4,13 +4,13 @@
import java.util.List;
import java.util.Map;
-import org.seasar.framework.log.Logger;
-
import jp.sf.pal.admin.service.ProfilingRuleService;
import jp.sf.pal.admin.web.AbstractPagerPage;
import jp.sf.pal.common.CommonException;
import jp.sf.pal.common.util.FacesMessageUtil;
+import org.seasar.framework.log.Logger;
+
public class RuleCriterionListPage extends AbstractPagerPage implements
Serializable {
@@ -47,7 +47,7 @@
getProfilingRuleService().loadPage(this);
} catch (CommonException e) {
FacesMessageUtil.addErrorMessage(e.getMessageId());
- logger.error("EPA0069", e);
+ logger.log("EPA0069", null, e);
}
// render faces messages
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleEditPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleEditPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleEditPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -33,7 +33,7 @@
getProfilingRuleService().loadPage(this);
} catch (CommonException e) {
FacesMessageUtil.addErrorMessage(e.getMessageId());
- logger.error("EPA0064", e);
+ logger.log("EPA0064", null, e);
}
// render faces messages
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleListPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleListPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleListPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -37,7 +37,7 @@
getProfilingRuleService().loadPage(this);
} catch (CommonException e) {
FacesMessageUtil.addErrorMessage(e.getMessageId());
- logger.error("EPA0048", e);
+ logger.log("EPA0048", null, e);
}
// render faces messages
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/ForgottenPasswordPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/ForgottenPasswordPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/ForgottenPasswordPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -19,17 +19,14 @@
import javax.faces.context.FacesContext;
-import org.seasar.framework.log.Logger;
-
import jp.sf.pal.common.CommonException;
import jp.sf.pal.common.util.FacesMessageUtil;
+import org.seasar.framework.log.Logger;
+
public class ForgottenPasswordPage extends AbstractForgottenPasswordPage
implements Serializable {
- /**
- *
- */
private static final long serialVersionUID = -1002535740755952748L;
/**
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/UserRegistrationPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/UserRegistrationPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/UserRegistrationPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -17,18 +17,16 @@
import java.io.Serializable;
-import org.seasar.framework.log.Logger;
-
import jp.sf.pal.admin.PALAdminConstants;
import jp.sf.pal.admin.util.UserRegistrationUtil;
import jp.sf.pal.common.CommonException;
import jp.sf.pal.common.util.FacesMessageUtil;
+import org.seasar.framework.log.Logger;
+
public class UserRegistrationPage extends AbstractUserRegistrationPage
implements Serializable {
- /**
- *
- */
+
private static final long serialVersionUID = -5852964123222268945L;
/**
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleConfirmPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleConfirmPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleConfirmPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -26,9 +26,7 @@
import org.seasar.teeda.extension.annotation.validator.Required;
public class RoleConfirmPage extends AbstractRolePage implements Serializable {
- /**
- *
- */
+
private static final long serialVersionUID = 8565809646908671454L;
/**
@@ -57,7 +55,7 @@
} catch (PALAdminException e) {
FacesMessageUtil.addErrorMessage("failed.to.add.new.role",
new Object[] { getName() });
- logger.error("Failed to add a new role: " + getName(), e);
+ logger.log("EPA0158", new Object[] { getName() }, e);
}
break;
// case CrudType.UPDATE:
@@ -70,7 +68,7 @@
} catch (PALAdminException e) {
FacesMessageUtil.addErrorMessage("failed.to.delete.role",
new Object[] { getName() });
- logger.error("Failed to delete a new role: " + getName(), e);
+ logger.log("EPA0159", new Object[] { getName() }, e);
}
break;
default:
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleEditPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleEditPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleEditPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -24,9 +24,6 @@
public class RoleEditPage extends AbstractRolePage implements Serializable {
- /**
- *
- */
private static final long serialVersionUID = 8348278121674992785L;
public String initialize() {
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleListPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleListPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleListPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -23,12 +23,16 @@
import jp.sf.pal.admin.web.AbstractPagerPage;
import jp.sf.pal.common.util.FacesMessageUtil;
+import org.seasar.framework.log.Logger;
+
public class RoleListPage extends AbstractPagerPage implements Serializable {
+ private static final long serialVersionUID = -9134524940073547390L;
+
/**
- *
+ * Logger for this class
*/
- private static final long serialVersionUID = -9134524940073547390L;
+ private static final Logger logger = Logger.getLogger(RoleListPage.class);
private int roleIndex;
@@ -99,7 +103,12 @@
}
public String prerender() {
- roleManagementService.loadPage(this);
+ try {
+ roleManagementService.loadPage(this);
+ } catch (Exception e) {
+ FacesMessageUtil.addErrorMessage("failed.to.get.roles");
+ logger.log("EPA0157", null, e);
+ }
// render FacesMessages
FacesMessageUtil.renderMessages();
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/AbstractGlobalSecurityConstraintPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/AbstractGlobalSecurityConstraintPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/AbstractGlobalSecurityConstraintPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -1,10 +1,10 @@
package jp.sf.pal.admin.web.securityconstraint;
-import org.seasar.teeda.extension.util.LabelHelper;
-
import jp.sf.pal.admin.service.SecurityConstraintService;
import jp.sf.pal.admin.web.AbstractCrudPage;
+import org.seasar.teeda.extension.util.LabelHelper;
+
public class AbstractGlobalSecurityConstraintPage extends AbstractCrudPage {
private String name;
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/GlobalSecurityConstraintConfirmPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/GlobalSecurityConstraintConfirmPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/GlobalSecurityConstraintConfirmPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -28,7 +28,7 @@
getSecurityConstraintService().loadPage(this);
} catch (CommonException e) {
FacesMessageUtil.addErrorMessage(e.getMessageId());
- logger.error("EPA0060", e);
+ logger.log("EPA0060", null, e);
}
} else {
// update or create
@@ -61,7 +61,7 @@
return GlobalSecurityConstraintListPage.class;
} catch (CommonException e) {
FacesMessageUtil.addErrorMessage(e.getMessageId());
- logger.error("EPA0061", e);
+ logger.log("EPA0061", null, e);
}
} else if (isUpdate()) {
// update
@@ -84,10 +84,12 @@
return GlobalSecurityConstraintListPage.class;
} catch (CommonException e) {
FacesMessageUtil.addErrorMessage(e.getMessageId());
- logger.error("EPA0063", e);
+ logger.log("EPA0063", null, e);
}
} else {
FacesMessageUtil.addWarnMessage("could.not.find.target.action");
+ logger.log("WPA0018",
+ new Object[] { Integer.valueOf(getCrudType()) });
}
return null;
}
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/GlobalSecurityConstraintEditPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/GlobalSecurityConstraintEditPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/GlobalSecurityConstraintEditPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -27,7 +27,7 @@
getSecurityConstraintService().loadPage(this);
} catch (CommonException e) {
FacesMessageUtil.addErrorMessage(e.getMessageId());
- logger.error("EPA0049", e);
+ logger.log("EPA0049", null, e);
}
// render faces messages
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/GlobalSecurityConstraintListPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/GlobalSecurityConstraintListPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/GlobalSecurityConstraintListPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -4,13 +4,13 @@
import java.util.List;
import java.util.Map;
-import org.seasar.framework.log.Logger;
-
import jp.sf.pal.admin.service.SecurityConstraintService;
import jp.sf.pal.admin.web.AbstractPagerPage;
import jp.sf.pal.common.CommonException;
import jp.sf.pal.common.util.FacesMessageUtil;
+import org.seasar.framework.log.Logger;
+
public class GlobalSecurityConstraintListPage extends AbstractPagerPage
implements Serializable {
@@ -39,7 +39,7 @@
getSecurityConstraintService().loadPage(this);
} catch (CommonException e) {
FacesMessageUtil.addErrorMessage(e.getMessageId());
- logger.error("EPA0059", e);
+ logger.log("EPA0059", null, e);
}
// render faces messages
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/SecurityDefinitionConfirmPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/SecurityDefinitionConfirmPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/SecurityDefinitionConfirmPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -29,7 +29,7 @@
getSecurityConstraintService().loadPage(this);
} catch (CommonException e) {
FacesMessageUtil.addErrorMessage(e.getMessageId());
- logger.error("EPA0050", e);
+ logger.log("EPA0050", null, e);
}
} else {
// update or create
@@ -60,7 +60,7 @@
return SecurityDefinitionListPage.class;
} catch (CommonException e) {
FacesMessageUtil.addErrorMessage(e.getMessageId());
- logger.error("EPA0051", e);
+ logger.log("EPA0051", null, e);
}
} else if (isUpdate()) {
// update
@@ -81,10 +81,12 @@
return SecurityDefinitionListPage.class;
} catch (CommonException e) {
FacesMessageUtil.addErrorMessage(e.getMessageId());
- logger.error("EPA0053", e);
+ logger.log("EPA0053", null, e);
}
} else {
FacesMessageUtil.addWarnMessage("could.not.find.target.action");
+ logger.log("WPA0019",
+ new Object[] { Integer.valueOf(getCrudType()) });
}
return null;
}
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/SecurityDefinitionConstraintListPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/SecurityDefinitionConstraintListPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/SecurityDefinitionConstraintListPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -72,7 +72,7 @@
getSecurityConstraintService().loadPage(this);
} catch (CommonException e) {
FacesMessageUtil.addErrorMessage(e.getMessageId());
- logger.error("EPA0054");
+ logger.log("EPA0054", null);
}
// render FacesMessages
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/SecurityDefinitionEditPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/SecurityDefinitionEditPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/SecurityDefinitionEditPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -33,8 +33,7 @@
getSecurityConstraintService().loadPage(this);
} catch (CommonException e) {
FacesMessageUtil.addErrorMessage(e.getMessageId());
- logger.error("EPA0049", e);
-
+ logger.log("EPA0049", null, e);
}
// render faces messages
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/SecurityDefinitionListPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/SecurityDefinitionListPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/SecurityDefinitionListPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -39,7 +39,7 @@
getSecurityConstraintService().loadPage(this);
} catch (CommonException e) {
FacesMessageUtil.addErrorMessage(e.getMessageId());
- logger.error("EPA0048", e);
+ logger.log("EPA0048", null, e);
}
// render faces messages
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderAddFolderAndPageEditorPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderAddFolderAndPageEditorPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderAddFolderAndPageEditorPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -33,16 +33,13 @@
public class FolderAddFolderAndPageEditorPage extends AbstractSiteEditorPage
implements Serializable {
- /**
- *
- */
private static final long serialVersionUID = 7554996409131145939L;
/**
* Logger for this class
*/
private static final Logger logger = Logger
- .getLogger(FolderInfoEditorPage.class);
+ .getLogger(FolderAddFolderAndPageEditorPage.class);
@Required
private String layoutName;
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderInfoEditorPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderInfoEditorPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderInfoEditorPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -32,9 +32,6 @@
public class FolderInfoEditorPage extends AbstractSiteEditorPage implements
Serializable {
- /**
- *
- */
private static final long serialVersionUID = 7317388711533222091L;
/**
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderMetadataEditorPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderMetadataEditorPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderMetadataEditorPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -32,9 +32,6 @@
public class FolderMetadataEditorPage extends AbstractSiteEditorPage implements
Serializable {
- /**
- *
- */
private static final long serialVersionUID = 7467441597149052725L;
/**
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderOrderEditorPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderOrderEditorPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderOrderEditorPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -31,9 +31,6 @@
public class FolderOrderEditorPage extends AbstractSiteEditorPage implements
Serializable {
- /**
- *
- */
private static final long serialVersionUID = -6925976356083695370L;
/**
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderSecurityEditorPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderSecurityEditorPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderSecurityEditorPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -29,9 +29,6 @@
public class FolderSecurityEditorPage extends AbstractSiteSecurityEditorPage
implements Serializable {
- /**
- *
- */
private static final long serialVersionUID = -8992530845130742843L;
/**
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutAddPortletEditorPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutAddPortletEditorPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutAddPortletEditorPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -30,16 +30,13 @@
public class LayoutAddPortletEditorPage extends AbstractSiteEditorPage
implements Serializable {
- /**
- *
- */
private static final long serialVersionUID = 7303037331858505917L;
/**
* Logger for this class
*/
private static final Logger logger = Logger
- .getLogger(LayoutInfoEditorPage.class);
+ .getLogger(LayoutAddPortletEditorPage.class);
private String layoutName;
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutInfoEditorPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutInfoEditorPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutInfoEditorPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -31,9 +31,6 @@
public class LayoutInfoEditorPage extends AbstractSiteEditorPage implements
Serializable {
- /**
- *
- */
private static final long serialVersionUID = -7707159453322242563L;
/**
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPreferenceEditorPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPreferenceEditorPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPreferenceEditorPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -34,9 +34,6 @@
public class LayoutPreferenceEditorPage extends AbstractSiteEditorPage
implements Serializable {
- /**
- *
- */
private static final long serialVersionUID = 8040353172823831504L;
/**
@@ -93,6 +90,7 @@
doDelete();
} else {
FacesMessageUtil.addWarnMessage("could.not.find.preference");
+ logger.log("WPA0013", null);
}
setPreferenceName(null);
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPropertyEditorPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPropertyEditorPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPropertyEditorPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -33,9 +33,6 @@
public class LayoutPropertyEditorPage extends AbstractSiteEditorPage implements
Serializable {
- /**
- *
- */
private static final long serialVersionUID = -7433703093804486330L;
/**
@@ -92,6 +89,7 @@
doDelete();
} else {
FacesMessageUtil.addWarnMessage("could.not.find.property");
+ logger.log("WPA0014", null);
}
setPropertyName(null);
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageInfoEditorPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageInfoEditorPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageInfoEditorPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -32,9 +32,6 @@
public class PageInfoEditorPage extends AbstractSiteEditorPage implements
Serializable {
- /**
- *
- */
private static final long serialVersionUID = 6200363396293790793L;
/**
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageMetadataEditorPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageMetadataEditorPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageMetadataEditorPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -32,9 +32,6 @@
public class PageMetadataEditorPage extends AbstractSiteEditorPage implements
Serializable {
- /**
- *
- */
private static final long serialVersionUID = 7467441597149052725L;
/**
@@ -239,6 +236,7 @@
doDelete();
} else {
FacesMessageUtil.addWarnMessage("could.not.find.metadata");
+ logger.log("WPA0015", null);
}
setMetadataLocale(null);
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageSecurityEditorPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageSecurityEditorPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageSecurityEditorPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -29,9 +29,6 @@
public class PageSecurityEditorPage extends AbstractSiteSecurityEditorPage
implements Serializable {
- /**
- *
- */
private static final long serialVersionUID = 5074641483347337061L;
/**
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletInfoEditorPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletInfoEditorPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletInfoEditorPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -31,16 +31,13 @@
public class PortletInfoEditorPage extends AbstractSiteEditorPage implements
Serializable {
- /**
- *
- */
private static final long serialVersionUID = -5933118337604397635L;
/**
* Logger for this class
*/
private static final Logger logger = Logger
- .getLogger(LayoutInfoEditorPage.class);
+ .getLogger(PortletInfoEditorPage.class);
private String decorator;
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPreferenceEditorPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPreferenceEditorPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPreferenceEditorPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -34,9 +34,6 @@
public class PortletPreferenceEditorPage extends AbstractSiteEditorPage
implements Serializable {
- /**
- *
- */
private static final long serialVersionUID = -3291082572720400440L;
/**
@@ -93,6 +90,7 @@
doDelete();
} else {
FacesMessageUtil.addWarnMessage("could.not.find.preference");
+ logger.log("WPA0016", null);
}
setPreferenceName(null);
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPropertyEditorPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPropertyEditorPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPropertyEditorPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -33,9 +33,6 @@
public class PortletPropertyEditorPage extends AbstractSiteEditorPage implements
Serializable {
- /**
- *
- */
private static final long serialVersionUID = 1628021934053317733L;
/**
@@ -92,6 +89,7 @@
doDelete();
} else {
FacesMessageUtil.addWarnMessage("could.not.find.property");
+ logger.log("WPA0017", null);
}
setPropertyName(null);
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/AbstractUserAttributePage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/AbstractUserAttributePage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/AbstractUserAttributePage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -15,11 +15,11 @@
*/
package jp.sf.pal.admin.web.user;
-import org.seasar.teeda.extension.util.LabelHelper;
-
import jp.sf.pal.admin.service.UserManagementService;
import jp.sf.pal.admin.web.AbstractCrudPage;
+import org.seasar.teeda.extension.util.LabelHelper;
+
public abstract class AbstractUserAttributePage extends AbstractCrudPage {
private String name;
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeConfirmPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeConfirmPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeConfirmPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -30,9 +30,6 @@
public class UserAttributeConfirmPage extends AbstractUserAttributePage
implements Serializable {
- /**
- *
- */
private static final long serialVersionUID = 8059029609744518426L;
/**
@@ -54,8 +51,7 @@
} catch (PALAdminException e) {
FacesMessageUtil
.addErrorMessage("failed.to.get.userattributes");
- logger.error("Failed to get user attributes: " + getName(),
- e);
+ logger.log("EPA0141", new Object[] { getName() }, e);
}
} else {
setCrudType(CrudType.READ);
@@ -81,8 +77,7 @@
FacesMessageUtil.addErrorMessage(
"failed.to.add.new.userattribute",
new Object[] { getKey() });
- logger.error("Failed to add a new user attribute: " + getKey(),
- e);
+ logger.log("EPA0142", new Object[] { getKey() }, e);
}
break;
case CrudType.UPDATE:
@@ -94,8 +89,7 @@
FacesMessageUtil.addErrorMessage(
"failed.to.update.new.userattribute",
new Object[] { getKey() });
- logger.error("Failed to update a new user attribute: " + getKey(),
- e);
+ logger.log("EPA0143", new Object[] { getKey() }, e);
}
break;
case CrudType.DELETE:
@@ -107,8 +101,7 @@
FacesMessageUtil.addErrorMessage(
"failed.to.delete.userattribute",
new Object[] { getKey() });
- logger.error("Failed to delete a new user attribute: "
- + getKey(), e);
+ logger.log("EPA0144", new Object[] { getKey() }, e);
}
break;
default:
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeEditPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeEditPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeEditPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -28,9 +28,6 @@
public class UserAttributeEditPage extends AbstractUserAttributePage implements
Serializable {
- /**
- *
- */
private static final long serialVersionUID = -6429222904388985538L;
/**
@@ -52,8 +49,7 @@
} catch (PALAdminException e) {
FacesMessageUtil
.addErrorMessage("failed.to.get.userattributes");
- logger.error("Failed to get user attributes: " + getName(),
- e);
+ logger.log("EPA0145", new Object[] { getName() }, e);
}
} else {
setCrudType(CrudType.CREATE);
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeListPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeListPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeListPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -32,9 +32,6 @@
public class UserAttributeListPage extends AbstractPagerPage implements
Serializable {
- /**
- *
- */
private static final long serialVersionUID = 8042231097969101982L;
/**
@@ -134,7 +131,7 @@
getUserManagementService().loadPage(this);
} catch (PALAdminException e) {
FacesMessageUtil.addErrorMessage("failed.to.get.userattributes");
- logger.error("Failed to get user attributes: " + getName(), e);
+ logger.log("EPA0146", new Object[] { getName() }, e);
}
// render FacesMessages
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserConfirmPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserConfirmPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserConfirmPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -29,9 +29,7 @@
import org.seasar.teeda.extension.annotation.takeover.TakeOver;
public class UserConfirmPage extends AbstractUserPage implements Serializable {
- /**
- *
- */
+
private static final long serialVersionUID = 5950243264539560661L;
/**
@@ -83,11 +81,11 @@
} catch (CommonException e) {
FacesMessageUtil.addErrorMessage(e.getMessageId(),
new Object[] { getName() });
- logger.error("Failed to add a new user: " + getName(), e);
+ logger.log("EPA0147", new Object[] { getName() }, e);
} catch (Exception e) {
FacesMessageUtil.addErrorMessage("failed.to.add.new.user",
new Object[] { getName() });
- logger.error("Failed to add a new user: " + getName(), e);
+ logger.log("EPA0148", new Object[] { getName() }, e);
}
}
@@ -97,7 +95,8 @@
&& getName().equals(
FacesContext.getCurrentInstance().getExternalContext()
.getRemoteUser())) {
- FacesMessageUtil.addErrorMessage("cannot.delete.current.user");
+ FacesMessageUtil.addWarnMessage("cannot.delete.current.user");
+ logger.log("WPA0001", null);
return;
}
@@ -108,7 +107,7 @@
} catch (PALAdminException e) {
FacesMessageUtil.addErrorMessage("failed.to.delete.user",
new Object[] { getName() });
- logger.error("Failed to delete the user: " + getName(), e);
+ logger.log("EPA0149", new Object[] { getName() }, e);
}
}
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserCreatePage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserCreatePage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserCreatePage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -29,9 +29,7 @@
import org.seasar.teeda.extension.annotation.validator.Required;
public class UserCreatePage extends AbstractUserPage implements Serializable {
- /**
- *
- */
+
private static final long serialVersionUID = 4251184998427709566L;
private List<Map<String, String>> roleNameItems;
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserEditPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserEditPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserEditPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -30,9 +30,7 @@
import org.seasar.teeda.extension.util.LabelHelper;
public class UserEditPage extends AbstractCrudPage implements Serializable {
- /**
- *
- */
+
private static final long serialVersionUID = 8197167663670294677L;
/**
@@ -181,6 +179,7 @@
if (!getUserManagementService().isUserExists(getName())) {
FacesMessageUtil.addWarnMessage("could.not.find.user",
new Object[] { getName() });
+ logger.log("WPA0002", new Object[] { getName() });
return UserListPage.class;
}
@@ -195,7 +194,8 @@
public Class<?> doUpdate() {
// check password
if (getPassword() == null && getPasswordConfirm() != null) {
- FacesMessageUtil.addErrorMessage("confirm.password.does.not.match");
+ FacesMessageUtil.addWarnMessage("confirm.password.does.not.match");
+ logger.log("WPA0003", new Object[] { getName() });
return null;
}
@@ -207,7 +207,7 @@
FacesMessageUtil.addErrorMessage(
"failed.to.update.user.information",
new Object[] { getName() });
- logger.error("Failed to update the user: " + getName(), e);
+ logger.log("WPA0004", new Object[] { getName() }, e);
}
return null;
}
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserGroupEditPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserGroupEditPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserGroupEditPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -30,9 +30,7 @@
import org.seasar.teeda.extension.util.LabelHelper;
public class UserGroupEditPage extends AbstractCrudPage implements Serializable {
- /**
- *
- */
+
private static final long serialVersionUID = 1292537289932760208L;
/**
@@ -163,6 +161,7 @@
public Class<?> doAddGroup() {
if (getName() == null || getNewGroup() == null) {
FacesMessageUtil.addWarnMessage("invalid.group.or.user.name");
+ logger.log("WPA0005", new Object[] { getName(), getNewGroup() });
return null;
}
@@ -171,6 +170,7 @@
getNewGroup())) {
FacesMessageUtil.addWarnMessage("group.exists.in.user",
new Object[] { getName(), getNewGroup() });
+ logger.log("WPA0006", new Object[] { getName(), getNewGroup() });
return null;
}
@@ -184,8 +184,7 @@
} catch (PALAdminException e) {
FacesMessageUtil.addErrorMessage("failed.to.add.group.to.user",
new Object[] { getName(), getNewGroup() });
- logger.error("Failed to add group to user. user=" + getName()
- + ", group=" + getNewGroup(), e);
+ logger.log("EPA0150", new Object[] { getName(), getNewGroup() }, e);
}
return null;
}
@@ -193,6 +192,7 @@
public Class<?> doRemoveGroup() {
if (getGroups() == null || getGroups().length == 0) {
FacesMessageUtil.addWarnMessage("need.to.select.groups");
+ logger.log("WPA0007", new Object[] { getGroups() });
return null;
}
@@ -208,8 +208,8 @@
FacesMessageUtil.addErrorMessage(
"failed.to.remove.groups.from.user", new Object[] {
getName(), getGroups() });
- logger.error("Failed to remove groups from user. user=" + getName()
- + ", groups=" + StringUtils.join(getGroups()), e);
+ logger.log("EPA0151",
+ new Object[] { StringUtils.join(getGroups()) }, e);
}
return null;
}
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserListPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserListPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserListPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -22,7 +22,6 @@
import java.util.Map;
import jp.sf.pal.admin.PALAdminConstants;
-import jp.sf.pal.admin.PALAdminException;
import jp.sf.pal.admin.service.UserManagementService;
import jp.sf.pal.admin.web.AbstractPagerPage;
import jp.sf.pal.common.util.FacesMessageUtil;
@@ -33,9 +32,6 @@
public class UserListPage extends AbstractPagerPage implements Serializable {
- /**
- *
- */
private static final long serialVersionUID = 1803281059596051705L;
/**
@@ -127,9 +123,9 @@
public String prerender() {
try {
userManagementService.loadPage(this);
- } catch (PALAdminException e) {
- FacesMessageUtil.addErrorMessage("failed.to.get.users");
- logger.error("Failed to get users: " + getName(), e);
+ } catch (Exception e) {
+ FacesMessageUtil.addErrorMessage("failed.to.get.roles");
+ logger.log("EPA0152", null, e);
}
// render FacesMessages
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserProfilingRuleEditPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserProfilingRuleEditPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserProfilingRuleEditPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -33,9 +33,7 @@
public class UserProfilingRuleEditPage extends AbstractCrudPage implements
Serializable {
- /**
- *
- */
+
private static final long serialVersionUID = -863022117977960622L;
/**
@@ -203,6 +201,8 @@
|| getNewProfilingRuleName() == null) {
FacesMessageUtil
.addWarnMessage("invalid.profilingRule.or.user.name");
+ logger.log("WPA0008", new Object[] { getName(),
+ getNewProfilingRuleName(), getNewLocatorName() });
return null;
}
@@ -220,9 +220,8 @@
"failed.to.add.principalRule.to.user", new Object[] {
getName(), getNewLocatorName(),
getNewProfilingRuleName() });
- logger.error("Failed to add principalRule to user. user="
- + getName() + ", principalRule=" + getNewLocatorName()
- + "/" + getNewProfilingRuleName(), e);
+ logger.log("EPA0153", new Object[] { getName(),
+ getNewLocatorName(), getNewProfilingRuleName() }, e);
}
return null;
}
@@ -230,6 +229,7 @@
public Class<?> doRemoveProfilingRule() {
if (getPrincipalRules() == null || getPrincipalRules().length == 0) {
FacesMessageUtil.addWarnMessage("need.to.select.profiling.rules");
+ logger.log("WPA0009", new Object[] { getPrincipalRules() });
return null;
}
@@ -253,9 +253,8 @@
getName(),
PALAdminUtil
.toStringFromArray(parsePrincipalRules(getPrincipalRules())) });
- logger.error("Failed to remove principalRules from user. user="
- + getName() + ", principalRules="
- + StringUtils.join(getPrincipalRules()), e);
+ logger.log("EPA0154", new Object[] { getName(),
+ StringUtils.join(getPrincipalRules()) }, e);
}
return null;
}
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserRoleEditPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserRoleEditPage.java 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserRoleEditPage.java 2008-07-07 04:38:27 UTC (rev 1015)
@@ -30,16 +30,14 @@
import org.seasar.teeda.extension.util.LabelHelper;
public class UserRoleEditPage extends AbstractCrudPage implements Serializable {
- /**
- *
- */
+
private static final long serialVersionUID = 3675965027344869490L;
/**
* Logger for this class
*/
private static final Logger logger = Logger
- .getLogger(UserGroupEditPage.class);
+ .getLogger(UserRoleEditPage.class);
private LabelHelper labelHelper;
@@ -154,6 +152,7 @@
public String doAddRole() {
if (getName() == null || getNewRole() == null) {
FacesMessageUtil.addWarnMessage("invalid.role.or.user.name");
+ logger.log("WPA0010", new Object[] { getName(), getNewRole() });
return null;
}
@@ -162,6 +161,7 @@
getNewRole())) {
FacesMessageUtil.addWarnMessage("role.exists.in.user",
new Object[] { getName(), getNewRole() });
+ logger.log("WPA0011", new Object[] { getName(), getNewRole() });
return null;
}
@@ -175,8 +175,7 @@
} catch (PALAdminException e) {
FacesMessageUtil.addErrorMessage("failed.to.add.role.to.user",
new Object[] { getName(), getNewRole() });
- logger.error("Failed to add role to user. user=" + getName()
- + ", role=" + getNewRole(), e);
+ logger.log("EPA0155", new Object[] { getName(), getNewRole() }, e);
}
return null;
}
@@ -184,6 +183,7 @@
public String doRemoveRole() {
if (getRoles() == null || getRoles().length == 0) {
FacesMessageUtil.addWarnMessage("need.to.select.roles");
+ logger.log("WPA0012", new Object[] { getRoles() });
return null;
}
@@ -199,8 +199,8 @@
FacesMessageUtil.addErrorMessage(
"failed.to.remove.roles.from.user", new Object[] {
getName(), getRoles() });
- logger.error("Failed to remove roles from user. user=" + getName()
- + ", roles=" + StringUtils.join(getRoles()), e);
+ logger.log("EPA0156", new Object[] { getName(),
+ StringUtils.join(getRoles()) }, e);
}
return null;
}
Modified: pal-admin/trunk/src/main/resources/PAMessages.properties
===================================================================
--- pal-admin/trunk/src/main/resources/PAMessages.properties 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/resources/PAMessages.properties 2008-07-07 04:38:27 UTC (rev 1015)
@@ -5,7 +5,6 @@
EPA0005=Could not load a user info.
EPA0006=Could not load a order.
EPA0007=Could not change a order.
-
EPA0008=Could not load a page.
EPA0009=Could not add a property.
EPA0010=Could not add a property.
@@ -72,7 +71,6 @@
EPA0071=Could not add a rule criterion.
EPA0072=Could not update a rule criterion.
EPA0073=Could not delete a rule criterion.
-
EPA0074=Could not load a page.
EPA0075=Could not update a page.
EPA0076=Could not update a page.
@@ -140,5 +138,63 @@
EPA0138=Could not update a portlet.
EPA0139=Could not delete a portlet.
EPA0140=Could not delete a portlet.
+EPA0141=Failed to get user attributes: {0}
+EPA0142=Failed to add a new user attribute: {0}
+EPA0143=Failed to update a new user attribute: {0}
+EPA0144=Failed to delete a new user attribute: {0}
+EPA0145=Failed to get user attributes: {0}
+EPA0146=Failed to get user attributes: {0}
+EPA0147=Failed to add a new user: {0}
+EPA0148=Failed to add a new user: {0}
+EPA0149=Failed to delete the user: {0}
+EPA0150=Failed to add group to user. user={0}, group={1}
+EPA0151=Failed to remove groups from user. user={0}, groups={1}
+EPA0152=Failed to get users.
+EPA0153=Failed to add principalRule to user. user={0}, principalRule={1}/{2}
+EPA0154=Failed to remove principalRules from user. user={0}, principalRules={1}
+EPA0155=Failed to add role to user. user={0}, role={1}
+EPA0156=Failed to remove roles from user. user={0}, roles={1}
+EPA0157=Failed to get roles.
+EPA0158=Failed to add a new role: {0}
+EPA0159=Failed to delete a new role: {0}
+EPA0160=Failed to add a new group: {0}
+EPA0161=Failed to delete a new group: {0}
+EPA0162=Failed to get groups.
+EPA0163=Failed to start a portlet application: {0}
+EPA0164=Failed to stop a portlet application: {0}
+EPA0165=Failed to undeploy a portlet application: {0}
+EPA0166=Failed to delete a portlet application: {0}
+EPA0167=Invalid new password.
+EPA0168=Failed to start a portlet application deployment.
+EPA0169=Failed to start a portlet application deployment: {0}, {1}, {2}, {3}
+EPA0170=Invalid repository parameters.
+EPA0171=Failed to add new repository.
+EPA0172=Failed to update new repository.
+EPA0173=Failed to delete new repository.
+EPA0174=Invalid repository parameters.
-
+WPA0001=Failed to delete a user. The username is null.
+WPA0002=Could not find a user: {0}
+WPA0003=The confirm password does not match: {0}
+WPA0004=Failed to update the user: {0}
+WPA0005=Invalid user name or group: name={0}, group={1}
+WPA0006=The group already exists in the user: {0}, group={1}
+WPA0007=Invalid groups: {0}
+WPA0008=Invalid user name or profiling rule: name={0}, rule={1}, locator={2}
+WPA0009=Invalid rule: {0}
+WPA0010=Invalid username or role: name={0}, role={1}
+WPA0011=The role already exists in the user: name={0}, role={1}
+WPA0012=Invalid roles: {0}
+WPA0013=Could not find a preference.
+WPA0014=Could not find a property.
+WPA0015=Could not find a metadata.
+WPA0016=Could not find a preference.
+WPA0017=Could not find a property.
+WPA0018=Could not find a target action: {0}
+WPA0019=Could not find a target action: {0}
+WPA0020=Could not find a target action: {0}
+WPA0021=Could not find a target action: {0}
+WPA0022=Could not find a target action: {0}
+WPA0023=Could not find a target action: {0}
+WPA0024=Could not find a target action: {0}
+WPA0025=Could not find a target action: {0}
Modified: pal-admin/trunk/src/main/resources/appMessages.properties
===================================================================
--- pal-admin/trunk/src/main/resources/appMessages.properties 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/resources/appMessages.properties 2008-07-07 04:38:27 UTC (rev 1015)
@@ -298,3 +298,5 @@
rule.criterion.already.exists=The rule criterion already exists.
rule.criterion.does.not.exist=The rule criterion does not exist.
+failed.to.get.roles=Failed to get roles.
+failed.to.get.groups=Failed to get groups.
Modified: pal-admin/trunk/src/main/resources/appMessages_ja.properties
===================================================================
--- pal-admin/trunk/src/main/resources/appMessages_ja.properties 2008-07-07 04:35:36 UTC (rev 1014)
+++ pal-admin/trunk/src/main/resources/appMessages_ja.properties 2008-07-07 04:38:27 UTC (rev 1015)
@@ -276,3 +276,6 @@
could.not.delete.global.security.constraint=\u30b0\u30ed\u30fc\u30d0\u30eb\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5236\u7d04\u3092\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
global.security.constraint.already.exists=\u305d\u306e\u30b0\u30ed\u30fc\u30d0\u30eb\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5236\u7d04\u306f\u5b58\u5728\u3057\u3066\u3044\u307e\u3059\u3002
global.security.constraint.does.not.exist=\u305d\u306e\u30b0\u30ed\u30fc\u30d0\u30eb\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5236\u7d04\u306f\u5b58\u5728\u3057\u3066\u3044\u307e\u305b\u3093\u3002
+
+failed.to.get.roles=\u30ed\u30fc\u30eb\u60c5\u5831\u306e\u53d6\u5f97\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
+failed.to.get.groups=\u30b0\u30eb\u30fc\u30d7\u60c5\u5831\u306e\u53d6\u5f97\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
\ No newline at end of file