RAP Tomcat deployment

git-svn-id: https://svn.argeo.org/commons/trunk@4255 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/eclipse/features/org.argeo.eclipse.dep.rap/pom.xml b/eclipse/features/org.argeo.eclipse.dep.rap/pom.xml
index 2a27b523b8c6fdd06c5421095f0a3bc4ce0a7928..d8c92b52157c349096b5e34fc0bdcb79ae1dadea 100644 (file)
--- 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 92a81f8cd48a2bdbfbc4d9ac4b656882940520cb..c4f7a22d705d3b37fc34c9bdc215e9cd0054d30c 100644 (file)
--- 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 4e2d71be78459de7ad6c9d2f78d3b49fc7d28836..008b63214fc25fce58b58f8d4a76d8923284411e 100644 (file)
--- 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 067e16e15dd400d1f250463fbc37a819a49fd1a6..b30b8bd2d76c042504f6714485b56dd7fe382b75 100644 (file)
--- 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 a45053fd5decab203e01eb00c6443d7f2c783ebf..febc4b97cfea863a01633e5e99eba9067c52eca1 100644 (file)
--- 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 fde1ebba46de1d2a93df84ba7ab5d29ea519a6b1..16388e44923581cad2ad3b756a02d7bc4bc0456a 100644 (file)
--- 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>