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/test/java/org/apache/servicemix/kernel/jaas/config/NamespaceHandlerTest.java b/karaf/jaas/jaas-config/src/test/java/org/apache/felix/karaf/jaas/config/NamespaceHandlerTest.java
similarity index 91%
rename from karaf/jaas/jaas-config/src/test/java/org/apache/servicemix/kernel/jaas/config/NamespaceHandlerTest.java
rename to karaf/jaas/jaas-config/src/test/java/org/apache/felix/karaf/jaas/config/NamespaceHandlerTest.java
index fb282e9..c390fb9 100644
--- a/karaf/jaas/jaas-config/src/test/java/org/apache/servicemix/kernel/jaas/config/NamespaceHandlerTest.java
+++ b/karaf/jaas/jaas-config/src/test/java/org/apache/felix/karaf/jaas/config/NamespaceHandlerTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.kernel.jaas.config;
+package org.apache.felix.karaf.jaas.config;
import java.util.Dictionary;
import java.util.Hashtable;
@@ -23,8 +23,8 @@
import javax.security.auth.login.AppConfigurationEntry;
import junit.framework.TestCase;
-import org.apache.servicemix.kernel.jaas.boot.ProxyLoginModule;
-import org.apache.servicemix.kernel.jaas.config.impl.Config;
+import org.apache.felix.karaf.jaas.boot.ProxyLoginModule;
+import org.apache.felix.karaf.jaas.config.impl.Config;
import org.easymock.EasyMock;
import static org.easymock.EasyMock.anyObject;
import static org.easymock.EasyMock.aryEq;
@@ -82,7 +82,7 @@
assertNotNull(cfg.getModules());
assertEquals(1, cfg.getModules().length);
assertNotNull(cfg.getModules()[0]);
- assertEquals("org.apache.servicemix.kernel.jaas.config.SimpleLoginModule", cfg.getModules()[0].getClassName());
+ assertEquals("org.apache.felix.karaf.jaas.config.SimpleLoginModule", cfg.getModules()[0].getClassName());
assertEquals("required", cfg.getModules()[0].getFlags());
assertNotNull(cfg.getModules()[0].getOptions());
assertEquals(1, cfg.getModules()[0].getOptions().size());
@@ -97,7 +97,7 @@
assertNotNull(options);
assertEquals(3, options.size());
assertEquals("value", options.get("key"));
- assertEquals("org.apache.servicemix.kernel.jaas.config.SimpleLoginModule", options.get(ProxyLoginModule.PROPERTY_MODULE));
+ assertEquals("org.apache.felix.karaf.jaas.config.SimpleLoginModule", options.get(ProxyLoginModule.PROPERTY_MODULE));
assertEquals("32", options.get(ProxyLoginModule.PROPERTY_BUNDLE));
// Test keystore
diff --git a/karaf/jaas/jaas-config/src/test/resources/config.xml b/karaf/jaas/jaas-config/src/test/resources/config.xml
index 868b7c7..9fe3042 100644
--- a/karaf/jaas/jaas-config/src/test/resources/config.xml
+++ b/karaf/jaas/jaas-config/src/test/resources/config.xml
@@ -33,7 +33,7 @@
http://servicemix.apache.org/schema/servicemix-jaas.xsd">
<jaas:config id="realm">
- <jaas:module className="org.apache.servicemix.kernel.jaas.config.SimpleLoginModule" flags="required">
+ <jaas:module className="org.apache.felix.karaf.jaas.config.SimpleLoginModule" flags="required">
key=value
</jaas:module>
</jaas:config>
diff --git a/karaf/jaas/jaas-config/src/test/resources/privatestore.jks b/karaf/jaas/jaas-config/src/test/resources/privatestore.jks
index 26fc0bc..80106c1 100644
--- a/karaf/jaas/jaas-config/src/test/resources/privatestore.jks
+++ b/karaf/jaas/jaas-config/src/test/resources/privatestore.jks
Binary files differ