Rename spring config files to use karaf, remove empty dirs
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@771213 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/karaf/jaas/jaas-config/src/main/resources/META-INF/spring/servicemix-jaas.xml b/karaf/jaas/jaas-config/src/main/resources/META-INF/spring/karaf-jaas.xml
similarity index 100%
rename from karaf/jaas/jaas-config/src/main/resources/META-INF/spring/servicemix-jaas.xml
rename to karaf/jaas/jaas-config/src/main/resources/META-INF/spring/karaf-jaas.xml
diff --git a/karaf/jaas/jaas-modules/src/main/resources/META-INF/spring/servicemix-jaas-module.xml b/karaf/jaas/jaas-modules/src/main/resources/META-INF/spring/karaf-jaas-module.xml
similarity index 92%
rename from karaf/jaas/jaas-modules/src/main/resources/META-INF/spring/servicemix-jaas-module.xml
rename to karaf/jaas/jaas-modules/src/main/resources/META-INF/spring/karaf-jaas-module.xml
index 2a5ad64..5791028 100644
--- a/karaf/jaas/jaas-modules/src/main/resources/META-INF/spring/servicemix-jaas-module.xml
+++ b/karaf/jaas/jaas-modules/src/main/resources/META-INF/spring/karaf-jaas-module.xml
@@ -41,19 +41,19 @@
<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>
</jaas:config>
-->
- <!-- Bean to allow the ${karaf.home} property to be correctly resolved -->
+ <!-- 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 = ${karaf.base}/etc/users.properties
+ users = ${servicemix.base}/etc/users.properties
</jaas:module>
</jaas:config>