FELIX-1116: Renaming packages and changing artifact/group ids in the POMs
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@770981 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/karaf/jaas/jaas-config/src/main/resources/META-INF/spring.handlers b/karaf/jaas/jaas-config/src/main/resources/META-INF/spring.handlers
index fe59e34..c8b49a7 100644
--- a/karaf/jaas/jaas-config/src/main/resources/META-INF/spring.handlers
+++ b/karaf/jaas/jaas-config/src/main/resources/META-INF/spring.handlers
@@ -16,5 +16,5 @@
# limitations under the License.
#
################################################################################
-http\://servicemix.apache.org/jaas = org.apache.servicemix.kernel.jaas.config.impl.NamespaceHandler
-
\ No newline at end of file
+http\://servicemix.apache.org/jaas = org.apache.felix.karaf.jaas.config.impl.NamespaceHandler
+
diff --git a/karaf/jaas/jaas-config/src/main/resources/META-INF/spring.schemas b/karaf/jaas/jaas-config/src/main/resources/META-INF/spring.schemas
index 3001be1..352002b 100644
--- a/karaf/jaas/jaas-config/src/main/resources/META-INF/spring.schemas
+++ b/karaf/jaas/jaas-config/src/main/resources/META-INF/spring.schemas
@@ -16,4 +16,4 @@
# limitations under the License.
#
################################################################################
-http\://servicemix.apache.org/schema/servicemix-jaas.xsd = org/apache/servicemix/kernel/jaas/config/servicemix-jaas.xsd
+http\://servicemix.apache.org/schema/servicemix-jaas.xsd = org/apache/felix/karaf/jaas/config/servicemix-jaas.xsd
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/servicemix-jaas.xml
index eca5fbd..d878a3d 100644
--- 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/servicemix-jaas.xml
@@ -30,30 +30,30 @@
http://www.springframework.org/schema/osgi/spring-osgi.xsd">
<bean id="config"
- class="org.apache.servicemix.kernel.jaas.config.impl.OsgiConfiguration"
+ class="org.apache.felix.karaf.jaas.config.impl.OsgiConfiguration"
init-method="init"
destroy-method="close"/>
<osgi:list id="realms"
- interface="org.apache.servicemix.kernel.jaas.config.JaasRealm"
+ interface="org.apache.felix.karaf.jaas.config.JaasRealm"
cardinality="0..N">
<osgi:listener ref="config" bind-method="register" unbind-method="unregister" />
</osgi:list>
<bean id="proxyLoginModuleInitializer"
- class="org.apache.servicemix.kernel.jaas.config.impl.ProxyLoginModuleInitializer"
+ class="org.apache.felix.karaf.jaas.config.impl.ProxyLoginModuleInitializer"
init-method="init"/>
<!-- Register the Straight-Through flow -->
- <bean id="keystoreManager" class="org.apache.servicemix.kernel.jaas.config.impl.OsgiKeystoreManager" />
+ <bean id="keystoreManager" class="org.apache.felix.karaf.jaas.config.impl.OsgiKeystoreManager" />
<osgi:service ref="keystoreManager">
<osgi:interfaces>
- <value>org.apache.servicemix.kernel.jaas.config.KeystoreManager</value>
+ <value>org.apache.felix.karaf.jaas.config.KeystoreManager</value>
</osgi:interfaces>
</osgi:service>
<osgi:list id="keystores"
- interface="org.apache.servicemix.kernel.jaas.config.KeystoreInstance"
+ interface="org.apache.felix.karaf.jaas.config.KeystoreInstance"
cardinality="0..N">
<osgi:listener ref="keystoreManager" bind-method="register" unbind-method="unregister" />
</osgi:list>
diff --git a/karaf/jaas/jaas-config/src/main/resources/org/apache/servicemix/kernel/jaas/config/servicemix-jaas.xsd b/karaf/jaas/jaas-config/src/main/resources/org/apache/felix/karaf/jaas/config/servicemix-jaas.xsd
similarity index 100%
rename from karaf/jaas/jaas-config/src/main/resources/org/apache/servicemix/kernel/jaas/config/servicemix-jaas.xsd
rename to karaf/jaas/jaas-config/src/main/resources/org/apache/felix/karaf/jaas/config/servicemix-jaas.xsd