diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..259b6bb
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+/classes/
+/classes-test/
+/junit-reports/
+/target/
+/ice4j.jar
diff --git a/build.xml b/build.xml
index 266f7c5..5e433f7 100644
--- a/build.xml
+++ b/build.xml
@@ -5,8 +5,8 @@
-
-
+
+
diff --git a/pom.xml b/pom.xml
index 271e650..fe68892 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,8 +36,17 @@
- src
- test
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+
+
+ **/*TestSuite.*
+
+
+
+
@@ -60,4 +69,31 @@
+
+
+
+ jitsi-maven-repository-releases
+ default
+ Jitsi Maven Repository (Releases)
+
+ true
+
+
+ false
+
+ https://github.com/jitsi/jitsi-maven-repository/raw/master/releases/
+
+
+ jitsi-maven-repository-snapshots
+ default
+ Jitsi Maven Repository (Snapshots)
+
+ false
+
+
+ true
+
+ https://github.com/jitsi/jitsi-maven-repository/raw/master/snapshots/
+
+
diff --git a/src/org/ice4j/AbstractResponseCollector.java b/src/main/java/org/ice4j/AbstractResponseCollector.java
similarity index 100%
rename from src/org/ice4j/AbstractResponseCollector.java
rename to src/main/java/org/ice4j/AbstractResponseCollector.java
diff --git a/src/org/ice4j/BaseStunMessageEvent.java b/src/main/java/org/ice4j/BaseStunMessageEvent.java
similarity index 100%
rename from src/org/ice4j/BaseStunMessageEvent.java
rename to src/main/java/org/ice4j/BaseStunMessageEvent.java
diff --git a/src/org/ice4j/ChannelDataMessageEvent.java b/src/main/java/org/ice4j/ChannelDataMessageEvent.java
similarity index 100%
rename from src/org/ice4j/ChannelDataMessageEvent.java
rename to src/main/java/org/ice4j/ChannelDataMessageEvent.java
diff --git a/src/org/ice4j/PeerUdpMessageEvent.java b/src/main/java/org/ice4j/PeerUdpMessageEvent.java
similarity index 100%
rename from src/org/ice4j/PeerUdpMessageEvent.java
rename to src/main/java/org/ice4j/PeerUdpMessageEvent.java
diff --git a/src/org/ice4j/ResponseCollector.java b/src/main/java/org/ice4j/ResponseCollector.java
similarity index 100%
rename from src/org/ice4j/ResponseCollector.java
rename to src/main/java/org/ice4j/ResponseCollector.java
diff --git a/src/org/ice4j/StackProperties.java b/src/main/java/org/ice4j/StackProperties.java
similarity index 100%
rename from src/org/ice4j/StackProperties.java
rename to src/main/java/org/ice4j/StackProperties.java
diff --git a/src/org/ice4j/StunException.java b/src/main/java/org/ice4j/StunException.java
similarity index 100%
rename from src/org/ice4j/StunException.java
rename to src/main/java/org/ice4j/StunException.java
diff --git a/src/org/ice4j/StunFailureEvent.java b/src/main/java/org/ice4j/StunFailureEvent.java
similarity index 100%
rename from src/org/ice4j/StunFailureEvent.java
rename to src/main/java/org/ice4j/StunFailureEvent.java
diff --git a/src/org/ice4j/StunMessageEvent.java b/src/main/java/org/ice4j/StunMessageEvent.java
similarity index 100%
rename from src/org/ice4j/StunMessageEvent.java
rename to src/main/java/org/ice4j/StunMessageEvent.java
diff --git a/src/org/ice4j/StunResponseEvent.java b/src/main/java/org/ice4j/StunResponseEvent.java
similarity index 100%
rename from src/org/ice4j/StunResponseEvent.java
rename to src/main/java/org/ice4j/StunResponseEvent.java
diff --git a/src/org/ice4j/StunTimeoutEvent.java b/src/main/java/org/ice4j/StunTimeoutEvent.java
similarity index 100%
rename from src/org/ice4j/StunTimeoutEvent.java
rename to src/main/java/org/ice4j/StunTimeoutEvent.java
diff --git a/src/org/ice4j/Transport.java b/src/main/java/org/ice4j/Transport.java
similarity index 100%
rename from src/org/ice4j/Transport.java
rename to src/main/java/org/ice4j/Transport.java
diff --git a/src/org/ice4j/TransportAddress.java b/src/main/java/org/ice4j/TransportAddress.java
similarity index 100%
rename from src/org/ice4j/TransportAddress.java
rename to src/main/java/org/ice4j/TransportAddress.java
diff --git a/src/org/ice4j/attribute/AddressAttribute.java b/src/main/java/org/ice4j/attribute/AddressAttribute.java
similarity index 100%
rename from src/org/ice4j/attribute/AddressAttribute.java
rename to src/main/java/org/ice4j/attribute/AddressAttribute.java
diff --git a/src/org/ice4j/attribute/AlternateServerAttribute.java b/src/main/java/org/ice4j/attribute/AlternateServerAttribute.java
similarity index 100%
rename from src/org/ice4j/attribute/AlternateServerAttribute.java
rename to src/main/java/org/ice4j/attribute/AlternateServerAttribute.java
diff --git a/src/org/ice4j/attribute/Attribute.java b/src/main/java/org/ice4j/attribute/Attribute.java
similarity index 100%
rename from src/org/ice4j/attribute/Attribute.java
rename to src/main/java/org/ice4j/attribute/Attribute.java
diff --git a/src/org/ice4j/attribute/AttributeDecoder.java b/src/main/java/org/ice4j/attribute/AttributeDecoder.java
similarity index 100%
rename from src/org/ice4j/attribute/AttributeDecoder.java
rename to src/main/java/org/ice4j/attribute/AttributeDecoder.java
diff --git a/src/org/ice4j/attribute/AttributeFactory.java b/src/main/java/org/ice4j/attribute/AttributeFactory.java
similarity index 100%
rename from src/org/ice4j/attribute/AttributeFactory.java
rename to src/main/java/org/ice4j/attribute/AttributeFactory.java
diff --git a/src/org/ice4j/attribute/ChangeRequestAttribute.java b/src/main/java/org/ice4j/attribute/ChangeRequestAttribute.java
similarity index 100%
rename from src/org/ice4j/attribute/ChangeRequestAttribute.java
rename to src/main/java/org/ice4j/attribute/ChangeRequestAttribute.java
diff --git a/src/org/ice4j/attribute/ChangedAddressAttribute.java b/src/main/java/org/ice4j/attribute/ChangedAddressAttribute.java
similarity index 100%
rename from src/org/ice4j/attribute/ChangedAddressAttribute.java
rename to src/main/java/org/ice4j/attribute/ChangedAddressAttribute.java
diff --git a/src/org/ice4j/attribute/ChannelNumberAttribute.java b/src/main/java/org/ice4j/attribute/ChannelNumberAttribute.java
similarity index 100%
rename from src/org/ice4j/attribute/ChannelNumberAttribute.java
rename to src/main/java/org/ice4j/attribute/ChannelNumberAttribute.java
diff --git a/src/org/ice4j/attribute/ConnectionIdAttribute.java b/src/main/java/org/ice4j/attribute/ConnectionIdAttribute.java
similarity index 100%
rename from src/org/ice4j/attribute/ConnectionIdAttribute.java
rename to src/main/java/org/ice4j/attribute/ConnectionIdAttribute.java
diff --git a/src/org/ice4j/attribute/ContentDependentAttribute.java b/src/main/java/org/ice4j/attribute/ContentDependentAttribute.java
similarity index 100%
rename from src/org/ice4j/attribute/ContentDependentAttribute.java
rename to src/main/java/org/ice4j/attribute/ContentDependentAttribute.java
diff --git a/src/org/ice4j/attribute/DataAttribute.java b/src/main/java/org/ice4j/attribute/DataAttribute.java
similarity index 86%
rename from src/org/ice4j/attribute/DataAttribute.java
rename to src/main/java/org/ice4j/attribute/DataAttribute.java
index 2effdec..7fcf736 100644
--- a/src/org/ice4j/attribute/DataAttribute.java
+++ b/src/main/java/org/ice4j/attribute/DataAttribute.java
@@ -38,12 +38,12 @@ public class DataAttribute
*
* Some dialect does not add (and support) padding (GTalk).
*/
- private boolean padding = true;
+ private final boolean padding;
/**
* Constructor.
*/
- protected DataAttribute ()
+ protected DataAttribute()
{
this(true);
}
@@ -51,9 +51,10 @@ public class DataAttribute
/**
* Constructor.
*/
- protected DataAttribute (boolean padding)
+ protected DataAttribute(boolean padding)
{
super(DATA);
+
this.padding = padding;
}
@@ -80,22 +81,26 @@ public class DataAttribute
*/
public byte[] encode()
{
+ char dataLength = getDataLength();
char type = getAttributeType();
- byte binValue[] = new byte[HEADER_LENGTH + getDataLength() +
- (padding ? (getDataLength() % 4) : 0)];
+ byte binary[]
+ = new byte[
+ HEADER_LENGTH
+ + dataLength
+ + (padding ? ((4 - dataLength % 4) % 4) : 0)];
//Type
- binValue[0] = (byte)(type >> 8);
- binValue[1] = (byte)(type & 0x00FF);
+ binary[0] = (byte)(type >> 8);
+ binary[1] = (byte)(type & 0x00FF);
//Length
- binValue[2] = (byte)(getDataLength() >> 8);
- binValue[3] = (byte)(getDataLength() & 0x00FF);
+ binary[2] = (byte)(dataLength >> 8);
+ binary[3] = (byte)(dataLength & 0x00FF);
//data
- System.arraycopy(data, 0, binValue, 4, getDataLength());
+ System.arraycopy(data, 0, binary, 4, dataLength);
- return binValue;
+ return binary;
}
/**
@@ -169,4 +174,4 @@ public class DataAttribute
return true;
}
-}
\ No newline at end of file
+}
diff --git a/src/org/ice4j/attribute/DestinationAddressAttribute.java b/src/main/java/org/ice4j/attribute/DestinationAddressAttribute.java
similarity index 100%
rename from src/org/ice4j/attribute/DestinationAddressAttribute.java
rename to src/main/java/org/ice4j/attribute/DestinationAddressAttribute.java
diff --git a/src/org/ice4j/attribute/DontFragmentAttribute.java b/src/main/java/org/ice4j/attribute/DontFragmentAttribute.java
similarity index 100%
rename from src/org/ice4j/attribute/DontFragmentAttribute.java
rename to src/main/java/org/ice4j/attribute/DontFragmentAttribute.java
diff --git a/src/org/ice4j/attribute/ErrorCodeAttribute.java b/src/main/java/org/ice4j/attribute/ErrorCodeAttribute.java
similarity index 100%
rename from src/org/ice4j/attribute/ErrorCodeAttribute.java
rename to src/main/java/org/ice4j/attribute/ErrorCodeAttribute.java
diff --git a/src/org/ice4j/attribute/EvenPortAttribute.java b/src/main/java/org/ice4j/attribute/EvenPortAttribute.java
similarity index 100%
rename from src/org/ice4j/attribute/EvenPortAttribute.java
rename to src/main/java/org/ice4j/attribute/EvenPortAttribute.java
diff --git a/src/org/ice4j/attribute/FingerprintAttribute.java b/src/main/java/org/ice4j/attribute/FingerprintAttribute.java
similarity index 100%
rename from src/org/ice4j/attribute/FingerprintAttribute.java
rename to src/main/java/org/ice4j/attribute/FingerprintAttribute.java
diff --git a/src/org/ice4j/attribute/IceControlAttribute.java b/src/main/java/org/ice4j/attribute/IceControlAttribute.java
similarity index 100%
rename from src/org/ice4j/attribute/IceControlAttribute.java
rename to src/main/java/org/ice4j/attribute/IceControlAttribute.java
diff --git a/src/org/ice4j/attribute/IceControlledAttribute.java b/src/main/java/org/ice4j/attribute/IceControlledAttribute.java
similarity index 100%
rename from src/org/ice4j/attribute/IceControlledAttribute.java
rename to src/main/java/org/ice4j/attribute/IceControlledAttribute.java
diff --git a/src/org/ice4j/attribute/IceControllingAttribute.java b/src/main/java/org/ice4j/attribute/IceControllingAttribute.java
similarity index 100%
rename from src/org/ice4j/attribute/IceControllingAttribute.java
rename to src/main/java/org/ice4j/attribute/IceControllingAttribute.java
diff --git a/src/org/ice4j/attribute/LifetimeAttribute.java b/src/main/java/org/ice4j/attribute/LifetimeAttribute.java
similarity index 100%
rename from src/org/ice4j/attribute/LifetimeAttribute.java
rename to src/main/java/org/ice4j/attribute/LifetimeAttribute.java
diff --git a/src/org/ice4j/attribute/MagicCookieAttribute.java b/src/main/java/org/ice4j/attribute/MagicCookieAttribute.java
similarity index 100%
rename from src/org/ice4j/attribute/MagicCookieAttribute.java
rename to src/main/java/org/ice4j/attribute/MagicCookieAttribute.java
diff --git a/src/org/ice4j/attribute/MappedAddressAttribute.java b/src/main/java/org/ice4j/attribute/MappedAddressAttribute.java
similarity index 100%
rename from src/org/ice4j/attribute/MappedAddressAttribute.java
rename to src/main/java/org/ice4j/attribute/MappedAddressAttribute.java
diff --git a/src/org/ice4j/attribute/MessageIntegrityAttribute.java b/src/main/java/org/ice4j/attribute/MessageIntegrityAttribute.java
similarity index 100%
rename from src/org/ice4j/attribute/MessageIntegrityAttribute.java
rename to src/main/java/org/ice4j/attribute/MessageIntegrityAttribute.java
diff --git a/src/org/ice4j/attribute/NonceAttribute.java b/src/main/java/org/ice4j/attribute/NonceAttribute.java
similarity index 100%
rename from src/org/ice4j/attribute/NonceAttribute.java
rename to src/main/java/org/ice4j/attribute/NonceAttribute.java
diff --git a/src/org/ice4j/attribute/OptionalAttribute.java b/src/main/java/org/ice4j/attribute/OptionalAttribute.java
similarity index 100%
rename from src/org/ice4j/attribute/OptionalAttribute.java
rename to src/main/java/org/ice4j/attribute/OptionalAttribute.java
diff --git a/src/org/ice4j/attribute/PriorityAttribute.java b/src/main/java/org/ice4j/attribute/PriorityAttribute.java
similarity index 100%
rename from src/org/ice4j/attribute/PriorityAttribute.java
rename to src/main/java/org/ice4j/attribute/PriorityAttribute.java
diff --git a/src/org/ice4j/attribute/RealmAttribute.java b/src/main/java/org/ice4j/attribute/RealmAttribute.java
similarity index 100%
rename from src/org/ice4j/attribute/RealmAttribute.java
rename to src/main/java/org/ice4j/attribute/RealmAttribute.java
diff --git a/src/org/ice4j/attribute/ReflectedFromAttribute.java b/src/main/java/org/ice4j/attribute/ReflectedFromAttribute.java
similarity index 100%
rename from src/org/ice4j/attribute/ReflectedFromAttribute.java
rename to src/main/java/org/ice4j/attribute/ReflectedFromAttribute.java
diff --git a/src/org/ice4j/attribute/RemoteAddressAttribute.java b/src/main/java/org/ice4j/attribute/RemoteAddressAttribute.java
similarity index 100%
rename from src/org/ice4j/attribute/RemoteAddressAttribute.java
rename to src/main/java/org/ice4j/attribute/RemoteAddressAttribute.java
diff --git a/src/org/ice4j/attribute/RequestedAddressFamilyAttribute.java b/src/main/java/org/ice4j/attribute/RequestedAddressFamilyAttribute.java
similarity index 100%
rename from src/org/ice4j/attribute/RequestedAddressFamilyAttribute.java
rename to src/main/java/org/ice4j/attribute/RequestedAddressFamilyAttribute.java
diff --git a/src/org/ice4j/attribute/RequestedTransportAttribute.java b/src/main/java/org/ice4j/attribute/RequestedTransportAttribute.java
similarity index 100%
rename from src/org/ice4j/attribute/RequestedTransportAttribute.java
rename to src/main/java/org/ice4j/attribute/RequestedTransportAttribute.java
diff --git a/src/org/ice4j/attribute/ReservationTokenAttribute.java b/src/main/java/org/ice4j/attribute/ReservationTokenAttribute.java
similarity index 100%
rename from src/org/ice4j/attribute/ReservationTokenAttribute.java
rename to src/main/java/org/ice4j/attribute/ReservationTokenAttribute.java
diff --git a/src/org/ice4j/attribute/ResponseAddressAttribute.java b/src/main/java/org/ice4j/attribute/ResponseAddressAttribute.java
similarity index 100%
rename from src/org/ice4j/attribute/ResponseAddressAttribute.java
rename to src/main/java/org/ice4j/attribute/ResponseAddressAttribute.java
diff --git a/src/org/ice4j/attribute/SoftwareAttribute.java b/src/main/java/org/ice4j/attribute/SoftwareAttribute.java
similarity index 100%
rename from src/org/ice4j/attribute/SoftwareAttribute.java
rename to src/main/java/org/ice4j/attribute/SoftwareAttribute.java
diff --git a/src/org/ice4j/attribute/SourceAddressAttribute.java b/src/main/java/org/ice4j/attribute/SourceAddressAttribute.java
similarity index 100%
rename from src/org/ice4j/attribute/SourceAddressAttribute.java
rename to src/main/java/org/ice4j/attribute/SourceAddressAttribute.java
diff --git a/src/org/ice4j/attribute/UnknownAttributesAttribute.java b/src/main/java/org/ice4j/attribute/UnknownAttributesAttribute.java
similarity index 100%
rename from src/org/ice4j/attribute/UnknownAttributesAttribute.java
rename to src/main/java/org/ice4j/attribute/UnknownAttributesAttribute.java
diff --git a/src/org/ice4j/attribute/UseCandidateAttribute.java b/src/main/java/org/ice4j/attribute/UseCandidateAttribute.java
similarity index 100%
rename from src/org/ice4j/attribute/UseCandidateAttribute.java
rename to src/main/java/org/ice4j/attribute/UseCandidateAttribute.java
diff --git a/src/org/ice4j/attribute/UsernameAttribute.java b/src/main/java/org/ice4j/attribute/UsernameAttribute.java
similarity index 100%
rename from src/org/ice4j/attribute/UsernameAttribute.java
rename to src/main/java/org/ice4j/attribute/UsernameAttribute.java
diff --git a/src/org/ice4j/attribute/XorMappedAddressAttribute.java b/src/main/java/org/ice4j/attribute/XorMappedAddressAttribute.java
similarity index 100%
rename from src/org/ice4j/attribute/XorMappedAddressAttribute.java
rename to src/main/java/org/ice4j/attribute/XorMappedAddressAttribute.java
diff --git a/src/org/ice4j/attribute/XorOnlyAttribute.java b/src/main/java/org/ice4j/attribute/XorOnlyAttribute.java
similarity index 100%
rename from src/org/ice4j/attribute/XorOnlyAttribute.java
rename to src/main/java/org/ice4j/attribute/XorOnlyAttribute.java
diff --git a/src/org/ice4j/attribute/XorPeerAddressAttribute.java b/src/main/java/org/ice4j/attribute/XorPeerAddressAttribute.java
similarity index 100%
rename from src/org/ice4j/attribute/XorPeerAddressAttribute.java
rename to src/main/java/org/ice4j/attribute/XorPeerAddressAttribute.java
diff --git a/src/org/ice4j/attribute/XorRelayedAddressAttribute.java b/src/main/java/org/ice4j/attribute/XorRelayedAddressAttribute.java
similarity index 100%
rename from src/org/ice4j/attribute/XorRelayedAddressAttribute.java
rename to src/main/java/org/ice4j/attribute/XorRelayedAddressAttribute.java
diff --git a/src/org/ice4j/ice/Agent.java b/src/main/java/org/ice4j/ice/Agent.java
similarity index 99%
rename from src/org/ice4j/ice/Agent.java
rename to src/main/java/org/ice4j/ice/Agent.java
index 8683eb1..d1e2f52 100644
--- a/src/org/ice4j/ice/Agent.java
+++ b/src/main/java/org/ice4j/ice/Agent.java
@@ -178,7 +178,7 @@ public class Agent
* repair the case where both agents believe to have the controlling or the
* controlled role.
*/
- private final long tieBreaker;
+ private long tieBreaker;
/**
* Determines whether this is the controlling agent in a an ICE interaction.
@@ -311,6 +311,16 @@ public class Agent
nominator = new DefaultNominator(this);
}
+ /**
+ * Sets the tie breaker value. Note that to this should be set early (before
+ * connectivity checks start).
+ * @param tieBreakerInput the value to set.
+ */
+ public void setTieBreaker(long tieBreakerInput)
+ {
+ tieBreaker = tieBreakerInput;
+ }
+
/**
* Creates a new media stream and stores it.
*
diff --git a/src/org/ice4j/ice/Candidate.java b/src/main/java/org/ice4j/ice/Candidate.java
similarity index 97%
rename from src/org/ice4j/ice/Candidate.java
rename to src/main/java/org/ice4j/ice/Candidate.java
index c9ef4e7..50aacd9 100644
--- a/src/org/ice4j/ice/Candidate.java
+++ b/src/main/java/org/ice4j/ice/Candidate.java
@@ -773,24 +773,32 @@ public abstract class Candidate>
*/
protected int getDefaultPreference()
{
- if( getType() == CandidateType.RELAYED_CANDIDATE)
+ // https://tools.ietf.org/html/rfc5245#section-4.1.4
+ //
+ // It is RECOMMENDED that default candidates be chosen based on the
+ // likelihood of those candidates to work with the peer that is being
+ // contacted. It is RECOMMENDED that the default candidates are the
+ // relayed candidates (if relayed candidates are available), server
+ // reflexive candidates (if server reflexive candidates are available),
+ // and finally host candidates.
+
+ switch (getType())
+ {
+ case RELAYED_CANDIDATE:
return 30;
- if( getType() == CandidateType.SERVER_REFLEXIVE_CANDIDATE)
- return 10;
+ case SERVER_REFLEXIVE_CANDIDATE:
+ return 20;
- if( getType() == CandidateType.HOST_CANDIDATE)
- {
- //prefer IPv4 as default since many servers would still freak out
- //when seeing IPv6 address.
- if(getTransportAddress().isIPv6())
- return 20;
- else
- return 25;
+ case HOST_CANDIDATE:
+ // Prefer IPv4 as default since many servers would still freak out
+ // when seeing IPv6 address.
+ return getTransportAddress().isIPv6() ? 10 : 15;
+
+ default:
+ // WTF?
+ return 5;
}
-
- //WTF?
- return 5;
}
/**
diff --git a/src/org/ice4j/ice/CandidateExtendedType.java b/src/main/java/org/ice4j/ice/CandidateExtendedType.java
similarity index 100%
rename from src/org/ice4j/ice/CandidateExtendedType.java
rename to src/main/java/org/ice4j/ice/CandidateExtendedType.java
diff --git a/src/org/ice4j/ice/CandidatePair.java b/src/main/java/org/ice4j/ice/CandidatePair.java
similarity index 100%
rename from src/org/ice4j/ice/CandidatePair.java
rename to src/main/java/org/ice4j/ice/CandidatePair.java
diff --git a/src/org/ice4j/ice/CandidatePairState.java b/src/main/java/org/ice4j/ice/CandidatePairState.java
similarity index 100%
rename from src/org/ice4j/ice/CandidatePairState.java
rename to src/main/java/org/ice4j/ice/CandidatePairState.java
diff --git a/src/org/ice4j/ice/CandidatePrioritizer.java b/src/main/java/org/ice4j/ice/CandidatePrioritizer.java
similarity index 100%
rename from src/org/ice4j/ice/CandidatePrioritizer.java
rename to src/main/java/org/ice4j/ice/CandidatePrioritizer.java
diff --git a/src/org/ice4j/ice/CandidateTcpType.java b/src/main/java/org/ice4j/ice/CandidateTcpType.java
similarity index 100%
rename from src/org/ice4j/ice/CandidateTcpType.java
rename to src/main/java/org/ice4j/ice/CandidateTcpType.java
diff --git a/src/org/ice4j/ice/CandidateType.java b/src/main/java/org/ice4j/ice/CandidateType.java
similarity index 100%
rename from src/org/ice4j/ice/CandidateType.java
rename to src/main/java/org/ice4j/ice/CandidateType.java
diff --git a/src/org/ice4j/ice/CheckList.java b/src/main/java/org/ice4j/ice/CheckList.java
similarity index 100%
rename from src/org/ice4j/ice/CheckList.java
rename to src/main/java/org/ice4j/ice/CheckList.java
diff --git a/src/org/ice4j/ice/CheckListState.java b/src/main/java/org/ice4j/ice/CheckListState.java
similarity index 100%
rename from src/org/ice4j/ice/CheckListState.java
rename to src/main/java/org/ice4j/ice/CheckListState.java
diff --git a/src/org/ice4j/ice/Component.java b/src/main/java/org/ice4j/ice/Component.java
similarity index 98%
rename from src/org/ice4j/ice/Component.java
rename to src/main/java/org/ice4j/ice/Component.java
index 274c23d..464f2ef 100644
--- a/src/org/ice4j/ice/Component.java
+++ b/src/main/java/org/ice4j/ice/Component.java
@@ -691,21 +691,15 @@ public class Component
{
synchronized(localCandidates)
{
- Iterator localCandsIter
- = localCandidates.iterator();
+ Iterator localCandsIter = localCandidates.iterator();
while (localCandsIter.hasNext())
{
LocalCandidate cand = localCandsIter.next();
- if(this.defaultCandidate == null)
- {
- this.defaultCandidate = cand;
- continue;
- }
-
- if( defaultCandidate.getDefaultPreference()
- < cand.getDefaultPreference())
+ if ((defaultCandidate == null)
+ || (defaultCandidate.getDefaultPreference()
+ < cand.getDefaultPreference()))
{
defaultCandidate = cand;
}
diff --git a/src/org/ice4j/ice/ConnectivityCheckClient.java b/src/main/java/org/ice4j/ice/ConnectivityCheckClient.java
similarity index 100%
rename from src/org/ice4j/ice/ConnectivityCheckClient.java
rename to src/main/java/org/ice4j/ice/ConnectivityCheckClient.java
diff --git a/src/org/ice4j/ice/ConnectivityCheckServer.java b/src/main/java/org/ice4j/ice/ConnectivityCheckServer.java
similarity index 100%
rename from src/org/ice4j/ice/ConnectivityCheckServer.java
rename to src/main/java/org/ice4j/ice/ConnectivityCheckServer.java
diff --git a/src/org/ice4j/ice/DefaultNominator.java b/src/main/java/org/ice4j/ice/DefaultNominator.java
similarity index 100%
rename from src/org/ice4j/ice/DefaultNominator.java
rename to src/main/java/org/ice4j/ice/DefaultNominator.java
diff --git a/src/org/ice4j/ice/FoundationsRegistry.java b/src/main/java/org/ice4j/ice/FoundationsRegistry.java
similarity index 100%
rename from src/org/ice4j/ice/FoundationsRegistry.java
rename to src/main/java/org/ice4j/ice/FoundationsRegistry.java
diff --git a/src/org/ice4j/ice/GoogleRelayedCandidate.java b/src/main/java/org/ice4j/ice/GoogleRelayedCandidate.java
similarity index 100%
rename from src/org/ice4j/ice/GoogleRelayedCandidate.java
rename to src/main/java/org/ice4j/ice/GoogleRelayedCandidate.java
diff --git a/src/org/ice4j/ice/HostCandidate.java b/src/main/java/org/ice4j/ice/HostCandidate.java
similarity index 100%
rename from src/org/ice4j/ice/HostCandidate.java
rename to src/main/java/org/ice4j/ice/HostCandidate.java
diff --git a/src/org/ice4j/ice/IceMediaStream.java b/src/main/java/org/ice4j/ice/IceMediaStream.java
similarity index 100%
rename from src/org/ice4j/ice/IceMediaStream.java
rename to src/main/java/org/ice4j/ice/IceMediaStream.java
diff --git a/src/org/ice4j/ice/IceProcessingState.java b/src/main/java/org/ice4j/ice/IceProcessingState.java
similarity index 100%
rename from src/org/ice4j/ice/IceProcessingState.java
rename to src/main/java/org/ice4j/ice/IceProcessingState.java
diff --git a/src/org/ice4j/ice/LocalCandidate.java b/src/main/java/org/ice4j/ice/LocalCandidate.java
similarity index 100%
rename from src/org/ice4j/ice/LocalCandidate.java
rename to src/main/java/org/ice4j/ice/LocalCandidate.java
diff --git a/src/org/ice4j/ice/NetworkUtils.java b/src/main/java/org/ice4j/ice/NetworkUtils.java
similarity index 100%
rename from src/org/ice4j/ice/NetworkUtils.java
rename to src/main/java/org/ice4j/ice/NetworkUtils.java
diff --git a/src/org/ice4j/ice/NominationStrategy.java b/src/main/java/org/ice4j/ice/NominationStrategy.java
similarity index 100%
rename from src/org/ice4j/ice/NominationStrategy.java
rename to src/main/java/org/ice4j/ice/NominationStrategy.java
diff --git a/src/org/ice4j/ice/PeerReflexiveCandidate.java b/src/main/java/org/ice4j/ice/PeerReflexiveCandidate.java
similarity index 100%
rename from src/org/ice4j/ice/PeerReflexiveCandidate.java
rename to src/main/java/org/ice4j/ice/PeerReflexiveCandidate.java
diff --git a/src/org/ice4j/ice/RelayedCandidate.java b/src/main/java/org/ice4j/ice/RelayedCandidate.java
similarity index 100%
rename from src/org/ice4j/ice/RelayedCandidate.java
rename to src/main/java/org/ice4j/ice/RelayedCandidate.java
diff --git a/src/org/ice4j/ice/RemoteCandidate.java b/src/main/java/org/ice4j/ice/RemoteCandidate.java
similarity index 100%
rename from src/org/ice4j/ice/RemoteCandidate.java
rename to src/main/java/org/ice4j/ice/RemoteCandidate.java
diff --git a/src/org/ice4j/ice/ServerReflexiveCandidate.java b/src/main/java/org/ice4j/ice/ServerReflexiveCandidate.java
similarity index 100%
rename from src/org/ice4j/ice/ServerReflexiveCandidate.java
rename to src/main/java/org/ice4j/ice/ServerReflexiveCandidate.java
diff --git a/src/org/ice4j/ice/TcpHostCandidate.java b/src/main/java/org/ice4j/ice/TcpHostCandidate.java
similarity index 100%
rename from src/org/ice4j/ice/TcpHostCandidate.java
rename to src/main/java/org/ice4j/ice/TcpHostCandidate.java
diff --git a/src/org/ice4j/ice/UPNPCandidate.java b/src/main/java/org/ice4j/ice/UPNPCandidate.java
similarity index 100%
rename from src/org/ice4j/ice/UPNPCandidate.java
rename to src/main/java/org/ice4j/ice/UPNPCandidate.java
diff --git a/src/org/ice4j/ice/harvest/AwsCandidateHarvester.java b/src/main/java/org/ice4j/ice/harvest/AwsCandidateHarvester.java
similarity index 100%
rename from src/org/ice4j/ice/harvest/AwsCandidateHarvester.java
rename to src/main/java/org/ice4j/ice/harvest/AwsCandidateHarvester.java
diff --git a/src/org/ice4j/ice/harvest/CandidateHarvester.java b/src/main/java/org/ice4j/ice/harvest/CandidateHarvester.java
similarity index 100%
rename from src/org/ice4j/ice/harvest/CandidateHarvester.java
rename to src/main/java/org/ice4j/ice/harvest/CandidateHarvester.java
diff --git a/src/org/ice4j/ice/harvest/CandidateHarvesterSet.java b/src/main/java/org/ice4j/ice/harvest/CandidateHarvesterSet.java
similarity index 100%
rename from src/org/ice4j/ice/harvest/CandidateHarvesterSet.java
rename to src/main/java/org/ice4j/ice/harvest/CandidateHarvesterSet.java
diff --git a/src/org/ice4j/ice/harvest/CandidateHarvesterSetElement.java b/src/main/java/org/ice4j/ice/harvest/CandidateHarvesterSetElement.java
similarity index 100%
rename from src/org/ice4j/ice/harvest/CandidateHarvesterSetElement.java
rename to src/main/java/org/ice4j/ice/harvest/CandidateHarvesterSetElement.java
diff --git a/src/org/ice4j/ice/harvest/CandidateHarvesterSetTask.java b/src/main/java/org/ice4j/ice/harvest/CandidateHarvesterSetTask.java
similarity index 100%
rename from src/org/ice4j/ice/harvest/CandidateHarvesterSetTask.java
rename to src/main/java/org/ice4j/ice/harvest/CandidateHarvesterSetTask.java
diff --git a/src/org/ice4j/ice/harvest/GoogleTurnCandidateHarvest.java b/src/main/java/org/ice4j/ice/harvest/GoogleTurnCandidateHarvest.java
similarity index 100%
rename from src/org/ice4j/ice/harvest/GoogleTurnCandidateHarvest.java
rename to src/main/java/org/ice4j/ice/harvest/GoogleTurnCandidateHarvest.java
diff --git a/src/org/ice4j/ice/harvest/GoogleTurnCandidateHarvester.java b/src/main/java/org/ice4j/ice/harvest/GoogleTurnCandidateHarvester.java
similarity index 100%
rename from src/org/ice4j/ice/harvest/GoogleTurnCandidateHarvester.java
rename to src/main/java/org/ice4j/ice/harvest/GoogleTurnCandidateHarvester.java
diff --git a/src/org/ice4j/ice/harvest/GoogleTurnSSLCandidateHarvester.java b/src/main/java/org/ice4j/ice/harvest/GoogleTurnSSLCandidateHarvester.java
similarity index 100%
rename from src/org/ice4j/ice/harvest/GoogleTurnSSLCandidateHarvester.java
rename to src/main/java/org/ice4j/ice/harvest/GoogleTurnSSLCandidateHarvester.java
diff --git a/src/org/ice4j/ice/harvest/HarvestStatistics.java b/src/main/java/org/ice4j/ice/harvest/HarvestStatistics.java
similarity index 100%
rename from src/org/ice4j/ice/harvest/HarvestStatistics.java
rename to src/main/java/org/ice4j/ice/harvest/HarvestStatistics.java
diff --git a/src/org/ice4j/ice/harvest/HostCandidateHarvester.java b/src/main/java/org/ice4j/ice/harvest/HostCandidateHarvester.java
similarity index 100%
rename from src/org/ice4j/ice/harvest/HostCandidateHarvester.java
rename to src/main/java/org/ice4j/ice/harvest/HostCandidateHarvester.java
diff --git a/src/org/ice4j/ice/harvest/MappingCandidateHarvester.java b/src/main/java/org/ice4j/ice/harvest/MappingCandidateHarvester.java
similarity index 100%
rename from src/org/ice4j/ice/harvest/MappingCandidateHarvester.java
rename to src/main/java/org/ice4j/ice/harvest/MappingCandidateHarvester.java
diff --git a/src/org/ice4j/ice/harvest/MultiplexingTcpHostHarvester.java b/src/main/java/org/ice4j/ice/harvest/MultiplexingTcpHostHarvester.java
similarity index 100%
rename from src/org/ice4j/ice/harvest/MultiplexingTcpHostHarvester.java
rename to src/main/java/org/ice4j/ice/harvest/MultiplexingTcpHostHarvester.java
diff --git a/src/org/ice4j/ice/harvest/SinglePortUdpHarvester.java b/src/main/java/org/ice4j/ice/harvest/SinglePortUdpHarvester.java
similarity index 100%
rename from src/org/ice4j/ice/harvest/SinglePortUdpHarvester.java
rename to src/main/java/org/ice4j/ice/harvest/SinglePortUdpHarvester.java
diff --git a/src/org/ice4j/ice/harvest/StunCandidateHarvest.java b/src/main/java/org/ice4j/ice/harvest/StunCandidateHarvest.java
similarity index 100%
rename from src/org/ice4j/ice/harvest/StunCandidateHarvest.java
rename to src/main/java/org/ice4j/ice/harvest/StunCandidateHarvest.java
diff --git a/src/org/ice4j/ice/harvest/StunCandidateHarvester.java b/src/main/java/org/ice4j/ice/harvest/StunCandidateHarvester.java
similarity index 100%
rename from src/org/ice4j/ice/harvest/StunCandidateHarvester.java
rename to src/main/java/org/ice4j/ice/harvest/StunCandidateHarvester.java
diff --git a/src/org/ice4j/ice/harvest/TrickleCallback.java b/src/main/java/org/ice4j/ice/harvest/TrickleCallback.java
similarity index 100%
rename from src/org/ice4j/ice/harvest/TrickleCallback.java
rename to src/main/java/org/ice4j/ice/harvest/TrickleCallback.java
diff --git a/src/org/ice4j/ice/harvest/TurnCandidateHarvest.java b/src/main/java/org/ice4j/ice/harvest/TurnCandidateHarvest.java
similarity index 100%
rename from src/org/ice4j/ice/harvest/TurnCandidateHarvest.java
rename to src/main/java/org/ice4j/ice/harvest/TurnCandidateHarvest.java
diff --git a/src/org/ice4j/ice/harvest/TurnCandidateHarvester.java b/src/main/java/org/ice4j/ice/harvest/TurnCandidateHarvester.java
similarity index 100%
rename from src/org/ice4j/ice/harvest/TurnCandidateHarvester.java
rename to src/main/java/org/ice4j/ice/harvest/TurnCandidateHarvester.java
diff --git a/src/org/ice4j/ice/harvest/UPNPHarvester.java b/src/main/java/org/ice4j/ice/harvest/UPNPHarvester.java
similarity index 100%
rename from src/org/ice4j/ice/harvest/UPNPHarvester.java
rename to src/main/java/org/ice4j/ice/harvest/UPNPHarvester.java
diff --git a/src/org/ice4j/ice/sdp/CandidateAttribute.java b/src/main/java/org/ice4j/ice/sdp/CandidateAttribute.java
similarity index 73%
rename from src/org/ice4j/ice/sdp/CandidateAttribute.java
rename to src/main/java/org/ice4j/ice/sdp/CandidateAttribute.java
index 90538c0..f2deb76 100644
--- a/src/org/ice4j/ice/sdp/CandidateAttribute.java
+++ b/src/main/java/org/ice4j/ice/sdp/CandidateAttribute.java
@@ -28,7 +28,12 @@ public class CandidateAttribute extends AttributeField
/**
* The Candidate that we will be encapsulating.
*/
- private final Candidate> candidate;
+ private Candidate> candidate;
+
+ protected CandidateAttribute()
+ {
+ this(null);
+ }
/**
* Creates an attribute instance
@@ -40,6 +45,29 @@ public class CandidateAttribute extends AttributeField
this.candidate = candidate;
}
+ /**
+ * {@inheritDoc}
+ */
+ public NameValue getAttribute()
+ {
+ // We've overridden the method getValue() of AttributeField. The
+ // NameValue pair of the method getAttribute() should return the value of
+ // the method getValue() of AttributeField then. Unfortunately, NameValue
+ // accesses its field value in multiple places so it is not a question of
+ // simply overriding a method or two. As a compromise, initialize a new
+ // NameValue with the current name and value upon each invocation.
+ NameValue attribute = super.getAttribute();
+ String name = getName();
+
+ if ((attribute == null)
+ || (name.equals(attribute.getName())
+ && (attribute.getValue() == null)))
+ {
+ attribute = new NameValue(name, getValue());
+ }
+ return attribute;
+ }
+
/**
* Returns the name of this attribute
*
@@ -69,8 +97,6 @@ public class CandidateAttribute extends AttributeField
return true;
}
- ;
-
/**
* Returns the value of this attribute.
*
@@ -111,10 +137,9 @@ public class CandidateAttribute extends AttributeField
* @throws javax.sdp.SdpException if there's a problem with the value
* String.
*/
- public void setValue(String value) throws
- SdpException
+ public void setValue(String value)
+ throws SdpException
{
-
}
/**
@@ -134,7 +159,10 @@ public class CandidateAttribute extends AttributeField
*/
public CandidateAttribute clone()
{
- return null;
+ CandidateAttribute clone = (CandidateAttribute) super.clone();
+
+ clone.candidate = candidate;
+ return clone;
}
/**
@@ -149,5 +177,4 @@ public class CandidateAttribute extends AttributeField
sbuff.append(getValue());
return sbuff.append(Separators.NEWLINE).toString();
}
-
-}
\ No newline at end of file
+}
diff --git a/src/org/ice4j/ice/sdp/IceSdpUtils.java b/src/main/java/org/ice4j/ice/sdp/IceSdpUtils.java
similarity index 100%
rename from src/org/ice4j/ice/sdp/IceSdpUtils.java
rename to src/main/java/org/ice4j/ice/sdp/IceSdpUtils.java
diff --git a/src/org/ice4j/message/ChannelData.java b/src/main/java/org/ice4j/message/ChannelData.java
similarity index 100%
rename from src/org/ice4j/message/ChannelData.java
rename to src/main/java/org/ice4j/message/ChannelData.java
diff --git a/src/org/ice4j/message/Indication.java b/src/main/java/org/ice4j/message/Indication.java
similarity index 100%
rename from src/org/ice4j/message/Indication.java
rename to src/main/java/org/ice4j/message/Indication.java
diff --git a/src/org/ice4j/message/Message.java b/src/main/java/org/ice4j/message/Message.java
similarity index 100%
rename from src/org/ice4j/message/Message.java
rename to src/main/java/org/ice4j/message/Message.java
diff --git a/src/org/ice4j/message/MessageFactory.java b/src/main/java/org/ice4j/message/MessageFactory.java
similarity index 100%
rename from src/org/ice4j/message/MessageFactory.java
rename to src/main/java/org/ice4j/message/MessageFactory.java
diff --git a/src/org/ice4j/message/Request.java b/src/main/java/org/ice4j/message/Request.java
similarity index 100%
rename from src/org/ice4j/message/Request.java
rename to src/main/java/org/ice4j/message/Request.java
diff --git a/src/org/ice4j/message/Response.java b/src/main/java/org/ice4j/message/Response.java
similarity index 100%
rename from src/org/ice4j/message/Response.java
rename to src/main/java/org/ice4j/message/Response.java
diff --git a/src/org/ice4j/pseudotcp/EnShutdown.java b/src/main/java/org/ice4j/pseudotcp/EnShutdown.java
similarity index 100%
rename from src/org/ice4j/pseudotcp/EnShutdown.java
rename to src/main/java/org/ice4j/pseudotcp/EnShutdown.java
diff --git a/src/org/ice4j/pseudotcp/IPseudoTcpNotify.java b/src/main/java/org/ice4j/pseudotcp/IPseudoTcpNotify.java
similarity index 100%
rename from src/org/ice4j/pseudotcp/IPseudoTcpNotify.java
rename to src/main/java/org/ice4j/pseudotcp/IPseudoTcpNotify.java
diff --git a/src/org/ice4j/pseudotcp/Option.java b/src/main/java/org/ice4j/pseudotcp/Option.java
similarity index 100%
rename from src/org/ice4j/pseudotcp/Option.java
rename to src/main/java/org/ice4j/pseudotcp/Option.java
diff --git a/src/org/ice4j/pseudotcp/PseudoTCPBase.java b/src/main/java/org/ice4j/pseudotcp/PseudoTCPBase.java
similarity index 100%
rename from src/org/ice4j/pseudotcp/PseudoTCPBase.java
rename to src/main/java/org/ice4j/pseudotcp/PseudoTCPBase.java
diff --git a/src/org/ice4j/pseudotcp/PseudoTcpJavaSocket.java b/src/main/java/org/ice4j/pseudotcp/PseudoTcpJavaSocket.java
similarity index 100%
rename from src/org/ice4j/pseudotcp/PseudoTcpJavaSocket.java
rename to src/main/java/org/ice4j/pseudotcp/PseudoTcpJavaSocket.java
diff --git a/src/org/ice4j/pseudotcp/PseudoTcpNotify.java b/src/main/java/org/ice4j/pseudotcp/PseudoTcpNotify.java
similarity index 100%
rename from src/org/ice4j/pseudotcp/PseudoTcpNotify.java
rename to src/main/java/org/ice4j/pseudotcp/PseudoTcpNotify.java
diff --git a/src/org/ice4j/pseudotcp/PseudoTcpSocket.java b/src/main/java/org/ice4j/pseudotcp/PseudoTcpSocket.java
similarity index 100%
rename from src/org/ice4j/pseudotcp/PseudoTcpSocket.java
rename to src/main/java/org/ice4j/pseudotcp/PseudoTcpSocket.java
diff --git a/src/org/ice4j/pseudotcp/PseudoTcpSocketFactory.java b/src/main/java/org/ice4j/pseudotcp/PseudoTcpSocketFactory.java
similarity index 100%
rename from src/org/ice4j/pseudotcp/PseudoTcpSocketFactory.java
rename to src/main/java/org/ice4j/pseudotcp/PseudoTcpSocketFactory.java
diff --git a/src/org/ice4j/pseudotcp/PseudoTcpSocketImpl.java b/src/main/java/org/ice4j/pseudotcp/PseudoTcpSocketImpl.java
similarity index 100%
rename from src/org/ice4j/pseudotcp/PseudoTcpSocketImpl.java
rename to src/main/java/org/ice4j/pseudotcp/PseudoTcpSocketImpl.java
diff --git a/src/org/ice4j/pseudotcp/PseudoTcpState.java b/src/main/java/org/ice4j/pseudotcp/PseudoTcpState.java
similarity index 100%
rename from src/org/ice4j/pseudotcp/PseudoTcpState.java
rename to src/main/java/org/ice4j/pseudotcp/PseudoTcpState.java
diff --git a/src/org/ice4j/pseudotcp/RSegment.java b/src/main/java/org/ice4j/pseudotcp/RSegment.java
similarity index 100%
rename from src/org/ice4j/pseudotcp/RSegment.java
rename to src/main/java/org/ice4j/pseudotcp/RSegment.java
diff --git a/src/org/ice4j/pseudotcp/SSegment.java b/src/main/java/org/ice4j/pseudotcp/SSegment.java
similarity index 100%
rename from src/org/ice4j/pseudotcp/SSegment.java
rename to src/main/java/org/ice4j/pseudotcp/SSegment.java
diff --git a/src/org/ice4j/pseudotcp/Segment.java b/src/main/java/org/ice4j/pseudotcp/Segment.java
similarity index 100%
rename from src/org/ice4j/pseudotcp/Segment.java
rename to src/main/java/org/ice4j/pseudotcp/Segment.java
diff --git a/src/org/ice4j/pseudotcp/SendFlags.java b/src/main/java/org/ice4j/pseudotcp/SendFlags.java
similarity index 100%
rename from src/org/ice4j/pseudotcp/SendFlags.java
rename to src/main/java/org/ice4j/pseudotcp/SendFlags.java
diff --git a/src/org/ice4j/pseudotcp/WriteResult.java b/src/main/java/org/ice4j/pseudotcp/WriteResult.java
similarity index 100%
rename from src/org/ice4j/pseudotcp/WriteResult.java
rename to src/main/java/org/ice4j/pseudotcp/WriteResult.java
diff --git a/src/org/ice4j/pseudotcp/util/ByteFifoBuffer.java b/src/main/java/org/ice4j/pseudotcp/util/ByteFifoBuffer.java
similarity index 100%
rename from src/org/ice4j/pseudotcp/util/ByteFifoBuffer.java
rename to src/main/java/org/ice4j/pseudotcp/util/ByteFifoBuffer.java
diff --git a/src/org/ice4j/security/CredentialsAuthority.java b/src/main/java/org/ice4j/security/CredentialsAuthority.java
similarity index 100%
rename from src/org/ice4j/security/CredentialsAuthority.java
rename to src/main/java/org/ice4j/security/CredentialsAuthority.java
diff --git a/src/org/ice4j/security/CredentialsManager.java b/src/main/java/org/ice4j/security/CredentialsManager.java
similarity index 100%
rename from src/org/ice4j/security/CredentialsManager.java
rename to src/main/java/org/ice4j/security/CredentialsManager.java
diff --git a/src/org/ice4j/security/LongTermCredential.java b/src/main/java/org/ice4j/security/LongTermCredential.java
similarity index 100%
rename from src/org/ice4j/security/LongTermCredential.java
rename to src/main/java/org/ice4j/security/LongTermCredential.java
diff --git a/src/org/ice4j/security/LongTermCredentialSession.java b/src/main/java/org/ice4j/security/LongTermCredentialSession.java
similarity index 100%
rename from src/org/ice4j/security/LongTermCredentialSession.java
rename to src/main/java/org/ice4j/security/LongTermCredentialSession.java
diff --git a/src/org/ice4j/socket/BaseDelegatingServerSocketChannel.java b/src/main/java/org/ice4j/socket/BaseDelegatingServerSocketChannel.java
similarity index 100%
rename from src/org/ice4j/socket/BaseDelegatingServerSocketChannel.java
rename to src/main/java/org/ice4j/socket/BaseDelegatingServerSocketChannel.java
diff --git a/src/org/ice4j/socket/BaseDelegatingSocketChannel.java b/src/main/java/org/ice4j/socket/BaseDelegatingSocketChannel.java
similarity index 100%
rename from src/org/ice4j/socket/BaseDelegatingSocketChannel.java
rename to src/main/java/org/ice4j/socket/BaseDelegatingSocketChannel.java
diff --git a/src/org/ice4j/socket/DTLSDatagramFilter.java b/src/main/java/org/ice4j/socket/DTLSDatagramFilter.java
similarity index 100%
rename from src/org/ice4j/socket/DTLSDatagramFilter.java
rename to src/main/java/org/ice4j/socket/DTLSDatagramFilter.java
diff --git a/src/org/ice4j/socket/DatagramPacketFilter.java b/src/main/java/org/ice4j/socket/DatagramPacketFilter.java
similarity index 100%
rename from src/org/ice4j/socket/DatagramPacketFilter.java
rename to src/main/java/org/ice4j/socket/DatagramPacketFilter.java
diff --git a/src/org/ice4j/socket/DatagramSocketFactory.java b/src/main/java/org/ice4j/socket/DatagramSocketFactory.java
similarity index 100%
rename from src/org/ice4j/socket/DatagramSocketFactory.java
rename to src/main/java/org/ice4j/socket/DatagramSocketFactory.java
diff --git a/src/org/ice4j/socket/DelegatingDatagramSocket.java b/src/main/java/org/ice4j/socket/DelegatingDatagramSocket.java
similarity index 100%
rename from src/org/ice4j/socket/DelegatingDatagramSocket.java
rename to src/main/java/org/ice4j/socket/DelegatingDatagramSocket.java
diff --git a/src/org/ice4j/socket/DelegatingServerSocket.java b/src/main/java/org/ice4j/socket/DelegatingServerSocket.java
similarity index 100%
rename from src/org/ice4j/socket/DelegatingServerSocket.java
rename to src/main/java/org/ice4j/socket/DelegatingServerSocket.java
diff --git a/src/org/ice4j/socket/DelegatingSocket.java b/src/main/java/org/ice4j/socket/DelegatingSocket.java
similarity index 100%
rename from src/org/ice4j/socket/DelegatingSocket.java
rename to src/main/java/org/ice4j/socket/DelegatingSocket.java
diff --git a/src/org/ice4j/socket/GoogleRelayedCandidateDatagramSocket.java b/src/main/java/org/ice4j/socket/GoogleRelayedCandidateDatagramSocket.java
similarity index 100%
rename from src/org/ice4j/socket/GoogleRelayedCandidateDatagramSocket.java
rename to src/main/java/org/ice4j/socket/GoogleRelayedCandidateDatagramSocket.java
diff --git a/src/org/ice4j/socket/GoogleRelayedCandidateDelegate.java b/src/main/java/org/ice4j/socket/GoogleRelayedCandidateDelegate.java
similarity index 100%
rename from src/org/ice4j/socket/GoogleRelayedCandidateDelegate.java
rename to src/main/java/org/ice4j/socket/GoogleRelayedCandidateDelegate.java
diff --git a/src/org/ice4j/socket/GoogleRelayedCandidateSocket.java b/src/main/java/org/ice4j/socket/GoogleRelayedCandidateSocket.java
similarity index 100%
rename from src/org/ice4j/socket/GoogleRelayedCandidateSocket.java
rename to src/main/java/org/ice4j/socket/GoogleRelayedCandidateSocket.java
diff --git a/src/org/ice4j/socket/HttpDemuxFilter.java b/src/main/java/org/ice4j/socket/HttpDemuxFilter.java
similarity index 100%
rename from src/org/ice4j/socket/HttpDemuxFilter.java
rename to src/main/java/org/ice4j/socket/HttpDemuxFilter.java
diff --git a/src/org/ice4j/socket/IceSocketWrapper.java b/src/main/java/org/ice4j/socket/IceSocketWrapper.java
similarity index 100%
rename from src/org/ice4j/socket/IceSocketWrapper.java
rename to src/main/java/org/ice4j/socket/IceSocketWrapper.java
diff --git a/src/org/ice4j/socket/IceTcpServerSocketWrapper.java b/src/main/java/org/ice4j/socket/IceTcpServerSocketWrapper.java
similarity index 100%
rename from src/org/ice4j/socket/IceTcpServerSocketWrapper.java
rename to src/main/java/org/ice4j/socket/IceTcpServerSocketWrapper.java
diff --git a/src/org/ice4j/socket/IceTcpSocketWrapper.java b/src/main/java/org/ice4j/socket/IceTcpSocketWrapper.java
similarity index 100%
rename from src/org/ice4j/socket/IceTcpSocketWrapper.java
rename to src/main/java/org/ice4j/socket/IceTcpSocketWrapper.java
diff --git a/src/org/ice4j/socket/IceUdpSocketWrapper.java b/src/main/java/org/ice4j/socket/IceUdpSocketWrapper.java
similarity index 100%
rename from src/org/ice4j/socket/IceUdpSocketWrapper.java
rename to src/main/java/org/ice4j/socket/IceUdpSocketWrapper.java
diff --git a/src/org/ice4j/socket/MultiplexedDatagramSocket.java b/src/main/java/org/ice4j/socket/MultiplexedDatagramSocket.java
similarity index 100%
rename from src/org/ice4j/socket/MultiplexedDatagramSocket.java
rename to src/main/java/org/ice4j/socket/MultiplexedDatagramSocket.java
diff --git a/src/org/ice4j/socket/MultiplexedSocket.java b/src/main/java/org/ice4j/socket/MultiplexedSocket.java
similarity index 100%
rename from src/org/ice4j/socket/MultiplexedSocket.java
rename to src/main/java/org/ice4j/socket/MultiplexedSocket.java
diff --git a/src/org/ice4j/socket/MultiplexingDatagramSocket.java b/src/main/java/org/ice4j/socket/MultiplexingDatagramSocket.java
similarity index 100%
rename from src/org/ice4j/socket/MultiplexingDatagramSocket.java
rename to src/main/java/org/ice4j/socket/MultiplexingDatagramSocket.java
diff --git a/src/org/ice4j/socket/MultiplexingSocket.java b/src/main/java/org/ice4j/socket/MultiplexingSocket.java
similarity index 100%
rename from src/org/ice4j/socket/MultiplexingSocket.java
rename to src/main/java/org/ice4j/socket/MultiplexingSocket.java
diff --git a/src/org/ice4j/socket/MuxServerSocketChannelFactory.java b/src/main/java/org/ice4j/socket/MuxServerSocketChannelFactory.java
similarity index 100%
rename from src/org/ice4j/socket/MuxServerSocketChannelFactory.java
rename to src/main/java/org/ice4j/socket/MuxServerSocketChannelFactory.java
diff --git a/src/org/ice4j/socket/RelayedCandidateDatagramSocket.java b/src/main/java/org/ice4j/socket/RelayedCandidateDatagramSocket.java
similarity index 100%
rename from src/org/ice4j/socket/RelayedCandidateDatagramSocket.java
rename to src/main/java/org/ice4j/socket/RelayedCandidateDatagramSocket.java
diff --git a/src/org/ice4j/socket/RtcpDemuxPacketFilter.java b/src/main/java/org/ice4j/socket/RtcpDemuxPacketFilter.java
similarity index 100%
rename from src/org/ice4j/socket/RtcpDemuxPacketFilter.java
rename to src/main/java/org/ice4j/socket/RtcpDemuxPacketFilter.java
diff --git a/src/org/ice4j/socket/SafeCloseDatagramSocket.java b/src/main/java/org/ice4j/socket/SafeCloseDatagramSocket.java
similarity index 100%
rename from src/org/ice4j/socket/SafeCloseDatagramSocket.java
rename to src/main/java/org/ice4j/socket/SafeCloseDatagramSocket.java
diff --git a/src/org/ice4j/socket/SocketReceiveBuffer.java b/src/main/java/org/ice4j/socket/SocketReceiveBuffer.java
similarity index 100%
rename from src/org/ice4j/socket/SocketReceiveBuffer.java
rename to src/main/java/org/ice4j/socket/SocketReceiveBuffer.java
diff --git a/src/org/ice4j/socket/StunDatagramPacketFilter.java b/src/main/java/org/ice4j/socket/StunDatagramPacketFilter.java
similarity index 100%
rename from src/org/ice4j/socket/StunDatagramPacketFilter.java
rename to src/main/java/org/ice4j/socket/StunDatagramPacketFilter.java
diff --git a/src/org/ice4j/socket/TCPInputStream.java b/src/main/java/org/ice4j/socket/TCPInputStream.java
similarity index 100%
rename from src/org/ice4j/socket/TCPInputStream.java
rename to src/main/java/org/ice4j/socket/TCPInputStream.java
diff --git a/src/org/ice4j/socket/TCPOutputStream.java b/src/main/java/org/ice4j/socket/TCPOutputStream.java
similarity index 100%
rename from src/org/ice4j/socket/TCPOutputStream.java
rename to src/main/java/org/ice4j/socket/TCPOutputStream.java
diff --git a/src/org/ice4j/socket/TurnDatagramPacketFilter.java b/src/main/java/org/ice4j/socket/TurnDatagramPacketFilter.java
similarity index 100%
rename from src/org/ice4j/socket/TurnDatagramPacketFilter.java
rename to src/main/java/org/ice4j/socket/TurnDatagramPacketFilter.java
diff --git a/src/org/ice4j/socket/jdk8/DelegatingServerSocketChannel.java b/src/main/java/org/ice4j/socket/jdk8/DelegatingServerSocketChannel.java
similarity index 100%
rename from src/org/ice4j/socket/jdk8/DelegatingServerSocketChannel.java
rename to src/main/java/org/ice4j/socket/jdk8/DelegatingServerSocketChannel.java
diff --git a/src/org/ice4j/socket/jdk8/DelegatingSocketChannel.java b/src/main/java/org/ice4j/socket/jdk8/DelegatingSocketChannel.java
similarity index 100%
rename from src/org/ice4j/socket/jdk8/DelegatingSocketChannel.java
rename to src/main/java/org/ice4j/socket/jdk8/DelegatingSocketChannel.java
diff --git a/src/org/ice4j/socket/jdk8/MuxServerSocketChannel.java b/src/main/java/org/ice4j/socket/jdk8/MuxServerSocketChannel.java
similarity index 100%
rename from src/org/ice4j/socket/jdk8/MuxServerSocketChannel.java
rename to src/main/java/org/ice4j/socket/jdk8/MuxServerSocketChannel.java
diff --git a/src/org/ice4j/socket/jdk8/PreReadSocketChannel.java b/src/main/java/org/ice4j/socket/jdk8/PreReadSocketChannel.java
similarity index 100%
rename from src/org/ice4j/socket/jdk8/PreReadSocketChannel.java
rename to src/main/java/org/ice4j/socket/jdk8/PreReadSocketChannel.java
diff --git a/src/org/ice4j/stack/ChannelDataEventHandler.java b/src/main/java/org/ice4j/stack/ChannelDataEventHandler.java
similarity index 100%
rename from src/org/ice4j/stack/ChannelDataEventHandler.java
rename to src/main/java/org/ice4j/stack/ChannelDataEventHandler.java
diff --git a/src/org/ice4j/stack/Connector.java b/src/main/java/org/ice4j/stack/Connector.java
similarity index 100%
rename from src/org/ice4j/stack/Connector.java
rename to src/main/java/org/ice4j/stack/Connector.java
diff --git a/src/org/ice4j/stack/ErrorHandler.java b/src/main/java/org/ice4j/stack/ErrorHandler.java
similarity index 100%
rename from src/org/ice4j/stack/ErrorHandler.java
rename to src/main/java/org/ice4j/stack/ErrorHandler.java
diff --git a/src/org/ice4j/stack/EventDispatcher.java b/src/main/java/org/ice4j/stack/EventDispatcher.java
similarity index 100%
rename from src/org/ice4j/stack/EventDispatcher.java
rename to src/main/java/org/ice4j/stack/EventDispatcher.java
diff --git a/src/org/ice4j/stack/MessageEventHandler.java b/src/main/java/org/ice4j/stack/MessageEventHandler.java
similarity index 100%
rename from src/org/ice4j/stack/MessageEventHandler.java
rename to src/main/java/org/ice4j/stack/MessageEventHandler.java
diff --git a/src/org/ice4j/stack/MessageProcessor.java b/src/main/java/org/ice4j/stack/MessageProcessor.java
similarity index 100%
rename from src/org/ice4j/stack/MessageProcessor.java
rename to src/main/java/org/ice4j/stack/MessageProcessor.java
diff --git a/src/org/ice4j/stack/MessageQueue.java b/src/main/java/org/ice4j/stack/MessageQueue.java
similarity index 100%
rename from src/org/ice4j/stack/MessageQueue.java
rename to src/main/java/org/ice4j/stack/MessageQueue.java
diff --git a/src/org/ice4j/stack/NetAccessManager.java b/src/main/java/org/ice4j/stack/NetAccessManager.java
similarity index 100%
rename from src/org/ice4j/stack/NetAccessManager.java
rename to src/main/java/org/ice4j/stack/NetAccessManager.java
diff --git a/src/org/ice4j/stack/PacketLogger.java b/src/main/java/org/ice4j/stack/PacketLogger.java
similarity index 100%
rename from src/org/ice4j/stack/PacketLogger.java
rename to src/main/java/org/ice4j/stack/PacketLogger.java
diff --git a/src/org/ice4j/stack/PeerUdpMessageEventHandler.java b/src/main/java/org/ice4j/stack/PeerUdpMessageEventHandler.java
similarity index 100%
rename from src/org/ice4j/stack/PeerUdpMessageEventHandler.java
rename to src/main/java/org/ice4j/stack/PeerUdpMessageEventHandler.java
diff --git a/src/org/ice4j/stack/RawMessage.java b/src/main/java/org/ice4j/stack/RawMessage.java
similarity index 100%
rename from src/org/ice4j/stack/RawMessage.java
rename to src/main/java/org/ice4j/stack/RawMessage.java
diff --git a/src/org/ice4j/stack/RequestListener.java b/src/main/java/org/ice4j/stack/RequestListener.java
similarity index 100%
rename from src/org/ice4j/stack/RequestListener.java
rename to src/main/java/org/ice4j/stack/RequestListener.java
diff --git a/src/org/ice4j/stack/StunClientTransaction.java b/src/main/java/org/ice4j/stack/StunClientTransaction.java
similarity index 100%
rename from src/org/ice4j/stack/StunClientTransaction.java
rename to src/main/java/org/ice4j/stack/StunClientTransaction.java
diff --git a/src/org/ice4j/stack/StunServerTransaction.java b/src/main/java/org/ice4j/stack/StunServerTransaction.java
similarity index 100%
rename from src/org/ice4j/stack/StunServerTransaction.java
rename to src/main/java/org/ice4j/stack/StunServerTransaction.java
diff --git a/src/org/ice4j/stack/StunStack.java b/src/main/java/org/ice4j/stack/StunStack.java
similarity index 100%
rename from src/org/ice4j/stack/StunStack.java
rename to src/main/java/org/ice4j/stack/StunStack.java
diff --git a/src/org/ice4j/stack/TransactionID.java b/src/main/java/org/ice4j/stack/TransactionID.java
similarity index 100%
rename from src/org/ice4j/stack/TransactionID.java
rename to src/main/java/org/ice4j/stack/TransactionID.java
diff --git a/src/org/ice4j/stunclient/BlockingRequestSender.java b/src/main/java/org/ice4j/stunclient/BlockingRequestSender.java
similarity index 100%
rename from src/org/ice4j/stunclient/BlockingRequestSender.java
rename to src/main/java/org/ice4j/stunclient/BlockingRequestSender.java
diff --git a/src/org/ice4j/stunclient/NetworkConfigurationDiscoveryProcess.java b/src/main/java/org/ice4j/stunclient/NetworkConfigurationDiscoveryProcess.java
similarity index 100%
rename from src/org/ice4j/stunclient/NetworkConfigurationDiscoveryProcess.java
rename to src/main/java/org/ice4j/stunclient/NetworkConfigurationDiscoveryProcess.java
diff --git a/src/org/ice4j/stunclient/SimpleAddressDetector.java b/src/main/java/org/ice4j/stunclient/SimpleAddressDetector.java
similarity index 100%
rename from src/org/ice4j/stunclient/SimpleAddressDetector.java
rename to src/main/java/org/ice4j/stunclient/SimpleAddressDetector.java
diff --git a/src/org/ice4j/stunclient/StunDiscoveryReport.java b/src/main/java/org/ice4j/stunclient/StunDiscoveryReport.java
similarity index 100%
rename from src/org/ice4j/stunclient/StunDiscoveryReport.java
rename to src/main/java/org/ice4j/stunclient/StunDiscoveryReport.java
diff --git a/src/org/ice4j/util/Ice4jLogFormatter.java b/src/main/java/org/ice4j/util/Ice4jLogFormatter.java
similarity index 100%
rename from src/org/ice4j/util/Ice4jLogFormatter.java
rename to src/main/java/org/ice4j/util/Ice4jLogFormatter.java
diff --git a/test/org/ice4j/MessageEventDispatchingTest.java b/src/test/java/org/ice4j/MessageEventDispatchingTest.java
similarity index 100%
rename from test/org/ice4j/MessageEventDispatchingTest.java
rename to src/test/java/org/ice4j/MessageEventDispatchingTest.java
diff --git a/test/org/ice4j/MsgFixture.java b/src/test/java/org/ice4j/MsgFixture.java
similarity index 100%
rename from test/org/ice4j/MsgFixture.java
rename to src/test/java/org/ice4j/MsgFixture.java
diff --git a/test/org/ice4j/PseudoTcpTestSuite.java b/src/test/java/org/ice4j/PseudoTcpTestSuite.java
similarity index 100%
rename from test/org/ice4j/PseudoTcpTestSuite.java
rename to src/test/java/org/ice4j/PseudoTcpTestSuite.java
diff --git a/test/org/ice4j/StunTestSuite.java b/src/test/java/org/ice4j/StunTestSuite.java
similarity index 100%
rename from test/org/ice4j/StunTestSuite.java
rename to src/test/java/org/ice4j/StunTestSuite.java
diff --git a/test/org/ice4j/TransactionSupportTests.java b/src/test/java/org/ice4j/TransactionSupportTests.java
similarity index 100%
rename from test/org/ice4j/TransactionSupportTests.java
rename to src/test/java/org/ice4j/TransactionSupportTests.java
diff --git a/test/org/ice4j/attribute/AddressAttributeTest.java b/src/test/java/org/ice4j/attribute/AddressAttributeTest.java
similarity index 100%
rename from test/org/ice4j/attribute/AddressAttributeTest.java
rename to src/test/java/org/ice4j/attribute/AddressAttributeTest.java
diff --git a/test/org/ice4j/attribute/AttributeDecoderTest.java b/src/test/java/org/ice4j/attribute/AttributeDecoderTest.java
similarity index 100%
rename from test/org/ice4j/attribute/AttributeDecoderTest.java
rename to src/test/java/org/ice4j/attribute/AttributeDecoderTest.java
diff --git a/test/org/ice4j/attribute/ChangeRequestAttributeTest.java b/src/test/java/org/ice4j/attribute/ChangeRequestAttributeTest.java
similarity index 100%
rename from test/org/ice4j/attribute/ChangeRequestAttributeTest.java
rename to src/test/java/org/ice4j/attribute/ChangeRequestAttributeTest.java
diff --git a/test/org/ice4j/attribute/ConnectionIdAttributeTest.java b/src/test/java/org/ice4j/attribute/ConnectionIdAttributeTest.java
similarity index 100%
rename from test/org/ice4j/attribute/ConnectionIdAttributeTest.java
rename to src/test/java/org/ice4j/attribute/ConnectionIdAttributeTest.java
diff --git a/test/org/ice4j/attribute/ErrorCodeAttributeTest.java b/src/test/java/org/ice4j/attribute/ErrorCodeAttributeTest.java
similarity index 100%
rename from test/org/ice4j/attribute/ErrorCodeAttributeTest.java
rename to src/test/java/org/ice4j/attribute/ErrorCodeAttributeTest.java
diff --git a/test/org/ice4j/attribute/NonceAttributeTest.java b/src/test/java/org/ice4j/attribute/NonceAttributeTest.java
similarity index 100%
rename from test/org/ice4j/attribute/NonceAttributeTest.java
rename to src/test/java/org/ice4j/attribute/NonceAttributeTest.java
diff --git a/test/org/ice4j/attribute/OptionalAttributeAttributeTest.java b/src/test/java/org/ice4j/attribute/OptionalAttributeAttributeTest.java
similarity index 100%
rename from test/org/ice4j/attribute/OptionalAttributeAttributeTest.java
rename to src/test/java/org/ice4j/attribute/OptionalAttributeAttributeTest.java
diff --git a/test/org/ice4j/attribute/RealmAttributeTest.java b/src/test/java/org/ice4j/attribute/RealmAttributeTest.java
similarity index 100%
rename from test/org/ice4j/attribute/RealmAttributeTest.java
rename to src/test/java/org/ice4j/attribute/RealmAttributeTest.java
diff --git a/test/org/ice4j/attribute/RequestedAddressFamilyAttributeTest.java b/src/test/java/org/ice4j/attribute/RequestedAddressFamilyAttributeTest.java
similarity index 100%
rename from test/org/ice4j/attribute/RequestedAddressFamilyAttributeTest.java
rename to src/test/java/org/ice4j/attribute/RequestedAddressFamilyAttributeTest.java
diff --git a/test/org/ice4j/attribute/SoftwareAttributeTest.java b/src/test/java/org/ice4j/attribute/SoftwareAttributeTest.java
similarity index 100%
rename from test/org/ice4j/attribute/SoftwareAttributeTest.java
rename to src/test/java/org/ice4j/attribute/SoftwareAttributeTest.java
diff --git a/test/org/ice4j/attribute/UnknownAttributesAttributeTest.java b/src/test/java/org/ice4j/attribute/UnknownAttributesAttributeTest.java
similarity index 100%
rename from test/org/ice4j/attribute/UnknownAttributesAttributeTest.java
rename to src/test/java/org/ice4j/attribute/UnknownAttributesAttributeTest.java
diff --git a/test/org/ice4j/attribute/UsernameAttributeTest.java b/src/test/java/org/ice4j/attribute/UsernameAttributeTest.java
similarity index 100%
rename from test/org/ice4j/attribute/UsernameAttributeTest.java
rename to src/test/java/org/ice4j/attribute/UsernameAttributeTest.java
diff --git a/test/org/ice4j/attribute/XorOnlyTest.java b/src/test/java/org/ice4j/attribute/XorOnlyTest.java
similarity index 100%
rename from test/org/ice4j/attribute/XorOnlyTest.java
rename to src/test/java/org/ice4j/attribute/XorOnlyTest.java
diff --git a/test/org/ice4j/message/MessageFactoryTest.java b/src/test/java/org/ice4j/message/MessageFactoryTest.java
similarity index 100%
rename from test/org/ice4j/message/MessageFactoryTest.java
rename to src/test/java/org/ice4j/message/MessageFactoryTest.java
diff --git a/test/org/ice4j/message/MessageTest.java b/src/test/java/org/ice4j/message/MessageTest.java
similarity index 100%
rename from test/org/ice4j/message/MessageTest.java
rename to src/test/java/org/ice4j/message/MessageTest.java
diff --git a/test/org/ice4j/pseudotcp/MultiThreadSupportTest.java b/src/test/java/org/ice4j/pseudotcp/MultiThreadSupportTest.java
similarity index 100%
rename from test/org/ice4j/pseudotcp/MultiThreadSupportTest.java
rename to src/test/java/org/ice4j/pseudotcp/MultiThreadSupportTest.java
diff --git a/test/org/ice4j/pseudotcp/PseudoTcpStreamTest.java b/src/test/java/org/ice4j/pseudotcp/PseudoTcpStreamTest.java
similarity index 100%
rename from test/org/ice4j/pseudotcp/PseudoTcpStreamTest.java
rename to src/test/java/org/ice4j/pseudotcp/PseudoTcpStreamTest.java
diff --git a/test/org/ice4j/pseudotcp/PseudoTcpTestBase.java b/src/test/java/org/ice4j/pseudotcp/PseudoTcpTestBase.java
similarity index 100%
rename from test/org/ice4j/pseudotcp/PseudoTcpTestBase.java
rename to src/test/java/org/ice4j/pseudotcp/PseudoTcpTestBase.java
diff --git a/test/org/ice4j/pseudotcp/PseudoTcpTestPingPong.java b/src/test/java/org/ice4j/pseudotcp/PseudoTcpTestPingPong.java
similarity index 100%
rename from test/org/ice4j/pseudotcp/PseudoTcpTestPingPong.java
rename to src/test/java/org/ice4j/pseudotcp/PseudoTcpTestPingPong.java
diff --git a/test/org/ice4j/pseudotcp/PseudoTcpTestRecvWindow.java b/src/test/java/org/ice4j/pseudotcp/PseudoTcpTestRecvWindow.java
similarity index 100%
rename from test/org/ice4j/pseudotcp/PseudoTcpTestRecvWindow.java
rename to src/test/java/org/ice4j/pseudotcp/PseudoTcpTestRecvWindow.java
diff --git a/test/org/ice4j/pseudotcp/PseudoTcpTestTransfer.java b/src/test/java/org/ice4j/pseudotcp/PseudoTcpTestTransfer.java
similarity index 100%
rename from test/org/ice4j/pseudotcp/PseudoTcpTestTransfer.java
rename to src/test/java/org/ice4j/pseudotcp/PseudoTcpTestTransfer.java
diff --git a/test/org/ice4j/pseudotcp/util/ByteFifoBufferTest.java b/src/test/java/org/ice4j/pseudotcp/util/ByteFifoBufferTest.java
similarity index 100%
rename from test/org/ice4j/pseudotcp/util/ByteFifoBufferTest.java
rename to src/test/java/org/ice4j/pseudotcp/util/ByteFifoBufferTest.java
diff --git a/test/org/ice4j/stack/DatagramCollector.java b/src/test/java/org/ice4j/stack/DatagramCollector.java
similarity index 100%
rename from test/org/ice4j/stack/DatagramCollector.java
rename to src/test/java/org/ice4j/stack/DatagramCollector.java
diff --git a/test/org/ice4j/stack/ShallowStackTest.java b/src/test/java/org/ice4j/stack/ShallowStackTest.java
similarity index 100%
rename from test/org/ice4j/stack/ShallowStackTest.java
rename to src/test/java/org/ice4j/stack/ShallowStackTest.java
diff --git a/test/org/ice4j/stunclient/ResponseSequenceServer.java b/src/test/java/org/ice4j/stunclient/ResponseSequenceServer.java
similarity index 100%
rename from test/org/ice4j/stunclient/ResponseSequenceServer.java
rename to src/test/java/org/ice4j/stunclient/ResponseSequenceServer.java
diff --git a/test/org/ice4j/stunclient/StunAddressDiscovererTest.java b/src/test/java/org/ice4j/stunclient/StunAddressDiscovererTest.java
similarity index 100%
rename from test/org/ice4j/stunclient/StunAddressDiscovererTest.java
rename to src/test/java/org/ice4j/stunclient/StunAddressDiscovererTest.java
diff --git a/test/org/ice4j/stunclient/StunAddressDiscovererTest_v4v6.java b/src/test/java/org/ice4j/stunclient/StunAddressDiscovererTest_v4v6.java
similarity index 100%
rename from test/org/ice4j/stunclient/StunAddressDiscovererTest_v4v6.java
rename to src/test/java/org/ice4j/stunclient/StunAddressDiscovererTest_v4v6.java
diff --git a/test/org/ice4j/stunclient/StunAddressDiscovererTest_v6.java b/src/test/java/org/ice4j/stunclient/StunAddressDiscovererTest_v6.java
similarity index 100%
rename from test/org/ice4j/stunclient/StunAddressDiscovererTest_v6.java
rename to src/test/java/org/ice4j/stunclient/StunAddressDiscovererTest_v6.java
diff --git a/test/test/AwsTest.java b/src/test/java/test/AwsTest.java
similarity index 100%
rename from test/test/AwsTest.java
rename to src/test/java/test/AwsTest.java
diff --git a/test/test/Ice.java b/src/test/java/test/Ice.java
similarity index 100%
rename from test/test/Ice.java
rename to src/test/java/test/Ice.java
diff --git a/test/test/IceDistributed.java b/src/test/java/test/IceDistributed.java
similarity index 100%
rename from test/test/IceDistributed.java
rename to src/test/java/test/IceDistributed.java
diff --git a/test/test/IceLite.java b/src/test/java/test/IceLite.java
similarity index 100%
rename from test/test/IceLite.java
rename to src/test/java/test/IceLite.java
diff --git a/test/test/IcePseudoTcp.java b/src/test/java/test/IcePseudoTcp.java
similarity index 100%
rename from test/test/IcePseudoTcp.java
rename to src/test/java/test/IcePseudoTcp.java
diff --git a/test/test/MappingTest.java b/src/test/java/test/MappingTest.java
similarity index 100%
rename from test/test/MappingTest.java
rename to src/test/java/test/MappingTest.java
diff --git a/test/test/SdpUtils.java b/src/test/java/test/SdpUtils.java
similarity index 97%
rename from test/test/SdpUtils.java
rename to src/test/java/test/SdpUtils.java
index f8862fa..454f24d 100644
--- a/test/test/SdpUtils.java
+++ b/src/test/java/test/SdpUtils.java
@@ -92,12 +92,10 @@ public class SdpUtils
continue;
Vector attributes = desc.getAttributes(true);
- for( Attribute attribute : attributes)
+ for (Attribute attribute : attributes)
{
- if(!attribute.getName().equals(CandidateAttribute.NAME))
- continue;
-
- parseCandidate(attribute, stream);
+ if (attribute.getName().equals(CandidateAttribute.NAME))
+ parseCandidate(attribute, stream);
}
//set default candidates
diff --git a/test/test/TrickleIce.java b/src/test/java/test/TrickleIce.java
similarity index 100%
rename from test/test/TrickleIce.java
rename to src/test/java/test/TrickleIce.java
diff --git a/test/test/signalling/Signalling.java b/src/test/java/test/signalling/Signalling.java
similarity index 100%
rename from test/test/signalling/Signalling.java
rename to src/test/java/test/signalling/Signalling.java
diff --git a/test/test/signalling/SignallingCallback.java b/src/test/java/test/signalling/SignallingCallback.java
similarity index 100%
rename from test/test/signalling/SignallingCallback.java
rename to src/test/java/test/signalling/SignallingCallback.java