axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sami...@apache.org
Subject svn commit: r668734 - in /webservices/axis2/trunk/java/modules/osgi: ./ resources/META-INF/ src/org/apache/axis2/extensions/osgi/ src/org/apache/axis2/extensions/osgi/core/ src/org/apache/axis2/osgi/ src/org/apache/axis2/osgi/core/ src/org/apache/axis2...
Date Tue, 17 Jun 2008 16:36:55 GMT
Author: saminda
Date: Tue Jun 17 09:36:54 2008
New Revision: 668734

URL: http://svn.apache.org/viewvc?rev=668734&view=rev
Log:
This is the first step towards making Axis2 an proper OSGi bundle. I have commented out some
of the existing code and 
started adding the structure for new code. From this commit the existing functionality will
break. I will post to 
mailing list of the progress each and every main events. 


Added:
    webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/osgi/
    webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/osgi/core/
      - copied from r668728, webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/extensions/osgi/core/
    webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/osgi/deployment/
    webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/osgi/engine/
    webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/osgi/internal/
    webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/osgi/internal/Activator.java
    webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/osgi/util/
Removed:
    webservices/axis2/trunk/java/modules/osgi/resources/META-INF/
    webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/extensions/osgi/core/
Modified:
    webservices/axis2/trunk/java/modules/osgi/pom.xml
    webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/extensions/osgi/Activator.java
    webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/extensions/osgi/OSGiAxis2Servlet.java
    webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/extensions/osgi/ServiceRegistry.java
    webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/osgi/core/SOAPProvider.java
    webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/osgi/core/web/ServletDescriptor.java
    webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/osgi/core/web/WebApp.java
    webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/osgi/core/web/WebAppDescriptor.java

Modified: webservices/axis2/trunk/java/modules/osgi/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/osgi/pom.xml?rev=668734&r1=668733&r2=668734&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/osgi/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/osgi/pom.xml Tue Jun 17 09:36:54 2008
@@ -19,18 +19,22 @@
   ~ under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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.apache.axis2</groupId>
         <artifactId>axis2-parent</artifactId>
         <version>SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
-    <artifactId>axis2-osgi</artifactId>
-    <name>Apache Axis2 - OSGi</name>
-    <description>OSGi for Axis 2.0</description>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.apache.axis2.osgi</artifactId>
+    <packaging>bundle</packaging>
+    <name>Apache Axis2 OSGi Integration</name>
+    <description>Apache Axis2 OSGi Integration</description>
     <build>
         <sourceDirectory>src</sourceDirectory>
         <resources>
@@ -41,129 +45,77 @@
         </resources>
         <plugins>
             <plugin>
-              <artifactId>maven-jar-plugin</artifactId>
-              <configuration>
-                <archive>  
-                  <manifestFile>resources/META-INF/MANIFEST.MF</manifestFile>
-                </archive> 
-              </configuration>
-            </plugin>  
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy</id>
-                        <phase>process-classes</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-						<configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.axis2</groupId>
-                                    <artifactId>axis2-kernel</artifactId>
-                                    <version>${version}</version>
-                                    <outputDirectory>${basedir}/target/classes</outputDirectory>
-                                    <excludes>**/*.java,META-INF/maven/**/*.*</excludes>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.axis2</groupId>
-                                    <artifactId>axis2-adb</artifactId>
-                                    <version>${version}</version>
-                                    <outputDirectory>${basedir}/target/classes</outputDirectory>
-                                    <excludes>**/*.java,META-INF/maven/**/*.*</excludes>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.axis2</groupId>
-                                    <artifactId>axis2-saaj</artifactId>
-                                    <version>${version}</version>
-                                    <outputDirectory>${basedir}/target/classes</outputDirectory>
-                                    <excludes>**/*.java,META-INF/maven/**/*.*</excludes>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.axis2</groupId>
-                                    <artifactId>axis2-metadata</artifactId>
-                                    <version>${version}</version>
-                                    <outputDirectory>${basedir}/target/classes</outputDirectory>
-                                    <excludes>**/*.java,META-INF/maven/**/*.*</excludes>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.axis2</groupId>
-                                    <artifactId>axis2-jaxws</artifactId>
-                                    <version>${version}</version>
-                                    <outputDirectory>${basedir}/target/classes</outputDirectory>
-                                    <excludes>**/*.java,META-INF/maven/**/*.*</excludes>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                </executions>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>1.4.0</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-Version>1.0.0.${pom.version}</Bundle-Version>
+                        <Bundle-Name>${pom.artifactId}</Bundle-Name>
+                        <Bundle-Vendor>WSO2 Inc</Bundle-Vendor>
+                        <Bundle-Description>${pom.description}</Bundle-Description>
+                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>
+                            !org.apache.axis2.osgi.internal,
+                            org.apache.axis2.osgi.*; version=1.0.0,
+                            org.apache.axis2.*;-split-package:=merge-last,
+                        </Export-Package>
+                        <Import-Package>
+                            !org.apache.axis2.*,
+                            javax.servlet; version=2.4.0,
+                            javax.servlet.http; version=2.4.0,
+                            *;resolution:=optional
+                        </Import-Package>
+                        <Private-Package>
+                            org.apache.axis2.osgi.internal,
+                        </Private-Package>
+                        <Bundle-Activator>org.apache.axis2.osgi.internal.Activator</Bundle-Activator>
+                    </instructions>
+                </configuration>
             </plugin>
         </plugins>
     </build>
+
     <dependencies>
         <dependency>
-            <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-adb</artifactId>
-            <version>${version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>servlet-api</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.4</version>
         </dependency>
         <dependency>
             <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-kernel</artifactId>
+            <artifactId>axis2-adb</artifactId>
             <version>${version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>servlet-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-jaxws</artifactId>
+            <artifactId>axis2-kernel</artifactId>
             <version>${version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>servlet-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.sun.xml.bind</groupId>
-                    <artifactId>jaxb-xjc</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.sun.xml.bind</groupId>
-                    <artifactId>jaxb-impl</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.osgi.core</artifactId>
-            <version>1.1.0-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
             <version>1.0.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
-            <artifactId>javax.servlet</artifactId>
+            <artifactId>org.osgi.compendium</artifactId>
             <version>1.0.0</version>
             <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>javax.servlet</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>org.osgi.foundation</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
+
+
 </project>

Modified: webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/extensions/osgi/Activator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/extensions/osgi/Activator.java?rev=668734&r1=668733&r2=668734&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/extensions/osgi/Activator.java
(original)
+++ webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/extensions/osgi/Activator.java
Tue Jun 17 09:36:54 2008
@@ -1,4 +1,6 @@
 /*
+*/
+/*
  * 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
@@ -16,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+/*
 
 package org.apache.axis2.extensions.osgi;
 
@@ -41,7 +44,7 @@
         this.context = context;
 
         logger = new Logger(context);
-        httpTracker = new HttpServiceTracker(context, servlet, logger); 
+        httpTracker = new HttpServiceTracker(context, servlet, logger);
         registry = new ServiceRegistry(servlet, logger);
 
         logger.log(LogService.LOG_INFO, "[Axis2/OSGi] Starting Bundle Listener");
@@ -85,3 +88,4 @@
         registry.close();
     }
 }
+*/

Modified: webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/extensions/osgi/OSGiAxis2Servlet.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/extensions/osgi/OSGiAxis2Servlet.java?rev=668734&r1=668733&r2=668734&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/extensions/osgi/OSGiAxis2Servlet.java
(original)
+++ webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/extensions/osgi/OSGiAxis2Servlet.java
Tue Jun 17 09:36:54 2008
@@ -1,4 +1,6 @@
 /*
+*/
+/*
  * 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
@@ -16,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+/*
 
 package org.apache.axis2.extensions.osgi;
 
@@ -33,12 +36,14 @@
 
 public class OSGiAxis2Servlet extends AxisServlet {
     
-    /**
+    */
+/**
      * Set the context root if it is not set already. We are overriding AxisServlet's impl
to
      * get past an issue in Felix.
      *
      * @param req
      */
+/*
     public void initContextRoot(HttpServletRequest req) {
         if (contextRoot != null && contextRoot.trim().length() != 0) {
             return;
@@ -58,3 +63,4 @@
         return configContext;
     }
 }
+*/

Modified: webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/extensions/osgi/ServiceRegistry.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/extensions/osgi/ServiceRegistry.java?rev=668734&r1=668733&r2=668734&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/extensions/osgi/ServiceRegistry.java
(original)
+++ webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/extensions/osgi/ServiceRegistry.java
Tue Jun 17 09:36:54 2008
@@ -1,4 +1,6 @@
 /*
+*/
+/*
  * 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
@@ -16,6 +18,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+/*
 
 package org.apache.axis2.extensions.osgi;
 
@@ -184,3 +187,4 @@
         }
     }
 }
+*/

Modified: webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/osgi/core/SOAPProvider.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/osgi/core/SOAPProvider.java?rev=668734&r1=668728&r2=668734&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/osgi/core/SOAPProvider.java
(original)
+++ webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/osgi/core/SOAPProvider.java
Tue Jun 17 09:36:54 2008
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package org.apache.axis2.extensions.osgi.core;
+package org.apache.axis2.osgi.core;
 
-import org.apache.axis2.extensions.osgi.core.web.WebApp;
+import org.apache.axis2.osgi.core.web.WebApp;
 import org.osgi.framework.Bundle;
 
 /**
@@ -99,7 +99,7 @@
      * Deploys an Object as a WebService using the provider's default binding type.
      * The service is deployed into the specified <code>WebApp</code> context
      *
-     * @param WebApp    the target web application context
+     * @param webApp    the target web application context
      * @param srvName   the display name of the service
      * @param srvClass  the class or interface that should be exposed. Specifying an interface
      *                  allows only the desired methods of the service object to be published.
@@ -112,7 +112,7 @@
      * Deploys an Object as a WebService using a specified binding type
      * The service is deployed into the specified <code>WebApp</code> context
      *
-     * @param WebApp      the target web application context
+     * @param webApp      the target web application context
      * @param srvName     the display name of the service
      * @param bindingType the name of the desired binding type
      * @param srvClass    the class or interface that should be exposed. Specifying an interface

Modified: webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/osgi/core/web/ServletDescriptor.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/osgi/core/web/ServletDescriptor.java?rev=668734&r1=668728&r2=668734&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/osgi/core/web/ServletDescriptor.java
(original)
+++ webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/osgi/core/web/ServletDescriptor.java
Tue Jun 17 09:36:54 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.axis2.extensions.osgi.core.web;
+package org.apache.axis2.osgi.core.web;
 
 import javax.servlet.http.HttpServlet;
 import java.util.Hashtable;

Modified: webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/osgi/core/web/WebApp.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/osgi/core/web/WebApp.java?rev=668734&r1=668728&r2=668734&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/osgi/core/web/WebApp.java
(original)
+++ webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/osgi/core/web/WebApp.java
Tue Jun 17 09:36:54 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.axis2.extensions.osgi.core.web;
+package org.apache.axis2.osgi.core.web;
 
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleException;

Modified: webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/osgi/core/web/WebAppDescriptor.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/osgi/core/web/WebAppDescriptor.java?rev=668734&r1=668728&r2=668734&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/osgi/core/web/WebAppDescriptor.java
(original)
+++ webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/osgi/core/web/WebAppDescriptor.java
Tue Jun 17 09:36:54 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.axis2.extensions.osgi.core.web;
+package org.apache.axis2.osgi.core.web;
 
 /**
  *

Added: webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/osgi/internal/Activator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/osgi/internal/Activator.java?rev=668734&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/osgi/internal/Activator.java
(added)
+++ webservices/axis2/trunk/java/modules/osgi/src/org/apache/axis2/osgi/internal/Activator.java
Tue Jun 17 09:36:54 2008
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed 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.axis2.osgi.internal;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+/**
+ * Activator will set the necessary parameters that initiate Axis2 OSGi integration
+ * TODO: TBD; yet the structure is being formed 
+ */
+public class Activator implements BundleActivator {
+
+
+    public void start(BundleContext context) throws Exception {
+
+    }
+
+    public void stop(BundleContext context) throws Exception {
+
+    }
+}



Mime
View raw message