taylor 2004/06/14 21:25:08
Modified: tutorial maven.xml project.properties
Log:
started to fix tutorial, still incomplete
CVS: ----------------------------------------------------------------------
CVS: PR:
CVS: If this change addresses a PR in the problem report tracking
CVS: database, then enter the PR number(s) here.
CVS: Obtained from:
CVS: If this change has been taken from another system, such as NCSA,
CVS: then name the system in this line, otherwise delete it.
CVS: Submitted by:
CVS: If this code has been contributed to Apache by someone else; i.e.,
CVS: they sent us a patch or a new module, then include their name/email
CVS: address here. If this is your work then delete this line.
CVS: Reviewed by:
CVS: If we are doing pre-commit code reviews and someone else has
CVS: reviewed your changes, include their name(s) here.
CVS: If you have not had it reviewed then delete this line.
Revision Changes Path
1.8 +2 -3 jakarta-jetspeed/tutorial/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/tutorial/maven.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- maven.xml 22 Apr 2004 05:14:55 -0000 1.7
+++ maven.xml 15 Jun 2004 04:25:08 -0000 1.8
@@ -36,11 +36,10 @@
<attainGoal name='jetspeed:war-config'/>
</preGoal>
- <!--
- <preGoal name="jetspeed:hotdeploy-config">
+ <preGoal name="jetspeed:hotdeploy-config">
<attainGoal name='tutorial-setup'/>
</preGoal>
- -->
+
<goal name='tutorial-setup'>
<j:choose>
<j:when test="${tutorial == null}">
1.12 +2 -2 jakarta-jetspeed/tutorial/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/tutorial/project.properties,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- project.properties 23 Apr 2004 19:05:32 -0000 1.11
+++ project.properties 15 Jun 2004 04:25:08 -0000 1.12
@@ -57,8 +57,8 @@
war.stage.dir = ${basedir}/stage
maven.war.src = ${war.stage.dir}/webapp
-maven.merge.properties = JetspeedResources,JetspeedSecurity,TurbineResources,Torque
+# maven.merge.properties =
JetspeedResources,JetspeedSecurity,TurbineResources,Torque
maven.war.appserver.home = /bluesunrise/apache/catalina
jetspeed.dist.version = 1.6-dev
-
+# jetspeed.dist.version = 1.5
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
