openmeetings-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From solo...@apache.org
Subject svn commit: r1497639 - in /openmeetings/trunk/singlewebapp: .classpath build.xml
Date Fri, 28 Jun 2013 03:51:42 GMT
Author: solomax
Date: Fri Jun 28 03:51:42 2013
New Revision: 1497639

URL: http://svn.apache.org/r1497639
Log:
Red5 client retrieving is removed from the build, client lib is taken from the server

Modified:
    openmeetings/trunk/singlewebapp/.classpath
    openmeetings/trunk/singlewebapp/build.xml

Modified: openmeetings/trunk/singlewebapp/.classpath
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/.classpath?rev=1497639&r1=1497638&r2=1497639&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/.classpath (original)
+++ openmeetings/trunk/singlewebapp/.classpath Fri Jun 28 03:51:42 2013
@@ -13,7 +13,6 @@
 	<classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=Openmeetings&amp;ivyXmlPath=ivy.xml&amp;confs=*&amp;ivySettingsPath=%24%7Bworkspace_loc%3AOpenmeetings%2Fivysettings.xml%7D&amp;loadSettingsOnDemand=false&amp;propertyFiles="/>
 	<classpathentry kind="lib" path="build/lib/java_16_tools.jar"/>
 	<classpathentry kind="lib" path="WebContent/screensharing"/>
-	<classpathentry kind="lib" path="build/red5/client/dist/red5-client-1.0.2-SNAPSHOT.jar"
sourcepath="build/red5/client/src/main/java"/>
 	<classpathentry kind="lib" path="build/red5/server/dist/red5-server.jar" sourcepath="build/red5/server/src/main/java"/>
 	<classpathentry kind="lib" path="build/red5/server/dist/lib/slf4j-api-1.7.2.jar"/>
 	<classpathentry kind="lib" path="build/red5/server/dist/lib/spring-core-3.1.1.RELEASE.jar"/>
@@ -35,5 +34,6 @@
 	<classpathentry kind="lib" path="build/red5/server/dist/lib/spring-aop-3.1.1.RELEASE.jar"/>
 	<classpathentry kind="lib" path="build/red5/server/dist/lib/spring-test-3.1.1.RELEASE.jar"/>
 	<classpathentry kind="lib" path="build/red5/server/dist/lib/commons-pool-1.5.6.jar"/>
+	<classpathentry kind="lib" path="build/red5/server/dist/lib/red5-client-1.0.2-SNAPSHOT.jar"/>
 	<classpathentry kind="output" path="build/classes/eclipse"/>
 </classpath>

Modified: openmeetings/trunk/singlewebapp/build.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/build.xml?rev=1497639&r1=1497638&r2=1497639&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/build.xml (original)
+++ openmeetings/trunk/singlewebapp/build.xml Fri Jun 28 03:51:42 2013
@@ -46,10 +46,8 @@
 	<property name="docs.src" value="xdocs" />
 
 	<property name="red5.server.dir" value="${build.base.dir}/red5/server" />
-	<property name="red5.client.dir" value="${build.base.dir}/red5/client" />
 	<property name="red5.lib" value="${red5.server.dir}/dist" />
 	<property name="red5.server.lib" value="${red5.lib}/lib" />
-	<property name="red5.client.lib" value="${red5.client.dir}/dist" />
 	<property name="red5.root" value="${dist.dir}/red5" />
 	<property name="dist.webapps.dir" value="${red5.root}/webapps/${project.distname}" />
 	<property name="dist.persistence.dir" value="${dist.webapps.dir}/WEB-INF/classes/META-INF/"
/>
@@ -88,7 +86,6 @@
 	<!-- compile classpath -->
 	<path id="check.classpath">
 		<fileset dir="${red5.server.lib}" includes="*.jar" />
-		<fileset dir="${red5.client.lib}" includes="*.jar" />
 		<fileset dir="${red5.lib}" includes="*.jar" />
 		<fileset dir="${mainlibs.lib.dir}" includes="*.jar" />
 		<fileset dir="${om.lib.dir}" includes="*.jar" />
@@ -108,7 +105,6 @@
 	<target name="prepare.mkdir" depends="-java6or7.check">
 		<mkdir dir="${red5.server.lib}" />
 		<mkdir dir="${red5.lib}/log" />
-		<mkdir dir="${red5.client.dir}/dist" />
 		<mkdir dir="${dist.dir}" />
 		<mkdir dir="${main.out.dir}" />
 		<mkdir dir="${mainlibs.lib.dir}" />
@@ -191,7 +187,6 @@
 	<!-- build webapp -->
 	<target name="-copy-libraries" description="All jars downloaded by ivy copied to appropriate
places">
 		<copy todir="${red5.root}/lib">
-			<fileset dir="${red5.client.lib}" includes="red5-client*.jar" />
 			<fileset dir="${mainlibs.lib.dir}" includes="*.jar" />
 		</copy>
 		<copy todir="${dist.webapps.dir}/WEB-INF/lib">
@@ -463,7 +458,7 @@
 			<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" />
-			<fileset dir="${red5.client.lib}" includes="red5-client*.jar" />
+			<fileset dir="${red5.server.lib}" includes="red5-client*.jar" />
 		</copy>
 		<signjar alias="filetest" keystore="${keystore.file}" storepass="secret" lazy="false"
 			sigalg="MD5withRSA" digestalg="SHA1">
@@ -969,11 +964,6 @@
 				<include name="**/*"/>
 			</fileset>
 		</move>
-		<!-- FIXME !!!!!! UNCOMMENT
-		<delete>
-			<fileset dir="${red5.lib}/lib" includes="red5-client*.jar" />
-		</delete>
-		-->
 		
 		<!-- START of Tomcat 7 patch -->
 		<delete>
@@ -992,13 +982,6 @@
 		<copy todir="${red5.lib}/conf" overwrite="true" force="true">
 			<fileset dir="${webcontent.src.dir}/red5" includes="jee-container*.xml" />
 		</copy>
-		<!--copy file="${red5.server.dir}/src/conf/red5.properties" todir="${red5.lib}/conf"
overwrite="true" force="true">
-			<filterchain>
-				<tokenfilter>
-					<replaceregex pattern="^[ \t]*rtmpt.target_reponse_size[ \t]*=.*$" replace="rtmpt.target_reponse_size=65536"/>
-				</tokenfilter>
-			</filterchain>
-		</copy-->
 		<copy file="${webcontent.src.dir}/red5/index.html" todir="${red5.lib}/webapps/root"
overwrite="true" force="true" />
 		<copy todir="${red5.lib}" overwrite="true" force="true">
 			<fileset dir="${webcontent.src.dir}/red5" includes="admin.*,network_test.sh" />
@@ -1012,30 +995,8 @@
 		<antcall target="-patch-red5-server-start-script"/> 
 	</target>
 	
-	<!-- Check for the Red5 client libraries -->
-	<target name="-retrieve-red5-client" unless="red5.client.installed" description="Retrieves
the libraries if needed" depends="-retrieve-red5-server">
-		<svn refid="svn.settings">
-			<checkout url="https://red5.googlecode.com/svn/java/client/trunk/" revision="${red5.client.revision}"
destPath="${red5.client.dir}" />
-		</svn>
-		<delete>
-			<fileset dir="${red5.client.dir}/lib" includes="red5-server*.jar" />
-		</delete>
-		<copy file="${red5.lib}/red5-server.jar" todir="${red5.client.dir}/lib" overwrite="true"
force="true" />
-		<artifact:mvn pom="${red5.client.dir}/pom.xml" mavenVersion="${maven.version}" fork="true"
dir="${red5.client.dir}">
-			<jvmarg value="-Dmaven.buildNumber.doUpdate=false" />
-			<!--jvmarg value="-Dassembly.skipAssembly=true" /-->
-			<arg value="clean"/>
-			<arg value="install"/>
-			<jvmarg value="-Dmaven.test.skip=true" />
-		</artifact:mvn>
-		<copy todir="${red5.client.lib}" overwrite="true" force="true">
-			<fileset dir="${red5.client.dir}/target" includes="red5-client-*.jar" excludes="*javadoc.jar,*sources.jar"
/>
-		</copy>
-		<echo message="Red5 Client build" />
-	</target>
-
 	<!-- Check for the Top level libraries -->
-	<target name="-retrieve-mainlibs" unless="mainlib.installed" description="Retrieves the
libraries if needed" depends="-retrieve-red5-client">
+	<target name="-retrieve-mainlibs" unless="mainlib.installed" description="Retrieves the
libraries if needed" depends="-retrieve-red5-server">
 		<!-- Ivy configuration - http://ant.apache.org/ivy/history/trunk/ant.html -->
 		<antcall target="-retrieve" inheritAll="true" inheritRefs="true">
 			<param name="ivy.conf.name" value="mainlib" />



Mime
View raw message