úklid
authorFrantišek Kučera <franta-hg@frantovo.cz>
Tue Mar 23 09:15:48 2010 +0100 (2010-03-23)
changeset 7877d86ffbf55b
parent 77 5378f8dc8fa9
child 79 b04d98cf60dd
úklid
java/nekurak.net-ear/nbproject/build-impl.xml
java/nekurak.net-ear/nbproject/genfiles.properties
java/nekurak.net-ear/nbproject/project.properties
java/nekurak.net-ear/nbproject/project.xml
java/nekurak.net-ear/src/conf/application.xml
java/nekurak.net-lib/src/cz/frantovo/nekurak/xml/ClanekXML.java
java/nekurak.net-rest/nbproject/ant-deploy.xml
java/nekurak.net-rest/nbproject/build-impl.xml
java/nekurak.net-rest/nbproject/genfiles.properties
java/nekurak.net-rest/nbproject/project.properties
java/nekurak.net-rest/nbproject/project.xml
java/nekurak.net-rest/src/java/cz/frantovo/nekurak/rest/ClanekREST.java
java/nekurak.net-rest/web/WEB-INF/beans.xml
java/nekurak.net-rest/web/WEB-INF/sun-web.xml
java/nekurak.net-rest/web/WEB-INF/web.xml
java/nekurak.net-web/build.xml
     1.1 --- a/java/nekurak.net-ear/nbproject/build-impl.xml	Tue Mar 23 01:12:16 2010 +0100
     1.2 +++ b/java/nekurak.net-ear/nbproject/build-impl.xml	Tue Mar 23 09:15:48 2010 +0100
     1.3 @@ -166,15 +166,6 @@
     1.4                  <isset property="build.deploy.on.save"/>
     1.5              </not>
     1.6          </condition>
     1.7 -        <ant antfile="${project.nekurak_net-rest}/build.xml" inheritall="false" target="dist-ear">
     1.8 -            <property location="${build.dir}" name="dist.ear.dir"/>
     1.9 -            <property name="deploy.on.save" value="${build.deploy.on.save}"/>
    1.10 -        </ant>
    1.11 -        <condition property="build.deploy.on.save" value="false">
    1.12 -            <not>
    1.13 -                <isset property="build.deploy.on.save"/>
    1.14 -            </not>
    1.15 -        </condition>
    1.16          <ant antfile="${project.nekurak_net-web}/build.xml" inheritall="false" target="dist-ear">
    1.17              <property location="${build.dir}" name="dist.ear.dir"/>
    1.18              <property name="deploy.on.save" value="${build.deploy.on.save}"/>
    1.19 @@ -193,7 +184,6 @@
    1.20      <target depends="init,deps-jar,pre-pre-compile,pre-compile" name="-do-compile-deps">
    1.21          <copyfiles files="${reference.nekurak_net-web.dist-ear}" todir="${build.dir}//"/>
    1.22          <copyfiles files="${reference.nekurak_net-ejb.dist-ear}" todir="${build.dir}//"/>
    1.23 -        <copyfiles files="${reference.nekurak_net-rest.dist-ear}" todir="${build.dir}//"/>
    1.24      </target>
    1.25      <target name="post-compile">
    1.26          <!-- Empty placeholder for easier customization. -->
    1.27 @@ -271,7 +261,6 @@
    1.28      <target name="-run-deploy-am" unless="no.deps">
    1.29          <!-- Task to deploy to the Access Manager runtime. -->
    1.30          <ant antfile="${project.nekurak_net-ejb}/build.xml" inheritall="false" target="-run-deploy-am"/>
    1.31 -        <ant antfile="${project.nekurak_net-rest}/build.xml" inheritall="false" target="-run-deploy-am"/>
    1.32          <ant antfile="${project.nekurak_net-web}/build.xml" inheritall="false" target="-run-deploy-am"/>
    1.33      </target>
    1.34      <target depends="-init-cos,dist-directory-deploy,pre-run-deploy,-pre-nbmodule-run-deploy,-run-deploy-nb,-init-deploy-ant,-deploy-ant,-run-deploy-am,-post-nbmodule-run-deploy,post-run-deploy" name="run-deploy"/>
    1.35 @@ -466,15 +455,6 @@
    1.36                  <isset property="build.deploy.on.save"/>
    1.37              </not>
    1.38          </condition>
    1.39 -        <ant antfile="${project.nekurak_net-rest}/build.xml" inheritall="false" target="clean-ear">
    1.40 -            <property location="${build.dir}" name="dist.ear.dir"/>
    1.41 -            <property name="deploy.on.save" value="${build.deploy.on.save}"/>
    1.42 -        </ant>
    1.43 -        <condition property="build.deploy.on.save" value="false">
    1.44 -            <not>
    1.45 -                <isset property="build.deploy.on.save"/>
    1.46 -            </not>
    1.47 -        </condition>
    1.48          <ant antfile="${project.nekurak_net-web}/build.xml" inheritall="false" target="clean-ear">
    1.49              <property location="${build.dir}" name="dist.ear.dir"/>
    1.50              <property name="deploy.on.save" value="${build.deploy.on.save}"/>
     2.1 --- a/java/nekurak.net-ear/nbproject/genfiles.properties	Tue Mar 23 01:12:16 2010 +0100
     2.2 +++ b/java/nekurak.net-ear/nbproject/genfiles.properties	Tue Mar 23 09:15:48 2010 +0100
     2.3 @@ -3,6 +3,6 @@
     2.4  build.xml.stylesheet.CRC32=475c2a62@1.17.2
     2.5  # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
     2.6  # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
     2.7 -nbproject/build-impl.xml.data.CRC32=efe37659
     2.8 -nbproject/build-impl.xml.script.CRC32=4bf9637a
     2.9 +nbproject/build-impl.xml.data.CRC32=dd0510f0
    2.10 +nbproject/build-impl.xml.script.CRC32=b94a2023
    2.11  nbproject/build-impl.xml.stylesheet.CRC32=624b8ca2@1.17.2
     3.1 --- a/java/nekurak.net-ear/nbproject/project.properties	Tue Mar 23 01:12:16 2010 +0100
     3.2 +++ b/java/nekurak.net-ear/nbproject/project.properties	Tue Mar 23 09:15:48 2010 +0100
     3.3 @@ -16,8 +16,7 @@
     3.4  jar.compress=false
     3.5  jar.content.additional=\
     3.6      ${reference.nekurak_net-web.dist-ear}:\
     3.7 -    ${reference.nekurak_net-ejb.dist-ear}:\
     3.8 -    ${reference.nekurak_net-rest.dist-ear}
     3.9 +    ${reference.nekurak_net-ejb.dist-ear}
    3.10  jar.name=nekurak.net-ear.ear
    3.11  javac.debug=true
    3.12  javac.deprecation=false
    3.13 @@ -27,10 +26,8 @@
    3.14  no.dependencies=false
    3.15  platform.active=default_platform
    3.16  project.nekurak_net-ejb=../nekurak.net-ejb
    3.17 -project.nekurak_net-rest=../nekurak.net-rest
    3.18  project.nekurak_net-web=../nekurak.net-web
    3.19  reference.nekurak_net-ejb.dist-ear=${project.nekurak_net-ejb}/dist/nekurak.net-ejb.jar
    3.20 -reference.nekurak_net-rest.dist-ear=${project.nekurak_net-rest}/dist/nekurak.net-rest.war
    3.21  reference.nekurak_net-web.dist-ear=${project.nekurak_net-web}/dist/nekurak.net-web.war
    3.22  resource.dir=setup
    3.23  run.classpath=
     4.1 --- a/java/nekurak.net-ear/nbproject/project.xml	Tue Mar 23 01:12:16 2010 +0100
     4.2 +++ b/java/nekurak.net-ear/nbproject/project.xml	Tue Mar 23 09:15:48 2010 +0100
     4.3 @@ -15,10 +15,6 @@
     4.4                      <file>${reference.nekurak_net-ejb.dist-ear}</file>
     4.5                      <path-in-war>/</path-in-war>
     4.6                  </library>
     4.7 -                <library>
     4.8 -                    <file>${reference.nekurak_net-rest.dist-ear}</file>
     4.9 -                    <path-in-war>/</path-in-war>
    4.10 -                </library>
    4.11              </web-module-additional-libraries>
    4.12          </data>
    4.13          <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
    4.14 @@ -31,14 +27,6 @@
    4.15                  <id>dist-ear</id>
    4.16              </reference>
    4.17              <reference>
    4.18 -                <foreign-project>nekurak_net-rest</foreign-project>
    4.19 -                <artifact-type>j2ee_ear_archive</artifact-type>
    4.20 -                <script>build.xml</script>
    4.21 -                <target>dist-ear</target>
    4.22 -                <clean-target>clean-ear</clean-target>
    4.23 -                <id>dist-ear</id>
    4.24 -            </reference>
    4.25 -            <reference>
    4.26                  <foreign-project>nekurak_net-web</foreign-project>
    4.27                  <artifact-type>j2ee_ear_archive</artifact-type>
    4.28                  <script>build.xml</script>
     5.1 --- a/java/nekurak.net-ear/src/conf/application.xml	Tue Mar 23 01:12:16 2010 +0100
     5.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.3 @@ -1,19 +0,0 @@
     5.4 -<?xml version="1.0" encoding="UTF-8"?>
     5.5 -<application version="6" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_6.xsd">
     5.6 -    <display-name>nekurak.net-ear</display-name>
     5.7 -    <module>
     5.8 -	<web>
     5.9 -	    <web-uri>nekurak.net-web.war</web-uri>
    5.10 -	    <context-root>/nekurak.net-web</context-root>
    5.11 -	</web>
    5.12 -    </module>
    5.13 -    <module>
    5.14 -	<web>
    5.15 -	    <web-uri>nekurak.net-rest.war</web-uri>
    5.16 -	    <context-root>/nekurak.net-rest</context-root>
    5.17 -	</web>
    5.18 -    </module>
    5.19 -    <module>
    5.20 -	<ejb>nekurak.net-ejb.jar</ejb>
    5.21 -    </module>
    5.22 -</application>
     6.1 --- a/java/nekurak.net-lib/src/cz/frantovo/nekurak/xml/ClanekXML.java	Tue Mar 23 01:12:16 2010 +0100
     6.2 +++ b/java/nekurak.net-lib/src/cz/frantovo/nekurak/xml/ClanekXML.java	Tue Mar 23 09:15:48 2010 +0100
     6.3 @@ -9,7 +9,7 @@
     6.4   * Převaděč do XML
     6.5   * @author fiki
     6.6   */
     6.7 -@XmlRootElement
     6.8 +@XmlRootElement(name="clanek")
     6.9  public class ClanekXML {
    6.10  
    6.11      private Clanek clanek;
    6.12 @@ -26,7 +26,6 @@
    6.13  	return clanek.getId();
    6.14      }
    6.15  
    6.16 -    @XmlAttribute(name = "id", required = true)
    6.17      public void setId(int id) {
    6.18  	clanek.setId(id);
    6.19      }
    6.20 @@ -36,7 +35,6 @@
    6.21  	return clanek.getNadpis();
    6.22      }
    6.23  
    6.24 -    @XmlElement
    6.25      public void setNadpis(String nadpis) {
    6.26  	clanek.setNadpis(nadpis);
    6.27      }
    6.28 @@ -46,7 +44,6 @@
    6.29  	return clanek.getText();
    6.30      }
    6.31  
    6.32 -    @XmlElement
    6.33      public void setText(String text) {
    6.34  	clanek.setText(text);
    6.35      }
     7.1 --- a/java/nekurak.net-rest/nbproject/ant-deploy.xml	Tue Mar 23 01:12:16 2010 +0100
     7.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.3 @@ -1,60 +0,0 @@
     7.4 -<?xml version="1.0" encoding="UTF-8"?>
     7.5 -<project default="-deploy-ant" basedir=".">
     7.6 -    <target name="-init-cl-deployment-env" if="deploy.ant.enabled">
     7.7 -        <property file="${deploy.ant.properties.file}" />
     7.8 -        <available file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" property="sun.web.present"/>
     7.9 -        <available file="${deploy.ant.resource.dir}" property="has.setup"/>
    7.10 -        <tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
    7.11 -        <echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
    7.12 -    </target>
    7.13 -    
    7.14 -    <target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
    7.15 -        <tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
    7.16 -        <copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
    7.17 -        <!-- The doctype triggers resolution which can fail -->
    7.18 -        <replace file="${temp.sun.web}">
    7.19 -            <replacetoken><![CDATA[<!DOCTYPE]]></replacetoken>
    7.20 -            <replacevalue><![CDATA[<!-- <!DOCTYPE]]></replacevalue>
    7.21 -        </replace>
    7.22 -        <replace file="${temp.sun.web}">
    7.23 -            <replacetoken><![CDATA[<sun-web-app]]></replacetoken>
    7.24 -            <replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
    7.25 -        </replace>
    7.26 -        <xmlproperty file="${temp.sun.web}" validate="false">
    7.27 -        </xmlproperty>    
    7.28 -        <delete file="${temp.sun.web}"/>
    7.29 -        <property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
    7.30 -        <property name="deploy.context.root.argument" value="?contextroot=${sun-web-app.context-root}"/>
    7.31 -    </target>
    7.32 -    <target name="-no-parse-sun-web" depends="-init-cl-deployment-env" unless="sun.web.present">
    7.33 -        <property name="deploy.context.root.argument" value=""/>
    7.34 -    </target>
    7.35 -    <target name="-add-resources" depends="-init-cl-deployment-env" if="has.setup">
    7.36 -        <tempfile prefix="gfv3" property="gfv3.resources.dir" destdir="${java.io.tmpdir}"/>
    7.37 -        <mkdir dir="${gfv3.resources.dir}"/>
    7.38 -        <mkdir dir="${gfv3.resources.dir}/META-INF"/>
    7.39 -        <property name="gfv3.resources.file" value="${gfv3.resources.dir}/META-INF/sun-resources.xml"/>
    7.40 -        <copy todir="${gfv3.resources.dir}/META-INF">
    7.41 -            <fileset dir="${deploy.ant.resource.dir}"/>
    7.42 -        </copy>
    7.43 -        <jar destfile="${deploy.ant.archive}" update="true">
    7.44 -            <fileset dir="${gfv3.resources.dir}"/>
    7.45 -        </jar>
    7.46 -        <delete dir="${gfv3.resources.dir}"/>
    7.47 -    </target>
    7.48 -    <target name="-deploy-ant" depends="-parse-sun-web,-no-parse-sun-web,-add-resources" if="deploy.ant.enabled">
    7.49 -        <echo message="Deploying ${deploy.ant.archive}"/>
    7.50 -        <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
    7.51 -        <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
    7.52 -        <get src="${gfv3.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}?force=true?name=${ant.project.name}"
    7.53 -            dest="${gfv3.results.file}"/>
    7.54 -        <delete file="${gfv3.results.file}"/>    
    7.55 -    </target>
    7.56 -    <target name="-undeploy-ant" depends="-init-cl-deployment-env" if="deploy.ant.enabled">
    7.57 -        <echo message="Undeploying ${deploy.ant.archive}"/>
    7.58 -        <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
    7.59 -        <get src="${gfv3.url}/__asadmin/undeploy?name=${ant.project.name}"
    7.60 -            dest="${gfv3.results.file}"/>
    7.61 -        <delete file="${gfv3.results.file}"/>    
    7.62 -    </target>
    7.63 -</project>
     8.1 --- a/java/nekurak.net-rest/nbproject/build-impl.xml	Tue Mar 23 01:12:16 2010 +0100
     8.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.3 @@ -1,868 +0,0 @@
     8.4 -<?xml version="1.0" encoding="UTF-8"?>
     8.5 -<!--
     8.6 -        *** GENERATED FROM project.xml - DO NOT EDIT  ***
     8.7 -        ***         EDIT ../build.xml INSTEAD         ***
     8.8 -
     8.9 -        For the purpose of easier reading the script
    8.10 -        is divided into following sections:
    8.11 -        - initialization
    8.12 -        - compilation
    8.13 -        - dist
    8.14 -        - execution
    8.15 -        - debugging
    8.16 -        - javadoc
    8.17 -        - junit compilation
    8.18 -        - junit execution
    8.19 -        - junit debugging
    8.20 -        - cleanup
    8.21 -
    8.22 -        -->
    8.23 -<project xmlns:webproject1="http://www.netbeans.org/ns/web-project/1" xmlns:webproject2="http://www.netbeans.org/ns/web-project/2" xmlns:webproject3="http://www.netbeans.org/ns/web-project/3" basedir=".." default="default" name="nekurak.net-rest-impl">
    8.24 -    <import file="ant-deploy.xml"/>
    8.25 -    <fail message="Please build using Ant 1.7.1 or higher.">
    8.26 -        <condition>
    8.27 -            <not>
    8.28 -                <antversion atleast="1.7.1"/>
    8.29 -            </not>
    8.30 -        </condition>
    8.31 -    </fail>
    8.32 -    <target depends="dist,javadoc" description="Build whole project." name="default"/>
    8.33 -    <!--
    8.34 -                INITIALIZATION SECTION
    8.35 -            -->
    8.36 -    <target name="-pre-init">
    8.37 -        <!-- Empty placeholder for easier customization. -->
    8.38 -        <!-- You can override this target in the ../build.xml file. -->
    8.39 -    </target>
    8.40 -    <target depends="-pre-init" name="-init-private">
    8.41 -        <property file="nbproject/private/private.properties"/>
    8.42 -    </target>
    8.43 -    <target depends="-pre-init,-init-private" name="-init-user">
    8.44 -        <property file="${user.properties.file}"/>
    8.45 -        <!-- The two properties below are usually overridden -->
    8.46 -        <!-- by the active platform. Just a fallback. -->
    8.47 -        <property name="default.javac.source" value="1.4"/>
    8.48 -        <property name="default.javac.target" value="1.4"/>
    8.49 -    </target>
    8.50 -    <target depends="-pre-init,-init-private,-init-user" name="-init-project">
    8.51 -        <property file="nbproject/project.properties"/>
    8.52 -    </target>
    8.53 -    <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" if="dist.ear.dir" name="-do-ear-init"/>
    8.54 -    <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
    8.55 -        <condition property="have.tests">
    8.56 -            <or>
    8.57 -                <available file="${test.src.dir}"/>
    8.58 -            </or>
    8.59 -        </condition>
    8.60 -        <condition property="have.sources">
    8.61 -            <or>
    8.62 -                <available file="${src.dir}"/>
    8.63 -            </or>
    8.64 -        </condition>
    8.65 -        <condition property="netbeans.home+have.tests">
    8.66 -            <and>
    8.67 -                <isset property="netbeans.home"/>
    8.68 -                <isset property="have.tests"/>
    8.69 -            </and>
    8.70 -        </condition>
    8.71 -        <condition property="no.javadoc.preview">
    8.72 -            <isfalse value="${javadoc.preview}"/>
    8.73 -        </condition>
    8.74 -        <property name="javac.compilerargs" value=""/>
    8.75 -        <condition property="no.deps">
    8.76 -            <and>
    8.77 -                <istrue value="${no.dependencies}"/>
    8.78 -            </and>
    8.79 -        </condition>
    8.80 -        <condition property="no.dist.ear.dir">
    8.81 -            <not>
    8.82 -                <isset property="dist.ear.dir"/>
    8.83 -            </not>
    8.84 -        </condition>
    8.85 -        <property name="build.web.excludes" value="${build.classes.excludes}"/>
    8.86 -        <condition property="do.compile.jsps">
    8.87 -            <istrue value="${compile.jsps}"/>
    8.88 -        </condition>
    8.89 -        <condition property="do.debug.server">
    8.90 -            <or>
    8.91 -                <not>
    8.92 -                    <isset property="debug.server"/>
    8.93 -                </not>
    8.94 -                <istrue value="${debug.server}"/>
    8.95 -                <and>
    8.96 -                    <not>
    8.97 -                        <istrue value="${debug.server}"/>
    8.98 -                    </not>
    8.99 -                    <not>
   8.100 -                        <istrue value="${debug.client}"/>
   8.101 -                    </not>
   8.102 -                </and>
   8.103 -            </or>
   8.104 -        </condition>
   8.105 -        <condition property="do.debug.client">
   8.106 -            <istrue value="${debug.client}"/>
   8.107 -        </condition>
   8.108 -        <condition property="do.display.browser">
   8.109 -            <istrue value="${display.browser}"/>
   8.110 -        </condition>
   8.111 -        <condition property="do.display.browser.debug">
   8.112 -            <and>
   8.113 -                <isset property="do.display.browser"/>
   8.114 -                <not>
   8.115 -                    <isset property="do.debug.client"/>
   8.116 -                </not>
   8.117 -            </and>
   8.118 -        </condition>
   8.119 -        <available file="${conf.dir}/MANIFEST.MF" property="has.custom.manifest"/>
   8.120 -        <available file="${persistence.xml.dir}/persistence.xml" property="has.persistence.xml"/>
   8.121 -        <condition property="do.war.package.with.custom.manifest">
   8.122 -            <isset property="has.custom.manifest"/>
   8.123 -        </condition>
   8.124 -        <condition property="do.war.package.without.custom.manifest">
   8.125 -            <not>
   8.126 -                <isset property="has.custom.manifest"/>
   8.127 -            </not>
   8.128 -        </condition>
   8.129 -        <condition property="do.tmp.war.package.with.custom.manifest">
   8.130 -            <and>
   8.131 -                <isset property="has.custom.manifest"/>
   8.132 -                <or>
   8.133 -                    <isfalse value="${directory.deployment.supported}"/>
   8.134 -                    <isset property="dist.ear.dir"/>
   8.135 -                </or>
   8.136 -            </and>
   8.137 -        </condition>
   8.138 -        <condition property="do.tmp.war.package.without.custom.manifest">
   8.139 -            <and>
   8.140 -                <not>
   8.141 -                    <isset property="has.custom.manifest"/>
   8.142 -                </not>
   8.143 -                <or>
   8.144 -                    <isfalse value="${directory.deployment.supported}"/>
   8.145 -                    <isset property="dist.ear.dir"/>
   8.146 -                </or>
   8.147 -            </and>
   8.148 -        </condition>
   8.149 -        <condition property="do.tmp.war.package">
   8.150 -            <or>
   8.151 -                <isfalse value="${directory.deployment.supported}"/>
   8.152 -                <isset property="dist.ear.dir"/>
   8.153 -            </or>
   8.154 -        </condition>
   8.155 -        <property name="build.meta.inf.dir" value="${build.web.dir}/META-INF"/>
   8.156 -        <condition else="" property="application.args.param" value="${application.args}">
   8.157 -            <and>
   8.158 -                <isset property="application.args"/>
   8.159 -                <not>
   8.160 -                    <equals arg1="${application.args}" arg2="" trim="true"/>
   8.161 -                </not>
   8.162 -            </and>
   8.163 -        </condition>
   8.164 -        <property name="source.encoding" value="${file.encoding}"/>
   8.165 -        <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
   8.166 -            <and>
   8.167 -                <isset property="javadoc.encoding"/>
   8.168 -                <not>
   8.169 -                    <equals arg1="${javadoc.encoding}" arg2=""/>
   8.170 -                </not>
   8.171 -            </and>
   8.172 -        </condition>
   8.173 -        <property name="javadoc.encoding.used" value="${source.encoding}"/>
   8.174 -        <property name="includes" value="**"/>
   8.175 -        <property name="excludes" value=""/>
   8.176 -        <property name="runmain.jvmargs" value=""/>
   8.177 -        <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
   8.178 -        <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
   8.179 -            <length length="0" string="${endorsed.classpath}" when="greater"/>
   8.180 -        </condition>
   8.181 -    </target>
   8.182 -    <target depends="init" name="-init-cos" unless="deploy.on.save">
   8.183 -        <condition property="deploy.on.save" value="true">
   8.184 -            <istrue value="${j2ee.deploy.on.save}"/>
   8.185 -        </condition>
   8.186 -    </target>
   8.187 -    <target name="-post-init">
   8.188 -        <!-- Empty placeholder for easier customization. -->
   8.189 -        <!-- You can override this target in the ../build.xml file. -->
   8.190 -    </target>
   8.191 -    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
   8.192 -        <fail unless="src.dir">Must set src.dir</fail>
   8.193 -        <fail unless="test.src.dir">Must set test.src.dir</fail>
   8.194 -        <fail unless="build.dir">Must set build.dir</fail>
   8.195 -        <fail unless="build.web.dir">Must set build.web.dir</fail>
   8.196 -        <fail unless="build.generated.dir">Must set build.generated.dir</fail>
   8.197 -        <fail unless="dist.dir">Must set dist.dir</fail>
   8.198 -        <fail unless="build.classes.dir">Must set build.classes.dir</fail>
   8.199 -        <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
   8.200 -        <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
   8.201 -        <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
   8.202 -        <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
   8.203 -        <fail unless="dist.war">Must set dist.war</fail>
   8.204 -        <fail unless="j2ee.platform.classpath">
   8.205 -The Java EE server classpath is not correctly set up. Your active server type is ${j2ee.server.type}.
   8.206 -Either open the project in the IDE and assign the server or setup the server classpath manually.
   8.207 -For example like this:
   8.208 -   ant -Duser.properties.file=&lt;path_to_property_file&gt; (where you put the property "j2ee.platform.classpath" in a .properties file)
   8.209 -or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties file is used)
   8.210 -                </fail>
   8.211 -    </target>
   8.212 -    <target name="-init-macrodef-property">
   8.213 -        <macrodef name="property" uri="http://www.netbeans.org/ns/web-project/1">
   8.214 -            <attribute name="name"/>
   8.215 -            <attribute name="value"/>
   8.216 -            <sequential>
   8.217 -                <property name="@{name}" value="${@{value}}"/>
   8.218 -            </sequential>
   8.219 -        </macrodef>
   8.220 -    </target>
   8.221 -    <target name="-init-macrodef-javac">
   8.222 -        <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
   8.223 -            <attribute default="${src.dir}" name="srcdir"/>
   8.224 -            <attribute default="${build.classes.dir}" name="destdir"/>
   8.225 -            <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
   8.226 -            <attribute default="${includes}" name="includes"/>
   8.227 -            <attribute default="${excludes}" name="excludes"/>
   8.228 -            <attribute default="${javac.debug}" name="debug"/>
   8.229 -            <attribute default="${empty.dir}" name="gensrcdir"/>
   8.230 -            <element name="customize" optional="true"/>
   8.231 -            <sequential>
   8.232 -                <property location="${build.dir}/empty" name="empty.dir"/>
   8.233 -                <mkdir dir="${empty.dir}"/>
   8.234 -                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}">
   8.235 -                    <src>
   8.236 -                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
   8.237 -                            <include name="*"/>
   8.238 -                        </dirset>
   8.239 -                    </src>
   8.240 -                    <classpath>
   8.241 -                        <path path="@{classpath}"/>
   8.242 -                    </classpath>
   8.243 -                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
   8.244 -                    <compilerarg line="${javac.compilerargs}"/>
   8.245 -                    <customize/>
   8.246 -                </javac>
   8.247 -            </sequential>
   8.248 -        </macrodef>
   8.249 -    </target>
   8.250 -    <target name="-init-macrodef-junit">
   8.251 -        <macrodef name="junit" uri="http://www.netbeans.org/ns/web-project/2">
   8.252 -            <attribute default="${includes}" name="includes"/>
   8.253 -            <attribute default="${excludes}" name="excludes"/>
   8.254 -            <attribute default="**" name="testincludes"/>
   8.255 -            <sequential>
   8.256 -                <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${java.io.tmpdir}">
   8.257 -                    <batchtest todir="${build.test.results.dir}">
   8.258 -                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
   8.259 -                            <filename name="@{testincludes}"/>
   8.260 -                        </fileset>
   8.261 -                    </batchtest>
   8.262 -                    <classpath>
   8.263 -                        <path path="${run.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}"/>
   8.264 -                    </classpath>
   8.265 -                    <syspropertyset>
   8.266 -                        <propertyref prefix="test-sys-prop."/>
   8.267 -                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
   8.268 -                    </syspropertyset>
   8.269 -                    <formatter type="brief" usefile="false"/>
   8.270 -                    <formatter type="xml"/>
   8.271 -                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
   8.272 -                    <jvmarg line="${runmain.jvmargs}"/>
   8.273 -                </junit>
   8.274 -            </sequential>
   8.275 -        </macrodef>
   8.276 -    </target>
   8.277 -    <target name="-init-macrodef-java">
   8.278 -        <macrodef name="java" uri="http://www.netbeans.org/ns/web-project/1">
   8.279 -            <attribute default="${main.class}" name="classname"/>
   8.280 -            <attribute default="${debug.classpath}" name="classpath"/>
   8.281 -            <element name="customize" optional="true"/>
   8.282 -            <sequential>
   8.283 -                <java classname="@{classname}" fork="true">
   8.284 -                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
   8.285 -                    <jvmarg line="${runmain.jvmargs}"/>
   8.286 -                    <classpath>
   8.287 -                        <path path="@{classpath}:${j2ee.platform.classpath}"/>
   8.288 -                    </classpath>
   8.289 -                    <syspropertyset>
   8.290 -                        <propertyref prefix="run-sys-prop."/>
   8.291 -                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
   8.292 -                    </syspropertyset>
   8.293 -                    <customize/>
   8.294 -                </java>
   8.295 -            </sequential>
   8.296 -        </macrodef>
   8.297 -    </target>
   8.298 -    <target name="-init-macrodef-nbjsdebug">
   8.299 -        <macrodef name="nbjsdebugstart" uri="http://www.netbeans.org/ns/web-project/1">
   8.300 -            <attribute default="${client.url}" name="webUrl"/>
   8.301 -            <sequential>
   8.302 -                <nbjsdebugstart urlPart="${client.urlPart}" webUrl="@{webUrl}"/>
   8.303 -            </sequential>
   8.304 -        </macrodef>
   8.305 -    </target>
   8.306 -    <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
   8.307 -        <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/web-project/1">
   8.308 -            <attribute default="${main.class}" name="name"/>
   8.309 -            <attribute default="${debug.classpath}:${j2ee.platform.classpath}" name="classpath"/>
   8.310 -            <sequential>
   8.311 -                <nbjpdastart addressproperty="jpda.address" name="@{name}" transport="${debug-transport}">
   8.312 -                    <classpath>
   8.313 -                        <path path="@{classpath}"/>
   8.314 -                    </classpath>
   8.315 -                </nbjpdastart>
   8.316 -            </sequential>
   8.317 -        </macrodef>
   8.318 -        <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/web-project/1">
   8.319 -            <attribute default="${build.classes.dir}" name="dir"/>
   8.320 -            <sequential>
   8.321 -                <nbjpdareload>
   8.322 -                    <fileset dir="@{dir}" includes="${fix.classes}">
   8.323 -                        <include name="${fix.includes}*.class"/>
   8.324 -                    </fileset>
   8.325 -                </nbjpdareload>
   8.326 -            </sequential>
   8.327 -        </macrodef>
   8.328 -        <macrodef name="nbjpdaappreloaded" uri="http://www.netbeans.org/ns/web-project/1">
   8.329 -            <sequential>
   8.330 -                <nbjpdaappreloaded/>
   8.331 -            </sequential>
   8.332 -        </macrodef>
   8.333 -    </target>
   8.334 -    <target name="-init-debug-args">
   8.335 -        <property name="version-output" value="java version &quot;${ant.java.version}"/>
   8.336 -        <condition property="have-jdk-older-than-1.4">
   8.337 -            <or>
   8.338 -                <contains string="${version-output}" substring="java version &quot;1.0"/>
   8.339 -                <contains string="${version-output}" substring="java version &quot;1.1"/>
   8.340 -                <contains string="${version-output}" substring="java version &quot;1.2"/>
   8.341 -                <contains string="${version-output}" substring="java version &quot;1.3"/>
   8.342 -            </or>
   8.343 -        </condition>
   8.344 -        <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
   8.345 -            <istrue value="${have-jdk-older-than-1.4}"/>
   8.346 -        </condition>
   8.347 -        <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
   8.348 -            <os family="windows"/>
   8.349 -        </condition>
   8.350 -        <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
   8.351 -            <isset property="debug.transport"/>
   8.352 -        </condition>
   8.353 -    </target>
   8.354 -    <target depends="-init-debug-args" name="-init-macrodef-debug">
   8.355 -        <macrodef name="debug" uri="http://www.netbeans.org/ns/web-project/1">
   8.356 -            <attribute default="${main.class}" name="classname"/>
   8.357 -            <attribute default="${debug.classpath}:${j2ee.platform.classpath}" name="classpath"/>
   8.358 -            <attribute default="${application.args.param}" name="args"/>
   8.359 -            <element name="customize" optional="true"/>
   8.360 -            <sequential>
   8.361 -                <java classname="@{classname}" fork="true">
   8.362 -                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
   8.363 -                    <jvmarg line="${debug-args-line}"/>
   8.364 -                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
   8.365 -                    <jvmarg line="${runmain.jvmargs}"/>
   8.366 -                    <classpath>
   8.367 -                        <path path="@{classpath}"/>
   8.368 -                    </classpath>
   8.369 -                    <syspropertyset>
   8.370 -                        <propertyref prefix="run-sys-prop."/>
   8.371 -                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
   8.372 -                    </syspropertyset>
   8.373 -                    <arg line="@{args}"/>
   8.374 -                    <customize/>
   8.375 -                </java>
   8.376 -            </sequential>
   8.377 -        </macrodef>
   8.378 -    </target>
   8.379 -    <target name="-init-taskdefs">
   8.380 -        <fail unless="libs.CopyLibs.classpath">
   8.381 -The libs.CopyLibs.classpath property is not set up.
   8.382 -This property must point to 
   8.383 -org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part
   8.384 -of NetBeans IDE installation and is usually located at 
   8.385 -&lt;netbeans_installation&gt;/java&lt;version&gt;/ant/extra folder.
   8.386 -Either open the project in the IDE and make sure CopyLibs library
   8.387 -exists or setup the property manually. For example like this:
   8.388 - ant -Dlibs.CopyLibs.classpath=a/path/to/org-netbeans-modules-java-j2seproject-copylibstask.jar
   8.389 -                </fail>
   8.390 -        <taskdef classpath="${libs.CopyLibs.classpath}" resource="org/netbeans/modules/java/j2seproject/copylibstask/antlib.xml"/>
   8.391 -    </target>
   8.392 -    <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-java,-init-macrodef-nbjpda,-init-macrodef-nbjsdebug,-init-macrodef-debug,-init-taskdefs" name="init"/>
   8.393 -    <!--
   8.394 -                COMPILATION SECTION
   8.395 -            -->
   8.396 -    <target depends="init" if="no.dist.ear.dir" name="deps-module-jar" unless="no.deps">
   8.397 -        <ant antfile="${project.nekurak_net-lib}/build.xml" inheritall="false" target="jar">
   8.398 -            <property name="deploy.on.save" value="false"/>
   8.399 -        </ant>
   8.400 -    </target>
   8.401 -    <target depends="init" if="dist.ear.dir" name="deps-ear-jar" unless="no.deps">
   8.402 -        <ant antfile="${project.nekurak_net-lib}/build.xml" inheritall="false" target="jar">
   8.403 -            <property name="deploy.on.save" value="false"/>
   8.404 -        </ant>
   8.405 -    </target>
   8.406 -    <target depends="init, deps-module-jar, deps-ear-jar" name="deps-jar" unless="no.deps"/>
   8.407 -    <target depends="init,deps-jar" name="-pre-pre-compile">
   8.408 -        <mkdir dir="${build.classes.dir}"/>
   8.409 -    </target>
   8.410 -    <target name="-pre-compile">
   8.411 -        <!-- Empty placeholder for easier customization. -->
   8.412 -        <!-- You can override this target in the ../build.xml file. -->
   8.413 -    </target>
   8.414 -    <target name="-copy-webdir">
   8.415 -        <copy todir="${build.web.dir}">
   8.416 -            <fileset dir="${web.docbase.dir}" excludes="${build.web.excludes},${excludes}" includes="${includes}"/>
   8.417 -        </copy>
   8.418 -        <copy todir="${build.web.dir}/WEB-INF">
   8.419 -            <fileset dir="${webinf.dir}" excludes="${build.web.excludes}"/>
   8.420 -        </copy>
   8.421 -    </target>
   8.422 -    <target depends="init, deps-jar, -pre-pre-compile, -pre-compile, -copy-manifest, -copy-persistence-xml, -copy-webdir, library-inclusion-in-archive,library-inclusion-in-manifest" if="have.sources" name="-do-compile">
   8.423 -        <webproject2:javac destdir="${build.classes.dir}" gensrcdir="${build.generated.sources.dir}"/>
   8.424 -        <copy todir="${build.classes.dir}">
   8.425 -            <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
   8.426 -        </copy>
   8.427 -    </target>
   8.428 -    <target if="has.custom.manifest" name="-copy-manifest">
   8.429 -        <mkdir dir="${build.meta.inf.dir}"/>
   8.430 -        <copy todir="${build.meta.inf.dir}">
   8.431 -            <fileset dir="${conf.dir}" includes="MANIFEST.MF"/>
   8.432 -        </copy>
   8.433 -    </target>
   8.434 -    <target if="has.persistence.xml" name="-copy-persistence-xml">
   8.435 -        <mkdir dir="${build.web.dir}/WEB-INF/classes/META-INF"/>
   8.436 -        <copy todir="${build.web.dir}/WEB-INF/classes/META-INF">
   8.437 -            <fileset dir="${persistence.xml.dir}" includes="persistence.xml"/>
   8.438 -        </copy>
   8.439 -    </target>
   8.440 -    <target name="-post-compile">
   8.441 -        <!-- Empty placeholder for easier customization. -->
   8.442 -        <!-- You can override this target in the ../build.xml file. -->
   8.443 -    </target>
   8.444 -    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
   8.445 -    <target name="-pre-compile-single">
   8.446 -        <!-- Empty placeholder for easier customization. -->
   8.447 -        <!-- You can override this target in the ../build.xml file. -->
   8.448 -    </target>
   8.449 -    <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
   8.450 -        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
   8.451 -        <webproject2:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}"/>
   8.452 -        <copy todir="${build.classes.dir}">
   8.453 -            <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
   8.454 -        </copy>
   8.455 -    </target>
   8.456 -    <target name="-post-compile-single">
   8.457 -        <!-- Empty placeholder for easier customization. -->
   8.458 -        <!-- You can override this target in the ../build.xml file. -->
   8.459 -    </target>
   8.460 -    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
   8.461 -    <target depends="compile" description="Test compile JSP pages to expose compilation errors." if="do.compile.jsps" name="compile-jsps">
   8.462 -        <mkdir dir="${build.generated.dir}/src"/>
   8.463 -        <java classname="org.netbeans.modules.web.project.ant.JspC" failonerror="true" fork="true">
   8.464 -            <arg value="-uriroot"/>
   8.465 -            <arg file="${basedir}/${build.web.dir}"/>
   8.466 -            <arg value="-d"/>
   8.467 -            <arg file="${basedir}/${build.generated.dir}/src"/>
   8.468 -            <arg value="-die1"/>
   8.469 -            <arg value="-compilerSourceVM ${javac.source}"/>
   8.470 -            <arg value="-compilerTargetVM ${javac.target}"/>
   8.471 -            <arg value="-javaEncoding ${source.encoding}"/>
   8.472 -            <classpath path="${java.home}/../lib/tools.jar:${jspctask.classpath}:${jspcompilation.classpath}"/>
   8.473 -        </java>
   8.474 -        <mkdir dir="${build.generated.dir}/classes"/>
   8.475 -        <webproject2:javac classpath="${j2ee.platform.classpath}:${build.classes.dir}:${jspcompilation.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src"/>
   8.476 -    </target>
   8.477 -    <target depends="compile" if="jsp.includes" name="-do-compile-single-jsp">
   8.478 -        <fail unless="javac.jsp.includes">Must select some files in the IDE or set javac.jsp.includes</fail>
   8.479 -        <mkdir dir="${build.generated.dir}/src"/>
   8.480 -        <java classname="org.netbeans.modules.web.project.ant.JspCSingle" failonerror="true" fork="true">
   8.481 -            <arg value="-uriroot"/>
   8.482 -            <arg file="${basedir}/${build.web.dir}"/>
   8.483 -            <arg value="-d"/>
   8.484 -            <arg file="${basedir}/${build.generated.dir}/src"/>
   8.485 -            <arg value="-die1"/>
   8.486 -            <arg value="-jspc.files"/>
   8.487 -            <arg path="${jsp.includes}"/>
   8.488 -            <arg value="-compilerSourceVM ${javac.source}"/>
   8.489 -            <arg value="-compilerTargetVM ${javac.target}"/>
   8.490 -            <arg value="-javaEncoding ${source.encoding}"/>
   8.491 -            <classpath path="${java.home}/../lib/tools.jar:${jspctask.classpath}:${jspcompilation.classpath}"/>
   8.492 -        </java>
   8.493 -        <mkdir dir="${build.generated.dir}/classes"/>
   8.494 -        <webproject2:javac classpath="${j2ee.platform.classpath}:${build.classes.dir}:${jspcompilation.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src">
   8.495 -            <customize>
   8.496 -                <patternset includes="${javac.jsp.includes}"/>
   8.497 -            </customize>
   8.498 -        </webproject2:javac>
   8.499 -    </target>
   8.500 -    <target name="compile-single-jsp">
   8.501 -        <fail unless="jsp.includes">Must select a file in the IDE or set jsp.includes</fail>
   8.502 -        <antcall target="-do-compile-single-jsp"/>
   8.503 -    </target>
   8.504 -    <!--
   8.505 -                DIST BUILDING SECTION
   8.506 -            -->
   8.507 -    <target name="-pre-dist">
   8.508 -        <!-- Empty placeholder for easier customization. -->
   8.509 -        <!-- You can override this target in the ../build.xml file. -->
   8.510 -    </target>
   8.511 -    <target depends="init,compile,compile-jsps,-pre-dist" if="do.war.package.without.custom.manifest" name="-do-dist-without-manifest">
   8.512 -        <dirname file="${dist.war}" property="dist.jar.dir"/>
   8.513 -        <mkdir dir="${dist.jar.dir}"/>
   8.514 -        <jar compress="${jar.compress}" jarfile="${dist.war}">
   8.515 -            <fileset dir="${build.web.dir}"/>
   8.516 -        </jar>
   8.517 -    </target>
   8.518 -    <target depends="init,compile,compile-jsps,-pre-dist" if="do.war.package.with.custom.manifest" name="-do-dist-with-manifest">
   8.519 -        <dirname file="${dist.war}" property="dist.jar.dir"/>
   8.520 -        <mkdir dir="${dist.jar.dir}"/>
   8.521 -        <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
   8.522 -            <fileset dir="${build.web.dir}"/>
   8.523 -        </jar>
   8.524 -    </target>
   8.525 -    <target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.without.custom.manifest" name="-do-tmp-dist-without-manifest">
   8.526 -        <dirname file="${dist.war}" property="dist.jar.dir"/>
   8.527 -        <mkdir dir="${dist.jar.dir}"/>
   8.528 -        <jar compress="${jar.compress}" jarfile="${dist.war}">
   8.529 -            <fileset dir="${build.web.dir}"/>
   8.530 -        </jar>
   8.531 -    </target>
   8.532 -    <target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.with.custom.manifest" name="-do-tmp-dist-with-manifest">
   8.533 -        <dirname file="${dist.war}" property="dist.jar.dir"/>
   8.534 -        <mkdir dir="${dist.jar.dir}"/>
   8.535 -        <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
   8.536 -            <fileset dir="${build.web.dir}"/>
   8.537 -        </jar>
   8.538 -    </target>
   8.539 -    <target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
   8.540 -    <target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest">
   8.541 -        <copyfiles files="${reference.nekurak_net-lib.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
   8.542 -        <mkdir dir="${build.web.dir}/META-INF"/>
   8.543 -        <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
   8.544 -    </target>
   8.545 -    <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir">
   8.546 -        <copyfiles files="${reference.nekurak_net-lib.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
   8.547 -    </target>
   8.548 -    <target depends="init" if="dist.ear.dir" name="-clean-webinf-lib">
   8.549 -        <delete dir="${build.web.dir}/WEB-INF/lib"/>
   8.550 -    </target>
   8.551 -    <target depends="init,-clean-webinf-lib,compile,compile-jsps,-pre-dist,library-inclusion-in-manifest" if="do.tmp.war.package" name="do-ear-dist">
   8.552 -        <dirname file="${dist.ear.war}" property="dist.jar.dir"/>
   8.553 -        <mkdir dir="${dist.jar.dir}"/>
   8.554 -        <jar compress="${jar.compress}" jarfile="${dist.ear.war}" manifest="${build.web.dir}/META-INF/MANIFEST.MF">
   8.555 -            <fileset dir="${build.web.dir}"/>
   8.556 -        </jar>
   8.557 -    </target>
   8.558 -    <target name="-post-dist">
   8.559 -        <!-- Empty placeholder for easier customization. -->
   8.560 -        <!-- You can override this target in the ../build.xml file. -->
   8.561 -    </target>
   8.562 -    <target depends="init,compile,-pre-dist,do-dist,-post-dist" description="Build distribution (WAR)." name="dist"/>
   8.563 -    <target depends="init,-clean-webinf-lib,-init-cos,compile,-pre-dist,do-ear-dist,-post-dist" description="Build distribution (WAR) to be packaged into an EAR." name="dist-ear"/>
   8.564 -    <!--
   8.565 -                EXECUTION SECTION
   8.566 -            -->
   8.567 -    <target depends="run-deploy,run-display-browser" description="Deploy to server and show in browser." name="run"/>
   8.568 -    <target name="-pre-run-deploy">
   8.569 -        <!-- Empty placeholder for easier customization. -->
   8.570 -        <!-- You can override this target in the ../build.xml file. -->
   8.571 -    </target>
   8.572 -    <target name="-post-run-deploy">
   8.573 -        <!-- Empty placeholder for easier customization. -->
   8.574 -        <!-- You can override this target in the ../build.xml file. -->
   8.575 -    </target>
   8.576 -    <target name="-pre-nbmodule-run-deploy">
   8.577 -        <!-- Empty placeholder for easier customization. -->
   8.578 -        <!-- This target can be overriden by NetBeans modules. Don't override it directly, use -pre-run-deploy task instead. -->
   8.579 -    </target>
   8.580 -    <target name="-post-nbmodule-run-deploy">
   8.581 -        <!-- Empty placeholder for easier customization. -->
   8.582 -        <!-- This target can be overriden by NetBeans modules. Don't override it directly, use -post-run-deploy task instead. -->
   8.583 -    </target>
   8.584 -    <target name="-run-deploy-am">
   8.585 -        <!-- Task to deploy to the Access Manager runtime. -->
   8.586 -    </target>
   8.587 -    <target depends="init,-init-cos,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest,-pre-run-deploy,-pre-nbmodule-run-deploy,-run-deploy-nb,-init-deploy-ant,-deploy-ant,-run-deploy-am,-post-nbmodule-run-deploy,-post-run-deploy" name="run-deploy">
   8.588 -        <nbjpdaappreloaded/>
   8.589 -    </target>
   8.590 -    <target if="netbeans.home" name="-run-deploy-nb">
   8.591 -        <nbdeploy clientUrlPart="${client.urlPart}" debugmode="false" forceRedeploy="${forceRedeploy}"/>
   8.592 -    </target>
   8.593 -    <target name="-init-deploy-ant" unless="netbeans.home">
   8.594 -        <property name="deploy.ant.archive" value="${dist.war}"/>
   8.595 -        <property name="deploy.ant.docbase.dir" value="${web.docbase.dir}"/>
   8.596 -        <property name="deploy.ant.resource.dir" value="${resource.dir}"/>
   8.597 -        <property name="deploy.ant.enabled" value="true"/>
   8.598 -    </target>
   8.599 -    <target depends="dist,-run-undeploy-nb,-init-deploy-ant,-undeploy-ant" name="run-undeploy"/>
   8.600 -    <target if="netbeans.home" name="-run-undeploy-nb">
   8.601 -        <fail message="Undeploy is not supported from within the IDE"/>
   8.602 -    </target>
   8.603 -    <target depends="init,-pre-dist,dist,-post-dist" name="verify">
   8.604 -        <nbverify file="${dist.war}"/>
   8.605 -    </target>
   8.606 -    <target depends="run-deploy,-init-display-browser,-display-browser-nb,-display-browser-cl" name="run-display-browser"/>
   8.607 -    <target if="do.display.browser" name="-init-display-browser">
   8.608 -        <condition property="do.display.browser.nb">
   8.609 -            <isset property="netbeans.home"/>
   8.610 -        </condition>
   8.611 -        <condition property="do.display.browser.cl">
   8.612 -            <isset property="deploy.ant.enabled"/>
   8.613 -        </condition>
   8.614 -    </target>
   8.615 -    <target if="do.display.browser.nb" name="-display-browser-nb">
   8.616 -        <nbbrowse url="${client.url}"/>
   8.617 -    </target>
   8.618 -    <target if="do.display.browser.cl" name="-get-browser" unless="browser">
   8.619 -        <condition property="browser" value="rundll32">
   8.620 -            <os family="windows"/>
   8.621 -        </condition>
   8.622 -        <condition else="" property="browser.args" value="url.dll,FileProtocolHandler">
   8.623 -            <os family="windows"/>
   8.624 -        </condition>
   8.625 -        <condition property="browser" value="/usr/bin/open">
   8.626 -            <os family="mac"/>
   8.627 -        </condition>
   8.628 -        <property environment="env"/>
   8.629 -        <condition property="browser" value="${env.BROWSER}">
   8.630 -            <isset property="env.BROWSER"/>
   8.631 -        </condition>
   8.632 -        <condition property="browser" value="/usr/bin/firefox">
   8.633 -            <available file="/usr/bin/firefox"/>
   8.634 -        </condition>
   8.635 -        <condition property="browser" value="/usr/local/firefox/firefox">
   8.636 -            <available file="/usr/local/firefox/firefox"/>
   8.637 -        </condition>
   8.638 -        <condition property="browser" value="/usr/bin/mozilla">
   8.639 -            <available file="/usr/bin/mozilla"/>
   8.640 -        </condition>
   8.641 -        <condition property="browser" value="/usr/local/mozilla/mozilla">
   8.642 -            <available file="/usr/local/mozilla/mozilla"/>
   8.643 -        </condition>
   8.644 -        <condition property="browser" value="/usr/sfw/lib/firefox/firefox">
   8.645 -            <available file="/usr/sfw/lib/firefox/firefox"/>
   8.646 -        </condition>
   8.647 -        <condition property="browser" value="/opt/csw/bin/firefox">
   8.648 -            <available file="/opt/csw/bin/firefox"/>
   8.649 -        </condition>
   8.650 -        <condition property="browser" value="/usr/sfw/lib/mozilla/mozilla">
   8.651 -            <available file="/usr/sfw/lib/mozilla/mozilla"/>
   8.652 -        </condition>
   8.653 -        <condition property="browser" value="/opt/csw/bin/mozilla">
   8.654 -            <available file="/opt/csw/bin/mozilla"/>
   8.655 -        </condition>
   8.656 -    </target>
   8.657 -    <target depends="-get-browser" if="do.display.browser.cl" name="-display-browser-cl">
   8.658 -        <fail unless="browser">
   8.659 -                    Browser not found, cannot launch the deployed application. Try to set the BROWSER environment variable.
   8.660 -                </fail>
   8.661 -        <property name="browse.url" value="${deploy.ant.client.url}${client.urlPart}"/>
   8.662 -        <echo>Launching ${browse.url}</echo>
   8.663 -        <exec executable="${browser}" spawn="true">
   8.664 -            <arg line="${browser.args} ${browse.url}"/>
   8.665 -        </exec>
   8.666 -    </target>
   8.667 -    <target depends="init,-init-cos,compile-single" name="run-main">
   8.668 -        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
   8.669 -        <webproject1:java classname="${run.class}"/>
   8.670 -    </target>
   8.671 -    <target depends="init,compile-test-single,-pre-test-run-single" name="run-test-with-main">
   8.672 -        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
   8.673 -        <webproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>
   8.674 -    </target>
   8.675 -    <!--
   8.676 -                DEBUGGING SECTION
   8.677 -            -->
   8.678 -    <target depends="init,-init-cos,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest" description="Debug project in IDE." if="netbeans.home" name="debug">
   8.679 -        <nbstartserver debugmode="true"/>
   8.680 -        <antcall target="connect-debugger"/>
   8.681 -        <nbdeploy clientUrlPart="${client.urlPart}" debugmode="true" forceRedeploy="true"/>
   8.682 -        <antcall target="debug-display-browser"/>
   8.683 -        <antcall target="connect-client-debugger"/>
   8.684 -    </target>
   8.685 -    <target if="do.debug.server" name="connect-debugger" unless="is.debugged">
   8.686 -        <nbjpdaconnect address="${jpda.address}" host="${jpda.host}" name="${name}" transport="${jpda.transport}">
   8.687 -            <classpath>
   8.688 -                <path path="${debug.classpath}:${j2ee.platform.classpath}"/>
   8.689 -            </classpath>
   8.690 -            <sourcepath>
   8.691 -                <path path="${web.docbase.dir}"/>
   8.692 -            </sourcepath>
   8.693 -        </nbjpdaconnect>
   8.694 -    </target>
   8.695 -    <target if="do.display.browser.debug" name="debug-display-browser">
   8.696 -        <nbbrowse url="${client.url}"/>
   8.697 -    </target>
   8.698 -    <target if="do.debug.client" name="connect-client-debugger">
   8.699 -        <webproject1:nbjsdebugstart webUrl="${client.url}"/>
   8.700 -    </target>
   8.701 -    <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test">
   8.702 -        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
   8.703 -        <webproject1:debug classname="${debug.class}" classpath="${debug.test.classpath}"/>
   8.704 -    </target>
   8.705 -    <target depends="init,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>
   8.706 -    <target depends="init,compile,compile-jsps,-do-compile-single-jsp,debug" if="netbeans.home" name="debug-single"/>
   8.707 -    <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test">
   8.708 -        <webproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/>
   8.709 -    </target>
   8.710 -    <target depends="init" if="netbeans.home" name="-debug-start-debugger">
   8.711 -        <webproject1:nbjpdastart name="${debug.class}"/>
   8.712 -    </target>
   8.713 -    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
   8.714 -        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
   8.715 -        <webproject1:debug classname="${debug.class}"/>
   8.716 -    </target>
   8.717 -    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single-main"/>
   8.718 -    <target depends="init" name="-pre-debug-fix">
   8.719 -        <fail unless="fix.includes">Must set fix.includes</fail>
   8.720 -        <property name="javac.includes" value="${fix.includes}.java"/>
   8.721 -    </target>
   8.722 -    <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
   8.723 -        <webproject1:nbjpdareload/>
   8.724 -    </target>
   8.725 -    <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
   8.726 -    <!--
   8.727 -                JAVADOC SECTION
   8.728 -            -->
   8.729 -    <target depends="init" name="javadoc-build">
   8.730 -        <mkdir dir="${dist.javadoc.dir}"/>
   8.731 -        <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}">
   8.732 -            <classpath>
   8.733 -                <path path="${javac.classpath}:${j2ee.platform.classpath}"/>
   8.734 -            </classpath>
   8.735 -            <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
   8.736 -                <filename name="**/*.java"/>
   8.737 -            </fileset>
   8.738 -            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
   8.739 -                <include name="**/*.java"/>
   8.740 -            </fileset>
   8.741 -        </javadoc>
   8.742 -    </target>
   8.743 -    <target depends="init,javadoc-build" if="netbeans.home" name="javadoc-browse" unless="no.javadoc.preview">
   8.744 -        <nbbrowse file="${dist.javadoc.dir}/index.html"/>
   8.745 -    </target>
   8.746 -    <target depends="init,javadoc-build,javadoc-browse" description="Build Javadoc." name="javadoc"/>
   8.747 -    <!--
   8.748 -                
   8.749 -                JUNIT COMPILATION SECTION
   8.750 -            -->
   8.751 -    <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
   8.752 -        <mkdir dir="${build.test.classes.dir}"/>
   8.753 -        <property name="j2ee.platform.embeddableejb.classpath" value=""/>
   8.754 -    </target>
   8.755 -    <target name="-pre-compile-test">
   8.756 -        <!-- Empty placeholder for easier customization. -->
   8.757 -        <!-- You can override this target in the ../build.xml file. -->
   8.758 -    </target>
   8.759 -    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test" if="have.tests" name="-do-compile-test">
   8.760 -        <webproject2:javac classpath="${javac.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
   8.761 -        <copy todir="${build.test.classes.dir}">
   8.762 -            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
   8.763 -        </copy>
   8.764 -    </target>
   8.765 -    <target name="-post-compile-test">
   8.766 -        <!-- Empty placeholder for easier customization. -->
   8.767 -        <!-- You can override this target in the ../build.xml file. -->
   8.768 -    </target>
   8.769 -    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
   8.770 -    <target name="-pre-compile-test-single">
   8.771 -        <!-- Empty placeholder for easier customization. -->
   8.772 -        <!-- You can override this target in the ../build.xml file. -->
   8.773 -    </target>
   8.774 -    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
   8.775 -        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
   8.776 -        <webproject2:javac classpath="${javac.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" srcdir="${test.src.dir}"/>
   8.777 -        <copy todir="${build.test.classes.dir}">
   8.778 -            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
   8.779 -        </copy>
   8.780 -    </target>
   8.781 -    <target name="-post-compile-test-single">
   8.782 -        <!-- Empty placeholder for easier customization. -->
   8.783 -        <!-- You can override this target in the ../build.xml file. -->
   8.784 -    </target>
   8.785 -    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
   8.786 -    <!--
   8.787 -                
   8.788 -                JUNIT EXECUTION SECTION
   8.789 -            -->
   8.790 -    <target depends="init" if="have.tests" name="-pre-test-run">
   8.791 -        <mkdir dir="${build.test.results.dir}"/>
   8.792 -    </target>
   8.793 -    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
   8.794 -        <webproject2:junit testincludes="**/*Test.java"/>
   8.795 -    </target>
   8.796 -    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
   8.797 -        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
   8.798 -    </target>
   8.799 -    <target depends="init" if="have.tests" name="test-report"/>
   8.800 -    <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
   8.801 -    <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
   8.802 -    <target depends="init" if="have.tests" name="-pre-test-run-single">
   8.803 -        <mkdir dir="${build.test.results.dir}"/>
   8.804 -    </target>
   8.805 -    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
   8.806 -        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
   8.807 -        <webproject2:junit excludes="" includes="${test.includes}"/>
   8.808 -    </target>
   8.809 -    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
   8.810 -        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
   8.811 -    </target>
   8.812 -    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
   8.813 -    <!--
   8.814 -                
   8.815 -                JUNIT DEBUGGING SECTION
   8.816 -            -->
   8.817 -    <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
   8.818 -        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
   8.819 -        <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
   8.820 -        <delete file="${test.report.file}"/>
   8.821 -        <!-- must exist, otherwise the XML formatter would fail -->
   8.822 -        <mkdir dir="${build.test.results.dir}"/>
   8.823 -        <webproject1:debug args="${test.class}" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}:${j2ee.platform.embeddableejb.classpath}">
   8.824 -            <customize>
   8.825 -                <arg value="showoutput=true"/>
   8.826 -                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
   8.827 -                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
   8.828 -            </customize>
   8.829 -        </webproject1:debug>
   8.830 -    </target>
   8.831 -    <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
   8.832 -        <webproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
   8.833 -    </target>
   8.834 -    <target depends="init,compile-test,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
   8.835 -    <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
   8.836 -        <webproject1:nbjpdareload dir="${build.test.classes.dir}"/>
   8.837 -    </target>
   8.838 -    <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
   8.839 -    <!--
   8.840 -                
   8.841 -                CLEANUP SECTION
   8.842 -            -->
   8.843 -    <target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps">
   8.844 -        <ant antfile="${project.nekurak_net-lib}/build.xml" inheritall="false" target="clean"/>
   8.845 -    </target>
   8.846 -    <target depends="init" name="do-clean">
   8.847 -        <condition property="build.dir.to.clean" value="${build.web.dir}">
   8.848 -            <isset property="dist.ear.dir"/>
   8.849 -        </condition>
   8.850 -        <property name="build.dir.to.clean" value="${build.web.dir}"/>
   8.851 -        <delete includeEmptyDirs="true" quiet="true">
   8.852 -            <fileset dir="${build.dir.to.clean}/WEB-INF/lib"/>
   8.853 -        </delete>
   8.854 -        <delete dir="${build.dir}"/>
   8.855 -        <available file="${build.dir.to.clean}/WEB-INF/lib" property="status.clean-failed" type="dir"/>
   8.856 -        <delete dir="${dist.dir}"/>
   8.857 -    </target>
   8.858 -    <target depends="do-clean" if="status.clean-failed" name="check-clean">
   8.859 -        <echo message="Warning: unable to delete some files in ${build.web.dir}/WEB-INF/lib - they are probably locked by the J2EE server. "/>
   8.860 -        <echo level="info" message="To delete all files undeploy the module from Server Registry in Runtime tab and then use Clean again."/>
   8.861 -    </target>
   8.862 -    <target depends="init" if="netbeans.home" name="undeploy-clean">
   8.863 -        <nbundeploy failOnError="false" startServer="false"/>
   8.864 -    </target>
   8.865 -    <target name="-post-clean">
   8.866 -        <!-- Empty placeholder for easier customization. -->
   8.867 -        <!-- You can override this target in the ../build.xml file. -->
   8.868 -    </target>
   8.869 -    <target depends="init,undeploy-clean,deps-clean,do-clean,check-clean,-post-clean" description="Clean build products." name="clean"/>
   8.870 -    <target depends="clean" description="Clean build products." name="clean-ear"/>
   8.871 -</project>
     9.1 --- a/java/nekurak.net-rest/nbproject/genfiles.properties	Tue Mar 23 01:12:16 2010 +0100
     9.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.3 @@ -1,8 +0,0 @@
     9.4 -build.xml.data.CRC32=c5edf49f
     9.5 -build.xml.script.CRC32=fb1b7f84
     9.6 -build.xml.stylesheet.CRC32=c0ebde35@1.21.2.1
     9.7 -# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
     9.8 -# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
     9.9 -nbproject/build-impl.xml.data.CRC32=c5edf49f
    9.10 -nbproject/build-impl.xml.script.CRC32=41eb3ef9
    9.11 -nbproject/build-impl.xml.stylesheet.CRC32=b139b33b@1.21.2.1
    10.1 --- a/java/nekurak.net-rest/nbproject/project.properties	Tue Mar 23 01:12:16 2010 +0100
    10.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.3 @@ -1,76 +0,0 @@
    10.4 -build.classes.dir=${build.web.dir}/WEB-INF/classes
    10.5 -build.classes.excludes=**/*.java,**/*.form
    10.6 -build.dir=build
    10.7 -build.generated.dir=${build.dir}/generated
    10.8 -build.generated.sources.dir=${build.dir}/generated-sources
    10.9 -build.test.classes.dir=${build.dir}/test/classes
   10.10 -build.test.results.dir=${build.dir}/test/results
   10.11 -build.web.dir=${build.dir}/web
   10.12 -build.web.excludes=${build.classes.excludes}
   10.13 -client.urlPart=
   10.14 -compile.jsps=false
   10.15 -conf.dir=${source.root}/conf
   10.16 -debug.classpath=${build.classes.dir}:${javac.classpath}
   10.17 -debug.test.classpath=\
   10.18 -    ${run.test.classpath}
   10.19 -display.browser=true
   10.20 -dist.dir=dist
   10.21 -dist.ear.war=${dist.dir}/${war.ear.name}
   10.22 -dist.javadoc.dir=${dist.dir}/javadoc
   10.23 -dist.war=${dist.dir}/${war.name}
   10.24 -endorsed.classpath=\
   10.25 -    ${libs.javaee-endorsed-api-6.0.classpath}
   10.26 -excludes=
   10.27 -includes=**
   10.28 -j2ee.deploy.on.save=false
   10.29 -j2ee.platform=1.6-web
   10.30 -j2ee.server.type=gfv3ee6
   10.31 -jar.compress=false
   10.32 -javac.classpath=\
   10.33 -    ${reference.nekurak_net-lib.jar}
   10.34 -# Space-separated list of extra javac options
   10.35 -javac.compilerargs=
   10.36 -javac.debug=true
   10.37 -javac.deprecation=false
   10.38 -javac.source=1.5
   10.39 -javac.target=1.5
   10.40 -javac.test.classpath=\
   10.41 -    ${javac.classpath}:\
   10.42 -    ${build.classes.dir}:\
   10.43 -    ${libs.junit.classpath}:\
   10.44 -    ${libs.junit_4.classpath}
   10.45 -javadoc.additionalparam=
   10.46 -javadoc.author=false
   10.47 -javadoc.encoding=${source.encoding}
   10.48 -javadoc.noindex=false
   10.49 -javadoc.nonavbar=false
   10.50 -javadoc.notree=false
   10.51 -javadoc.preview=true
   10.52 -javadoc.private=false
   10.53 -javadoc.splitindex=true
   10.54 -javadoc.use=true
   10.55 -javadoc.version=false
   10.56 -javadoc.windowtitle=
   10.57 -jspcompilation.classpath=${jspc.classpath}:${javac.classpath}
   10.58 -lib.dir=${web.docbase.dir}/WEB-INF/lib
   10.59 -no.dependencies=false
   10.60 -persistence.xml.dir=${conf.dir}
   10.61 -platform.active=default_platform
   10.62 -project.nekurak_net-lib=../nekurak.net-lib
   10.63 -reference.nekurak_net-lib.jar=${project.nekurak_net-lib}/dist/nekurak.net-lib.jar
   10.64 -resource.dir=setup
   10.65 -run.test.classpath=\
   10.66 -    ${javac.test.classpath}:\
   10.67 -    ${build.test.classes.dir}
   10.68 -# Space-separated list of JVM arguments used when running a class with a main method or a unit test
   10.69 -# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value):
   10.70 -runmain.jvmargs=
   10.71 -source.encoding=UTF-8
   10.72 -source.root=src
   10.73 -src.dir=${source.root}/java
   10.74 -test.src.dir=test
   10.75 -war.content.additional=
   10.76 -war.ear.name=nekurak.net-rest.war
   10.77 -war.name=nekurak.net-rest.war
   10.78 -web.docbase.dir=web
   10.79 -webinf.dir=web/WEB-INF
    11.1 --- a/java/nekurak.net-rest/nbproject/project.xml	Tue Mar 23 01:12:16 2010 +0100
    11.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    11.3 @@ -1,33 +0,0 @@
    11.4 -<?xml version="1.0" encoding="UTF-8"?>
    11.5 -<project xmlns="http://www.netbeans.org/ns/project/1">
    11.6 -    <type>org.netbeans.modules.web.project</type>
    11.7 -    <configuration>
    11.8 -        <data xmlns="http://www.netbeans.org/ns/web-project/3">
    11.9 -            <name>nekurak.net-rest</name>
   11.10 -            <minimum-ant-version>1.6.5</minimum-ant-version>
   11.11 -            <web-module-libraries>
   11.12 -                <library dirs="200">
   11.13 -                    <file>${reference.nekurak_net-lib.jar}</file>
   11.14 -                    <path-in-war>WEB-INF/lib</path-in-war>
   11.15 -                </library>
   11.16 -            </web-module-libraries>
   11.17 -            <web-module-additional-libraries/>
   11.18 -            <source-roots>
   11.19 -                <root id="src.dir" name="Source Packages"/>
   11.20 -            </source-roots>
   11.21 -            <test-roots>
   11.22 -                <root id="test.src.dir" name="Test Packages"/>
   11.23 -            </test-roots>
   11.24 -        </data>
   11.25 -        <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
   11.26 -            <reference>
   11.27 -                <foreign-project>nekurak_net-lib</foreign-project>
   11.28 -                <artifact-type>jar</artifact-type>
   11.29 -                <script>build.xml</script>
   11.30 -                <target>jar</target>
   11.31 -                <clean-target>clean</clean-target>
   11.32 -                <id>jar</id>
   11.33 -            </reference>
   11.34 -        </references>
   11.35 -    </configuration>
   11.36 -</project>
    12.1 --- a/java/nekurak.net-rest/src/java/cz/frantovo/nekurak/rest/ClanekREST.java	Tue Mar 23 01:12:16 2010 +0100
    12.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    12.3 @@ -1,12 +0,0 @@
    12.4 -package cz.frantovo.nekurak.rest;
    12.5 -
    12.6 -import cz.frantovo.nekurak.xml.ClanekXML;
    12.7 -
    12.8 -//@Path("clanek")
    12.9 -public class ClanekREST {
   12.10 -
   12.11 -    //@GET
   12.12 -    public ClanekXML getClanek() {
   12.13 -	return null;
   12.14 -    }
   12.15 -}
   12.16 \ No newline at end of file
    13.1 --- a/java/nekurak.net-rest/web/WEB-INF/beans.xml	Tue Mar 23 01:12:16 2010 +0100
    13.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    13.3 @@ -1,5 +0,0 @@
    13.4 -<?xml version="1.0" encoding="UTF-8"?>
    13.5 -<beans xmlns="http://java.sun.com/xml/ns/javaee"
    13.6 -       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    13.7 -       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
    13.8 -</beans>
    14.1 --- a/java/nekurak.net-rest/web/WEB-INF/sun-web.xml	Tue Mar 23 01:12:16 2010 +0100
    14.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    14.3 @@ -1,11 +0,0 @@
    14.4 -<?xml version="1.0" encoding="UTF-8"?>
    14.5 -<!DOCTYPE sun-web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Application Server 9.0 Servlet 2.5//EN" "http://www.sun.com/software/appserver/dtds/sun-web-app_2_5-0.dtd">
    14.6 -<sun-web-app error-url="">
    14.7 -  <context-root>/nekurak.net-rest</context-root>
    14.8 -  <class-loader delegate="true"/>
    14.9 -  <jsp-config>
   14.10 -    <property name="keepgenerated" value="true">
   14.11 -      <description>Keep a copy of the generated servlet class' java code.</description>
   14.12 -    </property>
   14.13 -  </jsp-config>
   14.14 -</sun-web-app>
    15.1 --- a/java/nekurak.net-rest/web/WEB-INF/web.xml	Tue Mar 23 01:12:16 2010 +0100
    15.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    15.3 @@ -1,12 +0,0 @@
    15.4 -<?xml version="1.0" encoding="UTF-8"?>
    15.5 -
    15.6 -<web-app xmlns="http://java.sun.com/xml/ns/javaee"
    15.7 -	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    15.8 -	 xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
    15.9 -	 version="3.0">
   15.10 -    <session-config>
   15.11 -	<session-timeout>
   15.12 -	    30
   15.13 -	</session-timeout>
   15.14 -    </session-config>
   15.15 -</web-app>
    16.1 --- a/java/nekurak.net-web/build.xml	Tue Mar 23 01:12:16 2010 +0100
    16.2 +++ b/java/nekurak.net-web/build.xml	Tue Mar 23 09:15:48 2010 +0100
    16.3 @@ -85,9 +85,6 @@
    16.4        nekurak.net/java/nekurak.net-web/nbproject/private/**
    16.5        nekurak.net/java/nekurak.net-web/dist/**
    16.6        nekurak.net/java/nekurak.net-web/build/**
    16.7 -      nekurak.net/java/nekurak.net-rest/nbproject/private/**
    16.8 -      nekurak.net/java/nekurak.net-rest/dist/**
    16.9 -      nekurak.net/java/nekurak.net-rest/build/**
   16.10        nekurak.net/java/nekurak.net-lib/nbproject/private/**
   16.11        nekurak.net/java/nekurak.net-lib/dist/**
   16.12        nekurak.net/java/nekurak.net-lib/build/**