[Red5commits] [1664] Got some strange UTF-8 characters that prevented successful compilation on Linux
mklishin
luke at codegent.com
Thu Jan 25 18:00:17 EST 2007
Got some strange UTF-8 characters that prevented successful compilation on Linux. Fixed that.
Timestamp: 01/25/07 17:56:18 EST (less than one hour ago)
Change: 1664
Author: mklishin
Files (see diff or trac for details):
java/server/trunk/build.properties
java/server/trunk/build.xml
java/server/trunk/src/org/red5/io/amf/Input.java
java/server/trunk/src/org/red5/io/amf3/AMF3.java
java/server/trunk/src/org/red5/io/amf3/Input.java
java/server/trunk/src/org/red5/server/Standalone.java
java/server/trunk/src/org/red5/server/TomcatLoader.java
java/server/trunk/src/org/red5/server/api/so/ISharedObjectBase.java
java/server/trunk/src/org/red5/server/api/so/ISharedObjectService.java
java/server/trunk/src/org/red5/server/net/rtmp/status/StatusCodes.java
java/server/trunk/src/org/red5/server/script/rhino/RhinoScriptUtils.java
Trac: http://mirror1.cvsdude.com/trac/osflash/red5/changeset/1664
Index: /java/server/trunk/src/org/red5/server/net/rtmp/status/StatusCodes.java
===================================================================
--- /java/server/trunk/src/org/red5/server/net/rtmp/status/StatusCodes.java (revision 1606)
+++ /java/server/trunk/src/org/red5/server/net/rtmp/status/StatusCodes.java (revision 1664)
@@ -32,5 +32,5 @@
/**
* The URI specified in the NetConnection.connect method did not
- * specify “rtmp” as the protocol. “rtmp” must be specified when connecting to
+ * specify 'rtmp' as the protocol. 'rtmp' must be specified when connecting to
* FMS and Red5. Either not supported version of AMF was used (3 when only 0 is supported)
*/
Index: /java/server/trunk/src/org/red5/server/TomcatLoader.java
===================================================================
--- /java/server/trunk/src/org/red5/server/TomcatLoader.java (revision 1654)
+++ /java/server/trunk/src/org/red5/server/TomcatLoader.java (revision 1664)
@@ -126,5 +126,6 @@
if (log.isDebugEnabled()) {
log.debug("Approot: " + appRoot);
- }
+
+ }
// Root applications directory
File appDirBase = new File(appRoot);
Index: /java/server/trunk/src/org/red5/server/script/rhino/RhinoScriptUtils.java
===================================================================
--- /java/server/trunk/src/org/red5/server/script/rhino/RhinoScriptUtils.java (revision 1655)
+++ /java/server/trunk/src/org/red5/server/script/rhino/RhinoScriptUtils.java (revision 1664)
@@ -71,5 +71,5 @@
log.debug("Script Engine Manager: " + mgr.getClass().getName());
}
- ScriptEngine engine = mgr.getEngineByName("rhino");
+ ScriptEngine engine = mgr.getEngineByName("javascript");
// set engine scope namespace
Bindings nameSpace = engine.getBindings(ScriptContext.ENGINE_SCOPE);
Index: /java/server/trunk/src/org/red5/server/Standalone.java
===================================================================
--- /java/server/trunk/src/org/red5/server/Standalone.java (revision 1654)
+++ /java/server/trunk/src/org/red5/server/Standalone.java (revision 1664)
@@ -66,6 +66,5 @@
* @param args
* String passed in that points to a red5.xml config file
- * @throws Exception
- * @throws Throwable
+ * @throws Throwable Base type of all exceptions
*/
public static void main(String[] args) throws Throwable {
@@ -119,5 +118,8 @@
// Setup system properties so they can be evaluated by Jetty
Properties props = new Properties();
- props.load(new FileInputStream(root + "/red5.properties"));
+
+ // Load properties
+ props.load(new FileInputStream(root + "/red5.properties"));
+
for (Object o : props.keySet()) {
String key = (String) o;
@@ -134,5 +136,7 @@
root = '/' + root;
}
- System.setProperty("red5.root", root);
+
+ // Set Red5 root as environment variable
+ System.setProperty("red5.root", root);
log.info("Setting Red5 root to " + root);
Index: /java/server/trunk/src/org/red5/server/api/so/ISharedObjectBase.java
===================================================================
--- /java/server/trunk/src/org/red5/server/api/so/ISharedObjectBase.java (revision 1590)
+++ /java/server/trunk/src/org/red5/server/api/so/ISharedObjectBase.java (revision 1664)
@@ -96,5 +96,5 @@
* Start performing multiple updates to the shared object from a connected
* client.
- * @param source
+ * @param source Update events listener
*/
public void beginUpdate(IEventListener source);
Index: /java/server/trunk/src/org/red5/server/api/so/ISharedObjectService.java
===================================================================
--- /java/server/trunk/src/org/red5/server/api/so/ISharedObjectService.java (revision 1538)
+++ /java/server/trunk/src/org/red5/server/api/so/ISharedObjectService.java (revision 1664)
@@ -26,5 +26,5 @@
/**
- * Service that manages shared objects.
+ * Service that manages shared objects for given scope.
*
*/
Index: /java/server/trunk/src/org/red5/io/amf3/Input.java
===================================================================
--- /java/server/trunk/src/org/red5/io/amf3/Input.java (revision 1660)
+++ /java/server/trunk/src/org/red5/io/amf3/Input.java (revision 1664)
@@ -34,6 +34,4 @@
import org.red5.io.object.DataTypes;
import org.red5.io.object.Deserializer;
-import org.red5.io.object.RecordSet;
-import org.red5.io.object.RecordSetPage;
import org.red5.io.utils.ObjectMap;
@@ -113,5 +111,5 @@
case AMF3.TYPE_XML:
case AMF3.TYPE_XML_SPECIAL:
- coreType = DataTypes.CORE_XML;
+ coreType = DataTypes.CORE_XML;
break;
case AMF3.TYPE_OBJECT:
@@ -238,5 +236,5 @@
String key = readString();
amf3_mode += 1;
- Object result = null;
+ Object result;
if (key.equals("")) {
// normal array
@@ -288,5 +286,5 @@
type >>= 1;
String className = readString();
- Object result = null;
+ Object result;
amf3_mode += 1;
// Load object properties into map
@@ -379,5 +377,4 @@
*
* @return a converted integer value
- * @throws IOException I/O exception
* @see <a href="http://osflash.org/amf3/parsing_integers">parsing AMF3
* integers (external)</a>
Index: /java/server/trunk/src/org/red5/io/amf3/AMF3.java
===================================================================
--- /java/server/trunk/src/org/red5/io/amf3/AMF3.java (revision 1660)
+++ /java/server/trunk/src/org/red5/io/amf3/AMF3.java (revision 1664)
@@ -110,5 +110,5 @@
* 01 = single anonymous property. <br />
* A single amf3-data contains a single value. <br />
- * The property name should be declared in the class-def reference but this doesn’t seem <b />
+ * The property name should be declared in the class-def reference but this doesn't seem <b />
* to always be the case - more to come here.
*/
Index: /java/server/trunk/src/org/red5/io/amf/Input.java
===================================================================
--- /java/server/trunk/src/org/red5/io/amf/Input.java (revision 1660)
+++ /java/server/trunk/src/org/red5/io/amf/Input.java (revision 1664)
@@ -257,6 +257,6 @@
* Date: 0x0B T7 T6 .. T0 Z1 Z2 T7 to T0 form a 64 bit Big Endian number
* that specifies the number of nanoseconds that have passed since
- * 1/1/1970 0:00 to the specified time. This format is ÒUTC 1970Ó. Z1 an
- * Z0 for a 16 bit Big Endian number indicating the indicated timeÕs
+ * 1/1/1970 0:00 to the specified time. This format is UTC 1970. Z1 an
+ * Z0 for a 16 bit Big Endian number indicating the indicated time's
* timezone in minutes.
*/
@@ -297,7 +297,9 @@
return result;
}
-
+
/**
* Read key - value pairs into Map object
+ * @param result Map to put resulting pair to
+ * @param deserializer Deserializer used
*/
protected void readKeyValues(Map<String, Object> result, Deserializer deserializer) {
@@ -369,6 +371,6 @@
* Creats a new instance of the className parameter and
* returns as an Object
- * @param className
- * @return Object
+ * @param className Class name as String
+ * @return Object New object instance (for given class)
*/
protected Object newInstance(String className) {
@@ -384,11 +386,10 @@
}
- /**
- * Reads the input as a bean and returns an object
- *
- * @param in
- * @param bean
- * @return Object
- */
+ /**
+ * Reads the input as a bean and returns an object
+ * @param deserializer Deserializer used
+ * @param bean Input as bean
+ * @return Decoded object
+ */
protected Object readBean(Deserializer deserializer, Object bean) {
if (log.isDebugEnabled()) {
@@ -425,10 +426,9 @@
}
- /**
- * Reads the input as a map and returns a Map
- *
- * @param in
- * @return Map
- */
+ /**
+ * Reads the input as a map and returns a Map
+ * @param deserializer Deserializer to use
+ * @return Read map
+ */
protected Map<String, Object> readSimpleObject(Deserializer deserializer) {
if (log.isDebugEnabled()) {
@@ -440,10 +440,10 @@
return result;
}
-
- /**
- * Reads start object
- *
- * @return String
- */
+
+ /**
+ * Reads start object
+ * @param deserializer Deserializer to use
+ * @return Read object
+ */
public Object readObject(Deserializer deserializer) {
String className;
Index: /java/server/trunk/build.properties
===================================================================
--- /java/server/trunk/build.properties (revision 1663)
+++ /java/server/trunk/build.properties (revision 1664)
@@ -18,5 +18,5 @@
# optimize only works with a few compilers
-build.optimize=true
+build.optimize=false
# Change this var to build to a different Java version
Index: /java/server/trunk/build.xml
===================================================================
--- /java/server/trunk/build.xml (revision 1660)
+++ /java/server/trunk/build.xml (revision 1664)
@@ -10,5 +10,5 @@
<property environment="env"/>
- <property name="java.home" value="${env.JAVA_HOME}"/>
+ <property name="java.home" value="${env.JDK_HOME}"/>
<property name="src.dir" value="src"/>
Note:
Diffs are chopped if more than 25k.
This is to get past the limit on the mailing list.
More information about the Red5commits
mailing list