You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by rw...@apache.org on 2006/03/27 21:11:33 UTC
svn commit: r389226 [2/2] - in /portals/jetspeed-2/trunk: app-servers/
applications/demo/ applications/j2-admin/ applications/rss/rss-war/
components/capability/ components/cm/ components/deploy-tool/
components/file-cache/ components/header-resource/ ...
Modified: portals/jetspeed-2/trunk/maven-archetypes/portal-resources/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/portal-resources/pom.xml?rev=389226&r1=389225&r2=389226&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal-resources/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal-resources/pom.xml Mon Mar 27 11:11:28 2006
@@ -52,7 +52,7 @@
<phase>process-resources</phase>
<configuration>
<tasks>
- <ant target="build" antfile="build.xml" dir="${basedir}" inheritAll="off"/>
+ <ant target="build" antfile="build.xml" dir="${basedir}" inheritall="off"/>
</tasks>
</configuration>
<goals>
Modified: portals/jetspeed-2/trunk/maven-archetypes/portal/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/portal/pom.xml?rev=389226&r1=389225&r2=389226&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/pom.xml Mon Mar 27 11:11:28 2006
@@ -52,7 +52,7 @@
<phase>process-resources</phase>
<configuration>
<tasks>
- <ant target="build" antfile="build.xml" dir="${basedir}" inheritAll="off">
+ <ant target="build" antfile="build.xml" dir="${basedir}" inheritall="off">
<property name="org.apache.jetspeed.archetype.artifactid"
value="${pom.artifactId}"/>
<property name="org.apache.jetspeed.archetype.version"
Modified: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/build.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/build.xml?rev=389226&r1=389225&r2=389226&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/build.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/build.xml Mon Mar 27 11:11:28 2006
@@ -16,7 +16,7 @@
$Id:$
-->
-<project name="app-sources" default="help">
+<project name="app-servers" default="help">
<!-- Properties -->
@@ -46,7 +46,7 @@
<target name="help">
<echo message="Buildfile for the app-servers maven POM."/>
- <echo message="Usage: ant [ deploy ]"/>
+ <echo message="Usage: ant [ deploy | hot-deploy | hot-deploy-jar | hot-deploy-war ]"/>
<echo message="Where:"/>
<echo message=" deploy - deploy to the target app server."/>
<echo message=" hot-deploy - hot deploy content and applications to the target app server."/>
@@ -80,45 +80,38 @@
<target name="deploy" depends="test-deploy-target, test-deploy-skip" unless="org.apache.jetspeed.skip">
- <!-- invoke deployment targets -->
<antcall target="unsupported-deploy"/>
- <antcall target="tomcat-deploy"/>
+ <antcall target="invoke-deploy"/>
</target>
<target name="hot-deploy" depends="test-deploy-target, test-deploy-skip" unless="org.apache.jetspeed.skip">
- <!-- invoke deployment targets -->
<antcall target="unsupported-deploy"/>
- <antcall target="tomcat-hot-deploy"/>
+ <antcall target="invoke-hot-deploy"/>
</target>
<target name="hot-deploy-jar" depends="test-deploy-target, test-deploy-skip" unless="org.apache.jetspeed.skip">
- <!-- invoke deployment targets -->
<antcall target="unsupported-deploy"/>
- <antcall target="tomcat-hot-deploy-jar"/>
+ <antcall target="invoke-hot-deploy-jar"/>
</target>
<target name="hot-deploy-war" depends="test-deploy-target, test-deploy-skip" unless="org.apache.jetspeed.skip">
- <!-- invoke deployment targets -->
<antcall target="unsupported-deploy"/>
- <antcall target="tomcat-hot-deploy-war"/>
+ <antcall target="invoke-hot-deploy-war"/>
</target>
<target name="test-deploy-target">
- <condition property="org.apache.jetspeed.tomcat">
- <equals arg1="${org.apache.jetspeed.deploy.target}" arg2="tomcat"/>
- </condition>
<condition property="org.apache.jetspeed.unsupported">
<not>
<or>
<equals arg1="${org.apache.jetspeed.deploy.target}" arg2="none"/>
- <equals arg1="${org.apache.jetspeed.deploy.target}" arg2="tomcat"/>
+ <available file="${basedir}/${org.apache.jetspeed.deploy.target}-build.xml"/>
</or>
</not>
</condition>
@@ -131,265 +124,83 @@
<not>
<equals arg1="${org.apache.jetspeed.deploy.enable}" arg2="true"/>
</not>
+ <equals arg1="${org.apache.jetspeed.deploy.target}" arg2="none"/>
</or>
</condition>
</target>
- <target name="unsupported-deploy" if="org.apache.jetspeed.unsupported">
- <fail message="Unsupported deployment target: ${org.apache.jetspeed.deploy.target}."/>
+ <target name="invoke-deploy" unless="org.apache.jetspeed.unsupported">
+ <ant antfile="${basedir}/${org.apache.jetspeed.deploy.target}-build.xml" dir="${basedir}" target="deploy" inheritall="off">
+ <property name="org.apache.jetspeed.server.home"
+ value="${org.apache.jetspeed.server.home}"/>
+ <property name="org.apache.jetspeed.catalina.version.major"
+ value="${org.apache.jetspeed.catalina.version.major}"/>
+ <property name="org.apache.jetspeed.production.database.default.name"
+ value="${org.apache.jetspeed.production.database.default.name}"/>
+ <property name="org.apache.jetspeed.production.database.url"
+ value="${org.apache.jetspeed.production.database.url}"/>
+ <property name="org.apache.jetspeed.production.database.jdbc.drivers.path"
+ value="${org.apache.jetspeed.production.database.jdbc.drivers.path}"/>
+ <property name="org.apache.jetspeed.production.database.driver"
+ value="${org.apache.jetspeed.production.database.driver}"/>
+ <property name="org.apache.jetspeed.production.database.user"
+ value="${org.apache.jetspeed.production.database.user}"/>
+ <property name="org.apache.jetspeed.production.database.password"
+ value="${org.apache.jetspeed.production.database.password}"/>
+ <property name="org.apache.jetspeed.groupid"
+ value="${org.apache.jetspeed.groupid}"/>
+ <property name="org.apache.jetspeed.version"
+ value="${org.apache.jetspeed.version}"/>
+ <property name="org.apache.portals.bridges.version"
+ value="${org.apache.portals.bridges.version}"/>
+ <property name="org.apache.pluto.version"
+ value="${org.apache.pluto.version}"/>
+ <property name="portlet-api.version"
+ value="${portlet-api.version}"/>
+ <property name="org.apache.derby.version"
+ value="${org.apache.derby.version}"/>
+ <property name="hsqldb.version"
+ value="${hsqldb.version}"/>
+ </ant>
+ </target>
+
+ <target name="invoke-hot-deploy" unless="org.apache.jetspeed.unsupported">
+ <ant antfile="${basedir}/${org.apache.jetspeed.deploy.target}-build.xml" dir="${basedir}" target="hot-deploy" inheritall="off">
+ <property name="org.apache.jetspeed.server.home"
+ value="${org.apache.jetspeed.server.home}"/>
+ <property name="org.apache.jetspeed.groupid"
+ value="${org.apache.jetspeed.groupid}"/>
+ <property name="org.apache.jetspeed.version"
+ value="${org.apache.jetspeed.version}"/>
+ <property name="org.apache.portals.bridges.version"
+ value="${org.apache.portals.bridges.version}"/>
+ </ant>
+ </target>
+
+ <target name="invoke-hot-deploy-jar" unless="org.apache.jetspeed.unsupported">
+ <ant antfile="${basedir}/${org.apache.jetspeed.deploy.target}-build.xml" dir="${basedir}" target="hot-deploy-jar" inheritall="off">
+ <property name="org.apache.jetspeed.deploy.groupid"
+ value="${org.apache.jetspeed.deploy.groupid}"/>
+ <property name="org.apache.jetspeed.deploy.artifactid"
+ value="${org.apache.jetspeed.deploy.artifactid}"/>
+ <property name="org.apache.jetspeed.deploy.version"
+ value="${org.apache.jetspeed.deploy.version}"/>
+ </ant>
+ </target>
+
+ <target name="invoke-hot-deploy-war" unless="org.apache.jetspeed.unsupported">
+ <ant antfile="${basedir}/${org.apache.jetspeed.deploy.target}-build.xml" dir="${basedir}" target="hot-deploy-war" inheritall="off">
+ <property name="org.apache.jetspeed.deploy.groupid"
+ value="${org.apache.jetspeed.deploy.groupid}"/>
+ <property name="org.apache.jetspeed.deploy.artifactid"
+ value="${org.apache.jetspeed.deploy.artifactid}"/>
+ <property name="org.apache.jetspeed.deploy.version"
+ value="${org.apache.jetspeed.deploy.version}"/>
+ </ant>
</target>
- <!-- Additional Task Definitions -->
-
- <taskdef resource="org/apache/maven/artifact/ant/antlib.xml"/>
-
- <!-- Tomcat Deployment -->
-
- <target name="tomcat-deploy" depends="tomcat-5-5" if="org.apache.jetspeed.tomcat">
-
- <!-- deploy provided libraries in shared/lib -->
- <delete>
- <fileset dir="${org.apache.jetspeed.server.home}/shared/lib">
- <include name="pluto-*.jar"/>
- <include name="portals-bridges-common-*.jar"/>
- <include name="jetspeed-commons-*.jar"/>
- <include name="jetspeed-api-*.jar"/>
- <include name="portlet-api-*.jar"/>
- </fileset>
- </delete>
- <dependencies filesetId="shared.lib.dependencies.id" useScope="runtime">
- <dependency groupId="org.apache.pluto"
- artifactId="pluto"
- version="${org.apache.pluto.version}"/>
- <dependency groupId="org.apache.portals.bridges"
- artifactId="portals-bridges-common"
- version="${org.apache.portals.bridges.version}"/>
- <dependency groupId="${org.apache.jetspeed.groupid}"
- artifactId="jetspeed-commons"
- version="${org.apache.jetspeed.version}"/>
- <dependency groupId="${org.apache.jetspeed.groupid}"
- artifactId="jetspeed-api"
- version="${org.apache.jetspeed.version}"/>
- <dependency groupId="portlet-api"
- artifactId="portlet-api"
- version="${portlet-api.version}"/>
- </dependencies>
- <copy todir="${org.apache.jetspeed.server.home}/shared/lib" flatten="on">
- <fileset refid="shared.lib.dependencies.id"/>
- </copy>
-
- <!-- deploy embedded database in shared/lib -->
- <antcall target="tomcat-embedded-database"/>
-
- <!-- deploy portal application -->
- <delete dir="${org.apache.jetspeed.server.home}/webapps/${artifactId}"/>
- <delete>
- <fileset dir="${org.apache.jetspeed.server.home}/webapps">
- <include name="${artifactId}.war"/>
- </fileset>
- </delete>
- <dependencies filesetId="portal.dependency.id" useScope="runtime">
- <dependency groupId="${groupId}"
- artifactId="${artifactId}-portal"
- version="${version}"
- type="war"/>
- </dependencies>
- <copy todir="${org.apache.jetspeed.server.home}/webapps">
- <fileset refid="portal.dependency.id"/>
- <mapper type="regexp" from=".*[/\\][^/\\]*${artifactId}-portal-${version}.war" to="${artifactId}.war"/>
- </copy>
- <mkdir dir="${org.apache.jetspeed.server.home}/webapps/${artifactId}"/>
- <unjar src="${org.apache.jetspeed.server.home}/webapps/${artifactId}.war" dest="${org.apache.jetspeed.server.home}/webapps/${artifactId}"/>
-
- <!-- generate and deploy portal application context file -->
- <delete file="${org.apache.jetspeed.server.home}/conf/Catalina/localhost/${artifactId}.xml"/>
- <copy todir="${org.apache.jetspeed.server.home}/conf/Catalina/localhost">
- <fileset dir="${basedir}/../etc/conf/tomcat">
- <include name="jetspeed-tomcat-5.xml" unless="org.apache.jetspeed.tomcat.5.5"/>
- <include name="jetspeed-tomcat-5.5.xml" if="org.apache.jetspeed.tomcat.5.5"/>
- </fileset>
- <filterset begintoken="@" endtoken="@">
- <filter token="CONTEXT" value="jetspeed"/>
- <filter token="USERNAME" value="${org.apache.jetspeed.production.database.user}"/>
- <filter token="PASSWORD" value="${org.apache.jetspeed.production.database.password}"/>
- <filter token="DRIVER" value="${org.apache.jetspeed.production.database.driver}"/>
- <filter token="URL" value="${org.apache.jetspeed.production.database.url}"/>
- </filterset>
- <mapper type="merge" to="${artifactId}.xml"/>
- </copy>
-
- <!-- deploy portlet and layout applications -->
- <antcall target="tomcat-deploy-apps"/>
-
- </target>
-
- <target name="tomcat-5-5">
- <condition property="org.apache.jetspeed.tomcat.5.5">
- <equals arg1="${org.apache.jetspeed.catalina.version.major}" arg2="5.5"/>
- </condition>
- </target>
-
- <target name="tomcat-embedded-database" depends="test-embedded-database, tomcat-embedded-database-derby, tomcat-embedded-database-hsql"/>
-
- <target name="tomcat-embedded-database-derby" if="org.apache.jetspeed.production.database.is.derby.embedded">
- <!-- Deploy embedded derby database in shared/lib -->
- <delete>
- <fileset dir="${org.apache.jetspeed.server.home}/shared/lib">
- <include name="derby-*.jar"/>
- </fileset>
- </delete>
- <dependencies filesetId="derby.embedded.db.dependencies.id" useScope="runtime">
- <dependency groupId="org.apache.derby"
- artifactId="derby"
- version="${org.apache.derby.version}"/>
- </dependencies>
- <copy todir="${org.apache.jetspeed.server.home}/shared/lib" flatten="on">
- <fileset refid="derby.embedded.db.dependencies.id"/>
- </copy>
- </target>
-
- <target name="tomcat-embedded-database-hsql" if="org.apache.jetspeed.production.database.is.hsql.embedded">
- <!-- Deploy embedded hsql database in shared/lib -->
- <delete>
- <fileset dir="${org.apache.jetspeed.server.home}/shared/lib">
- <include name="hsqldb-*.jar"/>
- </fileset>
- </delete>
- <dependencies filesetId="hsql.embedded.db.dependencies.id" useScope="runtime">
- <dependency groupId="hsqldb"
- artifactId="hsqldb"
- version="${hsqldb.version}"/>
- </dependencies>
- <copy todir="${org.apache.jetspeed.server.home}/shared/lib" flatten="on">
- <fileset refid="hsql.embedded.db.dependencies.id"/>
- </copy>
- </target>
-
- <target name="tomcat-deploy-apps">
- <!-- deploy portlet and layout applications -->
- <delete dir="${org.apache.jetspeed.server.home}/webapps/j2-admin"/>
- <delete>
- <fileset dir="${org.apache.jetspeed.server.home}/webapps">
- <include name="j2-admin.war"/>
- </fileset>
- </delete>
- <delete>
- <fileset dir="${org.apache.jetspeed.server.home}/conf/Catalina/localhost">
- <include name="j2-admin.xml"/>
- </fileset>
- </delete>
- <antcall target="tomcat-hot-deploy-war">
- <param name="org.apache.jetspeed.deploy.groupid" value="${org.apache.jetspeed.groupid}"/>
- <param name="org.apache.jetspeed.deploy.artifactid" value="jetspeed-layouts"/>
- <param name="org.apache.jetspeed.deploy.version" value="${org.apache.jetspeed.version}"/>
- </antcall>
- <antcall target="tomcat-hot-deploy-war">
- <param name="org.apache.jetspeed.deploy.groupid" value="${org.apache.jetspeed.groupid}"/>
- <param name="org.apache.jetspeed.deploy.artifactid" value="j2-admin"/>
- <param name="org.apache.jetspeed.deploy.version" value="${org.apache.jetspeed.version}"/>
- </antcall>
- <antcall target="tomcat-hot-deploy-apps"/>
- </target>
-
- <target name="tomcat-hot-deploy" if="org.apache.jetspeed.tomcat">
-
- <!-- hot deploy content -->
- <copy todir="${org.apache.jetspeed.server.home}/webapps/${artifactId}">
- <fileset dir="${basedir}/../portal/src/webapp">
- <exclude name="WEB-INF/**"/>
- <exclude name="decorations/**"/>
- <exclude name="readme.txt"/>
- </fileset>
- <fileset dir="${basedir}/../etc/webapp">
- <exclude name="WEB-INF/**"/>
- <exclude name="decorations/**"/>
- <exclude name="readme.txt"/>
- </fileset>
- </copy>
-
- <!-- hot deploy templates content -->
- <copy todir="${org.apache.jetspeed.server.home}/webapps/${artifactId}/WEB-INF/templates">
- <fileset dir="${basedir}/../portal/src/webapp/WEB-INF/templates">
- <exclude name="readme.txt"/>
- </fileset>
- <fileset dir="${basedir}/../etc/templates">
- <exclude name="readme.txt"/>
- </fileset>
- </copy>
-
- <!-- hot deploy portlet and layout applications -->
- <antcall target="tomcat-hot-deploy-apps"/>
-
- <!-- hot deploy pages content -->
- <copy todir="${org.apache.jetspeed.server.home}/webapps/${artifactId}/WEB-INF/pages">
- <fileset dir="${basedir}/../portal/src/webapp/WEB-INF/pages">
- <exclude name="readme.txt"/>
- </fileset>
- <fileset dir="${basedir}/../etc/pages">
- <exclude name="readme.txt"/>
- </fileset>
- </copy>
-
- <!-- hot deploy decorations content -->
- <copy todir="${org.apache.jetspeed.server.home}/webapps/${artifactId}/decorations">
- <fileset dir="${basedir}/../portal/src/webapp/decorations">
- <exclude name="readme.txt"/>
- </fileset>
- <fileset dir="${basedir}/../etc/decorations">
- <exclude name="readme.txt"/>
- </fileset>
- </copy>
-
- </target>
-
- <target name="tomcat-hot-deploy-apps">
- <!-- hot deploy portlet and layout applications -->
- </target>
-
- <target name="tomcat-hot-deploy-jar">
- <!-- hot deploy component -->
- <dependencies filesetId="component.dependencies.id" useScope="runtime">
- <dependency groupId="${org.apache.jetspeed.deploy.groupid}"
- artifactId="${org.apache.jetspeed.deploy.artifactid}"
- version="${org.apache.jetspeed.deploy.version}"/>
- </dependencies>
- <!-- copy only the artifact and ignore dependencies using mapper -->
- <copy todir="${org.apache.jetspeed.server.home}/webapps/${artifactId}/WEB-INF/lib">
- <fileset refid="component.dependencies.id"/>
- <mapper type="regexp" from=".*[/\\]([^/\\]*${org.apache.jetspeed.deploy.artifactid})-${org.apache.jetspeed.deploy.version}.jar" to="\1.jar"/>
- </copy>
- </target>
-
- <target name="tomcat-hot-deploy-war">
- <!-- hot deploy portlet or layout application -->
- <dependencies filesetId="portletapp.dependencies.id" useScope="runtime">
- <dependency groupId="${org.apache.jetspeed.deploy.groupid}"
- artifactId="${org.apache.jetspeed.deploy.artifactid}"
- version="${org.apache.jetspeed.deploy.version}"
- type="war"/>
- </dependencies>
- <!-- copy only the artifact and ignore dependencies using mapper -->
- <copy todir="${org.apache.jetspeed.server.home}/webapps/${artifactId}/WEB-INF/deploy">
- <fileset refid="portletapp.dependencies.id"/>
- <mapper type="regexp" from=".*[/\\]([^/\\]*${org.apache.jetspeed.deploy.artifactid})-${org.apache.jetspeed.deploy.version}.war" to="\1.war"/>
- </copy>
- </target>
-
- <!-- Utility Targets -->
-
- <target name="test-embedded-database">
- <condition property="org.apache.jetspeed.production.database.is.derby.embedded">
- <and>
- <equals arg1="${org.apache.jetspeed.production.database.default.name}" arg2="derby"/>
- <equals arg1="${org.apache.jetspeed.production.database.jdbc.drivers.path}" arg2=""/>
- </and>
- </condition>
- <condition property="org.apache.jetspeed.production.database.is.hsql.embedded">
- <and>
- <equals arg1="${org.apache.jetspeed.production.database.default.name}" arg2="hsql"/>
- <equals arg1="${org.apache.jetspeed.production.database.jdbc.drivers.path}" arg2=""/>
- </and>
- </condition>
+ <target name="unsupported-deploy" if="org.apache.jetspeed.unsupported">
+ <fail message="Unsupported deployment target: ${org.apache.jetspeed.deploy.target}."/>
</target>
</project>
Modified: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/pom.xml?rev=389226&r1=389225&r2=389226&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/pom.xml Mon Mar 27 11:11:28 2006
@@ -55,7 +55,7 @@
<tasks>
<!-- normal deployment to app server -->
- <ant target="deploy" antfile="build.xml" dir="${basedir}" inheritAll="off">
+ <ant target="deploy" antfile="build.xml" dir="${basedir}" inheritall="off">
<property name="org.apache.jetspeed.deploy.skip"
value="${org.apache.jetspeed.env.hotdeploy}"/>
<property name="org.apache.jetspeed.deploy.target"
@@ -93,7 +93,7 @@
</ant>
<!-- hot deployment to app server -->
- <ant target="hot-deploy" antfile="build.xml" dir="${basedir}" inheritAll="off">
+ <ant target="hot-deploy" antfile="build.xml" dir="${basedir}" inheritall="off">
<property name="org.apache.jetspeed.deploy.enable"
value="${org.apache.jetspeed.env.hotdeploy}"/>
<property name="org.apache.jetspeed.deploy.target"
Added: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/tomcat-build.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/tomcat-build.xml?rev=389226&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/tomcat-build.xml (added)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/tomcat-build.xml Mon Mar 27 11:11:28 2006
@@ -0,0 +1,325 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2006 The Apache Software Foundation
+
+Licensed 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.
+
+ $Id:$
+-->
+<project name="app-servers-tomcat" default="help">
+
+ <!-- Properties -->
+
+ <property name="org.apache.jetspeed.server.home" value=""/>
+ <property name="org.apache.jetspeed.catalina.version.major" value=""/>
+ <property name="org.apache.jetspeed.production.database.default.name" value=""/>
+ <property name="org.apache.jetspeed.production.database.url" value=""/>
+ <property name="org.apache.jetspeed.production.database.jdbc.drivers.path" value=""/>
+ <property name="org.apache.jetspeed.production.database.driver" value=""/>
+ <property name="org.apache.jetspeed.production.database.user" value=""/>
+ <property name="org.apache.jetspeed.production.database.password" value=""/>
+ <property name="org.apache.jetspeed.groupid" value=""/>
+ <property name="org.apache.jetspeed.version" value=""/>
+ <property name="org.apache.portals.bridges.version" value=""/>
+ <property name="org.apache.pluto.version" value=""/>
+ <property name="portlet-api.version" value=""/>
+ <property name="org.apache.derby.version" value=""/>
+ <property name="hsqldb.version" value=""/>
+ <property name="org.apache.jetspeed.deploy.groupid" value=""/>
+ <property name="org.apache.jetspeed.deploy.artifactid" value=""/>
+ <property name="org.apache.jetspeed.deploy.version" value=""/>
+
+ <!-- Usage -->
+
+ <target name="help">
+ <echo message="Buildfile for the app-servers Tomcat deployment."/>
+ <echo message="Usage: ant [ deploy | hot-deploy | hot-deploy-jar | hot-deploy-war ]"/>
+ <echo message="Where:"/>
+ <echo message=" deploy - deploy to Tomcat app server."/>
+ <echo message=" hot-deploy - hot deploy content and applications Tomcat app server."/>
+ <echo message=" hot-deploy-jar - hot deploy component jar Tomcat app server."/>
+ <echo message=" hot-deploy-war - hot deploy application war Tomcat app server."/>
+ <echo message="Configuration:"/>
+ <echo message=" org.apache.jetspeed.server.home=${org.apache.jetspeed.server.home}"/>
+ <echo message=" org.apache.jetspeed.catalina.version.major=${org.apache.jetspeed.catalina.version.major}"/>
+ <echo message=" org.apache.jetspeed.production.database.default.name=${org.apache.jetspeed.production.database.default.name}"/>
+ <echo message=" org.apache.jetspeed.production.database.url=${org.apache.jetspeed.production.database.url}"/>
+ <echo message=" org.apache.jetspeed.production.database.jdbc.drivers.path=${org.apache.jetspeed.production.database.jdbc.drivers.path}"/>
+ <echo message=" org.apache.jetspeed.production.database.driver=${org.apache.jetspeed.production.database.driver}"/>
+ <echo message=" org.apache.jetspeed.production.database.user=${org.apache.jetspeed.production.database.user}"/>
+ <echo message=" org.apache.jetspeed.production.database.password=${org.apache.jetspeed.production.database.password}"/>
+ <echo message=" org.apache.jetspeed.groupid=${org.apache.jetspeed.groupid}"/>
+ <echo message=" org.apache.jetspeed.version=${org.apache.jetspeed.version}"/>
+ <echo message=" org.apache.portals.bridges.version=${org.apache.portals.bridges.version}"/>
+ <echo message=" org.apache.pluto.version=${org.apache.pluto.version}"/>
+ <echo message=" portlet-api.version=${portlet-api.version}"/>
+ <echo message=" org.apache.derby.version=${org.apache.derby.version}"/>
+ <echo message=" hsqldb.version=${hsqldb.version}"/>
+ <echo message=" org.apache.jetspeed.deploy.groupid=${org.apache.jetspeed.deploy.groupid}"/>
+ <echo message=" org.apache.jetspeed.deploy.artifactid=${org.apache.jetspeed.deploy.artifactid}"/>
+ <echo message=" org.apache.jetspeed.deploy.version=${org.apache.jetspeed.deploy.version}"/>
+ </target>
+
+ <!-- Additional Task Definitions -->
+
+ <taskdef resource="org/apache/maven/artifact/ant/antlib.xml"/>
+
+ <!-- Tomcat Deployment -->
+
+ <target name="deploy" depends="version-5-5, test-embedded-database">
+
+ <!-- deploy provided libraries in shared/lib -->
+ <delete>
+ <fileset dir="${org.apache.jetspeed.server.home}/shared/lib">
+ <include name="pluto-*.jar"/>
+ <include name="portals-bridges-common-*.jar"/>
+ <include name="jetspeed-commons-*.jar"/>
+ <include name="jetspeed-api-*.jar"/>
+ <include name="portlet-api-*.jar"/>
+ </fileset>
+ </delete>
+ <dependencies filesetId="shared.lib.dependencies.id" useScope="runtime">
+ <dependency groupId="org.apache.pluto"
+ artifactId="pluto"
+ version="${org.apache.pluto.version}"/>
+ <dependency groupId="org.apache.portals.bridges"
+ artifactId="portals-bridges-common"
+ version="${org.apache.portals.bridges.version}"/>
+ <dependency groupId="${org.apache.jetspeed.groupid}"
+ artifactId="jetspeed-commons"
+ version="${org.apache.jetspeed.version}"/>
+ <dependency groupId="${org.apache.jetspeed.groupid}"
+ artifactId="jetspeed-api"
+ version="${org.apache.jetspeed.version}"/>
+ <dependency groupId="portlet-api"
+ artifactId="portlet-api"
+ version="${portlet-api.version}"/>
+ </dependencies>
+ <copy todir="${org.apache.jetspeed.server.home}/shared/lib" flatten="on">
+ <fileset refid="shared.lib.dependencies.id"/>
+ </copy>
+
+ <!-- deploy embedded database in shared/lib -->
+ <antcall target="embedded-database-derby"/>
+ <antcall target="embedded-database-hsql"/>
+
+ <!-- deploy portal application -->
+ <delete dir="${org.apache.jetspeed.server.home}/webapps/${artifactId}"/>
+ <delete>
+ <fileset dir="${org.apache.jetspeed.server.home}/webapps">
+ <include name="${artifactId}.war"/>
+ </fileset>
+ </delete>
+ <dependencies filesetId="portal.dependency.id" useScope="runtime">
+ <dependency groupId="${groupId}"
+ artifactId="${artifactId}-portal"
+ version="${version}"
+ type="war"/>
+ </dependencies>
+ <copy todir="${org.apache.jetspeed.server.home}/webapps">
+ <fileset refid="portal.dependency.id"/>
+ <mapper type="regexp" from=".*[/\\][^/\\]*${artifactId}-portal-${version}.war" to="${artifactId}.war"/>
+ </copy>
+ <mkdir dir="${org.apache.jetspeed.server.home}/webapps/${artifactId}"/>
+ <unjar src="${org.apache.jetspeed.server.home}/webapps/${artifactId}.war" dest="${org.apache.jetspeed.server.home}/webapps/${artifactId}"/>
+
+ <!-- generate and deploy portal application context file -->
+ <delete file="${org.apache.jetspeed.server.home}/conf/Catalina/localhost/${artifactId}.xml"/>
+ <copy todir="${org.apache.jetspeed.server.home}/conf/Catalina/localhost">
+ <fileset dir="${basedir}/../etc/conf/tomcat">
+ <include name="jetspeed-tomcat-5.xml" unless="org.apache.jetspeed.tomcat.5.5"/>
+ <include name="jetspeed-tomcat-5.5.xml" if="org.apache.jetspeed.tomcat.5.5"/>
+ </fileset>
+ <filterset begintoken="@" endtoken="@">
+ <filter token="CONTEXT" value="jetspeed"/>
+ <filter token="USERNAME" value="${org.apache.jetspeed.production.database.user}"/>
+ <filter token="PASSWORD" value="${org.apache.jetspeed.production.database.password}"/>
+ <filter token="DRIVER" value="${org.apache.jetspeed.production.database.driver}"/>
+ <filter token="URL" value="${org.apache.jetspeed.production.database.url}"/>
+ </filterset>
+ <mapper type="merge" to="${artifactId}.xml"/>
+ </copy>
+
+ <!-- deploy portlet and layout applications -->
+ <antcall target="deploy-apps"/>
+
+ </target>
+
+ <target name="hot-deploy">
+
+ <!-- hot deploy content -->
+ <copy todir="${org.apache.jetspeed.server.home}/webapps/${artifactId}">
+ <fileset dir="${basedir}/../portal/src/webapp">
+ <exclude name="WEB-INF/**"/>
+ <exclude name="decorations/**"/>
+ <exclude name="readme.txt"/>
+ </fileset>
+ <fileset dir="${basedir}/../etc/webapp">
+ <exclude name="WEB-INF/**"/>
+ <exclude name="decorations/**"/>
+ <exclude name="readme.txt"/>
+ </fileset>
+ </copy>
+
+ <!-- hot deploy templates content -->
+ <copy todir="${org.apache.jetspeed.server.home}/webapps/${artifactId}/WEB-INF/templates">
+ <fileset dir="${basedir}/../portal/src/webapp/WEB-INF/templates">
+ <exclude name="readme.txt"/>
+ </fileset>
+ <fileset dir="${basedir}/../etc/templates">
+ <exclude name="readme.txt"/>
+ </fileset>
+ </copy>
+
+ <!-- hot deploy portlet and layout applications -->
+ <antcall target="hot-deploy-apps"/>
+
+ <!-- hot deploy pages content -->
+ <copy todir="${org.apache.jetspeed.server.home}/webapps/${artifactId}/WEB-INF/pages">
+ <fileset dir="${basedir}/../portal/src/webapp/WEB-INF/pages">
+ <exclude name="readme.txt"/>
+ </fileset>
+ <fileset dir="${basedir}/../etc/pages">
+ <exclude name="readme.txt"/>
+ </fileset>
+ </copy>
+
+ <!-- hot deploy decorations content -->
+ <copy todir="${org.apache.jetspeed.server.home}/webapps/${artifactId}/decorations">
+ <fileset dir="${basedir}/../portal/src/webapp/decorations">
+ <exclude name="readme.txt"/>
+ </fileset>
+ <fileset dir="${basedir}/../etc/decorations">
+ <exclude name="readme.txt"/>
+ </fileset>
+ </copy>
+
+ </target>
+
+ <target name="hot-deploy-jar">
+ <!-- hot deploy component -->
+ <dependencies filesetId="component.dependencies.id" useScope="runtime">
+ <dependency groupId="${org.apache.jetspeed.deploy.groupid}"
+ artifactId="${org.apache.jetspeed.deploy.artifactid}"
+ version="${org.apache.jetspeed.deploy.version}"/>
+ </dependencies>
+ <!-- copy only the artifact and ignore dependencies using mapper -->
+ <copy todir="${org.apache.jetspeed.server.home}/webapps/${artifactId}/WEB-INF/lib">
+ <fileset refid="component.dependencies.id"/>
+ <mapper type="regexp" from=".*[/\\]([^/\\]*${org.apache.jetspeed.deploy.artifactid})-${org.apache.jetspeed.deploy.version}.jar" to="\1.jar"/>
+ </copy>
+ </target>
+
+ <target name="hot-deploy-war">
+ <!-- hot deploy portlet or layout application -->
+ <dependencies filesetId="portletapp.dependencies.id" useScope="runtime">
+ <dependency groupId="${org.apache.jetspeed.deploy.groupid}"
+ artifactId="${org.apache.jetspeed.deploy.artifactid}"
+ version="${org.apache.jetspeed.deploy.version}"
+ type="war"/>
+ </dependencies>
+ <!-- copy only the artifact and ignore dependencies using mapper -->
+ <copy todir="${org.apache.jetspeed.server.home}/webapps/${artifactId}/WEB-INF/deploy">
+ <fileset refid="portletapp.dependencies.id"/>
+ <mapper type="regexp" from=".*[/\\]([^/\\]*${org.apache.jetspeed.deploy.artifactid})-${org.apache.jetspeed.deploy.version}.war" to="\1.war"/>
+ </copy>
+ </target>
+
+ <!-- Tomcat Deployment Utilities -->
+
+ <target name="version-5-5">
+ <condition property="org.apache.jetspeed.tomcat.5.5">
+ <equals arg1="${org.apache.jetspeed.catalina.version.major}" arg2="5.5"/>
+ </condition>
+ </target>
+
+ <target name="test-embedded-database">
+ <condition property="org.apache.jetspeed.production.database.is.derby.embedded">
+ <and>
+ <equals arg1="${org.apache.jetspeed.production.database.default.name}" arg2="derby"/>
+ <equals arg1="${org.apache.jetspeed.production.database.jdbc.drivers.path}" arg2=""/>
+ </and>
+ </condition>
+ <condition property="org.apache.jetspeed.production.database.is.hsql.embedded">
+ <and>
+ <equals arg1="${org.apache.jetspeed.production.database.default.name}" arg2="hsql"/>
+ <equals arg1="${org.apache.jetspeed.production.database.jdbc.drivers.path}" arg2=""/>
+ </and>
+ </condition>
+ </target>
+
+ <target name="embedded-database-derby" if="org.apache.jetspeed.production.database.is.derby.embedded">
+ <!-- Deploy embedded derby database in shared/lib -->
+ <delete>
+ <fileset dir="${org.apache.jetspeed.server.home}/shared/lib">
+ <include name="derby-*.jar"/>
+ </fileset>
+ </delete>
+ <dependencies filesetId="derby.embedded.db.dependencies.id" useScope="runtime">
+ <dependency groupId="org.apache.derby"
+ artifactId="derby"
+ version="${org.apache.derby.version}"/>
+ </dependencies>
+ <copy todir="${org.apache.jetspeed.server.home}/shared/lib" flatten="on">
+ <fileset refid="derby.embedded.db.dependencies.id"/>
+ </copy>
+ </target>
+
+ <target name="embedded-database-hsql" if="org.apache.jetspeed.production.database.is.hsql.embedded">
+ <!-- Deploy embedded hsql database in shared/lib -->
+ <delete>
+ <fileset dir="${org.apache.jetspeed.server.home}/shared/lib">
+ <include name="hsqldb-*.jar"/>
+ </fileset>
+ </delete>
+ <dependencies filesetId="hsql.embedded.db.dependencies.id" useScope="runtime">
+ <dependency groupId="hsqldb"
+ artifactId="hsqldb"
+ version="${hsqldb.version}"/>
+ </dependencies>
+ <copy todir="${org.apache.jetspeed.server.home}/shared/lib" flatten="on">
+ <fileset refid="hsql.embedded.db.dependencies.id"/>
+ </copy>
+ </target>
+
+ <target name="deploy-apps">
+ <!-- deploy portlet and layout applications -->
+ <delete dir="${org.apache.jetspeed.server.home}/webapps/j2-admin"/>
+ <delete>
+ <fileset dir="${org.apache.jetspeed.server.home}/webapps">
+ <include name="j2-admin.war"/>
+ </fileset>
+ </delete>
+ <delete>
+ <fileset dir="${org.apache.jetspeed.server.home}/conf/Catalina/localhost">
+ <include name="j2-admin.xml"/>
+ </fileset>
+ </delete>
+ <antcall target="hot-deploy-apps"/>
+ </target>
+
+ <target name="hot-deploy-apps">
+ <!-- hot deploy portlet and layout applications -->
+ <antcall target="hot-deploy-war">
+ <param name="org.apache.jetspeed.deploy.groupid" value="${org.apache.jetspeed.groupid}"/>
+ <param name="org.apache.jetspeed.deploy.artifactid" value="jetspeed-layouts"/>
+ <param name="org.apache.jetspeed.deploy.version" value="${org.apache.jetspeed.version}"/>
+ </antcall>
+ <antcall target="hot-deploy-war">
+ <param name="org.apache.jetspeed.deploy.groupid" value="${org.apache.jetspeed.groupid}"/>
+ <param name="org.apache.jetspeed.deploy.artifactid" value="j2-admin"/>
+ <param name="org.apache.jetspeed.deploy.version" value="${org.apache.jetspeed.version}"/>
+ </antcall>
+ </target>
+
+</project>
Propchange: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/tomcat-build.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/pom.xml?rev=389226&r1=389225&r2=389226&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/pom.xml Mon Mar 27 11:11:28 2006
@@ -81,7 +81,7 @@
<phase>compile</phase>
<configuration>
<tasks>
- <ant target="schema" antfile="build.xml" dir="${basedir}" inheritAll="off">
+ <ant target="schema" antfile="build.xml" dir="${basedir}" inheritall="off">
<property name="org.apache.jetspeed.database.default.name"
value="${org.apache.jetspeed.test.database.default.name}"/>
</ant>
Modified: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/pom.xml?rev=389226&r1=389225&r2=389226&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/portal/pom.xml Mon Mar 27 11:11:28 2006
@@ -69,7 +69,7 @@
<phase>process-resources</phase>
<configuration>
<tasks>
- <ant target="configure" antfile="build.xml" dir="${basedir}" inheritAll="off">
+ <ant target="configure" antfile="build.xml" dir="${basedir}" inheritall="off">
<property name="org.apache.jetspeed.catalina.version.major"
value="${org.apache.jetspeed.catalina.version.major}"/>
<property name="org.apache.jetspeed.services.autodeployment.server"
Modified: portals/jetspeed-2/trunk/portal/pom.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portal/pom.xml?rev=389226&r1=389225&r2=389226&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portal/pom.xml (original)
+++ portals/jetspeed-2/trunk/portal/pom.xml Mon Mar 27 11:11:28 2006
@@ -69,7 +69,7 @@
<phase>process-resources</phase>
<configuration>
<tasks>
- <ant target="configure" antfile="build.xml" dir="${basedir}" inheritAll="off">
+ <ant target="configure" antfile="build.xml" dir="${basedir}" inheritall="off">
<property name="org.apache.jetspeed.deploy.type"
value="${org.apache.jetspeed.env.deploy.type}"/>
<property name="org.apache.jetspeed.catalina.version.major"
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org