You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by da...@apache.org on 2009/06/08 15:17:45 UTC
svn commit: r782616 - in /cxf/dosgi/trunk/distribution: ./
discovery-multi-bundle/ discovery-multi-bundle/src/
discovery-multi-bundle/src/main/ discovery-multi-bundle/src/main/assembly/
discovery-multi-bundle/src/main/resources/ discovery-multi-bundle/...
Author: davidb
Date: Mon Jun 8 13:17:45 2009
New Revision: 782616
URL: http://svn.apache.org/viewvc?rev=782616&view=rev
Log:
Initial bits of a multi-bundle distribution of Discovery.
Added:
cxf/dosgi/trunk/distribution/discovery-multi-bundle/
cxf/dosgi/trunk/distribution/discovery-multi-bundle/pom.xml (with props)
cxf/dosgi/trunk/distribution/discovery-multi-bundle/src/
cxf/dosgi/trunk/distribution/discovery-multi-bundle/src/main/
cxf/dosgi/trunk/distribution/discovery-multi-bundle/src/main/assembly/
cxf/dosgi/trunk/distribution/discovery-multi-bundle/src/main/assembly/assembly.xml (with props)
cxf/dosgi/trunk/distribution/discovery-multi-bundle/src/main/resources/
cxf/dosgi/trunk/distribution/discovery-multi-bundle/src/main/resources/distro_bundles.xml (with props)
cxf/dosgi/trunk/distribution/discovery-multi-bundle/src/main/xsl/
cxf/dosgi/trunk/distribution/discovery-multi-bundle/src/main/xsl/equinox_buildsystem_config.xslt
cxf/dosgi/trunk/distribution/discovery-multi-bundle/src/main/xsl/equinox_distro_config.xslt
cxf/dosgi/trunk/distribution/discovery-multi-bundle/src/main/xsl/felix_buildsystem_config.xslt
cxf/dosgi/trunk/distribution/discovery-multi-bundle/src/main/xsl/felix_distro_config.xslt
Modified:
cxf/dosgi/trunk/distribution/pom.xml
Added: cxf/dosgi/trunk/distribution/discovery-multi-bundle/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/discovery-multi-bundle/pom.xml?rev=782616&view=auto
==============================================================================
--- cxf/dosgi/trunk/distribution/discovery-multi-bundle/pom.xml (added)
+++ cxf/dosgi/trunk/distribution/discovery-multi-bundle/pom.xml Mon Jun 8 13:17:45 2009
@@ -0,0 +1,178 @@
+<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">
+<!--
+ 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.
+-->
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.cxf.dosgi</groupId>
+ <artifactId>cxf-dosgi-ri-discovery-multibundle-distribution</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ <name>Distributed OSGI Zookeeper-Based Discovery Multi-Bundle Distribution</name>
+ <url>http://cxf.apache.org</url>
+
+ <parent>
+ <groupId>org.apache.cxf.dosgi</groupId>
+ <artifactId>cxf-dosgi-ri-distribution-parent</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <properties>
+ <dosgi.version>${pom.version}</dosgi.version>
+ <topDirectoryLocation>../..</topDirectoryLocation>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.configadmin</artifactId>
+ <version>1.0.10</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.fileinstall</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.log4j</groupId>
+ <artifactId>com.springsource.org.apache.log4j</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf.dosgi</groupId>
+ <artifactId>cxf-dosgi-ri-discovery-distributed-zookeeper-wrapper</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf.dosgi</groupId>
+ <artifactId>cxf-dosgi-ri-discovery-distributed</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-deps</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <excludeTransitive>true</excludeTransitive>
+ <outputDirectory>${project.build.directory}/distribution_bundles</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>./src/main/assembly/assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>1.2.0</version>
+ <type>jar</type>
+ <outputDirectory>target/deps</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>compile</phase>
+ <configuration>
+ <tasks>
+ <path id="current.dir.path">
+ <pathelement location="." />
+ </path>
+ <pathconvert targetos="unix" property="current.dir" refid="current.dir.path" />
+
+ <xslt processor="trax" in="target/classes/distro_bundles.xml" out="target/distribution_configs/felix.config.properties.append" style="src/main/xsl/felix_distro_config.xslt">
+ <param name="Version" expression="${dosgi.version}" />
+ </xslt>
+
+ <xslt processor="trax" in="target/classes/distro_bundles.xml" out="target/felix.config.properties.append" style="src/main/xsl/felix_buildsystem_config.xslt">
+ <param name="TargetDir" expression="${current.dir}/target/" />
+ </xslt>
+
+ <xslt processor="trax" in="target/classes/distro_bundles.xml" out="target/distribution_configs/equinox.config.ini.append" style="src/main/xsl/equinox_distro_config.xslt">
+ <param name="Version" expression="${dosgi.version}" />
+ </xslt>
+
+ <xslt processor="trax" in="target/classes/distro_bundles.xml" out="target/equinox.config.ini.append" style="src/main/xsl/equinox_buildsystem_config.xslt">
+ <param name="TargetDir" expression="${current.dir}/target/" />
+ </xslt>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: cxf/dosgi/trunk/distribution/discovery-multi-bundle/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/dosgi/trunk/distribution/discovery-multi-bundle/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: cxf/dosgi/trunk/distribution/discovery-multi-bundle/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: cxf/dosgi/trunk/distribution/discovery-multi-bundle/src/main/assembly/assembly.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/discovery-multi-bundle/src/main/assembly/assembly.xml?rev=782616&view=auto
==============================================================================
--- cxf/dosgi/trunk/distribution/discovery-multi-bundle/src/main/assembly/assembly.xml (added)
+++ cxf/dosgi/trunk/distribution/discovery-multi-bundle/src/main/assembly/assembly.xml Mon Jun 8 13:17:45 2009
@@ -0,0 +1,57 @@
+<assembly>
+<!--
+ 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.
+-->
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/distribution_bundles</directory>
+ <outputDirectory>apache-cxf-dosgi-discovery-${dosgi.version}/dosgi_bundles</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/distribution_configs</directory>
+ <outputDirectory>apache-cxf-dosgi-discovery-${dosgi.version}/conf</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/maven-shared-archive-resources/META-INF</directory>
+ <excludes>
+ <exclude>DEPENDENCIES</exclude>
+ </excludes>
+ <outputDirectory>apache-cxf-dosgi-discovery-${dosgi.version}</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/resources/META-INF</directory>
+ <includes>
+ <include>NOTICE.jdom</include>
+ </includes>
+ <outputDirectory>apache-cxf-dosgi-discovery-${dosgi.version}</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/release</directory>
+ <includes>
+ <include>README</include>
+ </includes>
+ <outputDirectory>apache-cxf-dosgi-discovery-${dosgi.version}</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
Propchange: cxf/dosgi/trunk/distribution/discovery-multi-bundle/src/main/assembly/assembly.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/dosgi/trunk/distribution/discovery-multi-bundle/src/main/assembly/assembly.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: cxf/dosgi/trunk/distribution/discovery-multi-bundle/src/main/assembly/assembly.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: cxf/dosgi/trunk/distribution/discovery-multi-bundle/src/main/resources/distro_bundles.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/discovery-multi-bundle/src/main/resources/distro_bundles.xml?rev=782616&view=auto
==============================================================================
--- cxf/dosgi/trunk/distribution/discovery-multi-bundle/src/main/resources/distro_bundles.xml (added)
+++ cxf/dosgi/trunk/distribution/discovery-multi-bundle/src/main/resources/distro_bundles.xml Mon Jun 8 13:17:45 2009
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<bundles>
+ <bundle>cxf-dosgi-ri-discovery-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-discovery-${project.version}/dosgi_bundles/org.apache.felix.configadmin-1.0.10.jar</bundle>
+ <bundle>cxf-dosgi-ri-discovery-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-discovery-${project.version}/dosgi_bundles/org.apache.felix.fileinstall-1.0.0.jar</bundle>
+ <bundle>cxf-dosgi-ri-discovery-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-discovery-${project.version}/dosgi_bundles/com.springsource.org.apache.log4j-${log4j.version}.jar</bundle>
+ <bundle>cxf-dosgi-ri-discovery-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-discovery-${project.version}/dosgi_bundles/cxf-dosgi-ri-discovery-distributed-zookeeper-wrapper-${project.version}.jar</bundle>
+ <bundle>cxf-dosgi-ri-discovery-multibundle-distribution-${project.version}.dir/apache-cxf-dosgi-discovery-${project.version}/dosgi_bundles/cxf-dosgi-ri-discovery-distributed-${project.version}.jar</bundle>
+</bundles>
Propchange: cxf/dosgi/trunk/distribution/discovery-multi-bundle/src/main/resources/distro_bundles.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/dosgi/trunk/distribution/discovery-multi-bundle/src/main/resources/distro_bundles.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: cxf/dosgi/trunk/distribution/discovery-multi-bundle/src/main/resources/distro_bundles.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: cxf/dosgi/trunk/distribution/discovery-multi-bundle/src/main/xsl/equinox_buildsystem_config.xslt
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/discovery-multi-bundle/src/main/xsl/equinox_buildsystem_config.xslt?rev=782616&view=auto
==============================================================================
--- cxf/dosgi/trunk/distribution/discovery-multi-bundle/src/main/xsl/equinox_buildsystem_config.xslt (added)
+++ cxf/dosgi/trunk/distribution/discovery-multi-bundle/src/main/xsl/equinox_buildsystem_config.xslt Mon Jun 8 13:17:45 2009
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:transform version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ <xsl:output method="text" version="1.0" encoding="UTF-8" indent="yes"/>
+ <xsl:param name="TargetDir"/>
+ <xsl:template match="/">
+osgi.bundles= \
+ <xsl:for-each select="//bundles/bundle"><xsl:value-of select="$TargetDir"/><xsl:value-of select="text()"/><xsl:value-of select="string('@start, ')"/></xsl:for-each>
+ </xsl:template>
+</xsl:transform>
+
Added: cxf/dosgi/trunk/distribution/discovery-multi-bundle/src/main/xsl/equinox_distro_config.xslt
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/discovery-multi-bundle/src/main/xsl/equinox_distro_config.xslt?rev=782616&view=auto
==============================================================================
--- cxf/dosgi/trunk/distribution/discovery-multi-bundle/src/main/xsl/equinox_distro_config.xslt (added)
+++ cxf/dosgi/trunk/distribution/discovery-multi-bundle/src/main/xsl/equinox_distro_config.xslt Mon Jun 8 13:17:45 2009
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:transform version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ <xsl:output method="text" version="1.0" encoding="UTF-8" indent="yes"/>
+ <xsl:param name="Version"/>
+ <xsl:variable name = "Basename">.dir/apache-cxf-dosgi-ri-<xsl:value-of select="$Version"/>/dosgi_bundles/</xsl:variable>
+ <xsl:template match="/">
+osgi.bundles= \
+<xsl:for-each select="//bundles/bundle">../apache-cxf-dosgi-ri-<xsl:value-of select="$Version"/>/dosgi_bundles/<xsl:value-of select="substring-after(text(), $Basename)"/><xsl:value-of select="string('@start, ')"/></xsl:for-each>
+ </xsl:template>
+</xsl:transform>
+
Added: cxf/dosgi/trunk/distribution/discovery-multi-bundle/src/main/xsl/felix_buildsystem_config.xslt
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/discovery-multi-bundle/src/main/xsl/felix_buildsystem_config.xslt?rev=782616&view=auto
==============================================================================
--- cxf/dosgi/trunk/distribution/discovery-multi-bundle/src/main/xsl/felix_buildsystem_config.xslt (added)
+++ cxf/dosgi/trunk/distribution/discovery-multi-bundle/src/main/xsl/felix_buildsystem_config.xslt Mon Jun 8 13:17:45 2009
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:transform version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ <xsl:output method="text" version="1.0" encoding="UTF-8" indent="yes"/>
+ <xsl:param name="TargetDir"/>
+ <xsl:template match="/">
+org.osgi.framework.startlevel.beginning=<xsl:value-of select="count(//bundles/felix_deps) + count(//bundles/bundle) + 50"/>
+ <xsl:for-each select="//bundles/bundle">
+ <xsl:variable name="i" select="position() + count(//bundles/felix_deps) + 50"/>
+felix.auto.start.<xsl:value-of select="$i"/>=file:/<xsl:value-of select="$TargetDir"/><xsl:value-of select="text()"/>
+ </xsl:for-each>
+ </xsl:template>
+</xsl:transform>
+
Added: cxf/dosgi/trunk/distribution/discovery-multi-bundle/src/main/xsl/felix_distro_config.xslt
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/discovery-multi-bundle/src/main/xsl/felix_distro_config.xslt?rev=782616&view=auto
==============================================================================
--- cxf/dosgi/trunk/distribution/discovery-multi-bundle/src/main/xsl/felix_distro_config.xslt (added)
+++ cxf/dosgi/trunk/distribution/discovery-multi-bundle/src/main/xsl/felix_distro_config.xslt Mon Jun 8 13:17:45 2009
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:transform version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ <xsl:output method="text" version="1.0" encoding="UTF-8" indent="yes"/>
+ <xsl:param name="Version"/>
+ <xsl:variable name = "Basename">.dir/apache-cxf-dosgi-ri-<xsl:value-of select="$Version"/>/dosgi_bundles/</xsl:variable>
+ <xsl:template match="/">
+org.osgi.framework.startlevel.beginning=<xsl:value-of select="count(//bundles/felix_deps) + count(//bundles/bundle) + 50"/>
+ <xsl:for-each select="//bundles/bundle">
+ <xsl:variable name="i" select="position() + count(//bundles/felix_deps) + 50"/>
+felix.auto.start.<xsl:value-of select="$i"/>=file:apache-cxf-dosgi-ri-<xsl:value-of select="$Version"/>/dosgi_bundles/<xsl:value-of select="substring-after(text(), $Basename)"/>
+ </xsl:for-each>
+ </xsl:template>
+</xsl:transform>
+
Modified: cxf/dosgi/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/pom.xml?rev=782616&r1=782615&r2=782616&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/pom.xml (original)
+++ cxf/dosgi/trunk/distribution/pom.xml Mon Jun 8 13:17:45 2009
@@ -41,6 +41,7 @@
<module>multi-bundle</module>
<module>single-bundle</module>
<module>discovery-single-bundle</module>
+ <module>discovery-multi-bundle</module>
<module>sources</module>
</modules>
</project>