From: Roland Haeder <roland@mxchange.org>
Date: Thu, 1 Oct 2015 18:39:31 +0000 (+0200)
Subject: Merge branch 'rewrites/jpa'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=63d57069c436f413835b90e53fa6b892802b5b06;p=pizzaservice-ejb.git

Merge branch 'rewrites/jpa'

Signed-off-by: Roland Häder <roland@mxchange.org>
---

63d57069c436f413835b90e53fa6b892802b5b06
diff --cc PizzaService-ejb/nbproject/build-impl.xml
index 59e4523,27ca1db..a1e704d
--- a/PizzaService-ejb/nbproject/build-impl.xml
+++ b/PizzaService-ejb/nbproject/build-impl.xml
@@@ -828,34 -873,34 +873,49 @@@ exists or setup the property manually. 
      <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="${reference.PizzaService-lib.jar}" todir="${build.classes.dir}"/>
          <copyfiles files="${file.reference.cdi-api.jar}" todir="${build.classes.dir}"/>
      </target>
      <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="${reference.PizzaService-lib.jar}" property="manifest.reference.PizzaService-lib.jar"/>
          <basename file="${file.reference.cdi-api.jar}" property="manifest.file.reference.cdi-api.jar"/>
          <manifest file="${build.ear.classes.dir}/META-INF/MANIFEST.MF" mode="update">
              <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="${reference.PizzaService-lib.jar}" todir="${dist.ear.dir}/lib"/>
          <copyfiles files="${file.reference.cdi-api.jar}" todir="${dist.ear.dir}/lib"/>
          <manifest file="${build.ear.classes.dir}/META-INF/MANIFEST.MF" mode="update"/>
      </target>
diff --cc PizzaService-ejb/nbproject/genfiles.properties
index 81f553f,8edc767..1b8f2e4
--- a/PizzaService-ejb/nbproject/genfiles.properties
+++ b/PizzaService-ejb/nbproject/genfiles.properties
@@@ -3,6 -3,6 +3,11 @@@ build.xml.script.CRC32=cabe2e9
  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 --cc PizzaService-ejb/nbproject/project.xml
index 86e4aff,2f815ea..b4d3e67
--- a/PizzaService-ejb/nbproject/project.xml
+++ b/PizzaService-ejb/nbproject/project.xml
@@@ -5,11 -5,12 +5,20 @@@
          <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"/>