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 2008/03/29 03:50:04 UTC
svn commit: r642492 - in /directory/sandbox/akarasulu/bigbang/shared: ./
asn1-codec/ asn1-codec/src/main/resources/ asn1/
asn1/src/main/appended-resources/
asn1/src/main/appended-resources/META-INF/ asn1/src/main/resources/
convert/ convert/src/main/ap...
Author: akarasulu
Date: Fri Mar 28 19:50:00 2008
New Revision: 642492
URL: http://svn.apache.org/viewvc?rev=642492&view=rev
Log:
[MERGE][638217:642491] from bigbang changes since last merge
Added:
directory/sandbox/akarasulu/bigbang/shared/LICENSE
- copied unchanged from r642491, directory/shared/branches/bigbang/LICENSE
directory/sandbox/akarasulu/bigbang/shared/NOTICE
- copied unchanged from r642491, directory/shared/branches/bigbang/NOTICE
directory/sandbox/akarasulu/bigbang/shared/asn1/src/main/appended-resources/
- copied from r642491, directory/shared/branches/bigbang/asn1/src/main/appended-resources/
directory/sandbox/akarasulu/bigbang/shared/asn1/src/main/appended-resources/META-INF/
- copied from r642491, directory/shared/branches/bigbang/asn1/src/main/appended-resources/META-INF/
directory/sandbox/akarasulu/bigbang/shared/asn1/src/main/appended-resources/META-INF/LICENSE
- copied unchanged from r642491, directory/shared/branches/bigbang/asn1/src/main/appended-resources/META-INF/LICENSE
directory/sandbox/akarasulu/bigbang/shared/convert/src/main/appended-resources/
- copied from r642491, directory/shared/branches/bigbang/convert/src/main/appended-resources/
directory/sandbox/akarasulu/bigbang/shared/convert/src/main/appended-resources/META-INF/
- copied from r642491, directory/shared/branches/bigbang/convert/src/main/appended-resources/META-INF/
directory/sandbox/akarasulu/bigbang/shared/convert/src/main/appended-resources/META-INF/LICENSE
- copied unchanged from r642491, directory/shared/branches/bigbang/convert/src/main/appended-resources/META-INF/LICENSE
directory/sandbox/akarasulu/bigbang/shared/convert/src/main/appended-resources/META-INF/NOTICE
- copied unchanged from r642491, directory/shared/branches/bigbang/convert/src/main/appended-resources/META-INF/NOTICE
directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/appended-resources/
- copied from r642491, directory/shared/branches/bigbang/ldap/src/main/appended-resources/
directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/appended-resources/META-INF/
- copied from r642491, directory/shared/branches/bigbang/ldap/src/main/appended-resources/META-INF/
directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/appended-resources/META-INF/LICENSE
- copied unchanged from r642491, directory/shared/branches/bigbang/ldap/src/main/appended-resources/META-INF/LICENSE
directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/appended-resources/META-INF/NOTICE
- copied unchanged from r642491, directory/shared/branches/bigbang/ldap/src/main/appended-resources/META-INF/NOTICE
directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AssertionType.java
- copied unchanged from r642491, directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AssertionType.java
directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/util/DummySSLSocketFactory.java
- copied unchanged from r642491, directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/util/DummySSLSocketFactory.java
Removed:
directory/sandbox/akarasulu/bigbang/shared/asn1-codec/src/main/resources/
directory/sandbox/akarasulu/bigbang/shared/asn1/src/main/resources/
directory/sandbox/akarasulu/bigbang/shared/convert/src/main/resources/
directory/sandbox/akarasulu/bigbang/shared/ldap-constants/src/main/resources/
directory/sandbox/akarasulu/bigbang/shared/ldap-jndi/src/main/resources/
directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AssertionEnum.java
directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/resources/
Modified:
directory/sandbox/akarasulu/bigbang/shared/LAST_BIG_BANG_MERGE
directory/sandbox/akarasulu/bigbang/shared/asn1-codec/pom.xml
directory/sandbox/akarasulu/bigbang/shared/asn1/pom.xml
directory/sandbox/akarasulu/bigbang/shared/convert/pom.xml
directory/sandbox/akarasulu/bigbang/shared/ldap-constants/pom.xml
directory/sandbox/akarasulu/bigbang/shared/ldap-jndi/pom.xml
directory/sandbox/akarasulu/bigbang/shared/ldap/pom.xml
directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixTransformer.java
directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AbstractExprNode.java
directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AndNode.java
directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ApproximateNode.java
directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AssertionNode.java
directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/BranchNode.java
directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/EqualityNode.java
directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ExprNode.java
directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ExtensibleNode.java
directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/GreaterEqNode.java
directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/LeafNode.java
directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/LessEqNode.java
directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/NotNode.java
directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/OrNode.java
directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/PresenceNode.java
directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ScopeNode.java
directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SimpleNode.java
directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SubstringNode.java
directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/util/DirectoryClassUtils.java
directory/sandbox/akarasulu/bigbang/shared/pom.xml
Modified: directory/sandbox/akarasulu/bigbang/shared/LAST_BIG_BANG_MERGE
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/shared/LAST_BIG_BANG_MERGE?rev=642492&r1=642491&r2=642492&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/shared/LAST_BIG_BANG_MERGE (original)
+++ directory/sandbox/akarasulu/bigbang/shared/LAST_BIG_BANG_MERGE Fri Mar 28 19:50:00 2008
@@ -1,3 +1,6 @@
+$Rev$
+$Date$
+
This file shows the last time I merged from the big bang branch here as a commit
number:
@@ -13,7 +16,9 @@
Tue Mar 18 01:04:57 EDT 2008
----------------------------
svn merge -r 613574:638217 https://svn.apache.org/repos/asf/directory/shared/branches/bigbang .
-$Rev$
-$Date$
+
+Fri Mar 28 22:43:55 EDT 2008
+----------------------------
+svn merge -r 638217:642491 https://svn.apache.org/repos/asf/directory/shared/branches/bigbang .
Modified: directory/sandbox/akarasulu/bigbang/shared/asn1-codec/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/shared/asn1-codec/pom.xml?rev=642492&r1=642491&r2=642492&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/shared/asn1-codec/pom.xml (original)
+++ directory/sandbox/akarasulu/bigbang/shared/asn1-codec/pom.xml Fri Mar 28 19:50:00 2008
@@ -1,21 +1,24 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
+<?xml version="1.0" encoding="UTF-8"?>
- 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.
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
-->
-<!-- $Rev: $ $Date: $ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
Modified: directory/sandbox/akarasulu/bigbang/shared/asn1/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/shared/asn1/pom.xml?rev=642492&r1=642491&r2=642492&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/shared/asn1/pom.xml (original)
+++ directory/sandbox/akarasulu/bigbang/shared/asn1/pom.xml Fri Mar 28 19:50:00 2008
@@ -1,21 +1,24 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
+<?xml version="1.0" encoding="UTF-8"?>
- 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.
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
-->
-<!-- $Rev: $ $Date: $ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
Modified: directory/sandbox/akarasulu/bigbang/shared/convert/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/shared/convert/pom.xml?rev=642492&r1=642491&r2=642492&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/shared/convert/pom.xml (original)
+++ directory/sandbox/akarasulu/bigbang/shared/convert/pom.xml Fri Mar 28 19:50:00 2008
@@ -1,21 +1,24 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
+<?xml version="1.0" encoding="UTF-8"?>
- 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.
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
-->
-<!-- $Rev: $ $Date: $ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -44,26 +47,6 @@
<description>
Common LDAP converters : LDIF, DSML, CSV, etc
</description>
-
- <mailingLists>
- <mailingList>
- <name>Apache Directory Project</name>
- <subscribe>dev-subscribe@directory.apache.org</subscribe>
- <unsubscribe>dev-unsubscribe@directory.apache.org</unsubscribe>
- <archive>http://mail-archives.apache.org/mod_mbox/dev/</archive>
- <otherArchives>
- <otherArchive>http://www.archivum.info/dev@directory.apache.org/</otherArchive>
- </otherArchives>
- </mailingList>
- </mailingLists>
-
- <licenses>
- <license>
- <name>Apache 2.0 License</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
<dependencies>
Modified: directory/sandbox/akarasulu/bigbang/shared/ldap-constants/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/shared/ldap-constants/pom.xml?rev=642492&r1=642491&r2=642492&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/shared/ldap-constants/pom.xml (original)
+++ directory/sandbox/akarasulu/bigbang/shared/ldap-constants/pom.xml Fri Mar 28 19:50:00 2008
@@ -1,21 +1,24 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
+<?xml version="1.0" encoding="UTF-8"?>
- 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.
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
-->
-<!-- $Rev: $ $Date: $ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -44,26 +47,6 @@
<description>
Common LDAP constants used by clients and servers.
</description>
-
- <mailingLists>
- <mailingList>
- <name>Apache Directory Project</name>
- <subscribe>dev-subscribe@directory.apache.org</subscribe>
- <unsubscribe>dev-unsubscribe@directory.apache.org</unsubscribe>
- <archive>http://mail-archives.apache.org/mod_mbox/dev/</archive>
- <otherArchives>
- <otherArchive>http://www.archivum.info/dev@directory.apache.org/</otherArchive>
- </otherArchives>
- </mailingList>
- </mailingLists>
-
- <licenses>
- <license>
- <name>Apache 2.0 License</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
</project>
Modified: directory/sandbox/akarasulu/bigbang/shared/ldap-jndi/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/shared/ldap-jndi/pom.xml?rev=642492&r1=642491&r2=642492&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/shared/ldap-jndi/pom.xml (original)
+++ directory/sandbox/akarasulu/bigbang/shared/ldap-jndi/pom.xml Fri Mar 28 19:50:00 2008
@@ -1,21 +1,24 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
+<?xml version="1.0" encoding="UTF-8"?>
- 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.
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
-->
-<!-- $Rev: $ $Date: $ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
Modified: directory/sandbox/akarasulu/bigbang/shared/ldap/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/shared/ldap/pom.xml?rev=642492&r1=642491&r2=642492&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/shared/ldap/pom.xml (original)
+++ directory/sandbox/akarasulu/bigbang/shared/ldap/pom.xml Fri Mar 28 19:50:00 2008
@@ -1,21 +1,24 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
+<?xml version="1.0" encoding="UTF-8"?>
- 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.
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
-->
-<!-- $Rev: $ $Date: $ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -44,26 +47,6 @@
<description>
Common LDAP packages used by clients and servers.
</description>
-
- <mailingLists>
- <mailingList>
- <name>Apache Directory Project</name>
- <subscribe>dev-subscribe@directory.apache.org</subscribe>
- <unsubscribe>dev-unsubscribe@directory.apache.org</unsubscribe>
- <archive>http://mail-archives.apache.org/mod_mbox/dev/</archive>
- <otherArchives>
- <otherArchive>http://www.archivum.info/dev@directory.apache.org/</otherArchive>
- </otherArchives>
- </mailingList>
- </mailingLists>
-
- <licenses>
- <license>
- <name>Apache 2.0 License</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
<dependencies>
Modified: directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixTransformer.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixTransformer.java?rev=642492&r1=642491&r2=642492&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixTransformer.java (original)
+++ directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixTransformer.java Fri Mar 28 19:50:00 2008
@@ -302,7 +302,7 @@
private Message transformExtendedRequest( LdapMessage twixMessage, int messageId )
{
ExtendedRequest extendedRequest = twixMessage.getExtendedRequest();
- ExtendedRequestImpl snickersMessage = null;
+ ExtendedRequestImpl snickersMessage;
if ( extendedRequest.getRequestName().equals( GracefulShutdownRequest.EXTENSION_OID ) )
{
Modified: directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AbstractExprNode.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AbstractExprNode.java?rev=642492&r1=642491&r2=642492&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AbstractExprNode.java (original)
+++ directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AbstractExprNode.java Fri Mar 28 19:50:00 2008
@@ -35,11 +35,24 @@
/** The map of annotations */
protected Map<String, Object> annotations;
+ protected final AssertionType assertionType;
+
+
/**
* Creates a node by setting abstract node type.
*/
- protected AbstractExprNode()
+ protected AbstractExprNode( AssertionType assertionType )
{
+ this.assertionType = assertionType;
+ }
+
+
+ /**
+ * @see ExprNode#getAssertionType()
+ */
+ public AssertionType getAssertionType()
+ {
+ return assertionType;
}
Modified: directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AndNode.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AndNode.java?rev=642492&r1=642491&r2=642492&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AndNode.java (original)
+++ directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AndNode.java Fri Mar 28 19:50:00 2008
@@ -36,9 +36,9 @@
*
* @param childList the child nodes under this branch node.
*/
- public AndNode( List<ExprNode> children)
+ public AndNode( List<ExprNode> children )
{
- super( children );
+ super( children, AssertionType.AND );
}
@@ -56,9 +56,9 @@
*
* @return the operator constant.
*/
- public AssertionEnum getOperator()
+ public AssertionType getOperator()
{
- return AssertionEnum.AND;
+ return AssertionType.AND;
}
@@ -152,7 +152,7 @@
public int hashCode()
{
int hash = 37;
- hash = hash*17 + AssertionEnum.AND.hashCode();
+ hash = hash*17 + AssertionType.AND.hashCode();
hash = hash*17 + ( annotations == null ? 0 : annotations.hashCode() );
return hash;
}
Modified: directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ApproximateNode.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ApproximateNode.java?rev=642492&r1=642491&r2=642492&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ApproximateNode.java (original)
+++ directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ApproximateNode.java Fri Mar 28 19:50:00 2008
@@ -36,7 +36,7 @@
*/
public ApproximateNode( String attribute, byte[] value )
{
- super( attribute, value );
+ super( attribute, value, AssertionType.APPROXIMATE );
}
@@ -48,7 +48,7 @@
*/
public ApproximateNode( String attribute, String value )
{
- super( attribute, value );
+ super( attribute, value, AssertionType.APPROXIMATE );
}
Modified: directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AssertionNode.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AssertionNode.java?rev=642492&r1=642491&r2=642492&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AssertionNode.java (original)
+++ directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AssertionNode.java Fri Mar 28 19:50:00 2008
@@ -48,7 +48,7 @@
*
* @param assertion the arbitrary selection logic.
*/
- public AssertionNode(Assertion assertion)
+ public AssertionNode( Assertion assertion )
{
this( assertion, "ASSERTION" );
}
@@ -63,7 +63,7 @@
*/
public AssertionNode( Assertion assertion, String desc )
{
- super();
+ super( AssertionType.ASSERTION );
this.desc = desc;
this.assertion = assertion;
Modified: directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/BranchNode.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/BranchNode.java?rev=642492&r1=642491&r2=642492&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/BranchNode.java (original)
+++ directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/BranchNode.java Fri Mar 28 19:50:00 2008
@@ -42,9 +42,9 @@
*
* @param childList the child nodes under this branch node.
*/
- public BranchNode( List<ExprNode> children)
+ public BranchNode( List<ExprNode> children, AssertionType assertionType )
{
- super();
+ super( assertionType );
if ( null == children )
{
@@ -60,9 +60,9 @@
/**
* Creates a BranchNode using a logical operator.
*/
- public BranchNode()
+ public BranchNode( AssertionType assertionType )
{
- this( null );
+ this( null, assertionType );
}
/**
Modified: directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/EqualityNode.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/EqualityNode.java?rev=642492&r1=642491&r2=642492&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/EqualityNode.java (original)
+++ directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/EqualityNode.java Fri Mar 28 19:50:00 2008
@@ -36,7 +36,7 @@
*/
public EqualityNode( String attribute, byte[] value )
{
- super( attribute, value );
+ super( attribute, value, AssertionType.EQUALITY );
}
@@ -48,7 +48,7 @@
*/
public EqualityNode( String attribute, String value )
{
- super( attribute, value );
+ super( attribute, value, AssertionType.EQUALITY );
}
Modified: directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ExprNode.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ExprNode.java?rev=642492&r1=642491&r2=642492&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ExprNode.java (original)
+++ directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ExprNode.java Fri Mar 28 19:50:00 2008
@@ -55,10 +55,18 @@
*/
boolean isLeaf();
+
+ /**
+ * Gets the assertion type of this node. Make it possible to use switch
+ * statements on the node type.
+ *
+ * @return the assertion type
+ */
+ AssertionType getAssertionType();
/**
* Recursively appends the refinement string representation of this node and its
- * descendents in prefix notation to a buffer.
+ * descendants in prefix notation to a buffer.
*
* @param buf the buffer to append to.
* @throws UnsupportedOperationException if this node isn't a part of a refinement.
Modified: directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ExtensibleNode.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ExtensibleNode.java?rev=642492&r1=642491&r2=642492&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ExtensibleNode.java (original)
+++ directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ExtensibleNode.java Fri Mar 28 19:50:00 2008
@@ -48,7 +48,7 @@
*/
public ExtensibleNode( String attribute )
{
- super( attribute );
+ super( attribute, AssertionType.EXTENSIBLE );
dnAttributes = false;
}
@@ -77,7 +77,7 @@
*/
public ExtensibleNode( String attribute, byte[] value, String matchingRuleId, boolean dnAttributes )
{
- super( attribute );
+ super( attribute, AssertionType.EXTENSIBLE );
if ( value != null )
{
Modified: directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/GreaterEqNode.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/GreaterEqNode.java?rev=642492&r1=642491&r2=642492&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/GreaterEqNode.java (original)
+++ directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/GreaterEqNode.java Fri Mar 28 19:50:00 2008
@@ -36,7 +36,7 @@
*/
public GreaterEqNode( String attribute, byte[] value )
{
- super( attribute, value );
+ super( attribute, value, AssertionType.GREATEREQ );
}
@@ -48,7 +48,7 @@
*/
public GreaterEqNode( String attribute, String value )
{
- super( attribute, value );
+ super( attribute, value, AssertionType.GREATEREQ );
}
Modified: directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/LeafNode.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/LeafNode.java?rev=642492&r1=642491&r2=642492&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/LeafNode.java (original)
+++ directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/LeafNode.java Fri Mar 28 19:50:00 2008
@@ -37,9 +37,9 @@
*
* @param attribute the attribute this node is based on
*/
- protected LeafNode( String attribute )
+ protected LeafNode( String attribute, AssertionType assertionType )
{
- super();
+ super( assertionType );
this.attribute = attribute;
}
Modified: directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/LessEqNode.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/LessEqNode.java?rev=642492&r1=642491&r2=642492&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/LessEqNode.java (original)
+++ directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/LessEqNode.java Fri Mar 28 19:50:00 2008
@@ -36,7 +36,7 @@
*/
public LessEqNode( String attribute, byte[] value )
{
- super( attribute, value );
+ super( attribute, value, AssertionType.LESSEQ );
}
@@ -48,7 +48,7 @@
*/
public LessEqNode( String attribute, String value )
{
- super( attribute, value );
+ super( attribute, value, AssertionType.LESSEQ );
}
Modified: directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/NotNode.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/NotNode.java?rev=642492&r1=642491&r2=642492&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/NotNode.java (original)
+++ directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/NotNode.java Fri Mar 28 19:50:00 2008
@@ -38,9 +38,9 @@
*
* @param childList the child nodes under this branch node.
*/
- public NotNode( List<ExprNode> children)
+ public NotNode( List<ExprNode> children )
{
- super();
+ super( AssertionType.NOT );
if ( this.children.size() > 1 )
{
@@ -110,9 +110,9 @@
*
* @return the operator constant.
*/
- public AssertionEnum getOperator()
+ public AssertionType getOperator()
{
- return AssertionEnum.NOT;
+ return AssertionType.NOT;
}
@@ -202,7 +202,7 @@
public int hashCode()
{
int hash = 37;
- hash = hash*17 + AssertionEnum.NOT.hashCode();
+ hash = hash*17 + AssertionType.NOT.hashCode();
hash = hash*17 + ( annotations == null ? 0 : annotations.hashCode() );
return hash;
}
Modified: directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/OrNode.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/OrNode.java?rev=642492&r1=642491&r2=642492&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/OrNode.java (original)
+++ directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/OrNode.java Fri Mar 28 19:50:00 2008
@@ -38,7 +38,7 @@
*/
public OrNode( List<ExprNode> children)
{
- super( children );
+ super( children, AssertionType.OR );
}
@@ -58,9 +58,9 @@
*
* @return the operator constant.
*/
- public AssertionEnum getOperator()
+ public AssertionType getOperator()
{
- return AssertionEnum.OR;
+ return AssertionType.OR;
}
@@ -154,7 +154,7 @@
public int hashCode()
{
int hash = 37;
- hash = hash*17 + AssertionEnum.OR.hashCode();
+ hash = hash*17 + AssertionType.OR.hashCode();
hash = hash*17 + ( annotations == null ? 0 : annotations.hashCode() );
return hash;
}
Modified: directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/PresenceNode.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/PresenceNode.java?rev=642492&r1=642491&r2=642492&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/PresenceNode.java (original)
+++ directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/PresenceNode.java Fri Mar 28 19:50:00 2008
@@ -36,7 +36,7 @@
*/
public PresenceNode( String attribute )
{
- super( attribute );
+ super( attribute, AssertionType.PRESENCE );
}
Modified: directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ScopeNode.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ScopeNode.java?rev=642492&r1=642491&r2=642492&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ScopeNode.java (original)
+++ directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ScopeNode.java Fri Mar 28 19:50:00 2008
@@ -53,7 +53,7 @@
*/
public ScopeNode( AliasDerefMode aliasDerefAliases, String baseDn, int scope )
{
- super();
+ super( AssertionType.SCOPE );
this.scope = scope;
this.baseDn = baseDn;
this.aliasDerefAliases = aliasDerefAliases;
Modified: directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SimpleNode.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SimpleNode.java?rev=642492&r1=642491&r2=642492&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SimpleNode.java (original)
+++ directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SimpleNode.java Fri Mar 28 19:50:00 2008
@@ -43,9 +43,9 @@
* @param attribute the attribute name
* @param value the value to test for
*/
- protected SimpleNode( String attribute, byte[] value )
+ protected SimpleNode( String attribute, byte[] value, AssertionType assertionType )
{
- super( attribute );
+ super( attribute, assertionType );
this.value = value;
}
@@ -56,9 +56,9 @@
* @param attribute the attribute name
* @param value the value to test for
*/
- protected SimpleNode( String attribute, String value )
+ protected SimpleNode( String attribute, String value, AssertionType assertionType )
{
- super( attribute );
+ super( attribute, assertionType );
this.value = value;
}
Modified: directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SubstringNode.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SubstringNode.java?rev=642492&r1=642491&r2=642492&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SubstringNode.java (original)
+++ directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SubstringNode.java Fri Mar 28 19:50:00 2008
@@ -58,7 +58,7 @@
*/
public SubstringNode( String attribute, String initialPattern, String finalPattern )
{
- super( attribute );
+ super( attribute, AssertionType.SUBSTRING );
anyPattern = new ArrayList<String>( 2 );
this.finalPattern = finalPattern;
@@ -75,7 +75,7 @@
*/
public SubstringNode( String attribute )
{
- super( attribute );
+ super( attribute, AssertionType.SUBSTRING );
anyPattern = new ArrayList<String>( 2 );
this.finalPattern = null;
@@ -94,7 +94,7 @@
*/
public SubstringNode( List<String> anyPattern, String attribute, String initialPattern, String finalPattern )
{
- super( attribute );
+ super( attribute, AssertionType.SUBSTRING );
this.anyPattern = anyPattern;
this.finalPattern = finalPattern;
Modified: directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/util/DirectoryClassUtils.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/util/DirectoryClassUtils.java?rev=642492&r1=642491&r2=642492&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/util/DirectoryClassUtils.java (original)
+++ directory/sandbox/akarasulu/bigbang/shared/ldap/src/main/java/org/apache/directory/shared/ldap/util/DirectoryClassUtils.java Fri Mar 28 19:50:00 2008
@@ -20,6 +20,9 @@
package org.apache.directory.shared.ldap.util;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.lang.reflect.Method;
import java.util.Arrays;
@@ -29,9 +32,10 @@
*/
public class DirectoryClassUtils
{
+ private static final Logger LOG = LoggerFactory.getLogger( DirectoryClassUtils.class );
/**
- * A replacement for {@link java.lang.Class.getMethod} with extended capability.
+ * A replacement for {@link java.lang.Class#getMethod} with extended capability.
*
* <p>
* This method returns parameter-list assignment-compatible method as well as
@@ -41,13 +45,31 @@
* @param candidateMethodName Name of the method been looked for.
* @param candidateParameterTypes Types of the parameters in the signature of the method being loooked for.
* @return The Method found.
- * @throws NoSuchMethodException
+ * @throws NoSuchMethodException when the method cannot be found
*/
public static Method getAssignmentCompatibleMethod( Class<?> clazz,
String candidateMethodName,
Class<?>[] candidateParameterTypes
) throws NoSuchMethodException
{
+ if ( LOG.isDebugEnabled() )
+ {
+ StringBuilder buf = new StringBuilder();
+ buf.append( "call to getAssignmentCompatibleMethod(): \n\tclazz = " );
+ buf.append( clazz.getName() );
+ buf.append( "\n\tcandidateMethodName = " );
+ buf.append( candidateMethodName );
+ buf.append( "\n\tcandidateParameterTypes = " );
+
+ for ( Class<?> argClass : candidateParameterTypes )
+ {
+ buf.append( "\n\t\t" );
+ buf.append( argClass.getName() );
+ }
+
+ LOG.debug( buf.toString() );
+ }
+
try
{
// Look for exactly the same signature.
@@ -58,9 +80,12 @@
return exactMethod;
}
}
- catch ( SecurityException e ) { }
- catch ( NoSuchMethodException e ) { }
-
+ catch ( Exception e )
+ {
+ LOG.info( "Could not find accessible exact match for candidateMethod {}", candidateMethodName, e );
+ }
+
+
/**
* Look for the assignment-compatible signature.
*/
@@ -103,6 +128,7 @@
return methods[ mx ];
}
- throw new NoSuchMethodException( clazz.getName() + "." + candidateMethodName + "(" + Arrays.toString( candidateParameterTypes ) + ")" );
+ throw new NoSuchMethodException( clazz.getName() + "." + candidateMethodName
+ + "(" + Arrays.toString( candidateParameterTypes ) + ")" );
}
}
Modified: directory/sandbox/akarasulu/bigbang/shared/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/shared/pom.xml?rev=642492&r1=642491&r2=642492&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/shared/pom.xml (original)
+++ directory/sandbox/akarasulu/bigbang/shared/pom.xml Fri Mar 28 19:50:00 2008
@@ -1,21 +1,24 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
+
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ 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.
-->
-<!-- $Rev: $ $Date: $ -->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -135,26 +138,13 @@
<distributionManagement>
<site>
<id>apache.directory.shared</id>
- <url>scpexe://people.apache.org/home/felixk/public_html/projects/directory/shared/</url>
+ <url>scpexe://vm094.oxylos.org/var/www/html/projects/shared/</url>
</site>
</distributionManagement>
<reporting>
<excludeDefaults>true</excludeDefaults>
<plugins>
- <plugin>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <reportSets>
- <reportSet>
- <reports>
- <report>license</report>
- <report>dependencies</report>
- <report>issue-tracking</report>
- <report>index</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
<!--
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -297,5 +287,16 @@
<connection>scm:svn:http://svn.apache.org/repos/asf/directory/shared/branches/bigbang</connection>
</scm>
+ <repositories>
+ <repository>
+ <id>apache.directory.snapshot.repo</id>
+ <name>Snapshot repository for the Apache Directory project</name>
+ <url>http://vm094.oxylos.org/mirror-maven2/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
+
</project>