svnno****@sourc*****
svnno****@sourc*****
2007年 7月 14日 (土) 07:13:10 JST
Revision: 250 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=250 Author: shinsuke Date: 2007-07-14 07:13:10 +0900 (Sat, 14 Jul 2007) Log Message: ----------- updated portlet management for using the latest teeda. Modified Paths: -------------- pal-admin/trunk/.classpath pal-admin/trunk/pom.xml pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/DeployerEditPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/portletmanager/PortletListPage.java -------------- next part -------------- Modified: pal-admin/trunk/.classpath =================================================================== --- pal-admin/trunk/.classpath 2007-07-13 21:21:33 UTC (rev 249) +++ pal-admin/trunk/.classpath 2007-07-13 22:13:10 UTC (rev 250) @@ -5,42 +5,47 @@ <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/org/seasar/container/s2-extension/2.4.15/s2-extension-2.4.15.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/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/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/seasar/teeda/teeda-extension/1.0.8-RC1/teeda-extension-1.0.8-RC1.jar" sourcepath="M2_REPO/org/seasar/teeda/teeda-extension/1.0.8-RC1/teeda-extension-1.0.8-RC1-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/org/apache/portals/jetspeed-2/jetspeed-locator/2.2-dev_pal-1.0-beta5-dev/jetspeed-locator-2.2-dev_pal-1.0-beta5-dev.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/commons-lang/commons-lang/2.1/commons-lang-2.1.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/seasar/teeda/teeda-tiger/1.0.7/teeda-tiger-1.0.7.jar"/> + <classpathentry kind="var" path="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1.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/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/apache/portals/bridges/portals-bridges-portletfilter/1.0.3/portals-bridges-portletfilter-1.0.3.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/org/seasar/container/s2-tiger/2.4.15/s2-tiger-2.4.15.jar"/> + <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.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/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/commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.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/org/seasar/teeda/teeda-ajax/1.0.7-20070510/teeda-ajax-1.0.7-20070510.jar" sourcepath="M2_REPO/org/seasar/teeda/teeda-ajax/1.0.7-20070510/teeda-ajax-1.0.7-20070510-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.5/tomahawk-1.1.5.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/portals/jetspeed-2/jetspeed-locator/2.2-dev_pal-1.0-beta6-dev/jetspeed-locator-2.2-dev_pal-1.0-beta6-dev.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/org/apache/myfaces/tomahawk/tomahawk/1.1.3/tomahawk-1.1.3.jar"/> <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.1/commons-io-1.1.jar" sourcepath="M2_REPO/commons-io/commons-io/1.1/commons-io-1.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/easymock/easymock/2.2/easymock-2.2.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/jboss/javassist/3.4.ga/javassist-3.4.ga.jar"/> <classpathentry kind="var" path="M2_REPO/jp/sf/pal/common-utils/0.3-SNAPSHOT/common-utils-0.3-SNAPSHOT.jar" sourcepath="M2_REPO/jp/sf/pal/common-utils/0.3-SNAPSHOT/common-utils-0.3-SNAPSHOT-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/org/apache/portals/jetspeed-2/jetspeed-api/2.2-dev_pal-1.0-beta6-dev/jetspeed-api-2.2-dev_pal-1.0-beta6-dev.jar"/> + <classpathentry kind="var" path="M2_REPO/org/seasar/container/s2-framework/2.4.15/s2-framework-2.4.15.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/container/s2-extension/2.4.11/s2-extension-2.4.11.jar"/> - <classpathentry kind="var" path="M2_REPO/org/seasar/teeda/teeda-core/1.0.7-20070510/teeda-core-1.0.7-20070510.jar" sourcepath="M2_REPO/org/seasar/teeda/teeda-core/1.0.7-20070510/teeda-core-1.0.7-20070510-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/seasar/teeda/teeda-ajax/1.0.8-RC1/teeda-ajax-1.0.8-RC1.jar" sourcepath="M2_REPO/org/seasar/teeda/teeda-ajax/1.0.8-RC1/teeda-ajax-1.0.8-RC1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/ognl/ognl/2.6.9-patch-20070624/ognl-2.6.9-patch-20070624.jar"/> <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.1.1/commons-fileupload-1.1.1.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/org/seasar/portlet/s2-portlet/1.0.7/s2-portlet-1.0.7.jar" sourcepath="M2_REPO/org/seasar/portlet/s2-portlet/1.0.7/s2-portlet-1.0.7-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/poi/poi/3.0-FINAL/poi-3.0-FINAL.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/portals/jetspeed-2/jetspeed-api/2.2-dev_pal-1.0-beta5-dev/jetspeed-api-2.2-dev_pal-1.0-beta5-dev.jar"/> + <classpathentry kind="var" path="M2_REPO/org/seasar/teeda/teeda-core/1.0.8-RC1/teeda-core-1.0.8-RC1.jar" sourcepath="M2_REPO/org/seasar/teeda/teeda-core/1.0.8-RC1/teeda-core-1.0.8-RC1-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/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/seasar/teeda/teeda-extension/1.0.7-20070510/teeda-extension-1.0.7-20070510.jar" sourcepath="M2_REPO/org/seasar/teeda/teeda-extension/1.0.7-20070510/teeda-extension-1.0.7-20070510-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"/> </classpath> Modified: pal-admin/trunk/pom.xml =================================================================== --- pal-admin/trunk/pom.xml 2007-07-13 21:21:33 UTC (rev 249) +++ pal-admin/trunk/pom.xml 2007-07-13 22:13:10 UTC (rev 250) @@ -150,6 +150,11 @@ </dependency> <dependency> <groupId>org.seasar.teeda</groupId> + <artifactId>teeda-core</artifactId> + <version>1.0.8-RC1</version> + </dependency> + <dependency> + <groupId>org.seasar.teeda</groupId> <artifactId>teeda-extension</artifactId> <version>1.0.8-RC1</version> <type>jar</type> @@ -161,17 +166,16 @@ </exclusions> </dependency> <dependency> + <groupId>org.seasar.teeda</groupId> + <artifactId>teeda-tiger</artifactId> + <version>1.0.7</version> + </dependency> + <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-ejb_2.1_spec</artifactId> <version>1.0</version> </dependency> <dependency> - <groupId>org.seasar.teeda</groupId> - <artifactId>teeda-tiger</artifactId> - <version>1.0.7</version> - <type>jar</type> - </dependency> - <dependency> <groupId>org.seasar.portlet</groupId> <artifactId>s2-portlet</artifactId> <version>1.0.7</version> @@ -179,7 +183,7 @@ <dependency> <groupId>org.apache.portals.bridges</groupId> <artifactId>portals-bridges-portletfilter</artifactId> - <version>1.0.2-dev</version> + <version>1.0.3</version> </dependency> <dependency> <groupId>jp.sf.pal</groupId> @@ -205,7 +209,7 @@ <dependency> <groupId>org.apache.myfaces.tomahawk</groupId> <artifactId>tomahawk</artifactId> - <version>1.1.3</version> + <version>1.1.5</version> <exclusions> <exclusion> <groupId>struts</groupId> @@ -263,20 +267,27 @@ <scope>provided</scope> <!-- PORTLET DEV: END --> </dependency> - <!-- FOR TEST <dependency> <groupId>org.seasar.container</groupId> <artifactId>s2-framework</artifactId> - <version>2.4.12-SNAPSHOT</version> - <type>jar</type> + <version>2.4.15</version> </dependency> <dependency> <groupId>org.seasar.container</groupId> <artifactId>s2-extension</artifactId> - <version>2.4.12-SNAPSHOT</version> - <type>jar</type> + <version>2.4.15</version> </dependency> ---> + <dependency> + <groupId>org.seasar.container</groupId> + <artifactId>s2-tiger</artifactId> + <version>2.4.15</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> </dependencies> <reporting> <plugins> Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/DeployerEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/DeployerEditPage.java 2007-07-13 21:21:33 UTC (rev 249) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/DeployerEditPage.java 2007-07-13 22:13:10 UTC (rev 250) @@ -20,40 +20,35 @@ import javax.faces.internal.FacesMessageUtil; -import org.apache.myfaces.custom.fileupload.UploadedFile; -import org.seasar.teeda.extension.annotation.validator.Required; - import jp.sf.pal.admin.PALAdminException; import jp.sf.pal.admin.service.PortletDeploymentService; import jp.sf.pal.admin.web.AbstractCrudPage; -public class DeployerEditPage extends AbstractCrudPage implements Serializable -{ +import org.apache.myfaces.custom.fileupload.UploadedFile; + +public class DeployerEditPage extends AbstractCrudPage implements Serializable { /** * */ private static final long serialVersionUID = -1591324603578689328L; - @Required + // @Required private UploadedFile portletApplicationFile; private PortletDeploymentService portletDeploymentService; - public UploadedFile getPortletApplicationFile() - { + public UploadedFile getPortletApplicationFile() { return portletApplicationFile; } - public void setPortletApplicationFile(UploadedFile portletApplicationFile) - { + public void setPortletApplicationFile(UploadedFile portletApplicationFile) { this.portletApplicationFile = portletApplicationFile; } /** * @return the portletDeploymentService */ - public PortletDeploymentService getPortletDeploymentService() - { + public PortletDeploymentService getPortletDeploymentService() { return portletDeploymentService; } @@ -61,39 +56,29 @@ * @param portletDeploymentService the portletDeploymentService to set */ public void setPortletDeploymentService( - PortletDeploymentService portletDeploymentService) - { + PortletDeploymentService portletDeploymentService) { this.portletDeploymentService = portletDeploymentService; } - public String initialize() - { + public String initialize() { return null; } - public String prerender() - { + public String prerender() { return null; } - public String doFinish() - { - if (portletApplicationFile != null) - { - try - { + public String doFinish() { + if (portletApplicationFile != null) { + try { portletDeploymentService.deploy(this); FacesMessageUtil .addInfoMessage("started.portlet.application.deployment"); - } - catch (PALAdminException e) - { + } catch (PALAdminException e) { FacesMessageUtil .addErrorMessage("failed.to.start.portlet.application.deployment"); } - } - else - { + } else { FacesMessageUtil.addErrorMessage("invalid.upload.file"); } return null; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/portletmanager/PortletListPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/portletmanager/PortletListPage.java 2007-07-13 21:21:33 UTC (rev 249) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/portletmanager/PortletListPage.java 2007-07-13 22:13:10 UTC (rev 250) @@ -24,8 +24,7 @@ import jp.sf.pal.admin.service.PortletManagementService; import jp.sf.pal.admin.web.AbstractPagerPage; -public class PortletListPage extends AbstractPagerPage implements Serializable -{ +public class PortletListPage extends AbstractPagerPage implements Serializable { /** * @@ -36,118 +35,88 @@ private String path; - private int portletIndex; + private int portletApplicationIndex; private List<Map<String, Object>> portletApplicationItems; - private Integer status; - - private Integer applicationType; - private String version; private boolean serverManagerAvailable; private PortletManagementService portletManagementService; - public String getName() - { + public String getName() { return name; } - public void setName(String name) - { + public void setName(String name) { this.name = name; } - public String getPath() - { + public String getPath() { return path; } - public void setPath(String path) - { + public void setPath(String path) { this.path = path; } - public int getPortletIndex() - { - return portletIndex; + public int getPortletApplicationIndex() { + return portletApplicationIndex; } - public void setPortletIndex(int portletIndex) - { - this.portletIndex = portletIndex; + public void setPortletApplicationIndex(int portletIndex) { + this.portletApplicationIndex = portletIndex; } - public List<Map<String, Object>> getPortletApplicationItems() - { + public List<Map<String, Object>> getPortletApplicationItems() { return portletApplicationItems; } public void setPortletApplicationItems( - List<Map<String, Object>> portletItems) - { + List<Map<String, Object>> portletItems) { this.portletApplicationItems = portletItems; } - public Integer getStatus() - { - return status; + public Integer getStatus() { + return (Integer) portletApplicationItems.get(portletApplicationIndex) + .get("status"); } - public void setStatus(Integer status) - { - this.status = status; - } - /** * @return the applicationType */ - public Integer getApplicationType() - { - return applicationType; + public Integer getApplicationType() { + return (Integer) portletApplicationItems.get(portletApplicationIndex) + .get("applicationType"); } - /** - * @param applicationType the applicationType to set - */ - public void setApplicationType(Integer applicationType) - { - this.applicationType = applicationType; - } - - public String getVersion() - { + public String getVersion() { return version; } - public void setVersion(String version) - { + public void setVersion(String version) { this.version = version; } /** * @return the serverManagerAvailable */ - public boolean isServerManagerAvailable() - { + public boolean isServerManagerAvailable() { return serverManagerAvailable; } /** * @param serverManagerAvailable the serverManagerAvailable to set */ - public void setServerManagerAvailable(boolean serverManagerAvailable) - { + public void setServerManagerAvailable(boolean serverManagerAvailable) { this.serverManagerAvailable = serverManagerAvailable; } /** * @return the portletManagementService */ - public PortletManagementService getPortletManagementService() - { + public PortletManagementService getPortletManagementService() { return portletManagementService; } @@ -155,61 +124,51 @@ * @param portletManagementService the portletManagementService to set */ public void setPortletManagementService( - PortletManagementService portletManagementService) - { + PortletManagementService portletManagementService) { this.portletManagementService = portletManagementService; } - public String initialize() - { + public String initialize() { return null; } - public String prerender() - { + public String prerender() { // load page getPortletManagementService().loadPage(this); return null; } - public boolean isStartAction() - { + public boolean isStartAction() { return isServerManagerAvailable() && getStatus() == PALAdminConstants.PORTLET_APPLICATION_STATUS_STOPPED && getApplicationType() == PALAdminConstants.PORTLET_APPLICATION_TYPE_WEBAPP; } - public boolean isStopAction() - { + public boolean isStopAction() { return isServerManagerAvailable() && getStatus() == PALAdminConstants.PORTLET_APPLICATION_STATUS_RUNNING && getApplicationType() == PALAdminConstants.PORTLET_APPLICATION_TYPE_WEBAPP; } - public boolean isUndeployAction() - { + public boolean isUndeployAction() { return isServerManagerAvailable() && getApplicationType() == PALAdminConstants.PORTLET_APPLICATION_TYPE_WEBAPP; } - public boolean isDeleteAction() - { + public boolean isDeleteAction() { return getStatus() == PALAdminConstants.PORTLET_APPLICATION_STATUS_STOPPED; } - public boolean isRunning() - { + public boolean isRunning() { return getStatus() == PALAdminConstants.PORTLET_APPLICATION_STATUS_RUNNING; } - public boolean isStopped() - { + public boolean isStopped() { return getStatus() == PALAdminConstants.PORTLET_APPLICATION_STATUS_STOPPED; } - public boolean isUnknown() - { + public boolean isUnknown() { return !isRunning() && !isStopped(); }