java/nekurak.net-web/nbproject/build-impl.xml
changeset 6 e6581bb3c4a3
parent 0 b85f351aa5e5
child 26 fc3e84d87e01
     1.1 --- a/java/nekurak.net-web/nbproject/build-impl.xml	Tue Dec 22 20:58:12 2009 +0100
     1.2 +++ b/java/nekurak.net-web/nbproject/build-impl.xml	Tue Dec 22 21:09:58 2009 +0100
     1.3 @@ -126,7 +126,10 @@
     1.4          <condition property="do.tmp.war.package.with.custom.manifest">
     1.5              <and>
     1.6                  <isset property="has.custom.manifest"/>
     1.7 -                <isfalse value="${directory.deployment.supported}"/>
     1.8 +                <or>
     1.9 +                    <isfalse value="${directory.deployment.supported}"/>
    1.10 +                    <isset property="dist.ear.dir"/>
    1.11 +                </or>
    1.12              </and>
    1.13          </condition>
    1.14          <condition property="do.tmp.war.package.without.custom.manifest">
    1.15 @@ -134,11 +137,17 @@
    1.16                  <not>
    1.17                      <isset property="has.custom.manifest"/>
    1.18                  </not>
    1.19 -                <isfalse value="${directory.deployment.supported}"/>
    1.20 +                <or>
    1.21 +                    <isfalse value="${directory.deployment.supported}"/>
    1.22 +                    <isset property="dist.ear.dir"/>
    1.23 +                </or>
    1.24              </and>
    1.25          </condition>
    1.26          <condition property="do.tmp.war.package">
    1.27 -            <isfalse value="${directory.deployment.supported}"/>
    1.28 +            <or>
    1.29 +                <isfalse value="${directory.deployment.supported}"/>
    1.30 +                <isset property="dist.ear.dir"/>
    1.31 +            </or>
    1.32          </condition>
    1.33          <property name="build.meta.inf.dir" value="${build.web.dir}/META-INF"/>
    1.34          <condition else="" property="application.args.param" value="${application.args}">
    1.35 @@ -161,13 +170,11 @@
    1.36          <property name="javadoc.encoding.used" value="${source.encoding}"/>
    1.37          <property name="includes" value="**"/>
    1.38          <property name="excludes" value=""/>
    1.39 -        <condition else="" property="javac.compilerargs.jaxws" value="-Djava.endorsed.dirs='${jaxws.endorsed.dir}'">
    1.40 -            <and>
    1.41 -                <isset property="jaxws.endorsed.dir"/>
    1.42 -                <available file="nbproject/jaxws-build.xml"/>
    1.43 -            </and>
    1.44 +        <property name="runmain.jvmargs" value=""/>
    1.45 +        <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
    1.46 +        <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
    1.47 +            <length length="0" string="${endorsed.classpath}" when="greater"/>
    1.48          </condition>
    1.49 -        <property name="runmain.jvmargs" value=""/>
    1.50      </target>
    1.51      <target depends="init" name="-init-cos" unless="deploy.on.save">
    1.52          <condition property="deploy.on.save" value="true">
    1.53 @@ -230,7 +237,8 @@
    1.54                      <classpath>
    1.55                          <path path="@{classpath}"/>
    1.56                      </classpath>
    1.57 -                    <compilerarg line="${javac.compilerargs} ${javac.compilerargs.jaxws}"/>
    1.58 +                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
    1.59 +                    <compilerarg line="${javac.compilerargs}"/>
    1.60                      <customize/>
    1.61                  </javac>
    1.62              </sequential>
    1.63 @@ -242,14 +250,14 @@
    1.64              <attribute default="${excludes}" name="excludes"/>
    1.65              <attribute default="**" name="testincludes"/>
    1.66              <sequential>
    1.67 -                <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true">
    1.68 +                <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${java.io.tmpdir}">
    1.69                      <batchtest todir="${build.test.results.dir}">
    1.70                          <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
    1.71                              <filename name="@{testincludes}"/>
    1.72                          </fileset>
    1.73                      </batchtest>
    1.74                      <classpath>
    1.75 -                        <path path="${run.test.classpath}:${j2ee.platform.classpath}"/>
    1.76 +                        <path path="${run.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}"/>
    1.77                      </classpath>
    1.78                      <syspropertyset>
    1.79                          <propertyref prefix="test-sys-prop."/>
    1.80 @@ -257,6 +265,7 @@
    1.81                      </syspropertyset>
    1.82                      <formatter type="brief" usefile="false"/>
    1.83                      <formatter type="xml"/>
    1.84 +                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
    1.85                      <jvmarg line="${runmain.jvmargs}"/>
    1.86                  </junit>
    1.87              </sequential>
    1.88 @@ -269,6 +278,7 @@
    1.89              <element name="customize" optional="true"/>
    1.90              <sequential>
    1.91                  <java classname="@{classname}" fork="true">
    1.92 +                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
    1.93                      <jvmarg line="${runmain.jvmargs}"/>
    1.94                      <classpath>
    1.95                          <path path="@{classpath}:${j2ee.platform.classpath}"/>
    1.96 @@ -346,6 +356,7 @@
    1.97              <element name="customize" optional="true"/>
    1.98              <sequential>
    1.99                  <java classname="@{classname}" fork="true">
   1.100 +                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
   1.101                      <jvmarg line="${debug-args-line}"/>
   1.102                      <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
   1.103                      <jvmarg line="${runmain.jvmargs}"/>
   1.104 @@ -520,7 +531,10 @@
   1.105          <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
   1.106      </target>
   1.107      <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir"/>
   1.108 -    <target depends="init,compile,compile-jsps,-pre-dist,library-inclusion-in-manifest" if="do.tmp.war.package" name="do-ear-dist">
   1.109 +    <target depends="init" if="dist.ear.dir" name="-clean-webinf-lib">
   1.110 +        <delete dir="${build.web.dir}/WEB-INF/lib"/>
   1.111 +    </target>
   1.112 +    <target depends="init,-clean-webinf-lib,compile,compile-jsps,-pre-dist,library-inclusion-in-manifest" if="do.tmp.war.package" name="do-ear-dist">
   1.113          <dirname file="${dist.ear.war}" property="dist.jar.dir"/>
   1.114          <mkdir dir="${dist.jar.dir}"/>
   1.115          <jar compress="${jar.compress}" jarfile="${dist.ear.war}" manifest="${build.web.dir}/META-INF/MANIFEST.MF">
   1.116 @@ -532,7 +546,7 @@
   1.117          <!-- You can override this target in the ../build.xml file. -->
   1.118      </target>
   1.119      <target depends="init,compile,-pre-dist,do-dist,-post-dist" description="Build distribution (WAR)." name="dist"/>
   1.120 -    <target depends="init,-init-cos,compile,-pre-dist,do-ear-dist,-post-dist" description="Build distribution (WAR) to be packaged into an EAR." name="dist-ear"/>
   1.121 +    <target depends="init,-clean-webinf-lib,-init-cos,compile,-pre-dist,do-ear-dist,-post-dist" description="Build distribution (WAR) to be packaged into an EAR." name="dist-ear"/>
   1.122      <!--
   1.123                  EXECUTION SECTION
   1.124              -->
   1.125 @@ -647,7 +661,7 @@
   1.126      <!--
   1.127                  DEBUGGING SECTION
   1.128              -->
   1.129 -    <target depends="init,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest" description="Debug project in IDE." if="netbeans.home" name="debug">
   1.130 +    <target depends="init,-init-cos,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest" description="Debug project in IDE." if="netbeans.home" name="debug">
   1.131          <nbstartserver debugmode="true"/>
   1.132          <antcall target="connect-debugger"/>
   1.133          <nbdeploy clientUrlPart="${client.urlPart}" debugmode="true" forceRedeploy="true"/>
   1.134 @@ -722,13 +736,14 @@
   1.135              -->
   1.136      <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
   1.137          <mkdir dir="${build.test.classes.dir}"/>
   1.138 +        <property name="j2ee.platform.embeddableejb.classpath" value=""/>
   1.139      </target>
   1.140      <target name="-pre-compile-test">
   1.141          <!-- Empty placeholder for easier customization. -->
   1.142          <!-- You can override this target in the ../build.xml file. -->
   1.143      </target>
   1.144      <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test" if="have.tests" name="-do-compile-test">
   1.145 -        <webproject2:javac classpath="${javac.test.classpath}:${j2ee.platform.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
   1.146 +        <webproject2:javac classpath="${javac.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
   1.147          <copy todir="${build.test.classes.dir}">
   1.148              <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
   1.149          </copy>
   1.150 @@ -744,7 +759,7 @@
   1.151      </target>
   1.152      <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
   1.153          <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
   1.154 -        <webproject2:javac classpath="${javac.test.classpath}:${j2ee.platform.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" srcdir="${test.src.dir}"/>
   1.155 +        <webproject2:javac classpath="${javac.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" srcdir="${test.src.dir}"/>
   1.156          <copy todir="${build.test.classes.dir}">
   1.157              <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
   1.158          </copy>
   1.159 @@ -791,7 +806,7 @@
   1.160          <delete file="${test.report.file}"/>
   1.161          <!-- must exist, otherwise the XML formatter would fail -->
   1.162          <mkdir dir="${build.test.results.dir}"/>
   1.163 -        <webproject1:debug args="${test.class}" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}">
   1.164 +        <webproject1:debug args="${test.class}" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}:${j2ee.platform.embeddableejb.classpath}">
   1.165              <customize>
   1.166                  <arg value="showoutput=true"/>
   1.167                  <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>