Author: dkulp
Date: Wed Sep 28 14:34:06 2011
New Revision: 1176899
URL: http://svn.apache.org/viewvc?rev=1176899&view=rev
Log:
Merged revisions 1176890 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1176890 | dkulp | 2011-09-28 10:21:04 -0400 (Wed, 28 Sep 2011) | 2 lines
Move some modules out of distribution and into an osgi directory
........
Added:
cxf/branches/2.4.x-fixes/osgi/
cxf/branches/2.4.x-fixes/osgi/bundle/
- copied from r1176892, cxf/branches/2.4.x-fixes/distribution/bundle/
cxf/branches/2.4.x-fixes/osgi/karaf/
- copied from r1176892, cxf/branches/2.4.x-fixes/distribution/karaf/
Removed:
cxf/branches/2.4.x-fixes/distribution/bundle/
cxf/branches/2.4.x-fixes/distribution/karaf/
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/distribution/pom.xml
cxf/branches/2.4.x-fixes/osgi/karaf/features/pom.xml
cxf/branches/2.4.x-fixes/osgi/karaf/pom.xml
cxf/branches/2.4.x-fixes/parent/pom.xml
cxf/branches/2.4.x-fixes/pom.xml
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.4.x-fixes/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/pom.xml?rev=1176899&r1=1176898&r2=1176899&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/distribution/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/distribution/pom.xml Wed Sep 28 14:34:06 2011
@@ -44,8 +44,6 @@
</properties>
<modules>
- <module>bundle</module>
- <module>karaf</module>
<module>manifest</module>
</modules>
Modified: cxf/branches/2.4.x-fixes/osgi/karaf/features/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/osgi/karaf/features/pom.xml?rev=1176899&r1=1176892&r2=1176899&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/osgi/karaf/features/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/osgi/karaf/features/pom.xml Wed Sep 28 14:34:06
2011
@@ -30,8 +30,8 @@
<groupId>org.apache.cxf.karaf</groupId>
<artifactId>apache-cxf</artifactId>
<packaging>pom</packaging>
- <name>CXF :: Apache Karaf :: Features</name>
- <description>CXF :: Apache Karaf :: Features</description>
+ <name>Apache CXF Karaf Features</name>
+ <description>Apache CXF Karaf Features</description>
<!-- The validate plugin will export these provided dependencies bundles'
export packages first -->
<dependencies>
@@ -141,7 +141,7 @@
<plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>features-maven-plugin</artifactId>
- <version>${karaf-version}</version>
+ <version>${cxf.karaf.version}</version>
<configuration>
<file>${project.build.directory}/classes/features.xml</file>
<karafConfig>${project.build.directory}/classes/config.properties</karafConfig>
Modified: cxf/branches/2.4.x-fixes/osgi/karaf/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/osgi/karaf/pom.xml?rev=1176899&r1=1176892&r2=1176899&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/osgi/karaf/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/osgi/karaf/pom.xml Wed Sep 28 14:34:06 2011
@@ -31,41 +31,11 @@
<artifactId>karaf-parent</artifactId>
<packaging>pom</packaging>
<version>2.4.3-SNAPSHOT</version>
- <name>CXF :: Apache Karaf</name>
- <description>CXF :: Apache Karaf</description>
-
- <properties>
- <karaf-version>2.2.3</karaf-version>
- </properties>
+ <name>Apache CXF Karaf Parent</name>
+ <description>Apache CXF Karaf Parent</description>
<modules>
<module>features</module>
</modules>
- <repositories>
- <repository>
- <id>apache.snapshots</id>
- <url>http://repository.apache.org/snapshots/</url>
- <name>Apache Snapshot Repo</name>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>apache.snapshots</id>
- <url>http://repository.apache.org/snapshots/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </pluginRepository>
- </pluginRepositories>
-
</project>
Modified: cxf/branches/2.4.x-fixes/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/parent/pom.xml?rev=1176899&r1=1176898&r2=1176899&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/parent/pom.xml Wed Sep 28 14:34:06 2011
@@ -123,6 +123,7 @@
<!-- various OSGi related versions -->
<cxf.aries.version>0.3.1</cxf.aries.version>
<cxf.osgi.version>4.2.0</cxf.osgi.version>
+ <cxf.karaf.version>2.2.3</cxf.karaf.version>
<cxf.pax.logging.version>1.6.0</cxf.pax.logging.version>
<cxf.felix.framework.version>2.0.5</cxf.felix.framework.version>
<cxf.felix.configadmin.version>1.2.4</cxf.felix.configadmin.version>
Modified: cxf/branches/2.4.x-fixes/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/pom.xml?rev=1176899&r1=1176898&r2=1176899&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/pom.xml Wed Sep 28 14:34:06 2011
@@ -179,6 +179,8 @@
<module>rt</module>
<module>integration</module>
<module>maven-plugins</module>
+ <module>osgi/karaf</module>
+ <module>osgi/bundle</module>
<module>systests</module>
</modules>
