> getObjects();
/**
* Sets the maximum number of entries for the cache.
- *
+ *
* @param max
* upper-limit of the cache
*/
diff --git a/io/src/main/java/org/red5/cache/ICacheable.java b/io/src/main/java/org/red5/cache/ICacheable.java
index c6fedc4d0..8e560681e 100644
--- a/io/src/main/java/org/red5/cache/ICacheable.java
+++ b/io/src/main/java/org/red5/cache/ICacheable.java
@@ -13,9 +13,9 @@
/**
* Base interface for objects that can be made cacheable.
- *
+ *
* @see ICacheStore
- *
+ *
* @author The Red5 Project
* @author Paul Gregoire (mondain@gmail.com)
*/
@@ -23,14 +23,14 @@ public interface ICacheable extends Serializable {
/**
* Returns true if the object is cached, false otherwise.
- *
+ *
* @return true if object is cached, false otherwise
*/
public boolean isCached();
/**
* Sets a flag to represent the cached status of a cacheable object.
- *
+ *
* @param cached
* true if object is cached, false otherwise
*/
@@ -38,14 +38,14 @@ public interface ICacheable extends Serializable {
/**
* Returns the name of the cached object.
- *
+ *
* @return Object name
*/
public String getName();
/**
* Set the name of the cached object.
- *
+ *
* @param name
* New object name
*/
@@ -53,14 +53,14 @@ public interface ICacheable extends Serializable {
/**
* Returns the object contained within the cacheable reference.
- *
+ *
* @return Cached representation of object
*/
public byte[] getBytes();
/**
* Returns a readonly byte buffer.
- *
+ *
* @return Read-only IoBuffer with cached data
*/
public IoBuffer getByteBuffer();
diff --git a/io/src/main/java/org/red5/cache/impl/CacheImpl.java b/io/src/main/java/org/red5/cache/impl/CacheImpl.java
index 61fefe06f..420fac859 100644
--- a/io/src/main/java/org/red5/cache/impl/CacheImpl.java
+++ b/io/src/main/java/org/red5/cache/impl/CacheImpl.java
@@ -24,7 +24,7 @@
/**
* Provides an implementation of an object cache.
- *
+ *
* @author The Red5 Project
* @author Paul Gregoire (mondain@gmail.com)
*/
@@ -83,7 +83,7 @@ public static ApplicationContext getApplicationContext() {
/**
* Returns the instance of this class.
- *
+ *
* @return instance of this class
*/
public static CacheImpl getInstance() {
diff --git a/io/src/main/java/org/red5/cache/impl/CacheableImpl.java b/io/src/main/java/org/red5/cache/impl/CacheableImpl.java
index 3c92570ca..c4c059ade 100644
--- a/io/src/main/java/org/red5/cache/impl/CacheableImpl.java
+++ b/io/src/main/java/org/red5/cache/impl/CacheableImpl.java
@@ -14,7 +14,7 @@
/**
* Provides an implementation of a cacheable object.
- *
+ *
* @author The Red5 Project
* @author Paul Gregoire (mondain@gmail.com)
*/
diff --git a/io/src/main/java/org/red5/cache/impl/EhCacheImpl.java b/io/src/main/java/org/red5/cache/impl/EhCacheImpl.java
index 59a105374..ad6d142cc 100644
--- a/io/src/main/java/org/red5/cache/impl/EhCacheImpl.java
+++ b/io/src/main/java/org/red5/cache/impl/EhCacheImpl.java
@@ -31,9 +31,9 @@
/**
* Provides an implementation of an object cache using EhCache.
- *
+ *
* @see ehcache homepage
- *
+ *
* @author The Red5 Project
* @author Paul Gregoire (mondain@gmail.com)
*/
diff --git a/io/src/main/java/org/red5/cache/impl/NoCacheImpl.java b/io/src/main/java/org/red5/cache/impl/NoCacheImpl.java
index 88b18a46f..5370b41c3 100644
--- a/io/src/main/java/org/red5/cache/impl/NoCacheImpl.java
+++ b/io/src/main/java/org/red5/cache/impl/NoCacheImpl.java
@@ -21,7 +21,7 @@
/**
* Provides an implementation of an object cache which actually does not provide a cache.
- *
+ *
* @author The Red5 Project
* @author Paul Gregoire (mondain@gmail.com)
*/
@@ -40,7 +40,7 @@ private NoCacheImpl() {
/**
* Returns the instance of this class.
- *
+ *
* @return class instance
*/
public static NoCacheImpl getInstance() {
diff --git a/io/src/main/java/org/red5/codec/AACAudio.java b/io/src/main/java/org/red5/codec/AACAudio.java
index db1e678a8..351cd0911 100644
--- a/io/src/main/java/org/red5/codec/AACAudio.java
+++ b/io/src/main/java/org/red5/codec/AACAudio.java
@@ -15,7 +15,7 @@
* Red5 audio codec for the AAC audio format.
*
* Stores the decoder configuration
- *
+ *
* @author Paul Gregoire (mondain@gmail.com)
* @author Wittawas Nakkasem (vittee@hotmail.com)
* @author Vladimir Hmelyoff (vlhm@splitmedialabs.com)
@@ -109,12 +109,12 @@ private static long sample2TC(long time, int sampleRate) {
return (time * 1000L / sampleRate);
}
- //private final byte[] getAACSpecificConfig() {
- // byte[] b = new byte[] {
+ //private final byte[] getAACSpecificConfig() {
+ // byte[] b = new byte[] {
// (byte) (0x10 | /*((profile > 2) ? 2 : profile << 3) | */((sampleRateIndex >> 1) & 0x03)),
// (byte) (((sampleRateIndex & 0x01) << 7) | ((channels & 0x0F) << 3))
// };
// log.debug("SpecificAudioConfig {}", HexDump.toHexString(b));
- // return b;
- //}
+ // return b;
+ //}
}
diff --git a/io/src/main/java/org/red5/codec/AudioCodec.java b/io/src/main/java/org/red5/codec/AudioCodec.java
index 6c8fbe155..21f6024fb 100644
--- a/io/src/main/java/org/red5/codec/AudioCodec.java
+++ b/io/src/main/java/org/red5/codec/AudioCodec.java
@@ -13,7 +13,7 @@
/**
* Audio codecs that Red5 supports.
- *
+ *
* @author Art Clarke
* @author Paul Gregoire (mondain@gmail.com)
*/
@@ -42,7 +42,7 @@ private AudioCodec(byte id) {
/**
* Returns back a numeric id for this codec, that happens to correspond to the numeric identifier that FLV will use for this codec.
- *
+ *
* @return the codec id
*/
public byte getId() {
diff --git a/io/src/main/java/org/red5/codec/IAudioStreamCodec.java b/io/src/main/java/org/red5/codec/IAudioStreamCodec.java
index 706f11331..5f0c27d73 100644
--- a/io/src/main/java/org/red5/codec/IAudioStreamCodec.java
+++ b/io/src/main/java/org/red5/codec/IAudioStreamCodec.java
@@ -11,7 +11,7 @@
/**
* Represents an Audio codec and its associated decoder configuration.
- *
+ *
* @author Paul Gregoire (mondain@gmail.com)
*/
public interface IAudioStreamCodec {
@@ -28,7 +28,7 @@ public interface IAudioStreamCodec {
/**
* Returns true if the codec knows how to handle the passed stream data.
- *
+ *
* @param data
* some sample data to see if this codec can handle it.
* @return can this code handle the data.
@@ -37,7 +37,7 @@ public interface IAudioStreamCodec {
/**
* Update the state of the codec with the passed data.
- *
+ *
* @param data
* data to tell the codec we're adding
* @return true for success. false for error.
@@ -46,7 +46,7 @@ public interface IAudioStreamCodec {
/**
* Add audio data with a time stamp and a flag identifying the content as AMF or not.
- *
+ *
* @param data
* @param timestamp
* @param amf if true, data is in AMF format otherwise its most likely from non-AMF source like RTP
@@ -56,7 +56,7 @@ public interface IAudioStreamCodec {
/**
* Returns information used to configure the decoder.
- *
+ *
* @return the data for decoder setup.
*/
public IoBuffer getDecoderConfiguration();
diff --git a/io/src/main/java/org/red5/codec/IStreamCodecInfo.java b/io/src/main/java/org/red5/codec/IStreamCodecInfo.java
index 6658c7d26..c30222846 100644
--- a/io/src/main/java/org/red5/codec/IStreamCodecInfo.java
+++ b/io/src/main/java/org/red5/codec/IStreamCodecInfo.java
@@ -13,14 +13,14 @@
public interface IStreamCodecInfo {
/**
* Has audio support?
- *
+ *
* @return true if stream codec has audio support, false otherwise
*/
boolean hasAudio();
/**
* Has video support?
- *
+ *
* @return true if stream codec has video support, false otherwise
*/
boolean hasVideo();
diff --git a/io/src/main/java/org/red5/codec/IVideoStreamCodec.java b/io/src/main/java/org/red5/codec/IVideoStreamCodec.java
index ff134ddfe..cc7160908 100644
--- a/io/src/main/java/org/red5/codec/IVideoStreamCodec.java
+++ b/io/src/main/java/org/red5/codec/IVideoStreamCodec.java
@@ -31,14 +31,14 @@ public interface IVideoStreamCodec {
/**
* Check if the codec supports frame dropping.
- *
+ *
* @return if the codec supports frame dropping.
*/
public boolean canDropFrames();
/**
* Returns true if the codec knows how to handle the passed stream data.
- *
+ *
* @param data
* some sample data to see if this codec can handle it
* @return can this code handle the data.
@@ -47,7 +47,7 @@ public interface IVideoStreamCodec {
/**
* Update the state of the codec with the passed data.
- *
+ *
* @param data
* data to tell the codec we're adding
* @return true for success. false for error
@@ -56,7 +56,7 @@ public interface IVideoStreamCodec {
/**
* Update the state of the codec with the passed data.
- *
+ *
* @param data
* data to tell the codec we're adding
* @param timestamp time associated with the data
@@ -66,7 +66,7 @@ public interface IVideoStreamCodec {
/**
* Add video data with a time stamp and a flag identifying the content as AMF or not.
- *
+ *
* @param data
* @param timestamp
* @param amf if true, data is in AMF format otherwise its most likely from non-AMF source like RTP
@@ -76,28 +76,28 @@ public interface IVideoStreamCodec {
/**
* Returns keyframe data.
- *
+ *
* @return the data for a keyframe
*/
public IoBuffer getKeyframe();
/**
* Returns all the keyframe data.
- *
+ *
* @return array of keyframe data
*/
public FrameData[] getKeyframes();
/**
* Returns information used to configure the decoder.
- *
+ *
* @return the data for decoder setup
*/
public IoBuffer getDecoderConfiguration();
/**
* Returns the number of interframes collected from last keyframe.
- *
+ *
* @return number of interframes
*/
public int getNumInterframes();
@@ -127,7 +127,7 @@ public FrameData(IoBuffer data) {
/**
* Makes a copy of the incoming bytes and places them in an IoBuffer. No flip or rewind is performed on the source data.
- *
+ *
* @param data
* data
*/
diff --git a/io/src/main/java/org/red5/codec/MP3Audio.java b/io/src/main/java/org/red5/codec/MP3Audio.java
index 9c473d079..6912fffb6 100644
--- a/io/src/main/java/org/red5/codec/MP3Audio.java
+++ b/io/src/main/java/org/red5/codec/MP3Audio.java
@@ -12,7 +12,7 @@
* Red5 audio codec for the MP3 audio format.
*
* Stores the decoder configuration
- *
+ *
* @author Paul Gregoire (mondain@gmail.com)
*/
public class MP3Audio extends AbstractAudio {
diff --git a/io/src/main/java/org/red5/codec/OpusAudio.java b/io/src/main/java/org/red5/codec/OpusAudio.java
index 2ec4440aa..a93d2913b 100644
--- a/io/src/main/java/org/red5/codec/OpusAudio.java
+++ b/io/src/main/java/org/red5/codec/OpusAudio.java
@@ -14,7 +14,7 @@
* Red5 audio codec for the Opus audio format.
*
* Opus has no decoder configuration; its all in-band.
- *
+ *
* @author Paul Gregoire (mondain@gmail.com)
*/
public class OpusAudio extends AbstractAudio {
@@ -22,7 +22,7 @@ public class OpusAudio extends AbstractAudio {
private static Logger log = LoggerFactory.getLogger(OpusAudio.class);
/**
- * Sample rates:
+ * Sample rates:
Abbreviation Audio bandwidth Effective sample rate
NB (narrowband) 4 kHz 8 kHz
diff --git a/io/src/main/java/org/red5/codec/ScreenVideo.java b/io/src/main/java/org/red5/codec/ScreenVideo.java
index eed201f17..43c10afd0 100644
--- a/io/src/main/java/org/red5/codec/ScreenVideo.java
+++ b/io/src/main/java/org/red5/codec/ScreenVideo.java
@@ -13,7 +13,7 @@
/**
* Red5 video codec for the screen capture format.
- *
+ *
* @author The Red5 Project
* @author Joachim Bauch (jojo@struktur.de)
* @author Paul Gregoire (mondain@gmail.com)
@@ -127,7 +127,7 @@ private static int maxCompressedSize(int size) {
/**
* Update total block size
- *
+ *
* @param data
* Byte buffer
*/
diff --git a/io/src/main/java/org/red5/codec/ScreenVideo2.java b/io/src/main/java/org/red5/codec/ScreenVideo2.java
index 64c132832..d13098d31 100644
--- a/io/src/main/java/org/red5/codec/ScreenVideo2.java
+++ b/io/src/main/java/org/red5/codec/ScreenVideo2.java
@@ -13,7 +13,7 @@
/**
* Red5 video codec for the screen capture format.
- *
+ *
* @author The Red5 Project
* @author Joachim Bauch (jojo@struktur.de)
* @author Paul Gregoire (mondain@gmail.com)
@@ -137,7 +137,7 @@ private static int maxCompressedSize(int size) {
/**
* Update total block size
- *
+ *
* @param data
* Byte buffer
*/
diff --git a/io/src/main/java/org/red5/codec/SpeexAudio.java b/io/src/main/java/org/red5/codec/SpeexAudio.java
index 99dbeeba4..54f34d8be 100644
--- a/io/src/main/java/org/red5/codec/SpeexAudio.java
+++ b/io/src/main/java/org/red5/codec/SpeexAudio.java
@@ -12,7 +12,7 @@
* Red5 audio codec for the Speex audio format.
*
* Stores the decoder configuration
- *
+ *
* @author Paul Gregoire (mondain@gmail.com)
*/
public class SpeexAudio extends AbstractAudio {
diff --git a/io/src/main/java/org/red5/codec/ULAWAudio.java b/io/src/main/java/org/red5/codec/ULAWAudio.java
index 72a871381..9152f8dba 100644
--- a/io/src/main/java/org/red5/codec/ULAWAudio.java
+++ b/io/src/main/java/org/red5/codec/ULAWAudio.java
@@ -12,7 +12,7 @@
* Red5 audio codec for the PCM uLaw audio format.
*
* Stores the decoder configuration
- *
+ *
* @author Paul Gregoire (mondain@gmail.com)
*/
public class ULAWAudio extends AbstractAudio {
diff --git a/io/src/main/java/org/red5/codec/VideoCodec.java b/io/src/main/java/org/red5/codec/VideoCodec.java
index 383f8d908..bbfbcbacb 100644
--- a/io/src/main/java/org/red5/codec/VideoCodec.java
+++ b/io/src/main/java/org/red5/codec/VideoCodec.java
@@ -13,7 +13,7 @@
/**
* Video codecs that Red5 supports.
- *
+ *
* @author Art Clarke
* @author Paul Gregoire (mondain@gmail.com)
*/
@@ -42,7 +42,7 @@ private VideoCodec(byte id) {
/**
* Returns back a numeric id for this codec, that happens to correspond to the numeric identifier that FLV will use for this codec.
- *
+ *
* @return the codec id
*/
public byte getId() {
diff --git a/io/src/main/java/org/red5/compatibility/flex/data/messages/DataMessage.java b/io/src/main/java/org/red5/compatibility/flex/data/messages/DataMessage.java
index 698efb7ec..8cff12e83 100644
--- a/io/src/main/java/org/red5/compatibility/flex/data/messages/DataMessage.java
+++ b/io/src/main/java/org/red5/compatibility/flex/data/messages/DataMessage.java
@@ -11,7 +11,7 @@
/**
* Message containing data update requests.
- *
+ *
* @author The Red5 Project
* @author Joachim Bauch (jojo@struktur.de)
*/
diff --git a/io/src/main/java/org/red5/compatibility/flex/data/messages/SequencedMessage.java b/io/src/main/java/org/red5/compatibility/flex/data/messages/SequencedMessage.java
index 569981a88..58f3ab360 100644
--- a/io/src/main/java/org/red5/compatibility/flex/data/messages/SequencedMessage.java
+++ b/io/src/main/java/org/red5/compatibility/flex/data/messages/SequencedMessage.java
@@ -11,9 +11,9 @@
/**
* Response to DataMessage requests.
- *
+ *
* @see DataMessage
- *
+ *
* @author The Red5 Project
* @author Joachim Bauch (jojo@struktur.de)
*/
diff --git a/io/src/main/java/org/red5/compatibility/flex/messaging/io/ArrayCollection.java b/io/src/main/java/org/red5/compatibility/flex/messaging/io/ArrayCollection.java
index e198e66e1..e6e53237e 100644
--- a/io/src/main/java/org/red5/compatibility/flex/messaging/io/ArrayCollection.java
+++ b/io/src/main/java/org/red5/compatibility/flex/messaging/io/ArrayCollection.java
@@ -22,9 +22,9 @@
/**
* Flex ArrayCollection compatibility class.
- *
+ *
* @see ArrayCollection
- *
+ *
* @author The Red5 Project
* @author Joachim Bauch (jojo@struktur.de)
* @author Paul Gregoire (mondain@gmail.com)
diff --git a/io/src/main/java/org/red5/compatibility/flex/messaging/io/ObjectProxy.java b/io/src/main/java/org/red5/compatibility/flex/messaging/io/ObjectProxy.java
index 950e91a55..847fcb3ff 100644
--- a/io/src/main/java/org/red5/compatibility/flex/messaging/io/ObjectProxy.java
+++ b/io/src/main/java/org/red5/compatibility/flex/messaging/io/ObjectProxy.java
@@ -19,7 +19,7 @@
/**
* Flex ObjectProxy compatibility class.
- *
+ *
* @see ObjectProxy
* @author The Red5 Project
* @author Joachim Bauch (jojo@struktur.de)
@@ -44,7 +44,7 @@ public ObjectProxy() {
/**
* Create proxy for given object.
- *
+ *
* @param item
* object to proxy
*/
@@ -67,7 +67,7 @@ public void writeExternal(IDataOutput output) {
/**
* Return string representation of the proxied object.
- *
+ *
* @return string
*/
@Override
@@ -82,7 +82,7 @@ public void clear() {
/**
* Check if proxied object has a given property.
- *
+ *
* @param name
* name
* @return boolean
@@ -104,7 +104,7 @@ public Set> entrySet() {
/**
* Return the value of a property.
- *
+ *
* @param name
* name
* @return value
@@ -126,7 +126,7 @@ public Set keySet() {
/**
* Change a property of the proxied object.
- *
+ *
* @param name
* name
* @param value
@@ -146,7 +146,7 @@ public void putAll(Map values) {
/**
* Remove a property from the proxied object.
- *
+ *
* @param name
* name
* @return old value
diff --git a/io/src/main/java/org/red5/compatibility/flex/messaging/messages/AbstractMessage.java b/io/src/main/java/org/red5/compatibility/flex/messaging/messages/AbstractMessage.java
index 64bb5e782..815514994 100644
--- a/io/src/main/java/org/red5/compatibility/flex/messaging/messages/AbstractMessage.java
+++ b/io/src/main/java/org/red5/compatibility/flex/messaging/messages/AbstractMessage.java
@@ -21,7 +21,7 @@
/**
* Base class for all Flex compatibility messages.
- *
+ *
* @author The Red5 Project
* @author Joachim Bauch (jojo@struktur.de)
*/
@@ -58,7 +58,7 @@ public AbstractMessage() {
/**
* Add message properties to string.
- *
+ *
* @param result
* StringBuilder to add properties to
*/
@@ -169,7 +169,7 @@ public void setTimeToLive(long value) {
/**
* Return string representation of the message.
- *
+ *
* @return value
*/
@Override
diff --git a/io/src/main/java/org/red5/compatibility/flex/messaging/messages/AcknowledgeMessage.java b/io/src/main/java/org/red5/compatibility/flex/messaging/messages/AcknowledgeMessage.java
index 345b2a5e4..74654defb 100644
--- a/io/src/main/java/org/red5/compatibility/flex/messaging/messages/AcknowledgeMessage.java
+++ b/io/src/main/java/org/red5/compatibility/flex/messaging/messages/AcknowledgeMessage.java
@@ -16,7 +16,7 @@
/**
* Flex compatibility message that is returned to the client.
- *
+ *
* @author The Red5 Project
* @author Joachim Bauch (jojo@struktur.de)
* @author Paul Gregoire (mondain@gmail.com)
diff --git a/io/src/main/java/org/red5/compatibility/flex/messaging/messages/AcknowledgeMessageExt.java b/io/src/main/java/org/red5/compatibility/flex/messaging/messages/AcknowledgeMessageExt.java
index 9643e554a..49a62f836 100644
--- a/io/src/main/java/org/red5/compatibility/flex/messaging/messages/AcknowledgeMessageExt.java
+++ b/io/src/main/java/org/red5/compatibility/flex/messaging/messages/AcknowledgeMessageExt.java
@@ -12,7 +12,7 @@
/**
* An externalizable version of a given AcknowledgeMessage. The class alias for this class within flex is "DSK".
- *
+ *
* @author Paul Gregoire (mondain@gmail.com)
*/
public class AcknowledgeMessageExt extends AcknowledgeMessage implements IExternalizable {
diff --git a/io/src/main/java/org/red5/compatibility/flex/messaging/messages/AsyncMessage.java b/io/src/main/java/org/red5/compatibility/flex/messaging/messages/AsyncMessage.java
index e6efce7dd..68bb18733 100644
--- a/io/src/main/java/org/red5/compatibility/flex/messaging/messages/AsyncMessage.java
+++ b/io/src/main/java/org/red5/compatibility/flex/messaging/messages/AsyncMessage.java
@@ -16,7 +16,7 @@
/**
* Base class for for asynchronous Flex compatibility messages.
- *
+ *
* @author The Red5 Project
* @author Joachim Bauch (jojo@struktur.de)
* @author Paul Gregoire (mondain@gmail.com)
diff --git a/io/src/main/java/org/red5/compatibility/flex/messaging/messages/AsyncMessageExt.java b/io/src/main/java/org/red5/compatibility/flex/messaging/messages/AsyncMessageExt.java
index d309dd6a5..aa3146a44 100644
--- a/io/src/main/java/org/red5/compatibility/flex/messaging/messages/AsyncMessageExt.java
+++ b/io/src/main/java/org/red5/compatibility/flex/messaging/messages/AsyncMessageExt.java
@@ -12,7 +12,7 @@
/**
* An externalizable version of a given AsyncMessage. The class alias for this class within flex is "DSA".
- *
+ *
* @author Paul Gregoire (mondain@gmail.com)
*/
public class AsyncMessageExt extends AsyncMessage implements IExternalizable {
diff --git a/io/src/main/java/org/red5/compatibility/flex/messaging/messages/AuthenticationMessage.java b/io/src/main/java/org/red5/compatibility/flex/messaging/messages/AuthenticationMessage.java
index eade11dba..81e881fbb 100644
--- a/io/src/main/java/org/red5/compatibility/flex/messaging/messages/AuthenticationMessage.java
+++ b/io/src/main/java/org/red5/compatibility/flex/messaging/messages/AuthenticationMessage.java
@@ -9,7 +9,7 @@
/**
* Added to support flex.messaging.messages.AuthenticationMessage as noted in http://jira.red5.org/browse/APPSERVER-176
- *
+ *
* @author The Red5 Project
* @author Paul Gregoire (mondain@gmail.com)
*/
diff --git a/io/src/main/java/org/red5/compatibility/flex/messaging/messages/CommandMessage.java b/io/src/main/java/org/red5/compatibility/flex/messaging/messages/CommandMessage.java
index d639229e1..492e68ab6 100644
--- a/io/src/main/java/org/red5/compatibility/flex/messaging/messages/CommandMessage.java
+++ b/io/src/main/java/org/red5/compatibility/flex/messaging/messages/CommandMessage.java
@@ -18,7 +18,7 @@
/**
* Command message as sent by the mx:RemoteObject tag.
- *
+ *
* @see Action Message Format
* @see Apache Flex
*
diff --git a/io/src/main/java/org/red5/compatibility/flex/messaging/messages/CommandMessageExt.java b/io/src/main/java/org/red5/compatibility/flex/messaging/messages/CommandMessageExt.java
index 17eb77a3d..0cdeffce8 100644
--- a/io/src/main/java/org/red5/compatibility/flex/messaging/messages/CommandMessageExt.java
+++ b/io/src/main/java/org/red5/compatibility/flex/messaging/messages/CommandMessageExt.java
@@ -12,7 +12,7 @@
/**
* An externalizable version of a given CommandMessage. The class alias for this class within flex is "DSC".
- *
+ *
* @author Paul Gregoire (mondain@gmail.com)
*/
public class CommandMessageExt extends CommandMessage implements IExternalizable {
diff --git a/io/src/main/java/org/red5/compatibility/flex/messaging/messages/Constants.java b/io/src/main/java/org/red5/compatibility/flex/messaging/messages/Constants.java
index e59c9e26b..931310e06 100644
--- a/io/src/main/java/org/red5/compatibility/flex/messaging/messages/Constants.java
+++ b/io/src/main/java/org/red5/compatibility/flex/messaging/messages/Constants.java
@@ -9,7 +9,7 @@
/**
* Constants for the flex compatibility messages.
- *
+ *
* @author The Red5 Project
* @author Joachim Bauch (jojo@struktur.de)
*/
diff --git a/io/src/main/java/org/red5/compatibility/flex/messaging/messages/ErrorMessage.java b/io/src/main/java/org/red5/compatibility/flex/messaging/messages/ErrorMessage.java
index 2c5ba107d..3195ef288 100644
--- a/io/src/main/java/org/red5/compatibility/flex/messaging/messages/ErrorMessage.java
+++ b/io/src/main/java/org/red5/compatibility/flex/messaging/messages/ErrorMessage.java
@@ -9,7 +9,7 @@
/**
* Compatibility flex error message to be returned to the client.
- *
+ *
* @author The Red5 Project
* @author Joachim Bauch (jojo@struktur.de)
*/
diff --git a/io/src/main/java/org/red5/compatibility/flex/messaging/messages/Message.java b/io/src/main/java/org/red5/compatibility/flex/messaging/messages/Message.java
index a19636b62..beecb6468 100644
--- a/io/src/main/java/org/red5/compatibility/flex/messaging/messages/Message.java
+++ b/io/src/main/java/org/red5/compatibility/flex/messaging/messages/Message.java
@@ -39,28 +39,28 @@ public interface Message {
/**
* Returns the body of the message.
- *
+ *
* @return message body
*/
Object getBody();
/**
* Returns the client id indicating the client that sent the message.
- *
+ *
* @return client id
*/
String getClientId();
/**
* Returns the destination that the message targets.
- *
+ *
* @return destination
*/
String getDestination();
/**
* Returns a header value corresponding to the passed header name.
- *
+ *
* @param name
* header name
* @return header value
@@ -69,35 +69,35 @@ public interface Message {
/**
* Returns the headers for the message.
- *
+ *
* @return headers
*/
Map getHeaders();
/**
* Returns the unique message id.
- *
+ *
* @return message id
*/
String getMessageId();
/**
* Returns the timestamp for the message.
- *
+ *
* @return timestamp
*/
long getTimestamp();
/**
* Returns the time to live for the message.
- *
+ *
* @return time to live
*/
long getTimeToLive();
/**
* Tests whether a header with the passed name exists.
- *
+ *
* @param name
* header name
* @return true if header exists, false otherwise
@@ -106,7 +106,7 @@ public interface Message {
/**
* Sets the body of the message.
- *
+ *
* @param value
* body
*/
@@ -114,7 +114,7 @@ public interface Message {
/**
* Sets the client id indicating the client that sent the message.
- *
+ *
* @param value
* client id
*/
@@ -122,7 +122,7 @@ public interface Message {
/**
* Sets the destination that the message targets.
- *
+ *
* @param value
* destination
*/
@@ -130,7 +130,7 @@ public interface Message {
/**
* Sets a header on the message.
- *
+ *
* @param name
* header name
* @param value
@@ -140,7 +140,7 @@ public interface Message {
/**
* Sets the headers for the message.
- *
+ *
* @param values
* header values
*/
@@ -148,7 +148,7 @@ public interface Message {
/**
* Sets the unique message id.
- *
+ *
* @param value
* message id
*/
@@ -156,7 +156,7 @@ public interface Message {
/**
* Sets the timestamp for the message.
- *
+ *
* @param value
* timestamp
*/
@@ -164,7 +164,7 @@ public interface Message {
/**
* Sets the time to live for the message.
- *
+ *
* @param value
* ttl
*/
diff --git a/io/src/main/java/org/red5/compatibility/flex/messaging/messages/RemotingMessage.java b/io/src/main/java/org/red5/compatibility/flex/messaging/messages/RemotingMessage.java
index 022bf48a6..d3392c49b 100644
--- a/io/src/main/java/org/red5/compatibility/flex/messaging/messages/RemotingMessage.java
+++ b/io/src/main/java/org/red5/compatibility/flex/messaging/messages/RemotingMessage.java
@@ -9,10 +9,10 @@
/**
* Flex compatibility message that is sent by the mx:RemoteObject mxml tag.
- *
+ *
* @see Action Message Format
* @see Apache Flex
- *
+ *
* @author The Red5 Project
* @author Joachim Bauch (jojo@struktur.de)
*/
diff --git a/io/src/main/java/org/red5/io/ITagWriter.java b/io/src/main/java/org/red5/io/ITagWriter.java
index a0ab88b79..fa8075e0f 100644
--- a/io/src/main/java/org/red5/io/ITagWriter.java
+++ b/io/src/main/java/org/red5/io/ITagWriter.java
@@ -86,7 +86,7 @@ public interface ITagWriter {
/**
* Adds a post-process for execution once the instance completes.
- *
+ *
* @param postProcessor an implementation instance of IPostProcessor
*/
public void addPostProcessor(IPostProcessor postProcessor);
diff --git a/io/src/main/java/org/red5/io/amf/AMF.java b/io/src/main/java/org/red5/io/amf/AMF.java
index 5c513d7bf..b8ed9306d 100644
--- a/io/src/main/java/org/red5/io/amf/AMF.java
+++ b/io/src/main/java/org/red5/io/amf/AMF.java
@@ -11,11 +11,11 @@
/**
* These are the core AMF data types supported by Red5.
- *
+ *
* For detailed specification please see the link below.
- *
+ *
* @see Action Message Format
- *
+ *
* @author The Red5 Project
* @author Luke Hubbard, Codegent Ltd (luke@codegent.com)
*/
diff --git a/io/src/main/java/org/red5/io/amf/Input.java b/io/src/main/java/org/red5/io/amf/Input.java
index 01775d2f4..de924cc54 100644
--- a/io/src/main/java/org/red5/io/amf/Input.java
+++ b/io/src/main/java/org/red5/io/amf/Input.java
@@ -180,7 +180,7 @@ public Number readNumber() {
/**
* Reads string from buffer
- *
+ *
* @return String
*/
@Override
@@ -230,7 +230,7 @@ public String readString() {
/**
* Converts the bytes into a string.
- *
+ *
* @param str
* string bytes
* @return decoded String
@@ -305,7 +305,7 @@ public Map readKeyValues() {
/**
* Read key - value pairs into Map object
- *
+ *
* @param result
* Map to put resulting pair to
*/
diff --git a/io/src/main/java/org/red5/io/amf/Output.java b/io/src/main/java/org/red5/io/amf/Output.java
index f4b55bab2..d4480ebe2 100644
--- a/io/src/main/java/org/red5/io/amf/Output.java
+++ b/io/src/main/java/org/red5/io/amf/Output.java
@@ -68,7 +68,7 @@ private static CacheManager getCacheManager() {
cacheManager = constructDefault();
}
} else {
- // not a server, maybe running tests?
+ // not a server, maybe running tests?
cacheManager = constructDefault();
}
}
@@ -91,7 +91,7 @@ private static CacheManager constructDefault() {
/**
* Creates output with given byte buffer
- *
+ *
* @param buf
* Byte buffer
*/
@@ -526,7 +526,7 @@ protected static byte[] encodeString(String string) {
/**
* Write out string
- *
+ *
* @param buf
* Byte buffer to write to
* @param string
@@ -559,7 +559,7 @@ public void writeXML(Document xml) {
/**
* Convenience method to allow XML text to be used, instead of requiring an XML Document.
- *
+ *
* @param xml
* xml to write
*/
@@ -570,7 +570,7 @@ public void writeXML(String xml) {
/**
* Return buffer of this Output object
- *
+ *
* @return Byte buffer of this Output object
*/
public IoBuffer buf() {
diff --git a/io/src/main/java/org/red5/io/amf3/AMF3.java b/io/src/main/java/org/red5/io/amf3/AMF3.java
index 634b74487..deabb7884 100644
--- a/io/src/main/java/org/red5/io/amf3/AMF3.java
+++ b/io/src/main/java/org/red5/io/amf3/AMF3.java
@@ -11,10 +11,10 @@
* AMF3 data type definitions.
*
* For detailed specification please see the link below.
- *
+ *
* @see Action Message Format
* @see Official Adobe AMF3 Specification
- *
+ *
* @author The Red5 Project
* @author Luke Hubbard, Codegent Ltd (luke@codegent.com)
* @author Joachim Bauch (jojo@struktur.de)
@@ -131,21 +131,21 @@ public class AMF3 {
/**
* Property list encoding.
- *
+ *
* The remaining integer-data represents the number of class members that exist. The property names are read as string-data. The values are then read as AMF3-data.
*/
public static final byte TYPE_OBJECT_PROPERTY = 0x00;
/**
* Externalizable object.
- *
+ *
* What follows is the value of the "inner" object, including type code. This value appears for objects that implement IExternalizable, such as ArrayCollection and ObjectProxy.
*/
public static final byte TYPE_OBJECT_EXTERNALIZABLE = 0x01;
/**
* Name-value encoding.
- *
+ *
* The property names and values are encoded as string-data followed by AMF3-data until there is an empty string property name. If there is a class-def reference there are no property names and the number of values is equal to the number of properties in the class-def.
*/
public static final byte TYPE_OBJECT_VALUE = 0x02;
diff --git a/io/src/main/java/org/red5/io/amf3/ByteArray.java b/io/src/main/java/org/red5/io/amf3/ByteArray.java
index bf1b0ac16..f371f038e 100644
--- a/io/src/main/java/org/red5/io/amf3/ByteArray.java
+++ b/io/src/main/java/org/red5/io/amf3/ByteArray.java
@@ -17,7 +17,7 @@
/**
* Red5 version of the Flex ByteArray class.
- *
+ *
* @author The Red5 Project
* @author Joachim Bauch (jojo@struktur.de)
*/
@@ -34,7 +34,7 @@ public class ByteArray implements IDataInput, IDataOutput {
/**
* Internal constructor used to create ByteArray during deserialization.
- *
+ *
* @param buffer
* io buffer
* @param length
@@ -74,7 +74,7 @@ protected void prepareIO() {
/**
* Get internal data.
- *
+ *
* @return byte buffer
*/
protected IoBuffer getData() {
@@ -83,7 +83,7 @@ protected IoBuffer getData() {
/**
* Get the current position in the data.
- *
+ *
* @return current position
*/
public int position() {
@@ -92,7 +92,7 @@ public int position() {
/**
* Set the current position in the data.
- *
+ *
* @param position
* position to set
*/
@@ -102,7 +102,7 @@ public void position(int position) {
/**
* Return number of bytes available for reading.
- *
+ *
* @return bytes available
*/
public int bytesAvailable() {
@@ -111,7 +111,7 @@ public int bytesAvailable() {
/**
* Return total number of bytes in array.
- *
+ *
* @return number of bytes in array
*/
public int length() {
@@ -232,7 +232,7 @@ public String readMultiByte(int length, String charSet) {
@Override
public Object readObject() {
// according to AMF3 spec, each object should have its own "reference" tables,
- // so we must recreate Input object before reading each object
+ // so we must recreate Input object before reading each object
prepareIO();
return dataInput.readObject();
}
@@ -338,7 +338,7 @@ public void writeMultiByte(String value, String encoding) {
@Override
public void writeObject(Object value) {
// according to AMF3 spec, each object should have its own "reference" tables,
- // so we must recreate Input object before writing each object
+ // so we must recreate Input object before writing each object
prepareIO();
dataOutput.writeObject(value);
}
@@ -400,7 +400,7 @@ public boolean equals(Object obj) {
/**
* Return string representation of the array's contents.
- *
+ *
* @return string representation of array's contents.
*/
@Override
diff --git a/io/src/main/java/org/red5/io/amf3/DataInput.java b/io/src/main/java/org/red5/io/amf3/DataInput.java
index 1e3cd8889..86ecd19e6 100644
--- a/io/src/main/java/org/red5/io/amf3/DataInput.java
+++ b/io/src/main/java/org/red5/io/amf3/DataInput.java
@@ -17,10 +17,10 @@
/**
* Implementation of the IDataInput interface. Can be used to load an IExternalizable object.
- *
+ *
* @author The Red5 Project
* @author Joachim Bauch (jojo@struktur.de)
- *
+ *
*/
public class DataInput implements IDataInput {
@@ -32,7 +32,7 @@ public class DataInput implements IDataInput {
/**
* Create a new DataInput.
- *
+ *
* @param input
* input to use
*/
diff --git a/io/src/main/java/org/red5/io/amf3/DataOutput.java b/io/src/main/java/org/red5/io/amf3/DataOutput.java
index e8fff1500..0ff5062fd 100644
--- a/io/src/main/java/org/red5/io/amf3/DataOutput.java
+++ b/io/src/main/java/org/red5/io/amf3/DataOutput.java
@@ -18,10 +18,10 @@
/**
* Implementation of the IDataOutput interface. Can be used to store an IExternalizable object.
- *
+ *
* @author The Red5 Project
* @author Joachim Bauch (jojo@struktur.de)
- *
+ *
*/
public class DataOutput implements IDataOutput {
@@ -33,7 +33,7 @@ public class DataOutput implements IDataOutput {
/**
* Create a new DataOutput.
- *
+ *
* @param output
* destination to write to
*/
diff --git a/io/src/main/java/org/red5/io/amf3/IDataInput.java b/io/src/main/java/org/red5/io/amf3/IDataInput.java
index 8b1fcc9bd..1213f5f8f 100644
--- a/io/src/main/java/org/red5/io/amf3/IDataInput.java
+++ b/io/src/main/java/org/red5/io/amf3/IDataInput.java
@@ -11,7 +11,7 @@
/**
* Interface implemented by classes that provide a way to load custom objects.
- *
+ *
* @see IExternalizable#readExternal(IDataInput)
* @see Adobe Livedocs (external)
*/
@@ -19,14 +19,14 @@ public interface IDataInput {
/**
* Return the byteorder used when loading values.
- *
+ *
* @return the byteorder
*/
public ByteOrder getEndian();
/**
* Set the byteorder to use when loading values.
- *
+ *
* @param endian
* the byteorder to use
*/
@@ -34,21 +34,21 @@ public interface IDataInput {
/**
* Read boolean value.
- *
+ *
* @return the value
*/
public boolean readBoolean();
/**
* Read signed single byte value.
- *
+ *
* @return the value
*/
public byte readByte();
/**
* Read list of bytes.
- *
+ *
* @param bytes
* destination for read bytes
*/
@@ -56,7 +56,7 @@ public interface IDataInput {
/**
* Read list of bytes to given offset.
- *
+ *
* @param bytes
* destination for read bytes
* @param offset
@@ -66,7 +66,7 @@ public interface IDataInput {
/**
* Read given number of bytes to given offset.
- *
+ *
* @param bytes
* destination for read bytes
* @param offset
@@ -78,28 +78,28 @@ public interface IDataInput {
/**
* Read double-precision floating point value.
- *
+ *
* @return the value
*/
public double readDouble();
/**
* Read single-precision floating point value.
- *
+ *
* @return the value
*/
public float readFloat();
/**
* Read signed integer value.
- *
+ *
* @return the value
*/
public int readInt();
/**
* Read multibyte string.
- *
+ *
* @param length
* length of string to read
* @param charSet
@@ -110,49 +110,49 @@ public interface IDataInput {
/**
* Read arbitrary object.
- *
+ *
* @return the object
*/
public Object readObject();
/**
* Read signed short value.
- *
+ *
* @return the value
*/
public short readShort();
/**
* Read unsigned single byte value.
- *
+ *
* @return the value
*/
public int readUnsignedByte();
/**
* Read unsigned integer value.
- *
+ *
* @return the value
*/
public long readUnsignedInt();
/**
* Read unsigned short value.
- *
+ *
* @return the value
*/
public int readUnsignedShort();
/**
* Read UTF-8 encoded string.
- *
+ *
* @return the string
*/
public String readUTF();
/**
* Read UTF-8 encoded string with given length.
- *
+ *
* @param length
* the length of the string
* @return the string
diff --git a/io/src/main/java/org/red5/io/amf3/IDataOutput.java b/io/src/main/java/org/red5/io/amf3/IDataOutput.java
index f02d0a0c4..ea7b0e691 100644
--- a/io/src/main/java/org/red5/io/amf3/IDataOutput.java
+++ b/io/src/main/java/org/red5/io/amf3/IDataOutput.java
@@ -11,7 +11,7 @@
/**
* Interface implemented by classes that provide a way to store custom objects.
- *
+ *
* @see IExternalizable#writeExternal(IDataOutput)
* @see Adobe Livedocs (external)
*/
@@ -19,14 +19,14 @@ public interface IDataOutput {
/**
* Return the byteorder used when storing values.
- *
+ *
* @return the byteorder
*/
public ByteOrder getEndian();
/**
* Set the byteorder to use when storing values.
- *
+ *
* @param endian
* the byteorder to use
*/
@@ -34,7 +34,7 @@ public interface IDataOutput {
/**
* Write boolean value.
- *
+ *
* @param value
* the value
*/
@@ -42,7 +42,7 @@ public interface IDataOutput {
/**
* Write signed byte value.
- *
+ *
* @param value
* the value
*/
@@ -50,7 +50,7 @@ public interface IDataOutput {
/**
* Write multiple bytes.
- *
+ *
* @param bytes
* the bytes
*/
@@ -58,7 +58,7 @@ public interface IDataOutput {
/**
* Write multiple bytes from given offset.
- *
+ *
* @param bytes
* the bytes
* @param offset
@@ -68,7 +68,7 @@ public interface IDataOutput {
/**
* Write given number of bytes from given offset.
- *
+ *
* @param bytes
* the bytes
* @param offset
@@ -80,7 +80,7 @@ public interface IDataOutput {
/**
* Write double-precision floating point value.
- *
+ *
* @param value
* the value
*/
@@ -88,7 +88,7 @@ public interface IDataOutput {
/**
* Write single-precision floating point value.
- *
+ *
* @param value
* the value
*/
@@ -96,7 +96,7 @@ public interface IDataOutput {
/**
* Write signed integer value.
- *
+ *
* @param value
* the value
*/
@@ -104,7 +104,7 @@ public interface IDataOutput {
/**
* Write string in given character set.
- *
+ *
* @param value
* the string
* @param encoding
@@ -114,7 +114,7 @@ public interface IDataOutput {
/**
* Write arbitrary object.
- *
+ *
* @param value
* the object
*/
@@ -122,7 +122,7 @@ public interface IDataOutput {
/**
* Write signed short value.
- *
+ *
* @param value
* the value
*/
@@ -130,7 +130,7 @@ public interface IDataOutput {
/**
* Write unsigned integer value.
- *
+ *
* @param value
* the value
*/
@@ -138,7 +138,7 @@ public interface IDataOutput {
/**
* Write UTF-8 encoded string.
- *
+ *
* @param value
* the string
*/
@@ -146,7 +146,7 @@ public interface IDataOutput {
/**
* Write UTF-8 encoded string as byte array. This string is stored without informations about its length, so {@link IDataInput#readUTFBytes(int)} must be used to load it.
- *
+ *
* @param value
* the string
*/
diff --git a/io/src/main/java/org/red5/io/amf3/IExternalizable.java b/io/src/main/java/org/red5/io/amf3/IExternalizable.java
index 543734265..b162c0463 100644
--- a/io/src/main/java/org/red5/io/amf3/IExternalizable.java
+++ b/io/src/main/java/org/red5/io/amf3/IExternalizable.java
@@ -9,14 +9,14 @@
/**
* Interface that needs to be implemented by classes that serialize / deserialize themselves.
- *
+ *
* @see Adobe Livedocs (external)
*/
public interface IExternalizable {
/**
* Load custom object from stream.
- *
+ *
* @param input
* object to be used for data loading
*/
@@ -24,7 +24,7 @@ public interface IExternalizable {
/**
* Store custom object to stream.
- *
+ *
* @param output
* object to be used for data storing
*/
diff --git a/io/src/main/java/org/red5/io/amf3/Input.java b/io/src/main/java/org/red5/io/amf3/Input.java
index b2db4bef0..baf670c12 100644
--- a/io/src/main/java/org/red5/io/amf3/Input.java
+++ b/io/src/main/java/org/red5/io/amf3/Input.java
@@ -71,7 +71,7 @@ protected static class ClassReference {
/**
* Create new information about a class.
- *
+ *
* @param className
* class name
* @param type
@@ -175,7 +175,7 @@ public static class RefStorage {
/**
* Creates Input object for AMF3 from byte buffer
- *
+ *
* @param buf
* Byte buffer
*/
@@ -185,7 +185,7 @@ public Input(IoBuffer buf) {
/**
* Creates Input object for AMF3 from byte buffer and initializes references from passed RefStorage
- *
+ *
* @param buf
* buffer
* @param refStorage
@@ -206,7 +206,7 @@ public void enforceAMF3() {
/**
* Provide access to raw data.
- *
+ *
* @return IoBuffer
*/
protected IoBuffer getBuffer() {
@@ -215,7 +215,7 @@ protected IoBuffer getBuffer() {
/**
* Reads the data type
- *
+ *
* @return byte Data type
*/
@Override
@@ -329,7 +329,7 @@ public byte readDataType() {
/**
* Reads a null (value)
- *
+ *
* @return Object null
*/
@Override
@@ -339,7 +339,7 @@ public Object readNull() {
/**
* Reads a boolean
- *
+ *
* @return boolean Boolean value
*/
@Override
@@ -349,7 +349,7 @@ public Boolean readBoolean() {
/**
* Reads a Number
- *
+ *
* @return Number Number
*/
@Override
@@ -383,7 +383,7 @@ public Number readNumber() {
/**
* Reads a string
- *
+ *
* @return String String
*/
@Override
@@ -427,7 +427,7 @@ public String readString() {
/**
* Reads a string of a set length. This does not use the string reference table.
- *
+ *
* @param length the length of the string
* @return String
*/
@@ -458,7 +458,7 @@ public String getString() {
/**
* Returns a date
- *
+ *
* @return Date Date object
*/
@Override
@@ -478,7 +478,7 @@ public Date readDate() {
/**
* Returns an array
- *
+ *
* @return int Length of array
*/
@SuppressWarnings({ "unchecked", "rawtypes" })
@@ -1014,7 +1014,7 @@ public Vector readVectorObject() {
/**
* Reads Custom
- *
+ *
* @return Object Custom type object
*/
@Override
@@ -1031,7 +1031,7 @@ public Object readReference() {
/**
* Parser of AMF3 "compressed" integer data type
- *
+ *
* @return a converted integer value
*/
private int readInteger() {
diff --git a/io/src/main/java/org/red5/io/amf3/Output.java b/io/src/main/java/org/red5/io/amf3/Output.java
index d3d964f61..268f55f21 100644
--- a/io/src/main/java/org/red5/io/amf3/Output.java
+++ b/io/src/main/java/org/red5/io/amf3/Output.java
@@ -566,7 +566,7 @@ public void writeByteArray(ByteArray array) {
/**
* Write a Vector<int>.
- *
+ *
* @param vector
* vector
*/
@@ -598,7 +598,7 @@ public void writeVectorInt(Vector vector) {
/**
* Write a Vector<uint>.
- *
+ *
* @param vector
* vector
*/
@@ -624,7 +624,7 @@ public void writeVectorUInt(Vector vector) {
/**
* Write a Vector<Number>.
- *
+ *
* @param vector
* vector
*/
@@ -647,7 +647,7 @@ public void writeVectorNumber(Vector vector) {
/**
* Write a Vector<Object>.
- *
+ *
* @param vector
* vector
*/
diff --git a/io/src/main/java/org/red5/io/flv/IFLV.java b/io/src/main/java/org/red5/io/flv/IFLV.java
index 1079471e3..d11cb3bb5 100644
--- a/io/src/main/java/org/red5/io/flv/IFLV.java
+++ b/io/src/main/java/org/red5/io/flv/IFLV.java
@@ -25,14 +25,14 @@ public interface IFLV extends IStreamableFile {
/**
* Returns a boolean stating whether the flv has metadata
- *
+ *
* @return boolean true if file has injected metadata, false otherwise
*/
public boolean hasMetaData();
/**
* Sets the metadata
- *
+ *
* @param metadata
* Metadata object
* @throws FileNotFoundException
@@ -45,7 +45,7 @@ public interface IFLV extends IStreamableFile {
/**
* Sets the MetaService through Spring
- *
+ *
* @param service
* Metadata service
*/
@@ -53,7 +53,7 @@ public interface IFLV extends IStreamableFile {
/**
* Returns a map of the metadata
- *
+ *
* @return metadata File metadata
* @throws FileNotFoundException
* File not found
@@ -63,14 +63,14 @@ public interface IFLV extends IStreamableFile {
/**
* Returns a boolean stating whether a flv has keyframedata
- *
+ *
* @return boolean true if file has keyframe metadata, false otherwise
*/
public boolean hasKeyFrameData();
/**
* Sets the keyframe data of a flv file
- *
+ *
* @param keyframedata
* Keyframe metadata
*/
@@ -79,7 +79,7 @@ public interface IFLV extends IStreamableFile {
/**
* Gets the keyframe data
- *
+ *
* @return keyframedata Keyframe metadata
*/
@SuppressWarnings({ "rawtypes" })
@@ -87,7 +87,7 @@ public interface IFLV extends IStreamableFile {
/**
* Refreshes the headers. Usually used after data is added to the flv file
- *
+ *
* @throws IOException
* Any I/O exception
*/
@@ -95,7 +95,7 @@ public interface IFLV extends IStreamableFile {
/**
* Flushes Header
- *
+ *
* @throws IOException
* Any I/O exception
*/
@@ -103,7 +103,7 @@ public interface IFLV extends IStreamableFile {
/**
* Returns a Reader closest to the nearest keyframe
- *
+ *
* @param seekPoint
* Point in file we are seeking around
* @return reader Tag reader closest to that point
@@ -112,7 +112,7 @@ public interface IFLV extends IStreamableFile {
/**
* Returns a Writer based on the nearest key frame
- *
+ *
* @param seekPoint
* Point in file we are seeking around
* @return writer Tag writer closest to that point
@@ -121,7 +121,7 @@ public interface IFLV extends IStreamableFile {
/**
* Sets the caching implemenation
- *
+ *
* @param cache
* cache
*/
diff --git a/io/src/main/java/org/red5/io/flv/impl/FLV.java b/io/src/main/java/org/red5/io/flv/impl/FLV.java
index 4bdc5a19b..93023f5be 100644
--- a/io/src/main/java/org/red5/io/flv/impl/FLV.java
+++ b/io/src/main/java/org/red5/io/flv/impl/FLV.java
@@ -34,7 +34,7 @@
/**
* A FLVImpl implements the FLV api
- *
+ *
* @author The Red5 Project
* @author Dominick Accattato (daccattato@gmail.com)
* @author Luke Hubbard, Codegent Ltd (luke@codegent.com)
@@ -73,7 +73,7 @@ public FLV() {
/**
* Create FLV from given file source
- *
+ *
* @param file
* File source
*/
@@ -83,7 +83,7 @@ public FLV(File file) {
/**
* Create FLV from given file source and with specified metadata generation option
- *
+ *
* @param file
* File source
* @param generateMetadata
@@ -115,7 +115,7 @@ public FLV(File file, boolean generateMetadata) {
/**
* Sets the cache implementation to be used.
- *
+ *
* @param cache
* Cache store
*/
@@ -126,7 +126,7 @@ public void setCache(ICacheStore cache) {
/**
* Sets a writer post processor.
- *
+ *
* @param writerPostProcessor IPostProcess implementation class name
*/
@SuppressWarnings("unchecked")
@@ -143,7 +143,7 @@ public void setWriterPostProcessor(String writerPostProcessor) {
/**
* Sets a group of writer post processors.
- *
+ *
* @param writerPostProcessors IPostProcess implementation class names
*/
@SuppressWarnings("unchecked")
diff --git a/io/src/main/java/org/red5/io/flv/impl/FLVReader.java b/io/src/main/java/org/red5/io/flv/impl/FLVReader.java
index db25b3f44..029806be4 100644
--- a/io/src/main/java/org/red5/io/flv/impl/FLVReader.java
+++ b/io/src/main/java/org/red5/io/flv/impl/FLVReader.java
@@ -462,7 +462,7 @@ public static void setBufferSize(int bufferSize) {
/**
* Returns the file buffer.
- *
+ *
* @return File contents as byte buffer
*/
public IoBuffer getFileData() {
@@ -923,7 +923,7 @@ private ITag readTagHeader() throws UnsupportedDataTypeException {
/**
* Returns the last tag's timestamp as the files duration.
- *
+ *
* @param flvFile
* FLV file
* @return duration
diff --git a/io/src/main/java/org/red5/io/flv/impl/FLVWriter.java b/io/src/main/java/org/red5/io/flv/impl/FLVWriter.java
index 764a2b0b7..3ba2ea924 100644
--- a/io/src/main/java/org/red5/io/flv/impl/FLVWriter.java
+++ b/io/src/main/java/org/red5/io/flv/impl/FLVWriter.java
@@ -190,7 +190,7 @@ public class FLVWriter implements ITagWriter {
/**
* Creates writer implementation with for a given file
- *
+ *
* @param filePath
* path to existing file
*/
@@ -394,7 +394,7 @@ public boolean writeTag(ITag tag) throws IOException {
}
// get the data type
byte dataType = tag.getDataType();
- // when tag is ImmutableTag which is in red5-server-common.jar, tag.getBody().reset() will throw InvalidMarkException because
+ // when tag is ImmutableTag which is in red5-server-common.jar, tag.getBody().reset() will throw InvalidMarkException because
// ImmutableTag.getBody() returns a new IoBuffer instance everytime.
IoBuffer tagBody = tag.getBody();
// set a var holding the entire tag size including the previous tag length
@@ -541,8 +541,8 @@ public boolean writeTag(ITag tag) throws IOException {
}
// Data Type
IOUtils.writeUnsignedByte(tagBuffer, dataType); //1
- // Body Size - Length of the message. Number of bytes after StreamID to end of tag
- // (Equal to length of the tag - 11)
+ // Body Size - Length of the message. Number of bytes after StreamID to end of tag
+ // (Equal to length of the tag - 11)
IOUtils.writeMediumInt(tagBuffer, bodySize); //3
// Timestamp
IOUtils.writeExtendedMediumInt(tagBuffer, timestamp); //4
@@ -625,8 +625,8 @@ public boolean writeTag(byte dataType, IoBuffer data) throws IOException {
ByteBuffer tagBuffer = ByteBuffer.allocate(totalTagSize);
// Data Type
IOUtils.writeUnsignedByte(tagBuffer, dataType); //1
- // Body Size - Length of the message. Number of bytes after StreamID to end of tag
- // (Equal to length of the tag - 11)
+ // Body Size - Length of the message. Number of bytes after StreamID to end of tag
+ // (Equal to length of the tag - 11)
IOUtils.writeMediumInt(tagBuffer, bodySize); //3
// Timestamp
int timestamp = (int) (System.currentTimeMillis() - timeOffset);
@@ -695,7 +695,7 @@ public boolean writeStream(byte[] b) {
/**
* Create the stream output file; the flv itself.
- *
+ *
* @throws IOException
*/
private void createOutputFile() throws IOException {
@@ -704,7 +704,7 @@ private void createOutputFile() throws IOException {
/**
* Create the stream data file.
- *
+ *
* @throws IOException
*/
private void createDataFile() throws IOException {
@@ -782,7 +782,7 @@ private void writeMetadataTag(double duration, int videoCodecId, int audioCodecI
}
params.put("stereo", soundType);
if (audioDataSize > 0) {
- params.put("audiodatarate", 8 * audioDataSize / 1024 / duration); //from bytes to kilobits
+ params.put("audiodatarate", 8 * audioDataSize / 1024 / duration); //from bytes to kilobits
}
} else {
// place holder
@@ -806,8 +806,8 @@ private void writeMetadataTag(double duration, int videoCodecId, int audioCodecI
buf.get(bodyBuf);
// Data Type
IOUtils.writeUnsignedByte(tagBuffer, ITag.TYPE_METADATA); //1
- // Body Size - Length of the message. Number of bytes after StreamID to end of tag
- // (Equal to length of the tag - 11)
+ // Body Size - Length of the message. Number of bytes after StreamID to end of tag
+ // (Equal to length of the tag - 11)
IOUtils.writeMediumInt(tagBuffer, bodySize); //3
// Timestamp
IOUtils.writeExtendedMediumInt(tagBuffer, timestamp); //4
@@ -843,7 +843,7 @@ private void writeMetadataTag(double duration, int videoCodecId, int audioCodecI
/**
* Finalizes the FLV file.
- *
+ *
* @return bytes transferred
*/
private long finalizeFlv() {
@@ -931,7 +931,7 @@ private long finalizeFlv() {
// get starting position of the channel where latest stream data was written
long pos = dataChannel.position();
log.trace("Data available: {} bytes", pos);
- // set the data file the beginning
+ // set the data file the beginning
dataChannel.position(0L);
// transfer / write data file into final flv
int read = -1, wrote;
@@ -1005,7 +1005,7 @@ private long finalizeFlv() {
/**
* Read flv file information from pre-finalization file.
- *
+ *
* @param tmpFile
* @return array containing audio codec id, video codec id, and duration
*/
@@ -1186,7 +1186,7 @@ public void run() {
/**
* Allows repair of flv files if .info and .ser files still exist.
- *
+ *
* @param path
* path to .ser file
* @param audioId
@@ -1253,7 +1253,7 @@ public static boolean repair(String path, Integer audioId, Integer videoId) thro
/**
* Submits a finalizer internally.
- *
+ *
* @param flvFinalizer
* @return Future representing task
*/
@@ -1266,7 +1266,7 @@ private Future submit(FLVFinalizer flvFinalizer) {
/**
* Exposed to allow repair of flv files if .info and .ser files still exist.
- *
+ *
* @param args
* 0: path to .ser file 1: audio codec id 2: video codec id
* @throws InterruptedException
diff --git a/io/src/main/java/org/red5/io/flv/impl/Tag.java b/io/src/main/java/org/red5/io/flv/impl/Tag.java
index 622e6b6e5..9e50b1a44 100644
--- a/io/src/main/java/org/red5/io/flv/impl/Tag.java
+++ b/io/src/main/java/org/red5/io/flv/impl/Tag.java
@@ -12,7 +12,7 @@
/**
* A Tag represents the contents or payload of a FLV file.
- *
+ *
* @see FLV Tag
*
* @author The Red5 Project
@@ -58,7 +58,7 @@ public class Tag implements ITag {
/**
* TagImpl Constructor
- *
+ *
* @param dataType
* Tag data type
* @param timestamp
@@ -112,7 +112,7 @@ public IoBuffer getData() {
/**
* Return the body IoBuffer
- *
+ *
* @return Tag body
*/
@Override
@@ -122,7 +122,7 @@ public IoBuffer getBody() {
/**
* Return the size of the body
- *
+ *
* @return Tag body size
*/
@Override
@@ -132,7 +132,7 @@ public int getBodySize() {
/**
* Get the data type
- *
+ *
* @return Tag data type
*/
@Override
@@ -142,7 +142,7 @@ public byte getDataType() {
/**
* Return the timestamp
- *
+ *
* @return Tag timestamp
*/
@Override
@@ -152,7 +152,7 @@ public int getTimestamp() {
/**
* Return previous tag size
- *
+ *
* @return Previous tag size
*/
@Override
@@ -162,7 +162,7 @@ public int getPreviousTagSize() {
/**
* Prints out the contents of the tag
- *
+ *
* @return Tag contents
*/
@Override
diff --git a/io/src/main/java/org/red5/io/flv/meta/IMeta.java b/io/src/main/java/org/red5/io/flv/meta/IMeta.java
index 7ea143669..1e8097ab0 100644
--- a/io/src/main/java/org/red5/io/flv/meta/IMeta.java
+++ b/io/src/main/java/org/red5/io/flv/meta/IMeta.java
@@ -11,7 +11,7 @@
/**
* IMeta is a Marker Interface CuePoint and MetaData both implement this interface
- *
+ *
* @author The Red5 Project
* @author daccattato(daccattato@gmail.com)
*/
diff --git a/io/src/main/java/org/red5/io/flv/meta/IMetaCue.java b/io/src/main/java/org/red5/io/flv/meta/IMetaCue.java
index 287f8fdce..ddd525ef8 100644
--- a/io/src/main/java/org/red5/io/flv/meta/IMetaCue.java
+++ b/io/src/main/java/org/red5/io/flv/meta/IMetaCue.java
@@ -9,7 +9,7 @@
/**
* ICuePoint defines contract methods for use with cuepoints
- *
+ *
* @author The Red5 Project
* @author Dominick Accattato (daccattato@gmail.com)
*/
@@ -17,24 +17,24 @@ public interface IMetaCue extends IMeta, Comparable {
/**
* Sets the name
- *
+ *
* @param name
* Cue point name
- *
+ *
*/
public void setName(String name);
/**
* Gets the name
- *
+ *
* @return name Cue point name
- *
+ *
*/
public String getName();
/**
* Sets the type type can be "event" or "navigation"
- *
+ *
* @param type
* Cue point type
*
@@ -43,7 +43,7 @@ public interface IMetaCue extends IMeta, Comparable {
/**
* Gets the type
- *
+ *
* @return type Cue point type
*
*/
@@ -51,7 +51,7 @@ public interface IMetaCue extends IMeta, Comparable {
/**
* Sets the time
- *
+ *
* @param d
* Timestamp
*
@@ -60,7 +60,7 @@ public interface IMetaCue extends IMeta, Comparable {
/**
* Gets the time
- *
+ *
* @return time Timestamp
*
*/
diff --git a/io/src/main/java/org/red5/io/flv/meta/IMetaData.java b/io/src/main/java/org/red5/io/flv/meta/IMetaData.java
index 991a6cde4..0fa8d1054 100644
--- a/io/src/main/java/org/red5/io/flv/meta/IMetaData.java
+++ b/io/src/main/java/org/red5/io/flv/meta/IMetaData.java
@@ -9,10 +9,10 @@
/**
* FLV MetaData interface
- *
+ *
* @author The Red5 Project
* @author Dominick Accattato (daccattato@gmail.com)
- *
+ *
* Sample Data: private boolean canSeekToEnd = true; private int videocodecid = 4; private int framerate = 15; private int videodatarate = 400; private int height = 215; private int width = 320; private int duration = 7.347;
* @param
* key type
@@ -23,14 +23,14 @@ public interface IMetaData extends IMeta {
/**
* Returns a boolean depending on whether the video can seek to end
- *
+ *
* @return true if file is seekable to the end, false otherwise
*/
public boolean getCanSeekToEnd();
/**
* Sets whether a video can seek to end
- *
+ *
* @param b
* true if file is seekable to the end, false otherwise
*/
@@ -38,14 +38,14 @@ public interface IMetaData extends IMeta {
/**
* Returns the video codec id
- *
+ *
* @return Video codec id
*/
public int getVideoCodecId();
/**
* Sets the video codec id
- *
+ *
* @param id
* Video codec id
*/
@@ -57,14 +57,14 @@ public interface IMetaData extends IMeta {
/**
* Returns the framerate.
- *
+ *
* @return FLV framerate in frames per second
*/
public double getFrameRate();
/**
* Sets the framerate.
- *
+ *
* @param rate
* FLV framerate in frames per second
*/
@@ -72,14 +72,14 @@ public interface IMetaData extends IMeta {
/**
* Returns the videodatarate
- *
+ *
* @return Video data rate
*/
public int getVideoDataRate();
/**
* Sets the videodatarate
- *
+ *
* @param rate
* Video data rate
*/
@@ -87,14 +87,14 @@ public interface IMetaData extends IMeta {
/**
* Returns the height
- *
+ *
* @return height Video height
*/
public int getHeight();
/**
* Sets the height
- *
+ *
* @param h
* Video height
*/
@@ -102,14 +102,14 @@ public interface IMetaData extends IMeta {
/**
* Returns the width Video width
- *
+ *
* @return width
*/
public int getWidth();
/**
* Sets the width
- *
+ *
* @param w
* Video width
*/
@@ -117,14 +117,14 @@ public interface IMetaData extends IMeta {
/**
* Returns the duration.
- *
+ *
* @return duration Video duration in seconds
*/
public double getDuration();
/**
* Sets the duration.
- *
+ *
* @param d
* Video duration in seconds
*/
@@ -132,7 +132,7 @@ public interface IMetaData extends IMeta {
/**
* Sets the cue points
- *
+ *
* @param metaCue
* Cue points
*/
@@ -140,7 +140,7 @@ public interface IMetaData extends IMeta {
/**
* Gets the cue points
- *
+ *
* @return Cue points
*/
public IMetaCue[] getMetaCue();
diff --git a/io/src/main/java/org/red5/io/flv/meta/IMetaService.java b/io/src/main/java/org/red5/io/flv/meta/IMetaService.java
index 69bce547c..8ff035228 100644
--- a/io/src/main/java/org/red5/io/flv/meta/IMetaService.java
+++ b/io/src/main/java/org/red5/io/flv/meta/IMetaService.java
@@ -14,7 +14,7 @@
/**
* IMetaService Defines the MetaData Service API
- *
+ *
* @author The Red5 Project
* @author Dominick Accattato (daccattato@gmail.com)
* @author Luke Hubbard, Codegent Ltd (luke@codegent.com)
@@ -22,7 +22,7 @@
public interface IMetaService {
// Get FLV from FLVService
- // grab a reader from FLV
+ // grab a reader from FLV
// Set up CuePoints
// Set up MetaData
// Pass CuePoint array into MetaData
@@ -37,7 +37,7 @@ public interface IMetaService {
/**
* Initiates writing of the MetaData
- *
+ *
* @param meta
* Metadata
* @throws IOException
@@ -47,7 +47,7 @@ public interface IMetaService {
/**
* Writes the MetaData
- *
+ *
* @param metaData
* Metadata
*/
@@ -60,7 +60,7 @@ public interface IMetaService {
/**
* Read the MetaData
- *
+ *
* @return metaData Metadata
* @param buffer
* IoBuffer source
@@ -69,14 +69,14 @@ public interface IMetaService {
/**
* Read the Meta Cue Points
- *
+ *
* @return Meta cue points
*/
public IMetaCue[] readMetaCue();
/**
* Media file to be accessed
- *
+ *
* @param file
* file
*/
@@ -84,7 +84,7 @@ public interface IMetaService {
/**
* Returns the file being accessed
- *
+ *
* @return file
*/
public File getFile();
diff --git a/io/src/main/java/org/red5/io/flv/meta/MetaCue.java b/io/src/main/java/org/red5/io/flv/meta/MetaCue.java
index 22d0a049b..fd2d51364 100644
--- a/io/src/main/java/org/red5/io/flv/meta/MetaCue.java
+++ b/io/src/main/java/org/red5/io/flv/meta/MetaCue.java
@@ -11,7 +11,7 @@
import java.util.Map;
/**
- * Cue point is metadata marker used to control and accompany video playback with client-side application events.
+ * Cue point is metadata marker used to control and accompany video playback with client-side application events.
* Each cue point have at least one attribute, timestamp. Timestamp specifies position of cue point in FLV file.
* audioSamplesToChunks;
- //samples
+ //samples
private long[] audioSamples;
private long audioSampleSize;
@@ -295,7 +295,7 @@ public void decodeHeader() {
/**
* Process the audio information contained in the atoms.
- *
+ *
* @param stbl
* @param ase
* AudioSampleEntry
@@ -488,7 +488,7 @@ public boolean hasVideo() {
/**
* Returns the file buffer.
- *
+ *
* @return File contents as byte buffer
*/
public IoBuffer getFileData() {
@@ -574,12 +574,12 @@ ITag createFileMeta() {
/**
* Tag sequence MetaData, Audio config, remaining audio
- *
+ *
* Packet prefixes: af 00 ... 06 = Audio extra data (first audio packet) af 01 = Audio frame
- *
+ *
* Audio extra data(s): af 00 = Prefix 11 90 4f 14 = AAC Main = aottype 0 12 10 = AAC LC = aottype 1 13 90 56 e5 a5 48 00 = HE-AAC SBR =
* aottype 2 06 = Suffix
- *
+ *
* Still not absolutely certain about this order or the bytes - need to verify later
*/
private void createPreStreamingTags() {
@@ -679,7 +679,7 @@ public void analyzeFrames() {
int sample = 1;
// position
Long pos = null;
- //add the audio frames / samples / chunks
+ //add the audio frames / samples / chunks
for (int i = 0; i < audioSamplesToChunks.size(); i++) {
SampleToChunkBox.Entry record = audioSamplesToChunks.get(i);
long firstChunk = record.getFirstChunk();
@@ -698,7 +698,7 @@ public void analyzeFrames() {
int size = 0;
// if we have no samples, skip size check as its probably not aac
if (audioSamples.length > 0) {
- //update sample size
+ //update sample size
size = (int) audioSamples[sample - 1];
// skip empty AAC data which is 6 bytes long
log.trace("Audio sample - size: {} pos: {}", size, pos);
@@ -777,7 +777,7 @@ public void position(long pos) {
/**
* Search through the frames by offset / position to find the sample.
- *
+ *
* @param pos
* @return frame index
*/
diff --git a/io/src/main/java/org/red5/io/matroska/ConverterException.java b/io/src/main/java/org/red5/io/matroska/ConverterException.java
index f226498e2..775572672 100644
--- a/io/src/main/java/org/red5/io/matroska/ConverterException.java
+++ b/io/src/main/java/org/red5/io/matroska/ConverterException.java
@@ -23,7 +23,7 @@ public ConverterException() {
/**
* @see Exception#Exception(String)
- *
+ *
* @param message
* - string message for this exception
*/
diff --git a/io/src/main/java/org/red5/io/matroska/ParserUtils.java b/io/src/main/java/org/red5/io/matroska/ParserUtils.java
index 705cc2eb7..40f5a80d7 100644
--- a/io/src/main/java/org/red5/io/matroska/ParserUtils.java
+++ b/io/src/main/java/org/red5/io/matroska/ParserUtils.java
@@ -30,7 +30,7 @@ public class ParserUtils {
/**
* method used to parse : int, uint and date
- *
+ *
* @param inputStream
* - stream to get value
* @param size
@@ -54,7 +54,7 @@ public static long parseInteger(InputStream inputStream, final int size) throws
/**
* method used to parse string
- *
+ *
* @param inputStream
* - stream to get value
* @param size
@@ -77,7 +77,7 @@ public static String parseString(InputStream inputStream, final int size) throws
/**
* method used to parse float and double
- *
+ *
* @param inputStream
* - stream to get value
* @param size
@@ -101,7 +101,7 @@ public static double parseFloat(InputStream inputStream, final int size) throws
/**
* method used to parse subelements of {@link CompoundTag}
- *
+ *
* @param inputStream
* - stream to get value
* @param size
@@ -128,7 +128,7 @@ public static ArrayList parseMasterElement(InputStream inputStream, final i
/**
* method to parse byte array
- *
+ *
* @param inputStream
* - stream to get value
* @param size
@@ -149,7 +149,7 @@ public static byte[] parseBinary(InputStream inputStream, final int size) throws
/**
* method to parse {@link VINT}
- *
+ *
* @param inputStream
* - stream to get value
* @return - parsed value
@@ -201,9 +201,9 @@ public static VINT readVINT(InputStream inputStream) throws IOException {
/**
* parsing tag by matroska specification matroska spec
- *
+ *
* tag = VINT id, VINT size, data
- *
+ *
* @param inputStream
* - stream to get value
* @return tag, without parsing tag data, because it delegate to an tag itself
@@ -221,7 +221,7 @@ public static Tag parseTag(InputStream inputStream) throws IOException, Converte
/**
* method to encode long as byte array of given size
- *
+ *
* @param val
* - value to encode
* @param size
@@ -240,7 +240,7 @@ public static byte[] getBytes(long val, long size) {
/**
* method to skip given amount of bytes in stream
- *
+ *
* @param size
* - size to skip
* @param input
diff --git a/io/src/main/java/org/red5/io/matroska/VINT.java b/io/src/main/java/org/red5/io/matroska/VINT.java
index 34573a2b9..c13865b8f 100644
--- a/io/src/main/java/org/red5/io/matroska/VINT.java
+++ b/io/src/main/java/org/red5/io/matroska/VINT.java
@@ -34,7 +34,7 @@ public class VINT {
/**
* Constructor
- *
+ *
* @param binary
* - binary value of this {@link VINT}, calculated from value if not specified
* @param length
@@ -56,7 +56,7 @@ public VINT(long binary, byte length, long value) {
/**
* getter for length
- *
+ *
* @return - length
*/
public byte getLength() {
@@ -65,7 +65,7 @@ public byte getLength() {
/**
* getter for binary
- *
+ *
* @return - binary
*/
public long getBinary() {
@@ -74,7 +74,7 @@ public long getBinary() {
/**
* getter for value
- *
+ *
* @return - value
*/
public long getValue() {
@@ -83,7 +83,7 @@ public long getValue() {
/**
* method to encode {@link VINT} as sequence of bytes
- *
+ *
* @return - encoded {@link VINT}
*/
public byte[] encode() {
@@ -100,7 +100,7 @@ public String toString() {
/**
* method to construct {@link VINT} based on its binary representation
- *
+ *
* @param binary
* - binary value of {@link VINT}
* @return {@link VINT} corresponding to this binary
@@ -125,7 +125,7 @@ public static VINT fromBinary(long binary) {
/**
* method to construct {@link VINT} based on its value
- *
+ *
* @param value
* - value of {@link VINT}
* @return {@link VINT} corresponding to this value
diff --git a/io/src/main/java/org/red5/io/matroska/dtd/BinaryTag.java b/io/src/main/java/org/red5/io/matroska/dtd/BinaryTag.java
index 1a91f9b43..ed737a39c 100644
--- a/io/src/main/java/org/red5/io/matroska/dtd/BinaryTag.java
+++ b/io/src/main/java/org/red5/io/matroska/dtd/BinaryTag.java
@@ -25,7 +25,7 @@ public class BinaryTag extends Tag {
/**
* Constructor
- *
+ *
* @see Tag#Tag(String, VINT)
*
* @param name
@@ -41,9 +41,9 @@ public BinaryTag(String name, VINT id) throws IOException {
/**
* Constructor
- *
+ *
* @see Tag#Tag(String, VINT, VINT, InputStream)
- *
+ *
* @param name
* - the name of tag to be created
* @param id
@@ -77,7 +77,7 @@ protected void putValue(ByteBuffer bb) throws IOException {
/**
* getter for value
- *
+ *
* @return - byte array stored by this binary tag
*/
public byte[] getValue() {
@@ -86,7 +86,7 @@ public byte[] getValue() {
/**
* setter for value, updates the size of this tag
- *
+ *
* @param value
* - value to be set
* @return - this for chaining
@@ -107,7 +107,7 @@ public String toString() {
/**
* Utility helper method to get string representation of given byte array
- *
+ *
* @param bytes
* - bytes to be printed
* @return - String representation of byte array
diff --git a/io/src/main/java/org/red5/io/matroska/dtd/CompoundTag.java b/io/src/main/java/org/red5/io/matroska/dtd/CompoundTag.java
index 4a00dbab2..e46830713 100644
--- a/io/src/main/java/org/red5/io/matroska/dtd/CompoundTag.java
+++ b/io/src/main/java/org/red5/io/matroska/dtd/CompoundTag.java
@@ -24,7 +24,7 @@ public class CompoundTag extends Tag {
/**
* Constructor
- *
+ *
* @see Tag#Tag(String, VINT)
*
* @param name
@@ -40,9 +40,9 @@ public CompoundTag(String name, VINT id) throws IOException {
/**
* Constructor
- *
+ *
* @see Tag#Tag(String, VINT, VINT, InputStream)
- *
+ *
* @param name
* - the name of tag to be created
* @param id
@@ -60,7 +60,7 @@ public CompoundTag(String name, VINT id, VINT size, InputStream inputStream) thr
/**
* @see Tag#readData(InputStream)
- *
+ *
* @param inputStream
* - stream to read tag data from
* @throws IOException
@@ -99,7 +99,7 @@ protected void putValue(ByteBuffer bb) throws IOException {
/**
* method to add child tag to this {@link CompoundTag}, updates the size on add
- *
+ *
* @param ch
* - child {@link Tag} to be added
* @return - this for chaining
diff --git a/io/src/main/java/org/red5/io/matroska/dtd/DateTag.java b/io/src/main/java/org/red5/io/matroska/dtd/DateTag.java
index f75a48cb7..ec74e249d 100644
--- a/io/src/main/java/org/red5/io/matroska/dtd/DateTag.java
+++ b/io/src/main/java/org/red5/io/matroska/dtd/DateTag.java
@@ -10,7 +10,7 @@
/**
* http://matroska.org/technical/specs/index.html Date - signed 8 octets integer in nanoseconds with 0 indicating the precise beginning of the millennium (at 2001-01-01T00:00:00,000000000 UTC)
- *
+ *
*/
public class DateTag extends UnsignedIntegerTag {
public static final long NANO_MULTIPLIER = 1000;
@@ -21,7 +21,7 @@ public class DateTag extends UnsignedIntegerTag {
/**
* Constructor
- *
+ *
* @see Tag#Tag(String, VINT)
*
* @param name
@@ -37,9 +37,9 @@ public DateTag(String name, VINT id) throws IOException {
/**
* Constructor
- *
+ *
* @see Tag#Tag(String, VINT, VINT, InputStream)
- *
+ *
* @param name
* - the name of tag to be created
* @param id
@@ -76,7 +76,7 @@ protected void putValue(ByteBuffer bb) throws IOException {
/**
* setter for value, updates the size of this tag
- *
+ *
* @param value
* - value to be set
* @return - this for chaining
@@ -89,7 +89,7 @@ public DateTag setValue(final Date value) {
/**
* getter for value as {@link Date}
- *
+ *
* @return - value as {@link Date}
*/
public Date getDate() {
diff --git a/io/src/main/java/org/red5/io/matroska/dtd/FloatTag.java b/io/src/main/java/org/red5/io/matroska/dtd/FloatTag.java
index f5b52400c..ed15b869c 100644
--- a/io/src/main/java/org/red5/io/matroska/dtd/FloatTag.java
+++ b/io/src/main/java/org/red5/io/matroska/dtd/FloatTag.java
@@ -16,16 +16,16 @@
/**
* http://matroska.org/technical/specs/index.html
- *
+ *
* Float tag is class able to store 4 byte float or 8 byte double, stores double by default
- *
+ *
*/
public class FloatTag extends Tag {
private double value;
/**
* Constructor
- *
+ *
* @see Tag#Tag(String, VINT)
*
* @param name
@@ -41,9 +41,9 @@ public FloatTag(String name, VINT id) throws IOException {
/**
* Constructor
- *
+ *
* @see Tag#Tag(String, VINT, VINT, InputStream)
- *
+ *
* @param name
* - the name of tag to be created
* @param id
@@ -81,7 +81,7 @@ protected void putValue(ByteBuffer bb) throws IOException {
/**
* getter for value as double
- *
+ *
* @return - value as double
*/
public double getValue() {
@@ -90,7 +90,7 @@ public double getValue() {
/**
* setter for value, updates the size of this tag
- *
+ *
* @param value
* - value to be set
* @return - this for chaining
diff --git a/io/src/main/java/org/red5/io/matroska/dtd/SimpleBlock.java b/io/src/main/java/org/red5/io/matroska/dtd/SimpleBlock.java
index 8c70348fe..4b638eeec 100644
--- a/io/src/main/java/org/red5/io/matroska/dtd/SimpleBlock.java
+++ b/io/src/main/java/org/red5/io/matroska/dtd/SimpleBlock.java
@@ -30,7 +30,7 @@ public class SimpleBlock extends Tag {
/**
* Constructor
- *
+ *
* @see Tag#Tag(String, VINT)
*
* @param name
@@ -46,9 +46,9 @@ public SimpleBlock(String name, VINT id) throws IOException {
/**
* Constructor
- *
+ *
* @see Tag#Tag(String, VINT, VINT, InputStream)
- *
+ *
* @param name
* - the name of tag to be created
* @param id
@@ -88,7 +88,7 @@ protected void putValue(ByteBuffer bb) throws IOException {
/**
* getter for binary
- *
+ *
* @return - binary
*/
public byte[] getBinary() {
@@ -97,7 +97,7 @@ public byte[] getBinary() {
/**
* getter for time code
- *
+ *
* @return - time code
*/
public long getTimeCode() {
@@ -106,7 +106,7 @@ public long getTimeCode() {
/**
* getter for track number
- *
+ *
* @return - track number
*/
public int getTrackNumber() {
@@ -115,7 +115,7 @@ public int getTrackNumber() {
/**
* getter for key frame
- *
+ *
* @return - key frame
*/
public boolean isKeyFrame() {
diff --git a/io/src/main/java/org/red5/io/matroska/dtd/StringTag.java b/io/src/main/java/org/red5/io/matroska/dtd/StringTag.java
index be788629d..c57803780 100644
--- a/io/src/main/java/org/red5/io/matroska/dtd/StringTag.java
+++ b/io/src/main/java/org/red5/io/matroska/dtd/StringTag.java
@@ -17,16 +17,16 @@
/**
* http://matroska.org/technical/specs/index.html
- *
+ *
* String tag is class able to store strings
- *
+ *
*/
public class StringTag extends Tag {
private String value = "";
/**
* Constructor
- *
+ *
* @see Tag#Tag(String, VINT)
*
* @param name
@@ -42,9 +42,9 @@ public StringTag(String name, VINT id) throws IOException {
/**
* Constructor
- *
+ *
* @see Tag#Tag(String, VINT, VINT, InputStream)
- *
+ *
* @param name
* - the name of tag to be created
* @param id
@@ -78,7 +78,7 @@ protected void putValue(ByteBuffer bb) throws IOException {
/**
* getter for value
- *
+ *
* @return - value
*/
public String getValue() {
@@ -87,7 +87,7 @@ public String getValue() {
/**
* setter for value, updates the size of this tag
- *
+ *
* @param value
* - value to be set
* @return - this for chaining
diff --git a/io/src/main/java/org/red5/io/matroska/dtd/Tag.java b/io/src/main/java/org/red5/io/matroska/dtd/Tag.java
index c28acb047..388e06145 100644
--- a/io/src/main/java/org/red5/io/matroska/dtd/Tag.java
+++ b/io/src/main/java/org/red5/io/matroska/dtd/Tag.java
@@ -35,7 +35,7 @@ public abstract class Tag {
/**
* Constructor, internally calls {@link Tag#Tag(String, VINT, VINT, InputStream)} to create tag with 0 size
- *
+ *
* @param name
* - the name of tag to be created
* @param id
@@ -49,7 +49,7 @@ public Tag(String name, VINT id) throws IOException {
/**
* Constructor
- *
+ *
* @param name
* - the name of tag to be created
* @param id
@@ -70,7 +70,7 @@ public Tag(String name, VINT id, VINT size, InputStream inputStream) throws IOEx
/**
* method to read and to parse tag from inputStream given
- *
+ *
* @param inputStream
* - stream to parse tag data from
* @throws IOException
@@ -82,7 +82,7 @@ public Tag(String name, VINT id, VINT size, InputStream inputStream) throws IOEx
/**
* method to parse tag from inner bytes array - data
- *
+ *
* @throws IOException
* - in case of any IO errors
* @throws ConverterException
@@ -94,7 +94,7 @@ public void parse() throws IOException, ConverterException {
/**
* method to read tag data from inputStream given
- *
+ *
* @param inputStream InputStream
* @throws IOException
* - in case of any IO errors
@@ -109,7 +109,7 @@ public void readData(InputStream inputStream) throws IOException {
/**
* method to store tag value to {@link ByteBuffer} given
- *
+ *
* @param bb
* - {@link ByteBuffer} to store value
* @throws IOException
@@ -119,7 +119,7 @@ public void readData(InputStream inputStream) throws IOException {
/**
* getter for name
- *
+ *
* @return name of this {@link Tag}
*/
public String getName() {
@@ -128,7 +128,7 @@ public String getName() {
/**
* getter for id
- *
+ *
* @return id of this {@link Tag} as binary value of correspondent {@link VINT}
*/
public long getId() {
@@ -137,7 +137,7 @@ public long getId() {
/**
* getter for size
- *
+ *
* @return size of this {@link Tag} as value of correspondent {@link VINT}
*/
public long getSize() {
@@ -146,7 +146,7 @@ public long getSize() {
/**
* method to get total size of this tag: "header" + "contents"
- *
+ *
* @return - total size as int
*/
public int totalSize() {
@@ -155,7 +155,7 @@ public int totalSize() {
/**
* method to encode {@link Tag} as sequence of bytes
- *
+ *
* @return - encoded {@link Tag}
* @throws IOException
* - in case of any IO errors
diff --git a/io/src/main/java/org/red5/io/matroska/dtd/UnsignedIntegerTag.java b/io/src/main/java/org/red5/io/matroska/dtd/UnsignedIntegerTag.java
index e2402cebb..d721333ea 100644
--- a/io/src/main/java/org/red5/io/matroska/dtd/UnsignedIntegerTag.java
+++ b/io/src/main/java/org/red5/io/matroska/dtd/UnsignedIntegerTag.java
@@ -18,16 +18,16 @@
/**
* http://matroska.org/technical/specs/index.html
- *
+ *
* UnsignedInteger tag is class able to store long
- *
+ *
*/
public class UnsignedIntegerTag extends Tag {
private long value;
/**
* Constructor
- *
+ *
* @see Tag#Tag(String, VINT)
*
* @param name
@@ -43,9 +43,9 @@ public UnsignedIntegerTag(String name, VINT id) throws IOException {
/**
* Constructor
- *
+ *
* @see Tag#Tag(String, VINT, VINT, InputStream)
- *
+ *
* @param name
* - the name of tag to be created
* @param id
@@ -79,7 +79,7 @@ protected void putValue(ByteBuffer bb) throws IOException {
/**
* getter for value
- *
+ *
* @return - value
*/
public long getValue() {
@@ -88,7 +88,7 @@ public long getValue() {
/**
* setter for value, updates the size of this tag
- *
+ *
* @param value
* - value to be set
* @return - this for chaining
diff --git a/io/src/main/java/org/red5/io/matroska/parser/TagCrawler.java b/io/src/main/java/org/red5/io/matroska/parser/TagCrawler.java
index 2fc66a9ec..aa1057ff3 100644
--- a/io/src/main/java/org/red5/io/matroska/parser/TagCrawler.java
+++ b/io/src/main/java/org/red5/io/matroska/parser/TagCrawler.java
@@ -31,7 +31,7 @@ public class TagCrawler {
/**
* Constructor
- *
+ *
*/
public TagCrawler() {
skipHandler = createSkipHandler();
@@ -39,7 +39,7 @@ public TagCrawler() {
/**
* Method to add {@link TagHandler}
- *
+ *
* @param name
* - unique name of tag handler
* @param handler
@@ -53,7 +53,7 @@ public TagCrawler addHandler(String name, TagHandler handler) {
/**
* Method to remove {@link TagHandler}
- *
+ *
* @param name
* - unique name of tag handler
* @return - this for chaining
@@ -67,7 +67,7 @@ public TagCrawler removeHandler(String name) {
/**
* Method to get {@link TagHandler} by tag, can be overridden to change the logic of handler searching
- *
+ *
* @param tag
* - tag to be handled
* @return - this for chaining
@@ -81,7 +81,7 @@ public TagHandler getHandler(Tag tag) {
/**
* Method to create "default" handler (the one will be used if none other handlers were found) can be overridden to change the logic
- *
+ *
* @return - this for chaining
*/
public TagHandler createSkipHandler() {
@@ -99,7 +99,7 @@ public void handle(Tag tag, InputStream input) throws IOException, ConverterExce
/**
* Method to process the input stream given, will stop as soon as input stream will be empty
- *
+ *
* @param input
* - input stream to process
* @throws IOException
diff --git a/io/src/main/java/org/red5/io/mp3/IMP3.java b/io/src/main/java/org/red5/io/mp3/IMP3.java
index 630e36c07..eb31b2dd8 100644
--- a/io/src/main/java/org/red5/io/mp3/IMP3.java
+++ b/io/src/main/java/org/red5/io/mp3/IMP3.java
@@ -11,7 +11,7 @@
/**
* Informations about a MP3 file. Marker interface by now.
- *
+ *
* @author The Red5 Project
* @author Joachim Bauch (jojo@struktur.de)
*/
diff --git a/io/src/main/java/org/red5/io/mp3/impl/MP3.java b/io/src/main/java/org/red5/io/mp3/impl/MP3.java
index b6e8355b0..58f67107f 100644
--- a/io/src/main/java/org/red5/io/mp3/impl/MP3.java
+++ b/io/src/main/java/org/red5/io/mp3/impl/MP3.java
@@ -25,7 +25,7 @@ public class MP3 implements IMP3 {
/**
* Creates MP3 object using given file
- *
+ *
* @param file
* File object to use
*/
diff --git a/io/src/main/java/org/red5/io/mp3/impl/MP3Header.java b/io/src/main/java/org/red5/io/mp3/impl/MP3Header.java
index 3412585c4..f35f6f293 100644
--- a/io/src/main/java/org/red5/io/mp3/impl/MP3Header.java
+++ b/io/src/main/java/org/red5/io/mp3/impl/MP3Header.java
@@ -9,7 +9,7 @@
/**
* Header of a MP3 frame.
- *
+ *
* @author The Red5 Project
* @author Joachim Bauch (jojo@struktur.de)
* @see File format
@@ -76,7 +76,7 @@ public class MP3Header {
/**
* Creates MP3 header from frame sync value
- *
+ *
* @param data
* Frame sync data
* @throws Exception
@@ -185,7 +185,7 @@ public int getSampleRate() {
/**
* Calculate the size of a MP3 frame for this header.
- *
+ *
* @return size of the frame including the header
*/
public int frameSize() {
@@ -211,7 +211,7 @@ public int frameSize() {
/**
* Return the duration of the frame for this header.
- *
+ *
* @return The duration in milliseconds
*/
public double frameDuration() {
diff --git a/io/src/main/java/org/red5/io/mp3/impl/MP3Reader.java b/io/src/main/java/org/red5/io/mp3/impl/MP3Reader.java
index 9970548a4..75b0d00bc 100644
--- a/io/src/main/java/org/red5/io/mp3/impl/MP3Reader.java
+++ b/io/src/main/java/org/red5/io/mp3/impl/MP3Reader.java
@@ -118,7 +118,7 @@ public class MP3Reader implements ITagReader, IKeyFrameDataAnalyzer {
/**
* Creates reader from file input stream
- *
+ *
* @param file
* file input
* @throws IOException
@@ -193,7 +193,7 @@ public MP3Reader(File file) throws IOException {
/**
* A MP3 stream never has video.
- *
+ *
* @return always returns false
*/
@Override
@@ -224,7 +224,7 @@ private void checkValidHeader() {
/**
* Creates file metadata object
- *
+ *
* @return Tag
*/
private ITag createFileMeta() {
@@ -329,7 +329,7 @@ public long getDuration() {
/**
* Get the total readable bytes in a file or ByteBuffer.
- *
+ *
* @return Total readable bytes
*/
@Override
diff --git a/io/src/main/java/org/red5/io/mp3/impl/MP3Stream.java b/io/src/main/java/org/red5/io/mp3/impl/MP3Stream.java
index 781f18e90..c6e0afce6 100644
--- a/io/src/main/java/org/red5/io/mp3/impl/MP3Stream.java
+++ b/io/src/main/java/org/red5/io/mp3/impl/MP3Stream.java
@@ -20,7 +20,7 @@
*
* Instances of this class are constructed with an underlying stream which should point to an audio file. Read operations are possible in the usual way. However, there are special methods for searching and extracting headers of MPEG frames. Some meta information of frames can be queried.
*
- *
+ *
* This class was copied from Apache Tika and modified for Red5.
*/
public class MP3Stream extends PushbackInputStream {
@@ -72,7 +72,7 @@ public class MP3Stream extends PushbackInputStream {
/**
* Creates a new instance of {@code MpegStream} and initializes it with the underlying stream.
- *
+ *
* @param in
* the underlying audio stream
*/
@@ -87,7 +87,7 @@ public boolean eos() {
/**
* Searches for the next MPEG frame header from the current stream position on. This method advances the underlying input stream until it finds a valid frame header or the end of the stream is reached. In the former case a corresponding {@code AudioFrame} object is created. In the latter case there are no more headers, so the end of the stream is probably reached.
- *
+ *
* @return the next {@code AudioFrame} or null
* @throws IOException
* if an IO error occurs
@@ -114,7 +114,7 @@ public AudioFrame nextFrame() throws IOException {
/**
* Skips the current MPEG frame. This method can be called after a valid MPEG header has been retrieved using {@code nextFrame()}. In this case the underlying stream is advanced to the end of the associated MPEG frame. Otherwise, this method has no effect. The return value indicates whether a frame could be skipped.
- *
+ *
* @return true if a frame could be skipped, false otherwise
* @throws IOException
* if an IO error occurs
@@ -130,7 +130,7 @@ public boolean skipFrame() throws IOException {
/**
* Advances the underlying stream until the first byte of frame sync is found.
- *
+ *
* @throws IOException
* if an error occurs
*/
@@ -145,7 +145,7 @@ private void findFrameSyncByte() throws IOException {
/**
* Creates a bit field for the MPEG frame header.
- *
+ *
* @return the bit field
* @throws IOException
* if an error occurs
@@ -160,7 +160,7 @@ private HeaderBitField createHeaderField() throws IOException {
/**
* Creates an {@code AudioFrame} object based on the given header field. If the header field contains invalid values, result is null .
- *
+ *
* @param bits
* the header bit field
* @return the {@code AudioFrame}
@@ -188,7 +188,7 @@ private static AudioFrame createHeader(HeaderBitField bits) {
/**
* Reads the next byte.
- *
+ *
* @return the next byte
* @throws IOException
* if an error occurs
@@ -206,7 +206,7 @@ private int nextByte() throws IOException {
/**
* Pushes the given header field back in the stream so that the bytes are read again. This method is called if an invalid header was detected. Then search has to continue at the next byte after the frame sync byte.
- *
+ *
* @param field
* the header bit field with the invalid frame header
* @throws IOException
@@ -218,7 +218,7 @@ private void pushBack(HeaderBitField field) throws IOException {
/**
* Skips the given number of bytes from the specified input stream.
- *
+ *
* @param in
* the input stream
* @param count
@@ -239,7 +239,7 @@ private static void skipStream(InputStream in, long count) throws IOException {
/**
* Calculates the bit rate based on the given parameters.
- *
+ *
* @param mpegVer
* the MPEG version
* @param layer
@@ -274,7 +274,7 @@ private static int calculateBitRate(int mpegVer, int layer, int code) {
/**
* Calculates the sample rate based on the given parameters.
- *
+ *
* @param mpegVer
* the MPEG version
* @param code
@@ -287,7 +287,7 @@ private static int calculateSampleRate(int mpegVer, int code) {
/**
* Calculates the length of an MPEG frame based on the given parameters.
- *
+ *
* @param layer
* the layer
* @param bitRate
@@ -308,7 +308,7 @@ private static int calculateFrameLength(int layer, int bitRate, int sampleRate,
/**
* Calculates the duration of a MPEG frame based on the given parameters.
- *
+ *
* @param layer
* the layer
* @param sampleRate
@@ -322,7 +322,7 @@ private static float calculateDuration(int layer, int sampleRate) {
/**
* Calculates the number of channels based on the given parameters.
- *
+ *
* @param chan
* the code for the channels
* @return the number of channels
@@ -333,7 +333,7 @@ private static int calculateChannels(int chan) {
/**
* Creates the complete array for the sample rate mapping.
- *
+ *
* @return the table for the sample rates
*/
private static int[][] createSampleRateTable() {
@@ -353,7 +353,7 @@ private static class HeaderBitField {
/**
* Adds a byte to this field.
- *
+ *
* @param b
* the byte to be added
*/
@@ -364,7 +364,7 @@ public void add(int b) {
/**
* Returns the value of the bit group from the given start and end index. E.g. ''from'' = 0, ''to'' = 3 will return the value of the first 4 bits.
- *
+ *
* @param the
* from index
* @param to
@@ -379,7 +379,7 @@ public int get(int from, int to) {
/**
* Returns the value of the bit with the given index. The bit index is 0-based. Result is either 0 or 1, depending on the value of this bit.
- *
+ *
* @param bit
* the bit index
* @return the value of this bit
@@ -390,7 +390,7 @@ public int get(int bit) {
/**
* Returns the internal value of this field as an array. The array contains 3 bytes.
- *
+ *
* @return the internal value of this field as int array
*/
public byte[] toArray() {
diff --git a/io/src/main/java/org/red5/io/mp4/IMP4.java b/io/src/main/java/org/red5/io/mp4/IMP4.java
index d62a270ee..9e7c1827c 100644
--- a/io/src/main/java/org/red5/io/mp4/IMP4.java
+++ b/io/src/main/java/org/red5/io/mp4/IMP4.java
@@ -19,21 +19,21 @@
/**
* Represents MP4 file
- *
+ *
* @author Paul Gregoire (mondain@gmail.com)
*/
public interface IMP4 extends IStreamableFile {
/**
* Returns a boolean stating whether the mp4 has metadata
- *
+ *
* @return boolean true if file has injected metadata, false otherwise
*/
public boolean hasMetaData();
/**
* Sets the metadata
- *
+ *
* @param metadata
* Metadata object
* @throws FileNotFoundException
@@ -45,7 +45,7 @@ public interface IMP4 extends IStreamableFile {
/**
* Sets the MetaService through Spring
- *
+ *
* @param service
* Metadata service
*/
@@ -53,7 +53,7 @@ public interface IMP4 extends IStreamableFile {
/**
* Returns a map of the metadata
- *
+ *
* @return metadata File metadata
* @throws FileNotFoundException
* File not found
@@ -62,14 +62,14 @@ public interface IMP4 extends IStreamableFile {
/**
* Returns a boolean stating whether a mp4 has keyframedata
- *
+ *
* @return boolean true if file has keyframe metadata, false otherwise
*/
public boolean hasKeyFrameData();
/**
* Sets the keyframe data of a mp4 file
- *
+ *
* @param keyframedata
* Keyframe metadata
*/
@@ -77,14 +77,14 @@ public interface IMP4 extends IStreamableFile {
/**
* Gets the keyframe data
- *
+ *
* @return keyframedata Keyframe metadata
*/
public Map getKeyFrameData();
/**
* Refreshes the headers. Usually used after data is added to the mp4 file
- *
+ *
* @throws IOException
* Any I/O exception
*/
@@ -92,7 +92,7 @@ public interface IMP4 extends IStreamableFile {
/**
* Flushes Header
- *
+ *
* @throws IOException
* Any I/O exception
*/
@@ -100,7 +100,7 @@ public interface IMP4 extends IStreamableFile {
/**
* Returns a Reader closest to the nearest keyframe
- *
+ *
* @param seekPoint
* Point in file we are seeking around
* @return reader Tag reader closest to that point
@@ -109,7 +109,7 @@ public interface IMP4 extends IStreamableFile {
/**
* Returns a Writer based on the nearest key frame
- *
+ *
* @param seekPoint
* Point in file we are seeking around
* @return writer Tag writer closest to that point
diff --git a/io/src/main/java/org/red5/io/mp4/MP4Frame.java b/io/src/main/java/org/red5/io/mp4/MP4Frame.java
index d2e7332b7..752ed63d9 100644
--- a/io/src/main/java/org/red5/io/mp4/MP4Frame.java
+++ b/io/src/main/java/org/red5/io/mp4/MP4Frame.java
@@ -9,7 +9,7 @@
/**
* Represents an MP4 frame / chunk sample
- *
+ *
* @author Paul Gregoire (mondain@gmail.com)
*/
public class MP4Frame implements Comparable {
@@ -29,7 +29,7 @@ public class MP4Frame implements Comparable {
/**
* Returns the data type, being audio or video.
- *
+ *
* @return the data type
*/
public byte getType() {
@@ -42,7 +42,7 @@ public void setType(byte type) {
/**
* Returns the offset of the data chunk in the media source.
- *
+ *
* @return the offset in bytes
*/
public long getOffset() {
@@ -55,7 +55,7 @@ public void setOffset(long offset) {
/**
* Returns the size of the data chunk.
- *
+ *
* @return the size in bytes
*/
public int getSize() {
@@ -68,7 +68,7 @@ public void setSize(int size) {
/**
* Returns the timestamp.
- *
+ *
* @return the timestamp
*/
public double getTime() {
@@ -96,7 +96,7 @@ public void setTimeOffset(int timeOffset) {
/**
* Returns whether or not this chunk represents a key frame.
- *
+ *
* @return true if a key frame
*/
public boolean isKeyFrame() {
diff --git a/io/src/main/java/org/red5/io/mp4/impl/MP4.java b/io/src/main/java/org/red5/io/mp4/impl/MP4.java
index 453cd7959..6cfc7f9b9 100644
--- a/io/src/main/java/org/red5/io/mp4/impl/MP4.java
+++ b/io/src/main/java/org/red5/io/mp4/impl/MP4.java
@@ -24,7 +24,7 @@
/**
* A MP4Impl implements the MP4 api
- *
+ *
* @author The Red5 Project
* @author Paul Gregoire, (mondain@gmail.com)
*/
@@ -46,7 +46,7 @@ public MP4() {
/**
* Create MP4 from given file source.
- *
+ *
* @param file
* File source
*/
diff --git a/io/src/main/java/org/red5/io/mp4/impl/MP4Reader.java b/io/src/main/java/org/red5/io/mp4/impl/MP4Reader.java
index 138ded4e9..5ff30f8be 100644
--- a/io/src/main/java/org/red5/io/mp4/impl/MP4Reader.java
+++ b/io/src/main/java/org/red5/io/mp4/impl/MP4Reader.java
@@ -96,7 +96,7 @@
* NetStream.Play.NoSupportedTrackFound: This event is sent if the player does not detect any supported tracks. If there aren't any
* supported video, audio or data tracks found, Flash Player does not play the file.
*
- *
+ *
* @author The Red5 Project
* @author Paul Gregoire (mondain@gmail.com)
*/
@@ -143,10 +143,10 @@ public class MP4Reader implements IoConstants, ITagReader, IKeyFrameDataAnalyzer
/** Whether or not the clip contains an audio track */
private boolean hasAudio = false;
- //default video codec
+ //default video codec
private String videoCodecId = "avc1";
- //default audio codec
+ //default audio codec
private String audioCodecId = "mp4a";
//decoder bytes / configs
@@ -192,7 +192,7 @@ public class MP4Reader implements IoConstants, ITagReader, IKeyFrameDataAnalyzer
//keyframe - sample numbers
private long[] syncSamples;
- //samples
+ //samples
private long[] videoSamples;
private long[] audioSamples;
@@ -511,7 +511,7 @@ public void decodeHeader() {
/**
* Dumps the children of a container box.
- *
+ *
* @param box
* mp4 box
*/
@@ -524,7 +524,7 @@ public static void dumpBox(Container box) {
/**
* Process the video information contained in the atoms.
- *
+ *
* @param stbl
* @param vse
* VisualSampleEntry
@@ -582,7 +582,7 @@ private void processVideoBox(SampleTableBox stbl, VisualSampleEntry vse, long sc
/**
* Process the video information contained in the atoms.
- *
+ *
* @param stbl
* @param scale
* timescale
@@ -605,7 +605,7 @@ private void processVideoBox(SampleTableBox stbl, long scale) {
/**
* Process an stbl atom with containing video information.
- *
+ *
* @param stbl
* @param scale
*/
@@ -703,7 +703,7 @@ private void processVideoStbl(SampleTableBox stbl, long scale) {
/**
* Process the audio information contained in the atoms.
- *
+ *
* @param stbl
* @param ase
* AudioSampleEntry
@@ -809,7 +809,7 @@ private void processAudioBox(SampleTableBox stbl, AudioSampleEntry ase, long sca
/**
* Process the audio information contained in the atoms.
- *
+ *
* @param stbl
* @param scale
* timescale
@@ -916,7 +916,7 @@ public boolean hasVideo() {
/**
* Returns the file buffer.
- *
+ *
* @return File contents as byte buffer
*/
public IoBuffer getFileData() {
@@ -981,7 +981,7 @@ public boolean hasMoreTags() {
* Create tag for metadata event.
*
* Information mostly from http://www.kaourantin.net/2007/08/what-just-happened-to-video-on-web_20.html
- *
+ *
*
* width: Display width in pixels.
* height: Display height in pixels.
@@ -1002,18 +1002,18 @@ public boolean hasMoreTags() {
* trackinfo[1].timescale: 44100
* trackinfo[1].sampledescription.sampletype: mp4a
* trackinfo[1].language: und
- *
+ *
* chapters: As mentioned above information about chapters in audiobooks.
- * seekpoints: Array that lists the available keyframes in a file as time stamps in milliseconds.
- * This is optional as the MP4 file might not contain this information. Generally speaking,
+ * seekpoints: Array that lists the available keyframes in a file as time stamps in milliseconds.
+ * This is optional as the MP4 file might not contain this information. Generally speaking,
* most MP4 files will include this by default. You can directly feed the values into NetStream.seek();
- * videoframerate: The frame rate of the video if a monotone frame rate is used.
+ * videoframerate: The frame rate of the video if a monotone frame rate is used.
* Most videos will have a monotone frame rate.
* audiosamplerate: The original sampling rate of the audio track.
* audiochannels: The original number of channels of the audio track.
- * progressivedownloadinfo: Object that provides information from the "pdin" atom. This is optional
+ * progressivedownloadinfo: Object that provides information from the "pdin" atom. This is optional
* and many files will not have this field.
- * tags: Array of key value pairs representing the information present in the "ilst" atom, which is
+ * tags: Array of key value pairs representing the information present in the "ilst" atom, which is
* the equivalent of ID3 tags for MP4 files. These tags are mostly used by iTunes.
*
*
@@ -1106,13 +1106,13 @@ ITag createFileMeta() {
/**
* Tag sequence MetaData, Video config, Audio config, remaining audio and video
- *
+ *
* Packet prefixes: 17 00 00 00 00 = Video extra data (first video packet) 17 01 00 00 00 = Video keyframe 27 01 00 00 00 = Video
* interframe af 00 ... 06 = Audio extra data (first audio packet) af 01 = Audio frame
- *
+ *
* Audio extra data(s): af 00 = Prefix 11 90 4f 14 = AAC Main = aottype 0 // 11 90 12 10 = AAC LC = aottype 1 13 90 56 e5 a5 48 00 =
* HE-AAC SBR = aottype 2 06 = Suffix
- *
+ *
* Still not absolutely certain about this order or the bytes - need to verify later
*/
private void createPreStreamingTags(int timestamp, boolean clear) {
@@ -1141,7 +1141,7 @@ private void createPreStreamingTags(int timestamp, boolean clear) {
firstTags.add(tag);
}
// TODO: Handle other mp4 container audio codecs like mp3
- // mp3 header magic number ((int & 0xffe00000) == 0xffe00000)
+ // mp3 header magic number ((int & 0xffe00000) == 0xffe00000)
if (hasAudio) {
//audio tag #1
if (audioDecoderBytes != null) {
@@ -1360,7 +1360,7 @@ public void analyzeFrames() {
}
// if video-only, skip this
if (audioSamplesToChunks != null) {
- //add the audio frames / samples / chunks
+ //add the audio frames / samples / chunks
sample = 1;
for (int i = 0; i < audioSamplesToChunks.size(); i++) {
SampleToChunkBox.Entry record = audioSamplesToChunks.get(i);
@@ -1380,7 +1380,7 @@ public void analyzeFrames() {
int size = 0;
// if we have no samples, skip size check as its probably not aac
if (audioSamples.length > 0) {
- //update sample size
+ //update sample size
size = (int) audioSamples[sample - 1];
// skip empty AAC data which is 6 bytes long
log.trace("Audio sample - size: {} pos: {}", size, pos);
@@ -1467,7 +1467,7 @@ public void position(long pos) {
for (int f = 0; f < len; f++) {
frame = frames.get(f);
long offset = frame.getOffset();
- //look for pos to match frame offset or grab the first keyframe
+ //look for pos to match frame offset or grab the first keyframe
//beyond the offset
if (pos == offset || (offset > pos && frame.isKeyFrame())) {
//ensure that it is a keyframe
diff --git a/io/src/main/java/org/red5/io/object/BaseInput.java b/io/src/main/java/org/red5/io/object/BaseInput.java
index 6fcd05240..3422ceb18 100644
--- a/io/src/main/java/org/red5/io/object/BaseInput.java
+++ b/io/src/main/java/org/red5/io/object/BaseInput.java
@@ -13,7 +13,7 @@
/**
* BaseInput represents a way to map input to a HashMap. This class is meant to be extended.
- *
+ *
* @author The Red5 Project
* @author Luke Hubbard, Codegent Ltd (luke@codegent.com)
*/
@@ -33,7 +33,7 @@ public class BaseInput {
/**
* Store an object into a map.
- *
+ *
* @param obj
* Object to store
* @return reference id
@@ -47,7 +47,7 @@ protected int storeReference(Object obj) {
/**
* Replace a referenced object with another one. This is used by the AMF3 deserializer to handle circular references.
- *
+ *
* @param refId
* reference id
* @param newRef
@@ -67,7 +67,7 @@ public void clearReferences() {
/**
* Returns the object with the parameters id
- *
+ *
* @param id
* Object reference id
* @return Object Object reference with given id
@@ -78,7 +78,7 @@ protected Object getReference(int id) {
/**
* Checks the deserializer to see if a given class is blacklisted or not.
- *
+ *
* @param className class name/package
* @return true if not blacklisted and false if it is blacklisted
*/
diff --git a/io/src/main/java/org/red5/io/object/BaseOutput.java b/io/src/main/java/org/red5/io/object/BaseOutput.java
index 44db6aa62..3017b2806 100644
--- a/io/src/main/java/org/red5/io/object/BaseOutput.java
+++ b/io/src/main/java/org/red5/io/object/BaseOutput.java
@@ -12,7 +12,7 @@
/**
* BaseOutput represents a way to map input to a HashMap. This class is meant to be extended.
- *
+ *
* @author The Red5 Project
* @author Luke Hubbard, Codegent Ltd (luke@codegent.com)
*/
@@ -26,7 +26,7 @@ static class IdentityWrapper {
/**
* Creates wrapper for object
- *
+ *
* @param object
* Object to wrap
*/
@@ -71,7 +71,7 @@ protected BaseOutput() {
/**
* Store an object into a map
- *
+ *
* @param obj
* Object to store
*/
@@ -81,7 +81,7 @@ protected void storeReference(Object obj) {
/**
* Returns a boolean stating whether the map contains an object with that key
- *
+ *
* @param obj
* Object
* @return boolean true if it does contain it, false otherwise
@@ -100,7 +100,7 @@ public void clearReferences() {
/**
* Returns the reference id based on the parameter obj
- *
+ *
* @param obj
* Object
* @return short Reference id
diff --git a/io/src/main/java/org/red5/io/object/Deserializer.java b/io/src/main/java/org/red5/io/object/Deserializer.java
index f8af95625..f65b99f82 100644
--- a/io/src/main/java/org/red5/io/object/Deserializer.java
+++ b/io/src/main/java/org/red5/io/object/Deserializer.java
@@ -48,7 +48,7 @@ public synchronized static void loadBlackList() throws IOException {
/**
* Deserializes the input parameter and returns an Object which must then be cast to a core data type
- *
+ *
* @param
* type
* @param in
@@ -144,7 +144,7 @@ public static T deserialize(Input in, Type target) {
/**
* Checks to see if a given class is blacklisted or not.
- *
+ *
* @param className class name/package
* @return true if not blacklisted and false if it is blacklisted
*/
diff --git a/io/src/main/java/org/red5/io/object/ICustomSerializable.java b/io/src/main/java/org/red5/io/object/ICustomSerializable.java
index 0e2d6da5d..6c55d324b 100644
--- a/io/src/main/java/org/red5/io/object/ICustomSerializable.java
+++ b/io/src/main/java/org/red5/io/object/ICustomSerializable.java
@@ -9,9 +9,9 @@
/**
* Interface for objects that know how to serialize their contents.
- *
+ *
* NOTE: This is only used for AMF0 encoding and you should not need to implement this in your own objects.
- *
+ *
* @author The Red5 Project
* @author Joachim Bauch (jojo@struktur.de)
*/
@@ -19,7 +19,7 @@ public interface ICustomSerializable {
/**
* Serialize this object to the given output stream.
- *
+ *
* @param output
* output
*/
diff --git a/io/src/main/java/org/red5/io/object/Input.java b/io/src/main/java/org/red5/io/object/Input.java
index e2442bc65..e3a3b4f5a 100644
--- a/io/src/main/java/org/red5/io/object/Input.java
+++ b/io/src/main/java/org/red5/io/object/Input.java
@@ -16,9 +16,9 @@
import org.w3c.dom.Document;
/**
- * Interface for Input which defines the contract methods which are to be implemented. Input object provides ways to read primitives,
+ * Interface for Input which defines the contract methods which are to be implemented. Input object provides ways to read primitives,
* complex object and object references from byte buffer.
- *
+ *
* @author The Red5 Project
* @author Luke Hubbard, Codegent Ltd (luke@codegent.com)
*/
@@ -26,56 +26,56 @@ public interface Input {
/**
* Read type of data
- *
+ *
* @return Type of data as byte
*/
byte readDataType();
/**
* Read a string without the string type header.
- *
+ *
* @return String
*/
String getString();
/**
* Read Null data type
- *
+ *
* @return Null datatype (AS)
*/
Object readNull();
/**
* Read Boolean value
- *
+ *
* @return Boolean
*/
Boolean readBoolean();
/**
* Read Number object
- *
+ *
* @return Number
*/
Number readNumber();
/**
* Read String object
- *
+ *
* @return String
*/
String readString();
/**
* Read date object
- *
+ *
* @return Date
*/
Date readDate();
/**
* Read an array. This can result in a List or Map being deserialized depending on the array type found.
- *
+ *
* @param target
* target type
* @return array
@@ -84,42 +84,42 @@ public interface Input {
/**
* Read a map containing key - value pairs. This can result in a List or Map being deserialized depending on the map type found.
- *
+ *
* @return Map
*/
Object readMap();
/**
* Read an object.
- *
+ *
* @return object
*/
Object readObject();
/**
* Read XML document
- *
+ *
* @return XML DOM document
*/
Document readXML();
/**
* Read custom object
- *
+ *
* @return Custom object
*/
Object readCustom();
/**
* Read ByteArray object.
- *
+ *
* @return ByteArray object
*/
ByteArray readByteArray();
/**
* Read reference to Complex Data Type. Objects that are collaborators (properties) of other objects must be stored as references in map of id-reference pairs.
- *
+ *
* @return object
*/
Object readReference();
@@ -131,35 +131,35 @@ public interface Input {
/**
* Read key - value pairs. This is required for the RecordSet deserializer.
- *
+ *
* @return key-value pairs
*/
Map readKeyValues();
/**
* Read Vector<int> object.
- *
+ *
* @return Vector<Integer>
*/
Vector readVectorInt();
/**
* Read Vector<uint> object.
- *
+ *
* @return Vector<Long>
*/
Vector readVectorUInt();
/**
* Read Vector<Number> object.
- *
+ *
* @return Vector<Double>
*/
Vector readVectorNumber();
/**
* Read Vector<Object> object.
- *
+ *
* @return Vector<Object>
*/
Vector readVectorObject();
diff --git a/io/src/main/java/org/red5/io/object/Output.java b/io/src/main/java/org/red5/io/object/Output.java
index ab3f080c0..a1ea85feb 100644
--- a/io/src/main/java/org/red5/io/object/Output.java
+++ b/io/src/main/java/org/red5/io/object/Output.java
@@ -28,7 +28,7 @@ public interface Output {
// Basic Data Types
/**
* Write number
- *
+ *
* @param num
* Number
*/
@@ -36,7 +36,7 @@ public interface Output {
/**
* Write boolean
- *
+ *
* @param bol
* Boolean
*/
@@ -44,7 +44,7 @@ public interface Output {
/**
* Write string
- *
+ *
* @param string
* String
*/
@@ -52,7 +52,7 @@ public interface Output {
/**
* Write date
- *
+ *
* @param date
* Date
*/
@@ -62,7 +62,7 @@ public interface Output {
/**
* Write array.
- *
+ *
* @param array
* Array to write
*/
@@ -70,7 +70,7 @@ public interface Output {
/**
* Write array.
- *
+ *
* @param array
* Array to write
*/
@@ -78,7 +78,7 @@ public interface Output {
/**
* Write primitive array.
- *
+ *
* @param array
* Array to write
*/
@@ -126,7 +126,7 @@ public interface Output {
/**
* Write XML object
- *
+ *
* @param xml
* XML document
*/
@@ -134,7 +134,7 @@ public interface Output {
/**
* Write ByteArray object (AMF3 only).
- *
+ *
* @param array
* object to write
*/
@@ -142,7 +142,7 @@ public interface Output {
/**
* Write a Vector<int>.
- *
+ *
* @param vector
* vector
*/
@@ -150,7 +150,7 @@ public interface Output {
/**
* Write a Vector<uint>.
- *
+ *
* @param vector
* vector
*/
@@ -158,7 +158,7 @@ public interface Output {
/**
* Write a Vector<Number>.
- *
+ *
* @param vector
* vector
*/
@@ -166,7 +166,7 @@ public interface Output {
/**
* Write a Vector<Object>.
- *
+ *
* @param vector
* vector
*/
@@ -174,7 +174,7 @@ public interface Output {
/**
* Write reference to complex data type
- *
+ *
* @param obj
* Referenced object
*/
@@ -191,7 +191,7 @@ public interface Output {
/**
* Write custom (user) object
- *
+ *
* @param custom
* Custom data type object
*/
diff --git a/io/src/main/java/org/red5/io/object/RecordSet.java b/io/src/main/java/org/red5/io/object/RecordSet.java
index b7b9e3458..d85003dde 100644
--- a/io/src/main/java/org/red5/io/object/RecordSet.java
+++ b/io/src/main/java/org/red5/io/object/RecordSet.java
@@ -27,7 +27,7 @@
*
* For last mode, use page size property to specify maximum number of rows on one page
*
- *
+ *
* @author The Red5 Project
* @author Joachim Bauch (jojo@struktur.de)
*/
@@ -99,7 +99,7 @@ public class RecordSet {
/**
* Creates recordset from Input object
- *
+ *
* @param input
* input
*/
@@ -131,7 +131,7 @@ public RecordSet(Input input) {
/**
* Set the remoting client to use for retrieving of paged results.
- *
+ *
* @param client
* Remoting client that works with this Recordset
*/
@@ -141,7 +141,7 @@ public void setRemotingClient(IRemotingClient client) {
/**
* Set the mode for fetching paged results.
- *
+ *
* @param mode
* Mode for fetching of results
*/
@@ -151,7 +151,7 @@ public void setDeliveryMode(String mode) {
/**
* Set the mode for fetching paged results with given max page size.
- *
+ *
* @param mode
* Mode for fetching of results
* @param pageSize
@@ -163,7 +163,7 @@ public void setDeliveryMode(String mode, int pageSize) {
/**
* Set the mode for fetching paged results with given max page size and number of prefetched pages.
- *
+ *
* @param mode
* Mode for fetching of results
* @param pageSize
@@ -178,7 +178,7 @@ public void setDeliveryMode(String mode, int pageSize, int prefetchCount) {
/**
* Return a list containing the names of the columns in the recordset.
- *
+ *
* @return Column names set
*/
public List getColumnNames() {
@@ -187,7 +187,7 @@ public List getColumnNames() {
/**
* Make sure the passed item has been fetched from the server.
- *
+ *
* @param index
* Item index
*/
@@ -245,7 +245,7 @@ private void ensureAvailable(int index) {
/**
* Return a specified item from the recordset. If the item is not available yet, it will be received from the server.
- *
+ *
* @param index
* Item index
* @return Item from recordset
@@ -262,7 +262,7 @@ public List getItemAt(int index) {
/**
* Get the total number of items.
- *
+ *
* @return Number of items
*/
public int getLength() {
@@ -271,7 +271,7 @@ public int getLength() {
/**
* Get the number of items already received from the server.
- *
+ *
* @return Nsumber of received items
*/
public int getNumberAvailable() {
@@ -286,7 +286,7 @@ public int getNumberAvailable() {
/**
* Check if all items are available on the client.
- *
+ *
* @return number of available items
*/
public boolean isFullyPopulated() {
@@ -295,7 +295,7 @@ public boolean isFullyPopulated() {
/**
* Return Map that can be serialized as result.
- *
+ *
* @return serializable informations
*/
public Map serialize() {
diff --git a/io/src/main/java/org/red5/io/object/RecordSetPage.java b/io/src/main/java/org/red5/io/object/RecordSetPage.java
index 0072ae480..21029a871 100644
--- a/io/src/main/java/org/red5/io/object/RecordSetPage.java
+++ b/io/src/main/java/org/red5/io/object/RecordSetPage.java
@@ -30,7 +30,7 @@ public class RecordSetPage {
/**
* Creates recordset page from Input object
- *
+ *
* @param input
* Input object to use as source for data that has to be deserialized
*/
diff --git a/io/src/main/java/org/red5/io/object/Serializer.java b/io/src/main/java/org/red5/io/object/Serializer.java
index a2ad08cdf..431ec6ef8 100644
--- a/io/src/main/java/org/red5/io/object/Serializer.java
+++ b/io/src/main/java/org/red5/io/object/Serializer.java
@@ -30,7 +30,7 @@
/**
* The Serializer class writes data output and handles the data according to the core data types
- *
+ *
* @author The Red5 Project
* @author Luke Hubbard, Codegent Ltd (luke@codegent.com)
* @author Harald Radi (harald.radi@nme.at)
@@ -45,7 +45,7 @@ private Serializer() {
/**
* Serializes output to a core data type object
- *
+ *
* @param out
* Output writer
* @param any
@@ -57,7 +57,7 @@ public static void serialize(Output out, Object any) {
/**
* Serializes output to a core data type object
- *
+ *
* @param out
* Output writer
* @param field
@@ -124,7 +124,7 @@ public static void serialize(Output out, Field field, Method getter, Object obje
/**
* Writes a primitive out as an object
- *
+ *
* @param out
* Output writer
* @param basic
@@ -153,7 +153,7 @@ protected static boolean writeBasic(Output out, Object basic) {
/**
* Writes a complex type object out
- *
+ *
* @param out
* Output writer
* @param complex
@@ -179,7 +179,7 @@ public static boolean writeComplex(Output out, Object complex) {
/**
* Writes Lists out as a data type
- *
+ *
* @param out
* Output write
* @param listType
@@ -198,7 +198,7 @@ protected static boolean writeListType(Output out, Object listType) {
/**
* Writes a List out as an Object
- *
+ *
* @param out
* Output writer
* @param list
@@ -232,7 +232,7 @@ protected static void writeList(Output out, List list) {
/**
* Writes array (or collection) out as output Arrays, Collections, etc
- *
+ *
* @param out
* Output object
* @param arrType
@@ -258,7 +258,7 @@ protected static boolean writeArrayType(Output out, Object arrType) {
/**
* Writes an iterator out to the output
- *
+ *
* @param out
* Output writer
* @param it
@@ -277,7 +277,7 @@ protected static void writeIterator(Output out, Iterator it) {
/**
* Writes an xml type out to the output
- *
+ *
* @param out
* Output writer
* @param xml
@@ -297,7 +297,7 @@ protected static boolean writeXMLType(Output out, Object xml) {
/**
* Writes a document to the output
- *
+ *
* @param out
* Output writer
* @param doc
@@ -309,7 +309,7 @@ protected static void writeDocument(Output out, Document doc) {
/**
* Write typed object to the output
- *
+ *
* @param out
* Output writer
* @param obj
@@ -332,7 +332,7 @@ protected static boolean writeObjectType(Output out, Object obj) {
/**
* Writes a custom data to the output
- *
+ *
* @param out
* Output writer
* @param obj
@@ -351,7 +351,7 @@ protected static boolean writeCustomType(Output out, Object obj) {
/**
* Checks whether the field should be serialized or not
- *
+ *
* @param keyName
* key name
* @param field
@@ -385,7 +385,7 @@ public static boolean serializeField(String keyName, Field field, Method getter)
/**
* Handles classes by name, also provides "shortened" class aliases where appropriate.
- *
+ *
* @param objectClass
* class
* @return class name for given object
diff --git a/io/src/main/java/org/red5/io/object/StreamAction.java b/io/src/main/java/org/red5/io/object/StreamAction.java
index 17356cbb1..d9b055c79 100644
--- a/io/src/main/java/org/red5/io/object/StreamAction.java
+++ b/io/src/main/java/org/red5/io/object/StreamAction.java
@@ -13,7 +13,7 @@
/**
* Represents all the actions which may be permitted on a stream. Some actions are called by client implementations other than a Flash Player itself; ex "getStreamLength".
* If an action is not specified here, the "CUSTOM" enum will be returned.
- *
+ *
* @author Paul Gregoire
*/
public enum StreamAction {
diff --git a/io/src/main/java/org/red5/io/object/UnsignedByte.java b/io/src/main/java/org/red5/io/object/UnsignedByte.java
index 71f081ca7..9750b5530 100644
--- a/io/src/main/java/org/red5/io/object/UnsignedByte.java
+++ b/io/src/main/java/org/red5/io/object/UnsignedByte.java
@@ -9,7 +9,7 @@
/**
* The UnsignedByte class wraps a value of and unsigned 8 bits number.
- *
+ *
* @author Matteo Merli (matteo.merli@gmail.com)
*/
public final class UnsignedByte extends UnsignedNumber {
diff --git a/io/src/main/java/org/red5/io/object/UnsignedInt.java b/io/src/main/java/org/red5/io/object/UnsignedInt.java
index 68e051df5..50ce745dc 100644
--- a/io/src/main/java/org/red5/io/object/UnsignedInt.java
+++ b/io/src/main/java/org/red5/io/object/UnsignedInt.java
@@ -9,7 +9,7 @@
/**
* The UnsignedInt class wraps a value of an unsigned 32 bits number.
- *
+ *
* @author Matteo Merli (matteo.merli@gmail.com)
*/
public final class UnsignedInt extends UnsignedNumber {
diff --git a/io/src/main/java/org/red5/io/object/UnsignedLong.java b/io/src/main/java/org/red5/io/object/UnsignedLong.java
index 3f407b6a5..7d2257aeb 100644
--- a/io/src/main/java/org/red5/io/object/UnsignedLong.java
+++ b/io/src/main/java/org/red5/io/object/UnsignedLong.java
@@ -13,7 +13,7 @@
/**
* The UnsignedLong class wraps a value of an unsigned 64 bits number.
- *
+ *
* @author Matteo Merli (matteo.merli@gmail.com)
*/
public final class UnsignedLong extends UnsignedNumber {
@@ -54,7 +54,7 @@ public UnsignedLong(long c) {
/**
* Construct a new random UnsignedLong.
- *
+ *
* @param random
* a Random handler
*/
diff --git a/io/src/main/java/org/red5/io/object/UnsignedNumber.java b/io/src/main/java/org/red5/io/object/UnsignedNumber.java
index ae831493f..be21faf94 100644
--- a/io/src/main/java/org/red5/io/object/UnsignedNumber.java
+++ b/io/src/main/java/org/red5/io/object/UnsignedNumber.java
@@ -16,14 +16,14 @@ public abstract class UnsignedNumber extends Number {
/**
* Get a byte array representation of the number. The order will be MSB first (Big Endian).
- *
+ *
* @return the serialized number
*/
public abstract byte[] getBytes();
/**
* Perform a bit right shift of the value.
- *
+ *
* @param nBits
* the number of positions to shift
*/
@@ -31,7 +31,7 @@ public abstract class UnsignedNumber extends Number {
/**
* Perform a bit left shift of the value.
- *
+ *
* @param nBits
* the number of positions to shift
*/
diff --git a/io/src/main/java/org/red5/io/object/UnsignedShort.java b/io/src/main/java/org/red5/io/object/UnsignedShort.java
index c08050bc2..923ddc426 100644
--- a/io/src/main/java/org/red5/io/object/UnsignedShort.java
+++ b/io/src/main/java/org/red5/io/object/UnsignedShort.java
@@ -11,7 +11,7 @@
/**
* The UnsignedByte class wraps a value of an unsigned 16 bits number.
- *
+ *
* @author Matteo Merli (matteo.merli@gmail.com)
*/
public final class UnsignedShort extends UnsignedNumber {
diff --git a/io/src/main/java/org/red5/io/sctp/SctpException.java b/io/src/main/java/org/red5/io/sctp/SctpException.java
index 77ea38d9f..de340de39 100644
--- a/io/src/main/java/org/red5/io/sctp/SctpException.java
+++ b/io/src/main/java/org/red5/io/sctp/SctpException.java
@@ -10,7 +10,7 @@
public class SctpException extends Exception {
/**
- *
+ *
*/
private static final long serialVersionUID = 1L;
diff --git a/io/src/main/java/org/red5/io/sctp/SctpServerChanneOverUDP.java b/io/src/main/java/org/red5/io/sctp/SctpServerChanneOverUDP.java
index 6f95f2caa..a12d170d8 100644
--- a/io/src/main/java/org/red5/io/sctp/SctpServerChanneOverUDP.java
+++ b/io/src/main/java/org/red5/io/sctp/SctpServerChanneOverUDP.java
@@ -157,7 +157,7 @@ protected void implCloseSelectableChannel() throws IOException {
@Override
protected void implConfigureBlocking(boolean block) throws IOException {
- // TODO Auto-generated method stub
+ // TODO Auto-generated method stub
}
@Override
diff --git a/io/src/main/java/org/red5/io/sctp/packet/chunks/Init.java b/io/src/main/java/org/red5/io/sctp/packet/chunks/Init.java
index d130c1fb9..d2c05e209 100644
--- a/io/src/main/java/org/red5/io/sctp/packet/chunks/Init.java
+++ b/io/src/main/java/org/red5/io/sctp/packet/chunks/Init.java
@@ -20,7 +20,7 @@
public class Init extends Chunk {
- // initiateTag(4 byte) + advertisedReceiverWindowCredit(4 byte) + numberOfOutboundStreams(2 byte) + numberOfInboundStreams(2 byte) + TSN(4 byte)
+ // initiateTag(4 byte) + advertisedReceiverWindowCredit(4 byte) + numberOfOutboundStreams(2 byte) + numberOfInboundStreams(2 byte) + TSN(4 byte)
private static final int MANDATORY_FIELD_SIZE = 16;
private int initiateTag;
diff --git a/io/src/main/java/org/red5/io/utils/BufferUtils.java b/io/src/main/java/org/red5/io/utils/BufferUtils.java
index 6c80755c3..8bc5a17d5 100644
--- a/io/src/main/java/org/red5/io/utils/BufferUtils.java
+++ b/io/src/main/java/org/red5/io/utils/BufferUtils.java
@@ -13,7 +13,7 @@
/**
* Buffer Utility class which reads/writes integers to the input/output buffer
- *
+ *
* @author The Red5 Project
* @author Luke Hubbard, Codegent Ltd (luke@codegent.com)
* @author Andy Shaules (bowljoman@hotmail.com)
@@ -24,7 +24,7 @@ public class BufferUtils {
/**
* Writes a Medium Int to the output buffer
- *
+ *
* @param out
* Container to write to
* @param value
@@ -40,7 +40,7 @@ public static void writeMediumInt(IoBuffer out, int value) {
/**
* Reads an unsigned Medium Int from the in buffer
- *
+ *
* @param in
* Source
* @return int Integer value
@@ -57,7 +57,7 @@ public static int readUnsignedMediumInt(IoBuffer in) {
/**
* Reads a Medium Int to the in buffer
- *
+ *
* @param in
* Source
* @return int Medium int
@@ -77,7 +77,7 @@ public static int readMediumInt(IoBuffer in) {
/**
* Puts an input buffer in an output buffer and returns number of bytes written.
- *
+ *
* @param out
* Output buffer
* @param in
@@ -107,7 +107,7 @@ public final static int put(IoBuffer out, IoBuffer in, int numBytesMax) {
/**
* Consumes bytes from an input buffer and returns them in an output buffer.
- *
+ *
* @param in
* Input byte array
* @param numBytesMax
diff --git a/io/src/main/java/org/red5/io/utils/ConversionUtils.java b/io/src/main/java/org/red5/io/utils/ConversionUtils.java
index e611196cb..a35654e66 100644
--- a/io/src/main/java/org/red5/io/utils/ConversionUtils.java
+++ b/io/src/main/java/org/red5/io/utils/ConversionUtils.java
@@ -29,7 +29,7 @@
/**
* Misc utils for conversions
- *
+ *
* @author The Red5 Project
* @author Luke Hubbard, Codegent Ltd (luke@codegent.com)
* @author Paul Gregoire (mondain@gmail.com)
@@ -76,7 +76,7 @@ public class ConversionUtils {
/**
* Returns true for base types or arrays of base type.
- *
+ *
* @param obj Object
* @return true if base-type or array and false otherwise
*/
@@ -92,7 +92,7 @@ public static boolean isBaseTypeOrArray(Object obj) {
/**
* Convert source to given class
- *
+ *
* @param source
* Source object
* @param target
@@ -157,7 +157,7 @@ public static Object convert(Object source, Class target) throws ConversionEx
/**
* Convert to array
- *
+ *
* @param source
* Source object
* @param target
@@ -200,7 +200,7 @@ public static List convertMapToList(Map map) {
/**
* Convert to wrapped primitive
- *
+ *
* @param source
* Source object
* @param wrapper
@@ -233,7 +233,7 @@ public static Object convertToWrappedPrimitive(Object source, Class wrapper)
/**
* Convert string to primitive wrapper like Boolean or Float
- *
+ *
* @param str
* String to convert
* @param wrapper
@@ -264,7 +264,7 @@ public static Object convertStringToWrapper(String str, Class wrapper) {
/**
* Convert number to primitive wrapper like Boolean or Float
- *
+ *
* @param num
* Number to conver
* @param wrapper
@@ -295,7 +295,7 @@ public static Object convertNumberToWrapper(Number num, Class wrapper) {
/**
* Find method by name and number of parameters
- *
+ *
* @param object
* Object to find method on
* @param method
@@ -337,7 +337,7 @@ public static List findMethodsByNameAndNumParams(Object object, String m
/**
* Convert parameters using methods of this utility class
- *
+ *
* @param source
* Array of source object
* @param target
@@ -356,7 +356,7 @@ public static Object[] convertParams(Object[] source, Class[] target) throws
/**
* Convert parameters using methods of this utility class. Special handling is afforded to classes that implement IConnection.
- *
+ *
* @param source
* Array of source object
* @return Array of converted objects
@@ -405,7 +405,7 @@ public static List convertArrayToList(Object[] source) throws ConversionExcep
/**
* Convert map to bean
- *
+ *
* @param source
* Source map
* @param target
@@ -433,7 +433,7 @@ public static Object convertMapToBean(Map source, Clas
/**
* Convert bean to map
- *
+ *
* @param source
* Source bean
* @return Converted map
@@ -444,7 +444,7 @@ public static Object convertMapToBean(Map source, Clas
/**
* Convert array to set, removing duplicates
- *
+ *
* @param source
* Source array
* @return Set
@@ -459,7 +459,7 @@ public static Set convertArrayToSet(Object[] source) {
/**
* Create new class instance
- *
+ *
* @param className
* Class name; may not be loaded by JVM yet
* @return Instance of given class
@@ -479,7 +479,7 @@ protected static Object newInstance(String className) {
/**
* Create new class instance
- *
+ *
* @param clazz
* Class; may not be loaded by JVM yet
* @return Instance of given class
diff --git a/io/src/main/java/org/red5/io/utils/DOM2Writer.java b/io/src/main/java/org/red5/io/utils/DOM2Writer.java
index 44bf4077c..2bba0bd36 100644
--- a/io/src/main/java/org/red5/io/utils/DOM2Writer.java
+++ b/io/src/main/java/org/red5/io/utils/DOM2Writer.java
@@ -19,7 +19,7 @@
/**
* This class is a utility to serialize a DOM node as XML. This class uses the DOM Level 2 APIs. The main difference between this class and DOMWriter is that this class generates and prints out namespace declarations.
- *
+ *
* @author Matthew J. Duftler (duftler@us.ibm.com)
* @author Joseph Kesselman
*/
@@ -29,7 +29,7 @@ public class DOM2Writer {
/**
* Serialize this node into the writer as XML.
- *
+ *
* @param writer
* Writer object
* @param node
@@ -43,7 +43,7 @@ public static void serializeAsXML(Node node, Writer writer) {
/**
* Dumps DOM node
- *
+ *
* @param node
* Node to dump
* @param out
diff --git a/io/src/main/java/org/red5/io/utils/HexCharset.java b/io/src/main/java/org/red5/io/utils/HexCharset.java
index c48cf3c18..42d2658a4 100644
--- a/io/src/main/java/org/red5/io/utils/HexCharset.java
+++ b/io/src/main/java/org/red5/io/utils/HexCharset.java
@@ -25,7 +25,7 @@
*
* hex:nn used as a charset name inserts \n after every nnth character.
*
- *
+ *
* @author Malcolm McMahon
*/
public class HexCharset extends Charset {
@@ -40,7 +40,7 @@ public class HexCharset extends Charset {
/**
* Creates a new instance of HexCharset
- *
+ *
* @param caps
* true for A-F, false for a-f
*/
@@ -51,7 +51,7 @@ public HexCharset(boolean caps) {
/**
* Construct the charset
- *
+ *
* @param caps
* true for A-F, false for a-f
* @param measure
@@ -65,7 +65,7 @@ public HexCharset(boolean caps, int measure) {
/**
* Constructs a new encoder for this charset.
- *
+ *
* @return A new encoder for this charset
*/
@Override
@@ -75,7 +75,7 @@ public CharsetEncoder newEncoder() {
/**
* Constructs a new decoder for this charset.
- *
+ *
* @return A new decoder for this charset
*/
@Override
@@ -85,19 +85,19 @@ public CharsetDecoder newDecoder() {
/**
* Tells whether or not this charset contains the given charset.
- *
+ *
*
* A charset C is said to contain a charset D if, and only if, every character representable in D is also representable in C . If this relationship holds then it is guaranteed that every string that can be encoded in D can also be encoded in C without performing any replacements.
- *
+ *
*
* That C contains D does not imply that each character representable in C by a particular byte sequence is represented in D by the same byte sequence, although sometimes this is the case.
- *
+ *
*
* Every charset contains itself.
- *
+ *
*
* This method computes an approximation of the containment relation: If it returns true then the given charset is known to be contained by this charset; if it returns false, however, then it is not necessarily the case that the given charset is not contained in this charset.
- *
+ *
* @return true if, and only if, the given charset is contained in this charset
*/
@Override
@@ -116,14 +116,14 @@ private Encoder() {
/**
* Flushes this encoder.
- *
+ *
*
* The default implementation of this method does nothing, and always returns {@link CoderResult#UNDERFLOW}. This method should be overridden by encoders that may need to write final bytes to the output buffer once the entire input sequence has been read.
*
- *
+ *
* @param out
* The output byte buffer
- *
+ *
* @return A coder-result object, either {@link CoderResult#UNDERFLOW} or {@link CoderResult#OVERFLOW}
*/
@Override
@@ -137,27 +137,27 @@ protected java.nio.charset.CoderResult implFlush(java.nio.ByteBuffer out) {
/**
* Encodes one or more characters into one or more bytes.
- *
+ *
*
* This method encapsulates the basic encoding loop, encoding as many characters as possible until it either runs out of input, runs out of room in the output buffer, or encounters an encoding error. This method is invoked by the {@link #encode encode} method, which handles result interpretation and error recovery.
- *
+ *
*
* The buffers are read from, and written to, starting at their current positions. At most {@link Buffer#remaining in.remaining()} characters will be read, and at most {@link Buffer#remaining out.remaining()} bytes will be written. The buffers' positions will be advanced to reflect the characters read and the bytes written, but their marks and limits will not be modified.
- *
+ *
*
* This method returns a {@link CoderResult} object to describe its reason for termination, in the same manner as the {@link #encode encode} method. Most implementations of this method will handle encoding errors by returning an appropriate result object for interpretation by the {@link #encode encode} method. An optimized implementation may instead examine the relevant error action and implement that action
* itself.
- *
+ *
*
* An implementation of this method may perform arbitrary lookahead by returning {@link CoderResult#UNDERFLOW} until it receives sufficient input.
*
- *
+ *
* @param in
* The input character buffer
- *
+ *
* @param out
* The output byte buffer
- *
+ *
* @return A coder-result object describing the reason for termination
*/
@Override
@@ -201,27 +201,27 @@ private Decoder() {
/**
* Decodes one or more bytes into one or more characters.
- *
+ *
*
* This method encapsulates the basic decoding loop, decoding as many bytes as possible until it either runs out of input, runs out of room in the output buffer, or encounters a decoding error. This method is invoked by the {@link #decode decode} method, which handles result interpretation and error recovery.
- *
+ *
*
* The buffers are read from, and written to, starting at their current positions. At most {@link Buffer#remaining in.remaining()} bytes will be read, and at most {@link Buffer#remaining out.remaining()} characters will be written. The buffers' positions will be advanced to reflect the bytes read and the characters written, but their marks and limits will not be modified.
- *
+ *
*
* This method returns a {@link CoderResult} object to describe its reason for termination, in the same manner as the {@link #decode decode} method. Most implementations of this method will handle decoding errors by returning an appropriate result object for interpretation by the {@link #decode decode} method. An optimized implementation may instead examine the relevant error action and implement that action
* itself.
- *
+ *
*
* An implementation of this method may perform arbitrary lookahead by returning {@link CoderResult#UNDERFLOW} until it receives sufficient input.
*
- *
+ *
* @param in
* The input byte buffer
- *
+ *
* @param out
* The output character buffer
- *
+ *
* @return A coder-result object describing the reason for termination
*/
@Override
@@ -245,7 +245,7 @@ public java.nio.charset.CoderResult decodeLoop(java.nio.ByteBuffer in, java.nio.
/**
* Resets this decoder, clearing any charset-specific internal state.
- *
+ *
*
* The default implementation of this method does nothing. This method should be overridden by decoders that maintain internal state.
*
diff --git a/io/src/main/java/org/red5/io/utils/HexDump.java b/io/src/main/java/org/red5/io/utils/HexDump.java
index 7c73632ea..5a321a388 100644
--- a/io/src/main/java/org/red5/io/utils/HexDump.java
+++ b/io/src/main/java/org/red5/io/utils/HexDump.java
@@ -13,15 +13,15 @@
/**
* Hexadecimal byte dumper
- *
+ *
* @author Niko Schweitzer
*/
public class HexDump {
/**
* Method prettyPrintHex
- *
- *
+ *
+ *
* @param bbToConvert
* ByteBuffer to encode
* @return Hexdump string
@@ -32,8 +32,8 @@ public static String prettyPrintHex(ByteBuffer bbToConvert) {
/**
* Method prettyPrintHex
- *
- *
+ *
+ *
* @param baToConvert
* Array of bytes to encode
* @return Hexdump string
@@ -50,8 +50,8 @@ public static String prettyPrintHex(byte[] baToConvert) {
/**
* Method prettyPrintHex
- *
- *
+ *
+ *
* @param sToConvert
* string to convert
* @return hexdump string
@@ -68,7 +68,7 @@ public static String prettyPrintHex(String sToConvert) {
/**
* Dumps a byte array as hex.
- *
+ *
* @param sb
* string builder
* @param b
@@ -114,7 +114,7 @@ public static void dumpHex(StringBuilder sb, byte[] b) {
/**
* Sets the WithByteSeparator attribute of the Convert class
- *
+ *
* @param bs
* The new WithByteSeparator value
*/
@@ -124,7 +124,7 @@ public static void setWithByteSeparator(boolean bs) {
/**
* Sets the ByteSeparator attribute of the Convert class
- *
+ *
* @param bs
* The new ByteSeparator value
*/
@@ -134,7 +134,7 @@ public static void setByteSeparator(char bs) {
/**
* Sets the BitDigits attribute of the Convert class
- *
+ *
* @param bd
* The new BitDigits value
* @exception Exception
@@ -151,7 +151,7 @@ public static void setBitDigits(char[] bd) throws Exception {
/**
* Method setBitDigits
- *
+ *
* @param zeroBit
* zero bit
* @param oneBit
@@ -168,7 +168,7 @@ public static void setBitDigits(char zeroBit, char oneBit) {
/**
* Description of the Method
- *
+ *
* @param block
* Description of Parameter
* @return Description of the Returned Value
@@ -193,7 +193,7 @@ public static String byteArrayToBinaryString(byte[] block) {
/**
* Method toBinaryString
- *
+ *
* @param ba
* binary array
* @return the binary representation of the byte array
@@ -204,7 +204,7 @@ public static String toBinaryString(byte[] ba) {
/**
* Method toBinaryString
- *
+ *
* @param b
* byte array
* @return the binary representation of the byte
@@ -217,7 +217,7 @@ public static String toBinaryString(byte b) {
/**
* Method toBinaryString
- *
+ *
* @param s
* short
* @return the binary representation of the short
@@ -228,7 +228,7 @@ public static String toBinaryString(short s) {
/**
* Method toBinaryString
- *
+ *
* @param i
* integer
* @return the binary representation of the int
@@ -239,7 +239,7 @@ public static String toBinaryString(int i) {
/**
* Method toBinaryString
- *
+ *
* @param l
* long
* @return the binary representation of the long
@@ -250,7 +250,7 @@ public static String toBinaryString(long l) {
/**
* Method toByteArray
- *
+ *
* @param s
* short
* @return the short as array of bytes
@@ -264,7 +264,7 @@ public static final byte[] toByteArray(short s) {
/**
* Method toByteArray
- *
+ *
* @param i
* int
* @return the int as array of bytes
@@ -280,7 +280,7 @@ public static final byte[] toByteArray(int i) {
/**
* Method toByteArray
- *
+ *
* @param l
* long
* @return the long as array of bytes
@@ -300,7 +300,7 @@ public static final byte[] toByteArray(long l) {
/**
* Description of the Method
- *
+ *
* @param block
* Description of Parameter
* @return Description of the Returned Value
@@ -319,7 +319,7 @@ public static String byteArrayToHexString(byte[] block) {
/**
* Description of the Method
- *
+ *
* @param in
* string to be converted
* @return String in readable hex encoding
@@ -331,7 +331,7 @@ public static String stringToHexString(String in) {
/**
* Description of the Method
- *
+ *
* @param block
* Description of Parameter
* @param offset
@@ -358,7 +358,7 @@ public static String byteArrayToHexString(byte[] block, int offset, int length)
/**
* Returns a string of hexadecimal digits from a byte array. Each byte is converted to 2 hex symbols.
- *
+ *
* @param ba
* Description of Parameter
* @return Description of the Returned Value
@@ -369,7 +369,7 @@ public static String toHexString(byte[] ba) {
/**
* Method toHexString
- *
+ *
* @param b
* byte
* @return the hexadecimal representation of the byte
@@ -382,7 +382,7 @@ public static String toHexString(byte b) {
/**
* Description of the Method
- *
+ *
* @param s
* short
* @return Description of the Returned Value
@@ -393,7 +393,7 @@ public static String toHexString(short s) {
/**
* Method toHexString
- *
+ *
* @param i
* int
* @return the hexadecimal representation of the int
@@ -404,7 +404,7 @@ public static String toHexString(int i) {
/**
* Method toHexString
- *
+ *
* @param l
* long
* @return the hexadecimal representation of the long
@@ -415,7 +415,7 @@ public static String toHexString(long l) {
/**
* Method toString
- *
+ *
* @param ba
* byte array
* @return the byte array as string
@@ -426,7 +426,7 @@ public static String toString(byte[] ba) {
/**
* Method toString
- *
+ *
* @param b
* byte
* @return the byte as string
@@ -439,7 +439,7 @@ public static String toString(byte b) {
/**
* converts String to Hex String. Example: niko == 6E696B6F
- *
+ *
* @param ba
* byte array
* @param offset
@@ -468,7 +468,7 @@ public static String toHexString(byte[] ba, int offset, int length) {
/**
* Converts readable hex-String to byteArray
- *
+ *
* @param strA
* string
* @return the hexadecimal string as byte array
@@ -678,7 +678,7 @@ public static byte[] hexStringToByteArray(String strA) {
/**
* Description of the Method
- *
+ *
* @param b
* Description of Parameter
* @param buf
@@ -693,7 +693,7 @@ private static void byte2hex(byte b, StringBuffer buf) {
/**
* Description of the Method
- *
+ *
* @param b
* Description of Parameter
* @param buf
@@ -714,7 +714,7 @@ private static void byte2bin(byte b, StringBuffer buf) {
/**
* Returns a string of 8 hexadecimal digits (most significant digit first) corresponding to the integer n , which is treated as
* unsigned.
- *
+ *
* @param n
* Description of Parameter
* @return Description of the Returned Value
diff --git a/io/src/main/java/org/red5/io/utils/IOUtils.java b/io/src/main/java/org/red5/io/utils/IOUtils.java
index 70a96135c..3156132f3 100644
--- a/io/src/main/java/org/red5/io/utils/IOUtils.java
+++ b/io/src/main/java/org/red5/io/utils/IOUtils.java
@@ -15,7 +15,7 @@
/**
* Miscellaneous I/O utility methods
- *
+ *
* @see Unsigned bytes in Java
*/
public class IOUtils {
@@ -27,7 +27,7 @@ public class IOUtils {
/**
* Writes integer in reverse order
- *
+ *
* @param out
* Data buffer to fill
* @param value
@@ -39,7 +39,7 @@ public final static void writeReverseInt(IoBuffer out, int value) {
/**
* Writes medium integer
- *
+ *
* @param out
* Output buffer
* @param value
@@ -55,7 +55,7 @@ public final static void writeMediumInt(IoBuffer out, int value) {
/**
* Writes medium integer
- *
+ *
* @param out
* Output buffer
* @param value
@@ -69,7 +69,7 @@ public final static void writeMediumInt(ByteBuffer out, int value) {
/**
* Writes extended medium integer (equivalent to a regular integer whose most significant byte has been moved to its end, past its least significant byte)
- *
+ *
* @param out
* Output buffer
* @param value
@@ -82,7 +82,7 @@ public final static void writeExtendedMediumInt(IoBuffer out, int value) {
/**
* Writes extended medium integer (equivalent to a regular integer whose most significant byte has been moved to its end, past its least significant byte)
- *
+ *
* @param out
* Output buffer
* @param value
@@ -95,7 +95,7 @@ public final static void writeExtendedMediumInt(ByteBuffer out, int value) {
/**
* Writes an unsigned byte value to the supplied buffer.
- *
+ *
* @param out
* Output buffer
* @param value
@@ -107,7 +107,7 @@ public final static void writeUnsignedByte(ByteBuffer out, byte value) {
/**
* Reads unsigned medium integer (3 bytes)
- *
+ *
* @param in
* Unsigned medium int source
* @return int value
@@ -118,7 +118,7 @@ public final static int readUnsignedMediumInt(ByteBuffer in) {
/**
* Reads unsigned medium integer (3 bytes)
- *
+ *
* @param in
* Unsigned medium int source
* @return int value
@@ -129,7 +129,7 @@ public final static int readUnsignedMediumInt(IoBuffer in) {
/**
* Reads medium int
- *
+ *
* @param in
* Source
* @return int value
@@ -140,7 +140,7 @@ public final static int readMediumInt(ByteBuffer in) {
/**
* Reads medium int
- *
+ *
* @param in
* Source
* @return int value
@@ -151,7 +151,7 @@ public final static int readMediumInt(IoBuffer in) {
/**
* Reads extended medium int
- *
+ *
* @param in
* Source
* @return int value
@@ -164,7 +164,7 @@ public final static int readExtendedMediumInt(IoBuffer in) {
/**
* Reads extended medium int
- *
+ *
* @param in
* Source
* @return int value
@@ -177,7 +177,7 @@ public final static int readExtendedMediumInt(ByteBuffer in) {
/**
* Reads reverse int
- *
+ *
* @param in
* Source
* @return int
@@ -190,7 +190,7 @@ public final static int readReverseInt(IoBuffer in) {
/**
* Format debug message
- *
+ *
* @param log
* Logger
* @param msg
@@ -209,7 +209,7 @@ public final static void debug(Logger log, String msg, IoBuffer buf) {
/**
* String representation of byte buffer
- *
+ *
* @param buf Byte buffer
* @return String representation
*/
@@ -225,7 +225,7 @@ public final static String toString(IoBuffer buf) {
/**
* Returns a byte array for the given hex encoded string.
- *
+ *
* @param s encoded hex string
* @return byte array
*/
diff --git a/io/src/main/java/org/red5/io/utils/LEB128.java b/io/src/main/java/org/red5/io/utils/LEB128.java
index 3f9210b7e..e9848fd9b 100644
--- a/io/src/main/java/org/red5/io/utils/LEB128.java
+++ b/io/src/main/java/org/red5/io/utils/LEB128.java
@@ -9,11 +9,11 @@
/**
* This class encodes and decodes integers in the LEB128 compression format.
- *
- * Reference examples:
+ *
+ * Reference examples:
* @see leb128.go
* @see leb128.dart
- *
+ *
* @author The Red5 Project
* @author Paul Gregoire (mondain@gmail.com)
*/
@@ -25,7 +25,7 @@ public final class LEB128 {
/**
* Encodes an int into an LEB128 unsigned integer.
- *
+ *
* @param value integer to encode
* @return unsigned integer in LEB128 format
*/
@@ -46,7 +46,7 @@ public static int encode(int value) {
/**
* Decodes an LEB128 unsigned integer into a regular int.
- *
+ *
* @param value unsigned integer in LEB128 format to decode
* @return int
*/
diff --git a/io/src/main/java/org/red5/io/utils/ObjectMap.java b/io/src/main/java/org/red5/io/utils/ObjectMap.java
index 4457cb341..0b9c3baca 100644
--- a/io/src/main/java/org/red5/io/utils/ObjectMap.java
+++ b/io/src/main/java/org/red5/io/utils/ObjectMap.java
@@ -11,7 +11,7 @@
/**
* Map that should be transmitted as object through RTMP.
- *
+ *
* @author The Red5 Project
* @author Joachim Bauch (jojo@struktur.de)
* @param
diff --git a/io/src/main/java/org/red5/io/utils/RandomGUID.java b/io/src/main/java/org/red5/io/utils/RandomGUID.java
index 6bf102205..5636042e3 100644
--- a/io/src/main/java/org/red5/io/utils/RandomGUID.java
+++ b/io/src/main/java/org/red5/io/utils/RandomGUID.java
@@ -19,7 +19,7 @@ private RandomGUID() {
/**
* Returns a byte array for the given uuid or guid.
- *
+ *
* @param uid
* unique id
* @return array of bytes containing the id
@@ -42,7 +42,7 @@ public final static byte[] toByteArray(String uid) {
/**
* Returns a uuid / guid for a given byte array.
- *
+ *
* @param ba
* array of bytes containing the id
* @return id
@@ -64,7 +64,7 @@ public static String fromByteArray(byte[] ba) {
/**
* Returns a nice neat formatted string.
- *
+ *
* @param str
* unformatted string
* @return formatted string
diff --git a/io/src/main/java/org/red5/io/utils/Stax2DomBuilder.java b/io/src/main/java/org/red5/io/utils/Stax2DomBuilder.java
index 22c7a5cf5..1c671b965 100644
--- a/io/src/main/java/org/red5/io/utils/Stax2DomBuilder.java
+++ b/io/src/main/java/org/red5/io/utils/Stax2DomBuilder.java
@@ -22,7 +22,7 @@
/**
* Builds a DOM {@link org.w3c.dom.Document} using a {@link javax.xml.stream.XMLStreamReader}.
- *
+ *
* @version $Revision: 1.00 $, $Date: 2004/12/11 00:00:00 $
* @author Tatu Saloranta
*/
@@ -53,7 +53,7 @@ public Stax2DomBuilder() {
* Method used to change whether the build methods will add ignorable (element) white space in the DOM tree or not.
*
* Whether all-whitespace text segment is ignorable white space or not is based on DTD read in, as per XML specifications (white space is only significant in mixed content or pure text elements).
- *
+ *
* @param ignoreWS
* true to ignore whitespace; false otherwise.
*/
@@ -63,7 +63,7 @@ public void setIgnoreWhitespace(boolean ignoreWS) {
/**
* This method will create a {@link org.w3c.dom.Document} instance using the default JAXP mechanism and populate using the given StAX stream reader.
- *
+ *
* @param r
* Stream reader from which input is read.
* @return Document - DOM document object.
@@ -84,7 +84,7 @@ public Document build(XMLStreamReader r, DocumentBuilder docbuilder) throws XMLS
/**
* This method will populate given {@link org.w3c.dom.Document} using the given StAX stream reader instance.
- *
+ *
* @param r
* Stream reader from which input is read.
* @param doc
@@ -98,7 +98,7 @@ public void build(XMLStreamReader r, Document doc) throws XMLStreamException {
/**
* This method takes a XMLStreamReader and builds up a JDOM tree. Recursion has been eliminated by using nodes' parent/child relationship; this improves performance somewhat (classic recursion-by-iteration-and-explicit stack transformation)
- *
+ *
* @param r
* Stream reader to use for reading the document from which to build the tree
* @param doc
diff --git a/io/src/main/java/org/red5/io/utils/XMLUtils.java b/io/src/main/java/org/red5/io/utils/XMLUtils.java
index fd3b32077..75fecbd04 100644
--- a/io/src/main/java/org/red5/io/utils/XMLUtils.java
+++ b/io/src/main/java/org/red5/io/utils/XMLUtils.java
@@ -42,7 +42,7 @@ public class XMLUtils {
/**
* Converts string representation of XML into Document
- *
+ *
* @param str
* String representation of XML
* @return DOM object
@@ -67,7 +67,7 @@ public static Document stringToDoc(String str) throws IOException {
/**
* Converts doc to String
- *
+ *
* @param dom
* DOM object to convert
* @return XML as String
@@ -78,7 +78,7 @@ public static String docToString(Document dom) {
/**
* Convert a DOM tree into a String using Dom2Writer
- *
+ *
* @return XML as String
* @param dom
* DOM object to convert
@@ -91,7 +91,7 @@ public static String docToString1(Document dom) {
/**
* Convert a DOM tree into a String using transform
- *
+ *
* @param domDoc
* DOM object
* @throws java.io.IOException
diff --git a/io/src/main/java/org/red5/io/webm/TagConsumer.java b/io/src/main/java/org/red5/io/webm/TagConsumer.java
index 9a7eb5627..d6b904645 100644
--- a/io/src/main/java/org/red5/io/webm/TagConsumer.java
+++ b/io/src/main/java/org/red5/io/webm/TagConsumer.java
@@ -18,7 +18,7 @@
public interface TagConsumer {
/**
* Method will be called as soon as webm Tag is available
- *
+ *
* @param tag
* - tag to be processed
* @throws IOException
diff --git a/io/src/main/java/org/red5/io/webm/WebmReader.java b/io/src/main/java/org/red5/io/webm/WebmReader.java
index 2aeaf0de7..e39448212 100644
--- a/io/src/main/java/org/red5/io/webm/WebmReader.java
+++ b/io/src/main/java/org/red5/io/webm/WebmReader.java
@@ -39,7 +39,7 @@ public class WebmReader implements Closeable {
/**
* Constructor
- *
+ *
* @param file
* - file to be read
* @param processor
@@ -115,7 +115,7 @@ public TagHandler createSkipHandler() {
/**
* will process given file and send all tags found to the consumer
- *
+ *
* @throws IOException
* - in case of any exception during reading and/or consumeng
* @throws ConverterException
diff --git a/io/src/main/java/org/red5/io/webm/WebmWriter.java b/io/src/main/java/org/red5/io/webm/WebmWriter.java
index 1f676405f..0e9420382 100644
--- a/io/src/main/java/org/red5/io/webm/WebmWriter.java
+++ b/io/src/main/java/org/red5/io/webm/WebmWriter.java
@@ -44,7 +44,7 @@ public class WebmWriter implements Closeable, TagConsumer {
/**
* Constructor
- *
+ *
* @param file
* - file the data need to written to
* @param append
@@ -82,7 +82,7 @@ public WebmWriter(File file, boolean append) {
/**
* method to write webm header to the new file
- *
+ *
* @throws IOException
* - in case of IO errors
* @throws ConverterException
@@ -106,7 +106,7 @@ public void writeHeader() throws IOException, ConverterException {
/**
* will write tag bytesWritten counter will be increased by the number of bytes actually written
- *
+ *
* @param tag
* - tag to be written
* @throws IOException
diff --git a/io/src/main/java/org/red5/media/processor/GenericWriterPostProcessor.java b/io/src/main/java/org/red5/media/processor/GenericWriterPostProcessor.java
index 803c6610e..98c93f467 100644
--- a/io/src/main/java/org/red5/media/processor/GenericWriterPostProcessor.java
+++ b/io/src/main/java/org/red5/media/processor/GenericWriterPostProcessor.java
@@ -18,7 +18,7 @@
/**
* Example post-processor implementation which counts data types in a given file.
- *
+ *
* @author Paul Gregoire (mondain@gmail.com)
*/
public class GenericWriterPostProcessor implements IPostProcessor {
diff --git a/io/src/main/java/org/red5/media/processor/IPostProcessor.java b/io/src/main/java/org/red5/media/processor/IPostProcessor.java
index e5dd40683..7c7170ae0 100644
--- a/io/src/main/java/org/red5/media/processor/IPostProcessor.java
+++ b/io/src/main/java/org/red5/media/processor/IPostProcessor.java
@@ -9,14 +9,14 @@
/**
* Post processes media.
- *
+ *
* @author Paul Gregoire (mondain@gmail.com)
*/
public interface IPostProcessor extends Runnable {
/**
* Initialize processor with given objects.
- *
+ *
* @param objs Objects for processing
*/
void init(Object... objs);
diff --git a/io/src/main/java/org/red5/media/processor/IPreProcessor.java b/io/src/main/java/org/red5/media/processor/IPreProcessor.java
index d254ed6dd..7ef99f789 100644
--- a/io/src/main/java/org/red5/media/processor/IPreProcessor.java
+++ b/io/src/main/java/org/red5/media/processor/IPreProcessor.java
@@ -9,14 +9,14 @@
/**
* Pre-processes media.
- *
+ *
* @author Paul Gregoire (mondain@gmail.com)
*/
public interface IPreProcessor extends Runnable {
/**
* Initialize processor with given objects.
- *
+ *
* @param objs Objects for processing
*/
void init(Object... objs);
diff --git a/io/src/test/java/org/red5/codec/AVCVideoTest.java b/io/src/test/java/org/red5/codec/AVCVideoTest.java
index c33e6ebf9..9cd4e6d84 100644
--- a/io/src/test/java/org/red5/codec/AVCVideoTest.java
+++ b/io/src/test/java/org/red5/codec/AVCVideoTest.java
@@ -37,7 +37,7 @@ public void testCanHandleData() {
IoBuffer data = IoBuffer.allocate(8);
data.put((byte) 0x17);
data.flip();
- //
+ //
IoBuffer badData = IoBuffer.allocate(8);
badData.put((byte) 0x44);
badData.flip();
diff --git a/io/src/test/java/org/red5/io/AMFIOTest.java b/io/src/test/java/org/red5/io/AMFIOTest.java
index ff91a35e7..f8ca49a44 100644
--- a/io/src/test/java/org/red5/io/AMFIOTest.java
+++ b/io/src/test/java/org/red5/io/AMFIOTest.java
@@ -26,7 +26,7 @@
/**
* AMF I/O test
- *
+ *
* @author The Red5 Project
* @author Luke Hubbard, Codegent Ltd (luke@codegent.com)
* @author Paul Gregoire (mondain@gmail.com)
@@ -78,7 +78,7 @@ public void testAMF0Wiki() {
/**
* Sample data from https://en.wikipedia.org/wiki/Action_Message_Format
- * @throws Exception
+ * @throws Exception
*/
@Test
public void testAMF0Wiki2() throws Exception {
diff --git a/io/src/test/java/org/red5/io/TestJavaBean.java b/io/src/test/java/org/red5/io/TestJavaBean.java
index e16473295..2d493fc05 100644
--- a/io/src/test/java/org/red5/io/TestJavaBean.java
+++ b/io/src/test/java/org/red5/io/TestJavaBean.java
@@ -31,7 +31,7 @@ public class TestJavaBean {
/**
* Getter for property 'testByte'.
- *
+ *
* @return Value for property 'testByte'.
*/
public byte getTestByte() {
@@ -40,7 +40,7 @@ public byte getTestByte() {
/**
* Setter for property 'testByte'.
- *
+ *
* @param testByte
* Value to set for property 'testByte'.
*/
@@ -50,7 +50,7 @@ public void setTestByte(byte testByte) {
/**
* Getter for property 'testBoolean'.
- *
+ *
* @return Value for property 'testBoolean'.
*/
public boolean isTestBoolean() {
@@ -59,7 +59,7 @@ public boolean isTestBoolean() {
/**
* Setter for property 'testBoolean'.
- *
+ *
* @param testBoolean
* Value to set for property 'testBoolean'.
*/
@@ -69,7 +69,7 @@ public void setTestBoolean(boolean testBoolean) {
/**
* Getter for property 'testBooleanObject'.
- *
+ *
* @return Value for property 'testBooleanObject'.
*/
public Boolean getTestBooleanObject() {
@@ -78,7 +78,7 @@ public Boolean getTestBooleanObject() {
/**
* Setter for property 'testBooleanObject'.
- *
+ *
* @param testBooleanObject
* Value to set for property 'testBooleanObject'.
*/
@@ -88,7 +88,7 @@ public void setTestBooleanObject(Boolean testBooleanObject) {
/**
* Getter for property 'testDate'.
- *
+ *
* @return Value for property 'testDate'.
*/
public Date getTestDate() {
@@ -97,7 +97,7 @@ public Date getTestDate() {
/**
* Setter for property 'testDate'.
- *
+ *
* @param testDate
* Value to set for property 'testDate'.
*/
@@ -107,7 +107,7 @@ public void setTestDate(Date testDate) {
/**
* Getter for property 'testNumberObject'.
- *
+ *
* @return Value for property 'testNumberObject'.
*/
public Integer getTestNumberObject() {
@@ -116,7 +116,7 @@ public Integer getTestNumberObject() {
/**
* Setter for property 'testNumberObject'.
- *
+ *
* @param testNumberObject
* Value to set for property 'testNumberObject'.
*/
@@ -126,7 +126,7 @@ public void setTestNumberObject(Integer testNumberObject) {
/**
* Getter for property 'testPrimitiveNumber'.
- *
+ *
* @return Value for property 'testPrimitiveNumber'.
*/
public int getTestPrimitiveNumber() {
@@ -135,7 +135,7 @@ public int getTestPrimitiveNumber() {
/**
* Setter for property 'testPrimitiveNumber'.
- *
+ *
* @param testPrimitiveNumber
* Value to set for property 'testPrimitiveNumber'.
*/
@@ -145,7 +145,7 @@ public void setTestPrimitiveNumber(int testPrimitiveNumber) {
/**
* Getter for property 'testString'.
- *
+ *
* @return Value for property 'testString'.
*/
public String getTestString() {
@@ -154,7 +154,7 @@ public String getTestString() {
/**
* Setter for property 'testString'.
- *
+ *
* @param testString
* Value to set for property 'testString'.
*/
diff --git a/io/src/test/java/org/red5/io/matroska/EncoderTest.java b/io/src/test/java/org/red5/io/matroska/EncoderTest.java
index c3256ce2a..b60c37c63 100644
--- a/io/src/test/java/org/red5/io/matroska/EncoderTest.java
+++ b/io/src/test/java/org/red5/io/matroska/EncoderTest.java
@@ -30,7 +30,7 @@
public class EncoderTest {
/**
* tests if created and parsed {@link Tag}s have same IDs
- *
+ *
* @throws IOException
* - in case of any IO errors
* @throws ConverterException
@@ -56,7 +56,7 @@ public void testCreateTags() throws IOException, ConverterException {
/**
* tests if manually created and encoded "master" {@link Tag} can be parsed successfully
- *
+ *
* @throws IOException
* - in case of any IO errors
* @throws ConverterException
@@ -80,7 +80,7 @@ public void testEncodeTagEBML() throws IOException, ConverterException {
/**
* tests if manually created and encoded "uint" {@link Tag} can be parsed successfully
- *
+ *
* @throws IOException
* - in case of any IO errors
* @throws ConverterException
@@ -102,7 +102,7 @@ public void testEncodeTagUint() throws IOException, ConverterException {
/**
* tests if manually created and encoded "string" {@link Tag} can be parsed successfully
- *
+ *
* @throws IOException
* - in case of any IO errors
* @throws ConverterException
@@ -124,7 +124,7 @@ public void testEncodeTagString() throws IOException, ConverterException {
/**
* tests if manually created and encoded "double" {@link Tag} can be parsed successfully
- *
+ *
* @throws IOException
* - in case of any IO errors
* @throws ConverterException
@@ -146,7 +146,7 @@ public void testEncodeTagDouble() throws IOException, ConverterException {
/**
* tests if manually created and encoded "date" {@link Tag} can be parsed successfully
- *
+ *
* @throws IOException
* - in case of any IO errors
* @throws ConverterException
diff --git a/io/src/test/java/org/red5/io/matroska/ParserTest.java b/io/src/test/java/org/red5/io/matroska/ParserTest.java
index 76e23825e..f540a5831 100644
--- a/io/src/test/java/org/red5/io/matroska/ParserTest.java
+++ b/io/src/test/java/org/red5/io/matroska/ParserTest.java
@@ -51,7 +51,7 @@ public class ParserTest {
/**
* tests if EBML tag parsed as expected
- *
+ *
* @throws IOException
* - in case of any IO errors
* @throws ConverterException
@@ -71,7 +71,7 @@ public void testParseTagEBML() throws IOException, ConverterException {
/**
* tests if EBMLVersion tag parsed as expected
- *
+ *
* @throws IOException
* - in case of any IO errors
* @throws ConverterException
@@ -93,7 +93,7 @@ public void testParseTagEBMLVersion() throws IOException, ConverterException {
/**
* tests if EBMLReadVersion tag parsed as expected
- *
+ *
* @throws IOException
* - in case of any IO errors
* @throws ConverterException
@@ -115,7 +115,7 @@ public void testParseTagEBMLReadVersion() throws IOException, ConverterException
/**
* tests if DocType tag parsed as expected
- *
+ *
* @throws IOException
* - in case of any IO errors
* @throws ConverterException
diff --git a/io/src/test/java/org/red5/io/matroska/VintTest.java b/io/src/test/java/org/red5/io/matroska/VintTest.java
index ffb88051d..68d12031a 100644
--- a/io/src/test/java/org/red5/io/matroska/VintTest.java
+++ b/io/src/test/java/org/red5/io/matroska/VintTest.java
@@ -57,7 +57,7 @@ public void createVINT() {
/**
* tests if {@link VINT} can be parsed successfully
- *
+ *
* @throws IOException
* - in case of any IO errors
*/
diff --git a/io/src/test/java/org/red5/io/mp4/impl/MP4ReaderTest.java b/io/src/test/java/org/red5/io/mp4/impl/MP4ReaderTest.java
index b95e00ccc..3c68b2f66 100644
--- a/io/src/test/java/org/red5/io/mp4/impl/MP4ReaderTest.java
+++ b/io/src/test/java/org/red5/io/mp4/impl/MP4ReaderTest.java
@@ -56,7 +56,7 @@ public void testCtor() throws Exception {
@Test
public void testBytes() throws Exception {
- //00 40 94 00 00 00 00 00 00 00 06 ==
+ //00 40 94 00 00 00 00 00 00 00 06 ==
byte width[] = { (byte) 0x00, (byte) 0x40, (byte) 0x94, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00 };
System.out.println("width: {}" + bytesToLong(width));
@@ -92,10 +92,10 @@ public void testBytes() throws Exception {
// (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00 };
// System.out.println("moovposition: {}" + bytesToLong(moovposition));
//
- //
+ //
//byte[] arr = {(byte) 0x0f};
//System.out.println("bbb: {}" + bytesToByte(arr));
- //byte[] arr = {(byte) 0xE5, (byte) 0x88, (byte) 0x80, (byte) 0x00,
+ //byte[] arr = {(byte) 0xE5, (byte) 0x88, (byte) 0x80, (byte) 0x00,
//(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00 };
//System.out.println("bbb: {}" + bytesToLong(arr));
byte[] arr = { (byte) 0, (byte) 0, (byte) 0x10, (byte) 0 };
diff --git a/io/src/test/java/org/red5/io/utils/IOUtilsTest.java b/io/src/test/java/org/red5/io/utils/IOUtilsTest.java
index 3dfc5f9c4..18a553177 100644
--- a/io/src/test/java/org/red5/io/utils/IOUtilsTest.java
+++ b/io/src/test/java/org/red5/io/utils/IOUtilsTest.java
@@ -68,7 +68,7 @@ public void testReadReverseInt() {
value += bytes[0];
System.out.printf("Results #1 - result: %d\n", value);
assertTrue(ok == value);
- // optimized
+ // optimized
in.flip();
value = in.getInt();
value = ((value & 0xFF) << 24 | ((value >> 8) & 0x00FF) << 16 | ((value >>> 16) & 0x000000FF) << 8 | ((value >>> 24) & 0x000000FF));
diff --git a/io/src/test/java/org/red5/io/webm/WebmTest.java b/io/src/test/java/org/red5/io/webm/WebmTest.java
index 2b8b397c9..0d1aec34f 100644
--- a/io/src/test/java/org/red5/io/webm/WebmTest.java
+++ b/io/src/test/java/org/red5/io/webm/WebmTest.java
@@ -40,7 +40,7 @@ public void before() {
/**
* This test checks if test webm file can be read till the end with no exceptions
- *
+ *
* @throws IOException
* - in case of any IO exception
* @throws ConverterException
@@ -71,7 +71,7 @@ public TagHandler getHandler(Tag tag) {
/**
* This test checks if test webm file can be read and then be written with no exceptions
- *
+ *
* @throws IOException
* - in case of any IO exception
* @throws ConverterException
diff --git a/io/src/test/java/org/red5/test/Foo.java b/io/src/test/java/org/red5/test/Foo.java
index ff83230c6..828754d5a 100644
--- a/io/src/test/java/org/red5/test/Foo.java
+++ b/io/src/test/java/org/red5/test/Foo.java
@@ -6,7 +6,7 @@
/**
* Used for testing AMF3 Vectors
- *
+ *
* @author Paul
*/
public class Foo implements IExternalizable {
diff --git a/io/src/test/java/org/red5/test/Foo3.java b/io/src/test/java/org/red5/test/Foo3.java
index 93466ed4d..3ffb0a58a 100644
--- a/io/src/test/java/org/red5/test/Foo3.java
+++ b/io/src/test/java/org/red5/test/Foo3.java
@@ -6,7 +6,7 @@
/**
* Used for testing AMF3 Vectors
- *
+ *
* @author Paul
*/
public class Foo3 implements IExternalizable {
diff --git a/pom.xml b/pom.xml
index af5bf9858..3e751c4b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
Red5
The Red5 server
org.red5
- 1.2.24
+ 1.2.31
https://github.com/Red5/red5-server
2005
@@ -354,7 +354,7 @@
net.revelc.code.formatter
formatter-maven-plugin
- 2.8.1
+ 2.19.0
@@ -363,7 +363,7 @@
- ../red5-eclipse-format.xml
+ ${project.parent.basedir}/red5-eclipse-format.xml
LF
diff --git a/server/pom.xml b/server/pom.xml
index e2e564fcd..8536d0807 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -3,7 +3,7 @@
org.red5
red5-parent
- 1.2.24
+ 1.2.31
4.0.0
red5-server
diff --git a/server/src/main/java/Version.java b/server/src/main/java/Version.java
index e66d0beb0..7e004bbfb 100644
--- a/server/src/main/java/Version.java
+++ b/server/src/main/java/Version.java
@@ -2,7 +2,7 @@
/**
* Provides information about the version of Red5 being used.
- *
+ *
* @author Paul Gregoire
*/
public class Version {
diff --git a/server/src/main/java/org/red5/logging/ContextLoggingListener.java b/server/src/main/java/org/red5/logging/ContextLoggingListener.java
index 834eb72e1..71cde7a8b 100644
--- a/server/src/main/java/org/red5/logging/ContextLoggingListener.java
+++ b/server/src/main/java/org/red5/logging/ContextLoggingListener.java
@@ -24,7 +24,7 @@
/**
* A servlet context listener that puts this contexts LoggerContext into a static map of logger contexts within an overall singleton log context selector.
- *
+ *
* To use it, add the following line to a web.xml file
*
*
diff --git a/server/src/main/java/org/red5/logging/LoggerContextFilter.java b/server/src/main/java/org/red5/logging/LoggerContextFilter.java
index 735084762..56c0c3795 100644
--- a/server/src/main/java/org/red5/logging/LoggerContextFilter.java
+++ b/server/src/main/java/org/red5/logging/LoggerContextFilter.java
@@ -25,7 +25,7 @@
/**
* A servlet filter that puts this contexts LoggerContext into a Threadlocal variable.
- *
+ *
* It removes it after the request is processed.
*
* To use it, add the following lines to a web.xml file
diff --git a/server/src/main/java/org/red5/logging/W3CAppender.java b/server/src/main/java/org/red5/logging/W3CAppender.java
index 1d917e74b..6ef8109d7 100644
--- a/server/src/main/java/org/red5/logging/W3CAppender.java
+++ b/server/src/main/java/org/red5/logging/W3CAppender.java
@@ -25,7 +25,7 @@
/**
* Logback appender for the Extended W3C format.
- *
+ *
* @see "http://www.w3.org/TR/WD-logfile.html"
* @author Paul Gregoire (mondain@gmail.com)
*/
@@ -122,23 +122,23 @@ public synchronized void doAppend(LoggingEvent event) {
}
//Events Categories
//connect-pending session
- //connect session
- //disconnect session
- //publish stream
- //unpublish stream
- //play stream
- //pause stream
- //unpause stream
- //seek stream
- //stop stream
- //record stream
- //recordstop stream
- //server-start server
- //server-stop server
- //vhost-start vhost
- //vhost-stop vhost
- //app-start application
- //app-stop application
+ //connect session
+ //disconnect session
+ //publish stream
+ //unpublish stream
+ //play stream
+ //pause stream
+ //unpause stream
+ //seek stream
+ //stop stream
+ //record stream
+ //recordstop stream
+ //server-start server
+ //server-stop server
+ //vhost-start vhost
+ //vhost-stop vhost
+ //app-start application
+ //app-stop application
//filter based on event type - asterik allows all events
if (!events.equals("*")) {
if (!eventsList.contains(elements.get("x-event"))) {
@@ -148,46 +148,46 @@ public synchronized void doAppend(LoggingEvent event) {
return;
}
}
- //x-category event category
+ //x-category event category
//x-event type of event
//date date at which the event occurred
//time time at which the event occurred
- //tz time zone information
- //x-ctx event dependant context information
- //s-ip ip address[es] of the server
- //x-pid server process id
- //x-cpu-load cpu load
- //x-mem-load memory load (as reported in getServerStats)
- //x-adaptor adaptor name
- //x-vhost vhost name
- //x-app application name
- //x-appinst application instance name
- //x-duration duration of an event/session
- //x-status status code
- //c-ip client ip address
- //c-proto connection protocol - rtmp or rtmpt
- //s-uri uri of the fms application
- //cs-uri-stem stem of s-uri
- //cs-uri-query query portion of s-uri
- //c-referrer uri of the referrer
- //c-user-agent user agent
- //c-client-id client id
- //cs-bytes bytes transferred from client to server
- //sc-bytes bytes transferred from server to client
- //c-connect-type type of connection received by the server
- //x-sname stream name
- //x-sname-query query portion of stream uri
- //x-suri-query same as x-sname-query
- //x-suri-stem cs-uri-stem + x-sname + x-file-ext
- //x-suri x-suri-stem + x-suri-query
- //x-file-name full file path of recorded stream
- //x-file-ext stream type (flv or mp3)
- //x-file-size stream size in bytes
- //x-file-length stream length in seconds
- //x-spos stream position
- //cs-stream-bytes stream bytes transferred from client to server
- //sc-stream-bytes stream bytes transferred from server to client
- //x-service-name name of the service providing the connection
+ //tz time zone information
+ //x-ctx event dependant context information
+ //s-ip ip address[es] of the server
+ //x-pid server process id
+ //x-cpu-load cpu load
+ //x-mem-load memory load (as reported in getServerStats)
+ //x-adaptor adaptor name
+ //x-vhost vhost name
+ //x-app application name
+ //x-appinst application instance name
+ //x-duration duration of an event/session
+ //x-status status code
+ //c-ip client ip address
+ //c-proto connection protocol - rtmp or rtmpt
+ //s-uri uri of the fms application
+ //cs-uri-stem stem of s-uri
+ //cs-uri-query query portion of s-uri
+ //c-referrer uri of the referrer
+ //c-user-agent user agent
+ //c-client-id client id
+ //cs-bytes bytes transferred from client to server
+ //sc-bytes bytes transferred from server to client
+ //c-connect-type type of connection received by the server
+ //x-sname stream name
+ //x-sname-query query portion of stream uri
+ //x-suri-query same as x-sname-query
+ //x-suri-stem cs-uri-stem + x-sname + x-file-ext
+ //x-suri x-suri-stem + x-suri-query
+ //x-file-name full file path of recorded stream
+ //x-file-ext stream type (flv or mp3)
+ //x-file-size stream size in bytes
+ //x-file-length stream length in seconds
+ //x-spos stream position
+ //cs-stream-bytes stream bytes transferred from client to server
+ //sc-stream-bytes stream bytes transferred from server to client
+ //x-service-name name of the service providing the connection
//x-sc-qos-bytes bytes transferred from server to client for quality of service
//x-comment comments
//we may need date and/or time
diff --git a/server/src/main/java/org/red5/net/websocket/WSConstants.java b/server/src/main/java/org/red5/net/websocket/WSConstants.java
index 699e14139..de323617c 100644
--- a/server/src/main/java/org/red5/net/websocket/WSConstants.java
+++ b/server/src/main/java/org/red5/net/websocket/WSConstants.java
@@ -9,7 +9,7 @@
/**
* Convenience class for holding constants.
- *
+ *
* @author Paul Gregoire
*/
public class WSConstants {
diff --git a/server/src/main/java/org/red5/net/websocket/WebSocketPlugin.java b/server/src/main/java/org/red5/net/websocket/WebSocketPlugin.java
index 0489e885a..a466c9ce1 100644
--- a/server/src/main/java/org/red5/net/websocket/WebSocketPlugin.java
+++ b/server/src/main/java/org/red5/net/websocket/WebSocketPlugin.java
@@ -45,7 +45,7 @@
/**
* WebSocketPlugin - centralized WebSocket configuration and locator. getConns() {
@@ -113,7 +113,7 @@ public Set getConns() {
/**
* Returns the associated scope.
- *
+ *
* @return scope
*/
public IScope getScope() {
@@ -122,7 +122,7 @@ public IScope getScope() {
/**
* Sets the associated scope.
- *
+ *
* @param scope
*/
public void setScope(IScope scope) {
@@ -133,7 +133,7 @@ public void setScope(IScope scope) {
/**
* Sets the path.
- *
+ *
* @param path
*/
public void setPath(String path) {
@@ -142,7 +142,7 @@ public void setPath(String path) {
/**
* Returns the path of the scope.
- *
+ *
* @return path
*/
public String getPath() {
@@ -151,7 +151,7 @@ public String getPath() {
/**
* Add new connection on scope.
- *
+ *
* @param conn WebSocketConnection
*/
public void addConnection(WebSocketConnection conn) {
@@ -166,7 +166,7 @@ public void addConnection(WebSocketConnection conn) {
/**
* Remove connection from scope.
- *
+ *
* @param conn WebSocketConnection
*/
public void removeConnection(WebSocketConnection conn) {
@@ -181,7 +181,7 @@ public void removeConnection(WebSocketConnection conn) {
/**
* Add new listener on scope.
- *
+ *
* @param listener IWebSocketDataListener
*/
public void addListener(IWebSocketDataListener listener) {
@@ -191,7 +191,7 @@ public void addListener(IWebSocketDataListener listener) {
/**
* Remove listener from scope.
- *
+ *
* @param listener IWebSocketDataListener
*/
public void removeListener(IWebSocketDataListener listener) {
@@ -201,7 +201,7 @@ public void removeListener(IWebSocketDataListener listener) {
/**
* Add new listeners on scope.
- *
+ *
* @param listeners
* list of IWebSocketDataListener
*/
@@ -212,7 +212,7 @@ public void setListeners(Collection listeners) {
/**
* Returns the listeners in an unmodifiable set.
- *
+ *
* @return listeners
*/
public Set getListeners() {
@@ -221,7 +221,7 @@ public Set getListeners() {
/**
* Checks for a listener by class type.
- *
+ *
* @param clazz
* @return true if one exists and false otherwise
*/
@@ -231,7 +231,7 @@ public boolean hasListener(Class clazz) {
/**
* Check the scope state.
- *
+ *
* @return true:still have relation
*/
public boolean isValid() {
@@ -240,7 +240,7 @@ public boolean isValid() {
/**
* Message received from client and passed on to the listeners.
- *
+ *
* @param message
*/
public void onMessage(WSMessage message) {
diff --git a/server/src/main/java/org/red5/net/websocket/WebSocketScopeManager.java b/server/src/main/java/org/red5/net/websocket/WebSocketScopeManager.java
index 10ff28af4..99c649a25 100644
--- a/server/src/main/java/org/red5/net/websocket/WebSocketScopeManager.java
+++ b/server/src/main/java/org/red5/net/websocket/WebSocketScopeManager.java
@@ -56,7 +56,7 @@ public void removeListener(IWebSocketScopeListener listener) {
/**
* Returns the enable state of a given path.
- *
+ *
* @param path
* scope / context path
* @return enabled if registered as active and false otherwise
@@ -80,7 +80,7 @@ public boolean isEnabled(String path) {
/**
* Adds a scope to the enabled applications.
- *
+ *
* @param scope
* the application scope
*/
@@ -116,7 +116,7 @@ public void addScope(IScope scope) {
/**
* Removes the application scope.
- *
+ *
* @param scope
* the application scope
*/
@@ -126,7 +126,7 @@ public void removeApplication(IScope scope) {
/**
* Adds a websocket scope.
- *
+ *
* @param webSocketScope
* @return true if added and false otherwise
*/
@@ -142,7 +142,7 @@ public boolean addWebSocketScope(WebSocketScope webSocketScope) {
/**
* Removes a websocket scope.
- *
+ *
* @param webSocketScope
* @return true if removed and false otherwise
*/
@@ -158,7 +158,7 @@ public boolean removeWebSocketScope(WebSocketScope webSocketScope) {
/**
* Add the connection on scope.
- *
+ *
* @param conn
* WebSocketConnection
*/
@@ -169,7 +169,7 @@ public void addConnection(WebSocketConnection conn) {
/**
* Remove connection from scope.
- *
+ *
* @param conn
* WebSocketConnection
*/
@@ -188,7 +188,7 @@ public void removeConnection(WebSocketConnection conn) {
/**
* Add the listener on scope via its path.
- *
+ *
* @param listener
* IWebSocketDataListener
* @param path
@@ -205,7 +205,7 @@ public void addListener(IWebSocketDataListener listener, String path) {
/**
* Remove listener from scope via its path.
- *
+ *
* @param listener
* IWebSocketDataListener
* @param path
@@ -226,7 +226,7 @@ public void removeListener(IWebSocketDataListener listener, String path) {
/**
* Create a web socket scope. Use the IWebSocketScopeListener interface to configure the created scope.
- *
+ *
* @param path
*/
public void makeScope(String path) {
@@ -246,7 +246,7 @@ public void makeScope(String path) {
/**
* Create a web socket scope from a server IScope. Use the IWebSocketScopeListener interface to configure the created scope.
- *
+ *
* @param scope
*/
public void makeScope(IScope scope) {
@@ -270,7 +270,7 @@ public void makeScope(IScope scope) {
/**
* Get the corresponding scope.
- *
+ *
* @param path
* scope path
* @return scope
@@ -288,7 +288,7 @@ public WebSocketScope getScope(String path) {
/**
* Notifies listeners of scope lifecycle events.
- *
+ *
* @param event
* @param wsScope
*/
@@ -313,7 +313,7 @@ private void notifyListeners(WebSocketEvent event, WebSocketScope wsScope) {
/**
* Get the corresponding scope, if none exists, make new one.
- *
+ *
* @param conn
* @return wsScope
*/
@@ -352,7 +352,7 @@ public void stop() {
/**
* Set the application scope for this manager.
- *
+ *
* @param appScope
* @return true if added and false otherwise
*/
diff --git a/server/src/main/java/org/red5/net/websocket/listener/DefaultWebSocketDataListener.java b/server/src/main/java/org/red5/net/websocket/listener/DefaultWebSocketDataListener.java
index 39ce5ef77..2004f6df8 100644
--- a/server/src/main/java/org/red5/net/websocket/listener/DefaultWebSocketDataListener.java
+++ b/server/src/main/java/org/red5/net/websocket/listener/DefaultWebSocketDataListener.java
@@ -22,7 +22,7 @@
/**
* Default WebSocket data listener. In this default implementation, all messages are echoed back to every connection in the current scope.
- *
+ *
* @author Paul Gregoire (mondain@gmail.com)
*/
public class DefaultWebSocketDataListener extends WebSocketDataListener {
@@ -44,7 +44,7 @@ public void onWSMessage(WSMessage message) {
// assume we have text
String msg = new String(message.getPayload().array());
log.info("onWSMessage: {}", msg);
- // get the path
+ // get the path
String path = message.getPath();
// just echo back the message
WebSocketScopeManager manager = ((WebSocketPlugin) PluginRegistry.getPlugin(WebSocketPlugin.NAME)).getManager(path);
diff --git a/server/src/main/java/org/red5/net/websocket/listener/IWebSocketDataListener.java b/server/src/main/java/org/red5/net/websocket/listener/IWebSocketDataListener.java
index e4ef5117b..87c2d73ae 100644
--- a/server/src/main/java/org/red5/net/websocket/listener/IWebSocketDataListener.java
+++ b/server/src/main/java/org/red5/net/websocket/listener/IWebSocketDataListener.java
@@ -17,28 +17,28 @@ public interface IWebSocketDataListener {
/**
* Returns the protocol for which this listener is interested.
- *
+ *
* @return protocol
*/
public String getProtocol();
/**
* Sets the protocol for which this listener is interested.
- *
+ *
* @param protocol
*/
public void setProtocol(String protocol);
/**
* Dispatch message.
- *
+ *
* @param message
*/
public void onWSMessage(WSMessage message);
/**
* Connect a WebSocket client.
- *
+ *
* @param conn
* WebSocketConnection
*/
@@ -46,7 +46,7 @@ public interface IWebSocketDataListener {
/**
* Disconnect WebSocket client.
- *
+ *
* @param conn
* WebSocketConnection
*/
diff --git a/server/src/main/java/org/red5/net/websocket/listener/WebSocketDataListener.java b/server/src/main/java/org/red5/net/websocket/listener/WebSocketDataListener.java
index 20a36e848..eb758a930 100644
--- a/server/src/main/java/org/red5/net/websocket/listener/WebSocketDataListener.java
+++ b/server/src/main/java/org/red5/net/websocket/listener/WebSocketDataListener.java
@@ -9,7 +9,7 @@
/**
* Adapter class for WebSocket data listener interface.
- *
+ *
* @author Paul Gregoire
*/
public abstract class WebSocketDataListener implements IWebSocketDataListener {
diff --git a/server/src/main/java/org/red5/net/websocket/model/WSMessage.java b/server/src/main/java/org/red5/net/websocket/model/WSMessage.java
index 631f1712f..ec84ff738 100644
--- a/server/src/main/java/org/red5/net/websocket/model/WSMessage.java
+++ b/server/src/main/java/org/red5/net/websocket/model/WSMessage.java
@@ -15,7 +15,7 @@
/**
* Represents WebSocket message data.
- *
+ *
* @author Paul Gregoire (mondain@gmail.com)
*/
public class WSMessage {
@@ -49,7 +49,7 @@ public WSMessage(String message) throws UnsupportedEncodingException {
/**
* Returns the payload data as a UTF8 string.
- *
+ *
* @return string
* @throws UnsupportedEncodingException
*/
@@ -77,7 +77,7 @@ public void setConnection(WebSocketConnection connection) {
/**
* Returns the payload.
- *
+ *
* @return payload
*/
public IoBuffer getPayload() {
@@ -90,7 +90,7 @@ public void setPayload(IoBuffer payload) {
/**
* Adds additional payload data.
- *
+ *
* @param additionalPayload
*/
public void addPayload(IoBuffer additionalPayload) {
@@ -103,7 +103,7 @@ public void addPayload(IoBuffer additionalPayload) {
/**
* Adds additional payload data.
- *
+ *
* @param additionalPayload
*/
public void addPayload(byte[] additionalPayload) {
diff --git a/server/src/main/java/org/red5/net/websocket/model/WebSocketEvent.java b/server/src/main/java/org/red5/net/websocket/model/WebSocketEvent.java
index 1e9d172d8..9d1856ccc 100644
--- a/server/src/main/java/org/red5/net/websocket/model/WebSocketEvent.java
+++ b/server/src/main/java/org/red5/net/websocket/model/WebSocketEvent.java
@@ -9,7 +9,7 @@
/**
* WebSocket event enumeration.
- *
+ *
* @author Paul Gregoire
*/
public enum WebSocketEvent {
diff --git a/server/src/main/java/org/red5/net/websocket/server/DefaultServerEndpointConfigurator.java b/server/src/main/java/org/red5/net/websocket/server/DefaultServerEndpointConfigurator.java
index 8bcf85835..40f518c2f 100644
--- a/server/src/main/java/org/red5/net/websocket/server/DefaultServerEndpointConfigurator.java
+++ b/server/src/main/java/org/red5/net/websocket/server/DefaultServerEndpointConfigurator.java
@@ -27,7 +27,7 @@
/**
* Red5 implementation of the WebSocket JSR365 ServerEndpointConfig.Configurator.
- *
+ *
* @author Paul Gregoire
*/
public class DefaultServerEndpointConfigurator extends ServerEndpointConfig.Configurator {
@@ -208,7 +208,7 @@ public String[] getAllowedOrigins() {
/**
* Sets the allowed origins for this instance.
- *
+ *
* @param allowedOrigins
*/
public void setAllowedOrigins(String[] allowedOrigins) {
@@ -218,7 +218,7 @@ public void setAllowedOrigins(String[] allowedOrigins) {
/**
* Adds a HandshakeModifier implementation to the instances modifiers.
- *
+ *
* @param modifier
* @return true if added and false otherwise
*/
@@ -228,7 +228,7 @@ public boolean addHandshakeModifier(HandshakeModifier modifier) {
/**
* Removes a HandshakeModifier implementation from the instances modifiers.
- *
+ *
* @param modifier
* @return true if removed and false otherwise
*/
diff --git a/server/src/main/java/org/red5/net/websocket/server/DefaultWebSocketEndpoint.java b/server/src/main/java/org/red5/net/websocket/server/DefaultWebSocketEndpoint.java
index 4cee9a5bb..158fce61b 100644
--- a/server/src/main/java/org/red5/net/websocket/server/DefaultWebSocketEndpoint.java
+++ b/server/src/main/java/org/red5/net/websocket/server/DefaultWebSocketEndpoint.java
@@ -31,7 +31,7 @@
/**
* Default WebSocket endpoint.
- *
+ *
* @author Paul Gregoire
*/
public class DefaultWebSocketEndpoint extends Endpoint {
diff --git a/server/src/main/java/org/red5/net/websocket/server/HandshakeModifier.java b/server/src/main/java/org/red5/net/websocket/server/HandshakeModifier.java
index 1b6b4cf17..031419b5b 100644
--- a/server/src/main/java/org/red5/net/websocket/server/HandshakeModifier.java
+++ b/server/src/main/java/org/red5/net/websocket/server/HandshakeModifier.java
@@ -5,14 +5,14 @@
/**
* Allows for modification of a WebSocket handshake.
- *
+ *
* @author Paul Gregoire
*/
public class HandshakeModifier {
/**
* Modifies the handshake request and / or response.
- *
+ *
* @param request
* @param response
*/
diff --git a/server/src/main/java/org/red5/net/websocket/server/UpgradeUtil.java b/server/src/main/java/org/red5/net/websocket/server/UpgradeUtil.java
index bb9df389d..43150cfb5 100644
--- a/server/src/main/java/org/red5/net/websocket/server/UpgradeUtil.java
+++ b/server/src/main/java/org/red5/net/websocket/server/UpgradeUtil.java
@@ -48,7 +48,7 @@ private UpgradeUtil() {
* Checks to see if this is an HTTP request that includes a valid upgrade request to web socket.
*
* Note: RFC 2616 does not limit HTTP upgrade to GET requests but the Java WebSocket spec 1.0, section 8.2 implies such a limitation and RFC 6455 section 4.1 requires that a WebSocket Upgrade uses GET.
- *
+ *
* @param request
* The request to check if it is an HTTP upgrade request for a WebSocket connection
* @param response
diff --git a/server/src/main/java/org/red5/net/websocket/server/WsHttpUpgradeHandler.java b/server/src/main/java/org/red5/net/websocket/server/WsHttpUpgradeHandler.java
index 6ae6676fd..3c822a983 100644
--- a/server/src/main/java/org/red5/net/websocket/server/WsHttpUpgradeHandler.java
+++ b/server/src/main/java/org/red5/net/websocket/server/WsHttpUpgradeHandler.java
@@ -243,7 +243,7 @@ public void setSslSupport(SSLSupport sslSupport) {
/**
* Check to see if the timeout has expired and process a timeout if that is that case. Note: The name of this method originated with the Servlet 3.0 asynchronous processing but evolved over time to represent a timeout that is triggered independently of the socket read/write timeouts.
- *
+ *
* @param now
* - The time (as returned by System.currentTimeMillis() to use as the current time to determine whether the timeout has expired. If negative, the timeout will always be treated as if it has expired.
*/
diff --git a/server/src/main/java/org/red5/net/websocket/server/WsPerSessionServerEndpointConfig.java b/server/src/main/java/org/red5/net/websocket/server/WsPerSessionServerEndpointConfig.java
index 561f27a5f..c05bf8071 100644
--- a/server/src/main/java/org/red5/net/websocket/server/WsPerSessionServerEndpointConfig.java
+++ b/server/src/main/java/org/red5/net/websocket/server/WsPerSessionServerEndpointConfig.java
@@ -10,7 +10,7 @@
import javax.websocket.server.ServerEndpointConfig;
/**
- * Wraps the provided {@link ServerEndpointConfig} and provides a per session view - the difference being that the map returned by
+ * Wraps the provided {@link ServerEndpointConfig} and provides a per session view - the difference being that the map returned by
* {@link #getUserProperties()} is unique to this instance rather than shared with the wrapped {@link ServerEndpointConfig}.
*/
public class WsPerSessionServerEndpointConfig implements ServerEndpointConfig {
diff --git a/server/src/main/java/org/red5/server/Context.java b/server/src/main/java/org/red5/server/Context.java
index 8c4fbe2ac..d00272d52 100644
--- a/server/src/main/java/org/red5/server/Context.java
+++ b/server/src/main/java/org/red5/server/Context.java
@@ -91,7 +91,7 @@ public Context() {
/**
* Initializes app context and context path from given parameters
- *
+ *
* @param context
* Application context
* @param contextPath
@@ -105,7 +105,7 @@ public Context(ApplicationContext context, String contextPath) {
/**
* Return global scope
- *
+ *
* @return Global scope
*/
public IGlobalScope getGlobalScope() {
@@ -116,7 +116,7 @@ public IGlobalScope getGlobalScope() {
/**
* Return scope resolver
- *
+ *
* @return scope resolver
*/
public IScopeResolver getScopeResolver() {
@@ -125,7 +125,7 @@ public IScopeResolver getScopeResolver() {
/**
* Resolves scope using scope resolver collaborator
- *
+ *
* @param path
* Path to resolve
* @return Scope resolution result
@@ -136,7 +136,7 @@ public IScope resolveScope(String path) {
/**
* Resolves scope from given root using scope resolver.
- *
+ *
* @param root
* Scope to start from.
* @param path
@@ -149,7 +149,7 @@ public IScope resolveScope(IScope root, String path) {
/**
* Setter for client registry
- *
+ *
* @param clientRegistry
* Client registry
*/
@@ -159,7 +159,7 @@ public void setClientRegistry(IClientRegistry clientRegistry) {
/**
* Setter for mapping strategy
- *
+ *
* @param mappingStrategy
* Mapping strategy
*/
@@ -169,7 +169,7 @@ public void setMappingStrategy(IMappingStrategy mappingStrategy) {
/**
* Setter for scope resolver
- *
+ *
* @param scopeResolver
* Scope resolver used to resolve scopes
*/
@@ -179,7 +179,7 @@ public void setScopeResolver(IScopeResolver scopeResolver) {
/**
* Setter for service invoker
- *
+ *
* @param serviceInvoker
* Service invoker object
*/
@@ -189,7 +189,7 @@ public void setServiceInvoker(IServiceInvoker serviceInvoker) {
/**
* Return persistence store
- *
+ *
* @return Persistence store
*/
public IPersistenceStore getPersistanceStore() {
@@ -198,7 +198,7 @@ public IPersistenceStore getPersistanceStore() {
/**
* Setter for persistence store
- *
+ *
* @param persistanceStore
* Persistence store
*/
@@ -208,7 +208,7 @@ public void setPersistanceStore(IPersistenceStore persistanceStore) {
/**
* Setter for application context
- *
+ *
* @param context
* App context
*/
@@ -233,7 +233,7 @@ public void setApplicationContext(ApplicationContext context) {
/**
* Return application context
- *
+ *
* @return App context
*/
public ApplicationContext getApplicationContext() {
@@ -242,7 +242,7 @@ public ApplicationContext getApplicationContext() {
/**
* Setter for context path. Adds a slash at the end of path if there isn't one
- *
+ *
* @param contextPath
* Context path
*/
@@ -255,7 +255,7 @@ public void setContextPath(String contextPath) {
/**
* Return client registry
- *
+ *
* @return Client registry
*/
public IClientRegistry getClientRegistry() {
@@ -264,7 +264,7 @@ public IClientRegistry getClientRegistry() {
/**
* Return scope
- *
+ *
* @return null
*/
public IScope getScope() {
@@ -273,7 +273,7 @@ public IScope getScope() {
/**
* Return service invoker
- *
+ *
* @return Service invoker
*/
public IServiceInvoker getServiceInvoker() {
@@ -282,7 +282,7 @@ public IServiceInvoker getServiceInvoker() {
/**
* Look up service by name
- *
+ *
* @param serviceName
* Service name
* @return Service object
@@ -307,7 +307,7 @@ public Object lookupService(String serviceName) {
/**
* Look up scope handler for context path
- *
+ *
* @param contextPath
* Context path
* @return Scope handler
@@ -328,7 +328,7 @@ public IScopeHandler lookupScopeHandler(String contextPath) {
/**
* Return mapping strategy used by this context. Mapping strategy define naming rules (prefixes, postfixes, default application name, etc) for all named objects in context.
- *
+ *
* @return Mapping strategy
*/
public IMappingStrategy getMappingStrategy() {
@@ -337,13 +337,13 @@ public IMappingStrategy getMappingStrategy() {
/**
* Return array or resource that match given pattern
- *
+ *
* @param pattern
* Pattern to check against
* @return Array of Resource objects
* @throws IOException
* On I/O exception
- *
+ *
* @see org.springframework.core.io.Resource
*/
public Resource[] getResources(String pattern) throws IOException {
@@ -352,11 +352,11 @@ public Resource[] getResources(String pattern) throws IOException {
/**
* Return resource by path
- *
+ *
* @param path
* Resource path
* @return Resource
- *
+ *
* @see org.springframework.core.io.Resource
*/
public Resource getResource(String path) {
@@ -365,13 +365,13 @@ public Resource getResource(String path) {
/**
* Resolve scope from host and path
- *
+ *
* @param host
* Host
* @param path
* Path
* @return Scope
- *
+ *
* @see org.red5.server.api.scope.IScope
* @see org.red5.server.scope.Scope
*/
@@ -388,11 +388,11 @@ public boolean hasBean(String beanId) {
/**
* Return bean instantiated by bean factory
- *
+ *
* @param beanId
* Bean name
* @return Instantiated bean
- *
+ *
* @see org.springframework.beans.factory.BeanFactory
*/
public Object getBean(String beanId) {
@@ -413,11 +413,11 @@ public Object getBean(String beanId) {
/**
* Return core Red5 service instantiated by core context bean factory
- *
+ *
* @param beanId
* Bean name
* @return Core Red5 service instantiated
- *
+ *
* @see org.springframework.beans.factory.BeanFactory
*/
public Object getCoreService(String beanId) {
@@ -430,7 +430,7 @@ public void setCoreBeanFactory(BeanFactory core) {
/**
* Return current thread's context classloader
- *
+ *
* @return Classloder context of current thread
*/
public ClassLoader getClassLoader() {
@@ -439,7 +439,7 @@ public ClassLoader getClassLoader() {
/**
* Allows for reconstruction via CompositeData.
- *
+ *
* @param cd
* composite data
* @return Context class instance
diff --git a/server/src/main/java/org/red5/server/CoreHandler.java b/server/src/main/java/org/red5/server/CoreHandler.java
index e313840f6..d29f9fb30 100644
--- a/server/src/main/java/org/red5/server/CoreHandler.java
+++ b/server/src/main/java/org/red5/server/CoreHandler.java
@@ -62,7 +62,7 @@ public boolean connect(IConnection conn, IScope scope) {
*/
public boolean connect(IConnection conn, IScope scope, Object[] params) {
log.debug("connect - conn: {} scope: {}", conn, scope);
- // this is where we create the Client object that consolidates connections from a single client/FP.
+ // this is where we create the Client object that consolidates connections from a single client/FP.
// Now for more strangeness, I've only been looking at RTMPConnection derivatives, but it's setup() method
// seems the only way that the session id is passed in to the newly established connection and this is currently *always* passed in
// as null. I'm guessing that either the Flash Player passes some kind of unique id to us that is not being used, or that the idea
diff --git a/server/src/main/java/org/red5/server/Launcher.java b/server/src/main/java/org/red5/server/Launcher.java
index e5b254a46..f1f62789c 100644
--- a/server/src/main/java/org/red5/server/Launcher.java
+++ b/server/src/main/java/org/red5/server/Launcher.java
@@ -23,7 +23,7 @@ public class Launcher {
/**
* Launch Red5 under it's own classloader
- *
+ *
* @throws Exception
* on error
*/
diff --git a/server/src/main/java/org/red5/server/MappingStrategy.java b/server/src/main/java/org/red5/server/MappingStrategy.java
index eb369cee8..b0be81ded 100644
--- a/server/src/main/java/org/red5/server/MappingStrategy.java
+++ b/server/src/main/java/org/red5/server/MappingStrategy.java
@@ -40,7 +40,7 @@ public class MappingStrategy implements IMappingStrategy {
/**
* Setter for default application name ('default' by default).
- *
+ *
* @param defaultApp
* Default application
*/
@@ -50,7 +50,7 @@ public void setDefaultApp(String defaultApp) {
/**
* Resolves resource prefix from path. Default application used as root when path is specified.
- *
+ *
* @param path
* Path
* @return Resource prefix according to this naming strategy
@@ -65,7 +65,7 @@ public String mapResourcePrefix(String path) {
/**
* Resolves scope handler name for path. Default application used as root when path is specified.
- *
+ *
* @param path
* Path
* @return Scope handler name according to this naming strategy
@@ -80,7 +80,7 @@ public String mapScopeHandlerName(String path) {
/**
* Resolves service filename name from name
- *
+ *
* @param name
* Service name
* @return Service filename according to this naming strategy
diff --git a/server/src/main/java/org/red5/server/PersistableAttributeStore.java b/server/src/main/java/org/red5/server/PersistableAttributeStore.java
index 169aaffb8..12ae83e79 100644
--- a/server/src/main/java/org/red5/server/PersistableAttributeStore.java
+++ b/server/src/main/java/org/red5/server/PersistableAttributeStore.java
@@ -95,7 +95,7 @@ public boolean isPersistent() {
/**
* Set for persistence
- *
+ *
* @param persistent
* Persistence flag value
*/
@@ -105,7 +105,7 @@ public void setPersistent(boolean persistent) {
/**
* Returns last modification time as timestamp
- *
+ *
* @return Timestamp of last attribute modification
*/
public long getLastModified() {
@@ -114,7 +114,7 @@ public long getLastModified() {
/**
* Return store name
- *
+ *
* @return Store name
*/
public String getName() {
@@ -123,7 +123,7 @@ public String getName() {
/**
* Setter for name
- *
+ *
* @param name
* Name
*/
@@ -133,7 +133,7 @@ public void setName(String name) {
/**
* Ruturn scope path
- *
+ *
* @return Path
*/
public String getPath() {
@@ -142,7 +142,7 @@ public String getPath() {
/**
* Setter for scope path
- *
+ *
* @param path
* Path
*/
@@ -152,7 +152,7 @@ public void setPath(String path) {
/**
* Return scope type
- *
+ *
* @return Scope type
*/
public String getType() {
@@ -210,7 +210,7 @@ public void setStore(IPersistenceStore store) {
/**
* Return persistent store
- *
+ *
* @return Persistence store
*/
public IPersistenceStore getStore() {
@@ -263,7 +263,7 @@ public boolean setAttributes(IAttributeStore values) {
/**
* Removes attribute
- *
+ *
* @param name
* Attribute name
* @return true if attribute was removed, false otherwise
diff --git a/server/src/main/java/org/red5/server/adapter/Config.java b/server/src/main/java/org/red5/server/adapter/Config.java
index 72661c10c..e588dad53 100644
--- a/server/src/main/java/org/red5/server/adapter/Config.java
+++ b/server/src/main/java/org/red5/server/adapter/Config.java
@@ -12,7 +12,7 @@
/**
* Provides configuration details for Applications.
- *
+ *
* @author Paul Gregoire (mondain@gmail.com)
*/
@SuppressWarnings("unchecked")
diff --git a/server/src/main/java/org/red5/server/api/remoting/IRemotingConnection.java b/server/src/main/java/org/red5/server/api/remoting/IRemotingConnection.java
index 039800c7f..86f3be5e1 100644
--- a/server/src/main/java/org/red5/server/api/remoting/IRemotingConnection.java
+++ b/server/src/main/java/org/red5/server/api/remoting/IRemotingConnection.java
@@ -13,7 +13,7 @@
/**
* Connection coming from Remoting clients.
- *
+ *
* @author The Red5 Project
* @author Joachim Bauch (jojo@struktur.de)
*/
@@ -21,7 +21,7 @@ public interface IRemotingConnection extends IConnection {
/**
* Tell the client to add a header with all further requests. This is returned to the client as response for the next request received.
- *
+ *
* @param name
* name of the header to add
* @param value
@@ -31,7 +31,7 @@ public interface IRemotingConnection extends IConnection {
/**
* Tell the client to add a header with all further requests. This is returned to the client as response for the next request received.
- *
+ *
* @param name
* name of the header to add
* @param value
@@ -43,7 +43,7 @@ public interface IRemotingConnection extends IConnection {
/**
* Tell the client to no longer send a header with all further requests. This is returned to the client as response for the next request received.
- *
+ *
* @param name
* name of the header to remove
*/
@@ -51,7 +51,7 @@ public interface IRemotingConnection extends IConnection {
/**
* Return headers to send.
- *
+ *
* @return headers to send
*/
public Collection getHeaders();
diff --git a/server/src/main/java/org/red5/server/api/scope/IScopeResolver.java b/server/src/main/java/org/red5/server/api/scope/IScopeResolver.java
index 9c590b8d6..b9a68a82a 100644
--- a/server/src/main/java/org/red5/server/api/scope/IScopeResolver.java
+++ b/server/src/main/java/org/red5/server/api/scope/IScopeResolver.java
@@ -16,14 +16,14 @@ public interface IScopeResolver {
/**
* Return the global scope.
- *
+ *
* @return Global scope
*/
public IGlobalScope getGlobalScope();
/**
* Get the scope for a given path.
- *
+ *
* @param path
* Path to return the scope for
* @return Scope for passed path
@@ -34,7 +34,7 @@ public interface IScopeResolver {
/**
* Get the scope for a given path from a root scope.
- *
+ *
* @param root
* The scope to start traversing from.
* @param path
diff --git a/server/src/main/java/org/red5/server/api/session/ISession.java b/server/src/main/java/org/red5/server/api/session/ISession.java
index 209f50d28..cd2833168 100644
--- a/server/src/main/java/org/red5/server/api/session/ISession.java
+++ b/server/src/main/java/org/red5/server/api/session/ISession.java
@@ -20,14 +20,14 @@ public interface ISession extends Serializable {
/**
* Returns creation time in milliseconds.
- *
+ *
* @return creation time
*/
public long getCreated();
/**
* Returns the session's identifier.
- *
+ *
* @return session id
*/
public String getSessionId();
@@ -39,7 +39,7 @@ public interface ISession extends Serializable {
/**
* Returns the active state of the session.
- *
+ *
* @return is active
*/
public boolean isActive();
@@ -51,7 +51,7 @@ public interface ISession extends Serializable {
/**
* Sets the associated client id.
- *
+ *
* @param clientId
* client id
*/
@@ -59,14 +59,14 @@ public interface ISession extends Serializable {
/**
* Returns the client id associated with this session.
- *
+ *
* @return client id
*/
public String getClientId();
/**
* Sets where session resources will be located if persisted to disk.
- *
+ *
* @param destinationDirectory
* destination directory
*/
diff --git a/server/src/main/java/org/red5/server/api/statistics/IStatisticsService.java b/server/src/main/java/org/red5/server/api/statistics/IStatisticsService.java
index 00020151b..4e78fccd6 100644
--- a/server/src/main/java/org/red5/server/api/statistics/IStatisticsService.java
+++ b/server/src/main/java/org/red5/server/api/statistics/IStatisticsService.java
@@ -16,35 +16,35 @@
/**
* Statistics methods for Red5. They can be used to poll for updates of given elements inside the server. Statistics data will be stored as properties of different shared objects.
- *
+ *
* Use
- *
+ *
*
* getScopeStatisticsSO
*
- *
+ *
* and
- *
+ *
*
* getSharedObjectStatisticsSO
*
- *
+ *
* to get these shared objects. The property names are
- *
+ *
*
* scopeName
*
- *
+ *
* for scope attributes and
- *
+ *
*
* scopeName | sharedObjectName
*
- *
+ *
* for shared object attributes. Each property holds a Map containing key/value mappings of the corresponding attributes.
- *
+ *
* Sometime in the future, the updates on the shared objects will be done automatically so a client doesn't need to poll for them.
- *
+ *
* @author The Red5 Project
* @author Joachim Bauch (jojo@struktur.de)
*/
@@ -52,7 +52,7 @@ public interface IStatisticsService {
/**
* Return the shared object that will be used to keep scope statistics.
- *
+ *
* @param scope
* A scope to return the shared object for.
* @return the shared object containing scope statistics
@@ -61,7 +61,7 @@ public interface IStatisticsService {
/**
* Return the shared object that will be used to keep SO statistics.
- *
+ *
* @param scope
* A scope to return the shared object for.
* @return the shared object containing SO statistics
@@ -70,14 +70,14 @@ public interface IStatisticsService {
/**
* Return a list of all scopes that currently exist on the server.
- *
+ *
* @return list of scope names
*/
public Set getScopes();
/**
* Return a list of all scopes that currently exist on the server below a current path.
- *
+ *
* @param path
* Path to start looking for scopes.
* @return list of scope names
@@ -88,7 +88,7 @@ public interface IStatisticsService {
/**
* Update statistics for a given scope.
- *
+ *
* @param path
* Path to scope to update.
* @throws ScopeNotFoundException
@@ -98,7 +98,7 @@ public interface IStatisticsService {
/**
* Return informations about shared objects for a given scope.
- *
+ *
* @param path
* Path to scope to return shared object names for.
* @return list of informations about shared objects
@@ -107,7 +107,7 @@ public interface IStatisticsService {
/**
* Update informations about a shared object in a given scope.
- *
+ *
* @param path
* Path to scope that contains the shared object.
* @param name
diff --git a/server/src/main/java/org/red5/server/api/stream/IServerStream.java b/server/src/main/java/org/red5/server/api/stream/IServerStream.java
index f5b3f6578..95c90bc06 100644
--- a/server/src/main/java/org/red5/server/api/stream/IServerStream.java
+++ b/server/src/main/java/org/red5/server/api/stream/IServerStream.java
@@ -19,7 +19,7 @@ public interface IServerStream extends IPlaylist, IBroadcastStream {
/**
* Seek to a given position in the stream.
- *
+ *
* @param position
* new playback position in milliseconds
*/
diff --git a/server/src/main/java/org/red5/server/api/stream/IStreamHandler.java b/server/src/main/java/org/red5/server/api/stream/IStreamHandler.java
index 7f1340abc..8263b19a6 100644
--- a/server/src/main/java/org/red5/server/api/stream/IStreamHandler.java
+++ b/server/src/main/java/org/red5/server/api/stream/IStreamHandler.java
@@ -11,7 +11,7 @@ public interface IStreamHandler {
/**
* Called when the client begins publishing
- *
+ *
* @param stream
* the stream object
*/
@@ -19,7 +19,7 @@ public interface IStreamHandler {
/**
* Called when the client stops publishing
- *
+ *
* @param stream
* the stream object
*/
@@ -27,7 +27,7 @@ public interface IStreamHandler {
/**
* Called when the broadcast starts
- *
+ *
* @param stream
* the stream object
*/
@@ -35,7 +35,7 @@ public interface IStreamHandler {
/**
* Called when a recording starts
- *
+ *
* @param stream
* the stream object
*/
@@ -43,7 +43,7 @@ public interface IStreamHandler {
/**
* Called when a recording stops
- *
+ *
* @param stream
* the stream object
*/
@@ -51,7 +51,7 @@ public interface IStreamHandler {
/**
* Called when a client subscribes to a broadcast
- *
+ *
* @param stream
* the stream object
*/
@@ -59,7 +59,7 @@ public interface IStreamHandler {
/**
* Called when a client unsubscribes from a broadcast
- *
+ *
* @param stream
* the stream object
*/
@@ -67,7 +67,7 @@ public interface IStreamHandler {
/**
* Called when a client connects to an on demand stream
- *
+ *
* @param stream
* the stream object
*/
@@ -75,7 +75,7 @@ public interface IStreamHandler {
/**
* Called when a client disconnects from an on demand stream
- *
+ *
* @param stream
* the stream object
*/
diff --git a/server/src/main/java/org/red5/server/api/stream/IStreamSecurityService.java b/server/src/main/java/org/red5/server/api/stream/IStreamSecurityService.java
index 98b3c85ae..9a13ff19d 100644
--- a/server/src/main/java/org/red5/server/api/stream/IStreamSecurityService.java
+++ b/server/src/main/java/org/red5/server/api/stream/IStreamSecurityService.java
@@ -13,7 +13,7 @@
/**
* Service that supports protecting access to streams.
- *
+ *
* @author The Red5 Project
* @author Joachim Bauch (jojo@struktur.de)
*/
@@ -26,7 +26,7 @@ public interface IStreamSecurityService extends IScopeService {
/**
* Add handler that protects stream publishing.
- *
+ *
* @param handler
* Handler to add.
*/
@@ -34,7 +34,7 @@ public interface IStreamSecurityService extends IScopeService {
/**
* Remove handler that protects stream publishing.
- *
+ *
* @param handler
* Handler to remove.
*/
@@ -42,14 +42,14 @@ public interface IStreamSecurityService extends IScopeService {
/**
* Get handlers that protect stream publishing.
- *
+ *
* @return list of handlers
*/
public Set getStreamPublishSecurity();
/**
* Add handler that protects stream playback.
- *
+ *
* @param handler
* Handler to add.
*/
@@ -57,7 +57,7 @@ public interface IStreamSecurityService extends IScopeService {
/**
* Remove handler that protects stream playback.
- *
+ *
* @param handler
* Handler to remove.
*/
@@ -65,7 +65,7 @@ public interface IStreamSecurityService extends IScopeService {
/**
* Get handlers that protect stream plaback.
- *
+ *
* @return list of handlers
*/
public Set getStreamPlaybackSecurity();
diff --git a/server/src/main/java/org/red5/server/api/stream/IStreamableFile.java b/server/src/main/java/org/red5/server/api/stream/IStreamableFile.java
index c403d4d44..e15d7137e 100644
--- a/server/src/main/java/org/red5/server/api/stream/IStreamableFile.java
+++ b/server/src/main/java/org/red5/server/api/stream/IStreamableFile.java
@@ -19,7 +19,7 @@ public interface IStreamableFile {
/**
* Returns a reader to parse and read the tags inside the file.
- *
+ *
* @return the reader Tag reader
* @throws java.io.IOException
* I/O exception
@@ -28,7 +28,7 @@ public interface IStreamableFile {
/**
* Returns a writer that creates a new file or truncates existing contents.
- *
+ *
* @return the writer Tag writer
* @throws java.io.IOException
* I/O exception
@@ -37,7 +37,7 @@ public interface IStreamableFile {
/**
* Returns a Writer which is setup to append to the file.
- *
+ *
* @return the writer Tag writer used for append mode
* @throws java.io.IOException
* I/O exception
diff --git a/server/src/main/java/org/red5/server/api/stream/support/DenyAllStreamAccess.java b/server/src/main/java/org/red5/server/api/stream/support/DenyAllStreamAccess.java
index 720c82484..4b0f4aa51 100644
--- a/server/src/main/java/org/red5/server/api/stream/support/DenyAllStreamAccess.java
+++ b/server/src/main/java/org/red5/server/api/stream/support/DenyAllStreamAccess.java
@@ -13,7 +13,7 @@
/**
* Stream security handler that denies access to all streams.
- *
+ *
* @author The Red5 Project
* @author Joachim Bauch (jojo@struktur.de)
*/
diff --git a/server/src/main/java/org/red5/server/api/stream/support/StreamUtils.java b/server/src/main/java/org/red5/server/api/stream/support/StreamUtils.java
index 442c9f769..b1227d16e 100644
--- a/server/src/main/java/org/red5/server/api/stream/support/StreamUtils.java
+++ b/server/src/main/java/org/red5/server/api/stream/support/StreamUtils.java
@@ -18,7 +18,7 @@
/**
* Stream helper methods.
- *
+ *
* @author The Red5 Project
* @author Steven Gong (steven.gong@gmail.com)
* @author Paul Gregoire (mondain@gmail.com)
@@ -32,7 +32,7 @@ public abstract class StreamUtils {
/**
* Creates server stream
- *
+ *
* @param scope
* Scope of stream
* @param name
diff --git a/server/src/main/java/org/red5/server/exception/AccessDeniedException.java b/server/src/main/java/org/red5/server/exception/AccessDeniedException.java
index 25fdc660f..f34d7a837 100644
--- a/server/src/main/java/org/red5/server/exception/AccessDeniedException.java
+++ b/server/src/main/java/org/red5/server/exception/AccessDeniedException.java
@@ -13,7 +13,7 @@
public class AccessDeniedException extends RuntimeException {
/**
- *
+ *
*/
private static final long serialVersionUID = 2023603817704741161L;
diff --git a/server/src/main/java/org/red5/server/exception/ScopeHandlerNotFoundException.java b/server/src/main/java/org/red5/server/exception/ScopeHandlerNotFoundException.java
index d09dc1eb2..318c15488 100644
--- a/server/src/main/java/org/red5/server/exception/ScopeHandlerNotFoundException.java
+++ b/server/src/main/java/org/red5/server/exception/ScopeHandlerNotFoundException.java
@@ -16,7 +16,7 @@ public class ScopeHandlerNotFoundException extends RuntimeException {
/**
* Create exception from given scope handler name
- *
+ *
* @param handlerName
* Scope handler name
*/
diff --git a/server/src/main/java/org/red5/server/exception/ServiceNotFoundException.java b/server/src/main/java/org/red5/server/exception/ServiceNotFoundException.java
index eb01eaaa7..84a88a6dd 100644
--- a/server/src/main/java/org/red5/server/exception/ServiceNotFoundException.java
+++ b/server/src/main/java/org/red5/server/exception/ServiceNotFoundException.java
@@ -13,7 +13,7 @@
public class ServiceNotFoundException extends RuntimeException {
/**
- *
+ *
*/
private static final long serialVersionUID = -2400159517485748708L;
diff --git a/server/src/main/java/org/red5/server/exception/SharedObjectException.java b/server/src/main/java/org/red5/server/exception/SharedObjectException.java
index 25fb55fff..0b08e6e75 100644
--- a/server/src/main/java/org/red5/server/exception/SharedObjectException.java
+++ b/server/src/main/java/org/red5/server/exception/SharedObjectException.java
@@ -13,7 +13,7 @@
public class SharedObjectException extends RuntimeException {
/**
- *
+ *
*/
private static final long serialVersionUID = 4152370716169030341L;
diff --git a/server/src/main/java/org/red5/server/exception/StreamControlException.java b/server/src/main/java/org/red5/server/exception/StreamControlException.java
index cca3b8629..d06272bdb 100644
--- a/server/src/main/java/org/red5/server/exception/StreamControlException.java
+++ b/server/src/main/java/org/red5/server/exception/StreamControlException.java
@@ -13,7 +13,7 @@
public class StreamControlException extends RuntimeException {
/**
- *
+ *
*/
private static final long serialVersionUID = -8396541091694329882L;
diff --git a/server/src/main/java/org/red5/server/exception/StreamDataException.java b/server/src/main/java/org/red5/server/exception/StreamDataException.java
index d1f46297f..2b7833df7 100644
--- a/server/src/main/java/org/red5/server/exception/StreamDataException.java
+++ b/server/src/main/java/org/red5/server/exception/StreamDataException.java
@@ -13,7 +13,7 @@
public class StreamDataException extends RuntimeException {
/**
- *
+ *
*/
private static final long serialVersionUID = 5529626622367065317L;
diff --git a/server/src/main/java/org/red5/server/messaging/IPullableProvider.java b/server/src/main/java/org/red5/server/messaging/IPullableProvider.java
index 2797d4f6f..67a6d2cb4 100644
--- a/server/src/main/java/org/red5/server/messaging/IPullableProvider.java
+++ b/server/src/main/java/org/red5/server/messaging/IPullableProvider.java
@@ -11,7 +11,7 @@
/**
* A provider that supports passive pulling of messages.
- *
+ *
* @author The Red5 Project
* @author Steven Gong (steven.gong@gmail.com)
*/
diff --git a/server/src/main/java/org/red5/server/messaging/InMemoryPullPullPipe.java b/server/src/main/java/org/red5/server/messaging/InMemoryPullPullPipe.java
index 522d56d8e..8ac3d2d5e 100644
--- a/server/src/main/java/org/red5/server/messaging/InMemoryPullPullPipe.java
+++ b/server/src/main/java/org/red5/server/messaging/InMemoryPullPullPipe.java
@@ -15,7 +15,7 @@
/**
* A simple in-memory version of pull-pull pipe. It is triggered by an active consumer that pulls messages through it from a pullable provider.
- *
+ *
* @author The Red5 Project
* @author Steven Gong (steven.gong@gmail.com)
*/
diff --git a/server/src/main/java/org/red5/server/messaging/PipeUtils.java b/server/src/main/java/org/red5/server/messaging/PipeUtils.java
index 04a526db4..a80cdae7b 100644
--- a/server/src/main/java/org/red5/server/messaging/PipeUtils.java
+++ b/server/src/main/java/org/red5/server/messaging/PipeUtils.java
@@ -9,14 +9,14 @@
/**
* Helper class for pipe structure.
- *
+ *
* @author The Red5 Project
* @author Steven Gong (steven.gong@gmail.com)
*/
public class PipeUtils {
/**
* Connect a provider/consumer with a pipe.
- *
+ *
* @param provider
* Provider
* @param pipe
@@ -31,7 +31,7 @@ public static void connect(IProvider provider, IPipe pipe, IConsumer consumer) {
/**
* Disconnect a provider/consumer from a pipe.
- *
+ *
* @param provider
* Provider
* @param pipe
diff --git a/server/src/main/java/org/red5/server/messaging/ServiceAdapter.java b/server/src/main/java/org/red5/server/messaging/ServiceAdapter.java
index 785049055..5f83b5821 100644
--- a/server/src/main/java/org/red5/server/messaging/ServiceAdapter.java
+++ b/server/src/main/java/org/red5/server/messaging/ServiceAdapter.java
@@ -12,7 +12,7 @@
/**
* The ServiceAdapter class is the base definition of a service adapter.
- *
+ *
* @author Paul Gregoire
*/
public abstract class ServiceAdapter {
@@ -34,7 +34,7 @@ public void stop() {
/**
* Handle a data message intended for this adapter. This method is responsible for handling the message and returning a result (if any). The return value of this message is used as the body of the acknowledge message returned to the client. It may be null if there is no data being returned for this message. Typically the data content for the message is stored in the body property of the message. The headers of
* the message are used to store fields which relate to the transport of the message. The type of operation is stored as the operation property of the message.
- *
+ *
* @param message
* the message as sent by the client intended for this adapter
* @return the body of the acknowledge message (or null if there is no body)
@@ -44,7 +44,7 @@ public void stop() {
/**
* Accept a command from the adapter's service and perform some internal action based upon it. CommandMessages are used for messages which control the state of the connection between the client and the server. For example, this handles subscribe, unsubscribe, and ping operations. The messageRefType property of the CommandMessage is used to associate a command message with a particular service. Services are
* configured to handle messages of a particular concrete type. For example, the MessageService is typically invoked to handle messages of type flex.messaging.messages.AsyncMessage. To ensure a given CommandMessage is routed to the right service, its MessageRefType is set to the string name of the message type for messages handled by that service.
- *
+ *
* @param commandMessage
* message
* @return Exception if not implemented
@@ -55,7 +55,7 @@ public Object manage(CommandMessage commandMessage) {
/**
* Returns true if the adapter performs custom subscription management. The default return value is false, and subclasses should override this method as necessary.
- *
+ *
* @return true if subscriptions are handled
*/
public boolean handlesSubscriptions() {
diff --git a/server/src/main/java/org/red5/server/net/IConnectionEventQueue.java b/server/src/main/java/org/red5/server/net/IConnectionEventQueue.java
index f1dc12033..8192b739e 100644
--- a/server/src/main/java/org/red5/server/net/IConnectionEventQueue.java
+++ b/server/src/main/java/org/red5/server/net/IConnectionEventQueue.java
@@ -19,7 +19,7 @@ public interface IConnectionEventQueue {
/**
* Whether queue has waiting connection events
- *
+ *
* @param conn
* Connection
* @return true if queue has waiting events for connection, false otherwise
@@ -28,7 +28,7 @@ public interface IConnectionEventQueue {
/**
* Return iterator over waiting events
- *
+ *
* @param conn
* Connection
* @return Iterator over events
diff --git a/server/src/main/java/org/red5/server/net/proxy/NetworkDumpFilter.java b/server/src/main/java/org/red5/server/net/proxy/NetworkDumpFilter.java
index 2f2b647a8..aed212316 100644
--- a/server/src/main/java/org/red5/server/net/proxy/NetworkDumpFilter.java
+++ b/server/src/main/java/org/red5/server/net/proxy/NetworkDumpFilter.java
@@ -34,7 +34,7 @@ public class NetworkDumpFilter extends IoFilterAdapter {
/**
* Create network dump filter from given dump channels
- *
+ *
* @param headers
* Channel to dump headers
* @param raw
diff --git a/server/src/main/java/org/red5/server/net/proxy/ProxyFilter.java b/server/src/main/java/org/red5/server/net/proxy/ProxyFilter.java
index 4b80edc12..9281ddad6 100644
--- a/server/src/main/java/org/red5/server/net/proxy/ProxyFilter.java
+++ b/server/src/main/java/org/red5/server/net/proxy/ProxyFilter.java
@@ -34,7 +34,7 @@ public class ProxyFilter extends IoFilterAdapter {
/**
* Create proxy filter with given name
- *
+ *
* @param name
* name
*/
diff --git a/server/src/main/java/org/red5/server/net/remoting/FlexMessagingService.java b/server/src/main/java/org/red5/server/net/remoting/FlexMessagingService.java
index 64708350e..80d7111c3 100644
--- a/server/src/main/java/org/red5/server/net/remoting/FlexMessagingService.java
+++ b/server/src/main/java/org/red5/server/net/remoting/FlexMessagingService.java
@@ -43,7 +43,7 @@
/**
* Service that can execute compatibility Flex messages.
- *
+ *
* @author The Red5 Project
* @author Joachim Bauch (jojo@struktur.de)
* @author Paul Gregoire (mondain@gmail.com)
@@ -70,7 +70,7 @@ public class FlexMessagingService {
/**
* Setup available end points.
- *
+ *
* @param endpoints
* end points
*/
@@ -81,7 +81,7 @@ public void setEndpoints(Map endpoints) {
/**
* Set the service invoker to use.
- *
+ *
* @param serviceInvoker
* service invoker
*/
@@ -91,7 +91,7 @@ public void setServiceInvoker(IServiceInvoker serviceInvoker) {
/**
* Construct error message.
- *
+ *
* @param request
* request
* @param faultCode
@@ -116,7 +116,7 @@ public static ErrorMessage returnError(AbstractMessage request, String faultCode
/**
* Construct error message from exception.
- *
+ *
* @param request
* request
* @param faultCode
@@ -145,13 +145,13 @@ public static ErrorMessage returnError(AbstractMessage request, String faultCode
/**
* Handle request coming from
- *
+ *
*
* mx:RemoteObject
*
- *
+ *
* tags.
- *
+ *
* @see Adobe Livedocs (external)
*
* @param msg
@@ -233,7 +233,7 @@ public AsyncMessage handleRequest(RemotingMessage msg) {
/**
* Handle command message (external) request.
- *
+ *
* @param msg
* message
* @return message
@@ -290,7 +290,7 @@ public Message handleRequest(CommandMessageExt msg) {
/**
* Handle command message request.
- *
+ *
* @param msg
* message
* @return message
@@ -405,7 +405,7 @@ public Message handleRequest(CommandMessage msg) {
/**
* Evaluate update requests sent by a client.
- *
+ *
* @param msg
* @param event
*/
@@ -433,7 +433,7 @@ private void evaluateDataUpdate(DataMessage msg, DataMessage event) {
/**
* Handle messages related to shared objects.
- *
+ *
* @param msg
* message
* @return async message
@@ -477,7 +477,7 @@ public AsyncMessage handleRequest(DataMessage msg) {
/**
* Fallback method to handle arbitrary messages.
- *
+ *
* @param msg
* message
* @return error message
@@ -517,7 +517,7 @@ public Message handleRequest(AbstractMessage msg) {
ServiceAdapter adapter = (ServiceAdapter) endpoint;
//log.debug("Invoke: {}", adapter.invoke(msg));
Object o = adapter.invoke(msg);
- //the result of the invocation will make up the message body
+ //the result of the invocation will make up the message body
//AsyncMessage ext = new AsyncMessage();
//ext.setClientId(msg.getClientId());
//ext.setCorrelationId(result.getMessageId());
@@ -534,7 +534,7 @@ public Message handleRequest(AbstractMessage msg) {
/**
* This is mandatory for client built from Flex 3 or later, or client will hang with concurrent accesses.
- *
+ *
* @param msg
*/
private void setClientId(AbstractMessage msg) {
@@ -555,7 +555,7 @@ private void setClientId(AbstractMessage msg) {
/**
* Maps a client to an adapter for lookups on messages that do not contain a destination.
- *
+ *
* @param clientId
* a subscribed client id
* @param adapter
@@ -570,7 +570,7 @@ private final void registerClientToAdapter(String clientId, ServiceAdapter adapt
/**
* Removes a mapping for a client with an adapter.
- *
+ *
* @param clientId
* a subscribed client id
*/
diff --git a/server/src/main/java/org/red5/server/net/remoting/RemotingConnection.java b/server/src/main/java/org/red5/server/net/remoting/RemotingConnection.java
index 82fd10f3e..21873b0cf 100644
--- a/server/src/main/java/org/red5/server/net/remoting/RemotingConnection.java
+++ b/server/src/main/java/org/red5/server/net/remoting/RemotingConnection.java
@@ -38,7 +38,7 @@
/**
* Connection class so the Red5 object works in methods invoked through remoting. Attributes are stored in the session of the implementing
* servlet container.
- *
+ *
* @author The Red5 Project
* @author Joachim Bauch (jojo@struktur.de)
* @author Paul Gregoire (mondain@gmail.com)
@@ -110,7 +110,7 @@ public RemotingConnection(HttpServletRequest request, IScope scope, RemotingPack
/**
* Return string representation of the connection.
- *
+ *
* @return string
*/
public String toString() {
@@ -119,7 +119,7 @@ public String toString() {
/**
* Update the current packet.
- *
+ *
* @param packet
* remoting packet
*/
@@ -399,7 +399,7 @@ public Object getAttribute(String name, Object defaultValue) {
if (name == null) {
return null;
}
- // Synchronize so default value doesn't override other default value
+ // Synchronize so default value doesn't override other default value
synchronized (session) {
Object result = session.getAttribute(name);
if (result == null && defaultValue != null) {
diff --git a/server/src/main/java/org/red5/server/net/remoting/codec/RemotingCodecFactory.java b/server/src/main/java/org/red5/server/net/remoting/codec/RemotingCodecFactory.java
index d057f3be3..c3e857712 100644
--- a/server/src/main/java/org/red5/server/net/remoting/codec/RemotingCodecFactory.java
+++ b/server/src/main/java/org/red5/server/net/remoting/codec/RemotingCodecFactory.java
@@ -32,7 +32,7 @@ public void init() {
/**
* Returns the remoting decoder.
- *
+ *
* @return decoder
*/
public RemotingProtocolDecoder getRemotingDecoder() {
@@ -41,7 +41,7 @@ public RemotingProtocolDecoder getRemotingDecoder() {
/**
* Returns the remoting encoder.
- *
+ *
* @return encoder
*/
public RemotingProtocolEncoder getRemotingEncoder() {
diff --git a/server/src/main/java/org/red5/server/net/remoting/codec/RemotingProtocolDecoder.java b/server/src/main/java/org/red5/server/net/remoting/codec/RemotingProtocolDecoder.java
index af0b10580..18be20d9a 100644
--- a/server/src/main/java/org/red5/server/net/remoting/codec/RemotingProtocolDecoder.java
+++ b/server/src/main/java/org/red5/server/net/remoting/codec/RemotingProtocolDecoder.java
@@ -31,7 +31,7 @@ public class RemotingProtocolDecoder {
/**
* Decodes the given buffer.
- *
+ *
* @param buffer
* input buffer
* @return a List of {@link RemotingPacket} objects.
@@ -53,7 +53,7 @@ public List decodeBuffer(IoBuffer buffer) {
/**
* Decodes the buffer and returns a remoting packet.
- *
+ *
* @param in
* input buffer
* @return A {@link RemotingPacket}
@@ -68,7 +68,7 @@ public Object decode(IoBuffer in) throws Exception {
/**
* Read remoting headers.
- *
+ *
* @param in
* Input data as byte buffer
* @return header map
diff --git a/server/src/main/java/org/red5/server/net/remoting/codec/RemotingProtocolEncoder.java b/server/src/main/java/org/red5/server/net/remoting/codec/RemotingProtocolEncoder.java
index 807e55fee..942aa3ed9 100644
--- a/server/src/main/java/org/red5/server/net/remoting/codec/RemotingProtocolEncoder.java
+++ b/server/src/main/java/org/red5/server/net/remoting/codec/RemotingProtocolEncoder.java
@@ -41,7 +41,7 @@ public class RemotingProtocolEncoder {
/**
* Encodes the given buffer.
- *
+ *
* @param message
* message
* @return buffer
@@ -124,7 +124,7 @@ public IoBuffer encode(Object message) throws Exception {
/**
* Generate error object to return for given exception.
- *
+ *
* @param code
* call
* @param error
diff --git a/server/src/main/java/org/red5/server/net/remoting/message/RemotingPacket.java b/server/src/main/java/org/red5/server/net/remoting/message/RemotingPacket.java
index c779c7f9c..65db8c2d9 100644
--- a/server/src/main/java/org/red5/server/net/remoting/message/RemotingPacket.java
+++ b/server/src/main/java/org/red5/server/net/remoting/message/RemotingPacket.java
@@ -46,7 +46,7 @@ public class RemotingPacket {
/**
* Create remoting packet from list of pending calls
- *
+ *
* @param headers
* headers
* @param calls
@@ -59,7 +59,7 @@ public RemotingPacket(Map headers, List calls) {
/**
* Get the headers sent with the request.
- *
+ *
* @return headers
*/
public Map getHeaders() {
@@ -96,7 +96,7 @@ public String getScopePath() {
/**
* Return the encoding of the included calls.
- *
+ *
* @return encoding
*/
public Encoding getEncoding() {
diff --git a/server/src/main/java/org/red5/server/net/rtmp/IRTMPConnManager.java b/server/src/main/java/org/red5/server/net/rtmp/IRTMPConnManager.java
index 542c57ac1..1c5add5b8 100644
--- a/server/src/main/java/org/red5/server/net/rtmp/IRTMPConnManager.java
+++ b/server/src/main/java/org/red5/server/net/rtmp/IRTMPConnManager.java
@@ -13,7 +13,7 @@ public interface IRTMPConnManager {
/**
* Returns a connection matching the given client id.
- *
+ *
* @param clientId
* client id
* @return connection
@@ -22,7 +22,7 @@ public interface IRTMPConnManager {
/**
* Returns a connection matching the given session id.
- *
+ *
* @param sessionId
* session id
* @return connection
@@ -31,7 +31,7 @@ public interface IRTMPConnManager {
/**
* Creates a connection based on the given RTMPConnection class.
- *
+ *
* @param connCls
* class
* @return connection
@@ -40,7 +40,7 @@ public interface IRTMPConnManager {
/**
* Removes a connection matching the client id specified. If found, the connection will be returned.
- *
+ *
* @param clientId
* client id
* @return connection
@@ -49,7 +49,7 @@ public interface IRTMPConnManager {
/**
* Removes all the connections from the set.
- *
+ *
* @return connections
*/
Collection removeConnections();
diff --git a/server/src/main/java/org/red5/server/net/rtmp/InboundHandshake.java b/server/src/main/java/org/red5/server/net/rtmp/InboundHandshake.java
index 9b6ff3330..206adbf7e 100644
--- a/server/src/main/java/org/red5/server/net/rtmp/InboundHandshake.java
+++ b/server/src/main/java/org/red5/server/net/rtmp/InboundHandshake.java
@@ -20,7 +20,7 @@
/**
* Performs handshaking for server connections.
- *
+ *
* @author Paul Gregoire
*/
public class InboundHandshake extends RTMPHandshake {
@@ -51,7 +51,7 @@ public InboundHandshake(byte handshakeType, int algorithm) {
/**
* Generates response for versioned connections.
- *
+ *
* @param in
* incoming RTMP handshake bytes
* @return outgoing handshake
@@ -65,13 +65,13 @@ public IoBuffer doHandshake(IoBuffer in) {
/**
* Decodes the first client request (C1) and returns a server response (S0S1).
- *
+ *
*
* C1 = 1536 bytes from the client
* S0 = 0x03 (server handshake type - 0x03, 0x06, 0x08, or 0x09)
* S1 = 1536 bytes from server
*
- *
+ *
* @param in
* incoming handshake C1
* @return server response S0+S1
@@ -198,7 +198,7 @@ public IoBuffer decodeClientRequest1(IoBuffer in) {
System.arraycopy(signatureResponse, 0, c1, (Constants.HANDSHAKE_SIZE - DIGEST_LENGTH), DIGEST_LENGTH);
// create output buffer for S0+S1+S2
IoBuffer s0s1s2 = IoBuffer.allocate(Constants.HANDSHAKE_SIZE * 2 + 1); // 3073
- // set handshake with encryption type
+ // set handshake with encryption type
s0s1s2.put(handshakeType); // 1
s0s1s2.put(s1); // 1536
s0s1s2.put(c1); // 1536
@@ -213,12 +213,12 @@ public IoBuffer decodeClientRequest1(IoBuffer in) {
/**
* Decodes the second client request (C2) and returns a server response (S2).
- *
+ *
*
* C2 = Copy of S1 bytes
* S2 = Copy of C1 bytes
*
- *
+ *
* @param in
* incoming handshake C2
* @return true if C2 was processed successfully and false otherwise
@@ -294,7 +294,7 @@ public boolean decodeClientRequest2(IoBuffer in) {
/**
* Generates response for non-versioned connections, such as those before FP9.
- *
+ *
* @param input
* incoming RTMP bytes
* @return outgoing handshake
@@ -355,7 +355,7 @@ protected void createHandshakeBytes() {
/**
* Determines the validation scheme for given input.
- *
+ *
* @param handshake
* handshake bytes from the client
* @return true if client used a supported validation scheme, false if unsupported
@@ -405,7 +405,7 @@ private boolean validateScheme(byte[] handshake, int scheme) {
/**
* Encrypt via xtea.
- *
+ *
* @param in
* @param index
* @param keyId
@@ -417,7 +417,7 @@ private void encryptXtea(byte[] in, int index, int keyId) {
/**
* Encrypt via blowfish.
- *
+ *
* @param in
* @param index
* @param keyId
diff --git a/server/src/main/java/org/red5/server/net/rtmp/RTMPConnManager.java b/server/src/main/java/org/red5/server/net/rtmp/RTMPConnManager.java
index 9527a97c5..b0377b2f3 100644
--- a/server/src/main/java/org/red5/server/net/rtmp/RTMPConnManager.java
+++ b/server/src/main/java/org/red5/server/net/rtmp/RTMPConnManager.java
@@ -39,7 +39,7 @@
/**
* Responsible for management and creation of RTMP based connections.
- *
+ *
* @author The Red5 Project
*/
public class RTMPConnManager implements IConnectionManager, ApplicationContextAware, DisposableBean {
@@ -91,7 +91,7 @@ public void run() {
break;
default:
// XXX implement as a task and fix logic
- // ghost clean up
+ // ghost clean up
// if (max time allowed for no response from client exceeded, ping)
// // Ping client
// conn.ping();
@@ -189,7 +189,7 @@ public RTMPConnection createConnection(Class connCls, String sessionId) {
/**
* Adds a connection.
- *
+ *
* @param conn
* connection
*/
@@ -216,7 +216,7 @@ public void setConnection(RTMPConnection conn) {
/**
* Returns a connection for a given client id.
- *
+ *
* @param clientId
* client id
* @return connection if found and null otherwise
@@ -233,7 +233,7 @@ public RTMPConnection getConnection(int clientId) {
/**
* Returns a connection for a given session id.
- *
+ *
* @param sessionId session id
* @return connection if found and null otherwise
*/
@@ -296,7 +296,7 @@ public Collection removeConnections() {
/**
* Creates a connection instance based on the supplied type.
- *
+ *
* @param cls
* class
* @return connection
diff --git a/server/src/main/java/org/red5/server/net/rtmp/RTMPMinaIoHandler.java b/server/src/main/java/org/red5/server/net/rtmp/RTMPMinaIoHandler.java
index 249431364..81036f161 100644
--- a/server/src/main/java/org/red5/server/net/rtmp/RTMPMinaIoHandler.java
+++ b/server/src/main/java/org/red5/server/net/rtmp/RTMPMinaIoHandler.java
@@ -251,7 +251,7 @@ public void exceptionCaught(IoSession session, Throwable cause) throws Exception
/**
* Close and clean-up the IoSession.
- *
+ *
* @param session
* @param immediately
* close without waiting for the write queue to flush
diff --git a/server/src/main/java/org/red5/server/net/rtmp/RTMPMinaTransport.java b/server/src/main/java/org/red5/server/net/rtmp/RTMPMinaTransport.java
index 718779c21..bed27af1b 100644
--- a/server/src/main/java/org/red5/server/net/rtmp/RTMPMinaTransport.java
+++ b/server/src/main/java/org/red5/server/net/rtmp/RTMPMinaTransport.java
@@ -40,10 +40,10 @@
/**
* Transport setup class configures socket acceptor and thread pools for RTMP in Mina.
- *
+ *
* Note: This code originates from AsyncWeb. Originally modified by Luke Hubbard.
* var nc:NetConnection = new NetConnection();
* nc.proxyType = "best";
* nc.connect("rtmps:\\localhost\app");
*
- *
+ *
* https://issues.apache.org/jira/browse/DIRMINA-272 https://issues.apache.org/jira/browse/DIRMINA-997
- *
+ *
* Transport Layer Security (TLS) Renegotiation Issue http://www.oracle.com/technetwork/java/javase/documentation/tlsreadme2-176330.html
* Secure renegotiation https://jce.iaik.tugraz.at/sic/Products/Communication-Messaging-Security/iSaSiLk/documentation/Secure-Renegotiation
* Troubleshooting a HTTPS TLSv1 handshake http://integr8consulting.blogspot.com/2012/02/troubleshooting-https-tlsv1-handshake.html
* How to analyze Java SSL errors http://www.smartjava.org/content/how-analyze-java-ssl-errors
- *
+ *
* @author Kevin Green (kevygreen@gmail.com)
* @author Paul Gregoire (mondain@gmail.com)
*/
@@ -158,7 +158,7 @@ public void sessionCreated(IoSession session) throws Exception {
log.debug("SSL context supported protocol: {}", protocol);
}
}
- // compatibility: remove the SSLv2Hello message in the available protocols - some systems will fail
+ // compatibility: remove the SSLv2Hello message in the available protocols - some systems will fail
// to handshake if TSLv1 messages are enwrapped with SSLv2 messages, Java 6 tries to send TSLv1 embedded in SSLv2
} else {
log.warn("Keystore or Truststore file does not exist");
@@ -210,7 +210,7 @@ public void sessionCreated(IoSession session) throws Exception {
/**
* Password used to access the keystore file.
- *
+ *
* @param password
* keystore password
*/
@@ -220,7 +220,7 @@ public void setKeystorePassword(String password) {
/**
* Password used to access the truststore file.
- *
+ *
* @param password
* truststore password
*/
@@ -230,7 +230,7 @@ public void setTruststorePassword(String password) {
/**
* Set keystore data from a file.
- *
+ *
* @param path
* contains keystore
*/
@@ -240,7 +240,7 @@ public void setKeystoreFile(String path) {
/**
* Set truststore file path.
- *
+ *
* @param path
* contains truststore
*/
diff --git a/server/src/main/java/org/red5/server/net/rtmpt/BaseRTMPTConnection.java b/server/src/main/java/org/red5/server/net/rtmpt/BaseRTMPTConnection.java
index 3d1220167..9e41398a1 100644
--- a/server/src/main/java/org/red5/server/net/rtmpt/BaseRTMPTConnection.java
+++ b/server/src/main/java/org/red5/server/net/rtmpt/BaseRTMPTConnection.java
@@ -30,7 +30,7 @@
/**
* Base RTMPT client / session.
- *
+ *
* @author The Red5 Project
* @author Paul Gregoire (mondain@gmail.com)
*/
diff --git a/server/src/main/java/org/red5/server/net/rtmpt/RTMPTConnection.java b/server/src/main/java/org/red5/server/net/rtmpt/RTMPTConnection.java
index 6fc572912..e5eeb8aac 100644
--- a/server/src/main/java/org/red5/server/net/rtmpt/RTMPTConnection.java
+++ b/server/src/main/java/org/red5/server/net/rtmpt/RTMPTConnection.java
@@ -24,7 +24,7 @@
/**
* A RTMPT client / session.
- *
+ *
* @author The Red5 Project
* @author Joachim Bauch (jojo@struktur.de)
* @author Paul Gregoire (mondain@gmail.com)
@@ -84,7 +84,7 @@ public class RTMPTConnection extends BaseRTMPTConnection {
/**
* Returns the IoSession. Note that this is a compatibility item and is not constructed by Mina.
- *
+ *
* @return ioSession
*/
@Override
@@ -127,7 +127,7 @@ public void close() {
/**
* Received message object router.
- *
+ *
* @param message
* an IoBuffer or Packet
*/
@@ -197,7 +197,7 @@ public void setRemotePort(int remotePort) {
/**
* Set the servlet that created the connection.
- *
+ *
* @param servlet
* rtmp servlet
*/
@@ -207,7 +207,7 @@ protected void setServlet(RTMPTServlet servlet) {
/**
* Setter for servlet request.
- *
+ *
* @param request
* Servlet request
*/
@@ -224,7 +224,7 @@ public void setServletRequest(HttpServletRequest request) {
/**
* Return the polling delay to use.
- *
+ *
* @return the polling delay
*/
public byte getPollingDelay() {
@@ -271,7 +271,7 @@ public void dataReceived() {
/**
* Get the timestamp of last data received
- *
+ *
* @return time when last data received
*/
public Long getLastDataReceived() {
diff --git a/server/src/main/java/org/red5/server/net/rtmpt/RTMPTHandler.java b/server/src/main/java/org/red5/server/net/rtmpt/RTMPTHandler.java
index 4eec6ff67..8925cdf7c 100644
--- a/server/src/main/java/org/red5/server/net/rtmpt/RTMPTHandler.java
+++ b/server/src/main/java/org/red5/server/net/rtmpt/RTMPTHandler.java
@@ -14,7 +14,7 @@
/**
* Handler for RTMPT messages.
- *
+ *
* @author The Red5 Project
* @author Joachim Bauch (jojo@struktur.de)
* @author Paul Gregoire (mondain@gmail.com)
@@ -49,7 +49,7 @@ public RTMPTCodecFactory getCodecFactory() {
/**
* Return hostname for URL.
- *
+ *
* @param url
* URL
* @return Hostname from that URL
diff --git a/server/src/main/java/org/red5/server/net/rtmpt/RTMPTServlet.java b/server/src/main/java/org/red5/server/net/rtmpt/RTMPTServlet.java
index 3ae410e43..86ca5d667 100644
--- a/server/src/main/java/org/red5/server/net/rtmpt/RTMPTServlet.java
+++ b/server/src/main/java/org/red5/server/net/rtmpt/RTMPTServlet.java
@@ -42,7 +42,7 @@
/**
* Servlet that handles all RTMPT requests.
- *
+ *
* @author The Red5 Project
* @author Joachim Bauch (jojo@struktur.de)
* @author Paul Gregoire (mondain@gmail.com)
@@ -99,7 +99,7 @@ public class RTMPTServlet extends HttpServlet {
/**
* Return an error message to the client.
- *
+ *
* @param message
* Message
* @param resp
@@ -145,7 +145,7 @@ protected void handleBadRequest(String message, HttpServletResponse resp) throws
/**
* Return a single byte to the client.
- *
+ *
* @param message
* Message
* @param resp
@@ -166,7 +166,7 @@ protected void returnMessage(byte message, HttpServletResponse resp) throws IOEx
/**
* Return a message to the client.
- *
+ *
* @param message
* Message
* @param resp
@@ -187,7 +187,7 @@ protected void returnMessage(String message, HttpServletResponse resp) throws IO
/**
* Return raw data to the client.
- *
+ *
* @param conn
* RTMP connection
* @param buffer
@@ -241,7 +241,7 @@ protected void setRequestInfo(HttpServletRequest req) {
/**
* Skip data sent by the client.
- *
+ *
* @param req
* Servlet request
* @throws IOException
@@ -261,7 +261,7 @@ protected void skipData(HttpServletRequest req) throws IOException {
/**
* Send pending messages to client.
- *
+ *
* @param conn
* RTMP connection
* @param resp
@@ -302,7 +302,7 @@ protected void returnPendingMessages(RTMPTConnection conn, HttpServletResponse r
/**
* Start a new RTMPT session.
- *
+ *
* @param req
* Servlet request
* @param resp
@@ -323,7 +323,7 @@ protected void handleOpen(HttpServletRequest req, HttpServletResponse resp) thro
conn.setServletRequest(req);
// add the connection to the manager
manager.setConnection(conn);
- // set handler
+ // set handler
conn.setHandler(handler);
conn.setDecoder(handler.getCodecFactory().getRTMPDecoder());
conn.setEncoder(handler.getCodecFactory().getRTMPEncoder());
@@ -349,7 +349,7 @@ protected void handleOpen(HttpServletRequest req, HttpServletResponse resp) thro
/**
* Close a RTMPT session.
- *
+ *
* @param req
* Servlet request
* @param resp
@@ -374,7 +374,7 @@ protected void handleClose(HttpServletRequest req, HttpServletResponse resp) thr
/**
* Add data for an established session.
- *
+ *
* @param req
* Servlet request
* @param resp
@@ -485,7 +485,7 @@ protected void handleSend(HttpServletRequest req, HttpServletResponse resp) thro
/**
* Poll RTMPT session for updates.
- *
+ *
* @param req
* Servlet request
* @param resp
@@ -511,7 +511,7 @@ protected void handleIdle(HttpServletRequest req, HttpServletResponse resp) thro
/**
* Main entry point for the servlet.
- *
+ *
* @param req
* Request object
* @param resp
@@ -582,7 +582,7 @@ protected void service(HttpServletRequest req, HttpServletResponse resp) throws
break;
case 'f': // HTTPIdent request (ident and ident2)
//if HTTPIdent is requested send back some Red5 info
- //http://livedocs.adobe.com/flashmediaserver/3.0/docs/help.html?content=08_xmlref_011.html
+ //http://livedocs.adobe.com/flashmediaserver/3.0/docs/help.html?content=08_xmlref_011.html
String ident = "Red5 Red5 Server manager) {
/**
* Set the RTMPTHandler to use in this servlet.
- *
+ *
* @param handler
* handler
*/
@@ -687,7 +687,7 @@ public void setHandler(RTMPTHandler handler) {
/**
* Set the fcs/ident2 string
- *
+ *
* @param ident2
* ident2 string
*/
@@ -697,7 +697,7 @@ public void setIdent2(String ident2) {
/**
* Sets the target size for responses
- *
+ *
* @param targetResponseSize
* the targetResponseSize to set
*/
diff --git a/server/src/main/java/org/red5/server/net/servlet/AMFGatewayServlet.java b/server/src/main/java/org/red5/server/net/servlet/AMFGatewayServlet.java
index 8e3c669a3..c9c6a47ae 100644
--- a/server/src/main/java/org/red5/server/net/servlet/AMFGatewayServlet.java
+++ b/server/src/main/java/org/red5/server/net/servlet/AMFGatewayServlet.java
@@ -35,7 +35,7 @@
/**
* Servlet that handles remoting requests.
- *
+ *
* @author The Red5 Project
* @author Luke Hubbard (luke@codegent.com)
* @author Paul Gregoire (mondain@gmail.com)
@@ -86,7 +86,7 @@ public void service(HttpServletRequest req, HttpServletResponse resp) throws Ser
if (codecFactory == null) {
ServletContext ctx = getServletContext();
log.debug("Context path: {}", ctx.getContextPath());
- //attempt to lookup the webapp context
+ //attempt to lookup the webapp context
webAppCtx = WebApplicationContextUtils.getRequiredWebApplicationContext(ctx);
//now try to look it up as an attribute
if (webAppCtx == null) {
@@ -111,7 +111,7 @@ public void service(HttpServletRequest req, HttpServletResponse resp) throws Ser
/**
* Return the global scope to use for the given request.
- *
+ *
* @param req
* http request
* @return scope
@@ -137,7 +137,7 @@ protected IGlobalScope getGlobalScope(HttpServletRequest req) {
/**
* Works out AMF request
- *
+ *
* @param req
* Request
* @param resp
@@ -193,7 +193,7 @@ protected void serviceAMF(HttpServletRequest req, HttpServletResponse resp) thro
/**
* Decode request
- *
+ *
* @param req
* Request
* @return Remoting packet
@@ -231,7 +231,7 @@ protected RemotingPacket decodeRequest(HttpServletRequest req) throws Exception
/**
* Handles AMF request by making calls
- *
+ *
* @param req
* Request
* @param context
@@ -243,7 +243,7 @@ protected RemotingPacket decodeRequest(HttpServletRequest req) throws Exception
* @return
* true
*
- *
+ *
* on success
*/
protected boolean handleRemotingPacket(HttpServletRequest req, IContext context, IScope scope, RemotingPacket message) {
@@ -262,7 +262,7 @@ protected boolean handleRemotingPacket(HttpServletRequest req, IContext context,
/**
* Sends response to client
- *
+ *
* @param resp
* Response
* @param packet
diff --git a/server/src/main/java/org/red5/server/net/servlet/AMFTunnelServlet.java b/server/src/main/java/org/red5/server/net/servlet/AMFTunnelServlet.java
index 5fb5b7f61..d0a5fe895 100644
--- a/server/src/main/java/org/red5/server/net/servlet/AMFTunnelServlet.java
+++ b/server/src/main/java/org/red5/server/net/servlet/AMFTunnelServlet.java
@@ -29,7 +29,7 @@
/**
* Servlet to tunnel to the AMF gateway servlet.
- *
+ *
* @author The Red5 Project
* @author Paul Gregoire (mondain@gmail.com)
*/
diff --git a/server/src/main/java/org/red5/server/net/servlet/RedirectHTTPServlet.java b/server/src/main/java/org/red5/server/net/servlet/RedirectHTTPServlet.java
index 40b2f3985..0d282bf1e 100644
--- a/server/src/main/java/org/red5/server/net/servlet/RedirectHTTPServlet.java
+++ b/server/src/main/java/org/red5/server/net/servlet/RedirectHTTPServlet.java
@@ -16,7 +16,7 @@
/**
* Servlet to redirect to HTTP port of Red5.
- *
+ *
* @author The Red5 Project
* @author Joachim Bauch (jojo@struktur.de)
*/
diff --git a/server/src/main/java/org/red5/server/persistence/FilePersistence.java b/server/src/main/java/org/red5/server/persistence/FilePersistence.java
index 0de672784..4b769e36f 100644
--- a/server/src/main/java/org/red5/server/persistence/FilePersistence.java
+++ b/server/src/main/java/org/red5/server/persistence/FilePersistence.java
@@ -34,7 +34,7 @@
/**
* Simple file-based persistence for objects. Lowers memory usage if used instead of RAM memory storage.
- *
+ *
* @author The Red5 Project
* @author Joachim Bauch (jojo@struktur.de)
*/
@@ -84,7 +84,7 @@ public class FilePersistence extends RamPersistence {
/**
* Create file persistence object from given resource pattern resolver
- *
+ *
* @param resolver
* Resource pattern resolver and loader
*/
@@ -95,7 +95,7 @@ public FilePersistence(ResourcePatternResolver resolver) {
/**
* Create file persistence object for given scope
- *
+ *
* @param scope
* Scope
*/
@@ -115,7 +115,7 @@ public FilePersistence(IScope scope) {
/**
* Returns the context path.
- *
+ *
* @param rootFile
* @return context path
*/
@@ -139,7 +139,7 @@ private String getContextPath(Resource rootFile) {
/**
* Initializes the root directory and creates it if it doesn't already exist.
- *
+ *
* @param rootFile
* @param contextPath
* @throws IOException
@@ -229,7 +229,7 @@ public void setPersistenceInterval(int persistenceInterval) {
/**
* Return file path for persistable object
- *
+ *
* @param object
* Object to obtain file path for
* @return Path on disk
@@ -240,7 +240,7 @@ private String getObjectFilepath(IPersistable object) {
/**
* Return file path for persistable object
- *
+ *
* @param object
* Object to obtain file path for
* @param completePath
@@ -300,7 +300,7 @@ protected String getObjectPath(String id, String name) {
/**
* Get filename for persistable object
- *
+ *
* @param object
* Persistable object
* @return Name of file where given object is persisted to
@@ -316,7 +316,7 @@ private String getObjectFilename(IPersistable object) {
/**
* Load resource with given name
- *
+ *
* @param name
* Resource name
* @return Persistable object
@@ -327,7 +327,7 @@ private IPersistable doLoad(String name) {
/**
* Load resource with given name and attaches to persistable object
- *
+ *
* @param name
* Resource name
* @param object
@@ -469,21 +469,21 @@ public boolean load(IPersistable object) {
/**
* Save persistable object
- *
+ *
* @param object
* Persistable object
* @return
- *
+ *
*
* true
*
- *
+ *
* on success,
- *
+ *
*
* false
*
- *
+ *
* otherwise
*/
protected boolean saveObject(IPersistable object) {
@@ -590,7 +590,7 @@ public boolean save(IPersistable object) {
/**
* Remove empty dirs
- *
+ *
* @param base
* Base directory
*/
diff --git a/server/src/main/java/org/red5/server/scope/BroadcastScope.java b/server/src/main/java/org/red5/server/scope/BroadcastScope.java
index 0297029c3..b740798a9 100644
--- a/server/src/main/java/org/red5/server/scope/BroadcastScope.java
+++ b/server/src/main/java/org/red5/server/scope/BroadcastScope.java
@@ -52,7 +52,7 @@ public class BroadcastScope extends BasicScope implements IBroadcastScope, IPipe
/**
* Creates broadcast scope
- *
+ *
* @param parent
* Parent scope
* @param name
@@ -66,7 +66,7 @@ public BroadcastScope(IScope parent, String name) {
/**
* Register pipe connection event listener with this scope's pipe. A listener that wants to listen to events when provider/consumer connects to or disconnects from a specific pipe.
- *
+ *
* @param listener
* Pipe connection event listener
* @see org.red5.server.messaging.IPipeConnectionListener
@@ -77,7 +77,7 @@ public void addPipeConnectionListener(IPipeConnectionListener listener) {
/**
* Unregisters pipe connection event listener with this scope's pipe
- *
+ *
* @param listener
* Pipe connection event listener
* @see org.red5.server.messaging.IPipeConnectionListener
@@ -88,7 +88,7 @@ public void removePipeConnectionListener(IPipeConnectionListener listener) {
/**
* Pull message from pipe
- *
+ *
* @return Message object
* @see org.red5.server.messaging.IMessage
*/
@@ -98,7 +98,7 @@ public IMessage pullMessage() {
/**
* Pull message with timeout
- *
+ *
* @param wait
* Timeout
* @return Message object
@@ -123,7 +123,7 @@ public boolean subscribe(IConsumer consumer, Map paramMap) {
/**
* Disconnects scope's pipe from given consumer
- *
+ *
* @param consumer
* Consumer
* @return true on success, false otherwise
@@ -134,7 +134,7 @@ public boolean unsubscribe(IConsumer consumer) {
/**
* Getter for pipe consumers
- *
+ *
* @return Pipe consumers
*/
public List getConsumers() {
@@ -155,7 +155,7 @@ public void sendOOBControlMessage(IConsumer consumer, OOBControlMessage oobCtrlM
/**
* Push a message to this output endpoint. May block the pusher when output can't handle the message at the time.
- *
+ *
* @param message
* Message to be pushed
* @throws IOException
@@ -167,7 +167,7 @@ public void pushMessage(IMessage message) throws IOException {
/**
* Connect scope's pipe with given provider
- *
+ *
* @param provider
* Provider
* @param paramMap
@@ -180,7 +180,7 @@ public boolean subscribe(IProvider provider, Map paramMap) {
/**
* Disconnects scope's pipe from given provider
- *
+ *
* @param provider
* Provider
* @return true on success, false otherwise
@@ -191,7 +191,7 @@ public boolean unsubscribe(IProvider provider) {
/**
* Getter for providers list
- *
+ *
* @return List of providers
*/
public List getProviders() {
@@ -212,7 +212,7 @@ public void sendOOBControlMessage(IProvider provider, OOBControlMessage oobCtrlM
/**
* Pipe connection event handler
- *
+ *
* @param event
* Pipe connection event
*/
@@ -252,7 +252,7 @@ public IClientBroadcastStream getClientBroadcastStream() {
/**
* Sets the client broadcast stream
- *
+ *
* @param clientBroadcastStream
* stream
*/
diff --git a/server/src/main/java/org/red5/server/scope/GlobalScope.java b/server/src/main/java/org/red5/server/scope/GlobalScope.java
index 385cf274b..6e0585d68 100644
--- a/server/src/main/java/org/red5/server/scope/GlobalScope.java
+++ b/server/src/main/java/org/red5/server/scope/GlobalScope.java
@@ -17,7 +17,7 @@
/**
* Global scope is a top level scope. Server instance is meant to be injected with Spring before initialization (otherwise NullPointerException is thrown).
- *
+ *
* @see org.red5.server.api.scope.IGlobalScope
* @see org.red5.server.api.scope.IScope
* @see org.red5.server.scope.Scope
@@ -34,7 +34,7 @@ public class GlobalScope extends Scope implements IGlobalScope, GlobalScopeMXBea
}
/**
- *
+ *
* @param persistenceClass Persistent class name
* @throws Exception Exception
*/
@@ -47,7 +47,7 @@ public void setPersistenceClass(String persistenceClass) throws Exception {
/**
* Get persistence store for scope
- *
+ *
* @return Persistence store
*/
@Override
@@ -65,7 +65,7 @@ public IPersistenceStore getStore() {
/**
* Setter for server
- *
+ *
* @param server Server
*/
public void setServer(IServer server) {
diff --git a/server/src/main/java/org/red5/server/scope/RoomScope.java b/server/src/main/java/org/red5/server/scope/RoomScope.java
index d6462470a..c334662d2 100644
--- a/server/src/main/java/org/red5/server/scope/RoomScope.java
+++ b/server/src/main/java/org/red5/server/scope/RoomScope.java
@@ -4,7 +4,7 @@
/**
* Represents a subscope to other scopes.
- *
+ *
* @author Paul Gregoire (mondain@gmail.com)
*/
public class RoomScope extends Scope {
diff --git a/server/src/main/java/org/red5/server/scope/ScopeResolver.java b/server/src/main/java/org/red5/server/scope/ScopeResolver.java
index 6118ef596..eab7592e0 100644
--- a/server/src/main/java/org/red5/server/scope/ScopeResolver.java
+++ b/server/src/main/java/org/red5/server/scope/ScopeResolver.java
@@ -34,7 +34,7 @@ public class ScopeResolver implements IScopeResolver {
/**
* Getter for global scope
- *
+ *
* @return Global scope
*/
public IGlobalScope getGlobalScope() {
@@ -43,7 +43,7 @@ public IGlobalScope getGlobalScope() {
/**
* Setter for global scope
- *
+ *
* @param root
* Global scope
*/
diff --git a/server/src/main/java/org/red5/server/scope/WebScope.java b/server/src/main/java/org/red5/server/scope/WebScope.java
index 6318a2fe4..2f6ba7854 100644
--- a/server/src/main/java/org/red5/server/scope/WebScope.java
+++ b/server/src/main/java/org/red5/server/scope/WebScope.java
@@ -37,7 +37,7 @@
*
* Then it loads virtual hosts configuration, adds mappings of paths to global scope that is injected thru Spring IoC context file and runs initialization process.
*
- *
+ *
* Red5 server implementation instance and ServletContext are injected as well.
*/
@ManagedResource
@@ -110,7 +110,7 @@ public void destroy() throws Exception {
/**
* Setter for global scope. Sets persistence class.
- *
+ *
* @param globalScope
* Red5 global scope
*/
@@ -141,7 +141,7 @@ public void setParent() {
/**
* Setter for server
- *
+ *
* @param server
* Server instance
*/
@@ -152,7 +152,7 @@ public void setServer(IServer server) {
/**
* Servlet context
- *
+ *
* @param servletContext
* Servlet context
*/
@@ -162,7 +162,7 @@ public void setServletContext(ServletContext servletContext) {
/**
* Setter for context path
- *
+ *
* @param contextPath
* Context path
*/
@@ -173,7 +173,7 @@ public void setContextPath(String contextPath) {
/**
* Return scope context path
- *
+ *
* @return Scope context path
*/
@Override
@@ -183,7 +183,7 @@ public String getContextPath() {
/**
* Setter for virtual hosts. Creates array of hostnames.
- *
+ *
* @param virtualHosts
* Virtual hosts list as string
*/
@@ -278,7 +278,7 @@ public IServer getServer() {
/**
* Return object that can be used to load new applications.
- *
+ *
* @return the application loader
*/
public IApplicationLoader getApplicationLoader() {
@@ -308,7 +308,7 @@ private final void getAppContext() {
/**
* Is the scope currently shutting down?
- *
+ *
* @return is shutting down
*/
public boolean isShuttingDown() {
diff --git a/server/src/main/java/org/red5/server/security/IRed5Realm.java b/server/src/main/java/org/red5/server/security/IRed5Realm.java
index 9010a4c42..a2e3d7995 100644
--- a/server/src/main/java/org/red5/server/security/IRed5Realm.java
+++ b/server/src/main/java/org/red5/server/security/IRed5Realm.java
@@ -12,35 +12,35 @@
/**
* Red5 security realm.
- *
+ *
* @author Paul Gregoire
*/
public interface IRed5Realm {
/**
* Sets a servlet context.
- *
+ *
* @param servletContext
*/
void setServletContext(ServletContext servletContext);
/**
* Returns the servlet context.
- *
+ *
* @return servlet context
*/
ServletContext getServletContext();
/**
* Sets an application context.
- *
+ *
* @param applicationContext
*/
void setApplicationContext(ApplicationContext applicationContext);
/**
* Returns the application context.
- *
+ *
* @return application context
*/
ApplicationContext getApplicationContext();
diff --git a/server/src/main/java/org/red5/server/security/jaas/SimpleLoginModule.java b/server/src/main/java/org/red5/server/security/jaas/SimpleLoginModule.java
index ec98c3edc..5818aa7db 100644
--- a/server/src/main/java/org/red5/server/security/jaas/SimpleLoginModule.java
+++ b/server/src/main/java/org/red5/server/security/jaas/SimpleLoginModule.java
@@ -26,7 +26,7 @@
/**
* This LoginModule authenticates a user with a password. This module comes pre-loaded with one user / password pair and the ability for implementers to add additional pairs. The pre-loaded user is "red5" and their password is "password".
- *
+ *
* @author Paul Gregoire (mondain@gmail.com)
*/
public class SimpleLoginModule implements LoginModule {
@@ -150,7 +150,7 @@ public boolean logout() throws LoginException {
/**
* Adds a new Principal, given a user name and password.
- *
+ *
* @param userName
* @param password
*/
diff --git a/server/src/main/java/org/red5/server/security/jaas/SimplePrincipal.java b/server/src/main/java/org/red5/server/security/jaas/SimplePrincipal.java
index 0e638be0a..b0a0706ea 100644
--- a/server/src/main/java/org/red5/server/security/jaas/SimplePrincipal.java
+++ b/server/src/main/java/org/red5/server/security/jaas/SimplePrincipal.java
@@ -13,7 +13,7 @@
/**
* Represents a user. Subject to augment it with an additional identity. Authorization decisions can be based upon the Principals associated with a Subject.
- *
+ *
* @see java.security.Principal
* @see javax.security.auth.Subject
*/
@@ -30,7 +30,7 @@ public class SimplePrincipal implements Principal, Serializable {
/**
* Create a Principal with the given name.
- *
+ *
* @param name
* the username for this user
* @param password
diff --git a/server/src/main/java/org/red5/server/service/BaseStreamableFileService.java b/server/src/main/java/org/red5/server/service/BaseStreamableFileService.java
index 6f76443a3..b60330ba2 100644
--- a/server/src/main/java/org/red5/server/service/BaseStreamableFileService.java
+++ b/server/src/main/java/org/red5/server/service/BaseStreamableFileService.java
@@ -17,7 +17,7 @@
/**
* Base class for streamable file services.
- *
+ *
* @author The Red5 Project
* @author Joachim Bauch (jojo@struktur.de)
* @author Paul Gregoire (mondain@gmail.com)
diff --git a/server/src/main/java/org/red5/server/service/ContextServiceResolver.java b/server/src/main/java/org/red5/server/service/ContextServiceResolver.java
index 857025973..d2b2c378e 100644
--- a/server/src/main/java/org/red5/server/service/ContextServiceResolver.java
+++ b/server/src/main/java/org/red5/server/service/ContextServiceResolver.java
@@ -11,7 +11,7 @@
/**
* Resolve services that have been configured in the context of a scope.
- *
+ *
* @author The Red5 Project
* @author Joachim Bauch (jojo@struktur.de)
*/
diff --git a/server/src/main/java/org/red5/server/service/ShutdownServer.java b/server/src/main/java/org/red5/server/service/ShutdownServer.java
index 5e3bbf738..ef0fa2ecd 100644
--- a/server/src/main/java/org/red5/server/service/ShutdownServer.java
+++ b/server/src/main/java/org/red5/server/service/ShutdownServer.java
@@ -41,7 +41,7 @@
/**
* Server/service to perform orderly and controlled shutdown and clean up of Red5.
- *
+ *
* @author Paul Gregoire (mondain@gmail.com)
*/
public class ShutdownServer implements ApplicationContextAware, InitializingBean, DisposableBean {
diff --git a/server/src/main/java/org/red5/server/service/flv/IFLVService.java b/server/src/main/java/org/red5/server/service/flv/IFLVService.java
index d3e841172..f11a71ede 100644
--- a/server/src/main/java/org/red5/server/service/flv/IFLVService.java
+++ b/server/src/main/java/org/red5/server/service/flv/IFLVService.java
@@ -11,7 +11,7 @@
/**
* A FLVService sets up the service and hands out FLV objects to its callers
- *
+ *
* @author The Red5 Project
* @author Dominick Accattato (daccattato@gmail.com)
* @author Luke Hubbard, Codegent Ltd (luke@codegent.com)
diff --git a/server/src/main/java/org/red5/server/service/flv/impl/FLVService.java b/server/src/main/java/org/red5/server/service/flv/impl/FLVService.java
index f21255479..7ca684d21 100644
--- a/server/src/main/java/org/red5/server/service/flv/impl/FLVService.java
+++ b/server/src/main/java/org/red5/server/service/flv/impl/FLVService.java
@@ -17,7 +17,7 @@
/**
* A FLVServiceImpl sets up the service and hands out FLV objects to its callers.
- *
+ *
* @author The Red5 Project
* @author Dominick Accattato (daccattato@gmail.com)
* @author Luke Hubbard, Codegent Ltd (luke@codegent.com)
diff --git a/server/src/main/java/org/red5/server/service/m4a/IM4AService.java b/server/src/main/java/org/red5/server/service/m4a/IM4AService.java
index ed7f0bb1d..296df940a 100644
--- a/server/src/main/java/org/red5/server/service/m4a/IM4AService.java
+++ b/server/src/main/java/org/red5/server/service/m4a/IM4AService.java
@@ -11,7 +11,7 @@
/**
* A M4AService sets up the service and hands out M4A objects to its callers
- *
+ *
* @author The Red5 Project
* @author Paul Gregoire (mondain@gmail.com)
*/
diff --git a/server/src/main/java/org/red5/server/service/m4a/impl/M4AService.java b/server/src/main/java/org/red5/server/service/m4a/impl/M4AService.java
index b8740f9f9..f8398c6c1 100644
--- a/server/src/main/java/org/red5/server/service/m4a/impl/M4AService.java
+++ b/server/src/main/java/org/red5/server/service/m4a/impl/M4AService.java
@@ -17,7 +17,7 @@
/**
* A M4AServiceImpl sets up the service and hands out M4A objects to its callers.
- *
+ *
* @author The Red5 Project
* @author Paul Gregoire, (mondain@gmail.com)
*/
diff --git a/server/src/main/java/org/red5/server/service/mp3/IMP3Service.java b/server/src/main/java/org/red5/server/service/mp3/IMP3Service.java
index 50aeddf79..82d236259 100644
--- a/server/src/main/java/org/red5/server/service/mp3/IMP3Service.java
+++ b/server/src/main/java/org/red5/server/service/mp3/IMP3Service.java
@@ -11,7 +11,7 @@
/**
* Provide access to MP3 objects. Marker interface.
- *
+ *
* @author The Red5 Project
* @author Joachim Bauch (jojo@struktur.de)
*/
diff --git a/server/src/main/java/org/red5/server/service/mp4/IMP4Service.java b/server/src/main/java/org/red5/server/service/mp4/IMP4Service.java
index 987ac0371..972380eee 100644
--- a/server/src/main/java/org/red5/server/service/mp4/IMP4Service.java
+++ b/server/src/main/java/org/red5/server/service/mp4/IMP4Service.java
@@ -11,7 +11,7 @@
/**
* A MP4Service sets up the service and hands out MP4 objects to its callers
- *
+ *
* @author The Red5 Project
* @author Paul Gregoire (mondain@gmail.com)
*/
diff --git a/server/src/main/java/org/red5/server/service/mp4/impl/MP4Service.java b/server/src/main/java/org/red5/server/service/mp4/impl/MP4Service.java
index a09a43558..52fbed853 100644
--- a/server/src/main/java/org/red5/server/service/mp4/impl/MP4Service.java
+++ b/server/src/main/java/org/red5/server/service/mp4/impl/MP4Service.java
@@ -17,7 +17,7 @@
/**
* A MP4ServiceImpl sets up the service and hands out MP4 objects to its callers.
- *
+ *
* @author The Red5 Project
* @author Paul Gregoire, (mondain@gmail.com)
*/
@@ -25,7 +25,7 @@ public class MP4Service extends BaseStreamableFileService implements IMP4Service
/**
* File extensions handled by this service. If there are more than one, they are comma separated. '.mp4' must be the first on the list because it is the default file extension for mp4 files.
- *
+ *
* @see http://help.adobe.com/en_US/flashmediaserver/devguide/WS5b3ccc516d4fbf351e63e3d11a0773d117-7fc8.html
*/
private static String extension = ".mp4,.f4v,.mov,.3gp,.3g2";
diff --git a/server/src/main/java/org/red5/server/statistics/StatisticsService.java b/server/src/main/java/org/red5/server/statistics/StatisticsService.java
index 0fcba5094..7776ca98a 100644
--- a/server/src/main/java/org/red5/server/statistics/StatisticsService.java
+++ b/server/src/main/java/org/red5/server/statistics/StatisticsService.java
@@ -22,7 +22,7 @@
/**
* Implementation of the statistics service.
- *
+ *
* @author The Red5 Project
* @author Joachim Bauch (jojo@struktur.de)
*/
diff --git a/server/src/main/java/org/red5/server/stream/FileStreamSource.java b/server/src/main/java/org/red5/server/stream/FileStreamSource.java
index fbb92f1fc..4ab828d48 100644
--- a/server/src/main/java/org/red5/server/stream/FileStreamSource.java
+++ b/server/src/main/java/org/red5/server/stream/FileStreamSource.java
@@ -42,7 +42,7 @@ public class FileStreamSource implements ISeekableStreamSource, Constants {
/**
* Creates file stream source with tag reader
- *
+ *
* @param reader
* Tag reader
*/
@@ -59,7 +59,7 @@ public void close() {
/**
* Get tag from queue and convert to message
- *
+ *
* @return RTMP event
*/
public IRTMPEvent dequeue() {
diff --git a/server/src/main/java/org/red5/server/stream/ISeekableStreamSource.java b/server/src/main/java/org/red5/server/stream/ISeekableStreamSource.java
index 944240310..aacd57560 100644
--- a/server/src/main/java/org/red5/server/stream/ISeekableStreamSource.java
+++ b/server/src/main/java/org/red5/server/stream/ISeekableStreamSource.java
@@ -9,14 +9,14 @@
/**
* Stream source that can be seeked in timeline
- *
+ *
* @author The Red5 Project
* @author Steven Gong (steven.gong@gmail.com)
*/
public interface ISeekableStreamSource extends IStreamSource {
/**
* Seek the stream source to timestamp ts (in milliseconds).
- *
+ *
* @param ts
* Timestamp to seek to
* @return Actual timestamp seeked to
diff --git a/server/src/main/java/org/red5/server/stream/IStreamControl.java b/server/src/main/java/org/red5/server/stream/IStreamControl.java
index c9938e76c..ce8fc7f7c 100644
--- a/server/src/main/java/org/red5/server/stream/IStreamControl.java
+++ b/server/src/main/java/org/red5/server/stream/IStreamControl.java
@@ -9,7 +9,7 @@
/**
* Stream Control Event.
- *
+ *
* Marker interface for stream control operations. Play, Pause, Resume, Seek, Stop, etc.
*/
public interface IStreamControl {
diff --git a/server/src/main/java/org/red5/server/stream/IStreamSource.java b/server/src/main/java/org/red5/server/stream/IStreamSource.java
index ab4718fae..12078b504 100644
--- a/server/src/main/java/org/red5/server/stream/IStreamSource.java
+++ b/server/src/main/java/org/red5/server/stream/IStreamSource.java
@@ -15,24 +15,24 @@
public interface IStreamSource {
/**
* Is there something more to stream?
- *
+ *
* @return
* true
*
- *
+ *
* if there's streamable data,
- *
+ *
*
* false
*
- *
+ *
* otherwise
*/
public abstract boolean hasMore();
/**
* Double ended queue of event objects
- *
+ *
* @return Event from queue
*/
public abstract IEvent dequeue();
diff --git a/server/src/main/java/org/red5/server/stream/ITokenBucket.java b/server/src/main/java/org/red5/server/stream/ITokenBucket.java
index e45e98a06..71be149e9 100644
--- a/server/src/main/java/org/red5/server/stream/ITokenBucket.java
+++ b/server/src/main/java/org/red5/server/stream/ITokenBucket.java
@@ -10,14 +10,14 @@
/**
* Basically token bucket is used to control the bandwidth used by a stream or a connection or a client. There's a background thread that distributes tokens to the buckets in the system according to the configuration of the bucket. The configuration includes how fast the tokens are distributed. When a stream, for example, needs to send out a packet, the packet's byte count is calculated and each byte corresponds to a
* token in the bucket. The stream is assigned a bucket and the tokens in the bucket are acquired before the packet can be sent out. So if the speed(or bandwidth) in configuration is low, the stream can't send out packets fast.
- *
+ *
* @author The Red5 Project
* @author Steven Gong (steven.gong@gmail.com)
*/
public interface ITokenBucket {
/**
* Acquire tokens amount of tokenCount waiting wait milliseconds if token not available.
- *
+ *
* @param tokenCount
* The count of tokens to acquire.
* @param wait
@@ -28,7 +28,7 @@ public interface ITokenBucket {
/**
* Nonblockingly acquire token. If the token is not available and task is not null, the callback will be executed when the token is available. The tokens are not consumed automatically before callback, so it's recommended to acquire token again in callback function.
- *
+ *
* @param tokenCount
* Number of tokens
* @param callback
@@ -39,7 +39,7 @@ public interface ITokenBucket {
/**
* Nonblockingly acquire token. The upper limit is specified. If not enough tokens are left in bucket, all remaining will be returned.
- *
+ *
* @param upperLimitCount
* Upper limit of aquisition
* @return Remaining tokens from bucket
@@ -48,14 +48,14 @@ public interface ITokenBucket {
/**
* Get the capacity of this bucket in Byte.
- *
+ *
* @return Capacity of this bucket in bytes
*/
long getCapacity();
/**
* The amount of tokens increased per millisecond.
- *
+ *
* @return Amount of tokens increased per millisecond.
*/
double getSpeed();
@@ -71,7 +71,7 @@ public interface ITokenBucket {
public interface ITokenBucketCallback {
/**
* Being called when the tokens requested are available.
- *
+ *
* @param bucket
* Bucket
* @param tokenCount
@@ -81,7 +81,7 @@ public interface ITokenBucketCallback {
/**
* Resets tokens in bucket
- *
+ *
* @param bucket
* Bucket
* @param tokenCount
diff --git a/server/src/main/java/org/red5/server/stream/ITokenBucketService.java b/server/src/main/java/org/red5/server/stream/ITokenBucketService.java
index fa5477530..4238c7235 100644
--- a/server/src/main/java/org/red5/server/stream/ITokenBucketService.java
+++ b/server/src/main/java/org/red5/server/stream/ITokenBucketService.java
@@ -9,7 +9,7 @@
/**
* A service used to create and manage token buckets.
- *
+ *
* @author The Red5 Project
* @author Steven Gong (steven.gong@gmail.com)
*/
@@ -18,7 +18,7 @@ public interface ITokenBucketService {
/**
* Create a token bucket.
- *
+ *
* @param capacity
* Capacity of the bucket.
* @param speed
@@ -29,7 +29,7 @@ public interface ITokenBucketService {
/**
* Remove this bucket.
- *
+ *
* @param bucket
* Bucket to remove
*/
diff --git a/server/src/main/java/org/red5/server/stream/PlayBuffer.java b/server/src/main/java/org/red5/server/stream/PlayBuffer.java
index 4285ed0a6..53727f60f 100644
--- a/server/src/main/java/org/red5/server/stream/PlayBuffer.java
+++ b/server/src/main/java/org/red5/server/stream/PlayBuffer.java
@@ -15,7 +15,7 @@
/**
* A Play buffer for sending VOD. The implementation is not synchronized.
- *
+ *
* @author The Red5 Project
* @author Steven Gong (steven.gong@gmail.com)
*/
@@ -38,7 +38,7 @@ public class PlayBuffer {
/**
* Create play buffer with given capacity
- *
+ *
* @param capacity
* Capacity of buffer
*/
@@ -48,7 +48,7 @@ public PlayBuffer(long capacity) {
/**
* Buffer capacity in bytes.
- *
+ *
* @return Buffer capacity in bytes
*/
public long getCapacity() {
@@ -67,7 +67,7 @@ public void setCapacity(long capacity) {
/**
* Number of messages in buffer.
- *
+ *
* @return Number of messages in buffer
*/
public int getMessageCount() {
@@ -76,7 +76,7 @@ public int getMessageCount() {
/**
* Total message size in bytes.
- *
+ *
* @return Total message size in bytes
*/
public long getMessageSize() {
@@ -85,7 +85,7 @@ public long getMessageSize() {
/**
* Put a message into this buffer.
- *
+ *
* @param message
* RTMP message
* @return true indicates success and false indicates buffer is full.
@@ -106,7 +106,7 @@ public boolean putMessage(RTMPMessage message) {
/**
* Take a message from this buffer. The message count decreases.
- *
+ *
* @return null if buffer is empty.
*/
public RTMPMessage takeMessage() {
@@ -123,7 +123,7 @@ public RTMPMessage takeMessage() {
/**
* Peek a message but not take it from the buffer. The message count doesn't change.
- *
+ *
* @return null if buffer is empty.
*/
public RTMPMessage peekMessage() {
diff --git a/server/src/main/java/org/red5/server/stream/RtmpSampleAccess.java b/server/src/main/java/org/red5/server/stream/RtmpSampleAccess.java
index 1d87e7071..5932aabd6 100644
--- a/server/src/main/java/org/red5/server/stream/RtmpSampleAccess.java
+++ b/server/src/main/java/org/red5/server/stream/RtmpSampleAccess.java
@@ -14,7 +14,7 @@
/**
* Default RtmpSampleAccess bean
- *
+ *
* @see org.red5.server.api.stream.IRtmpSampleAccess
*/
public class RtmpSampleAccess implements IRtmpSampleAccess {
@@ -27,7 +27,7 @@ public class RtmpSampleAccess implements IRtmpSampleAccess {
/**
* Setter audioAllowed.
- *
+ *
* @param permission
* permission
*/
@@ -38,7 +38,7 @@ public void setAudioAllowed(boolean permission) {
/**
* Setter videoAllowed
- *
+ *
* @param permission
* permission
*/
diff --git a/server/src/main/java/org/red5/server/stream/ServerStream.java b/server/src/main/java/org/red5/server/stream/ServerStream.java
index 222201e43..37db1aa62 100644
--- a/server/src/main/java/org/red5/server/stream/ServerStream.java
+++ b/server/src/main/java/org/red5/server/stream/ServerStream.java
@@ -56,7 +56,7 @@
/**
* An implementation for server side stream.
- *
+ *
* @author The Red5 Project
* @author Steven Gong (steven.gong@gmail.com)
* @author Paul Gregoire (mondain@gmail.com)
@@ -611,7 +611,7 @@ protected void onItemEnd() {
/**
* Push message
- *
+ *
* @param message
* Message
*/
@@ -809,7 +809,7 @@ protected RTMPMessage getNextRTMPMessage() {
/**
* Send VOD initialization control message
- *
+ *
* @param msgIn
* Message input
* @param start
@@ -835,7 +835,7 @@ private void sendVODInitCM(IMessageInput msgIn, int start) {
/**
* Send VOD seek control message
- *
+ *
* @param msgIn
* Message input
* @param position
diff --git a/server/src/main/java/org/red5/server/stream/provider/FileProvider.java b/server/src/main/java/org/red5/server/stream/provider/FileProvider.java
index b25993d67..7afb3cc83 100644
--- a/server/src/main/java/org/red5/server/stream/provider/FileProvider.java
+++ b/server/src/main/java/org/red5/server/stream/provider/FileProvider.java
@@ -89,7 +89,7 @@ public class FileProvider implements IPassive, ISeekableProvider, IPullableProvi
/**
* Create file provider for given file and scope
- *
+ *
* @param scope
* Scope
* @param file
diff --git a/server/src/main/java/org/red5/server/tomcat/EmbeddedTomcat.java b/server/src/main/java/org/red5/server/tomcat/EmbeddedTomcat.java
index 7efccb681..98801850e 100644
--- a/server/src/main/java/org/red5/server/tomcat/EmbeddedTomcat.java
+++ b/server/src/main/java/org/red5/server/tomcat/EmbeddedTomcat.java
@@ -19,7 +19,7 @@
/**
* Extension of Tomcat's Tomcat class, tailored for Red5.
- *
+ *
* @author Paul Gregoire (mondain@gmail.com)
*/
public class EmbeddedTomcat extends Tomcat {
@@ -40,7 +40,7 @@ public Context addWebapp(Host host, String contextPath, String docBase, ContextC
config.setDefaultWebXml(noDefaultWebXmlPath());
// get the host first, creates a new std host if not already set
getHost();
- // reset ParentClassLoader
+ // reset ParentClassLoader
if (!host.getParentClassLoader().equals(Thread.currentThread().getContextClassLoader())) {
host.setParentClassLoader(Thread.currentThread().getContextClassLoader());
}
diff --git a/server/src/main/java/org/red5/server/tomcat/TomcatApplicationContext.java b/server/src/main/java/org/red5/server/tomcat/TomcatApplicationContext.java
index df9926444..b0e578cfc 100644
--- a/server/src/main/java/org/red5/server/tomcat/TomcatApplicationContext.java
+++ b/server/src/main/java/org/red5/server/tomcat/TomcatApplicationContext.java
@@ -20,7 +20,7 @@
/**
* Class that wraps a Tomcat webapp context.
- *
+ *
* @author The Red5 Project (red5@osflash.org)
* @author Joachim Bauch (jojo@struktur.de)
* @author Paul Gregoire
@@ -34,7 +34,7 @@ public class TomcatApplicationContext implements IApplicationContext {
/**
* Wrap the passed Tomcat webapp context.
- *
+ *
* @param context
*/
protected TomcatApplicationContext(Context context) {
diff --git a/server/src/main/java/org/red5/server/tomcat/TomcatApplicationLoader.java b/server/src/main/java/org/red5/server/tomcat/TomcatApplicationLoader.java
index 3c5114fef..95e1ae037 100644
--- a/server/src/main/java/org/red5/server/tomcat/TomcatApplicationLoader.java
+++ b/server/src/main/java/org/red5/server/tomcat/TomcatApplicationLoader.java
@@ -18,7 +18,7 @@
/**
* Class that can load new applications in Tomcat.
- *
+ *
* @author The Red5 Project (red5@osflash.org)
* @author Joachim Bauch (jojo@struktur.de)
*/
@@ -38,7 +38,7 @@ public class TomcatApplicationLoader implements IApplicationLoader {
/**
* Wrap Tomcat engine and host.
- *
+ *
* @param embedded
* @param host
*/
diff --git a/server/src/main/java/org/red5/server/tomcat/TomcatLoader.java b/server/src/main/java/org/red5/server/tomcat/TomcatLoader.java
index 394e6bf18..3c83ab12a 100644
--- a/server/src/main/java/org/red5/server/tomcat/TomcatLoader.java
+++ b/server/src/main/java/org/red5/server/tomcat/TomcatLoader.java
@@ -62,9 +62,9 @@
/**
* Red5 loader for Tomcat.
- *
+ *
* http://tomcat.apache.org/tomcat-8.5-doc/api/index.html
- *
+ *
* @author Paul Gregoire (mondain@gmail.com)
*/
@ManagedResource(objectName = "org.red5.server:type=TomcatLoader", description = "TomcatLoader")
@@ -85,7 +85,7 @@ public class TomcatLoader extends LoaderBase implements InitializingBean, Dispos
protected final static class DirectoryFilter implements FilenameFilter {
/**
* Check whether file matches filter rules
- *
+ *
* @param dir
* Directory
* @param name
@@ -174,7 +174,7 @@ public void afterPropertiesSet() throws Exception {
/**
* Add context for path and docbase to current host.
- *
+ *
* @param contextPath
* Path
* @param docBase
@@ -188,7 +188,7 @@ public Context addContext(String path, String docBase) throws ServletException {
/**
* Add context for path and docbase to a host.
- *
+ *
* @param contextPath
* Path
* @param docBase
@@ -224,7 +224,7 @@ public Context addContext(String contextPath, String docBase, Host host) throws
/**
* Remove context from the current host.
- *
+ *
* @param path
* Path
*/
@@ -514,7 +514,7 @@ public void run() {
/**
* Starts a web application and its red5 (spring) component. This is basically a stripped down version of start().
- *
+ *
* @return true on success
* @throws ServletException
*/
@@ -633,7 +633,7 @@ public void run() {
/**
* Set base host.
- *
+ *
* @param baseHost
* Base host
*/
@@ -644,7 +644,7 @@ public void setBaseHost(Host baseHost) {
/**
* Get base host.
- *
+ *
* @return Base host
*/
public Host getBaseHost() {
@@ -653,7 +653,7 @@ public Host getBaseHost() {
/**
* Return Tomcat engine.
- *
+ *
* @return Tomcat engine
*/
public Engine getEngine() {
@@ -662,7 +662,7 @@ public Engine getEngine() {
/**
* Set connectors.
- *
+ *
* @param connectors
*/
public void setConnectors(List connectors) {
@@ -672,7 +672,7 @@ public void setConnectors(List connectors) {
/**
* Set additional contexts.
- *
+ *
* @param contexts
* Map of contexts
* @throws ServletException
@@ -686,7 +686,7 @@ public void setContexts(Map contexts) throws ServletException {
/**
* Setter for embedded object.
- *
+ *
* @param embedded
* Embedded object
*/
@@ -697,7 +697,7 @@ public void setEmbedded(EmbeddedTomcat embedded) {
/**
* Getter for embedded object.
- *
+ *
* @return Embedded object
*/
public EmbeddedTomcat getEmbedded() {
@@ -706,7 +706,7 @@ public EmbeddedTomcat getEmbedded() {
/**
* Get the host.
- *
+ *
* @return host
*/
public Host getHost() {
@@ -715,7 +715,7 @@ public Host getHost() {
/**
* Set the host.
- *
+ *
* @param host
* Host
*/
@@ -726,7 +726,7 @@ public void setHost(Host host) {
/**
* Set additional hosts.
- *
+ *
* @param hosts
* List of hosts added to engine
*/
@@ -737,7 +737,7 @@ public void setHosts(List hosts) {
/**
* Setter for realm.
- *
+ *
* @param realm
* Realm
*/
@@ -748,7 +748,7 @@ public void setRealm(Realm realm) {
/**
* Getter for realm.
- *
+ *
* @return Realm
*/
public Realm getRealm() {
@@ -757,7 +757,7 @@ public Realm getRealm() {
/**
* Set additional valves.
- *
+ *
* @param valves
* List of valves
*/
@@ -768,7 +768,7 @@ public void setValves(List valves) {
/**
* Returns enabled state of websocket support.
- *
+ *
* @return true if enabled and false otherwise
*/
public boolean isWebsocketEnabled() {
@@ -777,7 +777,7 @@ public boolean isWebsocketEnabled() {
/**
* Set websocket feature enabled / disabled.
- *
+ *
* @param websocketEnabled
*/
public void setWebsocketEnabled(boolean websocketEnabled) {
@@ -786,7 +786,7 @@ public void setWebsocketEnabled(boolean websocketEnabled) {
/**
* Returns a semi-unique id for this host based on its host values
- *
+ *
* @return host id
*/
protected String getHostId() {
diff --git a/server/src/main/java/org/red5/server/tomcat/TomcatVHostLoader.java b/server/src/main/java/org/red5/server/tomcat/TomcatVHostLoader.java
index 3e281a5f5..f1ace5e67 100644
--- a/server/src/main/java/org/red5/server/tomcat/TomcatVHostLoader.java
+++ b/server/src/main/java/org/red5/server/tomcat/TomcatVHostLoader.java
@@ -39,7 +39,7 @@
/**
* Red5 loader for Tomcat virtual hosts.
- *
+ *
* @author Paul Gregoire (mondain@gmail.com)
*/
@ManagedResource(objectName = "org.red5.server:type=TomcatVHostLoader", description = "TomcatVHostLoader")
@@ -76,7 +76,7 @@ public class TomcatVHostLoader extends TomcatLoader implements TomcatVHostLoader
/**
* Initialization.
- *
+ *
* @throws ServletException
*/
@Override
@@ -193,7 +193,7 @@ public void start() throws ServletException {
}
//
appctx.setServletContext(servletContext);
- //set the root webapp ctx attr on the each servlet context so spring can find it later
+ //set the root webapp ctx attr on the each servlet context so spring can find it later
servletContext.setAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, appctx);
appctx.refresh();
} catch (Throwable t) {
@@ -247,7 +247,7 @@ public void destroy() throws Exception {
/**
* Starts a web application and its red5 (spring) component. This is basically a stripped down version of init().
- *
+ *
* @return true on success
* @throws ServletException
*/
@@ -319,7 +319,7 @@ public boolean startWebApplication(String applicationName) throws ServletExcepti
}
//
appctx.setServletContext(servletContext);
- //set the root webapp ctx attr on the each servlet context so spring can find it later
+ //set the root webapp ctx attr on the each servlet context so spring can find it later
servletContext.setAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, appctx);
appctx.refresh();
result = true;
@@ -335,7 +335,7 @@ public boolean startWebApplication(String applicationName) throws ServletExcepti
/**
* Create a standard host.
- *
+ *
* @return host
*/
public Host createHost() {
@@ -368,7 +368,7 @@ public Host getHost() {
/**
* Adds an alias to the current host.
- *
+ *
* @param alias
* alias
*/
@@ -379,7 +379,7 @@ public void addAlias(String alias) {
/**
* Removes an alias from the current host.
- *
+ *
* @param alias
* Alias
*/
@@ -396,7 +396,7 @@ public void removeAlias(String alias) {
/**
* Adds a valve to the current host.
- *
+ *
* @param valve
* Valve
*/
@@ -408,7 +408,7 @@ public void addValve(Valve valve) {
/**
* Removes a valve from the current host.
- *
+ *
* @param valveInfo
* Valve Information.
*/
@@ -423,12 +423,12 @@ public void removeValve(String valveInfo) {
log.error("", e);
}
//TODO: fix removing valves
- //((StandardHost) host).removeValve(valve);
+ //((StandardHost) host).removeValve(valve);
}
/**
* Set additional contexts.
- *
+ *
* @param contexts
* Map of contexts
* @throws ServletException
diff --git a/server/src/main/java/org/red5/server/tomcat/WarDeployer.java b/server/src/main/java/org/red5/server/tomcat/WarDeployer.java
index 2cc11f1fc..e4d610b6d 100644
--- a/server/src/main/java/org/red5/server/tomcat/WarDeployer.java
+++ b/server/src/main/java/org/red5/server/tomcat/WarDeployer.java
@@ -34,7 +34,7 @@
/**
* This service provides the means to auto-deploy a war.
- *
+ *
* @author Paul Gregoire (mondain@gmail.com)
*/
public final class WarDeployer implements ApplicationContextAware, InitializingBean, DisposableBean {
@@ -208,7 +208,7 @@ public void setWebappFolder(String webappFolder) {
/**
* Whether or not to expand war files prior to start up.
- *
+ *
* @param expandWars
* to expand or not
*/
@@ -218,7 +218,7 @@ public void setExpandWars(boolean expandWars) {
/**
* Returns the LoaderMBean.
- *
+ *
* @return LoadeerMBean
*/
public LoaderMXBean getLoader() {
@@ -246,7 +246,7 @@ public LoaderMXBean getLoader() {
protected class DirectoryFilter implements FilenameFilter {
/**
* Check whether file matches filter rules
- *
+ *
* @param dir
* Directory
* @param name
diff --git a/server/src/main/java/org/red5/server/tomcat/rtmps/RTMPSLoader.java b/server/src/main/java/org/red5/server/tomcat/rtmps/RTMPSLoader.java
index 7cbd1403d..518e70111 100644
--- a/server/src/main/java/org/red5/server/tomcat/rtmps/RTMPSLoader.java
+++ b/server/src/main/java/org/red5/server/tomcat/rtmps/RTMPSLoader.java
@@ -30,7 +30,7 @@
/**
* Loader for the RTMPS server which uses Tomcat.
- *
+ *
* @author The Red5 Project (red5@osflash.org)
* @author Paul Gregoire (mondain@gmail.com)
*/
@@ -46,7 +46,7 @@ public class RTMPSLoader extends RTMPTLoader {
/**
* Setter for server
- *
+ *
* @param server
* Value to set for property 'server'.
*/
@@ -57,7 +57,7 @@ public void setServer(IServer server) {
/**
* {@inheritDoc}
- *
+ *
* @throws ServletException
*/
@SuppressWarnings("deprecation")
diff --git a/server/src/main/java/org/red5/server/tomcat/rtmpt/RTMPTLoader.java b/server/src/main/java/org/red5/server/tomcat/rtmpt/RTMPTLoader.java
index 28fae67ec..e47d00b1b 100644
--- a/server/src/main/java/org/red5/server/tomcat/rtmpt/RTMPTLoader.java
+++ b/server/src/main/java/org/red5/server/tomcat/rtmpt/RTMPTLoader.java
@@ -32,7 +32,7 @@
/**
* Loader for the RTMPT server which uses Tomcat.
- *
+ *
* @author The Red5 Project (red5@osflash.org)
* @author Paul Gregoire (mondain@gmail.com)
*/
@@ -63,7 +63,7 @@ public class RTMPTLoader extends TomcatLoader {
/**
* Setter for server
- *
+ *
* @param server
* Value to set for property 'server'.
*/
@@ -74,7 +74,7 @@ public void setServer(IServer server) {
/**
* {@inheritDoc}
- *
+ *
* @throws ServletException
*/
@SuppressWarnings("deprecation")
@@ -159,7 +159,7 @@ public void start() throws ServletException {
/**
* Set servlet mappings
- *
+ *
* @param mappings
* mappings
*/
diff --git a/server/src/main/java/org/red5/server/util/LocalNetworkUtil.java b/server/src/main/java/org/red5/server/util/LocalNetworkUtil.java
index ceb816f6e..1a9525264 100644
--- a/server/src/main/java/org/red5/server/util/LocalNetworkUtil.java
+++ b/server/src/main/java/org/red5/server/util/LocalNetworkUtil.java
@@ -17,11 +17,11 @@ public class LocalNetworkUtil {
/**
* Returns a loopback IP address.
- *
+ *
* @return the current environment's IP address, taking into account the Internet connection to any of the available machine's Network interfaces.
- *
+ *
* Examples of the outputs:
- *
+ *
* fec0:0:0:9:213:e8ff:fef1:b717%4 siteLocal: true isLoopback: false isIPV6: true
* ============================================
* 130.212.150.216 siteLocal: false isLoopback: false isIPV6: false
diff --git a/server/src/main/java/org/red5/server/util/ServerDetector.java b/server/src/main/java/org/red5/server/util/ServerDetector.java
index 4155466ec..2be7c4c14 100644
--- a/server/src/main/java/org/red5/server/util/ServerDetector.java
+++ b/server/src/main/java/org/red5/server/util/ServerDetector.java
@@ -9,7 +9,7 @@
/**
* Simple JEE server detector, based on an idea created by Brian Wing Shun Chan.
- *
+ *
* @author Paul Gregoire (mondain@gmail.com)
*/
public class ServerDetector {
diff --git a/server/src/main/java/org/red5/server/util/UrlQueryStringMap.java b/server/src/main/java/org/red5/server/util/UrlQueryStringMap.java
index 7416344e2..c3d234479 100644
--- a/server/src/main/java/org/red5/server/util/UrlQueryStringMap.java
+++ b/server/src/main/java/org/red5/server/util/UrlQueryStringMap.java
@@ -9,7 +9,7 @@
* key
* @param
* value
- *
+ *
* @author Paul Gregoire
*/
@SuppressWarnings("serial")
@@ -21,7 +21,7 @@ public UrlQueryStringMap() {
/**
* Parse a given query string and return an instance of this class.
- *
+ *
* @param queryString
* query string
* @return query string items as map entries
diff --git a/server/src/main/java/org/red5/server/war/WarLoaderServlet.java b/server/src/main/java/org/red5/server/war/WarLoaderServlet.java
index 03b544319..e4e6bf769 100644
--- a/server/src/main/java/org/red5/server/war/WarLoaderServlet.java
+++ b/server/src/main/java/org/red5/server/war/WarLoaderServlet.java
@@ -41,9 +41,9 @@
/**
* Entry point from which the server config file is loaded while running within a J2EE application container.
- *
+ *
* This listener should be registered after Log4jConfigListener in web.xml, if the latter is used.
- *
+ *
* @author The Red5 Project
* @author Paul Gregoire (mondain@gmail.com)
*/
diff --git a/server/src/main/java/org/red5/spring/ExtendedPropertyPlaceholderConfigurer.java b/server/src/main/java/org/red5/spring/ExtendedPropertyPlaceholderConfigurer.java
index 3f4ecf3a0..b95eb2303 100644
--- a/server/src/main/java/org/red5/spring/ExtendedPropertyPlaceholderConfigurer.java
+++ b/server/src/main/java/org/red5/spring/ExtendedPropertyPlaceholderConfigurer.java
@@ -25,13 +25,13 @@
/**
* An extension of {@link PropertyPlaceholderConfigurer}. Provides runtime additions of properties and wildcard location lookups.
- *
+ *
* Properties can be added at runtime by using the static {@link #addGlobalProperty} before* the bean definition is instantiated in the ApplicationContext. A property added by {@link #addGlobalProperty} will get merged into properties specified by the bean definition, overriding keys that overlap.
- *
+ *
* wildcard locations can be used instead of locations, if both are declared the last will override. Wildcard locations are handled by {@link #setWildcardLocations(String[])}, using {@link PathMatchingResourcePatternResolver} for matching locations. For wildcard locations that matches multiple Properties files, they are merged in by alphabetical filename order.
- *
+ *
* @author Michael Guymon (michael.guymon@gmail.com)
- *
+ *
*/
@SuppressWarnings("deprecation")
public class ExtendedPropertyPlaceholderConfigurer extends PropertyPlaceholderConfigurer {
@@ -55,7 +55,7 @@ protected void processProperties(ConfigurableListableBeanFactory beanFactoryToPr
/**
* Merged {@link Properties} created by {@link #processProperties}
- *
+ *
* @return {@link Properties}
*/
public Properties getMergedProperties() {
@@ -64,7 +64,7 @@ public Properties getMergedProperties() {
/**
* String[] of wildcard locations of properties that are converted to Resource[] using using {@link PathMatchingResourcePatternResolver}
- *
+ *
* @param locations
* String[]
* @throws IOException
@@ -104,7 +104,7 @@ public void setWildcardLocations(String[] locations) throws IOException {
/**
* Add a global property to be merged
- *
+ *
* @param key
* String
* @param val
@@ -116,7 +116,7 @@ public static synchronized void addGlobalProperty(String key, String val) {
/**
* Copy of the manual properties
- *
+ *
* @return {@link Properties}
*/
private static synchronized Properties copyOfGlobalProperties() {
diff --git a/server/src/main/java/org/red5/spring/InetAddressEditor.java b/server/src/main/java/org/red5/spring/InetAddressEditor.java
index b508f052a..c8abddb80 100644
--- a/server/src/main/java/org/red5/spring/InetAddressEditor.java
+++ b/server/src/main/java/org/red5/spring/InetAddressEditor.java
@@ -28,7 +28,7 @@ public class InetAddressEditor extends PropertyEditorSupport {
private static Pattern ipv6 = Pattern.compile("([0-9a-fA-F]{4}:){7}[0-9a-fA-F]{4}");
@Override
- /**
+ /**
* Converts String IP address to InetAddress object.
*
* @param textValue ex. "255.255.222.255"
diff --git a/server/src/test/java/org/red5/net/websocket/WebSocketServerTest.java b/server/src/test/java/org/red5/net/websocket/WebSocketServerTest.java
index 3921e44ba..b797b5eb1 100644
--- a/server/src/test/java/org/red5/net/websocket/WebSocketServerTest.java
+++ b/server/src/test/java/org/red5/net/websocket/WebSocketServerTest.java
@@ -54,7 +54,7 @@
/**
* Tests for websocket operations.
- *
+ *
* @author Paul Gregoire (mondain@gmail.com)
*/
public class WebSocketServerTest {
diff --git a/server/src/test/java/org/red5/server/net/rtmp/ServerRTMPHandshakeTest.java b/server/src/test/java/org/red5/server/net/rtmp/ServerRTMPHandshakeTest.java
index 8db381e05..458e630aa 100644
--- a/server/src/test/java/org/red5/server/net/rtmp/ServerRTMPHandshakeTest.java
+++ b/server/src/test/java/org/red5/server/net/rtmp/ServerRTMPHandshakeTest.java
@@ -20,7 +20,7 @@
/**
* Tests for server side handshaking. Test command for using rtmpdump, if targeting specific player version use: -f "WIN 10,0,2,0"
- *
+ *
*
* rtmpdump -V -z -r "rtmp://localhost/live" -a "live" -W "http://localhost:5080/demos/publisher.swf" -p "http://localhost:5080/live" -y "test" -v -o t.flv
* rtmpdump -V -z -r "rtmpe://localhost/live" -a "live" -W "http://localhost:5080/demos/publisher.swf" -p "http://localhost:5080/live" -y "test" -v -o t.flv
@@ -28,11 +28,11 @@
*
*
* Test server
- *
+ *
*
* rtmpsrv - V - z
*
- *
+ *
* @author Paul Gregoire (mondain@gmail.com)
*/
public class ServerRTMPHandshakeTest {
@@ -41,7 +41,7 @@ public class ServerRTMPHandshakeTest {
// Red5 client generated C1
// Time and version: 0000000580000702
- // Algorithm: 0
+ // Algorithm: 0
// Offset: 460
// Digest: a143cbbc7b8b4838496f2667402c1bd742e6c73d051e94a284519d8d7966c6c6
private String red5clientC1 = "0000000580000702dc0578676cf5adfbf9be471bd4903991ae3d34421109e4d6612e5613100c31e9d3842743689dd57b5f675dd8af1081fbc24c266873044fa372045a1a32e9f08cc974ec3b1152f898893fb7b91ee9d45a8a84c7125e77447b9273e9caff90b240a59985355a30ac6650a3363baf6e34aeb6fc78ecc8a7f746711980e4d83d45248191eb9458f52338df757d7fb60c9e876c965c5907da9f8956bc0afa21698bc92d67962bc65e6d5c36383077cad969e1c336519659396c1d9949a4f1c4279a02a9f4f26d821beb92a86ff4bc463cb2d749d14b545e50dc052a248426af96b7ccae15321d0d4cec0d5d5c6543c99e7cd37e42d71098117f6a09c3f7a351570acf26aadba70f9383f3d1ff789fb63494f956fac4fbf26f5a4acb9f8131211c0c2cb068cfc7d2b5ff6e53730fcfb5ce483bbb76587136877d7e1c757711174511751d819d4fc2cca78f878ea6d830bf833b098e77ef95547f3037cdb964318c7767f60e61acf3039d63e5dd6b86d7cee4569189a9f324ffebff70e05e1ff0c14dbbf35b865c9beb03f837e926cc1d41d9811610ef5e59b0e2afabc36a5bd89986b385f2267f9358d7291fcab51cb8e8de5b52e0bcd392fc655ce1e6ee9ff38608504d80e5aaa143cbbc7b8b4838496f2667402c1bd742e6c73d051e94a284519d8d7966c6c612a0c2814e03344821dafeb196df6cf9f130a2718e9b88af7bc57e4410e72a38014017aa7a12fa53312ed4cc53f2bc73c5e450b1dba68d380e5bd0ded42165e512a13ad401c25add1b658ba1303b7a6bf48b9abfd2121cce20b7f02f618c7ae5d1c62c3826c64ee66b81156c2c4e8d8ccfa01e6352709c27cf259c1edd3993af730c8ed9027c0136efdf135e3646bebe8a4bd8b44c32eb71bc2d7473a4bfb3454bf5cc1801b0a5883bbcc724b42fbb83bdba881a455c23108bdc12e6c4c7afa2568d0d8161b4ac1126c5bd96fd4291f6e40be4e5d780a01067238b578073ec3bb0596c7ab6c7593c4bc1a79edfee22fae0c342d83010d2c77b43e8f4ce8d1c331dd97e1a69cbeb5b894316f519b3648b75d7d94091f6b9db7a4a7efcd98d606f819433e7344ad729846f04ffe2ca6a3bca43bb69d08a30cc189f1da97f69749868bf7302a7ceca8521ce673361a7918cec36218ed6cc47ad8e9d7b56d337d5d97f6828dfa78977e80e3236be323a4b4d4ac8c5a222f4675a1a44624a9ca30867193a8552e948585f38ac93b3e70f5b123a4149cf454effe17cef78aed52d70f5abcaba8e7bbdf0b452901a0a853a8ba173f5e895646ddf4a7b27b82e2b4052c3507d72563c123f9e55896fbf030c247591ab084db9a6a11d5e7bda60820f034f45f2b5825fd25963fabd93fecea0b07f959550bc12e1ac4d746e5c91704e57946e0724c7ec1f747e4205a7db483adafe62d9616551b3b6368c74ddd2c1afca81d068957a3f3ac219ef2a0c3d4469647b41a9633eead2d9647dfef334f138045a15b1920c8754f829084421d68c08940b5eecea6a68d29bc6a096c6d7b564a2e10b1a3eba48bc5d205913feab5c078b8c4877fecde82f7cb9510dfc297215798c25bd9207da4faed4f07dea78e40363ce75d439269cb3e61a71b5d4fec457ab58f8631b7ce7444454a10f7f67c9b5109ebc9c50c3491ea328e7b07e52f9f44aa9bfe88224f13e44b9838fa10aa4285a2fd95f74cac9271c851a4df78294d5673dd826a064cab5c50971a4cf2b81c669a8ec1c5f6d8acd1725796f0b7cca33b953457bdfb719ac31648b8969056232c877fa4a046e0ef1ba45f31149d5089e4a262cd52b18dcb5516bb2d2eec2baf2c6ac6b712ac76946f2ca7fcff3286bc9d62c5756b9e5e14ec9f90f415fadf3eba5c18a506f58c6929a8f96804efb4634baffb58353544b81f3a18ca7313ee8aafd25099a7802e23a0242b4e7cb61a098a748d705119513dc5e6459df926f6b7f385f7a3953b68f219e60da6df839b32e88e974f98e2d85b9615469ccde04c06624c4d62c439933d60bcc0fef2e286ebf3165e5cf1530bfd58097f271853220c6e7affaec85844613bb2cda966ac6f486dca0a9bf49523535a249f116ce0038f5e2872566c9d6d88cd81bcaccc7631be78248e3c44832305b4655a47a2a01a79848177c8059c3";
diff --git a/server/src/test/java/org/red5/server/scope/ScopeTest.java b/server/src/test/java/org/red5/server/scope/ScopeTest.java
index 13bc4fd32..cbe5f99ea 100644
--- a/server/src/test/java/org/red5/server/scope/ScopeTest.java
+++ b/server/src/test/java/org/red5/server/scope/ScopeTest.java
@@ -143,7 +143,7 @@ public void testScopeCreation() throws InterruptedException {
}
}
assertTrue(appScope.getBasicScopeNames(ScopeType.ROOM).size() == 1);
- *
+ *
*/
log.info("testScopeCreation-end");
}
diff --git a/server/src/test/java/org/red5/server/service/CuePointInjectionTest.java b/server/src/test/java/org/red5/server/service/CuePointInjectionTest.java
index bf5e48751..5bfa28017 100644
--- a/server/src/test/java/org/red5/server/service/CuePointInjectionTest.java
+++ b/server/src/test/java/org/red5/server/service/CuePointInjectionTest.java
@@ -45,7 +45,7 @@ public void setUp() {
/**
* Test MetaData injection
- *
+ *
* @throws IOException
* for fun
*/
@@ -82,7 +82,7 @@ public void testCuePointInjection() throws IOException {
/**
* Write FLV tags and inject Cue Points
- *
+ *
* @param reader
* @param writer
* @throws IOException
@@ -139,7 +139,7 @@ private void writeTagsWithInjection(ITagReader reader, ITagWriter writer) throws
/**
* Injects metadata (Cue Points) into a tag
- *
+ *
* @param cue
* @param writer
* @param tag
@@ -162,7 +162,7 @@ private ITag injectCuePoint(Object cue, ITag tag) {
/**
* Returns a timestamp in milliseconds
- *
+ *
* @param object
* @return int time
*/
diff --git a/server/src/test/java/org/red5/server/service/MetaDataInjectionTest.java b/server/src/test/java/org/red5/server/service/MetaDataInjectionTest.java
index 5652620df..de9219922 100644
--- a/server/src/test/java/org/red5/server/service/MetaDataInjectionTest.java
+++ b/server/src/test/java/org/red5/server/service/MetaDataInjectionTest.java
@@ -48,7 +48,7 @@ public void setUp() {
/**
* Test MetaData injection
- *
+ *
* @throws IOException
* if io exception
*/
@@ -83,7 +83,7 @@ public void testMetaDataInjection() throws IOException {
/**
* Write FLV tags and inject Cue Points
- *
+ *
* @param reader
* @param writer
* @throws IOException
@@ -148,7 +148,7 @@ private void writeTagsWithInjection(ITagReader reader, ITagWriter writer) throws
/**
* Injects metadata (Cue Points) into a tag
- *
+ *
* @param cue
* @param writer
* @param tag
@@ -171,7 +171,7 @@ private ITag injectMetaData(Object cue, ITag tag) {
/**
* Returns a timestamp in milliseconds
- *
+ *
* @param object
* @return int time
*/
diff --git a/server/src/test/java/org/red5/server/service/MetaDataTest.java b/server/src/test/java/org/red5/server/service/MetaDataTest.java
index b90cf1d8f..2d1c3a4df 100644
--- a/server/src/test/java/org/red5/server/service/MetaDataTest.java
+++ b/server/src/test/java/org/red5/server/service/MetaDataTest.java
@@ -13,7 +13,7 @@
/**
* MetaData TestCase
- *
+ *
* @author The Red5 Project
* @author daccattato (daccattato@gmail.com)
*/
diff --git a/server/src/test/java/org/red5/server/service/MetaServiceTest.java b/server/src/test/java/org/red5/server/service/MetaServiceTest.java
index 14ed81d11..0c5eb28ac 100644
--- a/server/src/test/java/org/red5/server/service/MetaServiceTest.java
+++ b/server/src/test/java/org/red5/server/service/MetaServiceTest.java
@@ -41,7 +41,7 @@ protected void setUp() throws Exception {
/**
* Test writing meta data
- *
+ *
* @throws IOException
* if io exception
*/
diff --git a/server/src/test/java/org/red5/server/so/SharedObjectTest.java b/server/src/test/java/org/red5/server/so/SharedObjectTest.java
index 4603604ba..dd47c6eed 100644
--- a/server/src/test/java/org/red5/server/so/SharedObjectTest.java
+++ b/server/src/test/java/org/red5/server/so/SharedObjectTest.java
@@ -45,9 +45,9 @@
/**
* This is for testing SharedObject issues.
- *
+ *
* http://help.adobe.com/en_US/FlashMediaServer/3.5_SS_ASD/WS5b3ccc516d4fbf351e63e3d11a11afc95e-7e63.html
- *
+ *
* @author Paul Gregoire (mondain@gmail.com)
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
diff --git a/service/pom.xml b/service/pom.xml
index ef3856acd..39cf8376f 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -3,7 +3,7 @@
org.red5
red5-parent
- 1.2.24
+ 1.2.31
4.0.0
red5-service
diff --git a/service/src/main/java/org/red5/classloading/ChildFirstClassLoader.java b/service/src/main/java/org/red5/classloading/ChildFirstClassLoader.java
index 6cf912f4c..2883cc496 100644
--- a/service/src/main/java/org/red5/classloading/ChildFirstClassLoader.java
+++ b/service/src/main/java/org/red5/classloading/ChildFirstClassLoader.java
@@ -12,7 +12,7 @@
/**
* An almost trivial no-fuss implementation of a class loader following the child-first delegation model. Based on code from Ceki Gulcu
- *
+ *
* @author Paul Gregoire (mondain@gmail.com)
*/
public final class ChildFirstClassLoader extends URLClassLoader {
@@ -57,7 +57,7 @@ public Class loadClass(String name) throws ClassNotFoundException {
* We override the parent-first behavior established by java.lang.Classloader.
*
* The implementation is surprisingly straightforward.
- *
+ *
* @param name the name of the class to load, should not be null
* @param resolve flag that indicates whether the class should be resolved
* @return the loaded class, never null
@@ -119,7 +119,7 @@ protected Class loadClass(String name, boolean resolve) throws ClassNotFoundE
/**
* Override the parent-first resource loading model established by java.lang.Classloader with child-first behavior.
- *
+ *
* @param name the name of the resource to load, should not be null
* @return a {@link URL} for the resource, or null if it could not be found
*/
diff --git a/service/src/main/java/org/red5/classloading/ClassLoaderBuilder.java b/service/src/main/java/org/red5/classloading/ClassLoaderBuilder.java
index 7b6b31581..c2dfd6a4f 100644
--- a/service/src/main/java/org/red5/classloading/ClassLoaderBuilder.java
+++ b/service/src/main/java/org/red5/classloading/ClassLoaderBuilder.java
@@ -32,10 +32,10 @@
/**
* Class used to get the Servlet Class loader. The class loader returned is a child first class loader.
- *
+ *
* This class is based on original code from the XINS project, by Anthony Goubard (anthony.goubard@japplis.com)
- *
+ *
* @author Paul Gregoire (mondain@gmail.com)
*/
public final class ClassLoaderBuilder {
@@ -62,7 +62,7 @@ public final class ClassLoaderBuilder {
/**
* Default build uses Red5 common lib without a parent classloader.
- *
+ *
* @return the class loader
*/
public static ClassLoader build() {
@@ -71,12 +71,12 @@ public static ClassLoader build() {
/**
* Gets a class loader based on mode.
- *
+ *
* @param path
* the directory or file containing classes
* @param mode
* the mode in which the servlet should be loaded. The possible values are
- *
+ *
*
* USE_CURRENT_CLASSPATH, USE_CLASSPATH_LIB, USE_WAR_LIB
*
@@ -285,7 +285,7 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IO
/**
* Unpack the specified entry from the JAR file.
- *
+ *
* @param jarStream
* The input stream of the JAR file positioned at the entry
* @param entryName
@@ -310,7 +310,7 @@ private static Path unpack(JarInputStream jarStream, String entryName) throws IO
/**
* Removes older versions of libraries from a given list based on their version numbers.
- *
+ *
* @param list
*/
private final static void scrubURLList(Collection list) {
@@ -532,7 +532,7 @@ private final static void scrubURLList(Collection list) {
/**
* Parses url and returns the jar filename stripped of the ending .jar
- *
+ *
* @param url
* @return
*/
diff --git a/service/src/main/java/org/red5/daemon/EngineLauncher.java b/service/src/main/java/org/red5/daemon/EngineLauncher.java
index fadf57c43..58b9b2771 100644
--- a/service/src/main/java/org/red5/daemon/EngineLauncher.java
+++ b/service/src/main/java/org/red5/daemon/EngineLauncher.java
@@ -32,7 +32,7 @@ public class EngineLauncher implements Daemon {
/**
* The Java entry point.
- *
+ *
* @param args
* Command line arguments
*/
diff --git a/service/src/main/java/org/red5/server/Bootstrap.java b/service/src/main/java/org/red5/server/Bootstrap.java
index a4d0d92f6..91eeb2265 100644
--- a/service/src/main/java/org/red5/server/Bootstrap.java
+++ b/service/src/main/java/org/red5/server/Bootstrap.java
@@ -27,7 +27,7 @@ public class Bootstrap {
/**
* BootStrapping entry point
- *
+ *
* @param args
* command line arguments
* @throws Exception
@@ -49,7 +49,7 @@ public static void main(String[] args) throws Exception {
/**
* Loads classloader with dependencies
- *
+ *
* @throws InstantiationException
* @throws IllegalAccessException
* @throws ClassNotFoundException
@@ -114,7 +114,7 @@ private static void bootStrap() throws InstantiationException, IllegalAccessExce
/**
* Gets the configuration root
- *
+ *
* @param root
* @return
*/
@@ -136,7 +136,7 @@ static Path getConfigurationRoot(Path root) {
/**
* Gets the Red5 root
- *
+ *
* @return
* @throws IOException
*/
diff --git a/service/src/main/java/org/red5/server/Shutdown.java b/service/src/main/java/org/red5/server/Shutdown.java
index c648ac8e9..4388b49fb 100644
--- a/service/src/main/java/org/red5/server/Shutdown.java
+++ b/service/src/main/java/org/red5/server/Shutdown.java
@@ -29,7 +29,7 @@ public class Shutdown {
* Arg 0 = port number
* Arg 1 = token
*
- *
+ *
* @param args
* see args list
*/