Author: solomax
Date: Sat Jan 24 11:43:27 2015
New Revision: 1654495
URL: http://svn.apache.org/r1654495
Log:
Screen-sharing application build is fixed
Added:
openmeetings/branches/3.0.x/src/screenshare/resources/quartz.properties
openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/resources/quartz.properties
Modified:
openmeetings/branches/3.0.x/build.xml
openmeetings/trunk/singlewebapp/openmeetings-screenshare/pom.xml
Modified: openmeetings/branches/3.0.x/build.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/build.xml?rev=1654495&r1=1654494&r2=1654495&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/build.xml (original)
+++ openmeetings/branches/3.0.x/build.xml Sat Jan 24 11:43:27 2015
@@ -330,6 +330,7 @@
<fileset dir="${red5.server.lib}"
includes="spring-beans-*.jar" />
<fileset dir="${red5.server.lib}"
includes="logback*.jar" />
<fileset dir="${red5.server.lib}"
includes="mina-core*.jar" />
+ <fileset dir="${red5.server.lib}"
includes="quartz-*.jar" />
<fileset dir="${red5.server.lib}"
includes="red5-io*.jar" />
<fileset dir="${red5.server.lib}"
includes="red5-server-common*.jar" />
<fileset dir="${red5.client.lib}" includes="red5*.jar"
/>
@@ -503,6 +504,7 @@
<include name="META-INF/NOTICE" />
</fileset>
<fileset
file="${screenshare.resources.dir}/logback.xml" />
+ <fileset file="${screenshare.resources.dir}/quartz.*" />
<manifest>
<attribute name="Built-By" value="OpenMeetings
- http://openmeetings.apache.org"; />
<attribute name="Built-On"
value="${screensharing.build.TODAY}" />
Added: openmeetings/branches/3.0.x/src/screenshare/resources/quartz.properties
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/screenshare/resources/quartz.properties?rev=1654495&view=auto
==============================================================================
--- openmeetings/branches/3.0.x/src/screenshare/resources/quartz.properties
(added)
+++ openmeetings/branches/3.0.x/src/screenshare/resources/quartz.properties Sat
Jan 24 11:43:27 2015
@@ -0,0 +1,13 @@
+# Licensed 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.
+org.quartz.scheduler.instanceName=ScreenSharingScheduler
+org.quartz.threadPool.threadCount=30
\ No newline at end of file
Modified: openmeetings/trunk/singlewebapp/openmeetings-screenshare/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-screenshare/pom.xml?rev=1654495&r1=1654494&r2=1654495&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-screenshare/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-screenshare/pom.xml Sat Jan 24
11:43:27 2015
@@ -195,6 +195,7 @@
<include>org.springframework:spring-context</include>
<include>org.springframework:spring-core</include>
<include>org.springframework:spring-beans</include>
+
<include>org.quartz-scheduler:quartz</include>
</includes>
</dependencies>
<jnlp>
@@ -235,6 +236,7 @@
<include>org.springframework:spring-context</include>
<include>org.springframework:spring-core</include>
<include>org.springframework:spring-beans</include>
+
<include>org.quartz-scheduler:quartz</include>
</includes>
</dependencies>
Added:
openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/resources/quartz.properties
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/resources/quartz.properties?rev=1654495&view=auto
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/resources/quartz.properties
(added)
+++
openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/resources/quartz.properties
Sat Jan 24 11:43:27 2015
@@ -0,0 +1,13 @@
+# Licensed 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.
+org.quartz.scheduler.instanceName=ScreenSharingScheduler
+org.quartz.threadPool.threadCount=30
\ No newline at end of file
