svn commit: r771213 - in /felix/trunk/karaf/jaas: jaas-boot/src/main/java/org/apache/servicemix/ jaas-config/src/main/resources/META-INF/spring/ jaas-modules/src/main/java/org/apache/servicemix/ jaas-modules/src/main/resources/META-INF/spring/

[gnodet]

Author: gnodet
Date: Mon May  4 07:07:22 2009
New Revision: 771213

URL: http://svn.apache.org/viewvc?rev=771213&view=rev
Log:
Rename spring config files to use karaf, remove empty dirs

Added:
    
felix/trunk/karaf/jaas/jaas-config/src/main/resources/META-INF/spring/karaf-jaas.xml
      - copied unchanged from r771211, 
felix/trunk/karaf/jaas/jaas-config/src/main/resources/META-INF/spring/servicemix-jaas.xml
    
felix/trunk/karaf/jaas/jaas-modules/src/main/resources/META-INF/spring/karaf-jaas-module.xml
      - copied, changed from r771185, 
felix/trunk/karaf/jaas/jaas-modules/src/main/resources/META-INF/spring/servicemix-jaas-module.xml
Removed:
    felix/trunk/karaf/jaas/jaas-boot/src/main/java/org/apache/servicemix/
    
felix/trunk/karaf/jaas/jaas-config/src/main/resources/META-INF/spring/servicemix-jaas.xml
    felix/trunk/karaf/jaas/jaas-modules/src/main/java/org/apache/servicemix/
    
felix/trunk/karaf/jaas/jaas-modules/src/main/resources/META-INF/spring/servicemix-jaas-module.xml

Copied: 
felix/trunk/karaf/jaas/jaas-modules/src/main/resources/META-INF/spring/karaf-jaas-module.xml
 (from r771185, 
felix/trunk/karaf/jaas/jaas-modules/src/main/resources/META-INF/spring/servicemix-jaas-module.xml)
URL: 
http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/jaas-modules/src/main/resources/META-INF/spring/karaf-jaas-module.xml?p2=felix/trunk/karaf/jaas/jaas-modules/src/main/resources/META-INF/spring/karaf-jaas-module.xml&p1=felix/trunk/karaf/jaas/jaas-modules/src/main/resources/META-INF/spring/servicemix-jaas-module.xml&r1=771185&r2=771213&rev=771213&view=diff
==============================================================================
--- 
felix/trunk/karaf/jaas/jaas-modules/src/main/resources/META-INF/spring/servicemix-jaas-module.xml
 (original)
+++ 
felix/trunk/karaf/jaas/jaas-modules/src/main/resources/META-INF/spring/karaf-jaas-module.xml
 Mon May  4 07:07:22 2009
@@ -41,7 +41,7 @@
 
     <osgi:reference id="configAdmin" 
interface="org.osgi.service.cm.ConfigurationAdmin" />
 
-    <jaas:config id="servicemix">
+    <jaas:config id="karaf">
         <jaas:module 
className="org.apache.felix.karaf.jaas.modules.osgi.OsgiConfigLoginModule" 
flags="required">
             pid = org.apache.servicemix.users
         </jaas:module>
@@ -51,7 +51,7 @@
     <!-- Bean to allow the ${servicemix.home} property to be correctly 
resolved -->
     <bean 
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" 
/>
 
-    <jaas:config id="servicemix">
+    <jaas:config id="karaf">
         <jaas:module 
className="org.apache.felix.karaf.jaas.modules.properties.PropertiesLoginModule"
 flags="required">
             users = ${servicemix.base}/etc/users.properties
         </jaas:module>