Author: eglynn
Date: Thu Oct 9 06:49:28 2008
New Revision: 703165
URL: http://svn.apache.org/viewvc?rev=703165&view=rev
Log:
Applying patch for CXF-1854 on behalf of David Bosschaert
Added:
cxf/sandbox/dosgi/distribution/
cxf/sandbox/dosgi/distribution/multi-bundle/
cxf/sandbox/dosgi/distribution/multi-bundle/pom.xml (with props)
cxf/sandbox/dosgi/distribution/multi-bundle/src/
cxf/sandbox/dosgi/distribution/multi-bundle/src/main/
cxf/sandbox/dosgi/distribution/multi-bundle/src/main/assembly/
cxf/sandbox/dosgi/distribution/multi-bundle/src/main/assembly/assembly.xml
(with props)
cxf/sandbox/dosgi/distribution/pom.xml (with props)
Modified:
cxf/sandbox/dosgi/felix/profiles/pom.xml
cxf/sandbox/dosgi/pom.xml
Added: cxf/sandbox/dosgi/distribution/multi-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/distribution/multi-bundle/pom.xml?rev=703165&view=auto
==============================================================================
--- cxf/sandbox/dosgi/distribution/multi-bundle/pom.xml (added)
+++ cxf/sandbox/dosgi/distribution/multi-bundle/pom.xml Thu Oct 9 06:49:28 2008
@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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</groupId>
+ <artifactId>cxf-dosgi-ri-multibundle-distribution</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>Distributed OSGI Multi-Bundle Distribution</name>
+ <url>http://cxf.apache.org</url>
+
+ <parent>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-dosgi-ri-distribution-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
+
+ <properties>
+ <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.0.2</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.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <version>1.1.2</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.jdom</groupId>
+ <artifactId>com.springsource.org.jdom</artifactId>
+ <version>1.0.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.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.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.locator</artifactId>
+ <version>${servicemix.specs.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.0</artifactId>
+ <version>${servicemix.specs.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jaxws-api-2.0</artifactId>
+ <version>${servicemix.specs.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.jaxb-impl-2.0.3</artifactId>
+ <version>${servicemix.feature.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.wsdl4j-1.6.1</artifactId>
+ <version>${servicemix.feature.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.xmlschema-1.3.2</artifactId>
+ <version>${servicemix.feature.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.asm-2.2.3</artifactId>
+ <version>${servicemix.kernel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.xmlresolver-1.2</artifactId>
+ <version>${servicemix.feature.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.neethi-2.0.2</artifactId>
+ <version>${servicemix.feature.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.woodstox</artifactId>
+ <version>${woodstox.bundle.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-bundle-minimal</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-dosgi-ri-discovery-local</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-dosgi-ri-dsw-cxf</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <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>
+ </plugins>
+ </build>
+</project>
Propchange: cxf/sandbox/dosgi/distribution/multi-bundle/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/sandbox/dosgi/distribution/multi-bundle/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: cxf/sandbox/dosgi/distribution/multi-bundle/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
cxf/sandbox/dosgi/distribution/multi-bundle/src/main/assembly/assembly.xml
URL:
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/distribution/multi-bundle/src/main/assembly/assembly.xml?rev=703165&view=auto
==============================================================================
--- cxf/sandbox/dosgi/distribution/multi-bundle/src/main/assembly/assembly.xml
(added)
+++ cxf/sandbox/dosgi/distribution/multi-bundle/src/main/assembly/assembly.xml
Thu Oct 9 06:49:28 2008
@@ -0,0 +1,33 @@
+<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.
+-->
+ <id>dosgi-ri-multi-bundle-assembly</id>
+
+ <formats>
+ <format>zip</format>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/distribution_bundles</directory>
+ <outputDirectory>bundles</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
Propchange:
cxf/sandbox/dosgi/distribution/multi-bundle/src/main/assembly/assembly.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
cxf/sandbox/dosgi/distribution/multi-bundle/src/main/assembly/assembly.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
cxf/sandbox/dosgi/distribution/multi-bundle/src/main/assembly/assembly.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: cxf/sandbox/dosgi/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/distribution/pom.xml?rev=703165&view=auto
==============================================================================
--- cxf/sandbox/dosgi/distribution/pom.xml (added)
+++ cxf/sandbox/dosgi/distribution/pom.xml Thu Oct 9 06:49:28 2008
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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</groupId>
+ <artifactId>cxf-dosgi-ri-distribution-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>Distributed OSGI Distribution Parent</name>
+ <url>http://cxf.apache.org</url>
+
+ <parent>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-dosgi-ri-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
+
+ <properties>
+ <topDirectoryLocation>..</topDirectoryLocation>
+ </properties>
+
+ <modules>
+ <module>multi-bundle</module>
+ </modules>
+</project>
Propchange: cxf/sandbox/dosgi/distribution/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/sandbox/dosgi/distribution/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: cxf/sandbox/dosgi/distribution/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: cxf/sandbox/dosgi/felix/profiles/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/felix/profiles/pom.xml?rev=703165&r1=703164&r2=703165&view=diff
==============================================================================
--- cxf/sandbox/dosgi/felix/profiles/pom.xml (original)
+++ cxf/sandbox/dosgi/felix/profiles/pom.xml Thu Oct 9 06:49:28 2008
@@ -34,8 +34,6 @@
<properties>
<topDirectoryLocation>../..</topDirectoryLocation>
- <jetty.version>6.1.9</jetty.version>
- <woodstox.bundle.version>3.2.7_1</woodstox.bundle.version>
</properties>
<dependencies>
Modified: cxf/sandbox/dosgi/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/pom.xml?rev=703165&r1=703164&r2=703165&view=diff
==============================================================================
--- cxf/sandbox/dosgi/pom.xml (original)
+++ cxf/sandbox/dosgi/pom.xml Thu Oct 9 06:49:28 2008
@@ -1,4 +1,22 @@
<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</groupId>
<artifactId>dosgi</artifactId>
@@ -7,6 +25,11 @@
<packaging>pom</packaging>
<name>Distributed OSGI Reference Implementation</name>
+ <properties>
+ <jetty.version>6.1.9</jetty.version>
+ <woodstox.bundle.version>3.2.7_1</woodstox.bundle.version>
+ </properties>
+
<modules>
<module>parent</module>
<module>felix</module>
@@ -14,6 +37,7 @@
<module>discovery</module>
<module>samples</module>
<module>systests</module>
+ <module>distribution</module>
</modules>
<reporting>
