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 2012/07/01 21:44:01 UTC
svn commit: r1355991 - in /cxf/dosgi/trunk/distribution/subsystem: ./
pom.xml src/ src/main/ src/main/assembly/
src/main/assembly/subsystem-assembly.xml src/main/resources/
src/main/resources/OSGI-INF/ src/main/resources/OSGI-INF/SUBSYSTEM.MF
Author: davidb
Date: Sun Jul 1 19:44:00 2012
New Revision: 1355991
URL: http://svn.apache.org/viewvc?rev=1355991&view=rev
Log:
Create an OSGi Subsystem distribution.
Added:
cxf/dosgi/trunk/distribution/subsystem/
cxf/dosgi/trunk/distribution/subsystem/pom.xml
cxf/dosgi/trunk/distribution/subsystem/src/
cxf/dosgi/trunk/distribution/subsystem/src/main/
cxf/dosgi/trunk/distribution/subsystem/src/main/assembly/
cxf/dosgi/trunk/distribution/subsystem/src/main/assembly/subsystem-assembly.xml
cxf/dosgi/trunk/distribution/subsystem/src/main/resources/
cxf/dosgi/trunk/distribution/subsystem/src/main/resources/OSGI-INF/
cxf/dosgi/trunk/distribution/subsystem/src/main/resources/OSGI-INF/SUBSYSTEM.MF
Added: cxf/dosgi/trunk/distribution/subsystem/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/subsystem/pom.xml?rev=1355991&view=auto
==============================================================================
--- cxf/dosgi/trunk/distribution/subsystem/pom.xml (added)
+++ cxf/dosgi/trunk/distribution/subsystem/pom.xml Sun Jul 1 19:44:00 2012
@@ -0,0 +1,396 @@
+<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-subsystem-distribution</artifactId>
+ <name>Distributed OSGi Subsystem Distribution</name>
+ <url>http://cxf.apache.org</url>
+
+ <parent>
+ <groupId>org.apache.cxf.dosgi</groupId>
+ <artifactId>cxf-dosgi-ri-distribution-parent</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <properties>
+ <dosgi.version>${project.version}</dosgi.version>
+ <topDirectoryLocation>../..</topDirectoryLocation>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <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-ws-metadata_2.0_spec</artifactId>
+ <version>1.1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_${servlet.version}_spec</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.enterprise</artifactId>
+ <version>${osgi.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>com.springsource.slf4j.api</artifactId>
+ <version>1.5.10</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>com.springsource.slf4j.jcl</artifactId>
+ <version>1.5.10</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jdom</groupId>
+ <artifactId>com.springsource.org.jdom</artifactId>
+ <version>1.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.aopalliance</groupId>
+ <artifactId>com.springsource.org.aopalliance</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-asm</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-expression</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-io</artifactId>
+ <version>${spring.osgi.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-core</artifactId>
+ <version>${spring.osgi.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-extender</artifactId>
+ <version>${spring.osgi.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.aggregate</groupId>
+ <artifactId>jetty-all-server</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.web</groupId>
+ <artifactId>pax-web-spi</artifactId>
+ <version>${pax.web.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.web</groupId>
+ <artifactId>pax-web-runtime</artifactId>
+ <version>${pax.web.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.web</groupId>
+ <artifactId>pax-web-jetty</artifactId>
+ <version>${pax.web.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.saaj-api-1.3</artifactId>
+ <version>${servicemix.specs.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
+ <version>${servicemix.specs.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jaxb-api-2.1</artifactId>
+ <version>${servicemix.specs.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jaxws-api-2.1</artifactId>
+ <version>${servicemix.specs.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jsr311-api-1.1.1</artifactId>
+ <version>${servicemix.specs.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.xmlschema</groupId>
+ <artifactId>xmlschema-core</artifactId>
+ <version>${xmlschema.bundle.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
+ <version>${xmlresolver.bundle.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.neethi</groupId>
+ <artifactId>neethi</artifactId>
+ <version>${neethi.bundle.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
+ <version>${wsdl4j.bundle.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.xmlsec</artifactId>
+ <version>${xmlsec.bundle.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
+ <version>${jaxbimpl.bundle.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.asm</artifactId>
+ <version>${asm.bundle.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>stax2-api</artifactId>
+ <version>3.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>woodstox-core-asl</artifactId>
+ <version>${woodstox.bundle.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.commons-pool</artifactId>
+ <version>${commons.pool.bundle.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.joda-time</artifactId>
+ <version>1.5.2_4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.opensaml</artifactId>
+ <version>2.4.1_1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-bundle-minimal</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf.dosgi</groupId>
+ <artifactId>cxf-dosgi-ri-discovery-local</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf.dosgi</groupId>
+ <artifactId>cxf-dosgi-ri-dsw-cxf</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf.dosgi</groupId>
+ <artifactId>cxf-dosgi-ri-topology-manager</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <!-- Discovery dependencies -->
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.configadmin</artifactId>
+ <version>1.2.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.fileinstall</artifactId>
+ <version>3.1.10</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.log4j</groupId>
+ <artifactId>com.springsource.org.apache.log4j</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>${zookeeper.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.jdmk</groupId>
+ <artifactId>jmxtools</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jmx</groupId>
+ <artifactId>jmxri</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf.dosgi</groupId>
+ <artifactId>cxf-dosgi-ri-discovery-distributed</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf.dosgi</groupId>
+ <artifactId>cxf-dosgi-ri-discovery-distributed-zookeeper-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf.dosgi</groupId>
+ <artifactId>cxf-dosgi-ri-discovery-distributed-zookeeper-server-config</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ </dependencies>
+
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
+ <plugins>
+ <!-- The assembly plugin is used to actually build the subsystem archive -->
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>./src/main/assembly/subsystem-assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- Since the assembly plugin has no way to output to an .esa file extension use the antrun
+ plugin to copy the file to one with the proper extension -->
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <configuration>
+ <target>
+ <copy file="${project.build.directory}/${project.build.finalName}.zip"
+ tofile="${project.build.directory}/${project.build.finalName}.esa" />
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- Attach the .esa file to the project so that it ends up in the repo -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>attach-instrumented-jar</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>${project.build.directory}/${project.build.finalName}.esa</file>
+ <type>esa</type>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Added: cxf/dosgi/trunk/distribution/subsystem/src/main/assembly/subsystem-assembly.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/subsystem/src/main/assembly/subsystem-assembly.xml?rev=1355991&view=auto
==============================================================================
--- cxf/dosgi/trunk/distribution/subsystem/src/main/assembly/subsystem-assembly.xml (added)
+++ cxf/dosgi/trunk/distribution/subsystem/src/main/assembly/subsystem-assembly.xml Sun Jul 1 19:44:00 2012
@@ -0,0 +1,48 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/component-1.1.2.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.
+-->
+ <id>subsystem-feature</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <files>
+ <file>
+ <source>target/classes/OSGI-INF/SUBSYSTEM.MF</source>
+ <outputDirectory>OSGI-INF</outputDirectory>
+ </file>
+ </files>
+
+ <dependencySets>
+ <dependencySet>
+ <scope>runtime</scope>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <excludes>
+ <!-- Exclude the current artifact as it doesn't contribute anything other than the
+ logic to build the subsystem. -->
+ <exclude>org.apache.cxf.dosgi:cxf-dosgi-ri-subsystem-distribution</exclude>
+ </excludes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
+
+
Added: cxf/dosgi/trunk/distribution/subsystem/src/main/resources/OSGI-INF/SUBSYSTEM.MF
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/subsystem/src/main/resources/OSGI-INF/SUBSYSTEM.MF?rev=1355991&view=auto
==============================================================================
--- cxf/dosgi/trunk/distribution/subsystem/src/main/resources/OSGI-INF/SUBSYSTEM.MF (added)
+++ cxf/dosgi/trunk/distribution/subsystem/src/main/resources/OSGI-INF/SUBSYSTEM.MF Sun Jul 1 19:44:00 2012
@@ -0,0 +1,51 @@
+Manifest-Version: 2.0
+Subsystem-ManifestVersion: 1.0
+Subsystem-SymbolicName: ${project.artifactId}
+Subsystem-Version: 1.4.0
+Subsystem-Name: ${project.name}
+Subsystem-Content: org.apache.geronimo.specs.geronimo-annotation_1.0_spec;start-order:=1,
+ org.apache.geronimo.specs.geronimo-activation_1.1_spec;start-order:=2,
+ org.apache.geronimo.specs.geronimo-javamail_1.4_spec;start-order:=3,
+ org.apache.geronimo.specs.geronimo-servlet_3.0_spec;start-order:=4,
+ org.apache.geronimo.specs.geronimo-ws-metadata_2.0_spec;start-order:=5,
+ com.springsource.org.apache.commons.logging;start-order:=6,
+ com.springsource.org.jdom;start-order:=7,
+ org.springframework.core;start-order:=8,
+ org.springframework.beans;start-order:=9,
+ org.springframework.context;start-order:=10,
+ com.springsource.org.aopalliance;start-order:=11,
+ com.springsource.slf4j.api;start-order:=11,
+ com.springsource.slf4j.jcl,
+ org.springframework.aop;start-order:=12,
+ org.springframework.asm;start-order:=13,
+ org.springframework.expression;start-order:=14,
+ org.springframework.osgi.io;start-order:=15,
+ org.springframework.osgi.core;start-order:=16,
+ org.springframework.osgi.extender;start-order:=17,
+ org.eclipse.jetty.aggregate.jetty-all-server;start-order:=18,
+ org.ops4j.pax.web.pax-web-spi;start-order:=19,
+ org.ops4j.pax.web.pax-web-runtime;start-order:=20,
+ org.ops4j.pax.web.pax-web-jetty;start-order:=21,
+ org.apache.servicemix.bundles.jaxb-impl;start-order:=22,
+ org.apache.servicemix.bundles.wsdl4j;start-order:=23,
+ org.apache.servicemix.bundles.xmlsec;start-order:=24,
+ org.apache.ws.xmlschema.core;start-order:=25,
+ org.apache.servicemix.bundles.asm;start-order:=26,
+ org.apache.servicemix.bundles.xmlresolver;start-order:=27,
+ org.apache.neethi;start-order:=28,
+ stax2-api;start-order:=29,
+ woodstox-core-asl;start-order:=30,
+ org.apache.servicemix.bundles.commons-pool;start-order:=31,
+ org.apache.servicemix.specs.saaj-api-1.3;start-order:=32,
+ org.apache.servicemix.specs.stax-api-1.0;start-order:=33,
+ org.apache.servicemix.specs.jaxb-api-2.1;start-order:=34,
+ org.apache.servicemix.specs.jaxws-api-2.1;start-order:=35,
+ org.apache.servicemix.specs.jsr311-api-1.1.1;start-order:=36,
+ org.apache.servicemix.bundles.joda-time;start-order:=37,
+ org.apache.servicemix.bundles.opensaml;start-order:=38,
+ org.apache.cxf.bundle-minimal;start-order:=39,
+ cxf-dosgi-ri-discovery-local;start-order:=40,
+ osgi.enterprise;start-order:=41,
+ cxf-dosgi-ri-dsw-cxf;start-order:=42,
+ cxf-dosgi-ri-topology-manager;start-order:=43
+Subsystem-Type: osgi.subsystem.feature