You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2011/02/10 05:20:23 UTC
svn commit: r1069226 - in /directory/shared/branches/m1/ldap-codec: ./
src/main/java/org/apache/directory/shared/ldap/codec/api/
src/main/java/org/apache/directory/shared/ldap/codec/osgi/
Author: akarasulu
Date: Thu Feb 10 04:20:22 2011
New Revision: 1069226
URL: http://svn.apache.org/viewvc?rev=1069226&view=rev
Log:
DIRSHARED-91: added default OSGi non-felix embedding LdapCodecService, and activator
Added:
directory/shared/branches/m1/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/api/DefaultLdapCodecService.java
directory/shared/branches/m1/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/osgi/
directory/shared/branches/m1/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultActivator.java
Modified:
directory/shared/branches/m1/ldap-codec/pom.xml
Modified: directory/shared/branches/m1/ldap-codec/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/pom.xml?rev=1069226&r1=1069225&r2=1069226&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-codec/pom.xml (original)
+++ directory/shared/branches/m1/ldap-codec/pom.xml Thu Feb 10 04:20:22 2011
@@ -131,9 +131,11 @@
<instructions>
<Bundle-SymbolicName>${project.groupId}.ldap.codec</Bundle-SymbolicName>
<Export-Package>
- org.apache.directory.shared.ldap.codec.api,
- org.apache.directory.shared.ldap.codec.controls
+ org.apache.directory.shared.ldap.codec.api
</Export-Package>
+ <Bundle-Activator>
+ org.apache.directory.shared.ldap.codec.osgi.DefaultActivator
+ </Bundle-Activator>
</instructions>
</configuration>
</plugin>
Added: directory/shared/branches/m1/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/api/DefaultLdapCodecService.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/api/DefaultLdapCodecService.java?rev=1069226&view=auto
==============================================================================
--- directory/shared/branches/m1/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/api/DefaultLdapCodecService.java (added)
+++ directory/shared/branches/m1/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/api/DefaultLdapCodecService.java Thu Feb 10 04:20:22 2011
@@ -0,0 +1,296 @@
+/*
+ * 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.codec.api;
+
+
+import org.apache.directory.shared.asn1.DecoderException;
+import org.apache.directory.shared.asn1.EncoderException;
+import org.apache.directory.shared.asn1.ber.Asn1Container;
+import org.apache.directory.shared.ldap.codec.BasicControlDecorator;
+import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
+import org.apache.directory.shared.ldap.codec.controls.cascade.CascadeFactory;
+import org.apache.directory.shared.ldap.codec.controls.manageDsaIT.ManageDsaITFactory;
+import org.apache.directory.shared.ldap.codec.controls.search.entryChange.EntryChangeFactory;
+import org.apache.directory.shared.ldap.codec.controls.search.pagedSearch.PagedResultsFactory;
+import org.apache.directory.shared.ldap.codec.controls.search.persistentSearch.PersistentSearchFactory;
+import org.apache.directory.shared.ldap.codec.controls.search.subentries.SubentriesFactory;
+import org.apache.directory.shared.ldap.codec.decorators.MessageDecorator;
+import org.apache.directory.shared.ldap.codec.protocol.mina.LdapProtocolCodecFactory;
+import org.apache.directory.shared.ldap.model.message.Control;
+import org.apache.directory.shared.ldap.model.message.Message;
+import org.apache.directory.shared.ldap.model.message.controls.OpaqueControl;
+import org.apache.directory.shared.util.exception.NotImplementedException;
+import org.apache.mina.filter.codec.ProtocolCodecFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.nio.ByteBuffer;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+
+/**
+ * The default {@link LdapCodecService} implementation.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
+ */
+public class DefaultLdapCodecService implements LdapCodecService
+{
+ /** A logger */
+ private static final Logger LOG = LoggerFactory.getLogger( DefaultLdapCodecService.class );
+
+ /** The map of registered {@link org.apache.directory.shared.ldap.codec.api.ControlFactory}'s */
+ private Map<String,ControlFactory<?,?>> controlFactories = new HashMap<String, ControlFactory<?,?>>();
+
+ /** The map of registered {@link org.apache.directory.shared.ldap.codec.api.ExtendedOpFactory}'s by request OID */
+ private Map<String,ExtendedOpFactory<?,?>> extReqFactories = new HashMap<String, ExtendedOpFactory<?,?>>();
+
+ /** The map of registered {@link ExtendedOpFactory}'s by response OID */
+ private Map<String,ExtendedOpFactory<?,?>> extResFactories = new HashMap<String, ExtendedOpFactory<?,?>>();
+
+
+ /**
+ * Creates a new instance of DefaultLdapCodecService.
+ */
+ public DefaultLdapCodecService()
+ {
+ loadStockControls();
+ }
+
+
+ /**
+ * Loads the Controls implement out of the box in the codec.
+ */
+ private void loadStockControls()
+ {
+ ControlFactory<?, ?> factory = new CascadeFactory( this );
+ controlFactories.put( factory.getOid(), factory );
+ LOG.info( "Registered pre-bundled control factory: {}", factory.getOid() );
+
+ factory = new EntryChangeFactory( this );
+ controlFactories.put( factory.getOid(), factory );
+ LOG.info( "Registered pre-bundled control factory: {}", factory.getOid() );
+
+ factory = new ManageDsaITFactory( this );
+ controlFactories.put( factory.getOid(), factory );
+ LOG.info( "Registered pre-bundled control factory: {}", factory.getOid() );
+
+ factory = new PagedResultsFactory( this );
+ controlFactories.put( factory.getOid(), factory );
+ LOG.info( "Registered pre-bundled control factory: {}", factory.getOid() );
+
+ factory = new PersistentSearchFactory( this );
+ controlFactories.put( factory.getOid(), factory );
+ LOG.info( "Registered pre-bundled control factory: {}", factory.getOid() );
+
+ factory = new SubentriesFactory( this );
+ controlFactories.put( factory.getOid(), factory );
+ LOG.info( "Registered pre-bundled control factory: {}", factory.getOid() );
+ }
+
+
+ //-------------------------------------------------------------------------
+ // LdapCodecService implementation methods
+ //-------------------------------------------------------------------------
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void registerControl( ControlFactory<?,?> factory )
+ {
+ controlFactories.put(factory.getOid(), factory);
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void unregisterControl( String oid )
+ {
+ controlFactories.remove( oid );
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public Iterator<String> registeredControls()
+ {
+ return Collections.unmodifiableSet(controlFactories.keySet()).iterator();
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isControlRegistered( String oid )
+ {
+ return controlFactories.containsKey(oid);
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public Iterator<String> registeredExtendedRequests()
+ {
+ return Collections.unmodifiableSet( extReqFactories.keySet() ).iterator();
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public Iterator<String> registeredExtendedResponses()
+ {
+ return Collections.unmodifiableSet( extResFactories.keySet() ).iterator();
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void registerExtendedOp( ExtendedOpFactory<?, ?> factory )
+ {
+ extReqFactories.put( factory.getRequestOid(), factory );
+ }
+
+
+ /**
+ * {@inheritDoc}
+ *
+ * @TODO - finish this up and add factory registration capabilities,
+ * of course there is one default mechanism for now.
+ */
+ public ProtocolCodecFactory newProtocolCodecFactory( boolean client )
+ {
+ if ( client )
+ {
+ return new LdapProtocolCodecFactory();
+ }
+ else
+ {
+ throw new NotImplementedException(
+ "Filters may be different here, and we're probably going to " +
+ "want to have a protocol codec factory registration mechanism" +
+ "since this way we can swap in and out MINA/Grizzly" );
+ }
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public CodecControl<? extends Control> newControl( String oid )
+ {
+ ControlFactory<?,?> factory = controlFactories.get( oid );
+
+ if ( factory == null )
+ {
+ return new BasicControlDecorator<Control>( this, new OpaqueControl( oid ) );
+ }
+
+ return factory.newCodecControl();
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @SuppressWarnings("unchecked")
+ public CodecControl<? extends Control> newControl( Control control )
+ {
+ if ( control == null )
+ {
+ throw new NullPointerException( "Control argument was null." );
+ }
+
+ // protect agains being multiply decorated
+ if ( control instanceof CodecControl )
+ {
+ return (CodecControl<?> )control;
+ }
+
+ @SuppressWarnings("rawtypes")
+ ControlFactory factory = controlFactories.get( control.getOid() );
+
+ if ( factory == null )
+ {
+ return new BasicControlDecorator<Control>( this, control );
+ }
+
+ return factory.newCodecControl( control );
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public javax.naming.ldap.Control toJndiControl( Control control ) throws EncoderException
+ {
+ CodecControl<? extends Control> decorator = newControl(control);
+ ByteBuffer bb = ByteBuffer.allocate( decorator.computeLength() );
+ decorator.encode( bb );
+ bb.flip();
+ javax.naming.ldap.BasicControl jndiControl =
+ new javax.naming.ldap.BasicControl( control.getOid(), control.isCritical(), bb.array() );
+ return jndiControl;
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public Control fromJndiControl( javax.naming.ldap.Control control ) throws DecoderException
+ {
+ @SuppressWarnings("rawtypes")
+ ControlFactory factory = controlFactories.get( control.getID() );
+
+ if ( factory == null )
+ {
+ OpaqueControl ourControl = new OpaqueControl( control.getID() );
+ ourControl.setCritical( control.isCritical() );
+ BasicControlDecorator<Control> decorator =
+ new BasicControlDecorator<Control>( this, ourControl );
+ decorator.setValue( control.getEncodedValue() );
+ return decorator;
+ }
+
+ @SuppressWarnings("unchecked")
+ CodecControl<? extends Control> ourControl = factory.newCodecControl();
+ ourControl.setCritical( control.isCritical() );
+ ourControl.setValue( control.getEncodedValue() );
+ ourControl.decode( control.getEncodedValue() );
+ return ourControl;
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public Asn1Container newMessageContainer()
+ {
+ return new LdapMessageContainer<MessageDecorator<? extends Message>>( this );
+ }
+}
Added: directory/shared/branches/m1/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultActivator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultActivator.java?rev=1069226&view=auto
==============================================================================
--- directory/shared/branches/m1/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultActivator.java (added)
+++ directory/shared/branches/m1/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultActivator.java Thu Feb 10 04:20:22 2011
@@ -0,0 +1,65 @@
+/*
+ * 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.codec.osgi;
+
+
+import org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceRegistration;
+
+
+/**
+ * The {@link org.osgi.framework.BundleActivator} for the codec.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+@SuppressWarnings({"UnusedDeclaration"})
+public class DefaultActivator implements BundleActivator
+{
+ private DefaultLdapCodecService codec;
+ private ServiceRegistration registration;
+
+
+ @SuppressWarnings({"UnusedDeclaration"})
+ public DefaultActivator()
+ {
+ this.codec = new DefaultLdapCodecService();
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void start( BundleContext bundleContext ) throws Exception
+ {
+ registration = bundleContext.registerService( LdapCodecService.class.getName(), codec, null );
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void stop( BundleContext bundleContext ) throws Exception
+ {
+ registration.unregister();
+ }
+}