From: Roland Haeder <roland@mxchange.org>
Date: Wed, 30 Sep 2015 06:15:02 +0000 (+0200)
Subject: Merge branch 'rewrites/jpa' of e:/Java Project/pizzaservice into rewrites/jpa
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c49019cfb4a4babff0f82d8a7359dff3bae8a0c2;p=pizzaservice.git

Merge branch 'rewrites/jpa' of e:/Java Project/pizzaservice into rewrites/jpa

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

Conflicts:
	PizzaService-ejb/lib/jcore.jar
---

c49019cfb4a4babff0f82d8a7359dff3bae8a0c2
diff --cc PizzaService-ejb/nbproject/private/private.properties
index 7338226,7338226..3fb37c5
--- a/PizzaService-ejb/nbproject/private/private.properties
+++ b/PizzaService-ejb/nbproject/private/private.properties
@@@ -1,10 -1,10 +1,10 @@@
--deploy.ant.properties.file=/home/quix0r/.netbeans/8.0.2/config/GlassFishEE6/Properties/gfv3-1925195178.properties
++deploy.ant.properties.file=C:\\Users\\KLC\\AppData\\Roaming\\NetBeans\\8.0.2\\config\\GlassFishEE6\\Properties\\gfv3-443781088.properties
  j2ee.platform.is.jsr109=true
--j2ee.server.domain=/home/quix0r/.netbeans/8.0.2/config/GF_4.1/domain1
--j2ee.server.home=/usr/local/glassfish-4.1/glassfish
--j2ee.server.instance=[/usr/local/glassfish-4.1/glassfish:/usr/local/glassfish-4.1/glassfish/domains/domain1]deployer:gfv3ee6:localhost:4848
--j2ee.server.middleware=/usr/local/glassfish-4.1
++j2ee.server.domain=C:/Users/KLC/domain
++j2ee.server.home=C:/Program Files/glassfish-4.1/glassfish
++j2ee.server.instance=[C:\\Program Files\\glassfish-4.1\\glassfish;C:\\Users\\KLC\\domain]deployer:gfv3ee6wc:localhost:4848
++j2ee.server.middleware=C:/Program Files/glassfish-4.1
  javac.debug=true
  javadoc.preview=true
--netbeans.user=/home/quix0r/.netbeans/8.0.2
--project.PizzaService-lib=/home/quix0r/public_html/pizzaservice-lib
++netbeans.user=C:\\Users\\KLC\\AppData\\Roaming\\NetBeans\\8.0.2
++project.PizzaService-lib=C:\\Users\\KLC\\Documents\\NetBeansProjects\\PizzaService-lib