Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 37081 invoked from network); 12 Apr 2005 21:32:59 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 12 Apr 2005 21:32:59 -0000 Received: (qmail 48241 invoked by uid 500); 12 Apr 2005 21:32:58 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 48217 invoked by uid 500); 12 Apr 2005 21:32:58 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 48202 invoked by uid 99); 12 Apr 2005 21:32:58 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Tue, 12 Apr 2005 14:32:57 -0700 Received: (qmail 37069 invoked by uid 65534); 12 Apr 2005 21:32:56 -0000 Message-ID: <20050412213256.37067.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Tue, 12 Apr 2005 21:32:56 -0000 Subject: svn commit: r161124 - geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityServiceImpl.java To: scm@geronimo.apache.org From: adc@apache.org X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: adc Date: Tue Apr 12 14:32:56 2005 New Revision: 161124 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D161124 Log: Better logging. Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/S= ecurityServiceImpl.java Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/secu= rity/SecurityServiceImpl.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/java= /org/apache/geronimo/security/SecurityServiceImpl.java?view=3Ddiff&r1=3D161= 123&r2=3D161124 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/S= ecurityServiceImpl.java (original) +++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/S= ecurityServiceImpl.java Tue Apr 12 14:32:56 2005 @@ -42,8 +42,6 @@ =20 public static boolean POLICY_INSTALLED =3D false; =20 - private final ServerInfo serverInfo; - private final Log log =3D LogFactory.getLog(SecurityServiceImpl.class); =20 /** @@ -54,9 +52,8 @@ public SecurityServiceImpl(ClassLoader classLoader, ServerInfo serverI= nfo, String policyConfigurationFactory, String policyProvider, String keyStore, Str= ing keyStorePassword, String trustStore, String trustStorePasswor= d) - throws PolicyContextException, ClassNotFoundException, Illegal= AccessException, InstantiationException { - - this.serverInfo =3D serverInfo; + throws PolicyContextException, ClassNotFoundException, Illegal= AccessException, InstantiationException + { =20 /** * @see "JSR 115 4.6.1" Container Subject Policy Context Handler @@ -81,14 +78,16 @@ if (policyConfigurationFactory !=3D null) PolicyConfigurationFactory.getPolicyConfigurationFactory(); =20 - if (keyStore !=3D null) - keyStore =3D sysOverRide(serverInfo.resolvePath(keyStore), KEY= STORE); - sysOverRide(keyStorePassword, KEYSTORE_PASSWORD); - - if (trustStore !=3D null) - trustStore =3D sysOverRide(serverInfo.resolvePath(trustStore),= TRUSTSTORE); - sysOverRide(trustStore, TRUSTSTORE); - sysOverRide(trustStorePassword, TRUSTSTORE_PASSWORD); + if (keyStore !=3D null) sysOverRide(serverInfo.resolvePath(keyStor= e), KEYSTORE); + if (keyStorePassword !=3D null) sysOverRide(keyStorePassword, KEYS= TORE_PASSWORD); + + if (trustStore !=3D null) sysOverRide(serverInfo.resolvePath(trust= Store), TRUSTSTORE); + if (trustStorePassword !=3D null) sysOverRide(trustStorePassword, = TRUSTSTORE_PASSWORD); + + log.info(KEYSTORE + ": " + System.getProperty(KEYSTORE)); + log.info(KEYSTORE_PASSWORD + ": " + System.getProperty(KEYSTORE_PA= SSWORD)); + log.info(TRUSTSTORE + ": " + System.getProperty(TRUSTSTORE)); + log.info(TRUSTSTORE_PASSWORD + ": " + System.getProperty(TRUSTSTOR= E_PASSWORD)); =20 log.info("JACC factory registered"); }