Changeset 6157
- Timestamp:
- 05/07/11 14:24:19 (13 years ago)
- Location:
- branches/OKBJavaConnector
- Files:
-
- 5 added
- 9 edited
-
AdministrationService/nbproject/build-impl.xml (modified) (17 diffs)
-
AdministrationService/nbproject/genfiles.properties (modified) (1 diff)
-
AdministrationService/nbproject/project.properties (modified) (2 diffs)
-
AdministrationService/src/administrationservice/Main.java (modified) (1 diff)
-
AdministrationService/src/com/heuristiclab/okb (added)
-
AdministrationService/src/com/heuristiclab/okb/service (added)
-
AdministrationService/src/com/heuristiclab/okb/service/administration (added)
-
AdministrationService/src/com/heuristiclab/okb/service/administration/AdministrationServiceUtil.java (added)
-
AdministrationService/src/com/heuristiclab/okb/service/administration/Platform.java (added)
-
AuthenticationService/nbproject/build-impl.xml (modified) (17 diffs)
-
AuthenticationService/nbproject/genfiles.properties (modified) (1 diff)
-
QueryService/nbproject/build-impl.xml (modified) (17 diffs)
-
QueryService/nbproject/genfiles.properties (modified) (1 diff)
-
QueryService/src/queryservice/Main.java (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/OKBJavaConnector/AdministrationService/nbproject/build-impl.xml
r6062 r6157 57 57 <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init"> 58 58 <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> 60 67 <condition property="main.class.available"> 61 68 <and> … … 72 79 </and> 73 80 </condition> 81 <condition property="do.archive"> 82 <not> 83 <istrue value="${jar.archive.disabled}"/> 84 </not> 85 </condition> 74 86 <condition property="do.mkdist"> 75 87 <and> 88 <isset property="do.archive"/> 76 89 <isset property="libs.CopyLibs.classpath"/> 77 90 <not> … … 86 99 </and> 87 100 </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>99 101 <condition property="do.archive+manifest.available"> 100 102 <and> … … 103 105 </and> 104 106 </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> 105 119 <condition property="do.archive+manifest.available+main.class"> 106 120 <and> … … 109 123 </and> 110 124 </condition> 111 <condition property=" do.archive+manifest.available+main.class+mkdist.available">112 < and>113 <istrue value="${manifest.available +main.class+mkdist.available}"/>114 <is true 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 <is true 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> 122 136 </condition> 123 137 <condition property="have.tests"> … … 175 189 <length length="0" string="${endorsed.classpath}" when="greater"/> 176 190 </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}"/> 178 200 <property name="jar.index" value="false"/> 201 <property name="jar.index.metainf" value="${jar.index}"/> 179 202 <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/> 180 203 </target> … … 304 327 <files includesfile="${javac.includesfile.binary}"/> 305 328 </delete> 306 <delete file="${javac.includesfile.binary}"/> 329 <delete> 330 <fileset file="${javac.includesfile.binary}"/> 331 </delete> 307 332 </sequential> 308 333 </macrodef> … … 314 339 <attribute default="**" name="testincludes"/> 315 340 <sequential> 316 <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${build.dir}"> 341 <property name="junit.forkmode" value="perTest"/> 342 <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}"> 317 343 <batchtest todir="${build.test.results.dir}"> 318 344 <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> … … 330 356 <formatter type="xml"/> 331 357 <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> 358 <jvmarg value="-ea"/> 332 359 <jvmarg line="${run.jvmargs}"/> 333 360 </junit> 334 361 </sequential> 335 362 </macrodef> 363 </target> 364 <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check" name="profile-init"/> 365 <target name="-profile-pre-init"> 366 <!-- Empty placeholder for easier customization. --> 367 <!-- You can override this target in the ../build.xml file. --> 368 </target> 369 <target name="-profile-post-init"> 370 <!-- Empty placeholder for easier customization. --> 371 <!-- You can override this target in the ../build.xml file. --> 372 </target> 373 <target name="-profile-init-macrodef-profile"> 374 <macrodef name="resolve"> 375 <attribute name="name"/> 376 <attribute name="value"/> 377 <sequential> 378 <property name="@{name}" value="${env.@{value}}"/> 379 </sequential> 380 </macrodef> 381 <macrodef name="profile"> 382 <attribute default="${main.class}" name="classname"/> 383 <element name="customize" optional="true"/> 384 <sequential> 385 <property environment="env"/> 386 <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/> 387 <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}"> 388 <jvmarg value="${profiler.info.jvmargs.agent}"/> 389 <jvmarg line="${profiler.info.jvmargs}"/> 390 <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/> 391 <arg line="${application.args}"/> 392 <classpath> 393 <path path="${run.classpath}"/> 394 </classpath> 395 <syspropertyset> 396 <propertyref prefix="run-sys-prop."/> 397 <mapper from="run-sys-prop.*" to="*" type="glob"/> 398 </syspropertyset> 399 <customize/> 400 </java> 401 </sequential> 402 </macrodef> 403 </target> 404 <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile" name="-profile-init-check"> 405 <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail> 406 <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail> 336 407 </target> 337 408 <target depends="-init-debug-args" name="-init-macrodef-nbjpda"> … … 429 500 <target name="-init-macrodef-copylibs"> 430 501 <macrodef name="copylibs" uri="http://www.netbeans.org/ns/j2se-project/3"> 502 <attribute default="${manifest.file}" name="manifest"/> 431 503 <element name="customize" optional="true"/> 432 504 <sequential> … … 444 516 </pathconvert> 445 517 <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/> 446 <copylibs compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">518 <copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" runtimeclasspath="${run.classpath.without.build.classes.dir}"> 447 519 <fileset dir="${build.classes.dir}"/> 448 520 <manifest> … … 573 645 <!-- You can override this target in the ../build.xml file. --> 574 646 </target> 575 <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available ">647 <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available-mkdist.available"> 576 648 <j2seproject1:jar/> 577 649 </target> 578 <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class ">650 <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"> 579 651 <j2seproject1:jar manifest="${manifest.file}"/> 580 652 </target> … … 585 657 </j2seproject1:manifest> 586 658 </j2seproject1:jar> 587 <echo >To run this application from the command line without Ant, try:</echo>659 <echo level="info">To run this application from the command line without Ant, try:</echo> 588 660 <property location="${build.classes.dir}" name="build.classes.dir.resolved"/> 589 661 <property location="${dist.jar}" name="dist.jar.resolved"/> … … 592 664 <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/> 593 665 </pathconvert> 594 <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo> 595 </target> 596 <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"> 666 <echo level="info">java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo> 667 </target> 668 <target depends="init" if="do.archive" name="-do-jar-with-libraries-create-manifest" unless="manifest.available"> 669 <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/> 670 <touch file="${tmp.manifest.file}" verbose="false"/> 671 </target> 672 <target depends="init" if="do.archive+manifest.available" name="-do-jar-with-libraries-copy-manifest"> 673 <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/> 674 <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/> 675 </target> 676 <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"> 677 <manifest file="${tmp.manifest.file}" mode="update"> 678 <attribute name="Main-Class" value="${main.class}"/> 679 </manifest> 680 </target> 681 <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"> 597 682 <basename file="${application.splash}" property="splashscreen.basename"/> 598 683 <mkdir dir="${build.classes.dir}/META-INF"/> 599 684 <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/> 600 < j2seproject3:copylibs>601 < customize>602 <attribute name="Main-Class" value="${main.class}"/>603 <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>604 </customize>605 < /j2seproject3:copylibs>606 <echo >To run this application from the command line without Ant, try:</echo>685 <manifest file="${tmp.manifest.file}" mode="update"> 686 <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/> 687 </manifest> 688 </target> 689 <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"> 690 <j2seproject3:copylibs manifest="${tmp.manifest.file}"/> 691 <echo level="info">To run this application from the command line without Ant, try:</echo> 607 692 <property location="${dist.jar}" name="dist.jar.resolved"/> 608 <echo>java -jar "${dist.jar.resolved}"</echo> 609 </target> 610 <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"> 611 <j2seproject3:copylibs> 612 <customize> 613 <attribute name="Main-Class" value="${main.class}"/> 614 </customize> 615 </j2seproject3:copylibs> 616 <echo>To run this application from the command line without Ant, try:</echo> 617 <property location="${dist.jar}" name="dist.jar.resolved"/> 618 <echo>java -jar "${dist.jar.resolved}"</echo> 619 </target> 693 <echo level="info">java -jar "${dist.jar.resolved}"</echo> 694 </target> 695 <target depends="-do-jar-with-libraries-pack" if="do.archive" name="-do-jar-with-libraries-delete-manifest"> 696 <delete> 697 <fileset file="${tmp.manifest.file}"/> 698 </delete> 699 </target> 700 <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"/> 620 701 <target name="-post-jar"> 621 702 <!-- Empty placeholder for easier customization. --> 622 703 <!-- You can override this target in the ../build.xml file. --> 623 704 </target> 624 <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"/>705 <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"/> 625 706 <!-- 626 707 ================= … … 687 768 </target> 688 769 <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/> 770 <!-- 771 ================= 772 PROFILING SECTION 773 ================= 774 --> 775 <target depends="profile-init,compile" description="Profile a project in the IDE." if="netbeans.home" name="profile"> 776 <nbprofiledirect> 777 <classpath> 778 <path path="${run.classpath}"/> 779 </classpath> 780 </nbprofiledirect> 781 <profile/> 782 </target> 783 <target depends="profile-init,compile-single" description="Profile a selected class in the IDE." if="netbeans.home" name="profile-single"> 784 <fail unless="profile.class">Must select one file in the IDE or set profile.class</fail> 785 <nbprofiledirect> 786 <classpath> 787 <path path="${run.classpath}"/> 788 </classpath> 789 </nbprofiledirect> 790 <profile classname="${profile.class}"/> 791 </target> 792 <!-- 793 ========================= 794 APPLET PROFILING SECTION 795 ========================= 796 --> 797 <target depends="profile-init,compile-single" if="netbeans.home" name="profile-applet"> 798 <nbprofiledirect> 799 <classpath> 800 <path path="${run.classpath}"/> 801 </classpath> 802 </nbprofiledirect> 803 <profile classname="sun.applet.AppletViewer"> 804 <customize> 805 <arg value="${applet.url}"/> 806 </customize> 807 </profile> 808 </target> 809 <!-- 810 ========================= 811 TESTS PROFILING SECTION 812 ========================= 813 --> 814 <target depends="profile-init,compile-test-single" if="netbeans.home" name="profile-test-single"> 815 <nbprofiledirect> 816 <classpath> 817 <path path="${run.test.classpath}"/> 818 </classpath> 819 </nbprofiledirect> 820 <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true"> 821 <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/> 822 <jvmarg value="${profiler.info.jvmargs.agent}"/> 823 <jvmarg line="${profiler.info.jvmargs}"/> 824 <test name="${profile.class}"/> 825 <classpath> 826 <path path="${run.test.classpath}"/> 827 </classpath> 828 <syspropertyset> 829 <propertyref prefix="test-sys-prop."/> 830 <mapper from="test-sys-prop.*" to="*" type="glob"/> 831 </syspropertyset> 832 <formatter type="brief" usefile="false"/> 833 <formatter type="xml"/> 834 </junit> 835 </target> 689 836 <!-- 690 837 =============== … … 733 880 <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/> 734 881 </target> 735 <target depends="init, compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">882 <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test"> 736 883 <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}"/> 737 884 <copy todir="${build.test.classes.dir}"> … … 748 895 <!-- You can override this target in the ../build.xml file. --> 749 896 </target> 750 <target depends="init, compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">897 <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single"> 751 898 <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail> 752 899 <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/> -
branches/OKBJavaConnector/AdministrationService/nbproject/genfiles.properties
r6062 r6157 5 5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. 6 6 nbproject/build-impl.xml.data.CRC32=1f292cb8 7 nbproject/build-impl.xml.script.CRC32= ec7443378 nbproject/build-impl.xml.stylesheet.CRC32= 229523de@1.38.3.457 nbproject/build-impl.xml.script.CRC32=6b11bff5 8 nbproject/build-impl.xml.stylesheet.CRC32=0c01fd8e@1.43.1.45 -
branches/OKBJavaConnector/AdministrationService/nbproject/project.properties
r6062 r6157 26 26 dist.javadoc.dir=${dist.dir}/javadoc 27 27 endorsed.classpath=\ 28 ${libs.JAX-WS-ENDORSED.classpath}:\ 28 29 ${libs.JAX-WS-ENDORSED.classpath}:\ 29 30 ${libs.JAX-WS-ENDORSED.classpath} … … 65 66 jnlp.offline-allowed=false 66 67 jnlp.signed=false 68 main.class=administrationservice.Main 67 69 manifest.file=manifest.mf 68 70 meta.inf.dir=${src.dir}/META-INF -
branches/OKBJavaConnector/AdministrationService/src/administrationservice/Main.java
r6085 r6157 83 83 ArrayOfPlatform algos = port.getPlatforms(); 84 84 85 86 85 for (Platform platform : algos.getPlatform()) { 87 86 System.out.println("platform Id:=" + platform.getId()); -
branches/OKBJavaConnector/AuthenticationService/nbproject/build-impl.xml
r6147 r6157 57 57 <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init"> 58 58 <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> 60 67 <condition property="main.class.available"> 61 68 <and> … … 72 79 </and> 73 80 </condition> 81 <condition property="do.archive"> 82 <not> 83 <istrue value="${jar.archive.disabled}"/> 84 </not> 85 </condition> 74 86 <condition property="do.mkdist"> 75 87 <and> 88 <isset property="do.archive"/> 76 89 <isset property="libs.CopyLibs.classpath"/> 77 90 <not> … … 86 99 </and> 87 100 </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>99 101 <condition property="do.archive+manifest.available"> 100 102 <and> … … 103 105 </and> 104 106 </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> 105 119 <condition property="do.archive+manifest.available+main.class"> 106 120 <and> … … 109 123 </and> 110 124 </condition> 111 <condition property=" do.archive+manifest.available+main.class+mkdist.available">112 < and>113 <istrue value="${manifest.available +main.class+mkdist.available}"/>114 <is true 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 <is true 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> 122 136 </condition> 123 137 <condition property="have.tests"> … … 175 189 <length length="0" string="${endorsed.classpath}" when="greater"/> 176 190 </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}"/> 178 200 <property name="jar.index" value="false"/> 201 <property name="jar.index.metainf" value="${jar.index}"/> 179 202 <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/> 180 203 </target> … … 302 325 <files includes="${javac.includes.binary}"/> 303 326 </delete> 327 <<<<<<< .mine 328 <delete> 329 <fileset file="${javac.includesfile.binary}"/> 330 </delete> 331 ======= 332 >>>>>>> .r6152 304 333 </sequential> 305 334 </macrodef> … … 311 340 <attribute default="**" name="testincludes"/> 312 341 <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}"> 314 344 <batchtest todir="${build.test.results.dir}"> 315 345 <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> … … 327 357 <formatter type="xml"/> 328 358 <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> 359 <jvmarg value="-ea"/> 329 360 <jvmarg line="${run.jvmargs}"/> 330 361 </junit> 331 362 </sequential> 332 363 </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> 333 408 </target> 334 409 <target depends="-init-debug-args" name="-init-macrodef-nbjpda"> … … 426 501 <target name="-init-macrodef-copylibs"> 427 502 <macrodef name="copylibs" uri="http://www.netbeans.org/ns/j2se-project/3"> 503 <attribute default="${manifest.file}" name="manifest"/> 428 504 <element name="customize" optional="true"/> 429 505 <sequential> … … 441 517 </pathconvert> 442 518 <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}"> 444 520 <fileset dir="${build.classes.dir}"/> 445 521 <manifest> … … 570 646 <!-- You can override this target in the ../build.xml file. --> 571 647 </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"> 573 649 <j2seproject1:jar/> 574 650 </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"> 576 652 <j2seproject1:jar manifest="${manifest.file}"/> 577 653 </target> … … 582 658 </j2seproject1:manifest> 583 659 </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> 585 661 <property location="${build.classes.dir}" name="build.classes.dir.resolved"/> 586 662 <property location="${dist.jar}" name="dist.jar.resolved"/> … … 589 665 <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/> 590 666 </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"> 594 683 <basename file="${application.splash}" property="splashscreen.basename"/> 595 684 <mkdir dir="${build.classes.dir}/META-INF"/> 596 685 <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> 604 693 <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"/> 617 702 <target name="-post-jar"> 618 703 <!-- Empty placeholder for easier customization. --> 619 704 <!-- You can override this target in the ../build.xml file. --> 620 705 </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"/> 622 707 <!-- 623 708 ================= … … 684 769 </target> 685 770 <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> 686 837 <!-- 687 838 =============== … … 730 881 <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/> 731 882 </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"> 733 884 <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}"/> 734 885 <copy todir="${build.test.classes.dir}"> … … 745 896 <!-- You can override this target in the ../build.xml file. --> 746 897 </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"> 748 899 <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail> 749 900 <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/> -
branches/OKBJavaConnector/AuthenticationService/nbproject/genfiles.properties
r6147 r6157 5 5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. 6 6 nbproject/build-impl.xml.data.CRC32=91684422 7 <<<<<<< .mine 8 nbproject/build-impl.xml.script.CRC32=6a8308f2 9 nbproject/build-impl.xml.stylesheet.CRC32=0c01fd8e@1.43.1.45 10 ======= 7 11 nbproject/build-impl.xml.script.CRC32=71faff76 8 12 nbproject/build-impl.xml.stylesheet.CRC32=f33e10ff@1.38.2.45 13 >>>>>>> .r6152 -
branches/OKBJavaConnector/QueryService/nbproject/build-impl.xml
r6066 r6157 57 57 <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init"> 58 58 <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> 60 67 <condition property="main.class.available"> 61 68 <and> … … 72 79 </and> 73 80 </condition> 81 <condition property="do.archive"> 82 <not> 83 <istrue value="${jar.archive.disabled}"/> 84 </not> 85 </condition> 74 86 <condition property="do.mkdist"> 75 87 <and> 88 <isset property="do.archive"/> 76 89 <isset property="libs.CopyLibs.classpath"/> 77 90 <not> … … 86 99 </and> 87 100 </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>99 101 <condition property="do.archive+manifest.available"> 100 102 <and> … … 103 105 </and> 104 106 </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> 105 119 <condition property="do.archive+manifest.available+main.class"> 106 120 <and> … … 109 123 </and> 110 124 </condition> 111 <condition property=" do.archive+manifest.available+main.class+mkdist.available">112 < and>113 <istrue value="${manifest.available +main.class+mkdist.available}"/>114 <is true 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 <is true 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> 122 136 </condition> 123 137 <condition property="have.tests"> … … 175 189 <length length="0" string="${endorsed.classpath}" when="greater"/> 176 190 </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}"/> 178 200 <property name="jar.index" value="false"/> 201 <property name="jar.index.metainf" value="${jar.index}"/> 179 202 <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/> 180 203 </target> … … 304 327 <files includesfile="${javac.includesfile.binary}"/> 305 328 </delete> 306 <delete file="${javac.includesfile.binary}"/> 329 <delete> 330 <fileset file="${javac.includesfile.binary}"/> 331 </delete> 307 332 </sequential> 308 333 </macrodef> … … 314 339 <attribute default="**" name="testincludes"/> 315 340 <sequential> 316 <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${build.dir}"> 341 <property name="junit.forkmode" value="perTest"/> 342 <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}"> 317 343 <batchtest todir="${build.test.results.dir}"> 318 344 <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> … … 330 356 <formatter type="xml"/> 331 357 <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> 358 <jvmarg value="-ea"/> 332 359 <jvmarg line="${run.jvmargs}"/> 333 360 </junit> 334 361 </sequential> 335 362 </macrodef> 363 </target> 364 <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check" name="profile-init"/> 365 <target name="-profile-pre-init"> 366 <!-- Empty placeholder for easier customization. --> 367 <!-- You can override this target in the ../build.xml file. --> 368 </target> 369 <target name="-profile-post-init"> 370 <!-- Empty placeholder for easier customization. --> 371 <!-- You can override this target in the ../build.xml file. --> 372 </target> 373 <target name="-profile-init-macrodef-profile"> 374 <macrodef name="resolve"> 375 <attribute name="name"/> 376 <attribute name="value"/> 377 <sequential> 378 <property name="@{name}" value="${env.@{value}}"/> 379 </sequential> 380 </macrodef> 381 <macrodef name="profile"> 382 <attribute default="${main.class}" name="classname"/> 383 <element name="customize" optional="true"/> 384 <sequential> 385 <property environment="env"/> 386 <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/> 387 <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}"> 388 <jvmarg value="${profiler.info.jvmargs.agent}"/> 389 <jvmarg line="${profiler.info.jvmargs}"/> 390 <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/> 391 <arg line="${application.args}"/> 392 <classpath> 393 <path path="${run.classpath}"/> 394 </classpath> 395 <syspropertyset> 396 <propertyref prefix="run-sys-prop."/> 397 <mapper from="run-sys-prop.*" to="*" type="glob"/> 398 </syspropertyset> 399 <customize/> 400 </java> 401 </sequential> 402 </macrodef> 403 </target> 404 <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile" name="-profile-init-check"> 405 <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail> 406 <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail> 336 407 </target> 337 408 <target depends="-init-debug-args" name="-init-macrodef-nbjpda"> … … 429 500 <target name="-init-macrodef-copylibs"> 430 501 <macrodef name="copylibs" uri="http://www.netbeans.org/ns/j2se-project/3"> 502 <attribute default="${manifest.file}" name="manifest"/> 431 503 <element name="customize" optional="true"/> 432 504 <sequential> … … 444 516 </pathconvert> 445 517 <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/> 446 <copylibs compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">518 <copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" runtimeclasspath="${run.classpath.without.build.classes.dir}"> 447 519 <fileset dir="${build.classes.dir}"/> 448 520 <manifest> … … 573 645 <!-- You can override this target in the ../build.xml file. --> 574 646 </target> 575 <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available ">647 <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available-mkdist.available"> 576 648 <j2seproject1:jar/> 577 649 </target> 578 <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class ">650 <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"> 579 651 <j2seproject1:jar manifest="${manifest.file}"/> 580 652 </target> … … 585 657 </j2seproject1:manifest> 586 658 </j2seproject1:jar> 587 <echo >To run this application from the command line without Ant, try:</echo>659 <echo level="info">To run this application from the command line without Ant, try:</echo> 588 660 <property location="${build.classes.dir}" name="build.classes.dir.resolved"/> 589 661 <property location="${dist.jar}" name="dist.jar.resolved"/> … … 592 664 <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/> 593 665 </pathconvert> 594 <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo> 595 </target> 596 <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"> 666 <echo level="info">java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo> 667 </target> 668 <target depends="init" if="do.archive" name="-do-jar-with-libraries-create-manifest" unless="manifest.available"> 669 <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/> 670 <touch file="${tmp.manifest.file}" verbose="false"/> 671 </target> 672 <target depends="init" if="do.archive+manifest.available" name="-do-jar-with-libraries-copy-manifest"> 673 <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/> 674 <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/> 675 </target> 676 <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"> 677 <manifest file="${tmp.manifest.file}" mode="update"> 678 <attribute name="Main-Class" value="${main.class}"/> 679 </manifest> 680 </target> 681 <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"> 597 682 <basename file="${application.splash}" property="splashscreen.basename"/> 598 683 <mkdir dir="${build.classes.dir}/META-INF"/> 599 684 <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/> 600 < j2seproject3:copylibs>601 < customize>602 <attribute name="Main-Class" value="${main.class}"/>603 <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>604 </customize>605 < /j2seproject3:copylibs>606 <echo >To run this application from the command line without Ant, try:</echo>685 <manifest file="${tmp.manifest.file}" mode="update"> 686 <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/> 687 </manifest> 688 </target> 689 <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"> 690 <j2seproject3:copylibs manifest="${tmp.manifest.file}"/> 691 <echo level="info">To run this application from the command line without Ant, try:</echo> 607 692 <property location="${dist.jar}" name="dist.jar.resolved"/> 608 <echo>java -jar "${dist.jar.resolved}"</echo> 609 </target> 610 <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"> 611 <j2seproject3:copylibs> 612 <customize> 613 <attribute name="Main-Class" value="${main.class}"/> 614 </customize> 615 </j2seproject3:copylibs> 616 <echo>To run this application from the command line without Ant, try:</echo> 617 <property location="${dist.jar}" name="dist.jar.resolved"/> 618 <echo>java -jar "${dist.jar.resolved}"</echo> 619 </target> 693 <echo level="info">java -jar "${dist.jar.resolved}"</echo> 694 </target> 695 <target depends="-do-jar-with-libraries-pack" if="do.archive" name="-do-jar-with-libraries-delete-manifest"> 696 <delete> 697 <fileset file="${tmp.manifest.file}"/> 698 </delete> 699 </target> 700 <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"/> 620 701 <target name="-post-jar"> 621 702 <!-- Empty placeholder for easier customization. --> 622 703 <!-- You can override this target in the ../build.xml file. --> 623 704 </target> 624 <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"/>705 <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"/> 625 706 <!-- 626 707 ================= … … 687 768 </target> 688 769 <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/> 770 <!-- 771 ================= 772 PROFILING SECTION 773 ================= 774 --> 775 <target depends="profile-init,compile" description="Profile a project in the IDE." if="netbeans.home" name="profile"> 776 <nbprofiledirect> 777 <classpath> 778 <path path="${run.classpath}"/> 779 </classpath> 780 </nbprofiledirect> 781 <profile/> 782 </target> 783 <target depends="profile-init,compile-single" description="Profile a selected class in the IDE." if="netbeans.home" name="profile-single"> 784 <fail unless="profile.class">Must select one file in the IDE or set profile.class</fail> 785 <nbprofiledirect> 786 <classpath> 787 <path path="${run.classpath}"/> 788 </classpath> 789 </nbprofiledirect> 790 <profile classname="${profile.class}"/> 791 </target> 792 <!-- 793 ========================= 794 APPLET PROFILING SECTION 795 ========================= 796 --> 797 <target depends="profile-init,compile-single" if="netbeans.home" name="profile-applet"> 798 <nbprofiledirect> 799 <classpath> 800 <path path="${run.classpath}"/> 801 </classpath> 802 </nbprofiledirect> 803 <profile classname="sun.applet.AppletViewer"> 804 <customize> 805 <arg value="${applet.url}"/> 806 </customize> 807 </profile> 808 </target> 809 <!-- 810 ========================= 811 TESTS PROFILING SECTION 812 ========================= 813 --> 814 <target depends="profile-init,compile-test-single" if="netbeans.home" name="profile-test-single"> 815 <nbprofiledirect> 816 <classpath> 817 <path path="${run.test.classpath}"/> 818 </classpath> 819 </nbprofiledirect> 820 <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true"> 821 <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/> 822 <jvmarg value="${profiler.info.jvmargs.agent}"/> 823 <jvmarg line="${profiler.info.jvmargs}"/> 824 <test name="${profile.class}"/> 825 <classpath> 826 <path path="${run.test.classpath}"/> 827 </classpath> 828 <syspropertyset> 829 <propertyref prefix="test-sys-prop."/> 830 <mapper from="test-sys-prop.*" to="*" type="glob"/> 831 </syspropertyset> 832 <formatter type="brief" usefile="false"/> 833 <formatter type="xml"/> 834 </junit> 835 </target> 689 836 <!-- 690 837 =============== … … 733 880 <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/> 734 881 </target> 735 <target depends="init, compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">882 <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test"> 736 883 <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}"/> 737 884 <copy todir="${build.test.classes.dir}"> … … 748 895 <!-- You can override this target in the ../build.xml file. --> 749 896 </target> 750 <target depends="init, compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">897 <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single"> 751 898 <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail> 752 899 <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/> -
branches/OKBJavaConnector/QueryService/nbproject/genfiles.properties
r6066 r6157 5 5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. 6 6 nbproject/build-impl.xml.data.CRC32=8ecda4f7 7 nbproject/build-impl.xml.script.CRC32= f8db9ea28 nbproject/build-impl.xml.stylesheet.CRC32= 229523de@1.38.3.457 nbproject/build-impl.xml.script.CRC32=0117fb8d 8 nbproject/build-impl.xml.stylesheet.CRC32=0c01fd8e@1.43.1.45 -
branches/OKBJavaConnector/QueryService/src/queryservice/Main.java
r6072 r6157 5 5 package queryservice; 6 6 7 import com.heuristiclab.services.query.QueryService;8 import com.heuristiclab.services.query.ArrayOfFilter;9 import com.heuristiclab.services.query.Filter;10 import com.heuristiclab.services.query.IQueryService;11 7 import java.net.MalformedURLException; 12 8 import java.net.URL; … … 56 52 } 57 53 58 public void GetFiltersTest() {59 try {60 QueryService srv = new QueryService(new URL("https://services.heuristiclab.com/OKB.SPR.Java-3.3/QueryService.svc?wsdl"));61 IQueryService port = srv.getQueryService();62 63 ArrayOfFilter filters = port.getFilters();64 for (Filter filter : filters.getFilter()) {65 System.out.println("filter TypeName:=" + filter.getFilterTypeName().getValue());66 System.out.println("filter Label:=" + filter.getLabel().getValue());67 System.out.println("filter Class:=" + filter.getClass().getName());68 }69 //assertTrue("No Filters found!", filters.getFilter().size() > 0);70 //assertTrue("No Filters found!", filters.getFilter().size() > 0);71 } catch (MalformedURLException ex) {72 Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);73 }74 }54 // public void GetFiltersTest() { 55 // try { 56 // QueryService srv = new QueryService(new URL("https://services.heuristiclab.com/OKB.SPR.Java-3.3/QueryService.svc?wsdl")); 57 // IQueryService port = srv.getQueryService(); 58 // 59 // ArrayOfFilter filters = port.getFilters(); 60 // for (Filter filter : filters.getFilter()) { 61 // System.out.println("filter TypeName:=" + filter.getFilterTypeName().getValue()); 62 // System.out.println("filter Label:=" + filter.getLabel().getValue()); 63 // System.out.println("filter Class:=" + filter.getClass().getName()); 64 // } 65 // //assertTrue("No Filters found!", filters.getFilter().size() > 0); 66 // //assertTrue("No Filters found!", filters.getFilter().size() > 0); 67 // } catch (MalformedURLException ex) { 68 // Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex); 69 // } 70 // } 75 71 76 72 /** … … 79 75 public static void main(String[] args) { 80 76 Main test = new Main(); 81 test.GetFiltersTest();77 // test.GetFiltersTest(); 82 78 } 83 79 }
Note: See TracChangeset
for help on using the changeset viewer.
