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-modules/pom.xml b/karaf/jaas/jaas-modules/pom.xml
index b3d0300..07af5aa 100644
--- a/karaf/jaas/jaas-modules/pom.xml
+++ b/karaf/jaas/jaas-modules/pom.xml
@@ -22,16 +22,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix.kernel.jaas</groupId>
+ <groupId>org.apache.felix.karaf.jaas</groupId>
<artifactId>jaas</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.servicemix.kernel.jaas</groupId>
- <artifactId>org.apache.servicemix.kernel.jaas.modules</artifactId>
+ <groupId>org.apache.felix.karaf.jaas</groupId>
+ <artifactId>org.apache.felix.karaf.jaas.modules</artifactId>
<packaging>bundle</packaging>
<version>1.2.0-SNAPSHOT</version>
- <name>Apache ServiceMix Kernel :: JAAS Modules</name>
+ <name>Apache Felix Karaf :: JAAS Modules</name>
<description>
Provides the JAAS Config
@@ -39,8 +39,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.servicemix.kernel.jaas</groupId>
- <artifactId>org.apache.servicemix.kernel.jaas.config</artifactId>
+ <groupId>org.apache.felix.karaf.jaas</groupId>
+ <artifactId>org.apache.felix.karaf.jaas.config</artifactId>
</dependency>
<dependency>
@@ -75,10 +75,10 @@
<instructions>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
<Export-Package>
- org.apache.servicemix.kernel.jaas.modules*;version=${project.version};-split-package:=merge-first
+ org.apache.felix.karaf.jaas.modules*;version=${project.version};-split-package:=merge-first
</Export-Package>
<Import-Package>
- org.apache.servicemix.kernel.jaas.config,
+ org.apache.felix.karaf.jaas.config,
org.springframework.beans.factory.config,
*
</Import-Package>
@@ -89,4 +89,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/karaf/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/RolePrincipal.java b/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/RolePrincipal.java
similarity index 96%
rename from karaf/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/RolePrincipal.java
rename to karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/RolePrincipal.java
index 03da146..1e70880 100644
--- a/karaf/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/RolePrincipal.java
+++ b/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/RolePrincipal.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.modules;
+package org.apache.felix.karaf.jaas.modules;
import java.security.Principal;
diff --git a/karaf/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/UserPrincipal.java b/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/UserPrincipal.java
similarity index 96%
rename from karaf/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/UserPrincipal.java
rename to karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/UserPrincipal.java
index 4978076..c791db9 100644
--- a/karaf/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/UserPrincipal.java
+++ b/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/UserPrincipal.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.modules;
+package org.apache.felix.karaf.jaas.modules;
import java.security.Principal;
diff --git a/karaf/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/osgi/ConfigAdminHolder.java b/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/osgi/ConfigAdminHolder.java
similarity index 95%
rename from karaf/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/osgi/ConfigAdminHolder.java
rename to karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/osgi/ConfigAdminHolder.java
index ec93095..cef50a7 100644
--- a/karaf/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/osgi/ConfigAdminHolder.java
+++ b/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/osgi/ConfigAdminHolder.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.modules.osgi;
+package org.apache.felix.karaf.jaas.modules.osgi;
import org.osgi.service.cm.ConfigurationAdmin;
diff --git a/karaf/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/osgi/OsgiConfigLoginModule.java b/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java
similarity index 95%
rename from karaf/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/osgi/OsgiConfigLoginModule.java
rename to karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java
index 2b48eb4..5e29485 100644
--- a/karaf/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/osgi/OsgiConfigLoginModule.java
+++ b/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/osgi/OsgiConfigLoginModule.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.modules.osgi;
+package org.apache.felix.karaf.jaas.modules.osgi;
import java.io.IOException;
import java.security.Principal;
@@ -33,8 +33,8 @@
import javax.security.auth.login.LoginException;
import javax.security.auth.spi.LoginModule;
-import org.apache.servicemix.kernel.jaas.modules.RolePrincipal;
-import org.apache.servicemix.kernel.jaas.modules.UserPrincipal;
+import org.apache.felix.karaf.jaas.modules.RolePrincipal;
+import org.apache.felix.karaf.jaas.modules.UserPrincipal;
import org.osgi.service.cm.Configuration;
public class OsgiConfigLoginModule implements LoginModule {
diff --git a/karaf/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/properties/PropertiesLoginModule.java b/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/properties/PropertiesLoginModule.java
similarity index 95%
rename from karaf/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/properties/PropertiesLoginModule.java
rename to karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/properties/PropertiesLoginModule.java
index 5971745..2077903 100644
--- a/karaf/jaas/jaas-modules/src/main/java/org/apache/servicemix/kernel/jaas/modules/properties/PropertiesLoginModule.java
+++ b/karaf/jaas/jaas-modules/src/main/java/org/apache/felix/karaf/jaas/modules/properties/PropertiesLoginModule.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.modules.properties;
+package org.apache.felix.karaf.jaas.modules.properties;
import java.io.File;
import java.io.IOException;
@@ -36,8 +36,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.servicemix.kernel.jaas.modules.RolePrincipal;
-import org.apache.servicemix.kernel.jaas.modules.UserPrincipal;
+import org.apache.felix.karaf.jaas.modules.RolePrincipal;
+import org.apache.felix.karaf.jaas.modules.UserPrincipal;
/**
* JAAS Login module for user / password, based on two properties files.
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/servicemix-jaas-module.xml
index e8acabe..8187e2b 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/servicemix-jaas-module.xml
@@ -35,14 +35,14 @@
- on this service, which means any bundle could access all the passwords.
-->
<!--
- <bean id="configAdminHolder" class="org.apache.servicemix.kernel.jaas.modules.osgi.ConfigAdminHolder">
+ <bean id="configAdminHolder" class="org.apache.felix.karaf.jaas.modules.osgi.ConfigAdminHolder">
<property name="service" ref="configAdmin" />
</bean>
<osgi:reference id="configAdmin" interface="org.osgi.service.cm.ConfigurationAdmin" />
<jaas:config id="servicemix">
- <jaas:module className="org.apache.servicemix.kernel.jaas.modules.osgi.OsgiConfigLoginModule" flags="required">
+ <jaas:module className="org.apache.felix.karaf.jaas.modules.osgi.OsgiConfigLoginModule" flags="required">
pid = org.apache.servicemix.users
</jaas:module>
</jaas:config>
@@ -52,9 +52,9 @@
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />
<jaas:config id="servicemix">
- <jaas:module className="org.apache.servicemix.kernel.jaas.modules.properties.PropertiesLoginModule" flags="required">
+ <jaas:module className="org.apache.felix.karaf.jaas.modules.properties.PropertiesLoginModule" flags="required">
users = ${servicemix.base}/etc/users.properties
</jaas:module>
</jaas:config>
-</beans>
\ No newline at end of file
+</beans>