Update of /var/cvs/contributions/didactor2
In directory james.mmbase.org:/tmp/cvs-serv1855
Modified Files:
configure.xml
Log Message:
drasticly simplified. MMbase 1.9 allows all these things to be easily
configured outside the web-app, An example of that should suffice. That would
not be more complex as a build.properties you need now.
See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2
Index: configure.xml
===================================================================
RCS file: /var/cvs/contributions/didactor2/configure.xml,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- configure.xml 24 Jan 2008 15:12:41 -0000 1.37
+++ configure.xml 25 Jul 2008 11:50:44 -0000 1.38
@@ -22,44 +22,6 @@
<property file="build.properties"/>
<property file="configure.properties"/>
- <!-- reasonable defaults : -->
- <property name="jdbc.supportclass"
value="org.mmbase.module.database.DatabaseSupportShim" />
- <property name="jdbc.querys" value="-1" />
- <property name="jdbc.probetime" value="30" />
- <property name="jdbc.password" value="" />
- <property name="jdbc.connections" value="20" />
-
-
- <property name="chat.server.logfile"
value="${catalina.base}/logs/ircserver.log" />
- <property name="chat.engine.logfile"
value="${catalina.base}/logs/ircengine.log" />
-
- <property name="chat.internal.port" value="5557" />
- <property name="chat.external.flashport" value="5557" />
- <property name="chat.external.ircport" value="6667" />
-
-
- <!-- defaults to mysql (should be hsql?) -->
- <property name="jdbc.url"
value="jdbc:mysql://$HOST:$PORT/$DBM?useUnicode=true&amp;characterEncoding=UTF-8"
/>
- <property name="jdbc.port" value="3306" />
- <property name="jdbc.driver" value="com.mysql.jdbc.Driver" />
-
- <property name="imageconvert.converterroot" value="" />
- <property name="imageconvert.convertercommand" value="convert" />
-
-
- <property name="mmbase.logdir" value="${catalina.base}/logs" />
- <property name="mmbase.logfile" value="didactor" />
- <property name="mmbaseroot.database" value="" />
- <property name="mmbaseroot.basename" value="mmb" />
- <property name="mmbaseroot.language" value="en" />
- <property name="mmbaseroot.datadir" value="" />
-
- <property name="wizards.pages.text.ftype" value="html" />
-
- <property name="build.webapp.dir" value="${build.dir}/webapp" />
- <property name="build.config.dir" value="${build.webapp.dir}/WEB-INF/config"
/>
- <property name="build.wizards.dir" value="${build.webapp.dir}/editwizards" />
- <property name="caches" value="" />
<target name="config" description="Configure the didactor instance with the
values from the properties file">
<tstamp>
@@ -75,76 +37,6 @@
token="$${war.time}"
value="${war.time}"/>
- <replace file="${build.config.dir}/log/log4j.xml"
- token="$${mmbase.logdir}"
- value="${mmbase.logdir}"/>
- <replace file="${build.config.dir}/log/log4j.xml"
- token="$${mmbase.logfile}"
- value="${mmbase.logfile}"/>
- <replace file="${build.config.dir}/modules/jdbc.xml"
- token="$${jdbc.password}"
- value="${jdbc.password}"/>
- <replace file="${build.config.dir}//modules/jdbc.xml"
- token="$${jdbc.port}"
- value="${jdbc.port}"/>
- <replace file="${build.config.dir}/modules/jdbc.xml"
- token="$${jdbc.supportclass}"
- value="${jdbc.supportclass}"/>
- <replace file="${build.config.dir}/modules/jdbc.xml"
- token="$${jdbc.database}"
- value="${jdbc.database}"/>
- <replace file="${build.config.dir}/modules/jdbc.xml"
- token="$${jdbc.user}"
- value="${jdbc.user}"/>
- <replace file="${build.config.dir}/modules/jdbc.xml"
- token="$${jdbc.connections}"
- value="${jdbc.connections}"/>
- <replace file="${build.config.dir}/modules/jdbc.xml"
- token="$${jdbc.driver}"
- value="${jdbc.driver}"/>
- <replace file="${build.config.dir}/modules/jdbc.xml"
- token="$${jdbc.host}"
- value="${jdbc.host}"/>
- <replace file="${build.config.dir}/modules/jdbc.xml"
- token="$${jdbc.url}"
- value="${jdbc.url}"/>
- <replace file="${build.config.dir}/modules/jdbc.xml"
- token="$${jdbc.querys}"
- value="${jdbc.querys}"/>
- <replace file="${build.config.dir}/modules/jdbc.xml"
- token="$${jdbc.probetime}"
- value="${jdbc.probetime}"/>
- <replace file="${build.config.dir}/modules/mmbaseroot.xml"
- token="$${mmbaseroot.machinename}"
- value="${mmbaseroot.machinename}"/>
- <replace file="${build.config.dir}/modules/mmbaseroot.xml"
- token="$${mmbaseroot.host}"
- value="${mmbaseroot.host}"/>
- <replace file="${build.config.dir}/modules/mmbaseroot.xml"
- token="$${mmbaseroot.database}"
- value="${mmbaseroot.database}"/>
- <replace file="${build.config.dir}/modules/mmbaseroot.xml"
- token="$${mmbaseroot.datadir}"
- value="${mmbaseroot.datadir}"/>
- <replace file="${build.config.dir}/modules/mmbaseroot.xml"
- token="$${mmbaseroot.basename}"
- value="${mmbaseroot.basename}"/>
- <replace file="${build.config.dir}/modules/mmbaseroot.xml"
- token="$${mmbaseroot.multicasthost}"
- value="${mmbaseroot.multicasthost}"/>
- <replace file="${build.config.dir}/modules/mmbaseroot.xml"
- token="$${mmbaseroot.multicastport}"
- value="${mmbaseroot.multicastport}"/>
- <replace file="${build.config.dir}/modules/mmbaseroot.xml"
- token="$${mmbaseroot.language}"
- value="${mmbaseroot.language}"/>
- <replace file="${build.config.dir}/builders/resources/images.xml"
- token="$${imageconvert.converterroot}"
- value="${imageconvert.converterroot}"/>
- <replace file="${build.config.dir}/builders/resources/images.xml"
- token="$${imageconvert.convertercommand}"
- value="${imageconvert.convertercommand}"/>
-
<for list="${caches}"
param="param">
<sequential>
@@ -177,44 +69,6 @@
</sequential>
</for>
- <if>
- <available file="${build.config.dir}/modules/sendmail.xml" />
- <then>
- <replace file="${build.config.dir}/modules/sendmail.xml"
- token="$${sendmail.smarthost}"
- value="${sendmail.smarthost}"/>
- <replace file="${build.config.dir}/modules/sendmail.xml"
- token="$${sendmail.emailsenderdomain}"
- value="${emailsenderdomain}"/>
- </then>
- </if>
- <if>
- <available file="${build.config.dir}/modules/smtpmodule.xml" />
- <then>
- <replace file="${build.config.dir}/modules/smtpmodule.xml"
- token="$${smtpmodule.hostname}"
- value="${smtpmodule.hostname}"/>
- <replace file="${build.config.dir}/modules/smtpmodule.xml"
- token="$${smtpmodule.port}"
- value="${smtpmodule.port}"/>
- <replace file="${build.config.dir}/modules/smtpmodule.xml"
- token="$${smtpmodule.relaydomains}"
- value="${smtpmodule.relaydomains}"/>
- </then>
- </if>
-
- <if>
- <available file="${build.config.dir}/chat/chat.properties" />
- <then>
- <replace file="${build.config.dir}/chat/chat.properties"
- token="$${chat.server.logfile}"
- value="${chat.server.logfile}"/>
- <replace file="${build.config.dir}/chat/chat.properties"
- token="$${chat.engine.logfile}"
- value="${chat.engine.logfile}"/>
- </then>
- </if>
-
<!-- A dirty hack, if you ask me-->
<replace dir="${build.wizards.dir}/data/config"
@@ -224,28 +78,5 @@
includes="**/*.xml"
/>
- <if>
- <available file="${build.dir}/webapp/chat/chat.jsp" />
- <then>
- <replace file="${build.dir}/webapp/chat/chat.jsp"
- token="$${chat.internal.port}"
- value="${chat.internal.port}"/>
- </then>
- </if>
-
- <if>
- <available
file="${build.dir}/webapp/WEB-INF/config/chat/chat.properties" />
- <then>
- <replace file="${build.dir}/webapp/WEB-INF/config/chat/chat.properties"
- token="$${chat.external.flashport}"
- value="${chat.external.flashport}"/>
- <replace file="${build.dir}/webapp/WEB-INF/config/chat/chat.properties"
- token="$${chat.external.ircport}"
- value="${chat.external.ircport}"/>
- </then>
- </if>
-
-
-
</target>
</project>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
