directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1068263 - in /directory/shared/branches/m1: integ/ integ/src/test/java/org/apache/directory/shared/ldap/codec/ integ/src/test/java/org/apache/directory/shared/ldap/codec/api/ ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/...
Date Tue, 08 Feb 2011 04:07:17 GMT
Author: akarasulu
Date: Tue Feb  8 04:07:16 2011
New Revision: 1068263

URL: http://svn.apache.org/viewvc?rev=1068263&view=rev
Log:
added felix driven osgi plugin mechanism - SERIOUS ISSUES WITH CACHE AND CONCURRENT TESTS

Added:
    directory/shared/branches/m1/integ/src/test/java/org/apache/directory/shared/ldap/codec/
    directory/shared/branches/m1/integ/src/test/java/org/apache/directory/shared/ldap/codec/api/
    directory/shared/branches/m1/integ/src/test/java/org/apache/directory/shared/ldap/codec/api/DefaultLdapCodecServiceTest.java
      - copied, changed from r1068237, directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/api/DefaultLdapCodecServiceTest.java
    directory/shared/branches/m1/ldap-extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/ExtrasBundleActivator.java
Removed:
    directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/api/DefaultLdapCodecServiceTest.java
Modified:
    directory/shared/branches/m1/integ/   (props changed)
    directory/shared/branches/m1/integ/pom.xml
    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/api/LdapCodecService.java
    directory/shared/branches/m1/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/osgi/CodecHostActivator.java
    directory/shared/branches/m1/ldap-extras/   (props changed)
    directory/shared/branches/m1/ldap-extras/codec/pom.xml
    directory/shared/branches/m1/ldap-extras/pom.xml

Propchange: directory/shared/branches/m1/integ/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Feb  8 04:07:16 2011
@@ -1,4 +1,5 @@
 target
+felix-cache
 .project
 .classpath
 .settings

Modified: directory/shared/branches/m1/integ/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/integ/pom.xml?rev=1068263&r1=1068262&r2=1068263&view=diff
==============================================================================
--- directory/shared/branches/m1/integ/pom.xml (original)
+++ directory/shared/branches/m1/integ/pom.xml Tue Feb  8 04:07:16 2011
@@ -41,7 +41,6 @@
      integration tests.
    -->
   
-
   <description>
     A place to put integration tests that if put in their rightful
     project position would incure some cyclic dependencies even if
@@ -68,6 +67,12 @@
     </dependency>
 
     <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>shared-ldap-extras-codec</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
       <version>${commons.io.version}</version>
@@ -75,6 +80,10 @@
     </dependency>
   </dependencies>
 
+  <properties>
+    <pluginDirectory>${project.build.directory}/pluginDirectory</pluginDirectory>
+  </properties>
+
   <build>
     <plugins>
       <plugin>
@@ -83,9 +92,39 @@
         <configuration>
           <systemPropertyVariables>
             <workingDirectory>${basedir}/target</workingDirectory>
+            <property>
+               <!-- org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService.pluginDirectory
-->
+              <name>org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService.pluginDirectory</name>
+              <value>${pluginDirectory}/foo</value>
+            </property> 
           </systemPropertyVariables>
         </configuration>
       </plugin>
+      
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>copy</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>${project.groupId}</groupId>
+                  <artifactId>shared-ldap-extras-codec</artifactId>
+                  <version>${project.version}</version>
+                  <outputDirectory>${pluginDirectory}</outputDirectory>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      
     </plugins>
   </build>
 </project>

Copied: directory/shared/branches/m1/integ/src/test/java/org/apache/directory/shared/ldap/codec/api/DefaultLdapCodecServiceTest.java
(from r1068237, directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/api/DefaultLdapCodecServiceTest.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/integ/src/test/java/org/apache/directory/shared/ldap/codec/api/DefaultLdapCodecServiceTest.java?p2=directory/shared/branches/m1/integ/src/test/java/org/apache/directory/shared/ldap/codec/api/DefaultLdapCodecServiceTest.java&p1=directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/api/DefaultLdapCodecServiceTest.java&r1=1068237&r2=1068263&rev=1068263&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/api/DefaultLdapCodecServiceTest.java
(original)
+++ directory/shared/branches/m1/integ/src/test/java/org/apache/directory/shared/ldap/codec/api/DefaultLdapCodecServiceTest.java
Tue Feb  8 04:07:16 2011
@@ -20,8 +20,10 @@
 package org.apache.directory.shared.ldap.codec.api;
 
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.*; 
+import java.util.Iterator;
 
+import org.apache.directory.shared.ldap.model.message.Control;
 import org.junit.Test;
 
 
@@ -33,133 +35,24 @@ import org.junit.Test;
 public class DefaultLdapCodecServiceTest
 {
     /**
-     * Test method for {@link org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService#DefaultLdapCodecService()}.
+     * Test method for {@link DefaultLdapCodecService#DefaultLdapCodecService()}.
      */
     @Test
-    public void testDefaultLdapCodecService()
+    public void testLoadingExtras()
     {
+        System.out.println( "Property name = " + DefaultLdapCodecService.PLUGIN_DIRECTORY_PROPERTY
);
+        System.out.println( "Property value = " + System.getProperty( DefaultLdapCodecService.PLUGIN_DIRECTORY_PROPERTY
) );
         DefaultLdapCodecService codec = new DefaultLdapCodecService();
+        Iterator<String> oids = codec.registeredControls();
+        while ( oids.hasNext() )
+        {
+            System.out.println( "Registered OID = " + oids.next() );
+        }
+
+        CodecControl<? extends Control> control = codec.newControl( "2.16.840.1.113730.3.4.3"
);
+        assertNotNull( control );
+        System.out.println( control );
         assertNotNull( codec );
         codec.shutdown();
     }
-
-
-//    /**
-//     * Test method for {@link org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService#shutdown()}.
-//     */
-//    @Test
-//    public void testShutdown()
-//    {
-//        fail( "Not yet implemented" );
-//    }
-//
-//
-//    /**
-//     * Test method for {@link org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService#registerControl(org.apache.directory.shared.ldap.codec.api.ControlFactory)}.
-//     */
-//    @Test
-//    public void testRegisterControl()
-//    {
-//        fail( "Not yet implemented" );
-//    }
-//
-//
-//    /**
-//     * Test method for {@link org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService#registeredControls()}.
-//     */
-//    @Test
-//    public void testRegisteredControls()
-//    {
-//        fail( "Not yet implemented" );
-//    }
-//
-//
-//    /**
-//     * Test method for {@link org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService#registeredExtendedRequests()}.
-//     */
-//    @Test
-//    public void testRegisteredExtendedRequests()
-//    {
-//        fail( "Not yet implemented" );
-//    }
-//
-//
-//    /**
-//     * Test method for {@link org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService#registeredExtendedResponses()}.
-//     */
-//    @Test
-//    public void testRegisteredExtendedResponses()
-//    {
-//        fail( "Not yet implemented" );
-//    }
-//
-//
-//    /**
-//     * Test method for {@link org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService#registerExtendedOp(org.apache.directory.shared.ldap.codec.api.ExtendedOpFactory)}.
-//     */
-//    @Test
-//    public void testRegisterExtendedOp()
-//    {
-//        fail( "Not yet implemented" );
-//    }
-//
-//
-//    /**
-//     * Test method for {@link org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService#newProtocolCodecFactory(boolean)}.
-//     */
-//    @Test
-//    public void testNewProtocolCodecFactory()
-//    {
-//        fail( "Not yet implemented" );
-//    }
-//
-//
-//    /**
-//     * Test method for {@link org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService#newControl(java.lang.String)}.
-//     */
-//    @Test
-//    public void testNewControlString()
-//    {
-//        fail( "Not yet implemented" );
-//    }
-//
-//
-//    /**
-//     * Test method for {@link org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService#newControl(org.apache.directory.shared.ldap.model.message.Control)}.
-//     */
-//    @Test
-//    public void testNewControlControl()
-//    {
-//        fail( "Not yet implemented" );
-//    }
-//
-//
-//    /**
-//     * Test method for {@link org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService#toJndiControl(org.apache.directory.shared.ldap.model.message.Control)}.
-//     */
-//    @Test
-//    public void testToJndiControl()
-//    {
-//        fail( "Not yet implemented" );
-//    }
-//
-//
-//    /**
-//     * Test method for {@link org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService#fromJndiControl(javax.naming.ldap.Control)}.
-//     */
-//    @Test
-//    public void testFromJndiControl()
-//    {
-//        fail( "Not yet implemented" );
-//    }
-//
-//
-//    /**
-//     * Test method for {@link org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService#newMessageContainer()}.
-//     */
-//    @Test
-//    public void testNewMessageContainer()
-//    {
-//        fail( "Not yet implemented" );
-//    }
 }

Modified: 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=1068263&r1=1068262&r2=1068263&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/api/DefaultLdapCodecService.java
(original)
+++ directory/shared/branches/m1/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/api/DefaultLdapCodecService.java
Tue Feb  8 04:07:16 2011
@@ -20,6 +20,7 @@
 package org.apache.directory.shared.ldap.codec.api;
 
 
+import java.io.File;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -63,6 +64,7 @@ import org.slf4j.LoggerFactory;
  */
 public class DefaultLdapCodecService implements LdapCodecService
 {
+    /** A logger */
     private static final Logger LOG = LoggerFactory.getLogger( DefaultLdapCodecService.class
);
     
     /**
@@ -73,6 +75,10 @@ public class DefaultLdapCodecService imp
     {
         "org.apache.directory.shared.ldap.codec.api; version=1.0.0"
     };
+ 
+    /** System property checked if the pluginProperty is null */
+    public static final String PLUGIN_DIRECTORY_PROPERTY = DefaultLdapCodecService.class.getName()
+ 
+        ".pluginDirectory";
     
     /** The map of registered {@link ControlFactory}'s */
     private Map<String,ControlFactory<?,?>> controlFactories = new HashMap<String,
ControlFactory<?,?>>();
@@ -89,12 +95,56 @@ public class DefaultLdapCodecService imp
     /** The embedded {@link Felix} instance */
     private Felix felix;
     
+    /** The plugin (bundle) containing directory to load codec extensions from */
+    private final File pluginDirectory;
+    
     
     /**
      * Creates a new instance of DefaultLdapCodecService.
      */
     public DefaultLdapCodecService()
     {
+        this( getPluginDirectorySystemValue() );
+    }
+    
+    
+    private static File getPluginDirectorySystemValue()
+    {
+        String value = System.getProperty( DefaultLdapCodecService.PLUGIN_DIRECTORY_PROPERTY
);
+        
+        if ( value == null )
+        {
+            return null;
+        }
+        
+        return new File( value );
+    }
+    
+    
+    /**
+     * Creates a new instance of DefaultLdapCodecService.
+     */
+    public DefaultLdapCodecService( File pluginDirectory )
+    {
+        this.pluginDirectory = pluginDirectory;
+        
+        if ( pluginDirectory == null )
+        {
+            // do nothing
+        }
+        else if ( ! pluginDirectory.isDirectory() )
+        {
+            String msg = "The provided plugin directory is not a directory:" + pluginDirectory.getAbsolutePath();
+            LOG.error( msg );
+            throw new IllegalArgumentException( msg );
+        }
+        else if ( ! pluginDirectory.canRead() )
+        {
+            String msg = "The provided plugin directory is not readable:" + pluginDirectory.getAbsolutePath();
+            LOG.error( msg );
+            throw new IllegalArgumentException( msg );
+        }
+        
         loadStockControls();
         setupFelix();
     }
@@ -226,6 +276,15 @@ public class DefaultLdapCodecService imp
     /**
      * {@inheritDoc}
      */
+    public void unregisterControl( String oid )
+    {
+        controlFactories.remove( oid );
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
     public Iterator<String> registeredControls()
     {
         return Collections.unmodifiableSet( controlFactories.keySet() ).iterator();
@@ -375,4 +434,18 @@ public class DefaultLdapCodecService imp
     {
         return new LdapMessageContainer<MessageDecorator<? extends Message>>(
this );
     }
+
+
+    /**
+     * Gets the plugin directory containing codec extension bundles to load. 
+     * If null, the service checks to see if system properties were used to 
+     * specify the plugin directory. 
+     *
+     * @see {@link #PLUGIN_DIRECTORY_PROPERTY}
+     * @return The directory containing plugins.
+     */
+    public File getPluginDirectory()
+    {
+        return pluginDirectory;
+    }
 }

Modified: directory/shared/branches/m1/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapCodecService.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapCodecService.java?rev=1068263&r1=1068262&r2=1068263&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapCodecService.java
(original)
+++ directory/shared/branches/m1/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapCodecService.java
Tue Feb  8 04:07:16 2011
@@ -72,6 +72,14 @@ public interface LdapCodecService
     
     
     /**
+     * Unregisters an {@link ControlFactory} with this service.
+     * 
+     * @param oid The oid of the control the factory is associated with.
+     */
+    void unregisterControl( String oid );
+    
+    
+    /**
      * Registers an {@link ExtendedOpFactory} for generating extended request 
      * response pairs.
      * 

Modified: directory/shared/branches/m1/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/osgi/CodecHostActivator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/osgi/CodecHostActivator.java?rev=1068263&r1=1068262&r2=1068263&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/osgi/CodecHostActivator.java
(original)
+++ directory/shared/branches/m1/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/osgi/CodecHostActivator.java
Tue Feb  8 04:07:16 2011
@@ -20,6 +20,10 @@
 package org.apache.directory.shared.ldap.codec.osgi;
 
 
+import java.io.File;
+import java.io.FileFilter;
+
+import org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService;
 import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleActivator;
@@ -34,12 +38,12 @@ import org.osgi.framework.ServiceRegistr
  */
 public class CodecHostActivator implements BundleActivator
 {
-    private LdapCodecService codec; 
+    private DefaultLdapCodecService codec; 
     private ServiceRegistration registration;
     private BundleContext bundleContext;
     
     
-    public CodecHostActivator( LdapCodecService codec )
+    public CodecHostActivator( DefaultLdapCodecService codec )
     {
         this.codec = codec;
     }
@@ -53,8 +57,29 @@ public class CodecHostActivator implemen
         this.bundleContext = bundleContext;
         
         registration = bundleContext.registerService( LdapCodecService.class.getName(), codec,
null );
+        
+        if ( codec.getPluginDirectory() != null )
+        {
+            File[] files = codec.getPluginDirectory().listFiles( new FileFilter()
+            {
+                public boolean accept( File pathname )
+                {
+                    return 
+                        pathname.canRead()
+                        &&
+                        pathname.isFile() 
+                        && 
+                        pathname.getAbsolutePath().endsWith( ".jar" );
+                }
+            });
+            
+            for ( File file : files )
+            {
+                bundleContext.installBundle( file.toURI().toURL().toExternalForm() );
+            }
+        }
     }
-
+    
 
     /**
      * {@inheritDoc}

Propchange: directory/shared/branches/m1/ldap-extras/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Feb  8 04:07:16 2011
@@ -0,0 +1 @@
+target

Modified: directory/shared/branches/m1/ldap-extras/codec/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-extras/codec/pom.xml?rev=1068263&r1=1068262&r2=1068263&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-extras/codec/pom.xml (original)
+++ directory/shared/branches/m1/ldap-extras/codec/pom.xml Tue Feb  8 04:07:16 2011
@@ -21,7 +21,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.shared</groupId>
-    <artifactId>shared-parent</artifactId>
+    <artifactId>shared-ldap-extras-parent</artifactId>
     <version>0.9.20-SNAPSHOT</version>
   </parent>
   
@@ -86,6 +86,9 @@
               org.apache.directory.shared.ldap.extras.controls,
               org.apache.directory.shared.ldap.extras.extended
             </Export-Package>
+            <Bundle-Activator>
+              org.apache.directory.shared.ldap.extras.ExtrasBundleActivator
+            </Bundle-Activator>
           </instructions>
         </configuration>
       </plugin>

Added: directory/shared/branches/m1/ldap-extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/ExtrasBundleActivator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/ExtrasBundleActivator.java?rev=1068263&view=auto
==============================================================================
--- directory/shared/branches/m1/ldap-extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/ExtrasBundleActivator.java
(added)
+++ directory/shared/branches/m1/ldap-extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/ExtrasBundleActivator.java
Tue Feb  8 04:07:16 2011
@@ -0,0 +1,77 @@
+/*
+ *   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.extras;
+
+
+import org.apache.directory.shared.ldap.codec.api.ControlFactory;
+import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.extras.controls.ppolicy_impl.PasswordPolicyFactory;
+import org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncDoneValueFactory;
+import org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncInfoValueFactory;
+import org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncModifyDnFactory;
+import org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory;
+import org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncStateValueFactory;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+
+
+/**
+ * A BundleActivator for the ldap codec extras extension: extra ApacheDS and 
+ * Apache Directory Studio specific controls and extended operations. 
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class ExtrasBundleActivator implements BundleActivator
+{
+    public void start( BundleContext context ) throws Exception
+    {
+        ServiceReference reference = 
+            context.getServiceReference( LdapCodecService.class.getName() );
+        
+        LdapCodecService codec = ( LdapCodecService ) context.getService( reference );
+        
+        ControlFactory<?,?> factory = new SyncDoneValueFactory( codec );
+        codec.registerControl( factory );
+        
+        factory = new SyncInfoValueFactory( codec );
+        codec.registerControl( factory );
+        
+        factory = new SyncModifyDnFactory( codec );
+        codec.registerControl( factory );
+        
+        factory = new SyncRequestValueFactory( codec );
+        codec.registerControl( factory );
+
+        factory = new SyncStateValueFactory( codec );
+        codec.registerControl( factory );
+        
+        factory = new PasswordPolicyFactory( codec );
+        codec.registerControl( factory );
+    }
+
+
+    /* (non-Javadoc)
+     * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
+     */
+    public void stop( BundleContext context ) throws Exception
+    {
+    }
+}

Modified: directory/shared/branches/m1/ldap-extras/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-extras/pom.xml?rev=1068263&r1=1068262&r2=1068263&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-extras/pom.xml (original)
+++ directory/shared/branches/m1/ldap-extras/pom.xml Tue Feb  8 04:07:16 2011
@@ -20,9 +20,13 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.directory.shared</groupId>
-  <version>1.0-SNAPSHOT</version>
-  <artifactId>apache-directory-shared-ldap-extras-parent</artifactId>
+  <parent>
+    <groupId>org.apache.directory.shared</groupId>
+    <artifactId>shared-parent</artifactId>
+    <version>0.9.20-SNAPSHOT</version>
+  </parent>
+  
+  <artifactId>shared-ldap-extras-parent</artifactId>
   <name>Apache Directory Shared LDAP Extras</name>
   <inceptionYear>2003</inceptionYear>
   <packaging>pom</packaging>



Mime
View raw message