Netbeans 6.7 → 6.8
authorFrantišek Kučera <franta-hg@frantovo.cz>
Tue Dec 22 21:09:58 2009 +0100 (2009-12-22)
changeset 6e6581bb3c4a3
parent 5 e10dd26d095e
child 7 c2a8f0c77f77
Netbeans 6.7 → 6.8
.hgignore
java/nekurak.net-web/nbproject/ant-deploy.xml
java/nekurak.net-web/nbproject/build-impl.xml
java/nekurak.net-web/nbproject/genfiles.properties
java/nekurak.net-web/nbproject/project.properties
     1.1 --- a/.hgignore	Tue Dec 22 20:58:12 2009 +0100
     1.2 +++ b/.hgignore	Tue Dec 22 21:09:58 2009 +0100
     1.3 @@ -2,4 +2,5 @@
     1.4  java/nekurak.net-web/build/*
     1.5  java/nekurak.net-web/nbproject/private
     1.6  java/nekurak.net-web/web/nekurak.net-web-src.zip
     1.7 -java/nekurak.net-web/src/conf/MANIFEST.MF
     1.8 \ No newline at end of file
     1.9 +java/nekurak.net-web/src/conf/MANIFEST.MF
    1.10 +java/nekurak.net-mvn/target/*
     2.1 --- a/java/nekurak.net-web/nbproject/ant-deploy.xml	Tue Dec 22 20:58:12 2009 +0100
     2.2 +++ b/java/nekurak.net-web/nbproject/ant-deploy.xml	Tue Dec 22 21:09:58 2009 +0100
     2.3 @@ -4,12 +4,12 @@
     2.4          <property file="${deploy.ant.properties.file}" />
     2.5          <available file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" property="sun.web.present"/>
     2.6          <available file="${deploy.ant.resource.dir}" property="has.setup"/>
     2.7 -        <tempfile prefix="sjsas" property="sjsas.password.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
     2.8 -        <echo message="AS_ADMIN_PASSWORD=${sjsas.password}" file="${sjsas.password.file}"/>
     2.9 +        <tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
    2.10 +        <echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
    2.11      </target>
    2.12      
    2.13      <target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
    2.14 -        <tempfile prefix="sjsas" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
    2.15 +        <tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
    2.16          <copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
    2.17          <!-- The doctype triggers resolution which can fail -->
    2.18          <replace file="${temp.sun.web}">
    2.19 @@ -23,38 +23,38 @@
    2.20          <xmlproperty file="${temp.sun.web}" validate="false">
    2.21          </xmlproperty>    
    2.22          <delete file="${temp.sun.web}"/>
    2.23 -        <property name="deploy.ant.client.url" value="${sjsas.url}${sun-web-app.context-root}"/>
    2.24 +        <property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
    2.25 +        <property name="deploy.context.root.argument" value="?contextroot=${sun-web-app.context-root}"/>
    2.26 +    </target>
    2.27 +    <target name="-no-parse-sun-web" depends="-init-cl-deployment-env" unless="sun.web.present">
    2.28 +        <property name="deploy.context.root.argument" value=""/>
    2.29      </target>
    2.30      <target name="-add-resources" depends="-init-cl-deployment-env" if="has.setup">
    2.31 -        <tempfile prefix="sjsas" property="sjsas.resources.dir" destdir="${java.io.tmpdir}"/>
    2.32 -        <mkdir dir="${sjsas.resources.dir}"/>
    2.33 -        <mkdir dir="${sjsas.resources.dir}/META-INF"/>
    2.34 -        <property name="sjsas.resources.file" value="${sjsas.resources.dir}/META-INF/sun-resources.xml"/>
    2.35 -        <copy todir="${sjsas.resources.dir}/META-INF">
    2.36 +        <tempfile prefix="gfv3" property="gfv3.resources.dir" destdir="${java.io.tmpdir}"/>
    2.37 +        <mkdir dir="${gfv3.resources.dir}"/>
    2.38 +        <mkdir dir="${gfv3.resources.dir}/META-INF"/>
    2.39 +        <property name="gfv3.resources.file" value="${gfv3.resources.dir}/META-INF/sun-resources.xml"/>
    2.40 +        <copy todir="${gfv3.resources.dir}/META-INF">
    2.41              <fileset dir="${deploy.ant.resource.dir}"/>
    2.42          </copy>
    2.43          <jar destfile="${deploy.ant.archive}" update="true">
    2.44 -            <fileset dir="${sjsas.resources.dir}"/>
    2.45 +            <fileset dir="${gfv3.resources.dir}"/>
    2.46          </jar>
    2.47 -        <delete dir="${sjsas.resources.dir}"/>
    2.48 +        <delete dir="${gfv3.resources.dir}"/>
    2.49      </target>
    2.50 -    <target name="-deploy-ant" depends="-parse-sun-web,-add-resources" if="deploy.ant.enabled">
    2.51 +    <target name="-deploy-ant" depends="-parse-sun-web,-no-parse-sun-web,-add-resources" if="deploy.ant.enabled">
    2.52          <echo message="Deploying ${deploy.ant.archive}"/>
    2.53 -        <taskdef name="sun-appserv-deploy" classname="org.apache.tools.ant.taskdefs.optional.sun.appserv.DeployTask"
    2.54 -                 classpath="${sjsas.root}/lib/sun-appserv-ant.jar" />
    2.55 -        <sun-appserv-deploy user="${sjsas.username}"
    2.56 -                passwordfile="${sjsas.password.file}"
    2.57 -                host="${sjsas.host}" port="${sjsas.port}"
    2.58 -                file="${deploy.ant.archive}" asinstalldir="${sjsas.root}"/>
    2.59 -        <delete file="${sjsas.password.file}"/>
    2.60 +        <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
    2.61 +        <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
    2.62 +        <get src="${gfv3.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}?force=true?name=${ant.project.name}"
    2.63 +            dest="${gfv3.results.file}"/>
    2.64 +        <delete file="${gfv3.results.file}"/>    
    2.65      </target>
    2.66      <target name="-undeploy-ant" depends="-init-cl-deployment-env" if="deploy.ant.enabled">
    2.67 -        <taskdef name="sun-appserv-undeploy" classname="org.apache.tools.ant.taskdefs.optional.sun.appserv.UndeployTask"
    2.68 -                 classpath="${sjsas.root}/lib/sun-appserv-ant.jar" />
    2.69 -        <sun-appserv-undeploy user="${sjsas.username}"
    2.70 -                passwordfile="${sjsas.password.file}"
    2.71 -                host="${sjsas.host}" port="${sjsas.port}"
    2.72 -                file="${deploy.ant.archive}" asinstalldir="${sjsas.root}"/>
    2.73 -        <delete file="${sjsas.password.file}"/>
    2.74 +        <echo message="Undeploying ${deploy.ant.archive}"/>
    2.75 +        <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
    2.76 +        <get src="${gfv3.url}/__asadmin/undeploy?name=${ant.project.name}"
    2.77 +            dest="${gfv3.results.file}"/>
    2.78 +        <delete file="${gfv3.results.file}"/>    
    2.79      </target>
    2.80  </project>
     3.1 --- a/java/nekurak.net-web/nbproject/build-impl.xml	Tue Dec 22 20:58:12 2009 +0100
     3.2 +++ b/java/nekurak.net-web/nbproject/build-impl.xml	Tue Dec 22 21:09:58 2009 +0100
     3.3 @@ -126,7 +126,10 @@
     3.4          <condition property="do.tmp.war.package.with.custom.manifest">
     3.5              <and>
     3.6                  <isset property="has.custom.manifest"/>
     3.7 -                <isfalse value="${directory.deployment.supported}"/>
     3.8 +                <or>
     3.9 +                    <isfalse value="${directory.deployment.supported}"/>
    3.10 +                    <isset property="dist.ear.dir"/>
    3.11 +                </or>
    3.12              </and>
    3.13          </condition>
    3.14          <condition property="do.tmp.war.package.without.custom.manifest">
    3.15 @@ -134,11 +137,17 @@
    3.16                  <not>
    3.17                      <isset property="has.custom.manifest"/>
    3.18                  </not>
    3.19 -                <isfalse value="${directory.deployment.supported}"/>
    3.20 +                <or>
    3.21 +                    <isfalse value="${directory.deployment.supported}"/>
    3.22 +                    <isset property="dist.ear.dir"/>
    3.23 +                </or>
    3.24              </and>
    3.25          </condition>
    3.26          <condition property="do.tmp.war.package">
    3.27 -            <isfalse value="${directory.deployment.supported}"/>
    3.28 +            <or>
    3.29 +                <isfalse value="${directory.deployment.supported}"/>
    3.30 +                <isset property="dist.ear.dir"/>
    3.31 +            </or>
    3.32          </condition>
    3.33          <property name="build.meta.inf.dir" value="${build.web.dir}/META-INF"/>
    3.34          <condition else="" property="application.args.param" value="${application.args}">
    3.35 @@ -161,13 +170,11 @@
    3.36          <property name="javadoc.encoding.used" value="${source.encoding}"/>
    3.37          <property name="includes" value="**"/>
    3.38          <property name="excludes" value=""/>
    3.39 -        <condition else="" property="javac.compilerargs.jaxws" value="-Djava.endorsed.dirs='${jaxws.endorsed.dir}'">
    3.40 -            <and>
    3.41 -                <isset property="jaxws.endorsed.dir"/>
    3.42 -                <available file="nbproject/jaxws-build.xml"/>
    3.43 -            </and>
    3.44 +        <property name="runmain.jvmargs" value=""/>
    3.45 +        <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
    3.46 +        <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
    3.47 +            <length length="0" string="${endorsed.classpath}" when="greater"/>
    3.48          </condition>
    3.49 -        <property name="runmain.jvmargs" value=""/>
    3.50      </target>
    3.51      <target depends="init" name="-init-cos" unless="deploy.on.save">
    3.52          <condition property="deploy.on.save" value="true">
    3.53 @@ -230,7 +237,8 @@
    3.54                      <classpath>
    3.55                          <path path="@{classpath}"/>
    3.56                      </classpath>
    3.57 -                    <compilerarg line="${javac.compilerargs} ${javac.compilerargs.jaxws}"/>
    3.58 +                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
    3.59 +                    <compilerarg line="${javac.compilerargs}"/>
    3.60                      <customize/>
    3.61                  </javac>
    3.62              </sequential>
    3.63 @@ -242,14 +250,14 @@
    3.64              <attribute default="${excludes}" name="excludes"/>
    3.65              <attribute default="**" name="testincludes"/>
    3.66              <sequential>
    3.67 -                <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true">
    3.68 +                <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${java.io.tmpdir}">
    3.69                      <batchtest todir="${build.test.results.dir}">
    3.70                          <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
    3.71                              <filename name="@{testincludes}"/>
    3.72                          </fileset>
    3.73                      </batchtest>
    3.74                      <classpath>
    3.75 -                        <path path="${run.test.classpath}:${j2ee.platform.classpath}"/>
    3.76 +                        <path path="${run.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}"/>
    3.77                      </classpath>
    3.78                      <syspropertyset>
    3.79                          <propertyref prefix="test-sys-prop."/>
    3.80 @@ -257,6 +265,7 @@
    3.81                      </syspropertyset>
    3.82                      <formatter type="brief" usefile="false"/>
    3.83                      <formatter type="xml"/>
    3.84 +                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
    3.85                      <jvmarg line="${runmain.jvmargs}"/>
    3.86                  </junit>
    3.87              </sequential>
    3.88 @@ -269,6 +278,7 @@
    3.89              <element name="customize" optional="true"/>
    3.90              <sequential>
    3.91                  <java classname="@{classname}" fork="true">
    3.92 +                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
    3.93                      <jvmarg line="${runmain.jvmargs}"/>
    3.94                      <classpath>
    3.95                          <path path="@{classpath}:${j2ee.platform.classpath}"/>
    3.96 @@ -346,6 +356,7 @@
    3.97              <element name="customize" optional="true"/>
    3.98              <sequential>
    3.99                  <java classname="@{classname}" fork="true">
   3.100 +                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
   3.101                      <jvmarg line="${debug-args-line}"/>
   3.102                      <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
   3.103                      <jvmarg line="${runmain.jvmargs}"/>
   3.104 @@ -520,7 +531,10 @@
   3.105          <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
   3.106      </target>
   3.107      <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir"/>
   3.108 -    <target depends="init,compile,compile-jsps,-pre-dist,library-inclusion-in-manifest" if="do.tmp.war.package" name="do-ear-dist">
   3.109 +    <target depends="init" if="dist.ear.dir" name="-clean-webinf-lib">
   3.110 +        <delete dir="${build.web.dir}/WEB-INF/lib"/>
   3.111 +    </target>
   3.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">
   3.113          <dirname file="${dist.ear.war}" property="dist.jar.dir"/>
   3.114          <mkdir dir="${dist.jar.dir}"/>
   3.115          <jar compress="${jar.compress}" jarfile="${dist.ear.war}" manifest="${build.web.dir}/META-INF/MANIFEST.MF">
   3.116 @@ -532,7 +546,7 @@
   3.117          <!-- You can override this target in the ../build.xml file. -->
   3.118      </target>
   3.119      <target depends="init,compile,-pre-dist,do-dist,-post-dist" description="Build distribution (WAR)." name="dist"/>
   3.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"/>
   3.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"/>
   3.122      <!--
   3.123                  EXECUTION SECTION
   3.124              -->
   3.125 @@ -647,7 +661,7 @@
   3.126      <!--
   3.127                  DEBUGGING SECTION
   3.128              -->
   3.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">
   3.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">
   3.131          <nbstartserver debugmode="true"/>
   3.132          <antcall target="connect-debugger"/>
   3.133          <nbdeploy clientUrlPart="${client.urlPart}" debugmode="true" forceRedeploy="true"/>
   3.134 @@ -722,13 +736,14 @@
   3.135              -->
   3.136      <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
   3.137          <mkdir dir="${build.test.classes.dir}"/>
   3.138 +        <property name="j2ee.platform.embeddableejb.classpath" value=""/>
   3.139      </target>
   3.140      <target name="-pre-compile-test">
   3.141          <!-- Empty placeholder for easier customization. -->
   3.142          <!-- You can override this target in the ../build.xml file. -->
   3.143      </target>
   3.144      <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test" if="have.tests" name="-do-compile-test">
   3.145 -        <webproject2:javac classpath="${javac.test.classpath}:${j2ee.platform.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
   3.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}"/>
   3.147          <copy todir="${build.test.classes.dir}">
   3.148              <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
   3.149          </copy>
   3.150 @@ -744,7 +759,7 @@
   3.151      </target>
   3.152      <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
   3.153          <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
   3.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}"/>
   3.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}"/>
   3.156          <copy todir="${build.test.classes.dir}">
   3.157              <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
   3.158          </copy>
   3.159 @@ -791,7 +806,7 @@
   3.160          <delete file="${test.report.file}"/>
   3.161          <!-- must exist, otherwise the XML formatter would fail -->
   3.162          <mkdir dir="${build.test.results.dir}"/>
   3.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}">
   3.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}">
   3.165              <customize>
   3.166                  <arg value="showoutput=true"/>
   3.167                  <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
     4.1 --- a/java/nekurak.net-web/nbproject/genfiles.properties	Tue Dec 22 20:58:12 2009 +0100
     4.2 +++ b/java/nekurak.net-web/nbproject/genfiles.properties	Tue Dec 22 21:09:58 2009 +0100
     4.3 @@ -1,8 +1,8 @@
     4.4  build.xml.data.CRC32=7602bd8b
     4.5  build.xml.script.CRC32=d97fcc7d
     4.6 -build.xml.stylesheet.CRC32=c0ebde35@1.15.2.1
     4.7 +build.xml.stylesheet.CRC32=c0ebde35@1.21.1.1
     4.8  # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
     4.9  # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
    4.10  nbproject/build-impl.xml.data.CRC32=7602bd8b
    4.11 -nbproject/build-impl.xml.script.CRC32=91cd58a3
    4.12 -nbproject/build-impl.xml.stylesheet.CRC32=8ab4467e@1.15.2.1
    4.13 +nbproject/build-impl.xml.script.CRC32=dc954e54
    4.14 +nbproject/build-impl.xml.stylesheet.CRC32=b139b33b@1.21.1.1
     5.1 --- a/java/nekurak.net-web/nbproject/project.properties	Tue Dec 22 20:58:12 2009 +0100
     5.2 +++ b/java/nekurak.net-web/nbproject/project.properties	Tue Dec 22 21:09:58 2009 +0100
     5.3 @@ -18,11 +18,12 @@
     5.4  dist.ear.war=${dist.dir}/${war.ear.name}
     5.5  dist.javadoc.dir=${dist.dir}/javadoc
     5.6  dist.war=${dist.dir}/${war.name}
     5.7 +endorsed.classpath=
     5.8  excludes=
     5.9  includes=**
    5.10  j2ee.deploy.on.save=true
    5.11  j2ee.platform=1.5
    5.12 -j2ee.server.type=J2EE
    5.13 +j2ee.server.type=gfv3ee6
    5.14  jar.compress=false
    5.15  javac.classpath=
    5.16  # Space-separated list of extra javac options
    5.17 @@ -48,6 +49,7 @@
    5.18  javadoc.use=true
    5.19  javadoc.version=false
    5.20  javadoc.windowtitle=
    5.21 +jaxbwiz.endorsed.dirs="${netbeans.home}/../ide12/modules/ext/jaxb/api"
    5.22  jspcompilation.classpath=${jspc.classpath}:${javac.classpath}
    5.23  lib.dir=${web.docbase.dir}/WEB-INF/lib
    5.24  persistence.xml.dir=${conf.dir}