[Carbon-dev] svn commit r16711 - in trunk/carbon-orbit: . org.wso2.carbon.ant org.wso2.carbon.axiom org.wso2.carbon.axis2 org.wso2.carbon.axis2/src org.wso2.carbon.neethi org.wso2.carbon.registry org.wso2.carbon.tiles org.wso2.carbon.woden org.wso2.carbon.wsdl4j org.wso2.carbon.xmlschema

svn at wso2.org svn at wso2.org
Thu May 8 10:44:46 PDT 2008


Author: saminda
Date: Thu May  8 10:44:34 2008
New Revision: 16711

Log:

Added separate bundles 


Added:
   trunk/carbon-orbit/org.wso2.carbon.ant/
   trunk/carbon-orbit/org.wso2.carbon.ant/pom.xml
   trunk/carbon-orbit/org.wso2.carbon.axiom/
   trunk/carbon-orbit/org.wso2.carbon.axiom/pom.xml
   trunk/carbon-orbit/org.wso2.carbon.neethi/
   trunk/carbon-orbit/org.wso2.carbon.neethi/pom.xml
   trunk/carbon-orbit/org.wso2.carbon.woden/
   trunk/carbon-orbit/org.wso2.carbon.woden/pom.xml
   trunk/carbon-orbit/org.wso2.carbon.wsdl4j/
   trunk/carbon-orbit/org.wso2.carbon.wsdl4j/pom.xml
   trunk/carbon-orbit/org.wso2.carbon.xmlschema/
   trunk/carbon-orbit/org.wso2.carbon.xmlschema/pom.xml
Removed:
   trunk/carbon-orbit/org.wso2.carbon.axis2/src/
Modified:
   trunk/carbon-orbit/org.wso2.carbon.axis2/pom.xml
   trunk/carbon-orbit/org.wso2.carbon.registry/pom.xml
   trunk/carbon-orbit/org.wso2.carbon.tiles/pom.xml
   trunk/carbon-orbit/pom.xml

Added: trunk/carbon-orbit/org.wso2.carbon.ant/pom.xml
==============================================================================
--- (empty file)
+++ trunk/carbon-orbit/org.wso2.carbon.ant/pom.xml	Thu May  8 10:44:34 2008
@@ -0,0 +1,65 @@
+<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">
+
+
+    <parent>
+        <groupId>org.wso2.carbon</groupId>
+        <artifactId>carbon-orbit-parent</artifactId>
+        <version>SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.wso2.carbon.ant</artifactId>
+    <packaging>bundle</packaging>
+    <name>org.wso2.carbon.ant</name>
+    <version>1.7.0</version>
+    <description>
+        org.wso2.carbon.ant. This bundle will represent Ant
+    </description>
+    <url>http://wso2.org</url>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.ant</groupId>
+            <artifactId>ant</artifactId>
+            <version>1.7.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.ant</groupId>
+                    <artifactId>ant-launcher</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>1.4.0</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-Version>1.0.M8</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.tools.*;-split-package:=merge-first
+                        </Export-Package>
+                        <Import-Package>
+                            !org.apache.tools.*,
+                            *;resolution:=optional
+                        </Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>

Added: trunk/carbon-orbit/org.wso2.carbon.axiom/pom.xml
==============================================================================
--- (empty file)
+++ trunk/carbon-orbit/org.wso2.carbon.axiom/pom.xml	Thu May  8 10:44:34 2008
@@ -0,0 +1,172 @@
+<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">
+
+
+    <parent>
+        <groupId>org.wso2.carbon</groupId>
+        <artifactId>carbon-orbit-parent</artifactId>
+        <version>SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.wso2.carbon.axiom</artifactId>
+    <packaging>bundle</packaging>
+    <name>org.wso2.carbon.axiom</name>
+    <version>1.2.7</version>
+    <description>
+        org.wso2.carbon.axiom. This bundle will contain all axiom
+        releated packages. This also include xml-apis, xml-resolver,
+    </description>
+    <url>http://wso2.org</url>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>javax.mail</groupId>
+            <artifactId>mail</artifactId>
+            <version>1.4</version>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.activation</groupId>
+            <artifactId>activation</artifactId>
+            <version>1.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+            <version>1.0.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.ws.commons.axiom</groupId>
+            <artifactId>axiom-impl</artifactId>
+            <version>1.2.7</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.ws.commons.axiom</groupId>
+            <artifactId>axiom-dom</artifactId>
+            <version>1.2.7</version>
+        </dependency>
+
+        <dependency>
+            <groupId>xml-apis</groupId>
+            <artifactId>xml-apis</artifactId>
+            <version>1.3.04</version>
+        </dependency>
+
+        <!-- Felix dependencies for bundle -->
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>dom4j</groupId>
+            <artifactId>dom4j</artifactId>
+            <version>1.6.1</version>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>1.4.0</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-Version>${pom.version}</Bundle-Version>
+                        <Bundle-Name>${pom.artifactId}</Bundle-Name>
+                        <Bundle-Vendor>WSO2 Inc</Bundle-Vendor>
+                        <Bundle-Description>OSGi Bundle for Axiom</Bundle-Description>
+                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>
+                            !javax.xml.namespace,
+                            org.apache.axiom.*;-split-package:=merge-first,
+                            org.jaxen.*,
+                            org.xml.sax.*,
+                            org.w3c.dom.*;-split-package:=merge-first,
+                            javax.xml.stream;-split-package:=merge-first,
+                            javax.xml.*;-split-package:=merge-first,
+                            javax.activation;version=1.1;-split-package:=merge-first,
+                            javax.mail;version=1.4;-split-package:=merge-first,
+                            javax.mail.event;version=1.4;-split-package:=merge-first,
+                            javax.mail.internet;version=1.4;-split-package:=merge-first,
+                            javax.mail.search;version=1.4;-split-package:=merge-first,
+                            javax.mail.util;version=1.4;-split-package:=merge-first,
+                            com.sun.mail.imap;version=1.4,
+                            com.sun.mail.pop3;version=1.4,
+                            com.sun.mail.smtp;version=1.4,
+                            org.dom4j.*,
+                        </Export-Package>
+                        <Import-Package>
+                            !org.apache.axiom.*,
+                            !org.jaxen.*,
+                            !org.xml.sax.*,
+                            !org.w3c.dom.*,
+                            !javax.xml.*,
+                            !javax.activation;version=1.1,
+                            !javax.mail;version=1.4,
+                            !javax.mail.event;version=1.4,
+                            !javax.mail.internet;version=1.4,
+                            !javax.mail.search;version=1.4,
+                            !javax.mail.util;version=1.4,
+                            !com.sun.mail.imap;version=1.4,
+                            !com.sun.mail.pop3;version=1.4,
+                            !com.sun.mail.smtp;version=1.4,
+                            !org.dom4j.*,
+                            *;resolution:=optional
+                        </Import-Package>
+                        <Private-Package>
+                            com.sun.activation.registries,
+                            com.sun.activation.viewers,
+                            com.sun.mail.handlers,
+                            com.sun.mail.iap,
+                            com.sun.mail.imap.protocol,
+                            com.sun.mail.util
+                        </Private-Package>
+                        <Include-Resource>
+                            @activation-1.1.jar!/META-INF/mailcap.default,
+                            @activation-1.1.jar!/META-INF/mimetypes.default,
+                            @mail-1.4.jar!/META-INF/javamail.charset.map,
+                            @mail-1.4.jar!/META-INF/javamail.default.address.map,
+                            @mail-1.4.jar!/META-INF/javamail.default.providers,
+                            @mail-1.4.jar!/META-INF/mailcap,
+                        </Include-Resource>
+                        <Embed-Dependency>wstx-asl;scope=compile|runtime;inline=false;</Embed-Dependency>
+                        <Embed-Directory>target/dependency</Embed-Directory>
+                        <Embed-Transitive>true</Embed-Transitive>
+                        <DynamicImport-Package>*</DynamicImport-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>

Modified: trunk/carbon-orbit/org.wso2.carbon.axis2/pom.xml
==============================================================================
--- trunk/carbon-orbit/org.wso2.carbon.axis2/pom.xml	(original)
+++ trunk/carbon-orbit/org.wso2.carbon.axis2/pom.xml	Thu May  8 10:44:34 2008
@@ -11,24 +11,14 @@
     <artifactId>org.wso2.carbon.axis2</artifactId>
     <packaging>bundle</packaging>
     <name>org.wso2.carbon.axis2</name>
-    <description>org.wso2.carbon.axis2</description>
+    <description>
+        org.wso2.carbon.axis2. This bundle will export packages for Axis2 WS engine.</description>
+    <version>1.4</version>
     <url>http://wso2.org</url>
 
     <dependencies>
 
         <dependency>
-            <groupId>javax.mail</groupId>
-            <artifactId>mail</artifactId>
-            <version>1.4</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.activation</groupId>
-            <artifactId>activation</artifactId>
-            <version>1.1</version>
-        </dependency>
-        
-        <dependency>
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-adb</artifactId>
             <exclusions>
@@ -90,23 +80,11 @@
         </dependency>
 
         <dependency>
-            <groupId>xml-apis</groupId>
-            <artifactId>xml-apis</artifactId>
-            <version>1.3.04</version>
-        </dependency>
-
-        <dependency>
             <groupId>xml-resolver</groupId>
             <artifactId>xml-resolver</artifactId>
             <version>1.2</version>
         </dependency>
 
-        <dependency>
-            <groupId>dom4j</groupId>
-            <artifactId>dom4j</artifactId>
-            <version>1.6.1</version>
-        </dependency>
-
         <!-- Felix dependencies for bundle -->
         <dependency>
             <groupId>org.apache.felix</groupId>
@@ -150,140 +128,22 @@
                 <configuration>
                     <instructions>
                         <Bundle-Version>1.4.0</Bundle-Version>
-                        <Bundle-Name>org.wso2.carbon.axis2</Bundle-Name>
+                        <Bundle-Name>${pom.artifactId}</Bundle-Name>
                         <Bundle-Vendor>WSO2 Inc</Bundle-Vendor>
-                        <Bundle-Description>OSGi Bundle for Axis2</Bundle-Description>
-                        <Bundle-SymbolicName>org.wso2.carbon.axis2</Bundle-SymbolicName>
-                        <!--<Bundle-Activator>org.wso2.carbon.axis2.Activator</Bundle-Activator>-->
+                        <Bundle-Description>${pom.description}</Bundle-Description>
+                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
                         <Export-Package>
-                            !javax.xml.namespace,
-                            !javax.servlet,
-                            !javax.servlet.http,
-                            org.apache.axis2.*; version=1.4.0,
-                            org.apache.axiom.*; version=1.2.7,
-                            org.dom4j.*; version=1.6.1,
-                            org.apache.neethi,
-                            org.apache.neethi.util,
-                            org.apache.neethi.builders,
-                            org.apache.neethi.builders.xml,
-                            javax.wsdl; version=1.6.2,
-                            javax.wsdl.extensions; version=1.6.2,
-                            javax.wsdl.extensions.http; version=1.6.2,
-                            javax.wsdl.extensions.mime; version=1.6.2,
-                            javax.wsdl.extensions.schema; version=1.6.2,
-                            javax.wsdl.extensions.soap; version=1.6.2,
-                            javax.wsdl.extensions.soap12; version=1.6.2,
-                            javax.wsdl.factory; version=1.6.2,
-                            javax.wsdl.xml; version=1.6.2,
-                            com.ibm.wsdl.extensions; version=1.6.2,
-                            com.ibm.wsdl.extensions.http; version=1.6.2,
-                            com.ibm.wsdl.extensions.mime; version=1.6.2,
-                            com.ibm.wsdl.extensions.schema; version=1.6.2,
-                            com.ibm.wsdl.extensions.soap; version=1.6.2,
-                            com.ibm.wsdl.extensions.soap12; version=1.6.2,
-                            com.ibm.wsdl.factory; version=1.6.2,
-                            com.ibm.wsdl.util; version=1.6.2,
-                            com.ibm.wsdl.util.xml; version=1.6.2,
-                            com.ibm.wsdl.xml; version=1.6.2,
-                            com.ibm.wsdl; version=1.6.2,
-                            org.apache.ws.commons.schema; version=0.0.0,
-                            org.apache.ws.commons.schema.resolver; version=0.0.0,
-                            org.apache.ws.commons.schema.utils; version=0.0.0,
-                            org.apache.ws.commons.schema.constants; version=0.0.0,
-                            org.apache.ws.commons.schema.extensions; version=0.0.0,
-                            javax.xml.namespace; version=1.0,
-                            javax.xml.stream; version=1.0,
-                            javax.xml.stream.events; version=1.0,
-                            javax.xml.stream.util; version=1.0,
-                            org.apache.woden.*,
-                            org.jaxen.*,
-                            org.xml.sax.*,
-                            org.w3c.dom.*,
-                            javax.xml.*,
-                            org.apache.xml.resolver.*,
-                            javax.activation;version=1.1,
-                            javax.mail;version=1.4,
-                            javax.mail.event;version=1.4,
-                            javax.mail.internet;version=1.4,
-                            javax.mail.search;version=1.4,
-                            javax.mail.util;version=1.4,
-                            com.sun.mail.imap;version=1.4,
-                            com.sun.mail.pop3;version=1.4,
-                            com.sun.mail.smtp;version=1.4,
+                            org.apache.axis2.*;-split-package:=merge-first,
                             org.apache.commons.codec.*,
-                            org.wso2.carbon.axis2
                         </Export-Package>
                         <Import-Package>
-                            !org.wso2.carbon.axis2,
                             !org.apache.axis2.*,
-                            !org.apache.axiom.*,
-                            !org.dom4j.*,
-                            !org.apache.neethi,
-                            !org.apache.neethi.util,
-                            !org.apache.neethi.builders,
-                            !org.apache.neethi.builders.xml,
-                            !javax.wsdl,
-                            !javax.wsdl.extensions,
-                            !javax.wsdl.extensions.http,
-                            !javax.wsdl.extensions.mime,
-                            !javax.wsdl.extensions.schema,
-                            !javax.wsdl.extensions.soap,
-                            !javax.wsdl.extensions.soap12,
-                            !javax.wsdl.factory,
-                            !javax.wsdl.xml,
-                            !com.ibm.wsdl.extensions,
-                            !com.ibm.wsdl.extensions.http,
-                            !com.ibm.wsdl.extensions.mime,
-                            !com.ibm.wsdl.extensions.schema,
-                            !com.ibm.wsdl.extensions.soap,
-                            !com.ibm.wsdl.extensions.soap12,
-                            !com.ibm.wsdl.factory,
-                            !com.ibm.wsdl.util,
-                            !com.ibm.wsdl.util.xml,
-                            !com.ibm.wsdl.xml,
-                            !com.ibm.wsdl,
-                            !org.apache.ws.commons.schema,
-                            !org.apache.ws.commons.schema.resolver,
-                            !org.apache.ws.commons.schema.utils,
-                            !org.apache.ws.commons.schema.constants,
-                            !org.apache.ws.commons.schema.extensions,
-                            !javax.activation,
-                            !javax.mail,
-                            !javax.mail.event,
-                            !javax.mail.internet,
-                            !javax.mail.search,
-                            !javax.mail.util,
-                            !javax.activation,
-                            !com.sun.mail.imap,
-                            !com.sun.mail.pop3,
-                            !com.sun.mail.smtp,
                             !org.apache.commons.codec.*,
-                            !javax.xml.namespace,
-                            !javax.xml.stream,
-                            !javax.xml.stream.events,
-                            !javax.xml.stream.util,
                             javax.servlet; version=2.4.0,
                             javax.servlet.http; version=2.4.0,
                             *;resolution:=optional
                         </Import-Package>
-                        <Private-Package>
-                            com.sun.activation.registries,
-                            com.sun.activation.viewers,
-                            com.sun.mail.handlers,
-                            com.sun.mail.iap,
-                            com.sun.mail.imap.protocol,
-                            com.sun.mail.util
-                        </Private-Package>
-                        <Include-Resource>
-                            @activation-1.1.jar!/META-INF/mailcap.default,
-                            @activation-1.1.jar!/META-INF/mimetypes.default,
-                            @mail-1.4.jar!/META-INF/javamail.charset.map,
-                            @mail-1.4.jar!/META-INF/javamail.default.address.map,
-                            @mail-1.4.jar!/META-INF/javamail.default.providers,
-                            @mail-1.4.jar!/META-INF/mailcap,
-                            @axis2-mtompolicy-1.4.jar!/META-INF/services/org.apache.neethi.builders.AssertionBuilder
-                        </Include-Resource>
-                        <Embed-Dependency>*;scope=compile|runtime;inline=false;artifactId=!axis2-adb|axis2-kernel|axis2-codegen|axis2-mtompolicy|axiom-api|axiom-impl|axiom-dom|stax-api|geronimo-stax-api_1.0_spec|woden-api|woden-impl-dom|xml-apis|wsdl4j|XmlSchema|activation|mail|dom4j|neethi|geronimo-activation_1.1_spec|geronimo-javamail_1.4_spec|commons-codec</Embed-Dependency>
+                        <Embed-Dependency>annogen|backport-util-concurrent|commons-fileupload|commons-httpclient|commons-io|geronimo-jms_1.1_spec|httpcore|httpcore-nio|mex|xalan|xercesImpl|xml-resolver|xmlParserAPIs;scope=compile|runtime;inline=false;</Embed-Dependency>
                         <Embed-Directory>target/dependency</Embed-Directory>
                         <Embed-Transitive>true</Embed-Transitive>
                         <DynamicImport-Package>*</DynamicImport-Package>

Added: trunk/carbon-orbit/org.wso2.carbon.neethi/pom.xml
==============================================================================
--- (empty file)
+++ trunk/carbon-orbit/org.wso2.carbon.neethi/pom.xml	Thu May  8 10:44:34 2008
@@ -0,0 +1,58 @@
+<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">
+
+
+    <parent>
+        <groupId>org.wso2.carbon</groupId>
+        <artifactId>carbon-orbit-parent</artifactId>
+        <version>SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.wso2.carbon.neethi</artifactId>
+    <packaging>bundle</packaging>
+    <name>org.wso2.carbon.neethi</name>
+    <version>2.0.4</version>
+    <description>
+        org.wso2.carbon.neethi. This bundle will export packages from neethi.jar
+    </description>
+    <url>http://wso2.org</url>
+
+    <dependencies>
+        <dependency>
+                <groupId>org.apache.neethi</groupId>
+                <artifactId>neethi</artifactId>
+                <version>2.0.4</version>
+            </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>1.4.0</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-Version>${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.neethi.*,
+                        </Export-Package>
+                        <Import-Package>
+                            !org.apache.neethi.*,
+                            *;resolution:=optional
+                        </Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>

Modified: trunk/carbon-orbit/org.wso2.carbon.registry/pom.xml
==============================================================================
--- trunk/carbon-orbit/org.wso2.carbon.registry/pom.xml	(original)
+++ trunk/carbon-orbit/org.wso2.carbon.registry/pom.xml	Thu May  8 10:44:34 2008
@@ -140,40 +140,39 @@
                         <Export-Package>
                             !javax.servlet,
                             !javax.servlet.http,
-                            org.wso2.registry;version=1.0.0,
-                            org.wso2.registry.announcement;version=1.0.0,
-                            org.wso2.registry.app;version=1.0.0,
-                            org.wso2.registry.aspects;version=1.0.0,
-                            org.wso2.registry.config;version=1.0.0,
-                            org.wso2.registry.exceptions;version=1.0.0,
-                            org.wso2.registry.i18n;version=1.0.0,
-                            org.wso2.registry.jdbc;version=1.0.0,
-                            org.wso2.registry.jdbc.dao;version=1.0.0,
-                            org.wso2.registry.jdbc.dataobjects;version=1.0.0,
-                            org.wso2.registry.jdbc.handlers;version=1.0.0,
-                            org.wso2.registry.jdbc.handlers.builtin;version=1.0.0,
-                            org.wso2.registry.jdbc.handlers.builtin.utils;version=1.0.0,
-                            org.wso2.registry.jdbc.handlers.filters;version=1.0.0,
-                            org.wso2.registry.jdbc.hsql;version=1.0.0,
-                            org.wso2.registry.jdbc.mediatypes;version=1.0.0,
-                            org.wso2.registry.jdbc.mediatypes.builtin;version=1.0.0,
-                            org.wso2.registry.jdbc.mediatypes.utils;version=1.0.0,
-                            org.wso2.registry.jdbc.queries;version=1.0.0,
-                            org.wso2.registry.jdbc.realm;version=1.0.0,
-                            org.wso2.registry.jdbc.realm.pathbased;version=1.0.0,
-                            org.wso2.registry.jdbc.urlhandlers;version=1.0.0,
-                            org.wso2.registry.jdbc.utils;version=1.0.0,
+                            org.wso2.registry,
+                            org.wso2.registry.announcement,
+                            org.wso2.registry.app,
+                            org.wso2.registry.aspects,
+                            org.wso2.registry.config,
+                            org.wso2.registry.exceptions,
+                            org.wso2.registry.i18n,
+                            org.wso2.registry.jdbc,
+                            org.wso2.registry.jdbc.dao,
+                            org.wso2.registry.jdbc.dataobjects,
+                            org.wso2.registry.jdbc.handlers,
+                            org.wso2.registry.jdbc.handlers.builtin,
+                            org.wso2.registry.jdbc.handlers.builtin.utils,
+                            org.wso2.registry.jdbc.handlers.filters,
+                            org.wso2.registry.jdbc.mediatypes,
+                            org.wso2.registry.jdbc.mediatypes.builtin,
+                            org.wso2.registry.jdbc.mediatypes.utils,
+                            org.wso2.registry.jdbc.queries,
+                            org.wso2.registry.jdbc.realm,
+                            org.wso2.registry.jdbc.realm.pathbased,
+                            org.wso2.registry.jdbc.urlhandlers,
+                            org.wso2.registry.jdbc.utils,
                             org.wso2.registry.jdbc.utils.creators; version=1.0.0,
-                            org.wso2.registry.secure;version=1.0.0,
-                            org.wso2.registry.servlet;version=1.0.0,
-                            org.wso2.registry.servlet.utils;version=1.0.0,
-                            org.wso2.registry.session;version=1.0.0,
-                            org.wso2.registry.users;version=1.0.0,
-                            org.wso2.registry.users.accesscontrol;version=1.0.0,
-                            org.wso2.registry.users.def;version=1.0.0,
-                            org.wso2.registry.users.def.util;version=1.0.0,
-                            org.wso2.registry.users.verifier;version=1.0.0,
-                            org.wso2.registry.utils;version=1.0.0,
+                            org.wso2.registry.secure,
+                            org.wso2.registry.servlet,
+                            org.wso2.registry.servlet.utils,
+                            org.wso2.registry.session,
+                            org.wso2.registry.users,
+                            org.wso2.registry.users.accesscontrol,
+                            org.wso2.registry.users.def,
+                            org.wso2.registry.users.def.util,
+                            org.wso2.registry.users.verifier,
+                            org.wso2.registry.utils,
                             org.wso2.authenticator.*; version=0.0.0,
                             org.wso2.usermanager.*; version=0.0.0,
                             org.apache.commons.pool; version=1.3,
@@ -184,40 +183,39 @@
                             org.apache.commons.jocl; version=1.2.2
                         </Export-Package>
                         <Import-Package>
-                            !org.wso2.registry;version=1.0.0,
-                            !org.wso2.registry.announcement;version=1.0.0,
-                            !org.wso2.registry.app;version=1.0.0,
-                            !org.wso2.registry.aspects;version=1.0.0,
-                            !org.wso2.registry.config;version=1.0.0,
-                            !org.wso2.registry.exceptions;version=1.0.0,
-                            !org.wso2.registry.i18n;version=1.0.0,
-                            !org.wso2.registry.jdbc;version=1.0.0,
-                            !org.wso2.registry.jdbc.dao;version=1.0.0,
-                            !org.wso2.registry.jdbc.dataobjects;version=1.0.0,
-                            !org.wso2.registry.jdbc.handlers;version=1.0.0,
-                            !org.wso2.registry.jdbc.handlers.builtin;version=1.0.0,
-                            !org.wso2.registry.jdbc.handlers.builtin.utils;version=1.0.0,
-                            !org.wso2.registry.jdbc.handlers.filters;version=1.0.0,
-                            !org.wso2.registry.jdbc.hsql;version=1.0.0,
-                            !org.wso2.registry.jdbc.mediatypes;version=1.0.0,
-                            !org.wso2.registry.jdbc.mediatypes.builtin;version=1.0.0,
-                            !org.wso2.registry.jdbc.mediatypes.utils;version=1.0.0,
-                            !org.wso2.registry.jdbc.queries;version=1.0.0,
-                            !org.wso2.registry.jdbc.realm;version=1.0.0,
-                            !org.wso2.registry.jdbc.realm.pathbased;version=1.0.0,
-                            !org.wso2.registry.jdbc.urlhandlers;version=1.0.0,
-                            !org.wso2.registry.jdbc.utils;version=1.0.0,
-                            !org.wso2.registry.secure;version=1.0.0,
-                            !org.wso2.registry.servlet;version=1.0.0,
-                            !org.wso2.registry.servlet.utils;version=1.0.0,
-                            !org.wso2.registry.jdbc.utils.creators; version=1.0.0,
-                            !org.wso2.registry.session;version=1.0.0,
-                            !org.wso2.registry.users;version=1.0.0,
-                            !org.wso2.registry.users.accesscontrol;version=1.0.0,
-                            !org.wso2.registry.users.def;version=1.0.0,
-                            !org.wso2.registry.users.def.util;version=1.0.0,
-                            !org.wso2.registry.users.verifier;version=1.0.0,
-                            !org.wso2.registry.utils;version=1.0.0,
+                            !org.wso2.registry,
+                            !org.wso2.registry.announcement,
+                            !org.wso2.registry.app,
+                            !org.wso2.registry.aspects,
+                            !org.wso2.registry.config,
+                            !org.wso2.registry.exceptions,
+                            !org.wso2.registry.i18n,
+                            !org.wso2.registry.jdbc,
+                            !org.wso2.registry.jdbc.dao,
+                            !org.wso2.registry.jdbc.dataobjects,
+                            !org.wso2.registry.jdbc.handlers,
+                            !org.wso2.registry.jdbc.handlers.builtin,
+                            !org.wso2.registry.jdbc.handlers.builtin.utils,
+                            !org.wso2.registry.jdbc.handlers.filters,
+                            !org.wso2.registry.jdbc.mediatypes,
+                            !org.wso2.registry.jdbc.mediatypes.builtin,
+                            !org.wso2.registry.jdbc.mediatypes.utils,
+                            !org.wso2.registry.jdbc.queries,
+                            !org.wso2.registry.jdbc.realm,
+                            !org.wso2.registry.jdbc.realm.pathbased,
+                            !org.wso2.registry.jdbc.urlhandlers,
+                            !org.wso2.registry.jdbc.utils,
+                            !org.wso2.registry.secure,
+                            !org.wso2.registry.servlet,
+                            !org.wso2.registry.servlet.utils,
+                            !org.wso2.registry.jdbc.utils.creators,
+                            !org.wso2.registry.session,
+                            !org.wso2.registry.users,
+                            !org.wso2.registry.users.accesscontrol,
+                            !org.wso2.registry.users.def,
+                            !org.wso2.registry.users.def.util,
+                            !org.wso2.registry.users.verifier,
+                            !org.wso2.registry.utils,
                             !org.wso2.authenticator.*,
                             !org.wso2.usermanager.*,
                             !org.apache.commons.pool,
@@ -232,21 +230,21 @@
                             !javax.xml.stream.util; version=1.0,
                             javax.servlet; version=2.4.0,
                             javax.servlet.http; version=2.4.0,
-                            javax.wsdl; version=1.6.2,
-                            javax.wsdl.extensions; version=1.6.2,
-                            javax.wsdl.extensions.http; version=1.6.2,
-                            javax.wsdl.extensions.mime; version=1.6.2,
-                            javax.wsdl.extensions.schema; version=1.6.2,
-                            javax.wsdl.extensions.soap; version=1.6.2,
-                            javax.wsdl.extensions.soap12; version=1.6.2,
-                            javax.wsdl.factory; version=1.6.2,
-                            javax.wsdl.xml; version=1.6.2,
-                            com.ibm.wsdl.extensions; version=1.6.2,
-                            com.ibm.wsdl.extensions.http; version=1.6.2,
-                            com.ibm.wsdl.extensions.mime; version=1.6.2,
-                            com.ibm.wsdl.extensions.schema; version=1.6.2,
-                            com.ibm.wsdl.extensions.soap; version=1.6.2,
-                            com.ibm.wsdl.extensions.soap12; version=1.6.2,
+                            javax.wsdl; version=0.0.0,
+                            javax.wsdl.extensions; version=0.0.0,
+                            javax.wsdl.extensions.http; version=0.0.0,
+                            javax.wsdl.extensions.mime; version=0.0.0,
+                            javax.wsdl.extensions.schema; version=0.0.0,
+                            javax.wsdl.extensions.soap; version=0.0.0,
+                            javax.wsdl.extensions.soap12; version=0.0.0,
+                            javax.wsdl.factory; version=0.0.0,
+                            javax.wsdl.xml; version=0.0.0,
+                            com.ibm.wsdl.extensions; version=0.0.0,
+                            com.ibm.wsdl.extensions.http; version=0.0.0,
+                            com.ibm.wsdl.extensions.mime; version=0.0.0,
+                            com.ibm.wsdl.extensions.schema; version=0.0.0,
+                            com.ibm.wsdl.extensions.soap; version=0.0.0,
+                            com.ibm.wsdl.extensions.soap12; version=0.0.0,
                             org.apache.ws.commons.schema; version=0.0.0,
                             org.apache.ws.commons.schema.resolver; version=0.0.0,
                             org.apache.ws.commons.schema.utils; version=0.0.0,
@@ -261,7 +259,6 @@
                         <Embed-Dependency>
                             abdera-client|abdera-core|abdera-i18n|abdera-parser|abdera-server|acegi-security|hsqldb|commons-httpclient|derby;scope=compile|runtime;inline=false</Embed-Dependency>
                         <Embed-Directory>target/dependency</Embed-Directory>
-                        <!--<Embed-Transitive>true</Embed-Transitive>-->
                     </instructions>
                 </configuration>
             </plugin>

Modified: trunk/carbon-orbit/org.wso2.carbon.tiles/pom.xml
==============================================================================
--- trunk/carbon-orbit/org.wso2.carbon.tiles/pom.xml	(original)
+++ trunk/carbon-orbit/org.wso2.carbon.tiles/pom.xml	Thu May  8 10:44:34 2008
@@ -12,6 +12,7 @@
     <packaging>bundle</packaging>
     <name>org.wso2.carbon.tiles</name>
     <description>org.wso2.carbon.tiles</description>
+    <version>2.0.5</version>
     <url>http://wso2.org</url>
 
     <dependencies>
@@ -61,18 +62,15 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Bundle-Version>1.0.0</Bundle-Version>
+                        <Bundle-Version>2.0.5</Bundle-Version>
                         <Bundle-Name>${pom.artifactId}</Bundle-Name>
                         <Bundle-Vendor>WSO2 Inc</Bundle-Vendor>
                         <Bundle-Description>OSGi Bundle for Tiles2</Bundle-Description>
                         <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
                         <!--<Bundle-Activator>org.wso2.carbon.axis2.Activator</Bundle-Activator>-->
                         <Export-Package>
-                            !javax.xml.namespace,
-                            !javax.servlet,
-                            !javax.servlet.http,
                             org.wso2.carbon.tiles; version=1.0.0,
-                            org.apache.tiles; version=2.0.5,
+                            org.apache.tiles; version=2.0.5;-split-package:=merge-first,
                             org.apache.tiles.jsp.taglib; version=2.0.5,
                             org.apache.tiles.jsp.taglib.definition; version=2.0.5,
                             org.apache.tiles.jsp.context; version=2.0.5,
@@ -101,14 +99,7 @@
                             javax.servlet;version="2.4.0",
                             javax.servlet.http;version="2.4.0",
                             javax.servlet.jsp;version="2.0.0",
-                            javax.servlet.jsp.el;version="2.0.0",
-                            javax.servlet.jsp.jstl.core,
-                            javax.servlet.jsp.jstl.fmt,
-                            javax.servlet.jsp.jstl.sql,
-                            javax.servlet.jsp.jstl.tlv,
-                            javax.servlet.jsp.resources;version="2.0.0",
                             javax.servlet.jsp.tagext;version="2.0.0",
-                            javax.servlet.resources;version="2.4.0",
                             !org.wso2.carbon.tiles,
                             !org.apache.tiles; version=2.0.5,
                             !org.apache.tiles.jsp.taglib; version=2.0.5,

Added: trunk/carbon-orbit/org.wso2.carbon.woden/pom.xml
==============================================================================
--- (empty file)
+++ trunk/carbon-orbit/org.wso2.carbon.woden/pom.xml	Thu May  8 10:44:34 2008
@@ -0,0 +1,78 @@
+<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">
+
+
+    <parent>
+        <groupId>org.wso2.carbon</groupId>
+        <artifactId>carbon-orbit-parent</artifactId>
+        <version>SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.wso2.carbon.woden</artifactId>
+    <packaging>bundle</packaging>
+    <name>org.wso2.carbon.woden</name>
+    <version>1.0M8</version>
+    <description>
+        org.wso2.carbon.woden. This bundle will represent Woden
+    </description>
+    <url>http://wso2.org</url>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.woden</groupId>
+            <artifactId>woden-api</artifactId>
+            <version>1.0M8</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.codehaus.woodstox</groupId>
+                    <artifactId>wstx-asl</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.woden</groupId>
+            <artifactId>woden-impl-dom</artifactId>
+            <version>1.0M8</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.codehaus.woodstox</groupId>
+                    <artifactId>wstx-asl</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>1.4.0</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-Version>1.0.M8</Bundle-Version>
+                        <Bundle-Name>${pom.artifactId}</Bundle-Name>
+                        <Bundle-Vendor>WSO2 Inc</Bundle-Vendor>
+                        <Bundle-Description>OSGi Bundle for Axiom</Bundle-Description>
+                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>
+                            org.apache.woden.*;-split-package:=merge-first
+                        </Export-Package>
+                        <Import-Package>
+                            !org.apache.woden.*,
+                            *;resolution:=optional
+                        </Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>

Added: trunk/carbon-orbit/org.wso2.carbon.wsdl4j/pom.xml
==============================================================================
--- (empty file)
+++ trunk/carbon-orbit/org.wso2.carbon.wsdl4j/pom.xml	Thu May  8 10:44:34 2008
@@ -0,0 +1,60 @@
+<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">
+
+
+    <parent>
+        <groupId>org.wso2.carbon</groupId>
+        <artifactId>carbon-orbit-parent</artifactId>
+        <version>SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.wso2.carbon.wsdl4j</artifactId>
+    <packaging>bundle</packaging>
+    <name>org.wso2.carbon.wsdl4j</name>
+    <version>1.6.2</version>
+    <description>
+        org.wso2.carbon.xmlschema. This bundle will export packages from wsdl4j.jar
+    </description>
+    <url>http://wso2.org</url>
+
+    <dependencies>
+        <dependency>
+            <groupId>wsdl4j</groupId>
+            <artifactId>wsdl4j</artifactId>
+            <version>1.6.2</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>1.4.0</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-Version>${pom.version}</Bundle-Version>
+                        <Bundle-Name>${pom.artifactId}</Bundle-Name>
+                        <Bundle-Vendor>WSO2 Inc</Bundle-Vendor>
+                        <Bundle-Description>OSGi Bundle for WSDL4J</Bundle-Description>
+                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>
+                            javax.wsdl.*,
+                            com.ibm.wsdl.*,
+                        </Export-Package>
+                        <Import-Package>
+                            !javax.wsdl.*,
+                            !com.ibm.wsdl.*,
+                            *;resolution:=optional
+                        </Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>

Added: trunk/carbon-orbit/org.wso2.carbon.xmlschema/pom.xml
==============================================================================
--- (empty file)
+++ trunk/carbon-orbit/org.wso2.carbon.xmlschema/pom.xml	Thu May  8 10:44:34 2008
@@ -0,0 +1,59 @@
+<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">
+
+
+    <parent>
+        <groupId>org.wso2.carbon</groupId>
+        <artifactId>carbon-orbit-parent</artifactId>
+        <version>SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.wso2.carbon.xmlschema</artifactId>
+    <packaging>bundle</packaging>
+    <name>org.wso2.carbon.xmlschema</name>
+    <version>1.4.2</version>
+    <description>
+        org.wso2.carbon.xmlschema. This bundle contains the resources needed for
+        xmlschema commons project
+    </description>
+    <url>http://wso2.org</url>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.ws.commons.schema</groupId>
+            <artifactId>XmlSchema</artifactId>
+            <version>1.4.2</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>1.4.0</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-Version>${pom.version}</Bundle-Version>
+                        <Bundle-Name>${pom.artifactId}</Bundle-Name>
+                        <Bundle-Vendor>WSO2 Inc</Bundle-Vendor>
+                        <Bundle-Description>OSGi Bundle for XMLSCHEMA</Bundle-Description>
+                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>
+                            org.apache.ws.commons.schema.*,
+                        </Export-Package>
+                        <Import-Package>
+                            !org.apache.ws.commons.schema.*,
+                            *;resolution:=optional
+                        </Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>

Modified: trunk/carbon-orbit/pom.xml
==============================================================================
--- trunk/carbon-orbit/pom.xml	(original)
+++ trunk/carbon-orbit/pom.xml	Thu May  8 10:44:34 2008
@@ -194,6 +194,12 @@
     <modules>
         <module>org.wso2.carbon.log4j</module>
         <module>org.wso2.carbon.tiles</module>
+        <module>org.wso2.carbon.ant</module>
+        <module>org.wso2.carbon.axiom</module>
+        <module>org.wso2.carbon.neethi</module>
+        <module>org.wso2.carbon.woden</module>
+        <module>org.wso2.carbon.wsdl4j</module>
+        <module>org.wso2.carbon.xmlschema</module>
         <module>org.wso2.carbon.axis2</module>
         <module>org.wso2.carbon.registry</module>
         <module>org.wso2.carbon.wss4j</module>



More information about the Carbon-dev mailing list