axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sami...@apache.org
Subject svn commit: r670559 - in /webservices/axis2/scratch/java/saminda/osgi_test: 3rd.bundles/ 3rd.bundles/axiom/ 3rd.bundles/dom4j/ 3rd.bundles/jaxen/ distribution/ distribution/lib/
Date Mon, 23 Jun 2008 13:23:26 GMT
Author: saminda
Date: Mon Jun 23 06:23:25 2008
New Revision: 670559

URL: http://svn.apache.org/viewvc?rev=670559&view=rev
Log:
improvement to sample 

Added:
    webservices/axis2/scratch/java/saminda/osgi_test/3rd.bundles/dom4j/
    webservices/axis2/scratch/java/saminda/osgi_test/3rd.bundles/dom4j/pom.xml
    webservices/axis2/scratch/java/saminda/osgi_test/3rd.bundles/jaxen/
    webservices/axis2/scratch/java/saminda/osgi_test/3rd.bundles/jaxen/pom.xml
Removed:
    webservices/axis2/scratch/java/saminda/osgi_test/distribution/lib/
Modified:
    webservices/axis2/scratch/java/saminda/osgi_test/3rd.bundles/axiom/pom.xml
    webservices/axis2/scratch/java/saminda/osgi_test/3rd.bundles/pom.xml
    webservices/axis2/scratch/java/saminda/osgi_test/distribution/bin.xml
    webservices/axis2/scratch/java/saminda/osgi_test/distribution/pom.xml

Modified: webservices/axis2/scratch/java/saminda/osgi_test/3rd.bundles/axiom/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/java/saminda/osgi_test/3rd.bundles/axiom/pom.xml?rev=670559&r1=670558&r2=670559&view=diff
==============================================================================
--- webservices/axis2/scratch/java/saminda/osgi_test/3rd.bundles/axiom/pom.xml (original)
+++ webservices/axis2/scratch/java/saminda/osgi_test/3rd.bundles/axiom/pom.xml Mon Jun 23
06:23:25 2008
@@ -22,18 +22,6 @@
     <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.ws.commons.axiom</groupId>
             <artifactId>axiom-impl</artifactId>
             <version>${pom.version}</version>
@@ -45,12 +33,6 @@
             <version>${pom.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>dom4j</groupId>
-            <artifactId>dom4j</artifactId>
-            <version>1.6.1</version>
-        </dependency>
-
     </dependencies>
 
     <build>
@@ -70,60 +52,16 @@
                         <Export-Package>
                             !javax.xml.namespace,
                             org.apache.axiom.*;-split-package:=merge-first,
-                            org.jaxen.*,
-                            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.*,
-                            !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.*,
                             org.xml.sax.*,
                             org.w3c.dom.*,
                             javax.xml.stream,
-                            javax.xml.stream.events,
-                            javax.xml.stream.util,
-                            javax.xml.datatype,
                             javax.xml.parsers,
-                            javax.xml.transform.*,
                             javax.xml.validation,
-                            javax.xml.xpath,
-                            javax.xml,
                             *;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>
                     </instructions>
                 </configuration>
             </plugin>

Added: webservices/axis2/scratch/java/saminda/osgi_test/3rd.bundles/dom4j/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/java/saminda/osgi_test/3rd.bundles/dom4j/pom.xml?rev=670559&view=auto
==============================================================================
--- webservices/axis2/scratch/java/saminda/osgi_test/3rd.bundles/dom4j/pom.xml (added)
+++ webservices/axis2/scratch/java/saminda/osgi_test/3rd.bundles/dom4j/pom.xml Mon Jun 23
06:23:25 2008
@@ -0,0 +1,57 @@
+<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.apache.axis2.3rd.bundles</groupId>
+        <artifactId>3rd.bundles</artifactId>
+        <version>1.0.0</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>dom4j</artifactId>
+    <packaging>bundle</packaging>
+    <name>dom4j</name>
+    <version>1.6.1</version>
+    <description>
+        This bundle will export packages from dom4j.jar
+    </description>
+
+    <dependencies>
+        <dependency>
+                <groupId>dom4j</groupId>
+                <artifactId>dom4j</artifactId>
+                <version>1.6.1</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>Apache Org</Bundle-Vendor>
+                        <Bundle-Description>${pom.description}</Bundle-Description>
+                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>
+                            org.dom4j.*,
+                        </Export-Package>
+                        <Import-Package>
+                            !org.dom4j.*,
+                            *;resolution:=optional
+                        </Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>

Added: webservices/axis2/scratch/java/saminda/osgi_test/3rd.bundles/jaxen/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/java/saminda/osgi_test/3rd.bundles/jaxen/pom.xml?rev=670559&view=auto
==============================================================================
--- webservices/axis2/scratch/java/saminda/osgi_test/3rd.bundles/jaxen/pom.xml (added)
+++ webservices/axis2/scratch/java/saminda/osgi_test/3rd.bundles/jaxen/pom.xml Mon Jun 23
06:23:25 2008
@@ -0,0 +1,57 @@
+<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.apache.axis2.3rd.bundles</groupId>
+        <artifactId>3rd.bundles</artifactId>
+        <version>1.0.0</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>jaxen</artifactId>
+    <packaging>bundle</packaging>
+    <name>jaxen</name>
+    <version>1.1.1</version>
+    <description>
+        This bundle will export packages from jaxen.jar
+    </description>
+
+    <dependencies>
+        <dependency>
+                <groupId>jaxen</groupId>
+                <artifactId>jaxen</artifactId>
+                <version>1.1.1</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>Apache Org</Bundle-Vendor>
+                        <Bundle-Description>${pom.description}</Bundle-Description>
+                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>
+                            org.jaxen.*,
+                        </Export-Package>
+                        <Import-Package>
+                            !org.jaxen.*,
+                            *;resolution:=optional
+                        </Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>

Modified: webservices/axis2/scratch/java/saminda/osgi_test/3rd.bundles/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/java/saminda/osgi_test/3rd.bundles/pom.xml?rev=670559&r1=670558&r2=670559&view=diff
==============================================================================
--- webservices/axis2/scratch/java/saminda/osgi_test/3rd.bundles/pom.xml (original)
+++ webservices/axis2/scratch/java/saminda/osgi_test/3rd.bundles/pom.xml Mon Jun 23 06:23:25
2008
@@ -45,6 +45,8 @@
         <module>xml-apis</module>
         <module>woden</module>
         <module>axiom</module>
+        <module>dom4j</module>
+        <module>jaxen</module>
     </modules>
 
 

Modified: webservices/axis2/scratch/java/saminda/osgi_test/distribution/bin.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/java/saminda/osgi_test/distribution/bin.xml?rev=670559&r1=670558&r2=670559&view=diff
==============================================================================
--- webservices/axis2/scratch/java/saminda/osgi_test/distribution/bin.xml (original)
+++ webservices/axis2/scratch/java/saminda/osgi_test/distribution/bin.xml Mon Jun 23 06:23:25
2008
@@ -26,19 +26,17 @@
                 <include>org.apache.axis2.3rd.bundles:wstx-asl:jar</include>
                 <include>org.apache.axis2.3rd.bundles:xml-apis:jar</include>
                 <include>org.apache.axis2.3rd.bundles:woden:jar</include>
+                <include>org.apache.axis2.3rd.bundles:jaxen:jar</include>
+                <include>org.apache.axis2.3rd.bundles:dom4j:jar</include>
                 <!--others-->
                 <include>org.apache.geronimo.specs:geronimo-stax-api_1.0_spec:jar</include>
                 <include>org.apache.geronimo.specs:geronimo-ws-metadata_2.0_spec:jar</include>
                 <include>org.apache.ws.commons.schema:XmlSchema:jar</include>
                 <include>org.apache.neethi:neethi:jar</include>
+                <include>org.apache.geronimo.specs:geronimo-javamail_1.4_spec:jar</include>
+                <include>org.apache.geronimo.specs:geronimo-activation_1.1_spec:jar</include>
+                <include>org.apache.axis2:org.apache.axis2.osgi:jar</include>
             </includes>
         </dependencySet>
     </dependencySets>
-
-    <files>
-        <file>
-            <source>lib/org.apache.axis2.osgi-SNAPSHOT.jar</source>
-            <outputDirectory>plugins</outputDirectory>
-        </file>
-    </files>
 </assembly>
\ No newline at end of file

Modified: webservices/axis2/scratch/java/saminda/osgi_test/distribution/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/java/saminda/osgi_test/distribution/pom.xml?rev=670559&r1=670558&r2=670559&view=diff
==============================================================================
--- webservices/axis2/scratch/java/saminda/osgi_test/distribution/pom.xml (original)
+++ webservices/axis2/scratch/java/saminda/osgi_test/distribution/pom.xml Mon Jun 23 06:23:25
2008
@@ -51,6 +51,12 @@
         </dependency>
 
         <dependency>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>org.apache.axis2.osgi</artifactId>
+            <version>SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.axis2.3rd.bundles</groupId>
             <artifactId>annogen</artifactId>
             <version>0.1.0</version>
@@ -117,6 +123,18 @@
 
         <dependency>
             <groupId>org.apache.axis2.3rd.bundles</groupId>
+            <artifactId>dom4j</artifactId>
+            <version>1.6.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.axis2.3rd.bundles</groupId>
+            <artifactId>jaxen</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.axis2.3rd.bundles</groupId>
             <artifactId>xml-apis</artifactId>
             <version>1.0.0</version>
         </dependency>
@@ -152,6 +170,19 @@
             <version>2.0.4</version>
         </dependency>
 
+        <!-- mail/activation-->
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-javamail_1.4_spec</artifactId>
+            <version>1.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-activation_1.1_spec</artifactId>
+            <version>1.0.1</version>
+        </dependency>
+
 
     </dependencies>
 



Mime
View raw message