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 2004/09/28 02:38:48 UTC
svn commit: rev 47355 - in incubator/directory/eve/trunk/backend/api: . src/java/org/apache/eve/schema
Author: akarasulu
Date: Mon Sep 27 17:38:47 2004
New Revision: 47355
Modified:
incubator/directory/eve/trunk/backend/api/project.xml
incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/ComparatorRegistry.java
incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/ComparatorRegistryMonitor.java
incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/ComparatorRegistryMonitorAdapter.java
incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/MatchingRuleRegistry.java
incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/MatchingRuleRegistryMonitor.java
incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/MatchingRuleRegistryMonitorAdapter.java
incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/NormalizerRegistry.java
incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/NormalizerRegistryMonitor.java
incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/NormalizerRegistryMonitorAdapter.java
incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/OidRegistry.java
incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/OidRegistryMonitor.java
incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/OidRegistryMonitorAdapter.java
incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/SyntaxCheckerRegistry.java
incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/SyntaxCheckerRegistryMonitor.java
incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/SyntaxCheckerRegistryMonitorAdapter.java
incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/SyntaxRegistry.java
incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/SyntaxRegistryMonitor.java
incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/SyntaxRegistryMonitorAdapter.java
Log:
Commit changes ...
o cleaned up style: removed a_, m_, l_ and removed space before ;
o removed @author tags minus the one for the project
o switched 1.1 license over to 2.0 license boiler plate
o for safty added stack printouts to exception handlers in monitors
o code fixes made to compile so value objects are referenced in ldap common
Modified: incubator/directory/eve/trunk/backend/api/project.xml
==============================================================================
--- incubator/directory/eve/trunk/backend/api/project.xml (original)
+++ incubator/directory/eve/trunk/backend/api/project.xml Mon Sep 27 17:38:47 2004
@@ -15,5 +15,12 @@
Eve's backend API.
</description>
+ <dependencies>
+ <dependency>
+ <groupId>incubator-directory</groupId>
+ <artifactId>ldap-common</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+ </dependencies>
</project>
Modified: incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/ComparatorRegistry.java
==============================================================================
--- incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/ComparatorRegistry.java (original)
+++ incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/ComparatorRegistry.java Mon Sep 27 17:38:47 2004
@@ -1,99 +1,61 @@
/*
-
- ============================================================================
- The Apache Software License, Version 1.1
- ============================================================================
-
- Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modifica-
- tion, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- 3. The end-user documentation included with the redistribution, if any, must
- include the following acknowledgment: "This product includes software
- developed by the Apache Software Foundation (http://www.apache.org/)."
- Alternately, this acknowledgment may appear in the software itself, if
- and wherever such third-party acknowledgments normally appear.
-
- 4. The names "Eve Directory Server", "Apache Directory Project", "Apache Eve"
- and "Apache Software Foundation" must not be used to endorse or promote
- products derived from this software without prior written
- permission. For written permission, please contact apache@apache.org.
-
- 5. Products derived from this software may not be called "Apache", nor may
- "Apache" appear in their name, without prior written permission of the
- Apache Software Foundation.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
- DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- This software consists of voluntary contributions made by many individuals
- on behalf of the Apache Software Foundation. For more information on the
- Apache Software Foundation, please see <http://www.apache.org/>.
-
-*/
-package org.apache.eve.schema ;
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * 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.eve.schema;
-import java.util.Comparator ;
+import java.util.Comparator;
-import javax.naming.NamingException ;
+import javax.naming.NamingException;
/**
* Comparator registry component's service interface.
*
- * @author <a href="mailto:akarasulu@apache.org">Alex Karasulu</a>
- * @author $LastChangedBy$
- * @version $LastChangedRevision$
+ * @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
+ * @version $Rev$
*/
public interface ComparatorRegistry
{
- /** Avalon service role */
- String ROLE = ComparatorRegistry.class.getName() ;
-
/**
* Registers a Comparator with this registry.
*
- * @param a_comparator the Comparator to register
+ * @param comparator the Comparator to register
* @throws NamingException if the Comparator is already registered or the
* registration operation is not supported
*/
- void register( Comparator a_comparator, String a_oid )
- throws NamingException ;
+ void register( Comparator comparator, String oid ) throws NamingException;
/**
* Looks up a Comparator by its unique Object Identifier.
*
- * @param a_oid the object identifier
+ * @param oid the object identifier
* @return the Comparator for the oid
* @throws NamingException if there is a backing store failure or the
* Comparator does not exist.
*/
- Comparator lookup( String a_oid ) throws NamingException ;
+ Comparator lookup( String oid ) throws NamingException;
/**
* Checks to see if a Comparator exists. Backing store failures simply
* return false.
*
- * @param a_oid the object identifier
+ * @param oid the object identifier
* @return true if a Comparator definition exists for the oid, false
* otherwise
*/
- boolean hasComparator( String a_oid ) ;
+ boolean hasComparator( String oid );
}
Modified: incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/ComparatorRegistryMonitor.java
==============================================================================
--- incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/ComparatorRegistryMonitor.java (original)
+++ incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/ComparatorRegistryMonitor.java Mon Sep 27 17:38:47 2004
@@ -1,96 +1,62 @@
/*
-
- ============================================================================
- The Apache Software License, Version 1.1
- ============================================================================
-
- Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modifica-
- tion, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- 3. The end-user documentation included with the redistribution, if any, must
- include the following acknowledgment: "This product includes software
- developed by the Apache Software Foundation (http://www.apache.org/)."
- Alternately, this acknowledgment may appear in the software itself, if
- and wherever such third-party acknowledgments normally appear.
-
- 4. The names "Eve Directory Server", "Apache Directory Project", "Apache Eve"
- and "Apache Software Foundation" must not be used to endorse or promote
- products derived from this software without prior written
- permission. For written permission, please contact apache@apache.org.
-
- 5. Products derived from this software may not be called "Apache", nor may
- "Apache" appear in their name, without prior written permission of the
- Apache Software Foundation.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
- DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- This software consists of voluntary contributions made by many individuals
- on behalf of the Apache Software Foundation. For more information on the
- Apache Software Foundation, please see <http://www.apache.org/>.
-
-*/
-package org.apache.eve.schema ;
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * 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.eve.schema;
-import java.util.Comparator ;
+import java.util.Comparator;
-import javax.naming.NamingException ;
+import javax.naming.NamingException;
/**
* Monitor interface for a ComparatorRegistry.
*
- * @author <a href="mailto:akarasulu@apache.org">Alex Karasulu</a>
- * @author $Author: akarasulu $
- * @version $Rev: 1463 $
+ * @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
+ * @version $Rev$
*/
public interface ComparatorRegistryMonitor
{
/**
* Monitors when a Comparator is registered successfully.
*
- * @param a_comparator the Comparator registered
+ * @param comparator the Comparator registered
*/
- void registered( Comparator a_comparator ) ;
+ void registered( Comparator comparator );
/**
* Monitors when a Comparator is successfully looked up.
*
- * @param a_comparator the Comparator looked up
+ * @param comparator the Comparator looked up
*/
- void lookedUp( Comparator a_comparator ) ;
+ void lookedUp( Comparator comparator );
/**
* Monitors when a lookup attempt fails.
*
- * @param a_oid the OID for the Comparator to lookup
- * @param a_fault the exception to be thrown for the fault
+ * @param oid the OID for the Comparator to lookup
+ * @param fault the exception to be thrown for the fault
*/
- void lookupFailed( String a_oid, NamingException a_fault ) ;
+ void lookupFailed( String oid, NamingException fault );
/**
* Monitors when a registration attempt fails.
*
- * @param a_comparator the Comparator which failed registration
- * @param a_fault the exception to be thrown for the fault
+ * @param comparator the Comparator which failed registration
+ * @param fault the exception to be thrown for the fault
*/
- void registerFailed( Comparator a_comparator, NamingException a_fault ) ;
+ void registerFailed( Comparator comparator, NamingException fault );
}
Modified: incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/ComparatorRegistryMonitorAdapter.java
==============================================================================
--- incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/ComparatorRegistryMonitorAdapter.java (original)
+++ incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/ComparatorRegistryMonitorAdapter.java Mon Sep 27 17:38:47 2004
@@ -1,66 +1,32 @@
/*
-
- ============================================================================
- The Apache Software License, Version 1.1
- ============================================================================
-
- Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modifica-
- tion, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- 3. The end-user documentation included with the redistribution, if any, must
- include the following acknowledgment: "This product includes software
- developed by the Apache Software Foundation (http://www.apache.org/)."
- Alternately, this acknowledgment may appear in the software itself, if
- and wherever such third-party acknowledgments normally appear.
-
- 4. The names "Eve Directory Server", "Apache Directory Project", "Apache Eve"
- and "Apache Software Foundation" must not be used to endorse or promote
- products derived from this software without prior written
- permission. For written permission, please contact apache@apache.org.
-
- 5. Products derived from this software may not be called "Apache", nor may
- "Apache" appear in their name, without prior written permission of the
- Apache Software Foundation.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
- DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- This software consists of voluntary contributions made by many individuals
- on behalf of the Apache Software Foundation. For more information on the
- Apache Software Foundation, please see <http://www.apache.org/>.
-
-*/
-package org.apache.eve.schema ;
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * 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.eve.schema;
-import java.util.Comparator ;
+import java.util.Comparator;
-import javax.naming.NamingException ;
+import javax.naming.NamingException;
/**
* An adapter for the ComparatorRegistry's monitor.
*
- * @author <a href="mailto:akarasulu@apache.org">Alex Karasulu</a>
- * @author $Author: akarasulu $
- * @version $Rev: 1463 $
+ * @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
+ * @version $Rev$
*/
public class ComparatorRegistryMonitorAdapter
implements ComparatorRegistryMonitor
@@ -69,7 +35,7 @@
* @see org.apache.eve.schema.ComparatorRegistryMonitor#registered(
* org.apache.eve.schema.Comparator)
*/
- public void registered( Comparator a_comparator)
+ public void registered( Comparator comparator )
{
}
@@ -78,7 +44,7 @@
* @see org.apache.eve.schema.ComparatorRegistryMonitor#lookedUp(
* org.apache.eve.schema.Comparator)
*/
- public void lookedUp( Comparator a_comparator )
+ public void lookedUp( Comparator comparator )
{
}
@@ -87,8 +53,12 @@
* @see org.apache.eve.schema.ComparatorRegistryMonitor#lookupFailed(
* java.lang.String, javax.naming.NamingException)
*/
- public void lookupFailed( String a_oid, NamingException a_fault )
+ public void lookupFailed( String oid, NamingException fault )
{
+ if ( fault != null )
+ {
+ fault.printStackTrace();
+ }
}
@@ -96,8 +66,7 @@
* @see org.apache.eve.schema.ComparatorRegistryMonitor#registerFailed(
* org.apache.eve.schema.Comparator, javax.naming.NamingException)
*/
- public void registerFailed( Comparator a_comparator,
- NamingException a_fault )
+ public void registerFailed( Comparator comparator, NamingException fault )
{
}
}
Modified: incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/MatchingRuleRegistry.java
==============================================================================
--- incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/MatchingRuleRegistry.java (original)
+++ incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/MatchingRuleRegistry.java Mon Sep 27 17:38:47 2004
@@ -1,97 +1,61 @@
/*
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * 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.eve.schema;
- ============================================================================
- The Apache Software License, Version 1.1
- ============================================================================
-
- Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modifica-
- tion, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- 3. The end-user documentation included with the redistribution, if any, must
- include the following acknowledgment: "This product includes software
- developed by the Apache Software Foundation (http://www.apache.org/)."
- Alternately, this acknowledgment may appear in the software itself, if
- and wherever such third-party acknowledgments normally appear.
-
- 4. The names "Eve Directory Server", "Apache Directory Project", "Apache Eve"
- and "Apache Software Foundation" must not be used to endorse or promote
- products derived from this software without prior written
- permission. For written permission, please contact apache@apache.org.
-
- 5. Products derived from this software may not be called "Apache", nor may
- "Apache" appear in their name, without prior written permission of the
- Apache Software Foundation.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
- DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- This software consists of voluntary contributions made by many individuals
- on behalf of the Apache Software Foundation. For more information on the
- Apache Software Foundation, please see <http://www.apache.org/>.
-
-*/
-package org.apache.eve.schema ;
+import javax.naming.NamingException;
-import javax.naming.NamingException ;
+import org.apache.ldap.common.schema.MatchingRule;
/**
* A registry used to track system matchingRules.
*
- * @author <a href="mailto:akarasulu@apache.org">Alex Karasulu</a>
- * @author $LastChangedBy$
- * @version $LastChangedRevision$
+ * @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
+ * @version $Rev$
*/
public interface MatchingRuleRegistry
{
- /** Avalon service role */
- String ROLE = MatchingRuleRegistry.class.getName() ;
-
-
/**
* Registers a MatchingRule with this registry.
*
- * @param a_matchingRule the MatchingRule to register
+ * @param matchingRule the MatchingRule to register
* @throws NamingException if the matchingRule is already registered or the
* registration operation is not supported
*/
- void register( MatchingRule a_matchingRule ) throws NamingException ;
+ void register( MatchingRule matchingRule ) throws NamingException;
/**
* Looks up a MatchingRule by its unique Object Identifier.
*
- * @param a_oid the object identifier
+ * @param oid the object identifier
* @return the MatchingRule for the oid
* @throws NamingException if there is a backing store failure or the
* MatchingRule does not exist.
*/
- MatchingRule lookup( String a_oid ) throws NamingException ;
+ MatchingRule lookup( String oid ) throws NamingException;
/**
* Checks to see if a MatchingRule exists. Backing store failures simply
* return false.
*
- * @param a_oid the object identifier
+ * @param oid the object identifier
* @return true if a MatchingRule definition exists for the oid, false
* otherwise
*/
- boolean hasMatchingRule( String a_oid ) ;
+ boolean hasMatchingRule( String oid );
}
Modified: incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/MatchingRuleRegistryMonitor.java
==============================================================================
--- incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/MatchingRuleRegistryMonitor.java (original)
+++ incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/MatchingRuleRegistryMonitor.java Mon Sep 27 17:38:47 2004
@@ -1,63 +1,31 @@
/*
-
- ============================================================================
- The Apache Software License, Version 1.1
- ============================================================================
-
- Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modifica-
- tion, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- 3. The end-user documentation included with the redistribution, if any, must
- include the following acknowledgment: "This product includes software
- developed by the Apache Software Foundation (http://www.apache.org/)."
- Alternately, this acknowledgment may appear in the software itself, if
- and wherever such third-party acknowledgments normally appear.
-
- 4. The names "Eve Directory Server", "Apache Directory Project", "Apache Eve"
- and "Apache Software Foundation" must not be used to endorse or promote
- products derived from this software without prior written
- permission. For written permission, please contact apache@apache.org.
-
- 5. Products derived from this software may not be called "Apache", nor may
- "Apache" appear in their name, without prior written permission of the
- Apache Software Foundation.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
- DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- This software consists of voluntary contributions made by many individuals
- on behalf of the Apache Software Foundation. For more information on the
- Apache Software Foundation, please see <http://www.apache.org/>.
-
-*/
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * 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.eve.schema;
import javax.naming.NamingException ;
+import org.apache.ldap.common.schema.MatchingRule;
+
/**
* Monitor interface for a MatchingRuleRegistry.
*
- * @author <a href="mailto:akarasulu@apache.org">Alex Karasulu</a>
- * @author $Author$
+ * @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
public interface MatchingRuleRegistryMonitor
@@ -65,31 +33,30 @@
/**
* Monitors when a MatchingRule is registered successfully.
*
- * @param a_matchingRule the MatchingRule registered
+ * @param matchingRule the MatchingRule registered
*/
- void registered( MatchingRule a_matchingRule ) ;
+ void registered( MatchingRule matchingRule );
/**
* Monitors when a MatchingRule is successfully looked up.
*
- * @param a_matchingRule the MatchingRule looked up
+ * @param matchingRule the MatchingRule looked up
*/
- void lookedUp( MatchingRule a_matchingRule ) ;
+ void lookedUp( MatchingRule matchingRule );
/**
* Monitors when a lookup attempt fails.
*
- * @param a_oid the OID for the MatchingRule to lookup
- * @param a_fault the exception to be thrown for the fault
+ * @param oid the OID for the MatchingRule to lookup
+ * @param fault the exception to be thrown for the fault
*/
- void lookupFailed( String a_oid, NamingException a_fault ) ;
+ void lookupFailed( String oid, NamingException fault );
/**
* Monitors when a registration attempt fails.
*
- * @param a_matchingRule the MatchingRule which failed registration
- * @param a_fault the exception to be thrown for the fault
+ * @param matchingRule the MatchingRule which failed registration
+ * @param fault the exception to be thrown for the fault
*/
- void registerFailed( MatchingRule a_matchingRule,
- NamingException a_fault ) ;
+ void registerFailed( MatchingRule matchingRule, NamingException fault );
}
Modified: incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/MatchingRuleRegistryMonitorAdapter.java
==============================================================================
--- incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/MatchingRuleRegistryMonitorAdapter.java (original)
+++ incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/MatchingRuleRegistryMonitorAdapter.java Mon Sep 27 17:38:47 2004
@@ -1,82 +1,50 @@
/*
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * 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.eve.schema;
- ============================================================================
- The Apache Software License, Version 1.1
- ============================================================================
-
- Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modifica-
- tion, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- 3. The end-user documentation included with the redistribution, if any, must
- include the following acknowledgment: "This product includes software
- developed by the Apache Software Foundation (http://www.apache.org/)."
- Alternately, this acknowledgment may appear in the software itself, if
- and wherever such third-party acknowledgments normally appear.
-
- 4. The names "Eve Directory Server", "Apache Directory Project", "Apache Eve"
- and "Apache Software Foundation" must not be used to endorse or promote
- products derived from this software without prior written
- permission. For written permission, please contact apache@apache.org.
-
- 5. Products derived from this software may not be called "Apache", nor may
- "Apache" appear in their name, without prior written permission of the
- Apache Software Foundation.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
- DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- This software consists of voluntary contributions made by many individuals
- on behalf of the Apache Software Foundation. For more information on the
- Apache Software Foundation, please see <http://www.apache.org/>.
-
-*/
-package org.apache.eve.schema ;
+import javax.naming.NamingException;
-import javax.naming.NamingException ;
+import org.apache.ldap.common.schema.MatchingRule;
/**
* An adapter for a MatchingRuleRegistryMonitor.
*
- * @author <a href="mailto:akarasulu@apache.org">Alex Karasulu</a>
- * @author $LastChangedBy$
- * @version $LastChangedRevision$
+ * @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
+ * @version $Rev$
*/
public class MatchingRuleRegistryMonitorAdapter
implements MatchingRuleRegistryMonitor
{
/**
* @see org.apache.eve.schema.MatchingRuleRegistryMonitor#registered(
- * org.apache.eve.schema.MatchingRule)
+ * org.apache.ldap.common.schema.MatchingRule)
*/
- public void registered( MatchingRule a_rule )
+ public void registered( MatchingRule rule )
{
}
/**
* @see org.apache.eve.schema.MatchingRuleRegistryMonitor#lookedUp(
- * org.apache.eve.schema.MatchingRule)
+ * org.apache.ldap.common.schema.MatchingRule)
*/
- public void lookedUp( MatchingRule a_rule )
+ public void lookedUp( MatchingRule rule )
{
}
@@ -85,16 +53,24 @@
* @see org.apache.eve.schema.MatchingRuleRegistryMonitor#lookupFailed(
* java.lang.String, javax.naming.NamingException)
*/
- public void lookupFailed( String a_oid, NamingException a_fault )
+ public void lookupFailed( String oid, NamingException fault )
{
+ if ( fault != null )
+ {
+ fault.printStackTrace();
+ }
}
/**
* @see org.apache.eve.schema.MatchingRuleRegistryMonitor#registerFailed(
- * org.apache.eve.schema.MatchingRule, javax.naming.NamingException)
+ * org.apache.ldap.common.schema.MatchingRule, javax.naming.NamingException)
*/
- public void registerFailed( MatchingRule a_rule, NamingException a_fault )
+ public void registerFailed( MatchingRule rule, NamingException fault )
{
+ if ( fault != null )
+ {
+ fault.printStackTrace();
+ }
}
}
Modified: incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/NormalizerRegistry.java
==============================================================================
--- incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/NormalizerRegistry.java (original)
+++ incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/NormalizerRegistry.java Mon Sep 27 17:38:47 2004
@@ -1,97 +1,61 @@
/*
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * 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.eve.schema;
- ============================================================================
- The Apache Software License, Version 1.1
- ============================================================================
-
- Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modifica-
- tion, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- 3. The end-user documentation included with the redistribution, if any, must
- include the following acknowledgment: "This product includes software
- developed by the Apache Software Foundation (http://www.apache.org/)."
- Alternately, this acknowledgment may appear in the software itself, if
- and wherever such third-party acknowledgments normally appear.
-
- 4. The names "Eve Directory Server", "Apache Directory Project", "Apache Eve"
- and "Apache Software Foundation" must not be used to endorse or promote
- products derived from this software without prior written
- permission. For written permission, please contact apache@apache.org.
-
- 5. Products derived from this software may not be called "Apache", nor may
- "Apache" appear in their name, without prior written permission of the
- Apache Software Foundation.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
- DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- This software consists of voluntary contributions made by many individuals
- on behalf of the Apache Software Foundation. For more information on the
- Apache Software Foundation, please see <http://www.apache.org/>.
-
-*/
-package org.apache.eve.schema ;
+import javax.naming.NamingException;
-import javax.naming.NamingException ;
+import org.apache.ldap.common.schema.Normalizer;
/**
* Normalizer registry component's service interface.
*
- * @author <a href="mailto:akarasulu@apache.org">Alex Karasulu</a>
- * @author $LastChangedBy$
- * @version $LastChangedRevision$
+ * @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
+ * @version $Rev$
*/
public interface NormalizerRegistry
{
- /** Avalon service role */
- String ROLE = NormalizerRegistry.class.getName() ;
-
/**
* Registers a Normalizer with this registry.
*
- * @param a_normalizer the Normalizer to register
+ * @param normalizer the Normalizer to register
* @throws NamingException if the Normalizer is already registered or the
* registration operation is not supported
*/
- void register( Normalizer a_normalizer, String a_oid )
- throws NamingException ;
+ void register( Normalizer normalizer, String oid ) throws NamingException;
/**
* Looks up a Normalizer by its unique Object Identifier.
*
- * @param a_oid the object identifier
+ * @param oid the object identifier
* @return the Normalizer for the oid
* @throws NamingException if there is a backing store failure or the
* Normalizer does not exist.
*/
- Normalizer lookup( String a_oid ) throws NamingException ;
+ Normalizer lookup( String oid ) throws NamingException;
/**
* Checks to see if a Normalizer exists. Backing store failures simply
* return false.
*
- * @param a_oid the object identifier
+ * @param oid the object identifier
* @return true if a Normalizer definition exists for the oid, false
* otherwise
*/
- boolean hasNormalizer( String a_oid ) ;
+ boolean hasNormalizer( String oid );
}
Modified: incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/NormalizerRegistryMonitor.java
==============================================================================
--- incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/NormalizerRegistryMonitor.java (original)
+++ incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/NormalizerRegistryMonitor.java Mon Sep 27 17:38:47 2004
@@ -1,94 +1,62 @@
/*
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * 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.eve.schema;
- ============================================================================
- The Apache Software License, Version 1.1
- ============================================================================
-
- Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modifica-
- tion, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- 3. The end-user documentation included with the redistribution, if any, must
- include the following acknowledgment: "This product includes software
- developed by the Apache Software Foundation (http://www.apache.org/)."
- Alternately, this acknowledgment may appear in the software itself, if
- and wherever such third-party acknowledgments normally appear.
-
- 4. The names "Eve Directory Server", "Apache Directory Project", "Apache Eve"
- and "Apache Software Foundation" must not be used to endorse or promote
- products derived from this software without prior written
- permission. For written permission, please contact apache@apache.org.
-
- 5. Products derived from this software may not be called "Apache", nor may
- "Apache" appear in their name, without prior written permission of the
- Apache Software Foundation.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
- DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- This software consists of voluntary contributions made by many individuals
- on behalf of the Apache Software Foundation. For more information on the
- Apache Software Foundation, please see <http://www.apache.org/>.
-
-*/
-package org.apache.eve.schema ;
+import javax.naming.NamingException;
-import javax.naming.NamingException ;
+import org.apache.ldap.common.schema.Normalizer;
/**
* Monitor interface for a NormalizerRegistry.
*
- * @author <a href="mailto:akarasulu@apache.org">Alex Karasulu</a>
- * @author $Author: akarasulu $
- * @version $Rev: 1463 $
+ * @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
+ * @version $Rev$
*/
public interface NormalizerRegistryMonitor
{
/**
* Monitors when a Normalizer is registered successfully.
*
- * @param a_normalizer the Normalizer registered
+ * @param normalizer the Normalizer registered
*/
- void registered( Normalizer a_normalizer ) ;
+ void registered( Normalizer normalizer );
/**
* Monitors when a Normalizer is successfully looked up.
*
- * @param a_normalizer the Normalizer looked up
+ * @param normalizer the Normalizer looked up
*/
- void lookedUp( Normalizer a_normalizer ) ;
+ void lookedUp( Normalizer normalizer );
/**
* Monitors when a lookup attempt fails.
*
- * @param a_oid the OID for the Normalizer to lookup
- * @param a_fault the exception to be thrown for the fault
+ * @param oid the OID for the Normalizer to lookup
+ * @param fault the exception to be thrown for the fault
*/
- void lookupFailed( String a_oid, NamingException a_fault ) ;
+ void lookupFailed( String oid, NamingException fault );
/**
* Monitors when a registration attempt fails.
*
- * @param a_normalizer the Normalizer which failed registration
- * @param a_fault the exception to be thrown for the fault
+ * @param normalizer the Normalizer which failed registration
+ * @param fault the exception to be thrown for the fault
*/
- void registerFailed( Normalizer a_normalizer, NamingException a_fault ) ;
+ void registerFailed( Normalizer normalizer, NamingException fault );
}
Modified: incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/NormalizerRegistryMonitorAdapter.java
==============================================================================
--- incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/NormalizerRegistryMonitorAdapter.java (original)
+++ incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/NormalizerRegistryMonitorAdapter.java Mon Sep 27 17:38:47 2004
@@ -1,64 +1,32 @@
/*
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * 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.eve.schema;
- ============================================================================
- The Apache Software License, Version 1.1
- ============================================================================
-
- Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modifica-
- tion, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- 3. The end-user documentation included with the redistribution, if any, must
- include the following acknowledgment: "This product includes software
- developed by the Apache Software Foundation (http://www.apache.org/)."
- Alternately, this acknowledgment may appear in the software itself, if
- and wherever such third-party acknowledgments normally appear.
-
- 4. The names "Eve Directory Server", "Apache Directory Project", "Apache Eve"
- and "Apache Software Foundation" must not be used to endorse or promote
- products derived from this software without prior written
- permission. For written permission, please contact apache@apache.org.
-
- 5. Products derived from this software may not be called "Apache", nor may
- "Apache" appear in their name, without prior written permission of the
- Apache Software Foundation.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
- DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- This software consists of voluntary contributions made by many individuals
- on behalf of the Apache Software Foundation. For more information on the
- Apache Software Foundation, please see <http://www.apache.org/>.
-
-*/
-package org.apache.eve.schema ;
+import javax.naming.NamingException;
-import javax.naming.NamingException ;
+import org.apache.ldap.common.schema.Normalizer;
/**
* An adapter for the NormalizerRegistry's monitor.
*
- * @author <a href="mailto:akarasulu@apache.org">Alex Karasulu</a>
- * @author $Author: akarasulu $
- * @version $Rev: 1463 $
+ * @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
+ * @version $Rev$
*/
public class NormalizerRegistryMonitorAdapter
implements NormalizerRegistryMonitor
@@ -67,7 +35,7 @@
* @see org.apache.eve.schema.NormalizerRegistryMonitor#registered(
* org.apache.eve.schema.Normalizer)
*/
- public void registered( Normalizer a_normalizer)
+ public void registered( Normalizer normalizer)
{
}
@@ -76,7 +44,7 @@
* @see org.apache.eve.schema.NormalizerRegistryMonitor#lookedUp(
* org.apache.eve.schema.Normalizer)
*/
- public void lookedUp( Normalizer a_normalizer )
+ public void lookedUp( Normalizer normalizer )
{
}
@@ -85,8 +53,12 @@
* @see org.apache.eve.schema.NormalizerRegistryMonitor#lookupFailed(
* java.lang.String, javax.naming.NamingException)
*/
- public void lookupFailed( String a_oid, NamingException a_fault )
+ public void lookupFailed( String oid, NamingException fault )
{
+ if ( fault != null )
+ {
+ fault.printStackTrace();
+ }
}
@@ -94,8 +66,11 @@
* @see org.apache.eve.schema.NormalizerRegistryMonitor#registerFailed(
* org.apache.eve.schema.Normalizer, javax.naming.NamingException)
*/
- public void registerFailed( Normalizer a_normalizer,
- NamingException a_fault )
+ public void registerFailed( Normalizer normalizer, NamingException fault )
{
+ if ( fault != null )
+ {
+ fault.printStackTrace();
+ }
}
}
Modified: incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/OidRegistry.java
==============================================================================
--- incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/OidRegistry.java (original)
+++ incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/OidRegistry.java Mon Sep 27 17:38:47 2004
@@ -1,91 +1,54 @@
/*
-
- ============================================================================
- The Apache Software License, Version 1.1
- ============================================================================
-
- Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modifica-
- tion, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- 3. The end-user documentation included with the redistribution, if any, must
- include the following acknowledgment: "This product includes software
- developed by the Apache Software Foundation (http://www.apache.org/)."
- Alternately, this acknowledgment may appear in the software itself, if
- and wherever such third-party acknowledgments normally appear.
-
- 4. The names "Eve Directory Server", "Apache Directory Project", "Apache Eve"
- and "Apache Software Foundation" must not be used to endorse or promote
- products derived from this software without prior written
- permission. For written permission, please contact apache@apache.org.
-
- 5. Products derived from this software may not be called "Apache", nor may
- "Apache" appear in their name, without prior written permission of the
- Apache Software Foundation.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
- DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- This software consists of voluntary contributions made by many individuals
- on behalf of the Apache Software Foundation. For more information on the
- Apache Software Foundation, please see <http://www.apache.org/>.
-
-*/
-package org.apache.eve.schema ;
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * 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.eve.schema;
-import java.util.List ;
-import java.util.Iterator ;
+import java.util.List;
+import java.util.Iterator;
-import javax.naming.NamingException ;
+import javax.naming.NamingException;
/**
* Object identifier registry.
*
- * @author <a href="mailto:akarasulu@apache.org">Alex Karasulu</a>
- * @author $Author$
+ * @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
public interface OidRegistry
{
- /** Avalon service interface ROLE */
- String ROLE = OidRegistry.class.toString() ;
-
/**
* Gets the object identifier using a common name
*
- * @param a_name the name to lookup an OID for
+ * @param name the name to lookup an OID for
* @return the OID string associated with a name
- * @throws NamingException if a_name does not map to an OID
+ * @throws NamingException if name does not map to an OID
*/
- String getOid( String a_name ) throws NamingException ;
+ String getOid( String name ) throws NamingException;
/**
* Gets the primary name associated with an OID. The primary name is the
* first name specified for the OID.
*
- * @param a_oid the object identifier
+ * @param oid the object identifier
* @return the primary name
- * @throws NamingException if a_oid does not exist
+ * @throws NamingException if oid does not exist
*/
- String getPrimaryName( String a_oid ) throws NamingException ;
+ String getPrimaryName( String oid ) throws NamingException;
/**
* Gets the names associated with an OID. An OID is unique however it may
@@ -95,24 +58,24 @@
* name certain things within the server internally. If there is more than
* one name then the first name is taken to be the primary.
*
- * @param a_oid the OID for which we return the set of common names
+ * @param oid the OID for which we return the set of common names
* @return a sorted set of names
- * @throws NamingException if a_oid does not exist
+ * @throws NamingException if oid does not exist
*/
- List getNameSet( String a_oid ) throws NamingException ;
+ List getNameSet( String oid ) throws NamingException;
/**
* Lists all the OIDs within the registry. This may be a really big list.
*
* @return all the OIDs registered
*/
- Iterator list() ;
+ Iterator list();
/**
* Adds an OID name pair to the registry.
*
- * @param a_name the name to associate with the OID
- * @param a_oid the OID to add or associate a new name with
+ * @param name the name to associate with the OID
+ * @param oid the OID to add or associate a new name with
*/
- void register( String a_name, String a_oid ) ;
+ void register( String name, String oid );
}
Modified: incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/OidRegistryMonitor.java
==============================================================================
--- incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/OidRegistryMonitor.java (original)
+++ incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/OidRegistryMonitor.java Mon Sep 27 17:38:47 2004
@@ -1,65 +1,31 @@
/*
-
- ============================================================================
- The Apache Software License, Version 1.1
- ============================================================================
-
- Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modifica-
- tion, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- 3. The end-user documentation included with the redistribution, if any, must
- include the following acknowledgment: "This product includes software
- developed by the Apache Software Foundation (http://www.apache.org/)."
- Alternately, this acknowledgment may appear in the software itself, if
- and wherever such third-party acknowledgments normally appear.
-
- 4. The names "Eve Directory Server", "Apache Directory Project", "Apache Eve"
- and "Apache Software Foundation" must not be used to endorse or promote
- products derived from this software without prior written
- permission. For written permission, please contact apache@apache.org.
-
- 5. Products derived from this software may not be called "Apache", nor may
- "Apache" appear in their name, without prior written permission of the
- Apache Software Foundation.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
- DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- This software consists of voluntary contributions made by many individuals
- on behalf of the Apache Software Foundation. For more information on the
- Apache Software Foundation, please see <http://www.apache.org/>.
-
-*/
-package org.apache.eve.schema ;
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * 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.eve.schema;
-import java.util.List ;
+import java.util.List;
-import javax.naming.NamingException ;
+import javax.naming.NamingException;
/**
* Monitor used to track notable OidRegistry events.
*
- * @author <a href="mailto:akarasulu@apache.org">Alex Karasulu</a>
- * @author $Author$
+ * @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
public interface OidRegistryMonitor
@@ -68,65 +34,65 @@
* Monitors situations where an OID is used to resolve an OID. The caller
* does not know that the argument is the same as the return value.
*
- * @param a_oid the OID argument and return value
+ * @param oid the OID argument and return value
*/
- void getOidWithOid( String a_oid ) ;
+ void getOidWithOid( String oid );
/**
* Monitors when an OID is resolved successfully for a name.
*
- * @param a_name the name used to lookup an OID
- * @param a_oid the OID returned for the name
+ * @param name the name used to lookup an OID
+ * @param oid the OID returned for the name
*/
- void oidResolved( String a_name, String a_oid ) ;
+ void oidResolved( String name, String oid );
/**
* Monitors when an OID is resolved successfully by using a normalized form
* of the name.
*
- * @param a_name the name used to lookup an OID
- * @param a_normalized the normalized name that mapped to the OID
- * @param a_oid the OID returned for the name
+ * @param name the name used to lookup an OID
+ * @param normalized the normalized name that mapped to the OID
+ * @param oid the OID returned for the name
*/
- void oidResolved( String a_name, String a_normalized, String a_oid ) ;
+ void oidResolved( String name, String normalized, String oid );
/**
* Monitors when resolution of an OID by name fails.
*
- * @param a_name the name used to lookup an OID
- * @param a_fault the exception thrown for the failure after this call
+ * @param name the name used to lookup an OID
+ * @param fault the exception thrown for the failure after this call
*/
- void oidResolutionFailed( String a_name, NamingException a_fault ) ;
+ void oidResolutionFailed( String name, NamingException fault );
/**
* Monitors when a name lookups fail due to the use of an unknown OID.
*
- * @param a_oid the OID used to lookup object names
- * @param a_fault the exception thrown for the failure after this call
+ * @param oid the OID used to lookup object names
+ * @param fault the exception thrown for the failure after this call
*/
- void oidDoesNotExist( String a_oid, NamingException a_fault ) ;
+ void oidDoesNotExist( String oid, NamingException fault );
/**
* Monitors situations where a primary name is resolved for a OID.
*
- * @param a_oid the OID used for the lookup
- * @param a_primaryName the primary name found for the OID
+ * @param oid the OID used for the lookup
+ * @param primaryName the primary name found for the OID
*/
- void nameResolved( String a_oid, String a_primaryName ) ;
+ void nameResolved( String oid, String primaryName );
/**
* Monitors situations where a names are resolved for a OID.
*
- * @param a_oid the OID used for the lookup
- * @param a_names the names found for the OID
+ * @param oid the OID used for the lookup
+ * @param names the names found for the OID
*/
- void namesResolved( String a_oid, List a_names ) ;
+ void namesResolved( String oid, List names );
/**
* Monitors the successful registration of a name for an OID.
*
- * @param a_name the one of many names registered with an OID
- * @param a_oid the OID to be associated with the name
+ * @param name the one of many names registered with an OID
+ * @param oid the OID to be associated with the name
*/
- void registered( String a_name, String a_oid ) ;
+ void registered( String name, String oid );
}
Modified: incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/OidRegistryMonitorAdapter.java
==============================================================================
--- incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/OidRegistryMonitorAdapter.java (original)
+++ incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/OidRegistryMonitorAdapter.java Mon Sep 27 17:38:47 2004
@@ -1,64 +1,30 @@
/*
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * 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.eve.schema;
- ============================================================================
- The Apache Software License, Version 1.1
- ============================================================================
-
- Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modifica-
- tion, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- 3. The end-user documentation included with the redistribution, if any, must
- include the following acknowledgment: "This product includes software
- developed by the Apache Software Foundation (http://www.apache.org/)."
- Alternately, this acknowledgment may appear in the software itself, if
- and wherever such third-party acknowledgments normally appear.
-
- 4. The names "Eve Directory Server", "Apache Directory Project", "Apache Eve"
- and "Apache Software Foundation" must not be used to endorse or promote
- products derived from this software without prior written
- permission. For written permission, please contact apache@apache.org.
-
- 5. Products derived from this software may not be called "Apache", nor may
- "Apache" appear in their name, without prior written permission of the
- Apache Software Foundation.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
- DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- This software consists of voluntary contributions made by many individuals
- on behalf of the Apache Software Foundation. For more information on the
- Apache Software Foundation, please see <http://www.apache.org/>.
-
-*/
-package org.apache.eve.schema ;
-
-import java.util.List ;
+import java.util.List;
-import javax.naming.NamingException ;
+import javax.naming.NamingException;
/**
* An adapter for an OidRegistryMonitor.
*
- * @author <a href="mailto:akarasulu@apache.org">Alex Karasulu</a>
- * @author $Author$
+ * @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
public class OidRegistryMonitorAdapter implements OidRegistryMonitor
@@ -68,7 +34,7 @@
* @see org.apache.eve.schema.OidRegistryMonitor#getOidWithOid(
* java.lang.String)
*/
- public void getOidWithOid( String a_oid )
+ public void getOidWithOid( String oid )
{
}
@@ -77,7 +43,7 @@
* @see org.apache.eve.schema.OidRegistryMonitor#oidResolved(
* java.lang.String, java.lang.String)
*/
- public void oidResolved( String a_name, String a_oid )
+ public void oidResolved( String name, String oid )
{
}
@@ -86,7 +52,7 @@
* @see org.apache.eve.schema.OidRegistryMonitor#oidResolved(
* java.lang.String, java.lang.String, java.lang.String)
*/
- public void oidResolved( String a_name, String a_normalized, String a_oid )
+ public void oidResolved( String name, String normalized, String oid )
{
}
@@ -95,8 +61,12 @@
* @see org.apache.eve.schema.OidRegistryMonitor#oidResolutionFailed(
* java.lang.String, javax.naming.NamingException)
*/
- public void oidResolutionFailed( String a_name, NamingException a_fault )
+ public void oidResolutionFailed( String name, NamingException fault )
{
+ if ( fault != null )
+ {
+ fault.printStackTrace();
+ }
}
@@ -104,8 +74,12 @@
* @see org.apache.eve.schema.OidRegistryMonitor#oidDoesNotExist(
* java.lang.String, javax.naming.NamingException)
*/
- public void oidDoesNotExist( String a_oid, NamingException a_fault )
+ public void oidDoesNotExist( String oid, NamingException fault )
{
+ if ( fault != null )
+ {
+ fault.printStackTrace();
+ }
}
@@ -113,7 +87,7 @@
* @see org.apache.eve.schema.OidRegistryMonitor#nameResolved(
* java.lang.String, java.lang.String)
*/
- public void nameResolved( String a_oid, String a_name )
+ public void nameResolved( String oid, String name )
{
}
@@ -122,7 +96,7 @@
* @see org.apache.eve.schema.OidRegistryMonitor#namesResolved(
* java.lang.String, java.util.List)
*/
- public void namesResolved( String a_oid, List a_names )
+ public void namesResolved( String oid, List names )
{
}
@@ -131,7 +105,7 @@
* @see org.apache.eve.schema.OidRegistryMonitor#registered(
* java.lang.String, java.lang.String)
*/
- public void registered( String a_name, String a_oid )
+ public void registered( String name, String oid )
{
}
}
Modified: incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/SyntaxCheckerRegistry.java
==============================================================================
--- incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/SyntaxCheckerRegistry.java (original)
+++ incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/SyntaxCheckerRegistry.java Mon Sep 27 17:38:47 2004
@@ -1,97 +1,62 @@
/*
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * 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.eve.schema;
- ============================================================================
- The Apache Software License, Version 1.1
- ============================================================================
-
- Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modifica-
- tion, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- 3. The end-user documentation included with the redistribution, if any, must
- include the following acknowledgment: "This product includes software
- developed by the Apache Software Foundation (http://www.apache.org/)."
- Alternately, this acknowledgment may appear in the software itself, if
- and wherever such third-party acknowledgments normally appear.
-
- 4. The names "Eve Directory Server", "Apache Directory Project", "Apache Eve"
- and "Apache Software Foundation" must not be used to endorse or promote
- products derived from this software without prior written
- permission. For written permission, please contact apache@apache.org.
-
- 5. Products derived from this software may not be called "Apache", nor may
- "Apache" appear in their name, without prior written permission of the
- Apache Software Foundation.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
- DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- This software consists of voluntary contributions made by many individuals
- on behalf of the Apache Software Foundation. For more information on the
- Apache Software Foundation, please see <http://www.apache.org/>.
-
-*/
-package org.apache.eve.schema ;
+import javax.naming.NamingException;
-import javax.naming.NamingException ;
+import org.apache.ldap.common.schema.SyntaxChecker;
/**
* SyntaxChecker registry component's service interface.
*
- * @author <a href="mailto:akarasulu@apache.org">Alex Karasulu</a>
- * @author $LastChangedBy$
- * @version $LastChangedRevision$
+ * @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
+ * @version $Rev$
*/
public interface SyntaxCheckerRegistry
{
- /** Avalon service role */
- String ROLE = SyntaxCheckerRegistry.class.getName() ;
-
/**
* Registers a SyntaxChecker with this registry.
*
- * @param a_syntaxChecker the SyntaxChecker to register
+ * @param syntaxChecker the SyntaxChecker to register
* @throws NamingException if the SyntaxChecker is already registered or the
* registration operation is not supported
*/
- void register( SyntaxChecker a_syntaxChecker, String a_oid )
- throws NamingException ;
+ void register( SyntaxChecker syntaxChecker, String oid )
+ throws NamingException;
/**
* Looks up a SyntaxChecker by its unique Object Identifier.
*
- * @param a_oid the object identifier
+ * @param oid the object identifier
* @return the SyntaxChecker for the oid
* @throws NamingException if there is a backing store failure or the
* SyntaxChecker does not exist.
*/
- SyntaxChecker lookup( String a_oid ) throws NamingException ;
+ SyntaxChecker lookup( String oid ) throws NamingException;
/**
* Checks to see if a SyntaxChecker exists. Backing store failures simply
* return false.
*
- * @param a_oid the object identifier
+ * @param oid the object identifier
* @return true if a SyntaxChecker definition exists for the oid, false
* otherwise
*/
- boolean hasSyntaxChecker( String a_oid ) ;
+ boolean hasSyntaxChecker( String oid );
}
Modified: incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/SyntaxCheckerRegistryMonitor.java
==============================================================================
--- incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/SyntaxCheckerRegistryMonitor.java (original)
+++ incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/SyntaxCheckerRegistryMonitor.java Mon Sep 27 17:38:47 2004
@@ -1,95 +1,62 @@
/*
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * 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.eve.schema;
- ============================================================================
- The Apache Software License, Version 1.1
- ============================================================================
-
- Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modifica-
- tion, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- 3. The end-user documentation included with the redistribution, if any, must
- include the following acknowledgment: "This product includes software
- developed by the Apache Software Foundation (http://www.apache.org/)."
- Alternately, this acknowledgment may appear in the software itself, if
- and wherever such third-party acknowledgments normally appear.
-
- 4. The names "Eve Directory Server", "Apache Directory Project", "Apache Eve"
- and "Apache Software Foundation" must not be used to endorse or promote
- products derived from this software without prior written
- permission. For written permission, please contact apache@apache.org.
-
- 5. Products derived from this software may not be called "Apache", nor may
- "Apache" appear in their name, without prior written permission of the
- Apache Software Foundation.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
- DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- This software consists of voluntary contributions made by many individuals
- on behalf of the Apache Software Foundation. For more information on the
- Apache Software Foundation, please see <http://www.apache.org/>.
-
-*/
-package org.apache.eve.schema ;
+import javax.naming.NamingException;
-import javax.naming.NamingException ;
+import org.apache.ldap.common.schema.SyntaxChecker;
/**
* Monitor interface for a SyntaxCheckerRegistry.
*
- * @author <a href="mailto:akarasulu@apache.org">Alex Karasulu</a>
- * @author $Author: akarasulu $
- * @version $Rev: 1463 $
+ * @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
+ * @version $Rev$
*/
public interface SyntaxCheckerRegistryMonitor
{
/**
* Monitors when a SyntaxChecker is registered successfully.
*
- * @param a_syntaxChecker the SyntaxChecker registered
+ * @param syntaxChecker the SyntaxChecker registered
*/
- void registered( SyntaxChecker a_syntaxChecker ) ;
+ void registered( SyntaxChecker syntaxChecker );
/**
* Monitors when a SyntaxChecker is successfully looked up.
*
- * @param a_syntaxChecker the SyntaxChecker looked up
+ * @param syntaxChecker the SyntaxChecker looked up
*/
- void lookedUp( SyntaxChecker a_syntaxChecker ) ;
+ void lookedUp( SyntaxChecker syntaxChecker );
/**
* Monitors when a lookup attempt fails.
*
- * @param a_oid the OID for the SyntaxChecker to lookup
- * @param a_fault the exception to be thrown for the fault
+ * @param oid the OID for the SyntaxChecker to lookup
+ * @param fault the exception to be thrown for the fault
*/
- void lookupFailed( String a_oid, NamingException a_fault ) ;
+ void lookupFailed( String oid, NamingException fault );
/**
* Monitors when a registration attempt fails.
*
- * @param a_syntaxChecker the SyntaxChecker which failed registration
- * @param a_fault the exception to be thrown for the fault
+ * @param syntaxChecker the SyntaxChecker which failed registration
+ * @param fault the exception to be thrown for the fault
*/
- void registerFailed( SyntaxChecker a_syntaxChecker,
- NamingException a_fault ) ;
+ void registerFailed( SyntaxChecker syntaxChecker, NamingException fault );
}
Modified: incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/SyntaxCheckerRegistryMonitorAdapter.java
==============================================================================
--- incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/SyntaxCheckerRegistryMonitorAdapter.java (original)
+++ incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/SyntaxCheckerRegistryMonitorAdapter.java Mon Sep 27 17:38:47 2004
@@ -1,64 +1,32 @@
/*
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * 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.eve.schema;
- ============================================================================
- The Apache Software License, Version 1.1
- ============================================================================
-
- Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modifica-
- tion, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- 3. The end-user documentation included with the redistribution, if any, must
- include the following acknowledgment: "This product includes software
- developed by the Apache Software Foundation (http://www.apache.org/)."
- Alternately, this acknowledgment may appear in the software itself, if
- and wherever such third-party acknowledgments normally appear.
-
- 4. The names "Eve Directory Server", "Apache Directory Project", "Apache Eve"
- and "Apache Software Foundation" must not be used to endorse or promote
- products derived from this software without prior written
- permission. For written permission, please contact apache@apache.org.
-
- 5. Products derived from this software may not be called "Apache", nor may
- "Apache" appear in their name, without prior written permission of the
- Apache Software Foundation.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
- DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- This software consists of voluntary contributions made by many individuals
- on behalf of the Apache Software Foundation. For more information on the
- Apache Software Foundation, please see <http://www.apache.org/>.
-
-*/
-package org.apache.eve.schema ;
+import javax.naming.NamingException;
-import javax.naming.NamingException ;
+import org.apache.ldap.common.schema.SyntaxChecker;
/**
* An adapter for the SyntaxCheckerRegistry's monitor.
*
- * @author <a href="mailto:akarasulu@apache.org">Alex Karasulu</a>
- * @author $Author: akarasulu $
- * @version $Rev: 1463 $
+ * @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
+ * @version $Rev$
*/
public class SyntaxCheckerRegistryMonitorAdapter
implements SyntaxCheckerRegistryMonitor
@@ -67,7 +35,7 @@
* @see org.apache.eve.schema.SyntaxCheckerRegistryMonitor#registered(
* org.apache.eve.schema.SyntaxChecker)
*/
- public void registered( SyntaxChecker a_syntaxChecker)
+ public void registered( SyntaxChecker syntaxChecker)
{
}
@@ -76,7 +44,7 @@
* @see org.apache.eve.schema.SyntaxCheckerRegistryMonitor#lookedUp(
* org.apache.eve.schema.SyntaxChecker)
*/
- public void lookedUp( SyntaxChecker a_syntaxChecker )
+ public void lookedUp( SyntaxChecker syntaxChecker )
{
}
@@ -85,8 +53,12 @@
* @see org.apache.eve.schema.SyntaxCheckerRegistryMonitor#lookupFailed(
* java.lang.String, javax.naming.NamingException)
*/
- public void lookupFailed( String a_oid, NamingException a_fault )
+ public void lookupFailed( String oid, NamingException fault )
{
+ if ( fault != null )
+ {
+ fault.printStackTrace();
+ }
}
@@ -94,8 +66,12 @@
* @see org.apache.eve.schema.SyntaxCheckerRegistryMonitor#registerFailed(
* org.apache.eve.schema.SyntaxChecker, javax.naming.NamingException)
*/
- public void registerFailed( SyntaxChecker a_syntaxChecker,
- NamingException a_fault )
+ public void registerFailed( SyntaxChecker syntaxChecker,
+ NamingException fault )
{
+ if ( fault != null )
+ {
+ fault.printStackTrace();
+ }
}
}
Modified: incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/SyntaxRegistry.java
==============================================================================
--- incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/SyntaxRegistry.java (original)
+++ incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/SyntaxRegistry.java Mon Sep 27 17:38:47 2004
@@ -1,95 +1,60 @@
/*
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * 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.eve.schema;
- ============================================================================
- The Apache Software License, Version 1.1
- ============================================================================
-
- Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modifica-
- tion, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- 3. The end-user documentation included with the redistribution, if any, must
- include the following acknowledgment: "This product includes software
- developed by the Apache Software Foundation (http://www.apache.org/)."
- Alternately, this acknowledgment may appear in the software itself, if
- and wherever such third-party acknowledgments normally appear.
-
- 4. The names "Eve Directory Server", "Apache Directory Project", "Apache Eve"
- and "Apache Software Foundation" must not be used to endorse or promote
- products derived from this software without prior written
- permission. For written permission, please contact apache@apache.org.
-
- 5. Products derived from this software may not be called "Apache", nor may
- "Apache" appear in their name, without prior written permission of the
- Apache Software Foundation.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
- DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- This software consists of voluntary contributions made by many individuals
- on behalf of the Apache Software Foundation. For more information on the
- Apache Software Foundation, please see <http://www.apache.org/>.
-
-*/
-package org.apache.eve.schema ;
+import javax.naming.NamingException;
-import javax.naming.NamingException ;
+import org.apache.ldap.common.schema.Syntax;
/**
* Manages the lookup and registration of Syntaxes within the system by OID.
*
- * @author <a href="mailto:akarasulu@apache.org">Alex Karasulu</a>
- * @author $Author$
+ * @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
public interface SyntaxRegistry
{
- /** Avalon service role */
- String ROLE = SyntaxRegistry.ROLE ;
-
/**
* Looks up a Syntax by its unique Object Identifier.
*
- * @param a_oid the object identifier
+ * @param oid the object identifier
* @return the Syntax for the oid
* @throws NamingException if there is a backing store failure or the Syntax
* does not exist.
*/
- Syntax lookup( String a_oid ) throws NamingException ;
+ Syntax lookup( String oid ) throws NamingException;
/**
* Registers a Syntax with this registry.
*
- * @param a_syntax the Syntax to register
+ * @param syntax the Syntax to register
* @throws NamingException if the syntax is already registered or the
* registration operation is not supported
*/
- void register( Syntax a_syntax ) throws NamingException ;
+ void register( Syntax syntax ) throws NamingException;
/**
* Checks to see if a Syntax exists. Backing store failures simply return
* false.
*
- * @param a_oid the object identifier
+ * @param oid the object identifier
* @return true if a Syntax definition exists for the oid, false otherwise
*/
- boolean hasSyntax( String a_oid ) ;
+ boolean hasSyntax( String oid );
}
Modified: incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/SyntaxRegistryMonitor.java
==============================================================================
--- incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/SyntaxRegistryMonitor.java (original)
+++ incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/SyntaxRegistryMonitor.java Mon Sep 27 17:38:47 2004
@@ -1,61 +1,31 @@
/*
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * 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.eve.schema;
- ============================================================================
- The Apache Software License, Version 1.1
- ============================================================================
-
- Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modifica-
- tion, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- 3. The end-user documentation included with the redistribution, if any, must
- include the following acknowledgment: "This product includes software
- developed by the Apache Software Foundation (http://www.apache.org/)."
- Alternately, this acknowledgment may appear in the software itself, if
- and wherever such third-party acknowledgments normally appear.
-
- 4. The names "Eve Directory Server", "Apache Directory Project", "Apache Eve"
- and "Apache Software Foundation" must not be used to endorse or promote
- products derived from this software without prior written
- permission. For written permission, please contact apache@apache.org.
-
- 5. Products derived from this software may not be called "Apache", nor may
- "Apache" appear in their name, without prior written permission of the
- Apache Software Foundation.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
- DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- This software consists of voluntary contributions made by many individuals
- on behalf of the Apache Software Foundation. For more information on the
- Apache Software Foundation, please see <http://www.apache.org/>.
-
-*/
-package org.apache.eve.schema ;
import javax.naming.NamingException;
+import org.apache.ldap.common.schema.Syntax;
+
+
/**
* Monitor interface for a SyntaxRegistry.
*
- * @author <a href="mailto:akarasulu@apache.org">Alex Karasulu</a>
- * @author $Author$
+ * @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
public interface SyntaxRegistryMonitor
@@ -63,30 +33,30 @@
/**
* Monitors when a Syntax is registered successfully.
*
- * @param a_syntax the Syntax registered
+ * @param syntax the Syntax registered
*/
- void registered( Syntax a_syntax ) ;
+ void registered( Syntax syntax );
/**
* Monitors when a Syntax is successfully looked up.
*
- * @param a_syntax the Syntax looked up
+ * @param syntax the Syntax looked up
*/
- void lookedUp( Syntax a_syntax ) ;
+ void lookedUp( Syntax syntax );
/**
* Monitors when a lookup attempt fails.
*
- * @param a_oid the OID for the Syntax to lookup
- * @param a_fault the exception to be thrown for the fault
+ * @param oid the OID for the Syntax to lookup
+ * @param fault the exception to be thrown for the fault
*/
- void lookupFailed( String a_oid, NamingException a_fault ) ;
+ void lookupFailed( String oid, NamingException fault );
/**
* Monitors when a registration attempt fails.
*
- * @param a_syntax the Syntax which failed registration
- * @param a_fault the exception to be thrown for the fault
+ * @param syntax the Syntax which failed registration
+ * @param fault the exception to be thrown for the fault
*/
- void registerFailed( Syntax a_syntax, NamingException a_fault ) ;
+ void registerFailed( Syntax syntax, NamingException fault );
}
Modified: incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/SyntaxRegistryMonitorAdapter.java
==============================================================================
--- incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/SyntaxRegistryMonitorAdapter.java (original)
+++ incubator/directory/eve/trunk/backend/api/src/java/org/apache/eve/schema/SyntaxRegistryMonitorAdapter.java Mon Sep 27 17:38:47 2004
@@ -1,62 +1,31 @@
/*
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * 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.eve.schema;
- ============================================================================
- The Apache Software License, Version 1.1
- ============================================================================
-
- Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modifica-
- tion, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- 3. The end-user documentation included with the redistribution, if any, must
- include the following acknowledgment: "This product includes software
- developed by the Apache Software Foundation (http://www.apache.org/)."
- Alternately, this acknowledgment may appear in the software itself, if
- and wherever such third-party acknowledgments normally appear.
-
- 4. The names "Eve Directory Server", "Apache Directory Project", "Apache Eve"
- and "Apache Software Foundation" must not be used to endorse or promote
- products derived from this software without prior written
- permission. For written permission, please contact apache@apache.org.
-
- 5. Products derived from this software may not be called "Apache", nor may
- "Apache" appear in their name, without prior written permission of the
- Apache Software Foundation.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
- DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- This software consists of voluntary contributions made by many individuals
- on behalf of the Apache Software Foundation. For more information on the
- Apache Software Foundation, please see <http://www.apache.org/>.
-
-*/
-package org.apache.eve.schema ;
import javax.naming.NamingException;
+import org.apache.ldap.common.schema.Syntax;
+
/**
* An adapter for the SyntaxRegistry's monitor.
*
- * @author <a href="mailto:akarasulu@apache.org">Alex Karasulu</a>
- * @author $Author$
+ * @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
public class SyntaxRegistryMonitorAdapter implements SyntaxRegistryMonitor
@@ -65,7 +34,7 @@
* @see org.apache.eve.schema.SyntaxRegistryMonitor#registered(
* org.apache.eve.schema.Syntax)
*/
- public void registered( Syntax a_syntax)
+ public void registered( Syntax syntax)
{
}
@@ -74,7 +43,7 @@
* @see org.apache.eve.schema.SyntaxRegistryMonitor#lookedUp(
* org.apache.eve.schema.Syntax)
*/
- public void lookedUp( Syntax a_syntax )
+ public void lookedUp( Syntax syntax )
{
}
@@ -83,8 +52,12 @@
* @see org.apache.eve.schema.SyntaxRegistryMonitor#lookupFailed(
* java.lang.String, javax.naming.NamingException)
*/
- public void lookupFailed( String a_oid, NamingException a_fault )
+ public void lookupFailed( String oid, NamingException fault )
{
+ if ( fault != null )
+ {
+ fault.printStackTrace();
+ }
}
@@ -92,7 +65,11 @@
* @see org.apache.eve.schema.SyntaxRegistryMonitor#registerFailed(
* org.apache.eve.schema.Syntax, javax.naming.NamingException)
*/
- public void registerFailed( Syntax a_syntax, NamingException a_fault )
+ public void registerFailed( Syntax syntax, NamingException fault )
{
+ if ( fault != null )
+ {
+ fault.printStackTrace();
+ }
}
}