[jboss-osgi-commits] JBoss-OSGI SVN: r94422 - projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability.

[jboss-osgi-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2009-10-06 12:19:06 -0400 (Tue, 06 Oct 2009)
New Revision: 94422

Added:
   projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/HttpServiceCapability.java
Removed:
   projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/HttpCapability.java
Log:
[JBOSGI-160] Use Pax Web instead of Apache Http-Service

Deleted: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/HttpCapability.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/HttpCapability.java	2009-10-06 16:13:42 UTC (rev 94421)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/HttpCapability.java	2009-10-06 16:19:06 UTC (rev 94422)
@@ -1,56 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.osgi.spi.capability;
-
-//$Id$
-
-import org.jboss.osgi.spi.testing.OSGiRuntime;
-import org.osgi.service.http.HttpService;
-
-/**
- * Adds the {@link HttpService} capability to the {@link OSGiRuntime}
- * under test. 
- * 
- * It is ignored if the {@link HttpService} is already registered.
- * 
- * Installed bundles: org.apache.felix.http.jetty.jar
- * 
- * Default properties set by this capability
- * 
- * <table>
- * <tr><th>Property</th><th>Value</th></tr> 
- * <tr><td>org.osgi.service.http.port</td><td>8090</td></tr> 
- * </table> 
- * 
- * @author thomas.diesler at jboss.com
- * @since 05-May-2009
- */
-public class HttpCapability extends Capability
-{
-   public HttpCapability()
-   {
-      super(HttpService.class.getName());
-      addSystemProperty("org.osgi.service.http.port", "8090");
-
-      addBundle("bundles/org.apache.felix.http.jetty.jar");
-   }
-}
\ No newline at end of file

Copied: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/HttpServiceCapability.java (from rev 94412, projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/HttpCapability.java)
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/HttpServiceCapability.java	                        (rev 0)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/capability/HttpServiceCapability.java	2009-10-06 16:19:06 UTC (rev 94422)
@@ -0,0 +1,56 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.spi.capability;
+
+//$Id$
+
+import org.jboss.osgi.spi.testing.OSGiRuntime;
+import org.osgi.service.http.HttpService;
+
+/**
+ * Adds the {@link HttpService} capability to the {@link OSGiRuntime}
+ * under test. 
+ * 
+ * It is ignored if the {@link HttpService} is already registered.
+ * 
+ * Installed bundles: pax-web-jetty-bundle.jar
+ * 
+ * Default properties set by this capability
+ * 
+ * <table>
+ * <tr><th>Property</th><th>Value</th></tr> 
+ * <tr><td>org.osgi.service.http.port</td><td>8090</td></tr> 
+ * </table> 
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 05-May-2009
+ */
+public class HttpServiceCapability extends Capability
+{
+   public HttpServiceCapability()
+   {
+      super(HttpService.class.getName());
+      addSystemProperty("org.osgi.service.http.port", "8090");
+
+      addBundle("bundles/pax-web-jetty-bundle.jar");
+   }
+}
\ No newline at end of file