1.1 --- a/java/nekurak.net-ear/nbproject/ant-deploy.xml Sun Jul 10 20:17:56 2011 +0200
1.2 +++ b/java/nekurak.net-ear/nbproject/ant-deploy.xml Fri Jul 15 22:25:39 2011 +0200
1.3 @@ -3,6 +3,7 @@
1.4 <target name="-init-cl-deployment-env" if="deploy.ant.enabled">
1.5 <property file="${deploy.ant.properties.file}" />
1.6 <available file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" property="sun.web.present"/>
1.7 + <available file="${deploy.ant.docbase.dir}/WEB-INF/glassfish-web.xml" property="glassfish.web.present"/>
1.8 <available file="${deploy.ant.resource.dir}" property="has.setup"/>
1.9 <tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
1.10 <echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
1.11 @@ -23,8 +24,34 @@
1.12 <xmlproperty file="${temp.sun.web}" validate="false">
1.13 </xmlproperty>
1.14 <delete file="${temp.sun.web}"/>
1.15 - <property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
1.16 - <property name="deploy.context.root.argument" value="&contextroot=${sun-web-app.context-root}"/>
1.17 + <condition property="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}" else="${gfv3.url}/${ant.project.name}">
1.18 + <isset property="sun-web-app.context-root"/>
1.19 + </condition>
1.20 + <condition property="deploy.context.root.argument" value="&contextroot=${sun-web-app.context-root}" else="/${ant.project.name}">
1.21 + <isset property="sun-web-app.context-root"/>
1.22 + </condition>
1.23 + </target>
1.24 + <target name="-parse-glassfish-web" depends="-init-cl-deployment-env" if="glassfish.web.present">
1.25 + <tempfile prefix="gfv3" property="temp.gf.web" destdir="${java.io.tmpdir}"/>
1.26 + <copy file="${deploy.ant.docbase.dir}/WEB-INF/glassfish-web.xml" tofile="${temp.gf.web}"/>
1.27 + <!-- The doctype triggers resolution which can fail -->
1.28 + <replace file="${temp.gf.web}">
1.29 + <replacetoken><![CDATA[<!DOCTYPE]]></replacetoken>
1.30 + <replacevalue><![CDATA[<!-- <!DOCTYPE]]></replacevalue>
1.31 + </replace>
1.32 + <replace file="${temp.gf.web}">
1.33 + <replacetoken><![CDATA[<glassfish-web-app]]></replacetoken>
1.34 + <replacevalue><![CDATA[--> <glassfish-web-app]]></replacevalue>
1.35 + </replace>
1.36 + <xmlproperty file="${temp.gf.web}" validate="false">
1.37 + </xmlproperty>
1.38 + <delete file="${temp.gf.web}"/>
1.39 + <condition property="deploy.ant.client.url" value="${gfv3.url}${glassfish-web-app.context-root}" else="${gfv3.url}/${ant.project.name}">
1.40 + <isset property="glassfish-web-app.context-root"/>
1.41 + </condition>
1.42 + <condition property="deploy.context.root.argument" value="&contextroot=${glassfish-web-app.context-root}" else="/${ant.project.name}">
1.43 + <isset property="glassfish-web-app.context-root"/>
1.44 + </condition>
1.45 </target>
1.46 <target name="-no-parse-sun-web" depends="-init-cl-deployment-env" unless="sun.web.present">
1.47 <property name="deploy.context.root.argument" value=""/>
1.48 @@ -33,7 +60,6 @@
1.49 <tempfile prefix="gfv3" property="gfv3.resources.dir" destdir="${java.io.tmpdir}"/>
1.50 <mkdir dir="${gfv3.resources.dir}"/>
1.51 <mkdir dir="${gfv3.resources.dir}/META-INF"/>
1.52 - <property name="gfv3.resources.file" value="${gfv3.resources.dir}/META-INF/sun-resources.xml"/>
1.53 <copy todir="${gfv3.resources.dir}/META-INF">
1.54 <fileset dir="${deploy.ant.resource.dir}"/>
1.55 </copy>
1.56 @@ -42,7 +68,7 @@
1.57 </jar>
1.58 <delete dir="${gfv3.resources.dir}"/>
1.59 </target>
1.60 - <target name="-deploy-ant" depends="-parse-sun-web,-no-parse-sun-web,-add-resources" if="deploy.ant.enabled">
1.61 + <target name="-deploy-ant" depends="-parse-glassfish-web, -parse-sun-web, -no-parse-sun-web,-add-resources" if="deploy.ant.enabled">
1.62 <antcall target="-deploy-without-pw"/>
1.63 <antcall target="-deploy-with-pw"/>
1.64 </target>
2.1 --- a/java/nekurak.net-ear/nbproject/build-impl.xml Sun Jul 10 20:17:56 2011 +0200
2.2 +++ b/java/nekurak.net-ear/nbproject/build-impl.xml Fri Jul 15 22:25:39 2011 +0200
2.3 @@ -15,126 +15,129 @@
2.4
2.5 -->
2.6 <project xmlns:ear2="http://www.netbeans.org/ns/j2ee-earproject/2" basedir=".." default="default" name="nekurak.net-ear-impl">
2.7 - <import file="ant-deploy.xml"/>
2.8 - <fail message="Please build using Ant 1.7.1 or higher.">
2.9 - <condition>
2.10 - <not>
2.11 - <antversion atleast="1.7.1"/>
2.12 - </not>
2.13 - </condition>
2.14 - </fail>
2.15 - <target depends="dist" description="Build whole project." name="default"/>
2.16 + <import file="ant-deploy.xml"/>
2.17 + <fail message="Please build using Ant 1.7.1 or higher.">
2.18 + <condition>
2.19 + <not>
2.20 + <antversion atleast="1.7.1"/>
2.21 + </not>
2.22 + </condition>
2.23 + </fail>
2.24 + <target depends="dist" description="Build whole project." name="default"/>
2.25 <!--
2.26 INITIALIZATION SECTION
2.27 -->
2.28 - <target name="pre-init">
2.29 + <target name="pre-init">
2.30 <!-- Empty placeholder for easier customization. -->
2.31 <!-- You can override this target in the ../build.xml file. -->
2.32 - </target>
2.33 - <target depends="pre-init" name="init-private">
2.34 - <property file="nbproject/private/private.properties"/>
2.35 - </target>
2.36 - <target depends="pre-init,init-private" name="init-userdir">
2.37 - <property location="${netbeans.user}/build.properties" name="user.properties.file"/>
2.38 - </target>
2.39 - <target depends="pre-init,init-private,init-userdir" name="init-user">
2.40 - <property file="${user.properties.file}"/>
2.41 - </target>
2.42 - <target depends="pre-init,init-private,init-userdir,init-user" name="init-project">
2.43 - <property file="nbproject/project.properties"/>
2.44 - </target>
2.45 - <target depends="pre-init,init-private,init-userdir,init-user,init-project" name="do-init">
2.46 + </target>
2.47 + <target depends="pre-init" name="init-private">
2.48 + <property file="nbproject/private/private.properties"/>
2.49 + </target>
2.50 + <target depends="pre-init,init-private" name="init-userdir">
2.51 + <property location="${netbeans.user}/build.properties" name="user.properties.file"/>
2.52 + </target>
2.53 + <target depends="pre-init,init-private,init-userdir" name="init-user">
2.54 + <property file="${user.properties.file}"/>
2.55 + </target>
2.56 + <target depends="pre-init,init-private,init-userdir,init-user" name="init-project">
2.57 + <property file="nbproject/project.properties"/>
2.58 + </target>
2.59 + <target depends="pre-init,init-private,init-userdir,init-user,init-project" name="do-init">
2.60 <!-- The two properties below are usually overridden -->
2.61 <!-- by the active platform. Just a fallback. -->
2.62 - <property name="default.javac.source" value="1.4"/>
2.63 - <property name="default.javac.target" value="1.4"/>
2.64 - <condition property="do.compile.jsps">
2.65 - <istrue value="${compile.jsps}"/>
2.66 - </condition>
2.67 - <condition property="do.display.browser">
2.68 - <and>
2.69 - <istrue value="${display.browser}"/>
2.70 - <isset property="client.module.uri"/>
2.71 - <not>
2.72 - <isset property="app.client"/>
2.73 - </not>
2.74 - </and>
2.75 - </condition>
2.76 - <available file="${meta.inf}/MANIFEST.MF" property="has.custom.manifest"/>
2.77 + <property name="default.javac.source" value="1.4"/>
2.78 + <property name="default.javac.target" value="1.4"/>
2.79 + <condition property="do.compile.jsps">
2.80 + <istrue value="${compile.jsps}"/>
2.81 + </condition>
2.82 + <condition property="do.display.browser">
2.83 + <and>
2.84 + <istrue value="${display.browser}"/>
2.85 + <isset property="client.module.uri"/>
2.86 + <not>
2.87 + <isset property="app.client"/>
2.88 + </not>
2.89 + </and>
2.90 + </condition>
2.91 + <available file="${meta.inf}/MANIFEST.MF" property="has.custom.manifest"/>
2.92 <!--
2.93 Variables needed to support directory deployment.
2.94 -->
2.95 - <condition property="do.package.with.custom.manifest.not.directory.deploy">
2.96 - <and>
2.97 - <isset property="has.custom.manifest"/>
2.98 - <isfalse value="${directory.deployment.supported}"/>
2.99 - </and>
2.100 - </condition>
2.101 - <condition property="do.package.without.custom.manifest.not.directory.deploy">
2.102 - <and>
2.103 - <not>
2.104 - <isset property="has.custom.manifest"/>
2.105 - </not>
2.106 - <isfalse value="${directory.deployment.supported}"/>
2.107 - </and>
2.108 - </condition>
2.109 - <condition property="do.package.not.directory.deploy">
2.110 - <isfalse value="${directory.deployment.supported}"/>
2.111 - </condition>
2.112 + <condition property="do.package.with.custom.manifest.not.directory.deploy">
2.113 + <and>
2.114 + <isset property="has.custom.manifest"/>
2.115 + <isfalse value="${directory.deployment.supported}"/>
2.116 + </and>
2.117 + </condition>
2.118 + <condition property="do.package.without.custom.manifest.not.directory.deploy">
2.119 + <and>
2.120 + <not>
2.121 + <isset property="has.custom.manifest"/>
2.122 + </not>
2.123 + <isfalse value="${directory.deployment.supported}"/>
2.124 + </and>
2.125 + </condition>
2.126 + <condition property="do.package.not.directory.deploy">
2.127 + <isfalse value="${directory.deployment.supported}"/>
2.128 + </condition>
2.129 <!--End Variables needed to support directory deployment.-->
2.130 - <condition else="" property="j2ee.appclient.mainclass.tool.param" value="-mainclass ${main.class}">
2.131 - <and>
2.132 - <isset property="main.class"/>
2.133 - <not>
2.134 - <equals arg1="${main.class}" arg2="" trim="true"/>
2.135 - </not>
2.136 - </and>
2.137 - </condition>
2.138 - <condition else="" property="j2ee.appclient.jvmoptions.param" value="${j2ee.appclient.jvmoptions}">
2.139 - <and>
2.140 - <isset property="j2ee.appclient.jvmoptions"/>
2.141 - <not>
2.142 - <equals arg1="${j2ee.appclient.jvmoptions}" arg2="" trim="true"/>
2.143 - </not>
2.144 - </and>
2.145 - </condition>
2.146 - <condition else="" property="application.args.param" value="${application.args}">
2.147 - <and>
2.148 - <isset property="application.args"/>
2.149 - <not>
2.150 - <equals arg1="${application.args}" arg2="" trim="true"/>
2.151 - </not>
2.152 - </and>
2.153 - </condition>
2.154 - <condition property="can.debug.appclient">
2.155 - <and>
2.156 - <isset property="netbeans.home"/>
2.157 - <isset property="app.client"/>
2.158 - </and>
2.159 - </condition>
2.160 - <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
2.161 - <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
2.162 - <length length="0" string="${endorsed.classpath}" when="greater"/>
2.163 - </condition>
2.164 - </target>
2.165 - <target depends="init" name="-init-cos">
2.166 - <condition else="false" property="build.deploy.on.save">
2.167 - <istrue value="${j2ee.deploy.on.save}"/>
2.168 - </condition>
2.169 - </target>
2.170 - <target name="post-init">
2.171 + <condition else="" property="j2ee.appclient.mainclass.tool.param" value="-mainclass ${main.class}">
2.172 + <and>
2.173 + <isset property="main.class"/>
2.174 + <not>
2.175 + <equals arg1="${main.class}" arg2="" trim="true"/>
2.176 + </not>
2.177 + </and>
2.178 + </condition>
2.179 + <condition else="" property="j2ee.appclient.jvmoptions.param" value="${j2ee.appclient.jvmoptions}">
2.180 + <and>
2.181 + <isset property="j2ee.appclient.jvmoptions"/>
2.182 + <not>
2.183 + <equals arg1="${j2ee.appclient.jvmoptions}" arg2="" trim="true"/>
2.184 + </not>
2.185 + </and>
2.186 + </condition>
2.187 + <condition else="" property="application.args.param" value="${application.args}">
2.188 + <and>
2.189 + <isset property="application.args"/>
2.190 + <not>
2.191 + <equals arg1="${application.args}" arg2="" trim="true"/>
2.192 + </not>
2.193 + </and>
2.194 + </condition>
2.195 + <condition property="can.debug.appclient">
2.196 + <and>
2.197 + <isset property="netbeans.home"/>
2.198 + <isset property="app.client"/>
2.199 + </and>
2.200 + </condition>
2.201 + <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
2.202 + <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
2.203 + <and>
2.204 + <isset property="endorsed.classpath"/>
2.205 + <length length="0" string="${endorsed.classpath}" when="greater"/>
2.206 + </and>
2.207 + </condition>
2.208 + </target>
2.209 + <target depends="init" name="-init-cos">
2.210 + <condition else="false" property="build.deploy.on.save">
2.211 + <istrue value="${j2ee.deploy.on.save}"/>
2.212 + </condition>
2.213 + </target>
2.214 + <target name="post-init">
2.215 <!-- Empty placeholder for easier customization. -->
2.216 <!-- You can override this target in the ../build.xml file. -->
2.217 - </target>
2.218 - <target depends="pre-init,init-private,init-userdir,init-user,init-project,do-init" name="init-check">
2.219 - <fail unless="build.dir">Must set build.dir</fail>
2.220 - <fail unless="build.generated.dir">Must set build.generated.dir</fail>
2.221 - <fail unless="dist.dir">Must set dist.dir</fail>
2.222 - <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
2.223 - <fail unless="dist.jar">Must set dist.jar</fail>
2.224 - </target>
2.225 - <target name="-init-taskdefs">
2.226 - <fail unless="libs.CopyLibs.classpath">
2.227 + </target>
2.228 + <target depends="pre-init,init-private,init-userdir,init-user,init-project,do-init" name="init-check">
2.229 + <fail unless="build.dir">Must set build.dir</fail>
2.230 + <fail unless="build.generated.dir">Must set build.generated.dir</fail>
2.231 + <fail unless="dist.dir">Must set dist.dir</fail>
2.232 + <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
2.233 + <fail unless="dist.jar">Must set dist.jar</fail>
2.234 + </target>
2.235 + <target name="-init-taskdefs">
2.236 + <fail unless="libs.CopyLibs.classpath">
2.237 The libs.CopyLibs.classpath property is not set up.
2.238 This property must point to
2.239 org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part
2.240 @@ -143,444 +146,483 @@
2.241 Either open the project in the IDE and make sure CopyLibs library
2.242 exists or setup the property manually. For example like this:
2.243 ant -Dlibs.CopyLibs.classpath=a/path/to/org-netbeans-modules-java-j2seproject-copylibstask.jar
2.244 - </fail>
2.245 - <taskdef classpath="${libs.CopyLibs.classpath}" resource="org/netbeans/modules/java/j2seproject/copylibstask/antlib.xml"/>
2.246 - </target>
2.247 - <target depends="pre-init,init-private,init-userdir,init-user,init-project,do-init,post-init,init-check,-init-taskdefs" name="init"/>
2.248 + </fail>
2.249 + <taskdef classpath="${libs.CopyLibs.classpath}" resource="org/netbeans/modules/java/j2seproject/copylibstask/antlib.xml"/>
2.250 + </target>
2.251 + <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-check" name="profile-init"/>
2.252 + <target name="-profile-pre-init">
2.253 + <!-- Empty placeholder for easier customization. -->
2.254 + <!-- You can override this target in the ../build.xml file. -->
2.255 + </target>
2.256 + <target name="-profile-post-init">
2.257 + <!-- Empty placeholder for easier customization. -->
2.258 + <!-- You can override this target in the ../build.xml file. -->
2.259 + </target>
2.260 + <target depends="-profile-pre-init, init, -profile-post-init" name="-profile-init-check">
2.261 + <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
2.262 + <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
2.263 + </target>
2.264 + <target depends="pre-init,init-private,init-userdir,init-user,init-project,do-init,post-init,init-check,-init-taskdefs" name="init"/>
2.265 <!--
2.266 COMPILATION SECTION
2.267 -->
2.268 - <target depends="init" name="deps-jar" unless="no.deps"/>
2.269 - <target depends="init" name="deps-j2ee-archive" unless="no.deps">
2.270 - <condition property="build.deploy.on.save" value="false">
2.271 - <not>
2.272 - <isset property="build.deploy.on.save"/>
2.273 - </not>
2.274 - </condition>
2.275 - <ant antfile="${project.nekurak_net-ejb}/build.xml" inheritall="false" target="dist-ear">
2.276 - <property location="${build.dir}" name="dist.ear.dir"/>
2.277 - <property name="deploy.on.save" value="${build.deploy.on.save}"/>
2.278 - </ant>
2.279 - <condition property="build.deploy.on.save" value="false">
2.280 - <not>
2.281 - <isset property="build.deploy.on.save"/>
2.282 - </not>
2.283 - </condition>
2.284 - <ant antfile="${project.nekurak_net-rest}/build.xml" inheritall="false" target="dist-ear">
2.285 - <property location="${build.dir}" name="dist.ear.dir"/>
2.286 - <property name="deploy.on.save" value="${build.deploy.on.save}"/>
2.287 - </ant>
2.288 - <condition property="build.deploy.on.save" value="false">
2.289 - <not>
2.290 - <isset property="build.deploy.on.save"/>
2.291 - </not>
2.292 - </condition>
2.293 - <ant antfile="${project.nekurak_net-web}/build.xml" inheritall="false" target="dist-ear">
2.294 - <property location="${build.dir}" name="dist.ear.dir"/>
2.295 - <property name="deploy.on.save" value="${build.deploy.on.save}"/>
2.296 - </ant>
2.297 - <condition property="build.deploy.on.save" value="false">
2.298 - <not>
2.299 - <isset property="build.deploy.on.save"/>
2.300 - </not>
2.301 - </condition>
2.302 - <ant antfile="${project.nekurak_net-ws}/build.xml" inheritall="false" target="dist-ear">
2.303 - <property location="${build.dir}" name="dist.ear.dir"/>
2.304 - <property name="deploy.on.save" value="${build.deploy.on.save}"/>
2.305 - </ant>
2.306 - </target>
2.307 - <target depends="init,deps-jar,deps-j2ee-archive" name="pre-pre-compile"/>
2.308 - <target name="pre-compile">
2.309 + <target depends="init" name="deps-jar" unless="no.deps"/>
2.310 + <target depends="init" name="deps-j2ee-archive" unless="no.deps">
2.311 + <condition property="build.deploy.on.save" value="false">
2.312 + <not>
2.313 + <isset property="build.deploy.on.save"/>
2.314 + </not>
2.315 + </condition>
2.316 + <ant antfile="${project.nekurak_net-ejb}/build.xml" inheritall="false" target="dist-ear">
2.317 + <property location="${build.dir}" name="dist.ear.dir"/>
2.318 + <property name="deploy.on.save" value="${build.deploy.on.save}"/>
2.319 + </ant>
2.320 + <condition property="build.deploy.on.save" value="false">
2.321 + <not>
2.322 + <isset property="build.deploy.on.save"/>
2.323 + </not>
2.324 + </condition>
2.325 + <ant antfile="${project.nekurak_net-rest}/build.xml" inheritall="false" target="dist-ear">
2.326 + <property location="${build.dir}" name="dist.ear.dir"/>
2.327 + <property name="deploy.on.save" value="${build.deploy.on.save}"/>
2.328 + </ant>
2.329 + <condition property="build.deploy.on.save" value="false">
2.330 + <not>
2.331 + <isset property="build.deploy.on.save"/>
2.332 + </not>
2.333 + </condition>
2.334 + <ant antfile="${project.nekurak_net-web}/build.xml" inheritall="false" target="dist-ear">
2.335 + <property location="${build.dir}" name="dist.ear.dir"/>
2.336 + <property name="deploy.on.save" value="${build.deploy.on.save}"/>
2.337 + </ant>
2.338 + <condition property="build.deploy.on.save" value="false">
2.339 + <not>
2.340 + <isset property="build.deploy.on.save"/>
2.341 + </not>
2.342 + </condition>
2.343 + <ant antfile="${project.nekurak_net-ws}/build.xml" inheritall="false" target="dist-ear">
2.344 + <property location="${build.dir}" name="dist.ear.dir"/>
2.345 + <property name="deploy.on.save" value="${build.deploy.on.save}"/>
2.346 + </ant>
2.347 + </target>
2.348 + <target depends="init,deps-jar,deps-j2ee-archive" name="pre-pre-compile"/>
2.349 + <target name="pre-compile">
2.350 <!-- Empty placeholder for easier customization. -->
2.351 <!-- You can override this target in the ../build.xml file. -->
2.352 - </target>
2.353 - <target depends="init,deps-jar,pre-pre-compile,pre-compile,-do-compile-deps" name="do-compile">
2.354 - <copy todir="${build.dir}/META-INF">
2.355 - <fileset dir="${meta.inf}"/>
2.356 - </copy>
2.357 - </target>
2.358 - <target depends="init,deps-jar,pre-pre-compile,pre-compile" name="-do-compile-deps">
2.359 - <copyfiles files="${reference.nekurak_net-web.dist-ear}" todir="${build.dir}//"/>
2.360 - <copyfiles files="${reference.nekurak_net-ejb.dist-ear}" todir="${build.dir}//"/>
2.361 - <copyfiles files="${reference.nekurak_net-rest.dist-ear}" todir="${build.dir}//"/>
2.362 - <copyfiles files="${reference.nekurak_net-ws.dist-ear}" todir="${build.dir}//"/>
2.363 - </target>
2.364 - <target name="post-compile">
2.365 + </target>
2.366 + <target depends="init,deps-jar,pre-pre-compile,pre-compile,-do-compile-deps" name="do-compile">
2.367 + <copy todir="${build.dir}/META-INF">
2.368 + <fileset dir="${meta.inf}"/>
2.369 + </copy>
2.370 + </target>
2.371 + <target depends="init,deps-jar,pre-pre-compile,pre-compile" name="-do-compile-deps">
2.372 + <copyfiles files="${reference.nekurak_net-web.dist-ear}" todir="${build.dir}//"/>
2.373 + <copyfiles files="${reference.nekurak_net-ejb.dist-ear}" todir="${build.dir}//"/>
2.374 + <copyfiles files="${reference.nekurak_net-rest.dist-ear}" todir="${build.dir}//"/>
2.375 + <copyfiles files="${reference.nekurak_net-ws.dist-ear}" todir="${build.dir}//"/>
2.376 + </target>
2.377 + <target name="post-compile">
2.378 <!-- Empty placeholder for easier customization. -->
2.379 <!-- You can override this target in the ../build.xml file. -->
2.380 - </target>
2.381 - <target depends="init,deps-jar,pre-pre-compile,pre-compile,do-compile,post-compile" description="Compile project." name="compile"/>
2.382 + </target>
2.383 + <target depends="init,deps-jar,pre-pre-compile,pre-compile,do-compile,post-compile" description="Compile project." name="compile"/>
2.384 <!--
2.385 DIST BUILDING SECTION
2.386 -->
2.387 - <target name="pre-dist">
2.388 + <target name="pre-dist">
2.389 <!-- Empty placeholder for easier customization. -->
2.390 <!-- You can override this target in the ../build.xml file. -->
2.391 - </target>
2.392 - <target depends="init,compile,pre-dist" name="do-dist-without-manifest" unless="has.custom.manifest">
2.393 - <dirname file="${dist.jar}" property="dist.jar.dir"/>
2.394 - <mkdir dir="${dist.jar.dir}"/>
2.395 - <jar compress="${jar.compress}" jarfile="${dist.jar}">
2.396 - <fileset dir="${build.dir}"/>
2.397 - </jar>
2.398 - </target>
2.399 - <target depends="init,compile,pre-dist" if="has.custom.manifest" name="do-dist-with-manifest">
2.400 - <dirname file="${dist.jar}" property="dist.jar.dir"/>
2.401 - <mkdir dir="${dist.jar.dir}"/>
2.402 - <jar compress="${jar.compress}" jarfile="${dist.jar}" manifest="${meta.inf}/MANIFEST.MF">
2.403 - <fileset dir="${build.dir}"/>
2.404 - </jar>
2.405 - </target>
2.406 + </target>
2.407 + <target depends="init,compile,pre-dist" name="do-dist-without-manifest" unless="has.custom.manifest">
2.408 + <dirname file="${dist.jar}" property="dist.jar.dir"/>
2.409 + <mkdir dir="${dist.jar.dir}"/>
2.410 + <jar compress="${jar.compress}" jarfile="${dist.jar}">
2.411 + <fileset dir="${build.dir}"/>
2.412 + </jar>
2.413 + </target>
2.414 + <target depends="init,compile,pre-dist" if="has.custom.manifest" name="do-dist-with-manifest">
2.415 + <dirname file="${dist.jar}" property="dist.jar.dir"/>
2.416 + <mkdir dir="${dist.jar.dir}"/>
2.417 + <jar compress="${jar.compress}" jarfile="${dist.jar}" manifest="${meta.inf}/MANIFEST.MF">
2.418 + <fileset dir="${build.dir}"/>
2.419 + </jar>
2.420 + </target>
2.421 <!--
2.422 TARGETS NEEDED TO SUPPORT DIRECTORY DEPLOYMENT
2.423 -->
2.424 - <target depends="init,compile,pre-dist" if="do.package.without.custom.manifest.not.directory.deploy" name="-do-tmp-dist-without-manifest">
2.425 - <dirname file="${dist.jar}" property="dist.jar.dir"/>
2.426 - <mkdir dir="${dist.jar.dir}"/>
2.427 - <jar compress="${jar.compress}" jarfile="${dist.jar}">
2.428 - <fileset dir="${build.dir}"/>
2.429 - </jar>
2.430 - </target>
2.431 - <target depends="init,compile,pre-dist" if="do.package.with.custom.manifest.not.directory.deploy" name="-do-tmp-dist-with-manifest">
2.432 - <dirname file="${dist.jar}" property="dist.jar.dir"/>
2.433 - <mkdir dir="${dist.jar.dir}"/>
2.434 - <jar compress="${jar.compress}" jarfile="${dist.jar}" manifest="${meta.inf}/MANIFEST.MF">
2.435 - <fileset dir="${build.dir}"/>
2.436 - </jar>
2.437 - </target>
2.438 - <target depends="init,compile,pre-dist,-do-tmp-dist-without-manifest,-do-tmp-dist-with-manifest" name="-do-dist-directory-deploy"/>
2.439 - <target depends="init,compile,pre-dist,-do-dist-directory-deploy,post-dist" description="Build distribution (JAR) - if directory deployment is not supported." name="dist-directory-deploy"/>
2.440 + <target depends="init,compile,pre-dist" if="do.package.without.custom.manifest.not.directory.deploy" name="-do-tmp-dist-without-manifest">
2.441 + <dirname file="${dist.jar}" property="dist.jar.dir"/>
2.442 + <mkdir dir="${dist.jar.dir}"/>
2.443 + <jar compress="${jar.compress}" jarfile="${dist.jar}">
2.444 + <fileset dir="${build.dir}"/>
2.445 + </jar>
2.446 + </target>
2.447 + <target depends="init,compile,pre-dist" if="do.package.with.custom.manifest.not.directory.deploy" name="-do-tmp-dist-with-manifest">
2.448 + <dirname file="${dist.jar}" property="dist.jar.dir"/>
2.449 + <mkdir dir="${dist.jar.dir}"/>
2.450 + <jar compress="${jar.compress}" jarfile="${dist.jar}" manifest="${meta.inf}/MANIFEST.MF">
2.451 + <fileset dir="${build.dir}"/>
2.452 + </jar>
2.453 + </target>
2.454 + <target depends="init,compile,pre-dist,-do-tmp-dist-without-manifest,-do-tmp-dist-with-manifest" name="-do-dist-directory-deploy"/>
2.455 + <target depends="init,compile,pre-dist,-do-dist-directory-deploy,post-dist" description="Build distribution (JAR) - if directory deployment is not supported." name="dist-directory-deploy"/>
2.456 <!--
2.457 END TARGETS NEEDED TO SUPPORT DIRECTORY DEPLOYMENT
2.458 -->
2.459 - <target name="post-dist">
2.460 + <target name="post-dist">
2.461 <!-- Empty placeholder for easier customization. -->
2.462 <!-- You can override this target in the ../build.xml file. -->
2.463 - </target>
2.464 - <target depends="init,compile,pre-dist,do-dist-without-manifest,do-dist-with-manifest,post-dist" description="Build distribution (JAR)." name="dist"/>
2.465 + </target>
2.466 + <target depends="init,compile,pre-dist,do-dist-without-manifest,do-dist-with-manifest,post-dist" description="Build distribution (JAR)." name="dist"/>
2.467 <!--
2.468 EXECUTION SECTION
2.469 -->
2.470 - <target depends="run-deploy,run-display-browser,run-ac" description="Deploy to server." name="run"/>
2.471 - <target name="pre-run-deploy">
2.472 + <target depends="run-deploy,run-display-browser,run-ac" description="Deploy to server." name="run"/>
2.473 + <target name="pre-run-deploy">
2.474 <!-- Empty placeholder for easier customization. -->
2.475 <!-- You can override this target in the ../build.xml file. -->
2.476 - </target>
2.477 - <target name="post-run-deploy">
2.478 + </target>
2.479 + <target name="post-run-deploy">
2.480 <!-- Empty placeholder for easier customization. -->
2.481 <!-- You can override this target in the ../build.xml file. -->
2.482 - </target>
2.483 - <target name="-pre-nbmodule-run-deploy">
2.484 + </target>
2.485 + <target name="-pre-nbmodule-run-deploy">
2.486 <!-- Empty placeholder for easier customization. -->
2.487 <!-- This target can be overriden by NetBeans modules. Don't override it directly, use -pre-run-deploy task instead. -->
2.488 - </target>
2.489 - <target name="-post-nbmodule-run-deploy">
2.490 + </target>
2.491 + <target name="-post-nbmodule-run-deploy">
2.492 <!-- Empty placeholder for easier customization. -->
2.493 <!-- This target can be overriden by NetBeans modules. Don't override it directly, use -post-run-deploy task instead. -->
2.494 - </target>
2.495 - <target name="-run-deploy-am" unless="no.deps">
2.496 + </target>
2.497 + <target name="-run-deploy-am" unless="no.deps">
2.498 <!-- Task to deploy to the Access Manager runtime. -->
2.499 - <ant antfile="${project.nekurak_net-ejb}/build.xml" inheritall="false" target="-run-deploy-am"/>
2.500 - <ant antfile="${project.nekurak_net-rest}/build.xml" inheritall="false" target="-run-deploy-am"/>
2.501 - <ant antfile="${project.nekurak_net-web}/build.xml" inheritall="false" target="-run-deploy-am"/>
2.502 - <ant antfile="${project.nekurak_net-ws}/build.xml" inheritall="false" target="-run-deploy-am"/>
2.503 - </target>
2.504 - <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"/>
2.505 - <target if="netbeans.home" name="-run-deploy-nb">
2.506 - <nbdeploy clientModuleUri="${client.module.uri}" clientUrlPart="${client.urlPart}" debugmode="false" forceRedeploy="${forceRedeploy}"/>
2.507 - </target>
2.508 - <target name="-init-deploy-ant" unless="netbeans.home">
2.509 - <property name="deploy.ant.archive" value="${dist.jar}"/>
2.510 - <property name="deploy.ant.resource.dir" value="${resource.dir}"/>
2.511 - <property name="deploy.ant.enabled" value="true"/>
2.512 - </target>
2.513 - <target depends="dist,-run-undeploy-nb,-init-deploy-ant,-undeploy-ant" name="run-undeploy"/>
2.514 - <target if="netbeans.home" name="-run-undeploy-nb">
2.515 - <fail message="Undeploy is not supported from within the IDE"/>
2.516 - </target>
2.517 - <target depends="dist" name="verify">
2.518 - <nbverify file="${dist.jar}"/>
2.519 - </target>
2.520 - <target depends="run-deploy,-init-display-browser,-display-browser-nb,-display-browser-cl" name="run-display-browser"/>
2.521 - <target if="do.display.browser" name="-init-display-browser">
2.522 - <condition property="do.display.browser.nb">
2.523 - <isset property="netbeans.home"/>
2.524 - </condition>
2.525 - <condition property="do.display.browser.cl">
2.526 - <and>
2.527 - <isset property="deploy.ant.enabled"/>
2.528 - <isset property="deploy.ant.client.url"/>
2.529 - </and>
2.530 - </condition>
2.531 - </target>
2.532 - <target if="do.display.browser.nb" name="-display-browser-nb">
2.533 - <nbbrowse url="${client.url}"/>
2.534 - </target>
2.535 - <target if="do.display.browser.cl" name="-get-browser" unless="browser">
2.536 - <condition property="browser" value="rundll32">
2.537 - <os family="windows"/>
2.538 - </condition>
2.539 - <condition else="" property="browser.args" value="url.dll,FileProtocolHandler">
2.540 - <os family="windows"/>
2.541 - </condition>
2.542 - <condition property="browser" value="/usr/bin/open">
2.543 - <os family="mac"/>
2.544 - </condition>
2.545 - <property environment="env"/>
2.546 - <condition property="browser" value="${env.BROWSER}">
2.547 - <isset property="env.BROWSER"/>
2.548 - </condition>
2.549 - <condition property="browser" value="/usr/bin/firefox">
2.550 - <available file="/usr/bin/firefox"/>
2.551 - </condition>
2.552 - <condition property="browser" value="/usr/local/firefox/firefox">
2.553 - <available file="/usr/local/firefox/firefox"/>
2.554 - </condition>
2.555 - <condition property="browser" value="/usr/bin/mozilla">
2.556 - <available file="/usr/bin/mozilla"/>
2.557 - </condition>
2.558 - <condition property="browser" value="/usr/local/mozilla/mozilla">
2.559 - <available file="/usr/local/mozilla/mozilla"/>
2.560 - </condition>
2.561 - <condition property="browser" value="/usr/sfw/lib/firefox/firefox">
2.562 - <available file="/usr/sfw/lib/firefox/firefox"/>
2.563 - </condition>
2.564 - <condition property="browser" value="/opt/csw/bin/firefox">
2.565 - <available file="/opt/csw/bin/firefox"/>
2.566 - </condition>
2.567 - <condition property="browser" value="/usr/sfw/lib/mozilla/mozilla">
2.568 - <available file="/usr/sfw/lib/mozilla/mozilla"/>
2.569 - </condition>
2.570 - <condition property="browser" value="/opt/csw/bin/mozilla">
2.571 - <available file="/opt/csw/bin/mozilla"/>
2.572 - </condition>
2.573 - </target>
2.574 - <target depends="-get-browser" if="do.display.browser.cl" name="-display-browser-cl">
2.575 - <fail unless="browser">
2.576 + <ant antfile="${project.nekurak_net-ejb}/build.xml" inheritall="false" target="-run-deploy-am"/>
2.577 + <ant antfile="${project.nekurak_net-rest}/build.xml" inheritall="false" target="-run-deploy-am"/>
2.578 + <ant antfile="${project.nekurak_net-web}/build.xml" inheritall="false" target="-run-deploy-am"/>
2.579 + <ant antfile="${project.nekurak_net-ws}/build.xml" inheritall="false" target="-run-deploy-am"/>
2.580 + </target>
2.581 + <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"/>
2.582 + <target if="netbeans.home" name="-run-deploy-nb">
2.583 + <nbdeploy clientModuleUri="${client.module.uri}" clientUrlPart="${client.urlPart}" debugmode="false" forceRedeploy="${forceRedeploy}"/>
2.584 + </target>
2.585 + <target name="-init-deploy-ant" unless="netbeans.home">
2.586 + <property name="deploy.ant.archive" value="${dist.jar}"/>
2.587 + <property name="deploy.ant.resource.dir" value="${resource.dir}"/>
2.588 + <property name="deploy.ant.enabled" value="true"/>
2.589 + </target>
2.590 + <target depends="dist,-run-undeploy-nb,-init-deploy-ant,-undeploy-ant" name="run-undeploy"/>
2.591 + <target if="netbeans.home" name="-run-undeploy-nb">
2.592 + <fail message="Undeploy is not supported from within the IDE"/>
2.593 + </target>
2.594 + <target depends="dist" name="verify">
2.595 + <nbverify file="${dist.jar}"/>
2.596 + </target>
2.597 + <target depends="run-deploy,-init-display-browser,-display-browser-nb,-display-browser-cl" name="run-display-browser"/>
2.598 + <target if="do.display.browser" name="-init-display-browser">
2.599 + <condition property="do.display.browser.nb">
2.600 + <isset property="netbeans.home"/>
2.601 + </condition>
2.602 + <condition property="do.display.browser.cl">
2.603 + <and>
2.604 + <isset property="deploy.ant.enabled"/>
2.605 + <isset property="deploy.ant.client.url"/>
2.606 + </and>
2.607 + </condition>
2.608 + </target>
2.609 + <target if="do.display.browser.nb" name="-display-browser-nb">
2.610 + <nbbrowse url="${client.url}"/>
2.611 + </target>
2.612 + <target if="do.display.browser.cl" name="-get-browser" unless="browser">
2.613 + <condition property="browser" value="rundll32">
2.614 + <os family="windows"/>
2.615 + </condition>
2.616 + <condition else="" property="browser.args" value="url.dll,FileProtocolHandler">
2.617 + <os family="windows"/>
2.618 + </condition>
2.619 + <condition property="browser" value="/usr/bin/open">
2.620 + <os family="mac"/>
2.621 + </condition>
2.622 + <property environment="env"/>
2.623 + <condition property="browser" value="${env.BROWSER}">
2.624 + <isset property="env.BROWSER"/>
2.625 + </condition>
2.626 + <condition property="browser" value="/usr/bin/firefox">
2.627 + <available file="/usr/bin/firefox"/>
2.628 + </condition>
2.629 + <condition property="browser" value="/usr/local/firefox/firefox">
2.630 + <available file="/usr/local/firefox/firefox"/>
2.631 + </condition>
2.632 + <condition property="browser" value="/usr/bin/mozilla">
2.633 + <available file="/usr/bin/mozilla"/>
2.634 + </condition>
2.635 + <condition property="browser" value="/usr/local/mozilla/mozilla">
2.636 + <available file="/usr/local/mozilla/mozilla"/>
2.637 + </condition>
2.638 + <condition property="browser" value="/usr/sfw/lib/firefox/firefox">
2.639 + <available file="/usr/sfw/lib/firefox/firefox"/>
2.640 + </condition>
2.641 + <condition property="browser" value="/opt/csw/bin/firefox">
2.642 + <available file="/opt/csw/bin/firefox"/>
2.643 + </condition>
2.644 + <condition property="browser" value="/usr/sfw/lib/mozilla/mozilla">
2.645 + <available file="/usr/sfw/lib/mozilla/mozilla"/>
2.646 + </condition>
2.647 + <condition property="browser" value="/opt/csw/bin/mozilla">
2.648 + <available file="/opt/csw/bin/mozilla"/>
2.649 + </condition>
2.650 + </target>
2.651 + <target depends="-get-browser" if="do.display.browser.cl" name="-display-browser-cl">
2.652 + <fail unless="browser">
2.653 Browser not found, cannot launch the deployed application. Try to set the BROWSER environment variable.
2.654 - </fail>
2.655 - <property name="browse.url" value="${deploy.ant.client.url}${client.urlPart}"/>
2.656 - <echo>Launching ${browse.url}</echo>
2.657 - <exec executable="${browser}" spawn="true">
2.658 - <arg line="${browser.args} ${browse.url}"/>
2.659 - </exec>
2.660 - </target>
2.661 - <target if="app.client" name="run-ac">
2.662 - <antcall target="-run-ac"/>
2.663 - </target>
2.664 - <target depends="init,-as-retrieve-option-workaround,-init-run-macros,-run-appclient-pregfv3,-run-appclient" name="-run-ac"/>
2.665 - <target if="j2ee.appclient.tool.args" name="-run-appclient-pregfv3">
2.666 - <ear2:run-appclient-pregfv3/>
2.667 - </target>
2.668 - <target name="-run-appclient" unless="j2ee.appclient.tool.args">
2.669 - <ear2:run-appclient subprojectname="${app.client}"/>
2.670 - </target>
2.671 - <target if="j2ee.appclient.mainclass.args" name="-as-retrieve-option-workaround" unless="j2ee.clientName">
2.672 - <property name="client.jar" value="${dist.dir}/nekurak.net-earClient.jar"/>
2.673 - <sleep seconds="3"/>
2.674 - <copy failonerror="false" file="${wa.copy.client.jar.from}/nekurak.net-ear/nekurak.net-earClient.jar" todir="${dist.dir}"/>
2.675 - <copy failonerror="false" flatten="true" todir="${dist.dir}/">
2.676 - <fileset dir="${wa.copy.client.jar.from}/nekurak.net-ear" includes="**/nekurak.net-earClient.jar"/>
2.677 - </copy>
2.678 - <copy flatten="true" todir="${dist.dir}/nekurak.net-earClient">
2.679 - <fileset dir="${wa.copy.client.jar.from}/nekurak.net-ear" includes="**/*.*ar"/>
2.680 - </copy>
2.681 - <copy failonerror="false" flatten="false" todir="${dist.dir}/nekurak.net-earClient">
2.682 - <fileset dir="${dist.dir}/gfdeploy/nekurak.net-ear" includes="**/*.jar"/>
2.683 - </copy>
2.684 - </target>
2.685 - <target depends="init" name="-init-run-macros">
2.686 - <macrodef name="run-appclient" uri="http://www.netbeans.org/ns/j2ee-earproject/2">
2.687 - <attribute name="subprojectname"/>
2.688 - <attribute default="${application.args.param}" name="args"/>
2.689 - <element name="customize" optional="true"/>
2.690 - <sequential>
2.691 - <java dir="${basedir}" fork="true" jar="${client.jar}">
2.692 - <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
2.693 - <jvmarg line="${j2ee.appclient.tool.jvmoptions}${client.jar},arg=-name,arg=@{subprojectname}"/>
2.694 - <arg line="@{args}"/>
2.695 - <syspropertyset>
2.696 - <propertyref prefix="run-sys-prop."/>
2.697 - <mapper from="run-sys-prop.*" to="*" type="glob"/>
2.698 - </syspropertyset>
2.699 - <customize/>
2.700 - </java>
2.701 - </sequential>
2.702 - </macrodef>
2.703 - <macrodef name="run-appclient-pregfv3" uri="http://www.netbeans.org/ns/j2ee-earproject/2">
2.704 - <element name="customize" optional="true"/>
2.705 - <sequential>
2.706 - <java classname="${j2ee.appclient.tool.mainclass}" fork="true">
2.707 - <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
2.708 - <jvmarg line="${j2ee.appclient.tool.jvmoptions}"/>
2.709 - <jvmarg line="${j2ee.appclient.jvmoptions.param}"/>
2.710 - <arg line="${j2ee.appclient.tool.args}"/>
2.711 - <arg line="-client ${client.jar}"/>
2.712 - <arg line="${j2ee.appclient.mainclass.tool.param}"/>
2.713 - <arg line="${application.args.param}"/>
2.714 - <classpath>
2.715 - <path path="${j2ee.platform.classpath}:${j2ee.appclient.tool.runtime}"/>
2.716 - </classpath>
2.717 - <syspropertyset>
2.718 - <propertyref prefix="run-sys-prop."/>
2.719 - <mapper from="run-sys-prop.*" to="*" type="glob"/>
2.720 - </syspropertyset>
2.721 - <customize/>
2.722 - </java>
2.723 - </sequential>
2.724 - </macrodef>
2.725 - </target>
2.726 + </fail>
2.727 + <property name="browse.url" value="${deploy.ant.client.url}${client.urlPart}"/>
2.728 + <echo>Launching ${browse.url}</echo>
2.729 + <exec executable="${browser}" spawn="true">
2.730 + <arg line="${browser.args} ${browse.url}"/>
2.731 + </exec>
2.732 + </target>
2.733 + <target if="app.client" name="run-ac">
2.734 + <antcall target="-run-ac"/>
2.735 + </target>
2.736 + <target depends="init,-as-retrieve-option-workaround,-init-run-macros,-run-appclient-pregfv3,-run-appclient" name="-run-ac"/>
2.737 + <target if="j2ee.appclient.tool.args" name="-run-appclient-pregfv3">
2.738 + <ear2:run-appclient-pregfv3/>
2.739 + </target>
2.740 + <target name="-run-appclient" unless="j2ee.appclient.tool.args">
2.741 + <ear2:run-appclient subprojectname="${app.client}"/>
2.742 + </target>
2.743 + <target if="j2ee.appclient.mainclass.args" name="-as-retrieve-option-workaround" unless="j2ee.clientName">
2.744 + <property name="client.jar" value="${dist.dir}/nekurak.net-earClient.jar"/>
2.745 + <sleep seconds="3"/>
2.746 + <copy failonerror="false" file="${wa.copy.client.jar.from}/nekurak.net-ear/nekurak.net-earClient.jar" todir="${dist.dir}"/>
2.747 + <copy failonerror="false" flatten="true" todir="${dist.dir}/">
2.748 + <fileset dir="${wa.copy.client.jar.from}/nekurak.net-ear" includes="**/nekurak.net-earClient.jar"/>
2.749 + </copy>
2.750 + <copy flatten="true" todir="${dist.dir}/nekurak.net-earClient">
2.751 + <fileset dir="${wa.copy.client.jar.from}/nekurak.net-ear" includes="**/*.*ar"/>
2.752 + </copy>
2.753 + <copy failonerror="false" flatten="false" todir="${dist.dir}/nekurak.net-earClient">
2.754 + <fileset dir="${dist.dir}/gfdeploy/nekurak.net-ear" includes="**/*.jar"/>
2.755 + </copy>
2.756 + </target>
2.757 + <target depends="init" name="-init-run-macros">
2.758 + <macrodef name="run-appclient" uri="http://www.netbeans.org/ns/j2ee-earproject/2">
2.759 + <attribute name="subprojectname"/>
2.760 + <attribute default="${application.args.param}" name="args"/>
2.761 + <element name="customize" optional="true"/>
2.762 + <sequential>
2.763 + <java dir="${basedir}" fork="true" jar="${client.jar}">
2.764 + <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
2.765 + <jvmarg line="${j2ee.appclient.tool.jvmoptions}${client.jar},arg=-name,arg=@{subprojectname}"/>
2.766 + <jvmarg line="${j2ee.appclient.jvmoptions.param}"/>
2.767 + <arg line="@{args}"/>
2.768 + <syspropertyset>
2.769 + <propertyref prefix="run-sys-prop."/>
2.770 + <mapper from="run-sys-prop.*" to="*" type="glob"/>
2.771 + </syspropertyset>
2.772 + <customize/>
2.773 + </java>
2.774 + </sequential>
2.775 + </macrodef>
2.776 + <macrodef name="run-appclient-pregfv3" uri="http://www.netbeans.org/ns/j2ee-earproject/2">
2.777 + <element name="customize" optional="true"/>
2.778 + <sequential>
2.779 + <java classname="${j2ee.appclient.tool.mainclass}" fork="true">
2.780 + <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
2.781 + <jvmarg line="${j2ee.appclient.tool.jvmoptions}"/>
2.782 + <jvmarg line="${j2ee.appclient.jvmoptions.param}"/>
2.783 + <arg line="${j2ee.appclient.tool.args}"/>
2.784 + <arg line="-client ${client.jar}"/>
2.785 + <arg line="${j2ee.appclient.mainclass.tool.param}"/>
2.786 + <arg line="${application.args.param}"/>
2.787 + <classpath>
2.788 + <path path="${j2ee.platform.classpath}:${j2ee.appclient.tool.runtime}"/>
2.789 + </classpath>
2.790 + <syspropertyset>
2.791 + <propertyref prefix="run-sys-prop."/>
2.792 + <mapper from="run-sys-prop.*" to="*" type="glob"/>
2.793 + </syspropertyset>
2.794 + <customize/>
2.795 + </java>
2.796 + </sequential>
2.797 + </macrodef>
2.798 + </target>
2.799 <!--
2.800 DEBUGGING SECTION
2.801 -->
2.802 - <target depends="run-debug,run-debug-appclient" description="Deploy to server." name="debug"/>
2.803 - <target depends="dist" description="Debug project in IDE." if="netbeans.home" name="run-debug" unless="app.client">
2.804 - <nbdeploy clientModuleUri="${client.module.uri}" clientUrlPart="${client.urlPart}" debugmode="true"/>
2.805 - <antcall target="connect-debugger"/>
2.806 - <antcall target="debug-display-browser"/>
2.807 - </target>
2.808 - <target name="connect-debugger" unless="is.debugged">
2.809 - <nbjpdaconnect address="${jpda.address}" host="${jpda.host}" name="${jpda.host}:${jpda.address}" transport="${jpda.transport}">
2.810 - <classpath>
2.811 - <path path="${debug.classpath}"/>
2.812 - <fileset dir="${build.dir}" includes="lib/*.jar"/>
2.813 - </classpath>
2.814 - <sourcepath>
2.815 - <path path="${ear.docbase.dirs}"/>
2.816 - </sourcepath>
2.817 - </nbjpdaconnect>
2.818 - </target>
2.819 - <target if="do.display.browser" name="debug-display-browser">
2.820 - <nbbrowse url="${client.url}"/>
2.821 - </target>
2.822 - <target if="can.debug.appclient" name="run-debug-appclient">
2.823 - <antcall target="-run-debug-appclient"/>
2.824 - </target>
2.825 - <target depends="init,-init-debug-args,-debug-appclient-deploy,-as-retrieve-option-workaround,-init-debug-macros,-debug-appclient-start-nbjpda,-debug-appclient-pregfv3,-debug-appclient,connect-debugger" name="-run-debug-appclient"/>
2.826 - <target name="-init-debug-args">
2.827 - <property name="version-output" value="java version "${ant.java.version}"/>
2.828 - <condition property="have-jdk-older-than-1.4">
2.829 - <or>
2.830 - <contains string="${version-output}" substring="java version "1.0"/>
2.831 - <contains string="${version-output}" substring="java version "1.1"/>
2.832 - <contains string="${version-output}" substring="java version "1.2"/>
2.833 - <contains string="${version-output}" substring="java version "1.3"/>
2.834 - </or>
2.835 - </condition>
2.836 - <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
2.837 - <istrue value="${have-jdk-older-than-1.4}"/>
2.838 - </condition>
2.839 - </target>
2.840 - <target depends="init,-init-debug-args,-as-retrieve-option-workaround,-init-run-macros" name="-init-debug-macros">
2.841 - <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
2.842 - <os family="windows"/>
2.843 - </condition>
2.844 - <condition else="${debug-transport-by-os}" property="debug-transport-appclient" value="${debug.transport}">
2.845 - <isset property="debug.transport"/>
2.846 - </condition>
2.847 - <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2ee-earproject/2">
2.848 - <attribute default="${main.class}" name="name"/>
2.849 - <attribute default="${debug.classpath}" name="classpath"/>
2.850 - <attribute default="" name="stopclassname"/>
2.851 - <sequential>
2.852 - <nbjpdastart addressproperty="jpda.address.appclient" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport-appclient}">
2.853 - <classpath>
2.854 - <path path="@{classpath}"/>
2.855 - </classpath>
2.856 - </nbjpdastart>
2.857 - </sequential>
2.858 - </macrodef>
2.859 - <macrodef name="debug-appclient" uri="http://www.netbeans.org/ns/j2ee-earproject/2">
2.860 - <attribute name="subprojectname"/>
2.861 - <sequential>
2.862 - <ear2:run-appclient subprojectname="@{subprojectname}">
2.863 - <customize>
2.864 - <jvmarg value="-Xrunjdwp:transport=${debug-transport-appclient},address=${jpda.address.appclient}"/>
2.865 - <jvmarg line="${debug-args-line}"/>
2.866 - </customize>
2.867 - </ear2:run-appclient>
2.868 - </sequential>
2.869 - </macrodef>
2.870 - <macrodef name="debug-appclient-pregfv3" uri="http://www.netbeans.org/ns/j2ee-earproject/2">
2.871 - <sequential>
2.872 - <ear2:run-appclient-pregfv3>
2.873 - <customize>
2.874 - <jvmarg value="-Xrunjdwp:transport=${debug-transport-appclient},address=${jpda.address.appclient}"/>
2.875 - <jvmarg line="${debug-args-line}"/>
2.876 - </customize>
2.877 - </ear2:run-appclient-pregfv3>
2.878 - </sequential>
2.879 - </macrodef>
2.880 - </target>
2.881 - <target name="-debug-appclient-deploy">
2.882 - <nbstartserver debugmode="true"/>
2.883 - <nbdeploy clientModuleUri="${client.module.uri}" clientUrlPart="${client.urlPart}" debugmode="true"/>
2.884 - </target>
2.885 - <target name="-debug-appclient-start-nbjpda">
2.886 - <ear2:nbjpdastart classpath="" name="${app.client}"/>
2.887 - </target>
2.888 - <target if="j2ee.appclient.tool.args" name="-debug-appclient-pregfv3">
2.889 - <ear2:debug-appclient-pregfv3/>
2.890 - </target>
2.891 - <target name="-debug-appclient" unless="j2ee.appclient.tool.args">
2.892 - <mkdir dir="${dist.dir}/nekurak.net-earClient"/>
2.893 - <copy flatten="true" todir="${dist.dir}/nekurak.net-earClient">
2.894 - <fileset dir="${wa.copy.client.jar.from}/nekurak.net-ear" includes="**/*.*ar"/>
2.895 - </copy>
2.896 - <ear2:debug-appclient subprojectname="${app.client}"/>
2.897 - </target>
2.898 + <target depends="run-debug,run-debug-appclient" description="Deploy to server." name="debug"/>
2.899 + <target depends="dist" description="Debug project in IDE." if="netbeans.home" name="run-debug" unless="app.client">
2.900 + <nbdeploy clientModuleUri="${client.module.uri}" clientUrlPart="${client.urlPart}" debugmode="true"/>
2.901 + <antcall target="connect-debugger"/>
2.902 + <antcall target="debug-display-browser"/>
2.903 + </target>
2.904 + <target name="connect-debugger" unless="is.debugged">
2.905 + <nbjpdaconnect address="${jpda.address}" host="${jpda.host}" name="${jpda.host}:${jpda.address}" transport="${jpda.transport}">
2.906 + <classpath>
2.907 + <path path="${debug.classpath}"/>
2.908 + <fileset dir="${build.dir}" includes="lib/*.jar"/>
2.909 + </classpath>
2.910 + <sourcepath>
2.911 + <path path="${ear.docbase.dirs}"/>
2.912 + </sourcepath>
2.913 + </nbjpdaconnect>
2.914 + </target>
2.915 + <target if="do.display.browser" name="debug-display-browser">
2.916 + <nbbrowse url="${client.url}"/>
2.917 + </target>
2.918 + <target if="can.debug.appclient" name="run-debug-appclient">
2.919 + <antcall target="-run-debug-appclient"/>
2.920 + </target>
2.921 + <target depends="init,-init-debug-args,-debug-appclient-deploy,-as-retrieve-option-workaround,-init-debug-macros,-debug-appclient-start-nbjpda,-debug-appclient-pregfv3,-debug-appclient,connect-debugger" name="-run-debug-appclient"/>
2.922 + <target name="-init-debug-args">
2.923 + <property name="version-output" value="java version "${ant.java.version}"/>
2.924 + <condition property="have-jdk-older-than-1.4">
2.925 + <or>
2.926 + <contains string="${version-output}" substring="java version "1.0"/>
2.927 + <contains string="${version-output}" substring="java version "1.1"/>
2.928 + <contains string="${version-output}" substring="java version "1.2"/>
2.929 + <contains string="${version-output}" substring="java version "1.3"/>
2.930 + </or>
2.931 + </condition>
2.932 + <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
2.933 + <istrue value="${have-jdk-older-than-1.4}"/>
2.934 + </condition>
2.935 + </target>
2.936 + <target depends="init,-init-debug-args,-as-retrieve-option-workaround,-init-run-macros" name="-init-debug-macros">
2.937 + <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
2.938 + <os family="windows"/>
2.939 + </condition>
2.940 + <condition else="${debug-transport-by-os}" property="debug-transport-appclient" value="${debug.transport}">
2.941 + <isset property="debug.transport"/>
2.942 + </condition>
2.943 + <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2ee-earproject/2">
2.944 + <attribute default="${main.class}" name="name"/>
2.945 + <attribute default="${debug.classpath}" name="classpath"/>
2.946 + <attribute default="" name="stopclassname"/>
2.947 + <sequential>
2.948 + <nbjpdastart addressproperty="jpda.address.appclient" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport-appclient}">
2.949 + <classpath>
2.950 + <path path="@{classpath}"/>
2.951 + </classpath>
2.952 + </nbjpdastart>
2.953 + </sequential>
2.954 + </macrodef>
2.955 + <macrodef name="debug-appclient" uri="http://www.netbeans.org/ns/j2ee-earproject/2">
2.956 + <attribute name="subprojectname"/>
2.957 + <sequential>
2.958 + <ear2:run-appclient subprojectname="@{subprojectname}">
2.959 + <customize>
2.960 + <jvmarg value="-Xrunjdwp:transport=${debug-transport-appclient},address=${jpda.address.appclient}"/>
2.961 + <jvmarg line="${debug-args-line}"/>
2.962 + </customize>
2.963 + </ear2:run-appclient>
2.964 + </sequential>
2.965 + </macrodef>
2.966 + <macrodef name="debug-appclient-pregfv3" uri="http://www.netbeans.org/ns/j2ee-earproject/2">
2.967 + <sequential>
2.968 + <ear2:run-appclient-pregfv3>
2.969 + <customize>
2.970 + <jvmarg value="-Xrunjdwp:transport=${debug-transport-appclient},address=${jpda.address.appclient}"/>
2.971 + <jvmarg line="${debug-args-line}"/>
2.972 + </customize>
2.973 + </ear2:run-appclient-pregfv3>
2.974 + </sequential>
2.975 + </macrodef>
2.976 + </target>
2.977 + <target name="-debug-appclient-deploy">
2.978 + <nbstartserver debugmode="true"/>
2.979 + <nbdeploy clientModuleUri="${client.module.uri}" clientUrlPart="${client.urlPart}" debugmode="true"/>
2.980 + </target>
2.981 + <target name="-debug-appclient-start-nbjpda">
2.982 + <ear2:nbjpdastart classpath="" name="${app.client}"/>
2.983 + </target>
2.984 + <target if="j2ee.appclient.tool.args" name="-debug-appclient-pregfv3">
2.985 + <ear2:debug-appclient-pregfv3/>
2.986 + </target>
2.987 + <target name="-debug-appclient" unless="j2ee.appclient.tool.args">
2.988 + <ear2:debug-appclient subprojectname="${app.client}"/>
2.989 + </target>
2.990 + <!--
2.991 + =================
2.992 + PROFILING SECTION
2.993 + =================
2.994 + -->
2.995 + <target description="Profile a J2EE project in the IDE." name="profile">
2.996 + <condition else="start-profiled-server" property="profiler.startserver.target" value="start-profiled-server-extraargs">
2.997 + <isset property="profiler.info.jvmargs.extra"/>
2.998 + </condition>
2.999 + <antcall target="${profiler.startserver.target}"/>
2.1000 + <antcall target="run"/>
2.1001 + <antcall target="start-loadgen"/>
2.1002 + </target>
2.1003 + <target name="start-profiled-server">
2.1004 + <nbstartprofiledserver forceRestart="${profiler.j2ee.serverForceRestart}" javaPlatform="${profiler.info.javaPlatform}" startupTimeout="${profiler.j2ee.serverStartupTimeout}">
2.1005 + <jvmarg value="${profiler.info.jvmargs.agent}"/>
2.1006 + <jvmarg value="${profiler.j2ee.agentID}"/>
2.1007 + </nbstartprofiledserver>
2.1008 + </target>
2.1009 + <target name="start-profiled-server-extraargs">
2.1010 + <nbstartprofiledserver forceRestart="${profiler.j2ee.serverForceRestart}" javaPlatform="${profiler.info.javaPlatform}" startupTimeout="${profiler.j2ee.serverStartupTimeout}">
2.1011 + <jvmarg value="${profiler.info.jvmargs.extra}"/>
2.1012 + <jvmarg value="${profiler.info.jvmargs.agent}"/>
2.1013 + <jvmarg value="${profiler.j2ee.agentID}"/>
2.1014 + </nbstartprofiledserver>
2.1015 + </target>
2.1016 + <target if="profiler.loadgen.path" name="start-loadgen">
2.1017 + <loadgenstart path="${profiler.loadgen.path}"/>
2.1018 + </target>
2.1019 <!--
2.1020 CLEANUP SECTION
2.1021 -->
2.1022 - <target depends="init" name="deps-clean" unless="no.deps">
2.1023 - <condition property="build.deploy.on.save" value="false">
2.1024 - <not>
2.1025 - <isset property="build.deploy.on.save"/>
2.1026 - </not>
2.1027 - </condition>
2.1028 - <ant antfile="${project.nekurak_net-ejb}/build.xml" inheritall="false" target="clean-ear">
2.1029 - <property location="${build.dir}" name="dist.ear.dir"/>
2.1030 - <property name="deploy.on.save" value="${build.deploy.on.save}"/>
2.1031 - </ant>
2.1032 - <condition property="build.deploy.on.save" value="false">
2.1033 - <not>
2.1034 - <isset property="build.deploy.on.save"/>
2.1035 - </not>
2.1036 - </condition>
2.1037 - <ant antfile="${project.nekurak_net-rest}/build.xml" inheritall="false" target="clean-ear">
2.1038 - <property location="${build.dir}" name="dist.ear.dir"/>
2.1039 - <property name="deploy.on.save" value="${build.deploy.on.save}"/>
2.1040 - </ant>
2.1041 - <condition property="build.deploy.on.save" value="false">
2.1042 - <not>
2.1043 - <isset property="build.deploy.on.save"/>
2.1044 - </not>
2.1045 - </condition>
2.1046 - <ant antfile="${project.nekurak_net-web}/build.xml" inheritall="false" target="clean-ear">
2.1047 - <property location="${build.dir}" name="dist.ear.dir"/>
2.1048 - <property name="deploy.on.save" value="${build.deploy.on.save}"/>
2.1049 - </ant>
2.1050 - <condition property="build.deploy.on.save" value="false">
2.1051 - <not>
2.1052 - <isset property="build.deploy.on.save"/>
2.1053 - </not>
2.1054 - </condition>
2.1055 - <ant antfile="${project.nekurak_net-ws}/build.xml" inheritall="false" target="clean-ear">
2.1056 - <property location="${build.dir}" name="dist.ear.dir"/>
2.1057 - <property name="deploy.on.save" value="${build.deploy.on.save}"/>
2.1058 - </ant>
2.1059 - </target>
2.1060 - <target depends="init" name="do-clean">
2.1061 - <delete dir="${build.dir}"/>
2.1062 - <delete dir="${dist.dir}"/>
2.1063 - <delete dir="${build.dir}"/>
2.1064 - </target>
2.1065 - <target depends="init" if="netbeans.home" name="undeploy-clean">
2.1066 - <nbundeploy failOnError="false" startServer="false"/>
2.1067 - </target>
2.1068 - <target name="post-clean">
2.1069 + <target depends="init" name="deps-clean" unless="no.deps">
2.1070 + <condition property="build.deploy.on.save" value="false">
2.1071 + <not>
2.1072 + <isset property="build.deploy.on.save"/>
2.1073 + </not>
2.1074 + </condition>
2.1075 + <ant antfile="${project.nekurak_net-ejb}/build.xml" inheritall="false" target="clean-ear">
2.1076 + <property location="${build.dir}" name="dist.ear.dir"/>
2.1077 + <property name="deploy.on.save" value="${build.deploy.on.save}"/>
2.1078 + </ant>
2.1079 + <condition property="build.deploy.on.save" value="false">
2.1080 + <not>
2.1081 + <isset property="build.deploy.on.save"/>
2.1082 + </not>
2.1083 + </condition>
2.1084 + <ant antfile="${project.nekurak_net-rest}/build.xml" inheritall="false" target="clean-ear">
2.1085 + <property location="${build.dir}" name="dist.ear.dir"/>
2.1086 + <property name="deploy.on.save" value="${build.deploy.on.save}"/>
2.1087 + </ant>
2.1088 + <condition property="build.deploy.on.save" value="false">
2.1089 + <not>
2.1090 + <isset property="build.deploy.on.save"/>
2.1091 + </not>
2.1092 + </condition>
2.1093 + <ant antfile="${project.nekurak_net-web}/build.xml" inheritall="false" target="clean-ear">
2.1094 + <property location="${build.dir}" name="dist.ear.dir"/>
2.1095 + <property name="deploy.on.save" value="${build.deploy.on.save}"/>
2.1096 + </ant>
2.1097 + <condition property="build.deploy.on.save" value="false">
2.1098 + <not>
2.1099 + <isset property="build.deploy.on.save"/>
2.1100 + </not>
2.1101 + </condition>
2.1102 + <ant antfile="${project.nekurak_net-ws}/build.xml" inheritall="false" target="clean-ear">
2.1103 + <property location="${build.dir}" name="dist.ear.dir"/>
2.1104 + <property name="deploy.on.save" value="${build.deploy.on.save}"/>
2.1105 + </ant>
2.1106 + </target>
2.1107 + <target depends="init" name="do-clean">
2.1108 + <delete dir="${build.dir}"/>
2.1109 + <delete dir="${dist.dir}"/>
2.1110 + <delete dir="${build.dir}"/>
2.1111 + </target>
2.1112 + <target depends="init" if="netbeans.home" name="undeploy-clean">
2.1113 + <nbundeploy failOnError="false" startServer="false"/>
2.1114 + </target>
2.1115 + <target name="post-clean">
2.1116 <!-- Empty placeholder for easier customization. -->
2.1117 <!-- You can override this target in the ../build.xml file. -->
2.1118 - </target>
2.1119 - <target depends="init,undeploy-clean,deps-clean,do-clean,post-clean" description="Clean build products." name="clean"/>
2.1120 + </target>
2.1121 + <target depends="init,undeploy-clean,deps-clean,do-clean,post-clean" description="Clean build products." name="clean"/>
2.1122 </project>
3.1 --- a/java/nekurak.net-ear/nbproject/genfiles.properties Sun Jul 10 20:17:56 2011 +0200
3.2 +++ b/java/nekurak.net-ear/nbproject/genfiles.properties Fri Jul 15 22:25:39 2011 +0200
3.3 @@ -4,5 +4,5 @@
3.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
3.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
3.6 nbproject/build-impl.xml.data.CRC32=3ed495e4
3.7 -nbproject/build-impl.xml.script.CRC32=1197b7f6
3.8 -nbproject/build-impl.xml.stylesheet.CRC32=56fd2fa2@1.18.1
3.9 +nbproject/build-impl.xml.script.CRC32=904b1c1e
3.10 +nbproject/build-impl.xml.stylesheet.CRC32=e4530a36@1.24.1
4.1 --- a/java/nekurak.net-ear/nbproject/project.properties Sun Jul 10 20:17:56 2011 +0200
4.2 +++ b/java/nekurak.net-ear/nbproject/project.properties Fri Jul 15 22:25:39 2011 +0200
4.3 @@ -10,9 +10,10 @@
4.4 endorsed.classpath=\
4.5 ${libs.javaee-endorsed-api-6.0.classpath}
4.6 j2ee.appclient.mainclass.args=${j2ee.appclient.tool.args}
4.7 +j2ee.compile.on.save=false
4.8 j2ee.deploy.on.save=false
4.9 j2ee.platform=1.6
4.10 -j2ee.platform.classpath=
4.11 +j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/javax.annotation.jar:${j2ee.server.home}/modules/javax.transaction.jar:${j2ee.server.home}/modules/jsf-api.jar:${j2ee.server.home}/modules/jsf-impl.jar:${j2ee.server.home}/modules/jaxrpc-api-osgi.jar:${j2ee.server.home}/modules/javax.enterprise.deploy.jar:${j2ee.server.home}/modules/javax.resource.jar:${j2ee.server.home}/modules/jstl-impl.jar:${j2ee.server.home}/modules/jersey-core.jar:${j2ee.server.home}/modules/javax.security.auth.message.jar:${j2ee.server.home}/modules/javax.servlet.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.ejb.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.management.j2ee.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.jms.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/javax.security.jacc.jar:${j2ee.server.home}/modules/javax.persistence.jar
4.12 j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar
4.13 j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar
4.14 j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar
5.1 --- a/java/nekurak.net-ejb/nbproject/ant-deploy.xml Sun Jul 10 20:17:56 2011 +0200
5.2 +++ b/java/nekurak.net-ejb/nbproject/ant-deploy.xml Fri Jul 15 22:25:39 2011 +0200
5.3 @@ -3,6 +3,7 @@
5.4 <target name="-init-cl-deployment-env" if="deploy.ant.enabled">
5.5 <property file="${deploy.ant.properties.file}" />
5.6 <available file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" property="sun.web.present"/>
5.7 + <available file="${deploy.ant.docbase.dir}/WEB-INF/glassfish-web.xml" property="glassfish.web.present"/>
5.8 <available file="${deploy.ant.resource.dir}" property="has.setup"/>
5.9 <tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
5.10 <echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
5.11 @@ -23,8 +24,34 @@
5.12 <xmlproperty file="${temp.sun.web}" validate="false">
5.13 </xmlproperty>
5.14 <delete file="${temp.sun.web}"/>
5.15 - <property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
5.16 - <property name="deploy.context.root.argument" value="&contextroot=${sun-web-app.context-root}"/>
5.17 + <condition property="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}" else="${gfv3.url}/${ant.project.name}">
5.18 + <isset property="sun-web-app.context-root"/>
5.19 + </condition>
5.20 + <condition property="deploy.context.root.argument" value="&contextroot=${sun-web-app.context-root}" else="/${ant.project.name}">
5.21 + <isset property="sun-web-app.context-root"/>
5.22 + </condition>
5.23 + </target>
5.24 + <target name="-parse-glassfish-web" depends="-init-cl-deployment-env" if="glassfish.web.present">
5.25 + <tempfile prefix="gfv3" property="temp.gf.web" destdir="${java.io.tmpdir}"/>
5.26 + <copy file="${deploy.ant.docbase.dir}/WEB-INF/glassfish-web.xml" tofile="${temp.gf.web}"/>
5.27 + <!-- The doctype triggers resolution which can fail -->
5.28 + <replace file="${temp.gf.web}">
5.29 + <replacetoken><![CDATA[<!DOCTYPE]]></replacetoken>
5.30 + <replacevalue><![CDATA[<!-- <!DOCTYPE]]></replacevalue>
5.31 + </replace>
5.32 + <replace file="${temp.gf.web}">
5.33 + <replacetoken><![CDATA[<glassfish-web-app]]></replacetoken>
5.34 + <replacevalue><![CDATA[--> <glassfish-web-app]]></replacevalue>
5.35 + </replace>
5.36 + <xmlproperty file="${temp.gf.web}" validate="false">
5.37 + </xmlproperty>
5.38 + <delete file="${temp.gf.web}"/>
5.39 + <condition property="deploy.ant.client.url" value="${gfv3.url}${glassfish-web-app.context-root}" else="${gfv3.url}/${ant.project.name}">
5.40 + <isset property="glassfish-web-app.context-root"/>
5.41 + </condition>
5.42 + <condition property="deploy.context.root.argument" value="&contextroot=${glassfish-web-app.context-root}" else="/${ant.project.name}">
5.43 + <isset property="glassfish-web-app.context-root"/>
5.44 + </condition>
5.45 </target>
5.46 <target name="-no-parse-sun-web" depends="-init-cl-deployment-env" unless="sun.web.present">
5.47 <property name="deploy.context.root.argument" value=""/>
5.48 @@ -33,7 +60,6 @@
5.49 <tempfile prefix="gfv3" property="gfv3.resources.dir" destdir="${java.io.tmpdir}"/>
5.50 <mkdir dir="${gfv3.resources.dir}"/>
5.51 <mkdir dir="${gfv3.resources.dir}/META-INF"/>
5.52 - <property name="gfv3.resources.file" value="${gfv3.resources.dir}/META-INF/sun-resources.xml"/>
5.53 <copy todir="${gfv3.resources.dir}/META-INF">
5.54 <fileset dir="${deploy.ant.resource.dir}"/>
5.55 </copy>
5.56 @@ -42,7 +68,7 @@
5.57 </jar>
5.58 <delete dir="${gfv3.resources.dir}"/>
5.59 </target>
5.60 - <target name="-deploy-ant" depends="-parse-sun-web,-no-parse-sun-web,-add-resources" if="deploy.ant.enabled">
5.61 + <target name="-deploy-ant" depends="-parse-glassfish-web, -parse-sun-web, -no-parse-sun-web,-add-resources" if="deploy.ant.enabled">
5.62 <antcall target="-deploy-without-pw"/>
5.63 <antcall target="-deploy-with-pw"/>
5.64 </target>
6.1 --- a/java/nekurak.net-ejb/nbproject/build-impl.xml Sun Jul 10 20:17:56 2011 +0200
6.2 +++ b/java/nekurak.net-ejb/nbproject/build-impl.xml Fri Jul 15 22:25:39 2011 +0200
6.3 @@ -118,8 +118,23 @@
6.4 <property name="excludes" value=""/>
6.5 <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
6.6 <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
6.7 - <length length="0" string="${endorsed.classpath}" when="greater"/>
6.8 + <and>
6.9 + <isset property="endorsed.classpath"/>
6.10 + <length length="0" string="${endorsed.classpath}" when="greater"/>
6.11 + </and>
6.12 </condition>
6.13 + <condition property="is.server.weblogic" value="true">
6.14 + <equals arg1="${j2ee.server.type}" arg2="WebLogic9"/>
6.15 + </condition>
6.16 + <condition else="false" property="jdkBug6558476">
6.17 + <and>
6.18 + <matches pattern="1\.[56]" string="${java.specification.version}"/>
6.19 + <not>
6.20 + <os family="unix"/>
6.21 + </not>
6.22 + </and>
6.23 + </condition>
6.24 + <property name="javac.fork" value="${jdkBug6558476}"/>
6.25 </target>
6.26 <target depends="init" name="-init-cos" unless="deploy.on.save">
6.27 <condition property="deploy.on.save" value="true">
6.28 @@ -188,7 +203,7 @@
6.29 <property location="${build.dir}/empty" name="empty.dir"/>
6.30 <mkdir dir="${empty.dir}"/>
6.31 <mkdir dir="@{apgeneratedsrcdir}"/>
6.32 - <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.33 + <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}">
6.34 <src>
6.35 <dirset dir="@{gensrcdir}" erroronmissingdir="false">
6.36 <include name="*"/>
6.37 @@ -259,15 +274,18 @@
6.38 <attribute default="${build.classes.dir}" name="destdir"/>
6.39 <sequential>
6.40 <fail unless="javac.includes">Must set javac.includes</fail>
6.41 - <pathconvert pathsep="," property="javac.includes.binary">
6.42 + <pathconvert pathsep="${line.separator}" property="javac.includes.binary">
6.43 <path>
6.44 <filelist dir="@{destdir}" files="${javac.includes}"/>
6.45 </path>
6.46 <globmapper from="*.java" to="*.class"/>
6.47 </pathconvert>
6.48 + <tempfile deleteonexit="true" property="javac.includesfile.binary"/>
6.49 + <echo file="${javac.includesfile.binary}" message="${javac.includes.binary}"/>
6.50 <delete>
6.51 - <files includes="${javac.includes.binary}"/>
6.52 + <files includesfile="${javac.includesfile.binary}"/>
6.53 </delete>
6.54 + <delete file="${javac.includesfile.binary}"/>
6.55 </sequential>
6.56 </macrodef>
6.57 </target>
6.58 @@ -295,6 +313,7 @@
6.59 <formatter type="brief" usefile="false"/>
6.60 <formatter type="xml"/>
6.61 <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
6.62 + <jvmarg value="-ea"/>
6.63 <jvmarg line="${runmain.jvmargs}"/>
6.64 </junit>
6.65 </sequential>
6.66 @@ -424,6 +443,19 @@
6.67 <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
6.68 <property name="ap.cmd.line.internal" value=""/>
6.69 </target>
6.70 + <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-check" name="profile-init"/>
6.71 + <target name="-profile-pre-init">
6.72 + <!-- Empty placeholder for easier customization. -->
6.73 + <!-- You can override this target in the ../build.xml file. -->
6.74 + </target>
6.75 + <target name="-profile-post-init">
6.76 + <!-- Empty placeholder for easier customization. -->
6.77 + <!-- You can override this target in the ../build.xml file. -->
6.78 + </target>
6.79 + <target depends="-profile-pre-init, init, -profile-post-init" name="-profile-init-check">
6.80 + <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
6.81 + <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
6.82 + </target>
6.83 <target depends="-pre-init,-init-private,-init-userdir,-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-debug,-init-taskdefs,-init-ap-cmdline" name="init"/>
6.84 <!--
6.85 COMPILATION SECTION
6.86 @@ -453,10 +485,16 @@
6.87 <!-- Empty placeholder for easier customization. -->
6.88 <!-- You can override this target in the ../build.xml file. -->
6.89 </target>
6.90 - <target depends="compile" name="library-inclusion-in-archive">
6.91 - <copyfiles files="${reference.nekurak_net-lib.jar}" todir="${build.classes.dir}"/>
6.92 - <copyfiles files="${reference.SuperDAO.jar}" todir="${build.classes.dir}"/>
6.93 - <copyfiles files="${libs.Smack-XMPP.classpath}" todir="${build.classes.dir}"/>
6.94 + <target depends="compile" if="is.server.weblogic" name="library-inclusion-in-archive">
6.95 + <basename file="${reference.nekurak_net-lib.jar}" property="manifest.reference.nekurak_net-lib.jar"/>
6.96 + <basename file="${reference.SuperDAO.jar}" property="manifest.reference.SuperDAO.jar"/>
6.97 + <basename file="${libs.Smack-XMPP.classpath}" property="manifest.libs.Smack-XMPP.classpath"/>
6.98 + <manifest file="${build.ear.classes.dir}/META-INF/MANIFEST.MF" mode="update">
6.99 + <attribute name="Extension-List" value="jar-1 jar-2 jar-3 "/>
6.100 + <attribute name="jar-1-Extension-Name" value="${manifest.reference.nekurak_net-lib.jar}"/>
6.101 + <attribute name="jar-2-Extension-Name" value="${manifest.reference.SuperDAO.jar}"/>
6.102 + <attribute name="jar-3-Extension-Name" value="${manifest.libs.Smack-XMPP.classpath}"/>
6.103 + </manifest>
6.104 </target>
6.105 <target depends="compile" name="library-inclusion-in-manifest">
6.106 <copyfiles files="${reference.nekurak_net-lib.jar}" todir="${dist.ear.dir}/lib"/>
6.107 @@ -635,6 +673,35 @@
6.108 </target>
6.109 <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
6.110 <!--
6.111 + =================
6.112 + PROFILING SECTION
6.113 + =================
6.114 + -->
6.115 + <target description="Profile a J2EE project in the IDE." name="profile">
6.116 + <condition else="start-profiled-server" property="profiler.startserver.target" value="start-profiled-server-extraargs">
6.117 + <isset property="profiler.info.jvmargs.extra"/>
6.118 + </condition>
6.119 + <antcall target="${profiler.startserver.target}"/>
6.120 + <antcall target="run"/>
6.121 + <antcall target="start-loadgen"/>
6.122 + </target>
6.123 + <target name="start-profiled-server">
6.124 + <nbstartprofiledserver forceRestart="${profiler.j2ee.serverForceRestart}" javaPlatform="${profiler.info.javaPlatform}" startupTimeout="${profiler.j2ee.serverStartupTimeout}">
6.125 + <jvmarg value="${profiler.info.jvmargs.agent}"/>
6.126 + <jvmarg value="${profiler.j2ee.agentID}"/>
6.127 + </nbstartprofiledserver>
6.128 + </target>
6.129 + <target name="start-profiled-server-extraargs">
6.130 + <nbstartprofiledserver forceRestart="${profiler.j2ee.serverForceRestart}" javaPlatform="${profiler.info.javaPlatform}" startupTimeout="${profiler.j2ee.serverStartupTimeout}">
6.131 + <jvmarg value="${profiler.info.jvmargs.extra}"/>
6.132 + <jvmarg value="${profiler.info.jvmargs.agent}"/>
6.133 + <jvmarg value="${profiler.j2ee.agentID}"/>
6.134 + </nbstartprofiledserver>
6.135 + </target>
6.136 + <target if="profiler.loadgen.path" name="start-loadgen">
6.137 + <loadgenstart path="${profiler.loadgen.path}"/>
6.138 + </target>
6.139 + <!--
6.140 JAVADOC SECTION
6.141 -->
6.142 <target depends="init" if="have.sources" name="javadoc-build">
6.143 @@ -750,6 +817,35 @@
6.144 </target>
6.145 <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
6.146 <!--
6.147 + =========================
6.148 + TESTS PROFILING SECTION
6.149 + =========================
6.150 + -->
6.151 + <target depends="profile-init,compile-test-single" if="netbeans.home" name="profile-test-single">
6.152 + <nbprofiledirect>
6.153 + <classpath>
6.154 + <path path="${run.test.classpath}"/>
6.155 + <path path="${j2ee.platform.classpath}"/>
6.156 + </classpath>
6.157 + </nbprofiledirect>
6.158 + <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true">
6.159 + <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
6.160 + <jvmarg value="${profiler.info.jvmargs.agent}"/>
6.161 + <jvmarg line="${profiler.info.jvmargs}"/>
6.162 + <test name="${profile.class}"/>
6.163 + <classpath>
6.164 + <path path="${run.test.classpath}"/>
6.165 + <path path="${j2ee.platform.classpath}"/>
6.166 + </classpath>
6.167 + <syspropertyset>
6.168 + <propertyref prefix="test-sys-prop."/>
6.169 + <mapper from="test-sys-prop.*" to="*" type="glob"/>
6.170 + </syspropertyset>
6.171 + <formatter type="brief" usefile="false"/>
6.172 + <formatter type="xml"/>
6.173 + </junit>
6.174 + </target>
6.175 + <!--
6.176 CLEANUP SECTION
6.177 -->
6.178 <target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps">
7.1 --- a/java/nekurak.net-ejb/nbproject/genfiles.properties Sun Jul 10 20:17:56 2011 +0200
7.2 +++ b/java/nekurak.net-ejb/nbproject/genfiles.properties Fri Jul 15 22:25:39 2011 +0200
7.3 @@ -1,8 +1,8 @@
7.4 -build.xml.data.CRC32=70881d3e
7.5 +build.xml.data.CRC32=7060a689
7.6 build.xml.script.CRC32=d7a2a0ed
7.7 -build.xml.stylesheet.CRC32=5910fda3@1.22.1
7.8 +build.xml.stylesheet.CRC32=5910fda3@1.28.1
7.9 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
7.10 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
7.11 -nbproject/build-impl.xml.data.CRC32=70881d3e
7.12 -nbproject/build-impl.xml.script.CRC32=ad4fc04b
7.13 -nbproject/build-impl.xml.stylesheet.CRC32=33606734@1.22.2
7.14 +nbproject/build-impl.xml.data.CRC32=7060a689
7.15 +nbproject/build-impl.xml.script.CRC32=8a650959
7.16 +nbproject/build-impl.xml.stylesheet.CRC32=6cd662d4@1.28.1
8.1 --- a/java/nekurak.net-ejb/nbproject/project.properties Sun Jul 10 20:17:56 2011 +0200
8.2 +++ b/java/nekurak.net-ejb/nbproject/project.properties Fri Jul 15 22:25:39 2011 +0200
8.3 @@ -1,6 +1,5 @@
8.4 annotation.processing.enabled=true
8.5 annotation.processing.enabled.in.editor=true
8.6 -annotation.processing.processors.list=
8.7 annotation.processing.run.all.processors=true
8.8 annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
8.9 build.classes.dir=${build.dir}/classes
8.10 @@ -22,9 +21,10 @@
8.11 ${libs.javaee-endorsed-api-6.0.classpath}
8.12 excludes=
8.13 includes=**
8.14 +j2ee.compile.on.save=false
8.15 j2ee.deploy.on.save=false
8.16 j2ee.platform=1.6
8.17 -j2ee.platform.classpath=
8.18 +j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/javax.annotation.jar:${j2ee.server.home}/modules/javax.transaction.jar:${j2ee.server.home}/modules/jsf-api.jar:${j2ee.server.home}/modules/jsf-impl.jar:${j2ee.server.home}/modules/jaxrpc-api-osgi.jar:${j2ee.server.home}/modules/javax.enterprise.deploy.jar:${j2ee.server.home}/modules/javax.resource.jar:${j2ee.server.home}/modules/jstl-impl.jar:${j2ee.server.home}/modules/jersey-core.jar:${j2ee.server.home}/modules/javax.security.auth.message.jar:${j2ee.server.home}/modules/javax.servlet.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.ejb.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.management.j2ee.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.jms.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/javax.security.jacc.jar:${j2ee.server.home}/modules/javax.persistence.jar
8.19 j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar
8.20 j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar
8.21 j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar
8.22 @@ -39,9 +39,10 @@
8.23 ${libs.Smack-XMPP.classpath}
8.24 javac.debug=true
8.25 javac.deprecation=false
8.26 -javac.processorpath=${javac.classpath}
8.27 -javac.source=1.5
8.28 -javac.target=1.5
8.29 +javac.processorpath=\
8.30 + ${javac.classpath}
8.31 +javac.source=1.6
8.32 +javac.target=1.6
8.33 javac.test.classpath=\
8.34 ${javac.classpath}:\
8.35 ${build.classes.dir}:\
9.1 --- a/java/nekurak.net-ejb/nbproject/project.xml Sun Jul 10 20:17:56 2011 +0200
9.2 +++ b/java/nekurak.net-ejb/nbproject/project.xml Fri Jul 15 22:25:39 2011 +0200
9.3 @@ -9,10 +9,10 @@
9.4 <included-library dirs="200">reference.SuperDAO.jar</included-library>
9.5 <included-library dirs="200">libs.Smack-XMPP.classpath</included-library>
9.6 <source-roots>
9.7 - <root id="src.dir" name="Source Packages"/>
9.8 + <root id="src.dir"/>
9.9 </source-roots>
9.10 <test-roots>
9.11 - <root id="test.src.dir" name="Test Packages"/>
9.12 + <root id="test.src.dir"/>
9.13 </test-roots>
9.14 </data>
9.15 <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
10.1 --- a/java/nekurak.net-ejb/src/java/cz/frantovo/nekurak/ejb/UzivatelEJB.java Sun Jul 10 20:17:56 2011 +0200
10.2 +++ b/java/nekurak.net-ejb/src/java/cz/frantovo/nekurak/ejb/UzivatelEJB.java Fri Jul 15 22:25:39 2011 +0200
10.3 @@ -35,6 +35,7 @@
10.4 private Map<Locale, ResourceBundle> lokalizace = new HashMap<Locale, ResourceBundle>();
10.5
10.6 /** Uživatele může zakládat kdokoli – uživatel se registruje sám. */
10.7 + @Override
10.8 public void registrujUzivatele(PozadavekNaRegistraciUzivatele p) throws NekurakVyjimka {
10.9 try {
10.10 Uzivatel u = p.getUzivatel();
11.1 --- a/java/nekurak.net-lib/nbproject/build-impl.xml Sun Jul 10 20:17:56 2011 +0200
11.2 +++ b/java/nekurak.net-lib/nbproject/build-impl.xml Fri Jul 15 22:25:39 2011 +0200
11.3 @@ -55,7 +55,14 @@
11.4 </target>
11.5 <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
11.6 <available file="${manifest.file}" property="manifest.available"/>
11.7 - <available file="${application.splash}" property="splashscreen.available"/>
11.8 + <condition property="splashscreen.available">
11.9 + <and>
11.10 + <not>
11.11 + <equals arg1="${application.splash}" arg2="" trim="true"/>
11.12 + </not>
11.13 + <available file="${application.splash}"/>
11.14 + </and>
11.15 + </condition>
11.16 <condition property="main.class.available">
11.17 <and>
11.18 <isset property="main.class"/>
11.19 @@ -70,8 +77,14 @@
11.20 <isset property="main.class.available"/>
11.21 </and>
11.22 </condition>
11.23 + <condition property="do.archive">
11.24 + <not>
11.25 + <istrue value="${jar.archive.disabled}"/>
11.26 + </not>
11.27 + </condition>
11.28 <condition property="do.mkdist">
11.29 <and>
11.30 + <isset property="do.archive"/>
11.31 <isset property="libs.CopyLibs.classpath"/>
11.32 <not>
11.33 <istrue value="${mkdist.disabled}"/>
11.34 @@ -84,40 +97,41 @@
11.35 <isset property="do.mkdist"/>
11.36 </and>
11.37 </condition>
11.38 - <condition property="manifest.available+main.class+mkdist.available+splashscreen.available">
11.39 - <and>
11.40 - <istrue value="${manifest.available+main.class+mkdist.available}"/>
11.41 - <istrue value="${splashscreen.available}"/>
11.42 - </and>
11.43 - </condition>
11.44 - <condition property="do.archive">
11.45 - <not>
11.46 - <istrue value="${jar.archive.disabled}"/>
11.47 - </not>
11.48 - </condition>
11.49 <condition property="do.archive+manifest.available">
11.50 <and>
11.51 <isset property="manifest.available"/>
11.52 <istrue value="${do.archive}"/>
11.53 </and>
11.54 </condition>
11.55 + <condition property="do.archive+main.class.available">
11.56 + <and>
11.57 + <isset property="main.class.available"/>
11.58 + <istrue value="${do.archive}"/>
11.59 + </and>
11.60 + </condition>
11.61 + <condition property="do.archive+splashscreen.available">
11.62 + <and>
11.63 + <isset property="splashscreen.available"/>
11.64 + <istrue value="${do.archive}"/>
11.65 + </and>
11.66 + </condition>
11.67 <condition property="do.archive+manifest.available+main.class">
11.68 <and>
11.69 <istrue value="${manifest.available+main.class}"/>
11.70 <istrue value="${do.archive}"/>
11.71 </and>
11.72 </condition>
11.73 - <condition property="do.archive+manifest.available+main.class+mkdist.available">
11.74 - <and>
11.75 - <istrue value="${manifest.available+main.class+mkdist.available}"/>
11.76 - <istrue value="${do.archive}"/>
11.77 - </and>
11.78 + <condition property="manifest.available-mkdist.available">
11.79 + <or>
11.80 + <istrue value="${manifest.available}"/>
11.81 + <isset property="do.mkdist"/>
11.82 + </or>
11.83 </condition>
11.84 - <condition property="do.archive+manifest.available+main.class+mkdist.available+splashscreen.available">
11.85 - <and>
11.86 - <istrue value="${manifest.available+main.class+mkdist.available+splashscreen.available}"/>
11.87 - <istrue value="${do.archive}"/>
11.88 - </and>
11.89 + <condition property="manifest.available+main.class-mkdist.available">
11.90 + <or>
11.91 + <istrue value="${manifest.available+main.class}"/>
11.92 + <isset property="do.mkdist"/>
11.93 + </or>
11.94 </condition>
11.95 <condition property="have.tests">
11.96 <or>
11.97 @@ -173,8 +187,17 @@
11.98 <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
11.99 <length length="0" string="${endorsed.classpath}" when="greater"/>
11.100 </condition>
11.101 - <property name="javac.fork" value="false"/>
11.102 + <condition else="false" property="jdkBug6558476">
11.103 + <and>
11.104 + <matches pattern="1\.[56]" string="${java.specification.version}"/>
11.105 + <not>
11.106 + <os family="unix"/>
11.107 + </not>
11.108 + </and>
11.109 + </condition>
11.110 + <property name="javac.fork" value="${jdkBug6558476}"/>
11.111 <property name="jar.index" value="false"/>
11.112 + <property name="jar.index.metainf" value="${jar.index}"/>
11.113 <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>
11.114 </target>
11.115 <target name="-post-init">
11.116 @@ -302,7 +325,9 @@
11.117 <delete>
11.118 <files includesfile="${javac.includesfile.binary}"/>
11.119 </delete>
11.120 - <delete file="${javac.includesfile.binary}"/>
11.121 + <delete>
11.122 + <fileset file="${javac.includesfile.binary}"/>
11.123 + </delete>
11.124 </sequential>
11.125 </macrodef>
11.126 </target>
11.127 @@ -312,7 +337,8 @@
11.128 <attribute default="${excludes}" name="excludes"/>
11.129 <attribute default="**" name="testincludes"/>
11.130 <sequential>
11.131 - <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${build.dir}">
11.132 + <property name="junit.forkmode" value="perTest"/>
11.133 + <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
11.134 <batchtest todir="${build.test.results.dir}">
11.135 <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
11.136 <filename name="@{testincludes}"/>
11.137 @@ -328,11 +354,56 @@
11.138 <formatter type="brief" usefile="false"/>
11.139 <formatter type="xml"/>
11.140 <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
11.141 + <jvmarg value="-ea"/>
11.142 <jvmarg line="${run.jvmargs}"/>
11.143 </junit>
11.144 </sequential>
11.145 </macrodef>
11.146 </target>
11.147 + <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check" name="profile-init"/>
11.148 + <target name="-profile-pre-init">
11.149 + <!-- Empty placeholder for easier customization. -->
11.150 + <!-- You can override this target in the ../build.xml file. -->
11.151 + </target>
11.152 + <target name="-profile-post-init">
11.153 + <!-- Empty placeholder for easier customization. -->
11.154 + <!-- You can override this target in the ../build.xml file. -->
11.155 + </target>
11.156 + <target name="-profile-init-macrodef-profile">
11.157 + <macrodef name="resolve">
11.158 + <attribute name="name"/>
11.159 + <attribute name="value"/>
11.160 + <sequential>
11.161 + <property name="@{name}" value="${env.@{value}}"/>
11.162 + </sequential>
11.163 + </macrodef>
11.164 + <macrodef name="profile">
11.165 + <attribute default="${main.class}" name="classname"/>
11.166 + <element name="customize" optional="true"/>
11.167 + <sequential>
11.168 + <property environment="env"/>
11.169 + <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
11.170 + <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">
11.171 + <jvmarg value="${profiler.info.jvmargs.agent}"/>
11.172 + <jvmarg line="${profiler.info.jvmargs}"/>
11.173 + <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
11.174 + <arg line="${application.args}"/>
11.175 + <classpath>
11.176 + <path path="${run.classpath}"/>
11.177 + </classpath>
11.178 + <syspropertyset>
11.179 + <propertyref prefix="run-sys-prop."/>
11.180 + <mapper from="run-sys-prop.*" to="*" type="glob"/>
11.181 + </syspropertyset>
11.182 + <customize/>
11.183 + </java>
11.184 + </sequential>
11.185 + </macrodef>
11.186 + </target>
11.187 + <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile" name="-profile-init-check">
11.188 + <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
11.189 + <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
11.190 + </target>
11.191 <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
11.192 <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
11.193 <attribute default="${main.class}" name="name"/>
11.194 @@ -427,6 +498,7 @@
11.195 </target>
11.196 <target name="-init-macrodef-copylibs">
11.197 <macrodef name="copylibs" uri="http://www.netbeans.org/ns/j2se-project/3">
11.198 + <attribute default="${manifest.file}" name="manifest"/>
11.199 <element name="customize" optional="true"/>
11.200 <sequential>
11.201 <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
11.202 @@ -442,7 +514,7 @@
11.203 </chainedmapper>
11.204 </pathconvert>
11.205 <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
11.206 - <copylibs compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
11.207 + <copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
11.208 <fileset dir="${build.classes.dir}"/>
11.209 <manifest>
11.210 <attribute name="Class-Path" value="${jar.classpath}"/>
11.211 @@ -571,10 +643,10 @@
11.212 <!-- Empty placeholder for easier customization. -->
11.213 <!-- You can override this target in the ../build.xml file. -->
11.214 </target>
11.215 - <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available">
11.216 + <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available-mkdist.available">
11.217 <j2seproject1:jar/>
11.218 </target>
11.219 - <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class">
11.220 + <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class-mkdist.available">
11.221 <j2seproject1:jar manifest="${manifest.file}"/>
11.222 </target>
11.223 <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available">
11.224 @@ -583,44 +655,53 @@
11.225 <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
11.226 </j2seproject1:manifest>
11.227 </j2seproject1:jar>
11.228 - <echo>To run this application from the command line without Ant, try:</echo>
11.229 + <echo level="info">To run this application from the command line without Ant, try:</echo>
11.230 <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
11.231 <property location="${dist.jar}" name="dist.jar.resolved"/>
11.232 <pathconvert property="run.classpath.with.dist.jar">
11.233 <path path="${run.classpath}"/>
11.234 <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
11.235 </pathconvert>
11.236 - <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
11.237 + <echo level="info">java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
11.238 </target>
11.239 - <target depends="init,compile,-pre-pre-jar,-pre-jar,-init-macrodef-copylibs" if="do.archive+manifest.available+main.class+mkdist.available+splashscreen.available" name="-do-jar-with-libraries-and-splashscreen">
11.240 + <target depends="init" if="do.archive" name="-do-jar-with-libraries-create-manifest" unless="manifest.available">
11.241 + <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
11.242 + <touch file="${tmp.manifest.file}" verbose="false"/>
11.243 + </target>
11.244 + <target depends="init" if="do.archive+manifest.available" name="-do-jar-with-libraries-copy-manifest">
11.245 + <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
11.246 + <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
11.247 + </target>
11.248 + <target depends="init,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest" if="do.archive+main.class.available" name="-do-jar-with-libraries-set-main">
11.249 + <manifest file="${tmp.manifest.file}" mode="update">
11.250 + <attribute name="Main-Class" value="${main.class}"/>
11.251 + </manifest>
11.252 + </target>
11.253 + <target depends="init,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-with-libraries-set-splashscreen">
11.254 <basename file="${application.splash}" property="splashscreen.basename"/>
11.255 <mkdir dir="${build.classes.dir}/META-INF"/>
11.256 <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
11.257 - <j2seproject3:copylibs>
11.258 - <customize>
11.259 - <attribute name="Main-Class" value="${main.class}"/>
11.260 - <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
11.261 - </customize>
11.262 - </j2seproject3:copylibs>
11.263 - <echo>To run this application from the command line without Ant, try:</echo>
11.264 + <manifest file="${tmp.manifest.file}" mode="update">
11.265 + <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
11.266 + </manifest>
11.267 + </target>
11.268 + <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest,-do-jar-with-libraries-set-main,-do-jar-with-libraries-set-splashscreen" if="do.mkdist" name="-do-jar-with-libraries-pack">
11.269 + <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
11.270 + <echo level="info">To run this application from the command line without Ant, try:</echo>
11.271 <property location="${dist.jar}" name="dist.jar.resolved"/>
11.272 - <echo>java -jar "${dist.jar.resolved}"</echo>
11.273 + <echo level="info">java -jar "${dist.jar.resolved}"</echo>
11.274 </target>
11.275 - <target depends="init,compile,-pre-pre-jar,-pre-jar,-init-macrodef-copylibs" if="do.archive+manifest.available+main.class+mkdist.available" name="-do-jar-with-libraries" unless="splashscreen.available">
11.276 - <j2seproject3:copylibs>
11.277 - <customize>
11.278 - <attribute name="Main-Class" value="${main.class}"/>
11.279 - </customize>
11.280 - </j2seproject3:copylibs>
11.281 - <echo>To run this application from the command line without Ant, try:</echo>
11.282 - <property location="${dist.jar}" name="dist.jar.resolved"/>
11.283 - <echo>java -jar "${dist.jar.resolved}"</echo>
11.284 + <target depends="-do-jar-with-libraries-pack" if="do.archive" name="-do-jar-with-libraries-delete-manifest">
11.285 + <delete>
11.286 + <fileset file="${tmp.manifest.file}"/>
11.287 + </delete>
11.288 </target>
11.289 + <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest,-do-jar-with-libraries-set-main,-do-jar-with-libraries-set-splashscreen,-do-jar-with-libraries-pack,-do-jar-with-libraries-delete-manifest" name="-do-jar-with-libraries"/>
11.290 <target name="-post-jar">
11.291 <!-- Empty placeholder for easier customization. -->
11.292 <!-- You can override this target in the ../build.xml file. -->
11.293 </target>
11.294 - <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries-and-splashscreen,-do-jar-with-libraries,-post-jar" description="Build JAR." name="jar"/>
11.295 + <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar" description="Build JAR." name="jar"/>
11.296 <!--
11.297 =================
11.298 EXECUTION SECTION
11.299 @@ -686,6 +767,72 @@
11.300 </target>
11.301 <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
11.302 <!--
11.303 + =================
11.304 + PROFILING SECTION
11.305 + =================
11.306 + -->
11.307 + <target depends="profile-init,compile" description="Profile a project in the IDE." if="netbeans.home" name="profile">
11.308 + <nbprofiledirect>
11.309 + <classpath>
11.310 + <path path="${run.classpath}"/>
11.311 + </classpath>
11.312 + </nbprofiledirect>
11.313 + <profile/>
11.314 + </target>
11.315 + <target depends="profile-init,compile-single" description="Profile a selected class in the IDE." if="netbeans.home" name="profile-single">
11.316 + <fail unless="profile.class">Must select one file in the IDE or set profile.class</fail>
11.317 + <nbprofiledirect>
11.318 + <classpath>
11.319 + <path path="${run.classpath}"/>
11.320 + </classpath>
11.321 + </nbprofiledirect>
11.322 + <profile classname="${profile.class}"/>
11.323 + </target>
11.324 + <!--
11.325 + =========================
11.326 + APPLET PROFILING SECTION
11.327 + =========================
11.328 + -->
11.329 + <target depends="profile-init,compile-single" if="netbeans.home" name="profile-applet">
11.330 + <nbprofiledirect>
11.331 + <classpath>
11.332 + <path path="${run.classpath}"/>
11.333 + </classpath>
11.334 + </nbprofiledirect>
11.335 + <profile classname="sun.applet.AppletViewer">
11.336 + <customize>
11.337 + <arg value="${applet.url}"/>
11.338 + </customize>
11.339 + </profile>
11.340 + </target>
11.341 + <!--
11.342 + =========================
11.343 + TESTS PROFILING SECTION
11.344 + =========================
11.345 + -->
11.346 + <target depends="profile-init,compile-test-single" if="netbeans.home" name="profile-test-single">
11.347 + <nbprofiledirect>
11.348 + <classpath>
11.349 + <path path="${run.test.classpath}"/>
11.350 + </classpath>
11.351 + </nbprofiledirect>
11.352 + <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true">
11.353 + <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
11.354 + <jvmarg value="${profiler.info.jvmargs.agent}"/>
11.355 + <jvmarg line="${profiler.info.jvmargs}"/>
11.356 + <test name="${profile.class}"/>
11.357 + <classpath>
11.358 + <path path="${run.test.classpath}"/>
11.359 + </classpath>
11.360 + <syspropertyset>
11.361 + <propertyref prefix="test-sys-prop."/>
11.362 + <mapper from="test-sys-prop.*" to="*" type="glob"/>
11.363 + </syspropertyset>
11.364 + <formatter type="brief" usefile="false"/>
11.365 + <formatter type="xml"/>
11.366 + </junit>
11.367 + </target>
11.368 + <!--
11.369 ===============
11.370 JAVADOC SECTION
11.371 ===============
11.372 @@ -731,7 +878,7 @@
11.373 <target if="do.depend.true" name="-compile-test-depend">
11.374 <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
11.375 </target>
11.376 - <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
11.377 + <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
11.378 <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir="${test.src.dir}"/>
11.379 <copy todir="${build.test.classes.dir}">
11.380 <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
11.381 @@ -746,7 +893,7 @@
11.382 <!-- Empty placeholder for easier customization. -->
11.383 <!-- You can override this target in the ../build.xml file. -->
11.384 </target>
11.385 - <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
11.386 + <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
11.387 <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
11.388 <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
11.389 <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>
12.1 --- a/java/nekurak.net-lib/nbproject/genfiles.properties Sun Jul 10 20:17:56 2011 +0200
12.2 +++ b/java/nekurak.net-lib/nbproject/genfiles.properties Fri Jul 15 22:25:39 2011 +0200
12.3 @@ -4,5 +4,5 @@
12.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
12.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
12.6 nbproject/build-impl.xml.data.CRC32=11ce77af
12.7 -nbproject/build-impl.xml.script.CRC32=827b6ce9
12.8 -nbproject/build-impl.xml.stylesheet.CRC32=229523de@1.38.3.45
12.9 +nbproject/build-impl.xml.script.CRC32=2e465a03
12.10 +nbproject/build-impl.xml.stylesheet.CRC32=0c01fd8e@1.43.1.45
13.1 --- a/java/nekurak.net-lib/nbproject/project.properties Sun Jul 10 20:17:56 2011 +0200
13.2 +++ b/java/nekurak.net-lib/nbproject/project.properties Fri Jul 15 22:25:39 2011 +0200
13.3 @@ -1,3 +1,8 @@
13.4 +annotation.processing.enabled=true
13.5 +annotation.processing.enabled.in.editor=false
13.6 +annotation.processing.run.all.processors=true
13.7 +application.title=nekurak.net-lib
13.8 +application.vendor=fiki
13.9 build.classes.dir=${build.dir}/classes
13.10 build.classes.excludes=**/*.java,**/*.form
13.11 # This directory is removed when the project is cleaned:
13.12 @@ -18,6 +23,7 @@
13.13 dist.dir=dist
13.14 dist.jar=${dist.dir}/nekurak.net-lib.jar
13.15 dist.javadoc.dir=${dist.dir}/javadoc
13.16 +endorsed.classpath=
13.17 excludes=
13.18 includes=**
13.19 jar.compress=false
13.20 @@ -26,8 +32,10 @@
13.21 # Space-separated list of extra javac options
13.22 javac.compilerargs=
13.23 javac.deprecation=false
13.24 -javac.source=1.5
13.25 -javac.target=1.5
13.26 +javac.processorpath=\
13.27 + ${javac.classpath}
13.28 +javac.source=1.6
13.29 +javac.target=1.6
13.30 javac.test.classpath=\
13.31 ${javac.classpath}:\
13.32 ${build.classes.dir}:\
13.33 @@ -44,6 +52,7 @@
13.34 javadoc.version=false
13.35 javadoc.windowtitle=
13.36 meta.inf.dir=${src.dir}/META-INF
13.37 +mkdist.disabled=false
13.38 platform.active=default_platform
13.39 run.classpath=\
13.40 ${javac.classpath}:\
14.1 --- a/java/nekurak.net-lib/src/cz/frantovo/nekurak/dto/Podnik.java Sun Jul 10 20:17:56 2011 +0200
14.2 +++ b/java/nekurak.net-lib/src/cz/frantovo/nekurak/dto/Podnik.java Fri Jul 15 22:25:39 2011 +0200
14.3 @@ -73,7 +73,7 @@
14.4
14.5 /**
14.6 * Získá z URL webové stránky podniku doménové jméno převedené na malá písmena.
14.7 - * Např. z „http://www.example.com/index.html“ získá „www.example.com“.
14.8 + * Např. z „http://www.Example.COM/index.html“ získá „www.example.com“.
14.9 * @return doménové jméno nebo null v případě chyby.
14.10 */
14.11 public String getUrlDomena() {
15.1 --- a/java/nekurak.net-rest/nbproject/ant-deploy.xml Sun Jul 10 20:17:56 2011 +0200
15.2 +++ b/java/nekurak.net-rest/nbproject/ant-deploy.xml Fri Jul 15 22:25:39 2011 +0200
15.3 @@ -3,6 +3,7 @@
15.4 <target name="-init-cl-deployment-env" if="deploy.ant.enabled">
15.5 <property file="${deploy.ant.properties.file}" />
15.6 <available file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" property="sun.web.present"/>
15.7 + <available file="${deploy.ant.docbase.dir}/WEB-INF/glassfish-web.xml" property="glassfish.web.present"/>
15.8 <available file="${deploy.ant.resource.dir}" property="has.setup"/>
15.9 <tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
15.10 <echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
15.11 @@ -23,8 +24,34 @@
15.12 <xmlproperty file="${temp.sun.web}" validate="false">
15.13 </xmlproperty>
15.14 <delete file="${temp.sun.web}"/>
15.15 - <property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
15.16 - <property name="deploy.context.root.argument" value="&contextroot=${sun-web-app.context-root}"/>
15.17 + <condition property="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}" else="${gfv3.url}/${ant.project.name}">
15.18 + <isset property="sun-web-app.context-root"/>
15.19 + </condition>
15.20 + <condition property="deploy.context.root.argument" value="&contextroot=${sun-web-app.context-root}" else="/${ant.project.name}">
15.21 + <isset property="sun-web-app.context-root"/>
15.22 + </condition>
15.23 + </target>
15.24 + <target name="-parse-glassfish-web" depends="-init-cl-deployment-env" if="glassfish.web.present">
15.25 + <tempfile prefix="gfv3" property="temp.gf.web" destdir="${java.io.tmpdir}"/>
15.26 + <copy file="${deploy.ant.docbase.dir}/WEB-INF/glassfish-web.xml" tofile="${temp.gf.web}"/>
15.27 + <!-- The doctype triggers resolution which can fail -->
15.28 + <replace file="${temp.gf.web}">
15.29 + <replacetoken><![CDATA[<!DOCTYPE]]></replacetoken>
15.30 + <replacevalue><![CDATA[<!-- <!DOCTYPE]]></replacevalue>
15.31 + </replace>
15.32 + <replace file="${temp.gf.web}">
15.33 + <replacetoken><![CDATA[<glassfish-web-app]]></replacetoken>
15.34 + <replacevalue><![CDATA[--> <glassfish-web-app]]></replacevalue>
15.35 + </replace>
15.36 + <xmlproperty file="${temp.gf.web}" validate="false">
15.37 + </xmlproperty>
15.38 + <delete file="${temp.gf.web}"/>
15.39 + <condition property="deploy.ant.client.url" value="${gfv3.url}${glassfish-web-app.context-root}" else="${gfv3.url}/${ant.project.name}">
15.40 + <isset property="glassfish-web-app.context-root"/>
15.41 + </condition>
15.42 + <condition property="deploy.context.root.argument" value="&contextroot=${glassfish-web-app.context-root}" else="/${ant.project.name}">
15.43 + <isset property="glassfish-web-app.context-root"/>
15.44 + </condition>
15.45 </target>
15.46 <target name="-no-parse-sun-web" depends="-init-cl-deployment-env" unless="sun.web.present">
15.47 <property name="deploy.context.root.argument" value=""/>
15.48 @@ -33,7 +60,6 @@
15.49 <tempfile prefix="gfv3" property="gfv3.resources.dir" destdir="${java.io.tmpdir}"/>
15.50 <mkdir dir="${gfv3.resources.dir}"/>
15.51 <mkdir dir="${gfv3.resources.dir}/META-INF"/>
15.52 - <property name="gfv3.resources.file" value="${gfv3.resources.dir}/META-INF/sun-resources.xml"/>
15.53 <copy todir="${gfv3.resources.dir}/META-INF">
15.54 <fileset dir="${deploy.ant.resource.dir}"/>
15.55 </copy>
15.56 @@ -42,7 +68,7 @@
15.57 </jar>
15.58 <delete dir="${gfv3.resources.dir}"/>
15.59 </target>
15.60 - <target name="-deploy-ant" depends="-parse-sun-web,-no-parse-sun-web,-add-resources" if="deploy.ant.enabled">
15.61 + <target name="-deploy-ant" depends="-parse-glassfish-web, -parse-sun-web, -no-parse-sun-web,-add-resources" if="deploy.ant.enabled">
15.62 <antcall target="-deploy-without-pw"/>
15.63 <antcall target="-deploy-with-pw"/>
15.64 </target>
16.1 --- a/java/nekurak.net-rest/nbproject/build-impl.xml Sun Jul 10 20:17:56 2011 +0200
16.2 +++ b/java/nekurak.net-rest/nbproject/build-impl.xml Fri Jul 15 22:25:39 2011 +0200
16.3 @@ -174,8 +174,20 @@
16.4 <property name="runmain.jvmargs" value=""/>
16.5 <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
16.6 <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
16.7 - <length length="0" string="${endorsed.classpath}" when="greater"/>
16.8 + <and>
16.9 + <isset property="endorsed.classpath"/>
16.10 + <length length="0" string="${endorsed.classpath}" when="greater"/>
16.11 + </and>
16.12 </condition>
16.13 + <condition else="false" property="jdkBug6558476">
16.14 + <and>
16.15 + <matches pattern="1\.[56]" string="${java.specification.version}"/>
16.16 + <not>
16.17 + <os family="unix"/>
16.18 + </not>
16.19 + </and>
16.20 + </condition>
16.21 + <property name="javac.fork" value="${jdkBug6558476}"/>
16.22 </target>
16.23 <target depends="init" name="-init-cos" unless="deploy.on.save">
16.24 <condition property="deploy.on.save" value="true">
16.25 @@ -246,7 +258,7 @@
16.26 <property location="${build.dir}/empty" name="empty.dir"/>
16.27 <mkdir dir="${empty.dir}"/>
16.28 <mkdir dir="@{apgeneratedsrcdir}"/>
16.29 - <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}">
16.30 + <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}">
16.31 <src>
16.32 <dirset dir="@{gensrcdir}" erroronmissingdir="false">
16.33 <include name="*"/>
16.34 @@ -316,15 +328,18 @@
16.35 <attribute default="${build.classes.dir}" name="destdir"/>
16.36 <sequential>
16.37 <fail unless="javac.includes">Must set javac.includes</fail>
16.38 - <pathconvert pathsep="," property="javac.includes.binary">
16.39 + <pathconvert pathsep="${line.separator}" property="javac.includes.binary">
16.40 <path>
16.41 <filelist dir="@{destdir}" files="${javac.includes}"/>
16.42 </path>
16.43 <globmapper from="*.java" to="*.class"/>
16.44 </pathconvert>
16.45 + <tempfile deleteonexit="true" property="javac.includesfile.binary"/>
16.46 + <echo file="${javac.includesfile.binary}" message="${javac.includes.binary}"/>
16.47 <delete>
16.48 - <files includes="${javac.includes.binary}"/>
16.49 + <files includesfile="${javac.includesfile.binary}"/>
16.50 </delete>
16.51 + <delete file="${javac.includesfile.binary}"/>
16.52 </sequential>
16.53 </macrodef>
16.54 </target>
16.55 @@ -350,6 +365,7 @@
16.56 <formatter type="brief" usefile="false"/>
16.57 <formatter type="xml"/>
16.58 <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
16.59 + <jvmarg value="-ea"/>
16.60 <jvmarg line="${runmain.jvmargs}"/>
16.61 </junit>
16.62 </sequential>
16.63 @@ -493,6 +509,19 @@
16.64 <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
16.65 <property name="ap.cmd.line.internal" value=""/>
16.66 </target>
16.67 + <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-check" name="profile-init"/>
16.68 + <target name="-profile-pre-init">
16.69 + <!-- Empty placeholder for easier customization. -->
16.70 + <!-- You can override this target in the ../build.xml file. -->
16.71 + </target>
16.72 + <target name="-profile-post-init">
16.73 + <!-- Empty placeholder for easier customization. -->
16.74 + <!-- You can override this target in the ../build.xml file. -->
16.75 + </target>
16.76 + <target depends="-profile-pre-init, init, -profile-post-init" name="-profile-init-check">
16.77 + <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
16.78 + <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
16.79 + </target>
16.80 <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,-init-ap-cmdline" name="init"/>
16.81 <!--
16.82 COMPILATION SECTION
16.83 @@ -562,6 +591,8 @@
16.84 <!-- You can override this target in the ../build.xml file. -->
16.85 </target>
16.86 <target depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
16.87 + <property name="jspc.schemas" value="/resources/schemas/"/>
16.88 + <property name="jspc.dtds" value="/resources/dtds/"/>
16.89 <target depends="compile" description="Test compile JSP pages to expose compilation errors." if="do.compile.jsps" name="compile-jsps">
16.90 <mkdir dir="${build.generated.dir}/src"/>
16.91 <java classname="org.netbeans.modules.web.project.ant.JspC" failonerror="true" fork="true">
16.92 @@ -570,9 +601,12 @@
16.93 <arg value="-d"/>
16.94 <arg file="${basedir}/${build.generated.dir}/src"/>
16.95 <arg value="-die1"/>
16.96 + <arg value="-schemas ${jspc.schemas}"/>
16.97 + <arg value="-dtds ${jspc.dtds}"/>
16.98 <arg value="-compilerSourceVM ${javac.source}"/>
16.99 <arg value="-compilerTargetVM ${javac.target}"/>
16.100 <arg value="-javaEncoding ${source.encoding}"/>
16.101 + <arg value="-sysClasspath ${libs.jsp-compilation-syscp.classpath}"/>
16.102 <classpath path="${java.home}/../lib/tools.jar:${libs.jsp-compiler.classpath}:${libs.jsp-compilation.classpath}"/>
16.103 </java>
16.104 <mkdir dir="${build.generated.dir}/classes"/>
16.105 @@ -587,6 +621,9 @@
16.106 <arg value="-d"/>
16.107 <arg file="${basedir}/${build.generated.dir}/src"/>
16.108 <arg value="-die1"/>
16.109 + <arg value="-schemas ${jspc.schemas}"/>
16.110 + <arg value="-dtds ${jspc.dtds}"/>
16.111 + <arg value="-sysClasspath ${libs.jsp-compilation-syscp.classpath}"/>
16.112 <arg value="-jspc.files"/>
16.113 <arg path="${jsp.includes}"/>
16.114 <arg value="-compilerSourceVM ${javac.source}"/>
16.115 @@ -828,6 +865,35 @@
16.116 </target>
16.117 <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
16.118 <!--
16.119 + =================
16.120 + PROFILING SECTION
16.121 + =================
16.122 + -->
16.123 + <target description="Profile a J2EE project in the IDE." name="profile">
16.124 + <condition else="start-profiled-server" property="profiler.startserver.target" value="start-profiled-server-extraargs">
16.125 + <isset property="profiler.info.jvmargs.extra"/>
16.126 + </condition>
16.127 + <antcall target="${profiler.startserver.target}"/>
16.128 + <antcall target="run"/>
16.129 + <antcall target="start-loadgen"/>
16.130 + </target>
16.131 + <target name="start-profiled-server">
16.132 + <nbstartprofiledserver forceRestart="${profiler.j2ee.serverForceRestart}" javaPlatform="${profiler.info.javaPlatform}" startupTimeout="${profiler.j2ee.serverStartupTimeout}">
16.133 + <jvmarg value="${profiler.info.jvmargs.agent}"/>
16.134 + <jvmarg value="${profiler.j2ee.agentID}"/>
16.135 + </nbstartprofiledserver>
16.136 + </target>
16.137 + <target name="start-profiled-server-extraargs">
16.138 + <nbstartprofiledserver forceRestart="${profiler.j2ee.serverForceRestart}" javaPlatform="${profiler.info.javaPlatform}" startupTimeout="${profiler.j2ee.serverStartupTimeout}">
16.139 + <jvmarg value="${profiler.info.jvmargs.extra}"/>
16.140 + <jvmarg value="${profiler.info.jvmargs.agent}"/>
16.141 + <jvmarg value="${profiler.j2ee.agentID}"/>
16.142 + </nbstartprofiledserver>
16.143 + </target>
16.144 + <target if="profiler.loadgen.path" name="start-loadgen">
16.145 + <loadgenstart path="${profiler.loadgen.path}"/>
16.146 + </target>
16.147 + <!--
16.148 JAVADOC SECTION
16.149 -->
16.150 <target depends="init" if="have.sources" name="javadoc-build">
16.151 @@ -949,6 +1015,35 @@
16.152 </target>
16.153 <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
16.154 <!--
16.155 + =========================
16.156 + TESTS PROFILING SECTION
16.157 + =========================
16.158 + -->
16.159 + <target depends="profile-init,compile-test-single" if="netbeans.home" name="profile-test-single">
16.160 + <nbprofiledirect>
16.161 + <classpath>
16.162 + <path path="${run.test.classpath}"/>
16.163 + <path path="${j2ee.platform.classpath}"/>
16.164 + </classpath>
16.165 + </nbprofiledirect>
16.166 + <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true">
16.167 + <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
16.168 + <jvmarg value="${profiler.info.jvmargs.agent}"/>
16.169 + <jvmarg line="${profiler.info.jvmargs}"/>
16.170 + <test name="${profile.class}"/>
16.171 + <classpath>
16.172 + <path path="${run.test.classpath}"/>
16.173 + <path path="${j2ee.platform.classpath}"/>
16.174 + </classpath>
16.175 + <syspropertyset>
16.176 + <propertyref prefix="test-sys-prop."/>
16.177 + <mapper from="test-sys-prop.*" to="*" type="glob"/>
16.178 + </syspropertyset>
16.179 + <formatter type="brief" usefile="false"/>
16.180 + <formatter type="xml"/>
16.181 + </junit>
16.182 + </target>
16.183 + <!--
16.184
16.185 CLEANUP SECTION
16.186 -->
17.1 --- a/java/nekurak.net-rest/nbproject/genfiles.properties Sun Jul 10 20:17:56 2011 +0200
17.2 +++ b/java/nekurak.net-rest/nbproject/genfiles.properties Fri Jul 15 22:25:39 2011 +0200
17.3 @@ -1,11 +1,11 @@
17.4 build.xml.data.CRC32=35b9fabc
17.5 build.xml.script.CRC32=fb1b7f84
17.6 -build.xml.stylesheet.CRC32=651128d4@1.24.1.1
17.7 +build.xml.stylesheet.CRC32=651128d4@1.31.2.1
17.8 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
17.9 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
17.10 nbproject/build-impl.xml.data.CRC32=35b9fabc
17.11 -nbproject/build-impl.xml.script.CRC32=6da89432
17.12 -nbproject/build-impl.xml.stylesheet.CRC32=8419264d@1.24.2.1
17.13 +nbproject/build-impl.xml.script.CRC32=1ed11878
17.14 +nbproject/build-impl.xml.stylesheet.CRC32=8ca9f0e6@1.31.2.1
17.15 nbproject/rest-build.xml.data.CRC32=d32e8880
17.16 nbproject/rest-build.xml.script.CRC32=23da2c77
17.17 nbproject/rest-build.xml.stylesheet.CRC32=ddd64843@1.4.1
18.1 --- a/java/nekurak.net-rest/nbproject/project.properties Sun Jul 10 20:17:56 2011 +0200
18.2 +++ b/java/nekurak.net-rest/nbproject/project.properties Fri Jul 15 22:25:39 2011 +0200
18.3 @@ -1,6 +1,5 @@
18.4 annotation.processing.enabled=true
18.5 annotation.processing.enabled.in.editor=true
18.6 -annotation.processing.processors.list=
18.7 annotation.processing.run.all.processors=true
18.8 annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
18.9 build.classes.dir=${build.web.dir}/WEB-INF/classes
18.10 @@ -27,9 +26,10 @@
18.11 ${libs.javaee-endorsed-api-6.0.classpath}
18.12 excludes=
18.13 includes=**
18.14 +j2ee.compile.on.save=false
18.15 j2ee.deploy.on.save=false
18.16 j2ee.platform=1.6-web
18.17 -j2ee.platform.classpath=${j2ee.server.home}/modules/javax.servlet.jar:${j2ee.server.home}/modules/jstl-impl.jar:${j2ee.server.home}/modules/javax.ejb.jar:${j2ee.server.home}/modules/javax.enterprise.deploy.jar:${j2ee.server.home}/modules/javax.security.jacc.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.transaction.jar:${j2ee.server.home}/modules/jsr311-api.jar:${j2ee.server.home}/modules/jsf-api.jar:${j2ee.server.home}/modules/javax.security.auth.message.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/endorsed/javax.annotation.jar:${j2ee.server.home}/modules/javax.management.j2ee.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.jms.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.resource.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/jsf-impl.jar:${j2ee.server.home}/modules/mail.jar
18.18 +j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/javax.annotation.jar:${j2ee.server.home}/modules/javax.transaction.jar:${j2ee.server.home}/modules/jsf-api.jar:${j2ee.server.home}/modules/jsf-impl.jar:${j2ee.server.home}/modules/jaxrpc-api-osgi.jar:${j2ee.server.home}/modules/javax.enterprise.deploy.jar:${j2ee.server.home}/modules/javax.resource.jar:${j2ee.server.home}/modules/jstl-impl.jar:${j2ee.server.home}/modules/jersey-core.jar:${j2ee.server.home}/modules/javax.security.auth.message.jar:${j2ee.server.home}/modules/javax.servlet.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.ejb.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.management.j2ee.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.jms.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/javax.security.jacc.jar:${j2ee.server.home}/modules/javax.persistence.jar
18.19 j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar
18.20 j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar
18.21 j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar
18.22 @@ -43,9 +43,10 @@
18.23 javac.compilerargs=
18.24 javac.debug=true
18.25 javac.deprecation=false
18.26 -javac.processorpath=${javac.classpath}
18.27 -javac.source=1.5
18.28 -javac.target=1.5
18.29 +javac.processorpath=\
18.30 + ${javac.classpath}
18.31 +javac.source=1.6
18.32 +javac.target=1.6
18.33 javac.test.classpath=\
18.34 ${javac.classpath}:\
18.35 ${build.classes.dir}:\
19.1 --- a/java/nekurak.net-web/nbproject/ant-deploy.xml Sun Jul 10 20:17:56 2011 +0200
19.2 +++ b/java/nekurak.net-web/nbproject/ant-deploy.xml Fri Jul 15 22:25:39 2011 +0200
19.3 @@ -3,6 +3,7 @@
19.4 <target name="-init-cl-deployment-env" if="deploy.ant.enabled">
19.5 <property file="${deploy.ant.properties.file}" />
19.6 <available file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" property="sun.web.present"/>
19.7 + <available file="${deploy.ant.docbase.dir}/WEB-INF/glassfish-web.xml" property="glassfish.web.present"/>
19.8 <available file="${deploy.ant.resource.dir}" property="has.setup"/>
19.9 <tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
19.10 <echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
19.11 @@ -23,8 +24,34 @@
19.12 <xmlproperty file="${temp.sun.web}" validate="false">
19.13 </xmlproperty>
19.14 <delete file="${temp.sun.web}"/>
19.15 - <property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
19.16 - <property name="deploy.context.root.argument" value="&contextroot=${sun-web-app.context-root}"/>
19.17 + <condition property="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}" else="${gfv3.url}/${ant.project.name}">
19.18 + <isset property="sun-web-app.context-root"/>
19.19 + </condition>
19.20 + <condition property="deploy.context.root.argument" value="&contextroot=${sun-web-app.context-root}" else="/${ant.project.name}">
19.21 + <isset property="sun-web-app.context-root"/>
19.22 + </condition>
19.23 + </target>
19.24 + <target name="-parse-glassfish-web" depends="-init-cl-deployment-env" if="glassfish.web.present">
19.25 + <tempfile prefix="gfv3" property="temp.gf.web" destdir="${java.io.tmpdir}"/>
19.26 + <copy file="${deploy.ant.docbase.dir}/WEB-INF/glassfish-web.xml" tofile="${temp.gf.web}"/>
19.27 + <!-- The doctype triggers resolution which can fail -->
19.28 + <replace file="${temp.gf.web}">
19.29 + <replacetoken><![CDATA[<!DOCTYPE]]></replacetoken>
19.30 + <replacevalue><![CDATA[<!-- <!DOCTYPE]]></replacevalue>
19.31 + </replace>
19.32 + <replace file="${temp.gf.web}">
19.33 + <replacetoken><![CDATA[<glassfish-web-app]]></replacetoken>
19.34 + <replacevalue><![CDATA[--> <glassfish-web-app]]></replacevalue>
19.35 + </replace>
19.36 + <xmlproperty file="${temp.gf.web}" validate="false">
19.37 + </xmlproperty>
19.38 + <delete file="${temp.gf.web}"/>
19.39 + <condition property="deploy.ant.client.url" value="${gfv3.url}${glassfish-web-app.context-root}" else="${gfv3.url}/${ant.project.name}">
19.40 + <isset property="glassfish-web-app.context-root"/>
19.41 + </condition>
19.42 + <condition property="deploy.context.root.argument" value="&contextroot=${glassfish-web-app.context-root}" else="/${ant.project.name}">
19.43 + <isset property="glassfish-web-app.context-root"/>
19.44 + </condition>
19.45 </target>
19.46 <target name="-no-parse-sun-web" depends="-init-cl-deployment-env" unless="sun.web.present">
19.47 <property name="deploy.context.root.argument" value=""/>
19.48 @@ -33,7 +60,6 @@
19.49 <tempfile prefix="gfv3" property="gfv3.resources.dir" destdir="${java.io.tmpdir}"/>
19.50 <mkdir dir="${gfv3.resources.dir}"/>
19.51 <mkdir dir="${gfv3.resources.dir}/META-INF"/>
19.52 - <property name="gfv3.resources.file" value="${gfv3.resources.dir}/META-INF/sun-resources.xml"/>
19.53 <copy todir="${gfv3.resources.dir}/META-INF">
19.54 <fileset dir="${deploy.ant.resource.dir}"/>
19.55 </copy>
19.56 @@ -42,7 +68,7 @@
19.57 </jar>
19.58 <delete dir="${gfv3.resources.dir}"/>
19.59 </target>
19.60 - <target name="-deploy-ant" depends="-parse-sun-web,-no-parse-sun-web,-add-resources" if="deploy.ant.enabled">
19.61 + <target name="-deploy-ant" depends="-parse-glassfish-web, -parse-sun-web, -no-parse-sun-web,-add-resources" if="deploy.ant.enabled">
19.62 <antcall target="-deploy-without-pw"/>
19.63 <antcall target="-deploy-with-pw"/>
19.64 </target>
20.1 --- a/java/nekurak.net-web/nbproject/build-impl.xml Sun Jul 10 20:17:56 2011 +0200
20.2 +++ b/java/nekurak.net-web/nbproject/build-impl.xml Fri Jul 15 22:25:39 2011 +0200
20.3 @@ -174,8 +174,20 @@
20.4 <property name="runmain.jvmargs" value=""/>
20.5 <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
20.6 <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
20.7 - <length length="0" string="${endorsed.classpath}" when="greater"/>
20.8 + <and>
20.9 + <isset property="endorsed.classpath"/>
20.10 + <length length="0" string="${endorsed.classpath}" when="greater"/>
20.11 + </and>
20.12 </condition>
20.13 + <condition else="false" property="jdkBug6558476">
20.14 + <and>
20.15 + <matches pattern="1\.[56]" string="${java.specification.version}"/>
20.16 + <not>
20.17 + <os family="unix"/>
20.18 + </not>
20.19 + </and>
20.20 + </condition>
20.21 + <property name="javac.fork" value="${jdkBug6558476}"/>
20.22 </target>
20.23 <target depends="init" name="-init-cos" unless="deploy.on.save">
20.24 <condition property="deploy.on.save" value="true">
20.25 @@ -246,7 +258,7 @@
20.26 <property location="${build.dir}/empty" name="empty.dir"/>
20.27 <mkdir dir="${empty.dir}"/>
20.28 <mkdir dir="@{apgeneratedsrcdir}"/>
20.29 - <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}">
20.30 + <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}">
20.31 <src>
20.32 <dirset dir="@{gensrcdir}" erroronmissingdir="false">
20.33 <include name="*"/>
20.34 @@ -316,15 +328,18 @@
20.35 <attribute default="${build.classes.dir}" name="destdir"/>
20.36 <sequential>
20.37 <fail unless="javac.includes">Must set javac.includes</fail>
20.38 - <pathconvert pathsep="," property="javac.includes.binary">
20.39 + <pathconvert pathsep="${line.separator}" property="javac.includes.binary">
20.40 <path>
20.41 <filelist dir="@{destdir}" files="${javac.includes}"/>
20.42 </path>
20.43 <globmapper from="*.java" to="*.class"/>
20.44 </pathconvert>
20.45 + <tempfile deleteonexit="true" property="javac.includesfile.binary"/>
20.46 + <echo file="${javac.includesfile.binary}" message="${javac.includes.binary}"/>
20.47 <delete>
20.48 - <files includes="${javac.includes.binary}"/>
20.49 + <files includesfile="${javac.includesfile.binary}"/>
20.50 </delete>
20.51 + <delete file="${javac.includesfile.binary}"/>
20.52 </sequential>
20.53 </macrodef>
20.54 </target>
20.55 @@ -350,6 +365,7 @@
20.56 <formatter type="brief" usefile="false"/>
20.57 <formatter type="xml"/>
20.58 <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
20.59 + <jvmarg value="-ea"/>
20.60 <jvmarg line="${runmain.jvmargs}"/>
20.61 </junit>
20.62 </sequential>
20.63 @@ -493,6 +509,19 @@
20.64 <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
20.65 <property name="ap.cmd.line.internal" value=""/>
20.66 </target>
20.67 + <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-check" name="profile-init"/>
20.68 + <target name="-profile-pre-init">
20.69 + <!-- Empty placeholder for easier customization. -->
20.70 + <!-- You can override this target in the ../build.xml file. -->
20.71 + </target>
20.72 + <target name="-profile-post-init">
20.73 + <!-- Empty placeholder for easier customization. -->
20.74 + <!-- You can override this target in the ../build.xml file. -->
20.75 + </target>
20.76 + <target depends="-profile-pre-init, init, -profile-post-init" name="-profile-init-check">
20.77 + <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
20.78 + <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
20.79 + </target>
20.80 <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,-init-ap-cmdline" name="init"/>
20.81 <!--
20.82 COMPILATION SECTION
20.83 @@ -562,6 +591,8 @@
20.84 <!-- You can override this target in the ../build.xml file. -->
20.85 </target>
20.86 <target depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
20.87 + <property name="jspc.schemas" value="/resources/schemas/"/>
20.88 + <property name="jspc.dtds" value="/resources/dtds/"/>
20.89 <target depends="compile" description="Test compile JSP pages to expose compilation errors." if="do.compile.jsps" name="compile-jsps">
20.90 <mkdir dir="${build.generated.dir}/src"/>
20.91 <java classname="org.netbeans.modules.web.project.ant.JspC" failonerror="true" fork="true">
20.92 @@ -570,9 +601,12 @@
20.93 <arg value="-d"/>
20.94 <arg file="${basedir}/${build.generated.dir}/src"/>
20.95 <arg value="-die1"/>
20.96 + <arg value="-schemas ${jspc.schemas}"/>
20.97 + <arg value="-dtds ${jspc.dtds}"/>
20.98 <arg value="-compilerSourceVM ${javac.source}"/>
20.99 <arg value="-compilerTargetVM ${javac.target}"/>
20.100 <arg value="-javaEncoding ${source.encoding}"/>
20.101 + <arg value="-sysClasspath ${libs.jsp-compilation-syscp.classpath}"/>
20.102 <classpath path="${java.home}/../lib/tools.jar:${libs.jsp-compiler.classpath}:${libs.jsp-compilation.classpath}"/>
20.103 </java>
20.104 <mkdir dir="${build.generated.dir}/classes"/>
20.105 @@ -587,6 +621,9 @@
20.106 <arg value="-d"/>
20.107 <arg file="${basedir}/${build.generated.dir}/src"/>
20.108 <arg value="-die1"/>
20.109 + <arg value="-schemas ${jspc.schemas}"/>
20.110 + <arg value="-dtds ${jspc.dtds}"/>
20.111 + <arg value="-sysClasspath ${libs.jsp-compilation-syscp.classpath}"/>
20.112 <arg value="-jspc.files"/>
20.113 <arg path="${jsp.includes}"/>
20.114 <arg value="-compilerSourceVM ${javac.source}"/>
20.115 @@ -830,6 +867,35 @@
20.116 </target>
20.117 <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
20.118 <!--
20.119 + =================
20.120 + PROFILING SECTION
20.121 + =================
20.122 + -->
20.123 + <target description="Profile a J2EE project in the IDE." name="profile">
20.124 + <condition else="start-profiled-server" property="profiler.startserver.target" value="start-profiled-server-extraargs">
20.125 + <isset property="profiler.info.jvmargs.extra"/>
20.126 + </condition>
20.127 + <antcall target="${profiler.startserver.target}"/>
20.128 + <antcall target="run"/>
20.129 + <antcall target="start-loadgen"/>
20.130 + </target>
20.131 + <target name="start-profiled-server">
20.132 + <nbstartprofiledserver forceRestart="${profiler.j2ee.serverForceRestart}" javaPlatform="${profiler.info.javaPlatform}" startupTimeout="${profiler.j2ee.serverStartupTimeout}">
20.133 + <jvmarg value="${profiler.info.jvmargs.agent}"/>
20.134 + <jvmarg value="${profiler.j2ee.agentID}"/>
20.135 + </nbstartprofiledserver>
20.136 + </target>
20.137 + <target name="start-profiled-server-extraargs">
20.138 + <nbstartprofiledserver forceRestart="${profiler.j2ee.serverForceRestart}" javaPlatform="${profiler.info.javaPlatform}" startupTimeout="${profiler.j2ee.serverStartupTimeout}">
20.139 + <jvmarg value="${profiler.info.jvmargs.extra}"/>
20.140 + <jvmarg value="${profiler.info.jvmargs.agent}"/>
20.141 + <jvmarg value="${profiler.j2ee.agentID}"/>
20.142 + </nbstartprofiledserver>
20.143 + </target>
20.144 + <target if="profiler.loadgen.path" name="start-loadgen">
20.145 + <loadgenstart path="${profiler.loadgen.path}"/>
20.146 + </target>
20.147 + <!--
20.148 JAVADOC SECTION
20.149 -->
20.150 <target depends="init" if="have.sources" name="javadoc-build">
20.151 @@ -951,6 +1017,35 @@
20.152 </target>
20.153 <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
20.154 <!--
20.155 + =========================
20.156 + TESTS PROFILING SECTION
20.157 + =========================
20.158 + -->
20.159 + <target depends="profile-init,compile-test-single" if="netbeans.home" name="profile-test-single">
20.160 + <nbprofiledirect>
20.161 + <classpath>
20.162 + <path path="${run.test.classpath}"/>
20.163 + <path path="${j2ee.platform.classpath}"/>
20.164 + </classpath>
20.165 + </nbprofiledirect>
20.166 + <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true">
20.167 + <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
20.168 + <jvmarg value="${profiler.info.jvmargs.agent}"/>
20.169 + <jvmarg line="${profiler.info.jvmargs}"/>
20.170 + <test name="${profile.class}"/>
20.171 + <classpath>
20.172 + <path path="${run.test.classpath}"/>
20.173 + <path path="${j2ee.platform.classpath}"/>
20.174 + </classpath>
20.175 + <syspropertyset>
20.176 + <propertyref prefix="test-sys-prop."/>
20.177 + <mapper from="test-sys-prop.*" to="*" type="glob"/>
20.178 + </syspropertyset>
20.179 + <formatter type="brief" usefile="false"/>
20.180 + <formatter type="xml"/>
20.181 + </junit>
20.182 + </target>
20.183 + <!--
20.184
20.185 CLEANUP SECTION
20.186 -->
21.1 --- a/java/nekurak.net-web/nbproject/genfiles.properties Sun Jul 10 20:17:56 2011 +0200
21.2 +++ b/java/nekurak.net-web/nbproject/genfiles.properties Fri Jul 15 22:25:39 2011 +0200
21.3 @@ -4,8 +4,8 @@
21.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
21.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
21.6 nbproject/build-impl.xml.data.CRC32=28fc3c5a
21.7 -nbproject/build-impl.xml.script.CRC32=b8c3901f
21.8 -nbproject/build-impl.xml.stylesheet.CRC32=8419264d@1.24.2.1
21.9 +nbproject/build-impl.xml.script.CRC32=37b9073f
21.10 +nbproject/build-impl.xml.stylesheet.CRC32=8ca9f0e6@1.31.2.1
21.11 nbproject/rest-build.xml.data.CRC32=84da1c7b
21.12 nbproject/rest-build.xml.script.CRC32=3db088b3
21.13 nbproject/rest-build.xml.stylesheet.CRC32=ddd64843@1.4.1
22.1 --- a/java/nekurak.net-web/nbproject/project.properties Sun Jul 10 20:17:56 2011 +0200
22.2 +++ b/java/nekurak.net-web/nbproject/project.properties Fri Jul 15 22:25:39 2011 +0200
22.3 @@ -1,6 +1,5 @@
22.4 annotation.processing.enabled=true
22.5 annotation.processing.enabled.in.editor=true
22.6 -annotation.processing.processors.list=
22.7 annotation.processing.run.all.processors=true
22.8 annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
22.9 build.classes.dir=${build.web.dir}/WEB-INF/classes
22.10 @@ -26,9 +25,10 @@
22.11 endorsed.classpath=
22.12 excludes=
22.13 includes=**
22.14 +j2ee.compile.on.save=true
22.15 j2ee.deploy.on.save=true
22.16 j2ee.platform=1.5
22.17 -j2ee.platform.classpath=
22.18 +j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/javax.annotation.jar:${j2ee.server.home}/modules/javax.transaction.jar:${j2ee.server.home}/modules/jsf-api.jar:${j2ee.server.home}/modules/jsf-impl.jar:${j2ee.server.home}/modules/jaxrpc-api-osgi.jar:${j2ee.server.home}/modules/javax.enterprise.deploy.jar:${j2ee.server.home}/modules/javax.resource.jar:${j2ee.server.home}/modules/jstl-impl.jar:${j2ee.server.home}/modules/jersey-core.jar:${j2ee.server.home}/modules/javax.security.auth.message.jar:${j2ee.server.home}/modules/javax.servlet.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.ejb.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.management.j2ee.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.jms.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/javax.security.jacc.jar:${j2ee.server.home}/modules/javax.persistence.jar
22.19 j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar
22.20 j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar
22.21 j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar
22.22 @@ -43,9 +43,10 @@
22.23 javac.compilerargs=
22.24 javac.debug=true
22.25 javac.deprecation=false
22.26 -javac.processorpath=${javac.classpath}
22.27 -javac.source=1.5
22.28 -javac.target=1.5
22.29 +javac.processorpath=\
22.30 + ${javac.classpath}
22.31 +javac.source=1.6
22.32 +javac.target=1.6
22.33 javac.test.classpath=\
22.34 ${javac.classpath}:\
22.35 ${build.classes.dir}:\
23.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
23.2 +++ b/java/nekurak.net-web/web/WEB-INF/glassfish-web.xml Fri Jul 15 22:25:39 2011 +0200
23.3 @@ -0,0 +1,31 @@
23.4 +<?xml version="1.0" encoding="UTF-8"?>
23.5 +<!DOCTYPE glassfish-web-app PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Servlet 3.0//EN" "http://glassfish.org/dtds/glassfish-web-app_3_0-1.dtd">
23.6 +<glassfish-web-app error-url="">
23.7 + <context-root>/nekurak.net-web</context-root>
23.8 + <security-role-mapping>
23.9 + <!-- TODO: opravit role vs. skupiny (tabulka v DB) -->
23.10 + <role-name>opravneny</role-name>
23.11 + <group-name>bezny</group-name>
23.12 + </security-role-mapping>
23.13 + <session-config>
23.14 + <session-properties>
23.15 + <!--
23.16 + Aby se nám do URL nedostávalo ;jsessionid=…
23.17 + ve výchozím stavu jsou obě true,
23.18 + enableCookies nemusíme uvádět,
23.19 + skrze enableURLRewriting zakážeme vkládání ID do URL,
23.20 + uživatelům bez cookies nebudou fungovat relace.
23.21 + Viz http://www.i-coding.de/www/en/glassfish/configuration/session-id.html
23.22 + -->
23.23 + <property name="enableCookies" value="true"/>
23.24 + <property name="enableURLRewriting" value="false"/>
23.25 + </session-properties>
23.26 + </session-config>
23.27 + <class-loader delegate="true"/>
23.28 + <jsp-config>
23.29 + <property name="keepgenerated" value="true">
23.30 + <description>Keep a copy of the generated servlet class' java code.</description>
23.31 + </property>
23.32 + </jsp-config>
23.33 + <parameter-encoding default-charset="UTF-8"/>
23.34 +</glassfish-web-app>
24.1 --- a/java/nekurak.net-web/web/WEB-INF/sun-web.xml Sun Jul 10 20:17:56 2011 +0200
24.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
24.3 @@ -1,31 +0,0 @@
24.4 -<?xml version="1.0" encoding="UTF-8"?>
24.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">
24.6 -<sun-web-app error-url="">
24.7 - <context-root>/nekurak.net-web</context-root>
24.8 - <class-loader delegate="true"/>
24.9 - <parameter-encoding default-charset="UTF-8"/>
24.10 - <session-config>
24.11 - <session-properties>
24.12 - <!--
24.13 - Aby se nám do URL nedostávalo ;jsessionid=…
24.14 - ve výchozím stavu jsou obě true,
24.15 - enableCookies nemusíme uvádět,
24.16 - skrze enableURLRewriting zakážeme vkládání ID do URL,
24.17 - uživatelům bez cookies nebudou fungovat relace.
24.18 - Viz http://www.i-coding.de/www/en/glassfish/configuration/session-id.html
24.19 - -->
24.20 - <property name="enableCookies" value="true"/>
24.21 - <property name="enableURLRewriting" value="false"/>
24.22 - </session-properties>
24.23 - </session-config>
24.24 - <jsp-config>
24.25 - <property name="keepgenerated" value="true">
24.26 - <description>Keep a copy of the generated servlet class' java code.</description>
24.27 - </property>
24.28 - </jsp-config>
24.29 - <security-role-mapping>
24.30 - <!-- TODO: opravit role vs. skupiny (tabulka v DB) -->
24.31 - <role-name>opravneny</role-name>
24.32 - <group-name>bezny</group-name>
24.33 - </security-role-mapping>
24.34 -</sun-web-app>
25.1 --- a/java/nekurak.net-ws/nbproject/ant-deploy.xml Sun Jul 10 20:17:56 2011 +0200
25.2 +++ b/java/nekurak.net-ws/nbproject/ant-deploy.xml Fri Jul 15 22:25:39 2011 +0200
25.3 @@ -3,6 +3,7 @@
25.4 <target name="-init-cl-deployment-env" if="deploy.ant.enabled">
25.5 <property file="${deploy.ant.properties.file}" />
25.6 <available file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" property="sun.web.present"/>
25.7 + <available file="${deploy.ant.docbase.dir}/WEB-INF/glassfish-web.xml" property="glassfish.web.present"/>
25.8 <available file="${deploy.ant.resource.dir}" property="has.setup"/>
25.9 <tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
25.10 <echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
25.11 @@ -23,8 +24,34 @@
25.12 <xmlproperty file="${temp.sun.web}" validate="false">
25.13 </xmlproperty>
25.14 <delete file="${temp.sun.web}"/>
25.15 - <property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
25.16 - <property name="deploy.context.root.argument" value="&contextroot=${sun-web-app.context-root}"/>
25.17 + <condition property="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}" else="${gfv3.url}/${ant.project.name}">
25.18 + <isset property="sun-web-app.context-root"/>
25.19 + </condition>
25.20 + <condition property="deploy.context.root.argument" value="&contextroot=${sun-web-app.context-root}" else="/${ant.project.name}">
25.21 + <isset property="sun-web-app.context-root"/>
25.22 + </condition>
25.23 + </target>
25.24 + <target name="-parse-glassfish-web" depends="-init-cl-deployment-env" if="glassfish.web.present">
25.25 + <tempfile prefix="gfv3" property="temp.gf.web" destdir="${java.io.tmpdir}"/>
25.26 + <copy file="${deploy.ant.docbase.dir}/WEB-INF/glassfish-web.xml" tofile="${temp.gf.web}"/>
25.27 + <!-- The doctype triggers resolution which can fail -->
25.28 + <replace file="${temp.gf.web}">
25.29 + <replacetoken><![CDATA[<!DOCTYPE]]></replacetoken>
25.30 + <replacevalue><![CDATA[<!-- <!DOCTYPE]]></replacevalue>
25.31 + </replace>
25.32 + <replace file="${temp.gf.web}">
25.33 + <replacetoken><![CDATA[<glassfish-web-app]]></replacetoken>
25.34 + <replacevalue><![CDATA[--> <glassfish-web-app]]></replacevalue>
25.35 + </replace>
25.36 + <xmlproperty file="${temp.gf.web}" validate="false">
25.37 + </xmlproperty>
25.38 + <delete file="${temp.gf.web}"/>
25.39 + <condition property="deploy.ant.client.url" value="${gfv3.url}${glassfish-web-app.context-root}" else="${gfv3.url}/${ant.project.name}">
25.40 + <isset property="glassfish-web-app.context-root"/>
25.41 + </condition>
25.42 + <condition property="deploy.context.root.argument" value="&contextroot=${glassfish-web-app.context-root}" else="/${ant.project.name}">
25.43 + <isset property="glassfish-web-app.context-root"/>
25.44 + </condition>
25.45 </target>
25.46 <target name="-no-parse-sun-web" depends="-init-cl-deployment-env" unless="sun.web.present">
25.47 <property name="deploy.context.root.argument" value=""/>
25.48 @@ -33,7 +60,6 @@
25.49 <tempfile prefix="gfv3" property="gfv3.resources.dir" destdir="${java.io.tmpdir}"/>
25.50 <mkdir dir="${gfv3.resources.dir}"/>
25.51 <mkdir dir="${gfv3.resources.dir}/META-INF"/>
25.52 - <property name="gfv3.resources.file" value="${gfv3.resources.dir}/META-INF/sun-resources.xml"/>
25.53 <copy todir="${gfv3.resources.dir}/META-INF">
25.54 <fileset dir="${deploy.ant.resource.dir}"/>
25.55 </copy>
25.56 @@ -42,7 +68,7 @@
25.57 </jar>
25.58 <delete dir="${gfv3.resources.dir}"/>
25.59 </target>
25.60 - <target name="-deploy-ant" depends="-parse-sun-web,-no-parse-sun-web,-add-resources" if="deploy.ant.enabled">
25.61 + <target name="-deploy-ant" depends="-parse-glassfish-web, -parse-sun-web, -no-parse-sun-web,-add-resources" if="deploy.ant.enabled">
25.62 <antcall target="-deploy-without-pw"/>
25.63 <antcall target="-deploy-with-pw"/>
25.64 </target>
26.1 --- a/java/nekurak.net-ws/nbproject/build-impl.xml Sun Jul 10 20:17:56 2011 +0200
26.2 +++ b/java/nekurak.net-ws/nbproject/build-impl.xml Fri Jul 15 22:25:39 2011 +0200
26.3 @@ -174,8 +174,20 @@
26.4 <property name="runmain.jvmargs" value=""/>
26.5 <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
26.6 <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
26.7 - <length length="0" string="${endorsed.classpath}" when="greater"/>
26.8 + <and>
26.9 + <isset property="endorsed.classpath"/>
26.10 + <length length="0" string="${endorsed.classpath}" when="greater"/>
26.11 + </and>
26.12 </condition>
26.13 + <condition else="false" property="jdkBug6558476">
26.14 + <and>
26.15 + <matches pattern="1\.[56]" string="${java.specification.version}"/>
26.16 + <not>
26.17 + <os family="unix"/>
26.18 + </not>
26.19 + </and>
26.20 + </condition>
26.21 + <property name="javac.fork" value="${jdkBug6558476}"/>
26.22 </target>
26.23 <target depends="init" name="-init-cos" unless="deploy.on.save">
26.24 <condition property="deploy.on.save" value="true">
26.25 @@ -246,7 +258,7 @@
26.26 <property location="${build.dir}/empty" name="empty.dir"/>
26.27 <mkdir dir="${empty.dir}"/>
26.28 <mkdir dir="@{apgeneratedsrcdir}"/>
26.29 - <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}">
26.30 + <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}">
26.31 <src>
26.32 <dirset dir="@{gensrcdir}" erroronmissingdir="false">
26.33 <include name="*"/>
26.34 @@ -316,15 +328,18 @@
26.35 <attribute default="${build.classes.dir}" name="destdir"/>
26.36 <sequential>
26.37 <fail unless="javac.includes">Must set javac.includes</fail>
26.38 - <pathconvert pathsep="," property="javac.includes.binary">
26.39 + <pathconvert pathsep="${line.separator}" property="javac.includes.binary">
26.40 <path>
26.41 <filelist dir="@{destdir}" files="${javac.includes}"/>
26.42 </path>
26.43 <globmapper from="*.java" to="*.class"/>
26.44 </pathconvert>
26.45 + <tempfile deleteonexit="true" property="javac.includesfile.binary"/>
26.46 + <echo file="${javac.includesfile.binary}" message="${javac.includes.binary}"/>
26.47 <delete>
26.48 - <files includes="${javac.includes.binary}"/>
26.49 + <files includesfile="${javac.includesfile.binary}"/>
26.50 </delete>
26.51 + <delete file="${javac.includesfile.binary}"/>
26.52 </sequential>
26.53 </macrodef>
26.54 </target>
26.55 @@ -350,6 +365,7 @@
26.56 <formatter type="brief" usefile="false"/>
26.57 <formatter type="xml"/>
26.58 <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
26.59 + <jvmarg value="-ea"/>
26.60 <jvmarg line="${runmain.jvmargs}"/>
26.61 </junit>
26.62 </sequential>
26.63 @@ -493,6 +509,19 @@
26.64 <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
26.65 <property name="ap.cmd.line.internal" value=""/>
26.66 </target>
26.67 + <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-check" name="profile-init"/>
26.68 + <target name="-profile-pre-init">
26.69 + <!-- Empty placeholder for easier customization. -->
26.70 + <!-- You can override this target in the ../build.xml file. -->
26.71 + </target>
26.72 + <target name="-profile-post-init">
26.73 + <!-- Empty placeholder for easier customization. -->
26.74 + <!-- You can override this target in the ../build.xml file. -->
26.75 + </target>
26.76 + <target depends="-profile-pre-init, init, -profile-post-init" name="-profile-init-check">
26.77 + <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
26.78 + <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
26.79 + </target>
26.80 <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,-init-ap-cmdline" name="init"/>
26.81 <!--
26.82 COMPILATION SECTION
26.83 @@ -562,6 +591,8 @@
26.84 <!-- You can override this target in the ../build.xml file. -->
26.85 </target>
26.86 <target depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
26.87 + <property name="jspc.schemas" value="/resources/schemas/"/>
26.88 + <property name="jspc.dtds" value="/resources/dtds/"/>
26.89 <target depends="compile" description="Test compile JSP pages to expose compilation errors." if="do.compile.jsps" name="compile-jsps">
26.90 <mkdir dir="${build.generated.dir}/src"/>
26.91 <java classname="org.netbeans.modules.web.project.ant.JspC" failonerror="true" fork="true">
26.92 @@ -570,9 +601,12 @@
26.93 <arg value="-d"/>
26.94 <arg file="${basedir}/${build.generated.dir}/src"/>
26.95 <arg value="-die1"/>
26.96 + <arg value="-schemas ${jspc.schemas}"/>
26.97 + <arg value="-dtds ${jspc.dtds}"/>
26.98 <arg value="-compilerSourceVM ${javac.source}"/>
26.99 <arg value="-compilerTargetVM ${javac.target}"/>
26.100 <arg value="-javaEncoding ${source.encoding}"/>
26.101 + <arg value="-sysClasspath ${libs.jsp-compilation-syscp.classpath}"/>
26.102 <classpath path="${java.home}/../lib/tools.jar:${libs.jsp-compiler.classpath}:${libs.jsp-compilation.classpath}"/>
26.103 </java>
26.104 <mkdir dir="${build.generated.dir}/classes"/>
26.105 @@ -587,6 +621,9 @@
26.106 <arg value="-d"/>
26.107 <arg file="${basedir}/${build.generated.dir}/src"/>
26.108 <arg value="-die1"/>
26.109 + <arg value="-schemas ${jspc.schemas}"/>
26.110 + <arg value="-dtds ${jspc.dtds}"/>
26.111 + <arg value="-sysClasspath ${libs.jsp-compilation-syscp.classpath}"/>
26.112 <arg value="-jspc.files"/>
26.113 <arg path="${jsp.includes}"/>
26.114 <arg value="-compilerSourceVM ${javac.source}"/>
26.115 @@ -828,6 +865,35 @@
26.116 </target>
26.117 <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
26.118 <!--
26.119 + =================
26.120 + PROFILING SECTION
26.121 + =================
26.122 + -->
26.123 + <target description="Profile a J2EE project in the IDE." name="profile">
26.124 + <condition else="start-profiled-server" property="profiler.startserver.target" value="start-profiled-server-extraargs">
26.125 + <isset property="profiler.info.jvmargs.extra"/>
26.126 + </condition>
26.127 + <antcall target="${profiler.startserver.target}"/>
26.128 + <antcall target="run"/>
26.129 + <antcall target="start-loadgen"/>
26.130 + </target>
26.131 + <target name="start-profiled-server">
26.132 + <nbstartprofiledserver forceRestart="${profiler.j2ee.serverForceRestart}" javaPlatform="${profiler.info.javaPlatform}" startupTimeout="${profiler.j2ee.serverStartupTimeout}">
26.133 + <jvmarg value="${profiler.info.jvmargs.agent}"/>
26.134 + <jvmarg value="${profiler.j2ee.agentID}"/>
26.135 + </nbstartprofiledserver>
26.136 + </target>
26.137 + <target name="start-profiled-server-extraargs">
26.138 + <nbstartprofiledserver forceRestart="${profiler.j2ee.serverForceRestart}" javaPlatform="${profiler.info.javaPlatform}" startupTimeout="${profiler.j2ee.serverStartupTimeout}">
26.139 + <jvmarg value="${profiler.info.jvmargs.extra}"/>
26.140 + <jvmarg value="${profiler.info.jvmargs.agent}"/>
26.141 + <jvmarg value="${profiler.j2ee.agentID}"/>
26.142 + </nbstartprofiledserver>
26.143 + </target>
26.144 + <target if="profiler.loadgen.path" name="start-loadgen">
26.145 + <loadgenstart path="${profiler.loadgen.path}"/>
26.146 + </target>
26.147 + <!--
26.148 JAVADOC SECTION
26.149 -->
26.150 <target depends="init" if="have.sources" name="javadoc-build">
26.151 @@ -949,6 +1015,35 @@
26.152 </target>
26.153 <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
26.154 <!--
26.155 + =========================
26.156 + TESTS PROFILING SECTION
26.157 + =========================
26.158 + -->
26.159 + <target depends="profile-init,compile-test-single" if="netbeans.home" name="profile-test-single">
26.160 + <nbprofiledirect>
26.161 + <classpath>
26.162 + <path path="${run.test.classpath}"/>
26.163 + <path path="${j2ee.platform.classpath}"/>
26.164 + </classpath>
26.165 + </nbprofiledirect>
26.166 + <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true">
26.167 + <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
26.168 + <jvmarg value="${profiler.info.jvmargs.agent}"/>
26.169 + <jvmarg line="${profiler.info.jvmargs}"/>
26.170 + <test name="${profile.class}"/>
26.171 + <classpath>
26.172 + <path path="${run.test.classpath}"/>
26.173 + <path path="${j2ee.platform.classpath}"/>
26.174 + </classpath>
26.175 + <syspropertyset>
26.176 + <propertyref prefix="test-sys-prop."/>
26.177 + <mapper from="test-sys-prop.*" to="*" type="glob"/>
26.178 + </syspropertyset>
26.179 + <formatter type="brief" usefile="false"/>
26.180 + <formatter type="xml"/>
26.181 + </junit>
26.182 + </target>
26.183 + <!--
26.184
26.185 CLEANUP SECTION
26.186 -->
27.1 --- a/java/nekurak.net-ws/nbproject/genfiles.properties Sun Jul 10 20:17:56 2011 +0200
27.2 +++ b/java/nekurak.net-ws/nbproject/genfiles.properties Fri Jul 15 22:25:39 2011 +0200
27.3 @@ -3,10 +3,10 @@
27.4 build.xml.stylesheet.CRC32=c0ebde35@1.21.2.1
27.5 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
27.6 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
27.7 -nbproject/build-impl.xml.data.CRC32=e6e63e07
27.8 -nbproject/build-impl.xml.script.CRC32=9b10bf3f
27.9 -nbproject/build-impl.xml.stylesheet.CRC32=8419264d@1.24.3.1
27.10 +nbproject/build-impl.xml.data.CRC32=6e851502
27.11 +nbproject/build-impl.xml.script.CRC32=9d4ac7d8
27.12 +nbproject/build-impl.xml.stylesheet.CRC32=8ca9f0e6@1.31.2.1
27.13 nbproject/wsit-deploy.xml.data.CRC32=4cb22909
27.14 nbproject/wsit-deploy.xml.script.CRC32=deb039de
27.15 nbproject/wsit-deploy.xml.stylesheet.CRC32=beb36995@3.9.1
27.16 -nbproject/jaxws-build.xml.stylesheet.CRC32=b0a0073f
27.17 +nbproject/jaxws-build.xml.stylesheet.CRC32=03b77b15
28.1 --- a/java/nekurak.net-ws/nbproject/jaxws-build.xml Sun Jul 10 20:17:56 2011 +0200
28.2 +++ b/java/nekurak.net-ws/nbproject/jaxws-build.xml Fri Jul 15 22:25:39 2011 +0200
28.3 @@ -15,16 +15,24 @@
28.4 <target name="wsgen-init" depends="init, -do-compile">
28.5 <mkdir dir="${build.generated.sources.dir}/jax-ws/resources/"/>
28.6 <mkdir dir="${build.classes.dir}"/>
28.7 + <mkdir dir="${build.classes.dir}/META-INF"/>
28.8 + <property name="j2ee.platform.wsgen.classpath" value="${libs.jaxws21.classpath}"/>
28.9 <taskdef name="wsgen" classname="com.sun.tools.ws.ant.WsGen">
28.10 <classpath path="${java.home}/../lib/tools.jar:${build.classes.dir}:${j2ee.platform.wsgen.classpath}:${javac.classpath}"/>
28.11 </taskdef>
28.12 </target>
28.13 <target name="wsgen-Podnik" depends="wsgen-init">
28.14 + <copy todir="${build.classes.dir}/META-INF">
28.15 + <fileset dir="${webinf.dir}" includes="wsit-cz.frantovo.nekurak.ws.Podnik.xml"/>
28.16 + </copy>
28.17 <wsgen sourcedestdir="${build.generated.sources.dir}/jax-ws" resourcedestdir="${build.generated.sources.dir}/jax-ws/resources/" destdir="${build.generated.sources.dir}/jax-ws" verbose="true" xendorsed="true" keep="true" genwsdl="true" sei="cz.frantovo.nekurak.ws.Podnik">
28.18 <classpath path="${java.home}/../lib/tools.jar:${build.classes.dir}:${j2ee.platform.wsgen.classpath}:${javac.classpath}"/>
28.19 </wsgen>
28.20 </target>
28.21 <target name="wsgen-Pokus" depends="wsgen-init">
28.22 + <copy todir="${build.classes.dir}/META-INF">
28.23 + <fileset dir="${webinf.dir}" includes="wsit-cz.frantovo.nekurak.ws.Pokus.xml"/>
28.24 + </copy>
28.25 <wsgen sourcedestdir="${build.generated.sources.dir}/jax-ws" resourcedestdir="${build.generated.sources.dir}/jax-ws/resources/" destdir="${build.generated.sources.dir}/jax-ws" verbose="true" xendorsed="true" keep="true" genwsdl="true" sei="cz.frantovo.nekurak.ws.Pokus">
28.26 <classpath path="${java.home}/../lib/tools.jar:${build.classes.dir}:${j2ee.platform.wsgen.classpath}:${javac.classpath}"/>
28.27 </wsgen>
29.1 --- a/java/nekurak.net-ws/nbproject/project.properties Sun Jul 10 20:17:56 2011 +0200
29.2 +++ b/java/nekurak.net-ws/nbproject/project.properties Fri Jul 15 22:25:39 2011 +0200
29.3 @@ -1,6 +1,5 @@
29.4 annotation.processing.enabled=true
29.5 annotation.processing.enabled.in.editor=true
29.6 -annotation.processing.processors.list=
29.7 annotation.processing.run.all.processors=true
29.8 annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
29.9 build.classes.dir=${build.web.dir}/WEB-INF/classes
29.10 @@ -27,9 +26,10 @@
29.11 ${libs.javaee-endorsed-api-6.0.classpath}
29.12 excludes=
29.13 includes=**
29.14 +j2ee.compile.on.save=false
29.15 j2ee.deploy.on.save=false
29.16 j2ee.platform=1.6-web
29.17 -j2ee.platform.classpath=${j2ee.server.home}/modules/javax.servlet.jar:${j2ee.server.home}/modules/jstl-impl.jar:${j2ee.server.home}/modules/javax.ejb.jar:${j2ee.server.home}/modules/javax.enterprise.deploy.jar:${j2ee.server.home}/modules/javax.security.jacc.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.transaction.jar:${j2ee.server.home}/modules/jsr311-api.jar:${j2ee.server.home}/modules/jsf-api.jar:${j2ee.server.home}/modules/javax.security.auth.message.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/endorsed/javax.annotation.jar:${j2ee.server.home}/modules/javax.management.j2ee.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.jms.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.resource.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/jsf-impl.jar:${j2ee.server.home}/modules/mail.jar
29.18 +j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/javax.annotation.jar:${j2ee.server.home}/modules/javax.transaction.jar:${j2ee.server.home}/modules/jsf-api.jar:${j2ee.server.home}/modules/jsf-impl.jar:${j2ee.server.home}/modules/jaxrpc-api-osgi.jar:${j2ee.server.home}/modules/javax.enterprise.deploy.jar:${j2ee.server.home}/modules/javax.resource.jar:${j2ee.server.home}/modules/jstl-impl.jar:${j2ee.server.home}/modules/jersey-core.jar:${j2ee.server.home}/modules/javax.security.auth.message.jar:${j2ee.server.home}/modules/javax.servlet.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.ejb.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.management.j2ee.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.jms.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/javax.security.jacc.jar:${j2ee.server.home}/modules/javax.persistence.jar
29.19 j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar
29.20 j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar
29.21 j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.ejb.jar
29.22 @@ -43,9 +43,10 @@
29.23 javac.compilerargs=
29.24 javac.debug=true
29.25 javac.deprecation=false
29.26 -javac.processorpath=${javac.classpath}
29.27 -javac.source=1.5
29.28 -javac.target=1.5
29.29 +javac.processorpath=\
29.30 + ${javac.classpath}
29.31 +javac.source=1.6
29.32 +javac.target=1.6
29.33 javac.test.classpath=\
29.34 ${javac.classpath}:\
29.35 ${build.classes.dir}:\
29.36 @@ -66,7 +67,6 @@
29.37 javadoc.windowtitle=
29.38 jspcompilation.classpath=${jspc.classpath}:${javac.classpath}
29.39 lib.dir=${web.docbase.dir}/WEB-INF/lib
29.40 -no.dependencies=false
29.41 persistence.xml.dir=${conf.dir}
29.42 platform.active=default_platform
29.43 project.nekurak_net-lib=../nekurak.net-lib
30.1 --- a/java/nekurak.net-ws/nbproject/project.xml Sun Jul 10 20:17:56 2011 +0200
30.2 +++ b/java/nekurak.net-ws/nbproject/project.xml Fri Jul 15 22:25:39 2011 +0200
30.3 @@ -16,10 +16,10 @@
30.4 </web-module-libraries>
30.5 <web-module-additional-libraries/>
30.6 <source-roots>
30.7 - <root id="src.dir" name="Source Packages"/>
30.8 + <root id="src.dir"/>
30.9 </source-roots>
30.10 <test-roots>
30.11 - <root id="test.src.dir" name="Test Packages"/>
30.12 + <root id="test.src.dir"/>
30.13 </test-roots>
30.14 </data>
30.15 <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">