diff --git a/performance/build.xml b/performance/build.xml index b4bc8bf..ca1b1f9 100644 --- a/performance/build.xml +++ b/performance/build.xml @@ -17,8 +17,7 @@ - - + @@ -36,6 +35,7 @@ classname="com.sun.japex.Japex"> + + + + + + Builds, tests, and runs the project xsbdrivers. @@ -46,8 +51,7 @@ -init-macrodef-junit: defines macro for junit execution -init-macrodef-debug: defines macro for class debugging -init-macrodef-java: defines macro for class execution - -do-jar-with-manifest: JAR building (if you are using a manifest) - -do-jar-without-manifest: JAR building (if you are not using a manifest) + -do-jar: JAR building run: execution of project -javadoc-build: Javadoc generation test-report: JUnit report generation diff --git a/performance/xsbdrivers/lib/ant-1.9.8.jar b/performance/xsbdrivers/lib/ant-1.9.8.jar new file mode 100644 index 0000000..674bf60 Binary files /dev/null and b/performance/xsbdrivers/lib/ant-1.9.8.jar differ diff --git a/performance/xsbdrivers/lib/stax-ex-1.8.jar b/performance/xsbdrivers/lib/stax-ex-1.8.jar new file mode 100644 index 0000000..8d87e08 Binary files /dev/null and b/performance/xsbdrivers/lib/stax-ex-1.8.jar differ diff --git a/performance/xsbdrivers/lib/xerces.2.7.1/xercesImpl.jar b/performance/xsbdrivers/lib/xercesImpl.jar similarity index 100% rename from performance/xsbdrivers/lib/xerces.2.7.1/xercesImpl.jar rename to performance/xsbdrivers/lib/xercesImpl.jar diff --git a/performance/xsbdrivers/nbproject/build-impl.xml b/performance/xsbdrivers/nbproject/build-impl.xml index 5165b51..67dea33 100644 --- a/performance/xsbdrivers/nbproject/build-impl.xml +++ b/performance/xsbdrivers/nbproject/build-impl.xml @@ -12,52 +12,112 @@ is divided into following sections: - execution - debugging - javadoc - - junit compilation - - junit execution - - junit debugging + - test compilation + - test execution + - test debugging - applet - cleanup ---> - - + --> + + + + + + + + + + ====================== + INITIALIZATION SECTION + ====================== + --> - + + + - + - - + + - + + - + + - + + + + + + + + + - - + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -77,9 +137,13 @@ is divided into following sections: - + + + + + @@ -89,12 +153,83 @@ is divided into following sections: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + Must set src.dir Must set test.src.dir Must set build.dir @@ -115,53 +250,488 @@ is divided into following sections: - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + - + + + + + + + + + + - + + + + + + + + + + + + + + + + + Must set javac.includes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + - + + - + + + + + + - - - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + No tests executed. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must set JVM to use for profiling in profiler.info.jvm + Must set profiler agent JVM arguments in profiler.info.jvmargs.agent + + + - - - + + + - + @@ -169,32 +739,56 @@ is divided into following sections: - + - + + + - + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - + + + + + + + - + @@ -203,307 +797,564 @@ is divided into following sections: - + + + - + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + =================== + COMPILATION SECTION + =================== + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + - + + + + + + + - + - + Must select some files in the IDE or set javac.includes - - - - - + + - + - - + ==================== + JAR BUILDING SECTION + ==================== + --> + + - - - - - - - - - - - - - To run this application from the command line without Ant, try: - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + To run this application from the command line without Ant, try: + + java -jar "${dist.jar.resolved}" + + + + + - java -cp "${run.classpath.with.dist.jar}" ${main.class} + + + + + + + - - - - - - - - - - - - - - - - - - - - - - To run this application from the command line without Ant, try: - - java -jar "${dist.jar.resolved}" + + + + + + - + + - + ================= + EXECUTION SECTION + ================= + --> + - + + + + Must select one file in the IDE or set run.class + + Must select one file in the IDE or set run.class + + - + ================= + DEBUGGING SECTION + ================= + --> + - + + + + - - + + - - + + Must select one file in the IDE or set debug.class - - + + + Must select one file in the IDE or set debug.class + + + + Must set fix.includes - + - + + + + + This target only works when run from inside the NetBeans IDE. + + + + + + + + + Must select one file in the IDE or set profile.class + This target only works when run from inside the NetBeans IDE. + + + + + + + + + This target only works when run from inside the NetBeans IDE. + + + + + + + + + + + + + This target only works when run from inside the NetBeans IDE. + + + + + + + + + + + + + + + + + + + + + - + end of pre NB72 profiling section + --> + + + + + + + + + + + + + + Must select one file in the IDE or set run.class + + + + + + Must select some files in the IDE or set test.includes + + + + + Must select one file in the IDE or set run.class + + + + + Must select one file in the IDE or set applet.url + + + + + - + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + - + - + - + ========================= + TEST COMPILATION SECTION + ========================= + --> + - - + + + + + - + - + - + Must select some files in the IDE or set javac.includes - - - - - + + - + - + - + ======================= + TEST EXECUTION SECTION + ======================= + --> + - - + + - - Some tests failed; see details above. + + Some tests failed; see details above. - - - - + + + + - + Must select some files in the IDE or set test.includes - + + + + Some tests failed; see details above. - - Some tests failed; see details above. + + + Must select some files in the IDE or set test.class + Must select some method in the IDE or set test.method + - + + Some tests failed; see details above. + + - + ======================= + TEST DEBUGGING SECTION + ======================= + --> + Must select one file in the IDE or set test.class - - - - - + - - + + Must select one file in the IDE or set test.class + Must select some method in the IDE or set test.method + - - + + + + + + - + - + ========================= + APPLET EXECUTION SECTION + ========================= + --> + Must select one file in the IDE or set applet.url @@ -512,11 +1363,11 @@ is divided into following sections: - + ========================= + APPLET DEBUGGING SECTION + ========================= + --> + Must select one file in the IDE or set applet.url @@ -524,22 +1375,62 @@ is divided into following sections: - + - - - - + =============== + CLEANUP SECTION + =============== + --> + + + + + + + + + + + + + + + + + + + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + diff --git a/performance/xsbdrivers/nbproject/genfiles.properties b/performance/xsbdrivers/nbproject/genfiles.properties index 1333f52..6369322 100644 --- a/performance/xsbdrivers/nbproject/genfiles.properties +++ b/performance/xsbdrivers/nbproject/genfiles.properties @@ -1,8 +1,8 @@ build.xml.data.CRC32=ef74613c -build.xml.script.CRC32=e18abc43 -build.xml.stylesheet.CRC32=d5b6853a +build.xml.script.CRC32=e1acd32e +build.xml.stylesheet.CRC32=8064a381@1.80.1.48 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. nbproject/build-impl.xml.data.CRC32=ef74613c -nbproject/build-impl.xml.script.CRC32=bb7d3f29 -nbproject/build-impl.xml.stylesheet.CRC32=99b91518 +nbproject/build-impl.xml.script.CRC32=380565bf +nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48 diff --git a/performance/xsbdrivers/nbproject/project.properties b/performance/xsbdrivers/nbproject/project.properties index 003f78e..3c37169 100644 --- a/performance/xsbdrivers/nbproject/project.properties +++ b/performance/xsbdrivers/nbproject/project.properties @@ -1,3 +1,7 @@ +annotation.processing.enabled=true +annotation.processing.enabled.in.editor=false +annotation.processing.processors.list= +annotation.processing.run.all.processors=true application.args= build.classes.dir=${build.dir}/classes build.classes.excludes=**/*.java,**/*.form @@ -15,6 +19,8 @@ debug.test.classpath=\ dist.dir=dist dist.jar=${dist.dir}/xsbdrivers.jar dist.javadoc.dir=${dist.dir}/javadoc +endorsed.classpath= +excludes= file.reference.activation.jar=lib/activation.jar file.reference.japex.jar=lib/japex.jar file.reference.jaxb-api.jar=lib/jaxb-api.jar @@ -22,9 +28,8 @@ file.reference.jaxb-impl.jar=lib/jaxb-impl.jar file.reference.jcommon-1.0.0-rc1.jar=lib/jcommon-1.0.0-rc1.jar file.reference.jdsl.jar=lib/jdsl.jar file.reference.jfreechart-1.0.0-rc1.jar=lib/jfreechart-1.0.0-rc1.jar -file.reference.jsr173_api.jar=../../streambuffer/lib/jsr173_api.jar -file.reference.sjsxp.jar=../../streambuffer/lib/sjsxp.jar -file.reference.stax-ex.jar=../../streambuffer/lib/stax-ex.jar +file.reference.stax-ex.jar=lib/stax-ex-1.8.jar +includes=** jar.compress=false javac.classpath=\ ${file.reference.activation.jar}:\ @@ -35,14 +40,15 @@ javac.classpath=\ ${file.reference.jcommon-1.0.0-rc1.jar}:\ ${file.reference.jfreechart-1.0.0-rc1.jar}:\ ${reference.streambuffer.jar}:\ - ${file.reference.jsr173_api.jar}:\ - ${file.reference.sjsxp.jar}:\ ${file.reference.stax-ex.jar} # Space-separated list of extra javac options javac.compilerargs= javac.deprecation=false -javac.source=1.5 -javac.target=1.5 +javac.external.vm=false +javac.processorpath=\ + ${javac.classpath} +javac.source=1.8 +javac.target=1.8 javac.test.classpath=\ ${javac.classpath}:\ ${build.classes.dir}:\ @@ -58,9 +64,10 @@ javadoc.splitindex=true javadoc.use=true javadoc.version=false javadoc.windowtitle= +mkdist.disabled=false platform.active=default_platform project.streambuffer=../../streambuffer -reference.streambuffer.jar=${project.streambuffer}/dist/streambuffer.jar +reference.streambuffer.jar=${project.streambuffer}/target/streambuffer-1.5.5-SNAPSHOT.jar run.classpath=\ ${javac.classpath}:\ ${build.classes.dir} diff --git a/roundtriptest/build.xml b/roundtriptest/build.xml index ad8774d..7099ee1 100644 --- a/roundtriptest/build.xml +++ b/roundtriptest/build.xml @@ -2,6 +2,11 @@ + + + + + Builds, tests, and runs the project roundtriptest. @@ -46,8 +51,7 @@ -init-macrodef-junit: defines macro for junit execution -init-macrodef-debug: defines macro for class debugging -init-macrodef-java: defines macro for class execution - -do-jar-with-manifest: JAR building (if you are using a manifest) - -do-jar-without-manifest: JAR building (if you are not using a manifest) + -do-jar: JAR building run: execution of project -javadoc-build: Javadoc generation test-report: JUnit report generation diff --git a/roundtriptest/lib/stax-ex-1.8.jar b/roundtriptest/lib/stax-ex-1.8.jar new file mode 100644 index 0000000..8d87e08 Binary files /dev/null and b/roundtriptest/lib/stax-ex-1.8.jar differ diff --git a/roundtriptest/nbproject/build-impl.xml b/roundtriptest/nbproject/build-impl.xml index e2b3664..e658718 100644 --- a/roundtriptest/nbproject/build-impl.xml +++ b/roundtriptest/nbproject/build-impl.xml @@ -12,52 +12,112 @@ is divided into following sections: - execution - debugging - javadoc - - junit compilation - - junit execution - - junit debugging + - test compilation + - test execution + - test debugging - applet - cleanup ---> - - + --> + + + + + + + + + + ====================== + INITIALIZATION SECTION + ====================== + --> - + + + - + - - + + - + + - + + - + + + + + + + + + - - + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -77,9 +137,13 @@ is divided into following sections: - + + + + + @@ -89,12 +153,83 @@ is divided into following sections: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + Must set src.dir Must set test.src.dir Must set build.dir @@ -115,53 +250,488 @@ is divided into following sections: - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + - + + + + + + + + + + - + + + + + + + + + + + + + + + + + Must set javac.includes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + - + + - + + + + + + - - - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + No tests executed. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must set JVM to use for profiling in profiler.info.jvm + Must set profiler agent JVM arguments in profiler.info.jvmargs.agent + + + - - - + + + - + @@ -169,32 +739,56 @@ is divided into following sections: - + - + + + - + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - + + + + + + + - + @@ -203,307 +797,564 @@ is divided into following sections: - + + + - + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + =================== + COMPILATION SECTION + =================== + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + - + + + + + + + - + - + Must select some files in the IDE or set javac.includes - - - - - + + - + - - + ==================== + JAR BUILDING SECTION + ==================== + --> + + - - - - - - - - - - - - - To run this application from the command line without Ant, try: - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + To run this application from the command line without Ant, try: + + java -jar "${dist.jar.resolved}" + + + + + - java -cp "${run.classpath.with.dist.jar}" ${main.class} + + + + + + + - - - - - - - - - - - - - - - - - - - - - - To run this application from the command line without Ant, try: - - java -jar "${dist.jar.resolved}" + + + + + + - + + - + ================= + EXECUTION SECTION + ================= + --> + - + + + + Must select one file in the IDE or set run.class + + Must select one file in the IDE or set run.class + + - + ================= + DEBUGGING SECTION + ================= + --> + - + + + + - - + + - - + + Must select one file in the IDE or set debug.class - - + + + Must select one file in the IDE or set debug.class + + + + Must set fix.includes - + - + + + + + This target only works when run from inside the NetBeans IDE. + + + + + + + + + Must select one file in the IDE or set profile.class + This target only works when run from inside the NetBeans IDE. + + + + + + + + + This target only works when run from inside the NetBeans IDE. + + + + + + + + + + + + + This target only works when run from inside the NetBeans IDE. + + + + + + + + + + + + + + + + + + + + + - + end of pre NB72 profiling section + --> + + + + + + + + + + + + + + Must select one file in the IDE or set run.class + + + + + + Must select some files in the IDE or set test.includes + + + + + Must select one file in the IDE or set run.class + + + + + Must select one file in the IDE or set applet.url + + + + + - + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + - + - + - + ========================= + TEST COMPILATION SECTION + ========================= + --> + - - + + + + + - + - + - + Must select some files in the IDE or set javac.includes - - - - - + + - + - + - + ======================= + TEST EXECUTION SECTION + ======================= + --> + - - + + - - Some tests failed; see details above. + + Some tests failed; see details above. - - - - + + + + - + Must select some files in the IDE or set test.includes - + + + + Some tests failed; see details above. - - Some tests failed; see details above. + + + Must select some files in the IDE or set test.class + Must select some method in the IDE or set test.method + - + + Some tests failed; see details above. + + - + ======================= + TEST DEBUGGING SECTION + ======================= + --> + Must select one file in the IDE or set test.class - - - - - + - - + + Must select one file in the IDE or set test.class + Must select some method in the IDE or set test.method + - - + + + + + + - + - + ========================= + APPLET EXECUTION SECTION + ========================= + --> + Must select one file in the IDE or set applet.url @@ -512,11 +1363,11 @@ is divided into following sections: - + ========================= + APPLET DEBUGGING SECTION + ========================= + --> + Must select one file in the IDE or set applet.url @@ -524,22 +1375,62 @@ is divided into following sections: - + - - - - + =============== + CLEANUP SECTION + =============== + --> + + + + + + + + + + + + + + + + + + + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + diff --git a/roundtriptest/nbproject/genfiles.properties b/roundtriptest/nbproject/genfiles.properties index 33c7f54..1c30d95 100644 --- a/roundtriptest/nbproject/genfiles.properties +++ b/roundtriptest/nbproject/genfiles.properties @@ -1,8 +1,8 @@ build.xml.data.CRC32=678ded0a -build.xml.script.CRC32=7f4860a7 -build.xml.stylesheet.CRC32=d5b6853a +build.xml.script.CRC32=1aadf65c +build.xml.stylesheet.CRC32=8064a381@1.80.1.48 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. nbproject/build-impl.xml.data.CRC32=678ded0a -nbproject/build-impl.xml.script.CRC32=9201d9b2 -nbproject/build-impl.xml.stylesheet.CRC32=99b91518 +nbproject/build-impl.xml.script.CRC32=666ee09e +nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48 diff --git a/roundtriptest/nbproject/project.properties b/roundtriptest/nbproject/project.properties index 35185ba..4d77cca 100644 --- a/roundtriptest/nbproject/project.properties +++ b/roundtriptest/nbproject/project.properties @@ -4,6 +4,7 @@ build.classes.excludes=**/*.java,**/*.form # This directory is removed when the project is cleaned: build.dir=build build.generated.dir=${build.dir}/generated +build.generated.sources.dir=${build.dir}/generated-sources # Only compile against the classpath explicitly listed here: build.sysclasspath=ignore build.test.classes.dir=${build.dir}/test/classes @@ -16,15 +17,15 @@ debug.test.classpath=\ dist.dir=dist dist.jar=${dist.dir}/roundtriptest.jar dist.javadoc.dir=${dist.dir}/javadoc -file.reference.jsr173_api.jar=../streambuffer/lib/jsr173_api.jar +excludes= file.reference.sjsxp.jar=lib/sjsxp.jar -file.reference.stax-ex.jar=../streambuffer/lib/stax-ex.jar +file.reference.stax-ex.jar=lib/stax-ex-1.8.jar file.reference.stax-utils-src.zip=lib/stax-utils-src.zip file.reference.stax-utils.jar=lib/stax-utils.jar file.reference.xom-1.1b4.jar=lib/xom-1.1b4.jar +includes=** jar.compress=false javac.classpath=\ - ${file.reference.jsr173_api.jar}:\ ${file.reference.sjsxp.jar}:\ ${file.reference.xom-1.1b4.jar}:\ ${reference.streambuffer.jar}:\ @@ -56,7 +57,7 @@ manifest.file=manifest.mf meta.inf.dir=${src.dir}/META-INF platform.active=default_platform project.streambuffer=../streambuffer -reference.streambuffer.jar=${project.streambuffer}/dist/streambuffer.jar +reference.streambuffer.jar=${project.streambuffer}/target/streambuffer-1.5.5-SNAPSHOT.jar run.classpath=\ ${javac.classpath}:\ ${build.classes.dir}