Changeset 87:5fff85c7f980

Show
Ignore:
Timestamp:
11/09/20 19:00:45 (11 months ago)
Author:
František Kučera <franta-hg@…>
Branch:
default
Tags:
tip
Message:

nové netbeans

Location:
java/sql-vyuka/nbproject
Files:
4 modified

Legend:

Unmodified
Added
Removed
  • java/sql-vyuka/nbproject/ant-deploy.xml

    r79 r87  
    11<?xml version="1.0" encoding="UTF-8"?> 
     2<!-- 
     3DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. 
     4 
     5Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved. 
     6 
     7Oracle and Java are registered trademarks of Oracle and/or its affiliates. 
     8Other names may be trademarks of their respective owners. 
     9 
     10The contents of this file are subject to the terms of either the GNU 
     11General Public License Version 2 only ("GPL") or the Common 
     12Development and Distribution License("CDDL") (collectively, the 
     13"License"). You may not use this file except in compliance with the 
     14License. You can obtain a copy of the License at 
     15http://www.netbeans.org/cddl-gplv2.html 
     16or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the 
     17specific language governing permissions and limitations under the 
     18License.  When distributing the software, include this License Header 
     19Notice in each file and include the License file at 
     20nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this 
     21particular file as subject to the "Classpath" exception as provided 
     22by Oracle in the GPL Version 2 section of the License file that 
     23accompanied this code. If applicable, add the following below the 
     24License Header, with the fields enclosed by brackets [] replaced by 
     25your own identifying information: 
     26"Portions Copyrighted [year] [name of copyright owner]" 
     27 
     28If you wish your version of this file to be governed by only the CDDL 
     29or only the GPL Version 2, indicate your decision by adding 
     30"[Contributor] elects to include this software in this distribution 
     31under the [CDDL or GPL Version 2] license." If you do not indicate a 
     32single choice of license, a recipient has the option to distribute 
     33your version of this file under either the CDDL, the GPL Version 2 or 
     34to extend the choice of license to its licensees as provided above. 
     35However, if you add GPL Version 2 code and therefore, elected the GPL 
     36Version 2 license, then the option applies only if the new code is 
     37made subject to such option by the copyright holder. 
     38 
     39Contributor(s): 
     40--> 
    241<project default="-deploy-ant" basedir="."> 
    342    <target name="-init-cl-deployment-env" if="deploy.ant.enabled"> 
     
    948        <echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/> 
    1049    </target> 
    11      
     50 
    1251    <target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present"> 
    1352        <tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/> 
  • java/sql-vyuka/nbproject/build-impl.xml

    r82 r87  
    106106            <istrue value="${display.browser}"/> 
    107107        </condition> 
    108         <condition property="do.display.browser.debug"> 
     108        <condition property="do.display.browser.debug.old"> 
    109109            <and> 
    110110                <isset property="do.display.browser"/> 
     
    112112                    <isset property="do.debug.client"/> 
    113113                </not> 
     114                <not> 
     115                    <isset property="browser.context"/> 
     116                </not> 
     117            </and> 
     118        </condition> 
     119        <condition property="do.display.browser.debug"> 
     120            <and> 
     121                <isset property="do.display.browser"/> 
     122                <not> 
     123                    <isset property="do.debug.client"/> 
     124                </not> 
     125                <isset property="browser.context"/> 
    114126            </and> 
    115127        </condition> 
     
    459471                </union> 
    460472                <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/> 
    461                 <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}"> 
     473                <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}"> 
    462474                    <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/> 
    463475                    <propertyset> 
     
    968980        <mkdir dir="${dist.jar.dir}"/> 
    969981        <jar compress="${jar.compress}" jarfile="${dist.war}"> 
    970             <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/> 
     982            <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*,${dist.archive.excludes}"/> 
    971983        </jar> 
    972984    </target> 
     
    975987        <mkdir dir="${dist.jar.dir}"/> 
    976988        <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF"> 
    977             <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/> 
     989            <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*,${dist.archive.excludes}"/> 
    978990        </jar> 
    979991    </target> 
     
    982994        <mkdir dir="${dist.jar.dir}"/> 
    983995        <jar compress="${jar.compress}" jarfile="${dist.war}"> 
    984             <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/> 
     996            <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*,${dist.archive.excludes}"/> 
    985997        </jar> 
    986998    </target> 
     
    9891001        <mkdir dir="${dist.jar.dir}"/> 
    9901002        <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF"> 
    991             <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/> 
     1003            <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*,${dist.archive.excludes}"/> 
    9921004        </jar> 
    9931005    </target> 
     
    10081020        <mkdir dir="${dist.jar.dir}"/> 
    10091021        <jar compress="${jar.compress}" jarfile="${dist.ear.war}" manifest="${build.web.dir}/META-INF/MANIFEST.MF"> 
    1010             <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*"/> 
     1022            <fileset dir="${build.web.dir}" excludes="WEB-INF/classes/.netbeans_*,${dist.archive.excludes}"/> 
    10111023        </jar> 
    10121024    </target> 
     
    10571069        <nbverify file="${dist.war}"/> 
    10581070    </target> 
    1059     <target depends="run-deploy,-init-display-browser,-display-browser-nb,-display-browser-cl" name="run-display-browser"/> 
     1071    <target depends="run-deploy,-init-display-browser,-display-browser-nb-old,-display-browser-nb,-display-browser-cl" name="run-display-browser"/> 
    10601072    <target if="do.display.browser" name="-init-display-browser"> 
     1073        <condition property="do.display.browser.nb.old"> 
     1074            <and> 
     1075                <isset property="netbeans.home"/> 
     1076                <not> 
     1077                    <isset property="browser.context"/> 
     1078                </not> 
     1079            </and> 
     1080        </condition> 
    10611081        <condition property="do.display.browser.nb"> 
    1062             <isset property="netbeans.home"/> 
     1082            <and> 
     1083                <isset property="netbeans.home"/> 
     1084                <isset property="browser.context"/> 
     1085            </and> 
    10631086        </condition> 
    10641087        <condition property="do.display.browser.cl"> 
     
    10661089        </condition> 
    10671090    </target> 
     1091    <target if="do.display.browser.nb.old" name="-display-browser-nb-old"> 
     1092        <nbbrowse url="${client.url}"/> 
     1093    </target> 
    10681094    <target if="do.display.browser.nb" name="-display-browser-nb"> 
    1069         <nbbrowse url="${client.url}"/> 
     1095        <nbbrowse context="${browser.context}" url="${client.url}" urlPath="${client.urlPart}"/> 
    10701096    </target> 
    10711097    <target if="do.display.browser.cl" name="-get-browser" unless="browser"> 
     
    11361162        <antcall target="connect-debugger"/> 
    11371163        <nbdeploy clientUrlPart="${client.urlPart}" debugmode="true" forceRedeploy="true"/> 
     1164        <antcall target="debug-display-browser-old"/> 
    11381165        <antcall target="debug-display-browser"/> 
    11391166        <antcall target="connect-client-debugger"/> 
     
    11521179        </nbjpdaconnect> 
    11531180    </target> 
     1181    <target if="do.display.browser.debug.old" name="debug-display-browser-old"> 
     1182        <nbbrowse url="${client.url}"/> 
     1183    </target> 
    11541184    <target if="do.display.browser.debug" name="debug-display-browser"> 
    1155         <nbbrowse url="${client.url}"/> 
     1185        <nbbrowse context="${browser.context}" url="${client.url}" urlPath="${client.urlPart}"/> 
    11561186    </target> 
    11571187    <target if="do.debug.client" name="connect-client-debugger"> 
     
    12491279        <nbstartserver profilemode="true"/> 
    12501280        <nbdeploy clientUrlPart="${client.urlPart}" forceRedeploy="true" profilemode="true"/> 
     1281        <antcall target="debug-display-browser-old"/> 
    12511282        <antcall target="debug-display-browser"/> 
    12521283        <antcall target="-profile-start-loadgen"/> 
     
    13391370    </target> 
    13401371    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run"> 
    1341         <webproject2:test testincludes="**/*Test.java"/> 
     1372        <webproject2:test includes="${includes}" testincludes="**/*Test.java"/> 
    13421373    </target> 
    13431374    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run"> 
  • java/sql-vyuka/nbproject/genfiles.properties

    r82 r87  
    55# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. 
    66nbproject/build-impl.xml.data.CRC32=3f9299bb 
    7 nbproject/build-impl.xml.script.CRC32=7e55c0e0 
    8 nbproject/build-impl.xml.stylesheet.CRC32=5459df51@1.41.1.1 
     7nbproject/build-impl.xml.script.CRC32=55a3d669 
     8nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.68.1.1 
  • java/sql-vyuka/nbproject/project.properties

    r85 r87  
    3131j2ee.deploy.on.save=false 
    3232j2ee.platform=1.5 
    33 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 
     33j2ee.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 
    3434j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar 
    3535j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar 
    36 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 
    37 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 
     36j2ee.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 
     37j2ee.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 
    3838j2ee.platform.wsit.classpath= 
    3939j2ee.server.type=gfv3ee6