svnno****@sourc*****
svnno****@sourc*****
2007年 4月 12日 (木) 10:22:02 JST
Revision: 35
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=35
Author: shinsuke
Date: 2007-04-12 10:22:00 +0900 (Thu, 12 Apr 2007)
Log Message:
-----------
refactoring for user management. add portlet management(only list view).
Modified Paths:
--------------
pal-admin/trunk/.classpath
pal-admin/trunk/pom.xml
pal-admin/trunk/src/main/java/jp/sf/pal/admin/PALAdminConstants.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/User.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SecurityProviderLogic.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/DefaultPager.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/GroupManagementService.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/RoleManagementService.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/UserManagementService.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/AbstractCrudPage.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/role/RoleListPage.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/resources/jp/sf/pal/admin/web/label.properties
pal-admin/trunk/src/main/webapp/WEB-INF/portlet.xml
pal-admin/trunk/src/main/webapp/view/group/groupConfirm.html
pal-admin/trunk/src/main/webapp/view/group/groupEdit.html
pal-admin/trunk/src/main/webapp/view/group/groupList.html
pal-admin/trunk/src/main/webapp/view/role/roleConfirm.html
pal-admin/trunk/src/main/webapp/view/role/roleEdit.html
pal-admin/trunk/src/main/webapp/view/role/roleList.html
pal-admin/trunk/src/main/webapp/view/user/userConfirm.html
pal-admin/trunk/src/main/webapp/view/user/userCreate.html
pal-admin/trunk/src/main/webapp/view/user/userEdit.html
pal-admin/trunk/src/main/webapp/view/user/userGroupEdit.html
pal-admin/trunk/src/main/webapp/view/user/userList.html
pal-admin/trunk/src/main/webapp/view/user/userProfilingRuleEdit.html
pal-admin/trunk/src/main/webapp/view/user/userRoleEdit.html
Added Paths:
-----------
pal-admin/trunk/src/main/java/jp/sf/pal/admin/dxo/PortletApplicationDxo.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/PortletApplication.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/PortletManagementFilter.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/UserManagementFilter.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/PortletManagementLogic.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/Pager.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/PortletApplicationPager.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PortletManagementService.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/util/FacesMessageUtil.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/util/PagerUtil.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/util/PortalComponentUtil.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/AbstractPagerPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/PagerPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/portletmanager/
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/portletmanager/PortletListPage.java
pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/portletmanager/
pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/portletmanager/label.properties
pal-admin/trunk/src/main/webapp/WEB-INF/rpad-config.xml
pal-admin/trunk/src/main/webapp/view/portletmanager/
pal-admin/trunk/src/main/webapp/view/portletmanager/portletList.html
Removed Paths:
-------------
pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/J2SecurityProviderFilter.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/AbstractListPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/AbstractPage.java
-------------- next part --------------
Modified: pal-admin/trunk/.classpath
===================================================================
--- pal-admin/trunk/.classpath 2007-04-09 07:22:48 UTC (rev 34)
+++ pal-admin/trunk/.classpath 2007-04-12 01:22:00 UTC (rev 35)
@@ -1,34 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" output="src/main/webapp/WEB-INF/classes" path="src/main/java"/>
- <classpathentry kind="src" output="src/main/webapp/WEB-INF/classes" path="src/main/resources"/>
- <classpathentry kind="src" path="src/main/webapp/view"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" sourcepath="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/seasar/teeda/teeda-core/1.0.7-SNAPSHOT/teeda-core-1.0.7-SNAPSHOT.jar" sourcepath="M2_REPO/org/seasar/teeda/teeda-core/1.0.7-SNAPSHOT/teeda-core-1.0.7-SNAPSHOT-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/portlet-api/portlet-api/1.0/portlet-api-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/poi/poi/2.5.1-final-20040804/poi-2.5.1-final-20040804.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/seasar/teeda/teeda-ajax/1.0.7-SNAPSHOT/teeda-ajax-1.0.7-SNAPSHOT.jar" sourcepath="M2_REPO/org/seasar/teeda/teeda-ajax/1.0.7-SNAPSHOT/teeda-ajax-1.0.7-SNAPSHOT-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/servlet/jstl/1.1.2/jstl-1.1.2.jar" sourcepath="M2_REPO/javax/servlet/jstl/1.1.2/jstl-1.1.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar" sourcepath="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/seasar/container/s2-tiger/2.4.11/s2-tiger-2.4.11.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.2/junit-3.8.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/seasar/teeda/teeda-tiger/1.0.6/teeda-tiger-1.0.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar" sourcepath="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jp/sf/pal/portlet-output-optimizer/0.2/portlet-output-optimizer-0.2.jar" sourcepath="M2_REPO/jp/sf/pal/portlet-output-optimizer/0.2/portlet-output-optimizer-0.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jp/sf/pal/faces-response-filter/0.2/faces-response-filter-0.2.jar" sourcepath="M2_REPO/jp/sf/pal/faces-response-filter/0.2/faces-response-filter-0.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/javassist/3.4.ga/javassist-3.4.ga.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/seasar/container/s2-framework/2.4.11/s2-framework-2.4.11.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/seasar/portlet/s2-portlet/1.0.7-SNAPSHOT/s2-portlet-1.0.7-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/seasar/container/s2-extension/2.4.11/s2-extension-2.4.11.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/seasar/teeda/teeda-extension/1.0.7-SNAPSHOT/teeda-extension-1.0.7-SNAPSHOT.jar" sourcepath="M2_REPO/org/seasar/teeda/teeda-extension/1.0.7-SNAPSHOT/teeda-extension-1.0.7-SNAPSHOT-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/portals/bridges/portals-bridges-portletfilter/1.0.2-dev/portals-bridges-portletfilter-1.0.2-dev.jar"/>
- <classpathentry kind="var" path="M2_REPO/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/ognl/ognl/2.6.7/ognl-2.6.7.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-ejb_2.1_spec/1.0/geronimo-ejb_2.1_spec-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-el/commons-el/1.0/commons-el-1.0.jar" sourcepath="M2_REPO/commons-el/commons-el/1.0/commons-el-1.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/portals/jetspeed-2/jetspeed-api/2.2-dev/jetspeed-api-2.2-dev.jar"/>
- <classpathentry kind="var" path="M2_REPO/rhino/rhino/1.6r2/rhino-1.6r2.jar"/>
- <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="src" output="src/main/webapp/WEB-INF/classes" path="src/main/java"/>
+ <classpathentry kind="src" output="src/main/webapp/WEB-INF/classes" path="src/main/resources"/>
+ <classpathentry kind="src" path="src/main/webapp/view"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/pluto/pluto/1.0.1/pluto-1.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" sourcepath="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/seasar/teeda/teeda-core/1.0.7-SNAPSHOT/teeda-core-1.0.7-SNAPSHOT.jar" sourcepath="M2_REPO/org/seasar/teeda/teeda-core/1.0.7-SNAPSHOT/teeda-core-1.0.7-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/portlet-api/portlet-api/1.0/portlet-api-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/poi/poi/2.5.1-final-20040804/poi-2.5.1-final-20040804.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/seasar/teeda/teeda-ajax/1.0.7-SNAPSHOT/teeda-ajax-1.0.7-SNAPSHOT.jar" sourcepath="M2_REPO/org/seasar/teeda/teeda-ajax/1.0.7-SNAPSHOT/teeda-ajax-1.0.7-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar" sourcepath="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" sourcepath="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/servlet/jstl/1.1.2/jstl-1.1.2.jar" sourcepath="M2_REPO/javax/servlet/jstl/1.1.2/jstl-1.1.2-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.2/junit-3.8.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/seasar/container/s2-tiger/2.4.11/s2-tiger-2.4.11.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/seasar/teeda/teeda-tiger/1.0.6/teeda-tiger-1.0.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-digester/commons-digester/1.6/commons-digester-1.6.jar" sourcepath="M2_REPO/commons-digester/commons-digester/1.6/commons-digester-1.6-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/oro/oro/2.0.8/oro-2.0.8.jar" sourcepath="M2_REPO/oro/oro/2.0.8/oro-2.0.8-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar" sourcepath="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jp/sf/pal/portlet-output-optimizer/0.2/portlet-output-optimizer-0.2.jar" sourcepath="M2_REPO/jp/sf/pal/portlet-output-optimizer/0.2/portlet-output-optimizer-0.2-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.jar" sourcepath="M2_REPO/commons-validator/commons-validator/1.2.0/commons-validator-1.2.0-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/myfaces/tomahawk/tomahawk/1.1.3/tomahawk-1.1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jp/sf/pal/faces-response-filter/0.2/faces-response-filter-0.2.jar" sourcepath="M2_REPO/jp/sf/pal/faces-response-filter/0.2/faces-response-filter-0.2-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/javassist/3.4.ga/javassist-3.4.ga.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jp/sf/pal/tomahawk-bridge/0.9.1/tomahawk-bridge-0.9.1.jar" sourcepath="M2_REPO/jp/sf/pal/tomahawk-bridge/0.9.1/tomahawk-bridge-0.9.1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/seasar/container/s2-framework/2.4.11/s2-framework-2.4.11.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.3.1/commons-io-1.3.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.3/commons-codec-1.3.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.3/commons-codec-1.3-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/seasar/portlet/s2-portlet/1.0.7-SNAPSHOT/s2-portlet-1.0.7-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/seasar/container/s2-extension/2.4.11/s2-extension-2.4.11.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/seasar/teeda/teeda-extension/1.0.7-SNAPSHOT/teeda-extension-1.0.7-SNAPSHOT.jar" sourcepath="M2_REPO/org/seasar/teeda/teeda-extension/1.0.7-SNAPSHOT/teeda-extension-1.0.7-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/portals/bridges/portals-bridges-portletfilter/1.0.2-dev/portals-bridges-portletfilter-1.0.2-dev.jar"/>
+ <classpathentry kind="var" path="M2_REPO/ognl/ognl/2.6.7/ognl-2.6.7.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar" sourcepath="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-ejb_2.1_spec/1.0/geronimo-ejb_2.1_spec-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-el/commons-el/1.0/commons-el-1.0.jar" sourcepath="M2_REPO/commons-el/commons-el/1.0/commons-el-1.0-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/portals/jetspeed-2/jetspeed-api/2.2-dev/jetspeed-api-2.2-dev.jar"/>
</classpath>
Modified: pal-admin/trunk/pom.xml
===================================================================
--- pal-admin/trunk/pom.xml 2007-04-09 07:22:48 UTC (rev 34)
+++ pal-admin/trunk/pom.xml 2007-04-12 01:22:00 UTC (rev 35)
@@ -147,6 +147,12 @@
<artifactId>teeda-extension</artifactId>
<version>1.0.7-SNAPSHOT</version>
<type>jar</type>
+ <exclusions>
+ <exclusion>
+ <groupId>rhino</groupId>
+ <artifactId>rhino</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -181,6 +187,32 @@
<type>jar</type>
</dependency>
<dependency>
+ <groupId>jp.sf.pal</groupId>
+ <artifactId>tomahawk-bridge</artifactId>
+ <version>0.9.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.tomahawk</groupId>
+ <artifactId>tomahawk</artifactId>
+ <version>1.1.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>struts</groupId>
+ <artifactId>struts</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.3.1</version>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.13</version>
@@ -207,6 +239,14 @@
<scope>provided</scope>
<!-- PORTLET DEV: END -->
</dependency>
+ <dependency>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto</artifactId>
+ <version>1.0.1</version>
+<!-- PORTLET DEV: BEGIN -->
+ <scope>provided</scope>
+<!-- PORTLET DEV: END -->
+ </dependency>
<!-- FOR TEST
<dependency>
<groupId>org.seasar.container</groupId>
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/PALAdminConstants.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/PALAdminConstants.java 2007-04-09 07:22:48 UTC (rev 34)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/PALAdminConstants.java 2007-04-12 01:22:00 UTC (rev 35)
@@ -22,11 +22,21 @@
public static final String PAGE_MANAGER_COMPONENT = PREFIX + "PageManager";
+ public static final String APPLICATION_SERVER_MANAGER_COMPONENT = PREFIX
+ + "ApplicationServerManager";
+
+ public static final String PORTLET_REGISTRY_COMPONENT = PREFIX
+ + "PortletRegistry";
+
+ public static final String PORTLET_FACTORY_COMPONENT = PREFIX
+ + "PortletFactory";
+
public static final String PREVIOUS_PAGE_NUMBER = "previousPageNumber";
public static final String NEXT_PAGE_NUMBER = "nextPageNumber";
- public static final int DEFAULT_PAGER_LIMIT_SIZE = 25;
+ //TODO move to portlet.xml file
+ public static final int DEFAULT_PAGER_LIMIT_SIZE = 3;
public static final String DEFAULT_TEMPLATE_FOLDER = "/_user/template/";
@@ -39,10 +49,18 @@
public static final String USER_CREDENTIAL_EXTEND_UNLIMITED = PREFIX
+ "ExtendUnlimited";
- //TODO move to properties file
- public static final String PAGE_LOCATOR = "page";
+ //TODO move to portlet.xml file
+ public static final String LOCATOR_PAGE = "page";
- //TODO move to properties file
- public static final String MENU_LOCATOR = "menu";
+ //TODO move to portlet.xml file
+ public static final String LOCATOR_MENU = "menu";
+ public static final int PORTLET_APPLICATION_TYPE_WEBAPP = 0;
+
+ public static final int PORTLET_APPLICATION_TYPE_LOCAL = 1;
+
+ public static final int PORTLET_APPLICATION_STATUS_RUNNING = 1;
+
+ public static final int PORTLET_APPLICATION_STATUS_STOPPED = 0;
+
}
Added: pal-admin/trunk/src/main/java/jp/sf/pal/admin/dxo/PortletApplicationDxo.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/dxo/PortletApplicationDxo.java 2007-04-09 07:22:48 UTC (rev 34)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/dxo/PortletApplicationDxo.java 2007-04-12 01:22:00 UTC (rev 35)
@@ -0,0 +1,13 @@
+package jp.sf.pal.admin.dxo;
+
+import java.util.List;
+import java.util.Map;
+
+import jp.sf.pal.admin.entity.PortletApplication;
+
+public interface PortletApplicationDxo
+{
+ public void convert(List<PortletApplication> entities,
+ List<Map<String, Object>> list);
+
+}
Property changes on: pal-admin/trunk/src/main/java/jp/sf/pal/admin/dxo/PortletApplicationDxo.java
___________________________________________________________________
Name: svn:eol-style
+ native
Added: pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/PortletApplication.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/PortletApplication.java 2007-04-09 07:22:48 UTC (rev 34)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/PortletApplication.java 2007-04-12 01:22:00 UTC (rev 35)
@@ -0,0 +1,102 @@
+package jp.sf.pal.admin.entity;
+
+import java.io.Serializable;
+
+public class PortletApplication implements Serializable
+{
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 904304488157108100L;
+
+ private String name;
+
+ private String path;
+
+ private String version;
+
+ private int status;
+
+ private int applicationType;
+
+ /**
+ * @return the name
+ */
+ public String getName()
+ {
+ return name;
+ }
+
+ /**
+ * @param name the name to set
+ */
+ public void setName(String name)
+ {
+ this.name = name;
+ }
+
+ /**
+ * @return the path
+ */
+ public String getPath()
+ {
+ return path;
+ }
+
+ /**
+ * @param path the path to set
+ */
+ public void setPath(String path)
+ {
+ this.path = path;
+ }
+
+ /**
+ * @return the status
+ */
+ public int getStatus()
+ {
+ return status;
+ }
+
+ /**
+ * @param status the status to set
+ */
+ public void setStatus(int status)
+ {
+ this.status = status;
+ }
+
+ /**
+ * @return the version
+ */
+ public String getVersion()
+ {
+ return version;
+ }
+
+ /**
+ * @param version the version to set
+ */
+ public void setVersion(String version)
+ {
+ this.version = version;
+ }
+
+ /**
+ * @return the applicationType
+ */
+ public int getApplicationType()
+ {
+ return applicationType;
+ }
+
+ /**
+ * @param applicationType the applicationType to set
+ */
+ public void setApplicationType(int applicationType)
+ {
+ this.applicationType = applicationType;
+ }
+}
Property changes on: pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/PortletApplication.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/User.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/User.java 2007-04-09 07:22:48 UTC (rev 34)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/User.java 2007-04-12 01:22:00 UTC (rev 35)
@@ -176,7 +176,7 @@
{
PrincipalRule principalRule = new PrincipalRule();
principalRule.setProfilingRuleName(principalRulename);
- principalRule.setLocatorName(PALAdminConstants.PAGE_LOCATOR);
+ principalRule.setLocatorName(PALAdminConstants.LOCATOR_PAGE);
principalRules.add(principalRule);
}
Deleted: pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/J2SecurityProviderFilter.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/J2SecurityProviderFilter.java 2007-04-09 07:22:48 UTC (rev 34)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/J2SecurityProviderFilter.java 2007-04-12 01:22:00 UTC (rev 35)
@@ -1,169 +0,0 @@
-package jp.sf.pal.admin.filter;
-
-import java.io.IOException;
-
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletContext;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
-import jp.sf.pal.admin.PALAdminConstants;
-
-import org.apache.jetspeed.CommonPortletServices;
-import org.apache.jetspeed.page.PageManager;
-import org.apache.jetspeed.profiler.Profiler;
-import org.apache.jetspeed.security.GroupManager;
-import org.apache.jetspeed.security.RoleManager;
-import org.apache.jetspeed.security.SecurityProvider;
-import org.apache.jetspeed.security.UserManager;
-import org.apache.portals.bridges.portletfilter.PortletFilter;
-import org.apache.portals.bridges.portletfilter.PortletFilterChain;
-import org.apache.portals.bridges.portletfilter.PortletFilterConfig;
-
-public class J2SecurityProviderFilter implements PortletFilter
-{
- private SecurityProvider securityProvider;
-
- private UserManager userManager;
-
- private GroupManager groupManager;
-
- private RoleManager roleManager;
-
- private Profiler profiler;
-
- private PageManager pageManager;
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.portals.bridges.portletfilter.PortletFilter#destroy()
- */
- public void destroy()
- {
- securityProvider = null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.portals.bridges.portletfilter.PortletFilter#init(org.apache.portals.bridges.portletfilter.PortletFilterConfig)
- */
- public void init(PortletFilterConfig filterConfig) throws PortletException
- {
- PortletConfig portletConfig = filterConfig.getPortletConfig();
- PortletContext portletContext = portletConfig.getPortletContext();
- if (!PALAdminConstants.DEBUG)
- {
- // securityProvider
- securityProvider = (SecurityProvider) portletContext
- .getAttribute(PALAdminConstants.CPS_SECURITY_PROVIDER_COMPONENT);
- if (securityProvider == null)
- {
- throw new PortletException(
- "Failed to find the Security Provider on portlet initialization");
- }
-
- // userManager
- userManager = (UserManager) portletContext
- .getAttribute(CommonPortletServices.CPS_USER_MANAGER_COMPONENT);
- if (userManager == null)
- {
- throw new PortletException(
- "Failed to find the User Manager on portlet initialization");
- }
-
- // groupManager
- groupManager = (GroupManager) portletContext
- .getAttribute(CommonPortletServices.CPS_GROUP_MANAGER_COMPONENT);
- if (groupManager == null)
- {
- throw new PortletException(
- "Failed to find the Group Manager on portlet initialization");
- }
-
- // roleManager
- roleManager = (RoleManager) portletContext
- .getAttribute(CommonPortletServices.CPS_ROLE_MANAGER_COMPONENT);
- if (roleManager == null)
- {
- throw new PortletException(
- "Failed to find the Role Manager on portlet initialization");
- }
-
- // profiler
- profiler = (Profiler) portletContext
- .getAttribute(CommonPortletServices.CPS_PROFILER_COMPONENT);
- if (null == profiler)
- {
- throw new PortletException(
- "Failed to find the Profiler on portlet initialization");
- }
-
- // pageManager
- pageManager = (PageManager) portletContext
- .getAttribute(CommonPortletServices.CPS_PAGE_MANAGER_COMPONENT);
- if (null == pageManager)
- {
- throw new PortletException(
- "Failed to find the Page Manager on portlet initialization");
- }
-
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.portals.bridges.portletfilter.PortletFilter#processActionFilter(javax.portlet.ActionRequest,
- * javax.portlet.ActionResponse,
- * org.apache.portals.bridges.portletfilter.PortletFilterChain)
- */
- public void processActionFilter(ActionRequest request,
- ActionResponse response, PortletFilterChain chain)
- throws PortletException, IOException
- {
- request.setAttribute(PALAdminConstants.SECURITY_PROVIDER_COMPONENT,
- securityProvider);
- request.setAttribute(PALAdminConstants.USER_MANAGER_COMPONENT,
- userManager);
- request.setAttribute(PALAdminConstants.GROUP_MANAGER_COMPONENT,
- groupManager);
- request.setAttribute(PALAdminConstants.ROLE_MANAGER_COMPONENT,
- roleManager);
- request.setAttribute(PALAdminConstants.PROFILER_COMPONENT, profiler);
- request.setAttribute(PALAdminConstants.PAGE_MANAGER_COMPONENT,
- pageManager);
-
- chain.processActionFilter(request, response);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.portals.bridges.portletfilter.PortletFilter#renderFilter(javax.portlet.RenderRequest,
- * javax.portlet.RenderResponse,
- * org.apache.portals.bridges.portletfilter.PortletFilterChain)
- */
- public void renderFilter(RenderRequest request, RenderResponse response,
- PortletFilterChain chain) throws PortletException, IOException
- {
- request.setAttribute(PALAdminConstants.SECURITY_PROVIDER_COMPONENT,
- securityProvider);
- request.setAttribute(PALAdminConstants.USER_MANAGER_COMPONENT,
- userManager);
- request.setAttribute(PALAdminConstants.GROUP_MANAGER_COMPONENT,
- groupManager);
- request.setAttribute(PALAdminConstants.ROLE_MANAGER_COMPONENT,
- roleManager);
- request.setAttribute(PALAdminConstants.PROFILER_COMPONENT, profiler);
- request.setAttribute(PALAdminConstants.PAGE_MANAGER_COMPONENT,
- pageManager);
-
- chain.renderFilter(request, response);
- }
-
-}
Added: pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/PortletManagementFilter.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/PortletManagementFilter.java 2007-04-09 07:22:48 UTC (rev 34)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/PortletManagementFilter.java 2007-04-12 01:22:00 UTC (rev 35)
@@ -0,0 +1,159 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package jp.sf.pal.admin.filter;
+
+import java.io.IOException;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.PortletConfig;
+import javax.portlet.PortletContext;
+import javax.portlet.PortletException;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+
+import jp.sf.pal.admin.PALAdminConstants;
+import jp.sf.pal.admin.rpad.RPADException;
+import jp.sf.pal.admin.rpad.repository.RepositoryManager;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.jetspeed.CommonPortletServices;
+import org.apache.jetspeed.components.portletregistry.PortletRegistry;
+import org.apache.jetspeed.factory.PortletFactory;
+import org.apache.jetspeed.tools.pamanager.servletcontainer.ApplicationServerManager;
+import org.apache.portals.bridges.portletfilter.PortletFilter;
+import org.apache.portals.bridges.portletfilter.PortletFilterChain;
+import org.apache.portals.bridges.portletfilter.PortletFilterConfig;
+
+public class PortletManagementFilter implements PortletFilter
+{
+ /**
+ * Logger for this class
+ */
+ private static final Log log = LogFactory
+ .getLog(PortletManagementFilter.class);
+
+ protected final static String RPAD_CONFIG_FILE = "config-file";
+
+ protected final static String DEFAULT_RPAD_CONFIG_FILE = "/WEB-INF/rpad-config.xml";
+
+ protected final static String WEBAPP_ROOT_PREFIX = "${webapp}";
+
+ private ApplicationServerManager applicationServerManager;
+
+ private PortletRegistry portletRegistry;
+
+ private PortletFactory portletFactory;
+
+ public void destroy()
+ {
+ applicationServerManager = null;
+ portletFactory = null;
+ portletRegistry = null;
+ try
+ {
+ RepositoryManager.getInstance().store();
+ }
+ catch (RPADException e)
+ {
+ log.error("Could not store the configuration.", e);
+ }
+ }
+
+ public void init(PortletFilterConfig filterConfig) throws PortletException
+ {
+ PortletConfig portletConfig = filterConfig.getPortletConfig();
+ PortletContext portletContext = portletConfig.getPortletContext();
+
+ portletRegistry = (PortletRegistry) portletContext
+ .getAttribute(CommonPortletServices.CPS_REGISTRY_COMPONENT);
+ portletFactory = (PortletFactory) portletContext
+ .getAttribute(CommonPortletServices.CPS_PORTLET_FACTORY_COMPONENT);
+ applicationServerManager = (ApplicationServerManager) portletContext
+ .getAttribute(CommonPortletServices.CPS_APPLICATION_SERVER_MANAGER_COMPONENT);
+
+ //RPAD
+ initRRPAD(portletConfig);
+ }
+
+ protected void initRRPAD(PortletConfig portletConfig)
+ throws PortletException
+ {
+ PortletContext portletContext = portletConfig.getPortletContext();
+
+ String rpadConfigFile = portletConfig
+ .getInitParameter(RPAD_CONFIG_FILE);
+ if (rpadConfigFile == null)
+ {
+ rpadConfigFile = portletContext
+ .getRealPath(DEFAULT_RPAD_CONFIG_FILE);
+ }
+ else if (rpadConfigFile.startsWith(WEBAPP_ROOT_PREFIX))
+ {
+ rpadConfigFile = portletContext.getRealPath(rpadConfigFile
+ .substring(WEBAPP_ROOT_PREFIX.length()));
+ }
+
+ if (log.isDebugEnabled())
+ {
+ log.debug("init(PortletConfig) - configFile=" + rpadConfigFile);
+ }
+
+ // Create RepositoryManager
+ try
+ {
+ RepositoryManager.init(rpadConfigFile);
+ }
+ catch (Exception e)
+ {
+ throw new PortletException(
+ "Could not create RepositoryManager. The config file is "
+ + rpadConfigFile, e);
+ }
+ }
+
+ public void processActionFilter(ActionRequest request,
+ ActionResponse response, PortletFilterChain chain)
+ throws PortletException, IOException
+ {
+ request.setAttribute(
+ PALAdminConstants.APPLICATION_SERVER_MANAGER_COMPONENT,
+ applicationServerManager);
+ request.setAttribute(PALAdminConstants.PORTLET_FACTORY_COMPONENT,
+ portletFactory);
+ request.setAttribute(PALAdminConstants.PORTLET_REGISTRY_COMPONENT,
+ portletRegistry);
+
+ chain.processActionFilter(request, response);
+ }
+
+ public void renderFilter(RenderRequest request, RenderResponse response,
+ PortletFilterChain chain) throws PortletException, IOException
+ {
+ request.setAttribute(
+ PALAdminConstants.APPLICATION_SERVER_MANAGER_COMPONENT,
+ applicationServerManager);
+ request.setAttribute(PALAdminConstants.PORTLET_FACTORY_COMPONENT,
+ portletFactory);
+ request.setAttribute(PALAdminConstants.PORTLET_REGISTRY_COMPONENT,
+ portletRegistry);
+
+ chain.renderFilter(request, response);
+ }
+
+}
Property changes on: pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/PortletManagementFilter.java
___________________________________________________________________
Name: svn:eol-style
+ native
Copied: pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/UserManagementFilter.java (from rev 34, pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/J2SecurityProviderFilter.java)
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/J2SecurityProviderFilter.java 2007-04-09 07:22:48 UTC (rev 34)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/filter/UserManagementFilter.java 2007-04-12 01:22:00 UTC (rev 35)
@@ -0,0 +1,174 @@
+package jp.sf.pal.admin.filter;
+
+import java.io.IOException;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.PortletConfig;
+import javax.portlet.PortletContext;
+import javax.portlet.PortletException;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+
+import jp.sf.pal.admin.PALAdminConstants;
+
+import org.apache.jetspeed.CommonPortletServices;
+import org.apache.jetspeed.page.PageManager;
+import org.apache.jetspeed.profiler.Profiler;
+import org.apache.jetspeed.security.GroupManager;
+import org.apache.jetspeed.security.RoleManager;
+import org.apache.jetspeed.security.SecurityProvider;
+import org.apache.jetspeed.security.UserManager;
+import org.apache.portals.bridges.portletfilter.PortletFilter;
+import org.apache.portals.bridges.portletfilter.PortletFilterChain;
+import org.apache.portals.bridges.portletfilter.PortletFilterConfig;
+
+public class UserManagementFilter implements PortletFilter
+{
+ private SecurityProvider securityProvider;
+
+ private UserManager userManager;
+
+ private GroupManager groupManager;
+
+ private RoleManager roleManager;
+
+ private Profiler profiler;
+
+ private PageManager pageManager;
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.portals.bridges.portletfilter.PortletFilter#destroy()
+ */
+ public void destroy()
+ {
+ securityProvider = null;
+ userManager = null;
+ groupManager = null;
+ roleManager = null;
+ profiler = null;
+ pageManager = null;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.portals.bridges.portletfilter.PortletFilter#init(org.apache.portals.bridges.portletfilter.PortletFilterConfig)
+ */
+ public void init(PortletFilterConfig filterConfig) throws PortletException
+ {
+ PortletConfig portletConfig = filterConfig.getPortletConfig();
+ PortletContext portletContext = portletConfig.getPortletContext();
+ if (!PALAdminConstants.DEBUG)
+ {
+ // securityProvider
+ securityProvider = (SecurityProvider) portletContext
+ .getAttribute(PALAdminConstants.CPS_SECURITY_PROVIDER_COMPONENT);
+ if (securityProvider == null)
+ {
+ throw new PortletException(
+ "Failed to find the Security Provider on portlet initialization");
+ }
+
+ // userManager
+ userManager = (UserManager) portletContext
+ .getAttribute(CommonPortletServices.CPS_USER_MANAGER_COMPONENT);
+ if (userManager == null)
+ {
+ throw new PortletException(
+ "Failed to find the User Manager on portlet initialization");
+ }
+
+ // groupManager
+ groupManager = (GroupManager) portletContext
+ .getAttribute(CommonPortletServices.CPS_GROUP_MANAGER_COMPONENT);
+ if (groupManager == null)
+ {
+ throw new PortletException(
+ "Failed to find the Group Manager on portlet initialization");
+ }
+
+ // roleManager
+ roleManager = (RoleManager) portletContext
+ .getAttribute(CommonPortletServices.CPS_ROLE_MANAGER_COMPONENT);
+ if (roleManager == null)
+ {
+ throw new PortletException(
+ "Failed to find the Role Manager on portlet initialization");
+ }
+
+ // profiler
+ profiler = (Profiler) portletContext
+ .getAttribute(CommonPortletServices.CPS_PROFILER_COMPONENT);
+ if (null == profiler)
+ {
+ throw new PortletException(
+ "Failed to find the Profiler on portlet initialization");
+ }
+
+ // pageManager
+ pageManager = (PageManager) portletContext
+ .getAttribute(CommonPortletServices.CPS_PAGE_MANAGER_COMPONENT);
+ if (null == pageManager)
+ {
+ throw new PortletException(
+ "Failed to find the Page Manager on portlet initialization");
+ }
+
+ }
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.portals.bridges.portletfilter.PortletFilter#processActionFilter(javax.portlet.ActionRequest,
+ * javax.portlet.ActionResponse,
+ * org.apache.portals.bridges.portletfilter.PortletFilterChain)
+ */
+ public void processActionFilter(ActionRequest request,
+ ActionResponse response, PortletFilterChain chain)
+ throws PortletException, IOException
+ {
+ request.setAttribute(PALAdminConstants.SECURITY_PROVIDER_COMPONENT,
+ securityProvider);
+ request.setAttribute(PALAdminConstants.USER_MANAGER_COMPONENT,
+ userManager);
+ request.setAttribute(PALAdminConstants.GROUP_MANAGER_COMPONENT,
+ groupManager);
+ request.setAttribute(PALAdminConstants.ROLE_MANAGER_COMPONENT,
+ roleManager);
+ request.setAttribute(PALAdminConstants.PROFILER_COMPONENT, profiler);
+ request.setAttribute(PALAdminConstants.PAGE_MANAGER_COMPONENT,
+ pageManager);
+
+ chain.processActionFilter(request, response);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.portals.bridges.portletfilter.PortletFilter#renderFilter(javax.portlet.RenderRequest,
+ * javax.portlet.RenderResponse,
+ * org.apache.portals.bridges.portletfilter.PortletFilterChain)
+ */
+ public void renderFilter(RenderRequest request, RenderResponse response,
+ PortletFilterChain chain) throws PortletException, IOException
+ {
+ request.setAttribute(PALAdminConstants.SECURITY_PROVIDER_COMPONENT,
+ securityProvider);
+ request.setAttribute(PALAdminConstants.USER_MANAGER_COMPONENT,
+ userManager);
+ request.setAttribute(PALAdminConstants.GROUP_MANAGER_COMPONENT,
+ groupManager);
+ request.setAttribute(PALAdminConstants.ROLE_MANAGER_COMPONENT,
+ roleManager);
+ request.setAttribute(PALAdminConstants.PROFILER_COMPONENT, profiler);
+ request.setAttribute(PALAdminConstants.PAGE_MANAGER_COMPONENT,
+ pageManager);
+
+ chain.renderFilter(request, response);
+ }
+
+}
Added: 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 2007-04-09 07:22:48 UTC (rev 34)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/PortletManagementLogic.java 2007-04-12 01:22:00 UTC (rev 35)
@@ -0,0 +1,149 @@
+package jp.sf.pal.admin.logic;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import jp.sf.pal.admin.PALAdminConstants;
+import jp.sf.pal.admin.entity.PortletApplication;
+import jp.sf.pal.admin.pager.PortletApplicationPager;
+import jp.sf.pal.admin.util.PortalComponentUtil;
+
+import org.apache.jetspeed.components.portletregistry.PortletRegistry;
+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.log.Logger;
+
+public class PortletManagementLogic
+{
+ /**
+ * Logger for this class
+ */
+ private static final Logger logger = Logger
+ .getLogger(PortletManagementLogic.class);
+
+ private ApplicationServerManager applicationServerManager = null;
+
+ private PortletRegistry portletRegistry = null;
+
+ private PortletFactory portletFactory = null;
+
+ /**
+ * @return the applicationServerManager
+ */
+ public ApplicationServerManager getApplicationServerManager()
+ {
+ if (applicationServerManager == null)
+ {
+ applicationServerManager = PortalComponentUtil
+ .getApplicationServerManager();
+ }
+ return applicationServerManager;
+ }
+
+ /**
+ * @param applicationServerManager the applicationServerManager to set
+ */
+ public void setApplicationServerManager(
+ ApplicationServerManager applicationServerManager)
+ {
+ this.applicationServerManager = applicationServerManager;
+ }
+
+ /**
+ * @return the portletFactory
+ */
+ public PortletFactory getPortletFactory()
+ {
+ if (portletFactory == null)
+ {
+ portletFactory = PortalComponentUtil.getPortletFactory();
+ }
+ return portletFactory;
+ }
+
+ /**
+ * @param portletFactory the portletFactory to set
+ */
+ public void setPortletFactory(PortletFactory portletFactory)
+ {
+ this.portletFactory = portletFactory;
+ }
+
+ /**
+ * @return the portletRegistry
+ */
+ public PortletRegistry getPortletRegistry()
+ {
+ if (portletRegistry == null)
+ {
+ portletRegistry = PortalComponentUtil.getPortletRegistry();
+ }
+ return portletRegistry;
+ }
+
+ /**
+ * @param portletRegistry the portletRegistry to set
+ */
+ public void setPortletRegistry(PortletRegistry portletRegistry)
+ {
+ this.portletRegistry = portletRegistry;
+ }
+
+ public List<PortletApplication> getPortletApplications(
+ PortletApplicationPager pager)
+ {
+ List<PortletApplication> portletApplicationList = new ArrayList<PortletApplication>();
+ List<MutablePortletApplication> portlets = new ArrayList<MutablePortletApplication>(
+ getPortletRegistry().getPortletApplications());
+
+ // set count
+ pager.setCount(portlets.size());
+
+ // create list
+ int offset = pager.getOffset();
+ int limit = pager.getLimit();
+ int size = portlets.size();
+ if (logger.isDebugEnabled())
+ {
+ logger
+ .debug("getPortletApplications(PortletApplicationPager) - offset="
+ + offset + ", limit=" + limit + ", size=" + size);
+ }
+ for (int i = offset; i < offset + limit && i < size; i++)
+ {
+ MutablePortletApplication pa = portlets.get(i);
+
+ PortletApplication portlet = new PortletApplication();
+ portlet.setName(pa.getName());
+ portlet.setVersion(pa.getVersion());
+ if (pa.getApplicationType() == MutablePortletApplication.LOCAL)
+ {
+ portlet.setPath("<local>");
+ portlet
+ .setApplicationType(PALAdminConstants.PORTLET_APPLICATION_TYPE_LOCAL);
+ }
+ else
+ {
+ portlet.setPath(pa.getWebApplicationDefinition()
+ .getContextRoot());
+ portlet
+ .setApplicationType(PALAdminConstants.PORTLET_APPLICATION_TYPE_WEBAPP);
+ }
+ if (getPortletFactory().isPortletApplicationRegistered(pa))
+ {
+ portlet
+ .setStatus(PALAdminConstants.PORTLET_APPLICATION_STATUS_RUNNING);
+ }
+ else
+ {
+ portlet
+ .setStatus(PALAdminConstants.PORTLET_APPLICATION_STATUS_STOPPED);
+ }
+
+ portletApplicationList.add(portlet);
+ }
+
+ return portletApplicationList;
+ }
+}
Property changes on: pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/PortletManagementLogic.java
___________________________________________________________________
Name: svn:eol-style
+ native
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 2007-04-09 07:22:48 UTC (rev 34)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SecurityProviderLogic.java 2007-04-12 01:22:00 UTC (rev 35)
@@ -7,7 +7,6 @@
import java.util.List;
import java.util.Set;
-import javax.faces.context.FacesContext;
import javax.security.auth.Subject;
import jp.sf.pal.admin.PALAdminConstants;
@@ -19,6 +18,7 @@
import jp.sf.pal.admin.pager.GroupPager;
import jp.sf.pal.admin.pager.RolePager;
import jp.sf.pal.admin.pager.UserPager;
+import jp.sf.pal.admin.util.PortalComponentUtil;
import jp.sf.pal.admin.util.PALAdminUtil;
import org.apache.jetspeed.om.folder.Folder;
@@ -66,14 +66,6 @@
private PageManager pageManager = null;
/**
- * @return the facesContext
- */
- public FacesContext getFacesContext()
- {
- return FacesContext.getCurrentInstance();
- }
-
- /**
* @return the authenticationProviderProxy
*/
public AuthenticationProviderProxy getAuthenticationProviderProxy()
@@ -145,9 +137,7 @@
{
if (userManager == null)
{
- userManager = (UserManager) getFacesContext().getExternalContext()
- .getRequestMap().get(
- PALAdminConstants.USER_MANAGER_COMPONENT);
+ userManager = PortalComponentUtil.getUserManager();
}
return userManager;
}
@@ -167,9 +157,7 @@
{
if (roleManager == null)
{
- roleManager = (RoleManager) getFacesContext().getExternalContext()
- .getRequestMap().get(
- PALAdminConstants.ROLE_MANAGER_COMPONENT);
+ roleManager = PortalComponentUtil.getRoleManager();
}
return roleManager;
}
@@ -189,9 +177,7 @@
{
if (groupManager == null)
{
- groupManager = (GroupManager) getFacesContext()
- .getExternalContext().getRequestMap().get(
- PALAdminConstants.GROUP_MANAGER_COMPONENT);
+ groupManager = PortalComponentUtil.getGroupManager();
}
return groupManager;
}
@@ -211,8 +197,7 @@
{
if (profiler == null)
{
- profiler = (Profiler) getFacesContext().getExternalContext()
- .getRequestMap().get(PALAdminConstants.PROFILER_COMPONENT);
+ profiler = PortalComponentUtil.getProfiler();
}
return profiler;
}
@@ -232,9 +217,7 @@
{
if (pageManager == null)
{
- pageManager = (PageManager) getFacesContext().getExternalContext()
- .getRequestMap().get(
- PALAdminConstants.PAGE_MANAGER_COMPONENT);
+ pageManager = PortalComponentUtil.getPageManager();
}
return pageManager;
}
@@ -254,9 +237,7 @@
{
if (securityProvider == null)
{
- securityProvider = (SecurityProvider) getFacesContext()
- .getExternalContext().getRequestMap().get(
- PALAdminConstants.SECURITY_PROVIDER_COMPONENT);
+ securityProvider = PortalComponentUtil.getSecurityProvider();
}
return securityProvider;
}
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/DefaultPager.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/DefaultPager.java 2007-04-09 07:22:48 UTC (rev 34)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/DefaultPager.java 2007-04-12 01:22:00 UTC (rev 35)
@@ -2,7 +2,7 @@
import jp.sf.pal.admin.PALAdminConstants;
-public class DefaultPager
+public class DefaultPager implements Pager
{
private int offset;
@@ -19,48 +19,48 @@
setLimit(PALAdminConstants.DEFAULT_PAGER_LIMIT_SIZE);
}
- /**
- * @return the limit
+ /* (non-Javadoc)
+ * @see jp.sf.pal.admin.pager.Pager#getLimit()
*/
public int getLimit()
{
return limit;
}
- /**
- * @param limit the limit to set
+ /* (non-Javadoc)
+ * @see jp.sf.pal.admin.pager.Pager#setLimit(int)
*/
public void setLimit(int limit)
{
this.limit = limit;
}
- /**
- * @return the count
+ /* (non-Javadoc)
+ * @see jp.sf.pal.admin.pager.Pager#getCount()
*/
public int getCount()
{
return count;
}
- /**
- * @param count the count to set
+ /* (non-Javadoc)
+ * @see jp.sf.pal.admin.pager.Pager#setCount(int)
*/
public void setCount(int count)
{
this.count = count;
}
- /**
- * @return the offset
+ /* (non-Javadoc)
+ * @see jp.sf.pal.admin.pager.Pager#getOffset()
*/
public int getOffset()
{
return offset;
}
- /**
- * @param offset the offset to set
+ /* (non-Javadoc)
+ * @see jp.sf.pal.admin.pager.Pager#setOffset(int)
*/
public void setOffset(int offset)
{
Added: pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/Pager.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/Pager.java 2007-04-09 07:22:48 UTC (rev 34)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/Pager.java 2007-04-12 01:22:00 UTC (rev 35)
@@ -0,0 +1,36 @@
+package jp.sf.pal.admin.pager;
+
+public interface Pager
+{
+
+ /**
+ * @return the limit
+ */
+ public abstract int getLimit();
+
+ /**
+ * @param limit the limit to set
+ */
+ public abstract void setLimit(int limit);
+
+ /**
+ * @return the count
+ */
+ public abstract int getCount();
+
+ /**
+ * @param count the count to set
+ */
+ public abstract void setCount(int count);
+
+ /**
+ * @return the offset
+ */
+ public abstract int getOffset();
+
+ /**
+ * @param offset the offset to set
+ */
+ public abstract void setOffset(int offset);
+
+}
\ No newline at end of file
Property changes on: pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/Pager.java
___________________________________________________________________
Name: svn:eol-style
+ native
Added: pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/PortletApplicationPager.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/PortletApplicationPager.java 2007-04-09 07:22:48 UTC (rev 34)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/PortletApplicationPager.java 2007-04-12 01:22:00 UTC (rev 35)
@@ -0,0 +1,6 @@
+package jp.sf.pal.admin.pager;
+
+public class PortletApplicationPager extends DefaultPager
+{
+
+}
Property changes on: pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/PortletApplicationPager.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/GroupManagementService.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/GroupManagementService.java 2007-04-09 07:22:48 UTC (rev 34)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/GroupManagementService.java 2007-04-12 01:22:00 UTC (rev 35)
@@ -4,14 +4,13 @@
import java.util.List;
import java.util.Map;
-import javax.faces.context.FacesContext;
-
import jp.sf.pal.admin.PALAdminConstants;
import jp.sf.pal.admin.PALAdminException;
import jp.sf.pal.admin.dxo.GroupDxo;
import jp.sf.pal.admin.entity.Group;
import jp.sf.pal.admin.logic.SecurityProviderLogic;
import jp.sf.pal.admin.pager.GroupPager;
+import jp.sf.pal.admin.util.PagerUtil;
import jp.sf.pal.admin.web.group.AbstractGroupPage;
import jp.sf.pal.admin.web.group.GroupListPage;
@@ -72,62 +71,6 @@
this.securityProviderLogic = securityProviderLogic;
}
- public void handlePagerNavigation()
- {
- Map requestMap = FacesContext.getCurrentInstance().getExternalContext()
- .getRequestParameterMap();
- String prev = (String) requestMap
- .get(PALAdminConstants.PREVIOUS_PAGE_NUMBER);
- if (prev != null)
- {
- int pageNum = Integer.parseInt(prev);
- getGroupPager().setOffset(
- (pageNum - 1) * getGroupPager().getLimit());
- return;
- }
-
- String next = (String) requestMap
- .get(PALAdminConstants.NEXT_PAGE_NUMBER);
- if (next != null)
- {
- int pageNum = Integer.parseInt(next);
- getGroupPager().setOffset(
- (pageNum - 1) * getGroupPager().getLimit());
- return;
- }
- }
-
- public List<Map<String, Object>> getGroups(GroupListPage page)
- {
- GroupPager pager = getGroupPager();
-
- List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
- groupDxo.convert(securityProviderLogic.getGroups(pager), list);
-
- // update page
- page.setCount(pager.getCount());
- page.setMaxPageNumber((pager.getCount() - 1) / pager.getLimit() + 1);
- page.setCurrentPageNumber(pager.getOffset() / pager.getLimit() + 1);
- if (page.getMaxPageNumber() > page.getCurrentPageNumber())
- {
- page.setNextPageNumber(page.getCurrentPageNumber() + 1);
- }
- else
- {
- page.setNextPageNumber(null);
- }
- if (page.getCurrentPageNumber() > 1)
- {
- page.setPreviousPageNumber(page.getCurrentPageNumber() - 1);
- }
- else
- {
- page.setPreviousPageNumber(null);
- }
-
- return list;
- }
-
public void insert(AbstractGroupPage page) throws PALAdminException
{
Group entity = new Group();
@@ -141,4 +84,21 @@
groupDxo.convert(page, entity);
securityProviderLogic.deleteGroup(entity);
}
+
+ public void loadPage(GroupListPage page)
+ {
+ GroupPager pager = getGroupPager();
+
+ // check page action
+ PagerUtil.updatePageNumber(pager,
+ PALAdminConstants.PREVIOUS_PAGE_NUMBER,
+ PALAdminConstants.NEXT_PAGE_NUMBER);
+
+ // set group list
+ List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
+ groupDxo.convert(securityProviderLogic.getGroups(pager), list);
+ PagerUtil.updatePagerPage(page, pager);
+ page.setGroupItems(list);
+
+ }
}
Added: pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PortletManagementService.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PortletManagementService.java 2007-04-09 07:22:48 UTC (rev 34)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PortletManagementService.java 2007-04-12 01:22:00 UTC (rev 35)
@@ -0,0 +1,91 @@
+package jp.sf.pal.admin.service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import jp.sf.pal.admin.PALAdminConstants;
+import jp.sf.pal.admin.dxo.PortletApplicationDxo;
+import jp.sf.pal.admin.logic.PortletManagementLogic;
+import jp.sf.pal.admin.pager.PortletApplicationPager;
+import jp.sf.pal.admin.util.PagerUtil;
+import jp.sf.pal.admin.web.portletmanager.PortletListPage;
+
+public class PortletManagementService
+{
+ private PortletManagementLogic portletManagementLogic;
+
+ private PortletApplicationPager portletApplicationPager;
+
+ private PortletApplicationDxo portletApplicationDxo;
+
+ /**
+ * @return the portletManagementLogic
+ */
+ public PortletManagementLogic getPortletManagementLogic()
+ {
+ return portletManagementLogic;
+ }
+
+ /**
+ * @param portletManagementLogic the portletManagementLogic to set
+ */
+ public void setPortletManagementLogic(
+ PortletManagementLogic portletManagementLogic)
+ {
+ this.portletManagementLogic = portletManagementLogic;
+ }
+
+ /**
+ * @return the portletApplicationPager
+ */
+ public PortletApplicationPager getPortletApplicationPager()
+ {
+ return portletApplicationPager;
+ }
+
+ /**
+ * @param portletApplicationPager the portletApplicationPager to set
+ */
+ public void setPortletApplicationPager(
+ PortletApplicationPager portletApplicationPager)
+ {
+ this.portletApplicationPager = portletApplicationPager;
+ }
+
+ /**
+ * @return the portletApplicationDxo
+ */
+ public PortletApplicationDxo getPortletApplicationDxo()
+ {
+ return portletApplicationDxo;
+ }
+
+ /**
+ * @param portletApplicationDxo the portletApplicationDxo to set
+ */
+ public void setPortletApplicationDxo(
+ PortletApplicationDxo portletApplicationDxo)
+ {
+ this.portletApplicationDxo = portletApplicationDxo;
+ }
+
+ public void loadPage(PortletListPage page)
+ {
+ PortletApplicationPager pager = getPortletApplicationPager();
+
+ // check page action
+ PagerUtil.updatePageNumber(pager,
+ PALAdminConstants.PREVIOUS_PAGE_NUMBER,
+ PALAdminConstants.NEXT_PAGE_NUMBER);
+
+ // set list
+ List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
+ portletApplicationDxo.convert(getPortletManagementLogic()
+ .getPortletApplications(pager), list);
+ PagerUtil.updatePagerPage(page, pager);
+ page.setPortletApplicationItems(list);
+
+ }
+
+}
Property changes on: pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PortletManagementService.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/RoleManagementService.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/RoleManagementService.java 2007-04-09 07:22:48 UTC (rev 34)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/RoleManagementService.java 2007-04-12 01:22:00 UTC (rev 35)
@@ -4,14 +4,13 @@
import java.util.List;
import java.util.Map;
-import javax.faces.context.FacesContext;
-
import jp.sf.pal.admin.PALAdminConstants;
import jp.sf.pal.admin.PALAdminException;
import jp.sf.pal.admin.dxo.RoleDxo;
import jp.sf.pal.admin.entity.Role;
import jp.sf.pal.admin.logic.SecurityProviderLogic;
import jp.sf.pal.admin.pager.RolePager;
+import jp.sf.pal.admin.util.PagerUtil;
import jp.sf.pal.admin.web.role.AbstractRolePage;
import jp.sf.pal.admin.web.role.RoleListPage;
@@ -72,60 +71,8 @@
this.rolePager = roleListPager;
}
- public void handlePagerNavigation()
- {
- Map requestMap = FacesContext.getCurrentInstance().getExternalContext()
- .getRequestParameterMap();
- String prev = (String) requestMap
- .get(PALAdminConstants.PREVIOUS_PAGE_NUMBER);
- if (prev != null)
- {
- int pageNum = Integer.parseInt(prev);
- getRolePager().setOffset((pageNum - 1) * getRolePager().getLimit());
- return;
- }
- String next = (String) requestMap
- .get(PALAdminConstants.NEXT_PAGE_NUMBER);
- if (next != null)
- {
- int pageNum = Integer.parseInt(next);
- getRolePager().setOffset((pageNum - 1) * getRolePager().getLimit());
- return;
- }
- }
- public List<Map<String, Object>> getRoles(RoleListPage page)
- {
- RolePager pager = getRolePager();
-
- List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
- roleDxo.convert(securityProviderLogic.getRoles(pager), list);
-
- // update page
- page.setCount(pager.getCount());
- page.setMaxPageNumber((pager.getCount() - 1) / pager.getLimit() + 1);
- page.setCurrentPageNumber(pager.getOffset() / pager.getLimit() + 1);
- if (page.getMaxPageNumber() > page.getCurrentPageNumber())
- {
- page.setNextPageNumber(page.getCurrentPageNumber() + 1);
- }
- else
- {
- page.setNextPageNumber(null);
- }
- if (page.getCurrentPageNumber() > 1)
- {
- page.setPreviousPageNumber(page.getCurrentPageNumber() - 1);
- }
- else
- {
- page.setPreviousPageNumber(null);
- }
-
- return list;
- }
-
public void insert(AbstractRolePage page) throws PALAdminException
{
Role entity = new Role();
@@ -139,4 +86,21 @@
roleDxo.convert(page, entity);
securityProviderLogic.deleteRole(entity);
}
+
+ public void loadPage(RoleListPage page)
+ {
+ RolePager pager = getRolePager();
+
+ // check page action
+ PagerUtil.updatePageNumber(pager,
+ PALAdminConstants.PREVIOUS_PAGE_NUMBER,
+ PALAdminConstants.NEXT_PAGE_NUMBER);
+
+ // set role list
+ List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
+ roleDxo.convert(securityProviderLogic.getRoles(pager), list);
+ PagerUtil.updatePagerPage(page, pager);
+ page.setRoleItems(list);
+
+ }
}
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/UserManagementService.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/UserManagementService.java 2007-04-09 07:22:48 UTC (rev 34)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/UserManagementService.java 2007-04-12 01:22:00 UTC (rev 35)
@@ -5,8 +5,6 @@
import java.util.List;
import java.util.Map;
-import javax.faces.context.FacesContext;
-
import jp.sf.pal.admin.PALAdminConstants;
import jp.sf.pal.admin.PALAdminException;
import jp.sf.pal.admin.dxo.UserDxo;
@@ -17,6 +15,7 @@
import jp.sf.pal.admin.logic.SecurityProviderLogic;
import jp.sf.pal.admin.pager.UserPager;
import jp.sf.pal.admin.util.PALAdminUtil;
+import jp.sf.pal.admin.util.PagerUtil;
import jp.sf.pal.admin.web.user.AbstractUserPage;
import jp.sf.pal.admin.web.user.UserEditPage;
import jp.sf.pal.admin.web.user.UserGroupEditPage;
@@ -34,6 +33,8 @@
private UserDxo userDxo;
+ private LabelHelper labelHelper;
+
/**
* @return the securityProviderLogic
*/
@@ -83,58 +84,37 @@
this.userPager = userListPager;
}
- public void handlePagerNavigation()
+ /**
+ * @return the labelHelper
+ */
+ public LabelHelper getLabelHelper()
{
- Map requestMap = FacesContext.getCurrentInstance().getExternalContext()
- .getRequestParameterMap();
- String prev = (String) requestMap
- .get(PALAdminConstants.PREVIOUS_PAGE_NUMBER);
- if (prev != null)
- {
- int pageNum = Integer.parseInt(prev);
- getUserPager().setOffset((pageNum - 1) * getUserPager().getLimit());
- return;
- }
+ return labelHelper;
+ }
- String next = (String) requestMap
- .get(PALAdminConstants.NEXT_PAGE_NUMBER);
- if (next != null)
- {
- int pageNum = Integer.parseInt(next);
- getUserPager().setOffset((pageNum - 1) * getUserPager().getLimit());
- return;
- }
+ /**
+ * @param labelHelper the labelHelper to set
+ */
+ public void setLabelHelper(LabelHelper labelHelper)
+ {
+ this.labelHelper = labelHelper;
}
- public List<Map<String, Object>> getUsers(UserListPage page)
+ public void loadPage(UserListPage page)
{
UserPager pager = getUserPager();
+ // check page action
+ PagerUtil.updatePageNumber(pager,
+ PALAdminConstants.PREVIOUS_PAGE_NUMBER,
+ PALAdminConstants.NEXT_PAGE_NUMBER);
+
+ // set user list
List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
userDxo.convert(securityProviderLogic.getUsers(pager), list);
+ PagerUtil.updatePagerPage(page, pager);
+ page.setUserItems(list);
- // update page
- page.setCount(pager.getCount());
- page.setMaxPageNumber((pager.getCount() - 1) / pager.getLimit() + 1);
- page.setCurrentPageNumber(pager.getOffset() / pager.getLimit() + 1);
- if (page.getMaxPageNumber() > page.getCurrentPageNumber())
- {
- page.setNextPageNumber(page.getCurrentPageNumber() + 1);
- }
- else
- {
- page.setNextPageNumber(null);
- }
- if (page.getCurrentPageNumber() > 1)
- {
- page.setPreviousPageNumber(page.getCurrentPageNumber() - 1);
- }
- else
- {
- page.setPreviousPageNumber(null);
- }
-
- return list;
}
public void insert(AbstractUserPage page) throws PALAdminException
@@ -177,7 +157,7 @@
getUserDxo().convert(user, page);
// set pull-down
- LabelHelper labelHelper = page.getLabelHelper();
+ LabelHelper labelHelper = getLabelHelper();
List<Map<String, String>> list = new ArrayList<Map<String, String>>();
list.add(PALAdminUtil.createItem(labelHelper.getLabelValue("Active"),
PALAdminConstants.USER_CREDENTIAL_ACTIVE));
@@ -361,10 +341,10 @@
public void loadPage(UserProfilingRuleEditPage page)
{
List<Map<String, String>> locatorList = new ArrayList<Map<String, String>>();
- locatorList.add(PALAdminUtil.createItem(PALAdminConstants.PAGE_LOCATOR,
- PALAdminConstants.PAGE_LOCATOR));
- locatorList.add(PALAdminUtil.createItem(PALAdminConstants.MENU_LOCATOR,
- PALAdminConstants.MENU_LOCATOR));
+ locatorList.add(PALAdminUtil.createItem(PALAdminConstants.LOCATOR_PAGE,
+ PALAdminConstants.LOCATOR_PAGE));
+ locatorList.add(PALAdminUtil.createItem(PALAdminConstants.LOCATOR_MENU,
+ PALAdminConstants.LOCATOR_MENU));
page.setNewLocatorNameItems(locatorList);
page.setNewProfilingRuleNameItems(getProfilingRuleNames());
Added: pal-admin/trunk/src/main/java/jp/sf/pal/admin/util/FacesMessageUtil.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/util/FacesMessageUtil.java 2007-04-09 07:22:48 UTC (rev 34)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/util/FacesMessageUtil.java 2007-04-12 01:22:00 UTC (rev 35)
@@ -0,0 +1,94 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package jp.sf.pal.admin.util;
+
+import javax.faces.application.FacesMessage;
+import javax.faces.context.FacesContext;
+
+public class FacesMessageUtil
+{
+ public static void addMessage(FacesMessage.Severity severity,
+ java.lang.String summary, java.lang.String detail)
+ {
+ FacesMessage facesMessage = new FacesMessage(severity, summary, detail);
+ FacesContext.getCurrentInstance().addMessage(null, facesMessage);
+ }
+
+ public static void addErrorMessage(java.lang.String summary, Throwable t)
+ {
+ addMessage(FacesMessage.SEVERITY_ERROR, summary, t.getMessage());
+ }
+
+ public static void addErrorMessage(java.lang.String summary,
+ java.lang.String detail)
+ {
+ addMessage(FacesMessage.SEVERITY_ERROR, summary, detail);
+ }
+
+ public static void addErrorMessage(java.lang.String summary)
+ {
+ addMessage(FacesMessage.SEVERITY_ERROR, summary, null);
+ }
+
+ public static void addFatalMessage(java.lang.String summary, Throwable t)
+ {
+ addMessage(FacesMessage.SEVERITY_FATAL, summary, t.getMessage());
+ }
+
+ public static void addFatalMessage(java.lang.String summary,
+ java.lang.String detail)
+ {
+ addMessage(FacesMessage.SEVERITY_FATAL, summary, detail);
+ }
+
+ public static void addFatalMessage(java.lang.String summary)
+ {
+ addMessage(FacesMessage.SEVERITY_FATAL, summary, null);
+ }
+
+ public static void addInfoMessage(java.lang.String summary, Throwable t)
+ {
+ addMessage(FacesMessage.SEVERITY_INFO, summary, t.getMessage());
+ }
+
+ public static void addInfoMessage(java.lang.String summary,
+ java.lang.String detail)
+ {
+ addMessage(FacesMessage.SEVERITY_INFO, summary, detail);
+ }
+
+ public static void addInfoMessage(java.lang.String summary)
+ {
+ addMessage(FacesMessage.SEVERITY_INFO, summary, null);
+ }
+
+ public static void addWarnMessage(java.lang.String summary, Throwable t)
+ {
+ addMessage(FacesMessage.SEVERITY_WARN, summary, t.getMessage());
+ }
+
+ public static void addWarnMessage(java.lang.String summary,
+ java.lang.String detail)
+ {
+ addMessage(FacesMessage.SEVERITY_WARN, summary, detail);
+ }
+
+ public static void addWarnMessage(java.lang.String summary)
+ {
+ addMessage(FacesMessage.SEVERITY_WARN, summary, null);
+ }
+}
Property changes on: pal-admin/trunk/src/main/java/jp/sf/pal/admin/util/FacesMessageUtil.java
___________________________________________________________________
Name: svn:eol-style
+ native
Added: pal-admin/trunk/src/main/java/jp/sf/pal/admin/util/PagerUtil.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/util/PagerUtil.java 2007-04-09 07:22:48 UTC (rev 34)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/util/PagerUtil.java 2007-04-12 01:22:00 UTC (rev 35)
@@ -0,0 +1,66 @@
+package jp.sf.pal.admin.util;
+
+import java.util.Map;
+
+import javax.faces.context.FacesContext;
+
+import jp.sf.pal.admin.pager.Pager;
+import jp.sf.pal.admin.web.PagerPage;
+
+public class PagerUtil
+{
+ /**
+ * @return the facesContext
+ */
+ private static FacesContext getFacesContext()
+ {
+ return FacesContext.getCurrentInstance();
+ }
+
+ public static void updatePageNumber(Pager pager, String prevKey,
+ String nextKey)
+ {
+ Map requestMap = getFacesContext().getExternalContext()
+ .getRequestParameterMap();
+
+ String prev = (String) requestMap.get(prevKey);
+ if (prev != null)
+ {
+ int pageNum = Integer.parseInt(prev);
+ pager.setOffset((pageNum - 1) * pager.getLimit());
+ return;
+ }
+
+ String next = (String) requestMap.get(nextKey);
+ if (next != null)
+ {
+ int pageNum = Integer.parseInt(next);
+ pager.setOffset((pageNum - 1) * pager.getLimit());
+ return;
+ }
+ }
+
+ public static void updatePagerPage(PagerPage page, Pager pager)
+ {
+ // update page
+ page.setCount(pager.getCount());
+ page.setMaxPageNumber((pager.getCount() - 1) / pager.getLimit() + 1);
+ page.setCurrentPageNumber(pager.getOffset() / pager.getLimit() + 1);
+ if (page.getMaxPageNumber() > page.getCurrentPageNumber())
+ {
+ page.setNextPageNumber(page.getCurrentPageNumber() + 1);
+ }
+ else
+ {
+ page.setNextPageNumber(null);
+ }
+ if (page.getCurrentPageNumber() > 1)
+ {
+ page.setPreviousPageNumber(page.getCurrentPageNumber() - 1);
+ }
+ else
+ {
+ page.setPreviousPageNumber(null);
+ }
+ }
+}
Property changes on: pal-admin/trunk/src/main/java/jp/sf/pal/admin/util/PagerUtil.java
___________________________________________________________________
Name: svn:eol-style
+ native
Added: pal-admin/trunk/src/main/java/jp/sf/pal/admin/util/PortalComponentUtil.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/util/PortalComponentUtil.java 2007-04-09 07:22:48 UTC (rev 34)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/util/PortalComponentUtil.java 2007-04-12 01:22:00 UTC (rev 35)
@@ -0,0 +1,84 @@
+package jp.sf.pal.admin.util;
+
+import javax.faces.context.FacesContext;
+
+import jp.sf.pal.admin.PALAdminConstants;
+
+import org.apache.jetspeed.components.portletregistry.PortletRegistry;
+import org.apache.jetspeed.factory.PortletFactory;
+import org.apache.jetspeed.page.PageManager;
+import org.apache.jetspeed.profiler.Profiler;
+import org.apache.jetspeed.security.GroupManager;
+import org.apache.jetspeed.security.RoleManager;
+import org.apache.jetspeed.security.SecurityProvider;
+import org.apache.jetspeed.security.UserManager;
+import org.apache.jetspeed.tools.pamanager.servletcontainer.ApplicationServerManager;
+
+public class PortalComponentUtil
+{
+ /**
+ * @return the facesContext
+ */
+ private static FacesContext getFacesContext()
+ {
+ return FacesContext.getCurrentInstance();
+ }
+
+ public static UserManager getUserManager()
+ {
+ return (UserManager) getFacesContext().getExternalContext()
+ .getRequestMap().get(PALAdminConstants.USER_MANAGER_COMPONENT);
+ }
+
+ public static RoleManager getRoleManager()
+ {
+ return (RoleManager) getFacesContext().getExternalContext()
+ .getRequestMap().get(PALAdminConstants.ROLE_MANAGER_COMPONENT);
+ }
+
+ public static GroupManager getGroupManager()
+ {
+ return (GroupManager) getFacesContext().getExternalContext()
+ .getRequestMap().get(PALAdminConstants.GROUP_MANAGER_COMPONENT);
+ }
+
+ public static Profiler getProfiler()
+ {
+ return (Profiler) getFacesContext().getExternalContext()
+ .getRequestMap().get(PALAdminConstants.PROFILER_COMPONENT);
+ }
+
+ public static PageManager getPageManager()
+ {
+ return (PageManager) getFacesContext().getExternalContext()
+ .getRequestMap().get(PALAdminConstants.PAGE_MANAGER_COMPONENT);
+ }
+
+ public static SecurityProvider getSecurityProvider()
+ {
+ return (SecurityProvider) getFacesContext().getExternalContext()
+ .getRequestMap().get(
+ PALAdminConstants.SECURITY_PROVIDER_COMPONENT);
+ }
+
+ public static ApplicationServerManager getApplicationServerManager()
+ {
+ return (ApplicationServerManager) getFacesContext()
+ .getExternalContext().getRequestMap().get(
+ PALAdminConstants.APPLICATION_SERVER_MANAGER_COMPONENT);
+ }
+
+ public static PortletRegistry getPortletRegistry()
+ {
+ return (PortletRegistry) getFacesContext().getExternalContext()
+ .getRequestMap().get(
+ PALAdminConstants.PORTLET_REGISTRY_COMPONENT);
+ }
+
+ public static PortletFactory getPortletFactory()
+ {
+ return (PortletFactory) getFacesContext().getExternalContext()
+ .getRequestMap().get(
+ PALAdminConstants.PORTLET_FACTORY_COMPONENT);
+ }
+}
Property changes on: pal-admin/trunk/src/main/java/jp/sf/pal/admin/util/PortalComponentUtil.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/AbstractCrudPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/AbstractCrudPage.java 2007-04-09 07:22:48 UTC (rev 34)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/AbstractCrudPage.java 2007-04-12 01:22:00 UTC (rev 35)
@@ -1,6 +1,6 @@
package jp.sf.pal.admin.web;
-public abstract class AbstractCrudPage extends AbstractPage
+public abstract class AbstractCrudPage
{
private int crudType = 0;
Deleted: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/AbstractListPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/AbstractListPage.java 2007-04-09 07:22:48 UTC (rev 34)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/AbstractListPage.java 2007-04-12 01:22:00 UTC (rev 35)
@@ -1,83 +0,0 @@
-package jp.sf.pal.admin.web;
-
-public class AbstractListPage extends AbstractCrudPage
-{
-
- private Integer count;
-
- private Integer currentPageNumber;
-
- private Integer maxPageNumber;
-
- private Integer previousPageNumber;
-
- private Integer nextPageNumber;
-
- public AbstractListPage()
- {
- super();
- }
-
- public Integer getCount()
- {
- return count;
- }
-
- public void setCount(Integer count)
- {
- this.count = count;
- }
-
- public Integer getCurrentPageNumber()
- {
- return currentPageNumber;
- }
-
- public void setCurrentPageNumber(Integer currentPageNumber)
- {
- this.currentPageNumber = currentPageNumber;
- }
-
- public Integer getMaxPageNumber()
- {
- return maxPageNumber;
- }
-
- public void setMaxPageNumber(Integer maxPageNumber)
- {
- this.maxPageNumber = maxPageNumber;
- }
-
- /**
- * @return the nextPageNumber
- */
- public Integer getNextPageNumber()
- {
- return nextPageNumber;
- }
-
- /**
- * @param nextPageNumber the nextPageNumber to set
- */
- public void setNextPageNumber(Integer nextPageNumber)
- {
- this.nextPageNumber = nextPageNumber;
- }
-
- /**
- * @return the previousPageNumber
- */
- public Integer getPreviousPageNumber()
- {
- return previousPageNumber;
- }
-
- /**
- * @param previousPageNumber the previousPageNumber to set
- */
- public void setPreviousPageNumber(Integer previousPageNumber)
- {
- this.previousPageNumber = previousPageNumber;
- }
-
-}
\ No newline at end of file
Deleted: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/AbstractPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/AbstractPage.java 2007-04-09 07:22:48 UTC (rev 34)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/AbstractPage.java 2007-04-12 01:22:00 UTC (rev 35)
@@ -1,66 +0,0 @@
-package jp.sf.pal.admin.web;
-
-import org.seasar.teeda.extension.util.LabelHelper;
-
-public abstract class AbstractPage
-{
- private LabelHelper labelHelper;
-
- /**
- * @return the labelHelper
- */
- public LabelHelper getLabelHelper()
- {
- return labelHelper;
- }
-
- /**
- * @param labelHelper the labelHelper to set
- */
- public void setLabelHelper(LabelHelper labelHelper)
- {
- this.labelHelper = labelHelper;
- }
-
- // Label
- public String getEditLabel()
- {
- return labelHelper.getLabelValue("edit");
- }
-
- public String getDeleteLabel()
- {
- return labelHelper.getLabelValue("delete");
- }
-
- public String getNextPageLabel()
- {
- return labelHelper.getLabelValue("nextPage");
- }
-
- public String getPreviousPageLabel()
- {
- return labelHelper.getLabelValue("previousPage");
- }
-
- public String getGroupTabLabel()
- {
- return labelHelper.getLabelValue("groupTab");
- }
-
- public String getRoleTabLabel()
- {
- return labelHelper.getLabelValue("roleTab");
- }
-
- public String getUserTabLabel()
- {
- return labelHelper.getLabelValue("userTab");
- }
-
- public String getBasicTabLabel()
- {
- return labelHelper.getLabelValue("basicTab");
- }
-
-}
Copied: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/AbstractPagerPage.java (from rev 34, pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/AbstractListPage.java)
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/AbstractListPage.java 2007-04-09 07:22:48 UTC (rev 34)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/AbstractPagerPage.java 2007-04-12 01:22:00 UTC (rev 35)
@@ -0,0 +1,101 @@
+package jp.sf.pal.admin.web;
+
+public abstract class AbstractPagerPage extends AbstractCrudPage implements PagerPage
+{
+
+ private Integer count;
+
+ private Integer currentPageNumber;
+
+ private Integer maxPageNumber;
+
+ private Integer previousPageNumber;
+
+ private Integer nextPageNumber;
+
+ public AbstractPagerPage()
+ {
+ super();
+ }
+
+ /* (non-Javadoc)
+ * @see jp.sf.pal.admin.web.PagerPage#getCount()
+ */
+ public Integer getCount()
+ {
+ return count;
+ }
+
+ /* (non-Javadoc)
+ * @see jp.sf.pal.admin.web.PagerPage#setCount(java.lang.Integer)
+ */
+ public void setCount(Integer count)
+ {
+ this.count = count;
+ }
+
+ /* (non-Javadoc)
+ * @see jp.sf.pal.admin.web.PagerPage#getCurrentPageNumber()
+ */
+ public Integer getCurrentPageNumber()
+ {
+ return currentPageNumber;
+ }
+
+ /* (non-Javadoc)
+ * @see jp.sf.pal.admin.web.PagerPage#setCurrentPageNumber(java.lang.Integer)
+ */
+ public void setCurrentPageNumber(Integer currentPageNumber)
+ {
+ this.currentPageNumber = currentPageNumber;
+ }
+
+ /* (non-Javadoc)
+ * @see jp.sf.pal.admin.web.PagerPage#getMaxPageNumber()
+ */
+ public Integer getMaxPageNumber()
+ {
+ return maxPageNumber;
+ }
+
+ /* (non-Javadoc)
+ * @see jp.sf.pal.admin.web.PagerPage#setMaxPageNumber(java.lang.Integer)
+ */
+ public void setMaxPageNumber(Integer maxPageNumber)
+ {
+ this.maxPageNumber = maxPageNumber;
+ }
+
+ /* (non-Javadoc)
+ * @see jp.sf.pal.admin.web.PagerPage#getNextPageNumber()
+ */
+ public Integer getNextPageNumber()
+ {
+ return nextPageNumber;
+ }
+
+ /* (non-Javadoc)
+ * @see jp.sf.pal.admin.web.PagerPage#setNextPageNumber(java.lang.Integer)
+ */
+ public void setNextPageNumber(Integer nextPageNumber)
+ {
+ this.nextPageNumber = nextPageNumber;
+ }
+
+ /* (non-Javadoc)
+ * @see jp.sf.pal.admin.web.PagerPage#getPreviousPageNumber()
+ */
+ public Integer getPreviousPageNumber()
+ {
+ return previousPageNumber;
+ }
+
+ /* (non-Javadoc)
+ * @see jp.sf.pal.admin.web.PagerPage#setPreviousPageNumber(java.lang.Integer)
+ */
+ public void setPreviousPageNumber(Integer previousPageNumber)
+ {
+ this.previousPageNumber = previousPageNumber;
+ }
+
+}
\ No newline at end of file
Added: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/PagerPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/PagerPage.java 2007-04-09 07:22:48 UTC (rev 34)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/PagerPage.java 2007-04-12 01:22:00 UTC (rev 35)
@@ -0,0 +1,26 @@
+package jp.sf.pal.admin.web;
+
+public interface PagerPage
+{
+
+ public abstract Integer getCount();
+
+ public abstract void setCount(Integer count);
+
+ public abstract Integer getCurrentPageNumber();
+
+ public abstract void setCurrentPageNumber(Integer currentPageNumber);
+
+ public abstract Integer getMaxPageNumber();
+
+ public abstract void setMaxPageNumber(Integer maxPageNumber);
+
+ public abstract Integer getNextPageNumber();
+
+ public abstract void setNextPageNumber(Integer nextPageNumber);
+
+ public abstract Integer getPreviousPageNumber();
+
+ public abstract void setPreviousPageNumber(Integer previousPageNumber);
+
+}
\ No newline at end of file
Property changes on: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/PagerPage.java
___________________________________________________________________
Name: svn:eol-style
+ native
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 2007-04-09 07:22:48 UTC (rev 34)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/GroupListPage.java 2007-04-12 01:22:00 UTC (rev 35)
@@ -5,12 +5,12 @@
import java.util.Map;
import jp.sf.pal.admin.service.GroupManagementService;
-import jp.sf.pal.admin.web.AbstractListPage;
+import jp.sf.pal.admin.web.AbstractPagerPage;
import jp.sf.pal.admin.web.CrudType;
import org.seasar.teeda.extension.annotation.takeover.TakeOver;
-public class GroupListPage extends AbstractListPage implements Serializable
+public class GroupListPage extends AbstractPagerPage implements Serializable
{
/**
@@ -80,12 +80,8 @@
public String prerender()
{
- // check page action
- groupManagementService.handlePagerNavigation();
+getGroupManagementService().loadPage(this);
- // set role list
- setGroupItems(groupManagementService.getGroups(this));
-
return null;
}
Added: 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 2007-04-09 07:22:48 UTC (rev 34)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/portletmanager/PortletListPage.java 2007-04-12 01:22:00 UTC (rev 35)
@@ -0,0 +1,117 @@
+package jp.sf.pal.admin.web.portletmanager;
+
+import java.util.List;
+import java.util.Map;
+
+import jp.sf.pal.admin.service.PortletManagementService;
+import jp.sf.pal.admin.web.AbstractPagerPage;
+
+public class PortletListPage extends AbstractPagerPage
+{
+
+ private String name;
+
+ private String path;
+
+ private int portletIndex;
+
+ private List<Map<String, Object>> portletApplicationItems;
+
+ private Integer status;
+
+ private String version;
+
+ private PortletManagementService portletManagementService;
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public void setName(String name)
+ {
+ this.name = name;
+ }
+
+ public String getPath()
+ {
+ return path;
+ }
+
+ public void setPath(String path)
+ {
+ this.path = path;
+ }
+
+ public int getPortletIndex()
+ {
+ return portletIndex;
+ }
+
+ public void setPortletIndex(int portletIndex)
+ {
+ this.portletIndex = portletIndex;
+ }
+
+ public List<Map<String, Object>> getPortletApplicationItems()
+ {
+ return portletApplicationItems;
+ }
+
+ public void setPortletApplicationItems(
+ List<Map<String, Object>> portletItems)
+ {
+ this.portletApplicationItems = portletItems;
+ }
+
+ public Integer getStatus()
+ {
+ return status;
+ }
+
+ public void setStatus(Integer status)
+ {
+ this.status = status;
+ }
+
+ public String getVersion()
+ {
+ return version;
+ }
+
+ public void setVersion(String version)
+ {
+ this.version = version;
+ }
+
+ /**
+ * @return the portletManagementService
+ */
+ public PortletManagementService getPortletManagementService()
+ {
+ return portletManagementService;
+ }
+
+ /**
+ * @param portletManagementService the portletManagementService to set
+ */
+ public void setPortletManagementService(
+ PortletManagementService portletManagementService)
+ {
+ this.portletManagementService = portletManagementService;
+ }
+
+ public String initialize()
+ {
+ return null;
+ }
+
+ public String prerender()
+ {
+ // load page
+ getPortletManagementService().loadPage(this);
+
+ return null;
+ }
+
+}
Property changes on: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/portletmanager/PortletListPage.java
___________________________________________________________________
Name: svn:eol-style
+ native
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 2007-04-09 07:22:48 UTC (rev 34)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleListPage.java 2007-04-12 01:22:00 UTC (rev 35)
@@ -5,12 +5,12 @@
import java.util.Map;
import jp.sf.pal.admin.service.RoleManagementService;
-import jp.sf.pal.admin.web.AbstractListPage;
+import jp.sf.pal.admin.web.AbstractPagerPage;
import jp.sf.pal.admin.web.CrudType;
import org.seasar.teeda.extension.annotation.takeover.TakeOver;
-public class RoleListPage extends AbstractListPage implements Serializable
+public class RoleListPage extends AbstractPagerPage implements Serializable
{
/**
@@ -98,12 +98,8 @@
public String prerender()
{
- // check page action
- roleManagementService.handlePagerNavigation();
+ roleManagementService.loadPage(this);
- // set role list
- setRoleItems(roleManagementService.getRoles(this));
-
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 2007-04-09 07:22:48 UTC (rev 34)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserListPage.java 2007-04-12 01:22:00 UTC (rev 35)
@@ -5,12 +5,12 @@
import java.util.Map;
import jp.sf.pal.admin.service.UserManagementService;
-import jp.sf.pal.admin.web.AbstractListPage;
+import jp.sf.pal.admin.web.AbstractPagerPage;
import jp.sf.pal.admin.web.CrudType;
import org.seasar.teeda.extension.annotation.takeover.TakeOver;
-public class UserListPage extends AbstractListPage implements Serializable
+public class UserListPage extends AbstractPagerPage implements Serializable
{
/**
@@ -80,11 +80,8 @@
public String prerender()
{
- // check page action
- userManagementService.handlePagerNavigation();
+ userManagementService.loadPage(this);
- // set role list
- setUserItems(userManagementService.getUsers(this));
return null;
}
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 2007-04-09 07:22:48 UTC (rev 34)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserProfilingRuleEditPage.java 2007-04-12 01:22:00 UTC (rev 35)
@@ -7,14 +7,14 @@
import javax.faces.internal.FacesMessageUtil;
-import org.seasar.framework.log.Logger;
-
import jp.sf.pal.admin.PALAdminException;
import jp.sf.pal.admin.entity.PrincipalRule;
import jp.sf.pal.admin.service.UserManagementService;
import jp.sf.pal.admin.util.PALAdminUtil;
import jp.sf.pal.admin.web.AbstractCrudPage;
+import org.seasar.framework.log.Logger;
+
public class UserProfilingRuleEditPage extends AbstractCrudPage implements
Serializable
{
Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/label.properties
===================================================================
--- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/label.properties 2007-04-09 07:22:48 UTC (rev 34)
+++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/label.properties 2007-04-12 01:22:00 UTC (rev 35)
@@ -2,6 +2,9 @@
roleTab=Role
groupTab=Group
+portletsTab=Portlets
+deployerTab=Deployer
+
previousPage=<<Previous
found= found.
nextPage=Next>>
Added: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/portletmanager/label.properties
===================================================================
--- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/portletmanager/label.properties 2007-04-09 07:22:48 UTC (rev 34)
+++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/portletmanager/label.properties 2007-04-12 01:22:00 UTC (rev 35)
@@ -0,0 +1,6 @@
+deployedPortletsList=Deployed Portlets List
+portletName=Portlet Name
+version=Version
+path=Path
+status=Status
+delete=Delete
Property changes on: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/portletmanager/label.properties
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: pal-admin/trunk/src/main/webapp/WEB-INF/portlet.xml
===================================================================
--- pal-admin/trunk/src/main/webapp/WEB-INF/portlet.xml 2007-04-09 07:22:48 UTC (rev 34)
+++ pal-admin/trunk/src/main/webapp/WEB-INF/portlet.xml 2007-04-12 01:22:00 UTC (rev 35)
@@ -26,8 +26,7 @@
</init-param>
<init-param>
<name>portlet-filters</name>
- <value>org.seasar.portlet.filter.RequestDumpFilter,jp.sf.pal.admin.filter.J2SecurityProviderFilter,jp.sf.pal.facesresponse.FacesResponseFilter,jp.sf.pal.pooptimizer.OptimizerFilter,org.seasar.portlet.filter.S2PortletFilter,org.seasar.portlet.filter.HotdeployPortletFilter</value>
- <!--value>org.seasar.portlet.filter.RequestDumpFilter,jp.sf.pal.admin.filter.J2SecurityProviderFilter,jp.sf.pal.facesresponse.FacesResponseFilter,jp.sf.pal.pooptimizer.OptimizerFilter,org.seasar.portlet.filter.S2PortletFilter,org.seasar.portlet.filter.HotdeployPortletFilter</value-->
+ <value>org.seasar.portlet.filter.RequestDumpFilter,jp.sf.pal.admin.filter.UserManagementFilter,jp.sf.pal.facesresponse.FacesResponseFilter,jp.sf.pal.pooptimizer.OptimizerFilter,org.seasar.portlet.filter.S2PortletFilter,org.seasar.portlet.filter.HotdeployPortletFilter</value>
</init-param>
<init-param>
<name>view-page</name>
@@ -51,4 +50,39 @@
<keywords>User,Role,Group,Management</keywords>
</portlet-info>
</portlet>
+ <portlet>
+ <description>Portlet Management Tool</description>
+ <portlet-name>PortletManagement</portlet-name>
+ <display-name>Portlet Management</display-name>
+ <portlet-class>org.apache.portals.bridges.portletfilter.FilterPortlet</portlet-class>
+ <init-param>
+ <name>portlet-class</name>
+ <value>org.seasar.teeda.core.portlet.FacesPortlet</value>
+ </init-param>
+ <init-param>
+ <name>portlet-filters</name>
+ <value>org.seasar.portlet.filter.RequestDumpFilter,jp.sf.pal.admin.filter.PortletManagementFilter,jp.sf.pal.facesresponse.FacesResponseFilter,jp.sf.pal.pooptimizer.OptimizerFilter,org.seasar.portlet.filter.S2PortletFilter,org.seasar.portlet.filter.HotdeployPortletFilter</value>
+ </init-param>
+ <init-param>
+ <name>view-page</name>
+ <value>/view/portletmanager/portletList.html</value>
+ </init-param>
+<!-- <init-param>
+ <name>edit-page</name>
+ <value></value>
+ </init-param> -->
+ <supports>
+ <mime-type>text/html</mime-type>
+ <portlet-mode>VIEW</portlet-mode>
+<!-- <portlet-mode>EDIT</portlet-mode> -->
+ </supports>
+ <supported-locale>en</supported-locale>
+ <supported-locale>ja</supported-locale>
+<!-- resource-bundle></resource-bundle -->
+ <portlet-info>
+ <title>Portlet Management</title>
+ <short-title>Management</short-title>
+ <keywords>Portlet,Management</keywords>
+ </portlet-info>
+ </portlet>
</portlet-app>
Added: pal-admin/trunk/src/main/webapp/WEB-INF/rpad-config.xml
===================================================================
--- pal-admin/trunk/src/main/webapp/WEB-INF/rpad-config.xml 2007-04-09 07:22:48 UTC (rev 34)
+++ pal-admin/trunk/src/main/webapp/WEB-INF/rpad-config.xml 2007-04-12 01:22:00 UTC (rev 35)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+-->
+<repositories>
+ <repository>
+ <name>PALab</name>
+ <class name="jp.sf.pal.admin.rpad.repository.impl.SimpleRepository"/>
+ <property name="configPath">http://pal.sourceforge.jp/portlet-repository.xml</property>
+ </repository>
+ <repository>
+ <name>Apache Portals</name>
+ <class name="jp.sf.pal.admin.rpad.repository.impl.SimpleRepository"/>
+ <property name="configPath">http://www.bluesunrise.com/rpa/portlet-repository.xml</property>
+ </repository>
+</repositories>
Property changes on: pal-admin/trunk/src/main/webapp/WEB-INF/rpad-config.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: pal-admin/trunk/src/main/webapp/view/group/groupConfirm.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/group/groupConfirm.html 2007-04-09 07:22:48 UTC (rev 34)
+++ pal-admin/trunk/src/main/webapp/view/group/groupConfirm.html 2007-04-12 01:22:00 UTC (rev 35)
@@ -15,7 +15,7 @@
<a id="jumpRoleList" href="../role/roleList.html" style="text-decoration: none;">
<span id="roleTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Role</span>
</a>
- <span id="groupTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">Group</span>
+ <label id="groupTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">Group</label>
</div>
<!-- tab: END -->
Modified: pal-admin/trunk/src/main/webapp/view/group/groupEdit.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/group/groupEdit.html 2007-04-09 07:22:48 UTC (rev 34)
+++ pal-admin/trunk/src/main/webapp/view/group/groupEdit.html 2007-04-12 01:22:00 UTC (rev 35)
@@ -15,7 +15,7 @@
<a id="jumpRoleList" href="../role/roleList.html" style="text-decoration: none;">
<span id="roleTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Role</span>
</a>
- <span id="groupTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">Group</span>
+ <label id="groupTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">Group</label>
</div>
<!-- tab: END -->
Modified: pal-admin/trunk/src/main/webapp/view/group/groupList.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/group/groupList.html 2007-04-09 07:22:48 UTC (rev 34)
+++ pal-admin/trunk/src/main/webapp/view/group/groupList.html 2007-04-12 01:22:00 UTC (rev 35)
@@ -15,7 +15,7 @@
<a id="jumpRoleList" href="../role/roleList.html" style="text-decoration: none;">
<span id="roleTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Role</span>
</a>
- <span id="groupTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">Group</span>
+ <label id="groupTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">Group</label>
</div>
<!-- tab: END -->
Added: pal-admin/trunk/src/main/webapp/view/portletmanager/portletList.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/portletmanager/portletList.html 2007-04-09 07:22:48 UTC (rev 34)
+++ pal-admin/trunk/src/main/webapp/view/portletmanager/portletList.html 2007-04-12 01:22:00 UTC (rev 35)
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:te="http://www.seasar.org/teeda/extension">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="stylesheet" type="text/css" href="../../css/global.css"/>
+</head>
+<body>
+<form id="PortletsListForm">
+<!-- tab: BEGIN -->
+<div style="padding: 0px 0px 3px 10px; margin:5px 0px;border-bottom:1px solid #000000;">
+ <label id="portletsTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">Portlets</label>
+ <a id="jumpGroupList" href="../deployer/deployerList.html" style="text-decoration: none;">
+ <span id="deployerTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Deployer</span>
+ </a>
+</div>
+<!-- tab: END -->
+
+<div>
+ <span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span>
+</div>
+
+<!-- content: BEGIN -->
+<div style="padding:5px 0px;">
+ <div class="portlet-section-header">
+ <label id="deployedPortletsListLabel">Deployed Portlets List</label>
+ </div>
+
+ <div>
+ <span id="count-header">10</span><!-- TODO: i18n--> <label id="foundLabel"> found.</label>
+ (<span id="currentPageNumber-header">3</span>/<span id="maxPageNumber-header">5</span>)
+ </div>
+
+ <div>
+ <a id="goPreviousPage-header" href="portletManagerList.html?previousPageNumber=1"
+ te:rendered="#{portletmanager_portletManagerListPage.previousPageNumber!=null}">
+ <span id="previousPageLabel-header"><<Previous</span>
+ </a>
+ <a id="goNextPage-header" href="portletManagerList.html?nextPageNumber=2"
+ te:rendered="#{portletmanager_portletManagerListPage.nextPageNumber!=null}">
+ <span id="nextPageLabel-header">Next>></span>
+ </a>
+ </div>
+
+ <table>
+ <thead class="portlet-section-subheader">
+ <tr>
+ <th><label id="portletNameLabel">Portlet Name</label></th>
+ <th><label id="versionLabel">Version</label></th>
+ <th><label id="pathLabel">Path</label></th>
+ <th><label id="statusLabel">Status</label></th>
+ <th><br/></th>
+ </tr>
+ </thead>
+ <tbody>
+ <div id="portletApplicationItems">
+ <tr>
+ <td class="portlet-section-body"><span id="name">PORTLET</span></td>
+ <td class="portlet-section-body"><span id="version">VERSION</span></td>
+ <td class="portlet-section-body"><span id="path">PATH</span></td>
+ <td class="portlet-section-body"><span id="status">STATUS</span></td>
+ <td class="portlet-section-alternate">
+ <a id="goPortletDeleteConfirm" href="portletDeleteConfirm.html?fixed_crudType=3&name=name"><span id="deleteLabel">Delete</span></a>
+ </td>
+ </tr>
+ </div>
+ </tbody>
+ </table>
+
+ <div>
+ <a id="goPreviousPage-footer" href="portletManagerList.html?previousPageNumber=1"
+ te:rendered="#{portletmanager_portletManagerListPage.previousPageNumber!=null}">
+ <span id="previousPageLabel-footer"><<Previous</span>
+ </a>
+ <a id="goNextPage-footer" href="portletManagerList.html?nextPageNumber=2"
+ te:rendered="#{portletmanager_portletManagerListPage.nextPageNumber!=null}">
+ <span id="nextPageLabel-footer">Next>></span>
+ </a>
+ </div>
+</div>
+<!-- content: END -->
+</form>
+</body></html>
Property changes on: pal-admin/trunk/src/main/webapp/view/portletmanager/portletList.html
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: pal-admin/trunk/src/main/webapp/view/role/roleConfirm.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/role/roleConfirm.html 2007-04-09 07:22:48 UTC (rev 34)
+++ pal-admin/trunk/src/main/webapp/view/role/roleConfirm.html 2007-04-12 01:22:00 UTC (rev 35)
@@ -12,7 +12,7 @@
<a id="jumpUserList" href="../user/userList.html" style="text-decoration: none;">
<span id="userTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">User</span>
</a>
- <span id="roleTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">Role</span>
+ <label id="roleTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">Role</label>
<a id="jumpGroupList" href="../group/groupList.html" style="text-decoration: none;">
<span id="groupTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Group</span>
</a>
Modified: pal-admin/trunk/src/main/webapp/view/role/roleEdit.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/role/roleEdit.html 2007-04-09 07:22:48 UTC (rev 34)
+++ pal-admin/trunk/src/main/webapp/view/role/roleEdit.html 2007-04-12 01:22:00 UTC (rev 35)
@@ -12,7 +12,7 @@
<a id="jumpUserList" href="../user/userList.html" style="text-decoration: none;">
<span id="userTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">User</span>
</a>
- <span id="roleTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">Role</span>
+ <label id="roleTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">Role</label>
<a id="jumpGroupList" href="../group/groupList.html" style="text-decoration: none;">
<span id="groupTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Group</span>
</a>
Modified: pal-admin/trunk/src/main/webapp/view/role/roleList.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/role/roleList.html 2007-04-09 07:22:48 UTC (rev 34)
+++ pal-admin/trunk/src/main/webapp/view/role/roleList.html 2007-04-12 01:22:00 UTC (rev 35)
@@ -12,7 +12,7 @@
<a id="jumpUserList" href="../user/userList.html" style="text-decoration: none;">
<span id="userTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">User</span>
</a>
- <span id="roleTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">Role</span>
+ <label id="roleTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">Role</label>
<a id="jumpGroupList" href="../group/groupList.html" style="text-decoration: none;">
<span id="groupTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Group</span>
</a>
Modified: pal-admin/trunk/src/main/webapp/view/user/userConfirm.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/user/userConfirm.html 2007-04-09 07:22:48 UTC (rev 34)
+++ pal-admin/trunk/src/main/webapp/view/user/userConfirm.html 2007-04-12 01:22:00 UTC (rev 35)
@@ -9,7 +9,7 @@
<form id="UserConfirmForm"><input type="hidden" id="crudType" />
<!-- tab: BEGIN -->
<div style="padding: 0px 0px 3px 10px; margin:5px 0px;border-bottom:1px solid #000000;">
- <span id="userTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">User</span>
+ <label id="userTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">User</label>
<a id="jumpRoleList" href="../role/roleList.html" style="text-decoration: none;">
<span id="roleTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Role</span>
</a>
Modified: pal-admin/trunk/src/main/webapp/view/user/userCreate.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/user/userCreate.html 2007-04-09 07:22:48 UTC (rev 34)
+++ pal-admin/trunk/src/main/webapp/view/user/userCreate.html 2007-04-12 01:22:00 UTC (rev 35)
@@ -9,7 +9,7 @@
<form id="UserCreateForm"><input type="hidden" id="crudType" />
<!-- tab: BEGIN -->
<div style="padding: 0px 0px 3px 10px; margin:5px 0px;border-bottom:1px solid #000000;">
- <span id="userTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">User</span>
+ <label id="userTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">User</label>
<a id="jumpRoleList" href="../role/roleList.html" style="text-decoration: none;">
<span id="roleTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Role</span>
</a>
Modified: pal-admin/trunk/src/main/webapp/view/user/userEdit.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/user/userEdit.html 2007-04-09 07:22:48 UTC (rev 34)
+++ pal-admin/trunk/src/main/webapp/view/user/userEdit.html 2007-04-12 01:22:00 UTC (rev 35)
@@ -9,7 +9,7 @@
<form id="UserEditForm"><input type="hidden" id="crudType" />
<!-- tab: BEGIN -->
<div style="padding: 0px 0px 3px 10px; margin:5px 0px;border-bottom:1px solid #000000;">
- <span id="userTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">User</span>
+ <label id="userTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">User</label>
<a id="jumpRoleList" href="../role/roleList.html" style="text-decoration: none;">
<span id="roleTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Role</span>
</a>
@@ -30,7 +30,7 @@
</div>
<div>
- <span id="basicTabLabel">Basic</span>
+ <label id="basicTabLabel">Basic</label>
|
<a id="jumpUserRoleEdit" href="userRoleEdit.html?fixed_crudType=3&name=name" style="text-decoration: none;">
<span id="roleTabLabel">Role</span>
Modified: pal-admin/trunk/src/main/webapp/view/user/userGroupEdit.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/user/userGroupEdit.html 2007-04-09 07:22:48 UTC (rev 34)
+++ pal-admin/trunk/src/main/webapp/view/user/userGroupEdit.html 2007-04-12 01:22:00 UTC (rev 35)
@@ -9,7 +9,7 @@
<form id="UserGroupEditForm"><input type="hidden" id="crudType" />
<!-- tab: BEGIN -->
<div style="padding: 0px 0px 3px 10px; margin:5px 0px;border-bottom:1px solid #000000;">
- <span id="userTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">User</span>
+ <label id="userTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">User</label>
<a id="jumpRoleList" href="../role/roleList.html" style="text-decoration: none;">
<span id="roleTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Role</span>
</a>
@@ -38,7 +38,7 @@
<span id="roleTabLabel">Role</span>
</a>
|
- <span id="groupTabLabel">Group</span>
+ <label id="groupTabLabel">Group</label>
|
<a id="jumpUserProfilingRuleEdit" href="userProfilingRuleEdit.html?fixed_crudType=3&name=name" style="text-decoration: none;">
<span id="profilingRuleTabLabel">Profiling Rule</span>
Modified: pal-admin/trunk/src/main/webapp/view/user/userList.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/user/userList.html 2007-04-09 07:22:48 UTC (rev 34)
+++ pal-admin/trunk/src/main/webapp/view/user/userList.html 2007-04-12 01:22:00 UTC (rev 35)
@@ -9,7 +9,7 @@
<form id="UserListForm">
<!-- tab: BEGIN -->
<div style="padding: 0px 0px 3px 10px; margin:5px 0px;border-bottom:1px solid #000000;">
- <span id="userTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">User</span>
+ <label id="userTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">User</label>
<a id="jumpRoleList" href="../role/roleList.html" style="text-decoration: none;">
<span id="roleTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Role</span>
</a>
Modified: pal-admin/trunk/src/main/webapp/view/user/userProfilingRuleEdit.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/user/userProfilingRuleEdit.html 2007-04-09 07:22:48 UTC (rev 34)
+++ pal-admin/trunk/src/main/webapp/view/user/userProfilingRuleEdit.html 2007-04-12 01:22:00 UTC (rev 35)
@@ -9,7 +9,7 @@
<form id="UserProfilingRuleEditForm"><input type="hidden" id="crudType" />
<!-- tab: BEGIN -->
<div style="padding: 0px 0px 3px 10px; margin:5px 0px;border-bottom:1px solid #000000;">
- <span id="userTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">User</span>
+ <label id="userTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">User</label>
<a id="jumpRoleList" href="../role/roleList.html" style="text-decoration: none;">
<span id="roleTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Role</span>
</a>
@@ -42,7 +42,7 @@
<span id="groupTabLabel">Group</span>
</a>
|
- <span id="profilingRuleTabLabel">Profiling Rule</span>
+ <label id="profilingRuleTabLabel">Profiling Rule</label>
</div>
<table class="tablebg">
Modified: pal-admin/trunk/src/main/webapp/view/user/userRoleEdit.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/user/userRoleEdit.html 2007-04-09 07:22:48 UTC (rev 34)
+++ pal-admin/trunk/src/main/webapp/view/user/userRoleEdit.html 2007-04-12 01:22:00 UTC (rev 35)
@@ -9,7 +9,7 @@
<form id="UserRoleEditForm"><input type="hidden" id="crudType" />
<!-- tab: BEGIN -->
<div style="padding: 0px 0px 3px 10px; margin:5px 0px;border-bottom:1px solid #000000;">
- <span id="userTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">User</span>
+ <label id="userTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">User</label>
<a id="jumpRoleList" href="../role/roleList.html" style="text-decoration: none;">
<span id="roleTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Role</span>
</a>
@@ -34,7 +34,7 @@
<span id="basicTabLabel">Basic</span>
</a>
|
- <span id="roleTabLabel">Role</span>
+ <label id="roleTabLabel">Role</label>
|
<a id="jumpUserGroupEdit" href="userGroupEdit.html?fixed_crudType=3&name=name" style="text-decoration: none;">
<span id="groupTabLabel">Group</span>