svnno****@sourc*****
svnno****@sourc*****
2007年 11月 30日 (金) 07:18:36 JST
Revision: 734
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=734
Author: shinsuke
Date: 2007-11-30 07:18:35 +0900 (Fri, 30 Nov 2007)
Log Message:
-----------
updated j2 revision. updated installer.
Modified Paths:
--------------
pal-portal/trunk/build.properties
pal-portal/trunk/build.xml
pal-portal/trunk/portal/build.xml
pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/pipelines.xml
-------------- next part --------------
Modified: pal-portal/trunk/build.properties
===================================================================
--- pal-portal/trunk/build.properties 2007-11-29 22:16:59 UTC (rev 733)
+++ pal-portal/trunk/build.properties 2007-11-29 22:18:35 UTC (rev 734)
@@ -4,7 +4,7 @@
container.name=PAL Portal
container.separator=/
container.version.major=1
-container.version.minor=0.1
+container.version.minor=0.2-dev
container.info.file=commons/src/java/org/apache/jetspeed/container/resources/ContainerInfo.properties
portlets.home=${basedir}/portlets
portlets.build.dir=${portlets.home}/build
@@ -27,20 +27,11 @@
installer.portlets.dir=${installer.target.dir}/portlets
dist.name.prefix=PALPortal
dist.version=${portal.version}
-dist.dir=${basedir}/dist
-dist.build.dir=${dist.dir}/build
-dist.temp.dir=${dist.dir}/temp
-dist.database.dir=${dist.dir}/database
-dist.selfextract.dir=${dist.dir}/selfextract
-dist.portal.dir=${dist.dir}/portalserver
-dist.installpack.file=${dist.build.dir}/installpack.zip
+#dist.tomcat.version=5.5.25
dist.tomcat.version=5.5.23
-dist.tomcat.base.file=${dist.build.dir}/apache-tomcat-${dist.tomcat.version}.zip
-dist.tomcat.compat.file=${dist.build.dir}/apache-tomcat-${dist.tomcat.version}-compat.zip
-dist.tomcat.base.dir=${dist.build.dir}/apache-tomcat
-dist.tomcat.compat.dir=${dist.build.dir}/apache-tomcat-compat
-dist.tomcat.base.url=http://www.ibiblio.org/pub/mirrors/apache/tomcat/tomcat-5/v${dist.tomcat.version}/bin/apache-tomcat-${dist.tomcat.version}.zip
-dist.tomcat.compat.url=http://www.ibiblio.org/pub/mirrors/apache/tomcat/tomcat-5/v${dist.tomcat.version}/bin/apache-tomcat-${dist.tomcat.version}-compat.zip
+dist.tomcat.base.file=${installer.target.dir}/apache-tomcat-${dist.tomcat.version}.zip
+#dist.tomcat.base.url=http://ftp.riken.jp/net/apache/tomcat/tomcat-5/v${dist.tomcat.version}/bin/apache-tomcat-${dist.tomcat.version}.zip
+dist.tomcat.base.url=http://archive.apache.org/dist/tomcat/tomcat-5/v5.5.23/bin/apache-tomcat-5.5.23.zip
dist.server.home=${dist.portal.dir}
dist.server.shared=${dist.server.home}/shared/lib
dist.server.war.dir=${dist.server.home}/webapps/
@@ -67,7 +58,7 @@
# Jetspeed SVN revision
#jetspeed2.svn.repository=http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/
jetspeed2.svn.repository=http://svn.apache.org/repos/asf/portals/jetspeed-2/branches/JETSPEED-2.1.3/
-jetspeed2.revision=593340
+jetspeed2.revision=598994
# Dependencies for Jetspeed
jetspeed.version=2.1.3-dev_pal-${portal.version}
@@ -156,11 +147,16 @@
-Dorg.apache.jetspeed.portal.artifactId="${org.apache.jetspeed.portal.artifactId}" \
-Dorg.apache.jetspeed.portal.name="${org.apache.jetspeed.portal.name}" \
-Dorg.apache.jetspeed.portal.currentVersion="${org.apache.jetspeed.portal.currentVersion}" \
--Ddist.name.prefix="${dist.name.prefix}" \
--Ddist.version="${dist.version}" \
-Djetspeed.version="${jetspeed.version}" \
-Dportal.psml.dir="${portal.psml.dir}" \
-Dportal.psml.name="${portal.psml.name}" \
+-Ddist.name.prefix="${dist.name.prefix}" \
+-Ddist.version="${dist.version}" \
+-Ddist.tomcat.base.url=${dist.tomcat.base.url} \
+-Ddist.tomcat.base.file=${dist.tomcat.base.file} \
+-Ddist.tomcat.version=${dist.tomcat.version} \
+-Dinstaller.target.dir=${installer.target.dir} \
+-Dcontainer.name="${container.name}" \
portal.patch.files=\
components/capability/src/java/org/apache/jetspeed/capabilities/impl/JetspeedCapabilities.java,\
@@ -180,7 +176,6 @@
layout-portlets/src/webapp/WEB-INF/portlet.xml,\
layout-portlets/src/webapp/WEB-INF/jetspeed-portlet.xml,\
src/webapp/WEB-INF/assembly/jetspeed-services.xml,\
-src/webapp/WEB-INF/assembly/portal-url-generation.xml,\
src/webapp/WEB-INF/assembly/pipelines.xml,\
src/webapp/WEB-INF/conf/Log4j.properties,\
src/webapp/WEB-INF/jetspeed_macros.vm,\
@@ -220,30 +215,6 @@
jp/sf/pal/pal-admin,\
jp/sf/pal/pal-wcm,\
-# Portlet List
-jp/sf/pal/cms-portlets,\
-jp/sf/pal/jstock,\
-jp/sf/pal/webparts,\
-jp/sf/pal/blog,\
-jp/sf/pal/addresslist,\
-jp/sf/pal/vfs-portlets,\
-jp/sf/pal/todolist,\
-jp/sf/pal/searchselector,\
-jp/sf/pal/weather,\
-jp/sf/pal/notepad,\
-jp/sf/pal/jmap,\
-jp/sf/pal/helloworld,\
-jp/sf/pal/jsfhelloworld,\
-jp/sf/pal/teeda-ajax-portlet,\
-jp/sf/pal/charttest,\
-jp/sf/pal/s2helloworld,\
-jp/sf/pal/googlegadgets,\
-jp/sf/pal/blogparts,\
-com/sun/portal/bookmarkportlet,\
-com/sun/portal/rssportlet,\
-com/sun/portal/showtimeportlet,\
-com/sun/portal/notepadportlet,\
-
# Custom Files and Patches
additional.portal.delete.files=
additional.portal.delete.directories=
Modified: pal-portal/trunk/build.xml
===================================================================
--- pal-portal/trunk/build.xml 2007-11-29 22:16:59 UTC (rev 733)
+++ pal-portal/trunk/build.xml 2007-11-29 22:18:35 UTC (rev 734)
@@ -223,18 +223,6 @@
<antcall target="create.binary.distribution"/>
</target>
- <target name="binary.distribution.without.tomcat" depends="display.logo"
- description="--> Create Binary Distribution">
- <property name="build.dist" value="true" />
- <antcall target="remove"/>
- <antcall target="checkout"/>
- <antcall target="update"/>
- <antcall target="clean.installer"/>
- <antcall target="clean"/>
- <antcall target="build"/>
- <antcall target="create.binary.distribution.without.tomcat"/>
- </target>
-
<target name="clean.installer" depends="display.logo"
description="--> Clean Portal and Portlets Distribution">
<ant antfile="${installer.dir}/build.xml" target="clean.installer" />
@@ -248,14 +236,6 @@
<ant antfile="${installer.dir}/build.xml" target="build.installer" />
</target>
- <target name="create.binary.distribution.without.tomcat" depends="display.logo"
- description="--> Create Portal and Portlets Distribution">
- <property name="build.dist" value="true" />
- <mkdir dir="${installer.portlets.dir}"/>
- <antcall target="deploy.portlets.for.dist"/>
- <ant antfile="${installer.dir}/build.xml" target="build.installer.without.tomcat" />
- </target>
-
<target name="deploy.portal.for.dist"
description="--> Create Portal Distribution">
<ant antfile="${portal.home}/build.xml"
@@ -270,41 +250,6 @@
/>
</target>
- <target name="binary.upgrade.distribution" depends="display.logo"
- description="--> Create Binary Upgrade Distribution">
- <property name="build.dist" value="true" />
- <antcall target="remove"/>
- <antcall target="checkout"/>
- <antcall target="update"/>
- <antcall target="clean.upgrade"/>
- <antcall target="clean"/>
- <antcall target="build"/>
- <antcall target="create.binary.upgrade.distribution"/>
- </target>
-
- <target name="create.binary.upgrade.distribution" depends="display.logo"
- description="--> Create Portal and Portlets Upgrade Distribution">
- <property name="build.dist" value="true" />
- <antcall target="deploy.portal.for.upgrade"/>
- <copy file="${upgrade.dir}/build-upgrade.xml"
- tofile="${upgrade.build.dir}/distribution/${org.apache.jetspeed.portal.artifactId}-upgrade-${portal.version}/build.xml"/>
- <zip destfile="${upgrade.build.dir}/${org.apache.jetspeed.portal.artifactId}-upgrade-${portal.version}.zip"
- basedir="${upgrade.build.dir}/distribution"
- />
- </target>
-
- <target name="deploy.portal.for.upgrade"
- description="--> Create Portal Upgrade Distribution">
- <ant antfile="${portal.home}/build.xml"
- target="deploy.for.upgrade"
- />
- </target>
-
- <target name="clean.upgrade" depends="display.logo"
- description="--> Clean Portal and Portlets Upgrade Distribution">
- <delete dir="${upgrade.build.dir}"/>
- </target>
-
<!-- =================================================================== -->
<!-- ALL BUILD -->
<!-- =================================================================== -->
Modified: pal-portal/trunk/portal/build.xml
===================================================================
--- pal-portal/trunk/portal/build.xml 2007-11-29 22:16:59 UTC (rev 733)
+++ pal-portal/trunk/portal/build.xml 2007-11-29 22:18:35 UTC (rev 734)
@@ -309,26 +309,5 @@
</target>
- <target name="deploy.for.upgrade" depends="setup.shell"
- description="--> Deploy Portal For Upgrade Distribution">
- <!-- j2:portal.genapp -->
- <exec
- executable="${shell.cmd}"
- failonerror="true"
- dir="${portal.dir}"
- >
- <arg line="${shell.options} 'maven ${jetspeed2.build.options} ${jetspeed2.deploy.base.options} ${jetspeed2.upgrade.deploy.options} j2:portal.genapp'"/>
- </exec>
- <!-- war:install j2:minStart -->
- <exec
- executable="${shell.cmd}"
- failonerror="true"
- dir="${org.apache.jetspeed.portal.home}"
- >
- <arg line="${shell.options} 'maven ${jetspeed2.build.options} ${jetspeed2.deploy.base.options} ${jetspeed2.upgrade.deploy.options} war:install j2:minStart'"/>
- </exec>
-
- </target>
-
</project>
Modified: pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/pipelines.xml
===================================================================
--- pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/pipelines.xml 2007-11-29 22:16:59 UTC (rev 733)
+++ pal-portal/trunk/portal/patches/src/webapp/WEB-INF/assembly/pipelines.xml 2007-11-29 22:18:35 UTC (rev 734)
@@ -1,8 +1,8 @@
Index: src/webapp/WEB-INF/assembly/pipelines.xml
===================================================================
---- src/webapp/WEB-INF/assembly/pipelines.xml (リビジョン 593340)
+--- src/webapp/WEB-INF/assembly/pipelines.xml (リビジョン 598994)
+++ src/webapp/WEB-INF/assembly/pipelines.xml (作業コピー)
-@@ -421,6 +421,7 @@
+@@ -444,6 +444,7 @@
<list>
<ref bean="capabilityValve"/>
<ref bean="localizationValve"/>