Permalink
Browse files

Link removal and general cleanup

git-svn-id: http://red5.googlecode.com/svn/java/server/trunk@4265 1b6495e4-3631-0410-8e05-8f51eee8b9cc
  • Loading branch information...
1 parent b26a328 commit 856573f4657a9e0c0b061887e83fdee6fe261cae mondain committed Jul 31, 2011
View
@@ -112,6 +112,7 @@
<target name="-library.check">
<echo message="Java: java.home is ${java.home} and the target version is ${java.target_version}"/>
<echo message="Ant: ant.home is ${ant.home} and the target version is ${ant.version}"/>
+ <echo message="Ivy conf name: ${ivy.conf.name}"/>
<!-- May want to add repository availability checking
<condition property="repository.offline.googlecode" value="true">
<isreachable host="red5.googlecode.com" timeout="30" />
@@ -124,14 +125,7 @@
<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"/>
- <available property="minajmx.installed" classpathref="project.classpath" classname="org.apache.mina.integration.jmx.IoServiceManager"/>
- <available property="acegi.installed" classpathref="project.classpath" classname="org.acegisecurity.SecurityConfig"/>
<isset property="ivy.conf.name"/>
- <!-- check for the test jars -->
- <available property="junit.installed" classpathref="project.classpath" classname="org.junit.Test"/>
- <available property="groboutils.installed" classpathref="project.classpath" classname="net.sourceforge.groboutils.junit.v1.TestRunnable"/>
- <available property="spring-mock.installed" classpathref="project.classpath" classname="org.springframework.mock.web.MockServletConfig"/>
- <equals arg1="ivy.conf.name" arg2="test"/>
</and>
</condition>
</target>
@@ -177,18 +171,8 @@
<isset property="ivy.conf.name"/>
</not>
</condition>
- <echo message="Ivy conf name: ${ivy.conf.name}"/>
<ivy:resolve file="ivy.xml" conf="${ivy.conf.name}"/>
<ivy:retrieve conf="${ivy.conf.name}"/>
- <!-- install locally
- <ivy:install organisation="javax" module="javaee-api" revision="5.1.2" from="googlecode" to="local_cache"/>
- <ivy:install organisation="*" module="jaudiotagger" revision="1.0.8" from="googlecode" to="local_cache"/>
- <ivy:install organisation="org.apache.commons" module="com.springsource.org.apache.commons.codec" revision="latest" from="com.springsource.repository.bundles.external" to="local_cache"/>
- <ivy:install organisation="org.apache.commons" module="com.springsource.org.apache.commons.collections" revision="latest" from="com.springsource.repository.bundles.external" to="local_cache"/>
- <ivy:install organisation="org.apache.commons" module="com.springsource.org.apache.commons.httpclient" revision="latest" from="com.springsource.repository.bundles.external" to="local_cache"/>
- <ivy:install organisation="org.apache.commons" module="com.springsource.org.apache.commons.lang" revision="latest" from="com.springsource.repository.bundles.external" to="local_cache"/>
- <ivy:install organisation="org.apache.xerces" module="com.springsource.org.apache.xerces" revision="latest" from="com.springsource.repository.bundles.external" to="local_cache"/>
- -->
</target>
<target name="ivyclear" description="Clears out the Ivy cache">
<delete dir="${user.home}/.ivy2/cache"/>
@@ -298,7 +282,9 @@
<exclude name="**/*.swf"/>
<exclude name="**/*.png"/>
<exclude name="**/*.jpg"/>
+ <!--
<exclude name="demos"/>
+ -->
</fileset>
</copy>
<!-- copy SWF without filtering as it causes corruption -->
@@ -307,7 +293,9 @@
<include name="**/*.swf"/>
<include name="**/*.png"/>
<include name="**/*.jpg"/>
+ <!--
<exclude name="demos"/>
+ -->
</fileset>
</copy>
<!-- vod -->
@@ -247,12 +247,10 @@ public byte readDataType() {
case AMF3.TYPE_NUMBER:
coreType = DataTypes.CORE_NUMBER;
break;
-
case AMF3.TYPE_BOOLEAN_TRUE:
case AMF3.TYPE_BOOLEAN_FALSE:
coreType = DataTypes.CORE_BOOLEAN;
break;
-
case AMF3.TYPE_STRING:
coreType = DataTypes.CORE_STRING;
break;
@@ -264,20 +262,16 @@ public byte readDataType() {
case AMF3.TYPE_OBJECT:
coreType = DataTypes.CORE_OBJECT;
break;
-
case AMF3.TYPE_ARRAY:
// should we map this to list or array?
coreType = DataTypes.CORE_ARRAY;
break;
-
case AMF3.TYPE_DATE:
coreType = DataTypes.CORE_DATE;
break;
-
case AMF3.TYPE_BYTEARRAY:
coreType = DataTypes.CORE_BYTEARRAY;
break;
-
case AMF3.TYPE_VECTOR_INT:
coreType = DataTypes.CORE_VECTOR_INT;
break;
@@ -290,7 +284,6 @@ public byte readDataType() {
case AMF3.TYPE_VECTOR_OBJECT:
coreType = DataTypes.CORE_VECTOR_OBJECT;
break;
-
default:
log.info("Unknown datatype: {}", currentDataType);
// End of object, and anything else lets just skip
@@ -956,8 +949,7 @@ public Object readReference(Type target) {
* Parser of AMF3 "compressed" integer data type
*
* @return a converted integer value
- * @see <a href="http://osflash.org/amf3/parsing_integers">parsing AMF3
- * integers (external)</a>
+ * @see <a href="http://osflash.org/amf3/parsing_integers">parsing AMF3 integers (external)</a>
*/
private int readAMF3Integer() {
int n = 0;
@@ -554,12 +554,14 @@ public void writeVectorInt(Vector<Integer> vector) {
buf.putInt(v);
}
// debug
- int pos = buf.position();
- buf.position(0);
- StringBuilder sb = new StringBuilder();
- HexDump.dumpHex(sb, buf.array());
- log.debug("\n{}", sb);
- buf.position(pos);
+ if (log.isDebugEnabled()) {
+ int pos = buf.position();
+ buf.position(0);
+ StringBuilder sb = new StringBuilder();
+ HexDump.dumpHex(sb, buf.array());
+ log.debug("\n{}", sb);
+ buf.position(pos);
+ }
}
/**
@@ -269,8 +269,7 @@ protected boolean writeArrayType(Output out, Object arrType) {
*/
protected void writeIterator(Output out, Iterator<Object> it) {
log.trace("writeIterator");
- // Create LinkedList of collection we iterate thru and write it out
- // later
+ // Create LinkedList of collection we iterate thru and write it out later
LinkedList<Object> list = new LinkedList<Object>();
while (it.hasNext()) {
list.addLast(it.next());
View
@@ -102,9 +102,8 @@
<br />
<p>
Further information about Red5 can be found at any of these links:
-<a href="http://red5.googlecode.com/" target="_blank">official homepage</a> |
-<a href="http://wiki.red5.org/" target="_blank">wiki</a> |
-<a href="http://osflash.org/red5" target="_blank">old homepage</a>
+<a href="http://red5.googlecode.com/" target="_blank">homepage</a> |
+<a href="http://wiki.red5.org/" target="_blank">wiki</a>
<br />
<br />
Be sure to subscribe <a href="http://groups.google.com/group/red5interest" target="_blank">the mailing list</a>

0 comments on commit 856573f

Please sign in to comment.