You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2008/05/12 13:49:46 UTC
svn commit: r655480 [1/11] - in /directory:
apacheds/trunk/apacheds-jdbm/src/examples/
apacheds/trunk/apacheds-jdbm/src/main/java/jdbm/btree/
apacheds/trunk/bootstrap-extract/src/main/java/org/apache/directory/server/schema/bootstrap/partition/
apached...
Author: elecharny
Date: Mon May 12 04:49:35 2008
New Revision: 655480
URL: http://svn.apache.org/viewvc?rev=655480&view=rev
Log:
o Removed the Tabs from code
o Fixed some imports
o Removed some useless throws
o Removed useless classes (ServerEntrySerializerUtils, ServerEntryPropertyEdit)
o Commented some part of a PersistentSearch test
Removed:
directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerAttributeSerializerUtils.java
directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntrySerializerUtils.java
Modified:
directory/apacheds/trunk/apacheds-jdbm/src/examples/Primes.java
directory/apacheds/trunk/apacheds-jdbm/src/main/java/jdbm/btree/BTree.java
directory/apacheds/trunk/bootstrap-extract/src/main/java/org/apache/directory/server/schema/bootstrap/partition/DbFileListing.java
directory/apacheds/trunk/bootstrap-extract/src/main/java/org/apache/directory/server/schema/bootstrap/partition/SchemaPartitionExtractor.java
directory/apacheds/trunk/bootstrap-extract/src/main/java/org/apache/directory/server/schema/bootstrap/partition/UniqueResourceException.java
directory/apacheds/trunk/bootstrap-extract/src/test/java/org/apache/directory/server/schema/bootstrap/partition/UniqueResourceTest.java
directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java
directory/apacheds/trunk/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/Index.java
directory/apacheds/trunk/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexComparator.java
directory/apacheds/trunk/core-constants/src/main/java/org/apache/directory/server/constants/ServerDNConstants.java
directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerAttribute.java
directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerEntry.java
directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerAttribute.java
directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerBinaryValue.java
directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntry.java
directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryPropertyEditor.java
directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntrySerializer.java
directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryUtils.java
directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerModification.java
directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerSearchResult.java
directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerStringValue.java
directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java
directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultServerAttributeTest.java
directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/DefaultServerEntryTest.java
directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerBinaryValueTest.java
directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerEntrySerializerTest.java
directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerModificationTest.java
directory/apacheds/trunk/core-entry/src/test/java/org/apache/directory/server/core/entry/ServerStringValueTest.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/SearchIT.java
directory/apacheds/trunk/core-plugin/src/main/antlr/openldap.g
directory/apacheds/trunk/core-unit/src/main/java/org/apache/directory/server/core/unit/AbstractTestCase.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AbstractAuthenticator.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/Authenticator.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/LdapPrincipal.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilter.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/enumeration/ReferralHandlingEnumeration.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/enumeration/SearchResultFilteringEnumeration.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/CompareOperationContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/LookupOperationContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/MoveOperationContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/RenameOperationContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/ReplaceOperationContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/jndi/JavaLdapSupport.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultOptimizer.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEnumerator.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/LeafEvaluator.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/SubstringEvaluator.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AddEntryDialog.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/IndexDialog.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/ObjectClassImpl.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyDNStoredProcedureParameterInjector.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java
directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilterTest.java
directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyInterceptor.java
directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/flags/TicketFlags.java
directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/configuration/ReplicationConfiguration.java
directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/ReplicationInterceptor.java
directory/apacheds/trunk/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationProtocolHandler.java
directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/messages/DhcpMessage.java
directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/ByteOption.java
directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/IntOption.java
directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/ShortOption.java
directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/UnrecognizedOption.java
directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpProtocolHandler.java
directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/service/AbstractDhcpService.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsDialog.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/SessionsFrame.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/ShutdownDialog.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/ShutdownProgress.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/AbstractLdapHandler.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/DefaultBindHandler.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/DefaultModifyHandler.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/DefaultSearchHandler.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java
directory/apacheds/trunk/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/AbstractBootstrapProducer.java
directory/apacheds/trunk/schema-registries/src/main/java/org/apache/directory/server/schema/DnComparator.java
directory/apacheds/trunk/schema-registries/src/main/java/org/apache/directory/server/schema/NameAndOptionalUIDComparator.java
directory/apacheds/trunk/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultOidRegistry.java
directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
directory/apacheds/trunk/server-unit/src/main/java/org/apache/directory/server/unit/AbstractServerTest.java
directory/apacheds/trunk/server-unit/src/test/java/org/apache/directory/server/DITUtilitiesSP.java
directory/apacheds/trunk/server-unit/src/test/java/org/apache/directory/server/DeleteIllegalDNITest.java
directory/apacheds/trunk/server-unit/src/test/java/org/apache/directory/server/PersistentSearchTest.java
directory/apacheds/trunk/server-unit/src/test/java/org/apache/directory/server/SearchITest.java
directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/AbstractAsn1Object.java
directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/Asn1Object.java
directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/AbstractContainer.java
directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/Asn1Decoder.java
directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/IAsn1Container.java
directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/AbstractGrammar.java
directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/GrammarAction.java
directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/GrammarTransition.java
directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/IAction.java
directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/IGrammar.java
directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/IStates.java
directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/tlv/ITLVBerDecoderMBean.java
directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/tlv/TLV.java
directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/tlv/TLVStateEnum.java
directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/tlv/UniversalTag.java
directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/tlv/Value.java
directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/codec/stateful/EncoderCallback.java
directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/codec/stateful/EncoderMonitor.java
directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/codec/stateful/EncoderMonitorAdapter.java
directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/codec/stateful/StatefulEncoder.java
directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/primitives/BitString.java
directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/primitives/OID.java
directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/util/Asn1StringUtils.java
directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/util/BooleanDecoder.java
directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/util/BooleanDecoderException.java
directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/util/IntegerDecoder.java
directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/util/IntegerDecoderException.java
directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/ber/tlv/LengthTest.java
directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/ber/tlv/ValueTest.java
directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/primitives/OIDTest.java
directory/shared/trunk/convert/src/main/antlr/schema.g
directory/shared/trunk/convert/src/main/java/org/apache/directory/shared/converter/schema/ParserException.java
directory/shared/trunk/convert/src/main/java/org/apache/directory/shared/converter/schema/Schema.java
directory/shared/trunk/convert/src/main/java/org/apache/directory/shared/converter/schema/SchemaElementImpl.java
directory/shared/trunk/convert/src/main/java/org/apache/directory/shared/converter/schema/SchemaParser.java
directory/shared/trunk/convert/src/main/java/org/apache/directory/shared/converter/schema/SchemaToLdif.java
directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java
directory/shared/trunk/ldap/src/main/antlr/ACIItem.g
directory/shared/trunk/ldap/src/main/antlr/ACIItemChecker.g
directory/shared/trunk/ldap/src/main/antlr/SubtreeSpecificationChecker.g
directory/shared/trunk/ldap/src/main/antlr/TriggerSpecification.g
directory/shared/trunk/ldap/src/main/antlr/schema-extension.g
directory/shared/trunk/ldap/src/main/antlr/schema-qdstring.g
directory/shared/trunk/ldap/src/main/antlr/schema-value.g
directory/shared/trunk/ldap/src/main/antlr/schema.g
directory/shared/trunk/ldap/src/main/antlr/subtree-specification.g
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/MultiException.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/RuntimeMultiException.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/ItemFirstACIItem.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/ProtectedItem.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/UserFirstACIItem.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/UserPermission.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/AttributeValueAssertion.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/Control.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ControlDecoder.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapConstants.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapDecoder.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessage.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageContainer.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapResponse.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapResult.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapStatesEnum.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ResponseCarryingException.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixDecoder.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixEncoder.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixTransformer.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/abandon/AbandonRequest.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/AttributeDescAction.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ControlValueAction.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ControlsInitAction.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ErrorMessageAction.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAndFilterAction.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitApproxMatchFilterAction.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAssertionValueFilterAction.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAttributeDescFilterAction.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAttributeDescListAction.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitEqualityMatchFilterAction.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitExtensibleMatchFilterAction.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitGreaterOrEqualFilterAction.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitLessOrEqualFilterAction.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitNotFilterAction.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitOrFilterAction.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitPresentFilterAction.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitReferralsAction.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitSubstringsFilterAction.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/MatchedDNAction.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ModifyAttributeValueAction.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ReferralAction.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResponseAction.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResponseNameAction.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResultCodeAction.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/SearchResultAttributeValueAction.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ServerSASLCredsAction.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreAnyAction.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreFinalAction.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreMatchValueAction.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreReferenceAction.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreTypeMatchingRuleAction.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ValueAction.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/add/AddRequest.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/add/AddResponse.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/BindRequest.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/BindResponse.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/LdapAuthentication.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/SaslCredentials.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/SimpleAuthentication.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/compare/CompareRequest.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/compare/CompareResponse.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/CascadeControlDecoder.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ManageDsaITControlDecoder.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/del/DelRequest.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/del/DelResponse.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/ExtendedRequest.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponse.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulAction.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulDisconnect.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulDisconnectContainer.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulDisconnectDecoder.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulDisconnectGrammar.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulDisconnectStatesEnum.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulShutdownContainer.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulShutdownDecoder.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulShutdownGrammar.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulShutdownStatesEnum.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/StoredProcedure.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/StoredProcedureContainer.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/StoredProcedureDecoder.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/StoredProcedureGrammar.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/StoredProcedureStatesEnum.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequest.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponse.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequest.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponse.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/AndFilter.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/AttributeValueAssertionFilter.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/ConnectorFilter.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/ExtensibleMatchFilter.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/Filter.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/NotFilter.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/OrFilter.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/PresentFilter.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequest.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultDone.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntry.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultReference.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SubstringFilter.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlCodec.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlContainer.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlDecoder.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlGrammar.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlStatesEnum.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlCodec.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlContainer.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlDecoder.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlGrammar.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlStatesEnum.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlContainer.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlDecoder.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlGrammar.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlStatesEnum.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/unbind/UnBindRequest.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/HttpClientError.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/LdapResultEnum.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/LdapURL.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/LdapURLEncodingException.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/URIException.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/UrlDecoderException.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/Entry.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/ClientAttribute.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/ClientBinaryValue.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/ClientStringValue.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientAttribute.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntry.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AbstractExprNode.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AndNode.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/AssertionNode.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/BranchNode.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/BranchNormalizedVisitor.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ExtensibleNode.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/FilterParser.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/LeafNode.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/NotNode.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/OrNode.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/PresenceNode.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/ScopeNode.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/filter/SubstringNode.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifUtils.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/MessageDecoder.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/StoredProcedureRequest.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/AttributeTypeAndValue.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/DefaultStringNormalizer.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/LdapDN.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/Rdn.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/RdnParser.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/DeepTrimToLowerNormalizer.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/DefaultObjectClass.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/ObjectIdentifierNormalizer.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/RegexNormalizer.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/UsageEnum.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/AttributeTypeDescriptionSyntaxChecker.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/LdapSyntaxDescriptionSyntaxChecker.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/MatchingRuleDescriptionSyntaxChecker.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/MatchingRuleUseDescriptionSyntaxChecker.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/schema/syntax/ObjectClassDescriptionSyntaxChecker.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/subtree/BaseSubtreeSpecification.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/trigger/TriggerSpecification.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributeSerializerUtils.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributeUtils.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/Base64.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/LongComparator.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/PropertiesUtils.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/StringTools.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/UnixCrypt.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/client/ClientBinaryValueTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifReaderTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/ldif/LdifUtilsTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AddRequestImplTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ArrayNamingEnumerationTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindRequestImplTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/CompareRequestImplTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/DeleteRequestImplTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedRequestImplTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedResponseImplTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImplTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseDoneImplTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImplTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseReferenceImplTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/RdnTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/schema/SchemaUtilsTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/trigger/TriggerSpecificationParserTest.java
Modified: directory/apacheds/trunk/apacheds-jdbm/src/examples/Primes.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/apacheds-jdbm/src/examples/Primes.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/apacheds/trunk/apacheds-jdbm/src/examples/Primes.java (original)
+++ directory/apacheds/trunk/apacheds-jdbm/src/examples/Primes.java Mon May 12 04:49:35 2008
@@ -138,15 +138,15 @@
{
Tuple tuple;
TupleBrowser browser;
- Long largest;
+ Long largest;
Long current;
if ( number.longValue() <= 0L ) {
throw new IllegalArgumentException( "Number must be greater than zero" );
}
if ( number.longValue() == 1 ) {
- return true;
- }
+ return true;
+ }
tuple = new Tuple();
browser = _primes.browse();
while ( browser.getNext( tuple ) ) {
@@ -223,7 +223,7 @@
Primes primes;
int count;
Long number;
- Long largest;
+ Long largest;
try {
primes = new Primes( args );
@@ -242,10 +242,10 @@
} else {
number = new Long( _random.nextLong() );
}
- largest = primes.getLargestPrime();
- if ( number.longValue() > primes.getLargestPrime().longValue() ) {
- throw new IllegalArgumentException( "Number is larger than largest known prime in database." );
- }
+ largest = primes.getLargestPrime();
+ if ( number.longValue() > primes.getLargestPrime().longValue() ) {
+ throw new IllegalArgumentException( "Number is larger than largest known prime in database." );
+ }
if ( primes.isPrime( number ) ) {
System.out.println( "The number " + number + " is a prime." );
} else {
Modified: directory/apacheds/trunk/apacheds-jdbm/src/main/java/jdbm/btree/BTree.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/apacheds-jdbm/src/main/java/jdbm/btree/BTree.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/apacheds/trunk/apacheds-jdbm/src/main/java/jdbm/btree/BTree.java (original)
+++ directory/apacheds/trunk/apacheds-jdbm/src/main/java/jdbm/btree/BTree.java Mon May 12 04:49:35 2008
@@ -562,7 +562,7 @@
public void setValueSerializer( Serializer valueSerializer )
{
- _valueSerializer = valueSerializer;
+ _valueSerializer = valueSerializer;
}
Modified: directory/apacheds/trunk/bootstrap-extract/src/main/java/org/apache/directory/server/schema/bootstrap/partition/DbFileListing.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/bootstrap-extract/src/main/java/org/apache/directory/server/schema/bootstrap/partition/DbFileListing.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/apacheds/trunk/bootstrap-extract/src/main/java/org/apache/directory/server/schema/bootstrap/partition/DbFileListing.java (original)
+++ directory/apacheds/trunk/bootstrap-extract/src/main/java/org/apache/directory/server/schema/bootstrap/partition/DbFileListing.java Mon May 12 04:49:35 2008
@@ -22,15 +22,15 @@
import java.io.BufferedReader;
import java.io.IOException;
-import java.io.InputStreamReader;
import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
-import java.util.Enumeration;
-import java.net.URL;
/**
@@ -78,8 +78,13 @@
{
boolean userIndexMode = false;
- String line;
- BufferedReader in = new BufferedReader( new InputStreamReader( getUniqueResourceAsStream( "DBFILES", "bootstrap partition database file list. Be sure there is exactly one bootstrap partition jar in your classpath." ) ) );
+ String line = null;
+ BufferedReader in = new BufferedReader(
+ new InputStreamReader(
+ getUniqueResourceAsStream(
+ "DBFILES",
+ "bootstrap partition database file list. " +
+ "Be sure there is exactly one bootstrap partition jar in your classpath." ) ) );
try
{
while ( ( line = in.readLine() ) != null )
Modified: directory/apacheds/trunk/bootstrap-extract/src/main/java/org/apache/directory/server/schema/bootstrap/partition/SchemaPartitionExtractor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/bootstrap-extract/src/main/java/org/apache/directory/server/schema/bootstrap/partition/SchemaPartitionExtractor.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/apacheds/trunk/bootstrap-extract/src/main/java/org/apache/directory/server/schema/bootstrap/partition/SchemaPartitionExtractor.java (original)
+++ directory/apacheds/trunk/bootstrap-extract/src/main/java/org/apache/directory/server/schema/bootstrap/partition/SchemaPartitionExtractor.java Mon May 12 04:49:35 2008
@@ -58,6 +58,7 @@
}
Iterator<String> ii = listing.iterator();
+
while ( ii.hasNext() )
{
extract( ii.next() );
Modified: directory/apacheds/trunk/bootstrap-extract/src/main/java/org/apache/directory/server/schema/bootstrap/partition/UniqueResourceException.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/bootstrap-extract/src/main/java/org/apache/directory/server/schema/bootstrap/partition/UniqueResourceException.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/apacheds/trunk/bootstrap-extract/src/main/java/org/apache/directory/server/schema/bootstrap/partition/UniqueResourceException.java (original)
+++ directory/apacheds/trunk/bootstrap-extract/src/main/java/org/apache/directory/server/schema/bootstrap/partition/UniqueResourceException.java Mon May 12 04:49:35 2008
@@ -27,11 +27,12 @@
import java.util.List;
/**
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$ $Date$
*/
public class UniqueResourceException extends RuntimeException
{
- public static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
private final String resourceName;
private final List<URL> urls;
Modified: directory/apacheds/trunk/bootstrap-extract/src/test/java/org/apache/directory/server/schema/bootstrap/partition/UniqueResourceTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/bootstrap-extract/src/test/java/org/apache/directory/server/schema/bootstrap/partition/UniqueResourceTest.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/apacheds/trunk/bootstrap-extract/src/test/java/org/apache/directory/server/schema/bootstrap/partition/UniqueResourceTest.java (original)
+++ directory/apacheds/trunk/bootstrap-extract/src/test/java/org/apache/directory/server/schema/bootstrap/partition/UniqueResourceTest.java Mon May 12 04:49:35 2008
@@ -23,6 +23,7 @@
import junit.framework.TestCase;
/**
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$ $Date$
*/
public class UniqueResourceTest extends TestCase
Modified: directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java (original)
+++ directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java Mon May 12 04:49:35 2008
@@ -20,6 +20,24 @@
package org.apache.directory.server.core.bootstrap.plugin;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.naming.NamingException;
+
import org.apache.directory.server.constants.ApacheSchemaConstants;
import org.apache.directory.server.constants.MetaSchemaConstants;
import org.apache.directory.server.constants.ServerDNConstants;
@@ -66,24 +84,6 @@
import org.apache.maven.plugin.MojoFailureException;
import org.codehaus.plexus.util.FileUtils;
-import javax.naming.NamingException;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
/**
* A plugin used to pre-load meta schema entries into the schema partition.
@@ -910,7 +910,7 @@
/** A main to be able to debug the plugin */
- public static void main( String[] args ) throws Exception
+ public static void main( String[] args )
{
BootstrapPlugin bp = new BootstrapPlugin();
@@ -958,6 +958,17 @@
"/home/elecharny/.m2/repository/org/apache/directory/server/apacheds-bootstrap-extract/1.5.3-SNAPSHOT/apacheds-bootstrap-extract-1.5.3-SNAPSHOT.jar",
"/home/elecharny/.m2/repository/org/apache/directory/server/apacheds-schema-extras/1.5.3-SNAPSHOT/apacheds-schema-extras-1.5.3-SNAPSHOT.jar",
"/home/elecharny/.m2/repository/org/apache/directory/server/apacheds-schema-bootstrap/1.5.3-SNAPSHOT/apacheds-schema-bootstrap-1.5.3-SNAPSHOT.jar" } );
- bp.execute();
+ try
+ {
+ bp.execute();
+ }
+ catch ( MojoExecutionException mee )
+ {
+ // Do nothing
+ }
+ catch ( MojoFailureException mfe)
+ {
+ // Do nothing
+ }
}
}
Modified: directory/apacheds/trunk/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/Index.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/Index.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/apacheds/trunk/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/Index.java (original)
+++ directory/apacheds/trunk/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/Index.java Mon May 12 04:49:35 2008
@@ -20,8 +20,8 @@
package org.apache.directory.server.core.partition.impl.btree;
-import java.util.regex.Pattern;
import java.io.File;
+import java.util.regex.Pattern;
import javax.naming.NamingException;
import javax.naming.directory.Attribute;
Modified: directory/apacheds/trunk/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexComparator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexComparator.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/apacheds/trunk/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexComparator.java (original)
+++ directory/apacheds/trunk/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexComparator.java Mon May 12 04:49:35 2008
@@ -40,52 +40,52 @@
public int compare( Object o1, Object o2 )
{
- try
- {
- long thisVal = ( Long ) o1;
- long anotherVal = ( Long ) o2;
-
- if ( thisVal == anotherVal )
- {
- return 0;
- }
-
- if ( thisVal == anotherVal )
- {
- return 0;
- }
-
- if ( thisVal >= 0 )
- {
- if ( anotherVal >= 0 )
- {
- return ( thisVal > anotherVal ) ? 1 : -1;
- }
- else
- {
- return -1;
- }
- }
- else if ( anotherVal >= 0 )
- {
- return 1;
- }
- else
- {
- return ( thisVal < anotherVal ) ? -1 : 1;
- }
- }
- catch ( NullPointerException npe )
- {
- if ( o1 == null )
- {
- throw new IllegalArgumentException( "Argument 'obj1' is null" );
- }
- else
- {
- throw new IllegalArgumentException( "Argument 'obj2' is null" );
- }
- }
+ try
+ {
+ long thisVal = ( Long ) o1;
+ long anotherVal = ( Long ) o2;
+
+ if ( thisVal == anotherVal )
+ {
+ return 0;
+ }
+
+ if ( thisVal == anotherVal )
+ {
+ return 0;
+ }
+
+ if ( thisVal >= 0 )
+ {
+ if ( anotherVal >= 0 )
+ {
+ return ( thisVal > anotherVal ) ? 1 : -1;
+ }
+ else
+ {
+ return -1;
+ }
+ }
+ else if ( anotherVal >= 0 )
+ {
+ return 1;
+ }
+ else
+ {
+ return ( thisVal < anotherVal ) ? -1 : 1;
+ }
+ }
+ catch ( NullPointerException npe )
+ {
+ if ( o1 == null )
+ {
+ throw new IllegalArgumentException( "Argument 'obj1' is null" );
+ }
+ else
+ {
+ throw new IllegalArgumentException( "Argument 'obj2' is null" );
+ }
+ }
}
};
Modified: directory/apacheds/trunk/core-constants/src/main/java/org/apache/directory/server/constants/ServerDNConstants.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-constants/src/main/java/org/apache/directory/server/constants/ServerDNConstants.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/apacheds/trunk/core-constants/src/main/java/org/apache/directory/server/constants/ServerDNConstants.java (original)
+++ directory/apacheds/trunk/core-constants/src/main/java/org/apache/directory/server/constants/ServerDNConstants.java Mon May 12 04:49:35 2008
@@ -27,6 +27,14 @@
*/
public class ServerDNConstants
{
+ /**
+ * A private constructor to protect this class containing only constants
+ */
+ private ServerDNConstants()
+ {
+
+ }
+
/** The administrators group DN */
public static final String ADMINISTRATORS_GROUP_DN = "cn=Administrators,ou=groups,ou=system";
@@ -34,34 +42,34 @@
public static final String SYSTEM_DN = "ou=system";
/** the default user principal or DN */
- public final static String ADMIN_SYSTEM_DN = "uid=admin,ou=system";
+ public static final String ADMIN_SYSTEM_DN = "uid=admin,ou=system";
/** the normalized user principal or DN */
- public final static String ADMIN_SYSTEM_DN_NORMALIZED = "0.9.2342.19200300.100.1.1=admin,2.5.4.11=system";
+ public static final String ADMIN_SYSTEM_DN_NORMALIZED = "0.9.2342.19200300.100.1.1=admin,2.5.4.11=system";
/** the DN for the global schema subentry */
- public final static String CN_SCHEMA_DN = "cn=schema";
+ public static final String CN_SCHEMA_DN = "cn=schema";
/** The DN for the gloval schema subentry normalized */
public static final String CN_SCHEMA_DN_NORMALIZED = "2.5.4.3=schema";
/** the DN for the global schema subentry */
- public final static String OU_SCHEMA_DN = "ou=schema";
+ public static final String OU_SCHEMA_DN = "ou=schema";
/** the base dn under which all users reside */
- public final static String USERS_SYSTEM_DN = "ou=users,ou=system";
+ public static final String USERS_SYSTEM_DN = "ou=users,ou=system";
/** The default change password base DN. */
- public final static String USER_EXAMPLE_COM_DN = "ou=users,dc=example,dc=com";
+ public static final String USER_EXAMPLE_COM_DN = "ou=users,dc=example,dc=com";
/** the base dn under which all groups reside */
- public final static String GROUPS_SYSTEM_DN = "ou=groups,ou=system";
+ public static final String GROUPS_SYSTEM_DN = "ou=groups,ou=system";
/** the dn base of the system preference hierarchy */
- public final static String SYSPREFROOT_SYSTEM_DN = "prefNodeName=sysPrefRoot,ou=system";
+ public static final String SYSPREFROOT_SYSTEM_DN = "prefNodeName=sysPrefRoot,ou=system";
/** The ldifDile base which stores the name of the loaded ldif files */
- public final static String LDIF_FILES_DN = "ou=loadedLdifFiles,ou=configuration,ou=system";
+ public static final String LDIF_FILES_DN = "ou=loadedLdifFiles,ou=configuration,ou=system";
}
Modified: directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerAttribute.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerAttribute.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerAttribute.java (original)
+++ directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerAttribute.java Mon May 12 04:49:35 2008
@@ -19,6 +19,9 @@
package org.apache.directory.server.core.entry;
+import javax.naming.NamingException;
+import javax.naming.directory.InvalidAttributeValueException;
+
import org.apache.directory.shared.asn1.primitives.OID;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Value;
@@ -30,9 +33,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.naming.NamingException;
-import javax.naming.directory.InvalidAttributeValueException;
-
/**
* A server side entry attribute aware of schema.
@@ -42,59 +42,29 @@
*/
public final class DefaultServerAttribute extends DefaultClientAttribute implements ServerAttribute
{
- /** Used for serialization */
- public static final long serialVersionUID = 2L;
-
/** logger for reporting errors that might not be handled properly upstream */
private static final Logger LOG = LoggerFactory.getLogger( DefaultServerAttribute.class );
/** The associated AttributeType */
- protected transient AttributeType attributeType;
+ private AttributeType attributeType;
// -----------------------------------------------------------------------
// utility methods
// -----------------------------------------------------------------------
/**
- * Check the attributeType member. It should not be null,
- * and it should contains a syntax.
- */
- protected String getErrorMessage( AttributeType attributeType )
- {
- try
- {
- if ( attributeType == null )
- {
- return "The AttributeType parameter should not be null";
- }
-
- if ( attributeType.getSyntax() == null )
- {
- return "There is no Syntax associated with this attributeType";
- }
-
- return null;
- }
- catch ( NamingException ne )
- {
- return "This AttributeType is incorrect";
- }
- }
-
-
- /**
* Private helper method used to set an UpId from an attributeType
*/
- private String getUpId( AttributeType attributeType )
+ private String getUpId( AttributeType at )
{
- String upId = attributeType.getName();
+ String atUpId = at.getName();
- if ( upId == null )
+ if ( atUpId == null )
{
- upId = attributeType.getOid();
+ atUpId = at.getOid();
}
- return upId;
+ return atUpId;
}
@@ -190,7 +160,8 @@
else
{
// The id is incorrect : this is not allowed
- throw new IllegalArgumentException( "The ID '" + id + "'is incompatible with the AttributeType's id '" + attributeType.getName() + "'" );
+ throw new IllegalArgumentException( "The ID '" + id + "'is incompatible with the AttributeType's id '" +
+ attributeType.getName() + "'" );
}
}
}
@@ -239,9 +210,9 @@
// In this case, it must be equals to the attributeType OID.
String normUpId = StringTools.lowerCaseAscii( StringTools.trim( upId ) );
- for ( String id:attributeType.getNames() )
+ for ( String atId:attributeType.getNames() )
{
- if ( id.equalsIgnoreCase( normUpId ) )
+ if ( atId.equalsIgnoreCase( normUpId ) )
{
// Found ! We can store the upId and get out
super.setUpId( upId );
@@ -317,9 +288,9 @@
// In this case, it must be equals to the attributeType OID.
String normUpId = StringTools.lowerCaseAscii( StringTools.trim( upId ) );
- for ( String id:attributeType.getNames() )
+ for ( String atId:attributeType.getNames() )
{
- if ( id.equalsIgnoreCase( normUpId ) )
+ if ( atId.equalsIgnoreCase( normUpId ) )
{
// Found ! We can store the upId and get out
super.setUpId( upId );
@@ -444,7 +415,6 @@
*
* @param attributeType the attribute type according to the schema
* @param vals an initial set of values for this attribute
- * @throws NamingException if there are problems creating the new attribute
*/
public DefaultServerAttribute( AttributeType attributeType, Value<?>... vals )
{
@@ -464,7 +434,6 @@
* @param upId
* @param attributeType the attribute type according to the schema
* @param vals an initial set of values for this attribute
- * @throws NamingException if there are problems creating the new attribute
*/
public DefaultServerAttribute( String upId, AttributeType attributeType, Value<?>... vals )
{
Modified: directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerEntry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerEntry.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerEntry.java (original)
+++ directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/DefaultServerEntry.java Mon May 12 04:49:35 2008
@@ -29,6 +29,8 @@
import java.util.Map;
import java.util.Set;
+import javax.naming.NamingException;
+
import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
import org.apache.directory.server.schema.registries.Registries;
import org.apache.directory.shared.ldap.NotImplementedException;
@@ -43,9 +45,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.naming.NamingException;
-import javax.naming.directory.InvalidAttributeValueException;
-
/**
* A default implementation of a ServerEntry which should suite most
@@ -59,7 +58,7 @@
public final class DefaultServerEntry extends AbstractEntry<AttributeType> implements ServerEntry, Externalizable
{
/** Used for serialization */
- public static final long serialVersionUID = 2L;
+ private static final long serialVersionUID = 2L;
/** The logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( DefaultServerEntry.class );
@@ -71,7 +70,7 @@
private static transient AttributeType OBJECT_CLASS_AT;
/** A mutex to manage synchronization*/
- private transient static Object MUTEX = new Object();
+ private static transient Object MUTEX = new Object();
//-------------------------------------------------------------------------
@@ -96,7 +95,7 @@
/**
* Get the UpId if it was null.
*/
- public static String getUpId( String upId, AttributeType attributeType ) throws NamingException
+ public static String getUpId( String upId, AttributeType attributeType )
{
String normUpId = StringTools.trim( upId );
@@ -159,7 +158,7 @@
*
* Updates the serverAttributeMap.
*/
- private void createAttribute( String upId, AttributeType attributeType, byte[]... values ) throws NamingException, InvalidAttributeValueException
+ private void createAttribute( String upId, AttributeType attributeType, byte[]... values )
{
ServerAttribute attribute = new DefaultServerAttribute( attributeType, values );
attribute.setUpId( upId, attributeType );
@@ -173,7 +172,7 @@
*
* Updates the serverAttributeMap.
*/
- private void createAttribute( String upId, AttributeType attributeType, String... values ) throws NamingException, InvalidAttributeValueException
+ private void createAttribute( String upId, AttributeType attributeType, String... values )
{
ServerAttribute attribute = new DefaultServerAttribute( attributeType, values );
attribute.setUpId( upId, attributeType );
@@ -187,7 +186,7 @@
*
* Updates the serverAttributeMap.
*/
- private void createAttribute( String upId, AttributeType attributeType, Value<?>... values ) throws NamingException, InvalidAttributeValueException
+ private void createAttribute( String upId, AttributeType attributeType, Value<?>... values )
{
ServerAttribute attribute = new DefaultServerAttribute( attributeType, values );
attribute.setUpId( upId, attributeType );
@@ -1032,7 +1031,7 @@
/**
* Returns the attribute associated with an AttributeType
*
- * @param the AttributeType we are looking for
+ * @param attributeType the AttributeType we are looking for
* @return the associated attribute
*/
public EntryAttribute get( AttributeType attributeType )
Modified: directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerAttribute.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerAttribute.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerAttribute.java (original)
+++ directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerAttribute.java Mon May 12 04:49:35 2008
@@ -19,12 +19,12 @@
package org.apache.directory.server.core.entry;
-import org.apache.directory.shared.ldap.schema.AttributeType;
-import org.apache.directory.shared.ldap.entry.client.ClientAttribute;
-
import javax.naming.NamingException;
import javax.naming.directory.InvalidAttributeValueException;
+import org.apache.directory.shared.ldap.entry.client.ClientAttribute;
+import org.apache.directory.shared.ldap.schema.AttributeType;
+
/**
* The server specific interface extending the EntryAttribute interface. It adds
@@ -95,7 +95,7 @@
* @param upId The attribute ID
* @param attributeType The associated attributeType
*/
- public void setUpId( String upId, AttributeType attributeType );
+ void setUpId( String upId, AttributeType attributeType );
/**
Modified: directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerBinaryValue.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerBinaryValue.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerBinaryValue.java (original)
+++ directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerBinaryValue.java Mon May 12 04:49:35 2008
@@ -19,6 +19,15 @@
package org.apache.directory.server.core.entry;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
+import java.util.Comparator;
+
+import javax.naming.NamingException;
+
import org.apache.directory.shared.ldap.NotImplementedException;
import org.apache.directory.shared.ldap.entry.Value;
import org.apache.directory.shared.ldap.entry.client.ClientBinaryValue;
@@ -30,15 +39,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.naming.NamingException;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.Arrays;
-import java.util.Comparator;
-
/**
* A server side schema aware wrapper around a binary attribute value.
@@ -52,7 +52,7 @@
public class ServerBinaryValue extends ClientBinaryValue
{
/** Used for serialization */
- public static final long serialVersionUID = 2L;
+ private static final long serialVersionUID = 2L;
/** logger for reporting errors that might not be handled properly upstream */
private static final Logger LOG = LoggerFactory.getLogger( ServerBinaryValue.class );
@@ -163,7 +163,8 @@
* @param wrapped the value to wrap which can be null
* @param normalizedValue the normalized value
*/
- /** No protection */ ServerBinaryValue( AttributeType attributeType, byte[] wrapped, byte[] normalizedValue, boolean same, boolean valid )
+ /** No protection */
+ ServerBinaryValue( AttributeType attributeType, byte[] wrapped, byte[] normalizedValue, boolean same, boolean valid )
{
super( wrapped );
this.normalized = true;
@@ -227,7 +228,6 @@
* to the wrapped value result in attempts to normalize the wrapped value.
*
* @return a reference to the normalized version of the wrapped value
- * @throws NamingException with failures to normalize
*/
public byte[] getNormalizedValueReference()
{
@@ -263,7 +263,6 @@
* to the wrapped value result in attempts to normalize the wrapped value.
*
* @return gets the normalized value
- * @throws NamingException if the value cannot be properly normalized
*/
public byte[] getNormalizedValue()
{
@@ -297,7 +296,6 @@
* determine how to properly normalize the wrapped value.
*
* @return the normalized version of the wrapped value
- * @throws NamingException if schema entity resolution fails or normalization fails
*/
public byte[] getNormalizedValueCopy()
{
@@ -414,7 +412,8 @@
}
else
{
- return ByteArrayComparator.INSTANCE.compare( getNormalizedValueReference(), binaryValue.getNormalizedValueReference() );
+ return ByteArrayComparator.INSTANCE.compare( getNormalizedValueReference(),
+ binaryValue.getNormalizedValueReference() );
}
}
catch ( NamingException e )
@@ -687,7 +686,7 @@
else
{
int wrappedLength = in.readInt();
- byte[] wrapped = null;
+ byte[] wrappedBytes = null;
switch ( wrappedLength )
{
@@ -699,15 +698,15 @@
case 0 :
// Empty value, so is the normalized value
- wrapped = StringTools.EMPTY_BYTES;
- normalizedValue = wrapped;
+ wrappedBytes = StringTools.EMPTY_BYTES;
+ normalizedValue = wrappedBytes;
setNormalized( true );
same = true;
break;
default :
- wrapped = new byte[wrappedLength];
- in.readFully( wrapped );
+ wrappedBytes = new byte[wrappedLength];
+ in.readFully( wrappedBytes );
int normalizedLength = in.readInt();
@@ -737,7 +736,7 @@
break;
}
- set( wrapped );
+ set( wrappedBytes );
}
}
}
\ No newline at end of file
Modified: directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntry.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntry.java (original)
+++ directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntry.java Mon May 12 04:49:35 2008
@@ -19,16 +19,16 @@
package org.apache.directory.server.core.entry;
+import java.util.List;
+import java.util.Set;
+
+import javax.naming.NamingException;
+
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Value;
import org.apache.directory.shared.ldap.schema.AttributeType;
-import javax.naming.NamingException;
-
-import java.util.List;
-import java.util.Set;
-
/**
* A server side entry which is schema aware.
@@ -550,5 +550,5 @@
/**
* A clone method to produce a clone of the current object
*/
- public Entry clone();
+ Entry clone();
}
Modified: directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryPropertyEditor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryPropertyEditor.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryPropertyEditor.java (original)
+++ directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryPropertyEditor.java Mon May 12 04:49:35 2008
@@ -19,17 +19,6 @@
*/
package org.apache.directory.server.core.entry;
-import org.apache.directory.shared.ldap.ldif.LdifComposer;
-import org.apache.directory.shared.ldap.ldif.LdifComposerImpl;
-import org.apache.directory.shared.ldap.ldif.LdifReader;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
-import org.apache.directory.shared.ldap.util.MultiMap;
-import org.apache.directory.shared.ldap.util.StringTools;
-
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-import javax.naming.directory.Attribute;
-import javax.naming.directory.Attributes;
import java.beans.PropertyEditor;
import java.beans.PropertyEditorSupport;
import java.io.BufferedReader;
@@ -39,6 +28,18 @@
import java.util.Map;
import java.util.Set;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+
+import org.apache.directory.shared.ldap.ldif.LdifComposer;
+import org.apache.directory.shared.ldap.ldif.LdifComposerImpl;
+import org.apache.directory.shared.ldap.ldif.LdifReader;
+import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.util.MultiMap;
+import org.apache.directory.shared.ldap.util.StringTools;
+
/**
* A JavaBeans {@link PropertyEditor} that can convert {@link ServerEntry} to
Modified: directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntrySerializer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntrySerializer.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntrySerializer.java (original)
+++ directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntrySerializer.java Mon May 12 04:49:35 2008
@@ -19,7 +19,6 @@
*/
package org.apache.directory.server.core.entry;
-
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -30,25 +29,25 @@
import javax.naming.NamingException;
-import jdbm.helper.Serializer;
-
import org.apache.directory.server.schema.registries.Registries;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Value;
-import org.apache.directory.shared.ldap.name.LdapDNSerializer;
import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.LdapDNSerializer;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import jdbm.helper.Serializer;
+
/**
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev$
+ * @version $Rev$, $Date$
*/
public class ServerEntrySerializer implements Serializer
{
- public static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
/** the logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( ServerEntrySerializer.class );
@@ -62,10 +61,10 @@
private transient Registries registries;
/** Flag used for ServerStringValue */
- private transient static final boolean HR_VALUE = true;
+ private static final transient boolean HR_VALUE = true;
/** Flag used for streamed values */
- private transient static final boolean STREAMED_VALUE = true;
+ private static final transient boolean STREAMED_VALUE = true;
/**
@@ -121,7 +120,7 @@
// Then the attributes.
out.writeInt( entry.size() );
- // Iterate through the attrbutes. We store the Attribute
+ // Iterate through the attributes. We store the Attribute
// here, to be able to restore it in the readExternal :
// we need access to the registries, which are not available
// in the ServerAttribute class.
@@ -189,7 +188,7 @@
if ( ssv.get() == null )
{
- // Write two empry string for UP nad normalized
+ // Write two empty string for UP and normalized
out.writeUTF( "" );
out.writeUTF( "" );
}
@@ -246,8 +245,7 @@
* [UP value]
* [Norm value] (will be null if normValue == upValue)
*/
- private Value<?> deserializeValue( ObjectInput in, AttributeType attributeType ) throws IOException,
- NamingException
+ private Value<?> deserializeValue( ObjectInput in, AttributeType attributeType ) throws IOException
{
boolean isValid = in.readBoolean();
boolean isHR = in.readBoolean();