You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jv...@apache.org on 2001/03/28 19:44:21 UTC
cvs commit: jakarta-turbine-tdk/src/share/velocity/peer/templates/screens Index.vm
jvanzyl 01/03/28 09:44:19
Modified: src newapp.xml
src/share/velocity/peer/templates/screens Index.vm
Log:
- flux is almost completely working :-)
Revision Changes Path
1.53 +21 -3 jakarta-turbine-tdk/src/newapp.xml
Index: newapp.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/newapp.xml,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- newapp.xml 2001/02/17 21:05:42 1.52
+++ newapp.xml 2001/03/28 17:44:18 1.53
@@ -63,6 +63,7 @@
<!-- Copies dependent files -->
<!-- =================================================================== -->
<target name="gather" depends="prepare">
+
<!-- Find and replace tokens -->
<filter token="date" value="${TODAY}"/>
@@ -80,6 +81,7 @@
<property name="newapp.conf" value="${newapp.home}/WEB-INF/conf"/>
<property name="newapp.db" value="${newapp.home}/WEB-INF/db"/>
<property name="newapp.src" value="${newapp.home}/WEB-INF/src"/>
+ <property name="newapp.lib" value="${newapp.home}/WEB-INF/lib"/>
<property name="newapp.build" value="${newapp.home}/WEB-INF/build"/>
<property name="newapp.project" value="${newapp.home}/WEB-INF/build/project"/>
<property name="newapp.torque" value="${newapp.home}/WEB-INF/build/bin/torque"/>
@@ -177,6 +179,21 @@
<fileset dir="share/${turbine.app.view}/${turbine.app.type}/WEB-INF/src"/>
</copy>
+ <!-- F L U X -->
+ <copy todir="${newapp.src}/java">
+ <fileset dir="share/flux/src/java"/>
+ </copy>
+
+ <copy todir="${newapp.home}/flux-templates">
+ <fileset dir="share/flux/src/templates"/>
+ </copy>
+
+ <copy file="share/flux/conf/Flux.properties" todir="${newapp.conf}"/>
+
+ <property name="flux.modules" value="org.apache.turbine.flux.modules"/>
+
+ <!-- T U R B I N E R E S O U R C E S P R O P E R T I E S -->
+
<!--
This will dynamically generate the correct
TurbineResources.properties file for this web
@@ -190,15 +207,16 @@
<property name="turbine.log" value="/logs/turbine.log"/>
<property name="view.type" value="${turbine.app.view}"/>
<property name="database.name" value="${newapp}"/>
- <property name="module.packages" value="${target.package}.modules"/>
+ <property name="module.packages" value="${target.package}.modules,${flux.modules}"/>
+ <property name="include.file" value="include = Flux.properties"/>
</ant>
<!-- copy the lib directory over to the new app lib directory -->
<copy todir="${newapp.home}/WEB-INF/lib">
<fileset dir="${tomcat.home}/share/tdk-lib"/>
</copy>
-
- <!-- fix permissions -->
+
+ <!-- F I X P E R M I S S I O N S -->
<chmod dir="${newapp.home}" perm="ugo+rx" includes="**/*.sh" />
</target>
1.8 +6 -0 jakarta-turbine-tdk/src/share/velocity/peer/templates/screens/Index.vm
Index: Index.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/share/velocity/peer/templates/screens/Index.vm,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Index.vm 2001/02/12 23:30:24 1.7
+++ Index.vm 2001/03/28 17:44:19 1.8
@@ -29,3 +29,9 @@
</tr>
</table>
#end
+
+ <a href="$link.setPage("user,FluxUserList.vm")">
+ <font face="$ui.sansSerifFonts" color="$ui.menuColor">
+ Administer Users
+ </font>
+ </a>
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org