gaspersic/java-design-patterns
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into layers

Browse Source 
Conflicts:
	layers/src/main/java/com/iluwatar/layers/App.java
	layers/src/main/java/com/iluwatar/layers/Cake.java
	layers/src/main/java/com/iluwatar/layers/CakeBakingException.java
	layers/src/main/java/com/iluwatar/layers/CakeBakingService.java
	layers/src/main/java/com/iluwatar/layers/CakeBakingServiceImpl.java
	layers/src/main/java/com/iluwatar/layers/CakeDao.java
	layers/src/main/java/com/iluwatar/layers/CakeInfo.java
	layers/src/main/java/com/iluwatar/layers/CakeLayer.java
	layers/src/main/java/com/iluwatar/layers/CakeLayerDao.java
	layers/src/main/java/com/iluwatar/layers/CakeLayerInfo.java
	layers/src/main/java/com/iluwatar/layers/CakeTopping.java
	layers/src/main/java/com/iluwatar/layers/CakeToppingDao.java
	layers/src/main/java/com/iluwatar/layers/CakeToppingInfo.java
	layers/src/main/resources/applicationContext.xml
This commit is contained in:
Ilkka Seppala
2015-08-15 20:47:34 +03:00
parent 2bf00fba70 fdb9be1e76
commit 072a885ec8
61 changed files with 1238 additions and 816 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
layers/src/main/resources/META-INF/persistence.xml
View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<persistence version="1.0"
xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd">
<persistence-unit name="jpaData" />
</persistence>