Return-Path: 
 <commits-return-31817-apmail-directory-commits-archive=directory.apache.org@directory.apache.org>
X-Original-To: apmail-directory-commits-archive@www.apache.org
Delivered-To: apmail-directory-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id EFD204513
	for <apmail-directory-commits-archive@www.apache.org>;
 Tue, 17 May 2011 16:54:58 +0000 (UTC)
Received: (qmail 18580 invoked by uid 500); 17 May 2011 16:54:58 -0000
Delivered-To: apmail-directory-commits-archive@directory.apache.org
Received: (qmail 18546 invoked by uid 500); 17 May 2011 16:54:58 -0000
Mailing-List: contact commits-help@directory.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@directory.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@directory.apache.org>
List-Post: <mailto:commits@directory.apache.org>
List-Id: <commits.directory.apache.org>
Reply-To: dev@directory.apache.org
Delivered-To: mailing list commits@directory.apache.org
Received: (qmail 18539 invoked by uid 99); 17 May 2011 16:54:58 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 May 2011 16:54:58 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 May 2011 16:54:55 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 8C4BE23889B2; Tue, 17 May 2011 16:54:34 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1104404 - in /directory/shared/branches/shared-osgi:
 integ/pom.xml ldap/codec/standalone/pom.xml
 ldap/codec/standalone/src/main/java/org/apache/directory/shared/ldap/codec/standalone/StandaloneLdapApiService.java
Date: Tue, 17 May 2011 16:54:34 -0000
To: commits@directory.apache.org
From: elecharny@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110517165434.8C4BE23889B2@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: elecharny
Date: Tue May 17 16:54:34 2011
New Revision: 1104404

URL: http://svn.apache.org/viewvc?rev=1104404&view=rev
Log:
o Fixed a NPE
o emoved the config from pom.xml, it's not needed anymore

Modified:
    directory/shared/branches/shared-osgi/integ/pom.xml
    directory/shared/branches/shared-osgi/ldap/codec/standalone/pom.xml
    directory/shared/branches/shared-osgi/ldap/codec/standalone/src/main/java/org/apache/directory/shared/ldap/codec/standalone/StandaloneLdapApiService.java

Modified: directory/shared/branches/shared-osgi/integ/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/integ/pom.xml?rev=1104404&r1=1104403&r2=1104404&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/integ/pom.xml (original)
+++ directory/shared/branches/shared-osgi/integ/pom.xml Tue May 17 16:54:34 2011
@@ -111,31 +111,6 @@
   <build>
     <plugins>
       <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <groupId>org.apache.maven.plugins</groupId>
-        <configuration>
-          <systemPropertyVariables>
-            <workingDirectory>${basedir}/target</workingDirectory>
-            <felix.cache.rootdir>
-              ${project.build.directory}
-            </felix.cache.rootdir>
-            <felix.cache.locking>
-              true
-            </felix.cache.locking>
-            <org.osgi.framework.storage.clean>
-              onFirstInit
-            </org.osgi.framework.storage.clean>
-            <org.osgi.framework.storage>
-              osgi-cache
-            </org.osgi.framework.storage>
-            <codec.plugin.directory>
-              ${codec.plugin.directory}
-            </codec.plugin.directory>
-          </systemPropertyVariables>
-        </configuration>
-      </plugin>
-      
-      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <executions>
@@ -158,7 +133,6 @@
           </execution>
         </executions>
       </plugin>
-      
     </plugins>
   </build>
 </project>

Modified: directory/shared/branches/shared-osgi/ldap/codec/standalone/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/codec/standalone/pom.xml?rev=1104404&r1=1104403&r2=1104404&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/codec/standalone/pom.xml (original)
+++ directory/shared/branches/shared-osgi/ldap/codec/standalone/pom.xml Tue May 17 16:54:34 2011
@@ -68,42 +68,4 @@
       <artifactId>org.apache.felix.framework</artifactId>
     </dependency>
   </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <groupId>org.apache.maven.plugins</groupId>
-        <configuration>
-          <systemPropertyVariables>
-            <default.controls>
-              org.apache.directory.shared.ldap.codec.controls.cascade.CascadeFactory,
-              org.apache.directory.shared.ldap.codec.controls.manageDsaIT.ManageDsaITFactory,
-              org.apache.directory.shared.ldap.codec.controls.search.entryChange.EntryChangeFactory,
-              org.apache.directory.shared.ldap.codec.controls.search.pagedSearch.PagedResultsFactory,
-              org.apache.directory.shared.ldap.codec.controls.search.persistentSearch.PersistentSearchFactory,
-              org.apache.directory.shared.ldap.codec.controls.search.subentries.SubentriesFactory
-            </default.controls>
-            <extra.controls>
-              org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicyFactory,
-              org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncDoneValueFactory,
-              org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncInfoValueFactory,
-              org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncModifyDnFactory,
-              org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory,
-              org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncStateValueFactory
-            </extra.controls>
-            <default.extendedOperation.requests>
-              org.apache.directory.shared.ldap.extras.extended.ads_impl.cancel.CancelFactory,
-              org.apache.directory.shared.ldap.extras.extended.ads_impl.certGeneration.CertGenerationFactory,
-              org.apache.directory.shared.ldap.extras.extended.ads_impl.gracefulShutdown.GracefulShutdownFactory,
-              org.apache.directory.shared.ldap.extras.extended.ads_impl.storedProcedure.StoredProcedureFactory
-            </default.extendedOperation.requests>
-            <default.extendedOperation.responses>
-              org.apache.directory.shared.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnectFactory
-            </default.extendedOperation.responses>
-          </systemPropertyVariables>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>

Modified: directory/shared/branches/shared-osgi/ldap/codec/standalone/src/main/java/org/apache/directory/shared/ldap/codec/standalone/StandaloneLdapApiService.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/codec/standalone/src/main/java/org/apache/directory/shared/ldap/codec/standalone/StandaloneLdapApiService.java?rev=1104404&r1=1104403&r2=1104404&view=diff
==============================================================================
--- directory/shared/branches/shared-osgi/ldap/codec/standalone/src/main/java/org/apache/directory/shared/ldap/codec/standalone/StandaloneLdapApiService.java (original)
+++ directory/shared/branches/shared-osgi/ldap/codec/standalone/src/main/java/org/apache/directory/shared/ldap/codec/standalone/StandaloneLdapApiService.java Tue May 17 16:54:34 2011
@@ -203,8 +203,13 @@ public class StandaloneLdapApiService im
     private void loadDefaultControls() throws Exception
     {
         // Load defaults from command line properties if it exists
-         String defaultControlsList = System.getProperty( DEFAULT_CONTROLS_LIST );
+        String defaultControlsList = System.getProperty( DEFAULT_CONTROLS_LIST );
         
+        if ( Strings.isEmpty( defaultControlsList ) )
+        {
+            return;
+        }
+
         for ( String control : defaultControlsList.split( "," ) )
         {
             System.out.println( control );