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 2010/01/26 23:50:33 UTC
svn commit: r903467 [3/3] - in /directory/shared/trunk: ./ all/ dsml-parser/
ldap-convert/ ldap-jndi/
ldap-jndi/src/main/java/org/apache/directory/shared/ldap/jndi/
ldap-schema-loader/ ldap-schema/
ldap/src/main/java/org/apache/directory/shared/ldap/co...
Added: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/Control.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/Control.java?rev=903467&view=auto
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/Control.java (added)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/Control.java Tue Jan 26 22:50:30 2010
@@ -0,0 +1,86 @@
+/*
+ * 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.shared.ldap.message.control;
+
+
+/**
+ * Protocol request and response altering control interface. Any number of
+ * controls may be associated with a protocol message.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev: 764131 $
+ */
+public interface Control
+{
+ /**
+ * @return The Control's OID
+ */
+ String getOid();
+
+
+ /**
+ * Sets the OID of the Control to identify the control type.
+ *
+ * @param oid the OID of this Control.
+ */
+ void setOid( String oid );
+
+
+ /**
+ * Tells if the control is critical or not.
+ *
+ * @return <code>true/code> if the control is critical, <code>false</code> otherwise
+ */
+ boolean isCritical();
+
+
+ /**
+ * Sets the critical flag which determines whether or not this control is
+ * critical for the correct operation of a request or response message. The
+ * default for this value should be false.
+ *
+ * @param isCritical true if the control is critical false otherwise.
+ */
+ void setCritical( boolean isCritical );
+
+
+ /**
+ * Returns the encoded value for this Control
+ *
+ * @return The encoded value
+ */
+ byte[] getValue();
+
+
+ /**
+ * Stores the encoded value for this Control
+ *
+ * @param value The encoded value
+ */
+ void setValue( byte[] value );
+
+
+ /**
+ * Tells if the Control has a value or not
+ *
+ * @return <code>true</code> if th Control has a value, even containing no bytes.
+ */
+ boolean hasValue();
+}
Added: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/ControlImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/ControlImpl.java?rev=903467&view=auto
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/ControlImpl.java (added)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/ControlImpl.java Tue Jan 26 22:50:30 2010
@@ -0,0 +1,35 @@
+/*
+ * 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.shared.ldap.message.control;
+
+
+/**
+ * A Control implementation to instanciate new Control.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
+ */
+public class ControlImpl extends AbstractControl
+{
+ public ControlImpl( String oid )
+ {
+ super( oid );
+ }
+}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/EntryChangeControl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/EntryChangeControl.java?rev=903467&r1=903466&r2=903467&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/EntryChangeControl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/EntryChangeControl.java Tue Jan 26 22:50:30 2010
@@ -75,7 +75,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public class EntryChangeControl extends InternalAbstractControl
+public class EntryChangeControl extends AbstractControl
{
private static final long serialVersionUID = -2356861450876343999L;
@@ -94,8 +94,7 @@
public EntryChangeControl()
{
- super();
- setID( CONTROL_OID );
+ super( CONTROL_OID );
}
@@ -135,7 +134,10 @@
}
- public byte[] getEncodedValue()
+ /**
+ * {@inheritDoc}
+ */
+ public byte[] getValue()
{
// should call this codec or something
EntryChangeControlCodec ecc = new EntryChangeControlCodec();
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/ManageDsaITControl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/ManageDsaITControl.java?rev=903467&r1=903466&r2=903467&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/ManageDsaITControl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/ManageDsaITControl.java Tue Jan 26 22:50:30 2010
@@ -19,7 +19,6 @@
*/
package org.apache.directory.shared.ldap.message.control;
-import org.apache.directory.shared.ldap.util.StringTools;
/**
@@ -60,30 +59,18 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public class ManageDsaITControl extends InternalAbstractControl
+public class ManageDsaITControl extends AbstractControl
{
public static final String CONTROL_OID = "2.16.840.1.113730.3.4.2";
private static final long serialVersionUID = -8844249964346248321L;
- /**
- * Returns an empty byte[] every time.
- */
- public byte[] getEncodedValue()
- {
- return StringTools.EMPTY_BYTES;
- }
-
-
- /**
- * Returns an empty byte[] every time.
- */
- public byte[] getValue()
+ public ManageDsaITControl()
{
- return StringTools.EMPTY_BYTES;
+ super( CONTROL_OID );
}
-
-
+
+
/**
* Returns "2.16.840.1.113730.3.4.2" every time.
*/
@@ -96,7 +83,7 @@
/**
* Returns "2.16.840.1.113730.3.4.2" every time.
*/
- public String getID()
+ public String getOid()
{
return CONTROL_OID;
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/PagedSearchControl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/PagedSearchControl.java?rev=903467&r1=903466&r2=903467&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/PagedSearchControl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/PagedSearchControl.java Tue Jan 26 22:50:30 2010
@@ -58,7 +58,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev: 678621 $
*/
-public class PagedSearchControl extends InternalAbstractControl
+public class PagedSearchControl extends AbstractControl
{
private static final long serialVersionUID = -2356861450876343999L;
@@ -81,8 +81,7 @@
*/
public PagedSearchControl()
{
- super();
- setID( CONTROL_OID );
+ super( CONTROL_OID );
}
@@ -138,9 +137,9 @@
/**
- * Encode the control.
+ * {@inheritDoc}
*/
- public byte[] getEncodedValue()
+ public byte[] getValue()
{
// should call this codec or something
PagedSearchControlCodec pscc = new PagedSearchControlCodec();
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/PersistentSearchControl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/PersistentSearchControl.java?rev=903467&r1=903466&r2=903467&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/PersistentSearchControl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/PersistentSearchControl.java Tue Jan 26 22:50:30 2010
@@ -44,7 +44,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public class PersistentSearchControl extends InternalAbstractControl
+public class PersistentSearchControl extends AbstractControl
{
/** As this class is serializable, defined its serialVersionUID */
private static final long serialVersionUID = -2356861450876343999L;
@@ -92,8 +92,7 @@
public PersistentSearchControl()
{
- super();
- setID( CONTROL_OID );
+ super( CONTROL_OID );
}
@@ -146,10 +145,9 @@
/**
- * @return The encoded byte[] for this persistentSearch control
- *
+ * {@inheritDoc}
*/
- public byte[] getEncodedValue()
+ public byte[] getValue()
{
PSearchControlCodec psearchCtlCodec = new PSearchControlCodec();
psearchCtlCodec.setChangesOnly( changesOnly );
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/SubentriesControl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/SubentriesControl.java?rev=903467&r1=903466&r2=903467&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/SubentriesControl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/SubentriesControl.java Tue Jan 26 22:50:30 2010
@@ -22,7 +22,6 @@
import org.apache.directory.shared.asn1.codec.EncoderException;
import org.apache.directory.shared.ldap.codec.search.controls.subEntry.SubEntryControlCodec;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -67,7 +66,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public class SubentriesControl extends InternalAbstractControl
+public class SubentriesControl extends AbstractControl
{
private static final long serialVersionUID = -2356861450876343999L;
@@ -81,8 +80,7 @@
public SubentriesControl()
{
- super();
- setID( CONTROL_OID );
+ super( CONTROL_OID );
}
@@ -98,7 +96,10 @@
}
- public byte[] getEncodedValue()
+ /**
+ * {@inheritDoc}
+ */
+ public byte[] getValue()
{
SubEntryControlCodec ctl = new SubEntryControlCodec();
ctl.setVisibility( isVisible() );
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncDoneValueControl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncDoneValueControl.java?rev=903467&r1=903466&r2=903467&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncDoneValueControl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncDoneValueControl.java Tue Jan 26 22:50:30 2010
@@ -22,7 +22,7 @@
import org.apache.directory.shared.asn1.codec.EncoderException;
import org.apache.directory.shared.ldap.codec.controls.replication.syncDoneValue.SyncDoneValueControlCodec;
-import org.apache.directory.shared.ldap.message.control.InternalAbstractControl;
+import org.apache.directory.shared.ldap.message.control.AbstractControl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -41,7 +41,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class SyncDoneValueControl extends InternalAbstractControl
+public class SyncDoneValueControl extends AbstractControl
{
/** As this class is serializable, defined its serialVersionUID */
private static final long serialVersionUID = 1L;
@@ -59,6 +59,12 @@
private boolean refreshDeletes;
+ public SyncDoneValueControl()
+ {
+ super( CONTROL_OID );
+ }
+
+
/**
* @return the cookie
*/
@@ -99,7 +105,7 @@
* {@inheritDoc}
*/
@Override
- public String getID()
+ public String getOid()
{
return CONTROL_OID;
}
@@ -108,7 +114,7 @@
/**
* {@inheritDoc}
*/
- public byte[] getEncodedValue()
+ public byte[] getValue()
{
SyncDoneValueControlCodec codec = new SyncDoneValueControlCodec();
codec.setCookie( cookie );
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncInfoValueNewCookieControl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncInfoValueNewCookieControl.java?rev=903467&r1=903466&r2=903467&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncInfoValueNewCookieControl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncInfoValueNewCookieControl.java Tue Jan 26 22:50:30 2010
@@ -21,7 +21,7 @@
import org.apache.directory.shared.asn1.codec.EncoderException;
import org.apache.directory.shared.ldap.codec.controls.replication.syncInfoValue.SyncInfoValueControlCodec;
-import org.apache.directory.shared.ldap.message.control.InternalAbstractControl;
+import org.apache.directory.shared.ldap.message.control.AbstractControl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -40,7 +40,7 @@
* @version $Rev: $
*
*/
-public class SyncInfoValueNewCookieControl extends InternalAbstractControl implements SyncInfoValueControl
+public class SyncInfoValueNewCookieControl extends AbstractControl implements SyncInfoValueControl
{
/** As this class is serializable, defined its serialVersionUID */
private static final long serialVersionUID = 1L;
@@ -52,6 +52,12 @@
private byte[] newCookie;
+ public SyncInfoValueNewCookieControl()
+ {
+ super( CONTROL_OID );
+ }
+
+
/**
* {@inheritDoc}
*/
@@ -74,7 +80,7 @@
* {@inheritDoc}
*/
@Override
- public String getID()
+ public String getOid()
{
return CONTROL_OID;
}
@@ -83,7 +89,7 @@
/**
* {@inheritDoc}
*/
- public byte[] getEncodedValue()
+ public byte[] getValue()
{
SyncInfoValueControlCodec syncInfoValueCtlCodec = new SyncInfoValueControlCodec( SynchronizationInfoEnum.NEW_COOKIE );
syncInfoValueCtlCodec.setCookie( newCookie );
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncInfoValueRefreshDeleteControl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncInfoValueRefreshDeleteControl.java?rev=903467&r1=903466&r2=903467&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncInfoValueRefreshDeleteControl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncInfoValueRefreshDeleteControl.java Tue Jan 26 22:50:30 2010
@@ -21,7 +21,7 @@
import org.apache.directory.shared.asn1.codec.EncoderException;
import org.apache.directory.shared.ldap.codec.controls.replication.syncInfoValue.SyncInfoValueControlCodec;
-import org.apache.directory.shared.ldap.message.control.InternalAbstractControl;
+import org.apache.directory.shared.ldap.message.control.AbstractControl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -44,7 +44,7 @@
* @version $Rev: $
*
*/
-public class SyncInfoValueRefreshDeleteControl extends InternalAbstractControl implements SyncInfoValueControl
+public class SyncInfoValueRefreshDeleteControl extends AbstractControl implements SyncInfoValueControl
{
/** As this class is serializable, defined its serialVersionUID */
private static final long serialVersionUID = 1L;
@@ -60,6 +60,12 @@
private boolean refreshDone = true;
+ public SyncInfoValueRefreshDeleteControl()
+ {
+ super( CONTROL_OID );
+ }
+
+
/**
* {@inheritDoc}
*/
@@ -100,7 +106,7 @@
* {@inheritDoc}
*/
@Override
- public String getID()
+ public String getOid()
{
return CONTROL_OID;
}
@@ -109,7 +115,7 @@
/**
* {@inheritDoc}
*/
- public byte[] getEncodedValue()
+ public byte[] getValue()
{
SyncInfoValueControlCodec syncInfoValueCtlCodec =
new SyncInfoValueControlCodec( SynchronizationInfoEnum.REFRESH_DELETE );
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncInfoValueRefreshPresentControl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncInfoValueRefreshPresentControl.java?rev=903467&r1=903466&r2=903467&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncInfoValueRefreshPresentControl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncInfoValueRefreshPresentControl.java Tue Jan 26 22:50:30 2010
@@ -21,7 +21,7 @@
import org.apache.directory.shared.asn1.codec.EncoderException;
import org.apache.directory.shared.ldap.codec.controls.replication.syncInfoValue.SyncInfoValueControlCodec;
-import org.apache.directory.shared.ldap.message.control.InternalAbstractControl;
+import org.apache.directory.shared.ldap.message.control.AbstractControl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -44,7 +44,7 @@
* @version $Rev: $
*
*/
-public class SyncInfoValueRefreshPresentControl extends InternalAbstractControl implements SyncInfoValueControl
+public class SyncInfoValueRefreshPresentControl extends AbstractControl implements SyncInfoValueControl
{
/** As this class is serializable, defined its serialVersionUID */
private static final long serialVersionUID = 1L;
@@ -60,6 +60,12 @@
private boolean refreshDone = true;
+ public SyncInfoValueRefreshPresentControl()
+ {
+ super( CONTROL_OID );
+ }
+
+
/**
* {@inheritDoc}
*/
@@ -100,7 +106,7 @@
* {@inheritDoc}
*/
@Override
- public String getID()
+ public String getOid()
{
return CONTROL_OID;
}
@@ -109,7 +115,7 @@
/**
* {@inheritDoc}
*/
- public byte[] getEncodedValue()
+ public byte[] getValue()
{
SyncInfoValueControlCodec syncInfoValueCtlCodec =
new SyncInfoValueControlCodec( SynchronizationInfoEnum.REFRESH_PRESENT );
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncInfoValueSyncIdSetControl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncInfoValueSyncIdSetControl.java?rev=903467&r1=903466&r2=903467&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncInfoValueSyncIdSetControl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncInfoValueSyncIdSetControl.java Tue Jan 26 22:50:30 2010
@@ -24,7 +24,7 @@
import org.apache.directory.shared.asn1.codec.EncoderException;
import org.apache.directory.shared.ldap.codec.controls.replication.syncInfoValue.SyncInfoValueControlCodec;
-import org.apache.directory.shared.ldap.message.control.InternalAbstractControl;
+import org.apache.directory.shared.ldap.message.control.AbstractControl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -47,7 +47,7 @@
* @version $Rev: $
*
*/
-public class SyncInfoValueSyncIdSetControl extends InternalAbstractControl implements SyncInfoValueControl
+public class SyncInfoValueSyncIdSetControl extends AbstractControl implements SyncInfoValueControl
{
/** As this class is serializable, defined its serialVersionUID */
private static final long serialVersionUID = 1L;
@@ -66,6 +66,12 @@
private List<byte[]> syncUUIDs = new ArrayList<byte[]>();
+ public SyncInfoValueSyncIdSetControl()
+ {
+ super( CONTROL_OID );
+ }
+
+
/**
* {@inheritDoc}
*/
@@ -124,7 +130,7 @@
* {@inheritDoc}
*/
@Override
- public String getID()
+ public String getOid()
{
return CONTROL_OID;
}
@@ -133,7 +139,7 @@
/**
* {@inheritDoc}
*/
- public byte[] getEncodedValue()
+ public byte[] getValue()
{
SyncInfoValueControlCodec syncInfoValueCtlCodec =
new SyncInfoValueControlCodec( SynchronizationInfoEnum.SYNC_ID_SET );
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncRequestValueControl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncRequestValueControl.java?rev=903467&r1=903466&r2=903467&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncRequestValueControl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncRequestValueControl.java Tue Jan 26 22:50:30 2010
@@ -21,7 +21,7 @@
import org.apache.directory.shared.asn1.codec.EncoderException;
import org.apache.directory.shared.ldap.codec.controls.replication.syncRequestValue.SyncRequestValueControlCodec;
-import org.apache.directory.shared.ldap.message.control.InternalAbstractControl;
+import org.apache.directory.shared.ldap.message.control.AbstractControl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -46,7 +46,7 @@
* @version $Rev: $
*
*/
-public class SyncRequestValueControl extends InternalAbstractControl
+public class SyncRequestValueControl extends AbstractControl
{
/** As this class is serializable, defined its serialVersionUID */
private static final long serialVersionUID = 1L;
@@ -67,6 +67,12 @@
private boolean reloadHint;
+ public SyncRequestValueControl()
+ {
+ super( CONTROL_OID );
+ }
+
+
/**
* @return the mode
*/
@@ -125,7 +131,7 @@
* {@inheritDoc}
*/
@Override
- public String getID()
+ public String getOid()
{
return CONTROL_OID;
}
@@ -134,7 +140,7 @@
/**
* {@inheritDoc}
*/
- public byte[] getEncodedValue()
+ public byte[] getValue()
{
SyncRequestValueControlCodec syncRequestValueCtlCodec = new SyncRequestValueControlCodec();
syncRequestValueCtlCodec.setMode( mode );
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncStateValueControl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncStateValueControl.java?rev=903467&r1=903466&r2=903467&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncStateValueControl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncStateValueControl.java Tue Jan 26 22:50:30 2010
@@ -21,7 +21,7 @@
import org.apache.directory.shared.asn1.codec.EncoderException;
import org.apache.directory.shared.ldap.codec.controls.replication.syncStateValue.SyncStateValueControlCodec;
-import org.apache.directory.shared.ldap.message.control.InternalAbstractControl;
+import org.apache.directory.shared.ldap.message.control.AbstractControl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -47,7 +47,7 @@
* @version $Rev: $
*
*/
-public class SyncStateValueControl extends InternalAbstractControl
+public class SyncStateValueControl extends AbstractControl
{
/** As this class is serializable, defined its serialVersionUID */
private static final long serialVersionUID = 1L;
@@ -68,6 +68,12 @@
private byte[] cookie;
+ public SyncStateValueControl()
+ {
+ super( CONTROL_OID );
+ }
+
+
/**
* @return the syncState's type
*/
@@ -130,7 +136,7 @@
* {@inheritDoc}
*/
@Override
- public String getID()
+ public String getOid()
{
return CONTROL_OID;
}
@@ -139,7 +145,7 @@
/**
* {@inheritDoc}
*/
- public byte[] getEncodedValue()
+ public byte[] getValue()
{
SyncStateValueControlCodec syncStateValueCtlCodec = new SyncStateValueControlCodec();
syncStateValueCtlCodec.setSyncStateType( syncStateType );
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributeUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributeUtils.java?rev=903467&r1=903466&r2=903467&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributeUtils.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributeUtils.java Tue Jan 26 22:50:30 2010
@@ -32,7 +32,6 @@
import javax.naming.directory.BasicAttribute;
import javax.naming.directory.BasicAttributes;
import javax.naming.directory.InvalidAttributeIdentifierException;
-import javax.naming.directory.InvalidAttributeValueException;
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
@@ -40,7 +39,6 @@
import org.apache.directory.shared.ldap.entry.Value;
import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
-import org.apache.directory.shared.ldap.ldif.LdifAttributesReader;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.schema.MatchingRule;
@@ -1322,81 +1320,4 @@
return null;
}
}
-
-
- /**
- * Build a new Attributes instance from a LDIF list of lines. The values can be
- * either a complete AVA, or a couple of AttributeType ID and a value (a String or
- * a byte[]). The following sample shows the three cases :
- *
- * <pre>
- * Attribute attr = AttributeUtils.createAttributes(
- * "objectclass: top",
- * "cn", "My name",
- * "jpegPhoto", new byte[]{0x01, 0x02} );
- * </pre>
- *
- * @param avas The AttributeType and Values, using a ldif format, or a couple of
- * Attribute ID/Value
- * @return An Attributes instance
- * @throws NamingException If the data are invalid
- */
- public static Attributes createAttributes( Object... avas ) throws NamingException
- {
- StringBuilder sb = new StringBuilder();
- int pos = 0;
- boolean valueExpected = false;
-
- for ( Object ava : avas)
- {
- if ( !valueExpected )
- {
- if ( !(ava instanceof String) )
- {
- throw new InvalidAttributeValueException( "The Attribute ID #" + (pos+1) + " must be a String" );
- }
-
- String attribute = (String)ava;
- sb.append( attribute );
-
- if ( attribute.indexOf( ':' ) != -1 )
- {
- sb.append( '\n' );
- }
- else
- {
- valueExpected = true;
- }
- }
- else
- {
- if ( ava instanceof String )
- {
- sb.append( ": " ).append( (String)ava ).append( '\n' );
- }
- else if ( ava instanceof byte[] )
- {
- sb.append( ":: " );
- sb.append( new String( Base64.encode( (byte[] )ava ) ) );
- sb.append( '\n' );
- }
- else
- {
- throw new InvalidAttributeValueException( "The Attribute value #" + (pos+1) + " must be a String or a byte[]" );
- }
-
- valueExpected = false;
- }
- }
-
- if ( valueExpected )
- {
- throw new InvalidAttributeValueException( "A value is missing at the end" );
- }
-
- LdifAttributesReader reader = new LdifAttributesReader();
- Attributes attributes = reader.parseAttributes( sb.toString() );
-
- return attributes;
- }
}
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractMessageTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractMessageTest.java?rev=903467&r1=903466&r2=903467&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractMessageTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractMessageTest.java Tue Jan 26 22:50:30 2010
@@ -20,13 +20,12 @@
package org.apache.directory.shared.ldap.message;
-import org.apache.directory.shared.ldap.message.InternalAbstractMessage;
-import org.apache.directory.shared.ldap.message.InternalControl;
-import org.apache.directory.shared.ldap.message.MessageTypeEnum;
-import org.junit.Test;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import org.apache.directory.shared.ldap.message.control.ControlImpl;
+import org.junit.Test;
+
/**
* Test cases for the AbstractMessage class' methods.
@@ -122,42 +121,45 @@
{
InternalAbstractMessage msg0;
InternalAbstractMessage msg1;
+
msg0 = new InternalAbstractMessage( 5, MessageTypeEnum.BIND_REQUEST )
{
private static final long serialVersionUID = 1L;
};
- msg0.add( new InternalControl()
+
+ msg0.add( new ControlImpl( "0.0" )
{
private static final long serialVersionUID = 1L;
- public void setID( String a_oid )
+ public void setOid( String oid )
{
}
-
+
public boolean isCritical()
{
return false;
}
- public void setCritical( boolean a_isCritical )
+ public void setCritical( boolean isCritical )
{
}
- public byte[] getEncodedValue()
+ public byte[] getValue()
{
return null;
}
- public String getID()
+ public String getOid()
{
return null;
}
} );
+
msg1 = new InternalAbstractMessage( 5, MessageTypeEnum.BIND_REQUEST )
{
private static final long serialVersionUID = 1L;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractResultResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractResultResponseTest.java?rev=903467&r1=903466&r2=903467&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractResultResponseTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractResultResponseTest.java Tue Jan 26 22:50:30 2010
@@ -20,19 +20,14 @@
package org.apache.directory.shared.ldap.message;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
import javax.naming.InvalidNameException;
-import org.apache.directory.shared.ldap.message.InternalAbstractResultResponse;
-import org.apache.directory.shared.ldap.message.InternalControl;
-import org.apache.directory.shared.ldap.message.InternalLdapResult;
-import org.apache.directory.shared.ldap.message.MessageTypeEnum;
-import org.apache.directory.shared.ldap.message.InternalReferral;
-import org.apache.directory.shared.ldap.message.ReferralImpl;
-import org.apache.directory.shared.ldap.message.ResultCodeEnum;
+import org.apache.directory.shared.ldap.message.control.ControlImpl;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.junit.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
/**
@@ -186,16 +181,18 @@
{
InternalAbstractResultResponse msg0;
InternalAbstractResultResponse msg1;
+
msg0 = new InternalAbstractResultResponse( 5, MessageTypeEnum.BIND_REQUEST )
{
private static final long serialVersionUID = 1L;
};
- msg0.add( new InternalControl()
+
+ msg0.add( new ControlImpl( "0.0" )
{
private static final long serialVersionUID = 1L;
- public void setID( String a_oid )
+ public void setOid( String oid )
{
}
@@ -206,22 +203,23 @@
}
- public void setCritical( boolean a_isCritical )
+ public void setCritical( boolean isCritical )
{
}
- public byte[] getEncodedValue()
+ public byte[] getValue()
{
return null;
}
- public String getID()
+ public String getOid()
{
return null;
}
} );
+
msg1 = new InternalAbstractResultResponse( 5, MessageTypeEnum.BIND_REQUEST )
{
private static final long serialVersionUID = 1L;
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AddRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AddRequestImplTest.java?rev=903467&r1=903466&r2=903467&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AddRequestImplTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AddRequestImplTest.java Tue Jan 26 22:50:30 2010
@@ -20,28 +20,22 @@
package org.apache.directory.shared.ldap.message;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
import java.util.HashMap;
import java.util.Map;
import javax.naming.InvalidNameException;
import javax.naming.NamingException;
-import javax.naming.ldap.Control;
-
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
-import org.apache.directory.shared.ldap.message.AbandonListener;
-import org.apache.directory.shared.ldap.message.InternalAddRequest;
-import org.apache.directory.shared.ldap.message.AddRequestImpl;
-import org.apache.directory.shared.ldap.message.MessageException;
-import org.apache.directory.shared.ldap.message.MessageTypeEnum;
-import org.apache.directory.shared.ldap.message.InternalResultResponse;
+import org.apache.directory.shared.ldap.message.control.Control;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.junit.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
/**
@@ -242,12 +236,12 @@
}
- public void add( javax.naming.ldap.Control control ) throws MessageException
+ public void add( Control control ) throws MessageException
{
}
- public void remove( javax.naming.ldap.Control control ) throws MessageException
+ public void remove( Control control ) throws MessageException
{
}
@@ -292,7 +286,7 @@
}
- public void addAll( javax.naming.ldap.Control[] controls ) throws MessageException
+ public void addAll( Control[] controls ) throws MessageException
{
}
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindRequestImplTest.java?rev=903467&r1=903466&r2=903467&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindRequestImplTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindRequestImplTest.java Tue Jan 26 22:50:30 2010
@@ -20,21 +20,17 @@
package org.apache.directory.shared.ldap.message;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
import java.util.HashMap;
import java.util.Map;
import javax.naming.InvalidNameException;
-import javax.naming.ldap.Control;
-import org.apache.directory.shared.ldap.message.InternalBindRequest;
-import org.apache.directory.shared.ldap.message.BindRequestImpl;
-import org.apache.directory.shared.ldap.message.MessageException;
-import org.apache.directory.shared.ldap.message.MessageTypeEnum;
-import org.apache.directory.shared.ldap.message.InternalResultResponse;
+import org.apache.directory.shared.ldap.message.control.Control;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.junit.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
/**
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/CompareRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/CompareRequestImplTest.java?rev=903467&r1=903466&r2=903467&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/CompareRequestImplTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/CompareRequestImplTest.java Tue Jan 26 22:50:30 2010
@@ -20,23 +20,18 @@
package org.apache.directory.shared.ldap.message;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
import java.util.HashMap;
import java.util.Map;
import javax.naming.InvalidNameException;
-import javax.naming.ldap.Control;
import org.apache.directory.shared.ldap.entry.Value;
-import org.apache.directory.shared.ldap.message.AbandonListener;
-import org.apache.directory.shared.ldap.message.InternalCompareRequest;
-import org.apache.directory.shared.ldap.message.CompareRequestImpl;
-import org.apache.directory.shared.ldap.message.MessageException;
-import org.apache.directory.shared.ldap.message.MessageTypeEnum;
-import org.apache.directory.shared.ldap.message.InternalResultResponse;
+import org.apache.directory.shared.ldap.message.control.Control;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.junit.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
/**
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/DeleteRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/DeleteRequestImplTest.java?rev=903467&r1=903466&r2=903467&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/DeleteRequestImplTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/DeleteRequestImplTest.java Tue Jan 26 22:50:30 2010
@@ -20,22 +20,17 @@
package org.apache.directory.shared.ldap.message;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
import java.util.HashMap;
import java.util.Map;
import javax.naming.InvalidNameException;
-import javax.naming.ldap.Control;
-import org.apache.directory.shared.ldap.message.AbandonListener;
-import org.apache.directory.shared.ldap.message.InternalDeleteRequest;
-import org.apache.directory.shared.ldap.message.DeleteRequestImpl;
-import org.apache.directory.shared.ldap.message.MessageException;
-import org.apache.directory.shared.ldap.message.MessageTypeEnum;
-import org.apache.directory.shared.ldap.message.InternalResultResponse;
+import org.apache.directory.shared.ldap.message.control.Control;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.junit.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
/**
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedRequestImplTest.java?rev=903467&r1=903466&r2=903467&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedRequestImplTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedRequestImplTest.java Tue Jan 26 22:50:30 2010
@@ -20,21 +20,17 @@
package org.apache.directory.shared.ldap.message;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
import java.util.HashMap;
import java.util.Map;
import javax.naming.NamingException;
-import javax.naming.ldap.Control;
import javax.naming.ldap.ExtendedResponse;
-import org.apache.directory.shared.ldap.message.InternalExtendedRequest;
-import org.apache.directory.shared.ldap.message.ExtendedRequestImpl;
-import org.apache.directory.shared.ldap.message.MessageException;
-import org.apache.directory.shared.ldap.message.MessageTypeEnum;
-import org.apache.directory.shared.ldap.message.InternalResultResponse;
+import org.apache.directory.shared.ldap.message.control.Control;
import org.junit.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
/**
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedResponseImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedResponseImplTest.java?rev=903467&r1=903466&r2=903467&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedResponseImplTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedResponseImplTest.java Tue Jan 26 22:50:30 2010
@@ -20,24 +20,17 @@
package org.apache.directory.shared.ldap.message;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
import java.util.HashMap;
import java.util.Map;
import javax.naming.InvalidNameException;
-import javax.naming.ldap.Control;
-import org.apache.directory.shared.ldap.message.InternalExtendedResponse;
-import org.apache.directory.shared.ldap.message.ExtendedResponseImpl;
-import org.apache.directory.shared.ldap.message.InternalLdapResult;
-import org.apache.directory.shared.ldap.message.LdapResultImpl;
-import org.apache.directory.shared.ldap.message.MessageException;
-import org.apache.directory.shared.ldap.message.MessageTypeEnum;
-import org.apache.directory.shared.ldap.message.ReferralImpl;
-import org.apache.directory.shared.ldap.message.ResultCodeEnum;
+import org.apache.directory.shared.ldap.message.control.Control;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.junit.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
/**
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImplTest.java?rev=903467&r1=903466&r2=903467&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImplTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImplTest.java Tue Jan 26 22:50:30 2010
@@ -20,23 +20,18 @@
package org.apache.directory.shared.ldap.message;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
import java.util.HashMap;
import java.util.Map;
import javax.naming.InvalidNameException;
-import javax.naming.ldap.Control;
-import org.apache.directory.shared.ldap.message.AbandonListener;
-import org.apache.directory.shared.ldap.message.MessageException;
-import org.apache.directory.shared.ldap.message.MessageTypeEnum;
-import org.apache.directory.shared.ldap.message.InternalModifyDnRequest;
-import org.apache.directory.shared.ldap.message.ModifyDnRequestImpl;
-import org.apache.directory.shared.ldap.message.InternalResultResponse;
+import org.apache.directory.shared.ldap.message.control.Control;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.name.RDN;
import org.junit.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
/**
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.java?rev=903467&r1=903466&r2=903467&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.java Tue Jan 26 22:50:30 2010
@@ -20,30 +20,25 @@
package org.apache.directory.shared.ldap.message;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
import javax.naming.InvalidNameException;
-import javax.naming.ldap.Control;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Modification;
import org.apache.directory.shared.ldap.entry.ModificationOperation;
import org.apache.directory.shared.ldap.entry.client.ClientModification;
import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
-import org.apache.directory.shared.ldap.message.AbandonListener;
-import org.apache.directory.shared.ldap.message.MessageException;
-import org.apache.directory.shared.ldap.message.MessageTypeEnum;
-import org.apache.directory.shared.ldap.message.InternalModifyRequest;
-import org.apache.directory.shared.ldap.message.ModifyRequestImpl;
-import org.apache.directory.shared.ldap.message.InternalResultResponse;
+import org.apache.directory.shared.ldap.message.control.Control;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.junit.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Collection;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
/**
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseDoneImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseDoneImplTest.java?rev=903467&r1=903466&r2=903467&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseDoneImplTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseDoneImplTest.java Tue Jan 26 22:50:30 2010
@@ -20,24 +20,17 @@
package org.apache.directory.shared.ldap.message;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
import java.util.HashMap;
import java.util.Map;
import javax.naming.InvalidNameException;
-import javax.naming.ldap.Control;
-import org.apache.directory.shared.ldap.message.InternalLdapResult;
-import org.apache.directory.shared.ldap.message.LdapResultImpl;
-import org.apache.directory.shared.ldap.message.MessageException;
-import org.apache.directory.shared.ldap.message.MessageTypeEnum;
-import org.apache.directory.shared.ldap.message.ReferralImpl;
-import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.message.InternalSearchResponseDone;
-import org.apache.directory.shared.ldap.message.SearchResponseDoneImpl;
+import org.apache.directory.shared.ldap.message.control.Control;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.junit.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
/**
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseReferenceImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseReferenceImplTest.java?rev=903467&r1=903466&r2=903467&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseReferenceImplTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseReferenceImplTest.java Tue Jan 26 22:50:30 2010
@@ -20,20 +20,14 @@
package org.apache.directory.shared.ldap.message;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
import java.util.HashMap;
import java.util.Map;
-import javax.naming.ldap.Control;
-
-import org.apache.directory.shared.ldap.message.MessageException;
-import org.apache.directory.shared.ldap.message.MessageTypeEnum;
-import org.apache.directory.shared.ldap.message.InternalReferral;
-import org.apache.directory.shared.ldap.message.ReferralImpl;
-import org.apache.directory.shared.ldap.message.InternalSearchResponseReference;
-import org.apache.directory.shared.ldap.message.SearchResponseReferenceImpl;
+import org.apache.directory.shared.ldap.message.control.Control;
import org.junit.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
/**
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/util/AttributeUtilsTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/util/AttributeUtilsTest.java?rev=903467&r1=903466&r2=903467&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/util/AttributeUtilsTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/util/AttributeUtilsTest.java Tue Jan 26 22:50:30 2010
@@ -23,14 +23,11 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
import java.util.HashSet;
import java.util.Set;
import javax.naming.NamingException;
-import javax.naming.directory.Attributes;
-import javax.naming.directory.InvalidAttributeValueException;
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
@@ -397,37 +394,5 @@
assertNotNull( entry.get( "cn" ) );
assertNull( entry.get( "ou" ) );
}
-
- @Test
- public void testCreateAttributesVarargs() throws NamingException
- {
- String mOid = "m-oid: 1.2.3.4";
- String description = "description";
-
- Attributes attrs = AttributeUtils.createAttributes(
- "objectClass: top",
- "objectClass: metaTop",
- "objectClass: metaSyntax",
- mOid,
- "m-description", description );
-
- assertEquals( "top", attrs.get( "objectClass" ).get( 0 ) );
- assertEquals( "metaTop", attrs.get( "objectClass" ).get( 1 ) );
- assertEquals( "metaSyntax", attrs.get( "objectClass" ).get( 2 ) );
- assertEquals( "1.2.3.4", attrs.get( "m-oid" ).get() );
- assertEquals( "description", attrs.get( "m-description" ).get() );
-
- try
- {
- AttributeUtils.createAttributes(
- "objectClass", "top",
- "objectClass" );
- fail();
- }
- catch ( InvalidAttributeValueException iave )
- {
- assertTrue( true );
- }
- }
}
Modified: directory/shared/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/pom.xml?rev=903467&r1=903466&r2=903467&view=diff
==============================================================================
--- directory/shared/trunk/pom.xml (original)
+++ directory/shared/trunk/pom.xml Tue Jan 26 22:50:30 2010
@@ -54,6 +54,7 @@
<module>asn1</module>
<module>ldap</module>
<module>ldap-jndi</module>
+ <module>ldap-ldif</module>
<module>ldap-constants</module>
<module>ldap-schema</module>
<module>ldap-schema-loader</module>