Reintroduce Jetty

git-svn-id: https://svn.argeo.org/commons/trunk@4365 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 58c10ef2e218cccf7d216c21314b6afe370861e8..e90b0ac23982994f01877dca8d7303f9c7681562 100644 (file)
--- a/eclipse/features/org.argeo.eclipse.dep.rap/pom.xml
+++ b/eclipse/features/org.argeo.eclipse.dep.rap/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons.eclipse</groupId>
@@ -74,6 +75,19 @@
                        <groupId>org.eclipse.rap</groupId>
                        <artifactId>org.eclipse.rap.ui.views</artifactId>
                </dependency>
+               <!-- Jetty -->
+               <dependency>
+                       <groupId>org.eclipse.equinox</groupId>
+                       <artifactId>org.eclipse.equinox.http.jetty</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>
                <!-- Eclipse -->
                <dependency>
                        <groupId>org.eclipse.core</groupId>

diff --git a/server/dep/org.argeo.server.dep.tomcat/pom.xml b/server/dep/org.argeo.server.dep.tomcat/pom.xml
index 7a4ac4b9a5058757e529a572c72d9c1ccd125d60..756242fade15ddfef756e8abdfdeff930545d18d 100644 (file)
--- a/server/dep/org.argeo.server.dep.tomcat/pom.xml
+++ b/server/dep/org.argeo.server.dep.tomcat/pom.xml
@@ -24,11 +24,11 @@
                        <artifactId>org.argeo.server.catalina</artifactId>
                        <version>${version.argeo-commons}</version>
                </dependency>
-               <dependency>
-                       <groupId>org.argeo.commons.server</groupId>
-                       <artifactId>org.argeo.server.tomcat</artifactId>
-                       <version>${version.argeo-commons}</version>
-               </dependency>
+<!--           <dependency> -->
+<!--                   <groupId>org.argeo.commons.server</groupId> -->
+<!--                   <artifactId>org.argeo.server.tomcat</artifactId> -->
+<!--                   <version>${version.argeo-commons}</version> -->
+<!--           </dependency> -->
 
                <!-- JEE -->
                <dependency>

diff --git a/server/modules/org.argeo.server.osgi.webapp/META-INF/context.xml b/server/modules/org.argeo.server.osgi.webapp/META-INF/context.xml
new file mode 100644 (file)
index 0000000..188c647
--- /dev/null
+++ b/server/modules/org.argeo.server.osgi.webapp/META-INF/context.xml
@@ -0,0 +1,2 @@
+<Context cookies="false">
+</Context>
\ No newline at end of file