You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2012/04/05 07:50:19 UTC
svn commit: r1309654 - in /incubator/openmeetings/trunk/singlewebapp:
build.properties build.xml
Author: solomax
Date: Thu Apr 5 05:50:19 2012
New Revision: 1309654
URL: http://svn.apache.org/viewvc?rev=1309654&view=rev
Log:
Default DB init is moved to the properties file, redundant properties are removed from build.xml
Modified:
incubator/openmeetings/trunk/singlewebapp/build.properties
incubator/openmeetings/trunk/singlewebapp/build.xml
Modified: incubator/openmeetings/trunk/singlewebapp/build.properties
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/build.properties?rev=1309654&r1=1309653&r2=1309654&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/build.properties (original)
+++ incubator/openmeetings/trunk/singlewebapp/build.properties Thu Apr 5 05:50:19 2012
@@ -1,5 +1,4 @@
project.version=2.0.0
project.status=SNAPSHOT
red5.revision=4315
-
-
+db=derby
Modified: incubator/openmeetings/trunk/singlewebapp/build.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/build.xml?rev=1309654&r1=1309653&r2=1309654&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/build.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/build.xml Thu Apr 5 05:50:19 2012
@@ -160,10 +160,6 @@
<target name="dist-debug" description="binary distribution of OpenMeetings"
depends="clean, jar, compile.laszlo.main.debug, compile.laszlo.main.debug.as3, signWebStartJars, -copy-libraries"/>
- <condition property="db.provider" value="${db}" else="derby">
- <isset property="db" />
- </condition>
-
<!-- Check timestamp on files -->
<target name="prepare" depends="prepare.mkdir">
<copy todir="${red5.root}" filtering="true">
@@ -195,8 +191,8 @@
<exclude name="services.xml" />
</fileset>
</copy>
- <echo message="db.provider == ${db.provider}"/>
- <copy file="src/META-INF/${db.provider}_persistence.xml" tofile="${dist.persistence.dir}/persistence.xml" overwrite="true"/>
+ <echo message="db.provider == ${db}"/>
+ <copy file="src/META-INF/${db}_persistence.xml" tofile="${dist.persistence.dir}/persistence.xml" overwrite="true"/>
<!-- add language files from .war version -->
<copy todir="${dist.webapps.dir}/languages">
@@ -433,7 +429,7 @@
<!-- invoke the enhancer -->
<openjpac>
<classpath refid="jpa.enhancement.classpath" />
- <config propertiesFile="${dist.persistence.dir}/${db.provider}_persistence.xml" />
+ <config propertiesFile="${dist.persistence.dir}/${db}_persistence.xml" />
</openjpac>
<echo message="Enhancing complete." />
</target>
@@ -857,7 +853,7 @@
<antcall target="-retrieve-tools.jar" inheritAll="true" inheritRefs="true"/>
<antcall target="-retrieve-openlaszlo" inheritAll="true" inheritRefs="true"/>
<antcall target="-retrieve-cmdadmin" inheritAll="true" inheritRefs="true"/>
- <echo message="db.provider == ${db.provider}"/>
- <copy file="src/META-INF/${db.provider}_persistence.xml" tofile="src/META-INF/persistence.xml" overwrite="true"/>
+ <echo message="db.provider == ${db}"/>
+ <copy file="src/META-INF/${db}_persistence.xml" tofile="src/META-INF/persistence.xml" overwrite="true"/>
</target>
</project>