Author: ate
Date: Mon Feb 26 12:47:49 2007
New Revision: 512001
URL: http://svn.apache.org/viewvc?view=rev&rev=512001
Log:
m2 hot-deploy-war task deploys now to the jetspeed-2 deploy folder (for not yet
infused wars),
and a new m2 hot-deploy-infused-war task deploys directly into the tomcat
webapps directory.
The Jetspeed-2 specific j2-admin, demo and rss wars are already infused so for
those the hot-deploy-infused-war task is used.
The used bridges demo wars (jsf-demo, jpetstore) are going to be modified back
to be jetspeed-2 independent, so will need to be infused on deployment.
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=512001&r1=512000&r2=512001
==============================================================================
--- portals/jetspeed-2/trunk/app-servers/tomcat-build.xml (original)
+++ portals/jetspeed-2/trunk/app-servers/tomcat-build.xml Mon Feb 26 12:47:49
2007
@@ -205,12 +205,27 @@
type="war"/>
</dependencies>
<!-- copy only the artifact and ignore dependencies using mapper -->
- <copy todir="${org.apache.jetspeed.server.home}/webapps/">
+ <copy
todir="${org.apache.jetspeed.server.home}/webapps/jetspeed/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>
+ <target name="hot-deploy-infused-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">
+ <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>
+
<target name="hot-deploy-local-war">
<!-- hot deploy portlet or layout application -->
<dependencies filesetId="portletapp.dependencies.id"
useScope="runtime">
@@ -220,7 +235,7 @@
type="war"/>
</dependencies>
<!-- copy only the artifact and ignore dependencies using mapper -->
- <copy
todir="${org.apache.jetspeed.server.home}/webapps/jetspeed/WEB-INF/deploy/">
+ <copy
todir="${org.apache.jetspeed.server.home}/webapps/jetspeed/WEB-INF/deploy/local">
<fileset refid="portletapp.dependencies.id"/>
<mapper type="regexp"
from=".*[/\\]([^/\\]*${org.apache.jetspeed.deploy.artifactid})-${org.apache.jetspeed.deploy.version}.war"
to="\1.war"/>
</copy>
@@ -428,7 +443,7 @@
<target name="hot-deploy-full-apps"
if="org.apache.jetspeed.deploy.full.apps">
<!-- hot deploy additional set of portlet applications -->
- <antcall target="hot-deploy-war">
+ <antcall target="hot-deploy-infused-war">
<param name="org.apache.jetspeed.deploy.groupid"
value="${org.apache.jetspeed.groupid}"/>
<param name="org.apache.jetspeed.deploy.artifactid" value="demo"/>
<param name="org.apache.jetspeed.deploy.version"
value="${org.apache.jetspeed.version}"/>
@@ -443,7 +458,7 @@
<param name="org.apache.jetspeed.deploy.artifactid"
value="jsf-demo"/>
<param name="org.apache.jetspeed.deploy.version"
value="${org.apache.portals.bridges.jsf-demo.version}"/>
</antcall>
- <antcall target="hot-deploy-war">
+ <antcall target="hot-deploy-infused-war">
<param name="org.apache.jetspeed.deploy.groupid"
value="${org.apache.jetspeed.groupid}"/>
<param name="org.apache.jetspeed.deploy.artifactid" value="rss"/>
<param name="org.apache.jetspeed.deploy.version"
value="${org.apache.jetspeed.version}"/>
@@ -457,7 +472,7 @@
<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">
+ <antcall target="hot-deploy-infused-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}"/>
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=512001&r1=512000&r2=512001
==============================================================================
---
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
Mon Feb 26 12:47:49 2007
@@ -229,6 +229,21 @@
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>
+
+ <target name="hot-infused-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/">
<fileset refid="portletapp.dependencies.id"/>
<mapper type="regexp"
from=".*[/\\]([^/\\]*${org.apache.jetspeed.deploy.artifactid})-${org.apache.jetspeed.deploy.version}.war"
to="\1.war"/>
@@ -244,7 +259,7 @@
type="war"/>
</dependencies>
<!-- copy only the artifact and ignore dependencies using mapper -->
- <copy
todir="${org.apache.jetspeed.server.home}/webapps/${artifactId}/WEB-INF/deploy/">
+ <copy
todir="${org.apache.jetspeed.server.home}/webapps/${artifactId}/WEB-INF/deploy/local/">
<fileset refid="portletapp.dependencies.id"/>
<mapper type="regexp"
from=".*[/\\]([^/\\]*${org.apache.jetspeed.deploy.artifactid})-${org.apache.jetspeed.deploy.version}.war"
to="\1.war"/>
</copy>
@@ -382,7 +397,7 @@
<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">
+ <antcall target="hot-deploy-infused-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}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
