You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/04/06 16:49:23 UTC

svn commit: r1310364 - in /archiva/redback/redback-core/trunk/redback-authentication: redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/ redback-authentication-providers/redback-authentication-ldap/src/main/java/org/co...

Author: olamy
Date: Fri Apr  6 14:49:22 2012
New Revision: 1310364

URL: http://svn.apache.org/viewvc?rev=1310364&view=rev
Log:
license headers fix

Removed:
    archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/org/codehaus/plexus/redback/authentication/ldap/LdapBindAuthenticatorTest.xml
Modified:
    archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/AuthenticationConstants.java
    archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/AuthenticationDataSource.java
    archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/AuthenticationException.java
    archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/AuthenticationManager.java
    archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/AuthenticationResult.java
    archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/Authenticator.java
    archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/DefaultAuthenticationManager.java
    archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/NotAuthenticatedException.java
    archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/PasswordBasedAuthenticationDataSource.java
    archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/TokenBasedAuthenticationDataSource.java
    archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/codehaus/plexus/redback/authentication/ldap/LdapBindAuthenticator.java
    archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/java/org/codehaus/plexus/redback/authentication/ldap/LdapBindAuthenticatorTest.java
    archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/security.properties

Modified: archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/AuthenticationConstants.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/AuthenticationConstants.java?rev=1310364&r1=1310363&r2=1310364&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/AuthenticationConstants.java (original)
+++ archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/AuthenticationConstants.java Fri Apr  6 14:49:22 2012
@@ -1,19 +1,22 @@
 package org.codehaus.plexus.redback.authentication;
 
 /*
- * Copyright 2001-2006 The Codehaus.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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
  *
- * 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
  *
- *      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.
+ * 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.
  */
 
 /**

Modified: archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/AuthenticationDataSource.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/AuthenticationDataSource.java?rev=1310364&r1=1310363&r2=1310364&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/AuthenticationDataSource.java (original)
+++ archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/AuthenticationDataSource.java Fri Apr  6 14:49:22 2012
@@ -1,34 +1,38 @@
 package org.codehaus.plexus.redback.authentication;
 
 /*
- * Copyright 2001-2006 The Codehaus.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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
  *
- * 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
  *
- *      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.
+ * 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.
  */
 
 /**
  * Just a tag to indicate that the implementing class is an AuthenticationDataSource.
- *
+ * <p/>
  * todo which this back to an interface and use the mojo style expression evaluation to populate the particular required fields
+ *
+ * @version $Id$
  * @see PasswordBasedAuthenticationDataSource
  * @see TokenBasedAuthenticationDataSource
- * @version $Id$
  */
 public interface AuthenticationDataSource
 {
     public String ROLE = AuthenticationDataSource.class.getName();
 
-    public String getPrincipal();
+    String getPrincipal();
 
-    public boolean isEnforcePasswordChange();
+    boolean isEnforcePasswordChange();
 }

Modified: archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/AuthenticationException.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/AuthenticationException.java?rev=1310364&r1=1310363&r2=1310364&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/AuthenticationException.java (original)
+++ archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/AuthenticationException.java Fri Apr  6 14:49:22 2012
@@ -1,21 +1,23 @@
 package org.codehaus.plexus.redback.authentication;
 
 /*
- * Copyright 2005 The Codehaus.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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
  *
- * 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
  *
- *      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.
+ * 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.
  */
-
 /**
  * AuthenticationException.java
  *

Modified: archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/AuthenticationManager.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/AuthenticationManager.java?rev=1310364&r1=1310363&r2=1310364&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/AuthenticationManager.java (original)
+++ archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/AuthenticationManager.java Fri Apr  6 14:49:22 2012
@@ -1,19 +1,22 @@
 package org.codehaus.plexus.redback.authentication;
 
 /*
- * Copyright 2005 The Codehaus.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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
  *
- * 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
  *
- *      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.
+ * 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.
  */
 
 import org.codehaus.plexus.redback.policy.AccountLockedException;

Modified: archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/AuthenticationResult.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/AuthenticationResult.java?rev=1310364&r1=1310363&r2=1310364&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/AuthenticationResult.java (original)
+++ archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/AuthenticationResult.java Fri Apr  6 14:49:22 2012
@@ -1,19 +1,22 @@
 package org.codehaus.plexus.redback.authentication;
 
 /*
- * Copyright 2005 The Codehaus.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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
  *
- * 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
  *
- *      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.
+ * 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.
  */
 
 import java.io.Serializable;

Modified: archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/Authenticator.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/Authenticator.java?rev=1310364&r1=1310363&r2=1310364&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/Authenticator.java (original)
+++ archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/Authenticator.java Fri Apr  6 14:49:22 2012
@@ -1,19 +1,22 @@
 package org.codehaus.plexus.redback.authentication;
 
 /*
- * Copyright 2005 The Codehaus.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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
  *
- * 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
  *
- *      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.
+ * 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.
  */
 
 import org.codehaus.plexus.redback.policy.AccountLockedException;

Modified: archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/DefaultAuthenticationManager.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/DefaultAuthenticationManager.java?rev=1310364&r1=1310363&r2=1310364&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/DefaultAuthenticationManager.java (original)
+++ archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/DefaultAuthenticationManager.java Fri Apr  6 14:49:22 2012
@@ -1,19 +1,22 @@
 package org.codehaus.plexus.redback.authentication;
 
 /*
- * Copyright 2005 The Codehaus.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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
  *
- * 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
  *
- *      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.
+ * 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.
  */
 
 import org.codehaus.plexus.redback.policy.AccountLockedException;

Modified: archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/NotAuthenticatedException.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/NotAuthenticatedException.java?rev=1310364&r1=1310363&r2=1310364&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/NotAuthenticatedException.java (original)
+++ archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/NotAuthenticatedException.java Fri Apr  6 14:49:22 2012
@@ -1,18 +1,22 @@
 package org.codehaus.plexus.redback.authentication;
+
 /*
- * Copyright 2005 The Codehaus.
- *
- * 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
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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
+ * 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.
+ * 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.
  */
 
 /**

Modified: archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/PasswordBasedAuthenticationDataSource.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/PasswordBasedAuthenticationDataSource.java?rev=1310364&r1=1310363&r2=1310364&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/PasswordBasedAuthenticationDataSource.java (original)
+++ archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/PasswordBasedAuthenticationDataSource.java Fri Apr  6 14:49:22 2012
@@ -1,19 +1,22 @@
 package org.codehaus.plexus.redback.authentication;
 
 /*
- * Copyright 2001-2006 The Codehaus.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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
  *
- * 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
  *
- *      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.
+ * 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.
  */
 
 import org.apache.commons.lang.StringUtils;

Modified: archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/TokenBasedAuthenticationDataSource.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/TokenBasedAuthenticationDataSource.java?rev=1310364&r1=1310363&r2=1310364&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/TokenBasedAuthenticationDataSource.java (original)
+++ archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/TokenBasedAuthenticationDataSource.java Fri Apr  6 14:49:22 2012
@@ -1,33 +1,36 @@
 package org.codehaus.plexus.redback.authentication;
 
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Service;
-
 /*
- * Copyright 2001-2006 The Codehaus.
- *
- * 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
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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
+ * 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.
+ * 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.
  */
 
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Service;
+
+
 /**
- * TokenBasedAuthenticationDataSource 
+ * TokenBasedAuthenticationDataSource
  *
  * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
  * @version $Id$
- * 
  */
-@Service("authenticationDataSource#token")
-@Scope("prototype")
+@Service( "authenticationDataSource#token" )
+@Scope( "prototype" )
 public class TokenBasedAuthenticationDataSource
     implements AuthenticationDataSource
 {
@@ -78,7 +81,7 @@ public class TokenBasedAuthenticationDat
 
     public void setEnforcePasswordChange( boolean enforcePasswordChange )
     {
-        this.enforcePasswordChange  = enforcePasswordChange;        
+        this.enforcePasswordChange = enforcePasswordChange;
     }
 
     public boolean isEnforcePasswordChange()

Modified: archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/codehaus/plexus/redback/authentication/ldap/LdapBindAuthenticator.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/codehaus/plexus/redback/authentication/ldap/LdapBindAuthenticator.java?rev=1310364&r1=1310363&r2=1310364&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/codehaus/plexus/redback/authentication/ldap/LdapBindAuthenticator.java (original)
+++ archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/codehaus/plexus/redback/authentication/ldap/LdapBindAuthenticator.java Fri Apr  6 14:49:22 2012
@@ -1,19 +1,22 @@
 package org.codehaus.plexus.redback.authentication.ldap;
 
 /*
- * Copyright 2005 The Codehaus.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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
  *
- * 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
  *
- *      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.
+ * 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.
  */
 
 import org.apache.commons.lang.StringUtils;

Modified: archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/java/org/codehaus/plexus/redback/authentication/ldap/LdapBindAuthenticatorTest.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/java/org/codehaus/plexus/redback/authentication/ldap/LdapBindAuthenticatorTest.java?rev=1310364&r1=1310363&r2=1310364&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/java/org/codehaus/plexus/redback/authentication/ldap/LdapBindAuthenticatorTest.java (original)
+++ archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/java/org/codehaus/plexus/redback/authentication/ldap/LdapBindAuthenticatorTest.java Fri Apr  6 14:49:22 2012
@@ -1,19 +1,22 @@
 package org.codehaus.plexus.redback.authentication.ldap;
 
 /*
- * Copyright 2001-2006 The Codehaus.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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
  *
- * 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
  *
- *      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.
+ * 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.
  */
 
 import junit.framework.TestCase;

Modified: archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/security.properties
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/security.properties?rev=1310364&r1=1310363&r2=1310364&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/security.properties (original)
+++ archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/security.properties Fri Apr  6 14:49:22 2012
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
 user.manager.impl=ldap
 ldap.bind.authenticator.enabled=true
 redback.default.admin=adminuser