Merge branch 'master' of e:/Java Project/pizzaservice

Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
	PizzaService-ejb/nbproject/build-impl.xml
	PizzaService-ejb/nbproject/genfiles.properties
	PizzaService-ejb/nbproject/project.xml

diff --git a/PizzaService-ejb/nbproject/build-impl.xml b/PizzaService-ejb/nbproject/build-impl.xml
index a1e704dcfcfd261b2a49b57063cf166ea9292b96..84402edea712c8aff45f98a9109f18375a5753fe 100644 (file)
--- a/PizzaService-ejb/nbproject/build-impl.xml
+++ b/PizzaService-ejb/nbproject/build-impl.xml
@@ -873,10 +873,7 @@ exists or setup the property manually. For example like this:
     <target if="is.jars.in.ejbjar" name="-library-inclusion-in-archive-by-user">
         <copyfiles files="${file.reference.jcoreee.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.jcore-logger-lib.jar}" todir="${build.classes.dir}"/>
-<<<<<<< HEAD
-=======
         <copyfiles files="${reference.PizzaService-lib.jar}" todir="${build.classes.dir}"/>
->>>>>>> rewrites/jpa
         <copyfiles files="${file.reference.jshop-core.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.jshop-ee-lib.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.cdi-api.jar}" todir="${build.classes.dir}"/>
@@ -884,10 +881,7 @@ exists or setup the property manually. For example like this:
     <target if="is.server.weblogic" name="-library-inclusion-in-archive-weblogic">
         <basename file="${file.reference.jcoreee.jar}" property="manifest.file.reference.jcoreee.jar"/>
         <basename file="${file.reference.jcore-logger-lib.jar}" property="manifest.file.reference.jcore-logger-lib.jar"/>
-<<<<<<< HEAD
-=======
         <basename file="${reference.PizzaService-lib.jar}" property="manifest.reference.PizzaService-lib.jar"/>
->>>>>>> rewrites/jpa
         <basename file="${file.reference.jshop-core.jar}" property="manifest.file.reference.jshop-core.jar"/>
         <basename file="${file.reference.jshop-ee-lib.jar}" property="manifest.file.reference.jshop-ee-lib.jar"/>
         <basename file="${file.reference.cdi-api.jar}" property="manifest.file.reference.cdi-api.jar"/>
@@ -895,25 +889,16 @@ exists or setup the property manually. For example like this:
             <attribute name="Extension-List" value="jar-1 jar-2 jar-3 jar-4 jar-5 jar-6 "/>
             <attribute name="jar-1-Extension-Name" value="${manifest.file.reference.jcoreee.jar}"/>
             <attribute name="jar-2-Extension-Name" value="${manifest.file.reference.jcore-logger-lib.jar}"/>
-<<<<<<< HEAD
             <attribute name="jar-3-Extension-Name" value="${manifest.file.reference.jshop-core.jar}"/>
             <attribute name="jar-4-Extension-Name" value="${manifest.file.reference.jshop-ee-lib.jar}"/>
             <attribute name="jar-5-Extension-Name" value="${manifest.reference.PizzaService-lib.jar}"/>
-=======
-            <attribute name="jar-3-Extension-Name" value="${manifest.reference.PizzaService-lib.jar}"/>
-            <attribute name="jar-4-Extension-Name" value="${manifest.file.reference.jshop-core.jar}"/>
-            <attribute name="jar-5-Extension-Name" value="${manifest.file.reference.jshop-ee-lib.jar}"/>
->>>>>>> rewrites/jpa
             <attribute name="jar-6-Extension-Name" value="${manifest.file.reference.cdi-api.jar}"/>
         </manifest>
     </target>
     <target depends="compile" name="library-inclusion-in-manifest">
         <copyfiles files="${file.reference.jcoreee.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jcore-logger-lib.jar}" todir="${dist.ear.dir}/lib"/>
-<<<<<<< HEAD
-=======
         <copyfiles files="${reference.PizzaService-lib.jar}" todir="${dist.ear.dir}/lib"/>
->>>>>>> rewrites/jpa
         <copyfiles files="${file.reference.jshop-core.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jshop-ee-lib.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.cdi-api.jar}" todir="${dist.ear.dir}/lib"/>

diff --git a/PizzaService-ejb/nbproject/genfiles.properties b/PizzaService-ejb/nbproject/genfiles.properties
index 1b8f2e487d2b8941006350e8ccd029611428e24d..81f553f158273a97095a5e629e1f939458ef3006 100644 (file)
--- a/PizzaService-ejb/nbproject/genfiles.properties
+++ b/PizzaService-ejb/nbproject/genfiles.properties
@@ -3,11 +3,6 @@ build.xml.script.CRC32=cabe2e92
 build.xml.stylesheet.CRC32=5910fda3@1.51.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.
-<<<<<<< HEAD
 nbproject/build-impl.xml.data.CRC32=2efd3682
 nbproject/build-impl.xml.script.CRC32=d1bf7afb
-=======
-nbproject/build-impl.xml.data.CRC32=a9327adf
-nbproject/build-impl.xml.script.CRC32=0299efaf
->>>>>>> rewrites/jpa
 nbproject/build-impl.xml.stylesheet.CRC32=6096d939@1.51.1

diff --git a/PizzaService-ejb/nbproject/project.xml b/PizzaService-ejb/nbproject/project.xml
index b4d3e6711c766a24af2b3ba8d933b009345ebc4e..86e4affccabf097cd362dc1082e84443b2b40eac 100644 (file)
--- a/PizzaService-ejb/nbproject/project.xml
+++ b/PizzaService-ejb/nbproject/project.xml
@@ -5,20 +5,11 @@
         <data xmlns="http://www.netbeans.org/ns/j2ee-ejbjarproject/3">
             <name>PizzaService-ejb</name>
             <minimum-ant-version>1.6.5</minimum-ant-version>
-<<<<<<< HEAD
             <included-library dirs="200">file.reference.jcoreee.jar</included-library>
             <included-library dirs="200">file.reference.jcore-logger-lib.jar</included-library>
             <included-library dirs="200">file.reference.jshop-core.jar</included-library>
             <included-library dirs="200">file.reference.jshop-ee-lib.jar</included-library>
             <included-library dirs="200">reference.PizzaService-lib.jar</included-library>
-=======
-            <explicit-platform explicit-source-supported="true"/>
-            <included-library dirs="200">file.reference.jcoreee.jar</included-library>
-            <included-library dirs="200">file.reference.jcore-logger-lib.jar</included-library>
-            <included-library dirs="200">reference.PizzaService-lib.jar</included-library>
-            <included-library dirs="200">file.reference.jshop-core.jar</included-library>
-            <included-library dirs="200">file.reference.jshop-ee-lib.jar</included-library>
->>>>>>> rewrites/jpa
             <included-library dirs="200">file.reference.cdi-api.jar</included-library>
             <source-roots>
                 <root id="src.dir"/>