Permalink
Browse files

Issue number:

Obtained from:
Submitted by:  mranga
Reviewed by:   mranga

Java 5 porting.
  • Loading branch information...
1 parent d716732 commit 84186f9de8029ca5f5551b0b09b69045f36b1ed5 @ranganathanm ranganathanm committed Oct 22, 2007
Showing with 525 additions and 299 deletions.
  1. +0 −1 .classpath
  2. +1 −3 README
  3. +8 −0 TODO.txt
  4. +2 −3 ant-build-config.properties
  5. +0 −8 build.xml
  6. +1 −1 how-to-run-the-tck.txt
  7. +61 −0 m2/jain-sip-api/pom.xml
  8. +62 −0 m2/jain-sip-ri/pom.xml
  9. +50 −0 m2/pom.xml
  10. +0 −18 pom.xml
  11. +2 −1 poms/api-pom.xml
  12. +2 −1 poms/ri-pom.xml
  13. +0 −2 src/examples/authorization/build.xml
  14. +0 −2 src/examples/busy/build.xml
  15. +0 −2 src/examples/cancel/build.xml
  16. +0 −2 src/examples/forked/invite/build.xml
  17. +0 −2 src/examples/ims/build.xml
  18. +0 −2 src/examples/nistgoodies/configlogger/build.xml
  19. +0 −2 src/examples/noautodialog/build.xml
  20. +0 −2 src/examples/prack/build.xml
  21. +0 −3 src/examples/redirect/build.xml
  22. +0 −2 src/examples/refer/build.xml
  23. +0 −2 src/examples/reinvite/build.xml
  24. +0 −2 src/examples/simplecallsetup/build.xml
  25. +1 −3 src/examples/subsnotify/build.xml
  26. +0 −5 src/examples/tls/build.xml
  27. +0 −2 src/examples/tpcc/build.xml
  28. +17 −21 src/gov/nist/core/GenericObject.java
  29. +16 −35 src/gov/nist/core/GenericObjectList.java
  30. +4 −0 src/gov/nist/core/Host.java
  31. +3 −0 src/gov/nist/core/HostPort.java
  32. +41 −7 src/gov/nist/core/NameValue.java
  33. +95 −13 src/gov/nist/core/NameValueList.java
  34. +2 −2 src/gov/nist/core/StringTokenizer.java
  35. +3 −3 src/gov/nist/core/ThreadAuditor.java
  36. +2 −2 src/gov/nist/javax/sdp/MediaDescriptionImpl.java
  37. +5 −5 src/gov/nist/javax/sdp/fields/AttributeField.java
  38. +2 −0 src/gov/nist/javax/sdp/fields/RepeatField.java
  39. +5 −8 src/gov/nist/javax/sdp/fields/SDPObjectList.java
  40. +25 −2 src/gov/nist/javax/sdp/parser/BandwidthFieldParser.java
  41. +25 −2 src/gov/nist/javax/sdp/parser/KeyFieldParser.java
  42. +2 −2 src/gov/nist/javax/sip/SipProviderImpl.java
  43. +4 −1 src/gov/nist/javax/sip/address/AddressImpl.java
  44. +6 −1 src/gov/nist/javax/sip/address/Authority.java
  45. +5 −1 src/gov/nist/javax/sip/address/GenericURI.java
  46. +9 −9 src/gov/nist/javax/sip/address/NetObject.java
  47. +4 −18 src/gov/nist/javax/sip/address/NetObjectList.java
  48. +5 −3 src/gov/nist/javax/sip/address/SipUri.java
  49. +5 −2 src/gov/nist/javax/sip/address/TelURLImpl.java
  50. +2 −2 src/gov/nist/javax/sip/address/TelephoneNumber.java
  51. +2 −2 src/gov/nist/javax/sip/header/AuthenticationHeader.java
  52. +2 −2 src/gov/nist/javax/sip/header/AuthenticationInfo.java
  53. +2 −2 src/gov/nist/javax/sip/header/Contact.java
  54. +8 −7 src/gov/nist/javax/sip/header/ParametersHeader.java
  55. +8 −49 src/gov/nist/javax/sip/header/SIPObjectList.java
  56. +3 −3 src/gov/nist/javax/sip/header/ims/PChargingFunctionAddresses.java
  57. +1 −1 src/gov/nist/javax/sip/header/ims/SecurityAgree.java
  58. +2 −2 src/gov/nist/javax/sip/parser/ParametersParser.java
  59. +2 −2 src/gov/nist/javax/sip/parser/ViaParser.java
  60. +2 −3 src/gov/nist/javax/sip/stack/SIPClientTransaction.java
  61. +3 −4 src/gov/nist/javax/sip/stack/SIPTransaction.java
  62. +2 −3 src/gov/nist/javax/sip/stack/SIPTransactionStack.java
  63. +1 −3 src/test/load/concurrency/build.xml
  64. +0 −2 src/test/load/multidialog/build.xml
  65. +8 −4 src/test/tck/factory/HeaderFactoryTest.java
  66. +2 −0 www/index.html
View
@@ -3,7 +3,6 @@
<classpathentry path="src" kind="src"/>
<classpathentry path="org.eclipse.jdt.launching.JRE_CONTAINER" exported="true" kind="con"/>
<classpathentry path="lib/log4j-1.2.8.jar" kind="lib"/>
- <classpathentry path="lib/concurrent.jar" kind="lib"/>
<classpathentry path="lib/junit-3.8.1.jar" kind="lib"/>
<classpathentry path="classes" kind="output"/>
</classpath>
View
@@ -25,9 +25,7 @@ Dependencies
1. You need to install ant and the junit extension for ant on your machine.
2. You need to have junit.jar in your classpath.
-3. You need to put concurrent.jar (included in the distribution) in your
- classpath.
-4. You need to have log4j.jar in your classpath (included in this distribution).
+3. You need to have log4j.jar in your classpath (included in this distribution).
There are versions of the dependent libraries in the lib directory.
View
@@ -0,0 +1,8 @@
+
+Notes for the next version:
+
+1. Add support for IMS headers.
+
+2. Add AddressFactory.createAddress() ( no args ).
+
+3. Intoduce AddressParametersHeader interface (SIP Servlets implementation support).
@@ -1,10 +1,9 @@
javac.debug=on
-javac.source=1.4
-javac.target=1.4
+javac.source=1.5
+javac.target=1.5
javac.deprecation=true
javac.optimize=off
javac.debuglevel=lines,var,source
log4j=log4j-1.2.8.jar
-concurrent=concurrent.jar
junit=junit-3.8.1.jar
View
@@ -89,7 +89,6 @@ c:/jakarta-ant/bin/ant all
<property name="sip-sdp-jar" value="${root}/sip-sdp.jar" />
<property name="unit_test_jar" value="${root}/nist-unit.jar" />
<property name="log4j_jar" value="${root}/lib/${log4j}" />
- <property name="concurrent_jar" value="${root}/lib/${concurrent}" />
<property name='j2se_api' value='http://java.sun.com/j2se/1.5/docs/api' />
<property name="junit_jar" value="${root}/lib/${junit}" />
@@ -153,7 +152,6 @@ c:/jakarta-ant/bin/ant all
<javadoc packagenames="javax.sip.*,javax.sip.header.*,javax.sip.message.*,javax.sip.address.*,gov.nist.javax.sip.*,gov.nist.javax.sip.address.*,gov.nist.javax.sip.message.*,gov.nist.javax.sip.header.*,gov.nist.javas.sip.header.ims.*,gov.nist.javax.sip.stack.*,gov.nist.core.net.*,gov.nist.javax.sip.parser.*,javax.sdp.*,gov.nist.javax.sdp.*,gov.nist.javax.sdp.fields.*" sourcepath="${srcroot}" overview="${docdir}/overview.html" destdir="javadoc" use="true" splitindex="true" windowtitle="The JAIN-SIP-1.2 RI For the People !" doctitle="NIST-SIP: The Reference Implementation for JAIN-SIP 1.2" public="true" author="true" version="true" defaultexcludes="yes" additionalparam="-breakiterator">
<classpath>
<pathelement location="${log4j_jar}" />
- <pathelement location="${concurrent_jar}" />
<pathelement location="${jain_api_jar}" />
</classpath>
<link href="${j2se_api}" />
@@ -216,7 +214,6 @@ c:/jakarta-ant/bin/ant all
<javac debug="${javac.debug}" debuglevel="${javac.debuglevel}" nowarn="${javac.nowarn}" deprecation="${javac.deprecation}" optimize="${javac.optimize}" srcdir="${srcroot}" source="${javac.source}" target="${javac.target}" includes="gov/nist/core/**/*.java, gov/nist/javax/sip/**/*.java" destdir="${classes}">
<classpath>
<pathelement location="${log4j_jar}" />
- <pathelement location="${concurrent_jar}" />
</classpath>
</javac>
@@ -226,7 +223,6 @@ c:/jakarta-ant/bin/ant all
<javac debug="${javac.debug}" debuglevel="${javac.debuglevel}" nowarn="${javac.nowarn}" deprecation="${javac.deprecation}" optimize="${javac.optimize}" srcdir="${srcroot}" source="${javac.source}" target="${javac.target}" includes="gov/nist/core/**/*.java, gov/nist/javax/sip/**/*.java" destdir="${classes}">
<classpath>
<pathelement location="${log4j_jar}" />
- <pathelement location="${concurrent_jar}" />
</classpath>
</javac>
<jar destfile="${ri_jar}" basedir="${classes}" includes="gov/nist/**/*.class" />
@@ -330,7 +326,6 @@ c:/jakarta-ant/bin/ant all
<pathelement location="${tck_jar}" />
<pathelement location='${junit_jar}' />
<pathelement location='${log4j_jar}' />
- <pathelement location='${concurrent_jar}' />
<!-- add source path since this will pick up test.tck.gui.images -->
<pathelement location='src' />
@@ -368,7 +363,6 @@ c:/jakarta-ant/bin/ant all
<pathelement location="${tck_jar}" />
<pathelement location='${junit_jar}' />
<pathelement location='${log4j_jar}' />
- <pathelement location='${concurrent_jar}' />
<!-- add source path since this will pick up test.tck.gui.images -->
<pathelement location='src' />
@@ -410,7 +404,6 @@ c:/jakarta-ant/bin/ant all
<pathelement location='${junit_jar}' />
<pathelement location='${log4j_jar}' />
<pathelement location='${unit_test_jar}' />
- <pathelement location='${concurrent_jar}' />
<!-- add project root to the classpath in order to make tck.properties accessible. -->
<pathelement location="${root}" />
@@ -439,7 +432,6 @@ c:/jakarta-ant/bin/ant all
<pathelement location='${junit_jar}' />
<pathelement location='${log4j_jar}' />
<pathelement location='${unit_test_jar}' />
- <pathelement location='${concurrent_jar}' />
<!-- add project root to the classpath in order to make tck.properties accessible. -->
<pathelement location="${root}" />
@@ -1,7 +1,7 @@
Here are instructions on how to configure and run the TCK
---------------------------------------------------------
-Pre-requisites: ant, junit, log4j and concurrent.jar.
+Pre-requisites: ant, junit and log4j.
The TCK is run as an ant junit target from build.xml
@@ -0,0 +1,61 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <!-- this is not a complete pom -->
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>javax.sip</groupId>
+ <artifactId>jain-sip-api</artifactId>
+ <packaging>jar</packaging>
+ <version>1.2</version>
+ <name>jain-sip</name>
+ <url>http://jain-sip.dev.java.net</url>
+ <build>
+ <sourceDirectory>../../src</sourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ <resources>
+ <resource>
+ <directory>../target/javax</directory>
+ <includes>
+ <include>sip/**</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+
+ </build>
+
+
+ <distributionManagement>
+ <repository>
+ <id>local-repository</id>
+ <url>${jain-sip-m2-repo.java.net.url}</url>
+ </repository>
+ </distributionManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.8</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+</project>
@@ -0,0 +1,62 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <!-- this is not a complete pom -->
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>javax.sip</groupId>
+ <artifactId>jain-sip-ri</artifactId>
+ <packaging>jar</packaging>
+ <version>1.2</version>
+ <name>jain-sip</name>
+ <url>http://jain-sip.dev.java.net</url>
+ <build>
+ <sourceDirectory>../../src</sourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ <resources>
+ <resource>
+ <directory>../target/gov/nist</directory>
+ <includes>
+ <include>sip/**</include>
+ <include>core/**</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+
+ </build>
+
+
+ <distributionManagement>
+ <repository>
+ <id>local-repository</id>
+ <url>${jain-sip-m2-repo.java.net.url}</url>
+ </repository>
+ </distributionManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.8</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+</project>
View
@@ -0,0 +1,50 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <!-- this is not a complete pom -->
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>javax.sip</groupId>
+ <artifactId>jain-sip-api</artifactId>
+ <packaging>jar</packaging>
+ <version>1.2</version>
+ <name>jain-sip</name>
+ <url>http://jain-sip.dev.java.net</url>
+ <build>
+ <sourceDirectory>../src</sourceDirectory>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.8</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <distributionManagement>
+ <repository>
+ <id>local-repository</id>
+ <url>${jain-sip-m2-repo.java.net.url}</url>
+ </repository>
+ </distributionManagement>
+
+</project>
View
@@ -1,18 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>javax.sip</groupId>
- <artifactId>jain-sip</artifactId>
- <packaging>jar</packaging>
- <version>1.2</version>
- <name>jain-sip</name>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
View
@@ -2,7 +2,8 @@
<modelVersion>4.0.0</modelVersion>
<groupId>javax.sip</groupId>
<artifactId>jain-sip-api</artifactId>
- <version>@VERSION@</version>
+ <version>1.2</version>
+ <packaging>jar</packaging>
<name>JAIN-SIP API</name>
<url>https://jain-sip.dev.java.net/</url>
View
@@ -2,7 +2,8 @@
<modelVersion>4.0.0</modelVersion>
<groupId>javax.sip</groupId>
<artifactId>jain-sip-ri</artifactId>
- <version>@VERSION@</version>
+ <version>1.2</version>
+ <packaging>jar</packaging>
<name>JAIN-SIP Refence Implementation</name>
<url>https://jain-sip.dev.java.net/</url>
@@ -10,11 +10,9 @@
<property name="classes" value="${root}/classes" />
<property name="srcroot" value="${root}/src" />
<property name="log4j_jar" value="${root}/lib/${log4j}" />
- <property name="concurrent_jar" value="${root}/lib/${concurrent}" />
<path id="project.class.path">
<pathelement location="${classes}" />
<pathelement location="${log4j_jar}" />
- <pathelement location="${concurrent_jar}" />
</path>
<target name="make">
<javac debug="${javac.debug}"
@@ -4,11 +4,9 @@
<property name = "classes" value="${root}/classes" />
<property name = "srcroot" value ="${root}/src" />
<property name = "log4j_jar" value="${root}/lib/${log4j}" />
- <property name = "concurrent_jar" value="${root}/lib/${concurrent}" />
<path id="project.class.path" >
<pathelement location="${classes}"/>
<pathelement location="${log4j_jar}"/>
- <pathelement location="${concurrent_jar}" />
</path>
<target name="make" >
<javac debug="${javac.debug}"
@@ -5,12 +5,10 @@
<property name = "srcroot" value ="${root}/src" />
<property name = "log4j_jar" value="${root}/lib/${log4j}" />
<property name = "junit_jar" value="${root}/lib/${junit}" />
- <property name = "concurrent_jar" value="${root}/lib/${concurrent}" />
<path id="project.class.path" >
<pathelement location="${classes}"/>
<pathelement location="${log4j_jar}"/>
<pathelement location="${junit_jar}"/>
- <pathelement location="${concurrent_jar}" />
</path>
<target name="make" >
<javac debug="${javac.debug}"
@@ -5,11 +5,9 @@
<property name="srcroot" value="${root}/src" />
<property name = "junit_jar" value="${root}/lib/${junit}" />
<property name="log4j_jar" value="${root}/lib/${log4j}" />
- <property name="concurrent_jar" value="${root}/lib/${concurrent}" />
<path id="project.class.path">
<pathelement location="${classes}" />
<pathelement location="${log4j_jar}" />
- <pathelement location="${concurrent_jar}" />
<pathelement location="${junit_jar}" />
</path>
<target name="make">
@@ -5,11 +5,9 @@
<property name="srcroot" value="${root}/src" />
<property name="log4j_jar" value="${root}/lib/${log4j}" />
<property name="junit_jar" value="${root}/lib/${junit}" />
- <property name="concurrent_jar" value="${root}/lib/${concurrent}" />
<path id="project.class.path">
<pathelement location="${classes}" />
<pathelement location="${log4j_jar}" />
- <pathelement location="${concurrent_jar}" />
<pathelement location="${junit_jar}" />
</path>
<target name="make">
Oops, something went wrong.

0 comments on commit 84186f9

Please sign in to comment.