1.1 --- a/java/sql-vyuka/nbproject/ant-deploy.xml Mon Nov 09 18:57:24 2020 +0100
1.2 +++ b/java/sql-vyuka/nbproject/ant-deploy.xml Mon Nov 09 19:00:45 2020 +0100
1.3 @@ -1,4 +1,43 @@
1.4 <?xml version="1.0" encoding="UTF-8"?>
1.5 +<!--
1.6 +DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1.7 +
1.8 +Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
1.9 +
1.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1.11 +Other names may be trademarks of their respective owners.
1.12 +
1.13 +The contents of this file are subject to the terms of either the GNU
1.14 +General Public License Version 2 only ("GPL") or the Common
1.15 +Development and Distribution License("CDDL") (collectively, the
1.16 +"License"). You may not use this file except in compliance with the
1.17 +License. You can obtain a copy of the License at
1.18 +http://www.netbeans.org/cddl-gplv2.html
1.19 +or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
1.20 +specific language governing permissions and limitations under the
1.21 +License. When distributing the software, include this License Header
1.22 +Notice in each file and include the License file at
1.23 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1.24 +particular file as subject to the "Classpath" exception as provided
1.25 +by Oracle in the GPL Version 2 section of the License file that
1.26 +accompanied this code. If applicable, add the following below the
1.27 +License Header, with the fields enclosed by brackets [] replaced by
1.28 +your own identifying information:
1.29 +"Portions Copyrighted [year] [name of copyright owner]"
1.30 +
1.31 +If you wish your version of this file to be governed by only the CDDL
1.32 +or only the GPL Version 2, indicate your decision by adding
1.33 +"[Contributor] elects to include this software in this distribution
1.34 +under the [CDDL or GPL Version 2] license." If you do not indicate a
1.35 +single choice of license, a recipient has the option to distribute
1.36 +your version of this file under either the CDDL, the GPL Version 2 or
1.37 +to extend the choice of license to its licensees as provided above.
1.38 +However, if you add GPL Version 2 code and therefore, elected the GPL
1.39 +Version 2 license, then the option applies only if the new code is
1.40 +made subject to such option by the copyright holder.
1.41 +
1.42 +Contributor(s):
1.43 +-->
1.44 <project default="-deploy-ant" basedir=".">
1.45 <target name="-init-cl-deployment-env" if="deploy.ant.enabled">
1.46 <property file="${deploy.ant.properties.file}" />
1.47 @@ -8,7 +47,7 @@
1.48 <tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
1.49 <echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
1.50 </target>
1.51 -
1.52 +
1.53 <target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
1.54 <tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
1.55 <copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
2.1 --- a/java/sql-vyuka/nbproject/build-impl.xml Mon Nov 09 18:57:24 2020 +0100
2.2 +++ b/java/sql-vyuka/nbproject/build-impl.xml Mon Nov 09 19:00:45 2020 +0100
2.3 @@ -105,12 +105,24 @@
2.4 <condition property="do.display.browser">
2.5 <istrue value="${display.browser}"/>
2.6 </condition>
2.7 + <condition property="do.display.browser.debug.old">
2.8 + <and>
2.9 + <isset property="do.display.browser"/>
2.10 + <not>
2.11 + <isset property="do.debug.client"/>
2.12 + </not>
2.13 + <not>
2.14 + <isset property="browser.context"/>
2.15 + </not>
2.16 + </and>
2.17 + </condition>
2.18 <condition property="do.display.browser.debug">
2.19 <and>
2.20 <isset property="do.display.browser"/>
2.21 <not>
2.22 <isset property="do.debug.client"/>
2.23 </not>
2.24 + <isset property="browser.context"/>
2.25 </and>
2.26 </condition>
2.27 <available file="${conf.dir}/MANIFEST.MF" property="has.custom.manifest"/>
2.28 @@ -458,7 +470,7 @@
2.29 </fileset>
2.30 </union>
2.31 <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
2.32 - <testng classfilesetref="test.set" failureProperty="tests.failed" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="sql-vyuka" testname="TestNG tests" workingDir="${basedir}">
2.33 + <testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="sql-vyuka" testname="TestNG tests" workingDir="${basedir}">
2.34 <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
2.35 <propertyset>
2.36 <propertyref prefix="test-sys-prop."/>
2.37 @@ -967,28 +979,28 @@
2.38 <dirname file="${dist.war}" property="dist.jar.dir"/>
2.39 <mkdir dir="${dist.jar.dir}"/>
2.40 <jar compress="${jar.compress}" jarfile="${dist.war}">
2.41 - <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/>
2.42 + <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*,${dist.archive.excludes}"/>
2.43 </jar>
2.44 </target>
2.45 <target depends="init,compile,compile-jsps,-pre-dist" if="do.war.package.with.custom.manifest" name="-do-dist-with-manifest">
2.46 <dirname file="${dist.war}" property="dist.jar.dir"/>
2.47 <mkdir dir="${dist.jar.dir}"/>
2.48 <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
2.49 - <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/>
2.50 + <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*,${dist.archive.excludes}"/>
2.51 </jar>
2.52 </target>
2.53 <target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.without.custom.manifest" name="-do-tmp-dist-without-manifest">
2.54 <dirname file="${dist.war}" property="dist.jar.dir"/>
2.55 <mkdir dir="${dist.jar.dir}"/>
2.56 <jar compress="${jar.compress}" jarfile="${dist.war}">
2.57 - <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/>
2.58 + <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*,${dist.archive.excludes}"/>
2.59 </jar>
2.60 </target>
2.61 <target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.with.custom.manifest" name="-do-tmp-dist-with-manifest">
2.62 <dirname file="${dist.war}" property="dist.jar.dir"/>
2.63 <mkdir dir="${dist.jar.dir}"/>
2.64 <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
2.65 - <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/>
2.66 + <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*,${dist.archive.excludes}"/>
2.67 </jar>
2.68 </target>
2.69 <target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
2.70 @@ -1007,7 +1019,7 @@
2.71 <dirname file="${dist.ear.war}" property="dist.jar.dir"/>
2.72 <mkdir dir="${dist.jar.dir}"/>
2.73 <jar compress="${jar.compress}" jarfile="${dist.ear.war}" manifest="${build.web.dir}/META-INF/MANIFEST.MF">
2.74 - <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/>
2.75 + <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*,${dist.archive.excludes}"/>
2.76 </jar>
2.77 </target>
2.78 <target name="-post-dist">
2.79 @@ -1056,17 +1068,31 @@
2.80 <target depends="init,-pre-dist,dist,-post-dist" name="verify">
2.81 <nbverify file="${dist.war}"/>
2.82 </target>
2.83 - <target depends="run-deploy,-init-display-browser,-display-browser-nb,-display-browser-cl" name="run-display-browser"/>
2.84 + <target depends="run-deploy,-init-display-browser,-display-browser-nb-old,-display-browser-nb,-display-browser-cl" name="run-display-browser"/>
2.85 <target if="do.display.browser" name="-init-display-browser">
2.86 + <condition property="do.display.browser.nb.old">
2.87 + <and>
2.88 + <isset property="netbeans.home"/>
2.89 + <not>
2.90 + <isset property="browser.context"/>
2.91 + </not>
2.92 + </and>
2.93 + </condition>
2.94 <condition property="do.display.browser.nb">
2.95 - <isset property="netbeans.home"/>
2.96 + <and>
2.97 + <isset property="netbeans.home"/>
2.98 + <isset property="browser.context"/>
2.99 + </and>
2.100 </condition>
2.101 <condition property="do.display.browser.cl">
2.102 <isset property="deploy.ant.enabled"/>
2.103 </condition>
2.104 </target>
2.105 + <target if="do.display.browser.nb.old" name="-display-browser-nb-old">
2.106 + <nbbrowse url="${client.url}"/>
2.107 + </target>
2.108 <target if="do.display.browser.nb" name="-display-browser-nb">
2.109 - <nbbrowse url="${client.url}"/>
2.110 + <nbbrowse context="${browser.context}" url="${client.url}" urlPath="${client.urlPart}"/>
2.111 </target>
2.112 <target if="do.display.browser.cl" name="-get-browser" unless="browser">
2.113 <condition property="browser" value="rundll32">
2.114 @@ -1135,6 +1161,7 @@
2.115 <nbstartserver debugmode="true"/>
2.116 <antcall target="connect-debugger"/>
2.117 <nbdeploy clientUrlPart="${client.urlPart}" debugmode="true" forceRedeploy="true"/>
2.118 + <antcall target="debug-display-browser-old"/>
2.119 <antcall target="debug-display-browser"/>
2.120 <antcall target="connect-client-debugger"/>
2.121 </target>
2.122 @@ -1151,8 +1178,11 @@
2.123 </sourcepath>
2.124 </nbjpdaconnect>
2.125 </target>
2.126 + <target if="do.display.browser.debug.old" name="debug-display-browser-old">
2.127 + <nbbrowse url="${client.url}"/>
2.128 + </target>
2.129 <target if="do.display.browser.debug" name="debug-display-browser">
2.130 - <nbbrowse url="${client.url}"/>
2.131 + <nbbrowse context="${browser.context}" url="${client.url}" urlPath="${client.urlPart}"/>
2.132 </target>
2.133 <target if="do.debug.client" name="connect-client-debugger">
2.134 <webproject1:nbjsdebugstart webUrl="${client.url}"/>
2.135 @@ -1248,6 +1278,7 @@
2.136 <startprofiler/>
2.137 <nbstartserver profilemode="true"/>
2.138 <nbdeploy clientUrlPart="${client.urlPart}" forceRedeploy="true" profilemode="true"/>
2.139 + <antcall target="debug-display-browser-old"/>
2.140 <antcall target="debug-display-browser"/>
2.141 <antcall target="-profile-start-loadgen"/>
2.142 </target>
2.143 @@ -1338,7 +1369,7 @@
2.144 <mkdir dir="${build.test.results.dir}"/>
2.145 </target>
2.146 <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
2.147 - <webproject2:test testincludes="**/*Test.java"/>
2.148 + <webproject2:test includes="${includes}" testincludes="**/*Test.java"/>
2.149 </target>
2.150 <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
2.151 <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
3.1 --- a/java/sql-vyuka/nbproject/genfiles.properties Mon Nov 09 18:57:24 2020 +0100
3.2 +++ b/java/sql-vyuka/nbproject/genfiles.properties Mon Nov 09 19:00:45 2020 +0100
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=3f9299bb
3.7 -nbproject/build-impl.xml.script.CRC32=7e55c0e0
3.8 -nbproject/build-impl.xml.stylesheet.CRC32=5459df51@1.41.1.1
3.9 +nbproject/build-impl.xml.script.CRC32=55a3d669
3.10 +nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.68.1.1
4.1 --- a/java/sql-vyuka/nbproject/project.properties Mon Nov 09 18:57:24 2020 +0100
4.2 +++ b/java/sql-vyuka/nbproject/project.properties Mon Nov 09 19:00:45 2020 +0100
4.3 @@ -30,11 +30,11 @@
4.4 j2ee.copy.static.files.on.save=false
4.5 j2ee.deploy.on.save=false
4.6 j2ee.platform=1.5
4.7 -j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/endorsed/javax.annotation.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/javax.management.j2ee.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/javax.security.jacc.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/jersey-core.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.transaction.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar:${j2ee.server.home}/modules/javax.el-api.jar:${j2ee.server.home}/modules/javax.enterprise.deploy.jar:${j2ee.server.home}/modules/javax.security.auth.message.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.jms.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/javax.resource.jar:${j2ee.server.home}/modules/javax.ejb.jar
4.8 +j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
4.9 j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar
4.10 j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar
4.11 -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
4.12 -j2ee.platform.wsimport.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
4.13 +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.jar
4.14 +j2ee.platform.wsimport.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.jar
4.15 j2ee.platform.wsit.classpath=
4.16 j2ee.server.type=gfv3ee6
4.17 jar.compress=false