[Red5commits] [2398] fix missing jar prob with slf4j

[pgregoire]

fix missing jar prob with slf4j


Timestamp: 10/15/07 19:49:20 EST (less than one hour ago) 
Change: 2398 
Author: pgregoire

Files (see diff or trac for details): 
java/server/trunk/build.xml
java/server/trunk/ivy.xml


Trac: http://mirror1.cvsdude.com/trac/osflash/red5/changeset/2398

Index: /java/server/trunk/build.xml
===================================================================
--- /java/server/trunk/build.xml (revision 2357)
+++ /java/server/trunk/build.xml (revision 2398)
@@ -45,4 +45,12 @@
 		</fileset>
 	</path>
+	<path id="runtime.classpath">
+		<fileset dir="${lib.dir}">
+			<exclude name="Grobo*.jar"/>
+			<exclude name="grobo*.jar"/>
+			<exclude name="junit*.jar"/>
+			<exclude name="ivy*.jar"/>			
+		</fileset>
+	</path>	
 	<echo>java.home is ${java.home} and the target version is ${java.target_version}</echo>
 	<target name="-junit.check">
@@ -65,4 +73,5 @@
 					<available property="spring.installed" classpathref="project.classpath" classname="org.springframework.core.SpringVersion"/>
 					<available property="log4j.installed" classpathref="project.classpath" classname="org.apache.log4j.Logger"/>
+					<available property="logging.installed" classpathref="project.classpath" classname="org.slf4j.Logger"/>
 					<available property="catalina.installed" classpathref="project.classpath" classname="org.apache.catalina.Server"/>
 					<available property="mina.installed" classpathref="project.classpath" classname="org.apache.mina.filter.codec.ProtocolEncoder"/>
@@ -74,4 +83,5 @@
 					<available property="spring.installed" classpathref="project.classpath" classname="org.springframework.core.SpringVersion"/>
 					<available property="log4j.installed" classpathref="project.classpath" classname="org.apache.log4j.Logger"/>
+					<available property="logging.installed" classpathref="project.classpath" classname="org.slf4j.Logger"/>
 					<available property="catalina.installed" classpathref="project.classpath" classname="org.apache.catalina.Server"/>
 					<available property="mina.installed" classpathref="project.classpath" classname="org.apache.mina.filter.codec.ProtocolEncoder"/>
@@ -535,5 +545,5 @@
 		</copy>
 		<manifestclasspath property="jar.classpath" jarfile="red5.jar">
-			<classpath refid="project.classpath"/>
+			<classpath refid="runtime.classpath"/>
 		</manifestclasspath>
 		<jar destfile="red5.jar">
Index: /java/server/trunk/ivy.xml
===================================================================
--- /java/server/trunk/ivy.xml (revision 2397)
+++ /java/server/trunk/ivy.xml (revision 2398)
@@ -37,7 +37,8 @@
         <dependency name="slf4j-api" rev="1.4.3" />
         <dependency name="slf4j-log4j12" rev="1.4.3" />
-        <dependency name="slf4j-simple" rev="1.4.3" />
+        <!-- dependency name="slf4j-simple" rev="1.4.3" / -->
         <dependency name="jcl104-over-slf4j" rev="1.4.3" />
         <dependency name="log4j-over-slf4j" rev="1.4.3" />
+        <dependency name="log4j" rev="1.2.15" />
         <!-- General --> 
         <dependency org="cglib" name="cglib-nodep" rev="2.1_3" />        


Note:
Diffs are chopped if more than 25k.
This is to get past the limit on the mailing list.