1.1 --- a/java/nekurak.net-ear/nbproject/build-impl.xml Tue Mar 23 16:11:07 2010 +0100
1.2 +++ b/java/nekurak.net-ear/nbproject/build-impl.xml Mon Apr 05 15:21:14 2010 +0200
1.3 @@ -166,6 +166,15 @@
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 @@ -184,6 +193,7 @@
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 @@ -261,6 +271,7 @@
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 @@ -455,6 +466,15 @@
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 16:11:07 2010 +0100
2.2 +++ b/java/nekurak.net-ear/nbproject/genfiles.properties Mon Apr 05 15:21:14 2010 +0200
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=dd0510f0
2.8 -nbproject/build-impl.xml.script.CRC32=b94a2023
2.9 +nbproject/build-impl.xml.data.CRC32=efe37659
2.10 +nbproject/build-impl.xml.script.CRC32=4bf9637a
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 16:11:07 2010 +0100
3.2 +++ b/java/nekurak.net-ear/nbproject/project.properties Mon Apr 05 15:21:14 2010 +0200
3.3 @@ -16,7 +16,8 @@
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-ejb.dist-ear}:\
3.9 + ${reference.nekurak_net-rest.dist-ear}
3.10 jar.name=nekurak.net-ear.ear
3.11 javac.debug=true
3.12 javac.deprecation=false
3.13 @@ -26,8 +27,10 @@
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 16:11:07 2010 +0100
4.2 +++ b/java/nekurak.net-ear/nbproject/project.xml Mon Apr 05 15:21:14 2010 +0200
4.3 @@ -15,6 +15,10 @@
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 @@ -27,6 +31,14 @@
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 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
5.2 +++ b/java/nekurak.net-rest/nbproject/ant-deploy.xml Mon Apr 05 15:21:14 2010 +0200
5.3 @@ -0,0 +1,60 @@
5.4 +<?xml version="1.0" encoding="UTF-8"?>
5.5 +<project default="-deploy-ant" basedir=".">
5.6 + <target name="-init-cl-deployment-env" if="deploy.ant.enabled">
5.7 + <property file="${deploy.ant.properties.file}" />
5.8 + <available file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" property="sun.web.present"/>
5.9 + <available file="${deploy.ant.resource.dir}" property="has.setup"/>
5.10 + <tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
5.11 + <echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
5.12 + </target>
5.13 +
5.14 + <target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
5.15 + <tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
5.16 + <copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
5.17 + <!-- The doctype triggers resolution which can fail -->
5.18 + <replace file="${temp.sun.web}">
5.19 + <replacetoken><![CDATA[<!DOCTYPE]]></replacetoken>
5.20 + <replacevalue><![CDATA[<!-- <!DOCTYPE]]></replacevalue>
5.21 + </replace>
5.22 + <replace file="${temp.sun.web}">
5.23 + <replacetoken><![CDATA[<sun-web-app]]></replacetoken>
5.24 + <replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
5.25 + </replace>
5.26 + <xmlproperty file="${temp.sun.web}" validate="false">
5.27 + </xmlproperty>
5.28 + <delete file="${temp.sun.web}"/>
5.29 + <property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
5.30 + <property name="deploy.context.root.argument" value="?contextroot=${sun-web-app.context-root}"/>
5.31 + </target>
5.32 + <target name="-no-parse-sun-web" depends="-init-cl-deployment-env" unless="sun.web.present">
5.33 + <property name="deploy.context.root.argument" value=""/>
5.34 + </target>
5.35 + <target name="-add-resources" depends="-init-cl-deployment-env" if="has.setup">
5.36 + <tempfile prefix="gfv3" property="gfv3.resources.dir" destdir="${java.io.tmpdir}"/>
5.37 + <mkdir dir="${gfv3.resources.dir}"/>
5.38 + <mkdir dir="${gfv3.resources.dir}/META-INF"/>
5.39 + <property name="gfv3.resources.file" value="${gfv3.resources.dir}/META-INF/sun-resources.xml"/>
5.40 + <copy todir="${gfv3.resources.dir}/META-INF">
5.41 + <fileset dir="${deploy.ant.resource.dir}"/>
5.42 + </copy>
5.43 + <jar destfile="${deploy.ant.archive}" update="true">
5.44 + <fileset dir="${gfv3.resources.dir}"/>
5.45 + </jar>
5.46 + <delete dir="${gfv3.resources.dir}"/>
5.47 + </target>
5.48 + <target name="-deploy-ant" depends="-parse-sun-web,-no-parse-sun-web,-add-resources" if="deploy.ant.enabled">
5.49 + <echo message="Deploying ${deploy.ant.archive}"/>
5.50 + <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
5.51 + <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
5.52 + <get src="${gfv3.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}?force=true?name=${ant.project.name}"
5.53 + dest="${gfv3.results.file}"/>
5.54 + <delete file="${gfv3.results.file}"/>
5.55 + </target>
5.56 + <target name="-undeploy-ant" depends="-init-cl-deployment-env" if="deploy.ant.enabled">
5.57 + <echo message="Undeploying ${deploy.ant.archive}"/>
5.58 + <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
5.59 + <get src="${gfv3.url}/__asadmin/undeploy?name=${ant.project.name}"
5.60 + dest="${gfv3.results.file}"/>
5.61 + <delete file="${gfv3.results.file}"/>
5.62 + </target>
5.63 +</project>
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
6.2 +++ b/java/nekurak.net-rest/nbproject/build-impl.xml Mon Apr 05 15:21:14 2010 +0200
6.3 @@ -0,0 +1,856 @@
6.4 +<?xml version="1.0" encoding="UTF-8"?>
6.5 +<!--
6.6 + *** GENERATED FROM project.xml - DO NOT EDIT ***
6.7 + *** EDIT ../build.xml INSTEAD ***
6.8 +
6.9 + For the purpose of easier reading the script
6.10 + is divided into following sections:
6.11 + - initialization
6.12 + - compilation
6.13 + - dist
6.14 + - execution
6.15 + - debugging
6.16 + - javadoc
6.17 + - junit compilation
6.18 + - junit execution
6.19 + - junit debugging
6.20 + - cleanup
6.21 +
6.22 + -->
6.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">
6.24 + <import file="rest-build.xml"/>
6.25 + <import file="ant-deploy.xml"/>
6.26 + <fail message="Please build using Ant 1.7.1 or higher.">
6.27 + <condition>
6.28 + <not>
6.29 + <antversion atleast="1.7.1"/>
6.30 + </not>
6.31 + </condition>
6.32 + </fail>
6.33 + <target depends="dist,javadoc" description="Build whole project." name="default"/>
6.34 + <!--
6.35 + INITIALIZATION SECTION
6.36 + -->
6.37 + <target name="-pre-init">
6.38 + <!-- Empty placeholder for easier customization. -->
6.39 + <!-- You can override this target in the ../build.xml file. -->
6.40 + </target>
6.41 + <target depends="-pre-init" name="-init-private">
6.42 + <property file="nbproject/private/private.properties"/>
6.43 + </target>
6.44 + <target depends="-pre-init,-init-private" name="-init-user">
6.45 + <property file="${user.properties.file}"/>
6.46 + <!-- The two properties below are usually overridden -->
6.47 + <!-- by the active platform. Just a fallback. -->
6.48 + <property name="default.javac.source" value="1.4"/>
6.49 + <property name="default.javac.target" value="1.4"/>
6.50 + </target>
6.51 + <target depends="-pre-init,-init-private,-init-user" name="-init-project">
6.52 + <property file="nbproject/project.properties"/>
6.53 + </target>
6.54 + <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" if="dist.ear.dir" name="-do-ear-init"/>
6.55 + <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
6.56 + <condition property="have.tests">
6.57 + <or>
6.58 + <available file="${test.src.dir}"/>
6.59 + </or>
6.60 + </condition>
6.61 + <condition property="have.sources">
6.62 + <or>
6.63 + <available file="${src.dir}"/>
6.64 + </or>
6.65 + </condition>
6.66 + <condition property="netbeans.home+have.tests">
6.67 + <and>
6.68 + <isset property="netbeans.home"/>
6.69 + <isset property="have.tests"/>
6.70 + </and>
6.71 + </condition>
6.72 + <condition property="no.javadoc.preview">
6.73 + <isfalse value="${javadoc.preview}"/>
6.74 + </condition>
6.75 + <property name="javac.compilerargs" value=""/>
6.76 + <condition property="no.deps">
6.77 + <and>
6.78 + <istrue value="${no.dependencies}"/>
6.79 + </and>
6.80 + </condition>
6.81 + <condition property="no.dist.ear.dir">
6.82 + <not>
6.83 + <isset property="dist.ear.dir"/>
6.84 + </not>
6.85 + </condition>
6.86 + <property name="build.web.excludes" value="${build.classes.excludes}"/>
6.87 + <condition property="do.compile.jsps">
6.88 + <istrue value="${compile.jsps}"/>
6.89 + </condition>
6.90 + <condition property="do.debug.server">
6.91 + <or>
6.92 + <not>
6.93 + <isset property="debug.server"/>
6.94 + </not>
6.95 + <istrue value="${debug.server}"/>
6.96 + <and>
6.97 + <not>
6.98 + <istrue value="${debug.server}"/>
6.99 + </not>
6.100 + <not>
6.101 + <istrue value="${debug.client}"/>
6.102 + </not>
6.103 + </and>
6.104 + </or>
6.105 + </condition>
6.106 + <condition property="do.debug.client">
6.107 + <istrue value="${debug.client}"/>
6.108 + </condition>
6.109 + <condition property="do.display.browser">
6.110 + <istrue value="${display.browser}"/>
6.111 + </condition>
6.112 + <condition property="do.display.browser.debug">
6.113 + <and>
6.114 + <isset property="do.display.browser"/>
6.115 + <not>
6.116 + <isset property="do.debug.client"/>
6.117 + </not>
6.118 + </and>
6.119 + </condition>
6.120 + <available file="${conf.dir}/MANIFEST.MF" property="has.custom.manifest"/>
6.121 + <available file="${persistence.xml.dir}/persistence.xml" property="has.persistence.xml"/>
6.122 + <condition property="do.war.package.with.custom.manifest">
6.123 + <isset property="has.custom.manifest"/>
6.124 + </condition>
6.125 + <condition property="do.war.package.without.custom.manifest">
6.126 + <not>
6.127 + <isset property="has.custom.manifest"/>
6.128 + </not>
6.129 + </condition>
6.130 + <condition property="do.tmp.war.package.with.custom.manifest">
6.131 + <and>
6.132 + <isset property="has.custom.manifest"/>
6.133 + <or>
6.134 + <isfalse value="${directory.deployment.supported}"/>
6.135 + <isset property="dist.ear.dir"/>
6.136 + </or>
6.137 + </and>
6.138 + </condition>
6.139 + <condition property="do.tmp.war.package.without.custom.manifest">
6.140 + <and>
6.141 + <not>
6.142 + <isset property="has.custom.manifest"/>
6.143 + </not>
6.144 + <or>
6.145 + <isfalse value="${directory.deployment.supported}"/>
6.146 + <isset property="dist.ear.dir"/>
6.147 + </or>
6.148 + </and>
6.149 + </condition>
6.150 + <condition property="do.tmp.war.package">
6.151 + <or>
6.152 + <isfalse value="${directory.deployment.supported}"/>
6.153 + <isset property="dist.ear.dir"/>
6.154 + </or>
6.155 + </condition>
6.156 + <property name="build.meta.inf.dir" value="${build.web.dir}/META-INF"/>
6.157 + <condition else="" property="application.args.param" value="${application.args}">
6.158 + <and>
6.159 + <isset property="application.args"/>
6.160 + <not>
6.161 + <equals arg1="${application.args}" arg2="" trim="true"/>
6.162 + </not>
6.163 + </and>
6.164 + </condition>
6.165 + <property name="source.encoding" value="${file.encoding}"/>
6.166 + <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
6.167 + <and>
6.168 + <isset property="javadoc.encoding"/>
6.169 + <not>
6.170 + <equals arg1="${javadoc.encoding}" arg2=""/>
6.171 + </not>
6.172 + </and>
6.173 + </condition>
6.174 + <property name="javadoc.encoding.used" value="${source.encoding}"/>
6.175 + <property name="includes" value="**"/>
6.176 + <property name="excludes" value=""/>
6.177 + <property name="runmain.jvmargs" value=""/>
6.178 + <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
6.179 + <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
6.180 + <length length="0" string="${endorsed.classpath}" when="greater"/>
6.181 + </condition>
6.182 + </target>
6.183 + <target depends="init" name="-init-cos" unless="deploy.on.save">
6.184 + <condition property="deploy.on.save" value="true">
6.185 + <istrue value="${j2ee.deploy.on.save}"/>
6.186 + </condition>
6.187 + </target>
6.188 + <target name="-post-init">
6.189 + <!-- Empty placeholder for easier customization. -->
6.190 + <!-- You can override this target in the ../build.xml file. -->
6.191 + </target>
6.192 + <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
6.193 + <fail unless="src.dir">Must set src.dir</fail>
6.194 + <fail unless="test.src.dir">Must set test.src.dir</fail>
6.195 + <fail unless="build.dir">Must set build.dir</fail>
6.196 + <fail unless="build.web.dir">Must set build.web.dir</fail>
6.197 + <fail unless="build.generated.dir">Must set build.generated.dir</fail>
6.198 + <fail unless="dist.dir">Must set dist.dir</fail>
6.199 + <fail unless="build.classes.dir">Must set build.classes.dir</fail>
6.200 + <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
6.201 + <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
6.202 + <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
6.203 + <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
6.204 + <fail unless="dist.war">Must set dist.war</fail>
6.205 + <fail unless="j2ee.platform.classpath">
6.206 +The Java EE server classpath is not correctly set up. Your active server type is ${j2ee.server.type}.
6.207 +Either open the project in the IDE and assign the server or setup the server classpath manually.
6.208 +For example like this:
6.209 + ant -Duser.properties.file=<path_to_property_file> (where you put the property "j2ee.platform.classpath" in a .properties file)
6.210 +or ant -Dj2ee.platform.classpath=<server_classpath> (where no properties file is used)
6.211 + </fail>
6.212 + </target>
6.213 + <target name="-init-macrodef-property">
6.214 + <macrodef name="property" uri="http://www.netbeans.org/ns/web-project/1">
6.215 + <attribute name="name"/>
6.216 + <attribute name="value"/>
6.217 + <sequential>
6.218 + <property name="@{name}" value="${@{value}}"/>
6.219 + </sequential>
6.220 + </macrodef>
6.221 + </target>
6.222 + <target name="-init-macrodef-javac">
6.223 + <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
6.224 + <attribute default="${src.dir}" name="srcdir"/>
6.225 + <attribute default="${build.classes.dir}" name="destdir"/>
6.226 + <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
6.227 + <attribute default="${includes}" name="includes"/>
6.228 + <attribute default="${excludes}" name="excludes"/>
6.229 + <attribute default="${javac.debug}" name="debug"/>
6.230 + <attribute default="${empty.dir}" name="gensrcdir"/>
6.231 + <element name="customize" optional="true"/>
6.232 + <sequential>
6.233 + <property location="${build.dir}/empty" name="empty.dir"/>
6.234 + <mkdir dir="${empty.dir}"/>
6.235 + <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}">
6.236 + <src>
6.237 + <dirset dir="@{gensrcdir}" erroronmissingdir="false">
6.238 + <include name="*"/>
6.239 + </dirset>
6.240 + </src>
6.241 + <classpath>
6.242 + <path path="@{classpath}"/>
6.243 + </classpath>
6.244 + <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
6.245 + <compilerarg line="${javac.compilerargs}"/>
6.246 + <customize/>
6.247 + </javac>
6.248 + </sequential>
6.249 + </macrodef>
6.250 + </target>
6.251 + <target name="-init-macrodef-junit">
6.252 + <macrodef name="junit" uri="http://www.netbeans.org/ns/web-project/2">
6.253 + <attribute default="${includes}" name="includes"/>
6.254 + <attribute default="${excludes}" name="excludes"/>
6.255 + <attribute default="**" name="testincludes"/>
6.256 + <sequential>
6.257 + <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${java.io.tmpdir}">
6.258 + <batchtest todir="${build.test.results.dir}">
6.259 + <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
6.260 + <filename name="@{testincludes}"/>
6.261 + </fileset>
6.262 + </batchtest>
6.263 + <classpath>
6.264 + <path path="${run.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}"/>
6.265 + </classpath>
6.266 + <syspropertyset>
6.267 + <propertyref prefix="test-sys-prop."/>
6.268 + <mapper from="test-sys-prop.*" to="*" type="glob"/>
6.269 + </syspropertyset>
6.270 + <formatter type="brief" usefile="false"/>
6.271 + <formatter type="xml"/>
6.272 + <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
6.273 + <jvmarg line="${runmain.jvmargs}"/>
6.274 + </junit>
6.275 + </sequential>
6.276 + </macrodef>
6.277 + </target>
6.278 + <target name="-init-macrodef-java">
6.279 + <macrodef name="java" uri="http://www.netbeans.org/ns/web-project/1">
6.280 + <attribute default="${main.class}" name="classname"/>
6.281 + <attribute default="${debug.classpath}" name="classpath"/>
6.282 + <element name="customize" optional="true"/>
6.283 + <sequential>
6.284 + <java classname="@{classname}" fork="true">
6.285 + <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
6.286 + <jvmarg line="${runmain.jvmargs}"/>
6.287 + <classpath>
6.288 + <path path="@{classpath}:${j2ee.platform.classpath}"/>
6.289 + </classpath>
6.290 + <syspropertyset>
6.291 + <propertyref prefix="run-sys-prop."/>
6.292 + <mapper from="run-sys-prop.*" to="*" type="glob"/>
6.293 + </syspropertyset>
6.294 + <customize/>
6.295 + </java>
6.296 + </sequential>
6.297 + </macrodef>
6.298 + </target>
6.299 + <target name="-init-macrodef-nbjsdebug">
6.300 + <macrodef name="nbjsdebugstart" uri="http://www.netbeans.org/ns/web-project/1">
6.301 + <attribute default="${client.url}" name="webUrl"/>
6.302 + <sequential>
6.303 + <nbjsdebugstart urlPart="${client.urlPart}" webUrl="@{webUrl}"/>
6.304 + </sequential>
6.305 + </macrodef>
6.306 + </target>
6.307 + <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
6.308 + <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/web-project/1">
6.309 + <attribute default="${main.class}" name="name"/>
6.310 + <attribute default="${debug.classpath}:${j2ee.platform.classpath}" name="classpath"/>
6.311 + <sequential>
6.312 + <nbjpdastart addressproperty="jpda.address" name="@{name}" transport="${debug-transport}">
6.313 + <classpath>
6.314 + <path path="@{classpath}"/>
6.315 + </classpath>
6.316 + </nbjpdastart>
6.317 + </sequential>
6.318 + </macrodef>
6.319 + <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/web-project/1">
6.320 + <attribute default="${build.classes.dir}" name="dir"/>
6.321 + <sequential>
6.322 + <nbjpdareload>
6.323 + <fileset dir="@{dir}" includes="${fix.classes}">
6.324 + <include name="${fix.includes}*.class"/>
6.325 + </fileset>
6.326 + </nbjpdareload>
6.327 + </sequential>
6.328 + </macrodef>
6.329 + <macrodef name="nbjpdaappreloaded" uri="http://www.netbeans.org/ns/web-project/1">
6.330 + <sequential>
6.331 + <nbjpdaappreloaded/>
6.332 + </sequential>
6.333 + </macrodef>
6.334 + </target>
6.335 + <target name="-init-debug-args">
6.336 + <property name="version-output" value="java version "${ant.java.version}"/>
6.337 + <condition property="have-jdk-older-than-1.4">
6.338 + <or>
6.339 + <contains string="${version-output}" substring="java version "1.0"/>
6.340 + <contains string="${version-output}" substring="java version "1.1"/>
6.341 + <contains string="${version-output}" substring="java version "1.2"/>
6.342 + <contains string="${version-output}" substring="java version "1.3"/>
6.343 + </or>
6.344 + </condition>
6.345 + <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
6.346 + <istrue value="${have-jdk-older-than-1.4}"/>
6.347 + </condition>
6.348 + <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
6.349 + <os family="windows"/>
6.350 + </condition>
6.351 + <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
6.352 + <isset property="debug.transport"/>
6.353 + </condition>
6.354 + </target>
6.355 + <target depends="-init-debug-args" name="-init-macrodef-debug">
6.356 + <macrodef name="debug" uri="http://www.netbeans.org/ns/web-project/1">
6.357 + <attribute default="${main.class}" name="classname"/>
6.358 + <attribute default="${debug.classpath}:${j2ee.platform.classpath}" name="classpath"/>
6.359 + <attribute default="${application.args.param}" name="args"/>
6.360 + <element name="customize" optional="true"/>
6.361 + <sequential>
6.362 + <java classname="@{classname}" fork="true">
6.363 + <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
6.364 + <jvmarg line="${debug-args-line}"/>
6.365 + <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
6.366 + <jvmarg line="${runmain.jvmargs}"/>
6.367 + <classpath>
6.368 + <path path="@{classpath}"/>
6.369 + </classpath>
6.370 + <syspropertyset>
6.371 + <propertyref prefix="run-sys-prop."/>
6.372 + <mapper from="run-sys-prop.*" to="*" type="glob"/>
6.373 + </syspropertyset>
6.374 + <arg line="@{args}"/>
6.375 + <customize/>
6.376 + </java>
6.377 + </sequential>
6.378 + </macrodef>
6.379 + </target>
6.380 + <target name="-init-taskdefs">
6.381 + <fail unless="libs.CopyLibs.classpath">
6.382 +The libs.CopyLibs.classpath property is not set up.
6.383 +This property must point to
6.384 +org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part
6.385 +of NetBeans IDE installation and is usually located at
6.386 +<netbeans_installation>/java<version>/ant/extra folder.
6.387 +Either open the project in the IDE and make sure CopyLibs library
6.388 +exists or setup the property manually. For example like this:
6.389 + ant -Dlibs.CopyLibs.classpath=a/path/to/org-netbeans-modules-java-j2seproject-copylibstask.jar
6.390 + </fail>
6.391 + <taskdef classpath="${libs.CopyLibs.classpath}" resource="org/netbeans/modules/java/j2seproject/copylibstask/antlib.xml"/>
6.392 + </target>
6.393 + <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"/>
6.394 + <!--
6.395 + COMPILATION SECTION
6.396 + -->
6.397 + <target depends="init" if="no.dist.ear.dir" name="deps-module-jar" unless="no.deps"/>
6.398 + <target depends="init" if="dist.ear.dir" name="deps-ear-jar" unless="no.deps"/>
6.399 + <target depends="init, deps-module-jar, deps-ear-jar" name="deps-jar" unless="no.deps"/>
6.400 + <target depends="init,deps-jar,generate-rest-config" name="-pre-pre-compile">
6.401 + <mkdir dir="${build.classes.dir}"/>
6.402 + </target>
6.403 + <target name="-pre-compile">
6.404 + <!-- Empty placeholder for easier customization. -->
6.405 + <!-- You can override this target in the ../build.xml file. -->
6.406 + </target>
6.407 + <target name="-copy-webdir">
6.408 + <copy todir="${build.web.dir}">
6.409 + <fileset dir="${web.docbase.dir}" excludes="${build.web.excludes},${excludes}" includes="${includes}"/>
6.410 + </copy>
6.411 + <copy todir="${build.web.dir}/WEB-INF">
6.412 + <fileset dir="${webinf.dir}" excludes="${build.web.excludes}"/>
6.413 + </copy>
6.414 + </target>
6.415 + <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">
6.416 + <webproject2:javac destdir="${build.classes.dir}" gensrcdir="${build.generated.sources.dir}"/>
6.417 + <copy todir="${build.classes.dir}">
6.418 + <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
6.419 + </copy>
6.420 + </target>
6.421 + <target if="has.custom.manifest" name="-copy-manifest">
6.422 + <mkdir dir="${build.meta.inf.dir}"/>
6.423 + <copy todir="${build.meta.inf.dir}">
6.424 + <fileset dir="${conf.dir}" includes="MANIFEST.MF"/>
6.425 + </copy>
6.426 + </target>
6.427 + <target if="has.persistence.xml" name="-copy-persistence-xml">
6.428 + <mkdir dir="${build.web.dir}/WEB-INF/classes/META-INF"/>
6.429 + <copy todir="${build.web.dir}/WEB-INF/classes/META-INF">
6.430 + <fileset dir="${persistence.xml.dir}" includes="persistence.xml"/>
6.431 + </copy>
6.432 + </target>
6.433 + <target name="-post-compile">
6.434 + <!-- Empty placeholder for easier customization. -->
6.435 + <!-- You can override this target in the ../build.xml file. -->
6.436 + </target>
6.437 + <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
6.438 + <target name="-pre-compile-single">
6.439 + <!-- Empty placeholder for easier customization. -->
6.440 + <!-- You can override this target in the ../build.xml file. -->
6.441 + </target>
6.442 + <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
6.443 + <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
6.444 + <webproject2:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}"/>
6.445 + <copy todir="${build.classes.dir}">
6.446 + <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
6.447 + </copy>
6.448 + </target>
6.449 + <target name="-post-compile-single">
6.450 + <!-- Empty placeholder for easier customization. -->
6.451 + <!-- You can override this target in the ../build.xml file. -->
6.452 + </target>
6.453 + <target depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
6.454 + <target depends="compile" description="Test compile JSP pages to expose compilation errors." if="do.compile.jsps" name="compile-jsps">
6.455 + <mkdir dir="${build.generated.dir}/src"/>
6.456 + <java classname="org.netbeans.modules.web.project.ant.JspC" failonerror="true" fork="true">
6.457 + <arg value="-uriroot"/>
6.458 + <arg file="${basedir}/${build.web.dir}"/>
6.459 + <arg value="-d"/>
6.460 + <arg file="${basedir}/${build.generated.dir}/src"/>
6.461 + <arg value="-die1"/>
6.462 + <arg value="-compilerSourceVM ${javac.source}"/>
6.463 + <arg value="-compilerTargetVM ${javac.target}"/>
6.464 + <arg value="-javaEncoding ${source.encoding}"/>
6.465 + <classpath path="${java.home}/../lib/tools.jar:${jspctask.classpath}:${jspcompilation.classpath}"/>
6.466 + </java>
6.467 + <mkdir dir="${build.generated.dir}/classes"/>
6.468 + <webproject2:javac classpath="${j2ee.platform.classpath}:${build.classes.dir}:${jspcompilation.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src"/>
6.469 + </target>
6.470 + <target depends="compile" if="jsp.includes" name="-do-compile-single-jsp">
6.471 + <fail unless="javac.jsp.includes">Must select some files in the IDE or set javac.jsp.includes</fail>
6.472 + <mkdir dir="${build.generated.dir}/src"/>
6.473 + <java classname="org.netbeans.modules.web.project.ant.JspCSingle" failonerror="true" fork="true">
6.474 + <arg value="-uriroot"/>
6.475 + <arg file="${basedir}/${build.web.dir}"/>
6.476 + <arg value="-d"/>
6.477 + <arg file="${basedir}/${build.generated.dir}/src"/>
6.478 + <arg value="-die1"/>
6.479 + <arg value="-jspc.files"/>
6.480 + <arg path="${jsp.includes}"/>
6.481 + <arg value="-compilerSourceVM ${javac.source}"/>
6.482 + <arg value="-compilerTargetVM ${javac.target}"/>
6.483 + <arg value="-javaEncoding ${source.encoding}"/>
6.484 + <classpath path="${java.home}/../lib/tools.jar:${jspctask.classpath}:${jspcompilation.classpath}"/>
6.485 + </java>
6.486 + <mkdir dir="${build.generated.dir}/classes"/>
6.487 + <webproject2:javac classpath="${j2ee.platform.classpath}:${build.classes.dir}:${jspcompilation.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src">
6.488 + <customize>
6.489 + <patternset includes="${javac.jsp.includes}"/>
6.490 + </customize>
6.491 + </webproject2:javac>
6.492 + </target>
6.493 + <target name="compile-single-jsp">
6.494 + <fail unless="jsp.includes">Must select a file in the IDE or set jsp.includes</fail>
6.495 + <antcall target="-do-compile-single-jsp"/>
6.496 + </target>
6.497 + <!--
6.498 + DIST BUILDING SECTION
6.499 + -->
6.500 + <target name="-pre-dist">
6.501 + <!-- Empty placeholder for easier customization. -->
6.502 + <!-- You can override this target in the ../build.xml file. -->
6.503 + </target>
6.504 + <target depends="init,compile,compile-jsps,-pre-dist" if="do.war.package.without.custom.manifest" name="-do-dist-without-manifest">
6.505 + <dirname file="${dist.war}" property="dist.jar.dir"/>
6.506 + <mkdir dir="${dist.jar.dir}"/>
6.507 + <jar compress="${jar.compress}" jarfile="${dist.war}">
6.508 + <fileset dir="${build.web.dir}"/>
6.509 + </jar>
6.510 + </target>
6.511 + <target depends="init,compile,compile-jsps,-pre-dist" if="do.war.package.with.custom.manifest" name="-do-dist-with-manifest">
6.512 + <dirname file="${dist.war}" property="dist.jar.dir"/>
6.513 + <mkdir dir="${dist.jar.dir}"/>
6.514 + <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
6.515 + <fileset dir="${build.web.dir}"/>
6.516 + </jar>
6.517 + </target>
6.518 + <target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.without.custom.manifest" name="-do-tmp-dist-without-manifest">
6.519 + <dirname file="${dist.war}" property="dist.jar.dir"/>
6.520 + <mkdir dir="${dist.jar.dir}"/>
6.521 + <jar compress="${jar.compress}" jarfile="${dist.war}">
6.522 + <fileset dir="${build.web.dir}"/>
6.523 + </jar>
6.524 + </target>
6.525 + <target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.with.custom.manifest" name="-do-tmp-dist-with-manifest">
6.526 + <dirname file="${dist.war}" property="dist.jar.dir"/>
6.527 + <mkdir dir="${dist.jar.dir}"/>
6.528 + <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
6.529 + <fileset dir="${build.web.dir}"/>
6.530 + </jar>
6.531 + </target>
6.532 + <target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
6.533 + <target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest">
6.534 + <mkdir dir="${build.web.dir}/META-INF"/>
6.535 + <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
6.536 + </target>
6.537 + <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir"/>
6.538 + <target depends="init" if="dist.ear.dir" name="-clean-webinf-lib">
6.539 + <delete dir="${build.web.dir}/WEB-INF/lib"/>
6.540 + </target>
6.541 + <target depends="init,-clean-webinf-lib,compile,compile-jsps,-pre-dist,library-inclusion-in-manifest" if="do.tmp.war.package" name="do-ear-dist">
6.542 + <dirname file="${dist.ear.war}" property="dist.jar.dir"/>
6.543 + <mkdir dir="${dist.jar.dir}"/>
6.544 + <jar compress="${jar.compress}" jarfile="${dist.ear.war}" manifest="${build.web.dir}/META-INF/MANIFEST.MF">
6.545 + <fileset dir="${build.web.dir}"/>
6.546 + </jar>
6.547 + </target>
6.548 + <target name="-post-dist">
6.549 + <!-- Empty placeholder for easier customization. -->
6.550 + <!-- You can override this target in the ../build.xml file. -->
6.551 + </target>
6.552 + <target depends="init,compile,-pre-dist,do-dist,-post-dist" description="Build distribution (WAR)." name="dist"/>
6.553 + <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"/>
6.554 + <!--
6.555 + EXECUTION SECTION
6.556 + -->
6.557 + <target depends="run-deploy,run-display-browser" description="Deploy to server and show in browser." name="run"/>
6.558 + <target name="-pre-run-deploy">
6.559 + <!-- Empty placeholder for easier customization. -->
6.560 + <!-- You can override this target in the ../build.xml file. -->
6.561 + </target>
6.562 + <target name="-post-run-deploy">
6.563 + <!-- Empty placeholder for easier customization. -->
6.564 + <!-- You can override this target in the ../build.xml file. -->
6.565 + </target>
6.566 + <target name="-pre-nbmodule-run-deploy">
6.567 + <!-- Empty placeholder for easier customization. -->
6.568 + <!-- This target can be overriden by NetBeans modules. Don't override it directly, use -pre-run-deploy task instead. -->
6.569 + </target>
6.570 + <target name="-post-nbmodule-run-deploy">
6.571 + <!-- Empty placeholder for easier customization. -->
6.572 + <!-- This target can be overriden by NetBeans modules. Don't override it directly, use -post-run-deploy task instead. -->
6.573 + </target>
6.574 + <target name="-run-deploy-am">
6.575 + <!-- Task to deploy to the Access Manager runtime. -->
6.576 + </target>
6.577 + <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">
6.578 + <nbjpdaappreloaded/>
6.579 + </target>
6.580 + <target if="netbeans.home" name="-run-deploy-nb">
6.581 + <nbdeploy clientUrlPart="${client.urlPart}" debugmode="false" forceRedeploy="${forceRedeploy}"/>
6.582 + </target>
6.583 + <target name="-init-deploy-ant" unless="netbeans.home">
6.584 + <property name="deploy.ant.archive" value="${dist.war}"/>
6.585 + <property name="deploy.ant.docbase.dir" value="${web.docbase.dir}"/>
6.586 + <property name="deploy.ant.resource.dir" value="${resource.dir}"/>
6.587 + <property name="deploy.ant.enabled" value="true"/>
6.588 + </target>
6.589 + <target depends="dist,-run-undeploy-nb,-init-deploy-ant,-undeploy-ant" name="run-undeploy"/>
6.590 + <target if="netbeans.home" name="-run-undeploy-nb">
6.591 + <fail message="Undeploy is not supported from within the IDE"/>
6.592 + </target>
6.593 + <target depends="init,-pre-dist,dist,-post-dist" name="verify">
6.594 + <nbverify file="${dist.war}"/>
6.595 + </target>
6.596 + <target depends="run-deploy,-init-display-browser,-display-browser-nb,-display-browser-cl" name="run-display-browser"/>
6.597 + <target if="do.display.browser" name="-init-display-browser">
6.598 + <condition property="do.display.browser.nb">
6.599 + <isset property="netbeans.home"/>
6.600 + </condition>
6.601 + <condition property="do.display.browser.cl">
6.602 + <isset property="deploy.ant.enabled"/>
6.603 + </condition>
6.604 + </target>
6.605 + <target if="do.display.browser.nb" name="-display-browser-nb">
6.606 + <nbbrowse url="${client.url}"/>
6.607 + </target>
6.608 + <target if="do.display.browser.cl" name="-get-browser" unless="browser">
6.609 + <condition property="browser" value="rundll32">
6.610 + <os family="windows"/>
6.611 + </condition>
6.612 + <condition else="" property="browser.args" value="url.dll,FileProtocolHandler">
6.613 + <os family="windows"/>
6.614 + </condition>
6.615 + <condition property="browser" value="/usr/bin/open">
6.616 + <os family="mac"/>
6.617 + </condition>
6.618 + <property environment="env"/>
6.619 + <condition property="browser" value="${env.BROWSER}">
6.620 + <isset property="env.BROWSER"/>
6.621 + </condition>
6.622 + <condition property="browser" value="/usr/bin/firefox">
6.623 + <available file="/usr/bin/firefox"/>
6.624 + </condition>
6.625 + <condition property="browser" value="/usr/local/firefox/firefox">
6.626 + <available file="/usr/local/firefox/firefox"/>
6.627 + </condition>
6.628 + <condition property="browser" value="/usr/bin/mozilla">
6.629 + <available file="/usr/bin/mozilla"/>
6.630 + </condition>
6.631 + <condition property="browser" value="/usr/local/mozilla/mozilla">
6.632 + <available file="/usr/local/mozilla/mozilla"/>
6.633 + </condition>
6.634 + <condition property="browser" value="/usr/sfw/lib/firefox/firefox">
6.635 + <available file="/usr/sfw/lib/firefox/firefox"/>
6.636 + </condition>
6.637 + <condition property="browser" value="/opt/csw/bin/firefox">
6.638 + <available file="/opt/csw/bin/firefox"/>
6.639 + </condition>
6.640 + <condition property="browser" value="/usr/sfw/lib/mozilla/mozilla">
6.641 + <available file="/usr/sfw/lib/mozilla/mozilla"/>
6.642 + </condition>
6.643 + <condition property="browser" value="/opt/csw/bin/mozilla">
6.644 + <available file="/opt/csw/bin/mozilla"/>
6.645 + </condition>
6.646 + </target>
6.647 + <target depends="-get-browser" if="do.display.browser.cl" name="-display-browser-cl">
6.648 + <fail unless="browser">
6.649 + Browser not found, cannot launch the deployed application. Try to set the BROWSER environment variable.
6.650 + </fail>
6.651 + <property name="browse.url" value="${deploy.ant.client.url}${client.urlPart}"/>
6.652 + <echo>Launching ${browse.url}</echo>
6.653 + <exec executable="${browser}" spawn="true">
6.654 + <arg line="${browser.args} ${browse.url}"/>
6.655 + </exec>
6.656 + </target>
6.657 + <target depends="init,-init-cos,compile-single" name="run-main">
6.658 + <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
6.659 + <webproject1:java classname="${run.class}"/>
6.660 + </target>
6.661 + <target depends="init,compile-test-single,-pre-test-run-single" name="run-test-with-main">
6.662 + <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
6.663 + <webproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>
6.664 + </target>
6.665 + <!--
6.666 + DEBUGGING SECTION
6.667 + -->
6.668 + <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">
6.669 + <nbstartserver debugmode="true"/>
6.670 + <antcall target="connect-debugger"/>
6.671 + <nbdeploy clientUrlPart="${client.urlPart}" debugmode="true" forceRedeploy="true"/>
6.672 + <antcall target="debug-display-browser"/>
6.673 + <antcall target="connect-client-debugger"/>
6.674 + </target>
6.675 + <target if="do.debug.server" name="connect-debugger" unless="is.debugged">
6.676 + <nbjpdaconnect address="${jpda.address}" host="${jpda.host}" name="${name}" transport="${jpda.transport}">
6.677 + <classpath>
6.678 + <path path="${debug.classpath}:${j2ee.platform.classpath}"/>
6.679 + </classpath>
6.680 + <sourcepath>
6.681 + <path path="${web.docbase.dir}"/>
6.682 + </sourcepath>
6.683 + </nbjpdaconnect>
6.684 + </target>
6.685 + <target if="do.display.browser.debug" name="debug-display-browser">
6.686 + <nbbrowse url="${client.url}"/>
6.687 + </target>
6.688 + <target if="do.debug.client" name="connect-client-debugger">
6.689 + <webproject1:nbjsdebugstart webUrl="${client.url}"/>
6.690 + </target>
6.691 + <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test">
6.692 + <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
6.693 + <webproject1:debug classname="${debug.class}" classpath="${debug.test.classpath}"/>
6.694 + </target>
6.695 + <target depends="init,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>
6.696 + <target depends="init,compile,compile-jsps,-do-compile-single-jsp,debug" if="netbeans.home" name="debug-single"/>
6.697 + <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test">
6.698 + <webproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/>
6.699 + </target>
6.700 + <target depends="init" if="netbeans.home" name="-debug-start-debugger">
6.701 + <webproject1:nbjpdastart name="${debug.class}"/>
6.702 + </target>
6.703 + <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
6.704 + <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
6.705 + <webproject1:debug classname="${debug.class}"/>
6.706 + </target>
6.707 + <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single-main"/>
6.708 + <target depends="init" name="-pre-debug-fix">
6.709 + <fail unless="fix.includes">Must set fix.includes</fail>
6.710 + <property name="javac.includes" value="${fix.includes}.java"/>
6.711 + </target>
6.712 + <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
6.713 + <webproject1:nbjpdareload/>
6.714 + </target>
6.715 + <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
6.716 + <!--
6.717 + JAVADOC SECTION
6.718 + -->
6.719 + <target depends="init" name="javadoc-build">
6.720 + <mkdir dir="${dist.javadoc.dir}"/>
6.721 + <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}">
6.722 + <classpath>
6.723 + <path path="${javac.classpath}:${j2ee.platform.classpath}"/>
6.724 + </classpath>
6.725 + <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
6.726 + <filename name="**/*.java"/>
6.727 + </fileset>
6.728 + <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
6.729 + <include name="**/*.java"/>
6.730 + </fileset>
6.731 + </javadoc>
6.732 + </target>
6.733 + <target depends="init,javadoc-build" if="netbeans.home" name="javadoc-browse" unless="no.javadoc.preview">
6.734 + <nbbrowse file="${dist.javadoc.dir}/index.html"/>
6.735 + </target>
6.736 + <target depends="init,javadoc-build,javadoc-browse" description="Build Javadoc." name="javadoc"/>
6.737 + <!--
6.738 +
6.739 + JUNIT COMPILATION SECTION
6.740 + -->
6.741 + <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
6.742 + <mkdir dir="${build.test.classes.dir}"/>
6.743 + <property name="j2ee.platform.embeddableejb.classpath" value=""/>
6.744 + </target>
6.745 + <target name="-pre-compile-test">
6.746 + <!-- Empty placeholder for easier customization. -->
6.747 + <!-- You can override this target in the ../build.xml file. -->
6.748 + </target>
6.749 + <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test" if="have.tests" name="-do-compile-test">
6.750 + <webproject2:javac classpath="${javac.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
6.751 + <copy todir="${build.test.classes.dir}">
6.752 + <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
6.753 + </copy>
6.754 + </target>
6.755 + <target name="-post-compile-test">
6.756 + <!-- Empty placeholder for easier customization. -->
6.757 + <!-- You can override this target in the ../build.xml file. -->
6.758 + </target>
6.759 + <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
6.760 + <target name="-pre-compile-test-single">
6.761 + <!-- Empty placeholder for easier customization. -->
6.762 + <!-- You can override this target in the ../build.xml file. -->
6.763 + </target>
6.764 + <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
6.765 + <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
6.766 + <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}"/>
6.767 + <copy todir="${build.test.classes.dir}">
6.768 + <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
6.769 + </copy>
6.770 + </target>
6.771 + <target name="-post-compile-test-single">
6.772 + <!-- Empty placeholder for easier customization. -->
6.773 + <!-- You can override this target in the ../build.xml file. -->
6.774 + </target>
6.775 + <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
6.776 + <!--
6.777 +
6.778 + JUNIT EXECUTION SECTION
6.779 + -->
6.780 + <target depends="init" if="have.tests" name="-pre-test-run">
6.781 + <mkdir dir="${build.test.results.dir}"/>
6.782 + </target>
6.783 + <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
6.784 + <webproject2:junit testincludes="**/*Test.java"/>
6.785 + </target>
6.786 + <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
6.787 + <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
6.788 + </target>
6.789 + <target depends="init" if="have.tests" name="test-report"/>
6.790 + <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
6.791 + <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
6.792 + <target depends="init" if="have.tests" name="-pre-test-run-single">
6.793 + <mkdir dir="${build.test.results.dir}"/>
6.794 + </target>
6.795 + <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
6.796 + <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
6.797 + <webproject2:junit excludes="" includes="${test.includes}"/>
6.798 + </target>
6.799 + <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
6.800 + <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
6.801 + </target>
6.802 + <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"/>
6.803 + <!--
6.804 +
6.805 + JUNIT DEBUGGING SECTION
6.806 + -->
6.807 + <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
6.808 + <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
6.809 + <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
6.810 + <delete file="${test.report.file}"/>
6.811 + <!-- must exist, otherwise the XML formatter would fail -->
6.812 + <mkdir dir="${build.test.results.dir}"/>
6.813 + <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}">
6.814 + <customize>
6.815 + <arg value="showoutput=true"/>
6.816 + <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
6.817 + <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
6.818 + </customize>
6.819 + </webproject1:debug>
6.820 + </target>
6.821 + <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
6.822 + <webproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
6.823 + </target>
6.824 + <target depends="init,compile-test,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
6.825 + <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
6.826 + <webproject1:nbjpdareload dir="${build.test.classes.dir}"/>
6.827 + </target>
6.828 + <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
6.829 + <!--
6.830 +
6.831 + CLEANUP SECTION
6.832 + -->
6.833 + <target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/>
6.834 + <target depends="init" name="do-clean">
6.835 + <condition property="build.dir.to.clean" value="${build.web.dir}">
6.836 + <isset property="dist.ear.dir"/>
6.837 + </condition>
6.838 + <property name="build.dir.to.clean" value="${build.web.dir}"/>
6.839 + <delete includeEmptyDirs="true" quiet="true">
6.840 + <fileset dir="${build.dir.to.clean}/WEB-INF/lib"/>
6.841 + </delete>
6.842 + <delete dir="${build.dir}"/>
6.843 + <available file="${build.dir.to.clean}/WEB-INF/lib" property="status.clean-failed" type="dir"/>
6.844 + <delete dir="${dist.dir}"/>
6.845 + </target>
6.846 + <target depends="do-clean" if="status.clean-failed" name="check-clean">
6.847 + <echo message="Warning: unable to delete some files in ${build.web.dir}/WEB-INF/lib - they are probably locked by the J2EE server. "/>
6.848 + <echo level="info" message="To delete all files undeploy the module from Server Registry in Runtime tab and then use Clean again."/>
6.849 + </target>
6.850 + <target depends="init" if="netbeans.home" name="undeploy-clean">
6.851 + <nbundeploy failOnError="false" startServer="false"/>
6.852 + </target>
6.853 + <target name="-post-clean">
6.854 + <!-- Empty placeholder for easier customization. -->
6.855 + <!-- You can override this target in the ../build.xml file. -->
6.856 + </target>
6.857 + <target depends="init,undeploy-clean,deps-clean,do-clean,check-clean,-post-clean" description="Clean build products." name="clean"/>
6.858 + <target depends="clean" description="Clean build products." name="clean-ear"/>
6.859 +</project>
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
7.2 +++ b/java/nekurak.net-rest/nbproject/genfiles.properties Mon Apr 05 15:21:14 2010 +0200
7.3 @@ -0,0 +1,11 @@
7.4 +build.xml.data.CRC32=8f44a4ef
7.5 +build.xml.script.CRC32=fb1b7f84
7.6 +build.xml.stylesheet.CRC32=c0ebde35@1.21.2.1
7.7 +# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
7.8 +# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
7.9 +nbproject/build-impl.xml.data.CRC32=8f44a4ef
7.10 +nbproject/build-impl.xml.script.CRC32=f658df40
7.11 +nbproject/build-impl.xml.stylesheet.CRC32=b139b33b@1.21.2.1
7.12 +nbproject/rest-build.xml.data.CRC32=d32e8880
7.13 +nbproject/rest-build.xml.script.CRC32=23da2c77
7.14 +nbproject/rest-build.xml.stylesheet.CRC32=ddd64843@1.4.1
8.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
8.2 +++ b/java/nekurak.net-rest/nbproject/project.properties Mon Apr 05 15:21:14 2010 +0200
8.3 @@ -0,0 +1,75 @@
8.4 +build.classes.dir=${build.web.dir}/WEB-INF/classes
8.5 +build.classes.excludes=**/*.java,**/*.form
8.6 +build.dir=build
8.7 +build.generated.dir=${build.dir}/generated
8.8 +build.generated.sources.dir=${build.dir}/generated-sources
8.9 +build.test.classes.dir=${build.dir}/test/classes
8.10 +build.test.results.dir=${build.dir}/test/results
8.11 +build.web.dir=${build.dir}/web
8.12 +build.web.excludes=${build.classes.excludes}
8.13 +client.urlPart=
8.14 +compile.jsps=false
8.15 +conf.dir=${source.root}/conf
8.16 +debug.classpath=${build.classes.dir}:${javac.classpath}
8.17 +debug.test.classpath=\
8.18 + ${run.test.classpath}
8.19 +display.browser=true
8.20 +dist.dir=dist
8.21 +dist.ear.war=${dist.dir}/${war.ear.name}
8.22 +dist.javadoc.dir=${dist.dir}/javadoc
8.23 +dist.war=${dist.dir}/${war.name}
8.24 +endorsed.classpath=\
8.25 + ${libs.javaee-endorsed-api-6.0.classpath}
8.26 +excludes=
8.27 +includes=**
8.28 +j2ee.deploy.on.save=false
8.29 +j2ee.platform=1.6-web
8.30 +j2ee.server.type=gfv3ee6
8.31 +jar.compress=false
8.32 +javac.classpath=\
8.33 + ${libs.restlib_gfv3ee6.classpath}
8.34 +# Space-separated list of extra javac options
8.35 +javac.compilerargs=
8.36 +javac.debug=true
8.37 +javac.deprecation=false
8.38 +javac.source=1.5
8.39 +javac.target=1.5
8.40 +javac.test.classpath=\
8.41 + ${javac.classpath}:\
8.42 + ${build.classes.dir}:\
8.43 + ${libs.junit.classpath}:\
8.44 + ${libs.junit_4.classpath}
8.45 +javadoc.additionalparam=
8.46 +javadoc.author=false
8.47 +javadoc.encoding=${source.encoding}
8.48 +javadoc.noindex=false
8.49 +javadoc.nonavbar=false
8.50 +javadoc.notree=false
8.51 +javadoc.preview=true
8.52 +javadoc.private=false
8.53 +javadoc.splitindex=true
8.54 +javadoc.use=true
8.55 +javadoc.version=false
8.56 +javadoc.windowtitle=
8.57 +jspcompilation.classpath=${jspc.classpath}:${javac.classpath}
8.58 +lib.dir=${web.docbase.dir}/WEB-INF/lib
8.59 +persistence.xml.dir=${conf.dir}
8.60 +platform.active=default_platform
8.61 +resource.dir=setup
8.62 +rest.config.type=dd
8.63 +rest.support.on=true
8.64 +run.test.classpath=\
8.65 + ${javac.test.classpath}:\
8.66 + ${build.test.classes.dir}
8.67 +# Space-separated list of JVM arguments used when running a class with a main method or a unit test
8.68 +# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value):
8.69 +runmain.jvmargs=
8.70 +source.encoding=UTF-8
8.71 +source.root=src
8.72 +src.dir=${source.root}/java
8.73 +test.src.dir=test
8.74 +war.content.additional=
8.75 +war.ear.name=nekurak.net-rest.war
8.76 +war.name=nekurak.net-rest.war
8.77 +web.docbase.dir=web
8.78 +webinf.dir=web/WEB-INF
9.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
9.2 +++ b/java/nekurak.net-rest/nbproject/project.xml Mon Apr 05 15:21:14 2010 +0200
9.3 @@ -0,0 +1,27 @@
9.4 +<?xml version="1.0" encoding="UTF-8"?>
9.5 +<project xmlns="http://www.netbeans.org/ns/project/1">
9.6 + <type>org.netbeans.modules.web.project</type>
9.7 + <configuration>
9.8 + <buildExtensions xmlns="http://www.netbeans.org/ns/ant-build-extender/1">
9.9 + <extension file="rest-build.xml" id="rest.4">
9.10 + <dependency dependsOn="generate-rest-config" target="-pre-pre-compile"/>
9.11 + </extension>
9.12 + </buildExtensions>
9.13 + <data xmlns="http://www.netbeans.org/ns/web-project/3">
9.14 + <name>nekurak.net-rest</name>
9.15 + <minimum-ant-version>1.6.5</minimum-ant-version>
9.16 + <web-module-libraries>
9.17 + <library dirs="200">
9.18 + <file>${libs.restlib_gfv3ee6.classpath}</file>
9.19 + </library>
9.20 + </web-module-libraries>
9.21 + <web-module-additional-libraries/>
9.22 + <source-roots>
9.23 + <root id="src.dir"/>
9.24 + </source-roots>
9.25 + <test-roots>
9.26 + <root id="test.src.dir"/>
9.27 + </test-roots>
9.28 + </data>
9.29 + </configuration>
9.30 +</project>
10.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
10.2 +++ b/java/nekurak.net-rest/nbproject/rest-build.xml Mon Apr 05 15:21:14 2010 +0200
10.3 @@ -0,0 +1,60 @@
10.4 +<?xml version="1.0" encoding="UTF-8"?>
10.5 +<!--
10.6 + *** GENERATED - DO NOT EDIT ***
10.7 + -->
10.8 +<project name="nekurak.net-rest-rest-build" basedir=".." xmlns:webproject3="http://www.netbeans.org/ns/web-project/3" xmlns:webproject2="http://www.netbeans.org/ns/web-project/2" xmlns:webproject1="http://www.netbeans.org/ns/web-project/1" xmlns:jaxrs="http://www.netbeans.org/ns/jax-rs/1">
10.9 + <target name="-check-trim">
10.10 + <condition property="do.trim">
10.11 + <and>
10.12 + <isset property="client.urlPart"/>
10.13 + <length string="${client.urlPart}" when="greater" length="0"/>
10.14 + </and>
10.15 + </condition>
10.16 + </target>
10.17 + <target name="-trim-url" if="do.trim">
10.18 + <pathconvert pathsep="/" property="rest.base.url">
10.19 + <propertyset>
10.20 + <propertyref name="client.url"/>
10.21 + </propertyset>
10.22 + <globmapper from="*${client.urlPart}" to="*/"/>
10.23 + </pathconvert>
10.24 + </target>
10.25 + <target name="-spare-url" unless="do.trim">
10.26 + <property name="rest.base.url" value="${client.url}"/>
10.27 + </target>
10.28 + <target name="test-restbeans" depends="run-deploy,-init-display-browser,-check-trim,-trim-url,-spare-url">
10.29 + <replace file="${restbeans.test.file}" token="${base.url.token}" value="${rest.base.url}||${rest.application.path}"/>
10.30 + <condition property="do.browse-url">
10.31 + <istrue value="${display.browser}"/>
10.32 + </condition>
10.33 + <antcall target="browse-url"/>
10.34 + </target>
10.35 + <target name="browse-url" if="do.browse-url">
10.36 + <nbbrowse url="${restbeans.test.url}"/>
10.37 + </target>
10.38 + <target name="check-rest-config-props" depends="-do-init">
10.39 + <condition property="do-generate-rest-config">
10.40 + <and>
10.41 + <equals arg1="${rest.config.type}" arg2="ide"/>
10.42 + <isset property="rest.resources.path"/>
10.43 + </and>
10.44 + </condition>
10.45 + </target>
10.46 + <target name="generate-rest-config" depends="check-rest-config-props" if="do-generate-rest-config">
10.47 + <mkdir dir="${build.generated.sources.dir}/rest/org/netbeans/rest/application/config/"/>
10.48 + <echo file="${build.generated.sources.dir}/rest/org/netbeans/rest/application/config/ApplicationConfig.java">/*
10.49 + * To change this template, choose Tools | Templates
10.50 + * and open the template in the editor.
10.51 + */
10.52 +
10.53 +package org.netbeans.rest.application.config;
10.54 +/**
10.55 + * This class is generated by the Netbeans IDE,
10.56 + * and registers all REST root resources created in the project.
10.57 + * Please, DO NOT EDIT this class !
10.58 + */
10.59 +@javax.ws.rs.ApplicationPath("${rest.resources.path}")
10.60 +public class ApplicationConfig extends javax.ws.rs.core.Application {
10.61 +}</echo>
10.62 + </target>
10.63 +</project>
11.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
11.2 +++ b/java/nekurak.net-rest/src/conf/MANIFEST.MF Mon Apr 05 15:21:14 2010 +0200
11.3 @@ -0,0 +1,2 @@
11.4 +Manifest-Version: 1.0
11.5 +
12.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
12.2 +++ b/java/nekurak.net-rest/src/java/cz/frantovo/nekurak/rest/ClankyREST.java Mon Apr 05 15:21:14 2010 +0200
12.3 @@ -0,0 +1,15 @@
12.4 +package cz.frantovo.nekurak.rest;
12.5 +
12.6 +import javax.ws.rs.GET;
12.7 +import javax.ws.rs.Path;
12.8 +import javax.ws.rs.Produces;
12.9 +
12.10 +@Path("clanek")
12.11 +public class ClankyREST {
12.12 +
12.13 + @GET
12.14 + @Produces("text/plain")
12.15 + public String getText() {
12.16 + return "ahoj";
12.17 + }
12.18 +}
13.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
13.2 +++ b/java/nekurak.net-rest/web/WEB-INF/beans.xml Mon Apr 05 15:21:14 2010 +0200
13.3 @@ -0,0 +1,5 @@
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 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
14.2 +++ b/java/nekurak.net-rest/web/WEB-INF/sun-web.xml Mon Apr 05 15:21:14 2010 +0200
14.3 @@ -0,0 +1,11 @@
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 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
15.2 +++ b/java/nekurak.net-rest/web/WEB-INF/web.xml Mon Apr 05 15:21:14 2010 +0200
15.3 @@ -0,0 +1,17 @@
15.4 +<?xml version="1.0" encoding="UTF-8"?>
15.5 +<web-app version="3.0" 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/web-app_3_0.xsd">
15.6 + <servlet>
15.7 + <servlet-name>ServletAdaptor</servlet-name>
15.8 + <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
15.9 + <load-on-startup>1</load-on-startup>
15.10 + </servlet>
15.11 + <servlet-mapping>
15.12 + <servlet-name>ServletAdaptor</servlet-name>
15.13 + <url-pattern>/zdroje/*</url-pattern>
15.14 + </servlet-mapping>
15.15 + <session-config>
15.16 + <session-timeout>
15.17 + 30
15.18 + </session-timeout>
15.19 + </session-config>
15.20 +</web-app>
16.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
16.2 +++ b/java/nekurak.net-rest/web/index.jsp Mon Apr 05 15:21:14 2010 +0200
16.3 @@ -0,0 +1,24 @@
16.4 +<?xml version="1.0" encoding="UTF-8"?>
16.5 +<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
16.6 + xmlns:c="http://java.sun.com/jsp/jstl/core"
16.7 + xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
16.8 + version="2.0">
16.9 + <jsp:directive.page contentType="application/xhtml+xml"/>
16.10 +
16.11 + <jsp:output doctype-system="http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg-flat.dtd"
16.12 + doctype-root-element="html"
16.13 + omit-xml-declaration="false"/>
16.14 +
16.15 + <html xmlns="http://www.w3.org/1999/xhtml"
16.16 + xmlns:svg="http://www.w3.org/2000/svg"
16.17 + xmlns:xlink="http://www.w3.org/1999/xlink">
16.18 + <head>
16.19 + <title>REST</title>
16.20 + </head>
16.21 + <body>
16.22 + <h1>REST</h1>
16.23 + <p>REST API</p>
16.24 + </body>
16.25 + </html>
16.26 +
16.27 +</jsp:root>
17.1 --- a/java/nekurak.net-web/src/java/cz/frantovo/nekurak/web/RegistraceUzivatele.java Tue Mar 23 16:11:07 2010 +0100
17.2 +++ b/java/nekurak.net-web/src/java/cz/frantovo/nekurak/web/RegistraceUzivatele.java Mon Apr 05 15:21:14 2010 +0200
17.3 @@ -1,6 +1,5 @@
17.4 package cz.frantovo.nekurak.web;
17.5
17.6 -import cz.frantovo.nekurak.vyjimky.NekurakVyjimka;
17.7 import java.util.Collections;
17.8 import java.util.HashMap;
17.9 import java.util.Map;
17.10 @@ -33,8 +32,8 @@
17.11 }
17.12
17.13 /**
17.14 - * @return true, pokud registrace proběhla, jinak vyhazuje výjimku.
17.15 - * @throws NekurakVyjimka špatný token nebo chyba při zakládání uživatele
17.16 + * @return null, pokud je vše v pořádku.
17.17 + * Jinak vrací chybovou hlášku (resp. klíč k lokalizaci)
17.18 */
17.19 public String getDokonciRegistraci() {
17.20