jvanzyl 01/08/28 14:19:06
Modified: src build.properties build.xml
src/share web.xml
Log:
- some changes to allow a cvs layout of a turbine application to work
in parallel with the TDK
Revision Changes Path
1.5 +3 -1 jakarta-turbine-tdk/src/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/build.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.properties 2001/06/08 20:39:07 1.4
+++ build.properties 2001/08/28 21:19:05 1.5
@@ -15,5 +15,7 @@
# -------------------------------------------------------------------------
tdk.home = .
-app.root = share/sample
+app.root = webContext
+app.src = share/sample
+app.properties = /WEB-INF/conf/TurbineResources.properties
share.dir = share
1.17 +15 -8 jakarta-turbine-tdk/src/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/build.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- build.xml 2001/07/24 15:45:02 1.16
+++ build.xml 2001/08/28 21:19:05 1.17
@@ -40,12 +40,12 @@
<property name="output.directory" value="../src"/>
<property name="schema.directory" value="../conf"/>
- <property name="app.root.templates" value="${app.root}/templates"/>
- <property name="app.root.resources" value="${app.root}/resources"/>
- <property name="app.root.images" value="${app.root}/images"/>
- <property name="app.root.build" value="${app.root}/build"/>
- <property name="app.root.conf" value="${app.root}/conf"/>
- <property name="app.root.modules" value="${app.root}/src/java/modules"/>
+ <property name="app.root.templates" value="${app.src}/templates"/>
+ <property name="app.root.resources" value="${app.src}/resources"/>
+ <property name="app.root.images" value="${app.src}/images"/>
+ <property name="app.root.build" value="${app.src}/build"/>
+ <property name="app.root.conf" value="${app.src}/conf"/>
+ <property name="app.root.modules" value="${app.src}/src/java/modules"/>
</target>
@@ -106,8 +106,8 @@
the properties -->
<target name="integrate-properties">
- <property name="app.root.templates" value="${app.root}/src/templates"/>
- <property name="app.root.conf" value="${app.root}/src/conf"/>
+ <property name="app.root.templates" value="${app.src}/src/templates"/>
+ <property name="app.root.conf" value="${app.src}/src/conf"/>
</target>
<target name="integrate" depends="integrate-properties,properties">
@@ -129,6 +129,11 @@
-->
</target>
+ <target name="setup" depends="properties">
+ <antcall target="turbine-libs"/>
+ <antcall target="deployment-descriptor"/>
+ </target>
+
<!-- =================================================================== -->
<!-- W E B A P P S T R U C T U R E -->
<!-- =================================================================== -->
@@ -297,6 +302,8 @@
<target name="deployment-descriptor">
<filter token="PROJECT" value="${turbine.app}"/>
+ <filter token="APP_ROOT" value="${app.root}"/>
+ <filter token="APP_PROPERTIES" value="${app.properties}"/>
<copy
file="${share.dir}/web.xml"
1.2 +29 -33 jakarta-turbine-tdk/src/share/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/share/web.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- web.xml 2001/05/27 22:42:40 1.1
+++ web.xml 2001/08/28 21:19:06 1.2
@@ -5,37 +5,33 @@
"http://java.sun.com/j2ee/dtds/web-app_2.3.dtd";>
<web-app>
- <servlet>
- <servlet-name>
- @PROJECT@
- </servlet-name>
- <servlet-class>
- org.apache.turbine.Turbine
- </servlet-class>
-
- <init-param>
- <param-name>properties</param-name>
- <!-- This is relative to the docBase -->
- <param-value>
- /WEB-INF/conf/TurbineResources.properties
- </param-value>
- </init-param>
- </servlet>
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>templates</web-resource-name>
- <url-pattern>/templates/*</url-pattern>
- </web-resource-collection>
- <web-resource-collection>
- <web-resource-name>logs</web-resource-name>
- <url-pattern>/logs/*</url-pattern>
- </web-resource-collection>
- <auth-constraint>
- <role-name>admin</role-name>
- </auth-constraint>
- </security-constraint>
- <login-config>
- <auth-method>BASIC</auth-method>
- <realm-name>Templates</realm-name>
- </login-config>
+ <servlet>
+ <servlet-name>@PROJECT@</servlet-name>
+ <servlet-class>org.apache.turbine.Turbine</servlet-class>
+ <init-param>
+ <param-name>applicationRoot</param-name>
+ <param-value>@APP_ROOT@</param-value>
+ </init-param>
+ <init-param>
+ <param-name>properties</param-name>
+ <param-value>@APP_PROPERTIES@</param-value>
+ </init-param>
+ </servlet>
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>templates</web-resource-name>
+ <url-pattern>/templates/*</url-pattern>
+ </web-resource-collection>
+ <web-resource-collection>
+ <web-resource-name>logs</web-resource-name>
+ <url-pattern>/logs/*</url-pattern>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>admin</role-name>
+ </auth-constraint>
+ </security-constraint>
+ <login-config>
+ <auth-method>BASIC</auth-method>
+ <realm-name>Templates</realm-name>
+ </login-config>
</web-app>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
