diff --git a/.gitignore b/.gitignore index 4693738d7..31f3d5cfc 100644 --- a/.gitignore +++ b/.gitignore @@ -6,41 +6,71 @@ target classes *.zip # ignore eclipse files -#.project -#.classpath +.project +.classpath .settings .metadata + # ignore IDEA files *.iml *.ipr *.iws .idea + # ignore NetBeans files nbactions.xml nb-configuration.xml catalog.xml + # maven-ant-tasks.jar test-output transaction.log + # vim files *.swp /.gitk-tmp.* atlassian-ide-plugin.xml + # temp files *~ + # maven versions plugin pom.xml.versionsBackup + # hprof dumps /*.hprof + # ignore 'randomly' strewn around logs server.log *.log + # ignore java crashes hs_err_pid*.log + # H2 databases produced by tests *.h2.db + # JBoss transaction generated files PutObjectStoreDirHere + # ignore mvn-rpmbuild repo /.m2 + +# ignore vs-code settings files +.vscode +.project +.classpath + +#ignoring src from android as they are smiply a copy +android-jain-sip-ri/src/main/java/android/* + +#ignoring generated logs from tests +jain-sip-test-suite/logs/* +**/notifier*.txt +**/subscriber*.txt +**/server_*.txt +**/client_*.txt +**/shootist*.txt +**/shootme*.txt +**/tckoutput.txt diff --git a/m2/README b/README_deploy.adoc similarity index 97% rename from m2/README rename to README_deploy.adoc index 35976efcb..028f86647 100644 --- a/m2/README +++ b/README_deploy.adoc @@ -1,3 +1,5 @@ += Maven eployment + To deploy maven 2 artifacts to maven2-repository on java.net (Note: you shall request Maven2 Publisher role on this project), do the following diff --git a/TODO.txt b/TODO.txt index 38d7fd1a8..32e2bae9e 100644 --- a/TODO.txt +++ b/TODO.txt @@ -10,3 +10,4 @@ Notes for the next version: Note that all the Extension classes (ending with Ext ) can be used as they will be included in the next JAIN-SIP API. + diff --git a/android-jain-sip-ri/pom.xml b/android-jain-sip-ri/pom.xml new file mode 100644 index 000000000..202f7fcd2 --- /dev/null +++ b/android-jain-sip-ri/pom.xml @@ -0,0 +1,280 @@ + + + + 4.0.0 + + javax.sip + 1.3.0-SNAPSHOT + jain-sip + ../pom.xml + + + android-jain-sip-ri + jar + + android-jain-sip-ri + http://code.google.com/p/jain-sip/ + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + 1.7 + 1.7 + + + + + maven-antrun-plugin + 3.0.0 + + + generate-sources + + + Copying source for android + + + + + + + + + + + + + + + + + Modifying source for android + + javax.sip + + + javax.sdp + + + gov.nist.core + + + gov.nist.android.javax.sdp + + + gov.nist.android.javax.sip + + + .android.javax.sip + + + "android.javax.sip.message + + + "android.javax.sip.header + + + "android.javax.sip.address + + + + + run + + + + + + + + org.apache.maven.plugins + maven-source-plugin + 2.1.2 + + + attach-sources + verify + + jar + + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.4 + + + + true + + + ${buildNumber} + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.8.1 + + android.* + + + + attach-javadocs + verify + + jar + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.2 + true + + mobicents-releases-repository + https://oss.sonatype.org/ + + + + deploy-to-sonatype + deploy + + deploy + + release + + + + + + + + + + + + release + + + + org.codehaus.mojo + buildnumber-maven-plugin + 1.0 + + + validate + + create + + + + + false + false + + + + + + + + + + + javax.xml.bind + jaxb-api + 2.3.0 + + + com.sun.xml.bind + jaxb-core + 2.3.0 + + + com.sun.xml.bind + jaxb-impl + 2.3.0 + + + + log4j + log4j + 1.2.15 + provided + + + com.sun.jmx + jmxri + + + com.sun.jdmk + jmxtools + + + javax.jms + jms + + + + + + + + + maven2-repository.dev.java.net + Java.net Repository for Maven + http://download.java.net/maven/2/ + default + + + mobicents-public-repository-group + Mobicens Public Maven Repository Group + https://oss.sonatype.org/content/groups/public + default + + true + never + + + true + never + + + + + + scm:git:https://code.google.com/p/jain-sip/ + scm:git:https://code.google.com/p/jain-sip/ + https://code.google.com/p/jain-sip/ + + \ No newline at end of file diff --git a/ant-tasks/build.xml b/archive/ant-tasks/build.xml similarity index 100% rename from ant-tasks/build.xml rename to archive/ant-tasks/build.xml diff --git a/ant-tasks/lib/ant.jar b/archive/ant-tasks/lib/ant.jar similarity index 100% rename from ant-tasks/lib/ant.jar rename to archive/ant-tasks/lib/ant.jar diff --git a/ant-tasks/lib/jdom.jar b/archive/ant-tasks/lib/jdom.jar similarity index 100% rename from ant-tasks/lib/jdom.jar rename to archive/ant-tasks/lib/jdom.jar diff --git a/ant-tasks/lib/maven-repository-importer-1.2.jar b/archive/ant-tasks/lib/maven-repository-importer-1.2.jar similarity index 100% rename from ant-tasks/lib/maven-repository-importer-1.2.jar rename to archive/ant-tasks/lib/maven-repository-importer-1.2.jar diff --git a/ant-tasks/src/net/java/jsip/ant/tasks/VersionerTask.java b/archive/ant-tasks/src/net/java/jsip/ant/tasks/VersionerTask.java similarity index 100% rename from ant-tasks/src/net/java/jsip/ant/tasks/VersionerTask.java rename to archive/ant-tasks/src/net/java/jsip/ant/tasks/VersionerTask.java diff --git a/ant-build-config.properties b/archive/build/ant-build-config.properties similarity index 100% rename from ant-build-config.properties rename to archive/build/ant-build-config.properties diff --git a/build.xml b/archive/build/build.xml similarity index 100% rename from build.xml rename to archive/build/build.xml diff --git a/how-to-run-the-tck.txt b/archive/build/how-to-run-the-tck.txt similarity index 100% rename from how-to-run-the-tck.txt rename to archive/build/how-to-run-the-tck.txt diff --git a/log4j.properties b/archive/build/log4j.properties similarity index 100% rename from log4j.properties rename to archive/build/log4j.properties diff --git a/manifest.tck b/archive/build/manifest.tck similarity index 100% rename from manifest.tck rename to archive/build/manifest.tck diff --git a/manifest.viewer b/archive/build/manifest.viewer similarity index 100% rename from manifest.viewer rename to archive/build/manifest.viewer diff --git a/tck.properties b/archive/build/tck.properties similarity index 100% rename from tck.properties rename to archive/build/tck.properties diff --git a/javax/sip/jain-sip-ri/1.2/jain-sip-ri-1.2.jar b/archive/javax/sip/jain-sip-ri/1.2/jain-sip-ri-1.2.jar similarity index 100% rename from javax/sip/jain-sip-ri/1.2/jain-sip-ri-1.2.jar rename to archive/javax/sip/jain-sip-ri/1.2/jain-sip-ri-1.2.jar diff --git a/javax/sip/jain-sip-ri/1.2/jain-sip-ri-1.2.jar.md5 b/archive/javax/sip/jain-sip-ri/1.2/jain-sip-ri-1.2.jar.md5 similarity index 100% rename from javax/sip/jain-sip-ri/1.2/jain-sip-ri-1.2.jar.md5 rename to archive/javax/sip/jain-sip-ri/1.2/jain-sip-ri-1.2.jar.md5 diff --git a/javax/sip/jain-sip-ri/1.2/jain-sip-ri-1.2.jar.sha1 b/archive/javax/sip/jain-sip-ri/1.2/jain-sip-ri-1.2.jar.sha1 similarity index 100% rename from javax/sip/jain-sip-ri/1.2/jain-sip-ri-1.2.jar.sha1 rename to archive/javax/sip/jain-sip-ri/1.2/jain-sip-ri-1.2.jar.sha1 diff --git a/javax/sip/jain-sip-ri/1.2/jain-sip-ri-1.2.pom b/archive/javax/sip/jain-sip-ri/1.2/jain-sip-ri-1.2.pom similarity index 100% rename from javax/sip/jain-sip-ri/1.2/jain-sip-ri-1.2.pom rename to archive/javax/sip/jain-sip-ri/1.2/jain-sip-ri-1.2.pom diff --git a/javax/sip/jain-sip-ri/1.2/jain-sip-ri-1.2.pom.md5 b/archive/javax/sip/jain-sip-ri/1.2/jain-sip-ri-1.2.pom.md5 similarity index 100% rename from javax/sip/jain-sip-ri/1.2/jain-sip-ri-1.2.pom.md5 rename to archive/javax/sip/jain-sip-ri/1.2/jain-sip-ri-1.2.pom.md5 diff --git a/javax/sip/jain-sip-ri/1.2/jain-sip-ri-1.2.pom.sha1 b/archive/javax/sip/jain-sip-ri/1.2/jain-sip-ri-1.2.pom.sha1 similarity index 100% rename from javax/sip/jain-sip-ri/1.2/jain-sip-ri-1.2.pom.sha1 rename to archive/javax/sip/jain-sip-ri/1.2/jain-sip-ri-1.2.pom.sha1 diff --git a/javax/sip/jain-sip-ri/maven-metadata.xml b/archive/javax/sip/jain-sip-ri/maven-metadata.xml similarity index 100% rename from javax/sip/jain-sip-ri/maven-metadata.xml rename to archive/javax/sip/jain-sip-ri/maven-metadata.xml diff --git a/javax/sip/jain-sip-ri/maven-metadata.xml.md5 b/archive/javax/sip/jain-sip-ri/maven-metadata.xml.md5 similarity index 100% rename from javax/sip/jain-sip-ri/maven-metadata.xml.md5 rename to archive/javax/sip/jain-sip-ri/maven-metadata.xml.md5 diff --git a/javax/sip/jain-sip-ri/maven-metadata.xml.sha1 b/archive/javax/sip/jain-sip-ri/maven-metadata.xml.sha1 similarity index 100% rename from javax/sip/jain-sip-ri/maven-metadata.xml.sha1 rename to archive/javax/sip/jain-sip-ri/maven-metadata.xml.sha1 diff --git a/lib/README.txt b/archive/lib/README.txt similarity index 100% rename from lib/README.txt rename to archive/lib/README.txt diff --git a/lib/jakarta-regexp-1.3.jar b/archive/lib/jakarta-regexp-1.3.jar similarity index 100% rename from lib/jakarta-regexp-1.3.jar rename to archive/lib/jakarta-regexp-1.3.jar diff --git a/lib/junit-3.8.1.jar b/archive/lib/junit-3.8.1.jar similarity index 100% rename from lib/junit-3.8.1.jar rename to archive/lib/junit-3.8.1.jar diff --git a/lib/log4j-1.2.15.jar b/archive/lib/log4j-1.2.15.jar similarity index 100% rename from lib/log4j-1.2.15.jar rename to archive/lib/log4j-1.2.15.jar diff --git a/poms/api-pom.xml b/archive/poms/api-pom.xml similarity index 100% rename from poms/api-pom.xml rename to archive/poms/api-pom.xml diff --git a/poms/ri-pom.xml b/archive/poms/ri-pom.xml similarity index 100% rename from poms/ri-pom.xml rename to archive/poms/ri-pom.xml diff --git a/jain-sip-api/pom.xml b/jain-sip-api/pom.xml new file mode 100644 index 000000000..bebb0d098 --- /dev/null +++ b/jain-sip-api/pom.xml @@ -0,0 +1,67 @@ + + + + 4.0.0 + + javax.sip + 1.3.0-SNAPSHOT + jain-sip + ../pom.xml + + + jain-sip-api + jar + + jain-sip-api + http://code.google.com/p/jain-sip/ + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + 1.6 + 1.6 + + + + org.apache.maven.plugins + maven-source-plugin + 2.1.2 + + + attach-sources + verify + + jar + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.8.1 + + + attach-javadocs + verify + + jar + + + + + + + + target/javax/ + + **/*.java + + + + + + \ No newline at end of file diff --git a/src/javax/sip/ClientTransaction.java b/jain-sip-api/src/main/java/javax/sip/ClientTransaction.java similarity index 100% rename from src/javax/sip/ClientTransaction.java rename to jain-sip-api/src/main/java/javax/sip/ClientTransaction.java diff --git a/src/javax/sip/Dialog.java b/jain-sip-api/src/main/java/javax/sip/Dialog.java similarity index 100% rename from src/javax/sip/Dialog.java rename to jain-sip-api/src/main/java/javax/sip/Dialog.java diff --git a/src/javax/sip/DialogDoesNotExistException.java b/jain-sip-api/src/main/java/javax/sip/DialogDoesNotExistException.java similarity index 100% rename from src/javax/sip/DialogDoesNotExistException.java rename to jain-sip-api/src/main/java/javax/sip/DialogDoesNotExistException.java diff --git a/src/javax/sip/DialogState.java b/jain-sip-api/src/main/java/javax/sip/DialogState.java similarity index 100% rename from src/javax/sip/DialogState.java rename to jain-sip-api/src/main/java/javax/sip/DialogState.java diff --git a/src/javax/sip/DialogTerminatedEvent.java b/jain-sip-api/src/main/java/javax/sip/DialogTerminatedEvent.java similarity index 100% rename from src/javax/sip/DialogTerminatedEvent.java rename to jain-sip-api/src/main/java/javax/sip/DialogTerminatedEvent.java diff --git a/src/javax/sip/IOExceptionEvent.java b/jain-sip-api/src/main/java/javax/sip/IOExceptionEvent.java similarity index 100% rename from src/javax/sip/IOExceptionEvent.java rename to jain-sip-api/src/main/java/javax/sip/IOExceptionEvent.java diff --git a/src/javax/sip/InvalidArgumentException.java b/jain-sip-api/src/main/java/javax/sip/InvalidArgumentException.java similarity index 100% rename from src/javax/sip/InvalidArgumentException.java rename to jain-sip-api/src/main/java/javax/sip/InvalidArgumentException.java diff --git a/src/javax/sip/ListeningPoint.java b/jain-sip-api/src/main/java/javax/sip/ListeningPoint.java similarity index 100% rename from src/javax/sip/ListeningPoint.java rename to jain-sip-api/src/main/java/javax/sip/ListeningPoint.java diff --git a/src/javax/sip/ObjectInUseException.java b/jain-sip-api/src/main/java/javax/sip/ObjectInUseException.java similarity index 100% rename from src/javax/sip/ObjectInUseException.java rename to jain-sip-api/src/main/java/javax/sip/ObjectInUseException.java diff --git a/src/javax/sip/PeerUnavailableException.java b/jain-sip-api/src/main/java/javax/sip/PeerUnavailableException.java similarity index 100% rename from src/javax/sip/PeerUnavailableException.java rename to jain-sip-api/src/main/java/javax/sip/PeerUnavailableException.java diff --git a/src/javax/sip/ProviderDoesNotExistException.java b/jain-sip-api/src/main/java/javax/sip/ProviderDoesNotExistException.java similarity index 100% rename from src/javax/sip/ProviderDoesNotExistException.java rename to jain-sip-api/src/main/java/javax/sip/ProviderDoesNotExistException.java diff --git a/src/javax/sip/RequestEvent.java b/jain-sip-api/src/main/java/javax/sip/RequestEvent.java similarity index 100% rename from src/javax/sip/RequestEvent.java rename to jain-sip-api/src/main/java/javax/sip/RequestEvent.java diff --git a/src/javax/sip/ResponseEvent.java b/jain-sip-api/src/main/java/javax/sip/ResponseEvent.java similarity index 100% rename from src/javax/sip/ResponseEvent.java rename to jain-sip-api/src/main/java/javax/sip/ResponseEvent.java diff --git a/src/javax/sip/ServerTransaction.java b/jain-sip-api/src/main/java/javax/sip/ServerTransaction.java similarity index 100% rename from src/javax/sip/ServerTransaction.java rename to jain-sip-api/src/main/java/javax/sip/ServerTransaction.java diff --git a/src/javax/sip/SipException.java b/jain-sip-api/src/main/java/javax/sip/SipException.java similarity index 100% rename from src/javax/sip/SipException.java rename to jain-sip-api/src/main/java/javax/sip/SipException.java diff --git a/src/javax/sip/SipFactory.java b/jain-sip-api/src/main/java/javax/sip/SipFactory.java similarity index 100% rename from src/javax/sip/SipFactory.java rename to jain-sip-api/src/main/java/javax/sip/SipFactory.java diff --git a/src/javax/sip/SipListener.java b/jain-sip-api/src/main/java/javax/sip/SipListener.java similarity index 100% rename from src/javax/sip/SipListener.java rename to jain-sip-api/src/main/java/javax/sip/SipListener.java diff --git a/src/javax/sip/SipProvider.java b/jain-sip-api/src/main/java/javax/sip/SipProvider.java similarity index 100% rename from src/javax/sip/SipProvider.java rename to jain-sip-api/src/main/java/javax/sip/SipProvider.java diff --git a/src/javax/sip/SipStack.java b/jain-sip-api/src/main/java/javax/sip/SipStack.java similarity index 100% rename from src/javax/sip/SipStack.java rename to jain-sip-api/src/main/java/javax/sip/SipStack.java diff --git a/src/javax/sip/Timeout.java b/jain-sip-api/src/main/java/javax/sip/Timeout.java similarity index 100% rename from src/javax/sip/Timeout.java rename to jain-sip-api/src/main/java/javax/sip/Timeout.java diff --git a/src/javax/sip/TimeoutEvent.java b/jain-sip-api/src/main/java/javax/sip/TimeoutEvent.java similarity index 100% rename from src/javax/sip/TimeoutEvent.java rename to jain-sip-api/src/main/java/javax/sip/TimeoutEvent.java diff --git a/src/javax/sip/Transaction.java b/jain-sip-api/src/main/java/javax/sip/Transaction.java similarity index 100% rename from src/javax/sip/Transaction.java rename to jain-sip-api/src/main/java/javax/sip/Transaction.java diff --git a/src/javax/sip/TransactionAlreadyExistsException.java b/jain-sip-api/src/main/java/javax/sip/TransactionAlreadyExistsException.java similarity index 100% rename from src/javax/sip/TransactionAlreadyExistsException.java rename to jain-sip-api/src/main/java/javax/sip/TransactionAlreadyExistsException.java diff --git a/src/javax/sip/TransactionDoesNotExistException.java b/jain-sip-api/src/main/java/javax/sip/TransactionDoesNotExistException.java similarity index 100% rename from src/javax/sip/TransactionDoesNotExistException.java rename to jain-sip-api/src/main/java/javax/sip/TransactionDoesNotExistException.java diff --git a/src/javax/sip/TransactionState.java b/jain-sip-api/src/main/java/javax/sip/TransactionState.java similarity index 100% rename from src/javax/sip/TransactionState.java rename to jain-sip-api/src/main/java/javax/sip/TransactionState.java diff --git a/src/javax/sip/TransactionTerminatedEvent.java b/jain-sip-api/src/main/java/javax/sip/TransactionTerminatedEvent.java similarity index 100% rename from src/javax/sip/TransactionTerminatedEvent.java rename to jain-sip-api/src/main/java/javax/sip/TransactionTerminatedEvent.java diff --git a/src/javax/sip/TransactionUnavailableException.java b/jain-sip-api/src/main/java/javax/sip/TransactionUnavailableException.java similarity index 100% rename from src/javax/sip/TransactionUnavailableException.java rename to jain-sip-api/src/main/java/javax/sip/TransactionUnavailableException.java diff --git a/src/javax/sip/TransportAlreadySupportedException.java b/jain-sip-api/src/main/java/javax/sip/TransportAlreadySupportedException.java similarity index 100% rename from src/javax/sip/TransportAlreadySupportedException.java rename to jain-sip-api/src/main/java/javax/sip/TransportAlreadySupportedException.java diff --git a/src/javax/sip/TransportNotSupportedException.java b/jain-sip-api/src/main/java/javax/sip/TransportNotSupportedException.java similarity index 100% rename from src/javax/sip/TransportNotSupportedException.java rename to jain-sip-api/src/main/java/javax/sip/TransportNotSupportedException.java diff --git a/src/javax/sip/address/Address.java b/jain-sip-api/src/main/java/javax/sip/address/Address.java similarity index 100% rename from src/javax/sip/address/Address.java rename to jain-sip-api/src/main/java/javax/sip/address/Address.java diff --git a/src/javax/sip/address/AddressFactory.java b/jain-sip-api/src/main/java/javax/sip/address/AddressFactory.java similarity index 100% rename from src/javax/sip/address/AddressFactory.java rename to jain-sip-api/src/main/java/javax/sip/address/AddressFactory.java diff --git a/src/javax/sip/address/Hop.java b/jain-sip-api/src/main/java/javax/sip/address/Hop.java similarity index 100% rename from src/javax/sip/address/Hop.java rename to jain-sip-api/src/main/java/javax/sip/address/Hop.java diff --git a/src/javax/sip/address/Router.java b/jain-sip-api/src/main/java/javax/sip/address/Router.java similarity index 100% rename from src/javax/sip/address/Router.java rename to jain-sip-api/src/main/java/javax/sip/address/Router.java diff --git a/src/javax/sip/address/SipURI.java b/jain-sip-api/src/main/java/javax/sip/address/SipURI.java similarity index 100% rename from src/javax/sip/address/SipURI.java rename to jain-sip-api/src/main/java/javax/sip/address/SipURI.java diff --git a/src/javax/sip/address/TelURL.java b/jain-sip-api/src/main/java/javax/sip/address/TelURL.java similarity index 100% rename from src/javax/sip/address/TelURL.java rename to jain-sip-api/src/main/java/javax/sip/address/TelURL.java diff --git a/src/javax/sip/address/URI.java b/jain-sip-api/src/main/java/javax/sip/address/URI.java similarity index 100% rename from src/javax/sip/address/URI.java rename to jain-sip-api/src/main/java/javax/sip/address/URI.java diff --git a/src/javax/sip/address/package.html b/jain-sip-api/src/main/java/javax/sip/address/package.html similarity index 100% rename from src/javax/sip/address/package.html rename to jain-sip-api/src/main/java/javax/sip/address/package.html diff --git a/src/javax/sip/change-log.html b/jain-sip-api/src/main/java/javax/sip/change-log.html similarity index 100% rename from src/javax/sip/change-log.html rename to jain-sip-api/src/main/java/javax/sip/change-log.html diff --git a/src/javax/sip/copyright.html b/jain-sip-api/src/main/java/javax/sip/copyright.html similarity index 100% rename from src/javax/sip/copyright.html rename to jain-sip-api/src/main/java/javax/sip/copyright.html diff --git a/src/javax/sip/header/AcceptEncodingHeader.java b/jain-sip-api/src/main/java/javax/sip/header/AcceptEncodingHeader.java similarity index 100% rename from src/javax/sip/header/AcceptEncodingHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/AcceptEncodingHeader.java diff --git a/src/javax/sip/header/AcceptHeader.java b/jain-sip-api/src/main/java/javax/sip/header/AcceptHeader.java similarity index 100% rename from src/javax/sip/header/AcceptHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/AcceptHeader.java diff --git a/src/javax/sip/header/AcceptLanguageHeader.java b/jain-sip-api/src/main/java/javax/sip/header/AcceptLanguageHeader.java similarity index 100% rename from src/javax/sip/header/AcceptLanguageHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/AcceptLanguageHeader.java diff --git a/src/javax/sip/header/AlertInfoHeader.java b/jain-sip-api/src/main/java/javax/sip/header/AlertInfoHeader.java similarity index 100% rename from src/javax/sip/header/AlertInfoHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/AlertInfoHeader.java diff --git a/src/javax/sip/header/AllowEventsHeader.java b/jain-sip-api/src/main/java/javax/sip/header/AllowEventsHeader.java similarity index 100% rename from src/javax/sip/header/AllowEventsHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/AllowEventsHeader.java diff --git a/src/javax/sip/header/AllowHeader.java b/jain-sip-api/src/main/java/javax/sip/header/AllowHeader.java similarity index 100% rename from src/javax/sip/header/AllowHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/AllowHeader.java diff --git a/src/javax/sip/header/AuthenticationInfoHeader.java b/jain-sip-api/src/main/java/javax/sip/header/AuthenticationInfoHeader.java similarity index 100% rename from src/javax/sip/header/AuthenticationInfoHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/AuthenticationInfoHeader.java diff --git a/src/javax/sip/header/AuthorizationHeader.java b/jain-sip-api/src/main/java/javax/sip/header/AuthorizationHeader.java similarity index 100% rename from src/javax/sip/header/AuthorizationHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/AuthorizationHeader.java diff --git a/src/javax/sip/header/CSeqHeader.java b/jain-sip-api/src/main/java/javax/sip/header/CSeqHeader.java similarity index 100% rename from src/javax/sip/header/CSeqHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/CSeqHeader.java diff --git a/src/javax/sip/header/CallIdHeader.java b/jain-sip-api/src/main/java/javax/sip/header/CallIdHeader.java similarity index 100% rename from src/javax/sip/header/CallIdHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/CallIdHeader.java diff --git a/src/javax/sip/header/CallInfoHeader.java b/jain-sip-api/src/main/java/javax/sip/header/CallInfoHeader.java similarity index 100% rename from src/javax/sip/header/CallInfoHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/CallInfoHeader.java diff --git a/src/javax/sip/header/ContactHeader.java b/jain-sip-api/src/main/java/javax/sip/header/ContactHeader.java similarity index 100% rename from src/javax/sip/header/ContactHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/ContactHeader.java diff --git a/src/javax/sip/header/ContentDispositionHeader.java b/jain-sip-api/src/main/java/javax/sip/header/ContentDispositionHeader.java similarity index 100% rename from src/javax/sip/header/ContentDispositionHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/ContentDispositionHeader.java diff --git a/src/javax/sip/header/ContentEncodingHeader.java b/jain-sip-api/src/main/java/javax/sip/header/ContentEncodingHeader.java similarity index 100% rename from src/javax/sip/header/ContentEncodingHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/ContentEncodingHeader.java diff --git a/src/javax/sip/header/ContentLanguageHeader.java b/jain-sip-api/src/main/java/javax/sip/header/ContentLanguageHeader.java similarity index 100% rename from src/javax/sip/header/ContentLanguageHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/ContentLanguageHeader.java diff --git a/src/javax/sip/header/ContentLengthHeader.java b/jain-sip-api/src/main/java/javax/sip/header/ContentLengthHeader.java similarity index 100% rename from src/javax/sip/header/ContentLengthHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/ContentLengthHeader.java diff --git a/src/javax/sip/header/ContentTypeHeader.java b/jain-sip-api/src/main/java/javax/sip/header/ContentTypeHeader.java similarity index 100% rename from src/javax/sip/header/ContentTypeHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/ContentTypeHeader.java diff --git a/src/javax/sip/header/DateHeader.java b/jain-sip-api/src/main/java/javax/sip/header/DateHeader.java similarity index 100% rename from src/javax/sip/header/DateHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/DateHeader.java diff --git a/src/javax/sip/header/Encoding.java b/jain-sip-api/src/main/java/javax/sip/header/Encoding.java similarity index 100% rename from src/javax/sip/header/Encoding.java rename to jain-sip-api/src/main/java/javax/sip/header/Encoding.java diff --git a/src/javax/sip/header/ErrorInfoHeader.java b/jain-sip-api/src/main/java/javax/sip/header/ErrorInfoHeader.java similarity index 100% rename from src/javax/sip/header/ErrorInfoHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/ErrorInfoHeader.java diff --git a/src/javax/sip/header/EventHeader.java b/jain-sip-api/src/main/java/javax/sip/header/EventHeader.java similarity index 100% rename from src/javax/sip/header/EventHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/EventHeader.java diff --git a/src/javax/sip/header/ExpiresHeader.java b/jain-sip-api/src/main/java/javax/sip/header/ExpiresHeader.java similarity index 100% rename from src/javax/sip/header/ExpiresHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/ExpiresHeader.java diff --git a/src/javax/sip/header/ExtensionHeader.java b/jain-sip-api/src/main/java/javax/sip/header/ExtensionHeader.java similarity index 100% rename from src/javax/sip/header/ExtensionHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/ExtensionHeader.java diff --git a/src/javax/sip/header/FromHeader.java b/jain-sip-api/src/main/java/javax/sip/header/FromHeader.java similarity index 100% rename from src/javax/sip/header/FromHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/FromHeader.java diff --git a/src/javax/sip/header/Header.java b/jain-sip-api/src/main/java/javax/sip/header/Header.java similarity index 100% rename from src/javax/sip/header/Header.java rename to jain-sip-api/src/main/java/javax/sip/header/Header.java diff --git a/src/javax/sip/header/HeaderAddress.java b/jain-sip-api/src/main/java/javax/sip/header/HeaderAddress.java similarity index 100% rename from src/javax/sip/header/HeaderAddress.java rename to jain-sip-api/src/main/java/javax/sip/header/HeaderAddress.java diff --git a/src/javax/sip/header/HeaderFactory.java b/jain-sip-api/src/main/java/javax/sip/header/HeaderFactory.java similarity index 100% rename from src/javax/sip/header/HeaderFactory.java rename to jain-sip-api/src/main/java/javax/sip/header/HeaderFactory.java diff --git a/src/javax/sip/header/InReplyToHeader.java b/jain-sip-api/src/main/java/javax/sip/header/InReplyToHeader.java similarity index 100% rename from src/javax/sip/header/InReplyToHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/InReplyToHeader.java diff --git a/src/javax/sip/header/MaxForwardsHeader.java b/jain-sip-api/src/main/java/javax/sip/header/MaxForwardsHeader.java similarity index 100% rename from src/javax/sip/header/MaxForwardsHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/MaxForwardsHeader.java diff --git a/src/javax/sip/header/MediaType.java b/jain-sip-api/src/main/java/javax/sip/header/MediaType.java similarity index 100% rename from src/javax/sip/header/MediaType.java rename to jain-sip-api/src/main/java/javax/sip/header/MediaType.java diff --git a/src/javax/sip/header/MimeVersionHeader.java b/jain-sip-api/src/main/java/javax/sip/header/MimeVersionHeader.java similarity index 100% rename from src/javax/sip/header/MimeVersionHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/MimeVersionHeader.java diff --git a/src/javax/sip/header/MinExpiresHeader.java b/jain-sip-api/src/main/java/javax/sip/header/MinExpiresHeader.java similarity index 100% rename from src/javax/sip/header/MinExpiresHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/MinExpiresHeader.java diff --git a/src/javax/sip/header/OptionTag.java b/jain-sip-api/src/main/java/javax/sip/header/OptionTag.java similarity index 100% rename from src/javax/sip/header/OptionTag.java rename to jain-sip-api/src/main/java/javax/sip/header/OptionTag.java diff --git a/src/javax/sip/header/OrganizationHeader.java b/jain-sip-api/src/main/java/javax/sip/header/OrganizationHeader.java similarity index 100% rename from src/javax/sip/header/OrganizationHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/OrganizationHeader.java diff --git a/src/javax/sip/header/Parameters.java b/jain-sip-api/src/main/java/javax/sip/header/Parameters.java similarity index 100% rename from src/javax/sip/header/Parameters.java rename to jain-sip-api/src/main/java/javax/sip/header/Parameters.java diff --git a/src/javax/sip/header/PriorityHeader.java b/jain-sip-api/src/main/java/javax/sip/header/PriorityHeader.java similarity index 100% rename from src/javax/sip/header/PriorityHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/PriorityHeader.java diff --git a/src/javax/sip/header/ProxyAuthenticateHeader.java b/jain-sip-api/src/main/java/javax/sip/header/ProxyAuthenticateHeader.java similarity index 100% rename from src/javax/sip/header/ProxyAuthenticateHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/ProxyAuthenticateHeader.java diff --git a/src/javax/sip/header/ProxyAuthorizationHeader.java b/jain-sip-api/src/main/java/javax/sip/header/ProxyAuthorizationHeader.java similarity index 100% rename from src/javax/sip/header/ProxyAuthorizationHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/ProxyAuthorizationHeader.java diff --git a/src/javax/sip/header/ProxyRequireHeader.java b/jain-sip-api/src/main/java/javax/sip/header/ProxyRequireHeader.java similarity index 100% rename from src/javax/sip/header/ProxyRequireHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/ProxyRequireHeader.java diff --git a/src/javax/sip/header/RAckHeader.java b/jain-sip-api/src/main/java/javax/sip/header/RAckHeader.java similarity index 100% rename from src/javax/sip/header/RAckHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/RAckHeader.java diff --git a/src/javax/sip/header/RSeqHeader.java b/jain-sip-api/src/main/java/javax/sip/header/RSeqHeader.java similarity index 100% rename from src/javax/sip/header/RSeqHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/RSeqHeader.java diff --git a/src/javax/sip/header/ReasonHeader.java b/jain-sip-api/src/main/java/javax/sip/header/ReasonHeader.java similarity index 100% rename from src/javax/sip/header/ReasonHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/ReasonHeader.java diff --git a/src/javax/sip/header/RecordRouteHeader.java b/jain-sip-api/src/main/java/javax/sip/header/RecordRouteHeader.java similarity index 100% rename from src/javax/sip/header/RecordRouteHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/RecordRouteHeader.java diff --git a/src/javax/sip/header/ReferToHeader.java b/jain-sip-api/src/main/java/javax/sip/header/ReferToHeader.java similarity index 100% rename from src/javax/sip/header/ReferToHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/ReferToHeader.java diff --git a/src/javax/sip/header/ReplyToHeader.java b/jain-sip-api/src/main/java/javax/sip/header/ReplyToHeader.java similarity index 100% rename from src/javax/sip/header/ReplyToHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/ReplyToHeader.java diff --git a/src/javax/sip/header/RequireHeader.java b/jain-sip-api/src/main/java/javax/sip/header/RequireHeader.java similarity index 100% rename from src/javax/sip/header/RequireHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/RequireHeader.java diff --git a/src/javax/sip/header/RetryAfterHeader.java b/jain-sip-api/src/main/java/javax/sip/header/RetryAfterHeader.java similarity index 100% rename from src/javax/sip/header/RetryAfterHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/RetryAfterHeader.java diff --git a/src/javax/sip/header/RouteHeader.java b/jain-sip-api/src/main/java/javax/sip/header/RouteHeader.java similarity index 100% rename from src/javax/sip/header/RouteHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/RouteHeader.java diff --git a/src/javax/sip/header/SIPETagHeader.java b/jain-sip-api/src/main/java/javax/sip/header/SIPETagHeader.java similarity index 100% rename from src/javax/sip/header/SIPETagHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/SIPETagHeader.java diff --git a/src/javax/sip/header/SIPIfMatchHeader.java b/jain-sip-api/src/main/java/javax/sip/header/SIPIfMatchHeader.java similarity index 100% rename from src/javax/sip/header/SIPIfMatchHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/SIPIfMatchHeader.java diff --git a/src/javax/sip/header/ServerHeader.java b/jain-sip-api/src/main/java/javax/sip/header/ServerHeader.java similarity index 100% rename from src/javax/sip/header/ServerHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/ServerHeader.java diff --git a/src/javax/sip/header/SubjectHeader.java b/jain-sip-api/src/main/java/javax/sip/header/SubjectHeader.java similarity index 100% rename from src/javax/sip/header/SubjectHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/SubjectHeader.java diff --git a/src/javax/sip/header/SubscriptionStateHeader.java b/jain-sip-api/src/main/java/javax/sip/header/SubscriptionStateHeader.java similarity index 100% rename from src/javax/sip/header/SubscriptionStateHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/SubscriptionStateHeader.java diff --git a/src/javax/sip/header/SupportedHeader.java b/jain-sip-api/src/main/java/javax/sip/header/SupportedHeader.java similarity index 100% rename from src/javax/sip/header/SupportedHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/SupportedHeader.java diff --git a/src/javax/sip/header/TimeStampHeader.java b/jain-sip-api/src/main/java/javax/sip/header/TimeStampHeader.java similarity index 100% rename from src/javax/sip/header/TimeStampHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/TimeStampHeader.java diff --git a/src/javax/sip/header/ToHeader.java b/jain-sip-api/src/main/java/javax/sip/header/ToHeader.java similarity index 100% rename from src/javax/sip/header/ToHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/ToHeader.java diff --git a/src/javax/sip/header/TooManyHopsException.java b/jain-sip-api/src/main/java/javax/sip/header/TooManyHopsException.java similarity index 100% rename from src/javax/sip/header/TooManyHopsException.java rename to jain-sip-api/src/main/java/javax/sip/header/TooManyHopsException.java diff --git a/src/javax/sip/header/UnsupportedHeader.java b/jain-sip-api/src/main/java/javax/sip/header/UnsupportedHeader.java similarity index 100% rename from src/javax/sip/header/UnsupportedHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/UnsupportedHeader.java diff --git a/src/javax/sip/header/UserAgentHeader.java b/jain-sip-api/src/main/java/javax/sip/header/UserAgentHeader.java similarity index 100% rename from src/javax/sip/header/UserAgentHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/UserAgentHeader.java diff --git a/src/javax/sip/header/ViaHeader.java b/jain-sip-api/src/main/java/javax/sip/header/ViaHeader.java similarity index 100% rename from src/javax/sip/header/ViaHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/ViaHeader.java diff --git a/src/javax/sip/header/WWWAuthenticateHeader.java b/jain-sip-api/src/main/java/javax/sip/header/WWWAuthenticateHeader.java similarity index 100% rename from src/javax/sip/header/WWWAuthenticateHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/WWWAuthenticateHeader.java diff --git a/src/javax/sip/header/WarningHeader.java b/jain-sip-api/src/main/java/javax/sip/header/WarningHeader.java similarity index 100% rename from src/javax/sip/header/WarningHeader.java rename to jain-sip-api/src/main/java/javax/sip/header/WarningHeader.java diff --git a/src/javax/sip/header/package.html b/jain-sip-api/src/main/java/javax/sip/header/package.html similarity index 100% rename from src/javax/sip/header/package.html rename to jain-sip-api/src/main/java/javax/sip/header/package.html diff --git a/src/javax/sip/message/Message.java b/jain-sip-api/src/main/java/javax/sip/message/Message.java similarity index 100% rename from src/javax/sip/message/Message.java rename to jain-sip-api/src/main/java/javax/sip/message/Message.java diff --git a/src/javax/sip/message/MessageFactory.java b/jain-sip-api/src/main/java/javax/sip/message/MessageFactory.java similarity index 100% rename from src/javax/sip/message/MessageFactory.java rename to jain-sip-api/src/main/java/javax/sip/message/MessageFactory.java diff --git a/src/javax/sip/message/Request.java b/jain-sip-api/src/main/java/javax/sip/message/Request.java similarity index 100% rename from src/javax/sip/message/Request.java rename to jain-sip-api/src/main/java/javax/sip/message/Request.java diff --git a/src/javax/sip/message/Response.java b/jain-sip-api/src/main/java/javax/sip/message/Response.java similarity index 100% rename from src/javax/sip/message/Response.java rename to jain-sip-api/src/main/java/javax/sip/message/Response.java diff --git a/src/javax/sip/message/package.html b/jain-sip-api/src/main/java/javax/sip/message/package.html similarity index 100% rename from src/javax/sip/message/package.html rename to jain-sip-api/src/main/java/javax/sip/message/package.html diff --git a/src/javax/sip/overview.html b/jain-sip-api/src/main/java/javax/sip/overview.html similarity index 100% rename from src/javax/sip/overview.html rename to jain-sip-api/src/main/java/javax/sip/overview.html diff --git a/src/javax/sip/package.html b/jain-sip-api/src/main/java/javax/sip/package.html similarity index 100% rename from src/javax/sip/package.html rename to jain-sip-api/src/main/java/javax/sip/package.html diff --git a/jain-sip-examples/pom.xml b/jain-sip-examples/pom.xml new file mode 100644 index 000000000..c103287ca --- /dev/null +++ b/jain-sip-examples/pom.xml @@ -0,0 +1,63 @@ + + 4.0.0 + gov.nist + jain-sip-examples + 1.3.0-SNAPSHOT + jain-sip-examples + examples of use of jain-ip API or RI + + + ISO-8859-1 + 1.3.0-SNAPSHOT + 11 + 11 + + + + + javax.sip + jain-sip-api + ${jain-sip.version} + + + javax.sip + jain-sip-ri + ${jain-sip.version} + + + javax.sip + android-jain-sip-ri + ${jain-sip.version} + + + + + log4j + log4j + 1.2.15 + + + com.sun.jmx + jmxri + + + com.sun.jdmk + jmxtools + + + javax.jms + jms + + + + + + + junit + junit + 4.13.2 + + + \ No newline at end of file diff --git a/src/examples/android/simplecallsetup/README.txt b/jain-sip-examples/src/main/java/examples/android/simplecallsetup/README.txt similarity index 100% rename from src/examples/android/simplecallsetup/README.txt rename to jain-sip-examples/src/main/java/examples/android/simplecallsetup/README.txt diff --git a/src/examples/android/simplecallsetup/Shootist.java b/jain-sip-examples/src/main/java/examples/android/simplecallsetup/Shootist.java similarity index 100% rename from src/examples/android/simplecallsetup/Shootist.java rename to jain-sip-examples/src/main/java/examples/android/simplecallsetup/Shootist.java diff --git a/src/examples/android/simplecallsetup/Shootme.java b/jain-sip-examples/src/main/java/examples/android/simplecallsetup/Shootme.java similarity index 100% rename from src/examples/android/simplecallsetup/Shootme.java rename to jain-sip-examples/src/main/java/examples/android/simplecallsetup/Shootme.java diff --git a/src/examples/authorization/AccountManagerImpl.java b/jain-sip-examples/src/main/java/examples/authorization/AccountManagerImpl.java similarity index 100% rename from src/examples/authorization/AccountManagerImpl.java rename to jain-sip-examples/src/main/java/examples/authorization/AccountManagerImpl.java diff --git a/src/examples/authorization/ShootistAuth.java b/jain-sip-examples/src/main/java/examples/authorization/ShootistAuth.java similarity index 100% rename from src/examples/authorization/ShootistAuth.java rename to jain-sip-examples/src/main/java/examples/authorization/ShootistAuth.java diff --git a/src/examples/authorization/ShootmeAuth.java b/jain-sip-examples/src/main/java/examples/authorization/ShootmeAuth.java similarity index 100% rename from src/examples/authorization/ShootmeAuth.java rename to jain-sip-examples/src/main/java/examples/authorization/ShootmeAuth.java diff --git a/src/examples/authorization/UserCredentialsImpl.java b/jain-sip-examples/src/main/java/examples/authorization/UserCredentialsImpl.java similarity index 100% rename from src/examples/authorization/UserCredentialsImpl.java rename to jain-sip-examples/src/main/java/examples/authorization/UserCredentialsImpl.java diff --git a/src/examples/authorization/build.xml b/jain-sip-examples/src/main/java/examples/authorization/build.xml similarity index 100% rename from src/examples/authorization/build.xml rename to jain-sip-examples/src/main/java/examples/authorization/build.xml diff --git a/src/examples/busy/Shootist.java b/jain-sip-examples/src/main/java/examples/busy/Shootist.java similarity index 100% rename from src/examples/busy/Shootist.java rename to jain-sip-examples/src/main/java/examples/busy/Shootist.java diff --git a/src/examples/busy/Shootme.java b/jain-sip-examples/src/main/java/examples/busy/Shootme.java similarity index 100% rename from src/examples/busy/Shootme.java rename to jain-sip-examples/src/main/java/examples/busy/Shootme.java diff --git a/src/examples/busy/build.xml b/jain-sip-examples/src/main/java/examples/busy/build.xml similarity index 100% rename from src/examples/busy/build.xml rename to jain-sip-examples/src/main/java/examples/busy/build.xml diff --git a/src/examples/cancel/AbstractCancelTest.java b/jain-sip-examples/src/main/java/examples/cancel/AbstractCancelTest.java similarity index 100% rename from src/examples/cancel/AbstractCancelTest.java rename to jain-sip-examples/src/main/java/examples/cancel/AbstractCancelTest.java diff --git a/src/examples/cancel/ProtocolObjects.java b/jain-sip-examples/src/main/java/examples/cancel/ProtocolObjects.java similarity index 100% rename from src/examples/cancel/ProtocolObjects.java rename to jain-sip-examples/src/main/java/examples/cancel/ProtocolObjects.java diff --git a/src/examples/cancel/README.txt b/jain-sip-examples/src/main/java/examples/cancel/README.txt similarity index 100% rename from src/examples/cancel/README.txt rename to jain-sip-examples/src/main/java/examples/cancel/README.txt diff --git a/src/examples/cancel/Shootist.java b/jain-sip-examples/src/main/java/examples/cancel/Shootist.java similarity index 100% rename from src/examples/cancel/Shootist.java rename to jain-sip-examples/src/main/java/examples/cancel/Shootist.java diff --git a/src/examples/cancel/Shootme.java b/jain-sip-examples/src/main/java/examples/cancel/Shootme.java similarity index 100% rename from src/examples/cancel/Shootme.java rename to jain-sip-examples/src/main/java/examples/cancel/Shootme.java diff --git a/src/examples/cancel/TestCancel.java b/jain-sip-examples/src/main/java/examples/cancel/TestCancel.java similarity index 100% rename from src/examples/cancel/TestCancel.java rename to jain-sip-examples/src/main/java/examples/cancel/TestCancel.java diff --git a/src/examples/cancel/TestDelayedCancel.java b/jain-sip-examples/src/main/java/examples/cancel/TestDelayedCancel.java similarity index 100% rename from src/examples/cancel/TestDelayedCancel.java rename to jain-sip-examples/src/main/java/examples/cancel/TestDelayedCancel.java diff --git a/src/examples/cancel/build.xml b/jain-sip-examples/src/main/java/examples/cancel/build.xml similarity index 100% rename from src/examples/cancel/build.xml rename to jain-sip-examples/src/main/java/examples/cancel/build.xml diff --git a/src/examples/forked/invite/ForkedInviteTest.java b/jain-sip-examples/src/main/java/examples/forked/invite/ForkedInviteTest.java similarity index 100% rename from src/examples/forked/invite/ForkedInviteTest.java rename to jain-sip-examples/src/main/java/examples/forked/invite/ForkedInviteTest.java diff --git a/src/examples/forked/invite/ProtocolObjects.java b/jain-sip-examples/src/main/java/examples/forked/invite/ProtocolObjects.java similarity index 100% rename from src/examples/forked/invite/ProtocolObjects.java rename to jain-sip-examples/src/main/java/examples/forked/invite/ProtocolObjects.java diff --git a/src/examples/forked/invite/Proxy.java b/jain-sip-examples/src/main/java/examples/forked/invite/Proxy.java similarity index 100% rename from src/examples/forked/invite/Proxy.java rename to jain-sip-examples/src/main/java/examples/forked/invite/Proxy.java diff --git a/src/examples/forked/invite/README.txt b/jain-sip-examples/src/main/java/examples/forked/invite/README.txt similarity index 100% rename from src/examples/forked/invite/README.txt rename to jain-sip-examples/src/main/java/examples/forked/invite/README.txt diff --git a/src/examples/forked/invite/Shootist.java b/jain-sip-examples/src/main/java/examples/forked/invite/Shootist.java similarity index 100% rename from src/examples/forked/invite/Shootist.java rename to jain-sip-examples/src/main/java/examples/forked/invite/Shootist.java diff --git a/src/examples/forked/invite/Shootme.java b/jain-sip-examples/src/main/java/examples/forked/invite/Shootme.java similarity index 100% rename from src/examples/forked/invite/Shootme.java rename to jain-sip-examples/src/main/java/examples/forked/invite/Shootme.java diff --git a/src/examples/forked/invite/build.xml b/jain-sip-examples/src/main/java/examples/forked/invite/build.xml similarity index 100% rename from src/examples/forked/invite/build.xml rename to jain-sip-examples/src/main/java/examples/forked/invite/build.xml diff --git a/src/examples/ims/README.txt b/jain-sip-examples/src/main/java/examples/ims/README.txt similarity index 100% rename from src/examples/ims/README.txt rename to jain-sip-examples/src/main/java/examples/ims/README.txt diff --git a/src/examples/ims/Shootist.java b/jain-sip-examples/src/main/java/examples/ims/Shootist.java similarity index 100% rename from src/examples/ims/Shootist.java rename to jain-sip-examples/src/main/java/examples/ims/Shootist.java diff --git a/src/examples/ims/Shootme.java b/jain-sip-examples/src/main/java/examples/ims/Shootme.java similarity index 100% rename from src/examples/ims/Shootme.java rename to jain-sip-examples/src/main/java/examples/ims/Shootme.java diff --git a/src/examples/ims/TheShootist.jpg b/jain-sip-examples/src/main/java/examples/ims/TheShootist.jpg similarity index 100% rename from src/examples/ims/TheShootist.jpg rename to jain-sip-examples/src/main/java/examples/ims/TheShootist.jpg diff --git a/src/examples/ims/build.xml b/jain-sip-examples/src/main/java/examples/ims/build.xml similarity index 100% rename from src/examples/ims/build.xml rename to jain-sip-examples/src/main/java/examples/ims/build.xml diff --git a/src/examples/nistgoodies/README.txt b/jain-sip-examples/src/main/java/examples/nistgoodies/README.txt similarity index 100% rename from src/examples/nistgoodies/README.txt rename to jain-sip-examples/src/main/java/examples/nistgoodies/README.txt diff --git a/src/examples/nistgoodies/configlogger/LogRecordFactoryImpl.java b/jain-sip-examples/src/main/java/examples/nistgoodies/configlogger/LogRecordFactoryImpl.java similarity index 100% rename from src/examples/nistgoodies/configlogger/LogRecordFactoryImpl.java rename to jain-sip-examples/src/main/java/examples/nistgoodies/configlogger/LogRecordFactoryImpl.java diff --git a/src/examples/nistgoodies/configlogger/LogRecordImpl.java b/jain-sip-examples/src/main/java/examples/nistgoodies/configlogger/LogRecordImpl.java similarity index 100% rename from src/examples/nistgoodies/configlogger/LogRecordImpl.java rename to jain-sip-examples/src/main/java/examples/nistgoodies/configlogger/LogRecordImpl.java diff --git a/src/examples/nistgoodies/configlogger/README.txt b/jain-sip-examples/src/main/java/examples/nistgoodies/configlogger/README.txt similarity index 100% rename from src/examples/nistgoodies/configlogger/README.txt rename to jain-sip-examples/src/main/java/examples/nistgoodies/configlogger/README.txt diff --git a/src/examples/nistgoodies/configlogger/Shootist.java b/jain-sip-examples/src/main/java/examples/nistgoodies/configlogger/Shootist.java similarity index 100% rename from src/examples/nistgoodies/configlogger/Shootist.java rename to jain-sip-examples/src/main/java/examples/nistgoodies/configlogger/Shootist.java diff --git a/src/examples/nistgoodies/configlogger/Shootme.java b/jain-sip-examples/src/main/java/examples/nistgoodies/configlogger/Shootme.java similarity index 100% rename from src/examples/nistgoodies/configlogger/Shootme.java rename to jain-sip-examples/src/main/java/examples/nistgoodies/configlogger/Shootme.java diff --git a/src/examples/nistgoodies/configlogger/build.xml b/jain-sip-examples/src/main/java/examples/nistgoodies/configlogger/build.xml similarity index 100% rename from src/examples/nistgoodies/configlogger/build.xml rename to jain-sip-examples/src/main/java/examples/nistgoodies/configlogger/build.xml diff --git a/src/examples/nistgoodies/leakaudit/LeakAudit.java b/jain-sip-examples/src/main/java/examples/nistgoodies/leakaudit/LeakAudit.java similarity index 100% rename from src/examples/nistgoodies/leakaudit/LeakAudit.java rename to jain-sip-examples/src/main/java/examples/nistgoodies/leakaudit/LeakAudit.java diff --git a/src/examples/nistgoodies/leakaudit/LeakingApp.java b/jain-sip-examples/src/main/java/examples/nistgoodies/leakaudit/LeakingApp.java similarity index 100% rename from src/examples/nistgoodies/leakaudit/LeakingApp.java rename to jain-sip-examples/src/main/java/examples/nistgoodies/leakaudit/LeakingApp.java diff --git a/src/examples/nistgoodies/leakaudit/README.txt b/jain-sip-examples/src/main/java/examples/nistgoodies/leakaudit/README.txt similarity index 100% rename from src/examples/nistgoodies/leakaudit/README.txt rename to jain-sip-examples/src/main/java/examples/nistgoodies/leakaudit/README.txt diff --git a/src/examples/nistgoodies/match/MatchTest.java b/jain-sip-examples/src/main/java/examples/nistgoodies/match/MatchTest.java similarity index 100% rename from src/examples/nistgoodies/match/MatchTest.java rename to jain-sip-examples/src/main/java/examples/nistgoodies/match/MatchTest.java diff --git a/src/examples/nistgoodies/match/README.txt b/jain-sip-examples/src/main/java/examples/nistgoodies/match/README.txt similarity index 100% rename from src/examples/nistgoodies/match/README.txt rename to jain-sip-examples/src/main/java/examples/nistgoodies/match/README.txt diff --git a/src/examples/nistgoodies/match/RegexpMatchTest.java b/jain-sip-examples/src/main/java/examples/nistgoodies/match/RegexpMatchTest.java similarity index 100% rename from src/examples/nistgoodies/match/RegexpMatchTest.java rename to jain-sip-examples/src/main/java/examples/nistgoodies/match/RegexpMatchTest.java diff --git a/src/examples/nistgoodies/messagevalve/README.txt b/jain-sip-examples/src/main/java/examples/nistgoodies/messagevalve/README.txt similarity index 100% rename from src/examples/nistgoodies/messagevalve/README.txt rename to jain-sip-examples/src/main/java/examples/nistgoodies/messagevalve/README.txt diff --git a/src/examples/nistgoodies/messagevalve/SipMessageValve.java b/jain-sip-examples/src/main/java/examples/nistgoodies/messagevalve/SipMessageValve.java similarity index 100% rename from src/examples/nistgoodies/messagevalve/SipMessageValve.java rename to jain-sip-examples/src/main/java/examples/nistgoodies/messagevalve/SipMessageValve.java diff --git a/src/examples/nistgoodies/pluggablelogger/LogRecordFactoryImpl.java b/jain-sip-examples/src/main/java/examples/nistgoodies/pluggablelogger/LogRecordFactoryImpl.java similarity index 100% rename from src/examples/nistgoodies/pluggablelogger/LogRecordFactoryImpl.java rename to jain-sip-examples/src/main/java/examples/nistgoodies/pluggablelogger/LogRecordFactoryImpl.java diff --git a/src/examples/nistgoodies/pluggablelogger/LogRecordImpl.java b/jain-sip-examples/src/main/java/examples/nistgoodies/pluggablelogger/LogRecordImpl.java similarity index 100% rename from src/examples/nistgoodies/pluggablelogger/LogRecordImpl.java rename to jain-sip-examples/src/main/java/examples/nistgoodies/pluggablelogger/LogRecordImpl.java diff --git a/src/examples/nistgoodies/pluggablelogger/README.txt b/jain-sip-examples/src/main/java/examples/nistgoodies/pluggablelogger/README.txt similarity index 100% rename from src/examples/nistgoodies/pluggablelogger/README.txt rename to jain-sip-examples/src/main/java/examples/nistgoodies/pluggablelogger/README.txt diff --git a/src/examples/nistgoodies/pluggablelogger/ServerLoggerImpl.java b/jain-sip-examples/src/main/java/examples/nistgoodies/pluggablelogger/ServerLoggerImpl.java similarity index 100% rename from src/examples/nistgoodies/pluggablelogger/ServerLoggerImpl.java rename to jain-sip-examples/src/main/java/examples/nistgoodies/pluggablelogger/ServerLoggerImpl.java diff --git a/src/examples/nistgoodies/pluggablelogger/Shootist.java b/jain-sip-examples/src/main/java/examples/nistgoodies/pluggablelogger/Shootist.java similarity index 100% rename from src/examples/nistgoodies/pluggablelogger/Shootist.java rename to jain-sip-examples/src/main/java/examples/nistgoodies/pluggablelogger/Shootist.java diff --git a/src/examples/nistgoodies/pluggablelogger/Shootme.java b/jain-sip-examples/src/main/java/examples/nistgoodies/pluggablelogger/Shootme.java similarity index 100% rename from src/examples/nistgoodies/pluggablelogger/Shootme.java rename to jain-sip-examples/src/main/java/examples/nistgoodies/pluggablelogger/Shootme.java diff --git a/src/examples/nistgoodies/pluggablelogger/StackLoggerImpl.java b/jain-sip-examples/src/main/java/examples/nistgoodies/pluggablelogger/StackLoggerImpl.java similarity index 100% rename from src/examples/nistgoodies/pluggablelogger/StackLoggerImpl.java rename to jain-sip-examples/src/main/java/examples/nistgoodies/pluggablelogger/StackLoggerImpl.java diff --git a/src/examples/nistgoodies/pluggablelogger/build.xml b/jain-sip-examples/src/main/java/examples/nistgoodies/pluggablelogger/build.xml similarity index 100% rename from src/examples/nistgoodies/pluggablelogger/build.xml rename to jain-sip-examples/src/main/java/examples/nistgoodies/pluggablelogger/build.xml diff --git a/src/examples/nistgoodies/threadaudit/README.txt b/jain-sip-examples/src/main/java/examples/nistgoodies/threadaudit/README.txt similarity index 100% rename from src/examples/nistgoodies/threadaudit/README.txt rename to jain-sip-examples/src/main/java/examples/nistgoodies/threadaudit/README.txt diff --git a/src/examples/nistgoodies/threadaudit/ThreadAudit.java b/jain-sip-examples/src/main/java/examples/nistgoodies/threadaudit/ThreadAudit.java similarity index 100% rename from src/examples/nistgoodies/threadaudit/ThreadAudit.java rename to jain-sip-examples/src/main/java/examples/nistgoodies/threadaudit/ThreadAudit.java diff --git a/src/examples/noautodialog/README.txt b/jain-sip-examples/src/main/java/examples/noautodialog/README.txt similarity index 100% rename from src/examples/noautodialog/README.txt rename to jain-sip-examples/src/main/java/examples/noautodialog/README.txt diff --git a/src/examples/noautodialog/Shootist.java b/jain-sip-examples/src/main/java/examples/noautodialog/Shootist.java similarity index 100% rename from src/examples/noautodialog/Shootist.java rename to jain-sip-examples/src/main/java/examples/noautodialog/Shootist.java diff --git a/src/examples/noautodialog/Shootme.java b/jain-sip-examples/src/main/java/examples/noautodialog/Shootme.java similarity index 100% rename from src/examples/noautodialog/Shootme.java rename to jain-sip-examples/src/main/java/examples/noautodialog/Shootme.java diff --git a/src/examples/noautodialog/build.xml b/jain-sip-examples/src/main/java/examples/noautodialog/build.xml similarity index 100% rename from src/examples/noautodialog/build.xml rename to jain-sip-examples/src/main/java/examples/noautodialog/build.xml diff --git a/src/examples/parser/Parser.java b/jain-sip-examples/src/main/java/examples/parser/Parser.java similarity index 100% rename from src/examples/parser/Parser.java rename to jain-sip-examples/src/main/java/examples/parser/Parser.java diff --git a/src/examples/parser/README.txt b/jain-sip-examples/src/main/java/examples/parser/README.txt similarity index 100% rename from src/examples/parser/README.txt rename to jain-sip-examples/src/main/java/examples/parser/README.txt diff --git a/src/examples/prack/Shootist.java b/jain-sip-examples/src/main/java/examples/prack/Shootist.java similarity index 100% rename from src/examples/prack/Shootist.java rename to jain-sip-examples/src/main/java/examples/prack/Shootist.java diff --git a/src/examples/prack/Shootme.java b/jain-sip-examples/src/main/java/examples/prack/Shootme.java similarity index 100% rename from src/examples/prack/Shootme.java rename to jain-sip-examples/src/main/java/examples/prack/Shootme.java diff --git a/src/examples/prack/build.xml b/jain-sip-examples/src/main/java/examples/prack/build.xml similarity index 100% rename from src/examples/prack/build.xml rename to jain-sip-examples/src/main/java/examples/prack/build.xml diff --git a/src/examples/publish/Notifier.java b/jain-sip-examples/src/main/java/examples/publish/Notifier.java similarity index 100% rename from src/examples/publish/Notifier.java rename to jain-sip-examples/src/main/java/examples/publish/Notifier.java diff --git a/src/examples/publish/Publisher.java b/jain-sip-examples/src/main/java/examples/publish/Publisher.java similarity index 100% rename from src/examples/publish/Publisher.java rename to jain-sip-examples/src/main/java/examples/publish/Publisher.java diff --git a/src/examples/publish/Subscriber.java b/jain-sip-examples/src/main/java/examples/publish/Subscriber.java similarity index 100% rename from src/examples/publish/Subscriber.java rename to jain-sip-examples/src/main/java/examples/publish/Subscriber.java diff --git a/src/examples/redirect/ProtocolObjects.java b/jain-sip-examples/src/main/java/examples/redirect/ProtocolObjects.java similarity index 100% rename from src/examples/redirect/ProtocolObjects.java rename to jain-sip-examples/src/main/java/examples/redirect/ProtocolObjects.java diff --git a/src/examples/redirect/Shootist.java b/jain-sip-examples/src/main/java/examples/redirect/Shootist.java similarity index 100% rename from src/examples/redirect/Shootist.java rename to jain-sip-examples/src/main/java/examples/redirect/Shootist.java diff --git a/src/examples/redirect/Shootme.java b/jain-sip-examples/src/main/java/examples/redirect/Shootme.java similarity index 100% rename from src/examples/redirect/Shootme.java rename to jain-sip-examples/src/main/java/examples/redirect/Shootme.java diff --git a/src/examples/redirect/build.xml b/jain-sip-examples/src/main/java/examples/redirect/build.xml similarity index 100% rename from src/examples/redirect/build.xml rename to jain-sip-examples/src/main/java/examples/redirect/build.xml diff --git a/src/examples/refer/Referee.java b/jain-sip-examples/src/main/java/examples/refer/Referee.java similarity index 100% rename from src/examples/refer/Referee.java rename to jain-sip-examples/src/main/java/examples/refer/Referee.java diff --git a/src/examples/refer/Referer.java b/jain-sip-examples/src/main/java/examples/refer/Referer.java similarity index 100% rename from src/examples/refer/Referer.java rename to jain-sip-examples/src/main/java/examples/refer/Referer.java diff --git a/src/examples/refer/build.xml b/jain-sip-examples/src/main/java/examples/refer/build.xml similarity index 100% rename from src/examples/refer/build.xml rename to jain-sip-examples/src/main/java/examples/refer/build.xml diff --git a/src/examples/reinvite/ProtocolObjects.java b/jain-sip-examples/src/main/java/examples/reinvite/ProtocolObjects.java similarity index 100% rename from src/examples/reinvite/ProtocolObjects.java rename to jain-sip-examples/src/main/java/examples/reinvite/ProtocolObjects.java diff --git a/src/examples/reinvite/README.txt b/jain-sip-examples/src/main/java/examples/reinvite/README.txt similarity index 100% rename from src/examples/reinvite/README.txt rename to jain-sip-examples/src/main/java/examples/reinvite/README.txt diff --git a/src/examples/reinvite/Shootist.java b/jain-sip-examples/src/main/java/examples/reinvite/Shootist.java similarity index 100% rename from src/examples/reinvite/Shootist.java rename to jain-sip-examples/src/main/java/examples/reinvite/Shootist.java diff --git a/src/examples/reinvite/Shootme.java b/jain-sip-examples/src/main/java/examples/reinvite/Shootme.java similarity index 100% rename from src/examples/reinvite/Shootme.java rename to jain-sip-examples/src/main/java/examples/reinvite/Shootme.java diff --git a/src/examples/reinvite/build.xml b/jain-sip-examples/src/main/java/examples/reinvite/build.xml similarity index 100% rename from src/examples/reinvite/build.xml rename to jain-sip-examples/src/main/java/examples/reinvite/build.xml diff --git a/src/examples/simplecallsetup/README.txt b/jain-sip-examples/src/main/java/examples/simplecallsetup/README.txt similarity index 100% rename from src/examples/simplecallsetup/README.txt rename to jain-sip-examples/src/main/java/examples/simplecallsetup/README.txt diff --git a/src/examples/simplecallsetup/Shootist.java b/jain-sip-examples/src/main/java/examples/simplecallsetup/Shootist.java similarity index 100% rename from src/examples/simplecallsetup/Shootist.java rename to jain-sip-examples/src/main/java/examples/simplecallsetup/Shootist.java diff --git a/src/examples/simplecallsetup/Shootme.java b/jain-sip-examples/src/main/java/examples/simplecallsetup/Shootme.java similarity index 100% rename from src/examples/simplecallsetup/Shootme.java rename to jain-sip-examples/src/main/java/examples/simplecallsetup/Shootme.java diff --git a/src/examples/simplecallsetup/TheShootist.jpg b/jain-sip-examples/src/main/java/examples/simplecallsetup/TheShootist.jpg similarity index 100% rename from src/examples/simplecallsetup/TheShootist.jpg rename to jain-sip-examples/src/main/java/examples/simplecallsetup/TheShootist.jpg diff --git a/src/examples/simplecallsetup/build.xml b/jain-sip-examples/src/main/java/examples/simplecallsetup/build.xml similarity index 100% rename from src/examples/simplecallsetup/build.xml rename to jain-sip-examples/src/main/java/examples/simplecallsetup/build.xml diff --git a/src/examples/subsnotify/Forker.java b/jain-sip-examples/src/main/java/examples/subsnotify/Forker.java similarity index 100% rename from src/examples/subsnotify/Forker.java rename to jain-sip-examples/src/main/java/examples/subsnotify/Forker.java diff --git a/src/examples/subsnotify/Notifier.java b/jain-sip-examples/src/main/java/examples/subsnotify/Notifier.java similarity index 100% rename from src/examples/subsnotify/Notifier.java rename to jain-sip-examples/src/main/java/examples/subsnotify/Notifier.java diff --git a/src/examples/subsnotify/Subscriber.java b/jain-sip-examples/src/main/java/examples/subsnotify/Subscriber.java similarity index 100% rename from src/examples/subsnotify/Subscriber.java rename to jain-sip-examples/src/main/java/examples/subsnotify/Subscriber.java diff --git a/src/examples/subsnotify/build.xml b/jain-sip-examples/src/main/java/examples/subsnotify/build.xml similarity index 100% rename from src/examples/subsnotify/build.xml rename to jain-sip-examples/src/main/java/examples/subsnotify/build.xml diff --git a/src/examples/tls/HopImpl.java b/jain-sip-examples/src/main/java/examples/tls/HopImpl.java similarity index 100% rename from src/examples/tls/HopImpl.java rename to jain-sip-examples/src/main/java/examples/tls/HopImpl.java diff --git a/src/examples/tls/MyRouter.java b/jain-sip-examples/src/main/java/examples/tls/MyRouter.java similarity index 100% rename from src/examples/tls/MyRouter.java rename to jain-sip-examples/src/main/java/examples/tls/MyRouter.java diff --git a/src/examples/tls/README.txt b/jain-sip-examples/src/main/java/examples/tls/README.txt similarity index 100% rename from src/examples/tls/README.txt rename to jain-sip-examples/src/main/java/examples/tls/README.txt diff --git a/src/examples/tls/Shootist.java b/jain-sip-examples/src/main/java/examples/tls/Shootist.java similarity index 98% rename from src/examples/tls/Shootist.java rename to jain-sip-examples/src/main/java/examples/tls/Shootist.java index d06a3508b..2a3b17f55 100755 --- a/src/examples/tls/Shootist.java +++ b/jain-sip-examples/src/main/java/examples/tls/Shootist.java @@ -10,8 +10,6 @@ import javax.sip.header.*; import javax.sip.message.*; -import test.unit.gov.nist.javax.sip.stack.tls.TlsTest; - import java.io.IOException; import java.security.cert.Certificate; import java.util.*; @@ -406,8 +404,8 @@ public void init() { } public static void main(String args[]) { - System.setProperty( "javax.net.ssl.keyStore", TlsTest.class.getResource("testkeys").getPath() ); - System.setProperty( "javax.net.ssl.trustStore", TlsTest.class.getResource("testkeys").getPath() ); + //System.setProperty( "javax.net.ssl.keyStore", TlsTest.class.getResource("testkeys").getPath() ); + //System.setProperty( "javax.net.ssl.trustStore", TlsTest.class.getResource("testkeys").getPath() ); System.setProperty( "javax.net.ssl.keyStorePassword", "passphrase" ); System.setProperty( "javax.net.ssl.keyStoreType", "jks" ); new Shootist().init(); diff --git a/src/examples/tls/Shootme.java b/jain-sip-examples/src/main/java/examples/tls/Shootme.java similarity index 98% rename from src/examples/tls/Shootme.java rename to jain-sip-examples/src/main/java/examples/tls/Shootme.java index 5e05cf3a7..bf600c6a1 100755 --- a/src/examples/tls/Shootme.java +++ b/jain-sip-examples/src/main/java/examples/tls/Shootme.java @@ -31,8 +31,6 @@ import javax.sip.message.Request; import javax.sip.message.Response; -import test.unit.gov.nist.javax.sip.stack.tls.TlsTest; - /** * This class is a UAC template. Shootist is the guy that shoots and shootme * is the guy that gets shot. @@ -321,8 +319,8 @@ public void init() { } public static void main(String args[]) { - System.setProperty( "javax.net.ssl.keyStore", TlsTest.class.getResource("testkeys").getPath() ); - System.setProperty( "javax.net.ssl.trustStore", TlsTest.class.getResource("testkeys").getPath() ); + System.setProperty( "javax.net.ssl.keyStore", Shootme.class.getResource("testkeys").getPath() ); + System.setProperty( "javax.net.ssl.trustStore", Shootme.class.getResource("testkeys").getPath() ); System.setProperty( "javax.net.ssl.keyStorePassword", "passphrase" ); System.setProperty( "javax.net.ssl.keyStoreType", "jks" ); new Shootme().init(); diff --git a/src/examples/tls/build.xml b/jain-sip-examples/src/main/java/examples/tls/build.xml similarity index 100% rename from src/examples/tls/build.xml rename to jain-sip-examples/src/main/java/examples/tls/build.xml diff --git a/src/examples/tls/testKeyStore b/jain-sip-examples/src/main/java/examples/tls/testKeyStore similarity index 100% rename from src/examples/tls/testKeyStore rename to jain-sip-examples/src/main/java/examples/tls/testKeyStore diff --git a/src/examples/tls/testkeys b/jain-sip-examples/src/main/java/examples/tls/testkeys similarity index 100% rename from src/examples/tls/testkeys rename to jain-sip-examples/src/main/java/examples/tls/testkeys diff --git a/src/examples/tpcc/Controller.java b/jain-sip-examples/src/main/java/examples/tpcc/Controller.java similarity index 100% rename from src/examples/tpcc/Controller.java rename to jain-sip-examples/src/main/java/examples/tpcc/Controller.java diff --git a/src/examples/tpcc/Controller4.java b/jain-sip-examples/src/main/java/examples/tpcc/Controller4.java similarity index 100% rename from src/examples/tpcc/Controller4.java rename to jain-sip-examples/src/main/java/examples/tpcc/Controller4.java diff --git a/src/examples/tpcc/Phone.java b/jain-sip-examples/src/main/java/examples/tpcc/Phone.java similarity index 100% rename from src/examples/tpcc/Phone.java rename to jain-sip-examples/src/main/java/examples/tpcc/Phone.java diff --git a/src/examples/tpcc/README.txt b/jain-sip-examples/src/main/java/examples/tpcc/README.txt similarity index 100% rename from src/examples/tpcc/README.txt rename to jain-sip-examples/src/main/java/examples/tpcc/README.txt diff --git a/src/examples/tpcc/build.xml b/jain-sip-examples/src/main/java/examples/tpcc/build.xml similarity index 100% rename from src/examples/tpcc/build.xml rename to jain-sip-examples/src/main/java/examples/tpcc/build.xml diff --git a/src/examples/websocket/B2BUA.java b/jain-sip-examples/src/main/java/examples/websocket/B2BUA.java similarity index 100% rename from src/examples/websocket/B2BUA.java rename to jain-sip-examples/src/main/java/examples/websocket/B2BUA.java diff --git a/src/examples/websocket/README.txt b/jain-sip-examples/src/main/java/examples/websocket/README.txt similarity index 100% rename from src/examples/websocket/README.txt rename to jain-sip-examples/src/main/java/examples/websocket/README.txt diff --git a/src/examples/websocket/build.xml b/jain-sip-examples/src/main/java/examples/websocket/build.xml similarity index 100% rename from src/examples/websocket/build.xml rename to jain-sip-examples/src/main/java/examples/websocket/build.xml diff --git a/jain-sip-ri/pom.xml b/jain-sip-ri/pom.xml new file mode 100644 index 000000000..bc1442228 --- /dev/null +++ b/jain-sip-ri/pom.xml @@ -0,0 +1,197 @@ + + + + 4.0.0 + + javax.sip + 1.3.0-SNAPSHOT + jain-sip + ../pom.xml + + + jain-sip-ri + jar + + jain-sip-ri + http://code.google.com/p/jain-sip/ + + + + + javax.sip + jain-sip-api + ${project.version} + provided + + + + + javax.xml.bind + jaxb-api + 2.3.0 + + + com.sun.xml.bind + jaxb-core + 2.3.0 + + + com.sun.xml.bind + jaxb-impl + 2.3.0 + + + + + log4j + log4j + 1.2.15 + provided + + + + com.sun.jmx + jmxri + + + com.sun.jdmk + jmxtools + + + javax.jms + jms + + + + + + + junit + junit + 4.13.2 + test + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + 1.7 + 1.7 + + + + org.apache.maven.plugins + maven-jar-plugin + 2.4 + + + + true + + + ${buildNumber} + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.8.1 + + + attach-javadocs + verify + + jar + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.2 + true + + mobicents-releases-repository + https://oss.sonatype.org/ + + + + deploy-to-sonatype + deploy + + deploy + + release + + + + + + + + + + release + + + + org.codehaus.mojo + buildnumber-maven-plugin + 1.0 + + + validate + + create + + + + + false + false + + + + + + + + + + + maven2-repository.dev.java.net + Java.net Repository for Maven + http://download.java.net/maven/2/ + default + + + mobicents-public-repository-group + Mobicens Public Maven Repository Group + https://oss.sonatype.org/content/groups/public + default + + true + never + + + true + never + + + + + + scm:git:https://code.google.com/p/jain-sip/ + scm:git:https://code.google.com/p/jain-sip/ + https://code.google.com/p/jain-sip/ + + \ No newline at end of file diff --git a/src/gov/nist/core/CommonLogger.java b/jain-sip-ri/src/main/java/gov/nist/core/CommonLogger.java similarity index 100% rename from src/gov/nist/core/CommonLogger.java rename to jain-sip-ri/src/main/java/gov/nist/core/CommonLogger.java diff --git a/src/gov/nist/core/CommonLoggerLog4j.java b/jain-sip-ri/src/main/java/gov/nist/core/CommonLoggerLog4j.java similarity index 100% rename from src/gov/nist/core/CommonLoggerLog4j.java rename to jain-sip-ri/src/main/java/gov/nist/core/CommonLoggerLog4j.java diff --git a/src/gov/nist/core/Debug.java b/jain-sip-ri/src/main/java/gov/nist/core/Debug.java similarity index 100% rename from src/gov/nist/core/Debug.java rename to jain-sip-ri/src/main/java/gov/nist/core/Debug.java diff --git a/src/gov/nist/core/DuplicateNameValueList.java b/jain-sip-ri/src/main/java/gov/nist/core/DuplicateNameValueList.java similarity index 100% rename from src/gov/nist/core/DuplicateNameValueList.java rename to jain-sip-ri/src/main/java/gov/nist/core/DuplicateNameValueList.java diff --git a/src/gov/nist/core/GenericObject.java b/jain-sip-ri/src/main/java/gov/nist/core/GenericObject.java similarity index 100% rename from src/gov/nist/core/GenericObject.java rename to jain-sip-ri/src/main/java/gov/nist/core/GenericObject.java diff --git a/src/gov/nist/core/GenericObjectList.java b/jain-sip-ri/src/main/java/gov/nist/core/GenericObjectList.java similarity index 100% rename from src/gov/nist/core/GenericObjectList.java rename to jain-sip-ri/src/main/java/gov/nist/core/GenericObjectList.java diff --git a/src/gov/nist/core/Host.java b/jain-sip-ri/src/main/java/gov/nist/core/Host.java similarity index 100% rename from src/gov/nist/core/Host.java rename to jain-sip-ri/src/main/java/gov/nist/core/Host.java diff --git a/src/gov/nist/core/HostNameParser.java b/jain-sip-ri/src/main/java/gov/nist/core/HostNameParser.java similarity index 100% rename from src/gov/nist/core/HostNameParser.java rename to jain-sip-ri/src/main/java/gov/nist/core/HostNameParser.java diff --git a/src/gov/nist/core/HostPort.java b/jain-sip-ri/src/main/java/gov/nist/core/HostPort.java similarity index 100% rename from src/gov/nist/core/HostPort.java rename to jain-sip-ri/src/main/java/gov/nist/core/HostPort.java diff --git a/src/gov/nist/core/InternalErrorHandler.java b/jain-sip-ri/src/main/java/gov/nist/core/InternalErrorHandler.java similarity index 100% rename from src/gov/nist/core/InternalErrorHandler.java rename to jain-sip-ri/src/main/java/gov/nist/core/InternalErrorHandler.java diff --git a/src/gov/nist/core/LexerCore.java b/jain-sip-ri/src/main/java/gov/nist/core/LexerCore.java similarity index 100% rename from src/gov/nist/core/LexerCore.java rename to jain-sip-ri/src/main/java/gov/nist/core/LexerCore.java diff --git a/src/gov/nist/core/LogLevels.java b/jain-sip-ri/src/main/java/gov/nist/core/LogLevels.java similarity index 100% rename from src/gov/nist/core/LogLevels.java rename to jain-sip-ri/src/main/java/gov/nist/core/LogLevels.java diff --git a/src/gov/nist/core/LogWriter.java b/jain-sip-ri/src/main/java/gov/nist/core/LogWriter.java similarity index 100% rename from src/gov/nist/core/LogWriter.java rename to jain-sip-ri/src/main/java/gov/nist/core/LogWriter.java diff --git a/src/gov/nist/core/Match.java b/jain-sip-ri/src/main/java/gov/nist/core/Match.java similarity index 100% rename from src/gov/nist/core/Match.java rename to jain-sip-ri/src/main/java/gov/nist/core/Match.java diff --git a/src/gov/nist/core/MultiMap.java b/jain-sip-ri/src/main/java/gov/nist/core/MultiMap.java similarity index 100% rename from src/gov/nist/core/MultiMap.java rename to jain-sip-ri/src/main/java/gov/nist/core/MultiMap.java diff --git a/src/gov/nist/core/MultiValueMap.java b/jain-sip-ri/src/main/java/gov/nist/core/MultiValueMap.java similarity index 100% rename from src/gov/nist/core/MultiValueMap.java rename to jain-sip-ri/src/main/java/gov/nist/core/MultiValueMap.java diff --git a/src/gov/nist/core/MultiValueMapImpl.java b/jain-sip-ri/src/main/java/gov/nist/core/MultiValueMapImpl.java similarity index 100% rename from src/gov/nist/core/MultiValueMapImpl.java rename to jain-sip-ri/src/main/java/gov/nist/core/MultiValueMapImpl.java diff --git a/src/gov/nist/core/NameValue.java b/jain-sip-ri/src/main/java/gov/nist/core/NameValue.java similarity index 100% rename from src/gov/nist/core/NameValue.java rename to jain-sip-ri/src/main/java/gov/nist/core/NameValue.java diff --git a/src/gov/nist/core/NameValueList.java b/jain-sip-ri/src/main/java/gov/nist/core/NameValueList.java similarity index 100% rename from src/gov/nist/core/NameValueList.java rename to jain-sip-ri/src/main/java/gov/nist/core/NameValueList.java diff --git a/src/gov/nist/core/NamingThreadFactory.java b/jain-sip-ri/src/main/java/gov/nist/core/NamingThreadFactory.java similarity index 100% rename from src/gov/nist/core/NamingThreadFactory.java rename to jain-sip-ri/src/main/java/gov/nist/core/NamingThreadFactory.java diff --git a/src/gov/nist/core/PackageNames.java b/jain-sip-ri/src/main/java/gov/nist/core/PackageNames.java similarity index 100% rename from src/gov/nist/core/PackageNames.java rename to jain-sip-ri/src/main/java/gov/nist/core/PackageNames.java diff --git a/src/gov/nist/core/ParserCore.java b/jain-sip-ri/src/main/java/gov/nist/core/ParserCore.java similarity index 100% rename from src/gov/nist/core/ParserCore.java rename to jain-sip-ri/src/main/java/gov/nist/core/ParserCore.java diff --git a/src/gov/nist/core/Separators.java b/jain-sip-ri/src/main/java/gov/nist/core/Separators.java similarity index 100% rename from src/gov/nist/core/Separators.java rename to jain-sip-ri/src/main/java/gov/nist/core/Separators.java diff --git a/src/gov/nist/core/ServerLogger.java b/jain-sip-ri/src/main/java/gov/nist/core/ServerLogger.java similarity index 100% rename from src/gov/nist/core/ServerLogger.java rename to jain-sip-ri/src/main/java/gov/nist/core/ServerLogger.java diff --git a/src/gov/nist/core/StackLogger.java b/jain-sip-ri/src/main/java/gov/nist/core/StackLogger.java similarity index 100% rename from src/gov/nist/core/StackLogger.java rename to jain-sip-ri/src/main/java/gov/nist/core/StackLogger.java diff --git a/src/gov/nist/core/StringTokenizer.java b/jain-sip-ri/src/main/java/gov/nist/core/StringTokenizer.java similarity index 100% rename from src/gov/nist/core/StringTokenizer.java rename to jain-sip-ri/src/main/java/gov/nist/core/StringTokenizer.java diff --git a/src/gov/nist/core/ThreadAuditor.java b/jain-sip-ri/src/main/java/gov/nist/core/ThreadAuditor.java similarity index 100% rename from src/gov/nist/core/ThreadAuditor.java rename to jain-sip-ri/src/main/java/gov/nist/core/ThreadAuditor.java diff --git a/src/gov/nist/core/Token.java b/jain-sip-ri/src/main/java/gov/nist/core/Token.java similarity index 100% rename from src/gov/nist/core/Token.java rename to jain-sip-ri/src/main/java/gov/nist/core/Token.java diff --git a/src/gov/nist/core/net/AddressResolver.java b/jain-sip-ri/src/main/java/gov/nist/core/net/AddressResolver.java similarity index 100% rename from src/gov/nist/core/net/AddressResolver.java rename to jain-sip-ri/src/main/java/gov/nist/core/net/AddressResolver.java diff --git a/src/gov/nist/core/net/DefaultNetworkLayer.java b/jain-sip-ri/src/main/java/gov/nist/core/net/DefaultNetworkLayer.java similarity index 100% rename from src/gov/nist/core/net/DefaultNetworkLayer.java rename to jain-sip-ri/src/main/java/gov/nist/core/net/DefaultNetworkLayer.java diff --git a/src/gov/nist/core/net/DefaultSecurityManagerProvider.java b/jain-sip-ri/src/main/java/gov/nist/core/net/DefaultSecurityManagerProvider.java similarity index 100% rename from src/gov/nist/core/net/DefaultSecurityManagerProvider.java rename to jain-sip-ri/src/main/java/gov/nist/core/net/DefaultSecurityManagerProvider.java diff --git a/src/gov/nist/core/net/NetworkLayer.java b/jain-sip-ri/src/main/java/gov/nist/core/net/NetworkLayer.java similarity index 100% rename from src/gov/nist/core/net/NetworkLayer.java rename to jain-sip-ri/src/main/java/gov/nist/core/net/NetworkLayer.java diff --git a/src/gov/nist/core/net/SecurityManagerProvider.java b/jain-sip-ri/src/main/java/gov/nist/core/net/SecurityManagerProvider.java similarity index 100% rename from src/gov/nist/core/net/SecurityManagerProvider.java rename to jain-sip-ri/src/main/java/gov/nist/core/net/SecurityManagerProvider.java diff --git a/src/gov/nist/core/net/SslNetworkLayer.java b/jain-sip-ri/src/main/java/gov/nist/core/net/SslNetworkLayer.java similarity index 100% rename from src/gov/nist/core/net/SslNetworkLayer.java rename to jain-sip-ri/src/main/java/gov/nist/core/net/SslNetworkLayer.java diff --git a/src/gov/nist/core/net/package.html b/jain-sip-ri/src/main/java/gov/nist/core/net/package.html similarity index 100% rename from src/gov/nist/core/net/package.html rename to jain-sip-ri/src/main/java/gov/nist/core/net/package.html diff --git a/src/gov/nist/core/package.html b/jain-sip-ri/src/main/java/gov/nist/core/package.html similarity index 100% rename from src/gov/nist/core/package.html rename to jain-sip-ri/src/main/java/gov/nist/core/package.html diff --git a/src/gov/nist/javax/sdp/MediaDescriptionImpl.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/MediaDescriptionImpl.java similarity index 100% rename from src/gov/nist/javax/sdp/MediaDescriptionImpl.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/MediaDescriptionImpl.java diff --git a/src/gov/nist/javax/sdp/SdpEncoderImpl.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/SdpEncoderImpl.java similarity index 100% rename from src/gov/nist/javax/sdp/SdpEncoderImpl.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/SdpEncoderImpl.java diff --git a/src/gov/nist/javax/sdp/SessionDescriptionImpl.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/SessionDescriptionImpl.java similarity index 100% rename from src/gov/nist/javax/sdp/SessionDescriptionImpl.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/SessionDescriptionImpl.java diff --git a/src/gov/nist/javax/sdp/TimeDescriptionImpl.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/TimeDescriptionImpl.java similarity index 100% rename from src/gov/nist/javax/sdp/TimeDescriptionImpl.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/TimeDescriptionImpl.java diff --git a/src/gov/nist/javax/sdp/fields/AttributeField.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/AttributeField.java similarity index 100% rename from src/gov/nist/javax/sdp/fields/AttributeField.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/AttributeField.java diff --git a/src/gov/nist/javax/sdp/fields/BandwidthField.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/BandwidthField.java similarity index 100% rename from src/gov/nist/javax/sdp/fields/BandwidthField.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/BandwidthField.java diff --git a/src/gov/nist/javax/sdp/fields/ConnectionAddress.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/ConnectionAddress.java similarity index 100% rename from src/gov/nist/javax/sdp/fields/ConnectionAddress.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/ConnectionAddress.java diff --git a/src/gov/nist/javax/sdp/fields/ConnectionField.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/ConnectionField.java similarity index 100% rename from src/gov/nist/javax/sdp/fields/ConnectionField.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/ConnectionField.java diff --git a/src/gov/nist/javax/sdp/fields/Email.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/Email.java similarity index 100% rename from src/gov/nist/javax/sdp/fields/Email.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/Email.java diff --git a/src/gov/nist/javax/sdp/fields/EmailAddress.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/EmailAddress.java similarity index 100% rename from src/gov/nist/javax/sdp/fields/EmailAddress.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/EmailAddress.java diff --git a/src/gov/nist/javax/sdp/fields/EmailField.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/EmailField.java similarity index 100% rename from src/gov/nist/javax/sdp/fields/EmailField.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/EmailField.java diff --git a/src/gov/nist/javax/sdp/fields/Indentation.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/Indentation.java similarity index 100% rename from src/gov/nist/javax/sdp/fields/Indentation.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/Indentation.java diff --git a/src/gov/nist/javax/sdp/fields/InformationField.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/InformationField.java similarity index 100% rename from src/gov/nist/javax/sdp/fields/InformationField.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/InformationField.java diff --git a/src/gov/nist/javax/sdp/fields/KeyField.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/KeyField.java similarity index 100% rename from src/gov/nist/javax/sdp/fields/KeyField.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/KeyField.java diff --git a/src/gov/nist/javax/sdp/fields/MediaField.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/MediaField.java similarity index 100% rename from src/gov/nist/javax/sdp/fields/MediaField.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/MediaField.java diff --git a/src/gov/nist/javax/sdp/fields/OriginField.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/OriginField.java similarity index 100% rename from src/gov/nist/javax/sdp/fields/OriginField.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/OriginField.java diff --git a/src/gov/nist/javax/sdp/fields/PhoneField.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/PhoneField.java similarity index 100% rename from src/gov/nist/javax/sdp/fields/PhoneField.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/PhoneField.java diff --git a/src/gov/nist/javax/sdp/fields/PreconditionFields.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/PreconditionFields.java similarity index 100% rename from src/gov/nist/javax/sdp/fields/PreconditionFields.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/PreconditionFields.java diff --git a/src/gov/nist/javax/sdp/fields/ProtoVersionField.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/ProtoVersionField.java similarity index 100% rename from src/gov/nist/javax/sdp/fields/ProtoVersionField.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/ProtoVersionField.java diff --git a/src/gov/nist/javax/sdp/fields/RepeatField.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/RepeatField.java similarity index 100% rename from src/gov/nist/javax/sdp/fields/RepeatField.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/RepeatField.java diff --git a/src/gov/nist/javax/sdp/fields/SDPField.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/SDPField.java similarity index 100% rename from src/gov/nist/javax/sdp/fields/SDPField.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/SDPField.java diff --git a/src/gov/nist/javax/sdp/fields/SDPFieldList.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/SDPFieldList.java similarity index 100% rename from src/gov/nist/javax/sdp/fields/SDPFieldList.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/SDPFieldList.java diff --git a/src/gov/nist/javax/sdp/fields/SDPFieldNames.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/SDPFieldNames.java similarity index 100% rename from src/gov/nist/javax/sdp/fields/SDPFieldNames.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/SDPFieldNames.java diff --git a/src/gov/nist/javax/sdp/fields/SDPFormat.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/SDPFormat.java similarity index 100% rename from src/gov/nist/javax/sdp/fields/SDPFormat.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/SDPFormat.java diff --git a/src/gov/nist/javax/sdp/fields/SDPKeywords.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/SDPKeywords.java similarity index 100% rename from src/gov/nist/javax/sdp/fields/SDPKeywords.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/SDPKeywords.java diff --git a/src/gov/nist/javax/sdp/fields/SDPObject.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/SDPObject.java similarity index 100% rename from src/gov/nist/javax/sdp/fields/SDPObject.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/SDPObject.java diff --git a/src/gov/nist/javax/sdp/fields/SDPObjectList.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/SDPObjectList.java similarity index 100% rename from src/gov/nist/javax/sdp/fields/SDPObjectList.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/SDPObjectList.java diff --git a/src/gov/nist/javax/sdp/fields/SessionNameField.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/SessionNameField.java similarity index 100% rename from src/gov/nist/javax/sdp/fields/SessionNameField.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/SessionNameField.java diff --git a/src/gov/nist/javax/sdp/fields/TimeField.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/TimeField.java similarity index 100% rename from src/gov/nist/javax/sdp/fields/TimeField.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/TimeField.java diff --git a/src/gov/nist/javax/sdp/fields/TypedTime.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/TypedTime.java similarity index 100% rename from src/gov/nist/javax/sdp/fields/TypedTime.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/TypedTime.java diff --git a/src/gov/nist/javax/sdp/fields/URIField.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/URIField.java similarity index 100% rename from src/gov/nist/javax/sdp/fields/URIField.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/URIField.java diff --git a/src/gov/nist/javax/sdp/fields/ZoneAdjustment.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/ZoneAdjustment.java similarity index 100% rename from src/gov/nist/javax/sdp/fields/ZoneAdjustment.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/ZoneAdjustment.java diff --git a/src/gov/nist/javax/sdp/fields/ZoneField.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/ZoneField.java similarity index 100% rename from src/gov/nist/javax/sdp/fields/ZoneField.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/ZoneField.java diff --git a/src/gov/nist/javax/sdp/fields/package.html b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/package.html similarity index 100% rename from src/gov/nist/javax/sdp/fields/package.html rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/fields/package.html diff --git a/src/gov/nist/javax/sdp/package.html b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/package.html similarity index 100% rename from src/gov/nist/javax/sdp/package.html rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/package.html diff --git a/src/gov/nist/javax/sdp/parser/AttributeFieldParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/parser/AttributeFieldParser.java similarity index 100% rename from src/gov/nist/javax/sdp/parser/AttributeFieldParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/parser/AttributeFieldParser.java diff --git a/src/gov/nist/javax/sdp/parser/BandwidthFieldParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/parser/BandwidthFieldParser.java similarity index 100% rename from src/gov/nist/javax/sdp/parser/BandwidthFieldParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/parser/BandwidthFieldParser.java diff --git a/src/gov/nist/javax/sdp/parser/ConnectionFieldParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/parser/ConnectionFieldParser.java similarity index 100% rename from src/gov/nist/javax/sdp/parser/ConnectionFieldParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/parser/ConnectionFieldParser.java diff --git a/src/gov/nist/javax/sdp/parser/EmailFieldParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/parser/EmailFieldParser.java similarity index 100% rename from src/gov/nist/javax/sdp/parser/EmailFieldParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/parser/EmailFieldParser.java diff --git a/src/gov/nist/javax/sdp/parser/InformationFieldParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/parser/InformationFieldParser.java similarity index 100% rename from src/gov/nist/javax/sdp/parser/InformationFieldParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/parser/InformationFieldParser.java diff --git a/src/gov/nist/javax/sdp/parser/KeyFieldParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/parser/KeyFieldParser.java similarity index 100% rename from src/gov/nist/javax/sdp/parser/KeyFieldParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/parser/KeyFieldParser.java diff --git a/src/gov/nist/javax/sdp/parser/Lexer.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/parser/Lexer.java similarity index 100% rename from src/gov/nist/javax/sdp/parser/Lexer.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/parser/Lexer.java diff --git a/src/gov/nist/javax/sdp/parser/MediaFieldParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/parser/MediaFieldParser.java similarity index 100% rename from src/gov/nist/javax/sdp/parser/MediaFieldParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/parser/MediaFieldParser.java diff --git a/src/gov/nist/javax/sdp/parser/OriginFieldParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/parser/OriginFieldParser.java similarity index 100% rename from src/gov/nist/javax/sdp/parser/OriginFieldParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/parser/OriginFieldParser.java diff --git a/src/gov/nist/javax/sdp/parser/ParserFactory.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/parser/ParserFactory.java similarity index 100% rename from src/gov/nist/javax/sdp/parser/ParserFactory.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/parser/ParserFactory.java diff --git a/src/gov/nist/javax/sdp/parser/PhoneFieldParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/parser/PhoneFieldParser.java similarity index 100% rename from src/gov/nist/javax/sdp/parser/PhoneFieldParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/parser/PhoneFieldParser.java diff --git a/src/gov/nist/javax/sdp/parser/ProtoVersionFieldParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/parser/ProtoVersionFieldParser.java similarity index 100% rename from src/gov/nist/javax/sdp/parser/ProtoVersionFieldParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/parser/ProtoVersionFieldParser.java diff --git a/src/gov/nist/javax/sdp/parser/RepeatFieldParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/parser/RepeatFieldParser.java similarity index 100% rename from src/gov/nist/javax/sdp/parser/RepeatFieldParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/parser/RepeatFieldParser.java diff --git a/src/gov/nist/javax/sdp/parser/SDPAnnounceParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/parser/SDPAnnounceParser.java similarity index 100% rename from src/gov/nist/javax/sdp/parser/SDPAnnounceParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/parser/SDPAnnounceParser.java diff --git a/src/gov/nist/javax/sdp/parser/SDPParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/parser/SDPParser.java similarity index 100% rename from src/gov/nist/javax/sdp/parser/SDPParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/parser/SDPParser.java diff --git a/src/gov/nist/javax/sdp/parser/SessionNameFieldParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/parser/SessionNameFieldParser.java similarity index 100% rename from src/gov/nist/javax/sdp/parser/SessionNameFieldParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/parser/SessionNameFieldParser.java diff --git a/src/gov/nist/javax/sdp/parser/TimeFieldParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/parser/TimeFieldParser.java similarity index 100% rename from src/gov/nist/javax/sdp/parser/TimeFieldParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/parser/TimeFieldParser.java diff --git a/src/gov/nist/javax/sdp/parser/URIFieldParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/parser/URIFieldParser.java similarity index 100% rename from src/gov/nist/javax/sdp/parser/URIFieldParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/parser/URIFieldParser.java diff --git a/src/gov/nist/javax/sdp/parser/ZoneFieldParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sdp/parser/ZoneFieldParser.java similarity index 100% rename from src/gov/nist/javax/sdp/parser/ZoneFieldParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sdp/parser/ZoneFieldParser.java diff --git a/src/gov/nist/javax/sip/ClientTransactionExt.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/ClientTransactionExt.java similarity index 100% rename from src/gov/nist/javax/sip/ClientTransactionExt.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/ClientTransactionExt.java diff --git a/src/gov/nist/javax/sip/DefaultAddressResolver.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/DefaultAddressResolver.java similarity index 100% rename from src/gov/nist/javax/sip/DefaultAddressResolver.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/DefaultAddressResolver.java diff --git a/src/gov/nist/javax/sip/DialogExt.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/DialogExt.java similarity index 100% rename from src/gov/nist/javax/sip/DialogExt.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/DialogExt.java diff --git a/src/gov/nist/javax/sip/DialogFilter.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/DialogFilter.java similarity index 100% rename from src/gov/nist/javax/sip/DialogFilter.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/DialogFilter.java diff --git a/src/gov/nist/javax/sip/DialogTimeoutEvent.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/DialogTimeoutEvent.java similarity index 100% rename from src/gov/nist/javax/sip/DialogTimeoutEvent.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/DialogTimeoutEvent.java diff --git a/src/gov/nist/javax/sip/EventScanner.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/EventScanner.java similarity index 100% rename from src/gov/nist/javax/sip/EventScanner.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/EventScanner.java diff --git a/src/gov/nist/javax/sip/EventWrapper.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/EventWrapper.java similarity index 100% rename from src/gov/nist/javax/sip/EventWrapper.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/EventWrapper.java diff --git a/src/gov/nist/javax/sip/IOExceptionEventExt.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/IOExceptionEventExt.java similarity index 100% rename from src/gov/nist/javax/sip/IOExceptionEventExt.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/IOExceptionEventExt.java diff --git a/src/gov/nist/javax/sip/ListeningPointExt.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/ListeningPointExt.java similarity index 100% rename from src/gov/nist/javax/sip/ListeningPointExt.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/ListeningPointExt.java diff --git a/src/gov/nist/javax/sip/ListeningPointImpl.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/ListeningPointImpl.java similarity index 100% rename from src/gov/nist/javax/sip/ListeningPointImpl.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/ListeningPointImpl.java diff --git a/src/gov/nist/javax/sip/LogRecord.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/LogRecord.java similarity index 100% rename from src/gov/nist/javax/sip/LogRecord.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/LogRecord.java diff --git a/src/gov/nist/javax/sip/LogRecordFactory.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/LogRecordFactory.java similarity index 100% rename from src/gov/nist/javax/sip/LogRecordFactory.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/LogRecordFactory.java diff --git a/src/gov/nist/javax/sip/MergedSystemProperties.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/MergedSystemProperties.java similarity index 100% rename from src/gov/nist/javax/sip/MergedSystemProperties.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/MergedSystemProperties.java diff --git a/src/gov/nist/javax/sip/NistSipMessageFactoryImpl.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/NistSipMessageFactoryImpl.java similarity index 100% rename from src/gov/nist/javax/sip/NistSipMessageFactoryImpl.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/NistSipMessageFactoryImpl.java diff --git a/src/gov/nist/javax/sip/RequestEventExt.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/RequestEventExt.java similarity index 100% rename from src/gov/nist/javax/sip/RequestEventExt.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/RequestEventExt.java diff --git a/src/gov/nist/javax/sip/ResponseEventExt.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/ResponseEventExt.java similarity index 100% rename from src/gov/nist/javax/sip/ResponseEventExt.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/ResponseEventExt.java diff --git a/src/gov/nist/javax/sip/SIPConstants.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/SIPConstants.java similarity index 100% rename from src/gov/nist/javax/sip/SIPConstants.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/SIPConstants.java diff --git a/src/gov/nist/javax/sip/ServerTransactionExt.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/ServerTransactionExt.java similarity index 100% rename from src/gov/nist/javax/sip/ServerTransactionExt.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/ServerTransactionExt.java diff --git a/src/gov/nist/javax/sip/SipListenerExt.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/SipListenerExt.java similarity index 100% rename from src/gov/nist/javax/sip/SipListenerExt.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/SipListenerExt.java diff --git a/src/gov/nist/javax/sip/SipProviderExt.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/SipProviderExt.java similarity index 100% rename from src/gov/nist/javax/sip/SipProviderExt.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/SipProviderExt.java diff --git a/src/gov/nist/javax/sip/SipProviderImpl.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/SipProviderImpl.java similarity index 100% rename from src/gov/nist/javax/sip/SipProviderImpl.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/SipProviderImpl.java diff --git a/src/gov/nist/javax/sip/SipStackExt.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/SipStackExt.java similarity index 100% rename from src/gov/nist/javax/sip/SipStackExt.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/SipStackExt.java diff --git a/src/gov/nist/javax/sip/SipStackImpl.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/SipStackImpl.java similarity index 100% rename from src/gov/nist/javax/sip/SipStackImpl.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/SipStackImpl.java diff --git a/src/gov/nist/javax/sip/TlsSecurityPolicy.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/TlsSecurityPolicy.java similarity index 100% rename from src/gov/nist/javax/sip/TlsSecurityPolicy.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/TlsSecurityPolicy.java diff --git a/src/gov/nist/javax/sip/TransactionExt.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/TransactionExt.java similarity index 100% rename from src/gov/nist/javax/sip/TransactionExt.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/TransactionExt.java diff --git a/src/gov/nist/javax/sip/Utils.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/Utils.java similarity index 100% rename from src/gov/nist/javax/sip/Utils.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/Utils.java diff --git a/src/gov/nist/javax/sip/UtilsExt.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/UtilsExt.java similarity index 100% rename from src/gov/nist/javax/sip/UtilsExt.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/UtilsExt.java diff --git a/src/gov/nist/javax/sip/address/AddressFactoryEx.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/address/AddressFactoryEx.java similarity index 100% rename from src/gov/nist/javax/sip/address/AddressFactoryEx.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/address/AddressFactoryEx.java diff --git a/src/gov/nist/javax/sip/address/AddressFactoryImpl.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/address/AddressFactoryImpl.java similarity index 100% rename from src/gov/nist/javax/sip/address/AddressFactoryImpl.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/address/AddressFactoryImpl.java diff --git a/src/gov/nist/javax/sip/address/AddressImpl.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/address/AddressImpl.java similarity index 100% rename from src/gov/nist/javax/sip/address/AddressImpl.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/address/AddressImpl.java diff --git a/src/gov/nist/javax/sip/address/Authority.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/address/Authority.java similarity index 100% rename from src/gov/nist/javax/sip/address/Authority.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/address/Authority.java diff --git a/src/gov/nist/javax/sip/address/GenericURI.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/address/GenericURI.java similarity index 100% rename from src/gov/nist/javax/sip/address/GenericURI.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/address/GenericURI.java diff --git a/src/gov/nist/javax/sip/address/NetObject.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/address/NetObject.java similarity index 100% rename from src/gov/nist/javax/sip/address/NetObject.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/address/NetObject.java diff --git a/src/gov/nist/javax/sip/address/NetObjectList.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/address/NetObjectList.java similarity index 100% rename from src/gov/nist/javax/sip/address/NetObjectList.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/address/NetObjectList.java diff --git a/src/gov/nist/javax/sip/address/ParameterNames.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/address/ParameterNames.java similarity index 100% rename from src/gov/nist/javax/sip/address/ParameterNames.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/address/ParameterNames.java diff --git a/src/gov/nist/javax/sip/address/RouterExt.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/address/RouterExt.java similarity index 100% rename from src/gov/nist/javax/sip/address/RouterExt.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/address/RouterExt.java diff --git a/src/gov/nist/javax/sip/address/SipURIExt.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/address/SipURIExt.java similarity index 100% rename from src/gov/nist/javax/sip/address/SipURIExt.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/address/SipURIExt.java diff --git a/src/gov/nist/javax/sip/address/SipUri.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/address/SipUri.java similarity index 100% rename from src/gov/nist/javax/sip/address/SipUri.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/address/SipUri.java diff --git a/src/gov/nist/javax/sip/address/TelURLImpl.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/address/TelURLImpl.java similarity index 100% rename from src/gov/nist/javax/sip/address/TelURLImpl.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/address/TelURLImpl.java diff --git a/src/gov/nist/javax/sip/address/TelephoneNumber.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/address/TelephoneNumber.java similarity index 100% rename from src/gov/nist/javax/sip/address/TelephoneNumber.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/address/TelephoneNumber.java diff --git a/src/gov/nist/javax/sip/address/UriDecoder.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/address/UriDecoder.java similarity index 100% rename from src/gov/nist/javax/sip/address/UriDecoder.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/address/UriDecoder.java diff --git a/src/gov/nist/javax/sip/address/UserInfo.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/address/UserInfo.java similarity index 100% rename from src/gov/nist/javax/sip/address/UserInfo.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/address/UserInfo.java diff --git a/src/gov/nist/javax/sip/address/package.html b/jain-sip-ri/src/main/java/gov/nist/javax/sip/address/package.html similarity index 100% rename from src/gov/nist/javax/sip/address/package.html rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/address/package.html diff --git a/src/gov/nist/javax/sip/clientauthutils/AccountManager.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/clientauthutils/AccountManager.java similarity index 100% rename from src/gov/nist/javax/sip/clientauthutils/AccountManager.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/clientauthutils/AccountManager.java diff --git a/src/gov/nist/javax/sip/clientauthutils/AuthenticationHelper.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/clientauthutils/AuthenticationHelper.java similarity index 100% rename from src/gov/nist/javax/sip/clientauthutils/AuthenticationHelper.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/clientauthutils/AuthenticationHelper.java diff --git a/src/gov/nist/javax/sip/clientauthutils/AuthenticationHelperImpl.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/clientauthutils/AuthenticationHelperImpl.java similarity index 100% rename from src/gov/nist/javax/sip/clientauthutils/AuthenticationHelperImpl.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/clientauthutils/AuthenticationHelperImpl.java diff --git a/src/gov/nist/javax/sip/clientauthutils/CredentialsCache.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/clientauthutils/CredentialsCache.java similarity index 100% rename from src/gov/nist/javax/sip/clientauthutils/CredentialsCache.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/clientauthutils/CredentialsCache.java diff --git a/src/gov/nist/javax/sip/clientauthutils/DigestServerAuthenticationHelper.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/clientauthutils/DigestServerAuthenticationHelper.java similarity index 100% rename from src/gov/nist/javax/sip/clientauthutils/DigestServerAuthenticationHelper.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/clientauthutils/DigestServerAuthenticationHelper.java diff --git a/src/gov/nist/javax/sip/clientauthutils/MessageDigestAlgorithm.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/clientauthutils/MessageDigestAlgorithm.java similarity index 100% rename from src/gov/nist/javax/sip/clientauthutils/MessageDigestAlgorithm.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/clientauthutils/MessageDigestAlgorithm.java diff --git a/src/gov/nist/javax/sip/clientauthutils/SecureAccountManager.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/clientauthutils/SecureAccountManager.java similarity index 100% rename from src/gov/nist/javax/sip/clientauthutils/SecureAccountManager.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/clientauthutils/SecureAccountManager.java diff --git a/src/gov/nist/javax/sip/clientauthutils/UserCredentialHash.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/clientauthutils/UserCredentialHash.java similarity index 100% rename from src/gov/nist/javax/sip/clientauthutils/UserCredentialHash.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/clientauthutils/UserCredentialHash.java diff --git a/src/gov/nist/javax/sip/clientauthutils/UserCredentials.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/clientauthutils/UserCredentials.java similarity index 100% rename from src/gov/nist/javax/sip/clientauthutils/UserCredentials.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/clientauthutils/UserCredentials.java diff --git a/src/gov/nist/javax/sip/clientauthutils/package.html b/jain-sip-ri/src/main/java/gov/nist/javax/sip/clientauthutils/package.html similarity index 100% rename from src/gov/nist/javax/sip/clientauthutils/package.html rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/clientauthutils/package.html diff --git a/src/gov/nist/javax/sip/header/Accept.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/Accept.java similarity index 100% rename from src/gov/nist/javax/sip/header/Accept.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/Accept.java diff --git a/src/gov/nist/javax/sip/header/AcceptEncoding.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/AcceptEncoding.java similarity index 100% rename from src/gov/nist/javax/sip/header/AcceptEncoding.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/AcceptEncoding.java diff --git a/src/gov/nist/javax/sip/header/AcceptEncodingList.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/AcceptEncodingList.java similarity index 100% rename from src/gov/nist/javax/sip/header/AcceptEncodingList.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/AcceptEncodingList.java diff --git a/src/gov/nist/javax/sip/header/AcceptLanguage.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/AcceptLanguage.java similarity index 100% rename from src/gov/nist/javax/sip/header/AcceptLanguage.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/AcceptLanguage.java diff --git a/src/gov/nist/javax/sip/header/AcceptLanguageList.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/AcceptLanguageList.java similarity index 100% rename from src/gov/nist/javax/sip/header/AcceptLanguageList.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/AcceptLanguageList.java diff --git a/src/gov/nist/javax/sip/header/AcceptList.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/AcceptList.java similarity index 100% rename from src/gov/nist/javax/sip/header/AcceptList.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/AcceptList.java diff --git a/src/gov/nist/javax/sip/header/AddressParameters.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/AddressParameters.java similarity index 100% rename from src/gov/nist/javax/sip/header/AddressParameters.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/AddressParameters.java diff --git a/src/gov/nist/javax/sip/header/AddressParametersHeader.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/AddressParametersHeader.java similarity index 100% rename from src/gov/nist/javax/sip/header/AddressParametersHeader.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/AddressParametersHeader.java diff --git a/src/gov/nist/javax/sip/header/AlertInfo.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/AlertInfo.java similarity index 100% rename from src/gov/nist/javax/sip/header/AlertInfo.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/AlertInfo.java diff --git a/src/gov/nist/javax/sip/header/AlertInfoList.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/AlertInfoList.java similarity index 100% rename from src/gov/nist/javax/sip/header/AlertInfoList.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/AlertInfoList.java diff --git a/src/gov/nist/javax/sip/header/Allow.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/Allow.java similarity index 100% rename from src/gov/nist/javax/sip/header/Allow.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/Allow.java diff --git a/src/gov/nist/javax/sip/header/AllowEvents.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/AllowEvents.java similarity index 100% rename from src/gov/nist/javax/sip/header/AllowEvents.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/AllowEvents.java diff --git a/src/gov/nist/javax/sip/header/AllowEventsList.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/AllowEventsList.java similarity index 100% rename from src/gov/nist/javax/sip/header/AllowEventsList.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/AllowEventsList.java diff --git a/src/gov/nist/javax/sip/header/AllowList.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/AllowList.java similarity index 100% rename from src/gov/nist/javax/sip/header/AllowList.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/AllowList.java diff --git a/src/gov/nist/javax/sip/header/AuthenticationHeader.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/AuthenticationHeader.java similarity index 100% rename from src/gov/nist/javax/sip/header/AuthenticationHeader.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/AuthenticationHeader.java diff --git a/src/gov/nist/javax/sip/header/AuthenticationInfo.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/AuthenticationInfo.java similarity index 100% rename from src/gov/nist/javax/sip/header/AuthenticationInfo.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/AuthenticationInfo.java diff --git a/src/gov/nist/javax/sip/header/AuthenticationInfoList.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/AuthenticationInfoList.java similarity index 100% rename from src/gov/nist/javax/sip/header/AuthenticationInfoList.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/AuthenticationInfoList.java diff --git a/src/gov/nist/javax/sip/header/Authorization.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/Authorization.java similarity index 100% rename from src/gov/nist/javax/sip/header/Authorization.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/Authorization.java diff --git a/src/gov/nist/javax/sip/header/AuthorizationList.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/AuthorizationList.java similarity index 100% rename from src/gov/nist/javax/sip/header/AuthorizationList.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/AuthorizationList.java diff --git a/src/gov/nist/javax/sip/header/CSeq.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/CSeq.java similarity index 100% rename from src/gov/nist/javax/sip/header/CSeq.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/CSeq.java diff --git a/src/gov/nist/javax/sip/header/CallID.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/CallID.java similarity index 100% rename from src/gov/nist/javax/sip/header/CallID.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/CallID.java diff --git a/src/gov/nist/javax/sip/header/CallIdentifier.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/CallIdentifier.java similarity index 100% rename from src/gov/nist/javax/sip/header/CallIdentifier.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/CallIdentifier.java diff --git a/src/gov/nist/javax/sip/header/CallInfo.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/CallInfo.java similarity index 100% rename from src/gov/nist/javax/sip/header/CallInfo.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/CallInfo.java diff --git a/src/gov/nist/javax/sip/header/CallInfoList.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/CallInfoList.java similarity index 100% rename from src/gov/nist/javax/sip/header/CallInfoList.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/CallInfoList.java diff --git a/src/gov/nist/javax/sip/header/Challenge.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/Challenge.java similarity index 100% rename from src/gov/nist/javax/sip/header/Challenge.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/Challenge.java diff --git a/src/gov/nist/javax/sip/header/Contact.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/Contact.java similarity index 100% rename from src/gov/nist/javax/sip/header/Contact.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/Contact.java diff --git a/src/gov/nist/javax/sip/header/ContactList.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ContactList.java similarity index 100% rename from src/gov/nist/javax/sip/header/ContactList.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ContactList.java diff --git a/src/gov/nist/javax/sip/header/ContentDisposition.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ContentDisposition.java similarity index 100% rename from src/gov/nist/javax/sip/header/ContentDisposition.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ContentDisposition.java diff --git a/src/gov/nist/javax/sip/header/ContentEncoding.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ContentEncoding.java similarity index 100% rename from src/gov/nist/javax/sip/header/ContentEncoding.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ContentEncoding.java diff --git a/src/gov/nist/javax/sip/header/ContentEncodingList.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ContentEncodingList.java similarity index 100% rename from src/gov/nist/javax/sip/header/ContentEncodingList.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ContentEncodingList.java diff --git a/src/gov/nist/javax/sip/header/ContentLanguage.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ContentLanguage.java similarity index 100% rename from src/gov/nist/javax/sip/header/ContentLanguage.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ContentLanguage.java diff --git a/src/gov/nist/javax/sip/header/ContentLanguageList.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ContentLanguageList.java similarity index 100% rename from src/gov/nist/javax/sip/header/ContentLanguageList.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ContentLanguageList.java diff --git a/src/gov/nist/javax/sip/header/ContentLength.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ContentLength.java similarity index 100% rename from src/gov/nist/javax/sip/header/ContentLength.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ContentLength.java diff --git a/src/gov/nist/javax/sip/header/ContentType.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ContentType.java similarity index 100% rename from src/gov/nist/javax/sip/header/ContentType.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ContentType.java diff --git a/src/gov/nist/javax/sip/header/Credentials.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/Credentials.java similarity index 100% rename from src/gov/nist/javax/sip/header/Credentials.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/Credentials.java diff --git a/src/gov/nist/javax/sip/header/ErrorInfo.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ErrorInfo.java similarity index 100% rename from src/gov/nist/javax/sip/header/ErrorInfo.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ErrorInfo.java diff --git a/src/gov/nist/javax/sip/header/ErrorInfoList.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ErrorInfoList.java similarity index 100% rename from src/gov/nist/javax/sip/header/ErrorInfoList.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ErrorInfoList.java diff --git a/src/gov/nist/javax/sip/header/Event.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/Event.java similarity index 100% rename from src/gov/nist/javax/sip/header/Event.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/Event.java diff --git a/src/gov/nist/javax/sip/header/Expires.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/Expires.java similarity index 100% rename from src/gov/nist/javax/sip/header/Expires.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/Expires.java diff --git a/src/gov/nist/javax/sip/header/ExtensionHeaderImpl.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ExtensionHeaderImpl.java similarity index 100% rename from src/gov/nist/javax/sip/header/ExtensionHeaderImpl.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ExtensionHeaderImpl.java diff --git a/src/gov/nist/javax/sip/header/ExtensionHeaderList.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ExtensionHeaderList.java similarity index 100% rename from src/gov/nist/javax/sip/header/ExtensionHeaderList.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ExtensionHeaderList.java diff --git a/src/gov/nist/javax/sip/header/From.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/From.java similarity index 100% rename from src/gov/nist/javax/sip/header/From.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/From.java diff --git a/src/gov/nist/javax/sip/header/HeaderExt.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/HeaderExt.java similarity index 100% rename from src/gov/nist/javax/sip/header/HeaderExt.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/HeaderExt.java diff --git a/src/gov/nist/javax/sip/header/HeaderFactoryExt.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/HeaderFactoryExt.java similarity index 100% rename from src/gov/nist/javax/sip/header/HeaderFactoryExt.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/HeaderFactoryExt.java diff --git a/src/gov/nist/javax/sip/header/HeaderFactoryImpl.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/HeaderFactoryImpl.java similarity index 100% rename from src/gov/nist/javax/sip/header/HeaderFactoryImpl.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/HeaderFactoryImpl.java diff --git a/src/gov/nist/javax/sip/header/InReplyTo.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/InReplyTo.java similarity index 100% rename from src/gov/nist/javax/sip/header/InReplyTo.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/InReplyTo.java diff --git a/src/gov/nist/javax/sip/header/InReplyToList.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/InReplyToList.java similarity index 100% rename from src/gov/nist/javax/sip/header/InReplyToList.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/InReplyToList.java diff --git a/src/gov/nist/javax/sip/header/Indentation.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/Indentation.java similarity index 100% rename from src/gov/nist/javax/sip/header/Indentation.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/Indentation.java diff --git a/src/gov/nist/javax/sip/header/MaxForwards.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/MaxForwards.java similarity index 100% rename from src/gov/nist/javax/sip/header/MaxForwards.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/MaxForwards.java diff --git a/src/gov/nist/javax/sip/header/MediaRange.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/MediaRange.java similarity index 100% rename from src/gov/nist/javax/sip/header/MediaRange.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/MediaRange.java diff --git a/src/gov/nist/javax/sip/header/MimeVersion.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/MimeVersion.java similarity index 100% rename from src/gov/nist/javax/sip/header/MimeVersion.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/MimeVersion.java diff --git a/src/gov/nist/javax/sip/header/MinExpires.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/MinExpires.java similarity index 100% rename from src/gov/nist/javax/sip/header/MinExpires.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/MinExpires.java diff --git a/src/gov/nist/javax/sip/header/NameMap.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/NameMap.java similarity index 100% rename from src/gov/nist/javax/sip/header/NameMap.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/NameMap.java diff --git a/src/gov/nist/javax/sip/header/Organization.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/Organization.java similarity index 100% rename from src/gov/nist/javax/sip/header/Organization.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/Organization.java diff --git a/src/gov/nist/javax/sip/header/ParameterNames.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ParameterNames.java similarity index 100% rename from src/gov/nist/javax/sip/header/ParameterNames.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ParameterNames.java diff --git a/src/gov/nist/javax/sip/header/ParametersExt.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ParametersExt.java similarity index 100% rename from src/gov/nist/javax/sip/header/ParametersExt.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ParametersExt.java diff --git a/src/gov/nist/javax/sip/header/ParametersHeader.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ParametersHeader.java similarity index 100% rename from src/gov/nist/javax/sip/header/ParametersHeader.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ParametersHeader.java diff --git a/src/gov/nist/javax/sip/header/Priority.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/Priority.java similarity index 100% rename from src/gov/nist/javax/sip/header/Priority.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/Priority.java diff --git a/src/gov/nist/javax/sip/header/Protocol.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/Protocol.java similarity index 100% rename from src/gov/nist/javax/sip/header/Protocol.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/Protocol.java diff --git a/src/gov/nist/javax/sip/header/ProxyAuthenticate.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ProxyAuthenticate.java similarity index 100% rename from src/gov/nist/javax/sip/header/ProxyAuthenticate.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ProxyAuthenticate.java diff --git a/src/gov/nist/javax/sip/header/ProxyAuthenticateList.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ProxyAuthenticateList.java similarity index 100% rename from src/gov/nist/javax/sip/header/ProxyAuthenticateList.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ProxyAuthenticateList.java diff --git a/src/gov/nist/javax/sip/header/ProxyAuthorization.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ProxyAuthorization.java similarity index 100% rename from src/gov/nist/javax/sip/header/ProxyAuthorization.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ProxyAuthorization.java diff --git a/src/gov/nist/javax/sip/header/ProxyAuthorizationList.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ProxyAuthorizationList.java similarity index 100% rename from src/gov/nist/javax/sip/header/ProxyAuthorizationList.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ProxyAuthorizationList.java diff --git a/src/gov/nist/javax/sip/header/ProxyRequire.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ProxyRequire.java similarity index 100% rename from src/gov/nist/javax/sip/header/ProxyRequire.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ProxyRequire.java diff --git a/src/gov/nist/javax/sip/header/ProxyRequireList.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ProxyRequireList.java similarity index 100% rename from src/gov/nist/javax/sip/header/ProxyRequireList.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ProxyRequireList.java diff --git a/src/gov/nist/javax/sip/header/RAck.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/RAck.java similarity index 100% rename from src/gov/nist/javax/sip/header/RAck.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/RAck.java diff --git a/src/gov/nist/javax/sip/header/RSeq.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/RSeq.java similarity index 100% rename from src/gov/nist/javax/sip/header/RSeq.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/RSeq.java diff --git a/src/gov/nist/javax/sip/header/Reason.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/Reason.java similarity index 100% rename from src/gov/nist/javax/sip/header/Reason.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/Reason.java diff --git a/src/gov/nist/javax/sip/header/ReasonList.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ReasonList.java similarity index 100% rename from src/gov/nist/javax/sip/header/ReasonList.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ReasonList.java diff --git a/src/gov/nist/javax/sip/header/RecordRoute.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/RecordRoute.java similarity index 100% rename from src/gov/nist/javax/sip/header/RecordRoute.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/RecordRoute.java diff --git a/src/gov/nist/javax/sip/header/RecordRouteList.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/RecordRouteList.java similarity index 100% rename from src/gov/nist/javax/sip/header/RecordRouteList.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/RecordRouteList.java diff --git a/src/gov/nist/javax/sip/header/ReferTo.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ReferTo.java similarity index 100% rename from src/gov/nist/javax/sip/header/ReferTo.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ReferTo.java diff --git a/src/gov/nist/javax/sip/header/ReplyTo.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ReplyTo.java similarity index 100% rename from src/gov/nist/javax/sip/header/ReplyTo.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ReplyTo.java diff --git a/src/gov/nist/javax/sip/header/RequestLine.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/RequestLine.java similarity index 100% rename from src/gov/nist/javax/sip/header/RequestLine.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/RequestLine.java diff --git a/src/gov/nist/javax/sip/header/Require.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/Require.java similarity index 100% rename from src/gov/nist/javax/sip/header/Require.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/Require.java diff --git a/src/gov/nist/javax/sip/header/RequireList.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/RequireList.java similarity index 100% rename from src/gov/nist/javax/sip/header/RequireList.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/RequireList.java diff --git a/src/gov/nist/javax/sip/header/RetryAfter.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/RetryAfter.java similarity index 100% rename from src/gov/nist/javax/sip/header/RetryAfter.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/RetryAfter.java diff --git a/src/gov/nist/javax/sip/header/Route.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/Route.java similarity index 100% rename from src/gov/nist/javax/sip/header/Route.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/Route.java diff --git a/src/gov/nist/javax/sip/header/RouteList.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/RouteList.java similarity index 100% rename from src/gov/nist/javax/sip/header/RouteList.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/RouteList.java diff --git a/src/gov/nist/javax/sip/header/SIPDate.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/SIPDate.java similarity index 100% rename from src/gov/nist/javax/sip/header/SIPDate.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/SIPDate.java diff --git a/src/gov/nist/javax/sip/header/SIPDateHeader.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/SIPDateHeader.java similarity index 100% rename from src/gov/nist/javax/sip/header/SIPDateHeader.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/SIPDateHeader.java diff --git a/src/gov/nist/javax/sip/header/SIPETag.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/SIPETag.java similarity index 100% rename from src/gov/nist/javax/sip/header/SIPETag.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/SIPETag.java diff --git a/src/gov/nist/javax/sip/header/SIPHeader.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/SIPHeader.java similarity index 100% rename from src/gov/nist/javax/sip/header/SIPHeader.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/SIPHeader.java diff --git a/src/gov/nist/javax/sip/header/SIPHeaderList.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/SIPHeaderList.java similarity index 100% rename from src/gov/nist/javax/sip/header/SIPHeaderList.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/SIPHeaderList.java diff --git a/src/gov/nist/javax/sip/header/SIPHeaderNames.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/SIPHeaderNames.java similarity index 100% rename from src/gov/nist/javax/sip/header/SIPHeaderNames.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/SIPHeaderNames.java diff --git a/src/gov/nist/javax/sip/header/SIPHeaderNamesCache.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/SIPHeaderNamesCache.java similarity index 100% rename from src/gov/nist/javax/sip/header/SIPHeaderNamesCache.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/SIPHeaderNamesCache.java diff --git a/src/gov/nist/javax/sip/header/SIPIfMatch.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/SIPIfMatch.java similarity index 100% rename from src/gov/nist/javax/sip/header/SIPIfMatch.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/SIPIfMatch.java diff --git a/src/gov/nist/javax/sip/header/SIPObject.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/SIPObject.java similarity index 100% rename from src/gov/nist/javax/sip/header/SIPObject.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/SIPObject.java diff --git a/src/gov/nist/javax/sip/header/SIPObjectList.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/SIPObjectList.java similarity index 100% rename from src/gov/nist/javax/sip/header/SIPObjectList.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/SIPObjectList.java diff --git a/src/gov/nist/javax/sip/header/Server.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/Server.java similarity index 100% rename from src/gov/nist/javax/sip/header/Server.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/Server.java diff --git a/src/gov/nist/javax/sip/header/SipRequestLine.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/SipRequestLine.java similarity index 100% rename from src/gov/nist/javax/sip/header/SipRequestLine.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/SipRequestLine.java diff --git a/src/gov/nist/javax/sip/header/SipStatusLine.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/SipStatusLine.java similarity index 100% rename from src/gov/nist/javax/sip/header/SipStatusLine.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/SipStatusLine.java diff --git a/src/gov/nist/javax/sip/header/StatusLine.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/StatusLine.java similarity index 100% rename from src/gov/nist/javax/sip/header/StatusLine.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/StatusLine.java diff --git a/src/gov/nist/javax/sip/header/Subject.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/Subject.java similarity index 100% rename from src/gov/nist/javax/sip/header/Subject.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/Subject.java diff --git a/src/gov/nist/javax/sip/header/SubscriptionState.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/SubscriptionState.java similarity index 100% rename from src/gov/nist/javax/sip/header/SubscriptionState.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/SubscriptionState.java diff --git a/src/gov/nist/javax/sip/header/Supported.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/Supported.java similarity index 100% rename from src/gov/nist/javax/sip/header/Supported.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/Supported.java diff --git a/src/gov/nist/javax/sip/header/SupportedList.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/SupportedList.java similarity index 100% rename from src/gov/nist/javax/sip/header/SupportedList.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/SupportedList.java diff --git a/src/gov/nist/javax/sip/header/TimeStamp.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/TimeStamp.java similarity index 100% rename from src/gov/nist/javax/sip/header/TimeStamp.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/TimeStamp.java diff --git a/src/gov/nist/javax/sip/header/To.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/To.java similarity index 100% rename from src/gov/nist/javax/sip/header/To.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/To.java diff --git a/src/gov/nist/javax/sip/header/Unsupported.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/Unsupported.java similarity index 100% rename from src/gov/nist/javax/sip/header/Unsupported.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/Unsupported.java diff --git a/src/gov/nist/javax/sip/header/UnsupportedList.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/UnsupportedList.java similarity index 100% rename from src/gov/nist/javax/sip/header/UnsupportedList.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/UnsupportedList.java diff --git a/src/gov/nist/javax/sip/header/UserAgent.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/UserAgent.java similarity index 100% rename from src/gov/nist/javax/sip/header/UserAgent.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/UserAgent.java diff --git a/src/gov/nist/javax/sip/header/Via.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/Via.java similarity index 100% rename from src/gov/nist/javax/sip/header/Via.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/Via.java diff --git a/src/gov/nist/javax/sip/header/ViaHeaderExt.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ViaHeaderExt.java similarity index 100% rename from src/gov/nist/javax/sip/header/ViaHeaderExt.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ViaHeaderExt.java diff --git a/src/gov/nist/javax/sip/header/ViaList.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ViaList.java similarity index 100% rename from src/gov/nist/javax/sip/header/ViaList.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ViaList.java diff --git a/src/gov/nist/javax/sip/header/WWWAuthenticate.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/WWWAuthenticate.java similarity index 100% rename from src/gov/nist/javax/sip/header/WWWAuthenticate.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/WWWAuthenticate.java diff --git a/src/gov/nist/javax/sip/header/WWWAuthenticateList.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/WWWAuthenticateList.java similarity index 100% rename from src/gov/nist/javax/sip/header/WWWAuthenticateList.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/WWWAuthenticateList.java diff --git a/src/gov/nist/javax/sip/header/Warning.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/Warning.java similarity index 100% rename from src/gov/nist/javax/sip/header/Warning.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/Warning.java diff --git a/src/gov/nist/javax/sip/header/WarningList.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/WarningList.java similarity index 100% rename from src/gov/nist/javax/sip/header/WarningList.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/WarningList.java diff --git a/src/gov/nist/javax/sip/header/extensions/Join.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/extensions/Join.java similarity index 100% rename from src/gov/nist/javax/sip/header/extensions/Join.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/extensions/Join.java diff --git a/src/gov/nist/javax/sip/header/extensions/JoinHeader.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/extensions/JoinHeader.java similarity index 100% rename from src/gov/nist/javax/sip/header/extensions/JoinHeader.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/extensions/JoinHeader.java diff --git a/src/gov/nist/javax/sip/header/extensions/MinSE.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/extensions/MinSE.java similarity index 100% rename from src/gov/nist/javax/sip/header/extensions/MinSE.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/extensions/MinSE.java diff --git a/src/gov/nist/javax/sip/header/extensions/MinSEHeader.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/extensions/MinSEHeader.java similarity index 100% rename from src/gov/nist/javax/sip/header/extensions/MinSEHeader.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/extensions/MinSEHeader.java diff --git a/src/gov/nist/javax/sip/header/extensions/References.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/extensions/References.java similarity index 100% rename from src/gov/nist/javax/sip/header/extensions/References.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/extensions/References.java diff --git a/src/gov/nist/javax/sip/header/extensions/ReferencesHeader.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/extensions/ReferencesHeader.java similarity index 100% rename from src/gov/nist/javax/sip/header/extensions/ReferencesHeader.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/extensions/ReferencesHeader.java diff --git a/src/gov/nist/javax/sip/header/extensions/ReferredBy.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/extensions/ReferredBy.java similarity index 100% rename from src/gov/nist/javax/sip/header/extensions/ReferredBy.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/extensions/ReferredBy.java diff --git a/src/gov/nist/javax/sip/header/extensions/ReferredByHeader.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/extensions/ReferredByHeader.java similarity index 100% rename from src/gov/nist/javax/sip/header/extensions/ReferredByHeader.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/extensions/ReferredByHeader.java diff --git a/src/gov/nist/javax/sip/header/extensions/Replaces.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/extensions/Replaces.java similarity index 100% rename from src/gov/nist/javax/sip/header/extensions/Replaces.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/extensions/Replaces.java diff --git a/src/gov/nist/javax/sip/header/extensions/ReplacesHeader.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/extensions/ReplacesHeader.java similarity index 100% rename from src/gov/nist/javax/sip/header/extensions/ReplacesHeader.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/extensions/ReplacesHeader.java diff --git a/src/gov/nist/javax/sip/header/extensions/SessionExpires.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/extensions/SessionExpires.java similarity index 100% rename from src/gov/nist/javax/sip/header/extensions/SessionExpires.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/extensions/SessionExpires.java diff --git a/src/gov/nist/javax/sip/header/extensions/SessionExpiresHeader.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/extensions/SessionExpiresHeader.java similarity index 100% rename from src/gov/nist/javax/sip/header/extensions/SessionExpiresHeader.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/extensions/SessionExpiresHeader.java diff --git a/src/gov/nist/javax/sip/header/ims/AddressHeaderIms.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/AddressHeaderIms.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/AddressHeaderIms.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/AddressHeaderIms.java diff --git a/src/gov/nist/javax/sip/header/ims/AuthorizationHeaderIms.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/AuthorizationHeaderIms.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/AuthorizationHeaderIms.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/AuthorizationHeaderIms.java diff --git a/src/gov/nist/javax/sip/header/ims/PAccessNetworkInfo.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PAccessNetworkInfo.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/PAccessNetworkInfo.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PAccessNetworkInfo.java diff --git a/src/gov/nist/javax/sip/header/ims/PAccessNetworkInfoHeader.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PAccessNetworkInfoHeader.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/PAccessNetworkInfoHeader.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PAccessNetworkInfoHeader.java diff --git a/src/gov/nist/javax/sip/header/ims/PAccessNetworkInfoList.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PAccessNetworkInfoList.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/PAccessNetworkInfoList.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PAccessNetworkInfoList.java diff --git a/src/gov/nist/javax/sip/header/ims/PAssertedIdentity.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PAssertedIdentity.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/PAssertedIdentity.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PAssertedIdentity.java diff --git a/src/gov/nist/javax/sip/header/ims/PAssertedIdentityHeader.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PAssertedIdentityHeader.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/PAssertedIdentityHeader.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PAssertedIdentityHeader.java diff --git a/src/gov/nist/javax/sip/header/ims/PAssertedIdentityList.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PAssertedIdentityList.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/PAssertedIdentityList.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PAssertedIdentityList.java diff --git a/src/gov/nist/javax/sip/header/ims/PAssertedService.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PAssertedService.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/PAssertedService.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PAssertedService.java diff --git a/src/gov/nist/javax/sip/header/ims/PAssertedServiceHeader.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PAssertedServiceHeader.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/PAssertedServiceHeader.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PAssertedServiceHeader.java diff --git a/src/gov/nist/javax/sip/header/ims/PAssociatedURI.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PAssociatedURI.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/PAssociatedURI.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PAssociatedURI.java diff --git a/src/gov/nist/javax/sip/header/ims/PAssociatedURIHeader.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PAssociatedURIHeader.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/PAssociatedURIHeader.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PAssociatedURIHeader.java diff --git a/src/gov/nist/javax/sip/header/ims/PAssociatedURIList.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PAssociatedURIList.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/PAssociatedURIList.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PAssociatedURIList.java diff --git a/src/gov/nist/javax/sip/header/ims/PCalledPartyID.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PCalledPartyID.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/PCalledPartyID.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PCalledPartyID.java diff --git a/src/gov/nist/javax/sip/header/ims/PCalledPartyIDHeader.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PCalledPartyIDHeader.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/PCalledPartyIDHeader.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PCalledPartyIDHeader.java diff --git a/src/gov/nist/javax/sip/header/ims/PChargingFunctionAddresses.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PChargingFunctionAddresses.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/PChargingFunctionAddresses.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PChargingFunctionAddresses.java diff --git a/src/gov/nist/javax/sip/header/ims/PChargingFunctionAddressesHeader.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PChargingFunctionAddressesHeader.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/PChargingFunctionAddressesHeader.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PChargingFunctionAddressesHeader.java diff --git a/src/gov/nist/javax/sip/header/ims/PChargingVector.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PChargingVector.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/PChargingVector.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PChargingVector.java diff --git a/src/gov/nist/javax/sip/header/ims/PChargingVectorHeader.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PChargingVectorHeader.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/PChargingVectorHeader.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PChargingVectorHeader.java diff --git a/src/gov/nist/javax/sip/header/ims/PMediaAuthorization.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PMediaAuthorization.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/PMediaAuthorization.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PMediaAuthorization.java diff --git a/src/gov/nist/javax/sip/header/ims/PMediaAuthorizationHeader.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PMediaAuthorizationHeader.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/PMediaAuthorizationHeader.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PMediaAuthorizationHeader.java diff --git a/src/gov/nist/javax/sip/header/ims/PMediaAuthorizationList.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PMediaAuthorizationList.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/PMediaAuthorizationList.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PMediaAuthorizationList.java diff --git a/src/gov/nist/javax/sip/header/ims/PPreferredIdentity.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PPreferredIdentity.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/PPreferredIdentity.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PPreferredIdentity.java diff --git a/src/gov/nist/javax/sip/header/ims/PPreferredIdentityHeader.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PPreferredIdentityHeader.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/PPreferredIdentityHeader.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PPreferredIdentityHeader.java diff --git a/src/gov/nist/javax/sip/header/ims/PPreferredService.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PPreferredService.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/PPreferredService.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PPreferredService.java diff --git a/src/gov/nist/javax/sip/header/ims/PPreferredServiceHeader.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PPreferredServiceHeader.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/PPreferredServiceHeader.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PPreferredServiceHeader.java diff --git a/src/gov/nist/javax/sip/header/ims/PProfileKey.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PProfileKey.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/PProfileKey.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PProfileKey.java diff --git a/src/gov/nist/javax/sip/header/ims/PProfileKeyHeader.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PProfileKeyHeader.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/PProfileKeyHeader.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PProfileKeyHeader.java diff --git a/src/gov/nist/javax/sip/header/ims/PServedUser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PServedUser.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/PServedUser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PServedUser.java diff --git a/src/gov/nist/javax/sip/header/ims/PServedUserHeader.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PServedUserHeader.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/PServedUserHeader.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PServedUserHeader.java diff --git a/src/gov/nist/javax/sip/header/ims/PUserDatabase.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PUserDatabase.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/PUserDatabase.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PUserDatabase.java diff --git a/src/gov/nist/javax/sip/header/ims/PUserDatabaseHeader.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PUserDatabaseHeader.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/PUserDatabaseHeader.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PUserDatabaseHeader.java diff --git a/src/gov/nist/javax/sip/header/ims/PVisitedNetworkID.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PVisitedNetworkID.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/PVisitedNetworkID.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PVisitedNetworkID.java diff --git a/src/gov/nist/javax/sip/header/ims/PVisitedNetworkIDHeader.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PVisitedNetworkIDHeader.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/PVisitedNetworkIDHeader.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PVisitedNetworkIDHeader.java diff --git a/src/gov/nist/javax/sip/header/ims/PVisitedNetworkIDList.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PVisitedNetworkIDList.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/PVisitedNetworkIDList.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PVisitedNetworkIDList.java diff --git a/src/gov/nist/javax/sip/header/ims/ParameterNamesIms.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/ParameterNamesIms.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/ParameterNamesIms.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/ParameterNamesIms.java diff --git a/src/gov/nist/javax/sip/header/ims/Path.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/Path.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/Path.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/Path.java diff --git a/src/gov/nist/javax/sip/header/ims/PathHeader.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PathHeader.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/PathHeader.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PathHeader.java diff --git a/src/gov/nist/javax/sip/header/ims/PathList.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PathList.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/PathList.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PathList.java diff --git a/src/gov/nist/javax/sip/header/ims/Privacy.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/Privacy.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/Privacy.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/Privacy.java diff --git a/src/gov/nist/javax/sip/header/ims/PrivacyHeader.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PrivacyHeader.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/PrivacyHeader.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PrivacyHeader.java diff --git a/src/gov/nist/javax/sip/header/ims/PrivacyList.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PrivacyList.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/PrivacyList.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/PrivacyList.java diff --git a/src/gov/nist/javax/sip/header/ims/SIPHeaderNamesIms.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/SIPHeaderNamesIms.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/SIPHeaderNamesIms.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/SIPHeaderNamesIms.java diff --git a/src/gov/nist/javax/sip/header/ims/SecurityAgree.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/SecurityAgree.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/SecurityAgree.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/SecurityAgree.java diff --git a/src/gov/nist/javax/sip/header/ims/SecurityAgreeHeader.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/SecurityAgreeHeader.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/SecurityAgreeHeader.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/SecurityAgreeHeader.java diff --git a/src/gov/nist/javax/sip/header/ims/SecurityClient.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/SecurityClient.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/SecurityClient.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/SecurityClient.java diff --git a/src/gov/nist/javax/sip/header/ims/SecurityClientHeader.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/SecurityClientHeader.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/SecurityClientHeader.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/SecurityClientHeader.java diff --git a/src/gov/nist/javax/sip/header/ims/SecurityClientList.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/SecurityClientList.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/SecurityClientList.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/SecurityClientList.java diff --git a/src/gov/nist/javax/sip/header/ims/SecurityServer.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/SecurityServer.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/SecurityServer.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/SecurityServer.java diff --git a/src/gov/nist/javax/sip/header/ims/SecurityServerHeader.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/SecurityServerHeader.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/SecurityServerHeader.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/SecurityServerHeader.java diff --git a/src/gov/nist/javax/sip/header/ims/SecurityServerList.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/SecurityServerList.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/SecurityServerList.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/SecurityServerList.java diff --git a/src/gov/nist/javax/sip/header/ims/SecurityVerify.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/SecurityVerify.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/SecurityVerify.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/SecurityVerify.java diff --git a/src/gov/nist/javax/sip/header/ims/SecurityVerifyHeader.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/SecurityVerifyHeader.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/SecurityVerifyHeader.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/SecurityVerifyHeader.java diff --git a/src/gov/nist/javax/sip/header/ims/SecurityVerifyList.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/SecurityVerifyList.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/SecurityVerifyList.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/SecurityVerifyList.java diff --git a/src/gov/nist/javax/sip/header/ims/ServiceRoute.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/ServiceRoute.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/ServiceRoute.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/ServiceRoute.java diff --git a/src/gov/nist/javax/sip/header/ims/ServiceRouteHeader.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/ServiceRouteHeader.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/ServiceRouteHeader.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/ServiceRouteHeader.java diff --git a/src/gov/nist/javax/sip/header/ims/ServiceRouteList.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/ServiceRouteList.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/ServiceRouteList.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/ServiceRouteList.java diff --git a/src/gov/nist/javax/sip/header/ims/WWWAuthenticateHeaderIms.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/WWWAuthenticateHeaderIms.java similarity index 100% rename from src/gov/nist/javax/sip/header/ims/WWWAuthenticateHeaderIms.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/WWWAuthenticateHeaderIms.java diff --git a/src/gov/nist/javax/sip/header/ims/package.html b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/package.html similarity index 100% rename from src/gov/nist/javax/sip/header/ims/package.html rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/ims/package.html diff --git a/src/gov/nist/javax/sip/header/package.html b/jain-sip-ri/src/main/java/gov/nist/javax/sip/header/package.html similarity index 100% rename from src/gov/nist/javax/sip/header/package.html rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/header/package.html diff --git a/src/gov/nist/javax/sip/message/Content.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/message/Content.java similarity index 100% rename from src/gov/nist/javax/sip/message/Content.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/message/Content.java diff --git a/src/gov/nist/javax/sip/message/ContentImpl.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/message/ContentImpl.java similarity index 100% rename from src/gov/nist/javax/sip/message/ContentImpl.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/message/ContentImpl.java diff --git a/src/gov/nist/javax/sip/message/HeaderIterator.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/message/HeaderIterator.java similarity index 100% rename from src/gov/nist/javax/sip/message/HeaderIterator.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/message/HeaderIterator.java diff --git a/src/gov/nist/javax/sip/message/ListMap.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/message/ListMap.java similarity index 100% rename from src/gov/nist/javax/sip/message/ListMap.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/message/ListMap.java diff --git a/src/gov/nist/javax/sip/message/MessageExt.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/message/MessageExt.java similarity index 100% rename from src/gov/nist/javax/sip/message/MessageExt.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/message/MessageExt.java diff --git a/src/gov/nist/javax/sip/message/MessageFactoryExt.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/message/MessageFactoryExt.java similarity index 100% rename from src/gov/nist/javax/sip/message/MessageFactoryExt.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/message/MessageFactoryExt.java diff --git a/src/gov/nist/javax/sip/message/MessageFactoryImpl.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/message/MessageFactoryImpl.java similarity index 100% rename from src/gov/nist/javax/sip/message/MessageFactoryImpl.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/message/MessageFactoryImpl.java diff --git a/src/gov/nist/javax/sip/message/MessageObject.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/message/MessageObject.java similarity index 100% rename from src/gov/nist/javax/sip/message/MessageObject.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/message/MessageObject.java diff --git a/src/gov/nist/javax/sip/message/MultipartMimeContent.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/message/MultipartMimeContent.java similarity index 100% rename from src/gov/nist/javax/sip/message/MultipartMimeContent.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/message/MultipartMimeContent.java diff --git a/src/gov/nist/javax/sip/message/MultipartMimeContentImpl.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/message/MultipartMimeContentImpl.java similarity index 100% rename from src/gov/nist/javax/sip/message/MultipartMimeContentImpl.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/message/MultipartMimeContentImpl.java diff --git a/src/gov/nist/javax/sip/message/RequestExt.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/message/RequestExt.java similarity index 100% rename from src/gov/nist/javax/sip/message/RequestExt.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/message/RequestExt.java diff --git a/src/gov/nist/javax/sip/message/ResponseExt.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/message/ResponseExt.java similarity index 100% rename from src/gov/nist/javax/sip/message/ResponseExt.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/message/ResponseExt.java diff --git a/src/gov/nist/javax/sip/message/SIPDuplicateHeaderException.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/message/SIPDuplicateHeaderException.java similarity index 100% rename from src/gov/nist/javax/sip/message/SIPDuplicateHeaderException.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/message/SIPDuplicateHeaderException.java diff --git a/src/gov/nist/javax/sip/message/SIPMessage.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/message/SIPMessage.java similarity index 100% rename from src/gov/nist/javax/sip/message/SIPMessage.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/message/SIPMessage.java diff --git a/src/gov/nist/javax/sip/message/SIPRequest.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/message/SIPRequest.java similarity index 100% rename from src/gov/nist/javax/sip/message/SIPRequest.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/message/SIPRequest.java diff --git a/src/gov/nist/javax/sip/message/SIPResponse.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/message/SIPResponse.java similarity index 100% rename from src/gov/nist/javax/sip/message/SIPResponse.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/message/SIPResponse.java diff --git a/src/gov/nist/javax/sip/message/package.html b/jain-sip-ri/src/main/java/gov/nist/javax/sip/message/package.html similarity index 100% rename from src/gov/nist/javax/sip/message/package.html rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/message/package.html diff --git a/src/gov/nist/javax/sip/package.html b/jain-sip-ri/src/main/java/gov/nist/javax/sip/package.html similarity index 100% rename from src/gov/nist/javax/sip/package.html rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/package.html diff --git a/src/gov/nist/javax/sip/parser/AcceptEncodingParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/AcceptEncodingParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/AcceptEncodingParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/AcceptEncodingParser.java diff --git a/src/gov/nist/javax/sip/parser/AcceptLanguageParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/AcceptLanguageParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/AcceptLanguageParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/AcceptLanguageParser.java diff --git a/src/gov/nist/javax/sip/parser/AcceptParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/AcceptParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/AcceptParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/AcceptParser.java diff --git a/src/gov/nist/javax/sip/parser/AddressParametersParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/AddressParametersParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/AddressParametersParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/AddressParametersParser.java diff --git a/src/gov/nist/javax/sip/parser/AddressParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/AddressParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/AddressParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/AddressParser.java diff --git a/src/gov/nist/javax/sip/parser/AlertInfoParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/AlertInfoParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/AlertInfoParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/AlertInfoParser.java diff --git a/src/gov/nist/javax/sip/parser/AllowEventsParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/AllowEventsParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/AllowEventsParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/AllowEventsParser.java diff --git a/src/gov/nist/javax/sip/parser/AllowParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/AllowParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/AllowParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/AllowParser.java diff --git a/src/gov/nist/javax/sip/parser/AuthenticationInfoParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/AuthenticationInfoParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/AuthenticationInfoParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/AuthenticationInfoParser.java diff --git a/src/gov/nist/javax/sip/parser/AuthorizationParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/AuthorizationParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/AuthorizationParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/AuthorizationParser.java diff --git a/src/gov/nist/javax/sip/parser/CSeqParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/CSeqParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/CSeqParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/CSeqParser.java diff --git a/src/gov/nist/javax/sip/parser/CallIDParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/CallIDParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/CallIDParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/CallIDParser.java diff --git a/src/gov/nist/javax/sip/parser/CallInfoParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/CallInfoParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/CallInfoParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/CallInfoParser.java diff --git a/src/gov/nist/javax/sip/parser/ChallengeParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ChallengeParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/ChallengeParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ChallengeParser.java diff --git a/src/gov/nist/javax/sip/parser/ContactParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ContactParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/ContactParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ContactParser.java diff --git a/src/gov/nist/javax/sip/parser/ContentDispositionParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ContentDispositionParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/ContentDispositionParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ContentDispositionParser.java diff --git a/src/gov/nist/javax/sip/parser/ContentEncodingParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ContentEncodingParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/ContentEncodingParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ContentEncodingParser.java diff --git a/src/gov/nist/javax/sip/parser/ContentLanguageParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ContentLanguageParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/ContentLanguageParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ContentLanguageParser.java diff --git a/src/gov/nist/javax/sip/parser/ContentLengthParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ContentLengthParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/ContentLengthParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ContentLengthParser.java diff --git a/src/gov/nist/javax/sip/parser/ContentTypeParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ContentTypeParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/ContentTypeParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ContentTypeParser.java diff --git a/src/gov/nist/javax/sip/parser/DateParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/DateParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/DateParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/DateParser.java diff --git a/src/gov/nist/javax/sip/parser/ErrorInfoParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ErrorInfoParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/ErrorInfoParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ErrorInfoParser.java diff --git a/src/gov/nist/javax/sip/parser/EventParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/EventParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/EventParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/EventParser.java diff --git a/src/gov/nist/javax/sip/parser/ExpiresParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ExpiresParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/ExpiresParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ExpiresParser.java diff --git a/src/gov/nist/javax/sip/parser/FromParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/FromParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/FromParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/FromParser.java diff --git a/src/gov/nist/javax/sip/parser/HeaderParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/HeaderParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/HeaderParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/HeaderParser.java diff --git a/src/gov/nist/javax/sip/parser/InReplyToParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/InReplyToParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/InReplyToParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/InReplyToParser.java diff --git a/src/gov/nist/javax/sip/parser/Lexer.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/Lexer.java similarity index 100% rename from src/gov/nist/javax/sip/parser/Lexer.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/Lexer.java diff --git a/src/gov/nist/javax/sip/parser/MaxForwardsParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/MaxForwardsParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/MaxForwardsParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/MaxForwardsParser.java diff --git a/src/gov/nist/javax/sip/parser/MessageParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/MessageParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/MessageParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/MessageParser.java diff --git a/src/gov/nist/javax/sip/parser/MessageParserFactory.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/MessageParserFactory.java similarity index 100% rename from src/gov/nist/javax/sip/parser/MessageParserFactory.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/MessageParserFactory.java diff --git a/src/gov/nist/javax/sip/parser/MimeVersionParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/MimeVersionParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/MimeVersionParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/MimeVersionParser.java diff --git a/src/gov/nist/javax/sip/parser/MinExpiresParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/MinExpiresParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/MinExpiresParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/MinExpiresParser.java diff --git a/src/gov/nist/javax/sip/parser/NioPipelineParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/NioPipelineParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/NioPipelineParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/NioPipelineParser.java diff --git a/src/gov/nist/javax/sip/parser/OrganizationParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/OrganizationParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/OrganizationParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/OrganizationParser.java diff --git a/src/gov/nist/javax/sip/parser/ParametersParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ParametersParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/ParametersParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ParametersParser.java diff --git a/src/gov/nist/javax/sip/parser/ParseExceptionListener.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ParseExceptionListener.java similarity index 100% rename from src/gov/nist/javax/sip/parser/ParseExceptionListener.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ParseExceptionListener.java diff --git a/src/gov/nist/javax/sip/parser/Parser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/Parser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/Parser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/Parser.java diff --git a/src/gov/nist/javax/sip/parser/ParserFactory.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ParserFactory.java similarity index 100% rename from src/gov/nist/javax/sip/parser/ParserFactory.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ParserFactory.java diff --git a/src/gov/nist/javax/sip/parser/Pipeline.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/Pipeline.java similarity index 100% rename from src/gov/nist/javax/sip/parser/Pipeline.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/Pipeline.java diff --git a/src/gov/nist/javax/sip/parser/PipelinedMsgParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/PipelinedMsgParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/PipelinedMsgParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/PipelinedMsgParser.java diff --git a/src/gov/nist/javax/sip/parser/PostParseExecutorServices.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/PostParseExecutorServices.java similarity index 100% rename from src/gov/nist/javax/sip/parser/PostParseExecutorServices.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/PostParseExecutorServices.java diff --git a/src/gov/nist/javax/sip/parser/PriorityParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/PriorityParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/PriorityParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/PriorityParser.java diff --git a/src/gov/nist/javax/sip/parser/ProxyAuthenticateParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ProxyAuthenticateParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/ProxyAuthenticateParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ProxyAuthenticateParser.java diff --git a/src/gov/nist/javax/sip/parser/ProxyAuthorizationParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ProxyAuthorizationParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/ProxyAuthorizationParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ProxyAuthorizationParser.java diff --git a/src/gov/nist/javax/sip/parser/ProxyRequireParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ProxyRequireParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/ProxyRequireParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ProxyRequireParser.java diff --git a/src/gov/nist/javax/sip/parser/RAckParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/RAckParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/RAckParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/RAckParser.java diff --git a/src/gov/nist/javax/sip/parser/RSeqParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/RSeqParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/RSeqParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/RSeqParser.java diff --git a/src/gov/nist/javax/sip/parser/ReasonParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ReasonParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/ReasonParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ReasonParser.java diff --git a/src/gov/nist/javax/sip/parser/RecordRouteParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/RecordRouteParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/RecordRouteParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/RecordRouteParser.java diff --git a/src/gov/nist/javax/sip/parser/ReferToParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ReferToParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/ReferToParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ReferToParser.java diff --git a/src/gov/nist/javax/sip/parser/ReplyToParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ReplyToParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/ReplyToParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ReplyToParser.java diff --git a/src/gov/nist/javax/sip/parser/RequestLineParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/RequestLineParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/RequestLineParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/RequestLineParser.java diff --git a/src/gov/nist/javax/sip/parser/RequireParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/RequireParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/RequireParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/RequireParser.java diff --git a/src/gov/nist/javax/sip/parser/RetryAfterParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/RetryAfterParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/RetryAfterParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/RetryAfterParser.java diff --git a/src/gov/nist/javax/sip/parser/RouteParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/RouteParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/RouteParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/RouteParser.java diff --git a/src/gov/nist/javax/sip/parser/SIPETagParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/SIPETagParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/SIPETagParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/SIPETagParser.java diff --git a/src/gov/nist/javax/sip/parser/SIPIfMatchParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/SIPIfMatchParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/SIPIfMatchParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/SIPIfMatchParser.java diff --git a/src/gov/nist/javax/sip/parser/SIPMessageListener.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/SIPMessageListener.java similarity index 100% rename from src/gov/nist/javax/sip/parser/SIPMessageListener.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/SIPMessageListener.java diff --git a/src/gov/nist/javax/sip/parser/ServerParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ServerParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/ServerParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ServerParser.java diff --git a/src/gov/nist/javax/sip/parser/StatusLineParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/StatusLineParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/StatusLineParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/StatusLineParser.java diff --git a/src/gov/nist/javax/sip/parser/StringMsgParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/StringMsgParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/StringMsgParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/StringMsgParser.java diff --git a/src/gov/nist/javax/sip/parser/StringMsgParserFactory.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/StringMsgParserFactory.java similarity index 100% rename from src/gov/nist/javax/sip/parser/StringMsgParserFactory.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/StringMsgParserFactory.java diff --git a/src/gov/nist/javax/sip/parser/SubjectParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/SubjectParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/SubjectParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/SubjectParser.java diff --git a/src/gov/nist/javax/sip/parser/SubscriptionStateParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/SubscriptionStateParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/SubscriptionStateParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/SubscriptionStateParser.java diff --git a/src/gov/nist/javax/sip/parser/SupportedParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/SupportedParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/SupportedParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/SupportedParser.java diff --git a/src/gov/nist/javax/sip/parser/TimeStampParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/TimeStampParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/TimeStampParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/TimeStampParser.java diff --git a/src/gov/nist/javax/sip/parser/ToParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ToParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/ToParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ToParser.java diff --git a/src/gov/nist/javax/sip/parser/TokenNames.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/TokenNames.java similarity index 100% rename from src/gov/nist/javax/sip/parser/TokenNames.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/TokenNames.java diff --git a/src/gov/nist/javax/sip/parser/TokenTypes.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/TokenTypes.java similarity index 100% rename from src/gov/nist/javax/sip/parser/TokenTypes.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/TokenTypes.java diff --git a/src/gov/nist/javax/sip/parser/URLParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/URLParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/URLParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/URLParser.java diff --git a/src/gov/nist/javax/sip/parser/UnsupportedParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/UnsupportedParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/UnsupportedParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/UnsupportedParser.java diff --git a/src/gov/nist/javax/sip/parser/UserAgentParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/UserAgentParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/UserAgentParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/UserAgentParser.java diff --git a/src/gov/nist/javax/sip/parser/ViaParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ViaParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/ViaParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ViaParser.java diff --git a/src/gov/nist/javax/sip/parser/WWWAuthenticateParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/WWWAuthenticateParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/WWWAuthenticateParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/WWWAuthenticateParser.java diff --git a/src/gov/nist/javax/sip/parser/WarningParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/WarningParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/WarningParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/WarningParser.java diff --git a/src/gov/nist/javax/sip/parser/extensions/JoinParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/extensions/JoinParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/extensions/JoinParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/extensions/JoinParser.java diff --git a/src/gov/nist/javax/sip/parser/extensions/MinSEParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/extensions/MinSEParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/extensions/MinSEParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/extensions/MinSEParser.java diff --git a/src/gov/nist/javax/sip/parser/extensions/ReferencesParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/extensions/ReferencesParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/extensions/ReferencesParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/extensions/ReferencesParser.java diff --git a/src/gov/nist/javax/sip/parser/extensions/ReferredByParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/extensions/ReferredByParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/extensions/ReferredByParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/extensions/ReferredByParser.java diff --git a/src/gov/nist/javax/sip/parser/extensions/ReplacesParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/extensions/ReplacesParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/extensions/ReplacesParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/extensions/ReplacesParser.java diff --git a/src/gov/nist/javax/sip/parser/extensions/SessionExpiresParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/extensions/SessionExpiresParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/extensions/SessionExpiresParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/extensions/SessionExpiresParser.java diff --git a/src/gov/nist/javax/sip/parser/ims/AddressHeaderParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ims/AddressHeaderParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/ims/AddressHeaderParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ims/AddressHeaderParser.java diff --git a/src/gov/nist/javax/sip/parser/ims/PAccessNetworkInfoParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ims/PAccessNetworkInfoParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/ims/PAccessNetworkInfoParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ims/PAccessNetworkInfoParser.java diff --git a/src/gov/nist/javax/sip/parser/ims/PAssertedIdentityParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ims/PAssertedIdentityParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/ims/PAssertedIdentityParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ims/PAssertedIdentityParser.java diff --git a/src/gov/nist/javax/sip/parser/ims/PAssertedServiceParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ims/PAssertedServiceParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/ims/PAssertedServiceParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ims/PAssertedServiceParser.java diff --git a/src/gov/nist/javax/sip/parser/ims/PAssociatedURIParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ims/PAssociatedURIParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/ims/PAssociatedURIParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ims/PAssociatedURIParser.java diff --git a/src/gov/nist/javax/sip/parser/ims/PCalledPartyIDParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ims/PCalledPartyIDParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/ims/PCalledPartyIDParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ims/PCalledPartyIDParser.java diff --git a/src/gov/nist/javax/sip/parser/ims/PChargingFunctionAddressesParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ims/PChargingFunctionAddressesParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/ims/PChargingFunctionAddressesParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ims/PChargingFunctionAddressesParser.java diff --git a/src/gov/nist/javax/sip/parser/ims/PChargingVectorParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ims/PChargingVectorParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/ims/PChargingVectorParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ims/PChargingVectorParser.java diff --git a/src/gov/nist/javax/sip/parser/ims/PMediaAuthorizationParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ims/PMediaAuthorizationParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/ims/PMediaAuthorizationParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ims/PMediaAuthorizationParser.java diff --git a/src/gov/nist/javax/sip/parser/ims/PPreferredIdentityParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ims/PPreferredIdentityParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/ims/PPreferredIdentityParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ims/PPreferredIdentityParser.java diff --git a/src/gov/nist/javax/sip/parser/ims/PPreferredServiceParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ims/PPreferredServiceParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/ims/PPreferredServiceParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ims/PPreferredServiceParser.java diff --git a/src/gov/nist/javax/sip/parser/ims/PProfileKeyParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ims/PProfileKeyParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/ims/PProfileKeyParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ims/PProfileKeyParser.java diff --git a/src/gov/nist/javax/sip/parser/ims/PServedUserParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ims/PServedUserParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/ims/PServedUserParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ims/PServedUserParser.java diff --git a/src/gov/nist/javax/sip/parser/ims/PUserDatabaseParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ims/PUserDatabaseParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/ims/PUserDatabaseParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ims/PUserDatabaseParser.java diff --git a/src/gov/nist/javax/sip/parser/ims/PVisitedNetworkIDParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ims/PVisitedNetworkIDParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/ims/PVisitedNetworkIDParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ims/PVisitedNetworkIDParser.java diff --git a/src/gov/nist/javax/sip/parser/ims/PathParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ims/PathParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/ims/PathParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ims/PathParser.java diff --git a/src/gov/nist/javax/sip/parser/ims/PrivacyParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ims/PrivacyParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/ims/PrivacyParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ims/PrivacyParser.java diff --git a/src/gov/nist/javax/sip/parser/ims/SecurityAgreeParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ims/SecurityAgreeParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/ims/SecurityAgreeParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ims/SecurityAgreeParser.java diff --git a/src/gov/nist/javax/sip/parser/ims/SecurityClientParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ims/SecurityClientParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/ims/SecurityClientParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ims/SecurityClientParser.java diff --git a/src/gov/nist/javax/sip/parser/ims/SecurityServerParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ims/SecurityServerParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/ims/SecurityServerParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ims/SecurityServerParser.java diff --git a/src/gov/nist/javax/sip/parser/ims/SecurityVerifyParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ims/SecurityVerifyParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/ims/SecurityVerifyParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ims/SecurityVerifyParser.java diff --git a/src/gov/nist/javax/sip/parser/ims/ServiceRouteParser.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ims/ServiceRouteParser.java similarity index 100% rename from src/gov/nist/javax/sip/parser/ims/ServiceRouteParser.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ims/ServiceRouteParser.java diff --git a/src/gov/nist/javax/sip/parser/ims/TokenNamesIms.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ims/TokenNamesIms.java similarity index 100% rename from src/gov/nist/javax/sip/parser/ims/TokenNamesIms.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ims/TokenNamesIms.java diff --git a/src/gov/nist/javax/sip/parser/ims/package.html b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ims/package.html similarity index 100% rename from src/gov/nist/javax/sip/parser/ims/package.html rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/ims/package.html diff --git a/src/gov/nist/javax/sip/parser/package.html b/jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/package.html similarity index 100% rename from src/gov/nist/javax/sip/parser/package.html rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/parser/package.html diff --git a/src/gov/nist/javax/sip/stack/AckSendingStrategy.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/AckSendingStrategy.java similarity index 100% rename from src/gov/nist/javax/sip/stack/AckSendingStrategy.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/AckSendingStrategy.java diff --git a/src/gov/nist/javax/sip/stack/Base64Coder.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/Base64Coder.java similarity index 100% rename from src/gov/nist/javax/sip/stack/Base64Coder.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/Base64Coder.java diff --git a/src/gov/nist/javax/sip/stack/BlockingQueueDispatchAuditor.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/BlockingQueueDispatchAuditor.java similarity index 100% rename from src/gov/nist/javax/sip/stack/BlockingQueueDispatchAuditor.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/BlockingQueueDispatchAuditor.java diff --git a/src/gov/nist/javax/sip/stack/ByteBufferFactory.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/ByteBufferFactory.java similarity index 100% rename from src/gov/nist/javax/sip/stack/ByteBufferFactory.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/ByteBufferFactory.java diff --git a/src/gov/nist/javax/sip/stack/CallAnalysisInterceptor.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/CallAnalysisInterceptor.java similarity index 100% rename from src/gov/nist/javax/sip/stack/CallAnalysisInterceptor.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/CallAnalysisInterceptor.java diff --git a/src/gov/nist/javax/sip/stack/CallAnalyzer.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/CallAnalyzer.java similarity index 100% rename from src/gov/nist/javax/sip/stack/CallAnalyzer.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/CallAnalyzer.java diff --git a/src/gov/nist/javax/sip/stack/ClientAuthType.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/ClientAuthType.java similarity index 100% rename from src/gov/nist/javax/sip/stack/ClientAuthType.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/ClientAuthType.java diff --git a/src/gov/nist/javax/sip/stack/CongestionControlMessageValve.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/CongestionControlMessageValve.java similarity index 100% rename from src/gov/nist/javax/sip/stack/CongestionControlMessageValve.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/CongestionControlMessageValve.java diff --git a/src/gov/nist/javax/sip/stack/ConnectionOrientedMessageChannel.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/ConnectionOrientedMessageChannel.java similarity index 100% rename from src/gov/nist/javax/sip/stack/ConnectionOrientedMessageChannel.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/ConnectionOrientedMessageChannel.java diff --git a/src/gov/nist/javax/sip/stack/ConnectionOrientedMessageProcessor.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/ConnectionOrientedMessageProcessor.java similarity index 100% rename from src/gov/nist/javax/sip/stack/ConnectionOrientedMessageProcessor.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/ConnectionOrientedMessageProcessor.java diff --git a/src/gov/nist/javax/sip/stack/DatagramQueuedMessageDispatch.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/DatagramQueuedMessageDispatch.java similarity index 100% rename from src/gov/nist/javax/sip/stack/DatagramQueuedMessageDispatch.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/DatagramQueuedMessageDispatch.java diff --git a/src/gov/nist/javax/sip/stack/DefaultMessageLogFactory.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/DefaultMessageLogFactory.java similarity index 100% rename from src/gov/nist/javax/sip/stack/DefaultMessageLogFactory.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/DefaultMessageLogFactory.java diff --git a/src/gov/nist/javax/sip/stack/DefaultRouter.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/DefaultRouter.java similarity index 100% rename from src/gov/nist/javax/sip/stack/DefaultRouter.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/DefaultRouter.java diff --git a/src/gov/nist/javax/sip/stack/DefaultTlsSecurityPolicy.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/DefaultTlsSecurityPolicy.java similarity index 100% rename from src/gov/nist/javax/sip/stack/DefaultTlsSecurityPolicy.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/DefaultTlsSecurityPolicy.java diff --git a/src/gov/nist/javax/sip/stack/HandshakeCompletedListenerImpl.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/HandshakeCompletedListenerImpl.java similarity index 100% rename from src/gov/nist/javax/sip/stack/HandshakeCompletedListenerImpl.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/HandshakeCompletedListenerImpl.java diff --git a/src/gov/nist/javax/sip/stack/HopImpl.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/HopImpl.java similarity index 100% rename from src/gov/nist/javax/sip/stack/HopImpl.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/HopImpl.java diff --git a/src/gov/nist/javax/sip/stack/IOHandler.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/IOHandler.java similarity index 100% rename from src/gov/nist/javax/sip/stack/IOHandler.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/IOHandler.java diff --git a/src/gov/nist/javax/sip/stack/IllegalTransactionStateException.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/IllegalTransactionStateException.java similarity index 100% rename from src/gov/nist/javax/sip/stack/IllegalTransactionStateException.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/IllegalTransactionStateException.java diff --git a/src/gov/nist/javax/sip/stack/KeyedSemaphore.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/KeyedSemaphore.java similarity index 100% rename from src/gov/nist/javax/sip/stack/KeyedSemaphore.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/KeyedSemaphore.java diff --git a/src/gov/nist/javax/sip/stack/MessageChannel.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/MessageChannel.java similarity index 100% rename from src/gov/nist/javax/sip/stack/MessageChannel.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/MessageChannel.java diff --git a/src/gov/nist/javax/sip/stack/MessageLog.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/MessageLog.java similarity index 100% rename from src/gov/nist/javax/sip/stack/MessageLog.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/MessageLog.java diff --git a/src/gov/nist/javax/sip/stack/MessageProcessor.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/MessageProcessor.java similarity index 100% rename from src/gov/nist/javax/sip/stack/MessageProcessor.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/MessageProcessor.java diff --git a/src/gov/nist/javax/sip/stack/MessageProcessorFactory.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/MessageProcessorFactory.java similarity index 100% rename from src/gov/nist/javax/sip/stack/MessageProcessorFactory.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/MessageProcessorFactory.java diff --git a/src/gov/nist/javax/sip/stack/MultiPipelineExecutor.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/MultiPipelineExecutor.java similarity index 100% rename from src/gov/nist/javax/sip/stack/MultiPipelineExecutor.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/MultiPipelineExecutor.java diff --git a/src/gov/nist/javax/sip/stack/NIOHandler.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/NIOHandler.java similarity index 100% rename from src/gov/nist/javax/sip/stack/NIOHandler.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/NIOHandler.java diff --git a/src/gov/nist/javax/sip/stack/NioMessageProcessorFactory.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/NioMessageProcessorFactory.java similarity index 100% rename from src/gov/nist/javax/sip/stack/NioMessageProcessorFactory.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/NioMessageProcessorFactory.java diff --git a/src/gov/nist/javax/sip/stack/NioTcpMessageChannel.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/NioTcpMessageChannel.java similarity index 100% rename from src/gov/nist/javax/sip/stack/NioTcpMessageChannel.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/NioTcpMessageChannel.java diff --git a/src/gov/nist/javax/sip/stack/NioTcpMessageProcessor.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/NioTcpMessageProcessor.java similarity index 100% rename from src/gov/nist/javax/sip/stack/NioTcpMessageProcessor.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/NioTcpMessageProcessor.java diff --git a/src/gov/nist/javax/sip/stack/NioTlsChannelInterface.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/NioTlsChannelInterface.java similarity index 100% rename from src/gov/nist/javax/sip/stack/NioTlsChannelInterface.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/NioTlsChannelInterface.java diff --git a/src/gov/nist/javax/sip/stack/NioTlsMessageChannel.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/NioTlsMessageChannel.java similarity index 100% rename from src/gov/nist/javax/sip/stack/NioTlsMessageChannel.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/NioTlsMessageChannel.java diff --git a/src/gov/nist/javax/sip/stack/NioTlsMessageProcessor.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/NioTlsMessageProcessor.java similarity index 100% rename from src/gov/nist/javax/sip/stack/NioTlsMessageProcessor.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/NioTlsMessageProcessor.java diff --git a/src/gov/nist/javax/sip/stack/NioTlsWebSocketMessageChannel.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/NioTlsWebSocketMessageChannel.java similarity index 100% rename from src/gov/nist/javax/sip/stack/NioTlsWebSocketMessageChannel.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/NioTlsWebSocketMessageChannel.java diff --git a/src/gov/nist/javax/sip/stack/NioTlsWebSocketMessageProcessor.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/NioTlsWebSocketMessageProcessor.java similarity index 100% rename from src/gov/nist/javax/sip/stack/NioTlsWebSocketMessageProcessor.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/NioTlsWebSocketMessageProcessor.java diff --git a/src/gov/nist/javax/sip/stack/NioWebSocketMessageChannel.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/NioWebSocketMessageChannel.java similarity index 100% rename from src/gov/nist/javax/sip/stack/NioWebSocketMessageChannel.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/NioWebSocketMessageChannel.java diff --git a/src/gov/nist/javax/sip/stack/NioWebSocketMessageProcessor.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/NioWebSocketMessageProcessor.java similarity index 100% rename from src/gov/nist/javax/sip/stack/NioWebSocketMessageProcessor.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/NioWebSocketMessageProcessor.java diff --git a/src/gov/nist/javax/sip/stack/OIOMessageProcessorFactory.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/OIOMessageProcessorFactory.java similarity index 100% rename from src/gov/nist/javax/sip/stack/OIOMessageProcessorFactory.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/OIOMessageProcessorFactory.java diff --git a/src/gov/nist/javax/sip/stack/QueuedMessageDispatchBase.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/QueuedMessageDispatchBase.java similarity index 100% rename from src/gov/nist/javax/sip/stack/QueuedMessageDispatchBase.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/QueuedMessageDispatchBase.java diff --git a/src/gov/nist/javax/sip/stack/RawMessageChannel.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/RawMessageChannel.java similarity index 100% rename from src/gov/nist/javax/sip/stack/RawMessageChannel.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/RawMessageChannel.java diff --git a/src/gov/nist/javax/sip/stack/SIPClientTransaction.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/SIPClientTransaction.java similarity index 100% rename from src/gov/nist/javax/sip/stack/SIPClientTransaction.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/SIPClientTransaction.java diff --git a/src/gov/nist/javax/sip/stack/SIPClientTransactionImpl.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/SIPClientTransactionImpl.java similarity index 100% rename from src/gov/nist/javax/sip/stack/SIPClientTransactionImpl.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/SIPClientTransactionImpl.java diff --git a/src/gov/nist/javax/sip/stack/SIPDialog.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/SIPDialog.java similarity index 100% rename from src/gov/nist/javax/sip/stack/SIPDialog.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/SIPDialog.java diff --git a/src/gov/nist/javax/sip/stack/SIPDialogErrorEvent.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/SIPDialogErrorEvent.java similarity index 100% rename from src/gov/nist/javax/sip/stack/SIPDialogErrorEvent.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/SIPDialogErrorEvent.java diff --git a/src/gov/nist/javax/sip/stack/SIPDialogEventListener.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/SIPDialogEventListener.java similarity index 100% rename from src/gov/nist/javax/sip/stack/SIPDialogEventListener.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/SIPDialogEventListener.java diff --git a/src/gov/nist/javax/sip/stack/SIPEventInterceptor.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/SIPEventInterceptor.java similarity index 100% rename from src/gov/nist/javax/sip/stack/SIPEventInterceptor.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/SIPEventInterceptor.java diff --git a/src/gov/nist/javax/sip/stack/SIPMessageValve.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/SIPMessageValve.java similarity index 100% rename from src/gov/nist/javax/sip/stack/SIPMessageValve.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/SIPMessageValve.java diff --git a/src/gov/nist/javax/sip/stack/SIPServerTransaction.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/SIPServerTransaction.java similarity index 100% rename from src/gov/nist/javax/sip/stack/SIPServerTransaction.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/SIPServerTransaction.java diff --git a/src/gov/nist/javax/sip/stack/SIPServerTransactionImpl.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/SIPServerTransactionImpl.java similarity index 100% rename from src/gov/nist/javax/sip/stack/SIPServerTransactionImpl.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/SIPServerTransactionImpl.java diff --git a/src/gov/nist/javax/sip/stack/SIPStackTimerTask.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/SIPStackTimerTask.java similarity index 100% rename from src/gov/nist/javax/sip/stack/SIPStackTimerTask.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/SIPStackTimerTask.java diff --git a/src/gov/nist/javax/sip/stack/SIPTransaction.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/SIPTransaction.java similarity index 100% rename from src/gov/nist/javax/sip/stack/SIPTransaction.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/SIPTransaction.java diff --git a/src/gov/nist/javax/sip/stack/SIPTransactionErrorEvent.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/SIPTransactionErrorEvent.java similarity index 100% rename from src/gov/nist/javax/sip/stack/SIPTransactionErrorEvent.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/SIPTransactionErrorEvent.java diff --git a/src/gov/nist/javax/sip/stack/SIPTransactionEventListener.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/SIPTransactionEventListener.java similarity index 100% rename from src/gov/nist/javax/sip/stack/SIPTransactionEventListener.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/SIPTransactionEventListener.java diff --git a/src/gov/nist/javax/sip/stack/SIPTransactionImpl.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/SIPTransactionImpl.java similarity index 100% rename from src/gov/nist/javax/sip/stack/SIPTransactionImpl.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/SIPTransactionImpl.java diff --git a/src/gov/nist/javax/sip/stack/SIPTransactionStack.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/SIPTransactionStack.java similarity index 100% rename from src/gov/nist/javax/sip/stack/SIPTransactionStack.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/SIPTransactionStack.java diff --git a/src/gov/nist/javax/sip/stack/SSLStateMachine.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/SSLStateMachine.java similarity index 100% rename from src/gov/nist/javax/sip/stack/SSLStateMachine.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/SSLStateMachine.java diff --git a/src/gov/nist/javax/sip/stack/ServerLog.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/ServerLog.java similarity index 100% rename from src/gov/nist/javax/sip/stack/ServerLog.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/ServerLog.java diff --git a/src/gov/nist/javax/sip/stack/ServerRequestInterface.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/ServerRequestInterface.java similarity index 100% rename from src/gov/nist/javax/sip/stack/ServerRequestInterface.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/ServerRequestInterface.java diff --git a/src/gov/nist/javax/sip/stack/ServerResponseInterface.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/ServerResponseInterface.java similarity index 100% rename from src/gov/nist/javax/sip/stack/ServerResponseInterface.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/ServerResponseInterface.java diff --git a/src/gov/nist/javax/sip/stack/SocketTimeoutAuditor.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/SocketTimeoutAuditor.java similarity index 100% rename from src/gov/nist/javax/sip/stack/SocketTimeoutAuditor.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/SocketTimeoutAuditor.java diff --git a/src/gov/nist/javax/sip/stack/StackMessageFactory.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/StackMessageFactory.java similarity index 100% rename from src/gov/nist/javax/sip/stack/StackMessageFactory.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/StackMessageFactory.java diff --git a/src/gov/nist/javax/sip/stack/TCPMessageChannel.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/TCPMessageChannel.java similarity index 100% rename from src/gov/nist/javax/sip/stack/TCPMessageChannel.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/TCPMessageChannel.java diff --git a/src/gov/nist/javax/sip/stack/TCPMessageProcessor.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/TCPMessageProcessor.java similarity index 100% rename from src/gov/nist/javax/sip/stack/TCPMessageProcessor.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/TCPMessageProcessor.java diff --git a/src/gov/nist/javax/sip/stack/TLSMessageChannel.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/TLSMessageChannel.java similarity index 100% rename from src/gov/nist/javax/sip/stack/TLSMessageChannel.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/TLSMessageChannel.java diff --git a/src/gov/nist/javax/sip/stack/TLSMessageProcessor.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/TLSMessageProcessor.java similarity index 100% rename from src/gov/nist/javax/sip/stack/TLSMessageProcessor.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/TLSMessageProcessor.java diff --git a/src/gov/nist/javax/sip/stack/UDPMessageChannel.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/UDPMessageChannel.java similarity index 100% rename from src/gov/nist/javax/sip/stack/UDPMessageChannel.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/UDPMessageChannel.java diff --git a/src/gov/nist/javax/sip/stack/UDPMessageProcessor.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/UDPMessageProcessor.java similarity index 100% rename from src/gov/nist/javax/sip/stack/UDPMessageProcessor.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/UDPMessageProcessor.java diff --git a/src/gov/nist/javax/sip/stack/WebSocketCodec.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/WebSocketCodec.java similarity index 100% rename from src/gov/nist/javax/sip/stack/WebSocketCodec.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/WebSocketCodec.java diff --git a/src/gov/nist/javax/sip/stack/WebSocketHttpHandshake.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/WebSocketHttpHandshake.java similarity index 100% rename from src/gov/nist/javax/sip/stack/WebSocketHttpHandshake.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/WebSocketHttpHandshake.java diff --git a/src/gov/nist/javax/sip/stack/package.html b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/package.html similarity index 100% rename from src/gov/nist/javax/sip/stack/package.html rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/package.html diff --git a/src/gov/nist/javax/sip/stack/sctp/SCTPMessageChannel.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/sctp/SCTPMessageChannel.java similarity index 100% rename from src/gov/nist/javax/sip/stack/sctp/SCTPMessageChannel.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/sctp/SCTPMessageChannel.java diff --git a/src/gov/nist/javax/sip/stack/sctp/SCTPMessageProcessor.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/sctp/SCTPMessageProcessor.java similarity index 100% rename from src/gov/nist/javax/sip/stack/sctp/SCTPMessageProcessor.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/sctp/SCTPMessageProcessor.java diff --git a/src/gov/nist/javax/sip/stack/timers/DefaultSipTimer.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/timers/DefaultSipTimer.java similarity index 100% rename from src/gov/nist/javax/sip/stack/timers/DefaultSipTimer.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/timers/DefaultSipTimer.java diff --git a/src/gov/nist/javax/sip/stack/timers/ScheduledExecutorSipTimer.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/timers/ScheduledExecutorSipTimer.java similarity index 100% rename from src/gov/nist/javax/sip/stack/timers/ScheduledExecutorSipTimer.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/timers/ScheduledExecutorSipTimer.java diff --git a/src/gov/nist/javax/sip/stack/timers/SipTimer.java b/jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/timers/SipTimer.java similarity index 100% rename from src/gov/nist/javax/sip/stack/timers/SipTimer.java rename to jain-sip-ri/src/main/java/gov/nist/javax/sip/stack/timers/SipTimer.java diff --git a/src/javax/sdp/Attribute.java b/jain-sip-ri/src/main/java/javax/sdp/Attribute.java similarity index 100% rename from src/javax/sdp/Attribute.java rename to jain-sip-ri/src/main/java/javax/sdp/Attribute.java diff --git a/src/javax/sdp/BandWidth.java b/jain-sip-ri/src/main/java/javax/sdp/BandWidth.java similarity index 100% rename from src/javax/sdp/BandWidth.java rename to jain-sip-ri/src/main/java/javax/sdp/BandWidth.java diff --git a/src/javax/sdp/Connection.java b/jain-sip-ri/src/main/java/javax/sdp/Connection.java similarity index 100% rename from src/javax/sdp/Connection.java rename to jain-sip-ri/src/main/java/javax/sdp/Connection.java diff --git a/src/javax/sdp/EMail.java b/jain-sip-ri/src/main/java/javax/sdp/EMail.java similarity index 100% rename from src/javax/sdp/EMail.java rename to jain-sip-ri/src/main/java/javax/sdp/EMail.java diff --git a/src/javax/sdp/Field.java b/jain-sip-ri/src/main/java/javax/sdp/Field.java similarity index 100% rename from src/javax/sdp/Field.java rename to jain-sip-ri/src/main/java/javax/sdp/Field.java diff --git a/src/javax/sdp/Info.java b/jain-sip-ri/src/main/java/javax/sdp/Info.java similarity index 100% rename from src/javax/sdp/Info.java rename to jain-sip-ri/src/main/java/javax/sdp/Info.java diff --git a/src/javax/sdp/Key.java b/jain-sip-ri/src/main/java/javax/sdp/Key.java similarity index 100% rename from src/javax/sdp/Key.java rename to jain-sip-ri/src/main/java/javax/sdp/Key.java diff --git a/src/javax/sdp/Media.java b/jain-sip-ri/src/main/java/javax/sdp/Media.java similarity index 100% rename from src/javax/sdp/Media.java rename to jain-sip-ri/src/main/java/javax/sdp/Media.java diff --git a/src/javax/sdp/MediaDescription.java b/jain-sip-ri/src/main/java/javax/sdp/MediaDescription.java similarity index 100% rename from src/javax/sdp/MediaDescription.java rename to jain-sip-ri/src/main/java/javax/sdp/MediaDescription.java diff --git a/src/javax/sdp/Origin.java b/jain-sip-ri/src/main/java/javax/sdp/Origin.java similarity index 100% rename from src/javax/sdp/Origin.java rename to jain-sip-ri/src/main/java/javax/sdp/Origin.java diff --git a/src/javax/sdp/Phone.java b/jain-sip-ri/src/main/java/javax/sdp/Phone.java similarity index 100% rename from src/javax/sdp/Phone.java rename to jain-sip-ri/src/main/java/javax/sdp/Phone.java diff --git a/src/javax/sdp/RepeatTime.java b/jain-sip-ri/src/main/java/javax/sdp/RepeatTime.java similarity index 100% rename from src/javax/sdp/RepeatTime.java rename to jain-sip-ri/src/main/java/javax/sdp/RepeatTime.java diff --git a/src/javax/sdp/SdpConstants.java b/jain-sip-ri/src/main/java/javax/sdp/SdpConstants.java similarity index 100% rename from src/javax/sdp/SdpConstants.java rename to jain-sip-ri/src/main/java/javax/sdp/SdpConstants.java diff --git a/src/javax/sdp/SdpEncoder.java b/jain-sip-ri/src/main/java/javax/sdp/SdpEncoder.java similarity index 100% rename from src/javax/sdp/SdpEncoder.java rename to jain-sip-ri/src/main/java/javax/sdp/SdpEncoder.java diff --git a/src/javax/sdp/SdpException.java b/jain-sip-ri/src/main/java/javax/sdp/SdpException.java similarity index 100% rename from src/javax/sdp/SdpException.java rename to jain-sip-ri/src/main/java/javax/sdp/SdpException.java diff --git a/src/javax/sdp/SdpFactory.java b/jain-sip-ri/src/main/java/javax/sdp/SdpFactory.java similarity index 100% rename from src/javax/sdp/SdpFactory.java rename to jain-sip-ri/src/main/java/javax/sdp/SdpFactory.java diff --git a/src/javax/sdp/SdpFactoryException.java b/jain-sip-ri/src/main/java/javax/sdp/SdpFactoryException.java similarity index 100% rename from src/javax/sdp/SdpFactoryException.java rename to jain-sip-ri/src/main/java/javax/sdp/SdpFactoryException.java diff --git a/src/javax/sdp/SdpParseException.java b/jain-sip-ri/src/main/java/javax/sdp/SdpParseException.java similarity index 100% rename from src/javax/sdp/SdpParseException.java rename to jain-sip-ri/src/main/java/javax/sdp/SdpParseException.java diff --git a/src/javax/sdp/SessionDescription.java b/jain-sip-ri/src/main/java/javax/sdp/SessionDescription.java similarity index 100% rename from src/javax/sdp/SessionDescription.java rename to jain-sip-ri/src/main/java/javax/sdp/SessionDescription.java diff --git a/src/javax/sdp/SessionName.java b/jain-sip-ri/src/main/java/javax/sdp/SessionName.java similarity index 100% rename from src/javax/sdp/SessionName.java rename to jain-sip-ri/src/main/java/javax/sdp/SessionName.java diff --git a/src/javax/sdp/Time.java b/jain-sip-ri/src/main/java/javax/sdp/Time.java similarity index 100% rename from src/javax/sdp/Time.java rename to jain-sip-ri/src/main/java/javax/sdp/Time.java diff --git a/src/javax/sdp/TimeDescription.java b/jain-sip-ri/src/main/java/javax/sdp/TimeDescription.java similarity index 100% rename from src/javax/sdp/TimeDescription.java rename to jain-sip-ri/src/main/java/javax/sdp/TimeDescription.java diff --git a/src/javax/sdp/TimeZoneAdjustment.java b/jain-sip-ri/src/main/java/javax/sdp/TimeZoneAdjustment.java similarity index 100% rename from src/javax/sdp/TimeZoneAdjustment.java rename to jain-sip-ri/src/main/java/javax/sdp/TimeZoneAdjustment.java diff --git a/src/javax/sdp/URI.java b/jain-sip-ri/src/main/java/javax/sdp/URI.java similarity index 100% rename from src/javax/sdp/URI.java rename to jain-sip-ri/src/main/java/javax/sdp/URI.java diff --git a/src/javax/sdp/Version.java b/jain-sip-ri/src/main/java/javax/sdp/Version.java similarity index 100% rename from src/javax/sdp/Version.java rename to jain-sip-ri/src/main/java/javax/sdp/Version.java diff --git a/src/javax/sdp/package.html b/jain-sip-ri/src/main/java/javax/sdp/package.html similarity index 100% rename from src/javax/sdp/package.html rename to jain-sip-ri/src/main/java/javax/sdp/package.html diff --git a/src/test/gov/nist/javax/sdp/parser/SdpParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sdp/parser/SdpParserTest.java similarity index 99% rename from src/test/gov/nist/javax/sdp/parser/SdpParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sdp/parser/SdpParserTest.java index 8edf87c8d..2d0f247ec 100644 --- a/src/test/gov/nist/javax/sdp/parser/SdpParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sdp/parser/SdpParserTest.java @@ -1,4 +1,4 @@ -package test.gov.nist.javax.sdp.parser; +package gov.nist.javax.sdp.parser; import gov.nist.javax.sdp.SessionDescriptionImpl; import gov.nist.javax.sdp.fields.AttributeField; diff --git a/src/test/unit/gov/nist/javax/sip/address/JainSipUriTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/address/JainSipUriTest.java similarity index 98% rename from src/test/unit/gov/nist/javax/sip/address/JainSipUriTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/address/JainSipUriTest.java index 9e8d7fb44..4331904e1 100644 --- a/src/test/unit/gov/nist/javax/sip/address/JainSipUriTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/address/JainSipUriTest.java @@ -1,6 +1,4 @@ -package test.unit.gov.nist.javax.sip.address; - -import gov.nist.javax.sip.address.SipUri; +package gov.nist.javax.sip.address; import java.text.ParseException; diff --git a/src/test/unit/gov/nist/javax/sip/address/UriDecoderTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/address/UriDecoderTest.java similarity index 96% rename from src/test/unit/gov/nist/javax/sip/address/UriDecoderTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/address/UriDecoderTest.java index 72bd59d18..aeeb82c52 100644 --- a/src/test/unit/gov/nist/javax/sip/address/UriDecoderTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/address/UriDecoderTest.java @@ -23,9 +23,8 @@ * . * */ -package test.unit.gov.nist.javax.sip.address; +package gov.nist.javax.sip.address; -import gov.nist.javax.sip.address.UriDecoder; import junit.framework.TestCase; /** diff --git a/src/test/unit/gov/nist/javax/sip/multipartmime/MultipartMimeParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/multipartmime/MultipartMimeParserTest.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/multipartmime/MultipartMimeParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/multipartmime/MultipartMimeParserTest.java index d3026d12d..db2225ba6 100644 --- a/src/test/unit/gov/nist/javax/sip/multipartmime/MultipartMimeParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/multipartmime/MultipartMimeParserTest.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.multipartmime; +package gov.nist.javax.sip.multipartmime; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/test/unit/gov/nist/javax/sip/parser/AcceptEncodingParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/AcceptEncodingParserTest.java similarity index 95% rename from src/test/unit/gov/nist/javax/sip/parser/AcceptEncodingParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/AcceptEncodingParserTest.java index e83d3f681..302aba161 100644 --- a/src/test/unit/gov/nist/javax/sip/parser/AcceptEncodingParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/AcceptEncodingParserTest.java @@ -18,7 +18,7 @@ * * */ -package test.unit.gov.nist.javax.sip.parser; +package gov.nist.javax.sip.parser; import gov.nist.javax.sip.parser.*; diff --git a/src/test/unit/gov/nist/javax/sip/parser/AcceptLanguageParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/AcceptLanguageParserTest.java similarity index 81% rename from src/test/unit/gov/nist/javax/sip/parser/AcceptLanguageParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/AcceptLanguageParserTest.java index 9c7b2c21c..db5a9a150 100755 --- a/src/test/unit/gov/nist/javax/sip/parser/AcceptLanguageParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/AcceptLanguageParserTest.java @@ -17,18 +17,18 @@ * * */ -package test.unit.gov.nist.javax.sip.parser; - -import gov.nist.javax.sip.parser.*; +package gov.nist.javax.sip.parser; public class AcceptLanguageParserTest extends ParserTestCase { public void testParser() { String data[] = { "Accept-Language: da \n", - "Accept-Language: \n", - "Accept-Language: ,\n", + "Accept-Language: \n", + //"Accept-Language: ,\n", "Accept-Language: da, en-gb;q=0.8\n", - "Accept-Language: *\n" }; + "Accept-Language: da, en-gb;q=0.8, en;q=0.7\n", + "Accept-Language: *\n" + }; super.testParser(AcceptLanguageParser.class,data); } diff --git a/src/test/unit/gov/nist/javax/sip/parser/AcceptParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/AcceptParserTest.java similarity index 95% rename from src/test/unit/gov/nist/javax/sip/parser/AcceptParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/AcceptParserTest.java index 986ecd6f9..5788fedb8 100644 --- a/src/test/unit/gov/nist/javax/sip/parser/AcceptParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/AcceptParserTest.java @@ -17,7 +17,7 @@ * * */ -package test.unit.gov.nist.javax.sip.parser; +package gov.nist.javax.sip.parser; import gov.nist.javax.sip.parser.*; diff --git a/src/test/unit/gov/nist/javax/sip/parser/AddressParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/AddressParserTest.java similarity index 98% rename from src/test/unit/gov/nist/javax/sip/parser/AddressParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/AddressParserTest.java index ecc76155f..634cc745f 100755 --- a/src/test/unit/gov/nist/javax/sip/parser/AddressParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/AddressParserTest.java @@ -22,7 +22,7 @@ * *The Open SLEE project */ -package test.unit.gov.nist.javax.sip.parser; +package gov.nist.javax.sip.parser; import gov.nist.javax.sip.address.AddressImpl; import gov.nist.javax.sip.parser.AddressParser; diff --git a/src/test/unit/gov/nist/javax/sip/parser/AlertInfoParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/AlertInfoParserTest.java similarity index 92% rename from src/test/unit/gov/nist/javax/sip/parser/AlertInfoParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/AlertInfoParserTest.java index a555d2118..1461a3057 100644 --- a/src/test/unit/gov/nist/javax/sip/parser/AlertInfoParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/AlertInfoParserTest.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.parser; +package gov.nist.javax.sip.parser; import gov.nist.javax.sip.parser.AlertInfoParser; diff --git a/src/test/unit/gov/nist/javax/sip/parser/AllowEventsParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/AllowEventsParserTest.java similarity index 96% rename from src/test/unit/gov/nist/javax/sip/parser/AllowEventsParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/AllowEventsParserTest.java index c92f25412..dcb283cc6 100755 --- a/src/test/unit/gov/nist/javax/sip/parser/AllowEventsParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/AllowEventsParserTest.java @@ -22,7 +22,7 @@ * *The Open SLEE project */ -package test.unit.gov.nist.javax.sip.parser; +package gov.nist.javax.sip.parser; import gov.nist.javax.sip.parser.*; diff --git a/src/test/unit/gov/nist/javax/sip/parser/AllowParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/AllowParserTest.java similarity index 96% rename from src/test/unit/gov/nist/javax/sip/parser/AllowParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/AllowParserTest.java index dd77888a8..5c1ea8ca1 100755 --- a/src/test/unit/gov/nist/javax/sip/parser/AllowParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/AllowParserTest.java @@ -22,7 +22,7 @@ * *The Open SLEE project */ -package test.unit.gov.nist.javax.sip.parser; +package gov.nist.javax.sip.parser; import gov.nist.javax.sip.parser.*; /** diff --git a/src/test/unit/gov/nist/javax/sip/parser/AuthenticationInfoParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/AuthenticationInfoParserTest.java similarity index 96% rename from src/test/unit/gov/nist/javax/sip/parser/AuthenticationInfoParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/AuthenticationInfoParserTest.java index 0304f40b0..7cc556368 100755 --- a/src/test/unit/gov/nist/javax/sip/parser/AuthenticationInfoParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/AuthenticationInfoParserTest.java @@ -22,7 +22,7 @@ * *The Open SLEE project */ -package test.unit.gov.nist.javax.sip.parser; +package gov.nist.javax.sip.parser; import gov.nist.javax.sip.parser.*; diff --git a/src/test/unit/gov/nist/javax/sip/parser/AuthorizationParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/AuthorizationParserTest.java similarity index 97% rename from src/test/unit/gov/nist/javax/sip/parser/AuthorizationParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/AuthorizationParserTest.java index 5a3ca2b1e..237bace0a 100755 --- a/src/test/unit/gov/nist/javax/sip/parser/AuthorizationParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/AuthorizationParserTest.java @@ -22,7 +22,7 @@ * *The Jain-SIP project */ -package test.unit.gov.nist.javax.sip.parser; +package gov.nist.javax.sip.parser; import gov.nist.javax.sip.parser.*; diff --git a/src/test/unit/gov/nist/javax/sip/parser/CSeqParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/CSeqParserTest.java similarity index 91% rename from src/test/unit/gov/nist/javax/sip/parser/CSeqParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/CSeqParserTest.java index 09d7c92dd..39881e839 100755 --- a/src/test/unit/gov/nist/javax/sip/parser/CSeqParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/CSeqParserTest.java @@ -22,14 +22,14 @@ * *The Open SLEE project */ -package test.unit.gov.nist.javax.sip.parser; +package gov.nist.javax.sip.parser; import gov.nist.javax.sip.parser.*; public class CSeqParserTest extends ParserTestCase { /* (non-Javadoc) - * @see test.unit.gov.nist.javax.sip.parser.ParserTestCase#testParser() + * @see gov.nist.javax.sip.parser.ParserTestCase#testParser() */ public void testParser() { diff --git a/src/test/unit/gov/nist/javax/sip/parser/CallIDParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/CallIDParserTest.java similarity index 97% rename from src/test/unit/gov/nist/javax/sip/parser/CallIDParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/CallIDParserTest.java index 481ffce34..b82865e0f 100755 --- a/src/test/unit/gov/nist/javax/sip/parser/CallIDParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/CallIDParserTest.java @@ -22,7 +22,7 @@ * *The Open SLEE project */ -package test.unit.gov.nist.javax.sip.parser; +package gov.nist.javax.sip.parser; import gov.nist.javax.sip.parser.*; /** diff --git a/src/test/unit/gov/nist/javax/sip/parser/CallInfoParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/CallInfoParserTest.java similarity index 96% rename from src/test/unit/gov/nist/javax/sip/parser/CallInfoParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/CallInfoParserTest.java index 9ef6c0db2..5bb6326de 100755 --- a/src/test/unit/gov/nist/javax/sip/parser/CallInfoParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/CallInfoParserTest.java @@ -22,7 +22,7 @@ * *The Open SLEE project */ -package test.unit.gov.nist.javax.sip.parser; +package gov.nist.javax.sip.parser; import gov.nist.javax.sip.parser.*; diff --git a/src/test/unit/gov/nist/javax/sip/parser/ContactParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ContactParserTest.java similarity index 98% rename from src/test/unit/gov/nist/javax/sip/parser/ContactParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ContactParserTest.java index 11e383d75..16d60cb24 100755 --- a/src/test/unit/gov/nist/javax/sip/parser/ContactParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ContactParserTest.java @@ -22,7 +22,7 @@ * *The JAIN-SIP project */ -package test.unit.gov.nist.javax.sip.parser; +package gov.nist.javax.sip.parser; import gov.nist.javax.sip.header.ContactList; import gov.nist.javax.sip.header.ParametersExt; diff --git a/src/test/unit/gov/nist/javax/sip/parser/ContentDispositionParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ContentDispositionParserTest.java similarity index 96% rename from src/test/unit/gov/nist/javax/sip/parser/ContentDispositionParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ContentDispositionParserTest.java index b14996718..4e0c0e284 100755 --- a/src/test/unit/gov/nist/javax/sip/parser/ContentDispositionParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ContentDispositionParserTest.java @@ -22,7 +22,7 @@ * *The Open SLEE project */ -package test.unit.gov.nist.javax.sip.parser; +package gov.nist.javax.sip.parser; import gov.nist.javax.sip.parser.*; diff --git a/src/test/unit/gov/nist/javax/sip/parser/ContentEncodingParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ContentEncodingParserTest.java similarity index 96% rename from src/test/unit/gov/nist/javax/sip/parser/ContentEncodingParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ContentEncodingParserTest.java index 552b8a16b..37306e5af 100755 --- a/src/test/unit/gov/nist/javax/sip/parser/ContentEncodingParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ContentEncodingParserTest.java @@ -22,7 +22,7 @@ * *The JAIN-SIP project. */ -package test.unit.gov.nist.javax.sip.parser; +package gov.nist.javax.sip.parser; import gov.nist.javax.sip.parser.*; diff --git a/src/test/unit/gov/nist/javax/sip/parser/ContentLanguageParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ContentLanguageParserTest.java similarity index 90% rename from src/test/unit/gov/nist/javax/sip/parser/ContentLanguageParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ContentLanguageParserTest.java index df627f2fb..727408811 100755 --- a/src/test/unit/gov/nist/javax/sip/parser/ContentLanguageParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ContentLanguageParserTest.java @@ -22,7 +22,7 @@ * *The Open SLEE project */ -package test.unit.gov.nist.javax.sip.parser; +package gov.nist.javax.sip.parser; import gov.nist.javax.sip.parser.*; /** @@ -33,7 +33,7 @@ public class ContentLanguageParserTest extends ParserTestCase { /* * (non-Javadoc) * - * @see test.unit.gov.nist.javax.sip.parser.ParserTestCase#testParser() + * @see gov.nist.javax.sip.parser.ParserTestCase#testParser() */ public void testParser() { diff --git a/src/test/unit/gov/nist/javax/sip/parser/ContentLengthParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ContentLengthParserTest.java similarity index 96% rename from src/test/unit/gov/nist/javax/sip/parser/ContentLengthParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ContentLengthParserTest.java index 53f8fa18c..63d2fa52c 100755 --- a/src/test/unit/gov/nist/javax/sip/parser/ContentLengthParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ContentLengthParserTest.java @@ -22,7 +22,7 @@ * *The Open SLEE project */ -package test.unit.gov.nist.javax.sip.parser; +package gov.nist.javax.sip.parser; import gov.nist.javax.sip.parser.*; /** diff --git a/src/test/unit/gov/nist/javax/sip/parser/ContentTypeParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ContentTypeParserTest.java similarity index 92% rename from src/test/unit/gov/nist/javax/sip/parser/ContentTypeParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ContentTypeParserTest.java index 923408c79..69231ef71 100755 --- a/src/test/unit/gov/nist/javax/sip/parser/ContentTypeParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ContentTypeParserTest.java @@ -22,7 +22,7 @@ * *The Open SIP project */ -package test.unit.gov.nist.javax.sip.parser; +package gov.nist.javax.sip.parser; import gov.nist.javax.sip.parser.*; /** @@ -31,7 +31,7 @@ public class ContentTypeParserTest extends ParserTestCase { /* (non-Javadoc) - * @see test.unit.gov.nist.javax.sip.parser.ParserTestCase#testParser() + * @see gov.nist.javax.sip.parser.ParserTestCase#testParser() */ public void testParser() { diff --git a/src/test/unit/gov/nist/javax/sip/parser/DateParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/DateParserTest.java similarity index 96% rename from src/test/unit/gov/nist/javax/sip/parser/DateParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/DateParserTest.java index 5559804d3..64ff6b261 100755 --- a/src/test/unit/gov/nist/javax/sip/parser/DateParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/DateParserTest.java @@ -22,7 +22,7 @@ * *The Open SLEE project */ -package test.unit.gov.nist.javax.sip.parser; +package gov.nist.javax.sip.parser; import gov.nist.javax.sip.parser.*; diff --git a/src/test/unit/gov/nist/javax/sip/parser/ErrorInfoParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ErrorInfoParserTest.java similarity index 96% rename from src/test/unit/gov/nist/javax/sip/parser/ErrorInfoParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ErrorInfoParserTest.java index 0d2d88cb3..fea177d47 100755 --- a/src/test/unit/gov/nist/javax/sip/parser/ErrorInfoParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ErrorInfoParserTest.java @@ -22,7 +22,7 @@ * *The Open SIP project */ -package test.unit.gov.nist.javax.sip.parser; +package gov.nist.javax.sip.parser; import gov.nist.javax.sip.parser.*; diff --git a/src/test/unit/gov/nist/javax/sip/parser/EventParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/EventParserTest.java similarity index 90% rename from src/test/unit/gov/nist/javax/sip/parser/EventParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/EventParserTest.java index 7248d7575..c15cefa41 100755 --- a/src/test/unit/gov/nist/javax/sip/parser/EventParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/EventParserTest.java @@ -22,7 +22,7 @@ * *The JAIN-SIP project */ -package test.unit.gov.nist.javax.sip.parser; +package gov.nist.javax.sip.parser; /** * @@ -30,7 +30,7 @@ public class EventParserTest extends ParserTestCase { /* (non-Javadoc) - * @see test.unit.gov.nist.javax.sip.parser.ParserTestCase#testParser() + * @see gov.nist.javax.sip.parser.ParserTestCase#testParser() */ public void testParser() { diff --git a/src/test/unit/gov/nist/javax/sip/parser/ExpiresParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ExpiresParserTest.java similarity index 90% rename from src/test/unit/gov/nist/javax/sip/parser/ExpiresParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ExpiresParserTest.java index f2ddefa01..efb752228 100755 --- a/src/test/unit/gov/nist/javax/sip/parser/ExpiresParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ExpiresParserTest.java @@ -22,7 +22,7 @@ * *The JAIN-SIP project */ -package test.unit.gov.nist.javax.sip.parser; +package gov.nist.javax.sip.parser; import gov.nist.javax.sip.parser.*; /** @@ -31,7 +31,7 @@ public class ExpiresParserTest extends ParserTestCase { /* (non-Javadoc) - * @see test.unit.gov.nist.javax.sip.parser.ParserTestCase#testParser() + * @see gov.nist.javax.sip.parser.ParserTestCase#testParser() */ public void testParser() { diff --git a/src/test/unit/gov/nist/javax/sip/parser/FromParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/FromParserTest.java similarity index 92% rename from src/test/unit/gov/nist/javax/sip/parser/FromParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/FromParserTest.java index d7e5b243d..d2d9a789a 100755 --- a/src/test/unit/gov/nist/javax/sip/parser/FromParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/FromParserTest.java @@ -22,7 +22,7 @@ * *The JAIN-SIP project */ -package test.unit.gov.nist.javax.sip.parser; +package gov.nist.javax.sip.parser; /** * @@ -30,7 +30,7 @@ public class FromParserTest extends ParserTestCase { /* (non-Javadoc) - * @see test.unit.gov.nist.javax.sip.parser.ParserTestCase#testParser() + * @see gov.nist.javax.sip.parser.ParserTestCase#testParser() */ public void testParser() { diff --git a/src/test/unit/gov/nist/javax/sip/parser/HostNameParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/HostNameParserTest.java similarity index 96% rename from src/test/unit/gov/nist/javax/sip/parser/HostNameParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/HostNameParserTest.java index db2e1328c..fb176c964 100644 --- a/src/test/unit/gov/nist/javax/sip/parser/HostNameParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/HostNameParserTest.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.parser; +package gov.nist.javax.sip.parser; import gov.nist.core.HostNameParser; import gov.nist.core.HostPort; diff --git a/src/test/unit/gov/nist/javax/sip/parser/InReplyToParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/InReplyToParserTest.java similarity index 91% rename from src/test/unit/gov/nist/javax/sip/parser/InReplyToParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/InReplyToParserTest.java index b26497da3..be9c514ea 100755 --- a/src/test/unit/gov/nist/javax/sip/parser/InReplyToParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/InReplyToParserTest.java @@ -22,7 +22,7 @@ * *The JAIN-SIP project */ -package test.unit.gov.nist.javax.sip.parser; +package gov.nist.javax.sip.parser; import gov.nist.javax.sip.parser.InReplyToParser; @@ -32,7 +32,7 @@ public class InReplyToParserTest extends ParserTestCase { /* (non-Javadoc) - * @see test.unit.gov.nist.javax.sip.parser.ParserTestCase#testParser() + * @see gov.nist.javax.sip.parser.ParserTestCase#testParser() */ public void testParser() { diff --git a/src/test/unit/gov/nist/javax/sip/parser/JunkAtEndOfMessageTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/JunkAtEndOfMessageTest.java similarity index 98% rename from src/test/unit/gov/nist/javax/sip/parser/JunkAtEndOfMessageTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/JunkAtEndOfMessageTest.java index 506afc66a..9b2dd51a8 100644 --- a/src/test/unit/gov/nist/javax/sip/parser/JunkAtEndOfMessageTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/JunkAtEndOfMessageTest.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.parser; +package gov.nist.javax.sip.parser; import gov.nist.javax.sip.message.MessageFactoryImpl; diff --git a/src/test/unit/gov/nist/javax/sip/parser/MaxForwardsParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/MaxForwardsParserTest.java similarity index 90% rename from src/test/unit/gov/nist/javax/sip/parser/MaxForwardsParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/MaxForwardsParserTest.java index 87326b83d..a967ff5a4 100755 --- a/src/test/unit/gov/nist/javax/sip/parser/MaxForwardsParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/MaxForwardsParserTest.java @@ -22,7 +22,7 @@ * *The JAIN-SIP Project */ -package test.unit.gov.nist.javax.sip.parser; +package gov.nist.javax.sip.parser; import gov.nist.javax.sip.parser.MaxForwardsParser; @@ -32,7 +32,7 @@ public class MaxForwardsParserTest extends ParserTestCase { /* (non-Javadoc) - * @see test.unit.gov.nist.javax.sip.parser.ParserTestCase#testParser() + * @see gov.nist.javax.sip.parser.ParserTestCase#testParser() */ public void testParser() { diff --git a/src/test/unit/gov/nist/javax/sip/parser/MimeVersionParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/MimeVersionParserTest.java similarity index 90% rename from src/test/unit/gov/nist/javax/sip/parser/MimeVersionParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/MimeVersionParserTest.java index e0724b6b3..e197ee61e 100755 --- a/src/test/unit/gov/nist/javax/sip/parser/MimeVersionParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/MimeVersionParserTest.java @@ -22,7 +22,7 @@ * *The Open SIP project */ -package test.unit.gov.nist.javax.sip.parser; +package gov.nist.javax.sip.parser; import gov.nist.javax.sip.parser.MimeVersionParser; @@ -32,7 +32,7 @@ public class MimeVersionParserTest extends ParserTestCase { /* (non-Javadoc) - * @see test.unit.gov.nist.javax.sip.parser.ParserTestCase#testParser() + * @see gov.nist.javax.sip.parser.ParserTestCase#testParser() */ public void testParser() { diff --git a/src/test/unit/gov/nist/javax/sip/parser/MinExpiresParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/MinExpiresParserTest.java similarity index 90% rename from src/test/unit/gov/nist/javax/sip/parser/MinExpiresParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/MinExpiresParserTest.java index 0d5a62697..9c6e57274 100755 --- a/src/test/unit/gov/nist/javax/sip/parser/MinExpiresParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/MinExpiresParserTest.java @@ -22,7 +22,7 @@ * *The Open SIP project */ -package test.unit.gov.nist.javax.sip.parser; +package gov.nist.javax.sip.parser; import gov.nist.javax.sip.parser.MinExpiresParser; @@ -32,7 +32,7 @@ public class MinExpiresParserTest extends ParserTestCase { /* (non-Javadoc) - * @see test.unit.gov.nist.javax.sip.parser.ParserTestCase#testParser() + * @see gov.nist.javax.sip.parser.ParserTestCase#testParser() */ public void testParser() { diff --git a/src/test/unit/gov/nist/javax/sip/parser/OrganizationParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/OrganizationParserTest.java similarity index 90% rename from src/test/unit/gov/nist/javax/sip/parser/OrganizationParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/OrganizationParserTest.java index 5bfa9a7de..71f5ed7a7 100755 --- a/src/test/unit/gov/nist/javax/sip/parser/OrganizationParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/OrganizationParserTest.java @@ -22,7 +22,7 @@ * *The Open SIP project */ -package test.unit.gov.nist.javax.sip.parser; +package gov.nist.javax.sip.parser; import gov.nist.javax.sip.parser.OrganizationParser; @@ -34,7 +34,7 @@ public class OrganizationParserTest extends ParserTestCase { "Organization: Boxes by Bob\n" }; /* (non-Javadoc) - * @see test.unit.gov.nist.javax.sip.parser.ParserTestCase#testParser() + * @see gov.nist.javax.sip.parser.ParserTestCase#testParser() */ public void testParser() { diff --git a/src/test/unit/gov/nist/javax/sip/parser/ParserTestCase.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ParserTestCase.java similarity index 98% rename from src/test/unit/gov/nist/javax/sip/parser/ParserTestCase.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ParserTestCase.java index 0be81fd78..6811203da 100755 --- a/src/test/unit/gov/nist/javax/sip/parser/ParserTestCase.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ParserTestCase.java @@ -22,7 +22,7 @@ * *The Open SLEE project */ -package test.unit.gov.nist.javax.sip.parser; +package gov.nist.javax.sip.parser; import gov.nist.javax.sip.header.SIPHeader; import gov.nist.javax.sip.header.SIPHeaderList; diff --git a/src/test/unit/gov/nist/javax/sip/parser/ParserTestSuite.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ParserTestSuite.java similarity index 98% rename from src/test/unit/gov/nist/javax/sip/parser/ParserTestSuite.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ParserTestSuite.java index fcb6682fd..999b1bf52 100644 --- a/src/test/unit/gov/nist/javax/sip/parser/ParserTestSuite.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ParserTestSuite.java @@ -17,7 +17,7 @@ * * */ -package test.unit.gov.nist.javax.sip.parser; +package gov.nist.javax.sip.parser; import junit.framework.*; diff --git a/src/test/unit/gov/nist/javax/sip/parser/RecordRouteParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/RecordRouteParserTest.java similarity index 95% rename from src/test/unit/gov/nist/javax/sip/parser/RecordRouteParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/RecordRouteParserTest.java index 16ef3c31b..c150d23d9 100644 --- a/src/test/unit/gov/nist/javax/sip/parser/RecordRouteParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/RecordRouteParserTest.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.parser; +package gov.nist.javax.sip.parser; import gov.nist.javax.sip.parser.RecordRouteParser; import gov.nist.javax.sip.parser.RouteParser; diff --git a/src/test/unit/gov/nist/javax/sip/parser/ReferToParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ReferToParserTest.java similarity index 93% rename from src/test/unit/gov/nist/javax/sip/parser/ReferToParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ReferToParserTest.java index 4da8abff8..c8b56d915 100644 --- a/src/test/unit/gov/nist/javax/sip/parser/ReferToParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ReferToParserTest.java @@ -28,7 +28,7 @@ * */ -package test.unit.gov.nist.javax.sip.parser; +package gov.nist.javax.sip.parser; import gov.nist.javax.sip.parser.ReferToParser; @@ -40,7 +40,7 @@ public class ReferToParserTest extends ParserTestCase { /* (non-Javadoc) - * @see test.unit.gov.nist.javax.sip.parser.ParserTestCase#testParser() + * @see gov.nist.javax.sip.parser.ParserTestCase#testParser() */ public void testParser() { diff --git a/src/test/unit/gov/nist/javax/sip/parser/RetryAfterParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/RetryAfterParserTest.java similarity index 96% rename from src/test/unit/gov/nist/javax/sip/parser/RetryAfterParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/RetryAfterParserTest.java index 9627d946a..cb3318a7b 100644 --- a/src/test/unit/gov/nist/javax/sip/parser/RetryAfterParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/RetryAfterParserTest.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.parser; +package gov.nist.javax.sip.parser; import gov.nist.javax.sip.header.RetryAfter; import gov.nist.javax.sip.parser.RetryAfterParser; diff --git a/src/test/unit/gov/nist/javax/sip/parser/RouteParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/RouteParserTest.java similarity index 97% rename from src/test/unit/gov/nist/javax/sip/parser/RouteParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/RouteParserTest.java index 2cf158868..e80c84cd3 100644 --- a/src/test/unit/gov/nist/javax/sip/parser/RouteParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/RouteParserTest.java @@ -17,7 +17,7 @@ * * */ -package test.unit.gov.nist.javax.sip.parser; +package gov.nist.javax.sip.parser; import gov.nist.javax.sip.parser.RouteParser; diff --git a/src/test/unit/gov/nist/javax/sip/parser/RussianDisplayNameTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/RussianDisplayNameTest.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/parser/RussianDisplayNameTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/RussianDisplayNameTest.java index 6834ab182..7c0e4a071 100644 --- a/src/test/unit/gov/nist/javax/sip/parser/RussianDisplayNameTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/RussianDisplayNameTest.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.parser; +package gov.nist.javax.sip.parser; import java.nio.charset.Charset; diff --git a/src/test/unit/gov/nist/javax/sip/parser/SupportedParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/SupportedParserTest.java similarity index 93% rename from src/test/unit/gov/nist/javax/sip/parser/SupportedParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/SupportedParserTest.java index 263ae4971..a0057153e 100644 --- a/src/test/unit/gov/nist/javax/sip/parser/SupportedParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/SupportedParserTest.java @@ -22,7 +22,7 @@ * *The JAIN-SIP Project */ -package test.unit.gov.nist.javax.sip.parser; +package gov.nist.javax.sip.parser; import gov.nist.javax.sip.header.Supported; import gov.nist.javax.sip.header.SupportedList; @@ -34,7 +34,7 @@ public class SupportedParserTest extends ParserTestCase { /* (non-Javadoc) - * @see test.unit.gov.nist.javax.sip.parser.ParserTestCase#testParser() + * @see gov.nist.javax.sip.parser.ParserTestCase#testParser() */ public void testParser() { diff --git a/src/test/unit/gov/nist/javax/sip/parser/TimeStampParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/TimeStampParserTest.java similarity index 91% rename from src/test/unit/gov/nist/javax/sip/parser/TimeStampParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/TimeStampParserTest.java index b551a7d9d..a1ee8476a 100644 --- a/src/test/unit/gov/nist/javax/sip/parser/TimeStampParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/TimeStampParserTest.java @@ -17,10 +17,10 @@ * * */ -package test.unit.gov.nist.javax.sip.parser; +package gov.nist.javax.sip.parser; import gov.nist.javax.sip.parser.TimeStampParser; -import test.unit.gov.nist.javax.sip.parser.ParserTestCase; +import gov.nist.javax.sip.parser.ParserTestCase; public class TimeStampParserTest extends ParserTestCase { public void testParser() { diff --git a/src/test/unit/gov/nist/javax/sip/parser/URLParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/URLParserTest.java similarity index 98% rename from src/test/unit/gov/nist/javax/sip/parser/URLParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/URLParserTest.java index c860dd26f..3f8aed3f7 100755 --- a/src/test/unit/gov/nist/javax/sip/parser/URLParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/URLParserTest.java @@ -22,7 +22,7 @@ * *The JAIN-SIP project. */ -package test.unit.gov.nist.javax.sip.parser; +package gov.nist.javax.sip.parser; import gov.nist.javax.sip.address.*; import gov.nist.javax.sip.parser.*; import junit.framework.TestCase; diff --git a/src/test/unit/gov/nist/javax/sip/parser/ViaParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ViaParserTest.java similarity index 98% rename from src/test/unit/gov/nist/javax/sip/parser/ViaParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ViaParserTest.java index 3d26af186..568ceb7da 100755 --- a/src/test/unit/gov/nist/javax/sip/parser/ViaParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ViaParserTest.java @@ -17,7 +17,7 @@ * * */ -package test.unit.gov.nist.javax.sip.parser; +package gov.nist.javax.sip.parser; import gov.nist.javax.sip.parser.*; diff --git a/src/test/unit/gov/nist/javax/sip/parser/WarningParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/WarningParserTest.java similarity index 97% rename from src/test/unit/gov/nist/javax/sip/parser/WarningParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/WarningParserTest.java index 405f1cb95..b77785e18 100644 --- a/src/test/unit/gov/nist/javax/sip/parser/WarningParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/WarningParserTest.java @@ -17,7 +17,7 @@ * * */ -package test.unit.gov.nist.javax.sip.parser; +package gov.nist.javax.sip.parser; import gov.nist.javax.sip.parser.ViaParser; import gov.nist.javax.sip.parser.WarningParser; diff --git a/src/test/unit/gov/nist/javax/sip/parser/extensions/JoinParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/extensions/JoinParserTest.java similarity index 75% rename from src/test/unit/gov/nist/javax/sip/parser/extensions/JoinParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/extensions/JoinParserTest.java index 82e9684d7..e32fa0659 100644 --- a/src/test/unit/gov/nist/javax/sip/parser/extensions/JoinParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/extensions/JoinParserTest.java @@ -1,7 +1,7 @@ -package test.unit.gov.nist.javax.sip.parser.extensions; +package gov.nist.javax.sip.parser.extensions; import gov.nist.javax.sip.parser.extensions.JoinParser; -import test.unit.gov.nist.javax.sip.parser.ParserTestCase; +import gov.nist.javax.sip.parser.ParserTestCase; public class JoinParserTest extends ParserTestCase { diff --git a/src/test/unit/gov/nist/javax/sip/parser/extensions/MinSEParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/extensions/MinSEParserTest.java similarity index 75% rename from src/test/unit/gov/nist/javax/sip/parser/extensions/MinSEParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/extensions/MinSEParserTest.java index 3886fcb72..e150af070 100644 --- a/src/test/unit/gov/nist/javax/sip/parser/extensions/MinSEParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/extensions/MinSEParserTest.java @@ -1,8 +1,8 @@ -package test.unit.gov.nist.javax.sip.parser.extensions; +package gov.nist.javax.sip.parser.extensions; import gov.nist.javax.sip.parser.extensions.MinSEParser; -import test.unit.gov.nist.javax.sip.parser.*; +import gov.nist.javax.sip.parser.*; public class MinSEParserTest extends ParserTestCase { diff --git a/src/test/unit/gov/nist/javax/sip/parser/extensions/ReferencesParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/extensions/ReferencesParserTest.java similarity index 83% rename from src/test/unit/gov/nist/javax/sip/parser/extensions/ReferencesParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/extensions/ReferencesParserTest.java index 812b4c42f..0ae6724cd 100644 --- a/src/test/unit/gov/nist/javax/sip/parser/extensions/ReferencesParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/extensions/ReferencesParserTest.java @@ -1,7 +1,7 @@ -package test.unit.gov.nist.javax.sip.parser.extensions; +package gov.nist.javax.sip.parser.extensions; import gov.nist.javax.sip.parser.extensions.ReferencesParser; -import test.unit.gov.nist.javax.sip.parser.ParserTestCase; +import gov.nist.javax.sip.parser.ParserTestCase; public class ReferencesParserTest extends ParserTestCase { diff --git a/src/test/unit/gov/nist/javax/sip/parser/extensions/ReferredByParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/extensions/ReferredByParserTest.java similarity index 86% rename from src/test/unit/gov/nist/javax/sip/parser/extensions/ReferredByParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/extensions/ReferredByParserTest.java index 0a723b696..695bea089 100644 --- a/src/test/unit/gov/nist/javax/sip/parser/extensions/ReferredByParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/extensions/ReferredByParserTest.java @@ -1,6 +1,6 @@ -package test.unit.gov.nist.javax.sip.parser.extensions; +package gov.nist.javax.sip.parser.extensions; -import test.unit.gov.nist.javax.sip.parser.ParserTestCase; +import gov.nist.javax.sip.parser.ParserTestCase; import gov.nist.javax.sip.parser.extensions.ReferredByParser; public class ReferredByParserTest extends ParserTestCase { diff --git a/src/test/unit/gov/nist/javax/sip/parser/extensions/ReplacesParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/extensions/ReplacesParserTest.java similarity index 76% rename from src/test/unit/gov/nist/javax/sip/parser/extensions/ReplacesParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/extensions/ReplacesParserTest.java index f2d03d71b..15291e1e1 100644 --- a/src/test/unit/gov/nist/javax/sip/parser/extensions/ReplacesParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/extensions/ReplacesParserTest.java @@ -1,6 +1,6 @@ -package test.unit.gov.nist.javax.sip.parser.extensions; +package gov.nist.javax.sip.parser.extensions; -import test.unit.gov.nist.javax.sip.parser.ParserTestCase; +import gov.nist.javax.sip.parser.ParserTestCase; import gov.nist.javax.sip.parser.extensions.ReplacesParser; public class ReplacesParserTest extends ParserTestCase { diff --git a/src/test/unit/gov/nist/javax/sip/parser/extensions/SessionExpiresParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/extensions/SessionExpiresParserTest.java similarity index 75% rename from src/test/unit/gov/nist/javax/sip/parser/extensions/SessionExpiresParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/extensions/SessionExpiresParserTest.java index 1ad917a5a..445331e18 100644 --- a/src/test/unit/gov/nist/javax/sip/parser/extensions/SessionExpiresParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/extensions/SessionExpiresParserTest.java @@ -1,6 +1,6 @@ -package test.unit.gov.nist.javax.sip.parser.extensions; +package gov.nist.javax.sip.parser.extensions; -import test.unit.gov.nist.javax.sip.parser.ParserTestCase; +import gov.nist.javax.sip.parser.ParserTestCase; import gov.nist.javax.sip.parser.extensions.SessionExpiresParser; public class SessionExpiresParserTest extends ParserTestCase { diff --git a/src/test/unit/gov/nist/javax/sip/parser/ims/PAccessNetworkInfoParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/PAccessNetworkInfoParserTest.java similarity index 97% rename from src/test/unit/gov/nist/javax/sip/parser/ims/PAccessNetworkInfoParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/PAccessNetworkInfoParserTest.java index dde6124e4..3a6d59407 100644 --- a/src/test/unit/gov/nist/javax/sip/parser/ims/PAccessNetworkInfoParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/PAccessNetworkInfoParserTest.java @@ -22,10 +22,10 @@ * PRODUCT OF PT INOVACAO - EST DEPARTMENT and Telecommunications Institute (Aveiro, Portugal) * ************************************************************************************************/ -package test.unit.gov.nist.javax.sip.parser.ims; +package gov.nist.javax.sip.parser.ims; import gov.nist.javax.sip.parser.ims.PAccessNetworkInfoParser; -import test.unit.gov.nist.javax.sip.parser.ParserTestCase; +import gov.nist.javax.sip.parser.ParserTestCase; public class PAccessNetworkInfoParserTest extends ParserTestCase { diff --git a/src/test/unit/gov/nist/javax/sip/parser/ims/PAssertedIdentityParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/PAssertedIdentityParserTest.java similarity index 93% rename from src/test/unit/gov/nist/javax/sip/parser/ims/PAssertedIdentityParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/PAssertedIdentityParserTest.java index 78053f8f8..ec9512d33 100644 --- a/src/test/unit/gov/nist/javax/sip/parser/ims/PAssertedIdentityParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/PAssertedIdentityParserTest.java @@ -22,10 +22,10 @@ * PRODUCT OF PT INOVACAO - EST DEPARTMENT and Telecommunications Institute (Aveiro, Portugal) * ************************************************************************************************/ -package test.unit.gov.nist.javax.sip.parser.ims; +package gov.nist.javax.sip.parser.ims; import gov.nist.javax.sip.parser.ims.PAssertedIdentityParser; -import test.unit.gov.nist.javax.sip.parser.ParserTestCase; +import gov.nist.javax.sip.parser.ParserTestCase; public class PAssertedIdentityParserTest extends ParserTestCase { diff --git a/src/test/unit/gov/nist/javax/sip/parser/ims/PAssertedServiceParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/PAssertedServiceParserTest.java similarity index 96% rename from src/test/unit/gov/nist/javax/sip/parser/ims/PAssertedServiceParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/PAssertedServiceParserTest.java index cea2fb9cc..c1568b8e7 100644 --- a/src/test/unit/gov/nist/javax/sip/parser/ims/PAssertedServiceParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/PAssertedServiceParserTest.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.parser.ims; +package gov.nist.javax.sip.parser.ims; /* * Conditions Of Use * @@ -27,7 +27,7 @@ import gov.nist.javax.sip.header.HeaderFactoryImpl; import gov.nist.javax.sip.header.ims.PAssertedServiceHeader; import gov.nist.javax.sip.parser.ims.PAssertedServiceParser; -import test.unit.gov.nist.javax.sip.parser.ParserTestCase; +import gov.nist.javax.sip.parser.ParserTestCase; /** * * @author aayush.bhatnagar diff --git a/src/test/unit/gov/nist/javax/sip/parser/ims/PAssociatedURIParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/PAssociatedURIParserTest.java similarity index 94% rename from src/test/unit/gov/nist/javax/sip/parser/ims/PAssociatedURIParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/PAssociatedURIParserTest.java index 060eafe4d..ef4547199 100644 --- a/src/test/unit/gov/nist/javax/sip/parser/ims/PAssociatedURIParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/PAssociatedURIParserTest.java @@ -22,10 +22,10 @@ * PRODUCT OF PT INOVACAO - EST DEPARTMENT and Telecommunications Institute (Aveiro, Portugal) * ************************************************************************************************/ -package test.unit.gov.nist.javax.sip.parser.ims; +package gov.nist.javax.sip.parser.ims; import gov.nist.javax.sip.parser.ims.PAssociatedURIParser; -import test.unit.gov.nist.javax.sip.parser.*; +import gov.nist.javax.sip.parser.*; /** * @author Miguel Freitas diff --git a/src/test/unit/gov/nist/javax/sip/parser/ims/PCalledPartyIDParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/PCalledPartyIDParserTest.java similarity index 93% rename from src/test/unit/gov/nist/javax/sip/parser/ims/PCalledPartyIDParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/PCalledPartyIDParserTest.java index f7ee5dcd3..883c30524 100644 --- a/src/test/unit/gov/nist/javax/sip/parser/ims/PCalledPartyIDParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/PCalledPartyIDParserTest.java @@ -22,10 +22,10 @@ * PRODUCT OF PT INOVACAO - EST DEPARTMENT and Telecommunications Institute (Aveiro, Portugal) * ************************************************************************************************/ -package test.unit.gov.nist.javax.sip.parser.ims; +package gov.nist.javax.sip.parser.ims; import gov.nist.javax.sip.parser.ims.PCalledPartyIDParser; -import test.unit.gov.nist.javax.sip.parser.ParserTestCase; +import gov.nist.javax.sip.parser.ParserTestCase; public class PCalledPartyIDParserTest extends ParserTestCase { diff --git a/src/test/unit/gov/nist/javax/sip/parser/ims/PChargingFunctionAddressesParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/PChargingFunctionAddressesParserTest.java similarity index 95% rename from src/test/unit/gov/nist/javax/sip/parser/ims/PChargingFunctionAddressesParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/PChargingFunctionAddressesParserTest.java index dfb5fb7de..fafaa5deb 100644 --- a/src/test/unit/gov/nist/javax/sip/parser/ims/PChargingFunctionAddressesParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/PChargingFunctionAddressesParserTest.java @@ -22,10 +22,10 @@ * PRODUCT OF PT INOVACAO - EST DEPARTMENT and Telecommunications Institute (Aveiro, Portugal) * ************************************************************************************************/ -package test.unit.gov.nist.javax.sip.parser.ims; +package gov.nist.javax.sip.parser.ims; import gov.nist.javax.sip.parser.ims.PChargingFunctionAddressesParser; -import test.unit.gov.nist.javax.sip.parser.*; +import gov.nist.javax.sip.parser.*; /** * @author Miguel Freitas diff --git a/src/test/unit/gov/nist/javax/sip/parser/ims/PMediaAuthorizationParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/PMediaAuthorizationParserTest.java similarity index 93% rename from src/test/unit/gov/nist/javax/sip/parser/ims/PMediaAuthorizationParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/PMediaAuthorizationParserTest.java index 20e8751d9..d4d20897a 100644 --- a/src/test/unit/gov/nist/javax/sip/parser/ims/PMediaAuthorizationParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/PMediaAuthorizationParserTest.java @@ -22,10 +22,10 @@ * PRODUCT OF PT INOVACAO - EST DEPARTMENT and Telecommunications Institute (Aveiro, Portugal) * ************************************************************************************************/ -package test.unit.gov.nist.javax.sip.parser.ims; +package gov.nist.javax.sip.parser.ims; import gov.nist.javax.sip.parser.ims.PMediaAuthorizationParser; -import test.unit.gov.nist.javax.sip.parser.ParserTestCase; +import gov.nist.javax.sip.parser.ParserTestCase; public class PMediaAuthorizationParserTest extends ParserTestCase { diff --git a/src/test/unit/gov/nist/javax/sip/parser/ims/PPreferredIdentityParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/PPreferredIdentityParserTest.java similarity index 93% rename from src/test/unit/gov/nist/javax/sip/parser/ims/PPreferredIdentityParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/PPreferredIdentityParserTest.java index 7e73d3492..3baf78396 100644 --- a/src/test/unit/gov/nist/javax/sip/parser/ims/PPreferredIdentityParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/PPreferredIdentityParserTest.java @@ -22,10 +22,10 @@ * PRODUCT OF PT INOVACAO - EST DEPARTMENT and Telecommunications Institute (Aveiro, Portugal) * ************************************************************************************************/ -package test.unit.gov.nist.javax.sip.parser.ims; +package gov.nist.javax.sip.parser.ims; import gov.nist.javax.sip.parser.ims.PPreferredIdentityParser; -import test.unit.gov.nist.javax.sip.parser.ParserTestCase; +import gov.nist.javax.sip.parser.ParserTestCase; public class PPreferredIdentityParserTest extends ParserTestCase { diff --git a/src/test/unit/gov/nist/javax/sip/parser/ims/PPreferredServiceParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/PPreferredServiceParserTest.java similarity index 96% rename from src/test/unit/gov/nist/javax/sip/parser/ims/PPreferredServiceParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/PPreferredServiceParserTest.java index 99860c72f..a894b1840 100644 --- a/src/test/unit/gov/nist/javax/sip/parser/ims/PPreferredServiceParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/PPreferredServiceParserTest.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.parser.ims; +package gov.nist.javax.sip.parser.ims; /* * Conditions Of Use * @@ -27,7 +27,7 @@ import gov.nist.javax.sip.header.HeaderFactoryImpl; import gov.nist.javax.sip.header.ims.PPreferredServiceHeader; import gov.nist.javax.sip.parser.ims.PPreferredServiceParser; -import test.unit.gov.nist.javax.sip.parser.ParserTestCase; +import gov.nist.javax.sip.parser.ParserTestCase; /** * * @author aayush.bhatnagar diff --git a/src/test/unit/gov/nist/javax/sip/parser/ims/PProfileKeyParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/PProfileKeyParserTest.java similarity index 96% rename from src/test/unit/gov/nist/javax/sip/parser/ims/PProfileKeyParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/PProfileKeyParserTest.java index bbadbe99f..d3d4001a5 100644 --- a/src/test/unit/gov/nist/javax/sip/parser/ims/PProfileKeyParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/PProfileKeyParserTest.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.parser.ims; +package gov.nist.javax.sip.parser.ims; /* * Conditions Of Use * @@ -30,7 +30,7 @@ import gov.nist.javax.sip.header.HeaderFactoryImpl; import gov.nist.javax.sip.header.ims.PProfileKeyHeader; import gov.nist.javax.sip.parser.ims.PProfileKeyParser; -import test.unit.gov.nist.javax.sip.parser.ParserTestCase; +import gov.nist.javax.sip.parser.ParserTestCase; /** * * @author aayush.bhatnagar diff --git a/src/test/unit/gov/nist/javax/sip/parser/ims/PServedUserParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/PServedUserParserTest.java similarity index 96% rename from src/test/unit/gov/nist/javax/sip/parser/ims/PServedUserParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/PServedUserParserTest.java index 466317eb6..c5ede299c 100644 --- a/src/test/unit/gov/nist/javax/sip/parser/ims/PServedUserParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/PServedUserParserTest.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.parser.ims; +package gov.nist.javax.sip.parser.ims; /* * Conditions Of Use * @@ -30,7 +30,7 @@ import gov.nist.javax.sip.header.HeaderFactoryImpl; import gov.nist.javax.sip.header.ims.PServedUserHeader; import gov.nist.javax.sip.parser.ims.PServedUserParser; -import test.unit.gov.nist.javax.sip.parser.ParserTestCase; +import gov.nist.javax.sip.parser.ParserTestCase; /** * diff --git a/src/test/unit/gov/nist/javax/sip/parser/ims/PUserDatabaseParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/PUserDatabaseParserTest.java similarity index 96% rename from src/test/unit/gov/nist/javax/sip/parser/ims/PUserDatabaseParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/PUserDatabaseParserTest.java index 58538a78b..46e18f937 100644 --- a/src/test/unit/gov/nist/javax/sip/parser/ims/PUserDatabaseParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/PUserDatabaseParserTest.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.parser.ims; +package gov.nist.javax.sip.parser.ims; /* * Conditions Of Use * @@ -30,7 +30,7 @@ import gov.nist.javax.sip.header.HeaderFactoryImpl; import gov.nist.javax.sip.header.ims.PUserDatabaseHeader; import gov.nist.javax.sip.parser.ims.PUserDatabaseParser; -import test.unit.gov.nist.javax.sip.parser.ParserTestCase; +import gov.nist.javax.sip.parser.ParserTestCase; /** * * @author aayush.bhatnagar diff --git a/src/test/unit/gov/nist/javax/sip/parser/ims/PVisitedNetworkIDParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/PVisitedNetworkIDParserTest.java similarity index 93% rename from src/test/unit/gov/nist/javax/sip/parser/ims/PVisitedNetworkIDParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/PVisitedNetworkIDParserTest.java index 9d5659362..3e277a819 100644 --- a/src/test/unit/gov/nist/javax/sip/parser/ims/PVisitedNetworkIDParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/PVisitedNetworkIDParserTest.java @@ -22,10 +22,10 @@ * PRODUCT OF PT INOVACAO - EST DEPARTMENT and Telecommunications Institute (Aveiro, Portugal) * ************************************************************************************************/ -package test.unit.gov.nist.javax.sip.parser.ims; +package gov.nist.javax.sip.parser.ims; import gov.nist.javax.sip.parser.ims.PVisitedNetworkIDParser; -import test.unit.gov.nist.javax.sip.parser.ParserTestCase; +import gov.nist.javax.sip.parser.ParserTestCase; public class PVisitedNetworkIDParserTest extends ParserTestCase { diff --git a/src/test/unit/gov/nist/javax/sip/parser/ims/PathParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/PathParserTest.java similarity index 92% rename from src/test/unit/gov/nist/javax/sip/parser/ims/PathParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/PathParserTest.java index 2314dbfde..9611e4f63 100644 --- a/src/test/unit/gov/nist/javax/sip/parser/ims/PathParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/PathParserTest.java @@ -22,10 +22,10 @@ * PRODUCT OF PT INOVACAO - EST DEPARTMENT and Telecommunications Institute (Aveiro, Portugal) * ************************************************************************************************/ -package test.unit.gov.nist.javax.sip.parser.ims; +package gov.nist.javax.sip.parser.ims; import gov.nist.javax.sip.parser.ims.PathParser; -import test.unit.gov.nist.javax.sip.parser.ParserTestCase; +import gov.nist.javax.sip.parser.ParserTestCase; public class PathParserTest extends ParserTestCase { diff --git a/src/test/unit/gov/nist/javax/sip/parser/ims/PrivacyParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/PrivacyParserTest.java similarity index 92% rename from src/test/unit/gov/nist/javax/sip/parser/ims/PrivacyParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/PrivacyParserTest.java index 19d7f4c0c..a46c84e6d 100644 --- a/src/test/unit/gov/nist/javax/sip/parser/ims/PrivacyParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/PrivacyParserTest.java @@ -22,10 +22,10 @@ * PRODUCT OF PT INOVACAO - EST DEPARTMENT and Telecommunications Institute (Aveiro, Portugal) * ************************************************************************************************/ -package test.unit.gov.nist.javax.sip.parser.ims; +package gov.nist.javax.sip.parser.ims; import gov.nist.javax.sip.parser.ims.PrivacyParser; -import test.unit.gov.nist.javax.sip.parser.ParserTestCase; +import gov.nist.javax.sip.parser.ParserTestCase; public class PrivacyParserTest extends ParserTestCase { diff --git a/src/test/unit/gov/nist/javax/sip/parser/ims/SecurityClientParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/SecurityClientParserTest.java similarity index 93% rename from src/test/unit/gov/nist/javax/sip/parser/ims/SecurityClientParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/SecurityClientParserTest.java index 030194898..89b70db9f 100644 --- a/src/test/unit/gov/nist/javax/sip/parser/ims/SecurityClientParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/SecurityClientParserTest.java @@ -22,10 +22,10 @@ * PRODUCT OF PT INOVACAO - EST DEPARTMENT and Telecommunications Institute (Aveiro, Portugal) * ************************************************************************************************/ -package test.unit.gov.nist.javax.sip.parser.ims; +package gov.nist.javax.sip.parser.ims; import gov.nist.javax.sip.parser.ims.SecurityClientParser; -import test.unit.gov.nist.javax.sip.parser.ParserTestCase; +import gov.nist.javax.sip.parser.ParserTestCase; public class SecurityClientParserTest extends ParserTestCase { diff --git a/src/test/unit/gov/nist/javax/sip/parser/ims/SecurityServerParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/SecurityServerParserTest.java similarity index 94% rename from src/test/unit/gov/nist/javax/sip/parser/ims/SecurityServerParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/SecurityServerParserTest.java index 37c63a8cd..722d49718 100644 --- a/src/test/unit/gov/nist/javax/sip/parser/ims/SecurityServerParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/SecurityServerParserTest.java @@ -22,10 +22,10 @@ * PRODUCT OF PT INOVACAO - EST DEPARTMENT and Telecommunications Institute (Aveiro, Portugal) * ************************************************************************************************/ -package test.unit.gov.nist.javax.sip.parser.ims; +package gov.nist.javax.sip.parser.ims; import gov.nist.javax.sip.parser.ims.SecurityServerParser; -import test.unit.gov.nist.javax.sip.parser.ParserTestCase; +import gov.nist.javax.sip.parser.ParserTestCase; public class SecurityServerParserTest extends ParserTestCase { diff --git a/src/test/unit/gov/nist/javax/sip/parser/ims/SecurityVerifyParserTest.java b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/SecurityVerifyParserTest.java similarity index 94% rename from src/test/unit/gov/nist/javax/sip/parser/ims/SecurityVerifyParserTest.java rename to jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/SecurityVerifyParserTest.java index 4bf70114e..970cd8408 100644 --- a/src/test/unit/gov/nist/javax/sip/parser/ims/SecurityVerifyParserTest.java +++ b/jain-sip-ri/src/test/java/gov/nist/javax/sip/parser/ims/SecurityVerifyParserTest.java @@ -22,10 +22,10 @@ * PRODUCT OF PT INOVACAO - EST DEPARTMENT and Telecommunications Institute (Aveiro, Portugal) * ************************************************************************************************/ -package test.unit.gov.nist.javax.sip.parser.ims; +package gov.nist.javax.sip.parser.ims; import gov.nist.javax.sip.parser.ims.SecurityVerifyParser; -import test.unit.gov.nist.javax.sip.parser.ParserTestCase; +import gov.nist.javax.sip.parser.ParserTestCase; public class SecurityVerifyParserTest extends ParserTestCase { diff --git a/jain-sip-sctp/pom.xml b/jain-sip-sctp/pom.xml new file mode 100644 index 000000000..2680736d3 --- /dev/null +++ b/jain-sip-sctp/pom.xml @@ -0,0 +1,154 @@ + + + + 4.0.0 + + javax.sip + 1.3.0-SNAPSHOT + jain-sip + ../pom.xml + + + jain-sip-sctp + jar + + jain-sip-sctp + http://code.google.com/p/jain-sip/ + + ${project.basedir}/../jain-sip-ri/src/main/java/ + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.7 + 1.7 + + gov/nist/javax/sip/stack/sctp/** + + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + verify + + jar + + + + + + org.codehaus.mojo + buildnumber-maven-plugin + 1.0 + + + validate + + create + + + + + false + false + + + + org.apache.maven.plugins + maven-jar-plugin + 2.4 + + + + true + + + ${buildNumber} + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.8.1 + + + attach-javadocs + verify + + jar + + + + + + + + target + + gov/nist/javax/sip/stack/sctp/** + + + **/*.java + + + + + + + javax.sip + jain-sip-api + ${project.version} + provided + + + javax.sip + jain-sip-ri + ${project.version} + provided + + + + + log4j + log4j + 1.2.15 + provided + + + com.sun.jmx + jmxri + + + com.sun.jdmk + jmxtools + + + javax.jms + jms + + + + + + + junit + junit + 4.13.2 + test + + + + + \ No newline at end of file diff --git a/jain-sip-test-suite/README.adoc b/jain-sip-test-suite/README.adoc new file mode 100644 index 000000000..c61ebc32d --- /dev/null +++ b/jain-sip-test-suite/README.adoc @@ -0,0 +1,14 @@ += Jain Sip Test Suite + +== Notes + +This is a work in progress. It is currently open to public review. Your +comments are solicited. + +== Authors + +The TCK was written by M. Ranganathan (factory tests) and Emil Ivov (stack tests and GUI) + +== Troubleshooting + +For ubuntu user (and probably other linux users), make sure to install libsctp-dev packages. Run `apt-get isntall libsctp-dev` to be sure the package is installed. \ No newline at end of file diff --git a/jain-sip-test-suite/pom.xml b/jain-sip-test-suite/pom.xml new file mode 100644 index 000000000..89bde3b14 --- /dev/null +++ b/jain-sip-test-suite/pom.xml @@ -0,0 +1,85 @@ + + 4.0.0 + gov.nist + jain-sip-test-suite + 1.3.0-SNAPSHOT + jain-sip-test-suite + + Jain-Sip integration and TCK tests + + + ISO-8859-1 + 1.3.0-SNAPSHOT + 11 + 11 + + + + + javax.sip + jain-sip-api + ${jain-sip.version} + + + javax.sip + jain-sip-ri + ${jain-sip.version} + + + javax.sip + jain-sip-sctp + ${jain-sip.version} + + + + + log4j + log4j + 1.2.15 + + + com.sun.jmx + jmxri + + + com.sun.jdmk + jmxtools + + + javax.jms + jms + + + + + + + junit + junit + 4.13.2 + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 3.0.0-M5 + + + tck/**/*Test.java + + + + **/TCP*Test.java + **/Tcp*Test.java + + **/tck/msgflow/callflows/tls/*Test.java + **/tck/msgflow/callflows/sctp/*Test.java + + + + + + \ No newline at end of file diff --git a/jain-sip-test-suite/src/main/java/Main.java b/jain-sip-test-suite/src/main/java/Main.java new file mode 100644 index 000000000..0e03c65e6 --- /dev/null +++ b/jain-sip-test-suite/src/main/java/Main.java @@ -0,0 +1,6 @@ +public class Main { + + public static void main(String[] args) { + System.out.println("Hello"); + } +} diff --git a/src/test/load/concurrency/ProtocolObjects.java b/jain-sip-test-suite/src/test/java/load/concurrency/ProtocolObjects.java similarity index 98% rename from src/test/load/concurrency/ProtocolObjects.java rename to jain-sip-test-suite/src/test/java/load/concurrency/ProtocolObjects.java index 497f3f8f9..3322745ad 100644 --- a/src/test/load/concurrency/ProtocolObjects.java +++ b/jain-sip-test-suite/src/test/java/load/concurrency/ProtocolObjects.java @@ -1,5 +1,5 @@ -package test.load.concurrency; +package load.concurrency; import java.util.Properties; import javax.sip.SipException; diff --git a/src/test/load/concurrency/README.txt b/jain-sip-test-suite/src/test/java/load/concurrency/README.txt similarity index 100% rename from src/test/load/concurrency/README.txt rename to jain-sip-test-suite/src/test/java/load/concurrency/README.txt diff --git a/src/test/load/concurrency/SelfTest.java b/jain-sip-test-suite/src/test/java/load/concurrency/SelfTest.java similarity index 97% rename from src/test/load/concurrency/SelfTest.java rename to jain-sip-test-suite/src/test/java/load/concurrency/SelfTest.java index f3af34b8f..c8cd9a64b 100644 --- a/src/test/load/concurrency/SelfTest.java +++ b/jain-sip-test-suite/src/test/java/load/concurrency/SelfTest.java @@ -1,4 +1,4 @@ -package test.load.concurrency; +package load.concurrency; import javax.sip.SipProvider; diff --git a/src/test/load/concurrency/Shootist.java b/jain-sip-test-suite/src/test/java/load/concurrency/Shootist.java similarity index 99% rename from src/test/load/concurrency/Shootist.java rename to jain-sip-test-suite/src/test/java/load/concurrency/Shootist.java index a7e3d0105..4fda9df47 100755 --- a/src/test/load/concurrency/Shootist.java +++ b/jain-sip-test-suite/src/test/java/load/concurrency/Shootist.java @@ -1,4 +1,4 @@ -package test.load.concurrency; +package load.concurrency; import java.util.ArrayList; import java.util.Timer; diff --git a/src/test/load/concurrency/Shootme.java b/jain-sip-test-suite/src/test/java/load/concurrency/Shootme.java similarity index 99% rename from src/test/load/concurrency/Shootme.java rename to jain-sip-test-suite/src/test/java/load/concurrency/Shootme.java index 6204b5626..67f327c28 100755 --- a/src/test/load/concurrency/Shootme.java +++ b/jain-sip-test-suite/src/test/java/load/concurrency/Shootme.java @@ -1,4 +1,4 @@ -package test.load.concurrency; +package load.concurrency; import javax.sip.ClientTransaction; import javax.sip.Dialog; import javax.sip.DialogTerminatedEvent; diff --git a/src/test/load/concurrency/build.xml b/jain-sip-test-suite/src/test/java/load/concurrency/build.xml similarity index 100% rename from src/test/load/concurrency/build.xml rename to jain-sip-test-suite/src/test/java/load/concurrency/build.xml diff --git a/src/test/load/leakcheck/busy/Shootist.java b/jain-sip-test-suite/src/test/java/load/leakcheck/busy/Shootist.java similarity index 99% rename from src/test/load/leakcheck/busy/Shootist.java rename to jain-sip-test-suite/src/test/java/load/leakcheck/busy/Shootist.java index 5248ec63b..05e2864a8 100644 --- a/src/test/load/leakcheck/busy/Shootist.java +++ b/jain-sip-test-suite/src/test/java/load/leakcheck/busy/Shootist.java @@ -1,4 +1,4 @@ -package test.load.leakcheck.busy; +package load.leakcheck.busy; import javax.sip.*; import javax.sip.address.*; diff --git a/src/test/load/leakcheck/busy/Shootme.java b/jain-sip-test-suite/src/test/java/load/leakcheck/busy/Shootme.java similarity index 99% rename from src/test/load/leakcheck/busy/Shootme.java rename to jain-sip-test-suite/src/test/java/load/leakcheck/busy/Shootme.java index fea61edee..264eafbb1 100644 --- a/src/test/load/leakcheck/busy/Shootme.java +++ b/jain-sip-test-suite/src/test/java/load/leakcheck/busy/Shootme.java @@ -1,4 +1,4 @@ -package test.load.leakcheck.busy; +package load.leakcheck.busy; import javax.sip.*; import javax.sip.address.*; diff --git a/src/test/load/multidialog/README.txt b/jain-sip-test-suite/src/test/java/load/multidialog/README.txt similarity index 100% rename from src/test/load/multidialog/README.txt rename to jain-sip-test-suite/src/test/java/load/multidialog/README.txt diff --git a/src/test/load/multidialog/Shootist.java b/jain-sip-test-suite/src/test/java/load/multidialog/Shootist.java similarity index 99% rename from src/test/load/multidialog/Shootist.java rename to jain-sip-test-suite/src/test/java/load/multidialog/Shootist.java index cba74cadc..f5178bf87 100644 --- a/src/test/load/multidialog/Shootist.java +++ b/jain-sip-test-suite/src/test/java/load/multidialog/Shootist.java @@ -1,4 +1,4 @@ -package test.load.multidialog; +package load.multidialog; import javax.sip.*; import javax.sip.address.*; diff --git a/src/test/load/multidialog/Shootme.java b/jain-sip-test-suite/src/test/java/load/multidialog/Shootme.java similarity index 99% rename from src/test/load/multidialog/Shootme.java rename to jain-sip-test-suite/src/test/java/load/multidialog/Shootme.java index 981b81760..ac2e44132 100644 --- a/src/test/load/multidialog/Shootme.java +++ b/jain-sip-test-suite/src/test/java/load/multidialog/Shootme.java @@ -1,4 +1,4 @@ -package test.load.multidialog; +package load.multidialog; import javax.sip.*; import javax.sip.address.*; diff --git a/src/test/load/multidialog/build.xml b/jain-sip-test-suite/src/test/java/load/multidialog/build.xml similarity index 100% rename from src/test/load/multidialog/build.xml rename to jain-sip-test-suite/src/test/java/load/multidialog/build.xml diff --git a/src/test/load/subsnotify/Notifier.java b/jain-sip-test-suite/src/test/java/load/subsnotify/Notifier.java similarity index 99% rename from src/test/load/subsnotify/Notifier.java rename to jain-sip-test-suite/src/test/java/load/subsnotify/Notifier.java index 71c99edec..29f2793e2 100644 --- a/src/test/load/subsnotify/Notifier.java +++ b/jain-sip-test-suite/src/test/java/load/subsnotify/Notifier.java @@ -1,4 +1,4 @@ -package test.load.subsnotify; +package load.subsnotify; import javax.sip.*; import javax.sip.address.*; diff --git a/src/test/load/subsnotify/SubsNotify.java b/jain-sip-test-suite/src/test/java/load/subsnotify/SubsNotify.java similarity index 89% rename from src/test/load/subsnotify/SubsNotify.java rename to jain-sip-test-suite/src/test/java/load/subsnotify/SubsNotify.java index 4aea37a05..dcb802223 100644 --- a/src/test/load/subsnotify/SubsNotify.java +++ b/jain-sip-test-suite/src/test/java/load/subsnotify/SubsNotify.java @@ -1,4 +1,4 @@ -package test.load.subsnotify; +package load.subsnotify; public class SubsNotify { diff --git a/src/test/load/subsnotify/Subscriber.java b/jain-sip-test-suite/src/test/java/load/subsnotify/Subscriber.java similarity index 99% rename from src/test/load/subsnotify/Subscriber.java rename to jain-sip-test-suite/src/test/java/load/subsnotify/Subscriber.java index c6681417d..0d7d5741f 100644 --- a/src/test/load/subsnotify/Subscriber.java +++ b/jain-sip-test-suite/src/test/java/load/subsnotify/Subscriber.java @@ -1,4 +1,4 @@ -package test.load.subsnotify; +package load.subsnotify; import java.util.ArrayList; import java.util.Properties; diff --git a/src/test/unit/gov/nist/javax/sip/stack/AckReTransmissionTest.java b/jain-sip-test-suite/src/test/java/sip/stack/AckReTransmissionTest.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/AckReTransmissionTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/AckReTransmissionTest.java index ff02808a9..e045b6837 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/AckReTransmissionTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/AckReTransmissionTest.java @@ -20,7 +20,7 @@ /** * */ -package test.unit.gov.nist.javax.sip.stack; +package sip.stack; import java.util.ArrayList; import java.util.EventObject; @@ -58,8 +58,8 @@ import org.apache.log4j.SimpleLayout; import org.apache.log4j.helpers.NullEnumeration; -import test.tck.msgflow.callflows.ProtocolObjects; -import test.tck.msgflow.callflows.ScenarioHarness; +import tck.msgflow.callflows.ProtocolObjects; +import tck.msgflow.callflows.ScenarioHarness; /** * diff --git a/src/test/unit/gov/nist/javax/sip/stack/CancelEventTest.java b/jain-sip-test-suite/src/test/java/sip/stack/CancelEventTest.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/CancelEventTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/CancelEventTest.java index cc373702c..82f15c0e6 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/CancelEventTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/CancelEventTest.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack; +package sip.stack; import gov.nist.javax.sip.stack.NioMessageProcessorFactory; @@ -43,7 +43,7 @@ import org.apache.log4j.Logger; -import test.tck.msgflow.callflows.ScenarioHarness; +import tck.msgflow.callflows.ScenarioHarness; public class CancelEventTest extends ScenarioHarness { diff --git a/src/test/unit/gov/nist/javax/sip/stack/ClientTransactionCallingAlertTest.java b/jain-sip-test-suite/src/test/java/sip/stack/ClientTransactionCallingAlertTest.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/ClientTransactionCallingAlertTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/ClientTransactionCallingAlertTest.java index 5b0d170c3..78f1b62ac 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/ClientTransactionCallingAlertTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/ClientTransactionCallingAlertTest.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack; +package sip.stack; import gov.nist.javax.sip.ClientTransactionExt; import gov.nist.javax.sip.stack.NioMessageProcessorFactory; diff --git a/src/test/unit/gov/nist/javax/sip/stack/CtxExpiredTest.java b/jain-sip-test-suite/src/test/java/sip/stack/CtxExpiredTest.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/CtxExpiredTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/CtxExpiredTest.java index c8da48ac2..aa242ffe8 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/CtxExpiredTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/CtxExpiredTest.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack; +package sip.stack; import java.util.ArrayList; import java.util.Properties; diff --git a/src/test/unit/gov/nist/javax/sip/stack/DeliverNotifyBefore202Test.java b/jain-sip-test-suite/src/test/java/sip/stack/DeliverNotifyBefore202Test.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/DeliverNotifyBefore202Test.java rename to jain-sip-test-suite/src/test/java/sip/stack/DeliverNotifyBefore202Test.java index ec1d27435..fb5bda316 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/DeliverNotifyBefore202Test.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/DeliverNotifyBefore202Test.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack; +package sip.stack; import gov.nist.javax.sip.stack.NioMessageProcessorFactory; diff --git a/src/test/unit/gov/nist/javax/sip/stack/DeliverRequestEventWithBadHeaderTest.java b/jain-sip-test-suite/src/test/java/sip/stack/DeliverRequestEventWithBadHeaderTest.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/DeliverRequestEventWithBadHeaderTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/DeliverRequestEventWithBadHeaderTest.java index 4505412a5..dd1925413 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/DeliverRequestEventWithBadHeaderTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/DeliverRequestEventWithBadHeaderTest.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack; +package sip.stack; import gov.nist.javax.sip.message.MessageFactoryImpl; import gov.nist.javax.sip.stack.NioMessageProcessorFactory; diff --git a/src/test/unit/gov/nist/javax/sip/stack/DeliverUnsolicitedNotifyTest.java b/jain-sip-test-suite/src/test/java/sip/stack/DeliverUnsolicitedNotifyTest.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/DeliverUnsolicitedNotifyTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/DeliverUnsolicitedNotifyTest.java index a4fe64c7c..166c797f1 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/DeliverUnsolicitedNotifyTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/DeliverUnsolicitedNotifyTest.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack; +package sip.stack; import gov.nist.javax.sip.stack.NioMessageProcessorFactory; diff --git a/src/test/unit/gov/nist/javax/sip/stack/DialogEarlyStateTimeoutTest.java b/jain-sip-test-suite/src/test/java/sip/stack/DialogEarlyStateTimeoutTest.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/DialogEarlyStateTimeoutTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/DialogEarlyStateTimeoutTest.java index a1d8db188..e27fb07c7 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/DialogEarlyStateTimeoutTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/DialogEarlyStateTimeoutTest.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack; +package sip.stack; import gov.nist.javax.sip.DialogTimeoutEvent; import gov.nist.javax.sip.ServerTransactionExt; @@ -45,8 +45,8 @@ import org.apache.log4j.ConsoleAppender; import org.apache.log4j.Logger; -import test.unit.gov.nist.javax.sip.stack.CtxExpiredTest.Shootist; -import test.unit.gov.nist.javax.sip.stack.CtxExpiredTest.Shootme; +import sip.stack.CtxExpiredTest.Shootist; +import sip.stack.CtxExpiredTest.Shootme; import junit.framework.TestCase; public class DialogEarlyStateTimeoutTest extends TestCase { diff --git a/src/test/unit/gov/nist/javax/sip/stack/DialogIdentityTest.java b/jain-sip-test-suite/src/test/java/sip/stack/DialogIdentityTest.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/DialogIdentityTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/DialogIdentityTest.java index 7b9cd1fb1..996df15b1 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/DialogIdentityTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/DialogIdentityTest.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack; +package sip.stack; import gov.nist.javax.sip.stack.NioMessageProcessorFactory; diff --git a/src/test/unit/gov/nist/javax/sip/stack/LooseDialogValidationTest.java b/jain-sip-test-suite/src/test/java/sip/stack/LooseDialogValidationTest.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/LooseDialogValidationTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/LooseDialogValidationTest.java index 3125cf0ad..79d666942 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/LooseDialogValidationTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/LooseDialogValidationTest.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack; +package sip.stack; import gov.nist.javax.sip.DialogExt; import gov.nist.javax.sip.SipProviderExt; @@ -617,8 +617,8 @@ public void terminate() { } } - private test.unit.gov.nist.javax.sip.stack.LooseDialogValidationTest.Shootme shootme; - private test.unit.gov.nist.javax.sip.stack.LooseDialogValidationTest.Shootist shootist; + private sip.stack.LooseDialogValidationTest.Shootme shootme; + private sip.stack.LooseDialogValidationTest.Shootist shootist; public void setUp() { this.shootme = new Shootme(); diff --git a/src/test/unit/gov/nist/javax/sip/stack/MultipleContactsTest.java b/jain-sip-test-suite/src/test/java/sip/stack/MultipleContactsTest.java similarity index 98% rename from src/test/unit/gov/nist/javax/sip/stack/MultipleContactsTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/MultipleContactsTest.java index ef038cc21..bc79b73bd 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/MultipleContactsTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/MultipleContactsTest.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack; +package sip.stack; @@ -35,7 +35,7 @@ import javax.sip.message.MessageFactory; import javax.sip.message.Request; -import test.tck.msgflow.callflows.ScenarioHarness; +import tck.msgflow.callflows.ScenarioHarness; import junit.framework.Assert; diff --git a/src/test/unit/gov/nist/javax/sip/stack/NIOIdleTimeoutTest.java b/jain-sip-test-suite/src/test/java/sip/stack/NIOIdleTimeoutTest.java similarity index 98% rename from src/test/unit/gov/nist/javax/sip/stack/NIOIdleTimeoutTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/NIOIdleTimeoutTest.java index 0d3e5835e..33f194ef1 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/NIOIdleTimeoutTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/NIOIdleTimeoutTest.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack; +package sip.stack; @@ -41,8 +41,8 @@ import javax.sip.message.Request; import junit.framework.Assert; -import test.tck.msgflow.callflows.ScenarioHarness; -import test.unit.gov.nist.javax.sip.stack.tls.TlsTest; +import tck.msgflow.callflows.ScenarioHarness; +import sip.stack.tls.TlsTest; /** * Test Issue 309 Via.setRPort() creates malformed rport parameter * @author jean.deruelle@gmail.com diff --git a/src/test/unit/gov/nist/javax/sip/stack/NIOParsingTest.java b/jain-sip-test-suite/src/test/java/sip/stack/NIOParsingTest.java similarity index 98% rename from src/test/unit/gov/nist/javax/sip/stack/NIOParsingTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/NIOParsingTest.java index 09bf83395..8f57e4051 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/NIOParsingTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/NIOParsingTest.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack; +package sip.stack; @@ -24,8 +24,8 @@ import javax.sip.message.Request; import junit.framework.Assert; -import test.tck.msgflow.callflows.ScenarioHarness; -import test.unit.gov.nist.javax.sip.stack.tls.TlsTest; +import tck.msgflow.callflows.ScenarioHarness; +import sip.stack.tls.TlsTest; /** * Test Issue 309 Via.setRPort() creates malformed rport parameter * @author jean.deruelle@gmail.com diff --git a/src/test/unit/gov/nist/javax/sip/stack/NoAutoDialogTest.java b/jain-sip-test-suite/src/test/java/sip/stack/NoAutoDialogTest.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/NoAutoDialogTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/NoAutoDialogTest.java index e58397828..1c803a6d2 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/NoAutoDialogTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/NoAutoDialogTest.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack; +package sip.stack; import gov.nist.javax.sip.stack.NioMessageProcessorFactory; diff --git a/src/test/unit/gov/nist/javax/sip/stack/NoToTagOn1xxDialogLeakTest.java b/jain-sip-test-suite/src/test/java/sip/stack/NoToTagOn1xxDialogLeakTest.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/NoToTagOn1xxDialogLeakTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/NoToTagOn1xxDialogLeakTest.java index 898b75ed9..387da8b81 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/NoToTagOn1xxDialogLeakTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/NoToTagOn1xxDialogLeakTest.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack; +package sip.stack; import gov.nist.javax.sip.stack.NioMessageProcessorFactory; import gov.nist.javax.sip.stack.SIPTransactionStack; diff --git a/src/test/unit/gov/nist/javax/sip/stack/NonRfc3261ForkedInviteTest.java b/jain-sip-test-suite/src/test/java/sip/stack/NonRfc3261ForkedInviteTest.java similarity index 80% rename from src/test/unit/gov/nist/javax/sip/stack/NonRfc3261ForkedInviteTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/NonRfc3261ForkedInviteTest.java index 69ce1d890..be95b415e 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/NonRfc3261ForkedInviteTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/NonRfc3261ForkedInviteTest.java @@ -1,6 +1,6 @@ -package test.unit.gov.nist.javax.sip.stack; +package sip.stack; -import test.tck.msgflow.callflows.forkedinvite.AbstractForkedInviteTestCase; +import tck.msgflow.callflows.forkedinvite.AbstractForkedInviteTestCase; import junit.framework.TestCase; public class NonRfc3261ForkedInviteTest extends AbstractForkedInviteTestCase { diff --git a/src/test/unit/gov/nist/javax/sip/stack/RFC5626KeepAliveTest.java b/jain-sip-test-suite/src/test/java/sip/stack/RFC5626KeepAliveTest.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/RFC5626KeepAliveTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/RFC5626KeepAliveTest.java index 651e196fb..350b18b44 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/RFC5626KeepAliveTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/RFC5626KeepAliveTest.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack; +package sip.stack; import gov.nist.javax.sip.DialogTimeoutEvent; import gov.nist.javax.sip.IOExceptionEventExt; @@ -49,8 +49,8 @@ import org.apache.log4j.Logger; -import test.tck.msgflow.callflows.ProtocolObjects; -import test.tck.msgflow.callflows.ScenarioHarness; +import tck.msgflow.callflows.ProtocolObjects; +import tck.msgflow.callflows.ScenarioHarness; /** * Test for RFC 5626 Section 4.4.1 tests the various conditions outlined in the flow available at diff --git a/src/test/unit/gov/nist/javax/sip/stack/ReInviteBusyTest.java b/jain-sip-test-suite/src/test/java/sip/stack/ReInviteBusyTest.java similarity index 97% rename from src/test/unit/gov/nist/javax/sip/stack/ReInviteBusyTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/ReInviteBusyTest.java index a91da14f0..67d18ea31 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/ReInviteBusyTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/ReInviteBusyTest.java @@ -20,7 +20,7 @@ /** * */ -package test.unit.gov.nist.javax.sip.stack; +package sip.stack; @@ -74,7 +74,7 @@ import org.apache.log4j.Logger; import org.apache.log4j.SimpleLayout; -import test.tck.msgflow.callflows.NonSipUriRouter; +import tck.msgflow.callflows.NonSipUriRouter; /** * @author M. Ranganathan diff --git a/src/test/unit/gov/nist/javax/sip/stack/ReInviteInfoAckOverlapTest.java b/jain-sip-test-suite/src/test/java/sip/stack/ReInviteInfoAckOverlapTest.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/ReInviteInfoAckOverlapTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/ReInviteInfoAckOverlapTest.java index 154ac4ca5..074b4a2fe 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/ReInviteInfoAckOverlapTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/ReInviteInfoAckOverlapTest.java @@ -20,7 +20,7 @@ /** * */ -package test.unit.gov.nist.javax.sip.stack; +package sip.stack; @@ -74,7 +74,7 @@ import org.apache.log4j.Logger; import org.apache.log4j.SimpleLayout; -import test.tck.msgflow.callflows.NonSipUriRouter; +import tck.msgflow.callflows.NonSipUriRouter; /** * @author Vladimir Ralev diff --git a/src/test/unit/gov/nist/javax/sip/stack/ReconnectTCPTest.java b/jain-sip-test-suite/src/test/java/sip/stack/ReconnectTCPTest.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/ReconnectTCPTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/ReconnectTCPTest.java index dd916c398..e635021d4 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/ReconnectTCPTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/ReconnectTCPTest.java @@ -20,7 +20,7 @@ /** * */ -package test.unit.gov.nist.javax.sip.stack; +package sip.stack; import gov.nist.javax.sip.stack.IOHandler; import gov.nist.javax.sip.stack.SIPTransactionStack; @@ -62,8 +62,8 @@ import org.apache.log4j.Logger; -import test.tck.msgflow.callflows.ProtocolObjects; -import test.tck.msgflow.callflows.ScenarioHarness; +import tck.msgflow.callflows.ProtocolObjects; +import tck.msgflow.callflows.ScenarioHarness; /** * Non regression test for http://code.google.com/p/mobicents/issues/detail?id=3188 diff --git a/src/test/unit/gov/nist/javax/sip/stack/RejectInvalidResponseTest.java b/jain-sip-test-suite/src/test/java/sip/stack/RejectInvalidResponseTest.java similarity index 98% rename from src/test/unit/gov/nist/javax/sip/stack/RejectInvalidResponseTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/RejectInvalidResponseTest.java index a4636a6f2..9a48a53d2 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/RejectInvalidResponseTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/RejectInvalidResponseTest.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack; +package sip.stack; import gov.nist.javax.sip.stack.NioMessageProcessorFactory; @@ -494,8 +494,8 @@ public void terminate() { } } - private test.unit.gov.nist.javax.sip.stack.RejectInvalidResponseTest.Shootme shootme; - private test.unit.gov.nist.javax.sip.stack.RejectInvalidResponseTest.Shootist shootist; + private sip.stack.RejectInvalidResponseTest.Shootme shootme; + private sip.stack.RejectInvalidResponseTest.Shootist shootist; public void setUp() { this.shootme = new Shootme(); diff --git a/src/test/unit/gov/nist/javax/sip/stack/RejectOutOfSequenceMessageTest.java b/jain-sip-test-suite/src/test/java/sip/stack/RejectOutOfSequenceMessageTest.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/RejectOutOfSequenceMessageTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/RejectOutOfSequenceMessageTest.java index 368bb017c..b5623bccf 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/RejectOutOfSequenceMessageTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/RejectOutOfSequenceMessageTest.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack; +package sip.stack; import gov.nist.javax.sip.stack.NioMessageProcessorFactory; diff --git a/src/test/unit/gov/nist/javax/sip/stack/SIPEventInterceptorTest.java b/jain-sip-test-suite/src/test/java/sip/stack/SIPEventInterceptorTest.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/SIPEventInterceptorTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/SIPEventInterceptorTest.java index 68017abc6..70eeb40ef 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/SIPEventInterceptorTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/SIPEventInterceptorTest.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack; +package sip.stack; import gov.nist.javax.sip.DialogExt; import gov.nist.javax.sip.stack.CallAnalysisInterceptor; diff --git a/src/test/unit/gov/nist/javax/sip/stack/SIPMessageValveImpl.java b/jain-sip-test-suite/src/test/java/sip/stack/SIPMessageValveImpl.java similarity index 97% rename from src/test/unit/gov/nist/javax/sip/stack/SIPMessageValveImpl.java rename to jain-sip-test-suite/src/test/java/sip/stack/SIPMessageValveImpl.java index 78349c6b9..9a3a8842a 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/SIPMessageValveImpl.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/SIPMessageValveImpl.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack; +package sip.stack; import gov.nist.javax.sip.SipStackImpl; import gov.nist.javax.sip.message.SIPMessage; import gov.nist.javax.sip.message.SIPRequest; diff --git a/src/test/unit/gov/nist/javax/sip/stack/SIPMessageValveTest.java b/jain-sip-test-suite/src/test/java/sip/stack/SIPMessageValveTest.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/SIPMessageValveTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/SIPMessageValveTest.java index 62c09f26d..0fa925ebc 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/SIPMessageValveTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/SIPMessageValveTest.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack; +package sip.stack; import gov.nist.javax.sip.DialogExt; import gov.nist.javax.sip.SipProviderExt; @@ -597,8 +597,8 @@ public void terminate() { } } - private test.unit.gov.nist.javax.sip.stack.SIPMessageValveTest.Shootme shootme; - private test.unit.gov.nist.javax.sip.stack.SIPMessageValveTest.Shootist shootist; + private sip.stack.SIPMessageValveTest.Shootme shootme; + private sip.stack.SIPMessageValveTest.Shootist shootist; public void setUp() { this.shootme = new Shootme(); diff --git a/src/test/unit/gov/nist/javax/sip/stack/SelfroutingTest.java b/jain-sip-test-suite/src/test/java/sip/stack/SelfroutingTest.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/SelfroutingTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/SelfroutingTest.java index 7935b520f..bcd0ab037 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/SelfroutingTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/SelfroutingTest.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack; +package sip.stack; import gov.nist.javax.sip.SipStackImpl; @@ -35,8 +35,8 @@ import org.apache.log4j.Logger; -import test.tck.msgflow.callflows.ProtocolObjects; -import test.tck.msgflow.callflows.ScenarioHarness; +import tck.msgflow.callflows.ProtocolObjects; +import tck.msgflow.callflows.ScenarioHarness; public class SelfroutingTest extends ScenarioHarness { diff --git a/src/test/unit/gov/nist/javax/sip/stack/ServerTransactionRetransmissionTimerTest.java b/jain-sip-test-suite/src/test/java/sip/stack/ServerTransactionRetransmissionTimerTest.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/ServerTransactionRetransmissionTimerTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/ServerTransactionRetransmissionTimerTest.java index 8515d27cb..ce769364a 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/ServerTransactionRetransmissionTimerTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/ServerTransactionRetransmissionTimerTest.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack; +package sip.stack; import gov.nist.javax.sip.ResponseEventExt; import gov.nist.javax.sip.SipStackImpl; diff --git a/src/test/unit/gov/nist/javax/sip/stack/SetRetransmissionTimerTest.java b/jain-sip-test-suite/src/test/java/sip/stack/SetRetransmissionTimerTest.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/SetRetransmissionTimerTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/SetRetransmissionTimerTest.java index 02d685b0e..e4cb1fcaa 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/SetRetransmissionTimerTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/SetRetransmissionTimerTest.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack; +package sip.stack; import gov.nist.javax.sip.ResponseEventExt; import gov.nist.javax.sip.TransactionExt; diff --git a/src/test/unit/gov/nist/javax/sip/stack/StackQueueCongestionControlTest.java b/jain-sip-test-suite/src/test/java/sip/stack/StackQueueCongestionControlTest.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/StackQueueCongestionControlTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/StackQueueCongestionControlTest.java index 356507557..de15bae77 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/StackQueueCongestionControlTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/StackQueueCongestionControlTest.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack; +package sip.stack; import gov.nist.javax.sip.DialogExt; import gov.nist.javax.sip.SipProviderExt; @@ -679,8 +679,8 @@ public void terminate() { } } - private test.unit.gov.nist.javax.sip.stack.StackQueueCongestionControlTest.Shootme shootme; - private test.unit.gov.nist.javax.sip.stack.StackQueueCongestionControlTest.Shootist shootist; + private sip.stack.StackQueueCongestionControlTest.Shootme shootme; + private sip.stack.StackQueueCongestionControlTest.Shootist shootist; public void setUp() { this.shootme = new Shootme(); diff --git a/src/test/unit/gov/nist/javax/sip/stack/TcpMultiThreadDeadlockTest.java b/jain-sip-test-suite/src/test/java/sip/stack/TcpMultiThreadDeadlockTest.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/TcpMultiThreadDeadlockTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/TcpMultiThreadDeadlockTest.java index 2bedf99a3..3023f7bd8 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/TcpMultiThreadDeadlockTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/TcpMultiThreadDeadlockTest.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack; +package sip.stack; import gov.nist.javax.sip.DialogExt; import gov.nist.javax.sip.SipProviderExt; @@ -656,8 +656,8 @@ public void terminate() { } } - private test.unit.gov.nist.javax.sip.stack.TcpMultiThreadDeadlockTest.Shootme shootme; - private test.unit.gov.nist.javax.sip.stack.TcpMultiThreadDeadlockTest.Shootist shootist; + private sip.stack.TcpMultiThreadDeadlockTest.Shootme shootme; + private sip.stack.TcpMultiThreadDeadlockTest.Shootist shootist; public void setUp() { this.shootme = new Shootme(); diff --git a/src/test/unit/gov/nist/javax/sip/stack/TcpSingleThreadDeadlockTest.java b/jain-sip-test-suite/src/test/java/sip/stack/TcpSingleThreadDeadlockTest.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/TcpSingleThreadDeadlockTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/TcpSingleThreadDeadlockTest.java index 445b67446..76d873583 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/TcpSingleThreadDeadlockTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/TcpSingleThreadDeadlockTest.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack; +package sip.stack; import gov.nist.javax.sip.DialogExt; import gov.nist.javax.sip.SipProviderExt; @@ -643,8 +643,8 @@ public void terminate() { } } - private test.unit.gov.nist.javax.sip.stack.TcpSingleThreadDeadlockTest.Shootme shootme; - private test.unit.gov.nist.javax.sip.stack.TcpSingleThreadDeadlockTest.Shootist shootist; + private sip.stack.TcpSingleThreadDeadlockTest.Shootme shootme; + private sip.stack.TcpSingleThreadDeadlockTest.Shootist shootist; public void setUp() { this.shootme = new Shootme(); diff --git a/src/test/unit/gov/nist/javax/sip/stack/TransactionAlreadyExistsExceptionTest.java b/jain-sip-test-suite/src/test/java/sip/stack/TransactionAlreadyExistsExceptionTest.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/TransactionAlreadyExistsExceptionTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/TransactionAlreadyExistsExceptionTest.java index 034bf3ac1..d83147823 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/TransactionAlreadyExistsExceptionTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/TransactionAlreadyExistsExceptionTest.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack; +package sip.stack; import gov.nist.javax.sip.message.MessageFactoryImpl; import gov.nist.javax.sip.stack.NioMessageProcessorFactory; diff --git a/src/test/unit/gov/nist/javax/sip/stack/UdpPrackTimeoutTest.java b/jain-sip-test-suite/src/test/java/sip/stack/UdpPrackTimeoutTest.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/UdpPrackTimeoutTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/UdpPrackTimeoutTest.java index 9f7835d96..3a9b6d469 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/UdpPrackTimeoutTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/UdpPrackTimeoutTest.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack; +package sip.stack; import java.util.ArrayList; @@ -34,9 +34,9 @@ import org.apache.log4j.Logger; -import test.tck.TestHarness; -import test.tck.msgflow.callflows.ProtocolObjects; -import test.tck.msgflow.callflows.ScenarioHarness; +import tck.TestHarness; +import tck.msgflow.callflows.ProtocolObjects; +import tck.msgflow.callflows.ScenarioHarness; public class UdpPrackTimeoutTest extends ScenarioHarness implements SipListener { diff --git a/src/test/unit/gov/nist/javax/sip/stack/ViaRPortTest.java b/jain-sip-test-suite/src/test/java/sip/stack/ViaRPortTest.java similarity index 98% rename from src/test/unit/gov/nist/javax/sip/stack/ViaRPortTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/ViaRPortTest.java index 222c1185a..2caaef9c2 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/ViaRPortTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/ViaRPortTest.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack; +package sip.stack; @@ -36,7 +36,7 @@ import javax.sip.message.MessageFactory; import javax.sip.message.Request; -import test.tck.msgflow.callflows.ScenarioHarness; +import tck.msgflow.callflows.ScenarioHarness; import junit.framework.Assert; /** diff --git a/src/test/unit/gov/nist/javax/sip/stack/WebsocketPacketFragmentationTest.java b/jain-sip-test-suite/src/test/java/sip/stack/WebsocketPacketFragmentationTest.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/WebsocketPacketFragmentationTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/WebsocketPacketFragmentationTest.java index a5f98950a..3389ab6fe 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/WebsocketPacketFragmentationTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/WebsocketPacketFragmentationTest.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack; +package sip.stack; import java.io.ByteArrayInputStream; diff --git a/src/test/unit/gov/nist/javax/sip/stack/WebsocketSelfTest.java b/jain-sip-test-suite/src/test/java/sip/stack/WebsocketSelfTest.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/WebsocketSelfTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/WebsocketSelfTest.java index 058b3b3e5..f62ec9a90 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/WebsocketSelfTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/WebsocketSelfTest.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack; +package sip.stack; import gov.nist.javax.sip.DialogExt; import gov.nist.javax.sip.SipProviderExt; @@ -45,7 +45,7 @@ import org.apache.log4j.Logger; import org.apache.log4j.PatternLayout; -import test.unit.gov.nist.javax.sip.stack.tls.TlsTest; +import sip.stack.tls.TlsTest; import junit.framework.TestCase; /** diff --git a/src/test/unit/gov/nist/javax/sip/stack/acktransport/InviteTest.java b/jain-sip-test-suite/src/test/java/sip/stack/acktransport/InviteTest.java similarity index 80% rename from src/test/unit/gov/nist/javax/sip/stack/acktransport/InviteTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/acktransport/InviteTest.java index 08d78af98..ed0e39207 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/acktransport/InviteTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/acktransport/InviteTest.java @@ -1,7 +1,7 @@ /** * */ -package test.unit.gov.nist.javax.sip.stack.acktransport; +package sip.stack.acktransport; import java.util.HashSet; @@ -40,27 +40,6 @@ public InviteTest() { } - public void setUp() { - - try { - super.setUp(); - - - } catch (Exception ex) { - fail("unexpected exception "); - } - } - - public void tearDown() { - try { - - } catch (Exception ex) { - ex.printStackTrace(); - logger.error("unexpected exception", ex); - fail("unexpected exception "); - } - } - public void testSendInvite() throws Exception { try { @@ -89,8 +68,11 @@ public void testSendInvite() throws Exception { shootmeUa.checkState(); shootist.checkState(); shootist.stop(); + logger.info("-----------------------> shoootist stopped"); shootmeUa.stop(); + logger.info("-----------------------> shootmeUa stopped"); proxy.stop(); + logger.info("-----------------------> proxy stopped"); } finally { } diff --git a/src/test/unit/gov/nist/javax/sip/stack/acktransport/Proxy.java b/jain-sip-test-suite/src/test/java/sip/stack/acktransport/Proxy.java similarity index 96% rename from src/test/unit/gov/nist/javax/sip/stack/acktransport/Proxy.java rename to jain-sip-test-suite/src/test/java/sip/stack/acktransport/Proxy.java index 86b3f04ee..950d6730b 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/acktransport/Proxy.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/acktransport/Proxy.java @@ -1,13 +1,9 @@ -package test.unit.gov.nist.javax.sip.stack.acktransport; +package sip.stack.acktransport; -import gov.nist.javax.sip.SipStackImpl; -import gov.nist.javax.sip.address.SipUri; - import java.util.HashMap; import java.util.Hashtable; import java.util.Iterator; -import java.util.Properties; import javax.sip.ClientTransaction; import javax.sip.DialogTerminatedEvent; @@ -16,8 +12,6 @@ import javax.sip.RequestEvent; import javax.sip.ResponseEvent; import javax.sip.ServerTransaction; -import javax.sip.SipException; -import javax.sip.SipFactory; import javax.sip.SipListener; import javax.sip.SipProvider; import javax.sip.SipStack; @@ -35,14 +29,11 @@ import javax.sip.message.Request; import javax.sip.message.Response; -import junit.framework.TestCase; - import org.apache.log4j.ConsoleAppender; import org.apache.log4j.Logger; import org.apache.log4j.SimpleLayout; -import test.tck.TestHarness; -import test.tck.msgflow.callflows.ProtocolObjects; +import junit.framework.TestCase; /** * A very simple forking proxy server. diff --git a/src/test/unit/gov/nist/javax/sip/stack/acktransport/Shootist.java b/jain-sip-test-suite/src/test/java/sip/stack/acktransport/Shootist.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/acktransport/Shootist.java rename to jain-sip-test-suite/src/test/java/sip/stack/acktransport/Shootist.java index cffc29df6..7ddfbf50c 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/acktransport/Shootist.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/acktransport/Shootist.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack.acktransport; +package sip.stack.acktransport; import gov.nist.javax.sip.DialogTimeoutEvent; import gov.nist.javax.sip.ResponseEventExt; diff --git a/src/test/unit/gov/nist/javax/sip/stack/acktransport/Shootme.java b/jain-sip-test-suite/src/test/java/sip/stack/acktransport/Shootme.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/acktransport/Shootme.java rename to jain-sip-test-suite/src/test/java/sip/stack/acktransport/Shootme.java index a237ce5b7..da1d5eeb5 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/acktransport/Shootme.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/acktransport/Shootme.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack.acktransport; +package sip.stack.acktransport; import gov.nist.javax.sip.SipStackImpl; diff --git a/src/test/unit/gov/nist/javax/sip/stack/acktransport/SipObjects.java b/jain-sip-test-suite/src/test/java/sip/stack/acktransport/SipObjects.java similarity index 98% rename from src/test/unit/gov/nist/javax/sip/stack/acktransport/SipObjects.java rename to jain-sip-test-suite/src/test/java/sip/stack/acktransport/SipObjects.java index c081fbbfb..1f851d768 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/acktransport/SipObjects.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/acktransport/SipObjects.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack.acktransport; +package sip.stack.acktransport; import gov.nist.javax.sip.SipStackImpl; import gov.nist.javax.sip.stack.NioMessageProcessorFactory; diff --git a/src/test/unit/gov/nist/javax/sip/stack/acktransport/package.html b/jain-sip-test-suite/src/test/java/sip/stack/acktransport/package.html similarity index 100% rename from src/test/unit/gov/nist/javax/sip/stack/acktransport/package.html rename to jain-sip-test-suite/src/test/java/sip/stack/acktransport/package.html diff --git a/src/test/unit/gov/nist/javax/sip/stack/challenge/ChallengeTest.java b/jain-sip-test-suite/src/test/java/sip/stack/challenge/ChallengeTest.java similarity index 94% rename from src/test/unit/gov/nist/javax/sip/stack/challenge/ChallengeTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/challenge/ChallengeTest.java index 79b8ec202..de2c7f2cd 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/challenge/ChallengeTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/challenge/ChallengeTest.java @@ -20,7 +20,7 @@ /** * */ -package test.unit.gov.nist.javax.sip.stack.challenge; +package sip.stack.challenge; import java.util.EventObject; @@ -35,7 +35,7 @@ import org.apache.log4j.Logger; -import test.tck.msgflow.callflows.ScenarioHarness; +import tck.msgflow.callflows.ScenarioHarness; /** * @author Jeroen van Bemmel (jbemmel@zonnet.nl) diff --git a/src/test/unit/gov/nist/javax/sip/stack/challenge/Shootist.java b/jain-sip-test-suite/src/test/java/sip/stack/challenge/Shootist.java similarity index 96% rename from src/test/unit/gov/nist/javax/sip/stack/challenge/Shootist.java rename to jain-sip-test-suite/src/test/java/sip/stack/challenge/Shootist.java index 607150d85..105278ab5 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/challenge/Shootist.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/challenge/Shootist.java @@ -17,7 +17,7 @@ * * */ -package test.unit.gov.nist.javax.sip.stack.challenge; +package sip.stack.challenge; import java.util.ArrayList; @@ -53,7 +53,7 @@ import org.apache.log4j.SimpleLayout; import org.apache.log4j.helpers.NullEnumeration; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.msgflow.callflows.ProtocolObjects; /** * This class is a UAC template. diff --git a/src/test/unit/gov/nist/javax/sip/stack/challenge/Shootme.java b/jain-sip-test-suite/src/test/java/sip/stack/challenge/Shootme.java similarity index 96% rename from src/test/unit/gov/nist/javax/sip/stack/challenge/Shootme.java rename to jain-sip-test-suite/src/test/java/sip/stack/challenge/Shootme.java index 8c0c1a083..a7bf49974 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/challenge/Shootme.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/challenge/Shootme.java @@ -17,7 +17,7 @@ * * */ -package test.unit.gov.nist.javax.sip.stack.challenge; +package sip.stack.challenge; import javax.sip.Dialog; import javax.sip.DialogTerminatedEvent; @@ -43,7 +43,7 @@ import org.apache.log4j.SimpleLayout; import org.apache.log4j.helpers.NullEnumeration; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.msgflow.callflows.ProtocolObjects; /** * This class is a UAC template. diff --git a/src/test/unit/gov/nist/javax/sip/stack/ctx491/ReInviteTest.java b/jain-sip-test-suite/src/test/java/sip/stack/ctx491/ReInviteTest.java similarity index 96% rename from src/test/unit/gov/nist/javax/sip/stack/ctx491/ReInviteTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/ctx491/ReInviteTest.java index 196bc67d5..8658784c8 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/ctx491/ReInviteTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/ctx491/ReInviteTest.java @@ -20,7 +20,7 @@ /** * */ -package test.unit.gov.nist.javax.sip.stack.ctx491; +package sip.stack.ctx491; import gov.nist.javax.sip.SipProviderImpl; import gov.nist.javax.sip.SipStackImpl; @@ -47,9 +47,9 @@ import org.apache.log4j.SimpleLayout; import org.apache.log4j.helpers.NullEnumeration; -import test.tck.msgflow.callflows.ProtocolObjects; -import test.tck.msgflow.callflows.ScenarioHarness; -import test.tck.TestHarness; +import tck.msgflow.callflows.ProtocolObjects; +import tck.msgflow.callflows.ScenarioHarness; +import tck.TestHarness; import junit.framework.TestCase; diff --git a/src/test/unit/gov/nist/javax/sip/stack/ctx491/Shootist.java b/jain-sip-test-suite/src/test/java/sip/stack/ctx491/Shootist.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/ctx491/Shootist.java rename to jain-sip-test-suite/src/test/java/sip/stack/ctx491/Shootist.java index a03ef0f84..e06fd4a9e 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/ctx491/Shootist.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/ctx491/Shootist.java @@ -17,7 +17,7 @@ * * */ -package test.unit.gov.nist.javax.sip.stack.ctx491; +package sip.stack.ctx491; import gov.nist.javax.sip.DialogExt; import gov.nist.javax.sip.address.SipUri; @@ -33,8 +33,8 @@ import org.apache.log4j.SimpleLayout; import org.apache.log4j.helpers.NullEnumeration; -import test.tck.TestHarness; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.TestHarness; +import tck.msgflow.callflows.ProtocolObjects; import java.io.File; import java.io.IOException; diff --git a/src/test/unit/gov/nist/javax/sip/stack/ctx491/Shootme.java b/jain-sip-test-suite/src/test/java/sip/stack/ctx491/Shootme.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/ctx491/Shootme.java rename to jain-sip-test-suite/src/test/java/sip/stack/ctx491/Shootme.java index 58ab02203..c3a6c3480 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/ctx491/Shootme.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/ctx491/Shootme.java @@ -17,7 +17,7 @@ * * */ -package test.unit.gov.nist.javax.sip.stack.ctx491; +package sip.stack.ctx491; import java.io.IOException; import java.util.Timer; @@ -36,7 +36,7 @@ import org.apache.log4j.SimpleLayout; import org.apache.log4j.helpers.NullEnumeration; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.msgflow.callflows.ProtocolObjects; /** * This class is a UAC template. diff --git a/src/test/unit/gov/nist/javax/sip/stack/dialog/b2bua/BackToBackUserAgent.java b/jain-sip-test-suite/src/test/java/sip/stack/dialog/b2bua/BackToBackUserAgent.java similarity index 98% rename from src/test/unit/gov/nist/javax/sip/stack/dialog/b2bua/BackToBackUserAgent.java rename to jain-sip-test-suite/src/test/java/sip/stack/dialog/b2bua/BackToBackUserAgent.java index 53d339dcb..49b230f0f 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/dialog/b2bua/BackToBackUserAgent.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/dialog/b2bua/BackToBackUserAgent.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack.dialog.b2bua; +package sip.stack.dialog.b2bua; import gov.nist.javax.sip.DialogTimeoutEvent; import gov.nist.javax.sip.ListeningPointExt; @@ -40,7 +40,7 @@ import javax.sip.message.Request; import javax.sip.message.Response; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.msgflow.callflows.ProtocolObjects; public class BackToBackUserAgent implements SipListenerExt { diff --git a/src/test/unit/gov/nist/javax/sip/stack/dialog/b2bua/BackToBackUserAgentTest.java b/jain-sip-test-suite/src/test/java/sip/stack/dialog/b2bua/BackToBackUserAgentTest.java similarity index 92% rename from src/test/unit/gov/nist/javax/sip/stack/dialog/b2bua/BackToBackUserAgentTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/dialog/b2bua/BackToBackUserAgentTest.java index f9f8ff975..27ae4ce37 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/dialog/b2bua/BackToBackUserAgentTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/dialog/b2bua/BackToBackUserAgentTest.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack.dialog.b2bua; +package sip.stack.dialog.b2bua; import junit.framework.TestCase; diff --git a/src/test/unit/gov/nist/javax/sip/stack/dialog/b2bua/Shootist.java b/jain-sip-test-suite/src/test/java/sip/stack/dialog/b2bua/Shootist.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/dialog/b2bua/Shootist.java rename to jain-sip-test-suite/src/test/java/sip/stack/dialog/b2bua/Shootist.java index 3b2a49c3e..e9c0dedcb 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/dialog/b2bua/Shootist.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/dialog/b2bua/Shootist.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack.dialog.b2bua; +package sip.stack.dialog.b2bua; import gov.nist.javax.sip.SipStackImpl; @@ -45,7 +45,7 @@ import org.apache.log4j.Logger; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.msgflow.callflows.ProtocolObjects; /** diff --git a/src/test/unit/gov/nist/javax/sip/stack/dialog/b2bua/Shootme.java b/jain-sip-test-suite/src/test/java/sip/stack/dialog/b2bua/Shootme.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/dialog/b2bua/Shootme.java rename to jain-sip-test-suite/src/test/java/sip/stack/dialog/b2bua/Shootme.java index 67d4e6c10..6ab4dc435 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/dialog/b2bua/Shootme.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/dialog/b2bua/Shootme.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack.dialog.b2bua; +package sip.stack.dialog.b2bua; import gov.nist.javax.sip.SipStackImpl; @@ -39,7 +39,7 @@ import org.apache.log4j.Logger; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.msgflow.callflows.ProtocolObjects; diff --git a/src/test/unit/gov/nist/javax/sip/stack/dialog/b2bua/reinvite/BackToBackUserAgent.java b/jain-sip-test-suite/src/test/java/sip/stack/dialog/b2bua/reinvite/BackToBackUserAgent.java similarity index 98% rename from src/test/unit/gov/nist/javax/sip/stack/dialog/b2bua/reinvite/BackToBackUserAgent.java rename to jain-sip-test-suite/src/test/java/sip/stack/dialog/b2bua/reinvite/BackToBackUserAgent.java index 49ba81a6f..8f23848d1 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/dialog/b2bua/reinvite/BackToBackUserAgent.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/dialog/b2bua/reinvite/BackToBackUserAgent.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack.dialog.b2bua.reinvite; +package sip.stack.dialog.b2bua.reinvite; import gov.nist.javax.sip.DialogTimeoutEvent; import gov.nist.javax.sip.ListeningPointExt; @@ -40,7 +40,7 @@ import javax.sip.message.Request; import javax.sip.message.Response; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.msgflow.callflows.ProtocolObjects; public class BackToBackUserAgent implements SipListenerExt { diff --git a/src/test/unit/gov/nist/javax/sip/stack/dialog/b2bua/reinvite/BackToBackUserAgentTest.java b/jain-sip-test-suite/src/test/java/sip/stack/dialog/b2bua/reinvite/BackToBackUserAgentTest.java similarity index 91% rename from src/test/unit/gov/nist/javax/sip/stack/dialog/b2bua/reinvite/BackToBackUserAgentTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/dialog/b2bua/reinvite/BackToBackUserAgentTest.java index 445746e9a..2cc963f4d 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/dialog/b2bua/reinvite/BackToBackUserAgentTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/dialog/b2bua/reinvite/BackToBackUserAgentTest.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack.dialog.b2bua.reinvite; +package sip.stack.dialog.b2bua.reinvite; import junit.framework.TestCase; diff --git a/src/test/unit/gov/nist/javax/sip/stack/dialog/b2bua/reinvite/Operation.java b/jain-sip-test-suite/src/test/java/sip/stack/dialog/b2bua/reinvite/Operation.java similarity index 53% rename from src/test/unit/gov/nist/javax/sip/stack/dialog/b2bua/reinvite/Operation.java rename to jain-sip-test-suite/src/test/java/sip/stack/dialog/b2bua/reinvite/Operation.java index bdb2680ab..ba99bd7d0 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/dialog/b2bua/reinvite/Operation.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/dialog/b2bua/reinvite/Operation.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack.dialog.b2bua.reinvite; +package sip.stack.dialog.b2bua.reinvite; public enum Operation { FORWARD_INVITE,FORWARD_BYE,SEND_RE_INVITE; diff --git a/src/test/unit/gov/nist/javax/sip/stack/dialog/b2bua/reinvite/Shootist.java b/jain-sip-test-suite/src/test/java/sip/stack/dialog/b2bua/reinvite/Shootist.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/dialog/b2bua/reinvite/Shootist.java rename to jain-sip-test-suite/src/test/java/sip/stack/dialog/b2bua/reinvite/Shootist.java index 07db85aaa..920a4e54f 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/dialog/b2bua/reinvite/Shootist.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/dialog/b2bua/reinvite/Shootist.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack.dialog.b2bua.reinvite; +package sip.stack.dialog.b2bua.reinvite; import gov.nist.javax.sip.SipStackImpl; @@ -45,7 +45,7 @@ import org.apache.log4j.Logger; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.msgflow.callflows.ProtocolObjects; /** diff --git a/src/test/unit/gov/nist/javax/sip/stack/dialog/b2bua/reinvite/Shootme.java b/jain-sip-test-suite/src/test/java/sip/stack/dialog/b2bua/reinvite/Shootme.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/dialog/b2bua/reinvite/Shootme.java rename to jain-sip-test-suite/src/test/java/sip/stack/dialog/b2bua/reinvite/Shootme.java index ab54cbf81..baa05a872 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/dialog/b2bua/reinvite/Shootme.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/dialog/b2bua/reinvite/Shootme.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack.dialog.b2bua.reinvite; +package sip.stack.dialog.b2bua.reinvite; import gov.nist.javax.sip.SipStackImpl; @@ -39,7 +39,7 @@ import org.apache.log4j.Logger; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.msgflow.callflows.ProtocolObjects; diff --git a/src/test/unit/gov/nist/javax/sip/stack/dialog/termination/DialogTerminationOn50XTest.java b/jain-sip-test-suite/src/test/java/sip/stack/dialog/termination/DialogTerminationOn50XTest.java similarity index 97% rename from src/test/unit/gov/nist/javax/sip/stack/dialog/termination/DialogTerminationOn50XTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/dialog/termination/DialogTerminationOn50XTest.java index 7d82dbfe4..05a6cb66c 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/dialog/termination/DialogTerminationOn50XTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/dialog/termination/DialogTerminationOn50XTest.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack.dialog.termination; +package sip.stack.dialog.termination; import java.util.EventObject; @@ -13,7 +13,7 @@ import org.apache.log4j.Logger; -import test.tck.msgflow.callflows.ScenarioHarness; +import tck.msgflow.callflows.ScenarioHarness; public class DialogTerminationOn50XTest extends ScenarioHarness implements SipListener { diff --git a/src/test/unit/gov/nist/javax/sip/stack/dialog/termination/Shootist.java b/jain-sip-test-suite/src/test/java/sip/stack/dialog/termination/Shootist.java similarity index 98% rename from src/test/unit/gov/nist/javax/sip/stack/dialog/termination/Shootist.java rename to jain-sip-test-suite/src/test/java/sip/stack/dialog/termination/Shootist.java index d289bce9f..74610eae6 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/dialog/termination/Shootist.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/dialog/termination/Shootist.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack.dialog.termination; +package sip.stack.dialog.termination; import javax.sip.*; import javax.sip.address.*; @@ -10,7 +10,7 @@ import org.apache.log4j.SimpleLayout; import org.apache.log4j.helpers.NullEnumeration; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.msgflow.callflows.ProtocolObjects; import java.util.*; diff --git a/src/test/unit/gov/nist/javax/sip/stack/dialog/termination/Shootme.java b/jain-sip-test-suite/src/test/java/sip/stack/dialog/termination/Shootme.java similarity index 98% rename from src/test/unit/gov/nist/javax/sip/stack/dialog/termination/Shootme.java rename to jain-sip-test-suite/src/test/java/sip/stack/dialog/termination/Shootme.java index 9b7fe2446..5e64a224d 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/dialog/termination/Shootme.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/dialog/termination/Shootme.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack.dialog.termination; +package sip.stack.dialog.termination; import javax.sip.*; import javax.sip.address.*; @@ -10,7 +10,7 @@ import org.apache.log4j.SimpleLayout; import org.apache.log4j.helpers.NullEnumeration; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.msgflow.callflows.ProtocolObjects; import java.text.ParseException; import java.util.*; diff --git a/src/test/unit/gov/nist/javax/sip/stack/dialog/timeout/DialogTimeoutTest.java b/jain-sip-test-suite/src/test/java/sip/stack/dialog/timeout/DialogTimeoutTest.java similarity index 98% rename from src/test/unit/gov/nist/javax/sip/stack/dialog/timeout/DialogTimeoutTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/dialog/timeout/DialogTimeoutTest.java index 1327fd783..58f8bf7d6 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/dialog/timeout/DialogTimeoutTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/dialog/timeout/DialogTimeoutTest.java @@ -13,7 +13,7 @@ * Permission to use this software is contingent upon your acceptance * of the terms of this agreement. */ - package test.unit.gov.nist.javax.sip.stack.dialog.timeout; + package sip.stack.dialog.timeout; import gov.nist.javax.sip.SipStackImpl; @@ -21,8 +21,8 @@ import org.apache.log4j.Logger; -import test.tck.msgflow.callflows.ProtocolObjects; -import test.tck.msgflow.callflows.ScenarioHarness; +import tck.msgflow.callflows.ProtocolObjects; +import tck.msgflow.callflows.ScenarioHarness; /** * Testing if Dialog Timeout Event is correctly passed to the application layer on both sides if the diff --git a/src/test/unit/gov/nist/javax/sip/stack/dialog/timeout/Shootist.java b/jain-sip-test-suite/src/test/java/sip/stack/dialog/timeout/Shootist.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/dialog/timeout/Shootist.java rename to jain-sip-test-suite/src/test/java/sip/stack/dialog/timeout/Shootist.java index 014312da2..0f18c00c0 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/dialog/timeout/Shootist.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/dialog/timeout/Shootist.java @@ -13,7 +13,7 @@ * Permission to use this software is contingent upon your acceptance * of the terms of this agreement. */ -package test.unit.gov.nist.javax.sip.stack.dialog.timeout; +package sip.stack.dialog.timeout; import gov.nist.javax.sip.DialogTimeoutEvent; import gov.nist.javax.sip.SipListenerExt; @@ -57,7 +57,7 @@ import org.apache.log4j.SimpleLayout; import org.apache.log4j.helpers.NullEnumeration; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.msgflow.callflows.ProtocolObjects; /** * This class sends an INVITE and upon receiving a 200 OK it doesn't send the ACK to test is the Dialog Timeout Event is correctly passed to the application diff --git a/src/test/unit/gov/nist/javax/sip/stack/dialog/timeout/ShootistNotImplementingSipListenerExt.java b/jain-sip-test-suite/src/test/java/sip/stack/dialog/timeout/ShootistNotImplementingSipListenerExt.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/dialog/timeout/ShootistNotImplementingSipListenerExt.java rename to jain-sip-test-suite/src/test/java/sip/stack/dialog/timeout/ShootistNotImplementingSipListenerExt.java index 131addf4e..b0533874d 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/dialog/timeout/ShootistNotImplementingSipListenerExt.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/dialog/timeout/ShootistNotImplementingSipListenerExt.java @@ -13,7 +13,7 @@ * Permission to use this software is contingent upon your acceptance * of the terms of this agreement. */ -package test.unit.gov.nist.javax.sip.stack.dialog.timeout; +package sip.stack.dialog.timeout; import gov.nist.javax.sip.DialogTimeoutEvent; import gov.nist.javax.sip.SipStackImpl; @@ -55,7 +55,7 @@ import org.apache.log4j.SimpleLayout; import org.apache.log4j.helpers.NullEnumeration; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.msgflow.callflows.ProtocolObjects; /** * This class sends an INVITE and upon receiving a 200 OK it doesn't send the ACK to test is the Dialog Timeout Event is correctly passed to the application diff --git a/src/test/unit/gov/nist/javax/sip/stack/dialog/timeout/Shootme.java b/jain-sip-test-suite/src/test/java/sip/stack/dialog/timeout/Shootme.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/dialog/timeout/Shootme.java rename to jain-sip-test-suite/src/test/java/sip/stack/dialog/timeout/Shootme.java index 50e18f42e..c0f515070 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/dialog/timeout/Shootme.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/dialog/timeout/Shootme.java @@ -13,7 +13,7 @@ * Permission to use this software is contingent upon your acceptance * of the terms of this agreement. */ -package test.unit.gov.nist.javax.sip.stack.dialog.timeout; +package sip.stack.dialog.timeout; import gov.nist.javax.sip.DialogTimeoutEvent; import gov.nist.javax.sip.SipListenerExt; @@ -48,7 +48,7 @@ import org.apache.log4j.SimpleLayout; import org.apache.log4j.helpers.NullEnumeration; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.msgflow.callflows.ProtocolObjects; /** * This class receives an INVITE and sends a 180 and a 200 OK, the Shootist will not send the ACK to test is the Dialog Timeout Event is correctly passed to the application. diff --git a/src/test/unit/gov/nist/javax/sip/stack/dialog/timeout/ShootmeNotImplementingListener.java b/jain-sip-test-suite/src/test/java/sip/stack/dialog/timeout/ShootmeNotImplementingListener.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/dialog/timeout/ShootmeNotImplementingListener.java rename to jain-sip-test-suite/src/test/java/sip/stack/dialog/timeout/ShootmeNotImplementingListener.java index 39288d0b5..5dfbdb712 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/dialog/timeout/ShootmeNotImplementingListener.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/dialog/timeout/ShootmeNotImplementingListener.java @@ -13,7 +13,7 @@ * Permission to use this software is contingent upon your acceptance * of the terms of this agreement. */ -package test.unit.gov.nist.javax.sip.stack.dialog.timeout; +package sip.stack.dialog.timeout; import gov.nist.javax.sip.DialogTimeoutEvent; import gov.nist.javax.sip.stack.SIPDialog; @@ -47,7 +47,7 @@ import org.apache.log4j.SimpleLayout; import org.apache.log4j.helpers.NullEnumeration; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.msgflow.callflows.ProtocolObjects; /** * This class receives an INVITE and sends a 180 and a 200 OK, the Shootist will not send the ACK to test is the Dialog Timeout Event is correctly passed to the application. diff --git a/src/test/unit/gov/nist/javax/sip/stack/forkedinvite/InviteTest.java b/jain-sip-test-suite/src/test/java/sip/stack/forkedinvite/InviteTest.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/forkedinvite/InviteTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/forkedinvite/InviteTest.java index 3b8a38517..45ed3da28 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/forkedinvite/InviteTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/forkedinvite/InviteTest.java @@ -1,7 +1,7 @@ /** * */ -package test.unit.gov.nist.javax.sip.stack.forkedinvite; +package sip.stack.forkedinvite; import java.util.HashSet; diff --git a/src/test/unit/gov/nist/javax/sip/stack/forkedinvite/Proxy.java b/jain-sip-test-suite/src/test/java/sip/stack/forkedinvite/Proxy.java similarity index 98% rename from src/test/unit/gov/nist/javax/sip/stack/forkedinvite/Proxy.java rename to jain-sip-test-suite/src/test/java/sip/stack/forkedinvite/Proxy.java index 21df50002..a9470a485 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/forkedinvite/Proxy.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/forkedinvite/Proxy.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack.forkedinvite; +package sip.stack.forkedinvite; import gov.nist.javax.sip.SipStackImpl; @@ -36,8 +36,8 @@ import org.apache.log4j.Logger; -import test.tck.TestHarness; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.TestHarness; +import tck.msgflow.callflows.ProtocolObjects; /** * A very simple forking proxy server. diff --git a/src/test/unit/gov/nist/javax/sip/stack/forkedinvite/Shootist.java b/jain-sip-test-suite/src/test/java/sip/stack/forkedinvite/Shootist.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/forkedinvite/Shootist.java rename to jain-sip-test-suite/src/test/java/sip/stack/forkedinvite/Shootist.java index 9751eca6a..c567a2244 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/forkedinvite/Shootist.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/forkedinvite/Shootist.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack.forkedinvite; +package sip.stack.forkedinvite; import gov.nist.javax.sip.ResponseEventExt; import gov.nist.javax.sip.SipStackImpl; diff --git a/src/test/unit/gov/nist/javax/sip/stack/forkedinvite/Shootme.java b/jain-sip-test-suite/src/test/java/sip/stack/forkedinvite/Shootme.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/forkedinvite/Shootme.java rename to jain-sip-test-suite/src/test/java/sip/stack/forkedinvite/Shootme.java index 7dd15f20b..d6bf53342 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/forkedinvite/Shootme.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/forkedinvite/Shootme.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack.forkedinvite; +package sip.stack.forkedinvite; import gov.nist.javax.sip.SipStackImpl; import gov.nist.javax.sip.header.HeaderExt; diff --git a/src/test/unit/gov/nist/javax/sip/stack/forkedinvite/SipObjects.java b/jain-sip-test-suite/src/test/java/sip/stack/forkedinvite/SipObjects.java similarity index 98% rename from src/test/unit/gov/nist/javax/sip/stack/forkedinvite/SipObjects.java rename to jain-sip-test-suite/src/test/java/sip/stack/forkedinvite/SipObjects.java index 3100d069b..e3da7c808 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/forkedinvite/SipObjects.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/forkedinvite/SipObjects.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack.forkedinvite; +package sip.stack.forkedinvite; import gov.nist.javax.sip.SipStackImpl; import gov.nist.javax.sip.stack.NioMessageProcessorFactory; diff --git a/src/test/unit/gov/nist/javax/sip/stack/forkedinvite482/AbstractForkedInviteTestCase.java b/jain-sip-test-suite/src/test/java/sip/stack/forkedinvite482/AbstractForkedInviteTestCase.java similarity index 95% rename from src/test/unit/gov/nist/javax/sip/stack/forkedinvite482/AbstractForkedInviteTestCase.java rename to jain-sip-test-suite/src/test/java/sip/stack/forkedinvite482/AbstractForkedInviteTestCase.java index 00eb32040..e70500395 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/forkedinvite482/AbstractForkedInviteTestCase.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/forkedinvite482/AbstractForkedInviteTestCase.java @@ -1,7 +1,7 @@ /** * */ -package test.unit.gov.nist.javax.sip.stack.forkedinvite482; +package sip.stack.forkedinvite482; import gov.nist.javax.sip.SipProviderImpl; @@ -27,8 +27,8 @@ import org.apache.log4j.SimpleLayout; import org.apache.log4j.helpers.NullEnumeration; -import test.tck.msgflow.callflows.ProtocolObjects; -import test.tck.msgflow.callflows.ScenarioHarness; +import tck.msgflow.callflows.ProtocolObjects; +import tck.msgflow.callflows.ScenarioHarness; import junit.framework.TestCase; diff --git a/src/test/unit/gov/nist/javax/sip/stack/forkedinvite482/ForkedInviteTest.java b/jain-sip-test-suite/src/test/java/sip/stack/forkedinvite482/ForkedInviteTest.java similarity index 85% rename from src/test/unit/gov/nist/javax/sip/stack/forkedinvite482/ForkedInviteTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/forkedinvite482/ForkedInviteTest.java index 0e87275f5..87943da63 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/forkedinvite482/ForkedInviteTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/forkedinvite482/ForkedInviteTest.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack.forkedinvite482; +package sip.stack.forkedinvite482; public class ForkedInviteTest extends AbstractForkedInviteTestCase { boolean myFlag; diff --git a/src/test/unit/gov/nist/javax/sip/stack/forkedinvite482/Proxy.java b/jain-sip-test-suite/src/test/java/sip/stack/forkedinvite482/Proxy.java similarity index 98% rename from src/test/unit/gov/nist/javax/sip/stack/forkedinvite482/Proxy.java rename to jain-sip-test-suite/src/test/java/sip/stack/forkedinvite482/Proxy.java index be9c81316..e862da8d1 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/forkedinvite482/Proxy.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/forkedinvite482/Proxy.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack.forkedinvite482; +package sip.stack.forkedinvite482; import java.util.HashSet; import java.util.Hashtable; @@ -27,8 +27,8 @@ import org.apache.log4j.Logger; -import test.tck.TestHarness; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.TestHarness; +import tck.msgflow.callflows.ProtocolObjects; /** * A very simple forking proxy server. diff --git a/src/test/unit/gov/nist/javax/sip/stack/forkedinvite482/Shootist.java b/jain-sip-test-suite/src/test/java/sip/stack/forkedinvite482/Shootist.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/forkedinvite482/Shootist.java rename to jain-sip-test-suite/src/test/java/sip/stack/forkedinvite482/Shootist.java index 4b685c9e4..017b30674 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/forkedinvite482/Shootist.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/forkedinvite482/Shootist.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack.forkedinvite482; +package sip.stack.forkedinvite482; import java.util.ArrayList; import java.util.HashSet; @@ -34,8 +34,8 @@ import org.apache.log4j.Logger; -import test.tck.TestHarness; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.TestHarness; +import tck.msgflow.callflows.ProtocolObjects; /** * This class is a UAC template. Shootist is the guy that shoots and shootme is the guy that gets diff --git a/src/test/unit/gov/nist/javax/sip/stack/forkedinvite482/Shootme.java b/jain-sip-test-suite/src/test/java/sip/stack/forkedinvite482/Shootme.java similarity index 98% rename from src/test/unit/gov/nist/javax/sip/stack/forkedinvite482/Shootme.java rename to jain-sip-test-suite/src/test/java/sip/stack/forkedinvite482/Shootme.java index b4288d4e9..ef70ac639 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/forkedinvite482/Shootme.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/forkedinvite482/Shootme.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack.forkedinvite482; +package sip.stack.forkedinvite482; import javax.sip.*; import javax.sip.address.*; @@ -9,8 +9,8 @@ import org.apache.log4j.Logger; import org.apache.log4j.SimpleLayout; -import test.tck.TestHarness; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.TestHarness; +import tck.msgflow.callflows.ProtocolObjects; diff --git a/src/test/unit/gov/nist/javax/sip/stack/forkedinvitedialogtimeout/InviteTest.java b/jain-sip-test-suite/src/test/java/sip/stack/forkedinvitedialogtimeout/InviteTest.java similarity index 98% rename from src/test/unit/gov/nist/javax/sip/stack/forkedinvitedialogtimeout/InviteTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/forkedinvitedialogtimeout/InviteTest.java index a4c8707fb..285950d52 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/forkedinvitedialogtimeout/InviteTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/forkedinvitedialogtimeout/InviteTest.java @@ -1,7 +1,7 @@ /** * */ -package test.unit.gov.nist.javax.sip.stack.forkedinvitedialogtimeout; +package sip.stack.forkedinvitedialogtimeout; import java.util.HashSet; diff --git a/src/test/unit/gov/nist/javax/sip/stack/forkedinvitedialogtimeout/Proxy.java b/jain-sip-test-suite/src/test/java/sip/stack/forkedinvitedialogtimeout/Proxy.java similarity index 98% rename from src/test/unit/gov/nist/javax/sip/stack/forkedinvitedialogtimeout/Proxy.java rename to jain-sip-test-suite/src/test/java/sip/stack/forkedinvitedialogtimeout/Proxy.java index 84499debf..ff87b6dfc 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/forkedinvitedialogtimeout/Proxy.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/forkedinvitedialogtimeout/Proxy.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack.forkedinvitedialogtimeout; +package sip.stack.forkedinvitedialogtimeout; import gov.nist.javax.sip.SipStackImpl; @@ -36,8 +36,8 @@ import org.apache.log4j.Logger; -import test.tck.TestHarness; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.TestHarness; +import tck.msgflow.callflows.ProtocolObjects; /** * A very simple forking proxy server. diff --git a/src/test/unit/gov/nist/javax/sip/stack/forkedinvitedialogtimeout/Shootist.java b/jain-sip-test-suite/src/test/java/sip/stack/forkedinvitedialogtimeout/Shootist.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/forkedinvitedialogtimeout/Shootist.java rename to jain-sip-test-suite/src/test/java/sip/stack/forkedinvitedialogtimeout/Shootist.java index 253852d0b..f16969300 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/forkedinvitedialogtimeout/Shootist.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/forkedinvitedialogtimeout/Shootist.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack.forkedinvitedialogtimeout; +package sip.stack.forkedinvitedialogtimeout; import gov.nist.javax.sip.DialogTimeoutEvent; import gov.nist.javax.sip.ResponseEventExt; diff --git a/src/test/unit/gov/nist/javax/sip/stack/forkedinvitedialogtimeout/Shootme.java b/jain-sip-test-suite/src/test/java/sip/stack/forkedinvitedialogtimeout/Shootme.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/forkedinvitedialogtimeout/Shootme.java rename to jain-sip-test-suite/src/test/java/sip/stack/forkedinvitedialogtimeout/Shootme.java index 26c2c3b1c..ded65ef7b 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/forkedinvitedialogtimeout/Shootme.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/forkedinvitedialogtimeout/Shootme.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack.forkedinvitedialogtimeout; +package sip.stack.forkedinvitedialogtimeout; import gov.nist.javax.sip.SipStackImpl; diff --git a/src/test/unit/gov/nist/javax/sip/stack/forkedinvitedialogtimeout/SipObjects.java b/jain-sip-test-suite/src/test/java/sip/stack/forkedinvitedialogtimeout/SipObjects.java similarity index 97% rename from src/test/unit/gov/nist/javax/sip/stack/forkedinvitedialogtimeout/SipObjects.java rename to jain-sip-test-suite/src/test/java/sip/stack/forkedinvitedialogtimeout/SipObjects.java index 49334649d..c6b9f8175 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/forkedinvitedialogtimeout/SipObjects.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/forkedinvitedialogtimeout/SipObjects.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack.forkedinvitedialogtimeout; +package sip.stack.forkedinvitedialogtimeout; import gov.nist.javax.sip.SipStackImpl; import gov.nist.javax.sip.stack.NioMessageProcessorFactory; diff --git a/src/test/unit/gov/nist/javax/sip/stack/forkedinvitedialogtimeout/package.html b/jain-sip-test-suite/src/test/java/sip/stack/forkedinvitedialogtimeout/package.html similarity index 100% rename from src/test/unit/gov/nist/javax/sip/stack/forkedinvitedialogtimeout/package.html rename to jain-sip-test-suite/src/test/java/sip/stack/forkedinvitedialogtimeout/package.html diff --git a/src/test/unit/gov/nist/javax/sip/stack/forkedinviteloopdisabled/AbstractForkedInviteTestCase.java b/jain-sip-test-suite/src/test/java/sip/stack/forkedinviteloopdisabled/AbstractForkedInviteTestCase.java similarity index 94% rename from src/test/unit/gov/nist/javax/sip/stack/forkedinviteloopdisabled/AbstractForkedInviteTestCase.java rename to jain-sip-test-suite/src/test/java/sip/stack/forkedinviteloopdisabled/AbstractForkedInviteTestCase.java index 626639ffa..88197cade 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/forkedinviteloopdisabled/AbstractForkedInviteTestCase.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/forkedinviteloopdisabled/AbstractForkedInviteTestCase.java @@ -1,7 +1,7 @@ /** * */ -package test.unit.gov.nist.javax.sip.stack.forkedinviteloopdisabled; +package sip.stack.forkedinviteloopdisabled; import gov.nist.javax.sip.SipProviderImpl; @@ -27,8 +27,8 @@ import org.apache.log4j.SimpleLayout; import org.apache.log4j.helpers.NullEnumeration; -import test.tck.msgflow.callflows.ProtocolObjects; -import test.tck.msgflow.callflows.ScenarioHarness; +import tck.msgflow.callflows.ProtocolObjects; +import tck.msgflow.callflows.ScenarioHarness; import junit.framework.TestCase; diff --git a/src/test/unit/gov/nist/javax/sip/stack/forkedinviteloopdisabled/ForkedInviteTest.java b/jain-sip-test-suite/src/test/java/sip/stack/forkedinviteloopdisabled/ForkedInviteTest.java similarity index 83% rename from src/test/unit/gov/nist/javax/sip/stack/forkedinviteloopdisabled/ForkedInviteTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/forkedinviteloopdisabled/ForkedInviteTest.java index a1099ff7a..dc16c3043 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/forkedinviteloopdisabled/ForkedInviteTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/forkedinviteloopdisabled/ForkedInviteTest.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack.forkedinviteloopdisabled; +package sip.stack.forkedinviteloopdisabled; public class ForkedInviteTest extends AbstractForkedInviteTestCase { boolean myFlag; diff --git a/src/test/unit/gov/nist/javax/sip/stack/forkedinviteloopdisabled/Proxy.java b/jain-sip-test-suite/src/test/java/sip/stack/forkedinviteloopdisabled/Proxy.java similarity index 98% rename from src/test/unit/gov/nist/javax/sip/stack/forkedinviteloopdisabled/Proxy.java rename to jain-sip-test-suite/src/test/java/sip/stack/forkedinviteloopdisabled/Proxy.java index 602c1f955..38c960f38 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/forkedinviteloopdisabled/Proxy.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/forkedinviteloopdisabled/Proxy.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack.forkedinviteloopdisabled; +package sip.stack.forkedinviteloopdisabled; import java.util.HashSet; import java.util.Hashtable; @@ -27,8 +27,8 @@ import org.apache.log4j.Logger; -import test.tck.TestHarness; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.TestHarness; +import tck.msgflow.callflows.ProtocolObjects; /** * A very simple forking proxy server. diff --git a/src/test/unit/gov/nist/javax/sip/stack/forkedinviteloopdisabled/Shootist.java b/jain-sip-test-suite/src/test/java/sip/stack/forkedinviteloopdisabled/Shootist.java similarity index 98% rename from src/test/unit/gov/nist/javax/sip/stack/forkedinviteloopdisabled/Shootist.java rename to jain-sip-test-suite/src/test/java/sip/stack/forkedinviteloopdisabled/Shootist.java index 7b3282f4d..d67b1f1eb 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/forkedinviteloopdisabled/Shootist.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/forkedinviteloopdisabled/Shootist.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack.forkedinviteloopdisabled; +package sip.stack.forkedinviteloopdisabled; import java.util.ArrayList; import java.util.HashSet; @@ -34,8 +34,8 @@ import org.apache.log4j.Logger; -import test.tck.TestHarness; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.TestHarness; +import tck.msgflow.callflows.ProtocolObjects; /** * This class is a UAC template. Shootist is the guy that shoots and shootme is the guy that gets diff --git a/src/test/unit/gov/nist/javax/sip/stack/forkedinviteloopdisabled/Shootme.java b/jain-sip-test-suite/src/test/java/sip/stack/forkedinviteloopdisabled/Shootme.java similarity index 98% rename from src/test/unit/gov/nist/javax/sip/stack/forkedinviteloopdisabled/Shootme.java rename to jain-sip-test-suite/src/test/java/sip/stack/forkedinviteloopdisabled/Shootme.java index 3b14eca45..0ae60c82c 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/forkedinviteloopdisabled/Shootme.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/forkedinviteloopdisabled/Shootme.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack.forkedinviteloopdisabled; +package sip.stack.forkedinviteloopdisabled; import javax.sip.*; import javax.sip.address.*; @@ -10,8 +10,8 @@ import org.apache.log4j.SimpleLayout; import gov.nist.javax.sip.SipProviderExt; -import test.tck.TestHarness; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.TestHarness; +import tck.msgflow.callflows.ProtocolObjects; diff --git a/src/test/unit/gov/nist/javax/sip/stack/no491/ReInviteTCPPostParserThreadPoolTest.java b/jain-sip-test-suite/src/test/java/sip/stack/no491/ReInviteTCPPostParserThreadPoolTest.java similarity index 97% rename from src/test/unit/gov/nist/javax/sip/stack/no491/ReInviteTCPPostParserThreadPoolTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/no491/ReInviteTCPPostParserThreadPoolTest.java index 9df708f09..4efff9eae 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/no491/ReInviteTCPPostParserThreadPoolTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/no491/ReInviteTCPPostParserThreadPoolTest.java @@ -20,7 +20,7 @@ /** * */ -package test.unit.gov.nist.javax.sip.stack.no491; +package sip.stack.no491; import gov.nist.javax.sip.SipStackImpl; import gov.nist.javax.sip.parser.PipelinedMsgParser; @@ -39,7 +39,7 @@ import org.apache.log4j.Logger; -import test.tck.msgflow.callflows.ScenarioHarness; +import tck.msgflow.callflows.ScenarioHarness; /** * @author M. Ranganathan diff --git a/src/test/unit/gov/nist/javax/sip/stack/no491/ReInviteTest.java b/jain-sip-test-suite/src/test/java/sip/stack/no491/ReInviteTest.java similarity index 97% rename from src/test/unit/gov/nist/javax/sip/stack/no491/ReInviteTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/no491/ReInviteTest.java index a5e8198b7..2e8455f0d 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/no491/ReInviteTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/no491/ReInviteTest.java @@ -20,7 +20,7 @@ /** * */ -package test.unit.gov.nist.javax.sip.stack.no491; +package sip.stack.no491; import gov.nist.javax.sip.SipStackImpl; @@ -37,7 +37,7 @@ import org.apache.log4j.Logger; -import test.tck.msgflow.callflows.ScenarioHarness; +import tck.msgflow.callflows.ScenarioHarness; /** * @author M. Ranganathan diff --git a/src/test/unit/gov/nist/javax/sip/stack/no491/Shootist.java b/jain-sip-test-suite/src/test/java/sip/stack/no491/Shootist.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/no491/Shootist.java rename to jain-sip-test-suite/src/test/java/sip/stack/no491/Shootist.java index e7fb574b5..6100e8523 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/no491/Shootist.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/no491/Shootist.java @@ -17,7 +17,7 @@ * * */ -package test.unit.gov.nist.javax.sip.stack.no491; +package sip.stack.no491; import gov.nist.javax.sip.DialogExt; import gov.nist.javax.sip.address.SipUri; @@ -33,8 +33,8 @@ import org.apache.log4j.SimpleLayout; import org.apache.log4j.helpers.NullEnumeration; -import test.tck.TestHarness; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.TestHarness; +import tck.msgflow.callflows.ProtocolObjects; import java.util.*; diff --git a/src/test/unit/gov/nist/javax/sip/stack/no491/Shootme.java b/jain-sip-test-suite/src/test/java/sip/stack/no491/Shootme.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/no491/Shootme.java rename to jain-sip-test-suite/src/test/java/sip/stack/no491/Shootme.java index 85eee21a3..1860a341a 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/no491/Shootme.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/no491/Shootme.java @@ -17,7 +17,7 @@ * * */ -package test.unit.gov.nist.javax.sip.stack.no491; +package sip.stack.no491; import gov.nist.javax.sip.DialogExt; @@ -31,7 +31,7 @@ import org.apache.log4j.SimpleLayout; import org.apache.log4j.helpers.NullEnumeration; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.msgflow.callflows.ProtocolObjects; /** * This class is a UAC template. diff --git a/src/test/unit/gov/nist/javax/sip/stack/reInvite/ReInviteTest.java b/jain-sip-test-suite/src/test/java/sip/stack/reInvite/ReInviteTest.java similarity index 97% rename from src/test/unit/gov/nist/javax/sip/stack/reInvite/ReInviteTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/reInvite/ReInviteTest.java index 0d341108b..e27dac0c7 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/reInvite/ReInviteTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/reInvite/ReInviteTest.java @@ -20,7 +20,7 @@ /** * */ -package test.unit.gov.nist.javax.sip.stack.reInvite; +package sip.stack.reInvite; import gov.nist.javax.sip.SipStackImpl; @@ -37,7 +37,7 @@ import org.apache.log4j.Logger; -import test.tck.msgflow.callflows.ScenarioHarness; +import tck.msgflow.callflows.ScenarioHarness; /** * @author M. Ranganathan diff --git a/src/test/unit/gov/nist/javax/sip/stack/reInvite/Shootist.java b/jain-sip-test-suite/src/test/java/sip/stack/reInvite/Shootist.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/reInvite/Shootist.java rename to jain-sip-test-suite/src/test/java/sip/stack/reInvite/Shootist.java index a13cf2013..b57fbc142 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/reInvite/Shootist.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/reInvite/Shootist.java @@ -17,7 +17,7 @@ * * */ -package test.unit.gov.nist.javax.sip.stack.reInvite; +package sip.stack.reInvite; import gov.nist.javax.sip.DialogExt; import gov.nist.javax.sip.address.SipUri; @@ -33,8 +33,8 @@ import org.apache.log4j.SimpleLayout; import org.apache.log4j.helpers.NullEnumeration; -import test.tck.TestHarness; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.TestHarness; +import tck.msgflow.callflows.ProtocolObjects; import java.util.*; diff --git a/src/test/unit/gov/nist/javax/sip/stack/reInvite/Shootme.java b/jain-sip-test-suite/src/test/java/sip/stack/reInvite/Shootme.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/reInvite/Shootme.java rename to jain-sip-test-suite/src/test/java/sip/stack/reInvite/Shootme.java index 820e5e6de..a7b446d12 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/reInvite/Shootme.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/reInvite/Shootme.java @@ -17,7 +17,7 @@ * * */ -package test.unit.gov.nist.javax.sip.stack.reInvite; +package sip.stack.reInvite; import gov.nist.javax.sip.DialogExt; @@ -31,7 +31,7 @@ import org.apache.log4j.SimpleLayout; import org.apache.log4j.helpers.NullEnumeration; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.msgflow.callflows.ProtocolObjects; /** * This class is a UAC template. diff --git a/src/test/unit/gov/nist/javax/sip/stack/reinvitechallenge/AccountManagerImpl.java b/jain-sip-test-suite/src/test/java/sip/stack/reinvitechallenge/AccountManagerImpl.java similarity index 85% rename from src/test/unit/gov/nist/javax/sip/stack/reinvitechallenge/AccountManagerImpl.java rename to jain-sip-test-suite/src/test/java/sip/stack/reinvitechallenge/AccountManagerImpl.java index 9ef64f45a..9aea091f9 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/reinvitechallenge/AccountManagerImpl.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/reinvitechallenge/AccountManagerImpl.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack.reinvitechallenge; +package sip.stack.reinvitechallenge; import javax.sip.ClientTransaction; diff --git a/src/test/unit/gov/nist/javax/sip/stack/reinvitechallenge/ReInviteTest.java b/jain-sip-test-suite/src/test/java/sip/stack/reinvitechallenge/ReInviteTest.java similarity index 96% rename from src/test/unit/gov/nist/javax/sip/stack/reinvitechallenge/ReInviteTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/reinvitechallenge/ReInviteTest.java index 7fb632181..793314e0e 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/reinvitechallenge/ReInviteTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/reinvitechallenge/ReInviteTest.java @@ -20,7 +20,7 @@ /** * */ -package test.unit.gov.nist.javax.sip.stack.reinvitechallenge; +package sip.stack.reinvitechallenge; import gov.nist.javax.sip.SipProviderImpl; import gov.nist.javax.sip.SipStackImpl; @@ -47,9 +47,9 @@ import org.apache.log4j.SimpleLayout; import org.apache.log4j.helpers.NullEnumeration; -import test.tck.msgflow.callflows.ProtocolObjects; -import test.tck.msgflow.callflows.ScenarioHarness; -import test.tck.TestHarness; +import tck.msgflow.callflows.ProtocolObjects; +import tck.msgflow.callflows.ScenarioHarness; +import tck.TestHarness; import junit.framework.TestCase; diff --git a/src/test/unit/gov/nist/javax/sip/stack/reinvitechallenge/Shootist.java b/jain-sip-test-suite/src/test/java/sip/stack/reinvitechallenge/Shootist.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/reinvitechallenge/Shootist.java rename to jain-sip-test-suite/src/test/java/sip/stack/reinvitechallenge/Shootist.java index c0f769604..d203221b2 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/reinvitechallenge/Shootist.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/reinvitechallenge/Shootist.java @@ -17,7 +17,7 @@ * * */ -package test.unit.gov.nist.javax.sip.stack.reinvitechallenge; +package sip.stack.reinvitechallenge; import gov.nist.javax.sip.DialogExt; import gov.nist.javax.sip.SipStackExt; @@ -36,8 +36,8 @@ import org.apache.log4j.SimpleLayout; import org.apache.log4j.helpers.NullEnumeration; -import test.tck.TestHarness; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.TestHarness; +import tck.msgflow.callflows.ProtocolObjects; import java.util.*; diff --git a/src/test/unit/gov/nist/javax/sip/stack/reinvitechallenge/Shootme.java b/jain-sip-test-suite/src/test/java/sip/stack/reinvitechallenge/Shootme.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/reinvitechallenge/Shootme.java rename to jain-sip-test-suite/src/test/java/sip/stack/reinvitechallenge/Shootme.java index be668c61c..aa406aa4b 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/reinvitechallenge/Shootme.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/reinvitechallenge/Shootme.java @@ -17,7 +17,7 @@ * * */ -package test.unit.gov.nist.javax.sip.stack.reinvitechallenge; +package sip.stack.reinvitechallenge; import gov.nist.javax.sip.DialogExt; import gov.nist.javax.sip.SipStackExt; @@ -35,7 +35,7 @@ import org.apache.log4j.SimpleLayout; import org.apache.log4j.helpers.NullEnumeration; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.msgflow.callflows.ProtocolObjects; /** * This class is a UAC template. diff --git a/src/test/unit/gov/nist/javax/sip/stack/reinvitechallenge/UserCredentialsImpl.java b/jain-sip-test-suite/src/test/java/sip/stack/reinvitechallenge/UserCredentialsImpl.java similarity index 82% rename from src/test/unit/gov/nist/javax/sip/stack/reinvitechallenge/UserCredentialsImpl.java rename to jain-sip-test-suite/src/test/java/sip/stack/reinvitechallenge/UserCredentialsImpl.java index 28a4ac818..68eea10a5 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/reinvitechallenge/UserCredentialsImpl.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/reinvitechallenge/UserCredentialsImpl.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack.reinvitechallenge; +package sip.stack.reinvitechallenge; import gov.nist.javax.sip.clientauthutils.UserCredentials; diff --git a/src/test/unit/gov/nist/javax/sip/stack/stx491/ReInviteTest.java b/jain-sip-test-suite/src/test/java/sip/stack/stx491/ReInviteTest.java similarity index 96% rename from src/test/unit/gov/nist/javax/sip/stack/stx491/ReInviteTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/stx491/ReInviteTest.java index 07cbceab2..2898b759f 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/stx491/ReInviteTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/stx491/ReInviteTest.java @@ -20,7 +20,7 @@ /** * */ -package test.unit.gov.nist.javax.sip.stack.stx491; +package sip.stack.stx491; import gov.nist.javax.sip.SipProviderImpl; import gov.nist.javax.sip.SipStackImpl; @@ -47,9 +47,9 @@ import org.apache.log4j.SimpleLayout; import org.apache.log4j.helpers.NullEnumeration; -import test.tck.msgflow.callflows.ProtocolObjects; -import test.tck.msgflow.callflows.ScenarioHarness; -import test.tck.TestHarness; +import tck.msgflow.callflows.ProtocolObjects; +import tck.msgflow.callflows.ScenarioHarness; +import tck.TestHarness; import junit.framework.TestCase; diff --git a/src/test/unit/gov/nist/javax/sip/stack/stx491/Shootist.java b/jain-sip-test-suite/src/test/java/sip/stack/stx491/Shootist.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/stx491/Shootist.java rename to jain-sip-test-suite/src/test/java/sip/stack/stx491/Shootist.java index ea25739c9..03e4d9b4b 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/stx491/Shootist.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/stx491/Shootist.java @@ -17,7 +17,7 @@ * * */ -package test.unit.gov.nist.javax.sip.stack.stx491; +package sip.stack.stx491; import gov.nist.javax.sip.DialogExt; import gov.nist.javax.sip.address.SipUri; @@ -33,8 +33,8 @@ import org.apache.log4j.SimpleLayout; import org.apache.log4j.helpers.NullEnumeration; -import test.tck.TestHarness; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.TestHarness; +import tck.msgflow.callflows.ProtocolObjects; import java.util.*; diff --git a/src/test/unit/gov/nist/javax/sip/stack/stx491/Shootme.java b/jain-sip-test-suite/src/test/java/sip/stack/stx491/Shootme.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/stx491/Shootme.java rename to jain-sip-test-suite/src/test/java/sip/stack/stx491/Shootme.java index 0b51d9512..999a9edfe 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/stx491/Shootme.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/stx491/Shootme.java @@ -17,7 +17,7 @@ * * */ -package test.unit.gov.nist.javax.sip.stack.stx491; +package sip.stack.stx491; import gov.nist.javax.sip.DialogExt; @@ -31,7 +31,7 @@ import org.apache.log4j.SimpleLayout; import org.apache.log4j.helpers.NullEnumeration; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.msgflow.callflows.ProtocolObjects; /** * This class is a UAC template. diff --git a/src/test/unit/gov/nist/javax/sip/stack/subsnotify/Notifier.java b/jain-sip-test-suite/src/test/java/sip/stack/subsnotify/Notifier.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/subsnotify/Notifier.java rename to jain-sip-test-suite/src/test/java/sip/stack/subsnotify/Notifier.java index c67e264e7..9ee4d21f1 100755 --- a/src/test/unit/gov/nist/javax/sip/stack/subsnotify/Notifier.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/subsnotify/Notifier.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack.subsnotify; +package sip.stack.subsnotify; import gov.nist.javax.sip.ResponseEventExt; import gov.nist.javax.sip.message.MessageExt; diff --git a/src/test/unit/gov/nist/javax/sip/stack/subsnotify/NotifyBefore202Test.java b/jain-sip-test-suite/src/test/java/sip/stack/subsnotify/NotifyBefore202Test.java similarity index 92% rename from src/test/unit/gov/nist/javax/sip/stack/subsnotify/NotifyBefore202Test.java rename to jain-sip-test-suite/src/test/java/sip/stack/subsnotify/NotifyBefore202Test.java index 4155cb9f9..c7cafe785 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/subsnotify/NotifyBefore202Test.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/subsnotify/NotifyBefore202Test.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack.subsnotify; +package sip.stack.subsnotify; import junit.framework.TestCase; diff --git a/src/test/unit/gov/nist/javax/sip/stack/subsnotify/Subscriber.java b/jain-sip-test-suite/src/test/java/sip/stack/subsnotify/Subscriber.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/subsnotify/Subscriber.java rename to jain-sip-test-suite/src/test/java/sip/stack/subsnotify/Subscriber.java index 63c0e07da..2d3787a7d 100755 --- a/src/test/unit/gov/nist/javax/sip/stack/subsnotify/Subscriber.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/subsnotify/Subscriber.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack.subsnotify; +package sip.stack.subsnotify; import gov.nist.javax.sip.ResponseEventExt; import gov.nist.javax.sip.stack.NioMessageProcessorFactory; diff --git a/src/test/unit/gov/nist/javax/sip/stack/subsnotify/SubscriberTimeoutAggressiveTest.java b/jain-sip-test-suite/src/test/java/sip/stack/subsnotify/SubscriberTimeoutAggressiveTest.java similarity index 90% rename from src/test/unit/gov/nist/javax/sip/stack/subsnotify/SubscriberTimeoutAggressiveTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/subsnotify/SubscriberTimeoutAggressiveTest.java index 3e34d2c36..1350f1024 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/subsnotify/SubscriberTimeoutAggressiveTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/subsnotify/SubscriberTimeoutAggressiveTest.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack.subsnotify; +package sip.stack.subsnotify; import junit.framework.TestCase; diff --git a/src/test/unit/gov/nist/javax/sip/stack/timeoutontermineted/Shootist.java b/jain-sip-test-suite/src/test/java/sip/stack/timeoutontermineted/Shootist.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/timeoutontermineted/Shootist.java rename to jain-sip-test-suite/src/test/java/sip/stack/timeoutontermineted/Shootist.java index 88687f206..10d9d3072 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/timeoutontermineted/Shootist.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/timeoutontermineted/Shootist.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack.timeoutontermineted; +package sip.stack.timeoutontermineted; import java.util.ArrayList; diff --git a/src/test/unit/gov/nist/javax/sip/stack/timeoutontermineted/Shootme.java b/jain-sip-test-suite/src/test/java/sip/stack/timeoutontermineted/Shootme.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/timeoutontermineted/Shootme.java rename to jain-sip-test-suite/src/test/java/sip/stack/timeoutontermineted/Shootme.java index b5b691d90..bcb40c283 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/timeoutontermineted/Shootme.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/timeoutontermineted/Shootme.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack.timeoutontermineted; +package sip.stack.timeoutontermineted; import java.util.Random; import java.util.Timer; diff --git a/src/test/unit/gov/nist/javax/sip/stack/timeoutontermineted/SipObjects.java b/jain-sip-test-suite/src/test/java/sip/stack/timeoutontermineted/SipObjects.java similarity index 98% rename from src/test/unit/gov/nist/javax/sip/stack/timeoutontermineted/SipObjects.java rename to jain-sip-test-suite/src/test/java/sip/stack/timeoutontermineted/SipObjects.java index 96b4fc03b..9109c3214 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/timeoutontermineted/SipObjects.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/timeoutontermineted/SipObjects.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack.timeoutontermineted; +package sip.stack.timeoutontermineted; import gov.nist.javax.sip.SipStackImpl; import gov.nist.javax.sip.stack.NioMessageProcessorFactory; diff --git a/src/test/unit/gov/nist/javax/sip/stack/timeoutontermineted/TimeoutOnTerminatedTest.java b/jain-sip-test-suite/src/test/java/sip/stack/timeoutontermineted/TimeoutOnTerminatedTest.java similarity index 96% rename from src/test/unit/gov/nist/javax/sip/stack/timeoutontermineted/TimeoutOnTerminatedTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/timeoutontermineted/TimeoutOnTerminatedTest.java index e2c693a4f..7585e30ff 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/timeoutontermineted/TimeoutOnTerminatedTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/timeoutontermineted/TimeoutOnTerminatedTest.java @@ -1,7 +1,7 @@ /** * */ -package test.unit.gov.nist.javax.sip.stack.timeoutontermineted; +package sip.stack.timeoutontermineted; import javax.sip.SipProvider; diff --git a/src/test/unit/gov/nist/javax/sip/stack/tls/DeadSocketTlsTest.java b/jain-sip-test-suite/src/test/java/sip/stack/tls/DeadSocketTlsTest.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/tls/DeadSocketTlsTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/tls/DeadSocketTlsTest.java index f272b08e0..f06ee8243 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/tls/DeadSocketTlsTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/tls/DeadSocketTlsTest.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack.tls; +package sip.stack.tls; import gov.nist.javax.sip.ClientTransactionExt; import gov.nist.javax.sip.TlsSecurityPolicy; diff --git a/src/test/unit/gov/nist/javax/sip/stack/tls/HopImpl.java b/jain-sip-test-suite/src/test/java/sip/stack/tls/HopImpl.java similarity index 97% rename from src/test/unit/gov/nist/javax/sip/stack/tls/HopImpl.java rename to jain-sip-test-suite/src/test/java/sip/stack/tls/HopImpl.java index bd702a5c4..97640b083 100755 --- a/src/test/unit/gov/nist/javax/sip/stack/tls/HopImpl.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/tls/HopImpl.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack.tls; +package sip.stack.tls; import javax.sip.address.*; import java.util.*; diff --git a/src/test/unit/gov/nist/javax/sip/stack/tls/MyRouter.java b/jain-sip-test-suite/src/test/java/sip/stack/tls/MyRouter.java similarity index 95% rename from src/test/unit/gov/nist/javax/sip/stack/tls/MyRouter.java rename to jain-sip-test-suite/src/test/java/sip/stack/tls/MyRouter.java index 420c67257..f33b5df98 100755 --- a/src/test/unit/gov/nist/javax/sip/stack/tls/MyRouter.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/tls/MyRouter.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack.tls; +package sip.stack.tls; import javax.sip.*; import javax.sip.address.*; import javax.sip.message.*; diff --git a/src/test/unit/gov/nist/javax/sip/stack/tls/Shootist.java b/jain-sip-test-suite/src/test/java/sip/stack/tls/Shootist.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/tls/Shootist.java rename to jain-sip-test-suite/src/test/java/sip/stack/tls/Shootist.java index d9d7a5a76..a889f5fef 100755 --- a/src/test/unit/gov/nist/javax/sip/stack/tls/Shootist.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/tls/Shootist.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack.tls; +package sip.stack.tls; import gov.nist.javax.sip.ClientTransactionExt; import gov.nist.javax.sip.TlsSecurityPolicy; import gov.nist.javax.sip.header.HeaderExt; diff --git a/src/test/unit/gov/nist/javax/sip/stack/tls/Shootme.java b/jain-sip-test-suite/src/test/java/sip/stack/tls/Shootme.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/tls/Shootme.java rename to jain-sip-test-suite/src/test/java/sip/stack/tls/Shootme.java index dd16d6b98..767554d1b 100755 --- a/src/test/unit/gov/nist/javax/sip/stack/tls/Shootme.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/tls/Shootme.java @@ -1,4 +1,4 @@ - package test.unit.gov.nist.javax.sip.stack.tls; + package sip.stack.tls; import gov.nist.javax.sip.TransactionExt; import gov.nist.javax.sip.stack.NioMessageProcessorFactory; diff --git a/src/test/unit/gov/nist/javax/sip/stack/tls/TlsTest.java b/jain-sip-test-suite/src/test/java/sip/stack/tls/TlsTest.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/tls/TlsTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/tls/TlsTest.java index 4f9741f7b..178ad474d 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/tls/TlsTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/tls/TlsTest.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack.tls; +package sip.stack.tls; import gov.nist.javax.sip.stack.NioMessageProcessorFactory; diff --git a/src/test/unit/gov/nist/javax/sip/stack/tls/TlsTestDomainDash.java b/jain-sip-test-suite/src/test/java/sip/stack/tls/TlsTestDomainDash.java similarity index 96% rename from src/test/unit/gov/nist/javax/sip/stack/tls/TlsTestDomainDash.java rename to jain-sip-test-suite/src/test/java/sip/stack/tls/TlsTestDomainDash.java index 388c226f6..e971efa50 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/tls/TlsTestDomainDash.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/tls/TlsTestDomainDash.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack.tls; +package sip.stack.tls; import junit.framework.TestCase; diff --git a/src/test/unit/gov/nist/javax/sip/stack/tls/fookeys b/jain-sip-test-suite/src/test/java/sip/stack/tls/fookeys similarity index 100% rename from src/test/unit/gov/nist/javax/sip/stack/tls/fookeys rename to jain-sip-test-suite/src/test/java/sip/stack/tls/fookeys diff --git a/src/test/unit/gov/nist/javax/sip/stack/tls/nopasaran.java b/jain-sip-test-suite/src/test/java/sip/stack/tls/nopasaran.java similarity index 89% rename from src/test/unit/gov/nist/javax/sip/stack/tls/nopasaran.java rename to jain-sip-test-suite/src/test/java/sip/stack/tls/nopasaran.java index a572f5ae7..c648c14a2 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/tls/nopasaran.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/tls/nopasaran.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack.tls; +package sip.stack.tls; import java.net.Socket; diff --git a/src/test/unit/gov/nist/javax/sip/stack/tls/testKeyStore b/jain-sip-test-suite/src/test/java/sip/stack/tls/testKeyStore similarity index 100% rename from src/test/unit/gov/nist/javax/sip/stack/tls/testKeyStore rename to jain-sip-test-suite/src/test/java/sip/stack/tls/testKeyStore diff --git a/src/test/tck/msgflow/callflows/tls/testkeys b/jain-sip-test-suite/src/test/java/sip/stack/tls/testkeys similarity index 100% rename from src/test/tck/msgflow/callflows/tls/testkeys rename to jain-sip-test-suite/src/test/java/sip/stack/tls/testkeys diff --git a/src/test/unit/gov/nist/javax/sip/stack/tx/timeout/Shootist.java b/jain-sip-test-suite/src/test/java/sip/stack/tx/timeout/Shootist.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/tx/timeout/Shootist.java rename to jain-sip-test-suite/src/test/java/sip/stack/tx/timeout/Shootist.java index b3c5e8790..7633af285 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/tx/timeout/Shootist.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/tx/timeout/Shootist.java @@ -13,7 +13,7 @@ * Permission to use this software is contingent upon your acceptance * of the terms of this agreement. */ -package test.unit.gov.nist.javax.sip.stack.tx.timeout; +package sip.stack.tx.timeout; import gov.nist.javax.sip.DialogTimeoutEvent; import gov.nist.javax.sip.SipListenerExt; @@ -58,7 +58,7 @@ import org.apache.log4j.SimpleLayout; import org.apache.log4j.helpers.NullEnumeration; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.msgflow.callflows.ProtocolObjects; /** * This class sends an INVITE and upon receiving a 200 OK it doesn't send the ACK to test is the Dialog Timeout Event is correctly passed to the application diff --git a/src/test/unit/gov/nist/javax/sip/stack/tx/timeout/Shootme.java b/jain-sip-test-suite/src/test/java/sip/stack/tx/timeout/Shootme.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/tx/timeout/Shootme.java rename to jain-sip-test-suite/src/test/java/sip/stack/tx/timeout/Shootme.java index 47b3a132e..a013ed569 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/tx/timeout/Shootme.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/tx/timeout/Shootme.java @@ -13,7 +13,7 @@ * Permission to use this software is contingent upon your acceptance * of the terms of this agreement. */ -package test.unit.gov.nist.javax.sip.stack.tx.timeout; +package sip.stack.tx.timeout; import gov.nist.javax.sip.DialogTimeoutEvent; import gov.nist.javax.sip.SipListenerExt; @@ -49,7 +49,7 @@ import org.apache.log4j.SimpleLayout; import org.apache.log4j.helpers.NullEnumeration; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.msgflow.callflows.ProtocolObjects; /** * This class receives an INVITE and sends a 180 and a 200 OK, the Shootist will not send the ACK to test is the Dialog Timeout Event is correctly passed to the application. diff --git a/src/test/unit/gov/nist/javax/sip/stack/tx/timeout/TxTimeoutTest.java b/jain-sip-test-suite/src/test/java/sip/stack/tx/timeout/TxTimeoutTest.java similarity index 97% rename from src/test/unit/gov/nist/javax/sip/stack/tx/timeout/TxTimeoutTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/tx/timeout/TxTimeoutTest.java index 1e5e83318..7a5731292 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/tx/timeout/TxTimeoutTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/tx/timeout/TxTimeoutTest.java @@ -13,7 +13,7 @@ * Permission to use this software is contingent upon your acceptance * of the terms of this agreement. */ - package test.unit.gov.nist.javax.sip.stack.tx.timeout; + package sip.stack.tx.timeout; import gov.nist.javax.sip.SipStackImpl; @@ -22,8 +22,8 @@ import org.apache.log4j.Logger; -import test.tck.msgflow.callflows.ProtocolObjects; -import test.tck.msgflow.callflows.ScenarioHarness; +import tck.msgflow.callflows.ProtocolObjects; +import tck.msgflow.callflows.ScenarioHarness; /** * Non regression test for http://java.net/jira/browse/JSIP-420 diff --git a/src/test/unit/gov/nist/javax/sip/stack/uasreinvite/ReInviteAllowInterleavingTest.java b/jain-sip-test-suite/src/test/java/sip/stack/uasreinvite/ReInviteAllowInterleavingTest.java similarity index 97% rename from src/test/unit/gov/nist/javax/sip/stack/uasreinvite/ReInviteAllowInterleavingTest.java rename to jain-sip-test-suite/src/test/java/sip/stack/uasreinvite/ReInviteAllowInterleavingTest.java index 0c3831511..a4370b30c 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/uasreinvite/ReInviteAllowInterleavingTest.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/uasreinvite/ReInviteAllowInterleavingTest.java @@ -1,4 +1,4 @@ -package test.unit.gov.nist.javax.sip.stack.uasreinvite; +package sip.stack.uasreinvite; import gov.nist.javax.sip.SipStackImpl; @@ -15,7 +15,7 @@ import org.apache.log4j.Logger; -import test.tck.msgflow.callflows.ScenarioHarness; +import tck.msgflow.callflows.ScenarioHarness; public class ReInviteAllowInterleavingTest extends ScenarioHarness implements SipListener { diff --git a/src/test/unit/gov/nist/javax/sip/stack/uasreinvite/Shootist.java b/jain-sip-test-suite/src/test/java/sip/stack/uasreinvite/Shootist.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/uasreinvite/Shootist.java rename to jain-sip-test-suite/src/test/java/sip/stack/uasreinvite/Shootist.java index 844b97ce1..255a20c01 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/uasreinvite/Shootist.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/uasreinvite/Shootist.java @@ -17,7 +17,7 @@ * * */ -package test.unit.gov.nist.javax.sip.stack.uasreinvite; +package sip.stack.uasreinvite; import gov.nist.javax.sip.DialogExt; import gov.nist.javax.sip.address.SipUri; @@ -33,8 +33,8 @@ import org.apache.log4j.SimpleLayout; import org.apache.log4j.helpers.NullEnumeration; -import test.tck.TestHarness; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.TestHarness; +import tck.msgflow.callflows.ProtocolObjects; import java.util.*; diff --git a/src/test/unit/gov/nist/javax/sip/stack/uasreinvite/Shootme.java b/jain-sip-test-suite/src/test/java/sip/stack/uasreinvite/Shootme.java similarity index 99% rename from src/test/unit/gov/nist/javax/sip/stack/uasreinvite/Shootme.java rename to jain-sip-test-suite/src/test/java/sip/stack/uasreinvite/Shootme.java index 050f94111..67b2f44d0 100644 --- a/src/test/unit/gov/nist/javax/sip/stack/uasreinvite/Shootme.java +++ b/jain-sip-test-suite/src/test/java/sip/stack/uasreinvite/Shootme.java @@ -17,7 +17,7 @@ * * */ -package test.unit.gov.nist.javax.sip.stack.uasreinvite; +package sip.stack.uasreinvite; import gov.nist.javax.sip.DialogExt; @@ -31,7 +31,7 @@ import org.apache.log4j.SimpleLayout; import org.apache.log4j.helpers.NullEnumeration; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.msgflow.callflows.ProtocolObjects; /** * This class is a UAC template. diff --git a/src/test/tck/README b/jain-sip-test-suite/src/test/java/tck/README similarity index 100% rename from src/test/tck/README rename to jain-sip-test-suite/src/test/java/tck/README diff --git a/src/test/tck/TckInternalError.java b/jain-sip-test-suite/src/test/java/tck/TckInternalError.java similarity index 97% rename from src/test/tck/TckInternalError.java rename to jain-sip-test-suite/src/test/java/tck/TckInternalError.java index f1189f0d2..bc0760e52 100755 --- a/src/test/tck/TckInternalError.java +++ b/jain-sip-test-suite/src/test/java/tck/TckInternalError.java @@ -1,4 +1,4 @@ -package test.tck; +package tck; /** * This class serves to wrap exceptions that were thrown during the testing diff --git a/src/test/tck/TestHarness.java b/jain-sip-test-suite/src/test/java/tck/TestHarness.java similarity index 98% rename from src/test/tck/TestHarness.java rename to jain-sip-test-suite/src/test/java/tck/TestHarness.java index ea1c6b75f..2a969b3e8 100755 --- a/src/test/tck/TestHarness.java +++ b/jain-sip-test-suite/src/test/java/tck/TestHarness.java @@ -1,4 +1,4 @@ -package test.tck; +package tck; import gov.nist.javax.sip.address.AddressFactoryImpl; import gov.nist.javax.sip.stack.NioMessageProcessorFactory; @@ -94,7 +94,7 @@ public class TestHarness extends TestCase { // tckProperties.load(TestHarness.class.getClassLoader() // .getResourceAsStream("tck.properties")); - tckProperties.load(new FileInputStream("tck.properties")); + tckProperties.load(new FileInputStream("src/test/resources/tck.properties")); Enumeration props = tckProperties.propertyNames(); while (props.hasMoreElements()) { String propname = (String) props.nextElement(); @@ -486,7 +486,7 @@ public static Properties getRiProperties(boolean autoDialog) { "gov.nist.javax.sip.PASS_INVITE_NON_2XX_ACK_TO_LISTENER", "true"); // For testing sending of stateless null keepalive messages. - //@see test.tck.msgflow.SipProviderTest.testSendNullRequest + //@see tck.msgflow.SipProviderTest.testSendNullRequest properties.setProperty("javax.sip.OUTBOUND_PROXY", LOCAL_ADDRESS + ":" + TI_PORT + "/udp"); if(System.getProperty("enableNIO") != null && System.getProperty("enableNIO").equalsIgnoreCase("true")) { logger.info("\nNIO Enabled\n"); @@ -519,7 +519,7 @@ public static Properties getTiProperties() { properties.setProperty("gov.nist.javax.sip.SERVER_LOG", "logs/tiMessageLog.txt"); // For testing sending of stateless null keepalive messages. - //@see test.tck.msgflow.SipProviderTest.testSendNullRequest + //@see tck.msgflow.SipProviderTest.testSendNullRequest properties.setProperty("javax.sip.OUTBOUND_PROXY", LOCAL_ADDRESS + ":" + RI_PORT + "/udp"); if(System.getProperty("enableNIO") != null && System.getProperty("enableNIO").equalsIgnoreCase("true")) { logger.info("\nNIO Enabled\n"); diff --git a/src/test/tck/TiUnexpectedError.java b/jain-sip-test-suite/src/test/java/tck/TiUnexpectedError.java similarity index 96% rename from src/test/tck/TiUnexpectedError.java rename to jain-sip-test-suite/src/test/java/tck/TiUnexpectedError.java index f31ce6fb8..969c08041 100755 --- a/src/test/tck/TiUnexpectedError.java +++ b/jain-sip-test-suite/src/test/java/tck/TiUnexpectedError.java @@ -1,4 +1,4 @@ -package test.tck; +package tck; /** * This class serves to wrap exceptions that were thrown by the Tested diff --git a/src/test/tck/factory/AddressFactoryTest.java b/jain-sip-test-suite/src/test/java/tck/factory/AddressFactoryTest.java similarity index 99% rename from src/test/tck/factory/AddressFactoryTest.java rename to jain-sip-test-suite/src/test/java/tck/factory/AddressFactoryTest.java index 49b2b10d5..262e13a89 100755 --- a/src/test/tck/factory/AddressFactoryTest.java +++ b/jain-sip-test-suite/src/test/java/tck/factory/AddressFactoryTest.java @@ -1,10 +1,10 @@ -package test.tck.factory; +package tck.factory; import java.text.ParseException; import javax.sip.address.*; import junit.framework.*; -import test.tck.*; +import tck.*; public class AddressFactoryTest extends FactoryTestHarness { diff --git a/src/test/tck/factory/FactoryTestHarness.java b/jain-sip-test-suite/src/test/java/tck/factory/FactoryTestHarness.java similarity index 99% rename from src/test/tck/factory/FactoryTestHarness.java rename to jain-sip-test-suite/src/test/java/tck/factory/FactoryTestHarness.java index 44f648bad..30b65778b 100755 --- a/src/test/tck/factory/FactoryTestHarness.java +++ b/jain-sip-test-suite/src/test/java/tck/factory/FactoryTestHarness.java @@ -1,7 +1,7 @@ -package test.tck.factory; +package tck.factory; import javax.sip.header.*; -import test.tck.*; +import tck.*; public class FactoryTestHarness extends TestHarness { diff --git a/src/test/tck/factory/FactoryTestSuite.java b/jain-sip-test-suite/src/test/java/tck/factory/FactoryTestSuite.java similarity index 96% rename from src/test/tck/factory/FactoryTestSuite.java rename to jain-sip-test-suite/src/test/java/tck/factory/FactoryTestSuite.java index 11c6149f2..c83e776ae 100644 --- a/src/test/tck/factory/FactoryTestSuite.java +++ b/jain-sip-test-suite/src/test/java/tck/factory/FactoryTestSuite.java @@ -1,4 +1,4 @@ -package test.tck.factory; +package tck.factory; import junit.framework.*; diff --git a/src/test/tck/factory/HeaderFactoryTest.java b/jain-sip-test-suite/src/test/java/tck/factory/HeaderFactoryTest.java similarity index 99% rename from src/test/tck/factory/HeaderFactoryTest.java rename to jain-sip-test-suite/src/test/java/tck/factory/HeaderFactoryTest.java index e6a90b94e..7610da81e 100755 --- a/src/test/tck/factory/HeaderFactoryTest.java +++ b/jain-sip-test-suite/src/test/java/tck/factory/HeaderFactoryTest.java @@ -1,4 +1,4 @@ -package test.tck.factory; +package tck.factory; // import gov.nist.javax.sip.header.*; import java.lang.reflect.*; @@ -13,7 +13,7 @@ import java.util.*; import java.text.*; -import test.tck.*; +import tck.*; /** * Generate header test cases based on RI. This assumes the correctness diff --git a/src/test/tck/factory/MessageFactoryTest.java b/jain-sip-test-suite/src/test/java/tck/factory/MessageFactoryTest.java similarity index 99% rename from src/test/tck/factory/MessageFactoryTest.java rename to jain-sip-test-suite/src/test/java/tck/factory/MessageFactoryTest.java index ad7ba5f79..86858b251 100755 --- a/src/test/tck/factory/MessageFactoryTest.java +++ b/jain-sip-test-suite/src/test/java/tck/factory/MessageFactoryTest.java @@ -1,4 +1,4 @@ -package test.tck.factory; +package tck.factory; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -26,8 +26,8 @@ import junit.framework.Test; import junit.framework.TestSuite; -import test.tck.TckInternalError; -import test.tck.TiUnexpectedError; +import tck.TckInternalError; +import tck.TiUnexpectedError; public class MessageFactoryTest extends FactoryTestHarness { @@ -481,11 +481,11 @@ public void testCharset() { ); // JvB: in UTF-8 these character would be encoded as multiple bytes - byte[] content = "öê".getBytes( "ISO-8859-1" ); + byte[] content = "��".getBytes( "ISO-8859-1" ); request.setContent( new String(content,"ISO-8859-1"), (ContentTypeHeader) request.getHeader(ContentTypeHeader.NAME) ); - assertEquals( 2, request.getRawContent().length ); + assertEquals(content.length, request.getRawContent().length ); } catch (Exception t) { t.printStackTrace(); fail( "ParseException", t ); diff --git a/src/test/tck/msgflow/ClientTransactionTest.java b/jain-sip-test-suite/src/test/java/tck/msgflow/ClientTransactionTest.java similarity index 99% rename from src/test/tck/msgflow/ClientTransactionTest.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/ClientTransactionTest.java index 8daaf5373..29ddc7740 100755 --- a/src/test/tck/msgflow/ClientTransactionTest.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/ClientTransactionTest.java @@ -17,7 +17,7 @@ * * */ -package test.tck.msgflow; +package tck.msgflow; import junit.framework.*; @@ -26,7 +26,7 @@ import javax.sip.header.*; import java.util.*; import java.text.*; -import test.tck.*; +import tck.*; /** *

Title: TCK

diff --git a/src/test/tck/msgflow/DialogStateMachineTest.java b/jain-sip-test-suite/src/test/java/tck/msgflow/DialogStateMachineTest.java similarity index 99% rename from src/test/tck/msgflow/DialogStateMachineTest.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/DialogStateMachineTest.java index 2fed0e17c..9fbce5cc2 100755 --- a/src/test/tck/msgflow/DialogStateMachineTest.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/DialogStateMachineTest.java @@ -17,7 +17,7 @@ * * */ -package test.tck.msgflow; +package tck.msgflow; import junit.framework.*; @@ -25,7 +25,7 @@ import javax.sip.message.*; import javax.sip.header.*; import java.util.*; -import test.tck.*; +import tck.*; /** * diff --git a/src/test/tck/msgflow/DialogTest.java b/jain-sip-test-suite/src/test/java/tck/msgflow/DialogTest.java similarity index 99% rename from src/test/tck/msgflow/DialogTest.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/DialogTest.java index 92ed0036b..c6a81fecf 100755 --- a/src/test/tck/msgflow/DialogTest.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/DialogTest.java @@ -17,7 +17,7 @@ * * */ -package test.tck.msgflow; +package tck.msgflow; import junit.framework.*; @@ -25,7 +25,7 @@ import javax.sip.message.*; import javax.sip.header.*; import java.util.*; -import test.tck.*; +import tck.*; /** *

Title: TCK

diff --git a/src/test/tck/msgflow/InviteClientTransactionsStateMachineTest.java b/jain-sip-test-suite/src/test/java/tck/msgflow/InviteClientTransactionsStateMachineTest.java similarity index 99% rename from src/test/tck/msgflow/InviteClientTransactionsStateMachineTest.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/InviteClientTransactionsStateMachineTest.java index e922c966a..6ed7f3b20 100755 --- a/src/test/tck/msgflow/InviteClientTransactionsStateMachineTest.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/InviteClientTransactionsStateMachineTest.java @@ -17,7 +17,7 @@ * * */ -package test.tck.msgflow; +package tck.msgflow; import java.util.TooManyListenersException; @@ -31,8 +31,8 @@ import junit.framework.Test; import junit.framework.TestSuite; -import test.tck.TckInternalError; -import test.tck.TiUnexpectedError; +import tck.TckInternalError; +import tck.TiUnexpectedError; /** * The test tries to verify that Invite Client Transactions correctly change diff --git a/src/test/tck/msgflow/InviteServerTransactionsStateMachineTest.java b/jain-sip-test-suite/src/test/java/tck/msgflow/InviteServerTransactionsStateMachineTest.java similarity index 99% rename from src/test/tck/msgflow/InviteServerTransactionsStateMachineTest.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/InviteServerTransactionsStateMachineTest.java index 98e0e666c..a8bce3231 100755 --- a/src/test/tck/msgflow/InviteServerTransactionsStateMachineTest.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/InviteServerTransactionsStateMachineTest.java @@ -17,7 +17,7 @@ * * */ -package test.tck.msgflow; +package tck.msgflow; import junit.framework.*; @@ -26,7 +26,7 @@ import javax.sip.header.*; import java.util.*; import java.text.*; -import test.tck.*; +import tck.*; /** * diff --git a/src/test/tck/msgflow/MessageFlowHarness.java b/jain-sip-test-suite/src/test/java/tck/msgflow/MessageFlowHarness.java similarity index 99% rename from src/test/tck/msgflow/MessageFlowHarness.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/MessageFlowHarness.java index b49d5d8b1..868f5374a 100755 --- a/src/test/tck/msgflow/MessageFlowHarness.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/MessageFlowHarness.java @@ -17,7 +17,7 @@ * * */ -package test.tck.msgflow; +package tck.msgflow; import gov.nist.javax.sip.stack.SIPTransactionStack; @@ -46,9 +46,9 @@ import javax.sip.message.Request; import javax.sip.message.Response; -import test.tck.TckInternalError; -import test.tck.TestHarness; -import test.tck.TiUnexpectedError; +import tck.TckInternalError; +import tck.TestHarness; +import tck.TiUnexpectedError; /** *

diff --git a/src/test/tck/msgflow/NonInviteClientTransactionsStateMachineTest.java b/jain-sip-test-suite/src/test/java/tck/msgflow/NonInviteClientTransactionsStateMachineTest.java similarity index 99% rename from src/test/tck/msgflow/NonInviteClientTransactionsStateMachineTest.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/NonInviteClientTransactionsStateMachineTest.java index 7db3f7ee4..5b19190eb 100755 --- a/src/test/tck/msgflow/NonInviteClientTransactionsStateMachineTest.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/NonInviteClientTransactionsStateMachineTest.java @@ -17,14 +17,14 @@ * * */ -package test.tck.msgflow; +package tck.msgflow; import junit.framework.*; import javax.sip.*; import javax.sip.message.*; import java.util.*; -import test.tck.*; +import tck.*; /** * diff --git a/src/test/tck/msgflow/NonInviteServerTransactionsStateMachineTest.java b/jain-sip-test-suite/src/test/java/tck/msgflow/NonInviteServerTransactionsStateMachineTest.java similarity index 99% rename from src/test/tck/msgflow/NonInviteServerTransactionsStateMachineTest.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/NonInviteServerTransactionsStateMachineTest.java index 5b56ece49..d394b68b6 100755 --- a/src/test/tck/msgflow/NonInviteServerTransactionsStateMachineTest.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/NonInviteServerTransactionsStateMachineTest.java @@ -17,7 +17,7 @@ * * */ -package test.tck.msgflow; +package tck.msgflow; import junit.framework.*; @@ -26,7 +26,7 @@ import javax.sip.header.*; import java.util.*; import java.text.*; -import test.tck.*; +import tck.*; /** * diff --git a/src/test/tck/msgflow/ServerTransactionTest.java b/jain-sip-test-suite/src/test/java/tck/msgflow/ServerTransactionTest.java similarity index 99% rename from src/test/tck/msgflow/ServerTransactionTest.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/ServerTransactionTest.java index 244454431..f6b6a9ec0 100755 --- a/src/test/tck/msgflow/ServerTransactionTest.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/ServerTransactionTest.java @@ -17,7 +17,7 @@ * * */ -package test.tck.msgflow; +package tck.msgflow; import junit.framework.*; @@ -27,7 +27,7 @@ import java.util.*; import java.text.*; -import test.tck.*; +import tck.*; /** *

diff --git a/src/test/tck/msgflow/SipEventCollector.java b/jain-sip-test-suite/src/test/java/tck/msgflow/SipEventCollector.java similarity index 99% rename from src/test/tck/msgflow/SipEventCollector.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/SipEventCollector.java index 9b8a5524b..5a30533b4 100755 --- a/src/test/tck/msgflow/SipEventCollector.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/SipEventCollector.java @@ -17,14 +17,14 @@ * * */ -package test.tck.msgflow; +package tck.msgflow; import javax.sip.*; import org.apache.log4j.Logger; import java.util.TooManyListenersException; -import test.tck.*; +import tck.*; /** *

diff --git a/src/test/tck/msgflow/SipProviderTest.java b/jain-sip-test-suite/src/test/java/tck/msgflow/SipProviderTest.java similarity index 99% rename from src/test/tck/msgflow/SipProviderTest.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/SipProviderTest.java index 5f5e2f1b5..d76247574 100755 --- a/src/test/tck/msgflow/SipProviderTest.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/SipProviderTest.java @@ -17,7 +17,7 @@ * * */ -package test.tck.msgflow; +package tck.msgflow; import junit.framework.*; @@ -27,7 +27,7 @@ import java.util.List; import java.util.*; import java.text.*; -import test.tck.*; +import tck.*; /** *

Title: TCK

diff --git a/src/test/tck/msgflow/TransactionTimeoutEventTest.java b/jain-sip-test-suite/src/test/java/tck/msgflow/TransactionTimeoutEventTest.java similarity index 98% rename from src/test/tck/msgflow/TransactionTimeoutEventTest.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/TransactionTimeoutEventTest.java index 44a7af780..1bcffd969 100644 --- a/src/test/tck/msgflow/TransactionTimeoutEventTest.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/TransactionTimeoutEventTest.java @@ -17,7 +17,7 @@ * * */ -package test.tck.msgflow; +package tck.msgflow; import java.util.TooManyListenersException; @@ -34,8 +34,8 @@ import org.apache.log4j.Logger; -import test.tck.TckInternalError; -import test.tck.TiUnexpectedError; +import tck.TckInternalError; +import tck.TiUnexpectedError; /** * Timeout test for invite client transactions -- test to see if an timeout diff --git a/src/test/tck/msgflow/callflows/NonSipUriRouter.java b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/NonSipUriRouter.java similarity index 97% rename from src/test/tck/msgflow/callflows/NonSipUriRouter.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/callflows/NonSipUriRouter.java index 69ee7024e..ec322e705 100644 --- a/src/test/tck/msgflow/callflows/NonSipUriRouter.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/NonSipUriRouter.java @@ -1,4 +1,4 @@ -package test.tck.msgflow.callflows; +package tck.msgflow.callflows; import java.util.LinkedList; import java.util.ListIterator; diff --git a/src/test/tck/msgflow/callflows/ProtocolObjects.java b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/ProtocolObjects.java similarity index 99% rename from src/test/tck/msgflow/callflows/ProtocolObjects.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/callflows/ProtocolObjects.java index 0508e5665..2bec5cb07 100644 --- a/src/test/tck/msgflow/callflows/ProtocolObjects.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/ProtocolObjects.java @@ -1,4 +1,4 @@ -package test.tck.msgflow.callflows; +package tck.msgflow.callflows; import gov.nist.javax.sip.stack.NioMessageProcessorFactory; diff --git a/src/test/tck/msgflow/callflows/ScenarioHarness.java b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/ScenarioHarness.java similarity index 96% rename from src/test/tck/msgflow/callflows/ScenarioHarness.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/callflows/ScenarioHarness.java index ba51eb106..a5cf4c4ef 100644 --- a/src/test/tck/msgflow/callflows/ScenarioHarness.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/ScenarioHarness.java @@ -1,4 +1,4 @@ -package test.tck.msgflow.callflows; +package tck.msgflow.callflows; import java.util.EventObject; import java.util.HashSet; @@ -13,9 +13,9 @@ import javax.sip.TimeoutEvent; import javax.sip.TransactionTerminatedEvent; -import test.tck.TckInternalError; -import test.tck.TestHarness; -import test.tck.TiUnexpectedError; +import tck.TckInternalError; +import tck.TestHarness; +import tck.TiUnexpectedError; public abstract class ScenarioHarness extends TestHarness { private HashSet tiProtocolObjects = new HashSet(); @@ -216,14 +216,14 @@ protected ProtocolObjects getRiProtocolObjects() { * @param tiProtocolObjects the tiProtocolObjects to set */ protected void addTiProtocolObjects( - test.tck.msgflow.callflows.ProtocolObjects tiProtocolObjects) { + tck.msgflow.callflows.ProtocolObjects tiProtocolObjects) { this.tiProtocolObjects.add(tiProtocolObjects); } /** * @return the tiProtocolObjects */ - protected test.tck.msgflow.callflows.ProtocolObjects getTiProtocolObjects() { + protected tck.msgflow.callflows.ProtocolObjects getTiProtocolObjects() { return tiProtocolObjects.iterator().next(); } diff --git a/src/test/tck/msgflow/callflows/forkedinvite/AbstractForkedInviteTestCase.java b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/forkedinvite/AbstractForkedInviteTestCase.java similarity index 95% rename from src/test/tck/msgflow/callflows/forkedinvite/AbstractForkedInviteTestCase.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/callflows/forkedinvite/AbstractForkedInviteTestCase.java index 34322034d..47f196faf 100644 --- a/src/test/tck/msgflow/callflows/forkedinvite/AbstractForkedInviteTestCase.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/forkedinvite/AbstractForkedInviteTestCase.java @@ -1,7 +1,7 @@ /** * */ -package test.tck.msgflow.callflows.forkedinvite; +package tck.msgflow.callflows.forkedinvite; import gov.nist.javax.sip.SipProviderImpl; @@ -28,8 +28,8 @@ import org.apache.log4j.SimpleLayout; import org.apache.log4j.helpers.NullEnumeration; -import test.tck.msgflow.callflows.ProtocolObjects; -import test.tck.msgflow.callflows.ScenarioHarness; +import tck.msgflow.callflows.ProtocolObjects; +import tck.msgflow.callflows.ScenarioHarness; import junit.framework.TestCase; diff --git a/src/test/tck/msgflow/callflows/forkedinvite/ForkedInviteTest.java b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/forkedinvite/ForkedInviteTest.java similarity index 87% rename from src/test/tck/msgflow/callflows/forkedinvite/ForkedInviteTest.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/callflows/forkedinvite/ForkedInviteTest.java index 87df3f34c..d3be61d6e 100644 --- a/src/test/tck/msgflow/callflows/forkedinvite/ForkedInviteTest.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/forkedinvite/ForkedInviteTest.java @@ -1,4 +1,4 @@ -package test.tck.msgflow.callflows.forkedinvite; +package tck.msgflow.callflows.forkedinvite; public class ForkedInviteTest extends AbstractForkedInviteTestCase { boolean myFlag; diff --git a/src/test/tck/msgflow/callflows/forkedinvite/Proxy.java b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/forkedinvite/Proxy.java similarity index 98% rename from src/test/tck/msgflow/callflows/forkedinvite/Proxy.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/callflows/forkedinvite/Proxy.java index 7a060fc05..98894dc7a 100644 --- a/src/test/tck/msgflow/callflows/forkedinvite/Proxy.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/forkedinvite/Proxy.java @@ -1,4 +1,4 @@ -package test.tck.msgflow.callflows.forkedinvite; +package tck.msgflow.callflows.forkedinvite; import java.util.Hashtable; import java.util.Iterator; @@ -25,8 +25,8 @@ import org.apache.log4j.Logger; -import test.tck.TestHarness; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.TestHarness; +import tck.msgflow.callflows.ProtocolObjects; /** * A very simple forking proxy server. diff --git a/src/test/tck/msgflow/callflows/forkedinvite/Shootist.java b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/forkedinvite/Shootist.java similarity index 99% rename from src/test/tck/msgflow/callflows/forkedinvite/Shootist.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/callflows/forkedinvite/Shootist.java index 5533bcf00..d06d4901d 100644 --- a/src/test/tck/msgflow/callflows/forkedinvite/Shootist.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/forkedinvite/Shootist.java @@ -1,4 +1,4 @@ -package test.tck.msgflow.callflows.forkedinvite; +package tck.msgflow.callflows.forkedinvite; import java.util.ArrayList; import java.util.HashSet; @@ -32,8 +32,8 @@ import org.apache.log4j.Logger; -import test.tck.TestHarness; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.TestHarness; +import tck.msgflow.callflows.ProtocolObjects; /** * This class is a UAC template. Shootist is the guy that shoots and shootme is diff --git a/src/test/tck/msgflow/callflows/forkedinvite/Shootme.java b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/forkedinvite/Shootme.java similarity index 98% rename from src/test/tck/msgflow/callflows/forkedinvite/Shootme.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/callflows/forkedinvite/Shootme.java index 047551bcc..87e0979d4 100644 --- a/src/test/tck/msgflow/callflows/forkedinvite/Shootme.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/forkedinvite/Shootme.java @@ -1,4 +1,4 @@ -package test.tck.msgflow.callflows.forkedinvite; +package tck.msgflow.callflows.forkedinvite; import javax.sip.*; import javax.sip.address.*; @@ -9,8 +9,8 @@ import org.apache.log4j.Logger; import org.apache.log4j.SimpleLayout; -import test.tck.TestHarness; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.TestHarness; +import tck.msgflow.callflows.ProtocolObjects; diff --git a/src/test/tck/msgflow/callflows/prack/AbstractPrackTestCase.java b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/prack/AbstractPrackTestCase.java similarity index 95% rename from src/test/tck/msgflow/callflows/prack/AbstractPrackTestCase.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/callflows/prack/AbstractPrackTestCase.java index 5551e053f..16d487cfa 100644 --- a/src/test/tck/msgflow/callflows/prack/AbstractPrackTestCase.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/prack/AbstractPrackTestCase.java @@ -1,4 +1,4 @@ -package test.tck.msgflow.callflows.prack; +package tck.msgflow.callflows.prack; import javax.sip.SipListener; import javax.sip.SipProvider; @@ -8,7 +8,7 @@ import org.apache.log4j.Logger; import org.apache.log4j.SimpleLayout; -import test.tck.msgflow.callflows.ScenarioHarness; +import tck.msgflow.callflows.ScenarioHarness; /** * diff --git a/src/test/tck/msgflow/callflows/prack/Shootist.java b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/prack/Shootist.java similarity index 98% rename from src/test/tck/msgflow/callflows/prack/Shootist.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/callflows/prack/Shootist.java index 8533f4f49..e3a2b45ae 100644 --- a/src/test/tck/msgflow/callflows/prack/Shootist.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/prack/Shootist.java @@ -1,4 +1,4 @@ -package test.tck.msgflow.callflows.prack; +package tck.msgflow.callflows.prack; import java.util.ArrayList; @@ -34,8 +34,8 @@ import org.apache.log4j.Logger; -import test.tck.TestHarness; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.TestHarness; +import tck.msgflow.callflows.ProtocolObjects; /** * This class is a UAC template. Shootist is the guy that shoots and shootme is diff --git a/src/test/tck/msgflow/callflows/prack/Shootme.java b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/prack/Shootme.java similarity index 98% rename from src/test/tck/msgflow/callflows/prack/Shootme.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/callflows/prack/Shootme.java index 230bc66ca..f8ab6718f 100644 --- a/src/test/tck/msgflow/callflows/prack/Shootme.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/prack/Shootme.java @@ -1,4 +1,4 @@ -package test.tck.msgflow.callflows.prack; +package tck.msgflow.callflows.prack; import javax.sip.*; import javax.sip.address.*; @@ -7,8 +7,8 @@ import org.apache.log4j.Logger; -import test.tck.TestHarness; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.TestHarness; +import tck.msgflow.callflows.ProtocolObjects; import java.util.*; diff --git a/src/test/tck/msgflow/callflows/prack/TcpPrackTest.java b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/prack/TcpPrackTest.java similarity index 86% rename from src/test/tck/msgflow/callflows/prack/TcpPrackTest.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/callflows/prack/TcpPrackTest.java index 7c565679a..2c278b660 100644 --- a/src/test/tck/msgflow/callflows/prack/TcpPrackTest.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/prack/TcpPrackTest.java @@ -1,4 +1,4 @@ -package test.tck.msgflow.callflows.prack; +package tck.msgflow.callflows.prack; public class TcpPrackTest extends UdpPrackTest { diff --git a/src/test/tck/msgflow/callflows/prack/UdpPrackTest.java b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/prack/UdpPrackTest.java similarity index 79% rename from src/test/tck/msgflow/callflows/prack/UdpPrackTest.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/callflows/prack/UdpPrackTest.java index 0d141a339..d64a120a4 100644 --- a/src/test/tck/msgflow/callflows/prack/UdpPrackTest.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/prack/UdpPrackTest.java @@ -1,6 +1,6 @@ -package test.tck.msgflow.callflows.prack; +package tck.msgflow.callflows.prack; -import test.tck.msgflow.callflows.prack.AbstractPrackTestCase; +import tck.msgflow.callflows.prack.AbstractPrackTestCase; public class UdpPrackTest extends AbstractPrackTestCase { boolean myFlag; diff --git a/src/test/tck/msgflow/callflows/recroute/AbstractRecRouteTestCase.java b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/recroute/AbstractRecRouteTestCase.java similarity index 96% rename from src/test/tck/msgflow/callflows/recroute/AbstractRecRouteTestCase.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/callflows/recroute/AbstractRecRouteTestCase.java index 10c9d800c..ffd3fe93d 100644 --- a/src/test/tck/msgflow/callflows/recroute/AbstractRecRouteTestCase.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/recroute/AbstractRecRouteTestCase.java @@ -1,4 +1,4 @@ -package test.tck.msgflow.callflows.recroute; +package tck.msgflow.callflows.recroute; import java.util.Hashtable; @@ -7,7 +7,7 @@ import org.apache.log4j.Logger; -import test.tck.msgflow.callflows.ScenarioHarness; +import tck.msgflow.callflows.ScenarioHarness; /** * @author M. Ranganathan diff --git a/src/test/tck/msgflow/callflows/recroute/Proxy.java b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/recroute/Proxy.java similarity index 98% rename from src/test/tck/msgflow/callflows/recroute/Proxy.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/callflows/recroute/Proxy.java index 96f8d9a15..f569531bd 100644 --- a/src/test/tck/msgflow/callflows/recroute/Proxy.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/recroute/Proxy.java @@ -1,4 +1,4 @@ -package test.tck.msgflow.callflows.recroute; +package tck.msgflow.callflows.recroute; import java.util.Hashtable; @@ -25,8 +25,8 @@ import org.apache.log4j.Logger; -import test.tck.TestHarness; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.TestHarness; +import tck.msgflow.callflows.ProtocolObjects; /** * A very simple Record-Routing proxy server. diff --git a/src/test/tck/msgflow/callflows/recroute/Shootist.java b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/recroute/Shootist.java similarity index 99% rename from src/test/tck/msgflow/callflows/recroute/Shootist.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/callflows/recroute/Shootist.java index 45f9641af..cbb30f0b1 100644 --- a/src/test/tck/msgflow/callflows/recroute/Shootist.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/recroute/Shootist.java @@ -1,4 +1,4 @@ -package test.tck.msgflow.callflows.recroute; +package tck.msgflow.callflows.recroute; import java.util.ArrayList; import java.util.HashSet; @@ -34,8 +34,8 @@ import org.apache.log4j.Logger; -import test.tck.TestHarness; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.TestHarness; +import tck.msgflow.callflows.ProtocolObjects; /** * This class is a UAC template. Shootist is the guy that shoots and shootme is diff --git a/src/test/tck/msgflow/callflows/recroute/Shootme.java b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/recroute/Shootme.java similarity index 99% rename from src/test/tck/msgflow/callflows/recroute/Shootme.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/callflows/recroute/Shootme.java index a8bc0f3b8..1f59cb4d5 100644 --- a/src/test/tck/msgflow/callflows/recroute/Shootme.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/recroute/Shootme.java @@ -1,4 +1,4 @@ -package test.tck.msgflow.callflows.recroute; +package tck.msgflow.callflows.recroute; import javax.sip.*; import javax.sip.address.*; @@ -9,8 +9,8 @@ import org.apache.log4j.Logger; import org.apache.log4j.SimpleLayout; -import test.tck.TestHarness; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.TestHarness; +import tck.msgflow.callflows.ProtocolObjects; diff --git a/src/test/tck/msgflow/callflows/recroute/TCPRecordRouteTest.java b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/recroute/TCPRecordRouteTest.java similarity index 88% rename from src/test/tck/msgflow/callflows/recroute/TCPRecordRouteTest.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/callflows/recroute/TCPRecordRouteTest.java index 2d26b876f..6374dac06 100644 --- a/src/test/tck/msgflow/callflows/recroute/TCPRecordRouteTest.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/recroute/TCPRecordRouteTest.java @@ -1,4 +1,4 @@ -package test.tck.msgflow.callflows.recroute; +package tck.msgflow.callflows.recroute; public class TCPRecordRouteTest extends AbstractRecRouteTestCase { boolean myFlag; diff --git a/src/test/tck/msgflow/callflows/recroute/UDPRecordRouteTest.java b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/recroute/UDPRecordRouteTest.java similarity index 88% rename from src/test/tck/msgflow/callflows/recroute/UDPRecordRouteTest.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/callflows/recroute/UDPRecordRouteTest.java index 92ef2e3f9..002736744 100644 --- a/src/test/tck/msgflow/callflows/recroute/UDPRecordRouteTest.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/recroute/UDPRecordRouteTest.java @@ -1,4 +1,4 @@ -package test.tck.msgflow.callflows.recroute; +package tck.msgflow.callflows.recroute; public class UDPRecordRouteTest extends AbstractRecRouteTestCase{ boolean myFlag; diff --git a/src/test/tck/msgflow/callflows/redirect/AbstractRedirectTestCase.java b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/redirect/AbstractRedirectTestCase.java similarity index 95% rename from src/test/tck/msgflow/callflows/redirect/AbstractRedirectTestCase.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/callflows/redirect/AbstractRedirectTestCase.java index cf1e42f4f..6ab2d2cfc 100644 --- a/src/test/tck/msgflow/callflows/redirect/AbstractRedirectTestCase.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/redirect/AbstractRedirectTestCase.java @@ -1,4 +1,4 @@ -package test.tck.msgflow.callflows.redirect; +package tck.msgflow.callflows.redirect; import javax.sip.SipListener; import javax.sip.SipProvider; @@ -8,7 +8,7 @@ import org.apache.log4j.Logger; import org.apache.log4j.SimpleLayout; -import test.tck.msgflow.callflows.ScenarioHarness; +import tck.msgflow.callflows.ScenarioHarness; /** * @author M. Ranganathan diff --git a/src/test/tck/msgflow/callflows/redirect/Shootist.java b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/redirect/Shootist.java similarity index 99% rename from src/test/tck/msgflow/callflows/redirect/Shootist.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/callflows/redirect/Shootist.java index 96c21f29b..ab016432e 100644 --- a/src/test/tck/msgflow/callflows/redirect/Shootist.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/redirect/Shootist.java @@ -1,4 +1,4 @@ -package test.tck.msgflow.callflows.redirect; +package tck.msgflow.callflows.redirect; import javax.sip.*; import javax.sip.address.*; @@ -7,8 +7,8 @@ import org.apache.log4j.Logger; -import test.tck.TestHarness; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.TestHarness; +import tck.msgflow.callflows.ProtocolObjects; import java.util.*; diff --git a/src/test/tck/msgflow/callflows/redirect/Shootme.java b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/redirect/Shootme.java similarity index 98% rename from src/test/tck/msgflow/callflows/redirect/Shootme.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/callflows/redirect/Shootme.java index 33f7416d9..b5d71e750 100644 --- a/src/test/tck/msgflow/callflows/redirect/Shootme.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/redirect/Shootme.java @@ -1,4 +1,4 @@ -package test.tck.msgflow.callflows.redirect; +package tck.msgflow.callflows.redirect; import javax.sip.*; import javax.sip.address.*; @@ -7,9 +7,9 @@ import org.apache.log4j.Logger; -import test.tck.TestHarness; -import test.tck.msgflow.MessageFlowHarness; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.TestHarness; +import tck.msgflow.MessageFlowHarness; +import tck.msgflow.callflows.ProtocolObjects; import java.util.*; diff --git a/src/test/tck/msgflow/callflows/redirect/TcpRedirectTest.java b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/redirect/TcpRedirectTest.java similarity index 90% rename from src/test/tck/msgflow/callflows/redirect/TcpRedirectTest.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/callflows/redirect/TcpRedirectTest.java index acffb1117..d610af6c2 100644 --- a/src/test/tck/msgflow/callflows/redirect/TcpRedirectTest.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/redirect/TcpRedirectTest.java @@ -1,4 +1,4 @@ -package test.tck.msgflow.callflows.redirect; +package tck.msgflow.callflows.redirect; public class TcpRedirectTest extends AbstractRedirectTestCase { boolean myFlag; diff --git a/src/test/tck/msgflow/callflows/redirect/UdpRedirectTest.java b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/redirect/UdpRedirectTest.java similarity index 89% rename from src/test/tck/msgflow/callflows/redirect/UdpRedirectTest.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/callflows/redirect/UdpRedirectTest.java index d731b74a6..5c50ea09b 100644 --- a/src/test/tck/msgflow/callflows/redirect/UdpRedirectTest.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/redirect/UdpRedirectTest.java @@ -1,4 +1,4 @@ -package test.tck.msgflow.callflows.redirect; +package tck.msgflow.callflows.redirect; public class UdpRedirectTest extends AbstractRedirectTestCase { boolean myFlag; diff --git a/src/test/tck/msgflow/callflows/refer/AbstractReferTestCase.java b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/refer/AbstractReferTestCase.java similarity index 94% rename from src/test/tck/msgflow/callflows/refer/AbstractReferTestCase.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/callflows/refer/AbstractReferTestCase.java index f212b35ae..378085d16 100644 --- a/src/test/tck/msgflow/callflows/refer/AbstractReferTestCase.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/refer/AbstractReferTestCase.java @@ -1,4 +1,4 @@ -package test.tck.msgflow.callflows.refer; +package tck.msgflow.callflows.refer; import java.util.EventObject; import java.util.Hashtable; @@ -22,8 +22,8 @@ import org.apache.log4j.SimpleLayout; import org.apache.log4j.helpers.NullEnumeration; -import test.tck.msgflow.callflows.ProtocolObjects; -import test.tck.msgflow.callflows.ScenarioHarness; +import tck.msgflow.callflows.ProtocolObjects; +import tck.msgflow.callflows.ScenarioHarness; import junit.framework.TestCase; diff --git a/src/test/tck/msgflow/callflows/refer/Referee.java b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/refer/Referee.java similarity index 99% rename from src/test/tck/msgflow/callflows/refer/Referee.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/callflows/refer/Referee.java index d83d867a9..09390b8c3 100644 --- a/src/test/tck/msgflow/callflows/refer/Referee.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/refer/Referee.java @@ -1,4 +1,4 @@ -package test.tck.msgflow.callflows.refer; +package tck.msgflow.callflows.refer; import java.text.ParseException; import java.util.ArrayList; @@ -47,8 +47,8 @@ import org.apache.log4j.Logger; import org.apache.log4j.SimpleLayout; -import test.tck.TestHarness; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.TestHarness; +import tck.msgflow.callflows.ProtocolObjects; diff --git a/src/test/tck/msgflow/callflows/refer/Referrer.java b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/refer/Referrer.java similarity index 99% rename from src/test/tck/msgflow/callflows/refer/Referrer.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/callflows/refer/Referrer.java index 52cd2f030..0e0f11514 100644 --- a/src/test/tck/msgflow/callflows/refer/Referrer.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/refer/Referrer.java @@ -1,4 +1,4 @@ -package test.tck.msgflow.callflows.refer; +package tck.msgflow.callflows.refer; import java.util.ArrayList; @@ -37,8 +37,8 @@ import org.apache.log4j.Logger; import org.apache.log4j.SimpleLayout; -import test.tck.TestHarness; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.TestHarness; +import tck.msgflow.callflows.ProtocolObjects; /** * This example shows an out-of-dialog REFER scenario: diff --git a/src/test/tck/msgflow/callflows/refer/TcpReferTest.java b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/refer/TcpReferTest.java similarity index 93% rename from src/test/tck/msgflow/callflows/refer/TcpReferTest.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/callflows/refer/TcpReferTest.java index 5a4c10f58..71bb03932 100644 --- a/src/test/tck/msgflow/callflows/refer/TcpReferTest.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/refer/TcpReferTest.java @@ -1,4 +1,4 @@ -package test.tck.msgflow.callflows.refer; +package tck.msgflow.callflows.refer; public class TcpReferTest extends AbstractReferTestCase { boolean myFlag; diff --git a/src/test/tck/msgflow/callflows/refer/UdpReferTest.java b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/refer/UdpReferTest.java similarity index 92% rename from src/test/tck/msgflow/callflows/refer/UdpReferTest.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/callflows/refer/UdpReferTest.java index b37db8574..c2ad1b078 100644 --- a/src/test/tck/msgflow/callflows/refer/UdpReferTest.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/refer/UdpReferTest.java @@ -1,4 +1,4 @@ -package test.tck.msgflow.callflows.refer; +package tck.msgflow.callflows.refer; public class UdpReferTest extends AbstractReferTestCase { boolean myFlag; diff --git a/src/test/tck/msgflow/callflows/reinvite/ReInviteTest.java b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/reinvite/ReInviteTest.java similarity index 96% rename from src/test/tck/msgflow/callflows/reinvite/ReInviteTest.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/callflows/reinvite/ReInviteTest.java index 56878ea9b..685abaa74 100644 --- a/src/test/tck/msgflow/callflows/reinvite/ReInviteTest.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/reinvite/ReInviteTest.java @@ -20,7 +20,7 @@ /** * */ -package test.tck.msgflow.callflows.reinvite; +package tck.msgflow.callflows.reinvite; import gov.nist.javax.sip.SipProviderImpl; @@ -46,9 +46,9 @@ import org.apache.log4j.SimpleLayout; import org.apache.log4j.helpers.NullEnumeration; -import test.tck.msgflow.callflows.ProtocolObjects; -import test.tck.msgflow.callflows.ScenarioHarness; -import test.tck.TestHarness; +import tck.msgflow.callflows.ProtocolObjects; +import tck.msgflow.callflows.ScenarioHarness; +import tck.TestHarness; import junit.framework.TestCase; diff --git a/src/test/tck/msgflow/callflows/reinvite/Shootist.java b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/reinvite/Shootist.java similarity index 99% rename from src/test/tck/msgflow/callflows/reinvite/Shootist.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/callflows/reinvite/Shootist.java index fa95e9e7a..2d7201533 100644 --- a/src/test/tck/msgflow/callflows/reinvite/Shootist.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/reinvite/Shootist.java @@ -17,7 +17,7 @@ * * */ -package test.tck.msgflow.callflows.reinvite; +package tck.msgflow.callflows.reinvite; import gov.nist.javax.sip.address.SipUri; @@ -32,8 +32,8 @@ import org.apache.log4j.SimpleLayout; import org.apache.log4j.helpers.NullEnumeration; -import test.tck.TestHarness; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.TestHarness; +import tck.msgflow.callflows.ProtocolObjects; import java.util.*; diff --git a/src/test/tck/msgflow/callflows/reinvite/Shootme.java b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/reinvite/Shootme.java similarity index 99% rename from src/test/tck/msgflow/callflows/reinvite/Shootme.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/callflows/reinvite/Shootme.java index 1bf09cb89..d0c6ff835 100644 --- a/src/test/tck/msgflow/callflows/reinvite/Shootme.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/reinvite/Shootme.java @@ -17,7 +17,7 @@ * * */ -package test.tck.msgflow.callflows.reinvite; +package tck.msgflow.callflows.reinvite; import javax.sip.*; import javax.sip.address.*; @@ -29,7 +29,7 @@ import org.apache.log4j.SimpleLayout; import org.apache.log4j.helpers.NullEnumeration; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.msgflow.callflows.ProtocolObjects; /** * This class is a UAC template. diff --git a/src/test/tck/msgflow/callflows/router/AbstractRouterTestCase.java b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/router/AbstractRouterTestCase.java similarity index 95% rename from src/test/tck/msgflow/callflows/router/AbstractRouterTestCase.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/callflows/router/AbstractRouterTestCase.java index 6126bccb6..c78c01a54 100644 --- a/src/test/tck/msgflow/callflows/router/AbstractRouterTestCase.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/router/AbstractRouterTestCase.java @@ -17,7 +17,7 @@ * * */ -package test.tck.msgflow.callflows.router; +package tck.msgflow.callflows.router; import javax.sip.SipListener; import javax.sip.SipProvider; @@ -27,8 +27,8 @@ import org.apache.log4j.Logger; import org.apache.log4j.SimpleLayout; -import test.tck.msgflow.callflows.NonSipUriRouter; -import test.tck.msgflow.callflows.ScenarioHarness; +import tck.msgflow.callflows.NonSipUriRouter; +import tck.msgflow.callflows.ScenarioHarness; /** * diff --git a/src/test/tck/msgflow/callflows/router/Shootist.java b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/router/Shootist.java similarity index 98% rename from src/test/tck/msgflow/callflows/router/Shootist.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/callflows/router/Shootist.java index 9d4ed7789..40730c5c7 100644 --- a/src/test/tck/msgflow/callflows/router/Shootist.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/router/Shootist.java @@ -17,7 +17,7 @@ * * */ -package test.tck.msgflow.callflows.router; +package tck.msgflow.callflows.router; import java.util.ArrayList; @@ -57,8 +57,8 @@ import org.apache.log4j.Logger; import org.apache.log4j.SimpleLayout; -import test.tck.TestHarness; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.TestHarness; +import tck.msgflow.callflows.ProtocolObjects; /** * This class is a UAC template. diff --git a/src/test/tck/msgflow/callflows/router/Shootme.java b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/router/Shootme.java similarity index 98% rename from src/test/tck/msgflow/callflows/router/Shootme.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/callflows/router/Shootme.java index 757597bd3..dee189e06 100644 --- a/src/test/tck/msgflow/callflows/router/Shootme.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/router/Shootme.java @@ -17,7 +17,7 @@ * * */ -package test.tck.msgflow.callflows.router; +package tck.msgflow.callflows.router; import javax.sip.*; import javax.sip.address.*; @@ -26,8 +26,8 @@ import org.apache.log4j.Logger; -import test.tck.TestHarness; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.TestHarness; +import tck.msgflow.callflows.ProtocolObjects; import java.util.*; diff --git a/src/test/tck/msgflow/callflows/router/TcpRouterTest.java b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/router/TcpRouterTest.java similarity index 95% rename from src/test/tck/msgflow/callflows/router/TcpRouterTest.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/callflows/router/TcpRouterTest.java index f912a8777..af13aaf63 100644 --- a/src/test/tck/msgflow/callflows/router/TcpRouterTest.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/router/TcpRouterTest.java @@ -17,7 +17,7 @@ * * */ -package test.tck.msgflow.callflows.router; +package tck.msgflow.callflows.router; public class TcpRouterTest extends UdpRouterTest { diff --git a/src/test/tck/msgflow/callflows/router/UdpRouterTest.java b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/router/UdpRouterTest.java similarity index 96% rename from src/test/tck/msgflow/callflows/router/UdpRouterTest.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/callflows/router/UdpRouterTest.java index dd9b789e4..314ba5430 100644 --- a/src/test/tck/msgflow/callflows/router/UdpRouterTest.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/router/UdpRouterTest.java @@ -17,7 +17,7 @@ * * */ -package test.tck.msgflow.callflows.router; +package tck.msgflow.callflows.router; public class UdpRouterTest extends AbstractRouterTestCase { diff --git a/src/test/tck/msgflow/callflows/sctp/SctpTest.java b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/sctp/SctpTest.java similarity index 96% rename from src/test/tck/msgflow/callflows/sctp/SctpTest.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/callflows/sctp/SctpTest.java index ce1b6633f..713a78790 100644 --- a/src/test/tck/msgflow/callflows/sctp/SctpTest.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/sctp/SctpTest.java @@ -20,7 +20,7 @@ /** * */ -package test.tck.msgflow.callflows.sctp; +package tck.msgflow.callflows.sctp; import java.util.EventObject; @@ -35,17 +35,16 @@ import org.apache.log4j.Logger; -import test.tck.msgflow.callflows.ScenarioHarness; +import tck.msgflow.callflows.ScenarioHarness; /** * @author M. Ranganathan * - * JvB: copied from TLS test - * Note: SCTP only works with Java7 on Linux + * JvB: copied from TLS test + * Note: SCTP only works with Java7 on Linux */ public class SctpTest extends ScenarioHarness implements SipListener { - protected Shootist shootist; private Shootme shootme; diff --git a/src/test/tck/msgflow/callflows/sctp/Shootist.java b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/sctp/Shootist.java similarity index 99% rename from src/test/tck/msgflow/callflows/sctp/Shootist.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/callflows/sctp/Shootist.java index d44aff74e..cca950b6d 100644 --- a/src/test/tck/msgflow/callflows/sctp/Shootist.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/sctp/Shootist.java @@ -17,7 +17,7 @@ * * */ -package test.tck.msgflow.callflows.sctp; +package tck.msgflow.callflows.sctp; import java.util.ArrayList; @@ -54,7 +54,7 @@ import org.apache.log4j.SimpleLayout; import org.apache.log4j.helpers.NullEnumeration; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.msgflow.callflows.ProtocolObjects; /** * This class is a UAC template. diff --git a/src/test/tck/msgflow/callflows/sctp/Shootme.java b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/sctp/Shootme.java similarity index 99% rename from src/test/tck/msgflow/callflows/sctp/Shootme.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/callflows/sctp/Shootme.java index cf22665e7..3c302d1f6 100644 --- a/src/test/tck/msgflow/callflows/sctp/Shootme.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/sctp/Shootme.java @@ -17,7 +17,7 @@ * * */ -package test.tck.msgflow.callflows.sctp; +package tck.msgflow.callflows.sctp; import javax.sip.*; import javax.sip.address.*; @@ -29,7 +29,7 @@ import org.apache.log4j.SimpleLayout; import org.apache.log4j.helpers.NullEnumeration; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.msgflow.callflows.ProtocolObjects; /** * This class is a UAC template. diff --git a/src/test/tck/msgflow/callflows/subsnotify/AbstractSubsnotifyTestCase.java b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/subsnotify/AbstractSubsnotifyTestCase.java similarity index 97% rename from src/test/tck/msgflow/callflows/subsnotify/AbstractSubsnotifyTestCase.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/callflows/subsnotify/AbstractSubsnotifyTestCase.java index f5d7fd685..d17a0d2b1 100644 --- a/src/test/tck/msgflow/callflows/subsnotify/AbstractSubsnotifyTestCase.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/subsnotify/AbstractSubsnotifyTestCase.java @@ -17,7 +17,7 @@ * * */ -package test.tck.msgflow.callflows.subsnotify; +package tck.msgflow.callflows.subsnotify; import javax.sip.SipListener; import javax.sip.SipProvider; @@ -27,7 +27,7 @@ import org.apache.log4j.Logger; import org.apache.log4j.SimpleLayout; -import test.tck.msgflow.callflows.ScenarioHarness; +import tck.msgflow.callflows.ScenarioHarness; /** * diff --git a/src/test/tck/msgflow/callflows/subsnotify/Forker.java b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/subsnotify/Forker.java similarity index 99% rename from src/test/tck/msgflow/callflows/subsnotify/Forker.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/callflows/subsnotify/Forker.java index 61228bb10..84c20465a 100644 --- a/src/test/tck/msgflow/callflows/subsnotify/Forker.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/subsnotify/Forker.java @@ -17,7 +17,7 @@ * * */ -package test.tck.msgflow.callflows.subsnotify; +package tck.msgflow.callflows.subsnotify; import javax.sip.*; import javax.sip.address.*; @@ -30,7 +30,7 @@ import org.apache.log4j.Logger; import org.apache.log4j.SimpleLayout; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.msgflow.callflows.ProtocolObjects; import java.text.ParseException; diff --git a/src/test/tck/msgflow/callflows/subsnotify/Notifier.java b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/subsnotify/Notifier.java similarity index 99% rename from src/test/tck/msgflow/callflows/subsnotify/Notifier.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/callflows/subsnotify/Notifier.java index 4ff4bcb07..ecfd3aa71 100644 --- a/src/test/tck/msgflow/callflows/subsnotify/Notifier.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/subsnotify/Notifier.java @@ -17,7 +17,7 @@ * * */ -package test.tck.msgflow.callflows.subsnotify; +package tck.msgflow.callflows.subsnotify; import javax.sip.ClientTransaction; import javax.sip.Dialog; @@ -53,8 +53,8 @@ import org.apache.log4j.Logger; import org.apache.log4j.SimpleLayout; -import test.tck.TestHarness; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.TestHarness; +import tck.msgflow.callflows.ProtocolObjects; /** * This is the side that sends out the notify. diff --git a/src/test/tck/msgflow/callflows/subsnotify/Subscriber.java b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/subsnotify/Subscriber.java similarity index 99% rename from src/test/tck/msgflow/callflows/subsnotify/Subscriber.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/callflows/subsnotify/Subscriber.java index e39779a47..13627d783 100644 --- a/src/test/tck/msgflow/callflows/subsnotify/Subscriber.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/subsnotify/Subscriber.java @@ -17,7 +17,7 @@ * * */ -package test.tck.msgflow.callflows.subsnotify; +package tck.msgflow.callflows.subsnotify; import javax.sip.*; import javax.sip.address.*; @@ -29,8 +29,8 @@ import org.apache.log4j.Logger; import org.apache.log4j.SimpleLayout; -import test.tck.TestHarness; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.TestHarness; +import tck.msgflow.callflows.ProtocolObjects; import java.util.*; diff --git a/src/test/tck/msgflow/callflows/subsnotify/TcpSubsnotifyTest.java b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/subsnotify/TcpSubsnotifyTest.java similarity index 95% rename from src/test/tck/msgflow/callflows/subsnotify/TcpSubsnotifyTest.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/callflows/subsnotify/TcpSubsnotifyTest.java index c58752e85..6bce86a27 100644 --- a/src/test/tck/msgflow/callflows/subsnotify/TcpSubsnotifyTest.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/subsnotify/TcpSubsnotifyTest.java @@ -17,7 +17,7 @@ * * */ -package test.tck.msgflow.callflows.subsnotify; +package tck.msgflow.callflows.subsnotify; /** * Test case for TCP transport. diff --git a/src/test/tck/msgflow/callflows/subsnotify/UdpSubsnotifyTest.java b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/subsnotify/UdpSubsnotifyTest.java similarity index 97% rename from src/test/tck/msgflow/callflows/subsnotify/UdpSubsnotifyTest.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/callflows/subsnotify/UdpSubsnotifyTest.java index 7dd1e6a76..30c2e6d30 100644 --- a/src/test/tck/msgflow/callflows/subsnotify/UdpSubsnotifyTest.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/subsnotify/UdpSubsnotifyTest.java @@ -17,7 +17,7 @@ * * */ -package test.tck.msgflow.callflows.subsnotify; +package tck.msgflow.callflows.subsnotify; import junit.textui.TestRunner; diff --git a/src/test/tck/msgflow/callflows/tls/Shootist.java b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/tls/Shootist.java similarity index 99% rename from src/test/tck/msgflow/callflows/tls/Shootist.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/callflows/tls/Shootist.java index 37199f1ab..ae6919eec 100644 --- a/src/test/tck/msgflow/callflows/tls/Shootist.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/tls/Shootist.java @@ -17,7 +17,7 @@ * * */ -package test.tck.msgflow.callflows.tls; +package tck.msgflow.callflows.tls; import java.util.ArrayList; @@ -54,7 +54,7 @@ import org.apache.log4j.SimpleLayout; import org.apache.log4j.helpers.NullEnumeration; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.msgflow.callflows.ProtocolObjects; /** * This class is a UAC template. diff --git a/src/test/tck/msgflow/callflows/tls/Shootme.java b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/tls/Shootme.java similarity index 99% rename from src/test/tck/msgflow/callflows/tls/Shootme.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/callflows/tls/Shootme.java index 117b59cf6..474eb7288 100644 --- a/src/test/tck/msgflow/callflows/tls/Shootme.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/tls/Shootme.java @@ -17,7 +17,7 @@ * * */ -package test.tck.msgflow.callflows.tls; +package tck.msgflow.callflows.tls; import javax.sip.*; import javax.sip.address.*; @@ -29,7 +29,7 @@ import org.apache.log4j.SimpleLayout; import org.apache.log4j.helpers.NullEnumeration; -import test.tck.msgflow.callflows.ProtocolObjects; +import tck.msgflow.callflows.ProtocolObjects; /** * This class is a UAC template. diff --git a/src/test/tck/msgflow/callflows/tls/TlsTest.java b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/tls/TlsTest.java similarity index 98% rename from src/test/tck/msgflow/callflows/tls/TlsTest.java rename to jain-sip-test-suite/src/test/java/tck/msgflow/callflows/tls/TlsTest.java index 638d33839..06f7ff40d 100644 --- a/src/test/tck/msgflow/callflows/tls/TlsTest.java +++ b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/tls/TlsTest.java @@ -20,7 +20,7 @@ /** * */ -package test.tck.msgflow.callflows.tls; +package tck.msgflow.callflows.tls; import java.util.EventObject; @@ -35,7 +35,7 @@ import org.apache.log4j.Logger; -import test.tck.msgflow.callflows.ScenarioHarness; +import tck.msgflow.callflows.ScenarioHarness; /** * @author M. Ranganathan diff --git a/src/test/unit/gov/nist/javax/sip/stack/tls/testkeys b/jain-sip-test-suite/src/test/java/tck/msgflow/callflows/tls/testkeys similarity index 100% rename from src/test/unit/gov/nist/javax/sip/stack/tls/testkeys rename to jain-sip-test-suite/src/test/java/tck/msgflow/callflows/tls/testkeys diff --git a/src/test/torture/ConfigurationSwitches.java b/jain-sip-test-suite/src/test/java/torture/ConfigurationSwitches.java similarity index 98% rename from src/test/torture/ConfigurationSwitches.java rename to jain-sip-test-suite/src/test/java/torture/ConfigurationSwitches.java index 8785906cf..3f5b2a027 100755 --- a/src/test/torture/ConfigurationSwitches.java +++ b/jain-sip-test-suite/src/test/java/torture/ConfigurationSwitches.java @@ -17,7 +17,7 @@ * * */ -package test.torture; +package torture; interface ConfigurationSwitches { public final static String OUTPUT_PARSED_STRUCTURE = diff --git a/src/test/torture/README b/jain-sip-test-suite/src/test/java/torture/README similarity index 100% rename from src/test/torture/README rename to jain-sip-test-suite/src/test/java/torture/README diff --git a/src/test/torture/TagNames.java b/jain-sip-test-suite/src/test/java/torture/TagNames.java similarity index 98% rename from src/test/torture/TagNames.java rename to jain-sip-test-suite/src/test/java/torture/TagNames.java index 025f9d37d..ded19bfff 100755 --- a/src/test/torture/TagNames.java +++ b/jain-sip-test-suite/src/test/java/torture/TagNames.java @@ -23,7 +23,7 @@ * Tag names and attributes. */ -package test.torture; +package torture; public interface TagNames { diff --git a/src/test/torture/TokenValues.java b/jain-sip-test-suite/src/test/java/torture/TokenValues.java similarity index 97% rename from src/test/torture/TokenValues.java rename to jain-sip-test-suite/src/test/java/torture/TokenValues.java index a50a97f59..e6427e7c7 100755 --- a/src/test/torture/TokenValues.java +++ b/jain-sip-test-suite/src/test/java/torture/TokenValues.java @@ -17,7 +17,7 @@ * * */ -package test.torture; +package torture; public interface TokenValues { public final static String EQUALS = "="; public final static String SLASH = "/"; diff --git a/src/test/torture/Torture.java b/jain-sip-test-suite/src/test/java/torture/Torture.java similarity index 99% rename from src/test/torture/Torture.java rename to jain-sip-test-suite/src/test/java/torture/Torture.java index 0bec853a4..348adec4a 100755 --- a/src/test/torture/Torture.java +++ b/jain-sip-test-suite/src/test/java/torture/Torture.java @@ -28,7 +28,7 @@ * */ -package test.torture; +package torture; import gov.nist.javax.sip.address.*; import gov.nist.javax.sip.parser.*; diff --git a/src/test/torture/TortureTest.java b/jain-sip-test-suite/src/test/java/torture/TortureTest.java similarity index 98% rename from src/test/torture/TortureTest.java rename to jain-sip-test-suite/src/test/java/torture/TortureTest.java index c1394de78..b62c084ce 100644 --- a/src/test/torture/TortureTest.java +++ b/jain-sip-test-suite/src/test/java/torture/TortureTest.java @@ -17,7 +17,7 @@ * * */ -package test.torture; +package torture; import junit.framework.TestCase; diff --git a/src/test/torture/torture.dtd b/jain-sip-test-suite/src/test/java/torture/torture.dtd similarity index 100% rename from src/test/torture/torture.dtd rename to jain-sip-test-suite/src/test/java/torture/torture.dtd diff --git a/src/test/torture/torture.xml b/jain-sip-test-suite/src/test/java/torture/torture.xml similarity index 100% rename from src/test/torture/torture.xml rename to jain-sip-test-suite/src/test/java/torture/torture.xml diff --git a/jain-sip-test-suite/src/test/resources/tck.properties b/jain-sip-test-suite/src/test/resources/tck.properties new file mode 100644 index 000000000..0a3d347bc --- /dev/null +++ b/jain-sip-test-suite/src/test/resources/tck.properties @@ -0,0 +1,3 @@ +javax.sip.tck.LOG_FILE_NAME="logs/debuglog.txt" +javax.sip.tck.ABORT_ON_FAIL="true" +javax.sip.tck.IMPLEMENTATION_PATH="gov.nist" diff --git a/m2/android-jain-sip-ri/pom.xml b/m2/android-jain-sip-ri/pom.xml deleted file mode 100644 index 8fae8caf0..000000000 --- a/m2/android-jain-sip-ri/pom.xml +++ /dev/null @@ -1,182 +0,0 @@ - - - - 4.0.0 - - javax.sip - 1.2.0 - jain-sip - ../pom.xml - - - javax.sip - android-jain-sip-ri - 1.2.X-SNAPSHOT - jar - - android-jain-sip-ri - http://code.google.com/p/jain-sip/ - - ../../src/android - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.7 - 1.7 - - - - org.apache.maven.plugins - maven-source-plugin - 2.1.2 - - - attach-sources - verify - - jar - - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.4 - - - - true - - - ${buildNumber} - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.8.1 - - ${basedir}/../../src/android - android.* - - - - attach-javadocs - verify - - jar - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.2 - true - - mobicents-releases-repository - https://oss.sonatype.org/ - - - - deploy-to-sonatype - deploy - - deploy - - release - - - - - - - - target - - gov/nist/javax/sip/** - gov/nist/javax/sdp/** - gov/nist/core/** - javax/sdp/** - javax/sip/** - - - **/*.java - - - - - - - - release - - - - org.codehaus.mojo - buildnumber-maven-plugin - 1.0 - - - validate - - create - - - - - false - false - - - - - - - - - - log4j - log4j - 1.2.14 - provided - - - - - - - maven2-repository.dev.java.net - Java.net Repository for Maven - http://download.java.net/maven/2/ - default - - - mobicents-public-repository-group - Mobicens Public Maven Repository Group - https://oss.sonatype.org/content/groups/public - default - - true - never - - - true - never - - - - - - scm:git:https://code.google.com/p/jain-sip/ - scm:git:https://code.google.com/p/jain-sip/ - https://code.google.com/p/jain-sip/ - - diff --git a/m2/jain-sip-api/pom.xml b/m2/jain-sip-api/pom.xml deleted file mode 100644 index c16cdc934..000000000 --- a/m2/jain-sip-api/pom.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - 4.0.0 - - javax.sip - 1.2.0 - jain-sip - ../pom.xml - - - jain-sip-api - jar - jain-sip-api - http://code.google.com/p/jain-sip/ - - ../../src/javax/ - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.6 - 1.6 - - **/sip/** - - - - - org.apache.maven.plugins - maven-source-plugin - 2.1.2 - - - attach-sources - verify - - jar - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.8.1 - - ${basedir}/../../src/javax/sip - javax.sdp.* - - - - attach-javadocs - verify - - jar - - - - - - - - target/javax/ - - sip/** - - - **/*.java - - - - - - diff --git a/m2/jain-sip-ri/pom.xml b/m2/jain-sip-ri/pom.xml deleted file mode 100644 index c144ebf51..000000000 --- a/m2/jain-sip-ri/pom.xml +++ /dev/null @@ -1,189 +0,0 @@ - - - - 4.0.0 - - javax.sip - 1.2.0 - jain-sip - ../pom.xml - - - javax.sip - jain-sip-ri - 1.2.X-SNAPSHOT - jar - - jain-sip-ri - http://code.google.com/p/jain-sip/ - - ../../src - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.7 - 1.7 - - gov/nist/javax/sip/** - gov/nist/javax/sdp/** - gov/nist/core/** - javax/sdp/** - - - - - org.apache.maven.plugins - maven-source-plugin - 2.1.2 - - - attach-sources - verify - - jar - - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.4 - - - - true - - - ${buildNumber} - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.8.1 - - - attach-javadocs - verify - - jar - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.2 - true - - mobicents-releases-repository - https://oss.sonatype.org/ - - - - deploy-to-sonatype - deploy - - deploy - - release - - - - - - - - target - - gov/nist/javax/sip/** - gov/nist/javax/sdp/** - gov/nist/core/** - javax/sdp/** - - - **/*.java - - - - - - - - release - - - - org.codehaus.mojo - buildnumber-maven-plugin - 1.0 - - - validate - - create - - - - - false - false - - - - - - - - - - log4j - log4j - 1.2.14 - provided - - - javax.sip - jain-sip-api - 1.2.0 - provided - - - - - - - maven2-repository.dev.java.net - Java.net Repository for Maven - http://download.java.net/maven/2/ - default - - - mobicents-public-repository-group - Mobicens Public Maven Repository Group - https://oss.sonatype.org/content/groups/public - default - - true - never - - - true - never - - - - - - scm:git:https://code.google.com/p/jain-sip/ - scm:git:https://code.google.com/p/jain-sip/ - https://code.google.com/p/jain-sip/ - - diff --git a/m2/jain-sip-sctp/pom.xml b/m2/jain-sip-sctp/pom.xml deleted file mode 100644 index c795a9047..000000000 --- a/m2/jain-sip-sctp/pom.xml +++ /dev/null @@ -1,118 +0,0 @@ - - - - 4.0.0 - - javax.sip - 1.2.0 - jain-sip - ../pom.xml - - - jain-sip-sctp - 1.2.X-SNAPSHOT - - jar - jain-sip-sctp - http://code.google.com/p/jain-sip/ - - ../../src - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.7 - 1.7 - - gov/nist/javax/sip/stack/sctp/** - - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - verify - - jar - - - - - - org.codehaus.mojo - buildnumber-maven-plugin - 1.0 - - - validate - - create - - - - - false - false - - - - org.apache.maven.plugins - maven-jar-plugin - 2.4 - - - - true - - - ${buildNumber} - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.8.1 - - - attach-javadocs - verify - - jar - - - - - - - - target - - gov/nist/javax/sip/stack/sctp/** - - - **/*.java - - - - - - - javax.sip - jain-sip-api - 1.2.0 - provided - - - javax.sip - jain-sip-ri - ${project.version} - provided - - - diff --git a/performance/b2bua/TODO.adoc b/performance/b2bua/TODO.adoc new file mode 100644 index 000000000..08fa7419a --- /dev/null +++ b/performance/b2bua/TODO.adoc @@ -0,0 +1,5 @@ += TODO List + +== test.properties + +Change load of file `test.properties` in `Test.java` as it's now embedded in jar from `src/main/resources` \ No newline at end of file diff --git a/src/performance/b2bua/build.xml b/performance/b2bua/build.xml similarity index 96% rename from src/performance/b2bua/build.xml rename to performance/b2bua/build.xml index b53da483f..ef6f99b13 100644 --- a/src/performance/b2bua/build.xml +++ b/performance/b2bua/build.xml @@ -30,7 +30,7 @@ - + diff --git a/performance/b2bua/pom.xml b/performance/b2bua/pom.xml new file mode 100644 index 000000000..3e228b680 --- /dev/null +++ b/performance/b2bua/pom.xml @@ -0,0 +1,30 @@ + + 4.0.0 + gov.nist + performance-b2bua + 1.0.0-SNAPSHOT + jar + + + ISO-8859-1 + 1.0.0-SNAPSHOT + 1.3.0-SNAPSHOT + 11 + 11 + + + + + javax.sip + jain-sip-api + ${jain-sip.version} + + + javax.sip + jain-sip-ri + ${jain-sip.version} + + + \ No newline at end of file diff --git a/src/performance/b2bua/run_uac_DIALOG.sh b/performance/b2bua/scripts/run_uac_DIALOG.sh similarity index 100% rename from src/performance/b2bua/run_uac_DIALOG.sh rename to performance/b2bua/scripts/run_uac_DIALOG.sh diff --git a/src/performance/b2bua/run_uas_DIALOG.sh b/performance/b2bua/scripts/run_uas_DIALOG.sh similarity index 100% rename from src/performance/b2bua/run_uas_DIALOG.sh rename to performance/b2bua/scripts/run_uas_DIALOG.sh diff --git a/src/performance/b2bua/uac_DIALOG.xml b/performance/b2bua/scripts/uac_DIALOG.xml similarity index 100% rename from src/performance/b2bua/uac_DIALOG.xml rename to performance/b2bua/scripts/uac_DIALOG.xml diff --git a/src/performance/b2bua/uas_DIALOG.xml b/performance/b2bua/scripts/uas_DIALOG.xml similarity index 100% rename from src/performance/b2bua/uas_DIALOG.xml rename to performance/b2bua/scripts/uas_DIALOG.xml diff --git a/src/performance/b2bua/Test.java b/performance/b2bua/src/main/java/performance/b2bua/Test.java similarity index 100% rename from src/performance/b2bua/Test.java rename to performance/b2bua/src/main/java/performance/b2bua/Test.java diff --git a/src/performance/b2bua/TestCall.java b/performance/b2bua/src/main/java/performance/b2bua/TestCall.java similarity index 100% rename from src/performance/b2bua/TestCall.java rename to performance/b2bua/src/main/java/performance/b2bua/TestCall.java diff --git a/src/performance/b2bua/test.properties b/performance/b2bua/src/main/resources/test.properties similarity index 100% rename from src/performance/b2bua/test.properties rename to performance/b2bua/src/main/resources/test.properties diff --git a/src/performance/uas/.ant-targets-build.xml b/performance/uas/.ant-targets-build.xml similarity index 100% rename from src/performance/uas/.ant-targets-build.xml rename to performance/uas/.ant-targets-build.xml diff --git a/src/performance/uas/README.txt b/performance/uas/README.txt similarity index 100% rename from src/performance/uas/README.txt rename to performance/uas/README.txt diff --git a/src/performance/uas/build.xml b/performance/uas/build.xml similarity index 100% rename from src/performance/uas/build.xml rename to performance/uas/build.xml diff --git a/src/performance/uas/diff.txt b/performance/uas/diff.txt similarity index 100% rename from src/performance/uas/diff.txt rename to performance/uas/diff.txt diff --git a/performance/uas/pom.xml b/performance/uas/pom.xml new file mode 100644 index 000000000..fdd831e79 --- /dev/null +++ b/performance/uas/pom.xml @@ -0,0 +1,53 @@ + + 4.0.0 + gov.nist + performance-uas + 1.0.0-SNAPSHOT + jar + + + ISO-8859-1 + 1.0.0-SNAPSHOT + 1.3.0-SNAPSHOT + 11 + 11 + + + + + javax.sip + jain-sip-api + ${jain-sip.version} + + + + javax.sip + jain-sip-ri + ${jain-sip.version} + + + + log4j + log4j + 1.2.15 + provided + + + + com.sun.jmx + jmxri + + + com.sun.jdmk + jmxtools + + + javax.jms + jms + + + + + \ No newline at end of file diff --git a/src/performance/uas/download-and-compile-sipp.sh b/performance/uas/scripts/download-and-compile-sipp.sh similarity index 100% rename from src/performance/uas/download-and-compile-sipp.sh rename to performance/uas/scripts/download-and-compile-sipp.sh diff --git a/src/performance/uas/performance-test-timer.sh b/performance/uas/scripts/performance-test-timer.sh similarity index 100% rename from src/performance/uas/performance-test-timer.sh rename to performance/uas/scripts/performance-test-timer.sh diff --git a/src/performance/uas/performance-test.sh b/performance/uas/scripts/performance-test.sh similarity index 100% rename from src/performance/uas/performance-test.sh rename to performance/uas/scripts/performance-test.sh diff --git a/src/performance/uas/performance-uac-timer.xml b/performance/uas/scripts/performance-uac-timer.xml similarity index 100% rename from src/performance/uas/performance-uac-timer.xml rename to performance/uas/scripts/performance-uac-timer.xml diff --git a/src/performance/uas/performance-uac.xml b/performance/uas/scripts/performance-uac.xml similarity index 100% rename from src/performance/uas/performance-uac.xml rename to performance/uas/scripts/performance-uac.xml diff --git a/src/performance/uas/Shootme.java b/performance/uas/src/main/java/performance/uas/Shootme.java similarity index 99% rename from src/performance/uas/Shootme.java rename to performance/uas/src/main/java/performance/uas/Shootme.java index 03dd53d79..f9d1232ba 100644 --- a/src/performance/uas/Shootme.java +++ b/performance/uas/src/main/java/performance/uas/Shootme.java @@ -1,7 +1,5 @@ package performance.uas; -import gov.nist.javax.sip.message.RequestExt; - import java.util.Properties; import java.util.Timer; import java.util.TimerTask; @@ -35,7 +33,7 @@ import org.apache.log4j.Logger; import org.apache.log4j.PatternLayout; -import test.unit.gov.nist.javax.sip.stack.tls.TlsTest; +import gov.nist.javax.sip.message.RequestExt; /** * This is the UAS application for performance testing diff --git a/src/performance/uas/ShootmeDialogAndTxStateless.java b/performance/uas/src/main/java/performance/uas/ShootmeDialogAndTxStateless.java similarity index 100% rename from src/performance/uas/ShootmeDialogAndTxStateless.java rename to performance/uas/src/main/java/performance/uas/ShootmeDialogAndTxStateless.java diff --git a/src/performance/uas/ShootmeDialogStateless.java b/performance/uas/src/main/java/performance/uas/ShootmeDialogStateless.java similarity index 99% rename from src/performance/uas/ShootmeDialogStateless.java rename to performance/uas/src/main/java/performance/uas/ShootmeDialogStateless.java index 6db417c50..c96c72c9b 100644 --- a/src/performance/uas/ShootmeDialogStateless.java +++ b/performance/uas/src/main/java/performance/uas/ShootmeDialogStateless.java @@ -1,8 +1,5 @@ package performance.uas; -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; import java.util.Properties; import javax.sip.DialogTerminatedEvent; diff --git a/m2/pom.xml b/pom.xml similarity index 58% rename from m2/pom.xml rename to pom.xml index fa84b43fb..993c79b49 100644 --- a/m2/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ javax.sip jain-sip - 1.2.1-SNAPSHOT + 1.3.0-SNAPSHOT pom @@ -45,7 +45,7 @@ Project Lead +1 - + @@ -58,6 +58,16 @@ jain-sip-api jain-sip-ri + jain-sip-sctp + android-jain-sip-ri + + jain-sip-examples + jain-sip-test-suite + tools/tracesviewer + tools/sniffer + performance/uas + performance/b2bua + @@ -74,31 +84,31 @@ - release-sign-artifacts - - - performRelease - true - - - - - - org.apache.maven.plugins - maven-gpg-plugin - - - sign-artifacts - install - - sign - - - - - - - + release-sign-artifacts + + + performRelease + true + + + + + + org.apache.maven.plugins + maven-gpg-plugin + + + sign-artifacts + install + + sign + + + + + + + @@ -110,39 +120,39 @@ default - mobicents-public-repository-group - Mobicens Public Maven Repository Group - https://oss.sonatype.org/content/groups/public - default - - true - never - - - true - never - + mobicents-public-repository-group + Mobicens Public Maven Repository Group + https://oss.sonatype.org/content/groups/public + default + + true + never + + + true + never + - - mobicents-releases-repository - Mobicents Releases Repository - https://oss.sonatype.org/service/local/staging/deploy/maven2 - - - mobicents-snapshots-repository - Mobicents Snapshots Repository - https://oss.sonatype.org/content/repositories/snapshots - - + + mobicents-releases-repository + Mobicents Releases Repository + https://oss.sonatype.org/service/local/staging/deploy/maven2 + + + mobicents-snapshots-repository + Mobicents Snapshots Repository + https://oss.sonatype.org/content/repositories/snapshots + + - - + + - maven-release-plugin - 2.2.2 + maven-release-plugin + 2.2.2 @@ -153,4 +163,4 @@ https://code.google.com/p/jain-sip/ - + \ No newline at end of file diff --git a/src/tools/sniffer/README.txt b/tools/sniffer/README.txt similarity index 100% rename from src/tools/sniffer/README.txt rename to tools/sniffer/README.txt diff --git a/src/tools/sniffer/pingtel.txt b/tools/sniffer/pingtel.txt similarity index 100% rename from src/tools/sniffer/pingtel.txt rename to tools/sniffer/pingtel.txt diff --git a/tools/sniffer/pom.xml b/tools/sniffer/pom.xml new file mode 100644 index 000000000..302387e75 --- /dev/null +++ b/tools/sniffer/pom.xml @@ -0,0 +1,38 @@ + + 4.0.0 + colorado.edu + sniffer + 1.0.0-SNAPSHOT + jar + + + ISO-8859-1 + 1.0.0-SNAPSHOT + 1.3.0-SNAPSHOT + 11 + 11 + + + + + javax.sip + jain-sip-api + ${jain-sip.version} + provided + + + javax.sip + jain-sip-ri + ${jain-sip.version} + provided + + + gov.nist + tracesviewer + ${tracesviewer.version} + provided + + + \ No newline at end of file diff --git a/src/tools/sniffer/SniffFileParser.java b/tools/sniffer/src/main/java/sniffer/SniffFileParser.java similarity index 97% rename from src/tools/sniffer/SniffFileParser.java rename to tools/sniffer/src/main/java/sniffer/SniffFileParser.java index d95ed30e6..a3557127d 100755 --- a/src/tools/sniffer/SniffFileParser.java +++ b/tools/sniffer/src/main/java/sniffer/SniffFileParser.java @@ -1,8 +1,8 @@ -package tools.sniffer; +package sniffer; import java.io.*; import java.util.*; -import tools.tracesviewer.*; +import tracesviewer.*; /** * Code to convert Ethereal frames to the XML format that the trace viewer diff --git a/src/tools/sniffer/SniffMessage.java b/tools/sniffer/src/main/java/sniffer/SniffMessage.java similarity index 99% rename from src/tools/sniffer/SniffMessage.java rename to tools/sniffer/src/main/java/sniffer/SniffMessage.java index f496625eb..f6937c87f 100755 --- a/src/tools/sniffer/SniffMessage.java +++ b/tools/sniffer/src/main/java/sniffer/SniffMessage.java @@ -1,4 +1,4 @@ -package tools.sniffer; +package sniffer; import java.util.*; import java.text.*; diff --git a/src/tools/sniffer/SniffMessageList.java b/tools/sniffer/src/main/java/sniffer/SniffMessageList.java similarity index 97% rename from src/tools/sniffer/SniffMessageList.java rename to tools/sniffer/src/main/java/sniffer/SniffMessageList.java index 8ba5e92f8..f38a7304b 100755 --- a/src/tools/sniffer/SniffMessageList.java +++ b/tools/sniffer/src/main/java/sniffer/SniffMessageList.java @@ -1,4 +1,4 @@ -package tools.sniffer; +package sniffer; import java.util.*; diff --git a/src/tools/sniffer/SniffSessionList.java b/tools/sniffer/src/main/java/sniffer/SniffSessionList.java similarity index 98% rename from src/tools/sniffer/SniffSessionList.java rename to tools/sniffer/src/main/java/sniffer/SniffSessionList.java index 385e1f078..834abd767 100755 --- a/src/tools/sniffer/SniffSessionList.java +++ b/tools/sniffer/src/main/java/sniffer/SniffSessionList.java @@ -1,4 +1,4 @@ -package tools.sniffer; +package sniffer; import java.util.*; diff --git a/src/tools/tracesviewer/README.txt b/tools/tracesviewer/README.txt similarity index 100% rename from src/tools/tracesviewer/README.txt rename to tools/tracesviewer/README.txt diff --git a/src/tools/tracesviewer/build.xml b/tools/tracesviewer/build.xml similarity index 100% rename from src/tools/tracesviewer/build.xml rename to tools/tracesviewer/build.xml diff --git a/tools/tracesviewer/pom.xml b/tools/tracesviewer/pom.xml new file mode 100644 index 000000000..48f041e24 --- /dev/null +++ b/tools/tracesviewer/pom.xml @@ -0,0 +1,26 @@ + + 4.0.0 + gov.nist + tracesviewer + 1.0.0-SNAPSHOT + tracesviewer + a viewer for viewing the signaling trace generated +from the NIST SIP stack. + + + ISO-8859-1 + 2.12.0 + 11 + 11 + + + + + + + + + + \ No newline at end of file diff --git a/src/tools/tracesviewer/runinit.sh b/tools/tracesviewer/runinit.sh similarity index 100% rename from src/tools/tracesviewer/runinit.sh rename to tools/tracesviewer/runinit.sh diff --git a/src/tools/tracesviewer/AboutFrame.java b/tools/tracesviewer/src/main/java/tracesviewer/AboutFrame.java similarity index 98% rename from src/tools/tracesviewer/AboutFrame.java rename to tools/tracesviewer/src/main/java/tracesviewer/AboutFrame.java index fc8b2b420..f7abac778 100755 --- a/src/tools/tracesviewer/AboutFrame.java +++ b/tools/tracesviewer/src/main/java/tracesviewer/AboutFrame.java @@ -4,7 +4,7 @@ * Created on April 16, 2002, 10:47 AM */ -package tools.tracesviewer; +package tracesviewer; import javax.swing.*; import java.awt.*; diff --git a/src/tools/tracesviewer/AlertFrame.java b/tools/tracesviewer/src/main/java/tracesviewer/AlertFrame.java similarity index 98% rename from src/tools/tracesviewer/AlertFrame.java rename to tools/tracesviewer/src/main/java/tracesviewer/AlertFrame.java index 841fa2292..0aae2cb10 100755 --- a/src/tools/tracesviewer/AlertFrame.java +++ b/tools/tracesviewer/src/main/java/tracesviewer/AlertFrame.java @@ -3,7 +3,7 @@ * * Created on April 10, 2002, 12:11 PM */ -package tools.tracesviewer; +package tracesviewer; import javax.swing.*; diff --git a/src/tools/tracesviewer/Arrow.java b/tools/tracesviewer/src/main/java/tracesviewer/Arrow.java similarity index 99% rename from src/tools/tracesviewer/Arrow.java rename to tools/tracesviewer/src/main/java/tracesviewer/Arrow.java index 59cd622d2..744d25466 100755 --- a/src/tools/tracesviewer/Arrow.java +++ b/tools/tracesviewer/src/main/java/tracesviewer/Arrow.java @@ -1,4 +1,4 @@ -package tools.tracesviewer; +package tracesviewer; import java.awt.*; diff --git a/src/tools/tracesviewer/CircleArrow.java b/tools/tracesviewer/src/main/java/tracesviewer/CircleArrow.java similarity index 98% rename from src/tools/tracesviewer/CircleArrow.java rename to tools/tracesviewer/src/main/java/tracesviewer/CircleArrow.java index c31578829..fbfe6bf58 100755 --- a/src/tools/tracesviewer/CircleArrow.java +++ b/tools/tracesviewer/src/main/java/tracesviewer/CircleArrow.java @@ -1,4 +1,4 @@ -package tools.tracesviewer; +package tracesviewer; import java.awt.*; diff --git a/src/tools/tracesviewer/DebugWindow.java b/tools/tracesviewer/src/main/java/tracesviewer/DebugWindow.java similarity index 98% rename from src/tools/tracesviewer/DebugWindow.java rename to tools/tracesviewer/src/main/java/tracesviewer/DebugWindow.java index c830eced2..e8b43db2d 100755 --- a/src/tools/tracesviewer/DebugWindow.java +++ b/tools/tracesviewer/src/main/java/tracesviewer/DebugWindow.java @@ -1,4 +1,4 @@ -package tools.tracesviewer; +package tracesviewer; import javax.swing.*; import java.awt.*; diff --git a/src/tools/tracesviewer/HelpBox.java b/tools/tracesviewer/src/main/java/tracesviewer/HelpBox.java similarity index 98% rename from src/tools/tracesviewer/HelpBox.java rename to tools/tracesviewer/src/main/java/tracesviewer/HelpBox.java index 638b6f3e3..ac323b8ec 100755 --- a/src/tools/tracesviewer/HelpBox.java +++ b/tools/tracesviewer/src/main/java/tracesviewer/HelpBox.java @@ -3,7 +3,7 @@ * * Created on April 15, 2002, 10:55 AM */ -package tools.tracesviewer; +package tracesviewer; import java.awt.*; import java.awt.event.*; diff --git a/src/tools/tracesviewer/ListenerTracesViewer.java b/tools/tracesviewer/src/main/java/tracesviewer/ListenerTracesViewer.java similarity index 99% rename from src/tools/tracesviewer/ListenerTracesViewer.java rename to tools/tracesviewer/src/main/java/tracesviewer/ListenerTracesViewer.java index c65f2de66..e310c3c51 100755 --- a/src/tools/tracesviewer/ListenerTracesViewer.java +++ b/tools/tracesviewer/src/main/java/tracesviewer/ListenerTracesViewer.java @@ -1,4 +1,4 @@ -package tools.tracesviewer; +package tracesviewer; import javax.swing.*; import java.awt.*; diff --git a/src/tools/tracesviewer/LogComparator.java b/tools/tracesviewer/src/main/java/tracesviewer/LogComparator.java similarity index 93% rename from src/tools/tracesviewer/LogComparator.java rename to tools/tracesviewer/src/main/java/tracesviewer/LogComparator.java index b94eee52b..9a5803fa2 100755 --- a/src/tools/tracesviewer/LogComparator.java +++ b/tools/tracesviewer/src/main/java/tracesviewer/LogComparator.java @@ -1,7 +1,7 @@ /******************************************************************************* * Product of NIST/ITL Advanced Networking Technologies Division (ANTD). * *******************************************************************************/ -package tools.tracesviewer; +package tracesviewer; import java.util.Comparator; @@ -29,7 +29,7 @@ public int compare(Object obj1, Object obj2) { else if (ts1 > ts2) return 1; else { - // Bug fix contributed by Pierre Sandström + // Bug fix contributed by Pierre Sandstr�m return m1 != m2 ? 1: 0; } } catch (NumberFormatException ex) { diff --git a/src/tools/tracesviewer/LogFileParser.java b/tools/tracesviewer/src/main/java/tracesviewer/LogFileParser.java similarity index 99% rename from src/tools/tracesviewer/LogFileParser.java rename to tools/tracesviewer/src/main/java/tracesviewer/LogFileParser.java index 723db309b..acbfe9cbc 100755 --- a/src/tools/tracesviewer/LogFileParser.java +++ b/tools/tracesviewer/src/main/java/tracesviewer/LogFileParser.java @@ -1,4 +1,4 @@ -package tools.tracesviewer; +package tracesviewer; //ifdef J2SDK1.4 import javax.xml.parsers.SAXParser; diff --git a/src/tools/tracesviewer/MessageLogList.java b/tools/tracesviewer/src/main/java/tracesviewer/MessageLogList.java similarity index 98% rename from src/tools/tracesviewer/MessageLogList.java rename to tools/tracesviewer/src/main/java/tracesviewer/MessageLogList.java index cd63708d9..d6506a6c0 100755 --- a/src/tools/tracesviewer/MessageLogList.java +++ b/tools/tracesviewer/src/main/java/tracesviewer/MessageLogList.java @@ -2,7 +2,7 @@ * Product of NIST/ITL Advanced Networking Technologies Division (ANTD). * *******************************************************************************/ -package tools.tracesviewer; +package tracesviewer; import java.util.*; diff --git a/src/tools/tracesviewer/PercentLayout.java b/tools/tracesviewer/src/main/java/tracesviewer/PercentLayout.java similarity index 99% rename from src/tools/tracesviewer/PercentLayout.java rename to tools/tracesviewer/src/main/java/tracesviewer/PercentLayout.java index e858fde47..af11d1915 100755 --- a/src/tools/tracesviewer/PercentLayout.java +++ b/tools/tracesviewer/src/main/java/tracesviewer/PercentLayout.java @@ -1,4 +1,4 @@ -package tools.tracesviewer; +package tracesviewer; import java.awt.*; import java.util.*; diff --git a/src/tools/tracesviewer/PercentLayoutConstraint.java b/tools/tracesviewer/src/main/java/tracesviewer/PercentLayoutConstraint.java similarity index 95% rename from src/tools/tracesviewer/PercentLayoutConstraint.java rename to tools/tracesviewer/src/main/java/tracesviewer/PercentLayoutConstraint.java index 31674d766..75942b9b9 100755 --- a/src/tools/tracesviewer/PercentLayoutConstraint.java +++ b/tools/tracesviewer/src/main/java/tracesviewer/PercentLayoutConstraint.java @@ -1,4 +1,4 @@ -package tools.tracesviewer; +package tracesviewer; public class PercentLayoutConstraint { /** diff --git a/src/tools/tracesviewer/ScriptFrame.java b/tools/tracesviewer/src/main/java/tracesviewer/ScriptFrame.java similarity index 98% rename from src/tools/tracesviewer/ScriptFrame.java rename to tools/tracesviewer/src/main/java/tracesviewer/ScriptFrame.java index cae5025ba..3805d8ea0 100755 --- a/src/tools/tracesviewer/ScriptFrame.java +++ b/tools/tracesviewer/src/main/java/tracesviewer/ScriptFrame.java @@ -3,7 +3,7 @@ * * Created on April 30, 2002, 11:50 AM */ -package tools.tracesviewer; +package tracesviewer; import java.awt.*; import java.awt.event.*; diff --git a/src/tools/tracesviewer/StraightArrow.java b/tools/tracesviewer/src/main/java/tracesviewer/StraightArrow.java similarity index 99% rename from src/tools/tracesviewer/StraightArrow.java rename to tools/tracesviewer/src/main/java/tracesviewer/StraightArrow.java index 044ac1180..bd20452a5 100755 --- a/src/tools/tracesviewer/StraightArrow.java +++ b/tools/tracesviewer/src/main/java/tracesviewer/StraightArrow.java @@ -1,4 +1,4 @@ -package tools.tracesviewer; +package tracesviewer; import java.awt.*; diff --git a/src/tools/tracesviewer/TabbedPaneDemo.java b/tools/tracesviewer/src/main/java/tracesviewer/TabbedPaneDemo.java similarity index 98% rename from src/tools/tracesviewer/TabbedPaneDemo.java rename to tools/tracesviewer/src/main/java/tracesviewer/TabbedPaneDemo.java index ef6914454..53197284c 100755 --- a/src/tools/tracesviewer/TabbedPaneDemo.java +++ b/tools/tracesviewer/src/main/java/tracesviewer/TabbedPaneDemo.java @@ -1,4 +1,4 @@ -package tools.tracesviewer; +package tracesviewer; import javax.swing.JTabbedPane; import javax.swing.ImageIcon; diff --git a/src/tools/tracesviewer/TracesAnimationThread.java b/tools/tracesviewer/src/main/java/tracesviewer/TracesAnimationThread.java similarity index 98% rename from src/tools/tracesviewer/TracesAnimationThread.java rename to tools/tracesviewer/src/main/java/tracesviewer/TracesAnimationThread.java index 482904e5c..4a2bcb1c0 100755 --- a/src/tools/tracesviewer/TracesAnimationThread.java +++ b/tools/tracesviewer/src/main/java/tracesviewer/TracesAnimationThread.java @@ -1,4 +1,4 @@ -package tools.tracesviewer; +package tracesviewer; import java.util.*; diff --git a/src/tools/tracesviewer/TracesCanvas.java b/tools/tracesviewer/src/main/java/tracesviewer/TracesCanvas.java similarity index 99% rename from src/tools/tracesviewer/TracesCanvas.java rename to tools/tracesviewer/src/main/java/tracesviewer/TracesCanvas.java index dbab19d45..23f75b088 100755 --- a/src/tools/tracesviewer/TracesCanvas.java +++ b/tools/tracesviewer/src/main/java/tracesviewer/TracesCanvas.java @@ -39,7 +39,7 @@ * 7 : LAST_ACTOR_GAP */ -package tools.tracesviewer; +package tracesviewer; import java.awt.*; import java.awt.event.*; diff --git a/src/tools/tracesviewer/TracesMessage.java b/tools/tracesviewer/src/main/java/tracesviewer/TracesMessage.java similarity index 99% rename from src/tools/tracesviewer/TracesMessage.java rename to tools/tracesviewer/src/main/java/tracesviewer/TracesMessage.java index 8c0411e5d..c7dc370cd 100755 --- a/src/tools/tracesviewer/TracesMessage.java +++ b/tools/tracesviewer/src/main/java/tracesviewer/TracesMessage.java @@ -1,4 +1,4 @@ -package tools.tracesviewer; +package tracesviewer; import java.io.*; diff --git a/src/tools/tracesviewer/TracesSession.java b/tools/tracesviewer/src/main/java/tracesviewer/TracesSession.java similarity index 97% rename from src/tools/tracesviewer/TracesSession.java rename to tools/tracesviewer/src/main/java/tracesviewer/TracesSession.java index 4fdaa8838..ecc1b2e2a 100755 --- a/src/tools/tracesviewer/TracesSession.java +++ b/tools/tracesviewer/src/main/java/tracesviewer/TracesSession.java @@ -1,4 +1,4 @@ -package tools.tracesviewer; +package tracesviewer; import java.util.*; import java.io.*; diff --git a/src/tools/tracesviewer/TracesSessions.java b/tools/tracesviewer/src/main/java/tracesviewer/TracesSessions.java similarity index 92% rename from src/tools/tracesviewer/TracesSessions.java rename to tools/tracesviewer/src/main/java/tracesviewer/TracesSessions.java index aa21c7727..1bef2f4c5 100755 --- a/src/tools/tracesviewer/TracesSessions.java +++ b/tools/tracesviewer/src/main/java/tracesviewer/TracesSessions.java @@ -1,4 +1,4 @@ -package tools.tracesviewer; +package tracesviewer; import java.util.*; import java.io.*; diff --git a/src/tools/tracesviewer/TracesSessionsDisplayer.java b/tools/tracesviewer/src/main/java/tracesviewer/TracesSessionsDisplayer.java similarity index 99% rename from src/tools/tracesviewer/TracesSessionsDisplayer.java rename to tools/tracesviewer/src/main/java/tracesviewer/TracesSessionsDisplayer.java index 16376f51a..884f85ee6 100755 --- a/src/tools/tracesviewer/TracesSessionsDisplayer.java +++ b/tools/tracesviewer/src/main/java/tracesviewer/TracesSessionsDisplayer.java @@ -1,4 +1,4 @@ -package tools.tracesviewer; +package tracesviewer; import javax.swing.*; import javax.swing.border.*; diff --git a/src/tools/tracesviewer/TracesSessionsList.java b/tools/tracesviewer/src/main/java/tracesviewer/TracesSessionsList.java similarity index 99% rename from src/tools/tracesviewer/TracesSessionsList.java rename to tools/tracesviewer/src/main/java/tracesviewer/TracesSessionsList.java index 5f7af89ee..7b1df2ec2 100755 --- a/src/tools/tracesviewer/TracesSessionsList.java +++ b/tools/tracesviewer/src/main/java/tracesviewer/TracesSessionsList.java @@ -1,4 +1,4 @@ -package tools.tracesviewer; +package tracesviewer; import java.awt.*; import java.awt.event.*; diff --git a/src/tools/tracesviewer/TracesSocket.java b/tools/tracesviewer/src/main/java/tracesviewer/TracesSocket.java similarity index 97% rename from src/tools/tracesviewer/TracesSocket.java rename to tools/tracesviewer/src/main/java/tracesviewer/TracesSocket.java index 5d3d9c6a2..fd7e290c7 100755 --- a/src/tools/tracesviewer/TracesSocket.java +++ b/tools/tracesviewer/src/main/java/tracesviewer/TracesSocket.java @@ -3,7 +3,7 @@ * * Created on July 3, 2003, 2:59 PM */ -package tools.tracesviewer; +package tracesviewer; import java.net.*; import java.io.*; diff --git a/src/tools/tracesviewer/TracesViewer.java b/tools/tracesviewer/src/main/java/tracesviewer/TracesViewer.java similarity index 99% rename from src/tools/tracesviewer/TracesViewer.java rename to tools/tracesviewer/src/main/java/tracesviewer/TracesViewer.java index 1b290f50b..098760d3f 100755 --- a/src/tools/tracesviewer/TracesViewer.java +++ b/tools/tracesviewer/src/main/java/tracesviewer/TracesViewer.java @@ -4,7 +4,7 @@ * Created on April 16, 2002, 2:41 PM */ -package tools.tracesviewer; +package tracesviewer; import javax.swing.*; import javax.swing.border.*; diff --git a/src/tools/tracesviewer/images/back.gif b/tools/tracesviewer/src/main/java/tracesviewer/images/back.gif similarity index 100% rename from src/tools/tracesviewer/images/back.gif rename to tools/tracesviewer/src/main/java/tracesviewer/images/back.gif diff --git a/src/tools/tracesviewer/images/comp.gif b/tools/tracesviewer/src/main/java/tracesviewer/images/comp.gif similarity index 100% rename from src/tools/tracesviewer/images/comp.gif rename to tools/tracesviewer/src/main/java/tracesviewer/images/comp.gif diff --git a/src/tools/tracesviewer/images/faces.jpg b/tools/tracesviewer/src/main/java/tracesviewer/images/faces.jpg similarity index 100% rename from src/tools/tracesviewer/images/faces.jpg rename to tools/tracesviewer/src/main/java/tracesviewer/images/faces.jpg diff --git a/src/tools/tracesviewer/images/nistBanner.jpg b/tools/tracesviewer/src/main/java/tracesviewer/images/nistBanner.jpg similarity index 100% rename from src/tools/tracesviewer/images/nistBanner.jpg rename to tools/tracesviewer/src/main/java/tracesviewer/images/nistBanner.jpg