taylor 2004/04/21 15:53:07
Modified: plugin plugin.jelly
tutorial maven.xml project.xml
tutorial/src/java/org/apache/jetspeed/tutorial/modules/localization
JPortalLocalization_en.properties
JPortalLocalization_fr.properties
tutorial/tutorials/1 JetspeedResources.properties.merge
jportal-skins.xreg
tutorial/tutorials/2 JetspeedResources.properties.merge
TurbineResources.properties.merge
tutorial/xdocs/2 bundles.xml
webapp/WEB-INF/psml/user/anon/html/en default.psml
Log:
- fixed plugin postfix processing to only look for postfix environment (i.e.
dev/prod/test) when ${maven.env.name} is not null
- added support for hotdeploy config pregoals in plugin
- updated the tutorial's project.xml to copy properties files into jar (thanks maven)
- updated tutorial maven.xml to use hotdeploy config pregoal
- brought tutorial up-to-date on properties, modules TR.p declarations, en, fr
- fixed bug in jportal skin (white text on white background)
- tested tutorial with deploy, hotdeploy thru tutorial #2 (smokin), including using
2 localization modules
- removed Jetspeed skin hard-coded in default.psml for anon
Revision Changes Path
1.6 +203 -198 jakarta-jetspeed/plugin/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/plugin/plugin.jelly,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- plugin.jelly 21 Apr 2004 18:59:13 -0000 1.5
+++ plugin.jelly 21 Apr 2004 22:53:07 -0000 1.6
@@ -20,226 +20,231 @@
=============================================================================
-->
<project xmlns:j="jelly:core" xmlns:u="jelly:util">
- <!--
+ <!--
========================================================================
Create the custom WAR from binary distribution
========================================================================
-->
- <goal name="jetspeed:war" description="Create custom .war file based on
jetspeed binary distribution">
- <j:set var="maven.war.src" value="${war.stage.dir}/webapp"/>
- <j:if test="${maven.jetspeed.debug == 'true'}">
- <echo>[DEBUG] maven.src.dir = ${maven.src.dir}</echo>
- <echo>[DEBUG] maven.war.src = ${maven.war.src}</echo>
- <echo>[DEBUG] maven.build.dir = ${maven.build.dir}</echo>
- <echo>[DEBUG] maven.war.build.dir =
${maven.war.build.dir}</echo>
- <echo>[DEBUG] maven.dependency.classpath =
${maven.dependency.classpath}</echo>
- </j:if>
- <!-- recreate target area -->
- <!--attainGoal name="war:init"/-->
- <mkdir dir="${maven.war.src}"/>
- <!-- recreate stage area -->
- <delete dir="${war.stage.dir}"/>
- <mkdir dir="${war.stage.dir}"/>
- <!-- copy distribution war to stage directory -->
- <j:forEach var="dep" items="${pom.dependencies}">
- <j:if test="${dep.getType() == 'distribution'}">
- <j:set var="dist.name" value="${dep.getArtifactId()}"/>
- <j:set var="internal.war.path"
value="${dep.getProperty('dist.native.name')}"/>
- <j:set var="internal.war.path"
value="${dep.getProperty('dist.native.name')}"/>
- <u:tokenize var="parts"
delim=":">${dep.getId()}</u:tokenize>
- <j:set var="depid" value="${parts[0]}"/>
- <j:set var="dist.dependency.zip"
value="${maven.repo.local}/${depid}/distributions/${dep.getArtifact()}"/>
- <j:if test="${maven.jetspeed.debug == 'true'}">
- <echo>[DEBUG] dist.dependency.zip =
${dist.dependency.zip}</echo>
- <echo>[DEBUG] dist.name = ${dist.name}</echo>
- <echo>[DEBUG] internal.war.path=
${internal.war.path}</echo>
- <echo>[DEBUG] depid= ${depid}</echo>
- </j:if>
- <!-- extract .war file from distribution -->
- <unzip src="${dist.dependency.zip}"
dest="${maven.war.src}">
- <!-- This extracts the .war and expands it -->
- <fileset dir=".">
- <include name="**/*.war"/>
- <exclude
name="**/${pom.artifactId}.war"/>
- </fileset>
- </unzip>
- <!-- delete work files from distribution -->
- <delete dir="${maven.war.src}/${internal.war.path}"/>
- </j:if>
- </j:forEach>
- <!-- copy application webapp source to stage webapp -->
- <copy todir="${maven.war.src}" overwrite="true" filtering="true">
- <fileset dir="${war.src}">
- <exclude name="**/*CVS*"/>
- <exclude name="**/*Entries*"/>
- <exclude name="**/*Repository*"/>
- <exclude name="**/*Tag*"/>
- <exclude name="**/*.log"/>
- <exclude name="**/*.log.1"/>
- </fileset>
- </copy>
- <!-- create project .jar file -->
- <attainGoal name="java:jar"/>
- <!-- copy jar to web app directory -->
- <copy file="${maven.build.dir}/${maven.final.name}.jar"
todir="${maven.war.src}/WEB-INF/lib"/>
- <!-- remove class files -->
- <!--delete>
+ <goal name="jetspeed:war" description="Create custom .war file based on
jetspeed binary distribution">
+ <j:set var="maven.war.src" value="${war.stage.dir}/webapp"/>
+ <j:if test="${maven.jetspeed.debug == 'true'}">
+ <echo>[DEBUG] maven.src.dir = ${maven.src.dir}</echo>
+ <echo>[DEBUG] maven.war.src = ${maven.war.src}</echo>
+ <echo>[DEBUG] maven.build.dir = ${maven.build.dir}</echo>
+ <echo>[DEBUG] maven.war.build.dir = ${maven.war.build.dir}</echo>
+ <echo>[DEBUG] maven.dependency.classpath =
${maven.dependency.classpath}</echo>
+ </j:if>
+ <!-- recreate target area -->
+ <!--attainGoal name="war:init"/-->
+ <mkdir dir="${maven.war.src}"/>
+ <!-- recreate stage area -->
+ <delete dir="${war.stage.dir}"/>
+ <mkdir dir="${war.stage.dir}"/>
+ <!-- copy distribution war to stage directory -->
+ <j:forEach var="dep" items="${pom.dependencies}">
+ <j:if test="${dep.getType() == 'distribution'}">
+ <j:set var="dist.name" value="${dep.getArtifactId()}"/>
+ <j:set var="internal.war.path"
value="${dep.getProperty('dist.native.name')}"/>
+ <j:set var="internal.war.path"
value="${dep.getProperty('dist.native.name')}"/>
+ <u:tokenize var="parts" delim=":">${dep.getId()}</u:tokenize>
+ <j:set var="depid" value="${parts[0]}"/>
+ <j:set var="dist.dependency.zip"
value="${maven.repo.local}/${depid}/distributions/${dep.getArtifact()}"/>
+ <j:if test="${maven.jetspeed.debug == 'true'}">
+ <echo>[DEBUG] dist.dependency.zip =
${dist.dependency.zip}</echo>
+ <echo>[DEBUG] dist.name = ${dist.name}</echo>
+ <echo>[DEBUG] internal.war.path= ${internal.war.path}</echo>
+ <echo>[DEBUG] depid= ${depid}</echo>
+ </j:if>
+ <!-- extract .war file from distribution -->
+ <unzip src="${dist.dependency.zip}" dest="${maven.war.src}">
+ <!-- This extracts the .war and expands it -->
+ <fileset dir=".">
+ <include name="**/*.war"/>
+ <exclude name="**/${pom.artifactId}.war"/>
+ </fileset>
+ </unzip>
+ <!-- delete work files from distribution -->
+ <delete dir="${maven.war.src}/${internal.war.path}"/>
+ </j:if>
+ </j:forEach>
+ <!-- copy application webapp source to stage webapp -->
+ <copy todir="${maven.war.src}" overwrite="true" filtering="true">
+ <fileset dir="${war.src}">
+ <exclude name="**/*CVS*"/>
+ <exclude name="**/*Entries*"/>
+ <exclude name="**/*Repository*"/>
+ <exclude name="**/*Tag*"/>
+ <exclude name="**/*.log"/>
+ <exclude name="**/*.log.1"/>
+ </fileset>
+ </copy>
+ <!-- create project .jar file -->
+ <attainGoal name="java:jar"/>
+ <!-- copy jar to web app directory -->
+ <copy file="${maven.build.dir}/${maven.final.name}.jar"
todir="${maven.war.src}/WEB-INF/lib"/>
+ <!-- remove class files -->
+ <!--delete>
<fileset dir="${maven.build.dir}/classes" includes="**/*.class"/>
</delete-->
- <!-- set version tag -->
- <attainGoal name="jetspeed:war-version-tag"/>
- <!-- merge any property files and copy environment specific local
registries -->
- <attainGoal name="jetspeed:war-config"/>
- <!-- create project .war file -->
- <attainGoal name="war:war"/>
- </goal>
- <!--
+ <!-- set version tag -->
+ <attainGoal name="jetspeed:war-version-tag"/>
+ <!-- merge any property files and copy environment specific local
registries -->
+ <attainGoal name="jetspeed:war-config"/>
+ <!-- create project .war file -->
+ <attainGoal name="war:war"/>
+ </goal>
+ <!--
========================================================================
Embed release version tag into bottom navigation
========================================================================
-->
- <goal name="jetspeed:war-version-tag" description="Updates release version tag
shown in the bottom navigation">
- <replace
file="${maven.war.src}/WEB-INF/templates/vm/navigations/html/bottom.vm"
token="(release)" value="${pom.currentVersion}"/>
- </goal>
- <!--
+ <goal name="jetspeed:war-version-tag" description="Updates release version tag
shown in the bottom navigation">
+ <replace
file="${maven.war.src}/WEB-INF/templates/vm/navigations/html/bottom.vm"
token="(release)" value="${pom.currentVersion}"/>
+ </goal>
+ <!--
========================================================================
Override jetspeed property files and add local registries
========================================================================
-->
- <goal name="jetspeed:war-config" description="Override jetspeed property files
and add local registries">
- <!-- define custom task for oeverriding properties -->
- <taskdef name="props_override"
classname="org.apache.jetspeed.util.ant.OverwritePropertiesTask">
- <classpath>
- <path refid="maven.dependency.classpath"/>
- </classpath>
- </taskdef>
- <!-- set proper environment property files -->
- <echo>Targeting ${maven.env.name} environment ...</echo>
- <j:set var="props.dir" value="${maven.war.src}/WEB-INF/conf"/>
- <u:tokenize var="merge.prop.files"
delim=",">${maven.merge.properties}</u:tokenize>
- <j:forEach items="${merge.prop.files}" var="prop.file">
- <j:if test="${maven.jetspeed.debug == 'true'}">
- <echo>[DEBUG] Merging ${prop.file}</echo>
- </j:if>
- <j:if test="${maven.env.name == null}">
- <j:if test="${maven.jetspeed.debug == 'true'}">
- <echo>[DEBUG] Merging ${prop.file} for
${maven.env.name}</echo>
- </j:if>
- <props_override
mergeBaseProperties="${props.dir}/${prop.file}.properties"
mergeProperties="${props.dir}/${prop.file}-${maven.env.name}.properties.merge"
includesDir="${props.dir}" failonerror="false"/>
- </j:if>
- <props_override
mergeBaseProperties="${props.dir}/${prop.file}.properties"
mergeProperties="${props.dir}/${prop.file}.properties.merge"
includesDir="${props.dir}" failonerror="false"/>
- </j:forEach>
- <!-- environment specific local registries -->
- <j:if test="${maven.env.name == null}">
- <u:tokenize var="local.xreg.files"
delim=",">${maven.copy.env.xreg}</u:tokenize>
- <j:forEach items="${local.xreg.files}" var="xreg.file">
- <j:if test="${maven.jetspeed.debug == 'true'}">
- <echo>[DEBUG] Copying local-${xreg.file} for
${maven.env.name}</echo>
- </j:if>
- <copy
file="${props.dir}/local-${xreg.file}-${maven.env.name}.xreg.copy"
toFile="${props.dir}/local-${xreg.file}.xreg" failonerror="false"/>
- </j:forEach>
- </j:if>
- <delete>
- <fileset dir="${props.dir}" includes="**/*.properties.merge"/>
- <fileset dir="${props.dir}" includes="**/local-*.xreg.copy"/>
- </delete>
- </goal>
- <!-- ================================================================== -->
- <!--H O T D E P L O Y W E B A P P -->
- <!-- ================================================================== -->
- <goal name="jetspeed:hotdeploy" prereqs="java:compile" description="Hot
deploys webapp classes on a local server">
- <j:if test="${maven.jetspeed.debug == 'true'}">
- <echo>[DEBUG] maven.src.dir = ${maven.src.dir}</echo>
- <echo>[DEBUG] maven.war.src = ${maven.war.src}</echo>
- <echo>[DEBUG] maven.build.dir = ${maven.build.dir}</echo>
- <echo>[DEBUG] maven.war.build.dir =
${maven.war.build.dir}</echo>
- </j:if>
- <copy
todir="${maven.war.appserver.home}/webapps/${pom.artifactId}/WEB-INF/classes">
- <fileset dir="${maven.build.dir}/classes">
- <!-- Do not include test files in the runtime jar -->
- <exclude name="**/Test*.*"/>
- <exclude name="**/test*.*"/>
- <!-- Also exclude the test cactus.properties file -->
- <exclude name="cactus.properties"/>
- </fileset>
- </copy>
- <copy todir="${maven.war.appserver.home}/webapps/${pom.artifactId}">
- <fileset dir="./stage/webapp">
- <exclude name="**/*.properties.merge"/>
- </fileset>
- </copy>
- </goal>
- <!--
+ <goal name="jetspeed:war-config" description="Override jetspeed property files
and add local registries">
+ <!-- define custom task for oeverriding properties -->
+ <taskdef name="props_override"
classname="org.apache.jetspeed.util.ant.OverwritePropertiesTask">
+ <classpath>
+ <path refid="maven.dependency.classpath"/>
+ </classpath>
+ </taskdef>
+ <!-- set proper environment property files -->
+ <echo>Targeting ${maven.env.name} environment ...</echo>
+ <j:set var="props.dir" value="${maven.war.src}/WEB-INF/conf"/>
+ <u:tokenize var="merge.prop.files"
delim=",">${maven.merge.properties}</u:tokenize>
+ <j:forEach items="${merge.prop.files}" var="prop.file">
+ <j:if test="${maven.jetspeed.debug == 'true'}">
+ <echo>[DEBUG] Merging ${prop.file}</echo>
+ </j:if>
+ <j:if test="${maven.env.name != null}">
+ <j:if test="${maven.jetspeed.debug == 'true'}">
+ <echo>[DEBUG] Merging ${prop.file} for ${maven.env.name}</echo>
+ </j:if>
+ <props_override
mergeBaseProperties="${props.dir}/${prop.file}.properties"
mergeProperties="${props.dir}/${prop.file}-${maven.env.name}.properties.merge"
includesDir="${props.dir}" failonerror="false"/>
+ </j:if>
+ <props_override
mergeBaseProperties="${props.dir}/${prop.file}.properties"
mergeProperties="${props.dir}/${prop.file}.properties.merge"
includesDir="${props.dir}" failonerror="false"/>
+ </j:forEach>
+ <!-- environment specific local registries -->
+ <j:if test="${maven.env.name == null}">
+ <u:tokenize var="local.xreg.files"
delim=",">${maven.copy.env.xreg}</u:tokenize>
+ <j:forEach items="${local.xreg.files}" var="xreg.file">
+ <j:if test="${maven.jetspeed.debug == 'true'}">
+ <echo>[DEBUG] Copying local-${xreg.file} for
${maven.env.name}</echo>
+ </j:if>
+ <copy
file="${props.dir}/local-${xreg.file}-${maven.env.name}.xreg.copy"
toFile="${props.dir}/local-${xreg.file}.xreg" failonerror="false"/>
+ </j:forEach>
+ </j:if>
+ <delete>
+ <fileset dir="${props.dir}" includes="**/*.properties.merge"/>
+ <fileset dir="${props.dir}" includes="**/local-*.xreg.copy"/>
+ </delete>
+ </goal>
+ <!-- ================================================================== -->
+ <!--H O T D E P L O Y W E B A P P -->
+ <!-- ================================================================== -->
+ <goal name="jetspeed:hotdeploy" prereqs="java:compile" description="Hot deploys
webapp classes on a local server">
+ <attainGoal name="jetspeed:hotdeploy-config"/>
+ <j:if test="${maven.jetspeed.debug == 'true'}">
+ <echo>[DEBUG] maven.src.dir = ${maven.src.dir}</echo>
+ <echo>[DEBUG] maven.war.src = ${maven.war.src}</echo>
+ <echo>[DEBUG] maven.build.dir = ${maven.build.dir}</echo>
+ <echo>[DEBUG] maven.war.build.dir = ${maven.war.build.dir}</echo>
+ </j:if>
+ <copy
todir="${maven.war.appserver.home}/webapps/${pom.artifactId}/WEB-INF/classes">
+ <fileset dir="${maven.build.dir}/classes">
+ <!-- Do not include test files in the runtime jar -->
+ <exclude name="**/Test*.*"/>
+ <exclude name="**/test*.*"/>
+ <!-- Also exclude the test cactus.properties file -->
+ <exclude name="cactus.properties"/>
+ </fileset>
+ </copy>
+ <copy todir="${maven.war.appserver.home}/webapps/${pom.artifactId}">
+ <fileset dir="./stage/webapp">
+ <exclude name="**/*.properties.merge"/>
+ </fileset>
+ </copy>
+ </goal>
+
+ <goal name="jetspeed:hotdeploy-config" description="Config Hot deploys webapp
classes on a local server">
+ </goal>
+
+ <!--
========================================================================
Create the Jetspeed WAR
========================================================================
-->
- <goal name="jetspeed:overlay" description="Overlay a vanilla Jetspeed War file
on your existing code.">
- <!-- this seems required to setup the plugin context -->
- <attainGoal name="war:init"/>
- <j:set var="maven.jetspeed.prewar.dir"
value="${pom.getPluginContext('maven-war-plugin').getVariable('maven.war.build.dir')}"/>
- <available file="${maven.jetspeed.prewar.dir}/${pom.artifactId}.war"
property="maven.jetspeed.prewar.exists"/>
- <j:choose>
- <j:when test="${maven.jetspeed.prewar.exists}">
- <!-- Expand the project war -->
- <unwar
src="${maven.jetspeed.prewar.dir}/${pom.artifactId}.war"
dest="${maven.jetspeed.build.dir}/${pom.artifactId}"/>
- <attainGoal name="jetspeed:webapp-update"/>
- <!-- delete the war because it no longer reflects the
expanded webapp -->
- <delete
file="${maven.jetspeed.prewar.dir}/${pom.artifactId}.war"/>
- </j:when>
- <j:otherwise>
- <available
file="${maven.jetspeed.prewar.dir}/${pom.artifactId}/WEB-INF" type="dir"
property="maven.jetspeed.prewebapp.exists"/>
- <j:choose>
- <j:when
test="${maven.jetspeed.prewebapp.exists}">
- <copy
todir="${maven.jetspeed.build.dir}/${pom.artifactId}">
- <fileset
dir="${maven.jetspeed.prewar.dir}/${pom.artifactId}"/>
- </copy>
- <attainGoal
name="jetspeed:webapp-update"/>
- </j:when>
- <j:otherwise>
- <echo>
+ <goal name="jetspeed:overlay" description="Overlay a vanilla Jetspeed War file
on your existing code.">
+ <!-- this seems required to setup the plugin context -->
+ <attainGoal name="war:init"/>
+ <j:set var="maven.jetspeed.prewar.dir"
value="${pom.getPluginContext('maven-war-plugin').getVariable('maven.war.build.dir')}"/>
+ <available file="${maven.jetspeed.prewar.dir}/${pom.artifactId}.war"
property="maven.jetspeed.prewar.exists"/>
+ <j:choose>
+ <j:when test="${maven.jetspeed.prewar.exists}">
+ <!-- Expand the project war -->
+ <unwar src="${maven.jetspeed.prewar.dir}/${pom.artifactId}.war"
dest="${maven.jetspeed.build.dir}/${pom.artifactId}"/>
+ <attainGoal name="jetspeed:webapp-update"/>
+ <!-- delete the war because it no longer reflects the expanded
webapp -->
+ <delete file="${maven.jetspeed.prewar.dir}/${pom.artifactId}.war"/>
+ </j:when>
+ <j:otherwise>
+ <available
file="${maven.jetspeed.prewar.dir}/${pom.artifactId}/WEB-INF" type="dir"
property="maven.jetspeed.prewebapp.exists"/>
+ <j:choose>
+ <j:when test="${maven.jetspeed.prewebapp.exists}">
+ <copy todir="${maven.jetspeed.build.dir}/${pom.artifactId}">
+ <fileset
dir="${maven.jetspeed.prewar.dir}/${pom.artifactId}"/>
+ </copy>
+ <attainGoal name="jetspeed:webapp-update"/>
+ </j:when>
+ <j:otherwise>
+ <echo>
Either a war or a webapp must exist. Please call the War plugin
first.
</echo>
- </j:otherwise>
- </j:choose>
- </j:otherwise>
- </j:choose>
- </goal>
- <goal name="jetspeed:webapp-update">
- <unwar src="${maven.jetspeed.vanilla.war}"
dest="${maven.jetspeed.build.dir}/${pom.artifactId}" overwrite="true"/>
- <attainGoal name="jetspeed:merge-properties"/>
- </goal>
- <goal name="jetspeed:merge-properties" description="Merge properties into
vanilla property files">
- <taskdef name="overwriteproperties"
classname="org.apache.jetspeed.util.ant.OverwritePropertiesTask">
- <classpath>
- <path refid="maven.dependency.classpath"/>
- </classpath>
- </taskdef>
- <echo> merge_jrp required </echo>
- <overwriteproperties
mergeBaseProperties="${maven.jetspeed.build.dir}/${pom.artifactId}/WEB-INF/conf/JetspeedResources.properties"
mergeProperties="${maven.jetspeed.merge.dir}/MergeJetspeedResources.properties"
includesDir="${maven.jetspeed.build.dir}/${pom.artifactId}/WEB-INF/conf/"/>
- <echo> merge_security required </echo>
- <overwriteproperties
mergeBaseProperties="${maven.jetspeed.build.dir}/${pom.artifactId}/WEB-INF/conf/JetspeedSecurity.properties"
mergeProperties="${maven.jetspeed.merge.dir}/MergeJetspeedSecurity.properties"
includesDir="${maven.jetspeed.build.dir}/${pom.artifactId}/WEB-INF/conf/"/>
- <echo> merge_trp required </echo>
- <overwriteproperties
mergeBaseProperties="${maven.jetspeed.build.dir}/${pom.artifactId}/WEB-INF/conf/TurbineResources.properties"
mergeProperties="${maven.jetspeed.merge.dir}/MergeTurbineResources.properties"
includesDir="${maven.jetspeed.build.dir}/${pom.artifactId}/WEB-INF/conf/"/>
- <echo> merge_torque required </echo>
- <overwriteproperties
mergeBaseProperties="${maven.jetspeed.build.dir}/${pom.artifactId}/WEB-INF/conf/Torque.properties"
mergeProperties="${maven.jetspeed.merge.dir}/MergeTorque.properties"
includesDir="${maven.jetspeed.build.dir}/${pom.artifactId}/WEB-INF/conf/"/>
- </goal>
-
- <!-- ================================================================== -->
- <!-- D E P L O Y W E B A P P -->
- <!-- ================================================================== -->
- <goal name="jetspeed:deploy" prereqs="" description="Simple deploy of entire
webapp to app server">
- <j:if test="${maven.jetspeed.debug == 'true'}">
- <echo>[DEBUG] maven.src.dir = ${maven.src.dir}</echo>
- <echo>[DEBUG] maven.war.src = ${maven.war.src}</echo>
- <echo>[DEBUG] maven.build.dir = ${maven.build.dir}</echo>
- <echo>[DEBUG] pom.artificactId = ${pom.artifactId}</echo>
- </j:if>
+ </j:otherwise>
+ </j:choose>
+ </j:otherwise>
+ </j:choose>
+ </goal>
+ <goal name="jetspeed:webapp-update">
+ <unwar src="${maven.jetspeed.vanilla.war}"
dest="${maven.jetspeed.build.dir}/${pom.artifactId}" overwrite="true"/>
+ <attainGoal name="jetspeed:merge-properties"/>
+ </goal>
+ <goal name="jetspeed:merge-properties" description="Merge properties into
vanilla property files">
+ <taskdef name="overwriteproperties"
classname="org.apache.jetspeed.util.ant.OverwritePropertiesTask">
+ <classpath>
+ <path refid="maven.dependency.classpath"/>
+ </classpath>
+ </taskdef>
+ <echo> merge_jrp required </echo>
+ <overwriteproperties
mergeBaseProperties="${maven.jetspeed.build.dir}/${pom.artifactId}/WEB-INF/conf/JetspeedResources.properties"
mergeProperties="${maven.jetspeed.merge.dir}/MergeJetspeedResources.properties"
includesDir="${maven.jetspeed.build.dir}/${pom.artifactId}/WEB-INF/conf/"/>
+ <echo> merge_security required </echo>
+ <overwriteproperties
mergeBaseProperties="${maven.jetspeed.build.dir}/${pom.artifactId}/WEB-INF/conf/JetspeedSecurity.properties"
mergeProperties="${maven.jetspeed.merge.dir}/MergeJetspeedSecurity.properties"
includesDir="${maven.jetspeed.build.dir}/${pom.artifactId}/WEB-INF/conf/"/>
+ <echo> merge_trp required </echo>
+ <overwriteproperties
mergeBaseProperties="${maven.jetspeed.build.dir}/${pom.artifactId}/WEB-INF/conf/TurbineResources.properties"
mergeProperties="${maven.jetspeed.merge.dir}/MergeTurbineResources.properties"
includesDir="${maven.jetspeed.build.dir}/${pom.artifactId}/WEB-INF/conf/"/>
+ <echo> merge_torque required </echo>
+ <overwriteproperties
mergeBaseProperties="${maven.jetspeed.build.dir}/${pom.artifactId}/WEB-INF/conf/Torque.properties"
mergeProperties="${maven.jetspeed.merge.dir}/MergeTorque.properties"
includesDir="${maven.jetspeed.build.dir}/${pom.artifactId}/WEB-INF/conf/"/>
+ </goal>
+
+ <!-- ================================================================== -->
+ <!-- D E P L O Y W E B A P P -->
+ <!-- ================================================================== -->
+ <goal name="jetspeed:deploy" prereqs="" description="Simple deploy of entire
webapp to app server">
+ <j:if test="${maven.jetspeed.debug == 'true'}">
+ <echo>[DEBUG] maven.src.dir = ${maven.src.dir}</echo>
+ <echo>[DEBUG] maven.war.src = ${maven.war.src}</echo>
+ <echo>[DEBUG] maven.build.dir = ${maven.build.dir}</echo>
+ <echo>[DEBUG] pom.artificactId = ${pom.artifactId}</echo>
+ </j:if>
<delete dir="${maven.war.appserver.home}/webapps/${pom.artifactId}"/>
<copy file="${maven.build.dir}/${pom.artifactId}.war"
todir="${maven.war.appserver.home}/webapps/">
- </copy>
+ </copy>
<unwar src="${maven.war.appserver.home}/webapps/${pom.artifactId}.war"
dest="${maven.war.appserver.home}/webapps/${pom.artifactId}"/>
- </goal>
-
+ </goal>
+
</project>
1.6 +28 -1 jakarta-jetspeed/tutorial/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/tutorial/maven.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- maven.xml 13 Apr 2004 16:24:10 -0000 1.5
+++ maven.xml 21 Apr 2004 22:53:07 -0000 1.6
@@ -14,11 +14,34 @@
limitations under the License.
-->
<project default="jetspeed:war" xmlns:j="jelly:core" xmlns:maven="jelly:maven"
xmlns:ant="jelly:ant">
+ <goal name="war">
+ <attainGoal name="jetspeed:war"/>
+ </goal>
+ <goal name="deploy">
+ <attainGoal name="jetspeed:deploy"/>
+ </goal>
+ <goal name="hotdeploy">
+ <attainGoal name="jetspeed:hotdeploy"/>
+ </goal>
<preGoal name="java:compile">
<attainGoal name="torque:om"/>
<attainGoal name="torque:sql"/>
</preGoal>
<preGoal name="jetspeed:war-config">
+ <attainGoal name='tutorial-setup'/>
+ </preGoal>
+
+ <!-- copy over the tutorial files, this is not standard practice -->
+ <preGoal name="jetspeed:hotdeploy-config">
+ <attainGoal name='jetspeed:war-config'/>
+ </preGoal>
+
+ <!--
+ <preGoal name="jetspeed:hotdeploy-config">
+ <attainGoal name='tutorial-setup'/>
+ </preGoal>
+ -->
+ <goal name='tutorial-setup'>
<j:choose>
<j:when test="${tutorial == null}">
<attainGoal name="tutorial-all"/>
@@ -31,7 +54,7 @@
<format property="timestamp" pattern="yyyy-MM-dd-hh:mm"/>
</tstamp>
<replace
file="${maven.war.src}/WEB-INF/conf/JetspeedResources.properties"
token="BUILD-VERSION" value="${pom.currentVersion}-${timestamp}"/>
- </preGoal>
+ </goal>
<preGoal name="clean">
<delete failonerror="false">
<fileset dir="${maven.src.dir}/java"
includes="**/*.generation"/>
@@ -56,6 +79,7 @@
</copy>
</goal>
<goal name="tutorial-1" description="Tailoring the Portal Web Design">
+ <echo>Configuring for Tutorial 1</echo>
<copy overwrite="true" todir="${maven.war.src}/WEB-INF/conf">
<fileset dir="tutorials/1">
<include name="**/*.properties.merge"/>
@@ -71,6 +95,7 @@
</goal>
<goal name="tutorial-2" description="Localisation">
<!-- <attainGoal name="tutorial-1"/> -->
+ <echo>Configuring for Tutorial 2</echo>
<copy overwrite="true" todir="${maven.war.src}/WEB-INF/conf">
<fileset dir="tutorials/2">
<include name="**/*.properties.merge"/>
@@ -86,6 +111,7 @@
<goal name="tutorial-3" description="Site Map">
<!-- <attainGoal name="tutorial-1"/> -->
<!-- <attainGoal name="tutorial-2"/> -->
+ <echo>Configuring for Tutorial 3</echo>
<copy overwrite="true" todir="${maven.war.src}/WEB-INF/conf">
<fileset dir="tutorials/3">
<include name="**/*.properties.merge"/>
@@ -107,6 +133,7 @@
<!-- <attainGoal name="tutorial-1"/> -->
<!-- <attainGoal name="tutorial-2"/> -->
<!-- <attainGoal name="tutorial-3"/> -->
+ <echo>Configuring for Tutorial 4</echo>
<copy overwrite="true" todir="${maven.war.src}/WEB-INF/conf">
<fileset dir="tutorials/4">
<include name="**/*.properties.merge"/>
1.11 +9 -0 jakarta-jetspeed/tutorial/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/tutorial/project.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- project.xml 20 Apr 2004 01:31:47 -0000 1.10
+++ project.xml 21 Apr 2004 22:53:07 -0000 1.11
@@ -385,6 +385,15 @@
<unitTestPatterns/>
<jarResources/>
<jars/>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ </resources>
+
</build>
<reports>
<!-- <report>maven-developer-activity-plugin</report> -->
1.2 +2 -2
jakarta-jetspeed/tutorial/src/java/org/apache/jetspeed/tutorial/modules/localization/JPortalLocalization_en.properties
Index: JPortalLocalization_en.properties
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/tutorial/src/java/org/apache/jetspeed/tutorial/modules/localization/JPortalLocalization_en.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JPortalLocalization_en.properties 8 Apr 2004 17:03:55 -0000 1.1
+++ JPortalLocalization_en.properties 21 Apr 2004 22:53:07 -0000 1.2
@@ -14,5 +14,5 @@
# $Id$
TOP_TITLE=Welcome to JPortal, the Jetspeed Tutorial
CONTACT_US=Contact Us
-
+BOTTOM_SUPPORT_MSG=Free Support
SECURITY_EXAMPLE_PORTLET=Security Example Portlet
1.2 +2 -2
jakarta-jetspeed/tutorial/src/java/org/apache/jetspeed/tutorial/modules/localization/JPortalLocalization_fr.properties
Index: JPortalLocalization_fr.properties
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/tutorial/src/java/org/apache/jetspeed/tutorial/modules/localization/JPortalLocalization_fr.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JPortalLocalization_fr.properties 8 Apr 2004 17:03:55 -0000 1.1
+++ JPortalLocalization_fr.properties 21 Apr 2004 22:53:07 -0000 1.2
@@ -14,5 +14,5 @@
# $Id$
TOP_TITLE=Bienvenu au JPortal, le Pr&ecepteur de Jetspeed
CONTACT_US=Nous Contacter
-
+BOTTOM_SUPPORT_MSG=Support Gratuit
SECURITY_EXAMPLE_PORTLET= Exemple de S&ecurit&e Portlet
1.2 +1 -1
jakarta-jetspeed/tutorial/tutorials/1/JetspeedResources.properties.merge
Index: JetspeedResources.properties.merge
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/tutorial/tutorials/1/JetspeedResources.properties.merge,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JetspeedResources.properties.merge 9 Apr 2004 01:14:28 -0000 1.1
+++ JetspeedResources.properties.merge 21 Apr 2004 22:53:07 -0000 1.2
@@ -12,7 +12,7 @@
#
# -------------------------------------------------------------------
-topnav.user_creation.enable=false
+topnav.user_creation.enable=true
# -------------------------------------------------------------------
#
1.2 +1 -1 jakarta-jetspeed/tutorial/tutorials/1/jportal-skins.xreg
Index: jportal-skins.xreg
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/tutorial/tutorials/1/jportal-skins.xreg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jportal-skins.xreg 8 Apr 2004 19:05:36 -0000 1.1
+++ jportal-skins.xreg 21 Apr 2004 22:53:07 -0000 1.2
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<registry>
<skin-entry name="jportal-skin" hidden="false">
- <property name="text-color" value="#ffffff" hidden="false"/>
+ <property name="text-color" value="#000000" hidden="false"/>
<property name="background-color" value="#ffffff" hidden="false"/>
<property name="title-text-color" value="#000000" hidden="false"/>
<property name="title-background-color" value="#ceff63" hidden="false"/>
1.2 +1 -1
jakarta-jetspeed/tutorial/tutorials/2/JetspeedResources.properties.merge
Index: JetspeedResources.properties.merge
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/tutorial/tutorials/2/JetspeedResources.properties.merge,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JetspeedResources.properties.merge 9 Apr 2004 01:14:28 -0000 1.1
+++ JetspeedResources.properties.merge 21 Apr 2004 22:53:07 -0000 1.2
@@ -4,7 +4,7 @@
#
# -------------------------------------------------------------------
[EMAIL PROTECTED]
[EMAIL PROTECTED]
# Consider the language as part of the fallback?
services.Profiler.fallback.language=false
1.2 +2 -3
jakarta-jetspeed/tutorial/tutorials/2/TurbineResources.properties.merge
Index: TurbineResources.properties.merge
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/tutorial/tutorials/2/TurbineResources.properties.merge,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TurbineResources.properties.merge 9 Apr 2004 01:14:28 -0000 1.1
+++ TurbineResources.properties.merge 21 Apr 2004 22:53:07 -0000 1.2
@@ -3,10 +3,9 @@
# Tutorial 2
#
# -------------------------------------------------------------------
-module.packages=com.bluesunrise.jportal.modules
+module.packages=org.apache.jetspeed.tutorial.modules
-locale.default.bundles=com.bluesunrise.jportal.modules.localization.JPortalLocalization,org.apache.jetspeed.modules.localization.JetspeedLocalization
-locale.default.bundle=org.apache.jetspeed.modules.localization.JetspeedLocalization
+locale.default.bundles=org.apache.jetspeed.tutorial.modules.localization.JPortalLocalization,org.apache.jetspeed.modules.localization.JetspeedLocalization
locale.default.language=en
locale.default.country=US
1.2 +3 -3 jakarta-jetspeed/tutorial/xdocs/2/bundles.xml
Index: bundles.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/tutorial/xdocs/2/bundles.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bundles.xml 9 Apr 2004 05:42:47 -0000 1.1
+++ bundles.xml 21 Apr 2004 22:53:07 -0000 1.2
@@ -34,11 +34,11 @@
<source>
TOP_TITLE=Welcome to JPortal, the Jetspeed Tutorial
-CONTACT_US=Contact Us
+BOTTOM_SUPPORT_MSG=Free Support
</source>
<p>
The first string, TOP_TITLE, replaces a resource string already defined in
Jetspeed.
-The second string, CONTACT_US is a new string that is referenced in the
<b>bottom-jportal.vm</b> file.
+The second string, BOTTOM_SUPPORT_MSG is a new string that is referenced in the
<b>bottom-jportal.vm</b> file.
</p>
<p>
Referencing localised strings in Velocity templates is accomplished with the
localisation global tool,
@@ -61,7 +61,7 @@
<source>
<![CDATA[
<td align="center">
- <a href="mailto:$config.getString("mail.support")">$l10n.CONTACT_US</a>
+ <a
href="mailto:$config.getString("mail.support")">$l10n.BOTTOM_SUPPORT_MSG</a>
</td>
]]>
</source>
1.11 +0 -1
jakarta-jetspeed/webapp/WEB-INF/psml/user/anon/html/en/default.psml
Index: default.psml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/user/anon/html/en/default.psml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- default.psml 17 Mar 2004 19:12:14 -0000 1.10
+++ default.psml 21 Apr 2004 22:53:07 -0000 1.11
@@ -16,7 +16,6 @@
-->
<portlets id="100" xmlns="http://xml.apache.org/jetspeed/2000/psml";>
<security-ref parent="anon-view_admin-all"/>
- <skin name="Jetspeed"/>
<metainfo>
<title>Default Jetspeed Page</title>
</metainfo>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
