From: Roland Haeder Date: Wed, 27 Apr 2016 20:45:14 +0000 (+0200) Subject: Merge branch 'master' of /media/quix0r/INTENSO/Java Project/pizzaservice X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ecc61ded0eecb3f7e638ae5e4bedd9c05d802c0f;p=pizzaservice-core.git Merge branch 'master' of /media/quix0r/INTENSO/Java Project/pizzaservice Signed-off-by: Roland Häder --- ecc61ded0eecb3f7e638ae5e4bedd9c05d802c0f diff --cc .gitattributes index 17cdcd5,dfe0770..712ebf5 --- a/.gitattributes +++ b/.gitattributes @@@ -1,2 -1,2 +1,7 @@@ ++<<<<<<< HEAD +# Use Linux/Uni* line-feed for new lines (prevents converting) +* text=lf ++======= + # Auto detect text files and perform LF normalization + * text=auto ++>>>>>>> 0d1f24c85b058414f76bf28c75ce73dc754cbe5c diff --cc build.xml index a6e9b6a,85ea050..9a6e93c --- a/build.xml +++ b/build.xml @@@ -1,73 -1,61 +1,137 @@@ - - - - - - - - - - - Builds, tests, and runs the project pizzaservice-core. - - - ++<<<<<<< HEAD ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ Builds, tests, and runs the project pizzaservice-core. ++ ++ ++ ++======= + + + + + + + + + + + Builds, tests, and runs the project PizzaService. + + + ++>>>>>>> 0d1f24c85b058414f76bf28c75ce73dc754cbe5c diff --cc lib/nblibraries.properties index 0d47c47,6d0afb5..bf8ac5b --- a/lib/nblibraries.properties +++ b/lib/nblibraries.properties @@@ -1,8 -1,4 +1,15 @@@ - libs.CopyLibs.classpath=\ - ${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar - libs.CopyLibs.displayName=CopyLibs Task - libs.CopyLibs.prop-version=2.0 - libs.jpa20-persistence.classpath=\ - ${base}/jpa20-persistence/javax.persistence_2.1.0.v201304241213.jar - libs.jpa20-persistence.displayName=Persistence (JPA 2.1) - libs.jpa20-persistence.prop-maven-dependencies=org.eclipse.persistence:javax.persistence:2.1.0:jar ++<<<<<<< HEAD + libs.CopyLibs.classpath=\ + ${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar + libs.CopyLibs.displayName=CopyLibs Task + libs.CopyLibs.prop-version=2.0 ++libs.jpa20-persistence.classpath=\ ++ ${base}/jpa20-persistence/javax.persistence_2.1.0.v201304241213.jar ++libs.jpa20-persistence.displayName=Persistence (JPA 2.1) ++libs.jpa20-persistence.prop-maven-dependencies=org.eclipse.persistence:javax.persistence:2.1.0:jar ++======= ++libs.CopyLibs.classpath=\ ++ ${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar ++libs.CopyLibs.displayName=CopyLibs Task ++libs.CopyLibs.prop-version=2.0 ++>>>>>>> 0d1f24c85b058414f76bf28c75ce73dc754cbe5c diff --cc nbproject/build-impl.xml index 8d94110,07b132d..32064c6 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@@ -8,1437 -8,633 +8,2069 @@@ is divided into following sections - initialization - compilation ++<<<<<<< HEAD + - jar + - execution + - debugging + - javadoc + - test compilation + - test execution + - test debugging + - applet + - cleanup + + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must set src.dir + Must set test.src.dir + Must set build.dir + Must set dist.dir + Must set build.classes.dir + Must set dist.javadoc.dir + Must set build.test.classes.dir + Must set build.test.results.dir + Must set build.classes.excludes + Must set dist.jar + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must set javac.includes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + No tests executed. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must set JVM to use for profiling in profiler.info.jvm + Must set profiler agent JVM arguments in profiler.info.jvmargs.agent + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select some files in the IDE or set javac.includes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + To run this application from the command line without Ant, try: + + java -jar "${dist.jar.resolved}" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select one file in the IDE or set run.class + + + + Must select one file in the IDE or set run.class + + + + + + + + + + + + + + + + + + + + + + + Must select one file in the IDE or set debug.class + + + + + Must select one file in the IDE or set debug.class + + + + + Must set fix.includes + + + + + + + + + + This target only works when run from inside the NetBeans IDE. + + + + + + + + + Must select one file in the IDE or set profile.class + This target only works when run from inside the NetBeans IDE. + + + + + + + + + This target only works when run from inside the NetBeans IDE. + + + + + + + + + + + + + This target only works when run from inside the NetBeans IDE. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select one file in the IDE or set run.class + + + + + + Must select some files in the IDE or set test.includes + + + + + Must select one file in the IDE or set run.class + + + + + Must select one file in the IDE or set applet.url + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select some files in the IDE or set javac.includes + + + + + + + + + + + + + + + + + + + + Some tests failed; see details above. + + + + + + + + + Must select some files in the IDE or set test.includes + + + + Some tests failed; see details above. + + + + Must select some files in the IDE or set test.class + Must select some method in the IDE or set test.method + + + + Some tests failed; see details above. + + + + + Must select one file in the IDE or set test.class + + + + Must select one file in the IDE or set test.class + Must select some method in the IDE or set test.method + + + + + + + + + + + + + + Must select one file in the IDE or set applet.url + + + + + + + + + Must select one file in the IDE or set applet.url + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ++======= + - dist + - execution + - debugging + - cleanup + + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must set build.dir + Must set build.generated.dir + Must set dist.dir + Must set build.classes.excludes + Must set dist.jar + + + + The libs.CopyLibs.classpath property is not set up. + This property must point to + org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part + of NetBeans IDE installation and is usually located at + <netbeans_installation>/java<version>/ant/extra folder. + Either open the project in the IDE and make sure CopyLibs library + exists or setup the property manually. For example like this: + ant -Dlibs.CopyLibs.classpath=a/path/to/org-netbeans-modules-java-j2seproject-copylibstask.jar + + + + + + + + + + + + + + + Must set JVM to use for profiling in profiler.info.jvm + Must set profiler agent JVM arguments in profiler.info.jvmargs.agent + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Browser not found, cannot launch the deployed application. Try to set the BROWSER environment variable. + + + Launching ${browse.url} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ++>>>>>>> 0d1f24c85b058414f76bf28c75ce73dc754cbe5c diff --cc nbproject/genfiles.properties index ffaad87,a23d1f8..ebe8d64 --- a/nbproject/genfiles.properties +++ b/nbproject/genfiles.properties @@@ -1,8 -1,8 +1,19 @@@ ++<<<<<<< HEAD +build.xml.data.CRC32=b1744a3a +build.xml.script.CRC32=f71628c3 +build.xml.stylesheet.CRC32=8064a381@1.79.1.48 +# 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=b1744a3a +nbproject/build-impl.xml.script.CRC32=2d7ae9d3 +nbproject/build-impl.xml.stylesheet.CRC32=05530350@1.79.1.48 ++======= + build.xml.data.CRC32=fdc75897 + build.xml.script.CRC32=8e3e9528 + build.xml.stylesheet.CRC32=a5d15b16@1.49.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=6fa7b0ea + nbproject/build-impl.xml.script.CRC32=82732cff + nbproject/build-impl.xml.stylesheet.CRC32=5eea63a6@1.49.1 ++>>>>>>> 0d1f24c85b058414f76bf28c75ce73dc754cbe5c diff --cc nbproject/project.properties index 89b4c20,8fa625d..b365aef --- a/nbproject/project.properties +++ b/nbproject/project.properties @@@ -1,123 -1,45 +1,171 @@@ ++<<<<<<< HEAD +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 +application.title=pizzaservice-core +application.vendor=Cho-Time GmbH +auxiliary.org-netbeans-spi-editor-hints-projects.perProjectHintSettingsFile=nbproject/cfg_hints.xml +build.classes.dir=${build.dir}/classes +build.classes.excludes=**/*.java,**/*.form +# This directory is removed when the project is cleaned: +build.dir=build +build.generated.dir=${build.dir}/generated +build.generated.sources.dir=${build.dir}/generated-sources +# Only compile against the classpath explicitly listed here: +build.sysclasspath=ignore +build.test.classes.dir=${build.dir}/test/classes +build.test.results.dir=${build.dir}/test/results +# Uncomment to specify the preferred debugger connection transport: +#debug.transport=dt_socket +debug.classpath=\ + ${run.classpath} +debug.test.classpath=\ + ${run.test.classpath} +# Files in build.classes.dir which should be excluded from distribution jar +dist.archive.excludes= +# This directory is removed when the project is cleaned: +dist.dir=dist +dist.jar=${dist.dir}/pizzaservice-core.jar +dist.javadoc.dir=${dist.dir}/javadoc +endorsed.classpath= +excludes= +file.reference.jcontacts-business-core.jar=lib/jcontacts-business-core.jar +file.reference.jcontacts-core.jar=lib/jcontacts-core.jar +file.reference.jcore-logger-lib.jar=lib/jcore-logger-lib.jar +file.reference.jcore.jar=lib/jcore.jar +file.reference.jcoreee.jar=lib/jcoreee.jar +file.reference.jcountry-core.jar=lib/jcountry-core.jar +file.reference.jcustomer-core.jar=lib/jcustomer-core.jar +file.reference.jphone-core.jar=lib/jphone-core.jar +file.reference.juser-core.jar=lib/juser-core.jar +includes=** +jar.archive.disabled=${jnlp.enabled} +jar.compress=false +jar.index=${jnlp.enabled} +javac.classpath=\ + ${file.reference.jcore.jar}:\ + ${file.reference.jcoreee.jar}:\ + ${file.reference.jcore-logger-lib.jar}:\ + ${file.reference.jcountry-core.jar}:\ + ${file.reference.jphone-core.jar}:\ + ${file.reference.juser-core.jar}:\ + ${file.reference.jcontacts-core.jar}:\ + ${file.reference.jcontacts-business-core.jar}:\ + ${file.reference.jcustomer-core.jar}:\ + ${libs.jpa20-persistence.classpath} +# Space-separated list of extra javac options +javac.compilerargs=-Xlint:unchecked -Xlint:deprecation +javac.deprecation=true +javac.external.vm=true +javac.processorpath=\ + ${javac.classpath} +javac.source=1.7 +javac.target=1.7 +javac.test.classpath=\ + ${javac.classpath}:\ + ${build.classes.dir} +javac.test.processorpath=\ + ${javac.test.classpath} +javadoc.additionalparam= +javadoc.author=true +javadoc.encoding=${source.encoding} +javadoc.noindex=false +javadoc.nonavbar=false +javadoc.notree=false +javadoc.private=true +javadoc.splitindex=true +javadoc.use=true +javadoc.version=true +javadoc.windowtitle=Pizza-Service Core Library +jnlp.codebase.type=no.codebase +jnlp.descriptor=application +jnlp.enabled=false +jnlp.mixed.code=default +jnlp.offline-allowed=false +jnlp.signed=false +jnlp.signing= +jnlp.signing.alias= +jnlp.signing.keystore= +# Optional override of default Application-Library-Allowable-Codebase attribute identifying the locations where your signed RIA is expected to be found. +manifest.custom.application.library.allowable.codebase= +# Optional override of default Caller-Allowable-Codebase attribute identifying the domains from which JavaScript code can make calls to your RIA without security prompts. +manifest.custom.caller.allowable.codebase= +# Optional override of default Codebase manifest attribute, use to prevent RIAs from being repurposed +manifest.custom.codebase= +# Optional override of default Permissions manifest attribute (supported values: sandbox, all-permissions) +manifest.custom.permissions= +meta.inf.dir=${src.dir}/META-INF +mkdist.disabled=true +platform.active=default_platform +project.license=gpl30 +run.classpath=\ + ${javac.classpath}:\ + ${build.classes.dir} +# Space-separated list of JVM arguments used when running the project. +# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value. +# To set system properties for unit tests define test-sys-prop.name=value: +run.jvmargs= +run.test.classpath=\ + ${javac.test.classpath}:\ + ${build.test.classes.dir} +source.encoding=UTF-8 +source.reference.jcontacts-business-core.jar=../jcore-business-core/src/ +source.reference.jcontacts-core.jar=../jcontacts-core/src/ +source.reference.jcore-logger-lib.jar=../jcore-logger-lib/src/ +source.reference.jcore.jar=../jcore/src/ +source.reference.jcoreee.jar=../jcoreee/src/ +source.reference.jcountry-core.jar=../jcountry-core/src/ +source.reference.jcustomer-core.jar=../jcustomer-core/src/ +source.reference.jphone-core.jar=../jphone-core/src/ +source.reference.juser-core.jar=../juser-core/src/ +src.dir=src +test.src.dir=test ++======= + build.classes.excludes=**/*.java,**/*.form,**/.nbattrs + build.dir=build + build.generated.dir=${build.dir}/generated + client.urlPart= + debug.classpath=${javac.classpath}::${jar.content.additional}:${run.classpath} + display.browser=true + dist.dir=dist + dist.jar=${dist.dir}/${jar.name} + endorsed.classpath= + j2ee.appclient.mainclass.args=${j2ee.appclient.tool.args} + j2ee.compile.on.save=true + j2ee.deploy.on.save=true + j2ee.platform=1.7 + j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar + j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar + j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar + 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 + 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 + j2ee.platform.wsit.classpath= + j2ee.server.type=gfv3ee6 + jar.compress=false + jar.content.additional=\ + ${reference.jshop-ejb.dist-ear}:\ + ${reference.jcore-logger-ejb.dist}:\ + ${reference.jshop-receipt-ejb.dist-ear}:\ + ${reference.PizzaService-ejb.dist-ear} + jar.name=PizzaService.ear + javac.debug=true + javac.deprecation=false + javac.source=1.6 + javac.target=1.6 + meta.inf=src/conf + no.dependencies=false + platform.active=default_platform + project.jcore-logger-ejb=../../NetBeansProjects/jcore-logger-ejb + project.jshop-ejb=../jshop-ejb + project.jshop-receipt-ejb=../jshop-receipt-ejb + project.PizzaService-ejb=../pizzaservice-ejb + reference.jcore-logger-ejb.dist=${project.jcore-logger-ejb}/dist/jcore-logger-ejb.jar + reference.jshop-ejb.dist-ear=${project.jshop-ejb}/dist/jshop-ejb.jar + reference.jshop-receipt-ejb.dist-ear=${project.jshop-receipt-ejb}/dist/jshop-receipt-ejb.jar + reference.PizzaService-ejb.dist-ear=${project.PizzaService-ejb}/dist/PizzaService-ejb.jar + resource.dir=setup + run.classpath= + source.root=. ++>>>>>>> 0d1f24c85b058414f76bf28c75ce73dc754cbe5c diff --cc nbproject/project.xml index ba9f799,46509a6..85a78a3 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@@ -1,18 -1,66 +1,82 @@@ ++<<<<<<< HEAD + org.netbeans.modules.java.j2seproject + + + pizzaservice-core + + + + + + ++======= + org.netbeans.modules.j2ee.earproject + + + PizzaService + 1.6.5 + + + + ${reference.jshop-ejb.dist-ear} + / + + + ${reference.jcore-logger-ejb.dist} + / + + + ${reference.jshop-receipt-ejb.dist-ear} + / + + + ${reference.PizzaService-ejb.dist-ear} + / + + ++>>>>>>> 0d1f24c85b058414f76bf28c75ce73dc754cbe5c .\lib\nblibraries.properties ++<<<<<<< HEAD ++======= + + + PizzaService-ejb + j2ee_ear_archive + + dist-ear + clean-ear + dist-ear + + + jcore-logger-ejb + jar + + dist + clean + dist + + + jshop-ejb + j2ee_ear_archive + + dist-ear + clean-ear + dist-ear + + + jshop-receipt-ejb + j2ee_ear_archive + + dist-ear + clean-ear + dist-ear + + ++>>>>>>> 0d1f24c85b058414f76bf28c75ce73dc754cbe5c