updated project files + .gitignore

diff --git a/.gitignore b/.gitignore
index b6e8691ab47c836bb5a32451aecf3023a1ba123b..0383bcc9e4d5d046929d1f5b3102c94012efafb2 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 /nbproject/private/
+/nbproject/*~
 /manifest.mf
 /build/
-/data/*.*
 /dist/
+/data/*
 /*.properties

diff --git a/nbproject/ant-deploy.xml b/nbproject/ant-deploy.xml
index 3c01560598dfb6e9553a981b2c724a341cd8a592..2d5f8778d18757ea5ded4eea4da13ca1adc51093 100644 (file)
--- a/nbproject/ant-deploy.xml
+++ b/nbproject/ant-deploy.xml
@@ -1,111 +1,111 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project default="-deploy-ant" basedir=".">
-       <target name="-init-cl-deployment-env" if="deploy.ant.enabled">
-               <property file="${deploy.ant.properties.file}" />
-               <available file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" property="sun.web.present"/>
-               <available file="${deploy.ant.docbase.dir}/WEB-INF/glassfish-web.xml" property="glassfish.web.present"/>
-               <available file="${deploy.ant.resource.dir}" property="has.setup"/>
-               <tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
-               <echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
-       </target>
+    <target name="-init-cl-deployment-env" if="deploy.ant.enabled">
+        <property file="${deploy.ant.properties.file}" />
+        <available file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" property="sun.web.present"/>
+        <available file="${deploy.ant.docbase.dir}/WEB-INF/glassfish-web.xml" property="glassfish.web.present"/>
+        <available file="${deploy.ant.resource.dir}" property="has.setup"/>
+        <tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
+        <echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
+    </target>
+    
+    <target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
+        <tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
+        <copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
+        <!-- The doctype triggers resolution which can fail -->
+        <replace file="${temp.sun.web}">
+            <replacetoken><![CDATA[<!DOCTYPE]]></replacetoken>
+            <replacevalue><![CDATA[<!-- <!DOCTYPE]]></replacevalue>
+        </replace>
+        <replace file="${temp.sun.web}">
+            <replacetoken><![CDATA[<sun-web-app]]></replacetoken>
+            <replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
+        </replace>
+        <xmlproperty file="${temp.sun.web}" validate="false">
+        </xmlproperty>    
+        <delete file="${temp.sun.web}"/>
+        <condition property="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}" else="${gfv3.url}/${ant.project.name}">
+            <isset property="sun-web-app.context-root"/>
+        </condition>
+        <condition property="deploy.context.root.argument" value="&amp;contextroot=${sun-web-app.context-root}" else="/${ant.project.name}">
+            <isset property="sun-web-app.context-root"/>
+        </condition>
+    </target>
+    <target name="-parse-glassfish-web" depends="-init-cl-deployment-env" if="glassfish.web.present">
+        <tempfile prefix="gfv3" property="temp.gf.web" destdir="${java.io.tmpdir}"/>
+        <copy file="${deploy.ant.docbase.dir}/WEB-INF/glassfish-web.xml" tofile="${temp.gf.web}"/>
+        <!-- The doctype triggers resolution which can fail -->
+        <replace file="${temp.gf.web}">
+            <replacetoken><![CDATA[<!DOCTYPE]]></replacetoken>
+            <replacevalue><![CDATA[<!-- <!DOCTYPE]]></replacevalue>
+        </replace>
+        <replace file="${temp.gf.web}">
+            <replacetoken><![CDATA[<glassfish-web-app]]></replacetoken>
+            <replacevalue><![CDATA[--> <glassfish-web-app]]></replacevalue>
+        </replace>
+        <xmlproperty file="${temp.gf.web}" validate="false">
+        </xmlproperty>
+        <delete file="${temp.gf.web}"/>
+        <condition property="deploy.ant.client.url" value="${gfv3.url}${glassfish-web-app.context-root}" else="${gfv3.url}/${ant.project.name}">
+            <isset property="glassfish-web-app.context-root"/>
+        </condition>
+        <condition property="deploy.context.root.argument" value="&amp;contextroot=${glassfish-web-app.context-root}" else="/${ant.project.name}">
+            <isset property="glassfish-web-app.context-root"/>
+        </condition>
+    </target>
+    <target name="-no-parse-sun-web" depends="-init-cl-deployment-env" unless="sun.web.present">
+        <property name="deploy.context.root.argument" value=""/>
+    </target>
+    <target name="-add-resources" depends="-init-cl-deployment-env" if="has.setup">
+        <tempfile prefix="gfv3" property="gfv3.resources.dir" destdir="${java.io.tmpdir}"/>
+        <mkdir dir="${gfv3.resources.dir}"/>
+        <mkdir dir="${gfv3.resources.dir}/META-INF"/>
+        <copy todir="${gfv3.resources.dir}/META-INF">
+            <fileset dir="${deploy.ant.resource.dir}"/>
+        </copy>
+        <jar destfile="${deploy.ant.archive}" update="true">
+            <fileset dir="${gfv3.resources.dir}"/>
+        </jar>
+        <delete dir="${gfv3.resources.dir}"/>
+    </target>
+    <target name="-deploy-ant" depends="-parse-glassfish-web, -parse-sun-web, -no-parse-sun-web,-add-resources" if="deploy.ant.enabled">
+        <antcall target="-deploy-without-pw"/>
+        <antcall target="-deploy-with-pw"/>
+    </target>
 
-       <target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
-               <tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
-               <copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
-               <!-- The doctype triggers resolution which can fail -->
-               <replace file="${temp.sun.web}">
-                       <replacetoken><![CDATA[<!DOCTYPE]]></replacetoken>
-                       <replacevalue><![CDATA[<!-- <!DOCTYPE]]></replacevalue>
-               </replace>
-               <replace file="${temp.sun.web}">
-                       <replacetoken><![CDATA[<sun-web-app]]></replacetoken>
-                       <replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
-               </replace>
-               <xmlproperty file="${temp.sun.web}" validate="false">
-               </xmlproperty>
-               <delete file="${temp.sun.web}"/>
-               <condition property="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}" else="${gfv3.url}/${ant.project.name}">
-                       <isset property="sun-web-app.context-root"/>
-               </condition>
-               <condition property="deploy.context.root.argument" value="&amp;contextroot=${sun-web-app.context-root}" else="/${ant.project.name}">
-                       <isset property="sun-web-app.context-root"/>
-               </condition>
-       </target>
-       <target name="-parse-glassfish-web" depends="-init-cl-deployment-env" if="glassfish.web.present">
-               <tempfile prefix="gfv3" property="temp.gf.web" destdir="${java.io.tmpdir}"/>
-               <copy file="${deploy.ant.docbase.dir}/WEB-INF/glassfish-web.xml" tofile="${temp.gf.web}"/>
-               <!-- The doctype triggers resolution which can fail -->
-               <replace file="${temp.gf.web}">
-                       <replacetoken><![CDATA[<!DOCTYPE]]></replacetoken>
-                       <replacevalue><![CDATA[<!-- <!DOCTYPE]]></replacevalue>
-               </replace>
-               <replace file="${temp.gf.web}">
-                       <replacetoken><![CDATA[<glassfish-web-app]]></replacetoken>
-                       <replacevalue><![CDATA[--> <glassfish-web-app]]></replacevalue>
-               </replace>
-               <xmlproperty file="${temp.gf.web}" validate="false">
-               </xmlproperty>
-               <delete file="${temp.gf.web}"/>
-               <condition property="deploy.ant.client.url" value="${gfv3.url}${glassfish-web-app.context-root}" else="${gfv3.url}/${ant.project.name}">
-                       <isset property="glassfish-web-app.context-root"/>
-               </condition>
-               <condition property="deploy.context.root.argument" value="&amp;contextroot=${glassfish-web-app.context-root}" else="/${ant.project.name}">
-                       <isset property="glassfish-web-app.context-root"/>
-               </condition>
-       </target>
-       <target name="-no-parse-sun-web" depends="-init-cl-deployment-env" unless="sun.web.present">
-               <property name="deploy.context.root.argument" value=""/>
-       </target>
-       <target name="-add-resources" depends="-init-cl-deployment-env" if="has.setup">
-               <tempfile prefix="gfv3" property="gfv3.resources.dir" destdir="${java.io.tmpdir}"/>
-               <mkdir dir="${gfv3.resources.dir}"/>
-               <mkdir dir="${gfv3.resources.dir}/META-INF"/>
-               <copy todir="${gfv3.resources.dir}/META-INF">
-                       <fileset dir="${deploy.ant.resource.dir}"/>
-               </copy>
-               <jar destfile="${deploy.ant.archive}" update="true">
-                       <fileset dir="${gfv3.resources.dir}"/>
-               </jar>
-               <delete dir="${gfv3.resources.dir}"/>
-       </target>
-       <target name="-deploy-ant" depends="-parse-glassfish-web, -parse-sun-web, -no-parse-sun-web,-add-resources" if="deploy.ant.enabled">
-               <antcall target="-deploy-without-pw"/>
-               <antcall target="-deploy-with-pw"/>
-       </target>
+    <target name="-deploy-without-pw" unless="gfv3.password">
+        <echo message="Deploying ${deploy.ant.archive}"/>
+        <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
+        <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
+        <get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&amp;force=true&amp;name=${ant.project.name}"
+            dest="${gfv3.results.file}"/>
+        <delete file="${gfv3.results.file}"/>    
+    </target>
+    <target name="-deploy-with-pw" if="gfv3.password">
+        <echo message="Deploying ${deploy.ant.archive}"/>
+        <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
+        <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
+        <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&amp;force=true&amp;name=${ant.project.name}"
+            dest="${gfv3.results.file}"/>
+        <delete file="${gfv3.results.file}"/>
+    </target>
+    <target name="-undeploy-ant" depends="-init-cl-deployment-env" if="deploy.ant.enabled">
+        <antcall target="-undeploy-without-pw"/>
+        <antcall target="-undeploy-with-pw"/>
+    </target>
 
-       <target name="-deploy-without-pw" unless="gfv3.password">
-               <echo message="Deploying ${deploy.ant.archive}"/>
-               <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
-               <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
-               <get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&amp;force=true&amp;name=${ant.project.name}"
-                        dest="${gfv3.results.file}"/>
-               <delete file="${gfv3.results.file}"/>
-       </target>
-       <target name="-deploy-with-pw" if="gfv3.password">
-               <echo message="Deploying ${deploy.ant.archive}"/>
-               <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
-               <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
-               <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&amp;force=true&amp;name=${ant.project.name}"
-                        dest="${gfv3.results.file}"/>
-               <delete file="${gfv3.results.file}"/>
-       </target>
-       <target name="-undeploy-ant" depends="-init-cl-deployment-env" if="deploy.ant.enabled">
-               <antcall target="-undeploy-without-pw"/>
-               <antcall target="-undeploy-with-pw"/>
-       </target>
-
-       <target name="-undeploy-without-pw" unless="gfv3.password">
-               <echo message="Undeploying ${deploy.ant.archive}"/>
-               <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
-               <get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
-                        dest="${gfv3.results.file}"/>
-               <delete file="${gfv3.results.file}"/>
-       </target>
-       <target name="-undeploy-with-pw" if="gfv3.password">
-               <echo message="Undeploying ${deploy.ant.archive}"/>
-               <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
-               <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
-                        dest="${gfv3.results.file}"/>
-               <delete file="${gfv3.results.file}"/>
-       </target>
+    <target name="-undeploy-without-pw" unless="gfv3.password">
+        <echo message="Undeploying ${deploy.ant.archive}"/>
+        <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
+        <get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
+            dest="${gfv3.results.file}"/>
+        <delete file="${gfv3.results.file}"/>    
+    </target>
+    <target name="-undeploy-with-pw" if="gfv3.password">
+        <echo message="Undeploying ${deploy.ant.archive}"/>
+        <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
+        <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
+            dest="${gfv3.results.file}"/>
+        <delete file="${gfv3.results.file}"/>
+    </target>
 </project>

diff --git a/nbproject/project.properties b/nbproject/project.properties
index 7dbdc8f210f4f1feede762af25e7cb992b9cc010..de673728a6b2517a6c6e5065a24d42ad6a0d36d9 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -6,6 +6,7 @@ debug.classpath=${javac.classpath}::${jar.content.additional}:${run.classpath}
 display.browser=true
 dist.dir=dist
 dist.jar=${dist.dir}/${jar.name}
+endorsed.classpath=
 j2ee.appclient.mainclass.args=${j2ee.appclient.tool.args}
 j2ee.compile.on.save=true
 j2ee.deploy.on.save=true
@@ -40,4 +41,5 @@ reference.jcontacts-ejb.dist-ear=${project.jcontacts-ejb}/dist/jcontacts-ejb.jar
 reference.jcore-logger-ejb.dist-ear=${project.jcore-logger-ejb}/dist/jcore-logger-ejb.jar
 reference.juser-ejb.dist-ear=${project.juser-ejb}/dist/juser-ejb.jar
 resource.dir=setup
+run.classpath=
 source.root=.

diff --git a/nbproject/project.xml b/nbproject/project.xml
index e72574a80145fe13262a051714b5bd7f2cdd14ac..586ffe334a1bcce6221d1962e92a331abeba43bc 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -1,63 +1,63 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://www.netbeans.org/ns/project/1">
-       <type>org.netbeans.modules.j2ee.earproject</type>
-       <configuration>
-               <data xmlns="http://www.netbeans.org/ns/j2ee-earproject/2">
-                       <name>addressbook</name>
-                       <minimum-ant-version>1.6.5</minimum-ant-version>
-                       <web-module-libraries/>
-                       <web-module-additional-libraries>
-                               <library>
-                                       <file>${reference.jcore-logger-ejb.dist-ear}</file>
-                                       <path-in-war>/</path-in-war>
-                               </library>
-                               <library>
-                                       <file>${reference.addressbook-ejb.dist-ear}</file>
-                                       <path-in-war>/</path-in-war>
-                               </library>
-                               <library>
-                                       <file>${reference.jcontacts-ejb.dist-ear}</file>
-                                       <path-in-war>/</path-in-war>
-                               </library>
-                               <library>
-                                       <file>${reference.juser-ejb.dist-ear}</file>
-                                       <path-in-war>/</path-in-war>
-                               </library>
-                       </web-module-additional-libraries>
-               </data>
-               <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
-                       <reference>
-                               <foreign-project>addressbook-ejb</foreign-project>
-                               <artifact-type>j2ee_ear_archive</artifact-type>
-                               <script>build.xml</script>
-                               <target>dist-ear</target>
-                               <clean-target>clean-ear</clean-target>
-                               <id>dist-ear</id>
-                       </reference>
-                       <reference>
-                               <foreign-project>jcontacts-ejb</foreign-project>
-                               <artifact-type>j2ee_ear_archive</artifact-type>
-                               <script>build.xml</script>
-                               <target>dist-ear</target>
-                               <clean-target>clean-ear</clean-target>
-                               <id>dist-ear</id>
-                       </reference>
-                       <reference>
-                               <foreign-project>jcore-logger-ejb</foreign-project>
-                               <artifact-type>j2ee_ear_archive</artifact-type>
-                               <script>build.xml</script>
-                               <target>dist-ear</target>
-                               <clean-target>clean-ear</clean-target>
-                               <id>dist-ear</id>
-                       </reference>
-                       <reference>
-                               <foreign-project>juser-ejb</foreign-project>
-                               <artifact-type>j2ee_ear_archive</artifact-type>
-                               <script>build.xml</script>
-                               <target>dist-ear</target>
-                               <clean-target>clean-ear</clean-target>
-                               <id>dist-ear</id>
-                       </reference>
-               </references>
-       </configuration>
+    <type>org.netbeans.modules.j2ee.earproject</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/j2ee-earproject/2">
+            <name>addressbook</name>
+            <minimum-ant-version>1.6.5</minimum-ant-version>
+            <web-module-libraries/>
+            <web-module-additional-libraries>
+                <library>
+                    <file>${reference.jcore-logger-ejb.dist-ear}</file>
+                    <path-in-war>/</path-in-war>
+                </library>
+                <library>
+                    <file>${reference.addressbook-ejb.dist-ear}</file>
+                    <path-in-war>/</path-in-war>
+                </library>
+                <library>
+                    <file>${reference.jcontacts-ejb.dist-ear}</file>
+                    <path-in-war>/</path-in-war>
+                </library>
+                <library>
+                    <file>${reference.juser-ejb.dist-ear}</file>
+                    <path-in-war>/</path-in-war>
+                </library>
+            </web-module-additional-libraries>
+        </data>
+        <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
+            <reference>
+                <foreign-project>addressbook-ejb</foreign-project>
+                <artifact-type>j2ee_ear_archive</artifact-type>
+                <script>build.xml</script>
+                <target>dist-ear</target>
+                <clean-target>clean-ear</clean-target>
+                <id>dist-ear</id>
+            </reference>
+            <reference>
+                <foreign-project>jcontacts-ejb</foreign-project>
+                <artifact-type>j2ee_ear_archive</artifact-type>
+                <script>build.xml</script>
+                <target>dist-ear</target>
+                <clean-target>clean-ear</clean-target>
+                <id>dist-ear</id>
+            </reference>
+            <reference>
+                <foreign-project>jcore-logger-ejb</foreign-project>
+                <artifact-type>j2ee_ear_archive</artifact-type>
+                <script>build.xml</script>
+                <target>dist-ear</target>
+                <clean-target>clean-ear</clean-target>
+                <id>dist-ear</id>
+            </reference>
+            <reference>
+                <foreign-project>juser-ejb</foreign-project>
+                <artifact-type>j2ee_ear_archive</artifact-type>
+                <script>build.xml</script>
+                <target>dist-ear</target>
+                <clean-target>clean-ear</clean-target>
+                <id>dist-ear</id>
+            </reference>
+        </references>
+    </configuration>
 </project>