From 2d0361bd2bddfd92a18cb120bd5657343f96bfe3 Mon Sep 17 00:00:00 2001 From: "Hiram R. Chirino" Date: Wed, 28 Dec 2005 17:35:25 +0000 Subject: [PATCH] Refactored package name org.activemq -> org.apache.activemq git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@359571 13f79535-47bb-0310-9956-ffa450edef68 --- activemq-jaas/login.config | 6 +++--- activemq-jaas/project.xml | 4 ++-- .../org/{ => apache}/activemq/jaas/GroupPrincipal.java | 2 +- .../org/{ => apache}/activemq/jaas/LDAPLoginModule.java | 2 +- .../{ => apache}/activemq/jaas/PropertiesLoginModule.java | 6 +++--- .../org/{ => apache}/activemq/jaas/UserPrincipal.java | 2 +- .../{ => apache}/activemq/jaas/GroupPrincipalTest.java | 4 +++- .../{ => apache}/activemq/jaas/LDAPLoginModuleTest.java | 7 ++++--- .../activemq/jaas/PropertiesLoginModuleTest.java | 5 ++++- .../org/{ => apache}/activemq/jaas/UserPrincipalTest.java | 4 +++- .../jaas/ldap/MutableServerStartupConfiguration.java | 2 +- .../activemq/jaas/ldap/ServerContextFactory.java | 2 +- .../activemq/jaas/ldap/ServerStartupConfiguration.java | 2 +- activemq-jaas/src/test/resources/login.config | 8 ++++---- 14 files changed, 32 insertions(+), 24 deletions(-) rename activemq-jaas/src/main/java/org/{ => apache}/activemq/jaas/GroupPrincipal.java (94%) rename activemq-jaas/src/main/java/org/{ => apache}/activemq/jaas/LDAPLoginModule.java (97%) rename activemq-jaas/src/main/java/org/{ => apache}/activemq/jaas/PropertiesLoginModule.java (93%) rename activemq-jaas/src/main/java/org/{ => apache}/activemq/jaas/UserPrincipal.java (94%) rename activemq-jaas/src/test/java/org/{ => apache}/activemq/jaas/GroupPrincipalTest.java (92%) rename activemq-jaas/src/test/java/org/{ => apache}/activemq/jaas/LDAPLoginModuleTest.java (94%) rename activemq-jaas/src/test/java/org/{ => apache}/activemq/jaas/PropertiesLoginModuleTest.java (94%) rename activemq-jaas/src/test/java/org/{ => apache}/activemq/jaas/UserPrincipalTest.java (92%) rename activemq-jaas/src/test/java/org/{ => apache}/activemq/jaas/ldap/MutableServerStartupConfiguration.java (95%) rename activemq-jaas/src/test/java/org/{ => apache}/activemq/jaas/ldap/ServerContextFactory.java (97%) rename activemq-jaas/src/test/java/org/{ => apache}/activemq/jaas/ldap/ServerStartupConfiguration.java (95%) diff --git a/activemq-jaas/login.config b/activemq-jaas/login.config index cf0afa294f..3a27ec80f4 100644 --- a/activemq-jaas/login.config +++ b/activemq-jaas/login.config @@ -1,6 +1,6 @@ testLogin { - org.activemq.jaas.PropertiesLoginModule required + org.apache.activemq.jaas.PropertiesLoginModule required debug=true - org.activemq.jaas.properties.user="src/test/resources/users.properties" - org.activemq.jaas.properties.group="src/test/resources/groups.properties"; + org.apache.activemq.jaas.properties.user="src/test/resources/users.properties" + org.apache.activemq.jaas.properties.group="src/test/resources/groups.properties"; }; \ No newline at end of file diff --git a/activemq-jaas/project.xml b/activemq-jaas/project.xml index ca7e07cff5..a346f4df98 100644 --- a/activemq-jaas/project.xml +++ b/activemq-jaas/project.xml @@ -27,11 +27,11 @@ activemq-jaas ActiveMQ is an open source message broker and JMS 1.1 provider ActiveMQ JAAS Login Modules - org.activemq.jaas + org.apache.activemq.jaas Utilities - org.activemq.jaas.* + org.apache.activemq.jaas.* diff --git a/activemq-jaas/src/main/java/org/activemq/jaas/GroupPrincipal.java b/activemq-jaas/src/main/java/org/apache/activemq/jaas/GroupPrincipal.java similarity index 94% rename from activemq-jaas/src/main/java/org/activemq/jaas/GroupPrincipal.java rename to activemq-jaas/src/main/java/org/apache/activemq/jaas/GroupPrincipal.java index c142384a30..99af27302a 100644 --- a/activemq-jaas/src/main/java/org/activemq/jaas/GroupPrincipal.java +++ b/activemq-jaas/src/main/java/org/apache/activemq/jaas/GroupPrincipal.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.jaas; +package org.apache.activemq.jaas; import java.security.Principal; diff --git a/activemq-jaas/src/main/java/org/activemq/jaas/LDAPLoginModule.java b/activemq-jaas/src/main/java/org/apache/activemq/jaas/LDAPLoginModule.java similarity index 97% rename from activemq-jaas/src/main/java/org/activemq/jaas/LDAPLoginModule.java rename to activemq-jaas/src/main/java/org/apache/activemq/jaas/LDAPLoginModule.java index c5f175c86b..52a1358f39 100644 --- a/activemq-jaas/src/main/java/org/activemq/jaas/LDAPLoginModule.java +++ b/activemq-jaas/src/main/java/org/apache/activemq/jaas/LDAPLoginModule.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.jaas; +package org.apache.activemq.jaas; import java.io.IOException; import java.text.MessageFormat; diff --git a/activemq-jaas/src/main/java/org/activemq/jaas/PropertiesLoginModule.java b/activemq-jaas/src/main/java/org/apache/activemq/jaas/PropertiesLoginModule.java similarity index 93% rename from activemq-jaas/src/main/java/org/activemq/jaas/PropertiesLoginModule.java rename to activemq-jaas/src/main/java/org/apache/activemq/jaas/PropertiesLoginModule.java index 6cbda8bfcb..9e1c775eb3 100644 --- a/activemq-jaas/src/main/java/org/activemq/jaas/PropertiesLoginModule.java +++ b/activemq-jaas/src/main/java/org/apache/activemq/jaas/PropertiesLoginModule.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.jaas; +package org.apache.activemq.jaas; import java.io.File; import java.io.IOException; @@ -43,8 +43,8 @@ import org.apache.commons.logging.LogFactory; */ public class PropertiesLoginModule implements LoginModule { - private final String USER_FILE = "org.activemq.jaas.properties.user"; - private final String GROUP_FILE = "org.activemq.jaas.properties.group"; + private final String USER_FILE = "org.apache.activemq.jaas.properties.user"; + private final String GROUP_FILE = "org.apache.activemq.jaas.properties.group"; private static final Log log = LogFactory.getLog(PropertiesLoginModule.class); diff --git a/activemq-jaas/src/main/java/org/activemq/jaas/UserPrincipal.java b/activemq-jaas/src/main/java/org/apache/activemq/jaas/UserPrincipal.java similarity index 94% rename from activemq-jaas/src/main/java/org/activemq/jaas/UserPrincipal.java rename to activemq-jaas/src/main/java/org/apache/activemq/jaas/UserPrincipal.java index e97e1cc170..e27380368f 100644 --- a/activemq-jaas/src/main/java/org/activemq/jaas/UserPrincipal.java +++ b/activemq-jaas/src/main/java/org/apache/activemq/jaas/UserPrincipal.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.jaas; +package org.apache.activemq.jaas; import java.security.Principal; diff --git a/activemq-jaas/src/test/java/org/activemq/jaas/GroupPrincipalTest.java b/activemq-jaas/src/test/java/org/apache/activemq/jaas/GroupPrincipalTest.java similarity index 92% rename from activemq-jaas/src/test/java/org/activemq/jaas/GroupPrincipalTest.java rename to activemq-jaas/src/test/java/org/apache/activemq/jaas/GroupPrincipalTest.java index bdd9cabe1d..fa147ed34d 100644 --- a/activemq-jaas/src/test/java/org/activemq/jaas/GroupPrincipalTest.java +++ b/activemq-jaas/src/test/java/org/apache/activemq/jaas/GroupPrincipalTest.java @@ -14,7 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.jaas; +package org.apache.activemq.jaas; + +import org.apache.activemq.jaas.GroupPrincipal; import junit.framework.TestCase; diff --git a/activemq-jaas/src/test/java/org/activemq/jaas/LDAPLoginModuleTest.java b/activemq-jaas/src/test/java/org/apache/activemq/jaas/LDAPLoginModuleTest.java similarity index 94% rename from activemq-jaas/src/test/java/org/activemq/jaas/LDAPLoginModuleTest.java rename to activemq-jaas/src/test/java/org/apache/activemq/jaas/LDAPLoginModuleTest.java index 7eb5cedb17..fd86690e9f 100644 --- a/activemq-jaas/src/test/java/org/activemq/jaas/LDAPLoginModuleTest.java +++ b/activemq-jaas/src/test/java/org/apache/activemq/jaas/LDAPLoginModuleTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.jaas; +package org.apache.activemq.jaas; import java.io.File; import java.io.IOException; @@ -36,11 +36,12 @@ import javax.security.auth.login.LoginContext; import javax.security.auth.login.LoginException; import junit.framework.TestCase; + +import org.apache.activemq.jaas.ldap.MutableServerStartupConfiguration; +import org.apache.activemq.jaas.ldap.ServerContextFactory; import org.apache.ldap.server.configuration.ShutdownConfiguration; import org.apache.ldap.server.jndi.CoreContextFactory; -import org.activemq.jaas.ldap.MutableServerStartupConfiguration; -import org.activemq.jaas.ldap.ServerContextFactory; /** diff --git a/activemq-jaas/src/test/java/org/activemq/jaas/PropertiesLoginModuleTest.java b/activemq-jaas/src/test/java/org/apache/activemq/jaas/PropertiesLoginModuleTest.java similarity index 94% rename from activemq-jaas/src/test/java/org/activemq/jaas/PropertiesLoginModuleTest.java rename to activemq-jaas/src/test/java/org/apache/activemq/jaas/PropertiesLoginModuleTest.java index c8a79825a6..3d6c522019 100644 --- a/activemq-jaas/src/test/java/org/activemq/jaas/PropertiesLoginModuleTest.java +++ b/activemq-jaas/src/test/java/org/apache/activemq/jaas/PropertiesLoginModuleTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.jaas; +package org.apache.activemq.jaas; import java.io.IOException; import javax.security.auth.Subject; @@ -27,6 +27,9 @@ import javax.security.auth.login.FailedLoginException; import javax.security.auth.login.LoginContext; import javax.security.auth.login.LoginException; +import org.apache.activemq.jaas.GroupPrincipal; +import org.apache.activemq.jaas.UserPrincipal; + import junit.framework.TestCase; diff --git a/activemq-jaas/src/test/java/org/activemq/jaas/UserPrincipalTest.java b/activemq-jaas/src/test/java/org/apache/activemq/jaas/UserPrincipalTest.java similarity index 92% rename from activemq-jaas/src/test/java/org/activemq/jaas/UserPrincipalTest.java rename to activemq-jaas/src/test/java/org/apache/activemq/jaas/UserPrincipalTest.java index 9de6890c28..595f3305fc 100644 --- a/activemq-jaas/src/test/java/org/activemq/jaas/UserPrincipalTest.java +++ b/activemq-jaas/src/test/java/org/apache/activemq/jaas/UserPrincipalTest.java @@ -14,7 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.jaas; +package org.apache.activemq.jaas; + +import org.apache.activemq.jaas.UserPrincipal; import junit.framework.TestCase; diff --git a/activemq-jaas/src/test/java/org/activemq/jaas/ldap/MutableServerStartupConfiguration.java b/activemq-jaas/src/test/java/org/apache/activemq/jaas/ldap/MutableServerStartupConfiguration.java similarity index 95% rename from activemq-jaas/src/test/java/org/activemq/jaas/ldap/MutableServerStartupConfiguration.java rename to activemq-jaas/src/test/java/org/apache/activemq/jaas/ldap/MutableServerStartupConfiguration.java index 2676beab56..edd9ac8e28 100644 --- a/activemq-jaas/src/test/java/org/activemq/jaas/ldap/MutableServerStartupConfiguration.java +++ b/activemq-jaas/src/test/java/org/apache/activemq/jaas/ldap/MutableServerStartupConfiguration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.jaas.ldap; +package org.apache.activemq.jaas.ldap; import java.io.File; import java.net.InetAddress; diff --git a/activemq-jaas/src/test/java/org/activemq/jaas/ldap/ServerContextFactory.java b/activemq-jaas/src/test/java/org/apache/activemq/jaas/ldap/ServerContextFactory.java similarity index 97% rename from activemq-jaas/src/test/java/org/activemq/jaas/ldap/ServerContextFactory.java rename to activemq-jaas/src/test/java/org/apache/activemq/jaas/ldap/ServerContextFactory.java index bd129fcb81..6a2524e550 100644 --- a/activemq-jaas/src/test/java/org/activemq/jaas/ldap/ServerContextFactory.java +++ b/activemq-jaas/src/test/java/org/apache/activemq/jaas/ldap/ServerContextFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.jaas.ldap; +package org.apache.activemq.jaas.ldap; import java.io.IOException; import java.net.InetAddress; diff --git a/activemq-jaas/src/test/java/org/activemq/jaas/ldap/ServerStartupConfiguration.java b/activemq-jaas/src/test/java/org/apache/activemq/jaas/ldap/ServerStartupConfiguration.java similarity index 95% rename from activemq-jaas/src/test/java/org/activemq/jaas/ldap/ServerStartupConfiguration.java rename to activemq-jaas/src/test/java/org/apache/activemq/jaas/ldap/ServerStartupConfiguration.java index 6f6f504205..64aefe0ae0 100644 --- a/activemq-jaas/src/test/java/org/activemq/jaas/ldap/ServerStartupConfiguration.java +++ b/activemq-jaas/src/test/java/org/apache/activemq/jaas/ldap/ServerStartupConfiguration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.jaas.ldap; +package org.apache.activemq.jaas.ldap; import java.net.InetAddress; diff --git a/activemq-jaas/src/test/resources/login.config b/activemq-jaas/src/test/resources/login.config index 5c5d849329..e14f5533fa 100644 --- a/activemq-jaas/src/test/resources/login.config +++ b/activemq-jaas/src/test/resources/login.config @@ -1,12 +1,12 @@ PropertiesLogin { - org.activemq.jaas.PropertiesLoginModule required + org.apache.activemq.jaas.PropertiesLoginModule required debug=true - org.activemq.jaas.properties.user="users.properties" - org.activemq.jaas.properties.group="groups.properties"; + org.apache.activemq.jaas.properties.user="users.properties" + org.apache.activemq.jaas.properties.group="groups.properties"; }; LDAPLogin { - org.activemq.jaas.LDAPLoginModule required + org.apache.activemq.jaas.LDAPLoginModule required debug=true initialContextFactory=com.sun.jndi.ldap.LdapCtxFactory connectionURL="ldap://localhost:9389"