Author: solomax
Date: Thu Feb 16 18:05:45 2012
New Revision: 1245107
URL: http://svn.apache.org/viewvc?rev=1245107&view=rev
Log:
old duplicated commons-codec jars are removed
Removed:
incubator/openmeetings/trunk/singlewebapp/WebContent/red5-screenshare/commons-codec-1.4.jar
incubator/openmeetings/trunk/singlewebapp/lib/axis2-1.6/commons-codec-1.3.jar
incubator/openmeetings/trunk/singlewebapp/lib/ical4j/commons-codec-1.4.jar
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=1245107&r1=1245106&r2=1245107&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/.classpath (original)
+++ incubator/openmeetings/trunk/singlewebapp/.classpath Thu Feb 16 18:05:45
2012
@@ -492,11 +492,6 @@
<attribute
name="org.eclipse.jst.component.nondependency" value=""/>
</attributes>
</classpathentry>
- <classpathentry exported="true" kind="lib"
path="lib/axis2-1.6/commons-codec-1.3.jar">
- <attributes>
- <attribute
name="org.eclipse.jst.component.nondependency" value=""/>
- </attributes>
- </classpathentry>
<classpathentry exported="true" kind="lib"
path="lib/axis2-1.6/commons-fileupload-1.2.jar">
<attributes>
<attribute
name="org.eclipse.jst.component.nondependency" value=""/>
Modified: incubator/openmeetings/trunk/singlewebapp/build.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/build.xml?rev=1245107&r1=1245106&r2=1245107&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/build.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/build.xml Thu Feb 16 18:05:45 2012
@@ -136,6 +136,7 @@
<!-- screenshare classpath -->
<path id="screenshare.classpath">
<fileset dir="${screenshare.lib}" includes="*.jar" />
+ <fileset dir="${red5.server.dir}/dist/lib"
includes="commons-codec*.jar" />
</path>
<!-- build artefacts -->
@@ -198,6 +199,7 @@
<target name="prepare" depends="prepare.mkdir">
<copy todir="${screenshare.out.dir}" filtering="true">
<fileset dir="${screenshare.lib}" />
+ <fileset dir="${red5.server.dir}/dist/lib"
includes="commons-codec*.jar" />
</copy>
<copy todir="${red5.root}" filtering="true">
<fileset dir="${red5.server.dir}/dist">
@@ -247,7 +249,6 @@
<copy todir="${dist.webapps.dir}/WEB-INF/lib">
<fileset dir="${axis2.lib}">
<include name="*.jar" />
- <exclude name="commons-codec-1.3.jar" />
</fileset>
<fileset dir="${velocity.lib}" />
<fileset dir="${batik.lib}" />
Modified: incubator/openmeetings/trunk/singlewebapp/src/templates/screenshare.vm
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/templates/screenshare.vm?rev=1245107&r1=1245106&r2=1245107&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/templates/screenshare.vm
(original)
+++ incubator/openmeetings/trunk/singlewebapp/src/templates/screenshare.vm Thu
Feb 16 18:05:45 2012
@@ -32,7 +32,7 @@ limitations under the License.
<jar href='red5-screenshare.jar'/>
<jar href="apache-commons.jar"/>
<jar href="commons-httpclient-3.1.jar"/>
- <jar href="commons-codec-1.4.jar"/>
+ <jar href="commons-codec-1.6.jar"/>
<jar href="apache-mina.jar"/>
<jar href="bouncycastle.jar"/>
<jar href="kunststoff.jar"/>
