diff --git a/petclinic/trunk/pom.xml b/petclinic/trunk/pom.xml
index f0c6167..eb3b4b6 100644
--- a/petclinic/trunk/pom.xml
+++ b/petclinic/trunk/pom.xml
@@ -8,7 +8,7 @@
 	<packaging>war</packaging>
 	<version>1.0.0-SNAPSHOT</version>
 	<properties>
-		<spring.version>3.0.0.RELEASE</spring.version>
+		<spring.version>3.0.5.RELEASE</spring.version>
 		<slf4j.version>1.5.6</slf4j.version>
 	</properties>
 	<dependencies>
@@ -226,7 +226,6 @@
 			<version>1.1.0</version>
 			<scope>test</scope>
 		</dependency>
-
 	</dependencies>
 	<repositories>
 		<repository>
diff --git a/petclinic/trunk/src/main/java/org/springframework/samples/petclinic/Owner.java b/petclinic/trunk/src/main/java/org/springframework/samples/petclinic/Owner.java
index 75ea3bc..03de549 100644
--- a/petclinic/trunk/src/main/java/org/springframework/samples/petclinic/Owner.java
+++ b/petclinic/trunk/src/main/java/org/springframework/samples/petclinic/Owner.java
@@ -74,6 +74,10 @@ public void addPet(Pet pet) {
 		pet.setOwner(this);
 	}
 
+    public void removePet(Pet pet) {
+		getPetsInternal().remove(pet);
+    }
+
 	/**
 	 * Return the Pet with the given name, or null if none found for this Owner.
 	 *
diff --git a/petclinic/trunk/src/main/java/org/springframework/samples/petclinic/hibernate/HibernateClinic.java b/petclinic/trunk/src/main/java/org/springframework/samples/petclinic/hibernate/HibernateClinic.java
index 4116385..9c62b11 100644
--- a/petclinic/trunk/src/main/java/org/springframework/samples/petclinic/hibernate/HibernateClinic.java
+++ b/petclinic/trunk/src/main/java/org/springframework/samples/petclinic/hibernate/HibernateClinic.java
@@ -92,6 +92,7 @@ public void storeVisit(Visit visit) {
 
 	public void deletePet(int id) throws DataAccessException {
 		Pet pet = loadPet(id);
+        pet.getOwner().removePet(pet);
 		sessionFactory.getCurrentSession().delete(pet);
 	}
 
diff --git a/petclinic/trunk/src/main/java/org/springframework/samples/petclinic/jpa/EntityManagerClinic.java b/petclinic/trunk/src/main/java/org/springframework/samples/petclinic/jpa/EntityManagerClinic.java
index 92fe1e2..0346781 100644
--- a/petclinic/trunk/src/main/java/org/springframework/samples/petclinic/jpa/EntityManagerClinic.java
+++ b/petclinic/trunk/src/main/java/org/springframework/samples/petclinic/jpa/EntityManagerClinic.java
@@ -90,6 +90,7 @@ public void storeVisit(Visit visit) {
 
 	public void deletePet(int id) throws DataAccessException {
 		Pet pet = loadPet(id);
+        pet.getOwner().removePet(pet);
 		this.em.remove(pet);
 	}
 
diff --git a/petclinic/trunk/src/main/resources/META-INF/orm.xml b/petclinic/trunk/src/main/resources/META-INF/orm.xml
index 7ea243e..d269185 100644
--- a/petclinic/trunk/src/main/resources/META-INF/orm.xml
+++ b/petclinic/trunk/src/main/resources/META-INF/orm.xml
@@ -81,16 +81,8 @@
 				<column name="BIRTH_DATE"/>
 				<temporal>DATE</temporal>
 			</basic>
-			<many-to-one name="owner" fetch="EAGER">
-				<cascade>
-					<cascade-all/>
-				</cascade>
-			</many-to-one>
-			<many-to-one name="type" fetch="EAGER">
-				<cascade>
-					<cascade-all/>
-				</cascade>
-			</many-to-one>
+			<many-to-one name="owner" fetch="EAGER"/>
+			<many-to-one name="type" fetch="EAGER"/>
 			<one-to-many name="visitsInternal" target-entity="Visit" mapped-by="pet" fetch="EAGER">
 				<cascade>
 					<cascade-all/>
diff --git a/petclinic/trunk/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/petclinic/trunk/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
new file mode 100644
index 0000000..53395ad
--- /dev/null
+++ b/petclinic/trunk/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
@@ -0,0 +1,7 @@
+<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.0">
+ <deployment>
+     <exclusions>
+         <module name="org.hibernate"/>
+     </exclusions>
+</deployment>
+</jboss-deployment-structure>
\ No newline at end of file
diff --git a/petclinic/trunk/src/main/webapp/WEB-INF/petclinic-servlet.xml b/petclinic/trunk/src/main/webapp/WEB-INF/petclinic-servlet.xml
index e55766a..a8353f9 100644
--- a/petclinic/trunk/src/main/webapp/WEB-INF/petclinic-servlet.xml
+++ b/petclinic/trunk/src/main/webapp/WEB-INF/petclinic-servlet.xml
@@ -5,9 +5,11 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns:p="http://www.springframework.org/schema/p" xmlns:context="http://www.springframework.org/schema/context"
 		xmlns:oxm="http://www.springframework.org/schema/oxm"
+        xmlns:mvc="http://www.springframework.org/schema/mvc"
 		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 				http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-				http://www.springframework.org/schema/oxm http://www.springframework.org/schema/oxm/spring-oxm-3.0.xsd">
+				http://www.springframework.org/schema/oxm http://www.springframework.org/schema/oxm/spring-oxm-3.0.xsd
+				http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd">
 
 	<!--
 		- The controllers are autodetected POJOs labeled with the @Controller annotation.
@@ -15,17 +17,25 @@
 	<context:component-scan base-package="org.springframework.samples.petclinic.web"/>
 
 	<!--
-		- The form-based controllers within this application provide @RequestMapping 
-		- annotations at the type level for path mapping URLs and @RequestMapping 
-		- at the method level for request type mappings (e.g., GET and POST). 
-		- In contrast, ClinicController - which is not form-based - provides 
+		- The form-based controllers within this application provide @RequestMapping
+		- annotations at the type level for path mapping URLs and @RequestMapping
+		- at the method level for request type mappings (e.g., GET and POST).
+		- In contrast, ClinicController - which is not form-based - provides
 		- @RequestMapping only at the method level for path mapping URLs.
-		-
-		- DefaultAnnotationHandlerMapping is driven by these annotations and is 
-		- enabled by default with Java 5+.
+
 	-->
-	
-	<!--
+    <mvc:resources mapping="/static/**" location="/" />
+
+    <mvc:default-servlet-handler/>
+
+    <mvc:view-controller path="/" view-name="welcome"/>
+
+    <!-- org.springframework.web.servlet.mvc.annotation.DefaultAnnotationHandlerMapping is not enabled by default
+         in Spring 3.0.5 -->
+    <bean class="org.springframework.web.servlet.mvc.annotation.DefaultAnnotationHandlerMapping">
+		<property name="order" value="1" />
+	</bean>
+    <!--
 		- This bean processes annotated handler methods, applying PetClinic-specific PropertyEditors
 		- for request parameter binding. It overrides the default AnnotationMethodHandlerAdapter.
 	-->
@@ -34,7 +44,6 @@
 			<bean class="org.springframework.samples.petclinic.web.ClinicBindingInitializer"/>
 		</property>
 	</bean>
-
 	<!--
 		- This bean resolves specific types of exceptions to corresponding logical 
 		- view names for error views. The default behaviour of DispatcherServlet 
diff --git a/petclinic/trunk/src/main/webapp/WEB-INF/spring/applicationContext-jpa.xml b/petclinic/trunk/src/main/webapp/WEB-INF/spring/applicationContext-jpa.xml
index 01ebfa0..9291f11 100644
--- a/petclinic/trunk/src/main/webapp/WEB-INF/spring/applicationContext-jpa.xml
+++ b/petclinic/trunk/src/main/webapp/WEB-INF/spring/applicationContext-jpa.xml
@@ -16,12 +16,6 @@
 	<!-- import the dataSource definition -->
 	<import resource="applicationContext-dataSource.xml"/>
 
-	<!--
-		Activates a load-time weaver for the context. Any bean within the context that
-		implements LoadTimeWeaverAware (such as LocalContainerEntityManagerFactoryBean)
-		will receive a reference to the autodetected load-time weaver.
-	-->
-	<context:load-time-weaver/>
 
 	<!-- Configurer that replaces ${...} placeholders with values from a properties file -->
 	<!-- (in this case, JDBC-related settings for the JPA EntityManager definition below) -->
@@ -31,16 +25,14 @@
 	<bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean"
 			p:dataSource-ref="dataSource">
 		<property name="jpaVendorAdapter">
-			<bean class="org.springframework.orm.jpa.vendor.TopLinkJpaVendorAdapter"
-					p:databasePlatform="${jpa.databasePlatform}" p:showSql="${jpa.showSql}"/>
+			<!--<bean class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter"-->
+					<!--p:databasePlatform="${jpa.databasePlatform}" p:showSql="${jpa.showSql}"/>-->
 			<!--
 			<bean class="org.springframework.orm.jpa.vendor.OpenJpaVendorAdapter"
 					p:database="${jpa.database}" p:showSql="${jpa.showSql}"/>
 			-->
-			<!--
 			<bean class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter"
 					p:database="${jpa.database}" p:showSql="${jpa.showSql}"/>
-			-->
 		</property>
 		<property name="persistenceXmlLocation" value="classpath:META-INF/jpa-persistence.xml"/>
 	</bean>
diff --git a/petclinic/trunk/src/main/webapp/WEB-INF/web.xml b/petclinic/trunk/src/main/webapp/WEB-INF/web.xml
index 768329b..28df4e3 100644
--- a/petclinic/trunk/src/main/webapp/WEB-INF/web.xml
+++ b/petclinic/trunk/src/main/webapp/WEB-INF/web.xml
@@ -1,188 +1,176 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-
-	<display-name>Spring PetClinic</display-name>
-
-	<description>Spring PetClinic sample application</description>
-
-	<!--
-		Key of the system property that should specify the root directory of this
-		web app. Applied by WebAppRootListener or Log4jConfigListener.
-	-->
-	<context-param>
-		<param-name>webAppRootKey</param-name>
-		<param-value>petclinic.root</param-value>
-	</context-param>
-	
-	
-
-	<!--
-		Location of the Log4J config file, for initialization and refresh checks.
-		Applied by Log4jConfigListener.
-	-->
-	<context-param>
-		<param-name>log4jConfigLocation</param-name>
-		<param-value>/WEB-INF/classes/log4j.properties</param-value>
-	</context-param>
-
-	<!--
-		- Location of the XML file that defines the root application context.
-		- Applied by ContextLoaderServlet.
-		-
-		- Can be set to:
-		- "/WEB-INF/applicationContext-hibernate.xml" for the Hibernate implementation,
-		- "/WEB-INF/applicationContext-jpa.xml" for the JPA one, or
-		- "/WEB-INF/applicationContext-jdbc.xml" for the JDBC one.
-	-->
-	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>/WEB-INF/spring/applicationContext-jdbc.xml</param-value>
-        <!--
-		<param-value>/WEB-INF/spring/applicationContext-hibernate.xml</param-value>
-		<param-value>/WEB-INF/spring/applicationContext-jpa.xml</param-value>
-		-->
-
-		<!--
-			To use the JPA variant above, you will need to enable Spring load-time
-			weaving in your server environment. Out of the box, Spring will try to
-			detect the running environment and use the appropriate weaver but if that
-			fails, one must enable one by hand or use the VM-wide weaver.
-			See PetClinic's readme and/or Spring's JPA documentation for more information.
-		-->
-	</context-param>
-
-	<!--
-		- Configures Log4J for this web app.
-		- As this context specifies a context-param "log4jConfigLocation", its file path
-		- is used to load the Log4J configuration, including periodic refresh checks.
-		-
-		- Would fall back to default Log4J initialization (non-refreshing) if no special
-		- context-params are given.
-		-
-		- Exports a "web app root key", i.e. a system property that specifies the root
-		- directory of this web app, for usage in log file paths.
-		- This web app specifies "petclinic.root" (see log4j.properties file).
-	-->
-	<!-- Leave the listener commented-out if using JBoss -->
-	<!--
-	<listener>
-		<listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
-	</listener>
-	-->
-
-	<!--
-		- Loads the root application context of this web app at startup,
-		- by default from "/WEB-INF/applicationContext.xml".
-		- Note that you need to fall back to Spring's ContextLoaderServlet for
-		- J2EE servers that do not follow the Servlet 2.4 initialization order.
-		-
-		- Use WebApplicationContextUtils.getWebApplicationContext(servletContext)
-		- to access it anywhere in the web application, outside of the framework.
-		-
-		- The root context is the parent of all servlet-specific contexts.
-		- This means that its beans are automatically available in these child contexts,
-		- both for getBean(name) calls and (external) bean references.
-	-->
-	<listener>
-		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-	</listener>
-	
-	<!--
-		Defines the 'default' servlet (usually for service static resources).
-		Uncomment this in containers (GlassFish) that do not declare this 
-		implicit definition out of the box, or change the name of the servlet mapping 
-		below to the appropriate one.
-		
-	<servlet>
-		<servlet-name>default</servlet-name>
-		<servlet-class>org.apache.catalina.servlets.DefaultServlet</servlet-class>
-		<init-param>
-			<param-name>debug</param-name>
-			<param-value>0</param-value>
-		</init-param>
-		<init-param>
-			<param-name>listings</param-name>
-			<param-value>false</param-value>
-		</init-param>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-	-->
-	<!--
-	 - Map static resources to the default servlet
-	 - examples:
-	 -     http://localhost:8080/static/images/pets.png
-	 -     http://localhost:8080/static/styles/petclinic.css
-	-->
-	<servlet-mapping>
-		<servlet-name>default</servlet-name>
-		<url-pattern>/static/*</url-pattern>
-	</servlet-mapping>
-	
-	<!--
-		- Servlet that dispatches request to registered handlers (Controller implementations).
-		- Has its own application context, by default defined in "{servlet-name}-servlet.xml",
-		- i.e. "petclinic-servlet.xml".
-		-
-		- A web app can contain any number of such servlets.
-		- Note that this web app has a shared root application context, serving as parent
-		- of all DispatcherServlet contexts.
-	-->
-	<servlet>
-		<servlet-name>petclinic</servlet-name>
-		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-		<load-on-startup>2</load-on-startup>
-	</servlet>
-
-	<!--
-		- Maps the petclinic dispatcher to "*.do". All handler mappings in
-		- petclinic-servlet.xml will by default be applied to this subpath.
-		- If a mapping isn't a /* subpath, the handler mappings are considered
-		- relative to the web app root.
-		-
-		- NOTE: A single dispatcher can be mapped to multiple paths, like any servlet.
-	-->
-	<servlet-mapping>
-		<servlet-name>petclinic</servlet-name>
-		<url-pattern>/</url-pattern>
-	</servlet-mapping>
-
-	<filter>
-		<filter-name>httpMethodFilter</filter-name>
-		<filter-class>org.springframework.web.filter.HiddenHttpMethodFilter</filter-class>
-	</filter>
-
-	<filter-mapping>
-		<filter-name>httpMethodFilter</filter-name>
-		<servlet-name>petclinic</servlet-name>
-	</filter-mapping>
-
-	<session-config>
-		<session-timeout>10</session-timeout>
-	</session-config>
-
-	<error-page>
-		<exception-type>java.lang.Exception</exception-type>
-		<!-- Displays a stack trace -->
-		<location>/WEB-INF/jsp/uncaughtException.jsp</location>
-	</error-page>
-
-	<!-- eliminate welcome files -->
-	<!-- useful for Servlet 3 container (Tomcat 7 and Jetty 6) -->
-	<welcome-file-list>
-		<welcome-file></welcome-file>
-	</welcome-file-list>
-
-	<!--
-		- Reference to PetClinic database.
-		- Only needed if not using a local DataSource but a JNDI one instead.
-	-->
-	<!--
-	<resource-ref>
-		<res-ref-name>jdbc/petclinic</res-ref-name>
-		<res-type>javax.sql.DataSource</res-type>
-		<res-auth>Container</res-auth>
-	</resource-ref>
-	-->
-	
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
+	<display-name>Spring PetClinic</display-name>
+
+	<description>Spring PetClinic sample application</description>
+
+	<!--
+		Key of the system property that should specify the root directory of this
+		web app. Applied by WebAppRootListener or Log4jConfigListener.
+	-->
+	<context-param>
+		<param-name>webAppRootKey</param-name>
+		<param-value>petclinic.root</param-value>
+	</context-param>
+	
+	
+
+	<!--
+		Location of the Log4J config file, for initialization and refresh checks.
+		Applied by Log4jConfigListener.
+	-->
+	<context-param>
+		<param-name>log4jConfigLocation</param-name>
+		<param-value>/WEB-INF/classes/log4j.properties</param-value>
+	</context-param>
+
+	<!--
+		- Location of the XML file that defines the root application context.
+		- Applied by ContextLoaderServlet.
+		-
+		- Can be set to:
+		- "/WEB-INF/applicationContext-hibernate.xml" for the Hibernate implementation,
+		- "/WEB-INF/applicationContext-jpa.xml" for the JPA one, or
+		- "/WEB-INF/applicationContext-jdbc.xml" for the JDBC one.
+	-->
+	<context-param>
+		<param-name>contextConfigLocation</param-name>
+		<!--<param-value>/WEB-INF/spring/applicationContext-jdbc.xml</param-value>-->
+        <!--<param-value>/WEB-INF/spring/applicationContext-hibernate.xml</param-value>-->
+        <param-value>/WEB-INF/spring/applicationContext-jpa.xml</param-value>
+
+		<!--
+			To use the JPA variant above, you will need to enable Spring load-time
+			weaving in your server environment. Out of the box, Spring will try to
+			detect the running environment and use the appropriate weaver but if that
+			fails, one must enable one by hand or use the VM-wide weaver.
+			See PetClinic's readme and/or Spring's JPA documentation for more information.
+		-->
+	</context-param>
+
+	<!--
+		- Configures Log4J for this web app.
+		- As this context specifies a context-param "log4jConfigLocation", its file path
+		- is used to load the Log4J configuration, including periodic refresh checks.
+		-
+		- Would fall back to default Log4J initialization (non-refreshing) if no special
+		- context-params are given.
+		-
+		- Exports a "web app root key", i.e. a system property that specifies the root
+		- directory of this web app, for usage in log file paths.
+		- This web app specifies "petclinic.root" (see log4j.properties file).
+	-->
+	<!-- Leave the listener commented-out if using JBoss -->
+	<!--
+	<listener>
+		<listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
+	</listener>
+	-->
+
+	<!--
+		- Loads the root application context of this web app at startup,
+		- by default from "/WEB-INF/applicationContext.xml".
+		- Note that you need to fall back to Spring's ContextLoaderServlet for
+		- J2EE servers that do not follow the Servlet 2.4 initialization order.
+		-
+		- Use WebApplicationContextUtils.getWebApplicationContext(servletContext)
+		- to access it anywhere in the web application, outside of the framework.
+		-
+		- The root context is the parent of all servlet-specific contexts.
+		- This means that its beans are automatically available in these child contexts,
+		- both for getBean(name) calls and (external) bean references.
+	-->
+	<listener>
+		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+	</listener>
+	
+	<!--
+		Defines the 'default' servlet (usually for service static resources).
+		Uncomment this in containers (GlassFish) that do not declare this 
+		implicit definition out of the box, or change the name of the servlet mapping 
+		below to the appropriate one.
+		
+	<servlet>
+		<servlet-name>default</servlet-name>
+		<servlet-class>org.apache.catalina.servlets.DefaultServlet</servlet-class>
+		<init-param>
+			<param-name>debug</param-name>
+			<param-value>0</param-value>
+		</init-param>
+		<init-param>
+			<param-name>listings</param-name>
+			<param-value>false</param-value>
+		</init-param>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+	-->
+	
+	<!--
+		- Servlet that dispatches request to registered handlers (Controller implementations).
+		- Has its own application context, by default defined in "{servlet-name}-servlet.xml",
+		- i.e. "petclinic-servlet.xml".
+		-
+		- A web app can contain any number of such servlets.
+		- Note that this web app has a shared root application context, serving as parent
+		- of all DispatcherServlet contexts.
+	-->
+	<servlet>
+		<servlet-name>petclinic</servlet-name>
+		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+		<load-on-startup>2</load-on-startup>
+	</servlet>
+
+	<!--
+		- Maps the petclinic dispatcher to "*.do". All handler mappings in
+		- petclinic-servlet.xml will by default be applied to this subpath.
+		- If a mapping isn't a /* subpath, the handler mappings are considered
+		- relative to the web app root.
+		-
+		- NOTE: A single dispatcher can be mapped to multiple paths, like any servlet.
+	-->
+	<servlet-mapping>
+		<servlet-name>petclinic</servlet-name>
+		<url-pattern>/</url-pattern>
+	</servlet-mapping>
+
+	<filter>
+		<filter-name>httpMethodFilter</filter-name>
+		<filter-class>org.springframework.web.filter.HiddenHttpMethodFilter</filter-class>
+	</filter>
+
+	<filter-mapping>
+		<filter-name>httpMethodFilter</filter-name>
+		<servlet-name>petclinic</servlet-name>
+	</filter-mapping>
+
+	<session-config>
+		<session-timeout>10</session-timeout>
+	</session-config>
+
+	<error-page>
+		<exception-type>java.lang.Exception</exception-type>
+		<!-- Displays a stack trace -->
+		<location>/WEB-INF/jsp/uncaughtException.jsp</location>
+	</error-page>
+
+	<!-- eliminate welcome files -->
+	<!-- useful for Servlet 3 container (Tomcat 7 and Jetty 6) -->
+	<welcome-file-list>
+		<welcome-file></welcome-file>
+	</welcome-file-list>
+
+	<!--
+		- Reference to PetClinic database.
+		- Only needed if not using a local DataSource but a JNDI one instead.
+	-->
+	<!--
+	<resource-ref>
+		<res-ref-name>jdbc/petclinic</res-ref-name>
+		<res-type>javax.sql.DataSource</res-type>
+		<res-auth>Container</res-auth>
+	</resource-ref>
+	-->
+	
 </web-app>
\ No newline at end of file
diff --git a/travel/src/main/resources/META-INF/persistence.xml b/travel/src/main/resources/META-INF/jpa-persistence.xml
similarity index 100%
rename from travel/src/main/resources/META-INF/persistence.xml
rename to travel/src/main/resources/META-INF/jpa-persistence.xml
diff --git a/travel/src/main/resources/META-INF/spring/data.xml b/travel/src/main/resources/META-INF/spring/data.xml
index 12e60a6..f3781a2 100644
--- a/travel/src/main/resources/META-INF/spring/data.xml
+++ b/travel/src/main/resources/META-INF/spring/data.xml
@@ -18,6 +18,7 @@
 		<property name="jpaVendorAdapter">
 			<bean class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter" />
 		</property>
+        <property name="persistenceXmlLocation" value="classpath*:META-INF/jpa-persistence.xml"/>
 	</bean>
 
 	<!-- Creates an in-memory HSQLDB Database -->
diff --git a/travel/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/travel/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
new file mode 100644
index 0000000..53395ad
--- /dev/null
+++ b/travel/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
@@ -0,0 +1,7 @@
+<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.0">
+ <deployment>
+     <exclusions>
+         <module name="org.hibernate"/>
+     </exclusions>
+</deployment>
+</jboss-deployment-structure>
\ No newline at end of file