Author: ningjiang
Date: Wed Feb 23 09:46:43 2011
New Revision: 1073660
URL: http://svn.apache.org/viewvc?rev=1073660&view=rev
Log:
Merged revisions 1073651 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1073651 | ningjiang | 2011-02-23 17:23:00 +0800 (Wed, 23 Feb 2011) | 1 line
CXF-3333 add cxf-all features for Karaf
........
Added:
cxf/branches/2.3.x-fixes/distribution/karaf/
- copied from r1073651, cxf/trunk/distribution/karaf/
cxf/branches/2.3.x-fixes/distribution/karaf/features/
- copied from r1073651, cxf/trunk/distribution/karaf/features/
cxf/branches/2.3.x-fixes/distribution/karaf/features/pom.xml
- copied unchanged from r1073651,
cxf/trunk/distribution/karaf/features/pom.xml
cxf/branches/2.3.x-fixes/distribution/karaf/features/src/
- copied from r1073651, cxf/trunk/distribution/karaf/features/src/
cxf/branches/2.3.x-fixes/distribution/karaf/features/src/main/
- copied from r1073651, cxf/trunk/distribution/karaf/features/src/main/
cxf/branches/2.3.x-fixes/distribution/karaf/features/src/main/resources/
- copied from r1073651,
cxf/trunk/distribution/karaf/features/src/main/resources/
cxf/branches/2.3.x-fixes/distribution/karaf/features/src/main/resources/config.properties
- copied unchanged from r1073651,
cxf/trunk/distribution/karaf/features/src/main/resources/config.properties
cxf/branches/2.3.x-fixes/distribution/karaf/features/src/main/resources/features.xml
- copied unchanged from r1073651,
cxf/trunk/distribution/karaf/features/src/main/resources/features.xml
cxf/branches/2.3.x-fixes/distribution/karaf/pom.xml
- copied unchanged from r1073651, cxf/trunk/distribution/karaf/pom.xml
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/distribution/pom.xml
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 23 09:46:43 2011
@@ -1 +1 @@
-/cxf/trunk:1072736
+/cxf/trunk:1072736,1073651
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.3.x-fixes/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/pom.xml?rev=1073660&r1=1073659&r2=1073660&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/distribution/pom.xml Wed Feb 23 09:46:43 2011
@@ -44,6 +44,7 @@
<modules>
<module>bundle</module>
+ <module>karaf</module>
<module>manifest</module>
</modules>
