Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 18498 invoked from network); 20 Dec 2006 06:58:32 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 20 Dec 2006 06:58:32 -0000 Received: (qmail 41912 invoked by uid 500); 20 Dec 2006 06:58:39 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 41882 invoked by uid 500); 20 Dec 2006 06:58:39 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 41869 invoked by uid 99); 20 Dec 2006 06:58:39 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Dec 2006 22:58:39 -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 [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Dec 2006 22:58:30 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 542D31A981A; Tue, 19 Dec 2006 22:57:42 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r488934 - in /directory/trunks/triplesec: installers/pom.xml jaas/src/main/java/org/safehaus/triplesec/jaas/SafehausLoginModule.java swing-admin/src/main/manifest/MANIFEST.MF Date: Wed, 20 Dec 2006 06:57:42 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061220065742.542D31A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: akarasulu Date: Tue Dec 19 22:57:41 2006 New Revision: 488934 URL: http://svn.apache.org/viewvc?view=rev&rev=488934 Log: cleanup more deps, fixed bug in login module when using IBM jvm krb5 module with bad option, fixed old manifest file to have new jars on CP Modified: directory/trunks/triplesec/installers/pom.xml directory/trunks/triplesec/jaas/src/main/java/org/safehaus/triplesec/jaas/SafehausLoginModule.java directory/trunks/triplesec/swing-admin/src/main/manifest/MANIFEST.MF Modified: directory/trunks/triplesec/installers/pom.xml URL: http://svn.apache.org/viewvc/directory/trunks/triplesec/installers/pom.xml?view=diff&rev=488934&r1=488933&r2=488934 ============================================================================== --- directory/trunks/triplesec/installers/pom.xml (original) +++ directory/trunks/triplesec/installers/pom.xml Tue Dec 19 22:57:41 2006 @@ -127,11 +127,11 @@ commons-cli - springframework + org.springframework spring-core - springframework + org.springframework spring-beans @@ -139,7 +139,7 @@ commons-logging - springframework + org.springframework spring-context @@ -148,7 +148,6 @@ org.apache.directory.daemon daemon-plugin - 1.0-SNAPSHOT Modified: directory/trunks/triplesec/jaas/src/main/java/org/safehaus/triplesec/jaas/SafehausLoginModule.java URL: http://svn.apache.org/viewvc/directory/trunks/triplesec/jaas/src/main/java/org/safehaus/triplesec/jaas/SafehausLoginModule.java?view=diff&rev=488934&r1=488933&r2=488934 ============================================================================== --- directory/trunks/triplesec/jaas/src/main/java/org/safehaus/triplesec/jaas/SafehausLoginModule.java (original) +++ directory/trunks/triplesec/jaas/src/main/java/org/safehaus/triplesec/jaas/SafehausLoginModule.java Tue Dec 19 22:57:41 2006 @@ -20,6 +20,7 @@ package org.safehaus.triplesec.jaas; +import java.util.HashMap; import java.util.Hashtable; import java.util.Iterator; import java.util.Map; @@ -308,7 +309,13 @@ try { - module.initialize( subject, cbHandler, sharedState, options ); + Map krb5ModuleOptions = new HashMap( options ); + if ( krb5ModuleOptions.containsKey( ALLOW_ADMIN ) ) + { + krb5ModuleOptions.remove( ALLOW_ADMIN ); + } + + module.initialize( subject, cbHandler, sharedState, krb5ModuleOptions ); return module.login(); } catch ( LoginException le ) Modified: directory/trunks/triplesec/swing-admin/src/main/manifest/MANIFEST.MF URL: http://svn.apache.org/viewvc/directory/trunks/triplesec/swing-admin/src/main/manifest/MANIFEST.MF?view=diff&rev=488934&r1=488933&r2=488934 ============================================================================== --- directory/trunks/triplesec/swing-admin/src/main/manifest/MANIFEST.MF (original) +++ directory/trunks/triplesec/swing-admin/src/main/manifest/MANIFEST.MF Tue Dec 19 22:57:41 2006 @@ -1,47 +1,47 @@ Manifest-Version: 1.0 Main-Class: org.safehaus.triplesec.admin.swing.AdminFrame Class-Path: logger.jar daemon.jar bootstrapper.jar - ../lib/antlr-2.7.2.jar - ../lib/apacheds-core-1.0-RC3.jar - ../lib/apacheds-core-shared-1.0-RC3.jar - ../lib/apacheds-kerberos-shared-1.0-RC3.jar - ../lib/apacheds-protocol-changepw-1.0-RC3.jar - ../lib/apacheds-protocol-shared-1.0-RC3.jar - ../lib/apacheds-protocol-kerberos-1.0-RC3.jar - ../lib/apacheds-protocol-ldap-1.0-RC3.jar - ../lib/apacheds-protocol-ntp-1.0-RC3.jar - ../lib/apacheds-server-jndi-1.0-RC3.jar - ../lib/apacheds-server-main-1.0-RC3.jar - ../lib/tools/apacheds-server-tools-1.0-RC3.jar + ../lib/antlr-2.7.6.jar + ../lib/apacheds-core-1.0.0.jar + ../lib/apacheds-core-shared-1.0.0.jar + ../lib/apacheds-kerberos-shared-1.0.0.jar + ../lib/apacheds-protocol-changepw-1.0.0.jar + ../lib/apacheds-protocol-shared-1.0.0.jar + ../lib/apacheds-protocol-kerberos-1.0.0.jar + ../lib/apacheds-protocol-ldap-1.0.0.jar + ../lib/apacheds-protocol-ntp-1.0.0.jar + ../lib/apacheds-server-jndi-1.0.0.jar + ../lib/apacheds-server-main-1.0.0.jar + ../lib/tools/apacheds-server-tools-1.0.0.jar ../lib/tools/commons-cli-1.0.jar ../lib/commons-collections-3.1.jar - ../lib/commons-lang-2.0.jar + ../lib/commons-lang-2.1.jar ../lib/commons-logging-1.0.4.jar - ../lib/commons-httpclient-2.0.2.jar - ../lib/activation-1.0.2.jar - ../lib/mail-1.3.2.jar + ../lib/commons-httpclient-3.0.1.jar + ../lib/activation-1.1.jar + ../lib/mail-1.4.jar ../lib/jdbm-1.0.jar ../lib/lcrypto-jdk14-131.jar - ../lib/mina-core-0.9.4.jar - ../lib/mina-filter-codec-asn1-0.9.4.jar - ../lib/mina-filter-ssl-0.9.4.jar - ../lib/shared-asn1-0.9.5.1.jar - ../lib/shared-ldap-0.9.5.1.jar - ../lib/spring-beans-1.2.6.jar - ../lib/spring-context-1.2.6.jar - ../lib/spring-core-1.2.6.jar - ../guardian/triplesec-guardian-api-0.7.1.jar - ../guardian/triplesec-guardian-ldap-0.7.1.jar - ../guardian/triplesec-jaas-0.7.1.jar - ../lib/triplesec-crypto-0.7.1.jar - ../lib/triplesec-main-0.7.1.jar - ../lib/triplesec-otp-0.7.1.jar - ../lib/triplesec-profile-0.7.1.jar - ../lib/triplesec-store-0.7.1.jar - ../lib/triplesec-testdata-0.7.1.jar - ../lib/triplesec-verifier-0.7.1.jar - ../lib/triplesec-configuration-0.7.1.jar - ../lib/triplesec-admin-api-0.7.1.jar + ../lib/mina-core-1.0.0.jar + ../lib/shared-asn1-codec-0.9.5.3.jar + ../lib/mina-filter-ssl-1.0.0.jar + ../lib/shared-asn1-0.9.5.3.jar + ../lib/shared-ldap-0.9.5.3.jar + ../lib/spring-beans-1.2.8.jar + ../lib/spring-context-1.2.8.jar + ../lib/spring-core-1.2.8.jar + ../guardian/triplesec-guardian-api-1.0-SNAPSHOT.jar + ../guardian/triplesec-guardian-ldap-1.0-SNAPSHOT.jar + ../guardian/triplesec-jaas-1.0-SNAPSHOT.jar + ../lib/triplesec-crypto-1.0-SNAPSHOT.jar + ../lib/triplesec-main-1.0-SNAPSHOT.jar + ../lib/triplesec-otp-1.0-SNAPSHOT.jar + ../lib/triplesec-profile-1.0-SNAPSHOT.jar + ../lib/triplesec-store-1.0-SNAPSHOT.jar + ../lib/triplesec-testdata-1.0-SNAPSHOT.jar + ../lib/triplesec-verifier-1.0-SNAPSHOT.jar + ../lib/triplesec-configuration-1.0-SNAPSHOT.jar + ../lib/triplesec-admin-api-1.0-SNAPSHOT.jar Specification-Title: triplesec-swing-admin Specification-Version: 1.0