You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2011/05/11 18:06:53 UTC
svn commit: r1101939 - in /directory/shared/trunk:
integ/src/test/java/org/apache/directory/shared/ldap/codec/api/
ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/
ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/...
Author: pamarcelot
Date: Wed May 11 16:06:53 2011
New Revision: 1101939
URL: http://svn.apache.org/viewvc?rev=1101939&view=rev
Log:
Removed shutdown method.
Modified:
directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/codec/api/StandaloneLdapCodecServiceTest.java
directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapCodecService.java
directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultLdapCodecService.java
directory/shared/trunk/ldap/codec/standalone/src/main/java/org/apache/directory/shared/ldap/codec/standalone/StandaloneLdapCodecService.java
directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/osgi/AbstractCodecServiceTest.java
Modified: directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/codec/api/StandaloneLdapCodecServiceTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/codec/api/StandaloneLdapCodecServiceTest.java?rev=1101939&r1=1101938&r2=1101939&view=diff
==============================================================================
--- directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/codec/api/StandaloneLdapCodecServiceTest.java (original)
+++ directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/codec/api/StandaloneLdapCodecServiceTest.java Wed May 11 16:06:53 2011
@@ -52,7 +52,6 @@ public class StandaloneLdapCodecServiceT
CodecControl<? extends Control> control = codec.newControl( PasswordPolicy.OID );
assertNotNull( control );
assertNotNull( codec );
- codec.shutdown();
}
@@ -72,6 +71,5 @@ public class StandaloneLdapCodecServiceT
StoredProcedureRequest decorator = ( StoredProcedureRequest ) codec.decorate( req );
assertNotNull( decorator );
- codec.shutdown();
}
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapCodecService.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapCodecService.java?rev=1101939&r1=1101938&r2=1101939&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapCodecService.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapCodecService.java Wed May 11 16:06:53 2011
@@ -285,10 +285,4 @@ public interface LdapCodecService
ExtendedResponseDecorator<?> decorate( ExtendedResponse decoratedMessage );
-
-
- /**
- * Shutdowns the internal OSGi container if any.
- */
- void shutdown();
}
Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultLdapCodecService.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultLdapCodecService.java?rev=1101939&r1=1101938&r2=1101939&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultLdapCodecService.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultLdapCodecService.java Wed May 11 16:06:53 2011
@@ -592,13 +592,4 @@ public class DefaultLdapCodecService imp
{
return extReqFactories.containsKey( oid ) || unsolicitedFactories.containsKey( oid );
}
-
-
- /**
- * {@inheritDoc}
- */
- public void shutdown()
- {
- // Nothing to do
- }
}
Modified: directory/shared/trunk/ldap/codec/standalone/src/main/java/org/apache/directory/shared/ldap/codec/standalone/StandaloneLdapCodecService.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/standalone/src/main/java/org/apache/directory/shared/ldap/codec/standalone/StandaloneLdapCodecService.java?rev=1101939&r1=1101938&r2=1101939&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/standalone/src/main/java/org/apache/directory/shared/ldap/codec/standalone/StandaloneLdapCodecService.java (original)
+++ directory/shared/trunk/ldap/codec/standalone/src/main/java/org/apache/directory/shared/ldap/codec/standalone/StandaloneLdapCodecService.java Wed May 11 16:06:53 2011
@@ -536,27 +536,6 @@ public class StandaloneLdapCodecService
/**
- * Shuts down the codec and its embedded {@link Felix} instance.
- */
- public void shutdown()
- {
- LOG.info( "Attempt to shutdown the codec service" );
-
- try
- {
- felix.stop();
- felix.waitForStop( 0 );
- }
- catch ( Exception e )
- {
- String message = "Failed to stop embedded felix instance: " + e.getMessage();
- LOG.error( message, e );
- throw new RuntimeException( message, e );
- }
- }
-
-
- /**
* Loads the Controls implement out of the box in the codec.
*/
private void loadStockControls()
Modified: directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/osgi/AbstractCodecServiceTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/osgi/AbstractCodecServiceTest.java?rev=1101939&r1=1101938&r2=1101939&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/osgi/AbstractCodecServiceTest.java (original)
+++ directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/osgi/AbstractCodecServiceTest.java Wed May 11 16:06:53 2011
@@ -57,7 +57,6 @@ public abstract class AbstractCodecServi
@AfterClass
public static void tearDownLdapCodecService()
{
- codec.shutdown();
codec = null;
encoder = null;
}