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 ta...@apache.org on 2006/10/27 01:54:11 UTC
svn commit: r468196 - in /portals/jetspeed-2/trunk:
app-servers/tomcat-build.xml
maven-archetypes/portal/src/archetype/archetype-resources/app-servers/tomcat-build.xml
Author: taylor
Date: Thu Oct 26 16:54:10 2006
New Revision: 468196
URL: http://svn.apache.org/viewvc?view=rev&rev=468196
Log:
special case for deploying local portlet apps such as layouts
Modified:
portals/jetspeed-2/trunk/app-servers/tomcat-build.xml
portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/tomcat-build.xml
Modified: portals/jetspeed-2/trunk/app-servers/tomcat-build.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/app-servers/tomcat-build.xml?view=diff&rev=468196&r1=468195&r2=468196
==============================================================================
--- portals/jetspeed-2/trunk/app-servers/tomcat-build.xml (original)
+++ portals/jetspeed-2/trunk/app-servers/tomcat-build.xml Thu Oct 26 16:54:10 2006
@@ -49,13 +49,14 @@
<target name="help">
<echo message="Buildfile for the app-servers Tomcat deployment."/>
- <echo message="Usage: ant [ deploy | hot-deploy | hot-deploy-shared-jar | hot-deploy-jar | hot-deploy-war ]"/>
+ <echo message="Usage: ant [ deploy | hot-deploy | hot-deploy-shared-jar | hot-deploy-jar | hot-deploy-war | hot-deploy-local-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-shared-jar - hot deploy shared component jar 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=" hot-deploy-local-war - hot deploy local application war Tomcat app server."/>
<echo message="Configuration:"/>
<echo message=" org.apache.jetspeed.deploy.type=${org.apache.jetspeed.deploy.type}"/>
<echo message=" org.apache.jetspeed.database.psml=${org.apache.jetspeed.database.psml}"/>
@@ -214,6 +215,21 @@
</copy>
</target>
+ <target name="hot-deploy-local-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">
@@ -454,7 +470,7 @@
<target name="hot-deploy-min-apps" if="org.apache.jetspeed.deploy.min.apps">
<!-- hot deploy minimal set of portlet and layout applications -->
- <antcall target="hot-deploy-war">
+ <antcall target="hot-deploy-local-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}"/>
Modified: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/tomcat-build.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/tomcat-build.xml?view=diff&rev=468196&r1=468195&r2=468196
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/tomcat-build.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/app-servers/tomcat-build.xml Thu Oct 26 16:54:10 2006
@@ -45,13 +45,14 @@
<target name="help">
<echo message="Buildfile for the app-servers Tomcat deployment."/>
- <echo message="Usage: ant [ deploy | hot-deploy | hot-deploy-shared-jar | hot-deploy-jar | hot-deploy-war ]"/>
+ <echo message="Usage: ant [ deploy | hot-deploy | hot-deploy-shared-jar | hot-deploy-jar | hot-deploy-war | hot-deploy-local-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-shared-jar - hot deploy shared component jar 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=" hot-deploy-local-war - hot deploy local 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}"/>
@@ -234,6 +235,21 @@
</copy>
</target>
+ <target name="hot-deploy-local-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">
@@ -361,7 +377,7 @@
<target name="hot-deploy-apps">
<!-- hot deploy portlet and layout applications -->
- <antcall target="hot-deploy-war">
+ <antcall target="hot-deploy-local-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}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org