Return-Path: 
 <activemq-commits-return-1185-apmail-geronimo-activemq-commits-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-activemq-commits-archive@www.apache.org
Received: (qmail 8102 invoked from network); 15 Mar 2006 15:12:15 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 15 Mar 2006 15:12:15 -0000
Received: (qmail 35013 invoked by uid 500); 15 Mar 2006 15:12:15 -0000
Delivered-To: apmail-geronimo-activemq-commits-archive@geronimo.apache.org
Received: (qmail 34987 invoked by uid 500); 15 Mar 2006 15:12:14 -0000
Mailing-List: contact activemq-commits-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:activemq-commits-help@geronimo.apache.org>
List-Unsubscribe: <mailto:activemq-commits-unsubscribe@geronimo.apache.org>
List-Post: <mailto:activemq-commits@geronimo.apache.org>
List-Id: <activemq-commits.geronimo.apache.org>
Reply-To: activemq-dev@geronimo.apache.org
Delivered-To: mailing list activemq-commits@geronimo.apache.org
Received: (qmail 34978 invoked by uid 99); 15 Mar 2006 15:12:14 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Mar 2006 07:12:14 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Wed, 15 Mar 2006 07:12:14 -0800
Received: (qmail 7459 invoked by uid 65534); 15 Mar 2006 15:11:53 -0000
Message-ID: <20060315151153.7456.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r386090 - in /incubator/activemq/trunk/activemq-jaas:
 pom.xml
 src/test/java/org/apache/activemq/jaas/PropertiesLoginModuleTest.java
Date: Wed, 15 Mar 2006 15:11:51 -0000
To: activemq-commits@geronimo.apache.org
From: chirino@apache.org
X-Mailer: svnmailer-1.0.7
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: chirino
Date: Wed Mar 15 07:11:48 2006
New Revision: 386090

URL: http://svn.apache.org/viewcvs?rev=386090&view=rev
Log:
The testcase now sets the system properties so that they don't need to be set by maven

Modified:
    incubator/activemq/trunk/activemq-jaas/pom.xml
    incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/PropertiesLoginModuleTest.java

Modified: incubator/activemq/trunk/activemq-jaas/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-jaas/pom.xml?rev=386090&r1=386089&r2=386090&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-jaas/pom.xml (original)
+++ incubator/activemq/trunk/activemq-jaas/pom.xml Wed Mar 15 07:11:48 2006
@@ -43,12 +43,6 @@
           <includes>
             <include implementation="java.lang.String">**/*Test.*</include>
           </includes>
-          <systemProperties>
-            <property>
-              <name>java.security.auth.login.config</name>
-              <value>${basedir}/src/test/resources/login.config</value>
-            </property>
-          </systemProperties>
         </configuration>
       </plugin>
 

Modified: incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/PropertiesLoginModuleTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/PropertiesLoginModuleTest.java?rev=386090&r1=386089&r2=386090&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/PropertiesLoginModuleTest.java (original)
+++ incubator/activemq/trunk/activemq-jaas/src/test/java/org/apache/activemq/jaas/PropertiesLoginModuleTest.java Wed Mar 15 07:11:48 2006
@@ -17,6 +17,8 @@
 package org.apache.activemq.jaas;
 
 import java.io.IOException;
+import java.net.URL;
+
 import javax.security.auth.Subject;
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.CallbackHandler;
@@ -27,9 +29,6 @@
 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;
 
 
@@ -37,6 +36,18 @@
  * @version $Rev: $ $Date: $
  */
 public class PropertiesLoginModuleTest extends TestCase {
+    
+    static {
+        String path = System.getProperty("java.security.auth.login.config");
+        if (path == null) {
+            URL resource = PropertiesLoginModuleTest.class.getClassLoader().getResource("login.config");
+            if (resource != null) {
+                path = resource.getFile();
+                System.setProperty("java.security.auth.login.config", path);
+            }
+        }
+        System.out.println("Path to login config: " + path);
+    }
 
     public void testLogin() throws LoginException {
         LoginContext context = new LoginContext("PropertiesLogin", new CallbackHandler() {