From 47b2a8ddeda678b1db4cb96dcc1ad21006cc1e44 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Wed, 27 Apr 2016 22:49:25 +0200
Subject: [PATCH] Opps, wrong merge ...
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 .gitattributes                                |   5 -
 build.xml                                     |  64 --
 lib/nblibraries.properties                    |   7 -
 nbproject/build-impl.xml                      | 632 ------------------
 nbproject/genfiles.properties                 |  11 -
 nbproject/project.properties                  |  50 +-
 nbproject/project.xml                         |  64 --
 src/conf/MANIFEST.MF                          |   2 -
 src/java/log4j2.xml                           |  34 -
 .../database/BasePizzaDatabaseBean.java       |   2 +-
 10 files changed, 2 insertions(+), 869 deletions(-)
 delete mode 100644 src/conf/MANIFEST.MF
 delete mode 100644 src/java/log4j2.xml

diff --git a/.gitattributes b/.gitattributes
index 712ebf5..17cdcd5 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,7 +1,2 @@
-<<<<<<< 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 --git a/build.xml b/build.xml
index 9a6e93c..b1425ce 100644
--- a/build.xml
+++ b/build.xml
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- You may freely edit this file. See commented blocks below for -->
 <!-- some examples of how to customize the build. -->
@@ -72,66 +71,3 @@
 
     -->
 </project>
-=======
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See commented blocks below for -->
-<!-- some examples of how to customize the build. -->
-<!-- (If you delete it and reopen the project it will be recreated.) -->
-<!-- By default, only the Clean and Build commands use this build script. -->
-<!-- Commands such as Run, Debug, and Test only use this build script if -->
-<!-- the Compile on Save feature is turned off for the project. -->
-<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
-<!-- in the project's Project Properties dialog box.-->
-<project name="PizzaService" default="default" basedir="." xmlns:ear="http://www.netbeans.org/ns/j2ee-earproject/2">
-    <description>Builds, tests, and runs the project PizzaService.</description>
-    <import file="nbproject/build-impl.xml"/>
-    <!--
-
-    There exist several targets which are by default empty and which can be 
-    used for execution of your tasks. These targets are usually executed 
-    before and after some main targets. They are: 
-
-      pre-init:                 called before initialization of project properties 
-      post-init:                called after initialization of project properties 
-      pre-compile:              called before javac compilation 
-      post-compile:             called after javac compilation 
-      pre-dist:                 called before archive building 
-      post-dist:                called after archive building 
-      post-clean:               called after cleaning build products 
-      pre-run-deploy:           called before deploying
-      post-run-deploy:          called after deploying
-
-    Example of pluging an obfuscator after the compilation could look like 
-
-        <target name="post-compile">
-            <obfuscate>
-                <fileset dir="${build.classes.dir}"/>
-            </obfuscate>
-        </target>
-
-    For list of available properties check the imported 
-    nbproject/build-impl.xml file. 
-
-
-    Other way how to customize the build is by overriding existing main targets.
-    The target of interest are: 
-
-      do-dist:                archive building
-      run:                    execution of project 
-
-    Example of overriding the target for project execution could look like 
-
-        <target name="run" depends="<PROJNAME>-impl.jar">
-            <exec dir="bin" executable="launcher.exe">
-                <arg file="${dist.jar}"/>
-            </exec>
-        </target>
-
-    Notice that overridden target depends on jar target and not only on 
-    compile target as regular run target does. Again, for list of available 
-    properties which you can use check the target you are overriding in 
-    nbproject/build-impl.xml file. 
-
-	-->
-</project>
->>>>>>> 0d1f24c85b058414f76bf28c75ce73dc754cbe5c
diff --git a/lib/nblibraries.properties b/lib/nblibraries.properties
index bf8ac5b..2bb16db 100644
--- a/lib/nblibraries.properties
+++ b/lib/nblibraries.properties
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 libs.CopyLibs.classpath=\
     ${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar
 libs.CopyLibs.displayName=CopyLibs Task
@@ -7,9 +6,3 @@ 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 --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 32064c6..8d94110 100644
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -8,7 +8,6 @@ is divided into following sections:
 
   - initialization
   - compilation
-<<<<<<< HEAD
   - jar
   - execution
   - debugging
@@ -1442,635 +1441,4 @@ is divided into following sections:
             </propertyset>
         </ant>
     </target>
-=======
-  - dist
-  - execution
-  - debugging
-  - cleanup
-
--->
-<project xmlns:ear2="http://www.netbeans.org/ns/j2ee-earproject/2" basedir=".." default="default" name="PizzaService-impl">
-	<import file="ant-deploy.xml"/>
-	<fail message="Please build using Ant 1.7.1 or higher.">
-		<condition>
-			<not>
-				<antversion atleast="1.7.1"/>
-			</not>
-		</condition>
-	</fail>
-	<target depends="dist" description="Build whole project." name="default"/>
-	<!--
-	INITIALIZATION SECTION
-	-->
-	<target name="pre-init">
-		<!-- Empty placeholder for easier customization. -->
-		<!-- You can override this target in the ../build.xml file. -->
-	</target>
-	<target depends="pre-init" name="init-private">
-		<property file="nbproject/private/private.properties"/>
-	</target>
-	<target depends="pre-init,init-private" name="init-userdir">
-		<property location="${netbeans.user}/build.properties" name="user.properties.file"/>
-	</target>
-	<target depends="pre-init,init-private,init-userdir" name="init-user">
-		<property file="${user.properties.file}"/>
-	</target>
-	<target depends="pre-init,init-private,init-userdir,init-user" name="init-project">
-		<property file="nbproject/project.properties"/>
-	</target>
-	<target depends="pre-init,init-private,init-userdir,init-user,init-project" name="do-init">
-		<!-- The two properties below are usually overridden -->
-		<!-- by the active platform. Just a fallback. -->
-		<property name="default.javac.source" value="1.4"/>
-		<property name="default.javac.target" value="1.4"/>
-		<condition property="do.compile.jsps">
-			<istrue value="${compile.jsps}"/>
-		</condition>
-		<condition property="do.display.browser.old">
-			<and>
-				<istrue value="${display.browser}"/>
-				<isset property="client.module.uri"/>
-				<not>
-					<isset property="app.client"/>
-				</not>
-				<not>
-					<isset property="browser.context"/>
-				</not>
-			</and>
-		</condition>
-		<condition property="do.display.browser">
-			<and>
-				<istrue value="${display.browser}"/>
-				<isset property="client.module.uri"/>
-				<not>
-					<isset property="app.client"/>
-				</not>
-				<isset property="browser.context"/>
-			</and>
-		</condition>
-		<available file="${meta.inf}/MANIFEST.MF" property="has.custom.manifest"/>
-		<!--
-			Variables needed to support directory deployment.
-		-->
-		<condition property="do.package.with.custom.manifest.not.directory.deploy">
-			<and>
-				<isset property="has.custom.manifest"/>
-				<isfalse value="${directory.deployment.supported}"/>
-			</and>
-		</condition>
-		<condition property="do.package.without.custom.manifest.not.directory.deploy">
-			<and>
-				<not>
-					<isset property="has.custom.manifest"/>
-				</not>
-				<isfalse value="${directory.deployment.supported}"/>
-			</and>
-		</condition>
-		<condition property="do.package.not.directory.deploy">
-			<isfalse value="${directory.deployment.supported}"/>
-		</condition>
-		<!--End Variables needed to support directory deployment.-->
-		<condition else="" property="j2ee.appclient.mainclass.tool.param" value="-mainclass ${main.class}">
-			<and>
-				<isset property="main.class"/>
-				<not>
-					<equals arg1="${main.class}" arg2="" trim="true"/>
-				</not>
-			</and>
-		</condition>
-		<condition else="" property="j2ee.appclient.jvmoptions.param" value="${j2ee.appclient.jvmoptions}">
-			<and>
-				<isset property="j2ee.appclient.jvmoptions"/>
-				<not>
-					<equals arg1="${j2ee.appclient.jvmoptions}" arg2="" trim="true"/>
-				</not>
-			</and>
-		</condition>
-		<condition else="" property="application.args.param" value="${application.args}">
-			<and>
-				<isset property="application.args"/>
-				<not>
-					<equals arg1="${application.args}" arg2="" trim="true"/>
-				</not>
-			</and>
-		</condition>
-		<condition property="can.debug.appclient">
-			<and>
-				<isset property="netbeans.home"/>
-				<isset property="app.client"/>
-			</and>
-		</condition>
-		<path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
-		<condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
-			<and>
-				<isset property="endorsed.classpath"/>
-				<length length="0" string="${endorsed.classpath}" when="greater"/>
-			</and>
-		</condition>
-	</target>
-	<target depends="init" name="-init-cos">
-		<condition else="false" property="build.deploy.on.save">
-			<or>
-				<istrue value="${j2ee.deploy.on.save}"/>
-				<istrue value="${j2ee.compile.on.save}"/>
-			</or>
-		</condition>
-	</target>
-	<target name="post-init">
-		<!-- Empty placeholder for easier customization. -->
-		<!-- You can override this target in the ../build.xml file. -->
-	</target>
-	<target depends="pre-init,init-private,init-userdir,init-user,init-project,do-init" name="init-check">
-		<fail unless="build.dir">Must set build.dir</fail>
-		<fail unless="build.generated.dir">Must set build.generated.dir</fail>
-		<fail unless="dist.dir">Must set dist.dir</fail>
-		<fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
-		<fail unless="dist.jar">Must set dist.jar</fail>
-	</target>
-	<target name="-init-taskdefs">
-		<fail unless="libs.CopyLibs.classpath">
-			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
-&lt;netbeans_installation&gt;/java&lt;version&gt;/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
-		</fail>
-		<taskdef classpath="${libs.CopyLibs.classpath}" resource="org/netbeans/modules/java/j2seproject/copylibstask/antlib.xml"/>
-	</target>
-	<!--
-		pre NB7.2 profiling section; consider it deprecated
-	-->
-	<target depends="-profile-pre-init, init, -profile-post-init, -profile-init-check" if="profiler.info.jvmargs.agent" name="profile-init"/>
-	<target if="profiler.info.jvmargs.agent" name="-profile-pre-init">
-		<!-- Empty placeholder for easier customization. -->
-		<!-- You can override this target in the ../build.xml file. -->
-	</target>
-	<target if="profiler.info.jvmargs.agent" name="-profile-post-init">
-		<!-- Empty placeholder for easier customization. -->
-		<!-- You can override this target in the ../build.xml file. -->
-	</target>
-	<target depends="-profile-pre-init, init, -profile-post-init" if="profiler.info.jvmargs.agent" name="-profile-init-check">
-		<fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
-		<fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
-	</target>
-	<!--
-		end of pre NB7.2 profiling section
-	-->
-	<target depends="pre-init,init-private,init-userdir,init-user,init-project,do-init,post-init,init-check,-init-taskdefs" name="init"/>
-	<!--
-	COMPILATION SECTION
-	-->
-	<target depends="init" name="deps-jar" unless="no.deps">
-		<condition property="build.deploy.on.save" value="false">
-			<not>
-				<isset property="build.deploy.on.save"/>
-			</not>
-		</condition>
-	</target>
-	<target depends="init" name="deps-j2ee-archive" unless="no.deps">
-		<condition property="build.deploy.on.save" value="false">
-			<not>
-				<isset property="build.deploy.on.save"/>
-			</not>
-		</condition>
-		<ant antfile="${project.jshop-ejb}/build.xml" inheritall="false" target="dist-ear">
-			<property location="${build.dir}" name="dist.ear.dir"/>
-			<property name="deploy.on.save" value="${build.deploy.on.save}"/>
-		</ant>
-	</target>
-	<target depends="init,deps-jar,deps-j2ee-archive" name="pre-pre-compile"/>
-	<target name="pre-compile">
-		<!-- Empty placeholder for easier customization. -->
-		<!-- You can override this target in the ../build.xml file. -->
-	</target>
-	<target depends="init,deps-jar,pre-pre-compile,pre-compile,-do-compile-deps" name="do-compile">
-		<copy todir="${build.dir}/META-INF">
-			<fileset dir="${meta.inf}"/>
-		</copy>
-	</target>
-	<target depends="init,deps-jar,pre-pre-compile,pre-compile" name="-do-compile-deps">
-		<copyfiles files="${reference.jshop-ejb.dist-ear}" todir="${build.dir}//"/>
-	</target>
-	<target name="post-compile">
-		<!-- Empty placeholder for easier customization. -->
-		<!-- You can override this target in the ../build.xml file. -->
-	</target>
-	<target depends="init,deps-jar,pre-pre-compile,pre-compile,do-compile,post-compile" description="Compile project." name="compile"/>
-	<!--
-		DIST BUILDING SECTION
-	-->
-	<target name="pre-dist">
-		<!-- Empty placeholder for easier customization. -->
-		<!-- You can override this target in the ../build.xml file. -->
-	</target>
-	<target depends="init,compile,pre-dist" name="do-dist-without-manifest" unless="has.custom.manifest">
-		<dirname file="${dist.jar}" property="dist.jar.dir"/>
-		<mkdir dir="${dist.jar.dir}"/>
-		<jar compress="${jar.compress}" jarfile="${dist.jar}">
-			<fileset dir="${build.dir}"/>
-		</jar>
-	</target>
-	<target depends="init,compile,pre-dist" if="has.custom.manifest" name="do-dist-with-manifest">
-		<dirname file="${dist.jar}" property="dist.jar.dir"/>
-		<mkdir dir="${dist.jar.dir}"/>
-		<jar compress="${jar.compress}" jarfile="${dist.jar}" manifest="${meta.inf}/MANIFEST.MF">
-			<fileset dir="${build.dir}"/>
-		</jar>
-	</target>
-	<!--
-		TARGETS NEEDED TO SUPPORT DIRECTORY DEPLOYMENT
-	-->
-	<target depends="init,compile,pre-dist" if="do.package.without.custom.manifest.not.directory.deploy" name="-do-tmp-dist-without-manifest">
-		<dirname file="${dist.jar}" property="dist.jar.dir"/>
-		<mkdir dir="${dist.jar.dir}"/>
-		<jar compress="${jar.compress}" jarfile="${dist.jar}">
-			<fileset dir="${build.dir}"/>
-		</jar>
-	</target>
-	<target depends="init,compile,pre-dist" if="do.package.with.custom.manifest.not.directory.deploy" name="-do-tmp-dist-with-manifest">
-		<dirname file="${dist.jar}" property="dist.jar.dir"/>
-		<mkdir dir="${dist.jar.dir}"/>
-		<jar compress="${jar.compress}" jarfile="${dist.jar}" manifest="${meta.inf}/MANIFEST.MF">
-			<fileset dir="${build.dir}"/>
-		</jar>
-	</target>
-	<target depends="init,compile,pre-dist,-do-tmp-dist-without-manifest,-do-tmp-dist-with-manifest" name="-do-dist-directory-deploy"/>
-	<target depends="init,compile,pre-dist,-do-dist-directory-deploy,post-dist" description="Build distribution (JAR) - if directory deployment is not supported." name="dist-directory-deploy"/>
-	<!--
-		END TARGETS NEEDED TO SUPPORT DIRECTORY DEPLOYMENT
-	-->
-	<target name="post-dist">
-		<!-- Empty placeholder for easier customization. -->
-		<!-- You can override this target in the ../build.xml file. -->
-	</target>
-	<target depends="init,compile,pre-dist,do-dist-without-manifest,do-dist-with-manifest,post-dist" description="Build distribution (JAR)." name="dist"/>
-	<!--
-	EXECUTION SECTION
-	-->
-	<target depends="run-deploy,run-display-browser,run-ac" description="Deploy to server." name="run"/>
-	<target name="pre-run-deploy">
-		<!-- Empty placeholder for easier customization. -->
-		<!-- You can override this target in the ../build.xml file. -->
-	</target>
-	<target name="post-run-deploy">
-		<!-- Empty placeholder for easier customization. -->
-		<!-- You can override this target in the ../build.xml file. -->
-	</target>
-	<target name="-pre-nbmodule-run-deploy">
-		<!-- Empty placeholder for easier customization. -->
-		<!-- This target can be overriden by NetBeans modules. Don't override it directly, use -pre-run-deploy task instead. -->
-	</target>
-	<target name="-post-nbmodule-run-deploy">
-		<!-- Empty placeholder for easier customization. -->
-		<!-- This target can be overriden by NetBeans modules. Don't override it directly, use -post-run-deploy task instead. -->
-	</target>
-	<target name="-run-deploy-am" unless="no.deps">
-		<!-- Task to deploy to the Access Manager runtime. -->
-		<ant antfile="${project.jshop-ejb}/build.xml" inheritall="false" target="-run-deploy-am"/>
-	</target>
-	<target depends="-init-cos,dist-directory-deploy,pre-run-deploy,-pre-nbmodule-run-deploy,-run-deploy-nb,-init-deploy-ant,-deploy-ant,-run-deploy-am,-post-nbmodule-run-deploy,post-run-deploy" name="run-deploy"/>
-	<target if="netbeans.home" name="-run-deploy-nb">
-		<nbdeploy clientModuleUri="${client.module.uri}" clientUrlPart="${client.urlPart}" debugmode="false" forceRedeploy="${forceRedeploy}"/>
-	</target>
-	<target name="-init-deploy-ant" unless="netbeans.home">
-		<property name="deploy.ant.archive" value="${dist.jar}"/>
-		<property name="deploy.ant.resource.dir" value="${resource.dir}"/>
-		<property name="deploy.ant.enabled" value="true"/>
-	</target>
-	<target depends="dist,-run-undeploy-nb,-init-deploy-ant,-undeploy-ant" name="run-undeploy"/>
-	<target if="netbeans.home" name="-run-undeploy-nb">
-		<fail message="Undeploy is not supported from within the IDE"/>
-	</target>
-	<target depends="dist" name="verify">
-		<nbverify file="${dist.jar}"/>
-	</target>
-	<target depends="run-deploy,-init-display-browser,-display-browser-nb-old,-display-browser-nb,-display-browser-cl" name="run-display-browser"/>
-	<target if="do.display.browser" name="-init-display-browser">
-		<condition property="do.display.browser.nb.old">
-			<and>
-				<isset property="netbeans.home"/>
-				<not>
-					<isset property="browser.context"/>
-				</not>
-			</and>
-		</condition>
-		<condition property="do.display.browser.nb">
-			<and>
-				<isset property="netbeans.home"/>
-				<isset property="browser.context"/>
-			</and>
-		</condition>
-		<condition property="do.display.browser.cl">
-			<and>
-				<isset property="deploy.ant.enabled"/>
-				<isset property="deploy.ant.client.url"/>
-			</and>
-		</condition>
-	</target>
-	<target if="do.display.browser.nb.old" name="-display-browser-nb-old">
-		<nbbrowse url="${client.url}"/>
-	</target>
-	<target if="do.display.browser.nb" name="-display-browser-nb">
-		<nbbrowse context="${browser.context}" url="${client.url}" urlPath="${client.urlPart}"/>
-	</target>
-	<target if="do.display.browser.cl" name="-get-browser" unless="browser">
-		<condition property="browser" value="rundll32">
-			<os family="windows"/>
-		</condition>
-		<condition else="" property="browser.args" value="url.dll,FileProtocolHandler">
-			<os family="windows"/>
-		</condition>
-		<condition property="browser" value="/usr/bin/open">
-			<os family="mac"/>
-		</condition>
-		<property environment="env"/>
-		<condition property="browser" value="${env.BROWSER}">
-			<isset property="env.BROWSER"/>
-		</condition>
-		<condition property="browser" value="/usr/bin/firefox">
-			<available file="/usr/bin/firefox"/>
-		</condition>
-		<condition property="browser" value="/usr/local/firefox/firefox">
-			<available file="/usr/local/firefox/firefox"/>
-		</condition>
-		<condition property="browser" value="/usr/bin/mozilla">
-			<available file="/usr/bin/mozilla"/>
-		</condition>
-		<condition property="browser" value="/usr/local/mozilla/mozilla">
-			<available file="/usr/local/mozilla/mozilla"/>
-		</condition>
-		<condition property="browser" value="/usr/sfw/lib/firefox/firefox">
-			<available file="/usr/sfw/lib/firefox/firefox"/>
-		</condition>
-		<condition property="browser" value="/opt/csw/bin/firefox">
-			<available file="/opt/csw/bin/firefox"/>
-		</condition>
-		<condition property="browser" value="/usr/sfw/lib/mozilla/mozilla">
-			<available file="/usr/sfw/lib/mozilla/mozilla"/>
-		</condition>
-		<condition property="browser" value="/opt/csw/bin/mozilla">
-			<available file="/opt/csw/bin/mozilla"/>
-		</condition>
-	</target>
-	<target depends="-get-browser" if="do.display.browser.cl" name="-display-browser-cl">
-		<fail unless="browser">
-			Browser not found, cannot launch the deployed application. Try to set the BROWSER environment variable.
-		</fail>
-		<property name="browse.url" value="${deploy.ant.client.url}${client.urlPart}"/>
-		<echo>Launching ${browse.url}</echo>
-		<exec executable="${browser}" spawn="true">
-			<arg line="${browser.args} ${browse.url}"/>
-		</exec>
-	</target>
-	<target if="app.client" name="run-ac">
-		<antcall target="-run-ac"/>
-	</target>
-	<target depends="init,-as-retrieve-option-workaround,-init-run-macros,-run-appclient-pregfv3,-run-appclient" name="-run-ac"/>
-	<target if="j2ee.appclient.tool.args" name="-run-appclient-pregfv3">
-		<ear2:run-appclient-pregfv3/>
-	</target>
-	<target name="-run-appclient" unless="j2ee.appclient.tool.args">
-		<ear2:run-appclient subprojectname="${app.client}"/>
-	</target>
-	<target if="j2ee.appclient.mainclass.args" name="-as-retrieve-option-workaround" unless="j2ee.clientName">
-		<property name="client.jar" value="${dist.dir}/PizzaServiceClient.jar"/>
-		<sleep seconds="3"/>
-		<copy failonerror="false" file="${wa.copy.client.jar.from}/PizzaService/PizzaServiceClient.jar" todir="${dist.dir}"/>
-		<copy failonerror="false" flatten="true" todir="${dist.dir}/">
-			<fileset dir="${wa.copy.client.jar.from}/PizzaService" includes="**/PizzaServiceClient.jar"/>
-		</copy>
-		<copy flatten="true" todir="${dist.dir}/PizzaServiceClient">
-			<fileset dir="${wa.copy.client.jar.from}/PizzaService" includes="**/*.*ar"/>
-		</copy>
-		<copy failonerror="false" flatten="false" todir="${dist.dir}/PizzaServiceClient">
-			<fileset dir="${dist.dir}/gfdeploy/PizzaService" includes="**/*.jar"/>
-		</copy>
-	</target>
-	<target depends="init" name="-init-run-macros">
-		<macrodef name="run-appclient" uri="http://www.netbeans.org/ns/j2ee-earproject/2">
-			<attribute name="subprojectname"/>
-			<attribute default="${application.args.param}" name="args"/>
-			<element name="customize" optional="true"/>
-			<sequential>
-				<java dir="${basedir}" fork="true" jar="${client.jar}">
-					<jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-					<jvmarg line="${j2ee.appclient.tool.jvmoptions}${client.jar},arg=-name,arg=@{subprojectname}"/>
-					<jvmarg line="${j2ee.appclient.jvmoptions.param}"/>
-					<arg line="@{args}"/>
-					<syspropertyset>
-						<propertyref prefix="run-sys-prop."/>
-						<mapper from="run-sys-prop.*" to="*" type="glob"/>
-					</syspropertyset>
-					<customize/>
-				</java>
-			</sequential>
-		</macrodef>
-		<macrodef name="run-appclient-pregfv3" uri="http://www.netbeans.org/ns/j2ee-earproject/2">
-			<element name="customize" optional="true"/>
-			<sequential>
-				<java classname="${j2ee.appclient.tool.mainclass}" fork="true">
-					<jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-					<jvmarg line="${j2ee.appclient.tool.jvmoptions}"/>
-					<jvmarg line="${j2ee.appclient.jvmoptions.param}"/>
-					<arg line="${j2ee.appclient.tool.args}"/>
-					<arg line="-client ${client.jar}"/>
-					<arg line="${j2ee.appclient.mainclass.tool.param}"/>
-					<arg line="${application.args.param}"/>
-					<classpath>
-						<path path="${j2ee.platform.classpath}:${j2ee.appclient.tool.runtime}"/>
-					</classpath>
-					<syspropertyset>
-						<propertyref prefix="run-sys-prop."/>
-						<mapper from="run-sys-prop.*" to="*" type="glob"/>
-					</syspropertyset>
-					<customize/>
-				</java>
-			</sequential>
-		</macrodef>
-	</target>
-	<!--
-	DEBUGGING SECTION
-	-->
-	<target depends="run-debug,run-debug-appclient" description="Deploy to server." name="debug"/>
-	<target depends="dist" description="Debug project in IDE." if="netbeans.home" name="run-debug" unless="app.client">
-		<nbdeploy clientModuleUri="${client.module.uri}" clientUrlPart="${client.urlPart}" debugmode="true"/>
-		<antcall target="connect-debugger"/>
-		<antcall target="debug-display-browser-old"/>
-		<antcall target="debug-display-browser"/>
-	</target>
-	<target name="connect-debugger" unless="is.debugged">
-		<condition property="listeningcp" value="sourcepath">
-			<istrue value="${j2ee.compile.on.save}"/>
-		</condition>
-		<nbjpdaconnect address="${jpda.address}" host="${jpda.host}" listeningcp="${listeningcp}" name="${jpda.host}:${jpda.address}" transport="${jpda.transport}">
-			<classpath>
-				<path path="${debug.classpath}"/>
-				<fileset dir="${build.dir}" includes="lib/*.jar"/>
-			</classpath>
-			<sourcepath>
-				<path path="${ear.docbase.dirs}"/>
-			</sourcepath>
-		</nbjpdaconnect>
-	</target>
-	<target if="do.display.browser.old" name="debug-display-browser-old">
-		<nbbrowse url="${client.url}"/>
-	</target>
-	<target if="do.display.browser" name="debug-display-browser">
-		<nbbrowse context="${browser.context}" url="${client.url}" urlPath="${client.urlPart}"/>
-	</target>
-	<target if="can.debug.appclient" name="run-debug-appclient">
-		<antcall target="-run-debug-appclient"/>
-	</target>
-	<target depends="init,-init-debug-args,-debug-appclient-deploy,-as-retrieve-option-workaround,-init-debug-macros,-debug-appclient-start-nbjpda,-debug-appclient-pregfv3,-debug-appclient,connect-debugger" name="-run-debug-appclient"/>
-	<target name="-init-debug-args">
-		<property name="version-output" value="java version &quot;${ant.java.version}"/>
-		<condition property="have-jdk-older-than-1.4">
-			<or>
-				<contains string="${version-output}" substring="java version &quot;1.0"/>
-				<contains string="${version-output}" substring="java version &quot;1.1"/>
-				<contains string="${version-output}" substring="java version &quot;1.2"/>
-				<contains string="${version-output}" substring="java version &quot;1.3"/>
-			</or>
-		</condition>
-		<condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
-			<istrue value="${have-jdk-older-than-1.4}"/>
-		</condition>
-	</target>
-	<target depends="init,-init-debug-args,-as-retrieve-option-workaround,-init-run-macros" name="-init-debug-macros">
-		<condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
-			<os family="windows"/>
-		</condition>
-		<condition else="${debug-transport-by-os}" property="debug-transport-appclient" value="${debug.transport}">
-			<isset property="debug.transport"/>
-		</condition>
-		<macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2ee-earproject/2">
-			<attribute default="${main.class}" name="name"/>
-			<attribute default="${debug.classpath}" name="classpath"/>
-			<attribute default="" name="stopclassname"/>
-			<sequential>
-				<nbjpdastart addressproperty="jpda.address.appclient" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport-appclient}">
-					<classpath>
-						<path path="@{classpath}"/>
-					</classpath>
-				</nbjpdastart>
-			</sequential>
-		</macrodef>
-		<macrodef name="debug-appclient" uri="http://www.netbeans.org/ns/j2ee-earproject/2">
-			<attribute name="subprojectname"/>
-			<sequential>
-				<ear2:run-appclient subprojectname="@{subprojectname}">
-					<customize>
-						<jvmarg value="-Xrunjdwp:transport=${debug-transport-appclient},address=${jpda.address.appclient}"/>
-						<jvmarg line="${debug-args-line}"/>
-					</customize>
-				</ear2:run-appclient>
-			</sequential>
-		</macrodef>
-		<macrodef name="debug-appclient-pregfv3" uri="http://www.netbeans.org/ns/j2ee-earproject/2">
-			<sequential>
-				<ear2:run-appclient-pregfv3>
-					<customize>
-						<jvmarg value="-Xrunjdwp:transport=${debug-transport-appclient},address=${jpda.address.appclient}"/>
-						<jvmarg line="${debug-args-line}"/>
-					</customize>
-				</ear2:run-appclient-pregfv3>
-			</sequential>
-		</macrodef>
-	</target>
-	<target name="-debug-appclient-deploy">
-		<nbstartserver debugmode="true"/>
-		<nbdeploy clientModuleUri="${client.module.uri}" clientUrlPart="${client.urlPart}" debugmode="true"/>
-	</target>
-	<target name="-debug-appclient-start-nbjpda">
-		<ear2:nbjpdastart classpath="" name="${app.client}"/>
-	</target>
-	<target if="j2ee.appclient.tool.args" name="-debug-appclient-pregfv3">
-		<ear2:debug-appclient-pregfv3/>
-	</target>
-	<target name="-debug-appclient" unless="j2ee.appclient.tool.args">
-		<ear2:debug-appclient subprojectname="${app.client}"/>
-	</target>
-	<!--
-	=================
-	PROFILING SECTION
-	=================
-	-->
-	<!--
-		pre NB7.2 profiling section; consider it deprecated
-	-->
-	<target description="Profile a J2EE project in the IDE." if="profiler.info.jvmargs.agent" name="-profile-pre72">
-		<condition else="start-profiled-server" property="profiler.startserver.target" value="start-profiled-server-extraargs">
-			<isset property="profiler.info.jvmargs.extra"/>
-		</condition>
-		<antcall target="${profiler.startserver.target}"/>
-		<antcall target="run"/>
-		<antcall target="-profile-start-loadgen"/>
-	</target>
-	<target name="start-profiled-server">
-		<nbstartprofiledserver forceRestart="${profiler.j2ee.serverForceRestart}" javaPlatform="${profiler.info.javaPlatform}" startupTimeout="${profiler.j2ee.serverStartupTimeout}">
-			<jvmarg value="${profiler.info.jvmargs.agent}"/>
-			<jvmarg value="${profiler.j2ee.agentID}"/>
-		</nbstartprofiledserver>
-	</target>
-	<target name="start-profiled-server-extraargs">
-		<nbstartprofiledserver forceRestart="${profiler.j2ee.serverForceRestart}" javaPlatform="${profiler.info.javaPlatform}" startupTimeout="${profiler.j2ee.serverStartupTimeout}">
-			<jvmarg value="${profiler.info.jvmargs.extra}"/>
-			<jvmarg value="${profiler.info.jvmargs.agent}"/>
-			<jvmarg value="${profiler.j2ee.agentID}"/>
-		</nbstartprofiledserver>
-	</target>
-	<!--
-		end of pre NB7.2 profiling section
-	-->
-	<target if="netbeans.home" name="-profile-check">
-		<condition property="profiler.configured">
-			<or>
-				<contains casesensitive="true" string="${run.jvmargs.ide}" substring="-agentpath:"/>
-				<contains casesensitive="true" string="${run.jvmargs.ide}" substring="-javaagent:"/>
-			</or>
-		</condition>
-	</target>
-	<target depends="dist" name="-do-profile">
-		<startprofiler/>
-		<nbstartserver profilemode="true"/>
-		<nbdeploy clientUrlPart="${client.urlPart}" forceRedeploy="true" profilemode="true"/>
-		<antcall target="-profile-start-loadgen"/>
-	</target>
-	<target depends="-profile-check,-profile-pre72" description="Profile a J2EE project in the IDE." if="profiler.configured" name="profile">
-		<antcall target="-do-profile"/>
-	</target>
-	<target if="profiler.loadgen.path" name="-profile-start-loadgen">
-		<loadgenstart path="${profiler.loadgen.path}"/>
-	</target>
-	<!--
-	CLEANUP SECTION
-	-->
-	<target depends="init" name="deps-clean" unless="no.deps">
-		<condition property="build.deploy.on.save" value="false">
-			<not>
-				<isset property="build.deploy.on.save"/>
-			</not>
-		</condition>
-		<ant antfile="${project.jshop-ejb}/build.xml" inheritall="false" target="clean-ear">
-			<property location="${build.dir}" name="dist.ear.dir"/>
-			<property name="deploy.on.save" value="${build.deploy.on.save}"/>
-		</ant>
-	</target>
-	<target depends="init" name="do-clean">
-		<delete dir="${build.dir}"/>
-		<delete dir="${dist.dir}"/>
-		<delete dir="${build.dir}"/>
-	</target>
-	<target depends="init" if="netbeans.home" name="undeploy-clean">
-		<nbundeploy failOnError="false" startServer="false"/>
-	</target>
-	<target name="post-clean">
-		<!-- Empty placeholder for easier customization. -->
-		<!-- You can override this target in the ../build.xml file. -->
-	</target>
-	<target depends="init,undeploy-clean,deps-clean,do-clean,post-clean" description="Clean build products." name="clean"/>
->>>>>>> 0d1f24c85b058414f76bf28c75ce73dc754cbe5c
 </project>
diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index ebe8d64..ffaad87 100644
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 build.xml.data.CRC32=b1744a3a
 build.xml.script.CRC32=f71628c3
 build.xml.stylesheet.CRC32=8064a381@1.79.1.48
@@ -7,13 +6,3 @@ build.xml.stylesheet.CRC32=8064a381@1.79.1.48
 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 --git a/nbproject/project.properties b/nbproject/project.properties
index b365aef..a7b8c91 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -1,11 +1,10 @@
-<<<<<<< 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
+application.vendor=rhaeder
 auxiliary.org-netbeans-spi-editor-hints-projects.perProjectHintSettingsFile=nbproject/cfg_hints.xml
 build.classes.dir=${build.dir}/classes
 build.classes.excludes=**/*.java,**/*.form
@@ -122,50 +121,3 @@ 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 --git a/nbproject/project.xml b/nbproject/project.xml
index 85a78a3..ba9f799 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://www.netbeans.org/ns/project/1">
-<<<<<<< HEAD
     <type>org.netbeans.modules.java.j2seproject</type>
     <configuration>
         <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
@@ -11,72 +10,9 @@
             <test-roots>
                 <root id="test.src.dir"/>
             </test-roots>
-=======
-    <type>org.netbeans.modules.j2ee.earproject</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/j2ee-earproject/2">
-            <name>PizzaService</name>
-            <minimum-ant-version>1.6.5</minimum-ant-version>
-            <web-module-libraries/>
-            <web-module-additional-libraries>
-                <library>
-                    <file>${reference.jshop-ejb.dist-ear}</file>
-                    <path-in-war>/</path-in-war>
-                </library>
-                <library>
-                    <file>${reference.jcore-logger-ejb.dist}</file>
-                    <path-in-war>/</path-in-war>
-                </library>
-                <library>
-                    <file>${reference.jshop-receipt-ejb.dist-ear}</file>
-                    <path-in-war>/</path-in-war>
-                </library>
-                <library>
-                    <file>${reference.PizzaService-ejb.dist-ear}</file>
-                    <path-in-war>/</path-in-war>
-                </library>
-            </web-module-additional-libraries>
->>>>>>> 0d1f24c85b058414f76bf28c75ce73dc754cbe5c
         </data>
         <libraries xmlns="http://www.netbeans.org/ns/ant-project-libraries/1">
             <definitions>.\lib\nblibraries.properties</definitions>
         </libraries>
-<<<<<<< HEAD
-=======
-        <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
-            <reference>
-                <foreign-project>PizzaService-ejb</foreign-project>
-                <artifact-type>j2ee_ear_archive</artifact-type>
-                <script>build.xml</script>
-                <target>dist-ear</target>
-                <clean-target>clean-ear</clean-target>
-                <id>dist-ear</id>
-            </reference>
-            <reference>
-                <foreign-project>jcore-logger-ejb</foreign-project>
-                <artifact-type>jar</artifact-type>
-                <script>build.xml</script>
-                <target>dist</target>
-                <clean-target>clean</clean-target>
-                <id>dist</id>
-            </reference>
-            <reference>
-                <foreign-project>jshop-ejb</foreign-project>
-                <artifact-type>j2ee_ear_archive</artifact-type>
-                <script>build.xml</script>
-                <target>dist-ear</target>
-                <clean-target>clean-ear</clean-target>
-                <id>dist-ear</id>
-            </reference>
-            <reference>
-                <foreign-project>jshop-receipt-ejb</foreign-project>
-                <artifact-type>j2ee_ear_archive</artifact-type>
-                <script>build.xml</script>
-                <target>dist-ear</target>
-                <clean-target>clean-ear</clean-target>
-                <id>dist-ear</id>
-            </reference>
-        </references>
->>>>>>> 0d1f24c85b058414f76bf28c75ce73dc754cbe5c
     </configuration>
 </project>
diff --git a/src/conf/MANIFEST.MF b/src/conf/MANIFEST.MF
deleted file mode 100644
index 59499bc..0000000
--- a/src/conf/MANIFEST.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-
diff --git a/src/java/log4j2.xml b/src/java/log4j2.xml
deleted file mode 100644
index 12e0868..0000000
--- a/src/java/log4j2.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (C) 2016 Roland Haeder
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
--->
-<Configuration status="INFO">
-	<Appenders>
-		<Console name="console" target="SYSTEM_OUT">
-			<PatternLayout pattern="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
-		</Console>
-	</Appenders>
-
-	<Loggers>
-		<Root level="TRACE">
-			<AppenderRef ref="console" />
-		</Root>
-
-		<Logger name="org.mxchange.jcore.BaseFrameworkSystem" level="INFO">
-			<AppenderRef ref="console" />
-		</Logger>
-	</Loggers>
-</Configuration>
diff --git a/src/org/mxchange/pizzaaplication/database/BasePizzaDatabaseBean.java b/src/org/mxchange/pizzaaplication/database/BasePizzaDatabaseBean.java
index 821020a..dad0573 100644
--- a/src/org/mxchange/pizzaaplication/database/BasePizzaDatabaseBean.java
+++ b/src/org/mxchange/pizzaaplication/database/BasePizzaDatabaseBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Cho-Time GmbH
+ * Copyright (C) 2016 Roland Haeder
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
-- 
2.39.5