You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by fm...@apache.org on 2011/09/23 15:38:58 UTC
svn commit: r1174750 - in /felix/trunk/http: api/
api/src/main/java/org/apache/felix/http/api/ cometd/
cometd/src/main/java/org/apache/felix/http/cometd/
cometd/src/main/java/org/apache/felix/http/cometd/internal/ samples/cometd/
samples/cometd/src/mai...
Author: fmeschbe
Date: Fri Sep 23 13:38:57 2011
New Revision: 1174750
URL: http://svn.apache.org/viewvc?rev=1174750&view=rev
Log:
FELIX-3102 Applied the patch supplied by Julian Sedding(thanks)
Added:
felix/trunk/http/cometd/src/main/java/org/apache/felix/http/cometd/CometdService.java (with props)
Removed:
felix/trunk/http/api/src/main/java/org/apache/felix/http/api/CometdService.java
Modified:
felix/trunk/http/api/pom.xml
felix/trunk/http/cometd/pom.xml
felix/trunk/http/cometd/src/main/java/org/apache/felix/http/cometd/internal/CometdServiceImpl.java
felix/trunk/http/samples/cometd/pom.xml
felix/trunk/http/samples/cometd/src/main/java/org/apache/felix/http/samples/cometd/Activator.java
Modified: felix/trunk/http/api/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/api/pom.xml?rev=1174750&r1=1174749&r2=1174750&view=diff
==============================================================================
--- felix/trunk/http/api/pom.xml (original)
+++ felix/trunk/http/api/pom.xml Fri Sep 23 13:38:57 2011
@@ -53,12 +53,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.cometd.java</groupId>
- <artifactId>cometd-api</artifactId>
- <version>1.0.beta7</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
Modified: felix/trunk/http/cometd/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/cometd/pom.xml?rev=1174750&r1=1174749&r2=1174750&view=diff
==============================================================================
--- felix/trunk/http/cometd/pom.xml (original)
+++ felix/trunk/http/cometd/pom.xml Fri Sep 23 13:38:57 2011
@@ -41,22 +41,18 @@
org.apache.felix.http.cometd.internal.CometdActivator
</Bundle-Activator>
<Export-Package>
- org.apache.felix.http.api;version=${pom.version},
- org.cometd;version=1.0.beta7,
- org.mortbay.*;-split-package:=merge-first,
- org.osgi.service.http,
- javax.servlet.*;version=2.5;-split-package:=merge-first
+ org.apache.felix.http.cometd;version=${project.version},
+ org.cometd;version=1.1.4
</Export-Package>
<Private-Package>
org.apache.felix.http.base.*,
- org.apache.felix.http.cometd.*
+ org.apache.felix.http.cometd.internal
</Private-Package>
- <Import-Package>
- org.osgi.service.http.*,
- org.cometd,
- org.apache.felix.http.api,
- *;resolution:=optional
- </Import-Package>
+ <Embed-Dependency>
+ cometd-jetty;inline=true,
+ jetty-util;inline=true,
+ jetty-util5;inline=true
+ </Embed-Dependency>
</instructions>
</configuration>
</plugin>
@@ -77,27 +73,17 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.5</version>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>6.1.24</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>6.1.24</version>
+ <version>6.1.26</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-sslengine</artifactId>
- <version>6.1.24</version>
- </dependency>
- <dependency>
- <groupId>org.cometd.java</groupId>
- <artifactId>cometd-api</artifactId>
- <version>1.0.beta7</version>
+ <artifactId>jetty-util5</artifactId>
+ <version>6.1.26</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
@@ -105,14 +91,14 @@
<version>6.1.15</version>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>org.apache.felix.http.api</artifactId>
- <version>${pom.version}</version>
+ <groupId>org.cometd.java</groupId>
+ <artifactId>cometd-api</artifactId>
+ <version>1.1.4</version>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>org.apache.felix.http.base</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
Added: felix/trunk/http/cometd/src/main/java/org/apache/felix/http/cometd/CometdService.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/cometd/src/main/java/org/apache/felix/http/cometd/CometdService.java?rev=1174750&view=auto
==============================================================================
--- felix/trunk/http/cometd/src/main/java/org/apache/felix/http/cometd/CometdService.java (added)
+++ felix/trunk/http/cometd/src/main/java/org/apache/felix/http/cometd/CometdService.java Fri Sep 23 13:38:57 2011
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.felix.http.cometd;
+
+import javax.servlet.ServletException;
+import org.cometd.Bayeux;
+
+public interface CometdService
+{
+ public Bayeux getBayeux()
+ throws ServletException;
+}
Propchange: felix/trunk/http/cometd/src/main/java/org/apache/felix/http/cometd/CometdService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: felix/trunk/http/cometd/src/main/java/org/apache/felix/http/cometd/CometdService.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev Url
Modified: felix/trunk/http/cometd/src/main/java/org/apache/felix/http/cometd/internal/CometdServiceImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/cometd/src/main/java/org/apache/felix/http/cometd/internal/CometdServiceImpl.java?rev=1174750&r1=1174749&r2=1174750&view=diff
==============================================================================
--- felix/trunk/http/cometd/src/main/java/org/apache/felix/http/cometd/internal/CometdServiceImpl.java (original)
+++ felix/trunk/http/cometd/src/main/java/org/apache/felix/http/cometd/internal/CometdServiceImpl.java Fri Sep 23 13:38:57 2011
@@ -16,7 +16,7 @@
*/
package org.apache.felix.http.cometd.internal;
-import org.apache.felix.http.api.CometdService;
+import org.apache.felix.http.cometd.CometdService;
import org.apache.felix.http.base.internal.logger.SystemLogger;
import org.cometd.Bayeux;
import org.mortbay.cometd.continuation.ContinuationCometdServlet;
Modified: felix/trunk/http/samples/cometd/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/samples/cometd/pom.xml?rev=1174750&r1=1174749&r2=1174750&view=diff
==============================================================================
--- felix/trunk/http/samples/cometd/pom.xml (original)
+++ felix/trunk/http/samples/cometd/pom.xml Fri Sep 23 13:38:57 2011
@@ -83,7 +83,7 @@
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>org.apache.felix.http.api</artifactId>
+ <artifactId>org.apache.felix.http.cometd</artifactId>
<version>${pom.version}</version>
</dependency>
</dependencies>
Modified: felix/trunk/http/samples/cometd/src/main/java/org/apache/felix/http/samples/cometd/Activator.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/samples/cometd/src/main/java/org/apache/felix/http/samples/cometd/Activator.java?rev=1174750&r1=1174749&r2=1174750&view=diff
==============================================================================
--- felix/trunk/http/samples/cometd/src/main/java/org/apache/felix/http/samples/cometd/Activator.java (original)
+++ felix/trunk/http/samples/cometd/src/main/java/org/apache/felix/http/samples/cometd/Activator.java Fri Sep 23 13:38:57 2011
@@ -26,7 +26,7 @@ import org.osgi.util.tracker.ServiceTrac
import javax.servlet.Servlet;
import javax.servlet.ServletException;
import java.util.Hashtable;
-import org.apache.felix.http.api.CometdService;
+import org.apache.felix.http.cometd.CometdService;
import org.cometd.Bayeux;
public final class Activator