Author: chirino
Date: Wed Dec 28 09:35:25 2005
New Revision: 359571
URL: http://svn.apache.org/viewcvs?rev=359571&view=rev
Log:
Refactored package name org.activemq -> org.apache.activemq
Added:
incubator/activemq/trunk/activemq-jaas/src/main/java/org/apache/
incubator/activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/
incubator/activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/
- copied from r359554,
incubator/activemq/trunk/activemq-jaas/src/main/java/org/activemq/jaas/
incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/
incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/
incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/
incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/GroupPrincipalTest.java
- copied, changed from r359554,
incubator/activemq/trunk/activemq-jaas/src/test/java/org/activemq/jaas/GroupPrincipalTest.java
incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/LDAPLoginModuleTest.java
- copied, changed from r359554,
incubator/activemq/trunk/activemq-jaas/src/test/java/org/activemq/jaas/LDAPLoginModuleTest.java
incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/PropertiesLoginModuleTest.java
- copied, changed from r359554,
incubator/activemq/trunk/activemq-jaas/src/test/java/org/activemq/jaas/PropertiesLoginModuleTest.java
incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/UserPrincipalTest.java
- copied, changed from r359554,
incubator/activemq/trunk/activemq-jaas/src/test/java/org/activemq/jaas/UserPrincipalTest.java
incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/ldap/
- copied from r359554,
incubator/activemq/trunk/activemq-jaas/src/test/java/org/activemq/jaas/ldap/
Removed:
incubator/activemq/trunk/activemq-jaas/src/main/java/org/activemq/jaas/
incubator/activemq/trunk/activemq-jaas/src/test/java/org/activemq/jaas/GroupPrincipalTest.java
incubator/activemq/trunk/activemq-jaas/src/test/java/org/activemq/jaas/LDAPLoginModuleTest.java
incubator/activemq/trunk/activemq-jaas/src/test/java/org/activemq/jaas/PropertiesLoginModuleTest.java
incubator/activemq/trunk/activemq-jaas/src/test/java/org/activemq/jaas/UserPrincipalTest.java
incubator/activemq/trunk/activemq-jaas/src/test/java/org/activemq/jaas/ldap/
Modified:
incubator/activemq/trunk/activemq-jaas/login.config
incubator/activemq/trunk/activemq-jaas/project.xml
incubator/activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/GroupPrincipal.java
incubator/activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/LDAPLoginModule.java
incubator/activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/PropertiesLoginModule.java
incubator/activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/UserPrincipal.java
incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/ldap/MutableServerStartupConfiguration.java
incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/ldap/ServerContextFactory.java
incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/ldap/ServerStartupConfiguration.java
incubator/activemq/trunk/activemq-jaas/src/test/resources/login.config
Modified: incubator/activemq/trunk/activemq-jaas/login.config
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-jaas/login.config?rev=359571&r1=359570&r2=359571&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-jaas/login.config (original)
+++ incubator/activemq/trunk/activemq-jaas/login.config Wed Dec 28 09:35:25 2005
@@ -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";
};
Modified: incubator/activemq/trunk/activemq-jaas/project.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-jaas/project.xml?rev=359571&r1=359570&r2=359571&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-jaas/project.xml (original)
+++ incubator/activemq/trunk/activemq-jaas/project.xml Wed Dec 28 09:35:25 2005
@@ -27,11 +27,11 @@
<id>activemq-jaas</id>
<description>ActiveMQ is an open source message broker and JMS 1.1
provider</description>
<shortDescription>ActiveMQ JAAS Login Modules</shortDescription>
- <package>org.activemq.jaas</package>
+ <package>org.apache.activemq.jaas</package>
<packageGroups>
<packageGroup>
<title>Utilities</title>
- <packages>org.activemq.jaas.*</packages>
+ <packages>org.apache.activemq.jaas.*</packages>
</packageGroup>
</packageGroups>
Modified:
incubator/activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/GroupPrincipal.java
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/GroupPrincipal.java?rev=359571&r1=359554&r2=359571&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/GroupPrincipal.java
(original)
+++
incubator/activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/GroupPrincipal.java
Wed Dec 28 09:35:25 2005
@@ -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;
Modified:
incubator/activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/LDAPLoginModule.java
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/LDAPLoginModule.java?rev=359571&r1=359554&r2=359571&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/LDAPLoginModule.java
(original)
+++
incubator/activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/LDAPLoginModule.java
Wed Dec 28 09:35:25 2005
@@ -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;
Modified:
incubator/activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/PropertiesLoginModule.java
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/PropertiesLoginModule.java?rev=359571&r1=359554&r2=359571&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/PropertiesLoginModule.java
(original)
+++
incubator/activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/PropertiesLoginModule.java
Wed Dec 28 09:35:25 2005
@@ -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 @@
*/
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);
Modified:
incubator/activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/UserPrincipal.java
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/UserPrincipal.java?rev=359571&r1=359554&r2=359571&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/UserPrincipal.java
(original)
+++
incubator/activemq/trunk/activemq-jaas/src/main/java/org/apache/activemq/jaas/UserPrincipal.java
Wed Dec 28 09:35:25 2005
@@ -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;
Copied:
incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/GroupPrincipalTest.java
(from r359554,
incubator/activemq/trunk/activemq-jaas/src/test/java/org/activemq/jaas/GroupPrincipalTest.java)
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/GroupPrincipalTest.java?p2=incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/GroupPrincipalTest.java&p1=incubator/activemq/trunk/activemq-jaas/src/test/java/org/activemq/jaas/GroupPrincipalTest.java&r1=359554&r2=359571&rev=359571&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-jaas/src/test/java/org/activemq/jaas/GroupPrincipalTest.java
(original)
+++
incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/GroupPrincipalTest.java
Wed Dec 28 09:35:25 2005
@@ -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;
Copied:
incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/LDAPLoginModuleTest.java
(from r359554,
incubator/activemq/trunk/activemq-jaas/src/test/java/org/activemq/jaas/LDAPLoginModuleTest.java)
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/LDAPLoginModuleTest.java?p2=incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/LDAPLoginModuleTest.java&p1=incubator/activemq/trunk/activemq-jaas/src/test/java/org/activemq/jaas/LDAPLoginModuleTest.java&r1=359554&r2=359571&rev=359571&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-jaas/src/test/java/org/activemq/jaas/LDAPLoginModuleTest.java
(original)
+++
incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/LDAPLoginModuleTest.java
Wed Dec 28 09:35:25 2005
@@ -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.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;
/**
Copied:
incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/PropertiesLoginModuleTest.java
(from r359554,
incubator/activemq/trunk/activemq-jaas/src/test/java/org/activemq/jaas/PropertiesLoginModuleTest.java)
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/PropertiesLoginModuleTest.java?p2=incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/PropertiesLoginModuleTest.java&p1=incubator/activemq/trunk/activemq-jaas/src/test/java/org/activemq/jaas/PropertiesLoginModuleTest.java&r1=359554&r2=359571&rev=359571&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-jaas/src/test/java/org/activemq/jaas/PropertiesLoginModuleTest.java
(original)
+++
incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/PropertiesLoginModuleTest.java
Wed Dec 28 09:35:25 2005
@@ -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;
@@ -26,6 +26,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;
Copied:
incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/UserPrincipalTest.java
(from r359554,
incubator/activemq/trunk/activemq-jaas/src/test/java/org/activemq/jaas/UserPrincipalTest.java)
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/UserPrincipalTest.java?p2=incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/UserPrincipalTest.java&p1=incubator/activemq/trunk/activemq-jaas/src/test/java/org/activemq/jaas/UserPrincipalTest.java&r1=359554&r2=359571&rev=359571&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-jaas/src/test/java/org/activemq/jaas/UserPrincipalTest.java
(original)
+++
incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/UserPrincipalTest.java
Wed Dec 28 09:35:25 2005
@@ -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;
Modified:
incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/ldap/MutableServerStartupConfiguration.java
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/ldap/MutableServerStartupConfiguration.java?rev=359571&r1=359554&r2=359571&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/ldap/MutableServerStartupConfiguration.java
(original)
+++
incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/ldap/MutableServerStartupConfiguration.java
Wed Dec 28 09:35:25 2005
@@ -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;
Modified:
incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/ldap/ServerContextFactory.java
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/ldap/ServerContextFactory.java?rev=359571&r1=359554&r2=359571&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/ldap/ServerContextFactory.java
(original)
+++
incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/ldap/ServerContextFactory.java
Wed Dec 28 09:35:25 2005
@@ -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;
Modified:
incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/ldap/ServerStartupConfiguration.java
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/ldap/ServerStartupConfiguration.java?rev=359571&r1=359554&r2=359571&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/ldap/ServerStartupConfiguration.java
(original)
+++
incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/ldap/ServerStartupConfiguration.java
Wed Dec 28 09:35:25 2005
@@ -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;
Modified: incubator/activemq/trunk/activemq-jaas/src/test/resources/login.config
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-jaas/src/test/resources/login.config?rev=359571&r1=359570&r2=359571&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-jaas/src/test/resources/login.config
(original)
+++ incubator/activemq/trunk/activemq-jaas/src/test/resources/login.config Wed
Dec 28 09:35:25 2005
@@ -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";
