Revision: 4674
Author: [email protected]
Date: Sun Dec 4 22:19:15 2011
Log: - build file is corrected to take db provider as parameter
(default to derby)
http://code.google.com/p/openmeetings/source/detail?r=4674
Deleted:
/trunk/singlewebapp/src/META-INF/persistence.xml
Modified:
/trunk/singlewebapp/build.xml
=======================================
--- /trunk/singlewebapp/src/META-INF/persistence.xml Sun Dec 4 06:44:54
2011
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- persistence.xml schema -->
-<persistence xmlns="http://java.sun.com/xml/ns/persistence";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"; version="2.0">
- <persistence-unit name="openmeetings"
transaction-type="RESOURCE_LOCAL">
-
<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-
<class>org.openmeetings.app.persistence.beans.adresses.Adresses</class>
-
<class>org.openmeetings.app.persistence.beans.adresses.States</class>
-
<class>org.openmeetings.app.persistence.beans.basic.Configuration</class>
-
<class>org.openmeetings.app.persistence.beans.basic.ErrorType</class>
-
<class>org.openmeetings.app.persistence.beans.basic.ErrorValues</class>
-
<class>org.openmeetings.app.persistence.beans.basic.LdapConfig</class>
-
<class>org.openmeetings.app.persistence.beans.basic.Naviglobal</class>
-
<class>org.openmeetings.app.persistence.beans.basic.Navimain</class>
- <class>org.openmeetings.app.persistence.beans.basic.Navisub</class>
-
<class>org.openmeetings.app.persistence.beans.basic.OmTimeZone</class>
-
<class>org.openmeetings.app.persistence.beans.basic.Sessiondata</class>
-
<class>org.openmeetings.app.persistence.beans.basic.SOAPLogin</class>
-
<class>org.openmeetings.app.persistence.beans.calendar.Appointment</class>
-
<class>org.openmeetings.app.persistence.beans.calendar.AppointmentCategory</class>
-
<class>org.openmeetings.app.persistence.beans.calendar.AppointmentReminderTyps</class>
-
<class>org.openmeetings.app.persistence.beans.calendar.MeetingMember</class>
-
<class>org.openmeetings.app.persistence.beans.domain.Organisation</class>
-
<class>org.openmeetings.app.persistence.beans.domain.Organisation_Users</class>
-
<class>org.openmeetings.app.persistence.beans.flvrecord.FlvRecording</class>
-
<class>org.openmeetings.app.persistence.beans.flvrecord.FlvRecordingLog</class>
-
<class>org.openmeetings.app.persistence.beans.flvrecord.FlvRecordingMetaData</class>
-
<class>org.openmeetings.app.persistence.beans.flvrecord.FlvRecordingMetaDelta</class>
-
<class>org.openmeetings.app.persistence.beans.invitation.Invitations</class>
-
<class>org.openmeetings.app.persistence.beans.lang.FieldLanguage</class>
-
<class>org.openmeetings.app.persistence.beans.lang.Fieldlanguagesvalues</class>
-
<class>org.openmeetings.app.persistence.beans.lang.Fieldvalues</class>
-
<class>org.openmeetings.app.persistence.beans.logs.ConferenceLog</class>
-
<class>org.openmeetings.app.persistence.beans.logs.ConferenceLogType</class>
- <class>org.openmeetings.app.persistence.beans.poll.PollType</class>
- <class>org.openmeetings.app.persistence.beans.poll.RoomPoll</class>
-
<class>org.openmeetings.app.persistence.beans.poll.RoomPollAnswers</class>
-
<class>org.openmeetings.app.persistence.beans.recording.ChatvaluesEvent</class>
-
<class>org.openmeetings.app.persistence.beans.recording.Recording</class>
-
<class>org.openmeetings.app.persistence.beans.recording.RecordingClient</class>
-
<class>org.openmeetings.app.persistence.beans.recording.RecordingConversionJob</class>
-
<class>org.openmeetings.app.persistence.beans.recording.RoomClient</class>
-
<class>org.openmeetings.app.persistence.beans.recording.RoomRecording</class>
-
<class>org.openmeetings.app.persistence.beans.recording.RoomStream</class>
-
<class>org.openmeetings.app.persistence.beans.recording.WhiteBoardEvent</class>
-
<class>org.openmeetings.app.persistence.beans.rooms.RoomModerators</class>
- <class>org.openmeetings.app.persistence.beans.rooms.Rooms</class>
-
<class>org.openmeetings.app.persistence.beans.rooms.RoomTypes</class>
-
<class>org.openmeetings.app.persistence.beans.rooms.Rooms_Organisation</class>
-
<class>org.openmeetings.app.persistence.beans.sip.OpenXGReturnObject</class>
-
<class>org.openmeetings.app.persistence.beans.user.PrivateMessages</class>
-
<class>org.openmeetings.app.persistence.beans.user.PrivateMessageFolder</class>
-
<class>org.openmeetings.app.persistence.beans.user.Salutations</class>
-
<class>org.openmeetings.app.persistence.beans.user.UserContacts</class>
- <class>org.openmeetings.app.persistence.beans.user.Userdata</class>
-
<class>org.openmeetings.app.persistence.beans.user.Usergroups</class>
-
<class>org.openmeetings.app.persistence.beans.user.Userlevel</class>
-
<class>org.openmeetings.app.persistence.beans.user.Users_Usergroups</class>
-
<class>org.openmeetings.app.persistence.beans.user.UserSipData</class>
- <class>org.openmeetings.app.persistence.beans.user.Users</class>
-
<class>org.openmeetings.app.persistence.beans.files.FileExplorerItem</class>
- <exclude-unlisted-classes>false</exclude-unlisted-classes>
- <properties>
- <property name="openjpa.ConnectionProperties"
- value="DriverClassName=org.apache.derby.jdbc.ClientDriver,
- Url=jdbc:derby:openmeetings;create=true,
- create=true,
- MaxActive=100,
- MaxWait=10000,
- TestOnBorrow=true,
- Username=user,
- Password=secret" />
- <property name="openjpa.jdbc.SynchronizeMappings"
value="buildSchema" />
- <property name="openjpa.RuntimeUnenhancedClasses"
value="unsupported" />
- <property name="openjpa.Log" value="DefaultLevel=WARN,
Tool=INFO" />
- <property name="openjpa.ConnectionDriverName"
value="org.apache.commons.dbcp.BasicDataSource" />
- <property name="openjpa.DataCache" value="true" />
- <property name="openjpa.QueryCache" value="true" />
- <property name="openjpa.jdbc.DBDictionary"
value="batchLimit=100" />
- <property name="openjpa.jdbc.QuerySQLCache" value="false" />
- </properties>
- </persistence-unit>
-</persistence>
=======================================
--- /trunk/singlewebapp/build.xml Mon Nov 21 08:18:02 2011
+++ /trunk/singlewebapp/build.xml Sun Dec 4 22:19:15 2011
@@ -157,6 +157,10 @@
<mkdir dir="${main.out.dir}" />
</target>
+ <condition property="db.provider" value="${db}" else="derby">
+ <isset property="db" />
+ </condition>
+
<!-- Check timestamp on files -->
<target name="prepare" depends="prepare.mkdir">
<copy todir="${screenshare.out.dir}" filtering="true">
@@ -228,17 +232,18 @@
<exclude name="services.xml"/>
</fileset>
</copy>
+ <copy file="src/META-INF/${db.provider}_persistence.xml"
+
tofile="${dist.webapps.dir}/WEB-INF/classes/META-INF/persistence.xml"/>
+
<chmod dir="${dist.webapps.dir}/WEB-INF/lib" perm="755"
includes="**/*.sh"/>
<!-- add language files from .war version -->
<copy todir="${dist.webapps.dir}/languages">
- <fileset dir="WebContent/languages">
- </fileset>
+ <fileset dir="WebContent/languages"/>
</copy>
<copy todir="${dist.webapps.dir}/conf">
- <fileset dir="WebContent/conf">
- </fileset>
+ <fileset dir="WebContent/conf"/>
</copy>
<!-- add templates
@@ -580,7 +585,7 @@
<!-- invoke the enhancer -->
<openjpac>
<classpath refid="jpa.enhancement.classpath"/>
- <config propertiesFile="src/META-INF/persistence.xml"/>
+ <config
propertiesFile="src/META-INF/${db.provider}_persistence.xml"/>
</openjpac>
<echo message="Enhancing complete."/>
</target>
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
