cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r633897 - /incubator/cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml
Date Wed, 05 Mar 2008 16:10:24 GMT
Author: gnodet
Date: Wed Mar  5 08:10:22 2008
New Revision: 633897

URL: http://svn.apache.org/viewvc?rev=633897&view=rev
Log:
Use felix to add osgi stuff to manifest - work in progress.  Add optional imports.

Modified:
    incubator/cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml

Modified: incubator/cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml?rev=633897&r1=633896&r2=633897&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml Wed Mar  5 08:10:22 2008
@@ -21,7 +21,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf</groupId>
     <artifactId>cxf-bundle</artifactId>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
     <name>Apache CXF Bundle Jar</name>
     <version>2.0.5-incubator-SNAPSHOT</version>
     <url>http://cwiki.apache.org/CXF</url>
@@ -37,7 +37,7 @@
         <maven.test.skip>true</maven.test.skip>
         <cxf.version>${pom.version}</cxf.version>
         <createSourcesJar>false</createSourcesJar>
-	<shade.version>1.0-beta-1</shade.version>
+        <shade.version>1.0</shade.version>
     </properties>
 
     <dependencies>
@@ -45,200 +45,167 @@
             <groupId>${pom.groupId}</groupId>
             <artifactId>cxf-common-utilities</artifactId>
             <version>${pom.version}</version>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>cxf-common-schemas</artifactId>
             <version>${pom.version}</version>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>cxf-tools-common</artifactId>
             <version>${pom.version}</version>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>cxf-tools-validator</artifactId>
             <version>${pom.version}</version>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>cxf-tools-wsdlto-core</artifactId>
             <version>${pom.version}</version>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>cxf-tools-misctools</artifactId>
             <version>${pom.version}</version>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>cxf-tools-wsdlto-databinding-jaxb</artifactId>
             <version>${pom.version}</version>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>cxf-tools-wsdlto-frontend-jaxws</artifactId>
             <version>${pom.version}</version>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>cxf-tools-java2wsdl</artifactId>
             <version>${pom.version}</version>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>cxf-xjc-ts</artifactId>
             <version>${pom.version}</version>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>cxf-xjc-dv</artifactId>
             <version>${pom.version}</version>
-            <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>cxf-api</artifactId>
             <version>${pom.version}</version>
-            <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>cxf-rt-core</artifactId>
             <version>${pom.version}</version>
-            <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>cxf-rt-management</artifactId>
             <version>${pom.version}</version>
-            <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>cxf-rt-transports-local</artifactId>
             <version>${pom.version}</version>
-            <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
             <version>${pom.version}</version>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
             <version>${pom.version}</version>
-            <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>cxf-rt-transports-jms</artifactId>
             <version>${pom.version}</version>
-            <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>cxf-rt-bindings-soap</artifactId>
             <version>${pom.version}</version>
-            <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>cxf-rt-bindings-coloc</artifactId>
             <version>${pom.version}</version>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>cxf-rt-bindings-object</artifactId>
             <version>${pom.version}</version>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>cxf-rt-bindings-xml</artifactId>
             <version>${pom.version}</version>
-            <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>cxf-rt-bindings-http</artifactId>
             <version>${pom.version}</version>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>cxf-rt-databinding-aegis</artifactId>
             <version>${pom.version}</version>
-            <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
             <version>${pom.version}</version>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>cxf-rt-frontend-js</artifactId>
             <version>${pom.version}</version>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>cxf-rt-frontend-simple</artifactId>
             <version>${pom.version}</version>
-            <optional>true</optional>
         </dependency>
-
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>cxf-rt-ws-security</artifactId>
             <version>${pom.version}</version>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>cxf-rt-ws-policy</artifactId>
             <version>${pom.version}</version>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>cxf-rt-ws-addr</artifactId>
             <version>${pom.version}</version>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>cxf-rt-ws-rm</artifactId>
             <version>${pom.version}</version>
-            <optional>true</optional>
         </dependency>
-
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -256,7 +223,42 @@
             </resource>
         </resources>
         <plugins>
-
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Import-Package>
+                            com.ibm*;resolution:=optional,
+                            com.sun*;resolution:=optional,
+                            javanet.staxutils*;resolution:=optional,
+                            javax.jms*;resolution:=optional,
+                            javax.xml.soap,
+                            junit.framework*;resolution:=optional,
+                            org.apache.abdera*;resolution:=optional,
+                            org.apache.commons.lang*;resolution:=optional,
+                            org.apache.log4j*;resolution:=optional,
+                            org.apache.velocity*;resolution:=optional,
+                            org.apache.xmlbeans*;resolution:=optional,
+                            org.apache.ws.security*;resolution:=optional,
+                            org.codehaus.jra*;resolution:=optional,
+                            org.jdom*;resolution:=optional,
+                            org.junit*;resolution:=optional,
+                            org.mortbay*;resolution:=optional,
+                            org.mozilla.javascript*;resolution:=optional,
+                            org.springframework*;resolution:=optional,
+                            *
+                        </Import-Package>
+                        <Export-Package>
+                            org.apache.cxf.*;version=${pom.version};-split-package:=merge-first,
+                            org.codehaus.xfire.aegis.type.java5.*,
+                            org.xmlsoap.schemas.wsdl.http.*,
+                            org.w3._2006._05.addressing.wsdl.*
+                        </Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
@@ -273,6 +275,14 @@
                             <createSourcesJar>${createSourcesJar}</createSourcesJar>
                             <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
                             <createDependencyReducedPom>true</createDependencyReducedPom>
+                            <filters>
+                                <filter>
+                                    <artifact>${project.groupId}:${project.artifactId}</artifact>
+                                    <excludes>
+                                        <exclude>org/**</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
 
                             <transformers>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
@@ -315,60 +325,60 @@
     </build>
 
     <profiles>
-         <profile>
-             <id>deploy</id>
-             <!--properties>
-                 <createSourcesJar>true</createSourcesJar>                  
  
-             </properties-->
-             <build>
-                 <plugins>
-                     <plugin>
-                         <groupId>org.apache.maven.plugins</groupId>
-                         <artifactId>maven-dependency-plugin</artifactId>
-                         <executions>
-                             <execution>
-                                 <id>unpack-sources</id>
-                                 <phase>generate-sources</phase>
-                                 <goals>
-                                     <goal>unpack-dependencies</goal>
-                                 </goals>
-                                 <configuration>
-                                     <includeGroupIds>org.apache.cxf</includeGroupIds>
-                                     <classifier>sources</classifier>
-                                     <outputDirectory>${project.build.directory}/sources</outputDirectory>
-                                 </configuration>
-                             </execution>
-                         </executions>
-                     </plugin>
-
-                     <plugin>
-                         <groupId>org.apache.maven.plugins</groupId>
-                         <artifactId>maven-javadoc-plugin</artifactId>
-                         <executions>
-                             <execution>
-                                 <id>package</id>
-                                 <phase>package</phase>
-                                 <goals>
-                                     <goal>jar</goal>
-                                 </goals>
-                             </execution>
-                         </executions>
-                         <configuration>
-                             <header>Apache CXF API</header>
-                             <footer>Apache CXF API</footer>
-                             <sourcepath>${project.build.directory}/sources</sourcepath>
-                         </configuration>
-                     </plugin>
-                 </plugins>
-             </build>
-         </profile>
+        <profile>
+            <id>deploy</id>
+            <properties>
+                <createSourcesJar>true</createSourcesJar>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>unpack-sources</id>
+                                <phase>generate-sources</phase>
+                                <goals>
+                                    <goal>unpack-dependencies</goal>
+                                </goals>
+                                <configuration>
+                                    <includeGroupIds>org.apache.cxf</includeGroupIds>
+                                    <classifier>sources</classifier>
+                                    <outputDirectory>${project.build.directory}/sources</outputDirectory>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>package</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <header>Apache CXF API</header>
+                            <footer>Apache CXF API</footer>
+                            <sourcepath>${project.build.directory}/sources</sourcepath>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 
 
     <scm>
         <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/branches/2.0.x-fixes/distribution/bundle</connection>
         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/branches/2.0.x-fixes/distribution/bundle</developerConnection>
-      <url>http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/cxf-parent/cxf-bundle</url>
-  </scm>
+        <url>http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/bundle</url>
+    </scm>
 
 </project>



Mime
View raw message