Author: sebawagner
Date: Mon Jul 9 17:10:19 2012
New Revision: 1359290
URL: http://svn.apache.org/viewvc?rev=1359290&view=rev
Log:
Merge r1355964 to 2.0 branch
Added:
incubator/openmeetings/branches/2.0/src/META-INF/persistence.xml
Removed:
incubator/openmeetings/branches/2.0/WebContent/red5/client_rtmpt_patch/RTMPTClient.java
incubator/openmeetings/branches/2.0/WebContent/red5/client_rtmpt_patch/RTMPTClientConnector.java
Modified:
incubator/openmeetings/branches/2.0/build.properties
incubator/openmeetings/branches/2.0/build.xml
incubator/openmeetings/branches/2.0/docs/BuildInstructions.html
incubator/openmeetings/branches/2.0/xdocs/BuildInstructions.xml
Modified: incubator/openmeetings/branches/2.0/build.properties
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/branches/2.0/build.properties?rev=1359290&r1=1359289&r2=1359290&view=diff
==============================================================================
--- incubator/openmeetings/branches/2.0/build.properties (original)
+++ incubator/openmeetings/branches/2.0/build.properties Mon Jul 9 17:10:19
2012
@@ -1,7 +1,7 @@
project.version=2.0.0
project.status=SNAPSHOT
-red5.server.revision=4385
-red5.client.revision=4385
+red5.server.revision=4387
+red5.client.revision=4387
laszlo.debug=false
laszlo.proxied=solo
db=derby
Modified: incubator/openmeetings/branches/2.0/build.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/branches/2.0/build.xml?rev=1359290&r1=1359289&r2=1359290&view=diff
==============================================================================
--- incubator/openmeetings/branches/2.0/build.xml (original)
+++ incubator/openmeetings/branches/2.0/build.xml Mon Jul 9 17:10:19 2012
@@ -789,8 +789,6 @@
<checkout
url="http://red5.googlecode.com/svn/java/client/trunk/";
revision="${red5.client.revision}" destPath="${red5.client.dir}" />
</svn>
<copy file="${red5.lib}/red5.jar"
todir="${red5.client.dir}/lib" overwrite="true" force="true" />
- <copy
file="${webcontent.src.dir}/red5/client_rtmpt_patch/RTMPTClient.java"
todir="${red5.client.dir}/src/org/red5/client/net/rtmpt" overwrite="true"
force="true" />
- <copy
file="${webcontent.src.dir}/red5/client_rtmpt_patch/RTMPTClientConnector.java"
todir="${red5.client.dir}/src/org/red5/client/net/rtmpt" overwrite="true"
force="true" />
<subant target="dist">
<fileset dir="${red5.client.dir}" includes="build.xml"
/>
</subant>
Modified: incubator/openmeetings/branches/2.0/docs/BuildInstructions.html
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/branches/2.0/docs/BuildInstructions.html?rev=1359290&r1=1359289&r2=1359290&view=diff
==============================================================================
--- incubator/openmeetings/branches/2.0/docs/BuildInstructions.html (original)
+++ incubator/openmeetings/branches/2.0/docs/BuildInstructions.html Mon Jul 9
17:10:19 2012
@@ -946,7 +946,18 @@ limitations under the License.
</td></tr>
<tr><td>
<blockquote>
- <p>Get the source: </p>
+ <p>
+ Required Software to build:
+ <ul>
+ <li>Sun Java JDK6</li>
+ <li>Apache ANT 1.8.3 or later</li>
+ <li>
+ SVN Command line client
(Subversion 1.7 required!)
+ <a
href="http://subversion.apache.org/packages.html"; target="_BLANK"
rel="nofollow">http://subversion.apache.org/packages.html</a>
+ </li>
+ </ul>
+ </p>
+ <p>Get the source: </p>
<div class="xmlcode">
svn checkout
https://svn.apache.org/repos/asf/incubator/openmeetings/trunk/singlewebapp/
@@ -966,10 +977,12 @@ limitations under the License.
</span>
<br />
ant compile.laszlo.main
- <span style="margin-left: 70px;"># compiles the
client into main.as3.swf10.swf and main.swf8.swf</span>
+ <span style="margin-left: 70px;"># compiles the
client into main.as3.swf10.swf and
+ main.swf8.swf</span>
<br />
ant compile.laszlo.main.debug
- <span style="margin-left: 30px;"># compiles the
debug-client into maindebug.as3.swf10.swf andmaindebug.swf8.swf
+ <span style="margin-left: 30px;"># compiles the
debug-client into
+ maindebug.as3.swf10.swf
andmaindebug.swf8.swf
</span>
<br />
ant -Ddb=<name of DB>
@@ -1038,8 +1051,10 @@ limitations under the License.
Marketplace)
</li>
<li>
- Apache IvyDE For Eclipse
(installable via Help > Install New Software)
- URL:
http://www.apache.org/dist/ant/ivyde/updatesite detailed steps can be found
here:
+ Apache IvyDE For Eclipse
(installable via Help > Install
+ New Software)
+ URL:
http://www.apache.org/dist/ant/ivyde/updatesite
+ detailed steps can be found
here:
<a
href="http://ant.apache.org/ivy/ivyde/download.cgi"; target="_BLANK"
rel="nofollow">http://ant.apache.org/ivy/ivyde/download.cgi</a>
</li>
<li>MySQL (or Postgres, or other
Databases supported by Hibernate)
Added: incubator/openmeetings/branches/2.0/src/META-INF/persistence.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/branches/2.0/src/META-INF/persistence.xml?rev=1359290&view=auto
==============================================================================
--- incubator/openmeetings/branches/2.0/src/META-INF/persistence.xml (added)
+++ incubator/openmeetings/branches/2.0/src/META-INF/persistence.xml Mon Jul 9
17:10:19 2012
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<!-- 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.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.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.Userlevel</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>
+
<class>org.openmeetings.app.persistence.beans.sip.asterisk.AsteriskSipUsers</class>
+
<class>org.openmeetings.app.persistence.beans.sip.asterisk.Extensions</class>
+
<class>org.openmeetings.app.persistence.beans.sip.asterisk.MeetMe</class>
+ <exclude-unlisted-classes>false</exclude-unlisted-classes>
+ <properties>
+ <property name="openjpa.RuntimeUnenhancedClasses"
value="unsupported" />
+ <property name="openjpa.ConnectionDriverName"
value="org.apache.commons.dbcp.BasicDataSource" />
+ <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.Log" value="DefaultLevel=WARN, Tool=INFO"
/>
+ <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>
Modified: incubator/openmeetings/branches/2.0/xdocs/BuildInstructions.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/branches/2.0/xdocs/BuildInstructions.xml?rev=1359290&r1=1359289&r2=1359290&view=diff
==============================================================================
--- incubator/openmeetings/branches/2.0/xdocs/BuildInstructions.xml (original)
+++ incubator/openmeetings/branches/2.0/xdocs/BuildInstructions.xml Mon Jul 9
17:10:19 2012
@@ -21,7 +21,8 @@
<p>
You can find Nightly Builds of the software at:
- <a
href="https://builds.apache.org/job/openmeetings/"; rel="nofollow"
target="_BLANK">
+ <a
href="https://builds.apache.org/job/openmeetings/"; rel="nofollow"
+ target="_BLANK">
https://builds.apache.org/job/openmeetings/
</a>
</p>
@@ -29,6 +30,18 @@
</section>
<section name="How to Build a Distribution">
+ <p>
+ Required Software to build:
+ <ul>
+ <li>Sun Java JDK6</li>
+ <li>Apache ANT 1.8.3 or later</li>
+ <li>
+ SVN Command line client
(Subversion 1.7 required!)
+ <a
href="http://subversion.apache.org/packages.html"; target="_BLANK"
+
rel="nofollow">http://subversion.apache.org/packages.html</a>
+ </li>
+ </ul>
+ </p>
<p>Get the source: </p>
<div class="xmlcode">
svn checkout
@@ -49,10 +62,12 @@
</span>
<br />
ant compile.laszlo.main
- <span style="margin-left: 70px;"># compiles the
client into main.as3.swf10.swf and main.swf8.swf</span>
+ <span style="margin-left: 70px;"># compiles the
client into main.as3.swf10.swf and
+ main.swf8.swf</span>
<br />
ant compile.laszlo.main.debug
- <span style="margin-left: 30px;"># compiles the
debug-client into maindebug.as3.swf10.swf andmaindebug.swf8.swf
+ <span style="margin-left: 30px;"># compiles the
debug-client into
+ maindebug.as3.swf10.swf
andmaindebug.swf8.swf
</span>
<br />
ant -Ddb=<name of DB>
@@ -107,9 +122,12 @@
Marketplace)
</li>
<li>
- Apache IvyDE™ For Eclipse
(installable via Help > Install New Software)
- URL:
http://www.apache.org/dist/ant/ivyde/updatesite detailed steps can be found
here:
- <a
href="http://ant.apache.org/ivy/ivyde/download.cgi"; target="_BLANK"
rel="nofollow">http://ant.apache.org/ivy/ivyde/download.cgi</a>
+ Apache IvyDE™ For Eclipse
(installable via Help > Install
+ New Software)
+ URL:
http://www.apache.org/dist/ant/ivyde/updatesite
+ detailed steps can be found
here:
+ <a
href="http://ant.apache.org/ivy/ivyde/download.cgi"; target="_BLANK"
+
rel="nofollow">http://ant.apache.org/ivy/ivyde/download.cgi</a>
</li>
<li>MySQL (or Postgres, or other
Databases supported by Hibernate)
are optionally but handy to
have them
@@ -270,14 +288,16 @@
href="http://www.openlaszlo.org/lps4.2/laszlo-explorer/index.jsp?lzr=swf8";
target="_BLANK"
rel="nofollow">Laszlo-in-10-Minutes</a>
and the
- <a
href="http://www.openlaszlo.org/lps4.2/docs/"; target="_BLANK"
rel="nofollow">Application
+ <a
href="http://www.openlaszlo.org/lps4.2/docs/"; target="_BLANK"
+ rel="nofollow">Application
Developer's Guide
</a>
or try the
- <a
href="http://www.openlaszlo.org/getstarted"; target="_BLANK"
rel="nofollow">ScreenCast</a>
+ <a
href="http://www.openlaszlo.org/getstarted"; target="_BLANK"
+ rel="nofollow">ScreenCast</a>
</li>
<li>
- <a
href="http://incubator.apache.org/openmeetings/svn.html"; >
+ <a
href="http://incubator.apache.org/openmeetings/svn.html";>
browse SVN source
</a>
</li>
