weaver 2004/09/29 09:07:22
Modified: maven-plugin plugin.jelly plugin.properties
Log:
- Added filterset for deployment server and port
- Added a switch to turn off expanding the jetspeed.war on deployment.
Revision Changes Path
1.19 +22 -2 jakarta-jetspeed-2/maven-plugin/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/maven-plugin/plugin.jelly,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- plugin.jelly 27 Sep 2004 18:31:02 -0000 1.18
+++ plugin.jelly 29 Sep 2004 16:07:22 -0000 1.19
@@ -106,7 +106,7 @@
<goal name="jetspeed2:build.portal">
- <copy todir="${basedir}/etc/project-dependencies" overwrite="true"
failonerror="true">
+ <copy todir="${basedir}/etc/project-dependencies" overwrite="true"
failonerror="true">
<fileset
dir="${org.apache.jetspeed.plugin.root}/plugin-resources/etc/project-dependencies" />
</copy>
<copy todir="${basedir}/etc/project-resources" overwrite="true"
failonerror="true">
@@ -160,6 +160,8 @@
<copy
file="${org.apache.jetspeed.plugin.root}/plugin-resources/webapp/WEB-INF/conf/jetspeed.properties"
tofile="${maven.war.webapp.dir}/WEB-INF/conf/jetspeed.properties" overwrite="true">
<filterset begintoken="@" endtoken="@">
+ <filter token="AUTODEPLOYMENT_SERVER"
value="${org.apache.jetspeed.services.autodeployment.server}"/>
+ <filter token="AUTODEPLOYMENT_PORT"
value="${org.apache.jetspeed.services.autodeployment.port}"/>
<filter token="AUTODEPLOYMENT_USER"
value="${org.apache.jetspeed.services.autodeployment.user}"/>
<filter token="AUTODEPLOYMENT_PASSWORD"
value="${org.apache.jetspeed.services.autodeployment.password}"/>
</filterset>
@@ -226,6 +228,22 @@
<copy
file="${maven.repo.local}/portals-bridges/jars/portals-bridges-struts-0.1.jar"
todir="${org.apache.jetspeed.server.shared}"/>
</goal>
+ <!-- This currently DOES NOT WORK, even after getting SCP to work in ant 1.6.2 -->
+ <goal name='jetspeed2:deploy.shared.scp'>
+ <echo>Copying from ${maven.repo.local} to ${org.apache.jetspeed.server.shared}
using SCP...</echo>
+
+ <j:set var="portal_project_desc_path"
value="${org.apache.jetspeed.plugin.root}/plugin-resources/portal_project.xml" />
+
+ <maven:pom projectDescriptor="${portal_project_desc_path}"
var="portal_project" />
+ <echo>Pluto: [EMAIL PROTECTED]</echo>
+ <scp file="${portal_project.getDependencyPath('pluto')}" todir="[EMAIL
PROTECTED]" failonerror="true" verbose="true"
keyfile="${org.apache.jetspeed.key.file}"
passphrase="${org.apache.jetspeed.key.passphrase}"/>
+ <ant:scp
file="${portal_project.getDependencyPath('jetspeed2:jetspeed-commons')}" todir="[EMAIL
PROTECTED]" failonerror="true" keyfile="${org.apache.jetspeed.key.file}"
passphrase="${org.apache.jetspeed.key.passphrase}"/>
+ <ant:scp file="${portal_project.getDependencyPath('portlet-api')}"
todir="[EMAIL PROTECTED]" failonerror="true"
keyfile="${org.apache.jetspeed.key.file}"
passphrase="${org.apache.jetspeed.key.passphrase}"/>
+ <ant:scp file="${portal_project.getDependencyPath('jetspeed2:jetspeed-api')}"
todir="[EMAIL PROTECTED]" failonerror="true"
keyfile="${org.apache.jetspeed.key.file}"
passphrase="${org.apache.jetspeed.key.passphrase}"/>
+ <ant:scp
file="${maven.repo.local}/portals-bridges/jars/portals-bridges-common-0.1.jar"
todir="[EMAIL PROTECTED]" failonerror="true"
keyfile="${org.apache.jetspeed.key.file}"
passphrase="${org.apache.jetspeed.key.passphrase}"/>
+ <ant:scp
file="${maven.repo.local}/portals-bridges/jars/portals-bridges-struts-0.1.jar"
todir="[EMAIL PROTECTED]" failonerror="true"
keyfile="${org.apache.jetspeed.key.file}"
passphrase="${org.apache.jetspeed.key.passphrase}"/>
+ </goal>
+
<goal name="jetspeed2:deploy.portal">
<attainGoal name='jetspeed2:deploy.shared'/>
@@ -239,7 +257,9 @@
<attainGoal name='jetspeed2:copy.context'/>
<delete dir="${org.apache.jetspeed.deploy.war.dir}/${maven.war.web.app.name}"/>
- <unwar src="${org.apache.jetspeed.deploy.war.dir}/${maven.war.final.name}"
dest="${org.apache.jetspeed.deploy.war.dir}/${maven.war.web.app.name}"/>
+ <j:if test="${org.apache.jetspeed.explode.war}">
+ <unwar src="${org.apache.jetspeed.deploy.war.dir}/${maven.war.final.name}"
dest="${org.apache.jetspeed.deploy.war.dir}/${maven.war.web.app.name}"/>
+ </j:if>
<j:set var="catalina_version_major"
value="${org.apache.jetspeed.catalina.version.major}"/>
<echo>Build jetspeed.xml for Tomcat version ${catalina_version_major}</echo>
1.7 +9 -0 jakarta-jetspeed-2/maven-plugin/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/maven-plugin/plugin.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- plugin.properties 25 Aug 2004 00:52:40 -0000 1.6
+++ plugin.properties 29 Sep 2004 16:07:22 -0000 1.7
@@ -7,6 +7,11 @@
# org.apache.jetspeed.services.autodeployment.user = <username>
# org.apache.jetspeed.services.autodeployment.password = <password>
+# Default server name and port for autodeployment.
+# You can override these via ${user.home}/build.properties.
+org.apache.jetspeed.services.autodeployment.server=localhost
+org.apache.jetspeed.services.autodeployment.port=8080
+
# Optional
# org.apache.jetspeed.context.file.name = jetspeed.xml
# org.apache.jetspeed.context.file.source = ./resources/fusion.xml
@@ -38,6 +43,10 @@
maven.war.build.dir=${maven.build.dir}
maven.war.webapp.dir=${maven.war.build.dir}/${pom.artifactId}
+# Specifies whether or not to expand the war when deploy.portal is called.
+# You can override this property either in you project's project.properties
+# or from your ${user.home}/build.properties
+org.apache.jetspeed.explode.war=true
maven.war.final.name=jetspeed.war
maven.war.web.app.name=jetspeed
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
