You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by jb...@apache.org on 2006/02/23 15:46:38 UTC
svn commit: r380132 [1/2] - in
/cocoon/blocks/naming/trunk/java/org/apache/cocoon:
components/naming/EntryManager.java components/naming/LDAPEntryManager.java
transformation/LDAPTransformer.java
Author: jbq
Date: Thu Feb 23 06:46:27 2006
New Revision: 380132
URL: http://svn.apache.org/viewcvs?rev=380132&view=rev
Log:
Keep in sync with branch 2.1
Modified:
cocoon/blocks/naming/trunk/java/org/apache/cocoon/components/naming/EntryManager.java
cocoon/blocks/naming/trunk/java/org/apache/cocoon/components/naming/LDAPEntryManager.java
cocoon/blocks/naming/trunk/java/org/apache/cocoon/transformation/LDAPTransformer.java
Modified: cocoon/blocks/naming/trunk/java/org/apache/cocoon/components/naming/EntryManager.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/naming/trunk/java/org/apache/cocoon/components/naming/EntryManager.java?rev=380132&r1=380131&r2=380132&view=diff
==============================================================================
--- cocoon/blocks/naming/trunk/java/org/apache/cocoon/components/naming/EntryManager.java (original)
+++ cocoon/blocks/naming/trunk/java/org/apache/cocoon/components/naming/EntryManager.java Thu Feb 23 06:46:27 2006
@@ -1,3 +1,19 @@
+/*
+* Copyright 2005 The Apache Software Foundation or its licensors,
+* as applicable.
+*
+* 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.apache.cocoon.components.naming;
import java.util.Map;
@@ -14,7 +30,6 @@
*/
public interface EntryManager {
-
String ROLE = EntryManager.class.getName();
int ADD_ATTRIBUTE = DirContext.ADD_ATTRIBUTE;
Modified: cocoon/blocks/naming/trunk/java/org/apache/cocoon/components/naming/LDAPEntryManager.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/naming/trunk/java/org/apache/cocoon/components/naming/LDAPEntryManager.java?rev=380132&r1=380131&r2=380132&view=diff
==============================================================================
--- cocoon/blocks/naming/trunk/java/org/apache/cocoon/components/naming/LDAPEntryManager.java (original)
+++ cocoon/blocks/naming/trunk/java/org/apache/cocoon/components/naming/LDAPEntryManager.java Thu Feb 23 06:46:27 2006
@@ -1,3 +1,19 @@
+/*
+* Copyright 2005 The Apache Software Foundation or its licensors,
+* as applicable.
+*
+* 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.apache.cocoon.components.naming;
import java.util.HashMap;
@@ -272,16 +288,16 @@
*/
private Attributes map2Attributes (Map map) {
Attributes attrs = new BasicAttributes (false);
- Iterator keys = map.keySet ().iterator ();
- while (keys.hasNext ()) {
- String key = (String)keys.next ();
- Iterator vals = ((List)map.get (key)).iterator ();
- Attribute attr = new BasicAttribute (key);
- while (vals.hasNext ()) {
- attr.add (vals.next ());
- }
- attrs.put (attr);
- }
+ Iterator keys = map.keySet ().iterator ();
+ while (keys.hasNext ()) {
+ String key = (String)keys.next ();
+ Iterator vals = ((List)map.get (key)).iterator ();
+ Attribute attr = new BasicAttribute (key);
+ while (vals.hasNext ()) {
+ attr.add (vals.next ());
+ }
+ attrs.put (attr);
+ }
return attrs;
}