Changeset 2075
- Timestamp:
- 08/13/12 14:00:14 (12 years ago)
- Location:
- SRUAggregator/trunk
- Files:
-
- 2 added
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
SRUAggregator/trunk/build/web/index.zul
r2016 r2075 3 3 <window id="mainWindow" contentStyle="background:white;" height="100%" apply="clarind.fcs.Aggregator"> 4 4 <borderlayout sclass="complex-layout" width="1000px"> 5 <!-- Kopf -->5 <!-- Kopf --> 6 6 <north height="100px"> 7 7 8 8 </north> 9 9 10 <!-- Linke Sidebar -->10 <!-- Linke Sidebar --> 11 11 <west width="200px" flex="true" splittable="true" margins="0,5,0,0"> 12 12 13 13 </west> 14 14 15 <!-- Center - Inhalt -->15 <!-- Center - Inhalt --> 16 16 <center autoscroll="true"> 17 17 <panel > … … 19 19 <textbox id="searchString" value="Elefant" /> 20 20 <button id="searchButton" forward ="onExecuteSearch" label="Search" /> 21 22 <separator /> 23 <label>Language:</label> 24 <combobox id="languageSelect" width="150px"> 25 <!--<template name="model"> --> 26 <comboitem label="German" /> 27 <comboitem label="English" /> 28 <comboitem label="Dutch" /> 29 <comboitem label="-More to come-" /> 30 <!-- </template> --> 31 </combobox> 21 32 22 33 <separator /> … … 38 49 </row> 39 50 40 51 <row> 41 52 <checkbox id="ids3" label="Corpus 3" /> 42 53 <checkbox id="ids4" label="Corpus 4" /> 43 54 </row> 44 55 45 56 <row> 46 57 <checkbox id="ids5" label="Corpus 5" /> 47 58 <checkbox id="ids6" label="Corpus 6" /> 48 59 </row> 49 60 50 61 <row> 51 62 <checkbox id="ids7" label="Corpus 7" /> 52 63 <checkbox id="ids8" label="Corpus 8" /> 53 64 </row> 54 65 55 66 <row> 56 67 <checkbox id="ids9" label="Corpus 9" /> 57 68 <checkbox id="ids10" label="Corpus 10" /> … … 79 90 </row> 80 91 81 92 <row> 82 93 <checkbox id="tue3" label="Corpus 3" /> 83 94 <checkbox id="tue4" label="Corpus 4" /> 84 95 </row> 85 96 86 97 <row> 87 98 <checkbox id="tue5" label="Corpus 5" /> 88 99 <checkbox id="tue6" label="Corpus 6" /> 89 100 </row> 90 101 91 102 <row> 92 103 <checkbox id="tue7" label="Corpus 7" /> 93 104 <checkbox id="tue8" label="Corpus 8" /> 94 105 </row> 95 106 96 107 <row> 97 108 <checkbox id="tue9" label="Corpus 9" /> 98 109 <checkbox id="tue10" label="Corpus 10" /> … … 107 118 </center> 108 119 109 <!-- Rechte Sidebar -->120 <!-- Rechte Sidebar --> 110 121 <east width="200px" flex="true" splittable="true" margins="0,5,0,0"> 111 122 112 123 </east> 113 124 114 <!-- Fusszeile -->125 <!-- Fusszeile --> 115 126 <south height="100px"> 116 127 -
SRUAggregator/trunk/nbproject/build-impl.xml
r2016 r2075 12 12 - debugging 13 13 - javadoc 14 - junit compilation15 - junit execution16 - junit debugging14 - test compilation 15 - test execution 16 - test debugging 17 17 - cleanup 18 18 … … 188 188 </condition> 189 189 <property name="javac.fork" value="${jdkBug6558476}"/> 190 <condition property="junit.available"> 191 <or> 192 <available classname="org.junit.Test" classpath="${run.test.classpath}"/> 193 <available classname="junit.framework.Test" classpath="${run.test.classpath}"/> 194 </or> 195 </condition> 196 <condition property="testng.available"> 197 <available classname="org.testng.annotations.Test" classpath="${run.test.classpath}"/> 198 </condition> 199 <condition property="junit+testng.available"> 200 <and> 201 <istrue value="${junit.available}"/> 202 <istrue value="${testng.available}"/> 203 </and> 204 </condition> 205 <condition else="testng" property="testng.mode" value="mixed"> 206 <istrue value="${junit+testng.available}"/> 207 </condition> 208 <condition else="" property="testng.debug.mode" value="-mixed"> 209 <istrue value="${junit+testng.available}"/> 210 </condition> 190 211 </target> 191 212 <target depends="init" name="-init-cos" unless="deploy.on.save"> … … 346 367 </macrodef> 347 368 </target> 348 <target name="-init-macrodef-junit"> 369 <target if="${junit.available}" name="-init-macrodef-junit-init"> 370 <condition else="false" property="nb.junit.batch" value="true"> 371 <and> 372 <istrue value="${junit.available}"/> 373 <not> 374 <isset property="test.method"/> 375 </not> 376 </and> 377 </condition> 378 <condition else="false" property="nb.junit.single" value="true"> 379 <and> 380 <istrue value="${junit.available}"/> 381 <isset property="test.method"/> 382 </and> 383 </condition> 384 </target> 385 <target if="${nb.junit.single}" name="-init-macrodef-junit-single" unless="${nb.junit.batch}"> 349 386 <macrodef name="junit" uri="http://www.netbeans.org/ns/web-project/2"> 350 387 <attribute default="${includes}" name="includes"/> 351 388 <attribute default="${excludes}" name="excludes"/> 352 389 <attribute default="**" name="testincludes"/> 390 <attribute default="" name="testmethods"/> 391 <element name="customize" optional="true"/> 353 392 <sequential> 354 393 <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${java.io.tmpdir}"> 355 <batchtest todir="${build.test.results.dir}"> 356 <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> 357 <filename name="@{testincludes}"/> 358 </fileset> 359 </batchtest> 360 <classpath> 361 <path path="${run.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}"/> 362 </classpath> 394 <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/> 363 395 <syspropertyset> 364 396 <propertyref prefix="test-sys-prop."/> … … 367 399 <formatter type="brief" usefile="false"/> 368 400 <formatter type="xml"/> 369 <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>370 401 <jvmarg value="-ea"/> 371 < jvmarg line="${runmain.jvmargs}"/>402 <customize/> 372 403 </junit> 373 404 </sequential> 374 405 </macrodef> 375 406 </target> 407 <target if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}"> 408 <macrodef name="junit" uri="http://www.netbeans.org/ns/web-project/2"> 409 <attribute default="${includes}" name="includes"/> 410 <attribute default="${excludes}" name="excludes"/> 411 <attribute default="**" name="testincludes"/> 412 <attribute default="" name="testmethods"/> 413 <element name="customize" optional="true"/> 414 <sequential> 415 <property name="run.jvmargs.ide" value=""/> 416 <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${build.dir}"> 417 <batchtest todir="${build.test.results.dir}"> 418 <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> 419 <filename name="@{testincludes}"/> 420 </fileset> 421 </batchtest> 422 <syspropertyset> 423 <propertyref prefix="test-sys-prop."/> 424 <mapper from="test-sys-prop.*" to="*" type="glob"/> 425 </syspropertyset> 426 <formatter type="brief" usefile="false"/> 427 <formatter type="xml"/> 428 <jvmarg value="-ea"/> 429 <jvmarg line="${run.jvmargs.ide}"/> 430 <customize/> 431 </junit> 432 </sequential> 433 </macrodef> 434 </target> 435 <target depends="-init-macrodef-junit-init,-init-macrodef-junit-single, -init-macrodef-junit-batch" if="${junit.available}" name="-init-macrodef-junit"/> 436 <target if="${testng.available}" name="-init-macrodef-testng"> 437 <macrodef name="testng" uri="http://www.netbeans.org/ns/web-project/2"> 438 <attribute default="${includes}" name="includes"/> 439 <attribute default="${excludes}" name="excludes"/> 440 <attribute default="**" name="testincludes"/> 441 <attribute default="" name="testmethods"/> 442 <element name="customize" optional="true"/> 443 <sequential> 444 <condition else="" property="testng.methods.arg" value="@{testincludes}.@{testmethods}"> 445 <isset property="test.method"/> 446 </condition> 447 <union id="test.set"> 448 <fileset dir="${test.src.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}"> 449 <filename name="@{testincludes}"/> 450 </fileset> 451 </union> 452 <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/> 453 <testng classfilesetref="test.set" failureProperty="tests.failed" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="Aggregator" testname="TestNG tests" workingDir="${basedir}"> 454 <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/> 455 <propertyset> 456 <propertyref prefix="test-sys-prop."/> 457 <mapper from="test-sys-prop.*" to="*" type="glob"/> 458 </propertyset> 459 <customize/> 460 </testng> 461 </sequential> 462 </macrodef> 463 </target> 464 <target name="-init-macrodef-test-impl"> 465 <macrodef name="test-impl" uri="http://www.netbeans.org/ns/web-project/2"> 466 <attribute default="${includes}" name="includes"/> 467 <attribute default="${excludes}" name="excludes"/> 468 <attribute default="**" name="testincludes"/> 469 <attribute default="" name="testmethods"/> 470 <element implicit="true" name="customize" optional="true"/> 471 <sequential> 472 <echo>No tests executed.</echo> 473 </sequential> 474 </macrodef> 475 </target> 476 <target depends="-init-macrodef-junit" if="${junit.available}" name="-init-macrodef-junit-impl"> 477 <macrodef name="test-impl" uri="http://www.netbeans.org/ns/web-project/2"> 478 <attribute default="${includes}" name="includes"/> 479 <attribute default="${excludes}" name="excludes"/> 480 <attribute default="**" name="testincludes"/> 481 <attribute default="" name="testmethods"/> 482 <element implicit="true" name="customize" optional="true"/> 483 <sequential> 484 <webproject2:junit excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}"> 485 <customize/> 486 </webproject2:junit> 487 </sequential> 488 </macrodef> 489 </target> 490 <target depends="-init-macrodef-testng" if="${testng.available}" name="-init-macrodef-testng-impl"> 491 <macrodef name="test-impl" uri="http://www.netbeans.org/ns/web-project/2"> 492 <attribute default="${includes}" name="includes"/> 493 <attribute default="${excludes}" name="excludes"/> 494 <attribute default="**" name="testincludes"/> 495 <attribute default="" name="testmethods"/> 496 <element implicit="true" name="customize" optional="true"/> 497 <sequential> 498 <webproject2:testng excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}"> 499 <customize/> 500 </webproject2:testng> 501 </sequential> 502 </macrodef> 503 </target> 504 <target depends="-init-macrodef-test-impl,-init-macrodef-junit-impl,-init-macrodef-testng-impl" name="-init-macrodef-test"> 505 <macrodef name="test" uri="http://www.netbeans.org/ns/web-project/2"> 506 <attribute default="${includes}" name="includes"/> 507 <attribute default="${excludes}" name="excludes"/> 508 <attribute default="**" name="testincludes"/> 509 <attribute default="" name="testmethods"/> 510 <sequential> 511 <webproject2:test-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}"> 512 <customize> 513 <classpath> 514 <path path="${run.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}"/> 515 </classpath> 516 <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> 517 <jvmarg line="${runmain.jvmargs}"/> 518 </customize> 519 </webproject2:test-impl> 520 </sequential> 521 </macrodef> 522 </target> 523 <target if="${junit.available}" name="-init-macrodef-junit-debug" unless="${nb.junit.batch}"> 524 <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/web-project/2"> 525 <attribute default="${includes}" name="includes"/> 526 <attribute default="${excludes}" name="excludes"/> 527 <attribute default="**" name="testincludes"/> 528 <attribute default="" name="testmethods"/> 529 <element name="customize" optional="true"/> 530 <sequential> 531 <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${java.io.tmpdir}"> 532 <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/> 533 <syspropertyset> 534 <propertyref prefix="test-sys-prop."/> 535 <mapper from="test-sys-prop.*" to="*" type="glob"/> 536 </syspropertyset> 537 <formatter type="brief" usefile="false"/> 538 <formatter type="xml"/> 539 <jvmarg value="-ea"/> 540 <jvmarg line="${debug-args-line}"/> 541 <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/> 542 <customize/> 543 </junit> 544 </sequential> 545 </macrodef> 546 </target> 547 <target if="${nb.junit.batch}" name="-init-macrodef-junit-debug-batch"> 548 <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/web-project/2"> 549 <attribute default="${includes}" name="includes"/> 550 <attribute default="${excludes}" name="excludes"/> 551 <attribute default="**" name="testincludes"/> 552 <attribute default="" name="testmethods"/> 553 <element name="customize" optional="true"/> 554 <sequential> 555 <property name="run.jvmargs.ide" value=""/> 556 <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${build.dir}"> 557 <batchtest todir="${build.test.results.dir}"> 558 <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> 559 <filename name="@{testincludes}"/> 560 </fileset> 561 </batchtest> 562 <syspropertyset> 563 <propertyref prefix="test-sys-prop."/> 564 <mapper from="test-sys-prop.*" to="*" type="glob"/> 565 </syspropertyset> 566 <formatter type="brief" usefile="false"/> 567 <formatter type="xml"/> 568 <jvmarg value="-ea"/> 569 <jvmarg line="${run.jvmargs.ide}"/> 570 <jvmarg line="${debug-args-line}"/> 571 <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/> 572 <customize/> 573 </junit> 574 </sequential> 575 </macrodef> 576 </target> 577 <target depends="-init-macrodef-junit-debug,-init-macrodef-junit-debug-batch" if="${junit.available}" name="-init-macrodef-junit-debug-impl"> 578 <macrodef name="test-debug-impl" uri="http://www.netbeans.org/ns/web-project/2"> 579 <attribute default="${includes}" name="includes"/> 580 <attribute default="${excludes}" name="excludes"/> 581 <attribute default="**" name="testincludes"/> 582 <attribute default="" name="testmethods"/> 583 <element implicit="true" name="customize" optional="true"/> 584 <sequential> 585 <webproject2:junit-debug excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}"> 586 <customize/> 587 </webproject2:junit-debug> 588 </sequential> 589 </macrodef> 590 </target> 591 <target if="${testng.available}" name="-init-macrodef-testng-debug"> 592 <macrodef name="testng-debug" uri="http://www.netbeans.org/ns/web-project/2"> 593 <attribute default="${main.class}" name="testClass"/> 594 <attribute default="" name="testMethod"/> 595 <element name="customize2" optional="true"/> 596 <sequential> 597 <condition else="-testclass @{testClass}" property="test.class.or.method" value="-methods @{testClass}.@{testMethod}"> 598 <isset property="test.method"/> 599 </condition> 600 <condition else="-suitename Aggregator -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}"> 601 <matches pattern=".*\.xml" string="@{testClass}"/> 602 </condition> 603 <delete dir="${build.test.results.dir}" quiet="true"/> 604 <mkdir dir="${build.test.results.dir}"/> 605 <webproject1:debug args="${testng.cmd.args}" classname="org.testng.TestNG" classpath="${debug.test.classpath}:${j2ee.platform.embeddableejb.classpath}"> 606 <customize> 607 <customize2/> 608 <jvmarg value="-ea"/> 609 <arg line="${testng.debug.mode}"/> 610 <arg line="-d ${build.test.results.dir}"/> 611 <arg line="-listener org.testng.reporters.VerboseReporter"/> 612 </customize> 613 </webproject1:debug> 614 </sequential> 615 </macrodef> 616 </target> 617 <target depends="-init-macrodef-testng-debug" if="${testng.available}" name="-init-macrodef-testng-debug-impl"> 618 <macrodef name="testng-debug-impl" uri="http://www.netbeans.org/ns/web-project/2"> 619 <attribute default="${main.class}" name="testClass"/> 620 <attribute default="" name="testMethod"/> 621 <element implicit="true" name="customize2" optional="true"/> 622 <sequential> 623 <webproject2:testng-debug testClass="@{testClass}" testMethod="@{testMethod}"> 624 <customize2/> 625 </webproject2:testng-debug> 626 </sequential> 627 </macrodef> 628 </target> 629 <target depends="-init-macrodef-junit-debug-impl" if="${junit.available}" name="-init-macrodef-test-debug-junit"> 630 <macrodef name="test-debug" uri="http://www.netbeans.org/ns/web-project/2"> 631 <attribute default="${includes}" name="includes"/> 632 <attribute default="${excludes}" name="excludes"/> 633 <attribute default="**" name="testincludes"/> 634 <attribute default="" name="testmethods"/> 635 <attribute default="${main.class}" name="testClass"/> 636 <attribute default="" name="testMethod"/> 637 <sequential> 638 <webproject2:test-debug-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}"> 639 <customize> 640 <classpath> 641 <path path="${run.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}"/> 642 </classpath> 643 <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> 644 <jvmarg line="${runmain.jvmargs}"/> 645 </customize> 646 </webproject2:test-debug-impl> 647 </sequential> 648 </macrodef> 649 </target> 650 <target depends="-init-macrodef-testng-debug-impl" if="${testng.available}" name="-init-macrodef-test-debug-testng"> 651 <macrodef name="test-debug" uri="http://www.netbeans.org/ns/web-project/2"> 652 <attribute default="${includes}" name="includes"/> 653 <attribute default="${excludes}" name="excludes"/> 654 <attribute default="**" name="testincludes"/> 655 <attribute default="" name="testmethods"/> 656 <attribute default="${main.class}" name="testClass"/> 657 <attribute default="" name="testMethod"/> 658 <sequential> 659 <webproject2:testng-debug-impl testClass="@{testClass}" testMethod="@{testMethod}"> 660 <customize2> 661 <syspropertyset> 662 <propertyref prefix="test-sys-prop."/> 663 <mapper from="test-sys-prop.*" to="*" type="glob"/> 664 </syspropertyset> 665 </customize2> 666 </webproject2:testng-debug-impl> 667 </sequential> 668 </macrodef> 669 </target> 670 <target depends="-init-macrodef-test-debug-junit,-init-macrodef-test-debug-testng" name="-init-macrodef-test-debug"/> 376 671 <target name="-init-macrodef-java"> 377 672 <macrodef name="java" uri="http://www.netbeans.org/ns/web-project/1"> … … 512 807 <property name="ap.cmd.line.internal" value=""/> 513 808 </target> 514 <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-check" name="profile-init"/> 809 <!-- 810 pre NB7.2 profiling section; consider it deprecated 811 --> 812 <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-check" if="profiler.info.jvmargs.agent" name="profile-init"/> 515 813 <target name="-profile-pre-init"> 516 814 <!-- Empty placeholder for easier customization. --> … … 521 819 <!-- You can override this target in the ../build.xml file. --> 522 820 </target> 523 <target depends="-profile-pre-init, init, -profile-post-init" name="-profile-init-check">821 <target depends="-profile-pre-init, init, -profile-post-init" if="profiler.info.jvmargs.agent" name="-profile-init-check"> 524 822 <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail> 525 823 <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail> 526 824 </target> 527 <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-java,-init-macrodef-nbjpda,-init-macrodef-nbjsdebug,-init-macrodef-debug,-init-taskdefs,-init-ap-cmdline" name="init"/> 825 <!-- 826 end of pre NB7.2 profiling section 827 --> 828 <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-test,-init-macrodef-test-debug,-init-macrodef-java,-init-macrodef-nbjpda,-init-macrodef-nbjsdebug,-init-macrodef-debug,-init-taskdefs,-init-ap-cmdline" name="init"/> 528 829 <!-- 529 830 COMPILATION SECTION … … 820 1121 </target> 821 1122 <target if="do.debug.server" name="connect-debugger" unless="is.debugged"> 822 <nbjpdaconnect address="${jpda.address}" host="${jpda.host}" name="${name}" transport="${jpda.transport}"> 1123 <condition property="listeningcp" value="sourcepath"> 1124 <istrue value="${j2ee.compile.on.save}"/> 1125 </condition> 1126 <nbjpdaconnect address="${jpda.address}" host="${jpda.host}" listeningcp="${listeningcp}" name="${name}" transport="${jpda.transport}"> 823 1127 <classpath> 824 1128 <path path="${debug.classpath}:${j2ee.platform.classpath}"/> … … 865 1169 ================= 866 1170 --> 867 <target description="Profile a J2EE project in the IDE." name="profile"> 1171 <!-- 1172 pre NB7.2 profiling section; consider it deprecated 1173 --> 1174 <target description="Profile a J2EE project in the IDE." if="profiler.info.jvmargs.agent" name="-profile-pre72"> 868 1175 <condition else="start-profiled-server" property="profiler.startserver.target" value="start-profiled-server-extraargs"> 869 1176 <isset property="profiler.info.jvmargs.extra"/> … … 871 1178 <antcall target="${profiler.startserver.target}"/> 872 1179 <antcall target="run"/> 873 <antcall target=" start-loadgen"/>874 </target> 875 <target name="start-profiled-server">1180 <antcall target="-profile-start-loadgen"/> 1181 </target> 1182 <target if="profiler.info.jvmargs.agent" name="start-profiled-server"> 876 1183 <nbstartprofiledserver forceRestart="${profiler.j2ee.serverForceRestart}" javaPlatform="${profiler.info.javaPlatform}" startupTimeout="${profiler.j2ee.serverStartupTimeout}"> 877 1184 <jvmarg value="${profiler.info.jvmargs.agent}"/> … … 879 1186 </nbstartprofiledserver> 880 1187 </target> 881 <target name="start-profiled-server-extraargs">1188 <target if="profiler.info.jvmargs.agent" name="start-profiled-server-extraargs"> 882 1189 <nbstartprofiledserver forceRestart="${profiler.j2ee.serverForceRestart}" javaPlatform="${profiler.info.javaPlatform}" startupTimeout="${profiler.j2ee.serverStartupTimeout}"> 883 1190 <jvmarg value="${profiler.info.jvmargs.extra}"/> … … 886 1193 </nbstartprofiledserver> 887 1194 </target> 888 <target if="profiler.loadgen.path" name="start-loadgen"> 1195 <target if="profiler.info.jvmargs.agent" name="-profile-test-single-pre72"> 1196 <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail> 1197 <nbprofiledirect> 1198 <classpath> 1199 <path path="${run.test.classpath}"/> 1200 <path path="${j2ee.platform.classpath}"/> 1201 </classpath> 1202 </nbprofiledirect> 1203 <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true"> 1204 <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/> 1205 <jvmarg value="${profiler.info.jvmargs.agent}"/> 1206 <jvmarg line="${profiler.info.jvmargs}"/> 1207 <test name="${profile.class}"/> 1208 <classpath> 1209 <path path="${run.test.classpath}"/> 1210 <path path="${j2ee.platform.classpath}"/> 1211 </classpath> 1212 <syspropertyset> 1213 <propertyref prefix="test-sys-prop."/> 1214 <mapper from="test-sys-prop.*" to="*" type="glob"/> 1215 </syspropertyset> 1216 <formatter type="brief" usefile="false"/> 1217 <formatter type="xml"/> 1218 </junit> 1219 </target> 1220 <target if="netbeans.home" name="-profile-check"> 1221 <condition property="profiler.configured"> 1222 <or> 1223 <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-agentpath:"/> 1224 <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-javaagent:"/> 1225 </or> 1226 </condition> 1227 </target> 1228 <target depends="init,-init-cos,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest" name="-do-profile"> 1229 <startprofiler/> 1230 <nbstartserver profilemode="true"/> 1231 <nbdeploy clientUrlPart="${client.urlPart}" forceRedeploy="true" profilemode="true"/> 1232 <antcall target="debug-display-browser"/> 1233 <antcall target="-profile-start-loadgen"/> 1234 </target> 1235 <target depends="-profile-check,-profile-pre72" description="Profile a J2EE project in the IDE." if="profiler.configured" name="profile" unless="profiler.info.jvmargs.agent"> 1236 <antcall target="-do-profile"/> 1237 </target> 1238 <target depends="-profile-test-single-pre72" name="profile-test-single"/> 1239 <target depends="-profile-check" if="profiler.configured" name="profile-test" unless="profiler.info.jvmargs.agent"> 1240 <startprofiler/> 1241 <antcall target="test-single"/> 1242 </target> 1243 <target if="profiler.loadgen.path" name="-profile-start-loadgen"> 889 1244 <loadgenstart path="${profiler.loadgen.path}"/> 890 1245 </target> … … 920 1275 <!-- 921 1276 922 JUNIT COMPILATION SECTION1277 TEST COMPILATION SECTION 923 1278 --> 924 1279 <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test"> … … 959 1314 <!-- 960 1315 961 JUNIT EXECUTION SECTION1316 TEST EXECUTION SECTION 962 1317 --> 963 1318 <target depends="init" if="have.tests" name="-pre-test-run"> … … 965 1320 </target> 966 1321 <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run"> 967 <webproject2: junit testincludes="**/*Test.java"/>1322 <webproject2:test testincludes="**/*Test.java"/> 968 1323 </target> 969 1324 <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run"> … … 978 1333 <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single"> 979 1334 <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail> 980 <webproject2: junit excludes=""includes="${test.includes}"/>1335 <webproject2:test excludes="" includes="${test.includes}" testincludes="${test.includes}"/> 981 1336 </target> 982 1337 <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single"> … … 984 1339 </target> 985 1340 <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/> 1341 <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single-method"> 1342 <fail unless="test.class">Must select some files in the IDE or set test.class</fail> 1343 <fail unless="test.method">Must select some method in the IDE or set test.method</fail> 1344 <webproject2:test excludes="" includes="${javac.includes}" testincludes="${test.class}" testmethods="${test.method}"/> 1345 </target> 1346 <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method" if="have.tests" name="-post-test-run-single-method"> 1347 <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail> 1348 </target> 1349 <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method,-post-test-run-single-method" description="Run single unit test." name="test-single-method"/> 986 1350 <!-- 987 1351 988 JUNIT DEBUGGING SECTION1352 TEST DEBUGGING SECTION 989 1353 --> 990 <target depends="init,compile-test " if="have.tests" name="-debug-start-debuggee-test">1354 <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test"> 991 1355 <fail unless="test.class">Must select one file in the IDE or set test.class</fail> 992 <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/> 993 <delete file="${test.report.file}"/> 994 <!-- must exist, otherwise the XML formatter would fail --> 995 <mkdir dir="${build.test.results.dir}"/> 996 <webproject1:debug args="${test.class}" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}:${j2ee.platform.embeddableejb.classpath}"> 997 <customize> 998 <arg value="showoutput=true"/> 999 <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/> 1000 <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/> 1001 </customize> 1002 </webproject1:debug> 1356 <webproject2:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testincludes="${javac.includes}"/> 1357 </target> 1358 <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test-method"> 1359 <fail unless="test.class">Must select one file in the IDE or set test.class</fail> 1360 <fail unless="test.method">Must select some method in the IDE or set test.method</fail> 1361 <webproject2:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testMethod="${test.method}" testincludes="${test.class}" testmethods="${test.method}"/> 1003 1362 </target> 1004 1363 <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test"> … … 1006 1365 </target> 1007 1366 <target depends="init,compile-test,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/> 1367 <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test-method" name="debug-test-method"/> 1008 1368 <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test"> 1009 1369 <webproject1:nbjpdareload dir="${build.test.classes.dir}"/> 1010 1370 </target> 1011 1371 <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/> 1012 <!--1013 =========================1014 TESTS PROFILING SECTION1015 =========================1016 -->1017 <target depends="profile-init,compile-test-single" if="netbeans.home" name="profile-test-single">1018 <nbprofiledirect>1019 <classpath>1020 <path path="${run.test.classpath}"/>1021 <path path="${j2ee.platform.classpath}"/>1022 </classpath>1023 </nbprofiledirect>1024 <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true">1025 <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>1026 <jvmarg value="${profiler.info.jvmargs.agent}"/>1027 <jvmarg line="${profiler.info.jvmargs}"/>1028 <test name="${profile.class}"/>1029 <classpath>1030 <path path="${run.test.classpath}"/>1031 <path path="${j2ee.platform.classpath}"/>1032 </classpath>1033 <syspropertyset>1034 <propertyref prefix="test-sys-prop."/>1035 <mapper from="test-sys-prop.*" to="*" type="glob"/>1036 </syspropertyset>1037 <formatter type="brief" usefile="false"/>1038 <formatter type="xml"/>1039 </junit>1040 </target>1041 1372 <!-- 1042 1373 -
SRUAggregator/trunk/nbproject/genfiles.properties
r2016 r2075 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=e938706e 7 nbproject/build-impl.xml.script.CRC32= 413d97558 nbproject/build-impl.xml.stylesheet.CRC32= b7883b1f@1.36.1.17 nbproject/build-impl.xml.script.CRC32=14072480 8 nbproject/build-impl.xml.stylesheet.CRC32=4e9cae83@1.38.1.1 -
SRUAggregator/trunk/nbproject/private/private.properties
r2016 r2075 1 deploy.ant.properties.file=/Users/zastrow/ .netbeans/7.1/tomcat70.properties1 deploy.ant.properties.file=/Users/zastrow/Library/Application Support/NetBeans/7.2/tomcat70.properties 2 2 j2ee.server.home=/Users/zastrow/Downloads/apache-tomcat-7.0.22 3 3 j2ee.server.instance=tomcat70:home=/Users/zastrow/Downloads/apache-tomcat-7.0.22 4 4 javac.debug=true 5 5 javadoc.preview=true 6 user.properties.file=/Users/zastrow/ .netbeans/7.1/build.properties6 user.properties.file=/Users/zastrow/Library/Application Support/NetBeans/7.2/build.properties -
SRUAggregator/trunk/nbproject/private/private.xml
r2016 r2075 2 2 <project-private xmlns="http://www.netbeans.org/ns/project-private/1"> 3 3 <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/> 4 <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/1"> 5 <file>file:/Users/zastrow/Documents/ClarinD/schrauber/Aggregator/trunk/web/index.zul</file> 6 <file>file:/Users/zastrow/Documents/ClarinD/schrauber/Aggregator/trunk/src/java/clarind/fcs/Aggregator.java</file> 7 </open-files> 4 <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/> 8 5 </project-private> -
SRUAggregator/trunk/nbproject/project.properties
r2016 r2075 29 29 includes=** 30 30 j2ee.compile.on.save=true 31 j2ee.copy.static.files.on.save=true 31 32 j2ee.deploy.on.save=true 32 33 j2ee.platform=1.6-web -
SRUAggregator/trunk/src/java/clarind/fcs/Aggregator.java
r2016 r2075 8 8 import org.zkoss.zul.Row; 9 9 import org.zkoss.zul.Checkbox; 10 import org.zkoss.zul.Combobox; 10 11 11 12 public class Aggregator extends GenericAutowireComposer { 12 13 13 14 private Textbox searchString; 14 15 private Rows rowsIds; 15 private Rows rowsTue; 16 private Rows rowsTue; 17 private Combobox languageSelect; 16 18 17 19 public void onExecuteSearch(Event ev) { … … 19 21 String display = "SearchString: " + searchString.getText() + "\n"; 20 22 23 display = display + "Language: " + languageSelect.getSelectedItem().getLabel() + "\n"; 24 21 25 int i, i2; 22 26 23 27 // ----- IDS: 24 28 25 29 display = display + "IDS:\n"; 26 27 for(i=0; i<rowsIds.getChildren().size(); i++){ 28 Row r = (Row)rowsIds.getChildren().get(i); 29 30 for(i2=0; i2<r.getChildren().size();i2++){ 31 Checkbox cb = (Checkbox)r.getChildren().get(i2); 32 if(cb.isChecked()) display = display + cb.getLabel() + "\n"; 33 } // for i2... 34 35 } // for i ... 36 37 38 // ----- TÃŒbingen: 39 40 display = display + "TÃŒbingen:\n"; 41 42 for(i=0; i<rowsTue.getChildren().size(); i++){ 43 Row r = (Row)rowsTue.getChildren().get(i); 44 45 for(i2=0; i2<r.getChildren().size();i2++){ 46 Checkbox cb = (Checkbox)r.getChildren().get(i2); 47 if(cb.isChecked()) display = display + cb.getLabel() + "\n"; 48 } // for i2... 49 50 } // for i ... 51 30 31 for (i = 0; i < rowsIds.getChildren().size(); i++) { 32 Row r = (Row) rowsIds.getChildren().get(i); 33 34 for (i2 = 0; i2 < r.getChildren().size(); i2++) { 35 Checkbox cb = (Checkbox) r.getChildren().get(i2); 36 if (cb.isChecked()) { 37 display = display + cb.getLabel() + "\n"; 38 } 39 } // for i2... 40 41 } // for i ... 42 43 44 // ----- TÃŒbingen: 45 46 display = display + "TÃŒbingen:\n"; 47 48 for (i = 0; i < rowsTue.getChildren().size(); i++) { 49 Row r = (Row) rowsTue.getChildren().get(i); 50 51 for (i2 = 0; i2 < r.getChildren().size(); i2++) { 52 Checkbox cb = (Checkbox) r.getChildren().get(i2); 53 if (cb.isChecked()) { 54 display = display + cb.getLabel() + "\n"; 55 } 56 } // for i2... 57 58 } // for i ... 59 52 60 Messagebox.show(display); 53 61 54 62 } catch (Exception ex) { 55 63 System.out.println(ex.getMessage()); -
SRUAggregator/trunk/web/index.zul
r2016 r2075 3 3 <window id="mainWindow" contentStyle="background:white;" height="100%" apply="clarind.fcs.Aggregator"> 4 4 <borderlayout sclass="complex-layout" width="1000px"> 5 <!-- Kopf -->5 <!-- Kopf --> 6 6 <north height="100px"> 7 7 8 8 </north> 9 9 10 <!-- Linke Sidebar -->10 <!-- Linke Sidebar --> 11 11 <west width="200px" flex="true" splittable="true" margins="0,5,0,0"> 12 12 13 13 </west> 14 14 15 <!-- Center - Inhalt -->15 <!-- Center - Inhalt --> 16 16 <center autoscroll="true"> 17 17 <panel > … … 19 19 <textbox id="searchString" value="Elefant" /> 20 20 <button id="searchButton" forward ="onExecuteSearch" label="Search" /> 21 22 <separator /> 23 <label>Language:</label> 24 <combobox id="languageSelect" width="150px"> 25 <!--<template name="model"> --> 26 <comboitem label="German" /> 27 <comboitem label="English" /> 28 <comboitem label="Dutch" /> 29 <comboitem label="-More to come-" /> 30 <!-- </template> --> 31 </combobox> 21 32 22 33 <separator /> … … 38 49 </row> 39 50 40 51 <row> 41 52 <checkbox id="ids3" label="Corpus 3" /> 42 53 <checkbox id="ids4" label="Corpus 4" /> 43 54 </row> 44 55 45 56 <row> 46 57 <checkbox id="ids5" label="Corpus 5" /> 47 58 <checkbox id="ids6" label="Corpus 6" /> 48 59 </row> 49 60 50 61 <row> 51 62 <checkbox id="ids7" label="Corpus 7" /> 52 63 <checkbox id="ids8" label="Corpus 8" /> 53 64 </row> 54 65 55 66 <row> 56 67 <checkbox id="ids9" label="Corpus 9" /> 57 68 <checkbox id="ids10" label="Corpus 10" /> … … 79 90 </row> 80 91 81 92 <row> 82 93 <checkbox id="tue3" label="Corpus 3" /> 83 94 <checkbox id="tue4" label="Corpus 4" /> 84 95 </row> 85 96 86 97 <row> 87 98 <checkbox id="tue5" label="Corpus 5" /> 88 99 <checkbox id="tue6" label="Corpus 6" /> 89 100 </row> 90 101 91 102 <row> 92 103 <checkbox id="tue7" label="Corpus 7" /> 93 104 <checkbox id="tue8" label="Corpus 8" /> 94 105 </row> 95 106 96 107 <row> 97 108 <checkbox id="tue9" label="Corpus 9" /> 98 109 <checkbox id="tue10" label="Corpus 10" /> … … 107 118 </center> 108 119 109 <!-- Rechte Sidebar -->120 <!-- Rechte Sidebar --> 110 121 <east width="200px" flex="true" splittable="true" margins="0,5,0,0"> 111 122 112 123 </east> 113 124 114 <!-- Fusszeile -->125 <!-- Fusszeile --> 115 126 <south height="100px"> 116 127
Note: See TracChangeset
for help on using the changeset viewer.