Author: reto
Date: Thu Jun 17 15:28:54 2010
New Revision: 955638
URL: http://svn.apache.org/viewvc?rev=955638&view=rev
Log:
CLEREZZA-235: switched http-service implementation to support ssl
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/org.apache.clerezza.platform.launcher.storageless/pom.xml
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/org.apache.clerezza.platform.launcher.storageless/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/org.apache.clerezza.platform.launcher.storageless/pom.xml?rev=955638&r1=955637&r2=955638&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/org.apache.clerezza.platform.launcher.storageless/pom.xml
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/org.apache.clerezza.platform.launcher.storageless/pom.xml
Thu Jun 17 15:28:54 2010
@@ -32,11 +32,20 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ <executions>
+ <execution>
+
<id>generate-scr-scrdescriptor</id>
+ <phase>none</phase>
+ </execution>
+ </executions>
+ </plugin>
<!-- Bundles to list in the installer properties file
-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.1</version>
<executions>
<execution>
<goals>
@@ -219,13 +228,72 @@
<scope>provided</scope>
<version>3.0.0</version>
</dependency>
- <dependency>
+ <!-- <dependency>
<groupId>org.ops4j.pax.web</groupId>
<artifactId>pax-web-jetty-bundle</artifactId>
<scope>provided</scope>
<version>0.7.2</version>
+ </dependency> -->
+ <dependency>
+ <groupId>org.wymiwyg</groupId>
+ <artifactId>jetty-osgi-httpservice</artifactId>
+ <scope>provided</scope>
+ <version>0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.equinox.http</groupId>
+ <artifactId>servlet</artifactId>
+ <scope>provided</scope>
+ <version>1.0.0-v20070606</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <scope>provided</scope>
+ <version>7.1.4.v20100610</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ <scope>provided</scope>
+ <version>7.1.4.v20100610</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <scope>provided</scope>
+ <version>7.1.4.v20100610</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-io</artifactId>
+ <scope>provided</scope>
+ <version>7.1.4.v20100610</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-continuation</artifactId>
+ <scope>provided</scope>
+ <version>7.1.4.v20100610</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-http</artifactId>
+ <scope>provided</scope>
+ <version>7.1.4.v20100610</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-security</artifactId>
+ <scope>provided</scope>
+ <version>7.1.4.v20100610</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>servlet-api-2.5</artifactId>
+ <scope>provided</scope>
+ <version>6.1.9</version>
</dependency>
-
<!-- Apache Felix framework bundles -->
<dependency>
<groupId>org.apache.felix</groupId>
