From 00445993755087fc4e4442acb12e1715b9cde5f8 Mon Sep 17 00:00:00 2001 From: Ulrik Sandberg Date: Sun, 25 Feb 2007 17:49:14 +0000 Subject: [PATCH] Added copyright text. --- .../ldap/pool/DelegatingContext.java | 20 +++++++++---- .../ldap/pool/DelegatingDirContext.java | 16 +++++++++++ .../ldap/pool/DelegatingLdapContext.java | 16 +++++++++++ .../pool/DirContextPoolableObjectFactory.java | 16 +++++++++++ .../ldap/pool/DirContextType.java | 16 +++++++++++ .../ldap/pool/PoolingContextSource.java | 28 ++++++++++++++----- .../ldap/support/TlsContextSource.java | 16 +++++++++++ .../DefaultDirContextValidator.java | 16 +++++++++++ .../ldap/validation/DirContextValidator.java | 16 +++++++++++ 9 files changed, 148 insertions(+), 12 deletions(-) diff --git a/sandbox/src/main/java/org/springframework/ldap/pool/DelegatingContext.java b/sandbox/src/main/java/org/springframework/ldap/pool/DelegatingContext.java index ddfe5b33..b7bc09c5 100644 --- a/sandbox/src/main/java/org/springframework/ldap/pool/DelegatingContext.java +++ b/sandbox/src/main/java/org/springframework/ldap/pool/DelegatingContext.java @@ -1,7 +1,19 @@ -/* Copyright 2007 The JA-SIG Collaborative. All rights reserved. - * See license distributed with this file and - * available online at http://www.uportal.org/license.html +/* + * Copyright 2002-2005 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + package org.springframework.ldap.pool; import java.util.Hashtable; @@ -15,10 +27,8 @@ import javax.naming.NamingException; import org.apache.commons.lang.Validate; import org.apache.commons.pool.KeyedObjectPool; - /** * @author Eric Dalquist eric.dalquist@doit.wisc.edu - * @version $Revision: 1.2 $ */ class DelegatingContext implements Context { private KeyedObjectPool keyedObjectPool; diff --git a/sandbox/src/main/java/org/springframework/ldap/pool/DelegatingDirContext.java b/sandbox/src/main/java/org/springframework/ldap/pool/DelegatingDirContext.java index ca4af5b4..08e2486f 100644 --- a/sandbox/src/main/java/org/springframework/ldap/pool/DelegatingDirContext.java +++ b/sandbox/src/main/java/org/springframework/ldap/pool/DelegatingDirContext.java @@ -1,3 +1,19 @@ +/* + * Copyright 2002-2005 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.springframework.ldap.pool; import javax.naming.Context; diff --git a/sandbox/src/main/java/org/springframework/ldap/pool/DelegatingLdapContext.java b/sandbox/src/main/java/org/springframework/ldap/pool/DelegatingLdapContext.java index 3bb1688c..33f30162 100644 --- a/sandbox/src/main/java/org/springframework/ldap/pool/DelegatingLdapContext.java +++ b/sandbox/src/main/java/org/springframework/ldap/pool/DelegatingLdapContext.java @@ -1,3 +1,19 @@ +/* + * Copyright 2002-2005 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.springframework.ldap.pool; import javax.naming.NamingException; diff --git a/sandbox/src/main/java/org/springframework/ldap/pool/DirContextPoolableObjectFactory.java b/sandbox/src/main/java/org/springframework/ldap/pool/DirContextPoolableObjectFactory.java index 3efe2be8..74e6b8bf 100644 --- a/sandbox/src/main/java/org/springframework/ldap/pool/DirContextPoolableObjectFactory.java +++ b/sandbox/src/main/java/org/springframework/ldap/pool/DirContextPoolableObjectFactory.java @@ -1,3 +1,19 @@ +/* + * Copyright 2002-2005 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.springframework.ldap.pool; import javax.naming.directory.DirContext; diff --git a/sandbox/src/main/java/org/springframework/ldap/pool/DirContextType.java b/sandbox/src/main/java/org/springframework/ldap/pool/DirContextType.java index 7fcf242d..c4884b6b 100644 --- a/sandbox/src/main/java/org/springframework/ldap/pool/DirContextType.java +++ b/sandbox/src/main/java/org/springframework/ldap/pool/DirContextType.java @@ -1,3 +1,19 @@ +/* + * Copyright 2002-2005 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.springframework.ldap.pool; import javax.naming.directory.DirContext; diff --git a/sandbox/src/main/java/org/springframework/ldap/pool/PoolingContextSource.java b/sandbox/src/main/java/org/springframework/ldap/pool/PoolingContextSource.java index 98cee683..b3a333ef 100644 --- a/sandbox/src/main/java/org/springframework/ldap/pool/PoolingContextSource.java +++ b/sandbox/src/main/java/org/springframework/ldap/pool/PoolingContextSource.java @@ -1,7 +1,18 @@ -/* Copyright 2007 The JA-SIG Collaborative. All rights reserved. -* See license distributed with this file and -* available online at http://www.uportal.org/license.html -*/ +/* + * Copyright 2002-2005 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.ldap.pool; @@ -129,7 +140,6 @@ import org.springframework.ldap.validation.DirContextValidator; * * * @author Eric Dalquist eric.dalquist@doit.wisc.edu - * @version $Revision: 1.3 $ */ public class PoolingContextSource implements ContextSource { protected final Log logger = LogFactory.getLog(this.getClass()); @@ -139,6 +149,10 @@ public class PoolingContextSource implements ContextSource { public static final class WhenExhaustedAction { + static { + values = new HashMap(); + } + /** * A "when exhausted action" type indicating that when the pool is * exhausted (i.e., the maximum number of active objects has @@ -164,12 +178,12 @@ public class PoolingContextSource implements ContextSource { */ public static final WhenExhaustedAction GROW = new WhenExhaustedAction("GROW", GenericKeyedObjectPool.WHEN_EXHAUSTED_GROW); + private static Map values; + private final byte commonsPoolId; private final String name; - private static Map values = new HashMap(); - private WhenExhaustedAction(String name, byte id) { this.name = name; this.commonsPoolId = id; diff --git a/sandbox/src/main/java/org/springframework/ldap/support/TlsContextSource.java b/sandbox/src/main/java/org/springframework/ldap/support/TlsContextSource.java index a16e196a..92c6bd46 100644 --- a/sandbox/src/main/java/org/springframework/ldap/support/TlsContextSource.java +++ b/sandbox/src/main/java/org/springframework/ldap/support/TlsContextSource.java @@ -1,3 +1,19 @@ +/* + * Copyright 2002-2005 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.springframework.ldap.support; import java.io.IOException; diff --git a/sandbox/src/main/java/org/springframework/ldap/validation/DefaultDirContextValidator.java b/sandbox/src/main/java/org/springframework/ldap/validation/DefaultDirContextValidator.java index b74e7b53..1a5a2db2 100644 --- a/sandbox/src/main/java/org/springframework/ldap/validation/DefaultDirContextValidator.java +++ b/sandbox/src/main/java/org/springframework/ldap/validation/DefaultDirContextValidator.java @@ -1,3 +1,19 @@ +/* + * Copyright 2002-2005 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.springframework.ldap.validation; import javax.naming.NamingEnumeration; diff --git a/sandbox/src/main/java/org/springframework/ldap/validation/DirContextValidator.java b/sandbox/src/main/java/org/springframework/ldap/validation/DirContextValidator.java index e7cf2884..1129068d 100644 --- a/sandbox/src/main/java/org/springframework/ldap/validation/DirContextValidator.java +++ b/sandbox/src/main/java/org/springframework/ldap/validation/DirContextValidator.java @@ -1,3 +1,19 @@ +/* + * Copyright 2002-2005 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.springframework.ldap.validation; import javax.naming.directory.DirContext;