[jbosstools-commits] JBoss Tools SVN: r13305 - in workspace/max/jpaap: demo and 13 other directories.

Author: max.andersen(a)jboss.com Date: 2009-01-28 09:40:59 -0500 (Wed, 28 Jan 2009) New Revision: 13305 Added: workspace/max/jpaap/demo/ workspace/max/jpaap/demo/.classpath workspace/max/jpaap/demo/.factorypath workspace/max/jpaap/demo/.project workspace/max/jpaap/demo/.settings/ workspace/max/jpaap/demo/.settings/org.eclipse.jdt.apt.core.prefs workspace/max/jpaap/demo/.settings/org.eclipse.jdt.core.prefs workspace/max/jpaap/demo/README.txt workspace/max/jpaap/demo/ant-build.xml workspace/max/jpaap/demo/build.xml workspace/max/jpaap/demo/dist/ workspace/max/jpaap/demo/dist/demo.jar workspace/max/jpaap/demo/lib/ workspace/max/jpaap/demo/lib/jpa.jar workspace/max/jpaap/demo/lib/jpaap.jar workspace/max/jpaap/demo/nbproject/ workspace/max/jpaap/demo/nbproject/build-impl.xml workspace/max/jpaap/demo/nbproject/genfiles.properties workspace/max/jpaap/demo/nbproject/private/ workspace/max/jpaap/demo/nbproject/private/config.properties workspace/max/jpaap/demo/nbproject/private/private.properties workspace/max/jpaap/demo/nbproject/private/private.xml workspace/max/jpaap/demo/nbproject/project.properties workspace/max/jpaap/demo/nbproject/project.xml workspace/max/jpaap/demo/src/ workspace/max/jpaap/demo/src/META-INF/ workspace/max/jpaap/demo/src/META-INF/orm.xml workspace/max/jpaap/demo/src/Test.java workspace/max/jpaap/demo/src/model/ workspace/max/jpaap/demo/src/model/Item.java workspace/max/jpaap/demo/src/model/Order.java workspace/max/jpaap/demo/src/model/Product.java workspace/max/jpaap/demo/src/model/Shop.java Removed: workspace/max/jpaap/org.jboss.jpa.metamodel/ Modified: workspace/max/jpaap/jpaap/.classpath workspace/max/jpaap/jpaap/.project workspace/max/jpaap/jpaap/build.xml workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/ImportContextImpl.java workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/JPAMetaModelEntityProcessor.java workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/xml/XmlMetaEntity.java workspace/max/jpaap/test/ workspace/max/jpaap/test/.classpath workspace/max/jpaap/test/.factorypath workspace/max/jpaap/test/.settings/org.eclipse.jdt.apt.core.prefs workspace/max/jpaap/test/.settings/org.eclipse.jdt.core.prefs workspace/max/jpaap/test/test jpa-build.xml.launch Log: removed broken eclipse attempt added demo project with ant, eclipse and netbeans support Added: workspace/max/jpaap/demo/.classpath =================================================================== --- workspace/max/jpaap/demo/.classpath (rev 0) +++ workspace/max/jpaap/demo/.classpath 2009-01-28 14:40:59 UTC (rev 13305) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="build/eclipse/gen-src"> + <attributes> + <attribute name="optional" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="lib" path="lib/jpa.jar"/> + <classpathentry kind="output" path="build/eclipse/classes"/> +</classpath> Added: workspace/max/jpaap/demo/.factorypath =================================================================== --- workspace/max/jpaap/demo/.factorypath (rev 0) +++ workspace/max/jpaap/demo/.factorypath 2009-01-28 14:40:59 UTC (rev 13305) @@ -0,0 +1,4 @@ +<factorypath> + <factorypathentry kind="WKSPJAR" id="/demo/lib/jpa.jar" enabled="true" runInBatchMode="false"/> + <factorypathentry kind="WKSPJAR" id="/demo/lib/jpaap.jar" enabled="true" runInBatchMode="false"/> +</factorypath> Added: workspace/max/jpaap/demo/.project =================================================================== --- workspace/max/jpaap/demo/.project (rev 0) +++ workspace/max/jpaap/demo/.project 2009-01-28 14:40:59 UTC (rev 13305) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>demo</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Added: workspace/max/jpaap/demo/.settings/org.eclipse.jdt.apt.core.prefs =================================================================== --- workspace/max/jpaap/demo/.settings/org.eclipse.jdt.apt.core.prefs (rev 0) +++ workspace/max/jpaap/demo/.settings/org.eclipse.jdt.apt.core.prefs 2009-01-28 14:40:59 UTC (rev 13305) @@ -0,0 +1,5 @@ +#Wed Jan 28 12:29:15 CET 2009 +eclipse.preferences.version=1 +org.eclipse.jdt.apt.aptEnabled=true +org.eclipse.jdt.apt.genSrcDir=build/eclipse/gen-src +org.eclipse.jdt.apt.reconcileEnabled=true Added: workspace/max/jpaap/demo/.settings/org.eclipse.jdt.core.prefs =================================================================== --- workspace/max/jpaap/demo/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ workspace/max/jpaap/demo/.settings/org.eclipse.jdt.core.prefs 2009-01-28 14:40:59 UTC (rev 13305) @@ -0,0 +1,3 @@ +#Wed Jan 28 12:29:16 CET 2009 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.processAnnotations=enabled Added: workspace/max/jpaap/demo/README.txt =================================================================== Added: workspace/max/jpaap/demo/ant-build.xml =================================================================== --- workspace/max/jpaap/demo/ant-build.xml (rev 0) +++ workspace/max/jpaap/demo/ant-build.xml 2009-01-28 14:40:59 UTC (rev 13305) @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<project basedir="." default="build" name="demo"> + <property environment="env"/> + <property name="debuglevel" value="source,lines,vars"/> + <property name="target" value="1.6"/> + <property name="source" value="1.6"/> + + <property name="build.classes.dir" value="build/ant/classes"/> + <property name="build.generated-src.dir" value="build/ant/gen-src"/> + + <target name="init"> + <mkdir dir="${build.classes.dir}"/> + <mkdir dir="${build.generated-src.dir}"/> + + <!-- copy non java resources, i.e. orm.xml --> + <copy includeemptydirs="false" todir="${build.classes.dir}"> + <fileset dir="${build.generated-src.dir}" excludes="**/*.java"/> + </copy> + <copy includeemptydirs="false" todir="${build.classes.dir}"> + <fileset dir="src" excludes="***/*.java"/> + </copy> + </target> + + <target name="clean"> + <delete dir="${build.classes.dir}"/> + </target> + + <target depends="init" name="build"> + + <echo message="${ant.project.name}: ${ant.file}"/> + + <javac debug="true" debuglevel="${debuglevel}" destdir="${build.classes.dir}" source="${source}" target="${target}"> + <src path="${build.generated-src.dir}"/> + <src path="src"/> + <classpath> + <pathelement location="${build.classes.dir}"/> + <pathelement location="lib/jpa.jar"/> + <pathelement location="lib/jpaap.jar"/> + </classpath> + + </javac> + + </target> + +</project> Added: workspace/max/jpaap/demo/build.xml =================================================================== --- workspace/max/jpaap/demo/build.xml (rev 0) +++ workspace/max/jpaap/demo/build.xml 2009-01-28 14:40:59 UTC (rev 13305) @@ -0,0 +1,86 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- You may freely edit this file. See commented blocks below for --> +<!-- some examples of how to customize the build. --> +<!-- (If you delete it and reopen the project it will be recreated.) --> +<!-- By default, only the Clean and Build commands use this build script. --> +<!-- Commands such as Run, Debug, and Test only use this build script if --> +<!-- the Compile on Save feature is turned off for the project. --> +<!-- You can turn off the Compile on Save (or Deploy on Save) setting --> +<!-- in the project's Project Properties dialog box.--> +<project name="demo" default="default" basedir="."> + <description>Builds, tests, and runs the project demo.</description> + + <import file="nbproject/build-impl.xml"/> + <target name="init" depends="demo-impl.init"> + <mkdir dir="${build.apt.dir}"/> + </target> + + <target name="-pre-compile"> + <!-- copy non java resources, i.e. orm.xml --> + <copy includeemptydirs="false" todir="${build.classes.dir}"> + <fileset dir="${src.dir}" excludes="**/*.java"/> + </copy> + </target> + + <!-- + + There exist several targets which are by default empty and which can be + used for execution of your tasks. These targets are usually executed + before and after some main targets. They are: + + -pre-init: called before initialization of project properties + -post-init: called after initialization of project properties + -pre-compile: called before javac compilation + -post-compile: called after javac compilation + -pre-compile-single: called before javac compilation of single file + -post-compile-single: called after javac compilation of single file + -pre-compile-test: called before javac compilation of JUnit tests + -post-compile-test: called after javac compilation of JUnit tests + -pre-compile-test-single: called before javac compilation of single JUnit test + -post-compile-test-single: called after javac compilation of single JUunit test + -pre-jar: called before JAR building + -post-jar: called after JAR building + -post-clean: called after cleaning build products + + (Targets beginning with '-' are not intended to be called on their own.) + + Example of inserting an obfuscator after compilation could look like this: + + <target name="-post-compile"> + <obfuscate> + <fileset dir="${build.classes.dir}"/> + </obfuscate> + </target> + + For list of available properties check the imported + nbproject/build-impl.xml file. + + + Another way to customize the build is by overriding existing main targets. + The targets of interest are: + + -init-macrodef-javac: defines macro for javac compilation + -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) + run: execution of project + -javadoc-build: Javadoc generation + test-report: JUnit report generation + + An example of overriding the target for project execution could look like this: + + <target name="run" depends="demo-impl.jar"> + <exec dir="bin" executable="launcher.exe"> + <arg file="${dist.jar}"/> + </exec> + </target> + + Notice that the overridden target depends on the jar target and not only on + the compile target as the regular run target does. Again, for a list of available + properties which you can use, check the target you are overriding in the + nbproject/build-impl.xml file. + + --> +</project> Added: workspace/max/jpaap/demo/dist/demo.jar =================================================================== (Binary files differ) Property changes on: workspace/max/jpaap/demo/dist/demo.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/max/jpaap/demo/lib/jpa.jar =================================================================== (Binary files differ) Property changes on: workspace/max/jpaap/demo/lib/jpa.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/max/jpaap/demo/lib/jpaap.jar =================================================================== (Binary files differ) Property changes on: workspace/max/jpaap/demo/lib/jpaap.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/max/jpaap/demo/nbproject/build-impl.xml =================================================================== --- workspace/max/jpaap/demo/nbproject/build-impl.xml (rev 0) +++ workspace/max/jpaap/demo/nbproject/build-impl.xml 2009-01-28 14:40:59 UTC (rev 13305) @@ -0,0 +1,637 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +*** GENERATED FROM project.xml - DO NOT EDIT *** +*** EDIT ../build.xml INSTEAD *** + +For the purpose of easier reading the script +is divided into following sections: + + - initialization + - compilation + - jar + - execution + - debugging + - javadoc + - junit compilation + - junit execution + - junit debugging + - applet + - cleanup + + --> +<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="demo-impl"> + <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/> + <!-- + ====================== + INITIALIZATION SECTION + ====================== + --> + <target name="-pre-init"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target depends="-pre-init" name="-init-private"> + <property file="nbproject/private/config.properties"/> + <property file="nbproject/private/configs/${config}.properties"/> + <property file="nbproject/private/private.properties"/> + </target> + <target depends="-pre-init,-init-private" name="-init-user"> + <property file="${user.properties.file}"/> + <!-- The two properties below are usually overridden --> + <!-- by the active platform. Just a fallback. --> + <property name="default.javac.source" value="1.4"/> + <property name="default.javac.target" value="1.4"/> + </target> + <target depends="-pre-init,-init-private,-init-user" name="-init-project"> + <property file="nbproject/configs/${config}.properties"/> + <property file="nbproject/project.properties"/> + </target> + <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init"> + <available file="${manifest.file}" property="manifest.available"/> + <condition property="manifest.available+main.class"> + <and> + <isset property="manifest.available"/> + <isset property="main.class"/> + <not> + <equals arg1="${main.class}" arg2="" trim="true"/> + </not> + </and> + </condition> + <condition property="manifest.available+main.class+mkdist.available"> + <and> + <istrue value="${manifest.available+main.class}"/> + <isset property="libs.CopyLibs.classpath"/> + </and> + </condition> + <condition property="have.tests"> + <or/> + </condition> + <condition property="have.sources"> + <or> + <available file="${src.dir}"/> + <available file="${src.gen-src.dir}"/> + </or> + </condition> + <condition property="netbeans.home+have.tests"> + <and> + <isset property="netbeans.home"/> + <isset property="have.tests"/> + </and> + </condition> + <condition property="no.javadoc.preview"> + <and> + <isset property="javadoc.preview"/> + <isfalse value="${javadoc.preview}"/> + </and> + </condition> + <property name="run.jvmargs" value=""/> + <property name="javac.compilerargs" value=""/> + <property name="work.dir" value="${basedir}"/> + <condition property="no.deps"> + <and> + <istrue value="${no.dependencies}"/> + </and> + </condition> + <property name="javac.debug" value="true"/> + <property name="javadoc.preview" value="true"/> + <property name="application.args" value=""/> + <property name="source.encoding" value="${file.encoding}"/> + <condition property="javadoc.encoding.used" value="${javadoc.encoding}"> + <and> + <isset property="javadoc.encoding"/> + <not> + <equals arg1="${javadoc.encoding}" arg2=""/> + </not> + </and> + </condition> + <property name="javadoc.encoding.used" value="${source.encoding}"/> + <property name="includes" value="**"/> + <property name="excludes" value=""/> + <property name="do.depend" value="false"/> + <condition property="do.depend.true"> + <istrue value="${do.depend}"/> + </condition> + <condition else="" property="javac.compilerargs.jaxws" value="-Djava.endorsed.dirs='${jaxws.endorsed.dir}'"> + <and> + <isset property="jaxws.endorsed.dir"/> + <available file="nbproject/jaxws-build.xml"/> + </and> + </condition> + </target> + <target name="-post-init"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check"> + <fail unless="src.dir">Must set src.dir</fail> + <fail unless="src.gen-src.dir">Must set src.gen-src.dir</fail> + <fail unless="build.dir">Must set build.dir</fail> + <fail unless="dist.dir">Must set dist.dir</fail> + <fail unless="build.classes.dir">Must set build.classes.dir</fail> + <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail> + <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail> + <fail unless="build.test.results.dir">Must set build.test.results.dir</fail> + <fail unless="build.classes.excludes">Must set build.classes.excludes</fail> + <fail unless="dist.jar">Must set dist.jar</fail> + </target> + <target name="-init-macrodef-property"> + <macrodef name="property" uri="http://www.netbeans.org/ns/j2se-project/1"> + <attribute name="name"/> + <attribute name="value"/> + <sequential> + <property name="@{name}" value="${@{value}}"/> + </sequential> + </macrodef> + </target> + <target name="-init-macrodef-javac"> + <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3"> + <attribute default="${src.dir}:${src.gen-src.dir}" name="srcdir"/> + <attribute default="${build.classes.dir}" name="destdir"/> + <attribute default="${javac.classpath}" name="classpath"/> + <attribute default="${includes}" name="includes"/> + <attribute default="${excludes}" name="excludes"/> + <attribute default="${javac.debug}" name="debug"/> + <attribute default="" name="sourcepath"/> + <element name="customize" optional="true"/> + <sequential> + <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}"> + <classpath> + <path path="@{classpath}"/> + </classpath> + <compilerarg line="${javac.compilerargs} ${javac.compilerargs.jaxws}"/> + <customize/> + </javac> + </sequential> + </macrodef> + <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3"> + <attribute default="${src.dir}:${src.gen-src.dir}" name="srcdir"/> + <attribute default="${build.classes.dir}" name="destdir"/> + <attribute default="${javac.classpath}" name="classpath"/> + <sequential> + <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}"> + <classpath> + <path path="@{classpath}"/> + </classpath> + </depend> + </sequential> + </macrodef> + <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/j2se-project/3"> + <attribute default="${build.classes.dir}" name="destdir"/> + <sequential> + <fail unless="javac.includes">Must set javac.includes</fail> + <pathconvert pathsep="," property="javac.includes.binary"> + <path> + <filelist dir="@{destdir}" files="${javac.includes}"/> + </path> + <globmapper from="*.java" to="*.class"/> + </pathconvert> + <delete> + <files includes="${javac.includes.binary}"/> + </delete> + </sequential> + </macrodef> + </target> + <target name="-init-macrodef-junit"> + <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3"> + <attribute default="${includes}" name="includes"/> + <attribute default="${excludes}" name="excludes"/> + <attribute default="**" name="testincludes"/> + <sequential> + <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true"> + <batchtest todir="${build.test.results.dir}"/> + <classpath> + <path path="${run.test.classpath}"/> + </classpath> + <syspropertyset> + <propertyref prefix="test-sys-prop."/> + <mapper from="test-sys-prop.*" to="*" type="glob"/> + </syspropertyset> + <formatter type="brief" usefile="false"/> + <formatter type="xml"/> + <jvmarg line="${run.jvmargs}"/> + </junit> + </sequential> + </macrodef> + </target> + <target depends="-init-debug-args" name="-init-macrodef-nbjpda"> + <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1"> + <attribute default="${main.class}" name="name"/> + <attribute default="${debug.classpath}" name="classpath"/> + <attribute default="" name="stopclassname"/> + <sequential> + <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}"> + <classpath> + <path path="@{classpath}"/> + </classpath> + </nbjpdastart> + </sequential> + </macrodef> + <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/j2se-project/1"> + <attribute default="${build.classes.dir}" name="dir"/> + <sequential> + <nbjpdareload> + <fileset dir="@{dir}" includes="${fix.classes}"> + <include name="${fix.includes}*.class"/> + </fileset> + </nbjpdareload> + </sequential> + </macrodef> + </target> + <target name="-init-debug-args"> + <property name="version-output" value="java version &quot;${ant.java.version}"/> + <condition property="have-jdk-older-than-1.4"> + <or> + <contains string="${version-output}" substring="java version &quot;1.0"/> + <contains string="${version-output}" substring="java version &quot;1.1"/> + <contains string="${version-output}" substring="java version &quot;1.2"/> + <contains string="${version-output}" substring="java version &quot;1.3"/> + </or> + </condition> + <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none"> + <istrue value="${have-jdk-older-than-1.4}"/> + </condition> + <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem"> + <os family="windows"/> + </condition> + <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}"> + <isset property="debug.transport"/> + </condition> + </target> + <target depends="-init-debug-args" name="-init-macrodef-debug"> + <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3"> + <attribute default="${main.class}" name="classname"/> + <attribute default="${debug.classpath}" name="classpath"/> + <element name="customize" optional="true"/> + <sequential> + <java classname="@{classname}" dir="${work.dir}" fork="true"> + <jvmarg line="${debug-args-line}"/> + <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/> + <jvmarg line="${run.jvmargs}"/> + <classpath> + <path path="@{classpath}"/> + </classpath> + <syspropertyset> + <propertyref prefix="run-sys-prop."/> + <mapper from="run-sys-prop.*" to="*" type="glob"/> + </syspropertyset> + <customize/> + </java> + </sequential> + </macrodef> + </target> + <target name="-init-macrodef-java"> + <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1"> + <attribute default="${main.class}" name="classname"/> + <element name="customize" optional="true"/> + <sequential> + <java classname="@{classname}" dir="${work.dir}" fork="true"> + <jvmarg line="${run.jvmargs}"/> + <classpath> + <path path="${run.classpath}"/> + </classpath> + <syspropertyset> + <propertyref prefix="run-sys-prop."/> + <mapper from="run-sys-prop.*" to="*" type="glob"/> + </syspropertyset> + <customize/> + </java> + </sequential> + </macrodef> + </target> + <target name="-init-presetdef-jar"> + <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1"> + <jar compress="${jar.compress}" jarfile="${dist.jar}"> + <j2seproject1:fileset dir="${build.classes.dir}"/> + </jar> + </presetdef> + </target> + <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-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar" name="init"/> + <!-- + =================== + COMPILATION SECTION + =================== + --> + <target depends="init" name="deps-jar" unless="no.deps"/> + <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/> + <target depends="init" name="-check-automatic-build"> + <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/> + </target> + <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build"> + <antcall target="clean"/> + </target> + <target depends="init,deps-jar" name="-pre-pre-compile"> + <mkdir dir="${build.classes.dir}"/> + </target> + <target name="-pre-compile"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target if="do.depend.true" name="-compile-depend"> + <j2seproject3:depend/> + </target> + <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-compile-depend" if="have.sources" name="-do-compile"> + <j2seproject3:javac/> + <copy todir="${build.classes.dir}"> + <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> + <fileset dir="${src.gen-src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> + </copy> + </target> + <target name="-post-compile"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/> + <target name="-pre-compile-single"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single"> + <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail> + <j2seproject3:force-recompile/> + <j2seproject3:javac excludes="" includes="${javac.includes}" sourcepath="${src.dir}:${src.gen-src.dir}"/> + </target> + <target name="-post-compile-single"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/> + <!-- + ==================== + JAR BUILDING SECTION + ==================== + --> + <target depends="init" name="-pre-pre-jar"> + <dirname file="${dist.jar}" property="dist.jar.dir"/> + <mkdir dir="${dist.jar.dir}"/> + </target> + <target name="-pre-jar"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target depends="init,compile,-pre-pre-jar,-pre-jar" name="-do-jar-without-manifest" unless="manifest.available"> + <j2seproject1:jar/> + </target> + <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class"> + <j2seproject1:jar manifest="${manifest.file}"/> + </target> + <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available"> + <j2seproject1:jar manifest="${manifest.file}"> + <j2seproject1:manifest> + <j2seproject1:attribute name="Main-Class" value="${main.class}"/> + </j2seproject1:manifest> + </j2seproject1:jar> + <echo>To run this application from the command line without Ant, try:</echo> + <property location="${build.classes.dir}" name="build.classes.dir.resolved"/> + <property location="${dist.jar}" name="dist.jar.resolved"/> + <pathconvert property="run.classpath.with.dist.jar"> + <path path="${run.classpath}"/> + <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/> + </pathconvert> + <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo> + </target> + <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class+mkdist.available" name="-do-jar-with-libraries"> + <property location="${build.classes.dir}" name="build.classes.dir.resolved"/> + <pathconvert property="run.classpath.without.build.classes.dir"> + <path path="${run.classpath}"/> + <map from="${build.classes.dir.resolved}" to=""/> + </pathconvert> + <pathconvert pathsep=" " property="jar.classpath"> + <path path="${run.classpath.without.build.classes.dir}"/> + <chainedmapper> + <flattenmapper/> + <globmapper from="*" to="lib/*"/> + </chainedmapper> + </pathconvert> + <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/> + <copylibs compress="${jar.compress}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}"> + <fileset dir="${build.classes.dir}"/> + <manifest> + <attribute name="Main-Class" value="${main.class}"/> + <attribute name="Class-Path" value="${jar.classpath}"/> + </manifest> + </copylibs> + <echo>To run this application from the command line without Ant, try:</echo> + <property location="${dist.jar}" name="dist.jar.resolved"/> + <echo>java -jar "${dist.jar.resolved}"</echo> + </target> + <target name="-post-jar"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <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"/> + <!-- + ================= + EXECUTION SECTION + ================= + --> + <target depends="init,compile" description="Run a main class." name="run"> + <j2seproject1:java> + <customize> + <arg line="${application.args}"/> + </customize> + </j2seproject1:java> + </target> + <target name="-do-not-recompile"> + <property name="javac.includes.binary" value=""/> + </target> + <target depends="init,-do-not-recompile,compile-single" name="run-single"> + <fail unless="run.class">Must select one file in the IDE or set run.class</fail> + <j2seproject1:java classname="${run.class}"/> + </target> + <!-- + ================= + DEBUGGING SECTION + ================= + --> + <target depends="init" if="netbeans.home" name="-debug-start-debugger"> + <j2seproject1:nbjpdastart name="${debug.class}"/> + </target> + <target depends="init,compile" name="-debug-start-debuggee"> + <j2seproject3:debug> + <customize> + <arg line="${application.args}"/> + </customize> + </j2seproject3:debug> + </target> + <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE." if="netbeans.home" name="debug"/> + <target depends="init" if="netbeans.home" name="-debug-start-debugger-stepinto"> + <j2seproject1:nbjpdastart stopclassname="${main.class}"/> + </target> + <target depends="init,compile,-debug-start-debugger-stepinto,-debug-start-debuggee" if="netbeans.home" name="debug-stepinto"/> + <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single"> + <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail> + <j2seproject3:debug classname="${debug.class}"/> + </target> + <target depends="init,-do-not-recompile,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/> + <target depends="init" name="-pre-debug-fix"> + <fail unless="fix.includes">Must set fix.includes</fail> + <property name="javac.includes" value="${fix.includes}.java"/> + </target> + <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix"> + <j2seproject1:nbjpdareload/> + </target> + <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/> + <!-- + =============== + JAVADOC SECTION + =============== + --> + <target depends="init" name="-javadoc-build"> + <mkdir dir="${dist.javadoc.dir}"/> + <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}"> + <classpath> + <path path="${javac.classpath}"/> + </classpath> + <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/*.java"/> + </fileset> + <fileset dir="${src.gen-src.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/*.java"/> + </fileset> + </javadoc> + </target> + <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview"> + <nbbrowse file="${dist.javadoc.dir}/index.html"/> + </target> + <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/> + <!-- + ========================= + JUNIT COMPILATION SECTION + ========================= + --> + <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test"> + <mkdir dir="${build.test.classes.dir}"/> + </target> + <target name="-pre-compile-test"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target if="do.depend.true" name="-compile-test-depend"> + <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir=""/> + </target> + <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test"> + <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir=""/> + <copy todir="${build.test.classes.dir}"/> + </target> + <target name="-post-compile-test"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/> + <target name="-pre-compile-test-single"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single"> + <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail> + <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/> + <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" sourcepath="" srcdir=""/> + <copy todir="${build.test.classes.dir}"/> + </target> + <target name="-post-compile-test-single"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/> + <!-- + ======================= + JUNIT EXECUTION SECTION + ======================= + --> + <target depends="init" if="have.tests" name="-pre-test-run"> + <mkdir dir="${build.test.results.dir}"/> + </target> + <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run"> + <j2seproject3:junit testincludes="**/*Test.java"/> + </target> + <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run"> + <fail if="tests.failed">Some tests failed; see details above.</fail> + </target> + <target depends="init" if="have.tests" name="test-report"/> + <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/> + <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/> + <target depends="init" if="have.tests" name="-pre-test-run-single"> + <mkdir dir="${build.test.results.dir}"/> + </target> + <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single"> + <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail> + <j2seproject3:junit excludes="" includes="${test.includes}"/> + </target> + <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single"> + <fail if="tests.failed">Some tests failed; see details above.</fail> + </target> + <target depends="init,-do-not-recompile,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/> + <!-- + ======================= + JUNIT DEBUGGING SECTION + ======================= + --> + <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test"> + <fail unless="test.class">Must select one file in the IDE or set test.class</fail> + <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/> + <delete file="${test.report.file}"/> + <mkdir dir="${build.test.results.dir}"/> + <j2seproject3:debug classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}"> + <customize> + <syspropertyset> + <propertyref prefix="test-sys-prop."/> + <mapper from="test-sys-prop.*" to="*" type="glob"/> + </syspropertyset> + <arg value="${test.class}"/> + <arg value="showoutput=true"/> + <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/> + <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/> + </customize> + </j2seproject3:debug> + </target> + <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test"> + <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/> + </target> + <target depends="init,-do-not-recompile,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/> + <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test"> + <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/> + </target> + <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/> + <!-- + ========================= + APPLET EXECUTION SECTION + ========================= + --> + <target depends="init,compile-single" name="run-applet"> + <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail> + <j2seproject1:java classname="sun.applet.AppletViewer"> + <customize> + <arg value="${applet.url}"/> + </customize> + </j2seproject1:java> + </target> + <!-- + ========================= + APPLET DEBUGGING SECTION + ========================= + --> + <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-applet"> + <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail> + <j2seproject3:debug classname="sun.applet.AppletViewer"> + <customize> + <arg value="${applet.url}"/> + </customize> + </j2seproject3:debug> + </target> + <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet" if="netbeans.home" name="debug-applet"/> + <!-- + =============== + CLEANUP SECTION + =============== + --> + <target depends="init" name="deps-clean" unless="no.deps"/> + <target depends="init" name="-do-clean"> + <delete dir="${build.dir}"/> + <delete dir="${dist.dir}"/> + </target> + <target name="-post-clean"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/> +</project> Added: workspace/max/jpaap/demo/nbproject/genfiles.properties =================================================================== --- workspace/max/jpaap/demo/nbproject/genfiles.properties (rev 0) +++ workspace/max/jpaap/demo/nbproject/genfiles.properties 2009-01-28 14:40:59 UTC (rev 13305) @@ -0,0 +1,8 @@ +build.xml.data.CRC32=b4636918 +build.xml.script.CRC32=d97338d6 +build.xml.stylesheet.CRC32=958a1d3e +# 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=4784f849 +nbproject/build-impl.xml.script.CRC32=6c3f21a8 +nbproject/build-impl.xml.stylesheet.CRC32=e55b27f5 Added: workspace/max/jpaap/demo/nbproject/private/config.properties =================================================================== Added: workspace/max/jpaap/demo/nbproject/private/private.properties =================================================================== --- workspace/max/jpaap/demo/nbproject/private/private.properties (rev 0) +++ workspace/max/jpaap/demo/nbproject/private/private.properties 2009-01-28 14:40:59 UTC (rev 13305) @@ -0,0 +1,7 @@ +compile.on.save=true +do.depend=false +do.jar=true +javac.debug=true +javadoc.preview=true +jaxws.endorsed.dir=C:\\work\\products\\netbeans-6.5\\java2\\modules\\ext\\jaxws21\\api:C:\\work\\products\\netbeans-6.5\\ide10\\modules\\ext\\jaxb\\api +user.properties.file=C:\\Users\\max\\.netbeans\\6.5\\build.properties Added: workspace/max/jpaap/demo/nbproject/private/private.xml =================================================================== --- workspace/max/jpaap/demo/nbproject/private/private.xml (rev 0) +++ workspace/max/jpaap/demo/nbproject/private/private.xml 2009-01-28 14:40:59 UTC (rev 13305) @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project-private xmlns="http://www.netbeans.org/ns/project-private/1"> + <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/> +</project-private> Added: workspace/max/jpaap/demo/nbproject/project.properties =================================================================== --- workspace/max/jpaap/demo/nbproject/project.properties (rev 0) +++ workspace/max/jpaap/demo/nbproject/project.properties 2009-01-28 14:40:59 UTC (rev 13305) @@ -0,0 +1,69 @@ +application.title=demo +application.vendor=max +build.classes.dir=${build.dir}/classes +build.classes.excludes=**/*.java,**/*.form +# This directory is removed when the project is cleaned: +build.dir=${basedir}/build/netbeans +build.apt.dir=${build.dir}/gen-src +build.generated.dir=${build.dir}/generated +# Only compile against the classpath explicitly listed here: +build.sysclasspath=ignore +build.test.classes.dir=${build.dir}/test/classes +build.test.results.dir=${build.dir}/test/results +# Uncomment to specify the preferred debugger connection transport: +#debug.transport=dt_socket +debug.classpath=\ + ${run.classpath} +debug.test.classpath=\ + ${run.test.classpath} +# This directory is removed when the project is cleaned: +dist.dir=dist +dist.jar=${dist.dir}/demo.jar +dist.javadoc.dir=${dist.dir}/javadoc +excludes= +file.reference.jpa.jar=lib/jpa.jar +file.reference.jpaap.jar=lib/jpaap.jar +includes=** +jar.compress=false +javac.classpath=\ + ${file.reference.jpa.jar}:\ + ${file.reference.jpaap.jar}:\ + ${build.apt.dir} +# Space-separated list of extra javac options +javac.compilerargs=-s ${build.apt.dir} +javac.deprecation=false +javac.source=1.6 +javac.target=1.6 +javac.test.classpath=\ + ${javac.classpath}:\ + ${build.classes.dir}:\ + ${libs.junit.classpath}:\ + ${libs.junit_4.classpath} +javadoc.additionalparam= +javadoc.author=false +javadoc.encoding=${source.encoding} +javadoc.noindex=false +javadoc.nonavbar=false +javadoc.notree=false +javadoc.private=false +javadoc.splitindex=true +javadoc.use=true +javadoc.version=false +javadoc.windowtitle= +main.class= +manifest.file=manifest.mf +meta.inf.dir=${src.dir}/META-INF +platform.active=default_platform +run.classpath=\ + ${javac.classpath}:\ + ${build.classes.dir} +# Space-separated list of JVM arguments used when running the project +# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value +# or test-sys-prop.name=value to set system properties for unit tests): +run.jvmargs= +run.test.classpath=\ + ${javac.test.classpath}:\ + ${build.test.classes.dir} +source.encoding=UTF-8 +src.dir=src +src.gen-src.dir=build\\netbeans\\gen-src Added: workspace/max/jpaap/demo/nbproject/project.xml =================================================================== --- workspace/max/jpaap/demo/nbproject/project.xml (rev 0) +++ workspace/max/jpaap/demo/nbproject/project.xml 2009-01-28 14:40:59 UTC (rev 13305) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://www.netbeans.org/ns/project/1"> + <type>org.netbeans.modules.java.j2seproject</type> + <configuration> + <data xmlns="http://www.netbeans.org/ns/j2se-project/3"> + <name>demo</name> + <minimum-ant-version>1.6.5</minimum-ant-version> + <source-roots> + <root id="src.dir"/> + <root id="src.gen-src.dir"/> + </source-roots> + <test-roots/> + </data> + </configuration> +</project> Added: workspace/max/jpaap/demo/src/META-INF/orm.xml =================================================================== --- workspace/max/jpaap/demo/src/META-INF/orm.xml (rev 0) +++ workspace/max/jpaap/demo/src/META-INF/orm.xml 2009-01-28 14:40:59 UTC (rev 13305) @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_2_0.xsd" + version="2.0" + > + <!-- careful old JPA1 schema --> + <package>model</package> <!-- default package --> + <entity class="Order" access="FIELD" metadata-complete="true"> <!--means ignore annotations--> + <attributes> + <id name="id"> + <column name="fld_id"/> + </id> + <basic name="filled"></basic> + <basic name="date"></basic> + <one-to-many name="items" target-entity="Item" fetch="EAGER"> <!-- target-entity optional guess the type from the geenric--> + <cascade> + <cascade-persist/> + </cascade> + </one-to-many> + <many-to-one name="shop"/> + <element-collection name="notes"/> <!-- new in JPA 2 --> + </attributes> + </entity> +</entity-mappings> + + + <!-- +public class Order { + long id; + Set<Item> items; + boolean filled; + Date date; + List<String> notes; + Shop shop; +} --> \ No newline at end of file Added: workspace/max/jpaap/demo/src/Test.java =================================================================== --- workspace/max/jpaap/demo/src/Test.java (rev 0) +++ workspace/max/jpaap/demo/src/Test.java 2009-01-28 14:40:59 UTC (rev 13305) @@ -0,0 +1,146 @@ +import static javax.jpa.criteria.JoinType.*; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.Set; + +import javax.jpa.criteria.Expression; +import javax.jpa.criteria.Join; +import javax.jpa.criteria.ListJoin; +import javax.jpa.criteria.Path; +import javax.jpa.criteria.Query; +import javax.jpa.criteria.QueryBuilder; +import javax.jpa.criteria.Root; +import javax.jpa.metamodel.Entity; + +import model.metamodel.Item_; +import model.metamodel.Order_; +import model.metamodel.Product_; +import model.metamodel.Shop_; +import model.Item; +import model.Order; +import model.Product; + +/** + * Writing queries involves passing typesafe, statically cached, metamodel + * objects to the query builder in order to create the various parts of + * the query. The typesafe metamodel objects were validated at init time, + * so it is impossible to build invalid queries in the application code. + */ +public class Test { + + QueryBuilder qb; + + public void test() { + Query q = qb.create(); + + Root<Order> order = q.addRoot(Order.class); + Join<Item, Product> product = order.join(Order_.items) + .join(Item_.product); + + Path<BigDecimal> price = product.get(Product_.price); + Path<Boolean> filled = order.get(Order_.filled); + Path<Date> date = order.get(Order_.date); + + q.select(order, product) + .where( qb.and( qb.gt(price, 100.00), qb.not(filled) ) ) + .order( qb.ascending(price), qb.descending(date) ); + } + + public void testUntypesafe() { + Query q = qb.create(); + + Root<Order> order = q.addRoot(Order.class); + Join<Item, Product> product = order.join("items") + .join("product"); + + Path<BigDecimal> price = product.get("price"); + Path<Boolean> filled = order.get("filled"); + Path<Date> date = order.get("date"); + + q.select(order, product) + .where( qb.and( qb.gt(price, 100.00), qb.not(filled) ) ) + .order( qb.ascending(price), qb.descending(date) ); + } + + /** + * Navigation by joining + */ + public void test2() { + Query q = qb.create(); + + Root<Product> product = q.addRoot(Product.class); + Join<Item, Order> order = product.join(Product_.items) + .join(Item_.order); + + q.select(product) + .where( qb.equal(order.get(Order_.id), 12345l) ); + } + + public void testMap() { + Query q = qb.create(); + + Root<Item> item = q.addRoot(Item.class); + Join<Item, Order> io = item.join(Item_.namedOrders); + + } + + /** + * Navigation by compound Path + */ + public void test3() { + Query q = qb.create(); + + Root<Item> item = q.addRoot(Item.class); + Path<String> shopName = item.get(Item_.order) + .get(Order_.shop) + .get(Shop_.name); + q.select(item) + .where( qb.equal(shopName, "amazon.com") ); + } + + public void test4() { + Query q = qb.create(); + + Root<Order> order = q.addRoot(Order.class); + ListJoin<Order, String> note = order.join(Order_.notes); + Expression<Set<Item>> items = order.get(Order_.items); + order.fetch(Order_.items, inner); + + q.select(note) + .where( qb.and( qb.lt(note.index(), 10), qb.isNotEmpty(items) ) ); + } + + public void test4Untypesafe() { + Query q = qb.create(); + + Root<Order> order = q.addRoot(Order.class); + ListJoin<Order, String> note = order.joinList("notes"); + Expression<Set<Item>> items = order.get("items"); + order.fetch("items", inner); + + q.select(note) + .where( qb.and( qb.lt(note.index(), 10), qb.isNotEmpty(items) ) ); + } + + /*public void test5() { + Expression<Long> l= null; + Expression<Integer> i= null; + Expression<Float> x= null; + Expression<Float> y= null; + + Expression<Number> n; + Expression<Float> f; + Expression<String> s = null; + + n = qb.quot(l, i); + + f = qb.sum(x, y); + + n = qb.quot(x, y); + + javax.jpa.criteria.Order o = qb.asc(n); + javax.jpa.criteria.Order p = qb.ascending(s); + }*/ + +} Added: workspace/max/jpaap/demo/src/model/Item.java =================================================================== --- workspace/max/jpaap/demo/src/model/Item.java (rev 0) +++ workspace/max/jpaap/demo/src/model/Item.java 2009-01-28 14:40:59 UTC (rev 13305) @@ -0,0 +1,63 @@ +package model; + +import java.util.Map; +import java.util.Set; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; + +@Entity +public class Item { + + long _id; + + int _quantity; + + Product _product; + + Order _order; + + @Id + public long getId() { + return _id; + } + + public void setId(long id) { + this._id = id; + } + + public int getQuantity() { + return _quantity; + } + + public void setQuantity(int quantity) { + this._quantity = quantity; + } + + @ManyToOne + public Product getProduct() { + return _product; + } + + public void setProduct(Product product) { + this._product = product; + } + + @ManyToOne + public Order getOrder() { + return _order; + } + + public void setOrder(Order order) { + this._order = order; + } + + @OneToMany + public Map<String, Order> getNamedOrders() { + return null; + } + + +} Added: workspace/max/jpaap/demo/src/model/Order.java =================================================================== --- workspace/max/jpaap/demo/src/model/Order.java (rev 0) +++ workspace/max/jpaap/demo/src/model/Order.java 2009-01-28 14:40:59 UTC (rev 13305) @@ -0,0 +1,28 @@ +package model; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; +import java.util.Date; +import java.util.List; +import java.util.Set; + +//@Entity +public class Order { + + //@Id + long id; + + //@OneToMany + Set<Item> items; + + boolean filled; + Date date; + + //@OneToMany + List<String> notes; + + //@ManyToOne + Shop shop; +} Added: workspace/max/jpaap/demo/src/model/Product.java =================================================================== --- workspace/max/jpaap/demo/src/model/Product.java (rev 0) +++ workspace/max/jpaap/demo/src/model/Product.java 2009-01-28 14:40:59 UTC (rev 13305) @@ -0,0 +1,27 @@ +package model; + +import java.math.BigDecimal; +import java.util.Set; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; + +@Entity +public class Product { + + @Id + long id; + + int test; + + String description; + BigDecimal price; + + @ManyToOne + Shop shop; + + @OneToMany + Set<Item> items; +} Added: workspace/max/jpaap/demo/src/model/Shop.java =================================================================== --- workspace/max/jpaap/demo/src/model/Shop.java (rev 0) +++ workspace/max/jpaap/demo/src/model/Shop.java 2009-01-28 14:40:59 UTC (rev 13305) @@ -0,0 +1,12 @@ +package model; + +import javax.persistence.Entity; +import javax.persistence.Id; + +@Entity +public class Shop { + @Id + long id; + String name; +} + \ No newline at end of file Modified: workspace/max/jpaap/jpaap/.classpath =================================================================== --- workspace/max/jpaap/jpaap/.classpath 2009-01-28 11:06:19 UTC (rev 13304) +++ workspace/max/jpaap/jpaap/.classpath 2009-01-28 14:40:59 UTC (rev 13305) @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src"/> + <classpathentry kind="src" path="target/gen-src"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry combineaccessrules="false" kind="src" path="/javax.persistence"/> Modified: workspace/max/jpaap/jpaap/.project =================================================================== --- workspace/max/jpaap/jpaap/.project 2009-01-28 11:06:19 UTC (rev 13304) +++ workspace/max/jpaap/jpaap/.project 2009-01-28 14:40:59 UTC (rev 13305) @@ -9,20 +9,9 @@ <name>org.eclipse.jdt.core.javabuilder</name> <arguments> </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> + </buildCommand> </buildSpec> <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> </natures> </projectDescription> Modified: workspace/max/jpaap/jpaap/build.xml =================================================================== --- workspace/max/jpaap/jpaap/build.xml 2009-01-28 11:06:19 UTC (rev 13304) +++ workspace/max/jpaap/jpaap/build.xml 2009-01-28 14:40:59 UTC (rev 13305) @@ -32,7 +32,9 @@ <!-- JAXB SOURCE GENERATION --> <target name="jaxb" depends="init"> <mkdir dir="${gen.dir}"/> - <exec executable="${java.home}/bin/xjc"> + <exec executable="xjc"> + <arg value="-p"/> + <arg value="org.jboss.jpa.metamodel.xml.jaxb"/> <arg value="-d"/> <arg value="${gen.dir}"/> <arg value="${resource.dir}/orm_2_0.xsd"/> @@ -49,6 +51,7 @@ <mkdir dir="${classes.dir}"/> <echo message="${ant.project.name}: ${ant.file}"/> <javac debug="true" debuglevel="${debuglevel}" destdir="${classes.dir}" source="${source}" target="${target}"> + <compilerarg value="-proc:none"/> <!-- Needed to not have the annotation processor run while we are compiling it --> <src path="${src.dir}"/> <src path="${gen.dir}"/> <classpath refid="lib.path"/> Modified: workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/ImportContextImpl.java =================================================================== --- workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/ImportContextImpl.java 2009-01-28 11:06:19 UTC (rev 13304) +++ workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/ImportContextImpl.java 2009-01-28 14:40:59 UTC (rev 13305) @@ -51,6 +51,8 @@ public String importType(String fqcn) { String result = fqcn; + //if(fqcn==null) return "/** (null) **/"; + String additionalTypePart = null; if(fqcn.indexOf('<')>=0) { additionalTypePart = result.substring(fqcn.indexOf('<')); Modified: workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/JPAMetaModelEntityProcessor.java =================================================================== --- workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/JPAMetaModelEntityProcessor.java 2009-01-28 11:06:19 UTC (rev 13304) +++ workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/JPAMetaModelEntityProcessor.java 2009-01-28 14:40:59 UTC (rev 13305) @@ -1,8 +1,7 @@ package org.jboss.jpa.metamodel.ap; -import com.sun.java.xml.ns.persistence.orm.EntityMappings; -import com.sun.java.xml.ns.persistence.orm.Entity; + import static javax.lang.model.SourceVersion.RELEASE_6; import java.io.*; @@ -17,43 +16,72 @@ import javax.lang.model.util.Elements; import javax.tools.Diagnostic; import javax.tools.FileObject; +import javax.tools.StandardLocation; +import javax.tools.JavaFileManager.Location; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; import javax.xml.bind.Unmarshaller; import org.jboss.jpa.metamodel.ap.annotation.MetaEntity; import org.jboss.jpa.metamodel.ap.xml.XmlMetaEntity; +import org.jboss.jpa.metamodel.xml.jaxb.Entity; +import org.jboss.jpa.metamodel.xml.jaxb.EntityMappings; +import org.jboss.jpa.metamodel.xml.jaxb.ObjectFactory; -(a)SupportedAnnotationTypes(&quot;javax.persistence.Entity&quot;) +//(a)SupportedAnnotationTypes(&quot;javax.persistence.Entity&quot;) +@SupportedAnnotationTypes("*") // TODO: this is not very effective @SupportedSourceVersion(RELEASE_6) public class JPAMetaModelEntityProcessor extends AbstractProcessor { - private static final String ORM_XML_LOCATION = "/META-INF/orm.xml"; + //private static final String ORM_XML_LOCATION = "/META-INF/orm.xml"; private static final Map<String, IMetaEntity> metaEntities = new HashMap<String, IMetaEntity>(); private boolean ormProcessed = false; public JPAMetaModelEntityProcessor() { + System.out.println("Created Processor " + this); } - public void init(ProcessingEnvironment env) { + public void init(ProcessingEnvironment env) { super.init(env); - parsingOrmXml(); + System.out.println("Init Processor " + this); } + + private void parsingOrmXmls() { + //make sure that we process ORM files only once per round + if (ormProcessed) return; + parsingOrmXml("/META-INF", "orm.xml"); + //simulate 20 different ORM files to parse + //Removed since these causes issues in Eclipse APT + //for (int i = 1 ; i <= 20 ; i++) parsingOrmXml("/model" + i , "orm.xml"); + + ormProcessed = true; + } /** * Tries to check whether a orm.xml file exists and parses it using JAXB */ - private void parsingOrmXml() { - processingEnv.getMessager().printMessage(Diagnostic.Kind.NOTE, "Checking for orm.xml"); - InputStream ormStream = this.getClass().getResourceAsStream(ORM_XML_LOCATION); + private void parsingOrmXml(String pkg, String name) { + String resource = pkg +"/"+name; + processingEnv.getMessager().printMessage(Diagnostic.Kind.NOTE, "XYZ Checking for " + resource); + + InputStream ormStream = null; + try { + FileObject resource2 = processingEnv.getFiler().getResource(StandardLocation.CLASS_OUTPUT, pkg, name); + ormStream = resource2.openInputStream(); + } catch (IOException e1) { + processingEnv.getMessager().printMessage(Diagnostic.Kind.WARNING, "Could not locate " + resource + " via APT api"); + //TODO: possible remove this fallback since it should not be needed. + ormStream = this.getClass().getResourceAsStream(resource); + } + if (ormStream == null) { - processingEnv.getMessager().printMessage(Diagnostic.Kind.NOTE, "No orm.xml found."); + processingEnv.getMessager().printMessage(Diagnostic.Kind.NOTE, resource + " not found."); return; } try { - JAXBContext jc = JAXBContext.newInstance(com.sun.java.xml.ns.persistence.orm.ObjectFactory.class); + JAXBContext jc = JAXBContext.newInstance(ObjectFactory.class); Unmarshaller unmarshaller = jc.createUnmarshaller(); EntityMappings mappings = (EntityMappings) unmarshaller.unmarshal(ormStream); Collection<Entity> entities = mappings.getEntity(); @@ -70,6 +98,12 @@ } catch (JAXBException e) { processingEnv.getMessager().printMessage(Diagnostic.Kind.NOTE, "Error unmarshalling orm.xml"); e.printStackTrace(); + } catch (Exception e) { + processingEnv.getMessager().printMessage( + Diagnostic.Kind.ERROR, + "Problem while reading " + resource + " " + e.getMessage()); + e.printStackTrace(); + //TODO: too bad you can't mark resources as having issues } } @@ -86,9 +120,14 @@ if (aRoundEnvironment.processingOver()) { - return false; + //assuming that when processing is over, we are done and clear resources like ORM parsing + //we could keep some ORM parsing in memory but how to detect that a file has changed / not changed? + ormProcessed = false; + metaEntities.clear(); + processingEnv.getMessager().printMessage(Diagnostic.Kind.NOTE, "Clear ORM processing resources"); + return false; } - + parsingOrmXmls(); Set<? extends Element> elements = aRoundEnvironment.getRootElements(); for (Element element : elements) { @@ -147,7 +186,7 @@ Diagnostic.Kind.ERROR, "Problem opening file to write MetaModel for " + entity.getSimpleName() + ioEx.getMessage()); - } + } } /** Modified: workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/xml/XmlMetaEntity.java =================================================================== --- workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/xml/XmlMetaEntity.java 2009-01-28 11:06:19 UTC (rev 13304) +++ workspace/max/jpaap/jpaap/src/org/jboss/jpa/metamodel/ap/xml/XmlMetaEntity.java 2009-01-28 14:40:59 UTC (rev 13305) @@ -17,7 +17,7 @@ */ package org.jboss.jpa.metamodel.ap.xml; -import com.sun.java.xml.ns.persistence.orm.*; +import org.jboss.jpa.metamodel.xml.jaxb.*; import org.jboss.jpa.metamodel.ap.IMetaEntity; import org.jboss.jpa.metamodel.ap.IMetaMember; import org.jboss.jpa.metamodel.ap.ImportContext; Property changes on: workspace/max/jpaap/test ___________________________________________________________________ Name: svn:ignore - build bin target + build bin target .apt_generated gen-src Modified: workspace/max/jpaap/test/.classpath =================================================================== --- workspace/max/jpaap/test/.classpath 2009-01-28 11:06:19 UTC (rev 13304) +++ workspace/max/jpaap/test/.classpath 2009-01-28 14:40:59 UTC (rev 13305) @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry excluding="**/*.class" kind="src" path="build/classes"/> <classpathentry kind="src" path="src"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="src" path="gen-src"> @@ -8,7 +7,7 @@ <attribute name="optional" value="true"/> </attributes> </classpathentry> - <classpathentry combineaccessrules="false" kind="src" path="/javax.persistence"/> <classpathentry combineaccessrules="false" kind="src" path="/jpaap"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="lib" path="/javax.persistence/target/jpa.jar"/> + <classpathentry kind="output" path="build/eclipse/classes"/> </classpath> Modified: workspace/max/jpaap/test/.factorypath =================================================================== --- workspace/max/jpaap/test/.factorypath 2009-01-28 11:06:19 UTC (rev 13304) +++ workspace/max/jpaap/test/.factorypath 2009-01-28 14:40:59 UTC (rev 13305) @@ -1,4 +1,4 @@ <factorypath> - <factorypathentry kind="WKSPJAR" id="/jpaap/jpaap.jar" enabled="false" runInBatchMode="false"/> - <factorypathentry kind="WKSPJAR" id="/javax.persistence/jpa.jar" enabled="false" runInBatchMode="false"/> + <factorypathentry kind="WKSPJAR" id="/javax.persistence/target/jpa.jar" enabled="true" runInBatchMode="false"/> + <factorypathentry kind="WKSPJAR" id="/jpaap/target/jpaap.jar" enabled="true" runInBatchMode="false"/> </factorypath> Modified: workspace/max/jpaap/test/.settings/org.eclipse.jdt.apt.core.prefs =================================================================== --- workspace/max/jpaap/test/.settings/org.eclipse.jdt.apt.core.prefs 2009-01-28 11:06:19 UTC (rev 13304) +++ workspace/max/jpaap/test/.settings/org.eclipse.jdt.apt.core.prefs 2009-01-28 14:40:59 UTC (rev 13305) @@ -1,4 +1,4 @@ -#Fri Jan 16 13:37:51 CET 2009 +#Wed Jan 28 10:11:38 CET 2009 eclipse.preferences.version=1 org.eclipse.jdt.apt.aptEnabled=true org.eclipse.jdt.apt.genSrcDir=gen-src Modified: workspace/max/jpaap/test/.settings/org.eclipse.jdt.core.prefs =================================================================== --- workspace/max/jpaap/test/.settings/org.eclipse.jdt.core.prefs 2009-01-28 11:06:19 UTC (rev 13304) +++ workspace/max/jpaap/test/.settings/org.eclipse.jdt.core.prefs 2009-01-28 14:40:59 UTC (rev 13305) @@ -1,3 +1,3 @@ -#Fri Jan 16 13:37:51 CET 2009 +#Wed Jan 28 10:11:38 CET 2009 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.processAnnotations=enabled Modified: workspace/max/jpaap/test/test jpa-build.xml.launch =================================================================== --- workspace/max/jpaap/test/test jpa-build.xml.launch 2009-01-28 11:06:19 UTC (rev 13304) +++ workspace/max/jpaap/test/test jpa-build.xml.launch 2009-01-28 14:40:59 UTC (rev 13305) @@ -2,18 +2,13 @@ <launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType"> <booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/> <stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${workspace}"/> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> -<listEntry value="/test/jpa-build.xml"/> -</listAttribute> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> -<listEntry value="1"/> -</listAttribute> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"/> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"/> <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/> +<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre6"/> <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="test"/> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/> -<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_NAME" value="jdk-1.6.0_10"/> -<stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_TYPE_ID" value="org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType"/> <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/test/jpa-build.xml}"/> <stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/> </launchConfiguration>