svnno****@sourc*****
svnno****@sourc*****
2009年 1月 25日 (日) 08:30:32 JST
Revision: 1700
http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1700
Author: shinsuke
Date: 2009-01-25 08:30:32 +0900 (Sun, 25 Jan 2009)
Log Message:
-----------
added binding type, and code formart.
Modified Paths:
--------------
pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/PermissionManagementLogic.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/PortletDeploymentLogic.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/PortletManagementLogic.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/ProfilingRuleLogic.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SecurityConstraintLogic.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SecurityProviderLogic.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SiteEditorLogic.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/RuleCriterionEditPage.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/securityconstraint/GlobalSecurityConstraintEditPage.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
-------------- next part --------------
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/PermissionManagementLogic.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/PermissionManagementLogic.java 2009-01-23 22:36:23 UTC (rev 1699)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/PermissionManagementLogic.java 2009-01-24 23:30:32 UTC (rev 1700)
@@ -41,13 +41,12 @@
import org.apache.jetspeed.security.SecurityException;
import org.apache.jetspeed.security.om.InternalPermission;
import org.apache.jetspeed.security.om.InternalPrincipal;
+import org.seasar.framework.container.annotation.tiger.Binding;
+import org.seasar.framework.container.annotation.tiger.BindingType;
import org.seasar.framework.log.Logger;
public class PermissionManagementLogic implements Serializable {
- /**
- *
- */
private static final long serialVersionUID = 102231630594363688L;
/**
@@ -62,8 +61,10 @@
private static final String PORTLET_PERMISSION = "org.apache.jetspeed.security.PortletPermission";
+ @Binding(bindingType = BindingType.MAY)
private RoleManager roleManager;
+ @Binding(bindingType = BindingType.MAY)
private PermissionManager permissionManager;
public List<Permission> getPortletPermissions(PortletPermissionPager pager)
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/PortletDeploymentLogic.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/PortletDeploymentLogic.java 2009-01-23 22:36:23 UTC (rev 1699)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/PortletDeploymentLogic.java 2009-01-24 23:30:32 UTC (rev 1700)
@@ -36,12 +36,12 @@
import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
import org.apache.jetspeed.tools.pamanager.servletcontainer.ApplicationServerManager;
import org.apache.jetspeed.tools.pamanager.servletcontainer.ApplicationServerManagerResult;
+import org.seasar.framework.container.annotation.tiger.Binding;
+import org.seasar.framework.container.annotation.tiger.BindingType;
import org.seasar.framework.log.Logger;
public class PortletDeploymentLogic implements Serializable {
- /**
- *
- */
+
private static final long serialVersionUID = -4957269606718394576L;
/**
@@ -50,8 +50,10 @@
private static final Logger logger = Logger
.getLogger(PortletManagementLogic.class);
+ @Binding(bindingType = BindingType.MAY)
private transient ApplicationServerManager applicationServerManager = null;
+ @Binding(bindingType = BindingType.MAY)
private transient PortletRegistry portletRegistry = null;
/**
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/PortletManagementLogic.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/PortletManagementLogic.java 2009-01-23 22:36:23 UTC (rev 1699)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/PortletManagementLogic.java 2009-01-24 23:30:32 UTC (rev 1700)
@@ -30,6 +30,8 @@
import org.apache.jetspeed.factory.PortletFactory;
import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
import org.apache.jetspeed.tools.pamanager.servletcontainer.ApplicationServerManager;
+import org.seasar.framework.container.annotation.tiger.Binding;
+import org.seasar.framework.container.annotation.tiger.BindingType;
import org.seasar.framework.log.Logger;
public class PortletManagementLogic implements Serializable {
@@ -42,10 +44,13 @@
private static final Logger logger = Logger
.getLogger(PortletManagementLogic.class);
+ @Binding(bindingType = BindingType.MAY)
private transient ApplicationServerManager applicationServerManager = null;
+ @Binding(bindingType = BindingType.MAY)
private transient PortletRegistry portletRegistry = null;
+ @Binding(bindingType = BindingType.MAY)
private transient PortletFactory portletFactory = null;
/**
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/ProfilingRuleLogic.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/ProfilingRuleLogic.java 2009-01-23 22:36:23 UTC (rev 1699)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/ProfilingRuleLogic.java 2009-01-24 23:30:32 UTC (rev 1700)
@@ -12,6 +12,8 @@
import jp.sf.pal.common.CommonException;
import org.apache.jetspeed.profiler.Profiler;
+import org.seasar.framework.container.annotation.tiger.Binding;
+import org.seasar.framework.container.annotation.tiger.BindingType;
import org.seasar.framework.log.Logger;
public class ProfilingRuleLogic implements Serializable {
@@ -24,6 +26,7 @@
private static final Logger logger = Logger
.getLogger(ProfilingRuleLogic.class);
+ @Binding(bindingType = BindingType.MAY)
private transient Profiler profiler;
public List<ProfilingRule> getProfilingRules(ProfilingRulePager pager)
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SecurityConstraintLogic.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SecurityConstraintLogic.java 2009-01-23 22:36:23 UTC (rev 1699)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SecurityConstraintLogic.java 2009-01-24 23:30:32 UTC (rev 1700)
@@ -19,6 +19,8 @@
import org.apache.jetspeed.om.page.PageSecurity;
import org.apache.jetspeed.om.page.SecurityConstraintsDef;
import org.apache.jetspeed.page.PageManager;
+import org.seasar.framework.container.annotation.tiger.Binding;
+import org.seasar.framework.container.annotation.tiger.BindingType;
import org.seasar.framework.log.Logger;
public class SecurityConstraintLogic implements Serializable {
@@ -37,6 +39,7 @@
private static int DELETE = 3;
+ @Binding(bindingType = BindingType.MAY)
private transient PageManager pageManager;
public List<SecurityDefinition> getSecurityDefinitions(
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SecurityProviderLogic.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SecurityProviderLogic.java 2009-01-23 22:36:23 UTC (rev 1699)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SecurityProviderLogic.java 2009-01-24 23:30:32 UTC (rev 1700)
@@ -66,9 +66,12 @@
import org.apache.jetspeed.security.om.InternalCredential;
import org.apache.jetspeed.security.spi.GroupSecurityHandler;
import org.apache.jetspeed.security.spi.RoleSecurityHandler;
+import org.seasar.framework.container.annotation.tiger.Binding;
+import org.seasar.framework.container.annotation.tiger.BindingType;
import org.seasar.framework.log.Logger;
public class SecurityProviderLogic implements Serializable {
+
private static final long serialVersionUID = 2380951929327928610L;
/**
@@ -77,24 +80,33 @@
private static final Logger logger = Logger
.getLogger(SecurityProviderLogic.class);
+ @Binding(bindingType = BindingType.MAY)
private transient SecurityProvider securityProvider = null;
+ @Binding(bindingType = BindingType.MAY)
private transient AuthenticationProviderProxy authenticationProviderProxy;
// private UserSecurityHandler userSecurityHandler = null;
+ @Binding(bindingType = BindingType.MAY)
private transient UserManager userManager = null;
+ @Binding(bindingType = BindingType.MAY)
private transient RoleSecurityHandler roleSecurityHandler = null;
+ @Binding(bindingType = BindingType.MAY)
private transient RoleManager roleManager = null;
+ @Binding(bindingType = BindingType.MAY)
private transient GroupSecurityHandler groupSecurityHandler = null;
+ @Binding(bindingType = BindingType.MAY)
private transient GroupManager groupManager = null;
+ @Binding(bindingType = BindingType.MAY)
private transient Profiler profiler = null;
+ @Binding(bindingType = BindingType.MAY)
private transient PageManager pageManager = null;
/**
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SiteEditorLogic.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SiteEditorLogic.java 2009-01-23 22:36:23 UTC (rev 1699)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SiteEditorLogic.java 2009-01-24 23:30:32 UTC (rev 1700)
@@ -63,12 +63,12 @@
import org.apache.jetspeed.security.PermissionManager;
import org.apache.jetspeed.security.SecurityAccessController;
import org.apache.pluto.om.window.PortletWindow;
+import org.seasar.framework.container.annotation.tiger.Binding;
+import org.seasar.framework.container.annotation.tiger.BindingType;
import org.seasar.framework.log.Logger;
public class SiteEditorLogic implements Serializable {
- /**
- *
- */
+
private static final long serialVersionUID = 3488261005315934120L;
/**
@@ -77,22 +77,31 @@
private static final Logger logger = Logger
.getLogger(SiteEditorLogic.class);
+ @Binding(bindingType = BindingType.MAY)
private transient PageManager pageManager = null;
+ @Binding(bindingType = BindingType.MAY)
private transient Profiler profiler = null;
+ @Binding(bindingType = BindingType.MAY)
private transient PortletRegistry portletRegistry = null;
+ @Binding(bindingType = BindingType.MAY)
private transient DecorationFactory decorationFactory = null;
+ @Binding(bindingType = BindingType.MAY)
private transient PermissionManager permissionManager = null;
+ @Binding(bindingType = BindingType.MAY)
private transient PortletWindowAccessor portletWindowAccessor = null;
+ @Binding(bindingType = BindingType.MAY)
private transient PortletEntityAccessComponent portletEntityAccessComponent = null;
+ @Binding(bindingType = BindingType.MAY)
private transient SecurityAccessController securityAccessController = null;
+ @Binding(bindingType = BindingType.MAY)
private transient RequestContext requestContext = null;
/**
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 2009-01-23 22:36:23 UTC (rev 1699)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/portletmanager/PortletListPage.java 2009-01-24 23:30:32 UTC (rev 1700)
@@ -19,13 +19,13 @@
import java.util.List;
import java.util.Map;
-import org.seasar.teeda.extension.util.LabelHelper;
-
import jp.sf.pal.admin.PALAdminConstants;
import jp.sf.pal.admin.service.PortletManagementService;
import jp.sf.pal.admin.web.AbstractPagerPage;
import jp.sf.pal.common.util.FacesMessageUtil;
+import org.seasar.teeda.extension.util.LabelHelper;
+
public class PortletListPage extends AbstractPagerPage implements Serializable {
private static final long serialVersionUID = -4766951315413321520L;
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 2009-01-23 22:36:23 UTC (rev 1699)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleCriterionEditPage.java 2009-01-24 23:30:32 UTC (rev 1700)
@@ -104,12 +104,12 @@
public void setFallbackType(Integer fallbackType) {
super.setFallbackType(fallbackType);
}
-
- public String getBackButtonValue(){
+
+ public String getBackButtonValue() {
return getLabelHelper().getLabelValue("back");
}
-
- public String getDoConfirmValue(){
+
+ public String getDoConfirmValue() {
return getLabelHelper().getLabelValue("confirm");
}
}
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 2009-01-23 22:36:23 UTC (rev 1699)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleEditPage.java 2009-01-24 23:30:32 UTC (rev 1700)
@@ -72,12 +72,12 @@
public void setTitle(String title) {
super.setTitle(title);
}
-
- public String getJumpRuleListValue(){
+
+ public String getJumpRuleListValue() {
return getLabelHelper().getLabelValue("back");
}
-
- public String getDoConfirmValue(){
+
+ public String getDoConfirmValue() {
return getLabelHelper().getLabelValue("confirm");
}
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 2009-01-23 22:36:23 UTC (rev 1699)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/GlobalSecurityConstraintEditPage.java 2009-01-24 23:30:32 UTC (rev 1700)
@@ -38,12 +38,12 @@
public Class<?> doConfirm() {
return GlobalSecurityConstraintConfirmPage.class;
}
-
- public String getJumpGlobalSecurityConstraintListValue(){
+
+ public String getJumpGlobalSecurityConstraintListValue() {
return getLabelHelper().getLabelValue("back");
}
-
+
public String getDoConfirmValue() {
return getLabelHelper().getLabelValue("confirm");
- }
+ }
}
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 2009-01-23 22:36:23 UTC (rev 1699)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/SecurityDefinitionConstraintListPage.java 2009-01-24 23:30:32 UTC (rev 1700)
@@ -5,7 +5,6 @@
import java.util.Map;
import jp.sf.pal.admin.service.SecurityConstraintService;
-import jp.sf.pal.admin.web.AbstractCrudPage;
import jp.sf.pal.common.CommonException;
import jp.sf.pal.common.util.FacesMessageUtil;
@@ -13,8 +12,8 @@
import org.seasar.teeda.extension.annotation.takeover.TakeOver;
import org.seasar.teeda.extension.annotation.takeover.TakeOverType;
-public class SecurityDefinitionConstraintListPage extends AbstractSecurityDefinitionPage
- implements Serializable {
+public class SecurityDefinitionConstraintListPage extends
+ AbstractSecurityDefinitionPage implements Serializable {
private static final long serialVersionUID = -8321082385044912655L;
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 2009-01-23 22:36:23 UTC (rev 1699)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/SecurityDefinitionEditPage.java 2009-01-24 23:30:32 UTC (rev 1700)
@@ -47,14 +47,13 @@
public void setDefinitionName(String definitionName) {
super.setDefinitionName(definitionName);
}
-
+
public String getJumpSecurityDefinitionListValue() {
return getLabelHelper().getLabelValue("back");
}
-
+
public String getDoConfirmValue() {
return getLabelHelper().getLabelValue("confirm");
}
-
}