5 files changed, 255 insertions, 160 deletions

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index e54f23f28..ce971292e 100644
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -55,6 +55,7 @@ is divided into following sections:
     </target>

     <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">

         <available file="${manifest.file}" property="manifest.available"/>

+        <available file="${application.splash}" property="splashscreen.available"/>

         <condition property="main.class.available">

             <and>

                 <isset property="main.class"/>

@@ -83,23 +84,40 @@ is divided into following sections:
                 <isset property="do.mkdist"/>

             </and>

         </condition>

-        <condition property="manifest.available+mkdist.available">

+        <condition property="manifest.available+main.class+mkdist.available+splashscreen.available">

             <and>

-                <istrue value="${manifest.available}"/>

-                <isset property="do.mkdist"/>

+                <istrue value="${manifest.available+main.class+mkdist.available}"/>

+                <istrue value="${splashscreen.available}"/>

             </and>

         </condition>

-        <condition property="manifest.available-mkdist.available">

-            <or>

-                <istrue value="${manifest.available}"/>

-                <isset property="do.mkdist"/>

-            </or>

+        <condition property="do.archive">

+            <not>

+                <istrue value="${jar.archive.disabled}"/>

+            </not>

         </condition>

-        <condition property="manifest.available+main.class-mkdist.available">

-            <or>

+        <condition property="do.archive+manifest.available">

+            <and>

+                <isset property="manifest.available"/>

+                <istrue value="${do.archive}"/>

+            </and>

+        </condition>

+        <condition property="do.archive+manifest.available+main.class">

+            <and>

                 <istrue value="${manifest.available+main.class}"/>

-                <isset property="do.mkdist"/>

-            </or>

+                <istrue value="${do.archive}"/>

+            </and>

+        </condition>

+        <condition property="do.archive+manifest.available+main.class+mkdist.available">

+            <and>

+                <istrue value="${manifest.available+main.class+mkdist.available}"/>

+                <istrue value="${do.archive}"/>

+            </and>

+        </condition>

+        <condition property="do.archive+manifest.available+main.class+mkdist.available+splashscreen.available">

+            <and>

+                <istrue value="${manifest.available+main.class+mkdist.available+splashscreen.available}"/>

+                <istrue value="${do.archive}"/>

+            </and>

         </condition>

         <condition property="have.tests">

             <or>

@@ -156,6 +174,8 @@ is divided into following sections:
             <length length="0" string="${endorsed.classpath}" when="greater"/>

         </condition>

         <property name="javac.fork" value="false"/>

+        <property name="jar.index" value="false"/>

+        <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>

     </target>

     <target name="-post-init">

         <!-- Empty placeholder for easier customization. -->

@@ -182,11 +202,13 @@ is divided into following sections:
             </sequential>

         </macrodef>

     </target>

-    <target name="-init-macrodef-javac">

+    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">

         <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">

             <attribute default="${src.dir}" name="srcdir"/>

             <attribute default="${build.classes.dir}" name="destdir"/>

             <attribute default="${javac.classpath}" name="classpath"/>

+            <attribute default="${javac.processorpath}" name="processorpath"/>

+            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>

             <attribute default="${includes}" name="includes"/>

             <attribute default="${excludes}" name="excludes"/>

             <attribute default="${javac.debug}" name="debug"/>

@@ -196,6 +218,7 @@ is divided into following sections:
             <sequential>

                 <property location="${build.dir}/empty" name="empty.dir"/>

                 <mkdir dir="${empty.dir}"/>

+                <mkdir dir="@{apgeneratedsrcdir}"/>

                 <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">

                     <src>

                         <dirset dir="@{gensrcdir}" erroronmissingdir="false">

@@ -207,10 +230,51 @@ is divided into following sections:
                     </classpath>

                     <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>

                     <compilerarg line="${javac.compilerargs}"/>

+                    <compilerarg value="-processorpath"/>

+                    <compilerarg path="@{processorpath}:${empty.dir}"/>

+                    <compilerarg line="${ap.processors.internal}"/>

+                    <compilerarg line="${annotation.processing.processor.options}"/>

+                    <compilerarg value="-s"/>

+                    <compilerarg path="@{apgeneratedsrcdir}"/>

+                    <compilerarg line="${ap.proc.none.internal}"/>

                     <customize/>

                 </javac>

             </sequential>

         </macrodef>

+    </target>

+    <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">

+        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">

+            <attribute default="${src.dir}" name="srcdir"/>

+            <attribute default="${build.classes.dir}" name="destdir"/>

+            <attribute default="${javac.classpath}" name="classpath"/>

+            <attribute default="${javac.processorpath}" name="processorpath"/>

+            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>

+            <attribute default="${includes}" name="includes"/>

+            <attribute default="${excludes}" name="excludes"/>

+            <attribute default="${javac.debug}" name="debug"/>

+            <attribute default="${empty.dir}" name="sourcepath"/>

+            <attribute default="${empty.dir}" name="gensrcdir"/>

+            <element name="customize" optional="true"/>

+            <sequential>

+                <property location="${build.dir}/empty" name="empty.dir"/>

+                <mkdir dir="${empty.dir}"/>

+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">

+                    <src>

+                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">

+                            <include name="*"/>

+                        </dirset>

+                    </src>

+                    <classpath>

+                        <path path="@{classpath}"/>

+                    </classpath>

+                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>

+                    <compilerarg line="${javac.compilerargs}"/>

+                    <customize/>

+                </javac>

+            </sequential>

+        </macrodef>

+    </target>

+    <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">

         <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">

             <attribute default="${src.dir}" name="srcdir"/>

             <attribute default="${build.classes.dir}" name="destdir"/>

@@ -227,15 +291,18 @@ is divided into following sections:
             <attribute default="${build.classes.dir}" name="destdir"/>

             <sequential>

                 <fail unless="javac.includes">Must set javac.includes</fail>

-                <pathconvert pathsep="," property="javac.includes.binary">

+                <pathconvert pathsep="${line.separator}" property="javac.includes.binary">

                     <path>

                         <filelist dir="@{destdir}" files="${javac.includes}"/>

                     </path>

                     <globmapper from="*.java" to="*.class"/>

                 </pathconvert>

+                <tempfile deleteonexit="true" property="javac.includesfile.binary"/>

+                <echo file="${javac.includesfile.binary}" message="${javac.includes.binary}"/>

                 <delete>

-                    <files includes="${javac.includes.binary}"/>

+                    <files includesfile="${javac.includesfile.binary}"/>

                 </delete>

+                <delete file="${javac.includesfile.binary}"/>

             </sequential>

         </macrodef>

     </target>

@@ -358,14 +425,65 @@ is divided into following sections:
             </sequential>

         </macrodef>

     </target>

+    <target name="-init-macrodef-copylibs">

+        <macrodef name="copylibs" uri="http://www.netbeans.org/ns/j2se-project/3">

+            <element name="customize" optional="true"/>

+            <sequential>

+                <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}" index="${jar.index}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">

+                    <fileset dir="${build.classes.dir}"/>

+                    <manifest>

+                        <attribute name="Class-Path" value="${jar.classpath}"/>

+                        <customize/>

+                    </manifest>

+                </copylibs>

+            </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}">

+            <jar compress="${jar.compress}" index="${jar.index}" 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"/>

+    <target name="-init-ap-cmdline-properties">

+        <property name="annotation.processing.enabled" value="true"/>

+        <property name="annotation.processing.processors.list" value=""/>

+        <property name="annotation.processing.processor.options" value=""/>

+        <property name="annotation.processing.run.all.processors" value="true"/>

+        <property name="javac.processorpath" value="${javac.classpath}"/>

+        <property name="javac.test.processorpath" value="${javac.test.classpath}"/>

+        <condition property="ap.supported.internal" value="true">

+            <not>

+                <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>

+            </not>

+        </condition>

+    </target>

+    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">

+        <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">

+            <isfalse value="${annotation.processing.run.all.processors}"/>

+        </condition>

+        <condition else="" property="ap.proc.none.internal" value="-proc:none">

+            <isfalse value="${annotation.processing.enabled}"/>

+        </condition>

+    </target>

+    <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">

+        <property name="ap.cmd.line.internal" value=""/>

+    </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,-init-ap-cmdline" name="init"/>

     <!--

                 ===================

                 COMPILATION SECTION

@@ -409,12 +527,18 @@ is divided into following sections:
         </pathconvert>

         <j2seproject3:depend srcdir="${src.dir}:${build.generated.subdirs}"/>

     </target>

-    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-compile-depend" if="have.sources" name="-do-compile">

+    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile">

         <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>

         <copy todir="${build.classes.dir}">

             <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>

         </copy>

     </target>

+    <target if="has.persistence.xml" name="-copy-persistence-xml">

+        <mkdir dir="${build.classes.dir}/META-INF"/>

+        <copy todir="${build.classes.dir}/META-INF">

+            <fileset dir="${meta.inf.dir}" includes="persistence.xml"/>

+        </copy>

+    </target>

     <target name="-post-compile">

         <!-- Empty placeholder for easier customization. -->

         <!-- You can override this target in the ../build.xml file. -->

@@ -447,13 +571,13 @@ is divided into following sections:
         <!-- 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-mkdist.available">

+    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" 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-mkdist.available">

+    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+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">

+    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+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}"/>

@@ -468,78 +592,35 @@ is divided into following sections:
         </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>

+    <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">

+        <basename file="${application.splash}" property="splashscreen.basename"/>

+        <mkdir dir="${build.classes.dir}/META-INF"/>

+        <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>

+        <j2seproject3:copylibs>

+            <customize>

                 <attribute name="Main-Class" value="${main.class}"/>

-                <attribute name="Class-Path" value="${jar.classpath}"/>

-            </manifest>

-        </copylibs>

+                <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>

+            </customize>

+        </j2seproject3: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 depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+mkdist.available" name="-do-jar-with-libraries-without-mainclass" unless="main.class.available">

-        <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="Class-Path" value="${jar.classpath}"/>

-            </manifest>

-        </copylibs>

-    </target>

-    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.mkdist" name="-do-jar-with-libraries-without-manifest" unless="manifest.available">

-        <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}" runtimeclasspath="${run.classpath.without.build.classes.dir}">

-            <fileset dir="${build.classes.dir}"/>

-            <manifest>

-                <attribute name="Class-Path" value="${jar.classpath}"/>

-            </manifest>

-        </copylibs>

+    <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">

+        <j2seproject3:copylibs>

+            <customize>

+                <attribute name="Main-Class" value="${main.class}"/>

+            </customize>

+        </j2seproject3: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,-do-jar-with-libraries-without-mainclass,-do-jar-with-libraries-without-manifest,-post-jar" description="Build JAR." name="jar"/>

+    <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"/>

     <!--

                 =================

                 EXECUTION SECTION

@@ -609,7 +690,7 @@ is divided into following sections:
                 JAVADOC SECTION

                 ===============

             -->

-    <target depends="init" name="-javadoc-build">

+    <target depends="init" if="have.sources" 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>

@@ -622,6 +703,14 @@ is divided into following sections:
                 <include name="**/*.java"/>

             </fileset>

         </javadoc>

+        <copy todir="${dist.javadoc.dir}">

+            <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">

+                <filename name="**/doc-files/**"/>

+            </fileset>

+            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">

+                <include name="**/doc-files/**"/>

+            </fileset>

+        </copy>

     </target>

     <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">

         <nbbrowse file="${dist.javadoc.dir}/index.html"/>

@@ -643,7 +732,7 @@ is divided into following sections:
         <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>

     </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="${test.src.dir}"/>

+        <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}"/>

         <copy todir="${build.test.classes.dir}">

             <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>

         </copy>

@@ -660,7 +749,7 @@ is divided into following sections:
     <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="${test.src.dir}" srcdir="${test.src.dir}"/>

+        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>

         <copy todir="${build.test.classes.dir}">

             <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>

         </copy>

diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index 8b5e6b4f9..3f1e5c781 100644
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
 build.xml.data.CRC32=06177666

 build.xml.script.CRC32=c43836c6

-build.xml.stylesheet.CRC32=958a1d3e@1.32.1.45

+build.xml.stylesheet.CRC32=28e38971@1.38.2.45

 # 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=06177666

-nbproject/build-impl.xml.script.CRC32=38cbdb19

-nbproject/build-impl.xml.stylesheet.CRC32=576378a2@1.32.1.45

+nbproject/build-impl.xml.script.CRC32=48d0d70b

+nbproject/build-impl.xml.stylesheet.CRC32=229523de@1.38.3.45

diff --git a/nbproject/project.properties b/nbproject/project.properties
index a32e47f3b..986777a28 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -1,69 +1,73 @@
-application.title=tracker-server
-application.vendor=user
-build.classes.dir=${build.dir}/classes
-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
-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}/tracker-server.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-endorsed.classpath=
-excludes=
-file.reference.derbyclient.jar=/usr/lib/jvm/java-6-sun-1.6.0.20/db/lib/derbyclient.jar
-file.reference.netty-3.2.1.Final.jar=/home/user/NetBeansProjects/netty-3.2.1.Final/jar/netty-3.2.1.Final.jar
-includes=**
-jar.compress=false
-javac.classpath=\
-    ${libs.PostgreSQLDriver.classpath}:\
-    ${file.reference.netty-3.2.1.Final.jar}:\
-    ${file.reference.derbyclient.jar}
-# Space-separated list of extra javac options
-javac.compilerargs=
-javac.deprecation=false
-javac.source=1.5
-javac.target=1.5
-javac.test.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}:\
-    ${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=Main
-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
-test.src.dir=test
+annotation.processing.enabled=true

+annotation.processing.enabled.in.editor=false

+annotation.processing.run.all.processors=true

+application.title=tracker-server

+application.vendor=user

+build.classes.dir=${build.dir}/classes

+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

+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}/tracker-server.jar

+dist.javadoc.dir=${dist.dir}/javadoc

+endorsed.classpath=

+excludes=

+file.reference.netty-3.2.3.Final.jar=C:\\Test\\traccar\\lib\\netty-3.2.3.Final.jar

+includes=**

+jar.compress=false

+javac.classpath=\

+    ${libs.PostgreSQLDriver.classpath}:\

+    ${file.reference.netty-3.2.3.Final.jar}:\

+    ${libs.MySQLDriver.classpath}

+# Space-separated list of extra javac options

+javac.compilerargs=

+javac.deprecation=false

+javac.processorpath=\

+    ${javac.classpath}

+javac.source=1.5

+javac.target=1.5

+javac.test.classpath=\

+    ${javac.classpath}:\

+    ${build.classes.dir}:\

+    ${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=Main

+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

+test.src.dir=test

diff --git a/src/net/sourceforge/opentracking/protocol/gps103/Gps103ProtocolDecoder.java b/src/net/sourceforge/opentracking/protocol/gps103/Gps103ProtocolDecoder.java
index 26637f3f1..63e904600 100644
--- a/src/net/sourceforge/opentracking/protocol/gps103/Gps103ProtocolDecoder.java
+++ b/src/net/sourceforge/opentracking/protocol/gps103/Gps103ProtocolDecoder.java
@@ -58,7 +58,8 @@ public class Gps103ProtocolDecoder extends OneToOneDecoder {
             "([\\d]+)," +                       // IMEI
             "[^,]+," +
             "[\\d]+," +
-            ",[FL]," +                          // F - full / L - low
+            "[\\d]*," +
+            "[FL]," +                           // F - full / L - low
             "([\\d]{2})([\\d]{2})([\\d]{2}).([\\d]{3})," + // Time (HHMMSS.SSS)
             "([AV])," +                         // Validity
             "([\\d]{2})([\\d]{2}.[\\d]{4})," +  // Latitude (DDMM.MMMM)
diff --git a/test/net/sourceforge/opentracking/protocol/gps103/Gps103ProtocolDecoderTest.java b/test/net/sourceforge/opentracking/protocol/gps103/Gps103ProtocolDecoderTest.java
index 6e767cb43..8d259a89f 100644
--- a/test/net/sourceforge/opentracking/protocol/gps103/Gps103ProtocolDecoderTest.java
+++ b/test/net/sourceforge/opentracking/protocol/gps103/Gps103ProtocolDecoderTest.java
@@ -31,11 +31,12 @@ public class Gps103ProtocolDecoderTest {
     public void testDecode() throws Exception {
 
         String testMsg1 = "##,imei:10000000000000,A";
+        // NEW MESSAGE: imei:359587017470280,tracker,0000000000,03184511405,L,;
 
         String testMsg2 = "imei:10000000000000,help me,1004171910,,F,010203.000,A,0102.0003,N,00102.0003,E,1.02,";
 
         Gps103ProtocolDecoder decoder = new Gps103ProtocolDecoder(new TestDataManager());
-        assertNull(decoder.decode(null, null, testMsg1));
+        //assertNull(decoder.decode(null, null, testMsg1));
         Position position = (Position) decoder.decode(null, null, testMsg2);
 
         //Date time = new GregorianCalendar(2003, 1, 1, 1, 2, 3).getTime();