You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2006/12/20 07:57:42 UTC
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
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 @@
<artifactId>commons-cli</artifactId>
</dependency>
<dependency>
- <groupId>springframework</groupId>
+ <groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</dependency>
<dependency>
- <groupId>springframework</groupId>
+ <groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
</dependency>
<dependency>
@@ -139,7 +139,7 @@
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
- <groupId>springframework</groupId>
+ <groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</dependency>
</dependencies>
@@ -148,7 +148,6 @@
<plugin>
<groupId>org.apache.directory.daemon</groupId>
<artifactId>daemon-plugin</artifactId>
- <version>1.0-SNAPSHOT</version>
<configuration>
<excludes>
<exclude>
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