From 5bfce417e31735055e332a548faea714364b0275 Mon Sep 17 00:00:00 2001
From: jsightler <jsightle@redhat.com>
Date: Thu, 30 Jan 2014 11:55:33 -0500
Subject: [PATCH] Patches to easily support deployment on EAP6.

---
 juddiv3-war/JAX-WS/CXF/WEB-INF/web.xml             | 20 ++++----------
 .../WEB-INF/jboss-deployment-structure.xml         |  7 ++++-
 juddiv3-war/pom.xml                                | 32 ++++++++++++++++++++++
 3 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/juddiv3-war/JAX-WS/CXF/WEB-INF/web.xml b/juddiv3-war/JAX-WS/CXF/WEB-INF/web.xml
index bff48dc..92978d5 100644
--- a/juddiv3-war/JAX-WS/CXF/WEB-INF/web.xml
+++ b/juddiv3-war/JAX-WS/CXF/WEB-INF/web.xml
@@ -34,12 +34,11 @@
   </context-param>
 
   <listener>
-    <listener-class>
-      org.springframework.web.context.ContextLoaderListener
-		</listener-class>
-		 <!-- this class setups the encryption key for the session-->
-    <listener-class>org.apache.juddi.adminconsole.StartupServlet</listener-class>
-    
+    <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+  </listener>
+  <listener>
+    <!-- this class setups the encryption key for the session-->
+    <listener-class>org.apache.juddi.adminconsole.StartupServlet</listener-class> 
   </listener>
 
   <servlet>
@@ -78,14 +77,7 @@
   	<servlet-name>NotifyServlet</servlet-name>
   	<url-pattern>/notify/*</url-pattern>
   </servlet-mapping>
- 
-  <resource-ref>
-      <description>jUDDI DataSource</description>
-      <res-ref-name>jdbc/juddiDB</res-ref-name>
-      <res-type>javax.sql.DataSource</res-type>
-      <res-auth>Container</res-auth>
-      <res-sharing-scope>Shareable</res-sharing-scope>
-  </resource-ref>
+
   <security-constraint>
       <display-name>jUDDI Admin content</display-name>
       <web-resource-collection>
diff --git a/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/jboss-deployment-structure.xml b/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/jboss-deployment-structure.xml
index a7c07b2..1954097 100644
--- a/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/jboss-deployment-structure.xml
+++ b/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/jboss-deployment-structure.xml
@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jboss-deployment-structure>
   <deployment>
+    <exclude-subsystems>  
+      <subsystem name="jaxr" />  
+      <subsystem name="jaxrs" />  
+      <subsystem name="webservices" />  
+    </exclude-subsystems>
     <dependencies>
       <module name="org.jboss.as.jpa.openjpa" />
       <module name="org.jboss.ws.cxf.jbossws-cxf-server" />
     </dependencies>
   </deployment>
-</jboss-deployment-structure>
\ No newline at end of file
+</jboss-deployment-structure>
diff --git a/juddiv3-war/pom.xml b/juddiv3-war/pom.xml
index e0c660e..5d113fc 100644
--- a/juddiv3-war/pom.xml
+++ b/juddiv3-war/pom.xml
@@ -480,12 +480,44 @@
                     <groupId>org.apache.juddi</groupId>
                     <version>${project.version}</version>
                 </dependency>
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-rt-frontend-jaxws</artifactId>
+			<version>${cxf.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-rt-frontend-jaxrs</artifactId>
+			<version>${cxf.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-rt-transports-http</artifactId>
+			<version>${cxf.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>cglib</groupId>
+					<artifactId>cglib</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
                 <dependency>
                     <groupId>javax.persistence</groupId>
                     <artifactId>persistence-api</artifactId>
                     <version>1.0</version>
                     <scope>provided</scope>
                 </dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
+			<version>${springframework.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-web</artifactId>
+			<version>${springframework.version}</version>
+		</dependency>
             </dependencies>
         </profile>
 	</profiles>
-- 
1.8.5.1