Merge dt
# Conflicts: # src/Test.java # src/métiers/Commande.java # test/métiers/CommandeTest.java
This commit is contained in:
famille Thevenot
69
nbproject/ant-deploy.xml
Normal file
69
nbproject/ant-deploy.xml
Normal file
@@ -0,0 +1,69 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!--
|
||||
|
||||
Licensed to the Apache Software Foundation (ASF) under one
|
||||
or more contributor license agreements. See the NOTICE file
|
||||
distributed with this work for additional information
|
||||
regarding copyright ownership. The ASF licenses this file
|
||||
to you under the Apache License, Version 2.0 (the
|
||||
"License"); you may not use this file except in compliance
|
||||
with the License. You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing,
|
||||
software distributed under the License is distributed on an
|
||||
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
KIND, either express or implied. See the License for the
|
||||
specific language governing permissions and limitations
|
||||
under the License.
|
||||
|
||||
-->
|
||||
<project default="-deploy-ant" basedir=".">
|
||||
<target name="-init" if="deploy.ant.enabled">
|
||||
<property file="${deploy.ant.properties.file}"/>
|
||||
<tempfile property="temp.module.folder" prefix="tomcat" destdir="${java.io.tmpdir}"/>
|
||||
<unwar src="${deploy.ant.archive}" dest="${temp.module.folder}">
|
||||
<patternset includes="META-INF/context.xml"/>
|
||||
</unwar>
|
||||
<xmlproperty file="${temp.module.folder}/META-INF/context.xml"/>
|
||||
<delete dir="${temp.module.folder}"/>
|
||||
</target>
|
||||
<target name="-check-credentials" if="deploy.ant.enabled" depends="-init">
|
||||
<fail message="Tomcat password has to be passed as tomcat.password property.">
|
||||
<condition>
|
||||
<not>
|
||||
<isset property="tomcat.password"/>
|
||||
</not>
|
||||
</condition>
|
||||
</fail>
|
||||
</target>
|
||||
<target name="-deploy-ant" if="deploy.ant.enabled" depends="-init,-check-credentials">
|
||||
<echo message="Deploying ${deploy.ant.archive} to ${Context(path)}"/>
|
||||
<taskdef name="deploy" classname="org.apache.catalina.ant.DeployTask">
|
||||
<classpath>
|
||||
<pathelement path="${tomcat.home}/lib/catalina-ant.jar"/>
|
||||
<pathelement path="${tomcat.home}/lib/tomcat-coyote.jar"/>
|
||||
<pathelement path="${tomcat.home}/lib/tomcat-util.jar"/>
|
||||
<pathelement path="${tomcat.home}/bin/tomcat-juli.jar"/>
|
||||
</classpath>
|
||||
</taskdef>
|
||||
<deploy url="${tomcat.url}/manager/text" username="${tomcat.username}"
|
||||
password="${tomcat.password}" path="${Context(path)}"
|
||||
war="${deploy.ant.archive}"/>
|
||||
<property name="deploy.ant.client.url" value="${tomcat.url}${Context(path)}"/>
|
||||
</target>
|
||||
<target name="-undeploy-ant" if="deploy.ant.enabled" depends="-init,-check-credentials">
|
||||
<echo message="Undeploying ${Context(path)}"/>
|
||||
<taskdef name="undeploy" classname="org.apache.catalina.ant.UndeployTask">
|
||||
<classpath>
|
||||
<pathelement path="${tomcat.home}/lib/catalina-ant.jar"/>
|
||||
<pathelement path="${tomcat.home}/lib/tomcat-coyote.jar"/>
|
||||
<pathelement path="${tomcat.home}/lib/tomcat-util.jar"/>
|
||||
<pathelement path="${tomcat.home}/bin/tomcat-juli.jar"/>
|
||||
</classpath>
|
||||
</taskdef>
|
||||
<undeploy url="${tomcat.url}/manager/text" username="${tomcat.username}"
|
||||
password="${tomcat.password}" path="${Context(path)}"/>
|
||||
</target>
|
||||
</project>
|
||||
1436
nbproject/build-impl.xml
Normal file
1436
nbproject/build-impl.xml
Normal file
File diff suppressed because it is too large
Load Diff
8
nbproject/genfiles.properties
Normal file
8
nbproject/genfiles.properties
Normal file
@@ -0,0 +1,8 @@
|
||||
build.xml.data.CRC32=ff2a0cb9
|
||||
build.xml.script.CRC32=dffdee25
|
||||
build.xml.stylesheet.CRC32=1707db4f@1.98.0.1
|
||||
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
|
||||
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
|
||||
nbproject/build-impl.xml.data.CRC32=ff2a0cb9
|
||||
nbproject/build-impl.xml.script.CRC32=f38222bd
|
||||
nbproject/build-impl.xml.stylesheet.CRC32=334708a0@1.98.0.1
|
||||
90
nbproject/project.properties
Normal file
90
nbproject/project.properties
Normal file
@@ -0,0 +1,90 @@
|
||||
annotation.processing.enabled=true
|
||||
annotation.processing.enabled.in.editor=true
|
||||
annotation.processing.processors.list=
|
||||
annotation.processing.run.all.processors=true
|
||||
annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
|
||||
build.classes.dir=${build.web.dir}/WEB-INF/classes
|
||||
build.classes.excludes=**/*.java,**/*.form
|
||||
build.dir=build
|
||||
build.generated.dir=${build.dir}/generated
|
||||
build.generated.sources.dir=${build.dir}/generated-sources
|
||||
build.test.classes.dir=${build.dir}/test/classes
|
||||
build.test.results.dir=${build.dir}/test/results
|
||||
build.web.dir=${build.dir}/web
|
||||
build.web.excludes=${build.classes.excludes}
|
||||
client.urlPart=
|
||||
compile.jsps=false
|
||||
conf.dir=${source.root}/conf
|
||||
debug.classpath=${build.classes.dir}:${javac.classpath}
|
||||
debug.test.classpath=\
|
||||
${run.test.classpath}
|
||||
display.browser=true
|
||||
# Files to be excluded from distribution war
|
||||
dist.archive.excludes=
|
||||
dist.dir=dist
|
||||
dist.ear.war=${dist.dir}/${war.ear.name}
|
||||
dist.javadoc.dir=${dist.dir}/javadoc
|
||||
dist.war=${dist.dir}/${war.name}
|
||||
endorsed.classpath=
|
||||
excludes=
|
||||
file.reference.jakarta.servlet.jsp.jstl-2.0.0.jar=../../../../Users/sio/Downloads/jakarta.servlet.jsp.jstl-2.0.0.jar
|
||||
file.reference.jakarta.servlet.jsp.jstl-api-2.0.0.jar=../../../../Users/sio/Downloads/jakarta.servlet.jsp.jstl-api-2.0.0.jar
|
||||
file.reference.mysql-connector-java-8.0.23.jar=C:\\Users\\sio\\Downloads\\mysql-connector-java-8.0.23.jar
|
||||
file.reference.mysql-connector-java-8.0.23.jar-1=C:\\Program Files\\Apache Software Foundation\\Tomcat 10.1\\drivers\\mysql-connector-java-8.0.23.jar
|
||||
includes=**
|
||||
j2ee.compile.on.save=true
|
||||
j2ee.copy.static.files.on.save=true
|
||||
j2ee.deploy.on.save=true
|
||||
j2ee.platform=10-web
|
||||
j2ee.platform.classpath=${j2ee.server.home}/bin/tomcat-juli.jar:${j2ee.server.home}/lib/annotations-api.jar:${j2ee.server.home}/lib/catalina-ant.jar:${j2ee.server.home}/lib/catalina-ha.jar:${j2ee.server.home}/lib/catalina-ssi.jar:${j2ee.server.home}/lib/catalina-storeconfig.jar:${j2ee.server.home}/lib/catalina-tribes.jar:${j2ee.server.home}/lib/catalina.jar:${j2ee.server.home}/lib/ecj-4.27.jar:${j2ee.server.home}/lib/el-api.jar:${j2ee.server.home}/lib/jakartaee-migration-1.0.8-shaded.jar:${j2ee.server.home}/lib/jasper-el.jar:${j2ee.server.home}/lib/jasper.jar:${j2ee.server.home}/lib/jaspic-api.jar:${j2ee.server.home}/lib/jsp-api.jar:${j2ee.server.home}/lib/servlet-api.jar:${j2ee.server.home}/lib/tomcat-api.jar:${j2ee.server.home}/lib/tomcat-coyote-ffm.jar:${j2ee.server.home}/lib/tomcat-coyote.jar:${j2ee.server.home}/lib/tomcat-dbcp.jar:${j2ee.server.home}/lib/tomcat-i18n-cs.jar:${j2ee.server.home}/lib/tomcat-i18n-de.jar:${j2ee.server.home}/lib/tomcat-i18n-es.jar:${j2ee.server.home}/lib/tomcat-i18n-fr.jar:${j2ee.server.home}/lib/tomcat-i18n-ja.jar:${j2ee.server.home}/lib/tomcat-i18n-ko.jar:${j2ee.server.home}/lib/tomcat-i18n-pt-BR.jar:${j2ee.server.home}/lib/tomcat-i18n-ru.jar:${j2ee.server.home}/lib/tomcat-i18n-zh-CN.jar:${j2ee.server.home}/lib/tomcat-jdbc.jar:${j2ee.server.home}/lib/tomcat-jni.jar:${j2ee.server.home}/lib/tomcat-util-scan.jar:${j2ee.server.home}/lib/tomcat-util.jar:${j2ee.server.home}/lib/tomcat-websocket.jar:${j2ee.server.home}/lib/websocket-api.jar:${j2ee.server.home}/lib/websocket-client-api.jar
|
||||
j2ee.server.type=Tomcat
|
||||
jar.compress=false
|
||||
javac.classpath=\
|
||||
${file.reference.jakarta.servlet.jsp.jstl-2.0.0.jar}:\
|
||||
${file.reference.jakarta.servlet.jsp.jstl-api-2.0.0.jar}:\
|
||||
${file.reference.mysql-connector-java-8.0.23.jar}:\
|
||||
${file.reference.mysql-connector-java-8.0.23.jar-1}
|
||||
# Space-separated list of extra javac options
|
||||
javac.compilerargs=
|
||||
javac.debug=true
|
||||
javac.deprecation=false
|
||||
javac.processorpath=\
|
||||
${javac.classpath}
|
||||
javac.source=21
|
||||
javac.target=21
|
||||
javac.test.classpath=\
|
||||
${javac.classpath}:\
|
||||
${build.classes.dir}
|
||||
javac.test.processorpath=\
|
||||
${javac.test.classpath}
|
||||
javadoc.additionalparam=
|
||||
javadoc.author=false
|
||||
javadoc.encoding=${source.encoding}
|
||||
javadoc.noindex=false
|
||||
javadoc.nonavbar=false
|
||||
javadoc.notree=false
|
||||
javadoc.preview=true
|
||||
javadoc.private=false
|
||||
javadoc.splitindex=true
|
||||
javadoc.use=true
|
||||
javadoc.version=false
|
||||
javadoc.windowtitle=
|
||||
lib.dir=${web.docbase.dir}/WEB-INF/lib
|
||||
persistence.xml.dir=${conf.dir}
|
||||
platform.active=default_platform
|
||||
resource.dir=setup
|
||||
run.test.classpath=\
|
||||
${javac.test.classpath}:\
|
||||
${build.test.classes.dir}
|
||||
# Space-separated list of JVM arguments used when running a class with a main method or a unit test
|
||||
# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value):
|
||||
runmain.jvmargs=
|
||||
source.encoding=UTF-8
|
||||
source.root=src
|
||||
src.dir=${source.root}/java
|
||||
test.src.dir=test
|
||||
war.content.additional=
|
||||
war.ear.name=${war.name}
|
||||
war.name=Test2JakartaV7-2.war
|
||||
web.docbase.dir=web
|
||||
webinf.dir=web/WEB-INF
|
||||
35
nbproject/project.xml
Normal file
35
nbproject/project.xml
Normal file
@@ -0,0 +1,35 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://www.netbeans.org/ns/project/1">
|
||||
<type>org.netbeans.modules.web.project</type>
|
||||
<configuration>
|
||||
<data xmlns="http://www.netbeans.org/ns/web-project/3">
|
||||
<name>Test2JakartaV7-2</name>
|
||||
<minimum-ant-version>1.6.5</minimum-ant-version>
|
||||
<web-module-libraries>
|
||||
<library dirs="200">
|
||||
<file>${file.reference.jakarta.servlet.jsp.jstl-2.0.0.jar}</file>
|
||||
<path-in-war>WEB-INF/lib</path-in-war>
|
||||
</library>
|
||||
<library dirs="200">
|
||||
<file>${file.reference.jakarta.servlet.jsp.jstl-api-2.0.0.jar}</file>
|
||||
<path-in-war>WEB-INF/lib</path-in-war>
|
||||
</library>
|
||||
<library dirs="200">
|
||||
<file>${file.reference.mysql-connector-java-8.0.23.jar}</file>
|
||||
<path-in-war>WEB-INF/lib</path-in-war>
|
||||
</library>
|
||||
<library dirs="200">
|
||||
<file>${file.reference.mysql-connector-java-8.0.23.jar-1}</file>
|
||||
<path-in-war>WEB-INF/lib</path-in-war>
|
||||
</library>
|
||||
</web-module-libraries>
|
||||
<web-module-additional-libraries/>
|
||||
<source-roots>
|
||||
<root id="src.dir"/>
|
||||
</source-roots>
|
||||
<test-roots>
|
||||
<root id="test.src.dir"/>
|
||||
</test-roots>
|
||||
</data>
|
||||
</configuration>
|
||||
</project>
|
||||
Reference in New Issue
Block a user