Revision: 2547 Author: seba.wagner Date: Tue Oct 27 08:01:22 2009 Log: Fixes: Binary SWFs up to date Copy hibernate conf for webapp always from same place http://code.google.com/p/openmeetings/source/detail?r=2547
Deleted: /trunk/singlewebapp/webapp/openmeetings/conf/any_hibernate.cfg.xml /trunk/singlewebapp/webapp/openmeetings/conf/mysql_hibernate.cfg.xml /trunk/singlewebapp/webapp/openmeetings/conf/om_ldap.cfg /trunk/singlewebapp/webapp/openmeetings/conf/postgres_hibernate.cfg.xml Modified: /trunk/singlewebapp/WebContent/openmeetings/main.lzx.swf8.swf /trunk/singlewebapp/WebContent/openmeetings/maindebug.lzx.swf8.swf /trunk/singlewebapp/build_red5webapp.xml ======================================= --- /trunk/singlewebapp/webapp/openmeetings/conf/any_hibernate.cfg.xml Mon Oct 26 14:00:36 2009 +++ /dev/null @@ -1,87 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-configuration PUBLIC "-//Hibernate/Hibernate Configuration DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd";> - -<!-- Generated file - Do not edit! --> - -<hibernate-configuration> - - <!-- a SessionFactory instance listed as /jndi/name --> - <session-factory> - - <!-- User / Password --> - <property name="connection.username">postgres</property> - <property name="connection.password">67810</property> - - <!-- Database Settings --> - <property name="connection.driver_class">org.postgresql.Driver</property> - <property name="dialect">org.hibernate.dialect.PostgreSQLDialect</property> - <property name="connection.url">jdbc:postgresql://localhost/openmeetings</property> - - <property name="hibernate.connection.CharSet">utf8</property> - <property name="hibernate.connection.characterEncoding">utf8</property> - <property name="hibernate.connection.useUnicode">true</property> - - <!-- Database Scheme Auto Update --> - <property name="hbm2ddl.auto">update</property> - - <!-- properties --> - - <property name="show_sql">false</property> - <property name="use_outer_join">false</property> - <property name="hibernate.query.factory_class">org.hibernate.hql.ast.ASTQueryTranslatorFactory</property> - <property name="connection.provider_class ">org.hibernate.connection.C3P0ConnectionProvider</property> - <property name="cache.provider_class">org.hibernate.cache.NoCacheProvider </property> - <property name="cache.use_query_cache">false</property> - <property name="cache.use_second_level_cache">false</property> - <property name="generate_statistics">false</property> - <property name="cache.use_structured_entries">false</property> - - - <property name="c3p0.max_size">20</property> - <property name="c3p0.min_size">2</property> - <property name="c3p0.max_statements">100</property> - <property name="c3p0.timeout">3600</property> - - <!-- mapping files --> - <mapping resource="org/openmeetings/app/hibernate/beans/adresses/Adresses.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/adresses/States.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/basic/Configuration.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/basic/ErrorType.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/basic/ErrorValues.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/basic/Naviglobal.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/basic/Navimain.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/basic/Navisub.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/basic/Sessiondata.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/calendar/Appointment.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/calendar/AppointmentCategory.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/calendar/AppointmentReminderTyps.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/calendar/MeetingMember.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/domain/Organisation.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/domain/Organisation_Users.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/files/FileExplorerItem.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/invitation/Invitations.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/lang/FieldLanguage.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/lang/Fieldlanguagesvalues.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/lang/Fieldvalues.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/logs/ConferenceLog.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/logs/ConferenceLogType.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/recording/ChatvaluesEvent.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/recording/Recording.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/recording/RecordingClient.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/recording/RecordingConversionJob.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/recording/RoomClient.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/recording/RoomRecording.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/recording/RoomStream.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/recording/WhiteBoardEvent.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/rooms/RoomTypes.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/rooms/Rooms.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/rooms/Rooms_Organisation.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/user/Salutations.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/user/Userdata.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/user/Usergroups.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/user/Userlevel.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/user/Users.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/user/Users_Usergroups.hbm.xml"/> - </session-factory> - -</hibernate-configuration> ======================================= --- /trunk/singlewebapp/webapp/openmeetings/conf/mysql_hibernate.cfg.xml Mon Oct 26 14:00:36 2009 +++ /dev/null @@ -1,93 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-configuration PUBLIC "-//Hibernate/Hibernate Configuration DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd";> - -<!-- Generated file - Do not edit! --> - -<hibernate-configuration> - - <!-- a SessionFactory instance listed as /jndi/name --> - <session-factory> - - <!-- User / Password --> - <property name="connection.username">root</property> - <property name="connection.password"></property> - - <!-- Database Settings --> - <property name="connection.driver_class">com.mysql.jdbc.Driver</property> - <!-- for performance reasons changed to MyISAM from org.hibernate.dialect.MySQLInnoDBDialect --> - <property name="dialect">org.hibernate.dialect.MySQLMyISAMDialect</property> - <property name="connection.url">jdbc:mysql://localhost/openmeetings?autoReconnect=true&useUnicode=true&createDatabaseIfNotExist=true&characterEncoding=utf-8</property> - - <property name="hibernate.connection.CharSet">utf8</property> - <property name="hibernate.connection.characterEncoding">utf8</property> - <property name="hibernate.connection.useUnicode">true</property> - - - <!-- Database Scheme Auto Update --> - <property name="hbm2ddl.auto">update</property> - - <!-- properties --> - - <property name="show_sql">false</property> - <property name="use_outer_join">false</property> - <property name="hibernate.query.factory_class">org.hibernate.hql.ast.ASTQueryTranslatorFactory</property> - <property name="hibernate.connection.provider_class">org.hibernate.connection.C3P0ConnectionProvider</property> - <!-- - <property name="connection.provider_class ">org.hibernate.connection.C3P0ConnectionProvider</property> - --> - <property name="hibernate.cache.provider_class">org.hibernate.cache.NoCacheProvider</property> - <property name="hibernate.cache.use_query_cache">false</property> - <property name="hibernate.cache.use_second_level_cache">false</property> - <property name="hibernate.generate_statistics">false</property> - <property name="hibernate.cache.use_structured_entries">false</property> - - - <property name="c3p0.max_size">20</property> - <property name="c3p0.min_size">2</property> - <property name="c3p0.idle_test_period">100</property> - <property name="c3p0.max_statements">100</property> - <property name="c3p0.timeout">100</property> - - <!-- mapping files --> - <mapping resource="org/openmeetings/app/hibernate/beans/adresses/Adresses.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/adresses/States.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/basic/Configuration.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/basic/ErrorType.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/basic/ErrorValues.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/basic/Naviglobal.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/basic/Navimain.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/basic/Navisub.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/basic/Sessiondata.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/calendar/Appointment.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/calendar/AppointmentCategory.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/calendar/AppointmentReminderTyps.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/calendar/MeetingMember.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/domain/Organisation.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/domain/Organisation_Users.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/files/FileExplorerItem.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/invitation/Invitations.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/lang/FieldLanguage.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/lang/Fieldlanguagesvalues.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/lang/Fieldvalues.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/logs/ConferenceLog.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/logs/ConferenceLogType.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/recording/ChatvaluesEvent.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/recording/Recording.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/recording/RecordingClient.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/recording/RecordingConversionJob.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/recording/RoomClient.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/recording/RoomRecording.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/recording/RoomStream.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/recording/WhiteBoardEvent.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/rooms/RoomTypes.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/rooms/Rooms.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/rooms/Rooms_Organisation.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/user/Salutations.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/user/Userdata.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/user/Usergroups.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/user/Userlevel.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/user/Users.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/user/Users_Usergroups.hbm.xml"/> - </session-factory> - -</hibernate-configuration> ======================================= --- /trunk/singlewebapp/webapp/openmeetings/conf/om_ldap.cfg Mon Oct 26 14:00:36 2009 +++ /dev/null @@ -1,22 +0,0 @@ -#ConfigurationFile for LDAP Auth -#ConfigKey 'ldap_config_path' must be set in DataBase Configration of OM and point to this file -#o.becherer,14.01.2009 - -#LDAP URL -ldap_conn_url=ldap://dc2.medint.local:389 - -#Login distinguished name (DN) for Authentification on LDAP Server - keep emtpy if not requiered -ldap_admin_dn=CN:dummy,OU:external users,OU:Other,DC:medint,DC:local - -#Loginpass for Authentification on LDAP Server - keep emtpy if not requiered -ldap_passwd=dummy07 - -#base to search for userdata(of user, that wants to login -ldap_search_base=OU:Company,DC:medint,DC:local - -# Fieldnames (can differ between Ldap servers) -field_user_principal=userPrincipalName - -# Ldap auth type(SIMPLE,NONE) -ldap_auth_type=SIMPLE - ======================================= --- /trunk/singlewebapp/webapp/openmeetings/conf/postgres_hibernate.cfg.xml Mon Oct 26 14:00:36 2009 +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-configuration PUBLIC "-//Hibernate/Hibernate Configuration DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd";> -<!-- Generated file - Do not edit! --> -<hibernate-configuration> - <!-- a SessionFactory instance listed as /jndi/name --> - <session-factory name=""> - <!-- User / Password --> - <property name="connection.username">postgres</property> - <property name="connection.password">postgres</property> - <!-- Database Settings --> - <property name="connection.driver_class">org.postgresql.Driver</property> - <property name="dialect">org.hibernate.dialect.PostgreSQLDialect</property> - <property name="connection.url">jdbc:postgresql://localhost/openmeetings</property> - <property name="hibernate.connection.CharSet">utf8</property> - <property name="hibernate.connection.characterEncoding">utf8</property> - <property name="hibernate.connection.useUnicode">true</property> - <!-- Database Scheme Auto Update --> - <property name="hbm2ddl.auto">update</property> - <!-- properties --> - <property name="show_sql">false</property> - <property name="use_outer_join">false</property> - <property name="hibernate.query.factory_class">org.hibernate.hql.ast.ASTQueryTranslatorFactory</property> - <property name="connection.provider_class ">org.hibernate.connection.C3P0ConnectionProvider</property> - <property name="cache.provider_class">org.hibernate.cache.NoCacheProvider</property> - <property name="cache.use_query_cache">false</property> - <property name="cache.use_second_level_cache">false</property> - <property name="generate_statistics">false</property> - <property name="cache.use_structured_entries">false</property> - <property name="c3p0.max_size">20</property> - <property name="c3p0.min_size">2</property> - <property name="c3p0.max_statements">100</property> - <property name="c3p0.timeout">3600</property> - <!-- mapping files --> - <mapping resource="org/openmeetings/app/hibernate/beans/adresses/Adresses.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/adresses/States.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/basic/Configuration.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/basic/ErrorType.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/basic/ErrorValues.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/basic/Naviglobal.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/basic/Navimain.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/basic/Navisub.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/basic/Sessiondata.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/calendar/Appointment.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/calendar/AppointmentCategory.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/calendar/AppointmentReminderTyps.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/calendar/MeetingMember.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/domain/Organisation.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/domain/Organisation_Users.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/files/FileExplorerItem.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/invitation/Invitations.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/lang/FieldLanguage.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/lang/Fieldlanguagesvalues.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/lang/Fieldvalues.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/logs/ConferenceLog.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/logs/ConferenceLogType.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/recording/ChatvaluesEvent.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/recording/Recording.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/recording/RecordingClient.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/recording/RecordingConversionJob.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/recording/RoomClient.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/recording/RoomRecording.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/recording/RoomStream.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/recording/WhiteBoardEvent.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/rooms/RoomTypes.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/rooms/Rooms.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/rooms/Rooms_Organisation.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/user/Salutations.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/user/Userdata.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/user/Usergroups.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/user/Userlevel.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/user/Users.hbm.xml"/> - <mapping resource="org/openmeetings/app/hibernate/beans/user/Users_Usergroups.hbm.xml"/> - </session-factory> -</hibernate-configuration> ======================================= --- /trunk/singlewebapp/WebContent/openmeetings/main.lzx.swf8.swf Tue Oct 27 02:06:34 2009 +++ /trunk/singlewebapp/WebContent/openmeetings/main.lzx.swf8.swf Tue Oct 27 08:01:22 2009 Binary file, no diff available. ======================================= --- /trunk/singlewebapp/WebContent/openmeetings/maindebug.lzx.swf8.swf Tue Oct 27 02:06:34 2009 +++ /trunk/singlewebapp/WebContent/openmeetings/maindebug.lzx.swf8.swf Tue Oct 27 08:01:22 2009 File is too large to display a diff. ======================================= --- /trunk/singlewebapp/build_red5webapp.xml Tue Oct 27 02:06:34 2009 +++ /trunk/singlewebapp/build_red5webapp.xml Tue Oct 27 08:01:22 2009 @@ -242,6 +242,10 @@ <fileset dir="WebContent/languages"> </fileset> </copy> + <copy todir="${dist.dir}/openmeetings/conf"> + <fileset dir="WebContent/conf"> + </fileset> + </copy> <!-- add compiled versions of openmeetings SWF to release You have to manually copy those ressources out of the Temp directory of Eclipse!! --> --~--~---------~--~----~------------~-------~--~----~ 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 -~----------~----~----~----~------~----~------~--~---
