Skip to content

Commit

Permalink
tagging JSIP 1.2.148.9
Browse files Browse the repository at this point in the history
  • Loading branch information
@deruelle
deruelle committed Mar 21, 2011
1 parent d00b66c commit 864640c
Show file tree
Hide file tree
Showing 281 changed files with 10,069 additions and 19,877 deletions.
5 changes: 1 addition & 4 deletions .classpath
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="ant-tasks/src"/>
<classpathentry excluding="gov/nist/javax/sip/stack/sctp/" kind="src" path="src"/>
<classpathentry excluding="gov/nist/javax/sip/stack/sctp/|test/tck/msgflow/callflows/sctp/" kind="src" path="src"/>
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="lib/junit-3.8.1.jar"/>
<classpathentry kind="lib" path="ant-tasks/lib/jdom.jar"/>
<classpathentry kind="lib" path="ant-tasks/lib/ant.jar"/>
<classpathentry kind="lib" path="lib/log4j-1.2.15.jar"/>
<classpathentry kind="output" path="classes"/>
</classpath>
2 changes: 1 addition & 1 deletion .project
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>jain-sip</name>
<name>jsip-stable-branch</name>
<comment></comment>
<projects>
</projects>
Expand Down
1 change: 1 addition & 0 deletions TIMESTAMP
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Wed Mar 24 14:53:37 GMT-05:00 2010
126 changes: 68 additions & 58 deletions ant-tasks/src/net/java/jsip/ant/tasks/VersionerTask.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
public class VersionerTask extends Task {

protected File cvsVersionFile = null;
protected int version = 1111;
protected int version = -1;
protected File pomFile = null;
protected File toVersion = null;
protected boolean incrementCVSVersion = false;
Expand All @@ -34,6 +34,10 @@ public class VersionerTask extends Task {
private boolean doPom = false;
private boolean doToVersion = false;

private String timeStampFileName = "TIMESTAMP";

private String antprops = "ant-version.properties";


public void setMainVersionParts(int mainVersionParts) {
this.mainVersionParts = mainVersionParts;
Expand Down Expand Up @@ -117,64 +121,70 @@ public void execute() throws BuildException {

super.execute();

int localVersion = 1111;
int localVersion = -1;
if (cvsVersionFile != null) {
//ObjectInputStream ois = null;
BufferedReader br=null;
try {
//ois = new ObjectInputStream(new FileInputStream(cvsVersionFile));

String versionValue=null;
br=new BufferedReader(new FileReader(cvsVersionFile));
versionValue=br.readLine();
localVersion = Math.abs(Integer.valueOf(versionValue));

} catch (Exception e) {
log("Failed to fetch version from file!!");
localVersion = this.version;
} finally {
if (br != null)
try {

br.close();
} catch (Exception e) {
localVersion = this.version;
}
}
super.getProject().setProperty("svnversion", Integer.toString(localVersion));


getProject().setProperty("jain-sip-ri-jar",
"jain-sip-ri-1.2." + localVersion + ".jar");
getProject().setProperty("jain-sip-sdp-jar",
"jain-sip-sdp-1.2." + localVersion + ".jar");
getProject().setProperty("jain-sip-src-tar",
"jain-sip-src-1.2." + localVersion + ".tar.gz");

getProject().setProperty("jain-sip-javadoc-tar",
"jain-sip-javadoc-1.2." + localVersion + ".tar.gz");

getProject().setProperty("jain-sip-all-tar",
"jain-sip-1.2." + localVersion + ".tar.gz");
getProject().setProperty("jain-sip-tck-jar",
"jain-sip-tck-1.2." + localVersion + ".jar");
getProject().setProperty("sdp_jar",
"jain-sdp-1.0." + localVersion + ".jar");
getProject().setProperty("sdp-src-jar",
"jain-sdp-src-1.0." + localVersion + ".jar");
getProject().setProperty("jain-sip-src-jar",
"jain-sip-src-1.2." + localVersion + ".jar");

getProject().setProperty("jain-sip-sctp-jar",
"jain-sip-sctp-1.2." + localVersion + ".jar");
getProject().setProperty("unit_test_jar",
"jain-sip-unit-test-1.2." + localVersion + ".jar");

String cwd = System.getProperty("user.dir");
getProject().setProperty("top",new File(cwd).getName());



//ObjectInputStream ois = null;
BufferedReader br=null;
try {
//ois = new ObjectInputStream(new FileInputStream(cvsVersionFile));

String versionValue=null;
br=new BufferedReader(new FileReader(cvsVersionFile));
versionValue=br.readLine();
localVersion = Math.abs(Integer.valueOf(versionValue));

} catch (Exception e) {
log("Failed to fetch version from file!!");
throw new BuildException(e);
} finally {
if (br != null)
try {

br.close();
} catch (Exception e) {
throw new BuildException(e);
}
}

if (incrementCVSVersion) {
cvsVersionFile.delete();
try {
cvsVersionFile.createNewFile();
//ObjectOutputStream oos = new ObjectOutputStream(
// new FileOutputStream(cvsVersionFile));
//oos.writeUTF(""+localVersion + 1);
BufferedWriter bw=new BufferedWriter(new FileWriter(cvsVersionFile));
bw.write(""+(localVersion + 1));
bw.flush();
bw.close();
File antPropertiesFile = new File( this.antprops);
antPropertiesFile.createNewFile();
bw=new BufferedWriter(new FileWriter(antPropertiesFile));
bw.write("jain-sip-ri-jar=jain-sip-ri-1.2."+(localVersion + 1) + ".jar\n");
bw.write("jain-sip-sdp-jar=jain-sip-sdp-1.2."+(localVersion + 1) + ".jar\n");
bw.write("jain-sip-src-tar=jain-sip-src-1.2."+(localVersion + 1) + ".tar.gz\n");
bw.write("jain-sip-javadoc-tar=jain-sip-javadoc-1.2."+(localVersion + 1) + ".tar.gz\n");

bw.write("jain-sip-all-tar=jain-sip-1.2." +(localVersion + 1) + ".tar.gz\n");
bw.write("jain-sip-tck-jar=jain-sip-tck-1.2."+(localVersion + 1) + ".jar\n");
bw.write("sdp_jar=jain-sdp-1.0."+(localVersion + 1) + ".jar\n");
bw.write("sdp-src-jar=jain-sdp-src-1.0."+(localVersion + 1) + ".jar\n");

bw.write("jain-sip-sctp-jar=jain-sip-sctp-1.2."+(localVersion + 1) + ".jar\n");
bw.write("unit_test_jar=jain-sip-unit-test-1.2." + (localVersion+1) + ".jar\n");
bw.flush();
bw.close();
bw=new BufferedWriter(new FileWriter(this.timeStampFileName));
Date date = new Date ( System.currentTimeMillis());
bw.write(date.toString());
bw.close();
} catch (IOException e) {
log("Failed to increment version in file. See stack trace:",e,0);
e.printStackTrace();
}

}

} else {
localVersion = this.version;
}
Expand Down
10 changes: 10 additions & 0 deletions ant-version.properties
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
jain-sip-ri-jar=jain-sip-ri-1.2.148.jar
jain-sip-sdp-jar=jain-sip-sdp-1.2.148.jar
jain-sip-src-tar=jain-sip-src-1.2.148.tar.gz
jain-sip-javadoc-tar=jain-sip-javadoc-1.2.148.tar.gz
jain-sip-all-tar=jain-sip-1.2.148.tar.gz
jain-sip-tck-jar=jain-sip-tck-1.2.148.jar
sdp_jar=jain-sdp-1.0.148.jar
sdp-src-jar=jain-sdp-src-1.0.148.jar
jain-sip-sctp-jar=jain-sip-sctp-1.2.148.jar
unit_test_jar=jain-sip-unit-test-1.2.148.jar
81 changes: 35 additions & 46 deletions build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ c:/jakarta-ant/bin/ant all
<property file="ant-build-config.properties" />
<!-- set global properties for this build -->
<property name="root" value="." />
<property file="ant-version.properties" />

<property name="href.nist.homepage" value="http://www-x.antd.nist.gov/" />
<property name="href.uncopyright" value="../uncopyright.html" />
Expand Down Expand Up @@ -110,7 +111,7 @@ c:/jakarta-ant/bin/ant all

<target name="all" depends="make,compileexamples,compiletools,javadoc,javadoc-jain" />

<target name="make" depends="compileapi,compileri,compilesdp,jain-sip-sdp-jar" />
<target name="make" depends="clean,compileapi,compileri,compilesdp,jain-sip-sdp-jar" />


<target name="cleanlogs">
Expand All @@ -130,20 +131,19 @@ c:/jakarta-ant/bin/ant all
</delete>
</target>
<!-- Clean everything -->
<target name="clean" depends="cleanlogs,cleantars">
<target name="clean" depends="cleanlogs">
<delete dir="${classes}" quiet="true" failonerror="false" />
<delete dir="${retrowoven}" quiet="true" failonerror="false" />
<delete file="./tracesviewer.jar" failonerror="false" />
<delete dir='javadoc' quiet="true" failonerror="false" />
<delete dir='javadoc-jain' quiet="true" failonerror="false" />
<delete dir="${dist}" quiet="true" failonerror="false" />
</target>
<target name="cleantars" >
<delete failonerror="0">
<fileset file="*.jar"/>
<fileset file="*.tar.gz"/>
</delete>
</target>

<target name="check_java_version">
<!-- JvB: Check for Java 1.5 -->
<available classname="java.lang.ProcessBuilder" property="jdk15.available" />
Expand All @@ -153,7 +153,7 @@ c:/jakarta-ant/bin/ant all
</target>

<!-- Create ${classes} -->
<target name="init" depends="generate-version">
<target name="init">
<mkdir dir="${classes}" />
</target>

Expand Down Expand Up @@ -250,8 +250,7 @@ c:/jakarta-ant/bin/ant all

</target>
<!-- Ant tools -->
<target name="ant-tools" >
<mkdir dir="${classes}" />
<target name="ant-tools" depends="init">
<jain-javac srcdir="ant-tasks/src" includes="net/java/jsip/ant/**/*.java">
<classpath>
<pathelement location="${jdom_jar}" />
Expand All @@ -260,7 +259,7 @@ c:/jakarta-ant/bin/ant all
</jain-javac>
</target>
<!-- Compile and build jars -->
<target name="compileri" depends="init,compileapi">
<target name="compileri" depends="clean,init,compileapi">
<jain-javac includes="gov/nist/core/**/*.java, gov/nist/javax/sip/**/*.java"
excludes="gov/nist/javax/sip/stack/sctp/**/*.java">
<classpath>
Expand All @@ -275,11 +274,11 @@ c:/jakarta-ant/bin/ant all
value="${jain-sip-ri-jar}"/>
</manifest>
</jar>
<jar destfile="${jain-sip-src-jar}" basedir="${srcroot}" includes="TIMESTAMP,gov/nist/**/*.java"
<jar destfile="${jain-sip-ri-src-jar}" basedir="${srcroot}" includes="TIMESTAMP,gov/nist/**/*.java"
excludes="gov/nist/javax/sip/stack/sctp/**/*.java">
<manifest>
<attribute name="Original-Jar-Name"
value="${jain-sip-src-jar}"/>
value="${jain-sip-ri-src-jar}"/>
</manifest>
</jar>
</target>
Expand Down Expand Up @@ -332,10 +331,9 @@ c:/jakarta-ant/bin/ant all
<jar destfile="${unit_test_jar}" basedir="${classes}" includes="test/unit/**/*.class,test/torture/**/*" />
</target>

<target name="jain-sip-sdp-jar" depends="compilejain,generate-version">
<target name="jain-sip-sdp-jar" depends="compilejain">
<copy file="TIMESTAMP" toDir="classes/" />
<copy file="version.txt" toDir="classes/" />
<jar destfile="${jain-sip-sdp-jar}" basedir="${classes}" includes="TIMESTAMP,version.txt,javax/**/*.class,gov/nist/**/*.class" >
<jar destfile="${jain-sip-sdp-jar}" basedir="${classes}" includes="TIMESTAMP,javax/**/*.class,gov/nist/**/*.class" >
<manifest>
<attribute name="Original-Jar-Name"
value="${jain-sip-sdp-jar}"/>
Expand All @@ -357,7 +355,7 @@ c:/jakarta-ant/bin/ant all
</target>

<!-- Compile the tck, always with debug on -->
<target name="compiletck" depends="init,compileri,compilesctp">
<target name="compiletck" depends="clean,init,compileri,compilesctp">
<mkdir dir="${classes}" />
<jain-javac>
<include name="test/tck/**/*.java" />
Expand Down Expand Up @@ -635,27 +633,31 @@ c:/jakarta-ant/bin/ant all
<fail if="testing.failed" />
</target>

<!-- Task to generate a vesion number -->
<target name="generate-version" depends="ant-tools" >
<taskdef name="versioner" classname="net.java.jsip.ant.tasks.VersionerTask" classpath="classes"/>
<versioner cvsVersionFile="${ant.file.NIST-SIP}/../version.txt" incrementCVSVersion="true"/>
</target>

<!-- Generate a tar file -->

<target name="srctar" depends="init" >
<target name="srctar" >
<tar compression="gzip" basedir="../" destfile="${jain-sip-src-tar}"
includes="${top}/**/*/"
excludes="${top}/www/**/*,${top}/javax/**/*,${top}/repo/**/*,${top}/ant-tasks/lib/**/*,${top}/test-reports/**/*,${top}/classes/**/*,${top}/javadoc/**/*,${top}/*.jar,${top}/lib/**/*,${top}/tckoutput.txt,${top}/*.gz,${top}/poms/**/*" />
includes="jain-sip/**/*/"
excludes="jain-sip/www/**/*,jain-sip/javax/**/*,jain-sip/repo/**/*,jain-sip/ant-tasks/lib/**/*,jain-sip/test-reports/**/*,jain-sip/classes/**/*,jain-sip/javadoc/**/*,jain-sip/*.jar,jain-sip/lib/**/*,jain-sip/tckoutput.txt,jain-sip/*.gz,jain-sip/poms/**/*" />
</target>
<target name="javadoctar" depends="init,javadoc" >
<touch file="${jain-sip-javadoc-tar}" />
<target name="javadoctar" >
<tar compression="gzip" basedir="../" destfile="${jain-sip-javadoc-tar}"
includes="${top}/javadoc/**/*" />
includes="jain-sip/javadoc/**/*" />
</target>
<target name="alltar" depends="init" >
<target name="alltar" >
<tar compression="gzip" basedir="../" destfile="${jain-sip-all-tar}"
includes="${top}/**/*/"
excludes="${top}/*.tar.gz" />
includes="jain-sip/**/*/"
excludes="jain-sip/*.tar.gz" />
</target>

<!-- builds the distribution -->
<target name="dist" depends="make,compiletck,javadoctar,alltar,srctar">
<target name="dist" depends="make,compiletck,javadoc,javadoctar,alltar,srctar">
<mkdir dir="${dist}" />
<mkdir dir="${dist}/jain-sdp" />
<mkdir dir="${dist}/jain-sip-javadoc" />
Expand All @@ -665,21 +667,21 @@ c:/jakarta-ant/bin/ant all
<mkdir dir="${dist}/jain-sip-tck" />
<mkdir dir="${dist}/jain-sip-src" />
<mkdir dir="${dist}/jain-sip-all" />
<copy file="${jain-sip-javadoc-tar}" todir="${dist}/jain-sip-javadoc" />
<copy file="${jain-sip-src-tar}" todir="${dist}/jain-sip-src" />
<!--copy file="${jain-sip-javadoc-tar}" todir="${dist}/jain-sip-javadoc" />
<copy file="${jain-sip-src-tar}" todir="${dist}/jain-sip-src" /-->
<copy file="${jain-sip-api-jar}" todir="${dist}/jain-sip-api"/>
<copy file="${jain-sip-ri-jar}" todir="${dist}/jain-sip-ri"/>
<copy file="${jain-sip-sdp-jar}" todir="${dist}/jain-sip-sdp"/>
<copy file="${sdp_jar}" todir="${dist}/jain-sdp"/>
<copy file="${jain-sip-tck-jar}" todir ="${dist}/jain-sip-tck" />
<copy file="${jain-sip-all-tar}" todir="${dist}/jain-sip-all" />
<!--copy file="${jain-sip-all-tar}" todir="${dist}/jain-sip-all" /-->
<copy file="README-DISTRIBUTION" todir="${dist}"/>

</target>

<!-- 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="dist,runtck,runtckcallflows,parsertest,unittest" />


<!-- compile to traces viewer jar -->
Expand Down Expand Up @@ -781,16 +783,10 @@ c:/jakarta-ant/bin/ant all
</commandline>
</cvs>
</target>
<!-- Task to generate a vesion number -->
<target name="generate-timestamp" >
<tstamp />
<echo file="TIMESTAMP" message="Date = ${DSTAMP} Time = ${TSTAMP}" />
</target>

<target name="generate-version" depends="ant-tools,svn-revision,generate-timestamp" >
<property file="ant-version.properties" />
<taskdef name="versioner" classname="net.java.jsip.ant.tasks.VersionerTask" classpath="classes"/>
<versioner cvsVersionFile="${ant.file.NIST-SIP}/../version.txt" incrementCVSVersion="false"/>
<target name="update-cvs" >
<!-- Here we update version.txt so local is the same as cvs -->
<!-- cvs -d :pserver:user:[email protected]:/cvs commit -m "Test commit" version.txt -->
<cvs cvsRoot=":pserver:${user.name}:${password}@cvs.dev.java.net:/cvs" command="commit -m 'versions' version.txt ant-version.properties" />
</target>
<target name="perform-m2-release" depends="ant-tools" description="Performs m2 deployment" >
<antcall target="update-from-cvs" />
Expand All @@ -805,11 +801,4 @@ c:/jakarta-ant/bin/ant all
<antcall target="clean-tasks" />
</target>


<target name="svn-revision">
<exec executable="svnversion" spawn="false" dir="./" output="version.txt">
<arg line="."/>
</exec>
</target>

</project>
</project>
Loading

0 comments on commit 864640c

Please sign in to comment.