cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1438537 - in /cxf/branches/2.7.x-fixes: ./ distribution/pom.xml osgi/karaf/features/src/main/resources/features.xml
Date Fri, 25 Jan 2013 14:27:28 GMT
Author: sergeyb
Date: Fri Jan 25 14:27:28 2013
New Revision: 1438537

URL: http://svn.apache.org/viewvc?rev=1438537&view=rev
Log:
Merged revisions 1438535 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1438535 | sergeyb | 2013-01-25 14:24:29 +0000 (Fri, 25 Jan 2013) | 1 line
  
  Referencing cxf-rt-rs-security-sso-saml module in the distribution pom and karaf features
........

Modified:
    cxf/branches/2.7.x-fixes/   (props changed)
    cxf/branches/2.7.x-fixes/distribution/pom.xml
    cxf/branches/2.7.x-fixes/osgi/karaf/features/src/main/resources/features.xml

Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/trunk:r1438535

Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.7.x-fixes/distribution/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/distribution/pom.xml?rev=1438537&r1=1438536&r2=1438537&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/distribution/pom.xml (original)
+++ cxf/branches/2.7.x-fixes/distribution/pom.xml Fri Jan 25 14:27:28 2013
@@ -353,6 +353,11 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
+            <artifactId>cxf-rt-rs-security-sso-saml</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
             <artifactId>cxf-rt-javascript</artifactId>
             <version>${project.version}</version>
         </dependency>

Modified: cxf/branches/2.7.x-fixes/osgi/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/osgi/karaf/features/src/main/resources/features.xml?rev=1438537&r1=1438536&r2=1438537&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/osgi/karaf/features/src/main/resources/features.xml (original)
+++ cxf/branches/2.7.x-fixes/osgi/karaf/features/src/main/resources/features.xml Fri Jan 25
14:27:28 2013
@@ -169,6 +169,11 @@
         <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-rs-security-xml/${project.version}</bundle>
     </feature>
 
+    <feature name="cxf-rs-security-sso-saml" version="${project.version}" resolver='(obr)'>
+        <feature version="${project.version}">cxf-rs-security-xml</feature>
+        <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-rs-security-sso-saml/${project.version}</bundle>
+    </feature>
+
     <feature name="cxf-rs-security-cors" version="${project.version}" resolver='(obr)'>
         <feature version="${project.version}">cxf-jaxrs</feature>
         <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-rs-security-cors/${project.version}</bundle>



Mime
View raw message