Free cookie consent management tool by TermsFeed Policy Generator

Changeset 6152


Ignore:
Timestamp:
05/07/11 14:12:43 (12 years ago)
Author:
bfarka
Message:

added ecj and custom statistics to communicate with the okb services #1441

Location:
branches/OKBJavaConnector/ECJClient
Files:
688 added
3 edited

Legend:

Unmodified
Added
Removed
  • branches/OKBJavaConnector/ECJClient/nbproject/build-impl.xml

    r6080 r6152  
    5656    <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
    5757        <available file="${manifest.file}" property="manifest.available"/>
    58         <available file="${application.splash}" property="splashscreen.available"/>
     58        <condition property="splashscreen.available">
     59            <and>
     60                <not>
     61                    <equals arg1="${application.splash}" arg2="" trim="true"/>
     62                </not>
     63                <available file="${application.splash}"/>
     64            </and>
     65        </condition>
    5966        <condition property="main.class.available">
    6067            <and>
     
    7178            </and>
    7279        </condition>
     80        <condition property="do.archive">
     81            <not>
     82                <istrue value="${jar.archive.disabled}"/>
     83            </not>
     84        </condition>
    7385        <condition property="do.mkdist">
    7486            <and>
     87                <isset property="do.archive"/>
    7588                <isset property="libs.CopyLibs.classpath"/>
    7689                <not>
     
    8598            </and>
    8699        </condition>
    87         <condition property="manifest.available+main.class+mkdist.available+splashscreen.available">
    88             <and>
    89                 <istrue value="${manifest.available+main.class+mkdist.available}"/>
    90                 <istrue value="${splashscreen.available}"/>
    91             </and>
    92         </condition>
    93         <condition property="do.archive">
    94             <not>
    95                 <istrue value="${jar.archive.disabled}"/>
    96             </not>
    97         </condition>
    98100        <condition property="do.archive+manifest.available">
    99101            <and>
     
    102104            </and>
    103105        </condition>
     106        <condition property="do.archive+main.class.available">
     107            <and>
     108                <isset property="main.class.available"/>
     109                <istrue value="${do.archive}"/>
     110            </and>
     111        </condition>
     112        <condition property="do.archive+splashscreen.available">
     113            <and>
     114                <isset property="splashscreen.available"/>
     115                <istrue value="${do.archive}"/>
     116            </and>
     117        </condition>
    104118        <condition property="do.archive+manifest.available+main.class">
    105119            <and>
     
    108122            </and>
    109123        </condition>
    110         <condition property="do.archive+manifest.available+main.class+mkdist.available">
    111             <and>
    112                 <istrue value="${manifest.available+main.class+mkdist.available}"/>
    113                 <istrue value="${do.archive}"/>
    114             </and>
    115         </condition>
    116         <condition property="do.archive+manifest.available+main.class+mkdist.available+splashscreen.available">
    117             <and>
    118                 <istrue value="${manifest.available+main.class+mkdist.available+splashscreen.available}"/>
    119                 <istrue value="${do.archive}"/>
    120             </and>
     124        <condition property="manifest.available-mkdist.available">
     125            <or>
     126                <istrue value="${manifest.available}"/>
     127                <isset property="do.mkdist"/>
     128            </or>
     129        </condition>
     130        <condition property="manifest.available+main.class-mkdist.available">
     131            <or>
     132                <istrue value="${manifest.available+main.class}"/>
     133                <isset property="do.mkdist"/>
     134            </or>
    121135        </condition>
    122136        <condition property="have.tests">
     
    174188            <length length="0" string="${endorsed.classpath}" when="greater"/>
    175189        </condition>
    176         <property name="javac.fork" value="false"/>
     190        <condition else="false" property="jdkBug6558476">
     191            <and>
     192                <matches pattern="1\.[56]" string="${java.specification.version}"/>
     193                <not>
     194                    <os family="unix"/>
     195                </not>
     196            </and>
     197        </condition>
     198        <property name="javac.fork" value="${jdkBug6558476}"/>
    177199        <property name="jar.index" value="false"/>
     200        <property name="jar.index.metainf" value="${jar.index}"/>
    178201        <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>
    179202    </target>
     
    303326                    <files includesfile="${javac.includesfile.binary}"/>
    304327                </delete>
    305                 <delete file="${javac.includesfile.binary}"/>
     328                <delete>
     329                    <fileset file="${javac.includesfile.binary}"/>
     330                </delete>
    306331            </sequential>
    307332        </macrodef>
     
    313338            <attribute default="**" name="testincludes"/>
    314339            <sequential>
    315                 <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${build.dir}">
     340                <property name="junit.forkmode" value="perTest"/>
     341                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
    316342                    <batchtest todir="${build.test.results.dir}">
    317343                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
     
    329355                    <formatter type="xml"/>
    330356                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
     357                    <jvmarg value="-ea"/>
    331358                    <jvmarg line="${run.jvmargs}"/>
    332359                </junit>
    333360            </sequential>
    334361        </macrodef>
     362    </target>
     363    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check" name="profile-init"/>
     364    <target name="-profile-pre-init">
     365        <!-- Empty placeholder for easier customization. -->
     366        <!-- You can override this target in the ../build.xml file. -->
     367    </target>
     368    <target name="-profile-post-init">
     369        <!-- Empty placeholder for easier customization. -->
     370        <!-- You can override this target in the ../build.xml file. -->
     371    </target>
     372    <target name="-profile-init-macrodef-profile">
     373        <macrodef name="resolve">
     374            <attribute name="name"/>
     375            <attribute name="value"/>
     376            <sequential>
     377                <property name="@{name}" value="${env.@{value}}"/>
     378            </sequential>
     379        </macrodef>
     380        <macrodef name="profile">
     381            <attribute default="${main.class}" name="classname"/>
     382            <element name="customize" optional="true"/>
     383            <sequential>
     384                <property environment="env"/>
     385                <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
     386                <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">
     387                    <jvmarg value="${profiler.info.jvmargs.agent}"/>
     388                    <jvmarg line="${profiler.info.jvmargs}"/>
     389                    <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
     390                    <arg line="${application.args}"/>
     391                    <classpath>
     392                        <path path="${run.classpath}"/>
     393                    </classpath>
     394                    <syspropertyset>
     395                        <propertyref prefix="run-sys-prop."/>
     396                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
     397                    </syspropertyset>
     398                    <customize/>
     399                </java>
     400            </sequential>
     401        </macrodef>
     402    </target>
     403    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile" name="-profile-init-check">
     404        <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
     405        <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
    335406    </target>
    336407    <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
     
    428499    <target name="-init-macrodef-copylibs">
    429500        <macrodef name="copylibs" uri="http://www.netbeans.org/ns/j2se-project/3">
     501            <attribute default="${manifest.file}" name="manifest"/>
    430502            <element name="customize" optional="true"/>
    431503            <sequential>
     
    443515                </pathconvert>
    444516                <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
    445                 <copylibs compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
     517                <copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
    446518                    <fileset dir="${build.classes.dir}"/>
    447519                    <manifest>
     
    600672        <!-- You can override this target in the ../build.xml file. -->
    601673    </target>
    602     <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available">
     674    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available-mkdist.available">
    603675        <j2seproject1:jar/>
    604676    </target>
    605     <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class">
     677    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class-mkdist.available">
    606678        <j2seproject1:jar manifest="${manifest.file}"/>
    607679    </target>
     
    612684            </j2seproject1:manifest>
    613685        </j2seproject1:jar>
    614         <echo>To run this application from the command line without Ant, try:</echo>
     686        <echo level="info">To run this application from the command line without Ant, try:</echo>
    615687        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
    616688        <property location="${dist.jar}" name="dist.jar.resolved"/>
     
    619691            <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
    620692        </pathconvert>
    621         <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
    622     </target>
    623     <target depends="init,compile,-pre-pre-jar,-pre-jar,-init-macrodef-copylibs" if="do.archive+manifest.available+main.class+mkdist.available+splashscreen.available" name="-do-jar-with-libraries-and-splashscreen">
     693        <echo level="info">java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
     694    </target>
     695    <target depends="init" if="do.archive" name="-do-jar-with-libraries-create-manifest" unless="manifest.available">
     696        <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
     697        <touch file="${tmp.manifest.file}" verbose="false"/>
     698    </target>
     699    <target depends="init" if="do.archive+manifest.available" name="-do-jar-with-libraries-copy-manifest">
     700        <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
     701        <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
     702    </target>
     703    <target depends="init,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest" if="do.archive+main.class.available" name="-do-jar-with-libraries-set-main">
     704        <manifest file="${tmp.manifest.file}" mode="update">
     705            <attribute name="Main-Class" value="${main.class}"/>
     706        </manifest>
     707    </target>
     708    <target depends="init,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-with-libraries-set-splashscreen">
    624709        <basename file="${application.splash}" property="splashscreen.basename"/>
    625710        <mkdir dir="${build.classes.dir}/META-INF"/>
    626711        <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
    627         <j2seproject3:copylibs>
    628             <customize>
    629                 <attribute name="Main-Class" value="${main.class}"/>
    630                 <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
    631             </customize>
    632         </j2seproject3:copylibs>
    633         <echo>To run this application from the command line without Ant, try:</echo>
     712        <manifest file="${tmp.manifest.file}" mode="update">
     713            <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
     714        </manifest>
     715    </target>
     716    <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest,-do-jar-with-libraries-set-main,-do-jar-with-libraries-set-splashscreen" if="do.mkdist" name="-do-jar-with-libraries-pack">
     717        <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
     718        <echo level="info">To run this application from the command line without Ant, try:</echo>
    634719        <property location="${dist.jar}" name="dist.jar.resolved"/>
    635         <echo>java -jar "${dist.jar.resolved}"</echo>
    636     </target>
    637     <target depends="init,compile,-pre-pre-jar,-pre-jar,-init-macrodef-copylibs" if="do.archive+manifest.available+main.class+mkdist.available" name="-do-jar-with-libraries" unless="splashscreen.available">
    638         <j2seproject3:copylibs>
    639             <customize>
    640                 <attribute name="Main-Class" value="${main.class}"/>
    641             </customize>
    642         </j2seproject3:copylibs>
    643         <echo>To run this application from the command line without Ant, try:</echo>
    644         <property location="${dist.jar}" name="dist.jar.resolved"/>
    645         <echo>java -jar "${dist.jar.resolved}"</echo>
    646     </target>
     720        <echo level="info">java -jar "${dist.jar.resolved}"</echo>
     721    </target>
     722    <target depends="-do-jar-with-libraries-pack" if="do.archive" name="-do-jar-with-libraries-delete-manifest">
     723        <delete>
     724            <fileset file="${tmp.manifest.file}"/>
     725        </delete>
     726    </target>
     727    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest,-do-jar-with-libraries-set-main,-do-jar-with-libraries-set-splashscreen,-do-jar-with-libraries-pack,-do-jar-with-libraries-delete-manifest" name="-do-jar-with-libraries"/>
    647728    <target name="-post-jar">
    648729        <!-- Empty placeholder for easier customization. -->
    649730        <!-- You can override this target in the ../build.xml file. -->
    650731    </target>
    651     <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries-and-splashscreen,-do-jar-with-libraries,-post-jar" description="Build JAR." name="jar"/>
     732    <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar" description="Build JAR." name="jar"/>
    652733    <!--
    653734                =================
     
    714795    </target>
    715796    <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
     797    <!--
     798                =================
     799                PROFILING SECTION
     800                =================
     801            -->
     802    <target depends="profile-init,compile" description="Profile a project in the IDE." if="netbeans.home" name="profile">
     803        <nbprofiledirect>
     804            <classpath>
     805                <path path="${run.classpath}"/>
     806            </classpath>
     807        </nbprofiledirect>
     808        <profile/>
     809    </target>
     810    <target depends="profile-init,compile-single" description="Profile a selected class in the IDE." if="netbeans.home" name="profile-single">
     811        <fail unless="profile.class">Must select one file in the IDE or set profile.class</fail>
     812        <nbprofiledirect>
     813            <classpath>
     814                <path path="${run.classpath}"/>
     815            </classpath>
     816        </nbprofiledirect>
     817        <profile classname="${profile.class}"/>
     818    </target>
     819    <!--
     820                =========================
     821                APPLET PROFILING  SECTION
     822                =========================
     823            -->
     824    <target depends="profile-init,compile-single" if="netbeans.home" name="profile-applet">
     825        <nbprofiledirect>
     826            <classpath>
     827                <path path="${run.classpath}"/>
     828            </classpath>
     829        </nbprofiledirect>
     830        <profile classname="sun.applet.AppletViewer">
     831            <customize>
     832                <arg value="${applet.url}"/>
     833            </customize>
     834        </profile>
     835    </target>
     836    <!--
     837                =========================
     838                TESTS PROFILING  SECTION
     839                =========================
     840            -->
     841    <target depends="profile-init,compile-test-single" if="netbeans.home" name="profile-test-single">
     842        <nbprofiledirect>
     843            <classpath>
     844                <path path="${run.test.classpath}"/>
     845            </classpath>
     846        </nbprofiledirect>
     847        <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true">
     848            <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
     849            <jvmarg value="${profiler.info.jvmargs.agent}"/>
     850            <jvmarg line="${profiler.info.jvmargs}"/>
     851            <test name="${profile.class}"/>
     852            <classpath>
     853                <path path="${run.test.classpath}"/>
     854            </classpath>
     855            <syspropertyset>
     856                <propertyref prefix="test-sys-prop."/>
     857                <mapper from="test-sys-prop.*" to="*" type="glob"/>
     858            </syspropertyset>
     859            <formatter type="brief" usefile="false"/>
     860            <formatter type="xml"/>
     861        </junit>
     862    </target>
    716863    <!--
    717864                ===============
     
    760907        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
    761908    </target>
    762     <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
     909    <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
    763910        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir="${test.src.dir}"/>
    764911        <copy todir="${build.test.classes.dir}">
     
    775922        <!-- You can override this target in the ../build.xml file. -->
    776923    </target>
    777     <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
     924    <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
    778925        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
    779926        <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
  • branches/OKBJavaConnector/ECJClient/nbproject/genfiles.properties

    r6080 r6152  
    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=66572d14
    7 nbproject/build-impl.xml.script.CRC32=e6589168
    8 nbproject/build-impl.xml.stylesheet.CRC32=229523de@1.38.3.45
     7nbproject/build-impl.xml.script.CRC32=6072b748
     8nbproject/build-impl.xml.stylesheet.CRC32=0c01fd8e@1.43.1.45
  • branches/OKBJavaConnector/ECJClient/nbproject/project.properties

    r6080 r6152  
    2727endorsed.classpath=
    2828excludes=
     29file.reference.gnujaxp.jar=libs\\gnujaxp.jar
     30file.reference.iText-2.1.5.jar=libs\\iText-2.1.5.jar
     31file.reference.jcommon-1.0.16.jar=libs\\jcommon-1.0.16.jar
     32file.reference.jfreechart-1.0.13-experimental.jar=libs\\jfreechart-1.0.13-experimental.jar
     33file.reference.jfreechart-1.0.13-swt.jar=libs\\jfreechart-1.0.13-swt.jar
     34file.reference.jfreechart-1.0.13.jar=libs\\jfreechart-1.0.13.jar
     35file.reference.junit.jar=libs\\junit.jar
     36file.reference.swtgraphics2d.jar=libs\\swtgraphics2d.jar
    2937includes=**
    3038jar.compress=false
     
    3442    ${reference.QueryService.jar}:\
    3543    ${reference.RunCreationService.jar}:\
    36     ${libs.metro.classpath}
     44    ${libs.metro.classpath}:\
     45    ${file.reference.gnujaxp.jar}:\
     46    ${file.reference.iText-2.1.5.jar}:\
     47    ${file.reference.jcommon-1.0.16.jar}:\
     48    ${file.reference.jfreechart-1.0.13-experimental.jar}:\
     49    ${file.reference.jfreechart-1.0.13-swt.jar}:\
     50    ${file.reference.jfreechart-1.0.13.jar}:\
     51    ${file.reference.junit.jar}:\
     52    ${file.reference.swtgraphics2d.jar}
    3753# Space-separated list of extra javac options
    3854javac.compilerargs=
     
    6076javadoc.version=false
    6177javadoc.windowtitle=
    62 main.class=
     78main.class=ec.display.Console
    6379manifest.file=manifest.mf
    6480meta.inf.dir=${src.dir}/META-INF
Note: See TracChangeset for help on using the changeset viewer.