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 2007/08/29 22:55:29 UTC
svn commit: r570930 [1/4] - in /directory/sandbox/akarasulu:
refactoring-apacheds-trunk/ refactoring-apacheds-trunk/benchmarks/
refactoring-apacheds-trunk/bootstrap-plugin/src/main/resources/
refactoring-apacheds-trunk/core-unit/src/test/java/org/apach...
Author: akarasulu
Date: Wed Aug 29 13:55:22 2007
New Revision: 570930
URL: http://svn.apache.org/viewvc?rev=570930&view=rev
Log:
bringing refactoring branches up to date with merge from trunks
Added:
directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/resources/browserconnections.xml
- copied unchanged from r570928, directory/apacheds/trunk/server-installers/src/main/resources/browserconnections.xml
directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/resources/header_server.bmp
- copied unchanged from r570928, directory/apacheds/trunk/server-installers/src/main/resources/header_server.bmp
directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/resources/header_studio.bmp
- copied unchanged from r570928, directory/apacheds/trunk/server-installers/src/main/resources/header_studio.bmp
directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/resources/header_suite.bmp
- copied unchanged from r570928, directory/apacheds/trunk/server-installers/src/main/resources/header_suite.bmp
directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/resources/server-installer.ico
- copied unchanged from r570928, directory/apacheds/trunk/server-installers/src/main/resources/server-installer.ico
directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/resources/studio-installer.ico
- copied unchanged from r570928, directory/apacheds/trunk/server-installers/src/main/resources/studio-installer.ico
directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/resources/suite-installer.ico
- copied unchanged from r570928, directory/apacheds/trunk/server-installers/src/main/resources/suite-installer.ico
directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/resources/welcome_server.bmp
- copied unchanged from r570928, directory/apacheds/trunk/server-installers/src/main/resources/welcome_server.bmp
directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/resources/welcome_studio.bmp
- copied unchanged from r570928, directory/apacheds/trunk/server-installers/src/main/resources/welcome_studio.bmp
directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/resources/welcome_suite.bmp
- copied unchanged from r570928, directory/apacheds/trunk/server-installers/src/main/resources/welcome_suite.bmp
directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-unit/src/test/java/org/apache/directory/server/StoredProcedureExecutionITest.java
- copied unchanged from r570928, directory/apacheds/trunk/server-unit/src/test/java/org/apache/directory/server/StoredProcedureExecutionITest.java
directory/sandbox/akarasulu/refactoring-shared-trunk/ldap/src/main/java/org/apache/directory/shared/ldap/sp/JavaStoredProcUtils.java
- copied unchanged from r570929, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/sp/JavaStoredProcUtils.java
Removed:
directory/sandbox/akarasulu/refactoring-apacheds-trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/JavaStoredProcedureExtendedOperationHandler.java
directory/sandbox/akarasulu/refactoring-apacheds-trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/LanguageSpecificStoredProceureExtendedOperationHandler.java
directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/resources/both_header.bmp
directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/resources/header.bmp
directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/resources/server_header.bmp
directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/resources/studio_header.bmp
directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/resources/welcome.bmp
directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-unit/src/test/java/org/apache/directory/server/StoredProcedureTest.java
directory/sandbox/akarasulu/refactoring-daemon-trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/wrapper/lib/wrapper.jar
directory/sandbox/akarasulu/refactoring-daemon-trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/wrapper/lib/wrappertest.jar
directory/sandbox/akarasulu/refactoring-shared-trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/BERGeneralizedTime.java
directory/sandbox/akarasulu/refactoring-shared-trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/BERString.java
directory/sandbox/akarasulu/refactoring-shared-trunk/ldap/src/main/java/org/apache/directory/shared/ldap/sp/BaseJavaStoredProcUtils.java
directory/sandbox/akarasulu/refactoring-shared-trunk/ldap/src/main/java/org/apache/directory/shared/ldap/sp/JavaStoredProcedureUtils.java
Modified:
directory/sandbox/akarasulu/refactoring-apacheds-trunk/benchmarks/pom.xml
directory/sandbox/akarasulu/refactoring-apacheds-trunk/bootstrap-plugin/src/main/resources/log4j.properties
directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER783ITest.java
directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER791ITest.java
directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/java/org/apache/directory/server/core/jndi/SearchITest.java
directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/java/org/apache/directory/server/core/schema/ObjectClassCreateTest.java
directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/java/org/apache/directory/server/core/trigger/BackupUtilities.java
directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/java/org/apache/directory/server/core/trigger/LoggingUtilities.java
directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/java/org/apache/directory/server/core/trigger/SubentryServiceForTriggersITest.java
directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/java/org/apache/directory/server/core/trigger/TriggerServiceITest.java
directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/resources/log4j.properties
directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/resources/org/apache/directory/server/core/normalization/testDireve308Example.ldif
directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/resources/org/apache/directory/server/core/org.apache.directory.server.core.TestPTest.ldif
directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/resources/org/apache/directory/server/core/schema/nonspecific.ldif
directory/sandbox/akarasulu/refactoring-apacheds-trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java
directory/sandbox/akarasulu/refactoring-apacheds-trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
directory/sandbox/akarasulu/refactoring-apacheds-trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java
directory/sandbox/akarasulu/refactoring-apacheds-trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java
directory/sandbox/akarasulu/refactoring-apacheds-trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
directory/sandbox/akarasulu/refactoring-apacheds-trunk/core/src/main/java/org/apache/directory/server/core/sp/StoredProcExecutionManager.java
directory/sandbox/akarasulu/refactoring-apacheds-trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java
directory/sandbox/akarasulu/refactoring-apacheds-trunk/core/src/test/resources/log4j.properties
directory/sandbox/akarasulu/refactoring-apacheds-trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributeSerializer.java
directory/sandbox/akarasulu/refactoring-apacheds-trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributesSerializer.java
directory/sandbox/akarasulu/refactoring-apacheds-trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/ArcFourHmacMd5Encryption.java
directory/sandbox/akarasulu/refactoring-apacheds-trunk/mitosis/src/test/resources/log4j.properties
directory/sandbox/akarasulu/refactoring-apacheds-trunk/pom.xml
directory/sandbox/akarasulu/refactoring-apacheds-trunk/protocol-dhcp/src/test/resources/log4j.properties
directory/sandbox/akarasulu/refactoring-apacheds-trunk/protocol-dns/src/test/resources/log4j.properties
directory/sandbox/akarasulu/refactoring-apacheds-trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/StoredProcedureExtendedOperationHandler.java
directory/sandbox/akarasulu/refactoring-apacheds-trunk/protocol-ntp/src/test/resources/log4j.properties
directory/sandbox/akarasulu/refactoring-apacheds-trunk/protocol-shared/src/test/java/org/apache/directory/server/protocol/shared/catalog/configuration-dns.ldif
directory/sandbox/akarasulu/refactoring-apacheds-trunk/protocol-shared/src/test/log4j.properties
directory/sandbox/akarasulu/refactoring-apacheds-trunk/sar-plugin/pom.xml
directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/ (props changed)
directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/pom.xml
directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/installers/apacheds-default.conf
directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/installers/apacheds-fhs.conf
directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/installers/apacheds-init
directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/installers/apacheds-rpm.spec
directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/installers/apacheds-server-win.nsi
directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/installers/apacheds-suite-win.nsi
directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/installers/apacheds-sysconfig.conf
directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/installers/apacheds.conf
directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/installers/log4j.properties
directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/installers/rpm-apacheds-tools.sh
directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/java/Dummy.java
directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-installers/src/main/resources/connections.xml
directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-main/log4j.properties
directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-sar/pom.xml
directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-tools/src/test/resources/org/apache/directory/server/tools/commands/exportcmd/10_entries.ldif
directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-tools/src/test/resources/org/apache/directory/server/tools/commands/importcmd/RFC2849Sample1.ldif
directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-tools/src/test/resources/org/apache/directory/server/tools/commands/importcmd/RFC2849Sample2.ldif
directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-tools/src/test/resources/org/apache/directory/server/tools/commands/importcmd/RFC2849Sample3.ldif
directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-tools/src/test/resources/org/apache/directory/server/tools/commands/importcmd/RFC2849Sample3VariousSpacing.ldif
directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-tools/src/test/resources/org/apache/directory/server/tools/commands/importcmd/import_10_entries.ldif
directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-tools/src/test/resources/org/apache/directory/server/tools/commands/importcmd/import_1_entry.ldif
directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-tools/src/test/resources/org/apache/directory/server/tools/commands/importcmd/import_1_entry_on_error.ldif
directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-tools/src/test/resources/org/apache/directory/server/tools/commands/importcmd/import_2_entries_error_and_ok.ldif
directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-unit/src/test/resources/log4j.properties
directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-unit/src/test/resources/org/apache/directory/server/DIRSERVER951ITest.ldif
directory/sandbox/akarasulu/refactoring-apacheds-trunk/server-unit/src/test/resources/org/apache/directory/server/NegationOperatorITest.ldif
directory/sandbox/akarasulu/refactoring-daemon-trunk/bootstrappers/pom.xml
directory/sandbox/akarasulu/refactoring-daemon-trunk/plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java
directory/sandbox/akarasulu/refactoring-daemon-trunk/plugin/src/main/java/org/apache/directory/daemon/installers/ServiceInstallersMojo.java
directory/sandbox/akarasulu/refactoring-daemon-trunk/plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java
directory/sandbox/akarasulu/refactoring-daemon-trunk/pom.xml
directory/sandbox/akarasulu/refactoring-shared-trunk/convert/src/test/resources/org/apache/directory/shared/converter/schema/test.schema
directory/sandbox/akarasulu/refactoring-shared-trunk/convert/src/test/resources/org/apache/directory/shared/converter/schema/test2.schema
directory/sandbox/akarasulu/refactoring-shared-trunk/convert/src/test/resources/org/apache/directory/shared/converter/schema/testATCollective.schema
directory/sandbox/akarasulu/refactoring-shared-trunk/convert/src/test/resources/org/apache/directory/shared/converter/schema/testATDesc.schema
directory/sandbox/akarasulu/refactoring-shared-trunk/convert/src/test/resources/org/apache/directory/shared/converter/schema/testATEquality.schema
directory/sandbox/akarasulu/refactoring-shared-trunk/convert/src/test/resources/org/apache/directory/shared/converter/schema/testATEqualityOID.schema
directory/sandbox/akarasulu/refactoring-shared-trunk/convert/src/test/resources/org/apache/directory/shared/converter/schema/testATMinimal.schema
directory/sandbox/akarasulu/refactoring-shared-trunk/convert/src/test/resources/org/apache/directory/shared/converter/schema/testATName2.schema
directory/sandbox/akarasulu/refactoring-shared-trunk/convert/src/test/resources/org/apache/directory/shared/converter/schema/testATNameMany.schema
directory/sandbox/akarasulu/refactoring-shared-trunk/convert/src/test/resources/org/apache/directory/shared/converter/schema/testATNameOne.schema
directory/sandbox/akarasulu/refactoring-shared-trunk/convert/src/test/resources/org/apache/directory/shared/converter/schema/testATNoName.schema
directory/sandbox/akarasulu/refactoring-shared-trunk/convert/src/test/resources/org/apache/directory/shared/converter/schema/testATNoUserModification.schema
directory/sandbox/akarasulu/refactoring-shared-trunk/convert/src/test/resources/org/apache/directory/shared/converter/schema/testATObsolete.schema
directory/sandbox/akarasulu/refactoring-shared-trunk/convert/src/test/resources/org/apache/directory/shared/converter/schema/testATOrdering.schema
directory/sandbox/akarasulu/refactoring-shared-trunk/convert/src/test/resources/org/apache/directory/shared/converter/schema/testATOrderingOID.schema
directory/sandbox/akarasulu/refactoring-shared-trunk/convert/src/test/resources/org/apache/directory/shared/converter/schema/testATSingleValue.schema
directory/sandbox/akarasulu/refactoring-shared-trunk/convert/src/test/resources/org/apache/directory/shared/converter/schema/testATSubstr.schema
directory/sandbox/akarasulu/refactoring-shared-trunk/convert/src/test/resources/org/apache/directory/shared/converter/schema/testATSubstrOID.schema
directory/sandbox/akarasulu/refactoring-shared-trunk/convert/src/test/resources/org/apache/directory/shared/converter/schema/testATSup.schema
directory/sandbox/akarasulu/refactoring-shared-trunk/convert/src/test/resources/org/apache/directory/shared/converter/schema/testATSupOID.schema
directory/sandbox/akarasulu/refactoring-shared-trunk/convert/src/test/resources/org/apache/directory/shared/converter/schema/testATSyntax.schema
directory/sandbox/akarasulu/refactoring-shared-trunk/convert/src/test/resources/org/apache/directory/shared/converter/schema/testATSyntaxOidLen.schema
directory/sandbox/akarasulu/refactoring-shared-trunk/convert/src/test/resources/org/apache/directory/shared/converter/schema/testATUsageDirOp.schema
directory/sandbox/akarasulu/refactoring-shared-trunk/convert/src/test/resources/org/apache/directory/shared/converter/schema/testATUsageDistrOp.schema
directory/sandbox/akarasulu/refactoring-shared-trunk/convert/src/test/resources/org/apache/directory/shared/converter/schema/testATUsageDsaOp.schema
directory/sandbox/akarasulu/refactoring-shared-trunk/convert/src/test/resources/org/apache/directory/shared/converter/schema/testATUsageUserApp.schema
directory/sandbox/akarasulu/refactoring-shared-trunk/convert/src/test/resources/org/apache/directory/shared/converter/schema/testMozillaATWithOidLen.schema
directory/sandbox/akarasulu/refactoring-shared-trunk/convert/src/test/resources/org/apache/directory/shared/converter/schema/testOC.schema
directory/sandbox/akarasulu/refactoring-shared-trunk/convert/src/test/resources/org/apache/directory/shared/converter/schema/testOCAbstract.schema
directory/sandbox/akarasulu/refactoring-shared-trunk/convert/src/test/resources/org/apache/directory/shared/converter/schema/testOCAuxiliary.schema
directory/sandbox/akarasulu/refactoring-shared-trunk/convert/src/test/resources/org/apache/directory/shared/converter/schema/testOCDesc.schema
directory/sandbox/akarasulu/refactoring-shared-trunk/convert/src/test/resources/org/apache/directory/shared/converter/schema/testOCMay2.schema
directory/sandbox/akarasulu/refactoring-shared-trunk/convert/src/test/resources/org/apache/directory/shared/converter/schema/testOCMayMany.schema
directory/sandbox/akarasulu/refactoring-shared-trunk/convert/src/test/resources/org/apache/directory/shared/converter/schema/testOCMayOne.schema
directory/sandbox/akarasulu/refactoring-shared-trunk/convert/src/test/resources/org/apache/directory/shared/converter/schema/testOCMinimal.schema
directory/sandbox/akarasulu/refactoring-shared-trunk/convert/src/test/resources/org/apache/directory/shared/converter/schema/testOCMust2.schema
directory/sandbox/akarasulu/refactoring-shared-trunk/convert/src/test/resources/org/apache/directory/shared/converter/schema/testOCMustMany.schema
directory/sandbox/akarasulu/refactoring-shared-trunk/convert/src/test/resources/org/apache/directory/shared/converter/schema/testOCMustOne.schema
directory/sandbox/akarasulu/refactoring-shared-trunk/convert/src/test/resources/org/apache/directory/shared/converter/schema/testOCName2.schema
directory/sandbox/akarasulu/refactoring-shared-trunk/convert/src/test/resources/org/apache/directory/shared/converter/schema/testOCNameMany.schema
directory/sandbox/akarasulu/refactoring-shared-trunk/convert/src/test/resources/org/apache/directory/shared/converter/schema/testOCNameOne.schema
directory/sandbox/akarasulu/refactoring-shared-trunk/convert/src/test/resources/org/apache/directory/shared/converter/schema/testOCNoName.schema
directory/sandbox/akarasulu/refactoring-shared-trunk/convert/src/test/resources/org/apache/directory/shared/converter/schema/testOCObsolete.schema
directory/sandbox/akarasulu/refactoring-shared-trunk/convert/src/test/resources/org/apache/directory/shared/converter/schema/testOCSup2.schema
directory/sandbox/akarasulu/refactoring-shared-trunk/convert/src/test/resources/org/apache/directory/shared/converter/schema/testOCSupMany.schema
directory/sandbox/akarasulu/refactoring-shared-trunk/convert/src/test/resources/org/apache/directory/shared/converter/schema/testOCSupOne.schema
directory/sandbox/akarasulu/refactoring-shared-trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java
directory/sandbox/akarasulu/refactoring-shared-trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/AttributeDescAction.java
directory/sandbox/akarasulu/refactoring-shared-trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequest.java
directory/sandbox/akarasulu/refactoring-shared-trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AbstractSchemaDescription.java
directory/sandbox/akarasulu/refactoring-shared-trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/parser/AbstractSchemaParser.java
directory/sandbox/akarasulu/refactoring-shared-trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/parser/ReusableAntlrSchemaLexer.java
directory/sandbox/akarasulu/refactoring-shared-trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/parser/ReusableAntlrSchemaParser.java
directory/sandbox/akarasulu/refactoring-shared-trunk/ldap/src/main/java/org/apache/directory/shared/ldap/sp/LdapContextParameter.java
directory/sandbox/akarasulu/refactoring-shared-trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java
directory/sandbox/akarasulu/refactoring-shared-trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java
directory/sandbox/akarasulu/refactoring-shared-trunk/ldap/src/test/resources/log4j.properties
Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/benchmarks/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/benchmarks/pom.xml?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/benchmarks/pom.xml (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/benchmarks/pom.xml Wed Aug 29 13:55:22 2007
@@ -1,4 +1,21 @@
<?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
+
+ 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>
<modelVersion>4.0.0</modelVersion>
<parent>
Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/bootstrap-plugin/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/bootstrap-plugin/src/main/resources/log4j.properties?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/bootstrap-plugin/src/main/resources/log4j.properties (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/bootstrap-plugin/src/main/resources/log4j.properties Wed Aug 29 13:55:22 2007
@@ -1,3 +1,19 @@
+#############################################################################
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#############################################################################
log4j.rootCategory=ERROR, stdout
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER783ITest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER783ITest.java?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER783ITest.java (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER783ITest.java Wed Aug 29 13:55:22 2007
@@ -1,4 +1,22 @@
-
+/*
+ * 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.
+ *
+ */
package org.apache.directory.server.core.jndi;
import java.util.Hashtable;
Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER791ITest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER791ITest.java?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER791ITest.java (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER791ITest.java Wed Aug 29 13:55:22 2007
@@ -1,4 +1,22 @@
-
+/*
+ * 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.
+ *
+ */
package org.apache.directory.server.core.jndi;
import java.util.Hashtable;
Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/java/org/apache/directory/server/core/jndi/SearchITest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/java/org/apache/directory/server/core/jndi/SearchITest.java?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/java/org/apache/directory/server/core/jndi/SearchITest.java (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/java/org/apache/directory/server/core/jndi/SearchITest.java Wed Aug 29 13:55:22 2007
@@ -222,6 +222,83 @@
assertNull( attrs.get( "creatorsName" ) );
}
+ public void testSearchUserAttrAndOpAttr() throws NamingException
+ {
+ SearchControls controls = new SearchControls();
+ controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
+ controls.setDerefLinkFlag( false );
+ controls.setReturningAttributes( new String[] { "*", "creatorsName" } );
+ sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES, DerefAliasesEnum.NEVER_DEREF_ALIASES );
+ HashMap<String, Attributes> map = new HashMap<String, Attributes>();
+
+ NamingEnumeration list = sysRoot.search( "", "(ou=testing01)", controls );
+ while ( list.hasMore() )
+ {
+ SearchResult result = ( SearchResult ) list.next();
+ map.put( result.getName(), result.getAttributes() );
+ }
+
+ assertEquals( "Expected number of results returned was incorrect!", 1, map.size() );
+
+ Attributes attrs = map.get( "ou=testing01,ou=system" );
+
+ assertNotNull( attrs.get( "objectClass" ) );
+ assertNotNull( attrs.get( "ou" ) );
+ assertNotNull( attrs.get( "creatorsName" ) );
+ assertNull( attrs.get( "createTimestamp" ) );
+ }
+
+ public void testSearchUserAttrAndNoAttr() throws NamingException
+ {
+ SearchControls controls = new SearchControls();
+ controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
+ controls.setDerefLinkFlag( false );
+ controls.setReturningAttributes( new String[] { "1.1", "ou" } );
+ sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES, DerefAliasesEnum.NEVER_DEREF_ALIASES );
+ HashMap<String, Attributes> map = new HashMap<String, Attributes>();
+
+ NamingEnumeration list = sysRoot.search( "", "(ou=testing01)", controls );
+ while ( list.hasMore() )
+ {
+ SearchResult result = ( SearchResult ) list.next();
+ map.put( result.getName(), result.getAttributes() );
+ }
+
+ assertEquals( "Expected number of results returned was incorrect!", 1, map.size() );
+
+ Attributes attrs = map.get( "ou=testing01,ou=system" );
+
+ assertNull( attrs.get( "objectClass" ) );
+ assertNotNull( attrs.get( "ou" ) );
+ assertNull( attrs.get( "creatorsName" ) );
+ assertNull( attrs.get( "createTimestamp" ) );
+ }
+
+ public void testSearchNoAttr() throws NamingException
+ {
+ SearchControls controls = new SearchControls();
+ controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
+ controls.setDerefLinkFlag( false );
+ controls.setReturningAttributes( new String[] { "1.1" } );
+ sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES, DerefAliasesEnum.NEVER_DEREF_ALIASES );
+ HashMap<String, Attributes> map = new HashMap<String, Attributes>();
+
+ NamingEnumeration list = sysRoot.search( "", "(ou=testing01)", controls );
+ while ( list.hasMore() )
+ {
+ SearchResult result = ( SearchResult ) list.next();
+ map.put( result.getName(), result.getAttributes() );
+ }
+
+ assertEquals( "Expected number of results returned was incorrect!", 1, map.size() );
+
+ Attributes attrs = map.get( "ou=testing01,ou=system" );
+
+ assertNull( attrs.get( "objectClass" ) );
+ assertNull( attrs.get( "ou" ) );
+ assertNull( attrs.get( "creatorsName" ) );
+ assertNull( attrs.get( "createTimestamp" ) );
+ }
public void testSearchAllAttr() throws NamingException
{
Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/java/org/apache/directory/server/core/schema/ObjectClassCreateTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/java/org/apache/directory/server/core/schema/ObjectClassCreateTest.java?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/java/org/apache/directory/server/core/schema/ObjectClassCreateTest.java (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/java/org/apache/directory/server/core/schema/ObjectClassCreateTest.java Wed Aug 29 13:55:22 2007
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ *
+ */
package org.apache.directory.server.core.schema;
import javax.naming.NamingException;
Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/java/org/apache/directory/server/core/trigger/BackupUtilities.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/java/org/apache/directory/server/core/trigger/BackupUtilities.java?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/java/org/apache/directory/server/core/trigger/BackupUtilities.java (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/java/org/apache/directory/server/core/trigger/BackupUtilities.java Wed Aug 29 13:55:22 2007
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ *
+ */
package org.apache.directory.server.core.trigger;
import javax.naming.Name;
@@ -9,6 +28,10 @@
import org.slf4j.LoggerFactory;
+/**
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev:$
+ */
public class BackupUtilities
{
private static final Logger log = LoggerFactory.getLogger( BackupUtilities.class );
Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/java/org/apache/directory/server/core/trigger/LoggingUtilities.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/java/org/apache/directory/server/core/trigger/LoggingUtilities.java?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/java/org/apache/directory/server/core/trigger/LoggingUtilities.java (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/java/org/apache/directory/server/core/trigger/LoggingUtilities.java Wed Aug 29 13:55:22 2007
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ *
+ */
package org.apache.directory.server.core.trigger;
import javax.naming.Name;
@@ -7,6 +26,10 @@
import org.slf4j.LoggerFactory;
+/**
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev:$
+ */
public class LoggingUtilities
{
private static final Logger log = LoggerFactory.getLogger( LoggingUtilities.class );
Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/java/org/apache/directory/server/core/trigger/SubentryServiceForTriggersITest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/java/org/apache/directory/server/core/trigger/SubentryServiceForTriggersITest.java?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/java/org/apache/directory/server/core/trigger/SubentryServiceForTriggersITest.java (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/java/org/apache/directory/server/core/trigger/SubentryServiceForTriggersITest.java Wed Aug 29 13:55:22 2007
@@ -32,7 +32,6 @@
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
-import org.apache.directory.server.core.subtree.SubentryService;
import org.apache.directory.server.core.unit.AbstractAdminTestCase;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.exception.LdapNoSuchAttributeException;
Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/java/org/apache/directory/server/core/trigger/TriggerServiceITest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/java/org/apache/directory/server/core/trigger/TriggerServiceITest.java?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/java/org/apache/directory/server/core/trigger/TriggerServiceITest.java (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/java/org/apache/directory/server/core/trigger/TriggerServiceITest.java Wed Aug 29 13:55:22 2007
@@ -27,7 +27,7 @@
import org.apache.directory.server.core.unit.AbstractAdminTestCase;
import org.apache.directory.shared.ldap.message.AttributesImpl;
-import org.apache.directory.shared.ldap.sp.BaseJavaStoredProcUtils;
+import org.apache.directory.shared.ldap.sp.JavaStoredProcUtils;
import org.apache.directory.shared.ldap.trigger.TriggerUtils;
import org.apache.directory.shared.ldap.util.AttributeUtils;
@@ -84,7 +84,7 @@
injectEntries( ldif );
// Load the stored procedure unit which has the stored procedure to be triggered.
- BaseJavaStoredProcUtils.loadStoredProcedureClass( spCtx, BackupUtilitiesSP.class );
+ JavaStoredProcUtils.loadStoredProcedureClass( spCtx, BackupUtilitiesSP.class );
// Create the Entry Trigger Specification.
TriggerUtils.defineTriggerExecutionSpecificPoint( ctx );
@@ -108,7 +108,7 @@
public void testAfterDeleteBackupDeletedEntryPrescriptiveTrigger() throws NamingException
{
// Load the stored procedure unit which has the stored procedure to be triggered.
- BaseJavaStoredProcUtils.loadStoredProcedureClass( spCtx, BackupUtilitiesSP.class );
+ JavaStoredProcUtils.loadStoredProcedureClass( spCtx, BackupUtilitiesSP.class );
// Create a container for backing up deleted entries.
String ldif =
@@ -182,7 +182,7 @@
"cn: teachers\n";
// Load the stored procedure unit which has the stored procedure to be triggered.
- BaseJavaStoredProcUtils.loadStoredProcedureClass( spCtx, ListUtilsSP.class );
+ JavaStoredProcUtils.loadStoredProcedureClass( spCtx, ListUtilsSP.class );
// Inject the ldif file into the server
injectEntries( ldif );
Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/resources/log4j.properties?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/resources/log4j.properties (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/resources/log4j.properties Wed Aug 29 13:55:22 2007
@@ -1,3 +1,19 @@
+#############################################################################
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#############################################################################
log4j.rootCategory=OFF, stdout
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/resources/org/apache/directory/server/core/normalization/testDireve308Example.ldif
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/resources/org/apache/directory/server/core/normalization/testDireve308Example.ldif?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/resources/org/apache/directory/server/core/normalization/testDireve308Example.ldif (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/resources/org/apache/directory/server/core/normalization/testDireve308Example.ldif Wed Aug 29 13:55:22 2007
@@ -1,3 +1,26 @@
+#
+# 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.
+#
+# EXAMPLE.COM is reserved for testing according to this RFC:
+#
+# http://www.rfc-editor.org/rfc/rfc2606.txt
+#
+
dn: ou=direct report view,ou=system
objectClass: organizationalUnit
ou: direct report view
Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/resources/org/apache/directory/server/core/org.apache.directory.server.core.TestPTest.ldif
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/resources/org/apache/directory/server/core/org.apache.directory.server.core.TestPTest.ldif?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/resources/org/apache/directory/server/core/org.apache.directory.server.core.TestPTest.ldif (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/resources/org/apache/directory/server/core/org.apache.directory.server.core.TestPTest.ldif Wed Aug 29 13:55:22 2007
@@ -1,3 +1,26 @@
+#
+# 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.
+#
+# EXAMPLE.COM is reserved for testing according to this RFC:
+#
+# http://www.rfc-editor.org/rfc/rfc2606.txt
+#
+
dn: uid=user.1,ou=test
objectClass: top
objectClass: person
Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/resources/org/apache/directory/server/core/schema/nonspecific.ldif
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/resources/org/apache/directory/server/core/schema/nonspecific.ldif?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/resources/org/apache/directory/server/core/schema/nonspecific.ldif (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/core-unit/src/test/resources/org/apache/directory/server/core/schema/nonspecific.ldif Wed Aug 29 13:55:22 2007
@@ -1,3 +1,25 @@
+#
+# 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.
+#
+# EXAMPLE.COM is reserved for testing according to this RFC:
+#
+# http://www.rfc-editor.org/rfc/rfc2606.txt
+#
dn: cn=person0,ou=system
objectClass: person
Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java Wed Aug 29 13:55:22 2007
@@ -164,7 +164,7 @@
*/
if ( retAttrs == null )
{
- retAttrs = new String[] { "*" };
+ retAttrs = SchemaConstants.ALL_USER_ATTRIBUTES_ARRAY;
}
/*
@@ -210,15 +210,18 @@
Set<AttributeType> allSuperTypes = getAllSuperTypes( attrType );
Iterator<String> it = retIdsSet.iterator();
+
while ( it.hasNext() )
{
String retId = it.next();
- if ( retId.equals( "*" ) || retId.equals( "+" ) )
+
+ if ( retId.equals( SchemaConstants.ALL_USER_ATTRIBUTES ) || retId.equals( SchemaConstants.ALL_OPERATIONAL_ATTRIBUTES ) )
{
continue;
}
AttributeType retType = attrTypeRegistry.lookup( retId );
+
if ( allSuperTypes.contains( retType ) )
{
retIdsSet.add( attrId );
@@ -230,7 +233,7 @@
* If not all attributes or this collective attribute requested specifically
* then bypass the inclusion process.
*/
- if ( !( retIdsSet.contains( "*" ) || retIdsSet.contains( attrId ) ) )
+ if ( !( retIdsSet.contains( SchemaConstants.ALL_USER_ATTRIBUTES ) || retIdsSet.contains( attrId ) ) )
{
continue;
}
@@ -293,7 +296,7 @@
if ( ( opContext.getAttrsId() == null ) || ( opContext.getAttrsId().size() == 0 ) )
{
- addCollectiveAttributes( opContext.getDn(), result, new String[] { "*" } );
+ addCollectiveAttributes( opContext.getDn(), result, SchemaConstants.ALL_USER_ATTRIBUTES_ARRAY );
}
else
{
Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java Wed Aug 29 13:55:22 2007
@@ -865,18 +865,20 @@
boolean containsAsterisk = false;
boolean containsPlus = false;
boolean containsOneDotOne = false;
- for ( int ii = 0; ii < ids.length; ii++ )
+
+ for ( String id:ids )
{
- String id = ids[ii].trim();
- if ( id.equals( "*" ) )
+ String idTrimmed = id.trim();
+
+ if ( idTrimmed.equals( SchemaConstants.ALL_USER_ATTRIBUTES ) )
{
containsAsterisk = true;
}
- else if ( id.equals( "+" ) )
+ else if ( idTrimmed.equals( SchemaConstants.ALL_OPERATIONAL_ATTRIBUTES ) )
{
containsPlus = true;
}
- else if ( id.equals( "1.1" ) )
+ else if ( idTrimmed.equals( SchemaConstants.NO_ATTRIBUTE ) )
{
containsOneDotOne = true;
}
@@ -884,11 +886,11 @@
{
try
{
- realIds.add( oidRegistry.getOid( id ) );
+ realIds.add( oidRegistry.getOid( idTrimmed ) );
}
catch ( NamingException e )
{
- realIds.add( id );
+ realIds.add( idTrimmed );
}
}
}
Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexusProxy.java Wed Aug 29 13:55:22 2007
@@ -68,6 +68,7 @@
import org.apache.directory.server.core.interceptor.context.UnbindOperationContext;
import org.apache.directory.server.core.invocation.Invocation;
import org.apache.directory.server.core.invocation.InvocationStack;
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.exception.LdapSizeLimitExceededException;
import org.apache.directory.shared.ldap.exception.LdapTimeLimitExceededException;
import org.apache.directory.shared.ldap.filter.ExprNode;
@@ -515,7 +516,7 @@
return ROOT_DSE_NO_OPERATIONNAL;
}
- else if ( ( attrs.size() == 1 ) && ( attrs.contains( "+" ) ) )
+ else if ( ( attrs.size() == 1 ) && ( attrs.contains( SchemaConstants.ALL_OPERATIONAL_ATTRIBUTES ) ) )
{
synchronized( ROOT_DSE_ALL_MUTEX )
{
Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java Wed Aug 29 13:55:22 2007
@@ -31,6 +31,7 @@
import org.apache.directory.server.core.enumeration.SearchResultEnumeration;
import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.message.AttributesImpl;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.schema.UsageEnum;
@@ -128,7 +129,7 @@
// add all listed attributes
for ( int ii = 0; ii < attrIds.length; ii++ )
{
- if ( attrIds[ii].equals( "+" ) )
+ if ( attrIds[ii].equals( SchemaConstants.ALL_OPERATIONAL_ATTRIBUTES ) )
{
continue;
}
@@ -165,7 +166,7 @@
// add all listed operational attributes
for ( int ii = 0; ii < attrIds.length; ii++ )
{
- if ( attrIds[ii].equals( "*" ) )
+ if ( attrIds[ii].equals( SchemaConstants.ALL_USER_ATTRIBUTES ) )
{
continue;
}
@@ -201,7 +202,7 @@
for ( int ii = 0; ii < attrIds.length; ii++ )
{
- if ( "1.1".equals( attrIds[ii] ) )
+ if ( SchemaConstants.NO_ATTRIBUTE.equals( attrIds[ii] ) )
{
break;
}
@@ -251,7 +252,7 @@
for ( int ii = ids.length - 1; ii >= 0; ii-- )
{
- if ( ids[ii].trim().equals( "*" ) )
+ if ( ids[ii].trim().equals( SchemaConstants.ALL_USER_ATTRIBUTES ) )
{
return true;
}
@@ -270,7 +271,7 @@
for ( int ii = ids.length - 1; ii >= 0; ii-- )
{
- if ( ids[ii].trim().equals( "+" ) )
+ if ( ids[ii].trim().equals( SchemaConstants.ALL_OPERATIONAL_ATTRIBUTES ) )
{
return true;
}
Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java Wed Aug 29 13:55:22 2007
@@ -403,21 +403,36 @@
if ( ( attributes == null ) || ( attributes.length == 0 ) )
{
+ // We have no attributes, that means "*" (all users attributes)
+ searchCtls.setReturningAttributes( SchemaConstants.ALL_USER_ATTRIBUTES_ARRAY );
return;
}
Map<String, String> filteredAttrs = new HashMap<String, String>();
+ boolean hasNoAttribute = false;
+ boolean hasAttributes = false;
for ( String attribute:attributes )
{
// Skip special attributes
- if ( ( "*".equals( attribute ) ) || ( "+".equals( attribute ) ) || ( "1.1".equals( attribute ) ) )
+ if ( ( SchemaConstants.ALL_USER_ATTRIBUTES.equals( attribute ) ) ||
+ ( SchemaConstants.ALL_OPERATIONAL_ATTRIBUTES.equals( attribute ) ) ||
+ ( SchemaConstants.NO_ATTRIBUTE.equals( attribute ) ) )
{
if ( !filteredAttrs.containsKey( attribute ) )
{
filteredAttrs.put( attribute, attribute );
}
+ if ( SchemaConstants.NO_ATTRIBUTE.equals( attribute ) )
+ {
+ hasNoAttribute = true;
+ }
+ else
+ {
+ hasAttributes = true;
+ }
+
continue;
}
@@ -438,6 +453,8 @@
}
}
}
+
+ hasAttributes = true;
}
catch ( NamingException ne )
{
@@ -445,6 +462,12 @@
}
}
+ // Treat a special case : if we have an attribute and "1.1", then discard "1.1"
+ if ( hasAttributes && hasNoAttribute )
+ {
+ filteredAttrs.remove( SchemaConstants.NO_ATTRIBUTE );
+ }
+
// If we still have the same attribute number, then we can just get out the method
if ( filteredAttrs.size() == attributes.length )
{
@@ -454,9 +477,9 @@
// Deal with the special case where the attribute list is now empty
if ( filteredAttrs.size() == 0 )
{
- // We just have to pass the special 1.1 ayttribute,
+ // We just have to pass the special 1.1 attribute,
// as we don't want to return any attribute
- searchCtls.setReturningAttributes( new String[]{ "1.1" } );
+ searchCtls.setReturningAttributes( SchemaConstants.NO_ATTRIBUTE_ARRAY );
return;
}
@@ -597,12 +620,11 @@
{
// Check whether the set contains a plus, and use it below to include all
// operational attributes. Due to RFC 3673, and issue DIREVE-228 in JIRA
- if ( "+".equals( id ) )
+ if ( SchemaConstants.ALL_OPERATIONAL_ATTRIBUTES.equals( id ) )
{
- // set.add( "+" );
returnAllOperationalAttributes = true;
}
- else if ( "*".equals( id ) )
+ else if ( SchemaConstants.ALL_USER_ATTRIBUTES.equals( id ) )
{
setOids.add( id );
}
@@ -791,7 +813,7 @@
}
// add the objectClass attribute
- if ( setOids.contains( "*" ) ||
+ if ( setOids.contains( SchemaConstants.ALL_USER_ATTRIBUTES ) ||
setOids.contains( SchemaConstants.OBJECT_CLASS_AT_OID ) ||
setOids.size() == minSetSize )
{
@@ -804,7 +826,7 @@
}
// add the cn attribute as required for the RDN
- if ( setOids.contains( "*" ) ||
+ if ( setOids.contains( SchemaConstants.ALL_USER_ATTRIBUTES ) ||
setOids.contains( SchemaConstants.CN_AT_OID ) ||
setOids.size() == minSetSize )
{
@@ -1230,7 +1252,7 @@
next.rename( opContext );
}
- private final static String[] schemaSubentryReturnAttributes = new String[] { "+", "*" };
+ private final static String[] schemaSubentryReturnAttributes = new String[] { SchemaConstants.ALL_OPERATIONAL_ATTRIBUTES, SchemaConstants.ALL_USER_ATTRIBUTES };
public void modify( NextInterceptor next, ModifyOperationContext opContext ) throws NamingException
{
Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/core/src/main/java/org/apache/directory/server/core/sp/StoredProcExecutionManager.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/core/src/main/java/org/apache/directory/server/core/sp/StoredProcExecutionManager.java?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/core/src/main/java/org/apache/directory/server/core/sp/StoredProcExecutionManager.java (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/core/src/main/java/org/apache/directory/server/core/sp/StoredProcExecutionManager.java Wed Aug 29 13:55:22 2007
@@ -32,6 +32,8 @@
import javax.naming.ldap.LdapContext;
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
+
/**
* A Factory type class which holds a registry of supported {@link StoredProcEngineConfig}s. A container reference
* as the base for Stored Procedure storage on the DIT is also handled by this class.
@@ -71,7 +73,7 @@
public Attributes findStoredProcUnit( LdapContext rootDSE, String fullSPName ) throws NamingException
{
SearchControls controls = new SearchControls();
- controls.setReturningAttributes( new String[] { "*" } );
+ controls.setReturningAttributes( SchemaConstants.ALL_USER_ATTRIBUTES_ARRAY );
controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
String spUnitName = StoredProcUtils.extractStoredProcUnitName( fullSPName );
String filter = "(storedProcUnitName=" + spUnitName + ")";
Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java Wed Aug 29 13:55:22 2007
@@ -452,7 +452,7 @@
SearchControls controls = new SearchControls();
controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
controls.setReturningAttributes( new String[]
- { "+", "*" } );
+ { SchemaConstants.ALL_OPERATIONAL_ATTRIBUTES, SchemaConstants.ALL_USER_ATTRIBUTES } );
NamingEnumeration subentries =
nexus.search(
@@ -579,7 +579,7 @@
SearchControls controls = new SearchControls();
controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
controls.setReturningAttributes( new String[]
- { "+", "*" } );
+ { SchemaConstants.ALL_OPERATIONAL_ATTRIBUTES, SchemaConstants.ALL_USER_ATTRIBUTES } );
NamingEnumeration subentries =
nexus.search(
@@ -741,7 +741,7 @@
ExprNode filter = new PresenceNode( oidRegistry.getOid( SchemaConstants.OBJECT_CLASS_AT ) );
SearchControls controls = new SearchControls();
controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
- controls.setReturningAttributes( new String[] { "+", "*" } );
+ controls.setReturningAttributes( new String[] { SchemaConstants.ALL_OPERATIONAL_ATTRIBUTES, SchemaConstants.ALL_USER_ATTRIBUTES } );
NamingEnumeration subentries =
nexus.search(
new SearchOperationContext( baseDn, factoryCfg.getEnvironment(), filter, controls ) );
@@ -822,7 +822,7 @@
ExprNode filter = new PresenceNode( oidRegistry.getOid( SchemaConstants.OBJECT_CLASS_AT ) );
SearchControls controls = new SearchControls();
controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
- controls.setReturningAttributes( new String[] { "+", "*" } );
+ controls.setReturningAttributes( new String[] { SchemaConstants.ALL_OPERATIONAL_ATTRIBUTES, SchemaConstants.ALL_USER_ATTRIBUTES } );
NamingEnumeration subentries =
nexus.search(
new SearchOperationContext( baseDn, factoryCfg.getEnvironment(), filter, controls ) );
@@ -897,7 +897,7 @@
SearchControls controls = new SearchControls();
controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
controls.setReturningAttributes( new String[]
- { "+", "*" } );
+ { SchemaConstants.ALL_OPERATIONAL_ATTRIBUTES, SchemaConstants.ALL_USER_ATTRIBUTES } );
NamingEnumeration subentries =
nexus.search(
new SearchOperationContext( baseDn, factoryCfg.getEnvironment(), filter, controls ) );
@@ -1064,7 +1064,7 @@
SearchControls controls = new SearchControls();
controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
controls.setReturningAttributes( new String[]
- { "+", "*" } );
+ { SchemaConstants.ALL_OPERATIONAL_ATTRIBUTES, SchemaConstants.ALL_USER_ATTRIBUTES } );
NamingEnumeration subentries =
nexus.search(
new SearchOperationContext( oldBaseDn, factoryCfg.getEnvironment(), filter, controls ) );
Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/core/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/core/src/test/resources/log4j.properties?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/core/src/test/resources/log4j.properties (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/core/src/test/resources/log4j.properties Wed Aug 29 13:55:22 2007
@@ -1,3 +1,19 @@
+#############################################################################
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#############################################################################
log4j.rootCategory=ERROR, stdout
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributeSerializer.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributeSerializer.java?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributeSerializer.java (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributeSerializer.java Wed Aug 29 13:55:22 2007
@@ -1,4 +1,22 @@
-
+/*
+ * 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.
+ *
+ */
package org.apache.directory.server.core.partition.impl.btree.jdbm;
import java.io.IOException;
@@ -7,6 +25,10 @@
import jdbm.helper.Serializer;
+/**
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$
+ */
public class AttributeSerializer implements Serializer
{
private static final long serialVersionUID = 1L;
Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributesSerializer.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributesSerializer.java?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributesSerializer.java (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributesSerializer.java Wed Aug 29 13:55:22 2007
@@ -1,4 +1,22 @@
-
+/*
+ * 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.
+ *
+ */
package org.apache.directory.server.core.partition.impl.btree.jdbm;
import java.io.IOException;
@@ -7,6 +25,10 @@
import jdbm.helper.Serializer;
+/**
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$
+ */
public class AttributesSerializer implements Serializer
{
private static final long serialVersionUID = 1L;
Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/ArcFourHmacMd5Encryption.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/ArcFourHmacMd5Encryption.java?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/ArcFourHmacMd5Encryption.java (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/ArcFourHmacMd5Encryption.java Wed Aug 29 13:55:22 2007
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ *
+ */
package org.apache.directory.server.kerberos.shared.crypto.encryption;
Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/mitosis/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/mitosis/src/test/resources/log4j.properties?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/mitosis/src/test/resources/log4j.properties (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/mitosis/src/test/resources/log4j.properties Wed Aug 29 13:55:22 2007
@@ -1,3 +1,19 @@
+#############################################################################
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#############################################################################
log4j.rootLogger=OFF, stdout
log4j.logger.org.apache.directory.mitosis=OFF
log4j.logger.org.apache.directory.mitosis.service.ClientConnectionManager=OFF
Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/pom.xml?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/pom.xml (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/pom.xml Wed Aug 29 13:55:22 2007
@@ -239,6 +239,13 @@
<artifactId>ldapsdk</artifactId>
<version>4.1</version>
</dependency>
+
+ <dependency>
+ <groupId>tanukisoft</groupId>
+ <artifactId>wrapper</artifactId>
+ <version>3.2.3</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
@@ -338,6 +345,7 @@
<module>server-main</module>
<module>server-jndi</module>
<module>kerberos-shared</module>
+ <!--module>kerberos-unit</module-->
<module>mitosis</module>
<module>server-replication</module>
</modules>
@@ -547,7 +555,7 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<!-- TODO delete version tag after upgrade to TLP pom 9 -->
<version>2.0.3</version>
Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/protocol-dhcp/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/protocol-dhcp/src/test/resources/log4j.properties?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/protocol-dhcp/src/test/resources/log4j.properties (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/protocol-dhcp/src/test/resources/log4j.properties Wed Aug 29 13:55:22 2007
@@ -1,3 +1,19 @@
+#############################################################################
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#############################################################################
log4j.rootCategory=OFF, stdout
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
Modified: directory/sandbox/akarasulu/refactoring-apacheds-trunk/protocol-dns/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/refactoring-apacheds-trunk/protocol-dns/src/test/resources/log4j.properties?rev=570930&r1=570929&r2=570930&view=diff
==============================================================================
--- directory/sandbox/akarasulu/refactoring-apacheds-trunk/protocol-dns/src/test/resources/log4j.properties (original)
+++ directory/sandbox/akarasulu/refactoring-apacheds-trunk/protocol-dns/src/test/resources/log4j.properties Wed Aug 29 13:55:22 2007
@@ -1,3 +1,19 @@
+#############################################################################
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#############################################################################
log4j.rootCategory=OFF, stdout
log4j.appender.stdout=org.apache.log4j.ConsoleAppender