Upgrade Spring-LDAP to 1.2.1 version.
This commit is contained in:
parent
1bbe6ca456
commit
82cfa722be
|
@ -56,7 +56,7 @@
|
|||
<dependency>
|
||||
<groupId>org.springframework.ldap</groupId>
|
||||
<artifactId>spring-ldap</artifactId>
|
||||
<version>1.2.1-SNAPSHOT</version>
|
||||
<version>1.2.1</version>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
|
|
@ -12,7 +12,6 @@ import org.apache.commons.logging.Log;
|
|||
import org.apache.commons.logging.LogFactory;
|
||||
|
||||
import javax.naming.Context;
|
||||
import javax.naming.NamingException;
|
||||
import javax.naming.directory.DirContext;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Hashtable;
|
||||
|
@ -89,27 +88,6 @@ public class DefaultSpringSecurityContextSource extends LdapContextSource implem
|
|||
}
|
||||
}
|
||||
|
||||
/** Copied from parent <tt>AbstractContextSource</tt> as package private */
|
||||
DirContext createContext(Hashtable environment) {
|
||||
DirContext ctx = null;
|
||||
|
||||
try {
|
||||
ctx = getDirContextInstance(environment);
|
||||
|
||||
if (logger.isInfoEnabled()) {
|
||||
Hashtable ctxEnv = ctx.getEnvironment();
|
||||
String ldapUrl = (String) ctxEnv.get(Context.PROVIDER_URL);
|
||||
logger.debug("Got Ldap context on server '" + ldapUrl + "'");
|
||||
}
|
||||
|
||||
return ctx;
|
||||
}
|
||||
catch (NamingException e) {
|
||||
LdapUtils.closeContext(ctx);
|
||||
throw org.springframework.ldap.support.LdapUtils.convertLdapException(e);
|
||||
}
|
||||
}
|
||||
|
||||
public void setMessageSource(MessageSource messageSource) {
|
||||
this.messages = new MessageSourceAccessor(messageSource);
|
||||
}
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
<dependency>
|
||||
<groupId>org.springframework.ldap</groupId>
|
||||
<artifactId>spring-ldap</artifactId>
|
||||
<version>1.2.1-SNAPSHOT</version>
|
||||
<version>1.2.1</version>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
|
10
pom.xml
10
pom.xml
|
@ -73,7 +73,7 @@
|
|||
<url>${siteDirectory}</url>
|
||||
</site>
|
||||
</distributionManagement>
|
||||
|
||||
<!--
|
||||
<repositories>
|
||||
<repository>
|
||||
<id>acegisnapshots</id>
|
||||
|
@ -83,19 +83,13 @@
|
|||
<enabled>false</enabled>
|
||||
</releases>
|
||||
</repository>
|
||||
<!-- TODO: Added for spring-ldap-1.2.1-SNAPSHOT -->
|
||||
<repository>
|
||||
<id>acegirepo</id>
|
||||
<name>Acegi maven repository</name>
|
||||
<url>http://acegisecurity.sourceforge.net/maven</url>
|
||||
</repository>
|
||||
<repository>
|
||||
<id>spring-milestone</id>
|
||||
<name>Springframework Maven Milestone Repository</name>
|
||||
<url>http://s3.amazonaws.com/maven.springframework.org/milestone</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
|
||||
-->
|
||||
<mailingLists>
|
||||
<mailingList>
|
||||
<name>Acegi Developer List</name>
|
||||
|
|
|
@ -6,11 +6,13 @@
|
|||
#
|
||||
# 1. Do clean check out of source from svn and note revision number.
|
||||
# 2. Switch to 1.4 JVM and run 'mvn test' from core directory.
|
||||
# 3. Set the version number in the pom.xml files of all the module.
|
||||
# 3. Set the version number in the pom.xml files of all the modules.
|
||||
# 3a. If doing a release rather than snapshot build, run "find . -name pom.xml | xargs grep SNAPSHOT" and make sure
|
||||
# there are no important snapshot dependencies.
|
||||
# 3b. Set the same version number in this script.
|
||||
# 4. Set the correct spring version number in the pom.xml.
|
||||
# 4a. Make sure there are no snapshot dependencies in the release.
|
||||
# 4b. Remove any references to external maven repositories in the parent pom.xml (remove <repositories> element).
|
||||
# 5. Run this script to generate the artifacts and web site in the 'release' directory.
|
||||
# 6. Copy the archives and unpack them to check the contents.
|
||||
# 7. The archives are tar archives. Create zip versions from the contents and check the internal paths are Ok.
|
||||
|
@ -185,7 +187,7 @@ tar --exclude='*/.svn' -cjf $PROJECT_NAME-$RELEASE_VERSION-src.tar.bz2 notice.tx
|
|||
-C ${PROJ_DIR}/adapters/jboss/main/java org \
|
||||
-C ${PROJ_DIR}/adapters/resin/main/java org \
|
||||
-C ${PROJ_DIR}/adapters/cas/main/java org \
|
||||
-C ${PROJ_DIR}/adapters/catalina/main/java org
|
||||
-C ${PROJ_DIR}/adapters/catalina/main/java org
|
||||
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue