svnno****@sourc*****
svnno****@sourc*****
2007年 7月 16日 (月) 15:23:47 JST
Revision: 267
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=267
Author: shinsuke
Date: 2007-07-16 15:23:46 +0900 (Mon, 16 Jul 2007)
Log Message:
-----------
replaced tomahawk with jsf4portlet. cleanup dependencies.
Modified Paths:
--------------
pal-admin/trunk/.classpath
pal-admin/trunk/pom.xml
pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PortletDeploymentService.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/DeployerEditPage.java
pal-admin/trunk/src/main/webapp/WEB-INF/portlet.xml
pal-admin/trunk/src/main/webapp/view/deployer/deployerEdit.html
-------------- next part --------------
Modified: pal-admin/trunk/.classpath
===================================================================
--- pal-admin/trunk/.classpath 2007-07-15 23:30:37 UTC (rev 266)
+++ pal-admin/trunk/.classpath 2007-07-16 06:23:46 UTC (rev 267)
@@ -9,43 +9,30 @@
<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/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/jp/sf/pal/jsf4portlet/0.1-SNAPSHOT/jsf4portlet-0.1-SNAPSHOT.jar"/>
<classpathentry kind="var" path="M2_REPO/portlet-api/portlet-api/1.0/portlet-api-1.0.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/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/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/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/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/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/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/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/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/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/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/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-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/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-15 23:30:37 UTC (rev 266)
+++ pal-admin/trunk/pom.xml 2007-07-16 06:23:46 UTC (rev 267)
@@ -158,12 +158,6 @@
<artifactId>teeda-extension</artifactId>
<version>1.0.8-RC1</version>
<type>jar</type>
- <exclusions>
- <exclusion>
- <groupId>rhino</groupId>
- <artifactId>rhino</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.seasar.teeda</groupId>
@@ -184,6 +178,20 @@
<groupId>org.apache.portals.bridges</groupId>
<artifactId>portals-bridges-portletfilter</artifactId>
<version>1.0.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>jp.sf.pal</groupId>
@@ -203,21 +211,10 @@
</dependency>
<dependency>
<groupId>jp.sf.pal</groupId>
- <artifactId>tomahawk-bridge</artifactId>
- <version>0.9.1</version>
+ <artifactId>jsf4portlet</artifactId>
+ <version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.tomahawk</groupId>
- <artifactId>tomahawk</artifactId>
- <version>1.1.5</version>
- <exclusions>
- <exclusion>
- <groupId>struts</groupId>
- <artifactId>struts</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.1.1</version>
@@ -281,6 +278,12 @@
<groupId>org.seasar.container</groupId>
<artifactId>s2-tiger</artifactId>
<version>2.4.15</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PortletDeploymentService.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PortletDeploymentService.java 2007-07-15 23:30:37 UTC (rev 266)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PortletDeploymentService.java 2007-07-16 06:23:46 UTC (rev 267)
@@ -40,7 +40,7 @@
import jp.sf.pal.admin.web.deployer.RemotePortletDeployConfirmPage;
import jp.sf.pal.admin.web.deployer.RemotePortletListPage;
-import org.apache.myfaces.custom.fileupload.UploadedFile;
+import jp.sf.pal.jsf.custom.fileupload.UploadedFile;
public class PortletDeploymentService implements Serializable
{
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/DeployerEditPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/DeployerEditPage.java 2007-07-15 23:30:37 UTC (rev 266)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/DeployerEditPage.java 2007-07-16 06:23:46 UTC (rev 267)
@@ -24,7 +24,7 @@
import jp.sf.pal.admin.service.PortletDeploymentService;
import jp.sf.pal.admin.web.AbstractCrudPage;
-import org.apache.myfaces.custom.fileupload.UploadedFile;
+import jp.sf.pal.jsf.custom.fileupload.UploadedFile;
public class DeployerEditPage extends AbstractCrudPage implements Serializable {
/**
Modified: pal-admin/trunk/src/main/webapp/WEB-INF/portlet.xml
===================================================================
--- pal-admin/trunk/src/main/webapp/WEB-INF/portlet.xml 2007-07-15 23:30:37 UTC (rev 266)
+++ pal-admin/trunk/src/main/webapp/WEB-INF/portlet.xml 2007-07-16 06:23:46 UTC (rev 267)
@@ -65,7 +65,7 @@
</init-param>
<init-param>
<name>portlet-filters</name>
- <value>jp.sf.pal.admin.filter.PortletManagementFilter,jp.sf.pal.facesresponse.FacesResponseFilter,jp.sf.pal.pooptimizer.OptimizerFilter,org.seasar.portlet.filter.S2PortletFilter,org.seasar.portlet.filter.HotdeployPortletFilter,jp.sf.pal.tomahawk.filter.ExtensionsPortletFilter</value>
+ <value>jp.sf.pal.admin.filter.PortletManagementFilter,jp.sf.pal.facesresponse.FacesResponseFilter,jp.sf.pal.pooptimizer.OptimizerFilter,org.seasar.portlet.filter.S2PortletFilter,org.seasar.portlet.filter.HotdeployPortletFilter,jp.sf.pal.jsf.filter.ExtensionsPortletFilter</value>
</init-param>
<init-param>
<name>view-page</name>
Modified: pal-admin/trunk/src/main/webapp/view/deployer/deployerEdit.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/deployer/deployerEdit.html 2007-07-15 23:30:37 UTC (rev 266)
+++ pal-admin/trunk/src/main/webapp/view/deployer/deployerEdit.html 2007-07-16 06:23:46 UTC (rev 267)
@@ -1,6 +1,6 @@
<?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:t="http://myfaces.apache.org/tomahawk">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:pal="http://pal.sourceforge.jp/jsf4portlet">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<link rel="stylesheet" type="text/css" href="../../css/global.css"/>
@@ -38,7 +38,7 @@
<tr>
<td class="portlet-section-subheader"><label id="portletApplicationFileLabel">Portlet Application File</label></td>
<td class="portlet-section-body">
- <t:inputFileUpload id="portletApplicationFile" value="#{deployer_deployerEditPage.portletApplicationFile}"></t:inputFileUpload>
+ <pal:inputFileUpload id="portletApplicationFile" value="#{deployer_deployerEditPage.portletApplicationFile}"></pal:inputFileUpload>
</td>
<td><span id="portletApplicationFileMessage"></span></td>
</tr>