Author: solomax
Date: Mon Mar 5 14:45:04 2012
New Revision: 1297076
URL: http://svn.apache.org/viewvc?rev=1297076&view=rev
Log:
build is corrected to remove duplicate jar; screensharing applet is fixed
Modified:
incubator/openmeetings/trunk/singlewebapp/.classpath
incubator/openmeetings/trunk/singlewebapp/build.xml
incubator/openmeetings/trunk/singlewebapp/src/templates/screenshare.vm
Modified: incubator/openmeetings/trunk/singlewebapp/.classpath
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/.classpath?rev=1297076&r1=1297075&r2=1297076&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/.classpath (original)
+++ incubator/openmeetings/trunk/singlewebapp/.classpath Mon Mar 5 14:45:04
2012
@@ -31,7 +31,6 @@
<classpathentry kind="lib"
path="lib/om/geronimo-saaj_1.3_spec-jar-1.0.1.jar"/>
<classpathentry kind="lib"
path="lib/om/geronimo-stax-api_1.0_spec-bundle-1.0.1.jar"/>
<classpathentry kind="lib"
path="lib/om/geronimo-ws-metadata_2.0_spec-jar-1.1.2.jar"/>
- <classpathentry kind="lib" path="lib/om/httpcore-jar-4.0.jar"/>
<classpathentry kind="lib" path="lib/om/ical4j-bundle-1.0.3.jar"/>
<classpathentry kind="lib" path="lib/om/jaxen-jar-1.1.1.jar"/>
<classpathentry kind="lib" path="lib/om/jsr311-api-jar-1.0.jar"/>
Modified: incubator/openmeetings/trunk/singlewebapp/build.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/build.xml?rev=1297076&r1=1297075&r2=1297076&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/build.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/build.xml Mon Mar 5 14:45:04 2012
@@ -368,18 +368,18 @@
</genkey>
<copy todir="${screenshare.out.dir}" filtering="true">
<fileset dir="${red5-screenshare.images}" />
- <fileset dir="${mainlibs.lib.dir}"
includes="commons-codec*.jar" />
- <fileset dir="${mainlibs.lib.dir}"
includes="httpclient*.jar" />
- <fileset dir="${mainlibs.lib.dir}"
includes="httpcore*.jar" />
- <fileset dir="${mainlibs.lib.dir}"
includes="bcprov-jdk16*.jar" />
- <fileset dir="${mainlibs.lib.dir}"
includes="ehcache-core*.jar" />
- <fileset dir="${mainlibs.lib.dir}"
includes="commons-beanutils*.jar" />
+ <fileset dir="${red5.server.lib}"
includes="commons-codec*.jar" />
+ <fileset dir="${red5.server.lib}"
includes="httpclient*.jar" />
+ <fileset dir="${red5.server.lib}"
includes="httpcore*.jar" />
+ <fileset dir="${red5.server.lib}"
includes="bcprov-jdk16*.jar" />
+ <fileset dir="${red5.server.lib}"
includes="ehcache-core*.jar" />
+ <fileset dir="${red5.server.lib}"
includes="commons-beanutils*.jar" />
<fileset dir="${red5.server.dir}/dist"
includes="red5.jar" />
- <fileset dir="${mainlibs.lib.dir}"
includes="org.springframework.context-*.jar" />
- <fileset dir="${mainlibs.lib.dir}"
includes="org.springframework.core-*.jar" />
- <fileset dir="${mainlibs.lib.dir}"
includes="logback*.jar" />
- <fileset dir="${mainlibs.lib.dir}"
includes="mina-core*.jar" />
- <fileset dir="${mainlibs.lib.dir}"
includes="com.springsource.slf4j.api*.jar" />
+ <fileset dir="${red5.server.lib}"
includes="spring-context-3*.jar" />
+ <fileset dir="${red5.server.lib}"
includes="spring-core-*.jar" />
+ <fileset dir="${red5.server.lib}"
includes="logback*.jar" />
+ <fileset dir="${red5.server.lib}"
includes="mina-core*.jar" />
+ <fileset dir="${red5.server.lib}"
includes="com.springsource.slf4j.api*.jar" />
</copy>
<signjar alias="filetest" keystore="filetest.keystore"
storepass="secret" lazy="false">
<path>
@@ -842,6 +842,7 @@
</antcall>
<delete>
<fileset dir="${om.lib.dir}"
includes="commons-logging*.jar"/>
+ <fileset dir="${om.lib.dir}"
includes="httpcore-jar*.jar"/>
<fileset dir="${om.lib.dir}" includes="*-source*.jar"/>
<fileset dir="${om.lib.dir}" includes="*-javadoc*.jar"/>
</delete>
Modified: incubator/openmeetings/trunk/singlewebapp/src/templates/screenshare.vm
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/templates/screenshare.vm?rev=1297076&r1=1297075&r2=1297076&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/templates/screenshare.vm
(original)
+++ incubator/openmeetings/trunk/singlewebapp/src/templates/screenshare.vm Mon
Mar 5 14:45:04 2012
@@ -29,20 +29,20 @@ limitations under the License.
</security>
<resources>
<j2se version='1.4+'/>
- <jar href="commons-codec-1.6.jar"/>
- <jar href="logback-classic-0.9.28.jar"/>
- <jar href="logback-core-0.9.28.jar"/>
- <jar href="red5.jar"/>
- <jar href="red5-screenshare.jar"/>
- <jar href="org.springframework.core-3.0.6.RELEASE.jar" />
- <jar href="org.springframework.context-3.0.6.RELEASE.jar" />
- <jar href="mina-core-2.0.4.jar" />
- <jar href="com.springsource.slf4j.api-1.6.1.jar" />
+ <jar href="bcprov-jdk16-145.jar"/>
+ <jar href="commons-beanutils-1.8.3.jar"/>
+ <jar href="commons-codec-1.6.jar"/>
+ <jar href="com.springsource.slf4j.api-1.6.1.jar"/>
+ <jar href="ehcache-core-2.5.0.jar"/>
<jar href="httpclient-4.1.2.jar" />
<jar href="httpcore-4.1.3.jar" />
- <jar href="bcprov-jdk16-145.jar" />
- <jar href="ehcache-core-2.5.0.jar" />
- <jar href="commons-beanutils-1.8.3.jar" />
+ <jar href="logback-classic-0.9.28.jar" />
+ <jar href="logback-core-0.9.28.jar" />
+ <jar href="mina-core-2.0.4.jar" />
+ <jar href="red5.jar" />
+ <jar href="red5-screenshare.jar" />
+ <jar href="spring-context-3.0.6.RELEASE.jar" />
+ <jar href="spring-core-3.0.6.RELEASE.jar" />
</resources>
<application-desc main-class='$startUpClass'>
<argument>$red5-host</argument>
