[Amdatu-commits] SVN r494 - in trunk/amdatu-web/httpcontext: . src/main/java/org/amdatu/web/httpcontext src/main/java/org/amdatu/web/httpcontext/service

[subvers...@amdatu.org]

Author: angelo.vandersijpt at luminis.eu
Date: Wed Dec 15 12:13:00 2010
New Revision: 494

Log:
AMDATU-213 The http context bundles now uses a nice import statement.

Removed:
   
trunk/amdatu-web/httpcontext/src/main/java/org/amdatu/web/httpcontext/ExtHttpContext.java
Modified:
   trunk/amdatu-web/httpcontext/pom.xml
   
trunk/amdatu-web/httpcontext/src/main/java/org/amdatu/web/httpcontext/service/HttpContextImpl.java

Modified: trunk/amdatu-web/httpcontext/pom.xml
==============================================================================
--- trunk/amdatu-web/httpcontext/pom.xml        (original)
+++ trunk/amdatu-web/httpcontext/pom.xml        Wed Dec 15 12:13:00 2010
@@ -13,27 +13,6 @@
   <name>Amdatu Web - HTTP Context</name>
   <description>Provides a HTTPContext implementation</description>
 
-  <dependencies>
-    <dependency>
-      <groupId>commons-beanutils</groupId>
-      <artifactId>commons-beanutils</artifactId>
-      <version>1.8.3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>com.springsource.org.apache.commons.logging</artifactId>
-      <version>1.1.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.kornr.osgi</groupId>
-      <artifactId>commons-logging-osgi</artifactId>
-      <version>${net.kornr.osgi.commons-logging-osgi.version}</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-
   <build>
     <plugins>
       <plugin>
@@ -41,17 +20,12 @@
         <artifactId>maven-bundle-plugin</artifactId>
         <configuration>
           <instructions>
+            <Private-Package>org.amdatu.web.httpcontext.osgi, 
org.amdatu.web.httpcontext.service</Private-Package>
             
<Bundle-Activator>org.amdatu.web.httpcontext.osgi.Activator</Bundle-Activator>
             
<Bundle-SymbolicName>org.amdatu.web.httpcontext</Bundle-SymbolicName>
-            
<Embed-Dependency>*;scope=compile;groupId=!org.apache.felix|org.osgi</Embed-Dependency>
-            <Import-Package>
-              *;resolution:=optional,
-              org.osgi.service.useradmin,
-              org.amdatu.web.httpcontext
-            </Import-Package>
-            <_exportcontents>
+            <Export-Package>
               org.amdatu.web.httpcontext
-            </_exportcontents>
+            </Export-Package>
           </instructions>
         </configuration>
       </plugin>

Modified: 
trunk/amdatu-web/httpcontext/src/main/java/org/amdatu/web/httpcontext/service/HttpContextImpl.java
==============================================================================
--- 
trunk/amdatu-web/httpcontext/src/main/java/org/amdatu/web/httpcontext/service/HttpContextImpl.java
  (original)
+++ 
trunk/amdatu-web/httpcontext/src/main/java/org/amdatu/web/httpcontext/service/HttpContextImpl.java
  Wed Dec 15 12:13:00 2010
@@ -16,13 +16,11 @@
  */
 package org.amdatu.web.httpcontext.service;
 
-import java.io.IOException;
-import java.net.URL;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.net.URL;
 
-import org.amdatu.web.httpcontext.ExtHttpContext;
 import org.amdatu.web.httpcontext.ResourceProvider;
 import org.apache.felix.dm.Component;
 import org.apache.sling.commons.mime.MimeTypeService;
@@ -30,6 +28,7 @@
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.ServiceReference;
+import org.osgi.service.http.HttpContext;
 import org.osgi.service.http.HttpService;
 import org.osgi.service.log.LogService;
 
@@ -43,7 +42,7 @@
  * http://osdir.com/ml/java.ops4j.general/2008-02/msg00130.html
  * @author ivol
  */
-public class HttpContextImpl implements ExtHttpContext {
+public class HttpContextImpl implements HttpContext {
     // Internal property names for service properties
     final static String BUNDLECONTEXT_PROP = "bundlecontext";
     final static String BUNDLEID_PROP = "bundleid";