Changeset 25

Show
Ignore:
Timestamp:
12/21/07 14:13:32 (9 months ago)
Author:
sip
Message:

static final

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • XmlRpcMcuClient/nbproject/build-impl.xml

    r12 r25  
    8181        </condition> 
    8282        <condition property="no.javadoc.preview"> 
    83             <isfalse value="${javadoc.preview}"/> 
     83            <and> 
     84                <isset property="javadoc.preview"/> 
     85                <isfalse value="${javadoc.preview}"/> 
     86            </and> 
    8487        </condition> 
    8588        <property name="run.jvmargs" value=""/> 
    …… 
    9598        <property name="application.args" value=""/> 
    9699        <property name="source.encoding" value="${file.encoding}"/> 
     100        <condition property="javadoc.encoding.used" value="${javadoc.encoding}"> 
     101            <and> 
     102                <isset property="javadoc.encoding"/> 
     103                <not> 
     104                    <equals arg1="${javadoc.encoding}" arg2=""/> 
     105                </not> 
     106            </and> 
     107        </condition> 
     108        <property name="javadoc.encoding.used" value="${source.encoding}"/> 
    97109        <property name="includes" value="**"/> 
    98110        <property name="excludes" value=""/> 
     111        <property name="do.depend" value="true"/> 
     112        <condition property="do.depend.true"> 
     113            <istrue value="${do.depend}"/> 
     114        </condition> 
    99115    </target> 
    100116    <target name="-post-init"> 
    …… 
    131147            <attribute default="${excludes}" name="excludes"/> 
    132148            <attribute default="${javac.debug}" name="debug"/> 
    133             <attribute default="${jaxws.endorsed.dir}" name="jaxwsendorsed"/> 
     149            <attribute default="" name="javac.compilerargs.jaxws"/> 
     150            <attribute default="" name="sourcepath"/> 
    134151            <element name="customize" optional="true"/> 
    135152            <sequential> 
    136                 <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="" srcdir="@{srcdir}" target="${javac.target}"> 
     153                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}"> 
    137154                    <classpath> 
    138155                        <path path="@{classpath}"/> 
    139156                    </classpath> 
    140                     <compilerarg line="-Djava.endorsed.dirs='@{jaxwsendorsed}'"/> 
    141                     <compilerarg line="${javac.compilerargs}"/> 
     157                    <compilerarg line="${javac.compilerargs} @{javac.compilerargs.jaxws}"/> 
    142158                    <customize/> 
    143159                </javac> 
    …… 
    176192            <attribute default="${includes}" name="includes"/> 
    177193            <attribute default="${excludes}" name="excludes"/> 
    178             <sequential> 
    179                 <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true"> 
     194            <attribute default="**" name="testincludes"/> 
     195            <sequential> 
     196                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true"> 
    180197                    <batchtest todir="${build.test.results.dir}"> 
    181198                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> 
    182                             <filename name="**/*Test.java"/> 
     199                            <filename name="@{testincludes}"/> 
    183200                        </fileset> 
    184201                    </batchtest> 
    …… 
    295312        <!-- You can override this target in the ../build.xml file. --> 
    296313    </target> 
    297     <target depends="init,deps-jar,-pre-pre-compile,-pre-compile" if="have.sources" name="-do-compile"> 
     314    <target if="do.depend.true" name="-compile-depend"> 
    298315        <j2seproject3:depend/> 
     316    </target> 
     317    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-compile-depend" if="have.sources" name="-do-compile"> 
    299318        <j2seproject3:javac/> 
    300319        <copy todir="${build.classes.dir}"> 
    …… 
    314333        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail> 
    315334        <j2seproject3:force-recompile/> 
    316         <j2seproject3:javac excludes="" includes="${javac.includes}"/> 
     335        <j2seproject3:javac excludes="" includes="${javac.includes}" sourcepath="${src.dir}"/> 
    317336    </target> 
    318337    <target name="-post-compile-single"> 
    …… 
    397416        </j2seproject1:java> 
    398417    </target> 
    399     <target depends="init,compile" name="run-single"> 
     418    <target name="-do-not-recompile"> 
     419        <property name="javac.includes.binary" value=""/> 
     420    </target> 
     421    <target depends="init,-do-not-recompile,compile-single" name="run-single"> 
    400422        <fail unless="run.class">Must select one file in the IDE or set run.class</fail> 
    401423        <j2seproject1:java classname="${run.class}"/> 
    …… 
    425447        <j2seproject3:debug classname="${debug.class}"/> 
    426448    </target> 
    427     <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/> 
     449    <target depends="init,-do-not-recompile,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/> 
    428450    <target depends="init" name="-pre-debug-fix"> 
    429451        <fail unless="fix.includes">Must set fix.includes</fail> 
    …… 
    441463    <target depends="init" name="-javadoc-build"> 
    442464        <mkdir dir="${dist.javadoc.dir}"/> 
    443         <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" destdir="${dist.javadoc.dir}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}"> 
     465        <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="${javadoc.encoding.used}" destdir="${dist.javadoc.dir}" docencoding="${javadoc.encoding.used}" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}"> 
    444466            <classpath> 
    445467                <path path="${javac.classpath}"/> 
    446468            </classpath> 
    447             <packageset dir="${src.dir}" excludes="${excludes}" includes="${includes}"/> 
    448469            <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}"> 
    449470                <filename name="**/*.java"/> 
    …… 
    467488        <!-- You can override this target in the ../build.xml file. --> 
    468489    </target> 
    469     <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test" if="have.tests" name="-do-compile-test"> 
     490    <target if="do.depend.true" name="-compile-test-depend"> 
    470491        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/> 
     492    </target> 
     493    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test"> 
    471494        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/> 
    472495        <copy todir="${build.test.classes.dir}"> 
    …… 
    486509        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail> 
    487510        <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/> 
    488         <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" srcdir="${test.src.dir}"/> 
     511        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/> 
    489512        <copy todir="${build.test.classes.dir}"> 
    490513            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> 
    …… 
    505528    </target> 
    506529    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run"> 
    507         <j2seproject3:junit/> 
     530        <j2seproject3:junit testincludes="**/*Test.java"/> 
    508531    </target> 
    509532    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run"> 
    …… 
    523546        <fail if="tests.failed">Some tests failed; see details above.</fail> 
    524547    </target> 
    525     <target depends="init,compile-test,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/> 
     548    <target depends="init,-do-not-recompile,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/> 
    526549    <!-- 
    527550                ======================= 
    …… 
    531554    <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test"> 
    532555        <fail unless="test.class">Must select one file in the IDE or set test.class</fail> 
    533         <j2seproject3:debug classname="junit.textui.TestRunner" classpath="${debug.test.classpath}"> 
     556        <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/> 
     557        <delete file="${test.report.file}"/> 
     558        <mkdir dir="${build.test.results.dir}"/> 
     559        <j2seproject3:debug classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}"> 
    534560            <customize> 
    535561                <syspropertyset> 
    …… 
    537563                    <mapper from="test-sys-prop.*" to="*" type="glob"/> 
    538564                </syspropertyset> 
    539                 <arg line="${test.class}"/> 
     565                <arg value="${test.class}"/> 
     566                <arg value="showoutput=true"/> 
     567                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/> 
     568                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/> 
    540569            </customize> 
    541570        </j2seproject3:debug> 
    …… 
    544573        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/> 
    545574    </target> 
    546     <target depends="init,compile-test,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/> 
     575    <target depends="init,-do-not-recompile,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/> 
    547576    <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test"> 
    548577        <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/> 

  • XmlRpcMcuClient/nbproject/genfiles.properties

    r12 r25  
    11build.xml.data.CRC32=3b995926 
    22build.xml.script.CRC32=6a1ad870 
    3 build.xml.stylesheet.CRC32=a12b3d02 
     3build.xml.stylesheet.CRC32=be360661 
    44# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. 
    55# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. 
    66nbproject/build-impl.xml.data.CRC32=3b995926 
    7 nbproject/build-impl.xml.script.CRC32=de1785e0 
    8 nbproject/build-impl.xml.stylesheet.CRC32=a6c60f5c 
     7nbproject/build-impl.xml.script.CRC32=860df6ff 
     8nbproject/build-impl.xml.stylesheet.CRC32=eb00e44a 

  • XmlRpcMcuClient/src/org/murillo/mcu/XmlRpcMcuClient.java

    r15 r25  
    3232public class XmlRpcMcuClient {     
    3333     
    34     public static Integer PCMU = 0; 
    35     public static Integer PCMA = 8; 
    36     public static Integer GSM  = 3; 
    37      
    38     public static Integer H261         = 31; 
    39     public static Integer H263_1996    = 34; 
    40     public static Integer H263_1998    = 103; 
    41     public static Integer MPEG4        = 104; 
    42      
    43     public static Integer QCIF = 0; 
    44     public static Integer CIF  = 1; 
    45      
    46     public static Integer MOSAIC1x1 = 0; 
    47     public static Integer MOSAIC2x2 = 1; 
    48     public static Integer MOSAIC3x3 = 2; 
     34    public static final Integer PCMU = 0; 
     35    public static final Integer PCMA = 8; 
     36    public static final Integer GSM  = 3; 
     37     
     38    public static final Integer H261         = 31; 
     39    public static final Integer H263_1996    = 34; 
     40    public static final Integer H263_1998    = 103; 
     41    public static final Integer MPEG4        = 104; 
     42     
     43    public static final Integer QCIF = 0; 
     44    public static final Integer CIF  = 1; 
     45     
     46    public static final Integer MOSAIC1x1 = 0; 
     47    public static final Integer MOSAIC2x2 = 1; 
     48    public static final Integer MOSAIC3x3 = 2; 
    4949     
    5050    private XmlRpcClient client; 
Copyright 2006 - Sergio García Murillo
Powered by Trac - Edgewall Software