Changeset 87:5fff85c7f980
- Timestamp:
- 11/09/20 19:00:45 (4 years ago)
- Branch:
- default
- Tags:
- tip
- Location:
- java/sql-vyuka/nbproject
- Files:
-
- 4 modified
Legend:
- Unmodified
- Added
- Removed
-
java/sql-vyuka/nbproject/ant-deploy.xml
r79 r87 1 1 <?xml version="1.0" encoding="UTF-8"?> 2 <!-- 3 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. 4 5 Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved. 6 7 Oracle and Java are registered trademarks of Oracle and/or its affiliates. 8 Other names may be trademarks of their respective owners. 9 10 The contents of this file are subject to the terms of either the GNU 11 General Public License Version 2 only ("GPL") or the Common 12 Development and Distribution License("CDDL") (collectively, the 13 "License"). You may not use this file except in compliance with the 14 License. You can obtain a copy of the License at 15 http://www.netbeans.org/cddl-gplv2.html 16 or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the 17 specific language governing permissions and limitations under the 18 License. When distributing the software, include this License Header 19 Notice in each file and include the License file at 20 nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this 21 particular file as subject to the "Classpath" exception as provided 22 by Oracle in the GPL Version 2 section of the License file that 23 accompanied this code. If applicable, add the following below the 24 License Header, with the fields enclosed by brackets [] replaced by 25 your own identifying information: 26 "Portions Copyrighted [year] [name of copyright owner]" 27 28 If you wish your version of this file to be governed by only the CDDL 29 or only the GPL Version 2, indicate your decision by adding 30 "[Contributor] elects to include this software in this distribution 31 under the [CDDL or GPL Version 2] license." If you do not indicate a 32 single choice of license, a recipient has the option to distribute 33 your version of this file under either the CDDL, the GPL Version 2 or 34 to extend the choice of license to its licensees as provided above. 35 However, if you add GPL Version 2 code and therefore, elected the GPL 36 Version 2 license, then the option applies only if the new code is 37 made subject to such option by the copyright holder. 38 39 Contributor(s): 40 --> 2 41 <project default="-deploy-ant" basedir="."> 3 42 <target name="-init-cl-deployment-env" if="deploy.ant.enabled"> … … 9 48 <echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/> 10 49 </target> 11 50 12 51 <target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present"> 13 52 <tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/> -
java/sql-vyuka/nbproject/build-impl.xml
r82 r87 106 106 <istrue value="${display.browser}"/> 107 107 </condition> 108 <condition property="do.display.browser.debug ">108 <condition property="do.display.browser.debug.old"> 109 109 <and> 110 110 <isset property="do.display.browser"/> … … 112 112 <isset property="do.debug.client"/> 113 113 </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"/> 114 126 </and> 115 127 </condition> … … 459 471 </union> 460 472 <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}"> 462 474 <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/> 463 475 <propertyset> … … 968 980 <mkdir dir="${dist.jar.dir}"/> 969 981 <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}"/> 971 983 </jar> 972 984 </target> … … 975 987 <mkdir dir="${dist.jar.dir}"/> 976 988 <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}"/> 978 990 </jar> 979 991 </target> … … 982 994 <mkdir dir="${dist.jar.dir}"/> 983 995 <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}"/> 985 997 </jar> 986 998 </target> … … 989 1001 <mkdir dir="${dist.jar.dir}"/> 990 1002 <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}"/> 992 1004 </jar> 993 1005 </target> … … 1008 1020 <mkdir dir="${dist.jar.dir}"/> 1009 1021 <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}"/> 1011 1023 </jar> 1012 1024 </target> … … 1057 1069 <nbverify file="${dist.war}"/> 1058 1070 </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"/> 1060 1072 <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> 1061 1081 <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> 1063 1086 </condition> 1064 1087 <condition property="do.display.browser.cl"> … … 1066 1089 </condition> 1067 1090 </target> 1091 <target if="do.display.browser.nb.old" name="-display-browser-nb-old"> 1092 <nbbrowse url="${client.url}"/> 1093 </target> 1068 1094 <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}"/> 1070 1096 </target> 1071 1097 <target if="do.display.browser.cl" name="-get-browser" unless="browser"> … … 1136 1162 <antcall target="connect-debugger"/> 1137 1163 <nbdeploy clientUrlPart="${client.urlPart}" debugmode="true" forceRedeploy="true"/> 1164 <antcall target="debug-display-browser-old"/> 1138 1165 <antcall target="debug-display-browser"/> 1139 1166 <antcall target="connect-client-debugger"/> … … 1152 1179 </nbjpdaconnect> 1153 1180 </target> 1181 <target if="do.display.browser.debug.old" name="debug-display-browser-old"> 1182 <nbbrowse url="${client.url}"/> 1183 </target> 1154 1184 <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}"/> 1156 1186 </target> 1157 1187 <target if="do.debug.client" name="connect-client-debugger"> … … 1249 1279 <nbstartserver profilemode="true"/> 1250 1280 <nbdeploy clientUrlPart="${client.urlPart}" forceRedeploy="true" profilemode="true"/> 1281 <antcall target="debug-display-browser-old"/> 1251 1282 <antcall target="debug-display-browser"/> 1252 1283 <antcall target="-profile-start-loadgen"/> … … 1339 1370 </target> 1340 1371 <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"/> 1342 1373 </target> 1343 1374 <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 5 5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. 6 6 nbproject/build-impl.xml.data.CRC32=3f9299bb 7 nbproject/build-impl.xml.script.CRC32= 7e55c0e08 nbproject/build-impl.xml.stylesheet.CRC32= 5459df51@1.41.1.17 nbproject/build-impl.xml.script.CRC32=55a3d669 8 nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.68.1.1 -
java/sql-vyuka/nbproject/project.properties
r85 r87 31 31 j2ee.deploy.on.save=false 32 32 j2ee.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.jar33 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 34 34 j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar 35 35 j2ee.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.jar37 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.jar36 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 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.jar 38 38 j2ee.platform.wsit.classpath= 39 39 j2ee.server.type=gfv3ee6