Skip to content

Commit

Permalink
Merge tag '1.3.0-32' into auvious
Browse files Browse the repository at this point in the history
Conflicts:
	m2/android-jain-sip-ri/pom.xml
	m2/jain-sip-ri/pom.xml
  • Loading branch information
pimenas committed Feb 10, 2018
2 parents b590bb1 + c861442 commit 4fe2d55
Show file tree
Hide file tree
Showing 268 changed files with 13,170 additions and 7,744 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ classes
*.iws
.idea
# ignore NetBeans files
nbproject
nbactions.xml
nb-configuration.xml
catalog.xml
Expand Down
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bhttps%3A%2F%2Fgithub.com%2FRestComm%2Fjain-sip.svg?type=shield)](https://app.fossa.io/projects/git%2Bhttps%3A%2F%2Fgithub.com%2FRestComm%2Fjain-sip?ref=badge_shield)


JAIN-SIP 1.2 Reference Implementation
--------------------------------------
Expand Down Expand Up @@ -120,3 +122,7 @@ See List of Contributions at:
file:./www/README.html

----------------------------------------------------------------------------


## License
[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bhttps%3A%2F%2Fgithub.com%2FRestComm%2Fjain-sip.svg?type=large)](https://app.fossa.io/projects/git%2Bhttps%3A%2F%2Fgithub.com%2FRestComm%2Fjain-sip?ref=badge_large)
18 changes: 14 additions & 4 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ c:/jakarta-ant/bin/ant all
<property name="retrowoven" value="${root}/retrowoven" />
<property name="docdir" value="${root}/javadoc" />
<property name="srcroot" value="${root}/src" />
<property name="srcmvn" value="${root}/m2/" />
<property name="dist" value="dist" />
<property name="jain-sip-api-jar" value="${root}/jain-sip-api-1.2.jar" />
<property name="jain-sip-api-src-jar" value="${root}/jain-sip-api-1.2-src.jar" />
Expand Down Expand Up @@ -389,7 +390,12 @@ c:/jakarta-ant/bin/ant all
<copy file="tck.properties" toDir="./classes" />
</target>


<!-- This is uses for running parallel testsuite -->
<target name="runtestmvn">
<exec dir="${srcmvn}" executable="sh">
<arg line="-c 'mvn clean verify'" />
</exec>
</target>

<!-- this uses the junit task of ant to run the tck in self test mode -->

Expand Down Expand Up @@ -581,7 +587,7 @@ c:/jakarta-ant/bin/ant all
</delete>
<mkdir dir="logs" />

<junit fork="yes" showoutput="yes" failureproperty="testing.failed">
<junit fork="yes" showoutput="yes" failureproperty="testing.failed" forkmode="perTest">
<sysproperty key="enableNIO" value="${enableNIO}"/>
<classpath>
<pathelement location="${jain-sip-api-jar}" />
Expand All @@ -602,12 +608,16 @@ c:/jakarta-ant/bin/ant all

<batchtest fork="yes" todir="test-reports" haltonfailure="no">
<fileset dir="${srcroot}">
<include name="test/unit/gov/nist/javax/**/*Test.java" />
<exclude name="test/unit/gov/nist/javax/sip/stack/NonRfc3261ForkedInviteTest.java" />
<exclude name="test/unit/gov/nist/javax/sip/stack/SimpleDialogRecoveryTest.java" />
<exclude name="test/unit/gov/nist/javax/sip/stack/tls/*Test.java" />
</fileset>
</batchtest>
<batchtest fork="yes" todir="test-reports" haltonfailure="no">
<fileset dir="${srcroot}">
<include name="test/unit/gov/nist/javax/**/*Test.java" />
</fileset>
</batchtest>
</junit>

<echo>The test report can be found at ./test-reports/html/index.html</echo>
Expand Down Expand Up @@ -744,7 +754,7 @@ c:/jakarta-ant/bin/ant all

<!-- This is the build verification test run by cruise control. -->

<target name="cc-buildloop" depends="generate-version,dist,runtck,runtckcallflows,parsertest,unittest" />
<target name="cc-buildloop" depends="generate-version,dist,runtestmvn" />


<!-- compile to traces viewer jar -->
Expand Down
2 changes: 2 additions & 0 deletions docs/uml/udp-request-processing-sequence-diagram.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
@startuml
!includeurl https://raw.githubusercontent.com/RestComm/design/master/telestax-style.plantuml!0

autonumber
actor UAC
boundary UDPMessageProcessor
Expand Down
2 changes: 1 addition & 1 deletion m2/android-jain-sip-ri/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<groupId>javax.sip</groupId>
<artifactId>android-jain-sip-ri</artifactId>
<version>1.2.307</version>
<version>1.3.0-32</version>
<packaging>jar</packaging>

<name>android-jain-sip-ri</name>
Expand Down
116 changes: 116 additions & 0 deletions m2/jain-sip-performance/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>
<parent>
<groupId>javax.sip</groupId>
<version>1.2.0</version>
<artifactId>jain-sip</artifactId>
<relativePath>../pom.xml</relativePath>
</parent>

<groupId>javax.sip</groupId>
<artifactId>jain-sip-performance</artifactId>
<version>1.2.X-SNAPSHOT</version>
<packaging>jar</packaging>
<url>http://code.google.com/p/jain-sip/</url>
<build>
<sourceDirectory>../../src</sourceDirectory>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
<includes>
<include>performance/**</include>
</includes>
</configuration>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>release</id>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<version>1.0</version>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>create</goal>
</goals>
</execution>
</executions>
<configuration>
<doCheck>false</doCheck>
<doUpdate>false</doUpdate>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<dependencies>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.14</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.sip</groupId>
<artifactId>jain-sip-ri</artifactId>
<version>${project.version}</version>
</dependency>
<!--dependency>
<groupId>javax.sip</groupId>
<artifactId>android-jain-sip-ri</artifactId>
<version>${project.version}</version>
</dependency-->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
</dependency>

</dependencies>

<!-- repositories -->
<repositories>
<repository>
<id>maven2-repository.dev.java.net</id>
<name>Java.net Repository for Maven</name>
<url>http://download.java.net/maven/2/</url>
<layout>default</layout>
</repository>
<repository>
<id>mobicents-public-repository-group</id>
<name>Mobicens Public Maven Repository Group</name>
<url>https://oss.sonatype.org/content/groups/public</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
</snapshots>
</repository>
</repositories>

<scm>
<connection>scm:git:[email protected]:telestax/telscale-jsip.git</connection>
<developerConnection>scm:git:[email protected]:telestax/telscale-jsip.git</developerConnection>
<url>https://bitbucket.org/telestax/telscale-jsip</url>
</scm>
</project>
2 changes: 1 addition & 1 deletion m2/jain-sip-ri/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<groupId>javax.sip</groupId>
<artifactId>jain-sip-ri</artifactId>
<version>1.2.307</version>
<version>1.3.0-32</version>
<packaging>jar</packaging>

<name>jain-sip-ri</name>
Expand Down
3 changes: 3 additions & 0 deletions m2/jain-sip-ri/tck.properties
Original file line number Diff line number Diff line change
@@ -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"
Loading

0 comments on commit 4fe2d55

Please sign in to comment.