Changeset 32
- Timestamp:
- Oct 21, 2011, 3:37:55 PM (13 years ago)
- Location:
- trunk/fmgVen
- Files:
-
- 1 added
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/fmgVen/nbproject/build-impl.xml
r26 r32 118 118 </fail> 119 119 <available file="${manifest.file}" property="manifest.available"/> 120 <available file="${application.splash}" property="splashscreen.available"/> 120 <condition property="splashscreen.available"> 121 <and> 122 <not> 123 <equals arg1="${application.splash}" arg2="" trim="true"/> 124 </not> 125 <available file="${application.splash}"/> 126 </and> 127 </condition> 121 128 <condition property="main.class.available"> 122 129 <and> … … 133 140 </and> 134 141 </condition> 142 <condition property="do.archive"> 143 <not> 144 <istrue value="${jar.archive.disabled}"/> 145 </not> 146 </condition> 135 147 <condition property="do.mkdist"> 136 148 <and> 149 <isset property="do.archive"/> 137 150 <isset property="libs.CopyLibs.classpath"/> 138 151 <not> … … 147 160 </and> 148 161 </condition> 149 <condition property="manifest.available+main.class+mkdist.available+splashscreen.available">150 <and>151 <istrue value="${manifest.available+main.class+mkdist.available}"/>152 <istrue value="${splashscreen.available}"/>153 </and>154 </condition>155 <condition property="do.archive">156 <not>157 <istrue value="${jar.archive.disabled}"/>158 </not>159 </condition>160 162 <condition property="do.archive+manifest.available"> 161 163 <and> … … 164 166 </and> 165 167 </condition> 168 <condition property="do.archive+main.class.available"> 169 <and> 170 <isset property="main.class.available"/> 171 <istrue value="${do.archive}"/> 172 </and> 173 </condition> 174 <condition property="do.archive+splashscreen.available"> 175 <and> 176 <isset property="splashscreen.available"/> 177 <istrue value="${do.archive}"/> 178 </and> 179 </condition> 166 180 <condition property="do.archive+manifest.available+main.class"> 167 181 <and> … … 170 184 </and> 171 185 </condition> 172 <condition property=" do.archive+manifest.available+main.class+mkdist.available">173 < and>174 <istrue value="${manifest.available +main.class+mkdist.available}"/>175 <is true value="${do.archive}"/>176 </ and>177 </condition> 178 <condition property=" do.archive+manifest.available+main.class+mkdist.available+splashscreen.available">179 < and>180 <istrue value="${manifest.available+main.class +mkdist.available+splashscreen.available}"/>181 <is true value="${do.archive}"/>182 </ and>186 <condition property="manifest.available-mkdist.available"> 187 <or> 188 <istrue value="${manifest.available}"/> 189 <isset property="do.mkdist"/> 190 </or> 191 </condition> 192 <condition property="manifest.available+main.class-mkdist.available"> 193 <or> 194 <istrue value="${manifest.available+main.class}"/> 195 <isset property="do.mkdist"/> 196 </or> 183 197 </condition> 184 198 <condition property="have.tests"> … … 237 251 </condition> 238 252 <property name="jar.index" value="false"/> 253 <property name="jar.index.metainf" value="${jar.index}"/> 239 254 <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/> 240 255 </target> … … 353 368 <sequential> 354 369 <fail unless="javac.includes">Must set javac.includes</fail> 355 <pathconvert pathsep=" ," property="javac.includes.binary">370 <pathconvert pathsep="${line.separator}" property="javac.includes.binary"> 356 371 <path> 357 372 <filelist dir="@{destdir}" files="${javac.includes}"/> … … 359 374 <globmapper from="*.java" to="*.class"/> 360 375 </pathconvert> 376 <tempfile deleteonexit="true" property="javac.includesfile.binary"/> 377 <echo file="${javac.includesfile.binary}" message="${javac.includes.binary}"/> 361 378 <delete> 362 <files includes="${javac.includes.binary}"/> 379 <files includesfile="${javac.includesfile.binary}"/> 380 </delete> 381 <delete> 382 <fileset file="${javac.includesfile.binary}"/> 363 383 </delete> 364 384 </sequential> … … 371 391 <attribute default="**" name="testincludes"/> 372 392 <sequential> 373 <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}"> 393 <property name="junit.forkmode" value="perTest"/> 394 <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}"> 374 395 <batchtest todir="${build.test.results.dir}"> 375 396 <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> … … 387 408 <formatter type="xml"/> 388 409 <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> 410 <jvmarg value="-ea"/> 389 411 <jvmarg line="${run.jvmargs}"/> 390 412 </junit> 391 413 </sequential> 392 414 </macrodef> 415 </target> 416 <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check" name="profile-init"/> 417 <target name="-profile-pre-init"> 418 <!-- Empty placeholder for easier customization. --> 419 <!-- You can override this target in the ../build.xml file. --> 420 </target> 421 <target name="-profile-post-init"> 422 <!-- Empty placeholder for easier customization. --> 423 <!-- You can override this target in the ../build.xml file. --> 424 </target> 425 <target name="-profile-init-macrodef-profile"> 426 <macrodef name="resolve"> 427 <attribute name="name"/> 428 <attribute name="value"/> 429 <sequential> 430 <property name="@{name}" value="${env.@{value}}"/> 431 </sequential> 432 </macrodef> 433 <macrodef name="profile"> 434 <attribute default="${main.class}" name="classname"/> 435 <element name="customize" optional="true"/> 436 <sequential> 437 <property environment="env"/> 438 <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/> 439 <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}"> 440 <jvmarg value="${profiler.info.jvmargs.agent}"/> 441 <jvmarg line="${profiler.info.jvmargs}"/> 442 <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/> 443 <arg line="${application.args}"/> 444 <classpath> 445 <path path="${run.classpath}"/> 446 </classpath> 447 <syspropertyset> 448 <propertyref prefix="run-sys-prop."/> 449 <mapper from="run-sys-prop.*" to="*" type="glob"/> 450 </syspropertyset> 451 <customize/> 452 </java> 453 </sequential> 454 </macrodef> 455 </target> 456 <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile" name="-profile-init-check"> 457 <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail> 458 <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail> 393 459 </target> 394 460 <target depends="-init-debug-args" name="-init-macrodef-nbjpda"> … … 491 557 <target name="-init-macrodef-copylibs"> 492 558 <macrodef name="copylibs" uri="http://www.netbeans.org/ns/j2se-project/3"> 559 <attribute default="${manifest.file}" name="manifest"/> 493 560 <element name="customize" optional="true"/> 494 561 <sequential> … … 506 573 </pathconvert> 507 574 <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/> 508 <copylibs compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">575 <copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" runtimeclasspath="${run.classpath.without.build.classes.dir}"> 509 576 <fileset dir="${build.classes.dir}"/> 510 577 <manifest> … … 635 702 <!-- You can override this target in the ../build.xml file. --> 636 703 </target> 637 <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available ">704 <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available-mkdist.available"> 638 705 <j2seproject1:jar/> 639 706 </target> 640 <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class ">707 <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"> 641 708 <j2seproject1:jar manifest="${manifest.file}"/> 642 709 </target> … … 647 714 </j2seproject1:manifest> 648 715 </j2seproject1:jar> 649 <echo >To run this application from the command line without Ant, try:</echo>716 <echo level="info">To run this application from the command line without Ant, try:</echo> 650 717 <property location="${build.classes.dir}" name="build.classes.dir.resolved"/> 651 718 <property location="${dist.jar}" name="dist.jar.resolved"/> … … 654 721 <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/> 655 722 </pathconvert> 656 <echo>${platform.java} -cp "${run.classpath.with.dist.jar}" ${main.class}</echo> 657 </target> 658 <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"> 723 <echo level="info">${platform.java} -cp "${run.classpath.with.dist.jar}" ${main.class}</echo> 724 </target> 725 <target depends="init" if="do.archive" name="-do-jar-with-libraries-create-manifest" unless="manifest.available"> 726 <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/> 727 <touch file="${tmp.manifest.file}" verbose="false"/> 728 </target> 729 <target depends="init" if="do.archive+manifest.available" name="-do-jar-with-libraries-copy-manifest"> 730 <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/> 731 <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/> 732 </target> 733 <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"> 734 <manifest file="${tmp.manifest.file}" mode="update"> 735 <attribute name="Main-Class" value="${main.class}"/> 736 </manifest> 737 </target> 738 <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"> 659 739 <basename file="${application.splash}" property="splashscreen.basename"/> 660 740 <mkdir dir="${build.classes.dir}/META-INF"/> 661 741 <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/> 662 < j2seproject3:copylibs>663 < customize>664 <attribute name="Main-Class" value="${main.class}"/>665 <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>666 </customize>667 < /j2seproject3:copylibs>668 <echo >To run this application from the command line without Ant, try:</echo>742 <manifest file="${tmp.manifest.file}" mode="update"> 743 <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/> 744 </manifest> 745 </target> 746 <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"> 747 <j2seproject3:copylibs manifest="${tmp.manifest.file}"/> 748 <echo level="info">To run this application from the command line without Ant, try:</echo> 669 749 <property location="${dist.jar}" name="dist.jar.resolved"/> 670 <echo>${platform.java} -jar "${dist.jar.resolved}"</echo> 671 </target> 672 <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"> 673 <j2seproject3:copylibs> 674 <customize> 675 <attribute name="Main-Class" value="${main.class}"/> 676 </customize> 677 </j2seproject3:copylibs> 678 <echo>To run this application from the command line without Ant, try:</echo> 679 <property location="${dist.jar}" name="dist.jar.resolved"/> 680 <echo>${platform.java} -jar "${dist.jar.resolved}"</echo> 681 </target> 750 <echo level="info">${platform.java} -jar "${dist.jar.resolved}"</echo> 751 </target> 752 <target depends="-do-jar-with-libraries-pack" if="do.archive" name="-do-jar-with-libraries-delete-manifest"> 753 <delete> 754 <fileset file="${tmp.manifest.file}"/> 755 </delete> 756 </target> 757 <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"/> 682 758 <target name="-post-jar"> 683 759 <!-- Empty placeholder for easier customization. --> 684 760 <!-- You can override this target in the ../build.xml file. --> 685 761 </target> 686 <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"/>762 <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"/> 687 763 <!-- 688 764 ================= … … 750 826 <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/> 751 827 <!-- 828 ================= 829 PROFILING SECTION 830 ================= 831 --> 832 <target depends="profile-init,compile" description="Profile a project in the IDE." if="netbeans.home" name="profile"> 833 <nbprofiledirect> 834 <classpath> 835 <path path="${run.classpath}"/> 836 </classpath> 837 </nbprofiledirect> 838 <profile/> 839 </target> 840 <target depends="profile-init,compile-single" description="Profile a selected class in the IDE." if="netbeans.home" name="profile-single"> 841 <fail unless="profile.class">Must select one file in the IDE or set profile.class</fail> 842 <nbprofiledirect> 843 <classpath> 844 <path path="${run.classpath}"/> 845 </classpath> 846 </nbprofiledirect> 847 <profile classname="${profile.class}"/> 848 </target> 849 <!-- 850 ========================= 851 APPLET PROFILING SECTION 852 ========================= 853 --> 854 <target depends="profile-init,compile-single" if="netbeans.home" name="profile-applet"> 855 <nbprofiledirect> 856 <classpath> 857 <path path="${run.classpath}"/> 858 </classpath> 859 </nbprofiledirect> 860 <profile classname="sun.applet.AppletViewer"> 861 <customize> 862 <arg value="${applet.url}"/> 863 </customize> 864 </profile> 865 </target> 866 <!-- 867 ========================= 868 TESTS PROFILING SECTION 869 ========================= 870 --> 871 <target depends="profile-init,compile-test-single" if="netbeans.home" name="profile-test-single"> 872 <nbprofiledirect> 873 <classpath> 874 <path path="${run.test.classpath}"/> 875 </classpath> 876 </nbprofiledirect> 877 <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true"> 878 <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/> 879 <jvmarg value="${profiler.info.jvmargs.agent}"/> 880 <jvmarg line="${profiler.info.jvmargs}"/> 881 <test name="${profile.class}"/> 882 <classpath> 883 <path path="${run.test.classpath}"/> 884 </classpath> 885 <syspropertyset> 886 <propertyref prefix="test-sys-prop."/> 887 <mapper from="test-sys-prop.*" to="*" type="glob"/> 888 </syspropertyset> 889 <formatter type="brief" usefile="false"/> 890 <formatter type="xml"/> 891 </junit> 892 </target> 893 <!-- 752 894 =============== 753 895 JAVADOC SECTION … … 760 902 <path path="${javac.classpath}"/> 761 903 </classpath> 762 <fileset dir="${src.dir}" excludes=" ${excludes}" includes="${includes}">904 <fileset dir="${src.dir}" excludes="*.java,${excludes}" includes="${includes}"> 763 905 <filename name="**/*.java"/> 764 906 </fileset> 765 907 <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false"> 766 908 <include name="**/*.java"/> 909 <exclude name="*.java"/> 767 910 </fileset> 768 911 </javadoc> 912 <copy todir="${dist.javadoc.dir}"> 913 <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}"> 914 <filename name="**/doc-files/**"/> 915 </fileset> 916 <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false"> 917 <include name="**/doc-files/**"/> 918 </fileset> 919 </copy> 769 920 </target> 770 921 <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview"> … … 787 938 <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/> 788 939 </target> 789 <target depends="init, compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">940 <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test"> 790 941 <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}"/> 791 942 <copy todir="${build.test.classes.dir}"> … … 802 953 <!-- You can override this target in the ../build.xml file. --> 803 954 </target> 804 <target depends="init, compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">955 <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single"> 805 956 <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail> 806 957 <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/> -
trunk/fmgVen/nbproject/genfiles.properties
r26 r32 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=31e5c25b 7 nbproject/build-impl.xml.script.CRC32= 68c116758 nbproject/build-impl.xml.stylesheet.CRC32= 78c6a6ee@1.38.1.457 nbproject/build-impl.xml.script.CRC32=f1913007 8 nbproject/build-impl.xml.stylesheet.CRC32=0ae3a408@1.44.1.45 -
trunk/fmgVen/src/com/fmguler/ven/Criteria.java
r30 r32 104 104 * Add a criterion where an attribue equals a value (SQL = operator) 105 105 */ 106 public Criteria eq(String attribute, Stringvalue) {106 public Criteria eq(String attribute, Object value) { 107 107 criterionList.add(new Criterion(attribute, Criterion.OP_EQUALS, value)); 108 108 return this; … … 112 112 * Add a criterion where an attribue is like a value (SQL like operator) 113 113 */ 114 public Criteria like(String attribute, Stringvalue) {114 public Criteria like(String attribute, Object value) { 115 115 criterionList.add(new Criterion(attribute, Criterion.OP_LIKE, value)); 116 116 return this; … … 120 120 * Add a criterion where an attribue is similar to a value (SQL similar to operator) 121 121 */ 122 public Criteria similarto(String attribute, Stringvalue) {122 public Criteria similarto(String attribute, Object value) { 123 123 criterionList.add(new Criterion(attribute, Criterion.OP_SIMILAR_TO, value)); 124 124 return this; … … 128 128 * Add a criterion where an attribue is greater than a value (SQL > operator) 129 129 */ 130 public Criteria gt(String attribute, Stringvalue) {130 public Criteria gt(String attribute, Object value) { 131 131 criterionList.add(new Criterion(attribute, Criterion.OP_GREATER_THAN, value)); 132 132 return this; … … 136 136 * Add a criterion where an attribue is less than a value (SQL < operator) 137 137 */ 138 public Criteria lt(String attribute, Stringvalue) {138 public Criteria lt(String attribute, Object value) { 139 139 criterionList.add(new Criterion(attribute, Criterion.OP_LESS_THAN, value)); 140 140 return this; -
trunk/fmgVen/src/com/fmguler/ven/QueryGenerator.java
r28 r32 36 36 private Set domainPackages; 37 37 private Set dbClasses; 38 private boolean debug = true;38 private boolean debug = false; 39 39 40 40 public QueryGenerator() { … … 237 237 domainPackages.add(domainPackage); 238 238 } 239 240 /** 241 * Set debug mode, true will log all debug messages to System.out 242 * <p> 243 * Note: Use debug mode to detect problems only. It is not a general purpose logging mode. 244 * @param debug set true to enable debug mode 245 */ 246 public void setDebug(boolean debug) { 247 this.debug = debug; 248 } 239 249 } -
trunk/fmgVen/src/com/fmguler/ven/QueryMapper.java
r28 r32 45 45 private Set domainPackages; 46 46 private Set dbClasses; 47 private boolean debug = true;47 private boolean debug = false; 48 48 49 49 public QueryMapper() { … … 191 191 domainPackages.add(domainPackage); 192 192 } 193 194 /** 195 * Set debug mode, true will log all debug messages to System.out 196 * <p> 197 * Note: Use debug mode to detect problems only. It is not a general purpose logging mode. 198 * @param debug set true to enable debug mode 199 */ 200 public void setDebug(boolean debug) { 201 this.debug = debug; 202 } 193 203 } -
trunk/fmgVen/src/com/fmguler/ven/Ven.java
r30 r32 38 38 private QueryGenerator generator; 39 39 private QueryMapper mapper; 40 private boolean debug = true;40 private boolean debug = false; 41 41 42 42 public Ven() { … … 196 196 return this; 197 197 } 198 199 /** 200 * Set debug mode, true will log all debug messages to System.out 201 * <p> 202 * Note: Use debug mode to detect problems only. It is not a general purpose logging mode. 203 * @param debug set true to enable debug mode 204 */ 205 public void setDebug(boolean debug) { 206 this.debug = debug; 207 generator.setDebug(debug); 208 mapper.setDebug(debug); 209 } 198 210 }
Note: See TracChangeset
for help on using the changeset viewer.