You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by eg...@apache.org on 2009/05/06 13:42:26 UTC
svn commit: r772157 - in /cxf/dosgi/trunk: distribution/multi-bundle/
distribution/multi-bundle/src/main/appended-resources/META-INF/
distribution/multi-bundle/src/main/assembly/
distribution/multi-bundle/src/main/release/ distribution/single-bundle/sr...
Author: eglynn
Date: Wed May 6 11:42:20 2009
New Revision: 772157
URL: http://svn.apache.org/viewvc?rev=772157&view=rev
Log:
[dOSGi] Cleanup of distribution build:
- pulled in maven-remote-resources-plugin and added velocity templates for distro LICENSE files so as to add references to the licenses for 3rd party dependencies
- removed extraneous NOTICEs
- generating multi-bundle distro in tar.gz as well as zip formats
- added top-level README with introductory information
Added:
cxf/dosgi/trunk/distribution/multi-bundle/src/main/appended-resources/META-INF/LICENSE.vm
cxf/dosgi/trunk/distribution/multi-bundle/src/main/release/
cxf/dosgi/trunk/distribution/multi-bundle/src/main/release/README
cxf/dosgi/trunk/distribution/single-bundle/src/main/appended-resources/META-INF/LICENSE.vm
Modified:
cxf/dosgi/trunk/distribution/multi-bundle/pom.xml
cxf/dosgi/trunk/distribution/multi-bundle/src/main/appended-resources/META-INF/NOTICE
cxf/dosgi/trunk/distribution/multi-bundle/src/main/assembly/assembly.xml
cxf/dosgi/trunk/distribution/single-bundle/src/main/appended-resources/META-INF/NOTICE
cxf/dosgi/trunk/distribution/sources/src/main/assembly/src.xml
cxf/dosgi/trunk/parent/pom.xml
Modified: cxf/dosgi/trunk/distribution/multi-bundle/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/multi-bundle/pom.xml?rev=772157&r1=772156&r2=772157&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/multi-bundle/pom.xml (original)
+++ cxf/dosgi/trunk/distribution/multi-bundle/pom.xml Wed May 6 11:42:20 2009
@@ -22,7 +22,6 @@
<groupId>org.apache.cxf.dosgi</groupId>
<artifactId>cxf-dosgi-ri-multibundle-distribution</artifactId>
<version>1.1-SNAPSHOT</version>
- <packaging>jar</packaging>
<name>Distributed OSGI Multi-Bundle Distribution</name>
<url>http://cxf.apache.org</url>
@@ -298,4 +297,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Added: cxf/dosgi/trunk/distribution/multi-bundle/src/main/appended-resources/META-INF/LICENSE.vm
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/multi-bundle/src/main/appended-resources/META-INF/LICENSE.vm?rev=772157&view=auto
==============================================================================
--- cxf/dosgi/trunk/distribution/multi-bundle/src/main/appended-resources/META-INF/LICENSE.vm (added)
+++ cxf/dosgi/trunk/distribution/multi-bundle/src/main/appended-resources/META-INF/LICENSE.vm Wed May 6 11:42:20 2009
@@ -0,0 +1,39 @@
+##
+## 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
+## regarding copyright ownership. The ASF licenses this file
+## to you 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.
+##
+## $Date: 2008-03-09 23:17:06 -0700 (Sun, 09 Mar 2008) $ $Rev: 635446 $
+##
+
+
+The $projectName
+includes a number of components and libraries with separate
+copyright notices and license terms. Your use of those components are
+subject to the terms and conditions of the following licenses.
+#set ( $apacheTxt = "The Apache Software License, Version 2.0" )
+
+#foreach ( $project in $projects )
+#foreach ( $license in $project.licenses)
+#if ( ! ($apacheTxt == $license.name) )
+
+$project.name #if ($project.url)($project.url)#end $project.artifact
+ License: $license.name #if ($license.url) ($license.url)#end
+
+#end
+#end
+#end
+
Modified: cxf/dosgi/trunk/distribution/multi-bundle/src/main/appended-resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/multi-bundle/src/main/appended-resources/META-INF/NOTICE?rev=772157&r1=772156&r2=772157&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/multi-bundle/src/main/appended-resources/META-INF/NOTICE (original)
+++ cxf/dosgi/trunk/distribution/multi-bundle/src/main/appended-resources/META-INF/NOTICE Wed May 6 11:42:20 2009
@@ -33,12 +33,6 @@
(http://java.sun.com/xml/ns/javaee/javaee_5.xsd)
-This product also includes MTOSI wsdl and schemas developed by the
-TeleManagement Forum (http://www.tmforum.org/browse.aspx). The original
-MTOSI wsdl and schemas can be download from
-(http://sourceforge.net/projects/mtosi-ri)
-
-
Portions of the included XmlSchema library are Copyright 2006 International Business Machines Corp.
Modified: cxf/dosgi/trunk/distribution/multi-bundle/src/main/assembly/assembly.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/multi-bundle/src/main/assembly/assembly.xml?rev=772157&r1=772156&r2=772157&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/multi-bundle/src/main/assembly/assembly.xml (original)
+++ cxf/dosgi/trunk/distribution/multi-bundle/src/main/assembly/assembly.xml Wed May 6 11:42:20 2009
@@ -18,6 +18,7 @@
under the License.
-->
<formats>
+ <format>tar.gz</format>
<format>zip</format>
<format>dir</format>
</formats>
@@ -33,6 +34,9 @@
</fileSet>
<fileSet>
<directory>target/maven-shared-archive-resources/META-INF</directory>
+ <excludes>
+ <exclude>DEPENDENCIES</exclude>
+ </excludes>
<outputDirectory></outputDirectory>
</fileSet>
<fileSet>
@@ -42,5 +46,12 @@
</includes>
<outputDirectory></outputDirectory>
</fileSet>
+ <fileSet>
+ <directory>src/main/release</directory>
+ <includes>
+ <include>README</include>
+ </includes>
+ <outputDirectory></outputDirectory>
+ </fileSet>
</fileSets>
</assembly>
Added: cxf/dosgi/trunk/distribution/multi-bundle/src/main/release/README
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/multi-bundle/src/main/release/README?rev=772157&view=auto
==============================================================================
--- cxf/dosgi/trunk/distribution/multi-bundle/src/main/release/README (added)
+++ cxf/dosgi/trunk/distribution/multi-bundle/src/main/release/README Wed May 6 11:42:20 2009
@@ -0,0 +1,52 @@
+Welcome to the Apache CXF Distributed OSGi DSW Reference Implementation
+=======================================================================
+
+
+The dOSGi subproject of Apache CXF provides the Reference Implementation
+of the Distribution Software (DSW) component of the Distributed OSGi
+Specification[1].
+
+
+This release is provided for your convenience in three different
+distribution formats:
+
+1. Multi-bundle distro: cxf-dosgi-ri-multibundle-distribution-1.0.{tar.gaz|zip}
+
+Contains the dOSGi implementation and all 3rd party dependencies as
+separate bundles within an archive.
+
+
+2. Single-bundle distro: cxf-dosgi-ri-singlebundle-distribution-1.0.jar
+
+Contains the dOSGi implementation and all 3rd party dependencies wrapped
+in a single OSGi bundle so as to allow direct installation in your favourite
+OSGi container in one fell swoop.
+
+
+3. Source distro: cxf-dosgi-ri-source-distribution-1.1-SNAPSHOT.{tar.gz|zip}
+
+Contains the entire source tree for dOSGi.
+
+
+The best starting point for using dOSGi is the Getting Started Guide[2].
+
+Also note the very detailed walk-through of the greeter demo[3].
+
+If you need more help, or want to provide any feedback, please feel free
+to drop us a note on the CXF dev or users list[4].
+
+If you trip over any problems with dOSGi, don't hesitate to submit an issue
+to the CXF JIRA[5] with the component set to "Distributed-OSGi".
+
+
+Thanks for using dOSGi!
+
+Regards,
+The CXF dOSGi team.
+
+
+[1] See RFC 119 in http://www.osgi.org/download/osgi-4.2-early-draft3.pdf
+[2] http://cxf.apache.org/distributed-osgi.html#DistributedOSGi-GettingStarted
+[3] http://cxf.apache.org/distributed-osgi-greeter-demo-walkthrough.htm
+[4] http://cxf.apache.org/mailing-lists.html
+[5] https://issues.apache.org/jira/browse/CXF
Added: cxf/dosgi/trunk/distribution/single-bundle/src/main/appended-resources/META-INF/LICENSE.vm
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/single-bundle/src/main/appended-resources/META-INF/LICENSE.vm?rev=772157&view=auto
==============================================================================
--- cxf/dosgi/trunk/distribution/single-bundle/src/main/appended-resources/META-INF/LICENSE.vm (added)
+++ cxf/dosgi/trunk/distribution/single-bundle/src/main/appended-resources/META-INF/LICENSE.vm Wed May 6 11:42:20 2009
@@ -0,0 +1,39 @@
+##
+## 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
+## regarding copyright ownership. The ASF licenses this file
+## to you 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.
+##
+## $Date: 2008-03-09 23:17:06 -0700 (Sun, 09 Mar 2008) $ $Rev: 635446 $
+##
+
+
+The $projectName
+includes a number of components and libraries with separate
+copyright notices and license terms. Your use of those components are
+subject to the terms and conditions of the following licenses.
+#set ( $apacheTxt = "The Apache Software License, Version 2.0" )
+
+#foreach ( $project in $projects )
+#foreach ( $license in $project.licenses)
+#if ( ! ($apacheTxt == $license.name) )
+
+$project.name #if ($project.url)($project.url)#end $project.artifact
+ License: $license.name #if ($license.url) ($license.url)#end
+
+#end
+#end
+#end
+
Modified: cxf/dosgi/trunk/distribution/single-bundle/src/main/appended-resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/single-bundle/src/main/appended-resources/META-INF/NOTICE?rev=772157&r1=772156&r2=772157&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/single-bundle/src/main/appended-resources/META-INF/NOTICE (original)
+++ cxf/dosgi/trunk/distribution/single-bundle/src/main/appended-resources/META-INF/NOTICE Wed May 6 11:42:20 2009
@@ -33,12 +33,6 @@
(http://java.sun.com/xml/ns/javaee/javaee_5.xsd)
-This product also includes MTOSI wsdl and schemas developed by the
-TeleManagement Forum (http://www.tmforum.org/browse.aspx). The original
-MTOSI wsdl and schemas can be download from
-(http://sourceforge.net/projects/mtosi-ri)
-
-
Portions of the included XmlSchema library are Copyright 2006 International Business Machines Corp.
Modified: cxf/dosgi/trunk/distribution/sources/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/sources/src/main/assembly/src.xml?rev=772157&r1=772156&r2=772157&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/sources/src/main/assembly/src.xml (original)
+++ cxf/dosgi/trunk/distribution/sources/src/main/assembly/src.xml Wed May 6 11:42:20 2009
@@ -18,8 +18,7 @@
* under the License.
-->
<assembly>
- <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
- <id>src</id>
+ <id></id>
<includeBaseDirectory>false</includeBaseDirectory>
<formats>
<format>tar.gz</format>
@@ -29,7 +28,7 @@
<fileSets>
<fileSet>
<directory>../..</directory>
- <outputDirectory>apache-cxf-dosgi-ri-${dosgi.version}-src</outputDirectory>
+ <outputDirectory>apache-cxf-dosgi-ri-${dosgi.version}</outputDirectory>
<includes>
<include>**/*</include>
</includes>
Modified: cxf/dosgi/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/parent/pom.xml?rev=772157&r1=772156&r2=772157&view=diff
==============================================================================
--- cxf/dosgi/trunk/parent/pom.xml (original)
+++ cxf/dosgi/trunk/parent/pom.xml Wed May 6 11:42:20 2009
@@ -113,6 +113,36 @@
<artifactId>maven-dependency-plugin</artifactId>
<version>2.0</version>
</plugin>
+
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.0</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-buildtools</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+ <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+ </resourceBundles>
+ <supplementalModels>
+ <supplementalModel>notice-supplements.xml</supplementalModel>
+ </supplementalModels>
+ <properties>
+ <projectName>Apache CXF Distributed OSGi DSW Reference Implementation</projectName>
+ </properties>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</pluginManagement>