From 5129cb0d08494ceee4e04d051aa32398a1758828 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 1 Mar 2011 19:35:57 +0000
Subject: [PATCH] RAP Tomcat deployment

git-svn-id: https://svn.argeo.org/commons/trunk@4255 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../org.argeo.eclipse.dep.rap/pom.xml         | 28 ++++++++-----------
 gis/runtime/org.argeo.gis.geotools/pom.xml    |  7 ++++-
 .../dep/org.argeo.security.dep.node/pom.xml   |  5 ++++
 .../plugins/org.argeo.security.ui.rap/pom.xml |  5 ++++
 .../WEB-INF/applicationContext.xml            |  2 +-
 .../WEB-INF/web.xml                           | 23 ++++++---------
 6 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/eclipse/features/org.argeo.eclipse.dep.rap/pom.xml b/eclipse/features/org.argeo.eclipse.dep.rap/pom.xml
index 2a27b523b..d8c92b521 100644
--- a/eclipse/features/org.argeo.eclipse.dep.rap/pom.xml
+++ b/eclipse/features/org.argeo.eclipse.dep.rap/pom.xml
@@ -33,10 +33,10 @@
 			<groupId>javax.servlet</groupId>
 			<artifactId>com.springsource.javax.servlet</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.eclipse.equinox</groupId>
-			<artifactId>org.eclipse.equinox.http.jetty</artifactId>
-		</dependency>
+<!--		<dependency>-->
+<!--			<groupId>org.eclipse.equinox</groupId>-->
+<!--			<artifactId>org.eclipse.equinox.http.jetty</artifactId>-->
+<!--		</dependency>-->
 		<dependency>
 			<groupId>org.eclipse.equinox</groupId>
 			<artifactId>org.eclipse.equinox.http.registry</artifactId>
@@ -45,10 +45,6 @@
 			<groupId>org.eclipse.equinox</groupId>
 			<artifactId>org.eclipse.equinox.http.servlet</artifactId>
 		</dependency>
-		<!-- <dependency> <groupId>org.eclipse.rap</groupId> <artifactId>org.eclipse.rap.demo.databinding</artifactId> 
-			</dependency> <dependency> <groupId>org.eclipse.rap</groupId> <artifactId>org.eclipse.rap.demo</artifactId> 
-			</dependency> <dependency> <groupId>org.eclipse.rap</groupId> <artifactId>org.eclipse.rap.design.example</artifactId> 
-			</dependency> -->
 		<dependency>
 			<groupId>org.eclipse.rap</groupId>
 			<artifactId>org.eclipse.rap.jface.databinding</artifactId>
@@ -69,14 +65,14 @@
 			<groupId>org.eclipse.rap</groupId>
 			<artifactId>org.eclipse.rap.ui.views</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.mortbay.jetty</groupId>
-			<artifactId>org.mortbay.jetty.server</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.mortbay.jetty</groupId>
-			<artifactId>org.mortbay.jetty.util</artifactId>
-		</dependency>
+<!--		<dependency>-->
+<!--			<groupId>org.mortbay.jetty</groupId>-->
+<!--			<artifactId>org.mortbay.jetty.server</artifactId>-->
+<!--		</dependency>-->
+<!--		<dependency>-->
+<!--			<groupId>org.mortbay.jetty</groupId>-->
+<!--			<artifactId>org.mortbay.jetty.util</artifactId>-->
+<!--		</dependency>-->
 		<dependency>
 			<groupId>org.eclipse.core</groupId>
 			<artifactId>org.eclipse.core.databinding</artifactId>
diff --git a/gis/runtime/org.argeo.gis.geotools/pom.xml b/gis/runtime/org.argeo.gis.geotools/pom.xml
index 92a81f8cd..c4f7a22d7 100644
--- a/gis/runtime/org.argeo.gis.geotools/pom.xml
+++ b/gis/runtime/org.argeo.gis.geotools/pom.xml
@@ -54,12 +54,17 @@
 		</plugins>
 	</build>
 	<dependencies>
-		<!-- JCR -->
+		<!-- Commons -->
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.server.jcr</artifactId>
 			<version>${version.argeo-commons}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.security</groupId>
+			<artifactId>org.argeo.security.core</artifactId>
+			<version>${version.argeo-commons}</version>
+		</dependency>
 
 		<!-- Geotools, JTS, etc. -->
 		<dependency>
diff --git a/security/dep/org.argeo.security.dep.node/pom.xml b/security/dep/org.argeo.security.dep.node/pom.xml
index 4e2d71be7..008b63214 100644
--- a/security/dep/org.argeo.security.dep.node/pom.xml
+++ b/security/dep/org.argeo.security.dep.node/pom.xml
@@ -63,6 +63,11 @@
 			<version>${version.argeo-commons}</version>
 			<type>pom</type>
 		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.webextender</artifactId>
+			<version>${version.argeo-commons}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.osgi</groupId>
 			<artifactId>org.springframework.osgi.web.extender</artifactId>
diff --git a/security/plugins/org.argeo.security.ui.rap/pom.xml b/security/plugins/org.argeo.security.ui.rap/pom.xml
index 067e16e15..b30b8bd2d 100644
--- a/security/plugins/org.argeo.security.ui.rap/pom.xml
+++ b/security/plugins/org.argeo.security.ui.rap/pom.xml
@@ -77,6 +77,11 @@
 			<artifactId>org.argeo.eclipse.dep.rap</artifactId>
 			<version>${version.argeo-commons}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.osgi.webapp</artifactId>
+			<version>${version.argeo-commons}</version>
+		</dependency>
 
 		<!-- Target platform generation -->
 		<dependency>
diff --git a/server/modules/org.argeo.server.osgi.webapp/WEB-INF/applicationContext.xml b/server/modules/org.argeo.server.osgi.webapp/WEB-INF/applicationContext.xml
index a45053fd5..febc4b97c 100644
--- a/server/modules/org.argeo.server.osgi.webapp/WEB-INF/applicationContext.xml
+++ b/server/modules/org.argeo.server.osgi.webapp/WEB-INF/applicationContext.xml
@@ -6,6 +6,6 @@
        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
 
 	<import resource="osgi.xml" />
-	<import resource="security.xml" />
+<!--	<import resource="security.xml" />-->
 
 </beans>
\ No newline at end of file
diff --git a/server/modules/org.argeo.server.osgi.webapp/WEB-INF/web.xml b/server/modules/org.argeo.server.osgi.webapp/WEB-INF/web.xml
index fde1ebba4..16388e449 100644
--- a/server/modules/org.argeo.server.osgi.webapp/WEB-INF/web.xml
+++ b/server/modules/org.argeo.server.osgi.webapp/WEB-INF/web.xml
@@ -21,11 +21,6 @@
 	</context-param>
 
 	<!-- OSGi Http Service -->
-<!--	<servlet>-->
-<!--		<servlet-name>service</servlet-name>-->
-<!--		<servlet-class>org.eclipse.equinox.http.servlet.HttpServiceServlet</servlet-class>-->
-<!--		<load-on-startup>1</load-on-startup>-->
-<!--	</servlet>-->
 	<servlet>
 		<servlet-name>service</servlet-name>
 		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
@@ -42,14 +37,14 @@
 	</servlet-mapping>
 
 	<!-- Security -->
-	<filter>
-		<filter-name>springSecurityFilterChain</filter-name>
-		<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
-	</filter>
-
-	<filter-mapping>
-		<filter-name>springSecurityFilterChain</filter-name>
-		<url-pattern>/*</url-pattern>
-	</filter-mapping>
+<!--	<filter>-->
+<!--		<filter-name>springSecurityFilterChain</filter-name>-->
+<!--		<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>-->
+<!--	</filter>-->
+<!---->
+<!--	<filter-mapping>-->
+<!--		<filter-name>springSecurityFilterChain</filter-name>-->
+<!--		<url-pattern>/*</url-pattern>-->
+<!--	</filter-mapping>-->
 
 </web-app>
-- 
2.30.2