Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
05/07/11 14:24:19 (14 years ago)
Author:
bfarka
Message:

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

Location:
branches/OKBJavaConnector/AuthenticationService/nbproject
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/OKBJavaConnector/AuthenticationService/nbproject/build-impl.xml

    r6147 r6157  
    5757    <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
    5858        <available file="${manifest.file}" property="manifest.available"/>
    59         <available file="${application.splash}" property="splashscreen.available"/>
     59        <condition property="splashscreen.available">
     60            <and>
     61                <not>
     62                    <equals arg1="${application.splash}" arg2="" trim="true"/>
     63                </not>
     64                <available file="${application.splash}"/>
     65            </and>
     66        </condition>
    6067        <condition property="main.class.available">
    6168            <and>
    … …  
    7279            </and>
    7380        </condition>
     81        <condition property="do.archive">
     82            <not>
     83                <istrue value="${jar.archive.disabled}"/>
     84            </not>
     85        </condition>
    7486        <condition property="do.mkdist">
    7587            <and>
     88                <isset property="do.archive"/>
    7689                <isset property="libs.CopyLibs.classpath"/>
    7790                <not>
    … …  
    8699            </and>
    87100        </condition>
    88         <condition property="manifest.available+main.class+mkdist.available+splashscreen.available">
    89             <and>
    90                 <istrue value="${manifest.available+main.class+mkdist.available}"/>
    91                 <istrue value="${splashscreen.available}"/>
    92             </and>
    93         </condition>
    94         <condition property="do.archive">
    95             <not>
    96                 <istrue value="${jar.archive.disabled}"/>
    97             </not>
    98         </condition>
    99101        <condition property="do.archive+manifest.available">
    100102            <and>
    … …  
    103105            </and>
    104106        </condition>
     107        <condition property="do.archive+main.class.available">
     108            <and>
     109                <isset property="main.class.available"/>
     110                <istrue value="${do.archive}"/>
     111            </and>
     112        </condition>
     113        <condition property="do.archive+splashscreen.available">
     114            <and>
     115                <isset property="splashscreen.available"/>
     116                <istrue value="${do.archive}"/>
     117            </and>
     118        </condition>
    105119        <condition property="do.archive+manifest.available+main.class">
    106120            <and>
    … …  
    109123            </and>
    110124        </condition>
    111         <condition property="do.archive+manifest.available+main.class+mkdist.available">
    112             <and>
    113                 <istrue value="${manifest.available+main.class+mkdist.available}"/>
    114                 <istrue value="${do.archive}"/>
    115             </and>
    116         </condition>
    117         <condition property="do.archive+manifest.available+main.class+mkdist.available+splashscreen.available">
    118             <and>
    119                 <istrue value="${manifest.available+main.class+mkdist.available+splashscreen.available}"/>
    120                 <istrue value="${do.archive}"/>
    121             </and>
     125        <condition property="manifest.available-mkdist.available">
     126            <or>
     127                <istrue value="${manifest.available}"/>
     128                <isset property="do.mkdist"/>
     129            </or>
     130        </condition>
     131        <condition property="manifest.available+main.class-mkdist.available">
     132            <or>
     133                <istrue value="${manifest.available+main.class}"/>
     134                <isset property="do.mkdist"/>
     135            </or>
    122136        </condition>
    123137        <condition property="have.tests">
    … …  
    175189            <length length="0" string="${endorsed.classpath}" when="greater"/>
    176190        </condition>
    177         <property name="javac.fork" value="false"/>
     191        <condition else="false" property="jdkBug6558476">
     192            <and>
     193                <matches pattern="1\.[56]" string="${java.specification.version}"/>
     194                <not>
     195                    <os family="unix"/>
     196                </not>
     197            </and>
     198        </condition>
     199        <property name="javac.fork" value="${jdkBug6558476}"/>
    178200        <property name="jar.index" value="false"/>
     201        <property name="jar.index.metainf" value="${jar.index}"/>
    179202        <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>
    180203    </target>
    … …  
    302325                    <files includes="${javac.includes.binary}"/>
    303326                </delete>
     327<<<<<<< .mine
     328                <delete>
     329                    <fileset file="${javac.includesfile.binary}"/>
     330                </delete>
     331=======
     332>>>>>>> .r6152
    304333            </sequential>
    305334        </macrodef>
    … …  
    311340            <attribute default="**" name="testincludes"/>
    312341            <sequential>
    313                 <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${build.dir}">
     342                <property name="junit.forkmode" value="perTest"/>
     343                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
    314344                    <batchtest todir="${build.test.results.dir}">
    315345                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
    … …  
    327357                    <formatter type="xml"/>
    328358                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
     359                    <jvmarg value="-ea"/>
    329360                    <jvmarg line="${run.jvmargs}"/>
    330361                </junit>
    331362            </sequential>
    332363        </macrodef>
     364    </target>
     365    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check" name="profile-init"/>
     366    <target name="-profile-pre-init">
     367        <!-- Empty placeholder for easier customization. -->
     368        <!-- You can override this target in the ../build.xml file. -->
     369    </target>
     370    <target name="-profile-post-init">
     371        <!-- Empty placeholder for easier customization. -->
     372        <!-- You can override this target in the ../build.xml file. -->
     373    </target>
     374    <target name="-profile-init-macrodef-profile">
     375        <macrodef name="resolve">
     376            <attribute name="name"/>
     377            <attribute name="value"/>
     378            <sequential>
     379                <property name="@{name}" value="${env.@{value}}"/>
     380            </sequential>
     381        </macrodef>
     382        <macrodef name="profile">
     383            <attribute default="${main.class}" name="classname"/>
     384            <element name="customize" optional="true"/>
     385            <sequential>
     386                <property environment="env"/>
     387                <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
     388                <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">
     389                    <jvmarg value="${profiler.info.jvmargs.agent}"/>
     390                    <jvmarg line="${profiler.info.jvmargs}"/>
     391                    <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
     392                    <arg line="${application.args}"/>
     393                    <classpath>
     394                        <path path="${run.classpath}"/>
     395                    </classpath>
     396                    <syspropertyset>
     397                        <propertyref prefix="run-sys-prop."/>
     398                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
     399                    </syspropertyset>
     400                    <customize/>
     401                </java>
     402            </sequential>
     403        </macrodef>
     404    </target>
     405    <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile" name="-profile-init-check">
     406        <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
     407        <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
    333408    </target>
    334409    <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
    … …  
    426501    <target name="-init-macrodef-copylibs">
    427502        <macrodef name="copylibs" uri="http://www.netbeans.org/ns/j2se-project/3">
     503            <attribute default="${manifest.file}" name="manifest"/>
    428504            <element name="customize" optional="true"/>
    429505            <sequential>
    … …  
    441517                </pathconvert>
    442518                <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
    443                 <copylibs compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
     519                <copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
    444520                    <fileset dir="${build.classes.dir}"/>
    445521                    <manifest>
    … …  
    570646        <!-- You can override this target in the ../build.xml file. -->
    571647    </target>
    572     <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available">
     648    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available-mkdist.available">
    573649        <j2seproject1:jar/>
    574650    </target>
    575     <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class">
     651    <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">
    576652        <j2seproject1:jar manifest="${manifest.file}"/>
    577653    </target>
    … …  
    582658            </j2seproject1:manifest>
    583659        </j2seproject1:jar>
    584         <echo>To run this application from the command line without Ant, try:</echo>
     660        <echo level="info">To run this application from the command line without Ant, try:</echo>
    585661        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
    586662        <property location="${dist.jar}" name="dist.jar.resolved"/>
    … …  
    589665            <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
    590666        </pathconvert>
    591         <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
    592     </target>
    593     <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">
     667        <echo level="info">java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
     668    </target>
     669    <target depends="init" if="do.archive" name="-do-jar-with-libraries-create-manifest" unless="manifest.available">
     670        <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
     671        <touch file="${tmp.manifest.file}" verbose="false"/>
     672    </target>
     673    <target depends="init" if="do.archive+manifest.available" name="-do-jar-with-libraries-copy-manifest">
     674        <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
     675        <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
     676    </target>
     677    <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">
     678        <manifest file="${tmp.manifest.file}" mode="update">
     679            <attribute name="Main-Class" value="${main.class}"/>
     680        </manifest>
     681    </target>
     682    <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">
    594683        <basename file="${application.splash}" property="splashscreen.basename"/>
    595684        <mkdir dir="${build.classes.dir}/META-INF"/>
    596685        <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
    597         <j2seproject3:copylibs>
    598             <customize>
    599                 <attribute name="Main-Class" value="${main.class}"/>
    600                 <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
    601             </customize>
    602         </j2seproject3:copylibs>
    603         <echo>To run this application from the command line without Ant, try:</echo>
     686        <manifest file="${tmp.manifest.file}" mode="update">
     687            <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
     688        </manifest>
     689    </target>
     690    <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">
     691        <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
     692        <echo level="info">To run this application from the command line without Ant, try:</echo>
    604693        <property location="${dist.jar}" name="dist.jar.resolved"/>
    605         <echo>java -jar "${dist.jar.resolved}"</echo>
    606     </target>
    607     <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">
    608         <j2seproject3:copylibs>
    609             <customize>
    610                 <attribute name="Main-Class" value="${main.class}"/>
    611             </customize>
    612         </j2seproject3:copylibs>
    613         <echo>To run this application from the command line without Ant, try:</echo>
    614         <property location="${dist.jar}" name="dist.jar.resolved"/>
    615         <echo>java -jar "${dist.jar.resolved}"</echo>
    616     </target>
     694        <echo level="info">java -jar "${dist.jar.resolved}"</echo>
     695    </target>
     696    <target depends="-do-jar-with-libraries-pack" if="do.archive" name="-do-jar-with-libraries-delete-manifest">
     697        <delete>
     698            <fileset file="${tmp.manifest.file}"/>
     699        </delete>
     700    </target>
     701    <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"/>
    617702    <target name="-post-jar">
    618703        <!-- Empty placeholder for easier customization. -->
    619704        <!-- You can override this target in the ../build.xml file. -->
    620705    </target>
    621     <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"/>
     706    <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"/>
    622707    <!--
    623708                =================
    … …  
    684769    </target>
    685770    <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
     771    <!--
     772                =================
     773                PROFILING SECTION
     774                =================
     775            -->
     776    <target depends="profile-init,compile" description="Profile a project in the IDE." if="netbeans.home" name="profile">
     777        <nbprofiledirect>
     778            <classpath>
     779                <path path="${run.classpath}"/>
     780            </classpath>
     781        </nbprofiledirect>
     782        <profile/>
     783    </target>
     784    <target depends="profile-init,compile-single" description="Profile a selected class in the IDE." if="netbeans.home" name="profile-single">
     785        <fail unless="profile.class">Must select one file in the IDE or set profile.class</fail>
     786        <nbprofiledirect>
     787            <classpath>
     788                <path path="${run.classpath}"/>
     789            </classpath>
     790        </nbprofiledirect>
     791        <profile classname="${profile.class}"/>
     792    </target>
     793    <!--
     794                =========================
     795                APPLET PROFILING  SECTION
     796                =========================
     797            -->
     798    <target depends="profile-init,compile-single" if="netbeans.home" name="profile-applet">
     799        <nbprofiledirect>
     800            <classpath>
     801                <path path="${run.classpath}"/>
     802            </classpath>
     803        </nbprofiledirect>
     804        <profile classname="sun.applet.AppletViewer">
     805            <customize>
     806                <arg value="${applet.url}"/>
     807            </customize>
     808        </profile>
     809    </target>
     810    <!--
     811                =========================
     812                TESTS PROFILING  SECTION
     813                =========================
     814            -->
     815    <target depends="profile-init,compile-test-single" if="netbeans.home" name="profile-test-single">
     816        <nbprofiledirect>
     817            <classpath>
     818                <path path="${run.test.classpath}"/>
     819            </classpath>
     820        </nbprofiledirect>
     821        <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true">
     822            <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
     823            <jvmarg value="${profiler.info.jvmargs.agent}"/>
     824            <jvmarg line="${profiler.info.jvmargs}"/>
     825            <test name="${profile.class}"/>
     826            <classpath>
     827                <path path="${run.test.classpath}"/>
     828            </classpath>
     829            <syspropertyset>
     830                <propertyref prefix="test-sys-prop."/>
     831                <mapper from="test-sys-prop.*" to="*" type="glob"/>
     832            </syspropertyset>
     833            <formatter type="brief" usefile="false"/>
     834            <formatter type="xml"/>
     835        </junit>
     836    </target>
    686837    <!--
    687838                ===============
    … …  
    730881        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
    731882    </target>
    732     <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
     883    <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
    733884        <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}"/>
    734885        <copy todir="${build.test.classes.dir}">
    … …  
    745896        <!-- You can override this target in the ../build.xml file. -->
    746897    </target>
    747     <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
     898    <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
    748899        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
    749900        <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>

  • branches/OKBJavaConnector/AuthenticationService/nbproject/genfiles.properties

    r6147 r6157  
    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=91684422
     7<<<<<<< .mine
     8nbproject/build-impl.xml.script.CRC32=6a8308f2
     9nbproject/build-impl.xml.stylesheet.CRC32=0c01fd8e@1.43.1.45
     10=======
    711nbproject/build-impl.xml.script.CRC32=71faff76
    812nbproject/build-impl.xml.stylesheet.CRC32=f33e10ff@1.38.2.45
     13>>>>>>> .r6152
Note: See TracChangeset for help on using the changeset viewer.