You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2016/03/07 23:24:57 UTC
svn commit: r1733998 - in /directory/studio/trunk:
plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/
plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/
tests/test.integration.core/...
Author: seelmann
Date: Mon Mar 7 22:24:56 2016
New Revision: 1733998
URL: http://svn.apache.org/viewvc?rev=1733998&view=rev
Log:
Workaround for lazy Bundle-ActivationPolicy
Modified:
directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionCorePlugin.java
directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java
directory/studio/trunk/tests/test.integration.core/src/main/java/org/apache/directory/studio/test/integration/core/Activator.java
directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/Activator.java
Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionCorePlugin.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionCorePlugin.java?rev=1733998&r1=1733997&r2=1733998&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionCorePlugin.java (original)
+++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionCorePlugin.java Mon Mar 7 22:24:56 2016
@@ -141,6 +141,10 @@ public class ConnectionCorePlugin extend
{
sessionTrustStoreManager = StudioKeyStoreManager.createMemoryKeyStoreManager();
}
+
+ // Nasty hack to get the API bundles started. DO NOT REMOVE
+ Platform.getBundle( "org.apache.directory.api.ldap.codec.core" ).start();
+ Platform.getBundle( "org.apache.directory.api.ldap.net.mina" ).start();
}
Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java?rev=1733998&r1=1733997&r2=1733998&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java (original)
+++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java Mon Mar 7 22:24:56 2016
@@ -43,7 +43,6 @@ import javax.security.auth.login.Configu
import org.apache.commons.lang.StringUtils;
import org.apache.directory.api.ldap.codec.api.DefaultConfigurableBinaryAttributeDetector;
-import org.apache.directory.api.ldap.codec.protocol.mina.LdapProtocolCodecActivator;
import org.apache.directory.api.ldap.model.cursor.SearchCursor;
import org.apache.directory.api.ldap.model.entry.AttributeUtils;
import org.apache.directory.api.ldap.model.entry.DefaultModification;
@@ -146,13 +145,6 @@ public class DirectoryApiConnectionWrapp
public DirectoryApiConnectionWrapper( Connection connection )
{
this.connection = connection;
-
- // Nasty hack to get the 'org.apache.directory.api.ldap.protocol.codec'
- // bundle started.
- // Instantiating one of this bundle class will trigger the start of the bundle
- // thanks to the lazy activation policy
- // DO NOT REMOVE
- LdapProtocolCodecActivator.lazyStart();
}
Modified: directory/studio/trunk/tests/test.integration.core/src/main/java/org/apache/directory/studio/test/integration/core/Activator.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.core/src/main/java/org/apache/directory/studio/test/integration/core/Activator.java?rev=1733998&r1=1733997&r2=1733998&view=diff
==============================================================================
--- directory/studio/trunk/tests/test.integration.core/src/main/java/org/apache/directory/studio/test/integration/core/Activator.java (original)
+++ directory/studio/trunk/tests/test.integration.core/src/main/java/org/apache/directory/studio/test/integration/core/Activator.java Mon Mar 7 22:24:56 2016
@@ -20,7 +20,7 @@
package org.apache.directory.studio.test.integration.core;
-import org.apache.directory.api.ldap.codec.protocol.mina.LdapProtocolCodecActivator;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Plugin;
import org.osgi.framework.BundleContext;
@@ -37,7 +37,10 @@ public class Activator extends Plugin
public void start( BundleContext context ) throws Exception
{
super.start( context );
- LdapProtocolCodecActivator.lazyStart();
+
+ // Nasty hack to get the API bundles started. DO NOT REMOVE
+ Platform.getBundle( "org.apache.directory.api.ldap.codec.core" ).start();
+ Platform.getBundle( "org.apache.directory.api.ldap.net.mina" ).start();
}
Modified: directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/Activator.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/Activator.java?rev=1733998&r1=1733997&r2=1733998&view=diff
==============================================================================
--- directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/Activator.java (original)
+++ directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/Activator.java Mon Mar 7 22:24:56 2016
@@ -20,7 +20,7 @@
package org.apache.directory.studio.test.integration.ui;
-import org.apache.directory.api.ldap.codec.protocol.mina.LdapProtocolCodecActivator;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Plugin;
import org.osgi.framework.BundleContext;
@@ -37,7 +37,10 @@ public class Activator extends Plugin
public void start( BundleContext context ) throws Exception
{
super.start( context );
- LdapProtocolCodecActivator.lazyStart();
+
+ // Nasty hack to get the API bundles started. DO NOT REMOVE
+ Platform.getBundle( "org.apache.directory.api.ldap.codec.core" ).start();
+ Platform.getBundle( "org.apache.directory.api.ldap.net.mina" ).start();
}