[Carbon-dev] svn commit r16573 - in trunk/carbon: distribution distribution/src/assembly org.wso2.carbon.bridge org.wso2.carbon.core org.wso2.carbon.utils

[svn at wso2.org]

Author: saminda
Date: Tue May  6 09:57:56 2008
New Revision: 16573

Log:

cleaning up for 1.4


Modified:
   trunk/carbon/distribution/pom.xml
   trunk/carbon/distribution/src/assembly/bin.xml
   trunk/carbon/org.wso2.carbon.bridge/pom.xml
   trunk/carbon/org.wso2.carbon.core/pom.xml
   trunk/carbon/org.wso2.carbon.utils/pom.xml

Modified: trunk/carbon/distribution/pom.xml
==============================================================================
--- trunk/carbon/distribution/pom.xml	(original)
+++ trunk/carbon/distribution/pom.xml	Tue May  6 09:57:56 2008
@@ -145,7 +145,7 @@
         <dependency>
             <groupId>org.apache.axis2</groupId>
             <artifactId>addressing</artifactId>
-            <version>SNAPSHOT</version>
+            <version>1.4</version>
             <type>mar</type>
         </dependency>
 

Modified: trunk/carbon/distribution/src/assembly/bin.xml
==============================================================================
--- trunk/carbon/distribution/src/assembly/bin.xml	(original)
+++ trunk/carbon/distribution/src/assembly/bin.xml	Tue May  6 09:57:56 2008
@@ -110,8 +110,6 @@
         </dependencySet>
         <dependencySet>
             <outputDirectory>wso2carbon-${wso2carbon.version}/repository/modules</outputDirectory>
-            <!--TODO -->
-            <outputFileNameMapping>${artifact.artifactId}-SNAPSHOT${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
             <includes>
                 <include>org.apache.axis2:addressing:mar</include>
             </includes>

Modified: trunk/carbon/org.wso2.carbon.bridge/pom.xml
==============================================================================
--- trunk/carbon/org.wso2.carbon.bridge/pom.xml	(original)
+++ trunk/carbon/org.wso2.carbon.bridge/pom.xml	Tue May  6 09:57:56 2008
@@ -18,8 +18,6 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <!--<optional>true</optional>-->
-            <!--<scope>provided</scope>-->
         </dependency>
 
         <!-- Start of OSGi dependencies with Felix -->

Modified: trunk/carbon/org.wso2.carbon.core/pom.xml
==============================================================================
--- trunk/carbon/org.wso2.carbon.core/pom.xml	(original)
+++ trunk/carbon/org.wso2.carbon.core/pom.xml	Tue May  6 09:57:56 2008
@@ -92,20 +92,20 @@
                         <Bundle-Description>OSGi Bundle for Carbon Core</Bundle-Description>
                         <Bundle-SymbolicName>org.wso2.carbon.core</Bundle-SymbolicName>
                         <Bundle-Activator>org.wso2.carbon.core.internal.Activator</Bundle-Activator>
+                        <Private-Package>org.wso2.carbon.core.internal</Private-Package>
                         <Export-Package>
                             !javax.servlet,
                             !javax.servlet.http,
                             !org.wso2.carbon.axis2.*,
                             !org.wso2.carbon.axis2.utils.*,
-                            org.wso2.carbon.core.*; version=1.0.0,
-                            org.wso2.carbon.core.internal; version=1.0.0
+                            org.wso2.carbon.core.*; version=1.0.0
                         </Export-Package>
                         <Import-Package>
                             javax.servlet; version=2.4.0,
                             javax.servlet.http; version=2.4.0,
                             org.wso2.carbon.axis2.utils.*; version=1.0.0,
-                            org.apache.axis2.*; version=1.4.9,
-                            org.apache.axiom.*; version=1.2.6,
+                            org.apache.axis2.*; version=1.4.0,
+                            org.apache.axiom.*; version=1.2.7,
                             org.wso2.carbon.server.transports; version=1.0.0,
                             org.wso2.carbon.registry.service;version=1.0.0,
                             org.jaxen.*,

Modified: trunk/carbon/org.wso2.carbon.utils/pom.xml
==============================================================================
--- trunk/carbon/org.wso2.carbon.utils/pom.xml	(original)
+++ trunk/carbon/org.wso2.carbon.utils/pom.xml	Tue May  6 09:57:56 2008
@@ -79,14 +79,13 @@
                         <Bundle-Vendor>WSO2 Inc</Bundle-Vendor>
                         <Bundle-Description>OSGi Bundle for Carbon Utils</Bundle-Description>
                         <Bundle-SymbolicName>org.wso2.carbon.utils</Bundle-SymbolicName>
-                        <!--<Bundle-Activator/>-->
                         <Export-Package>
                             !org.wso2.carbon.axis2.*,
                             org.wso2.carbon.utils.*; version=1.0.0,
                         </Export-Package>
                         <Import-Package>
-                            org.apache.axis2.*; version=1.4.9,
-                            org.apache.axiom.*; version=1.2.6,
+                            org.apache.axis2.*; version=1.4.0,
+                            org.apache.axiom.*; version=1.2.7,
                             org.wso2.carbon.server.transports; version=1.0.0,
                             org.wso2.carbon.registry.service;version=1.0.0,
                             *;resolution:=optional