Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 97814 invoked from network); 27 May 2008 09:29:57 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 27 May 2008 09:29:57 -0000 Received: (qmail 39478 invoked by uid 500); 27 May 2008 09:29:59 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 39447 invoked by uid 500); 27 May 2008 09:29:59 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 39438 invoked by uid 99); 27 May 2008 09:29:59 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 May 2008 02:29:59 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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, 27 May 2008 09:29:20 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 555702388A33; Tue, 27 May 2008 02:29:36 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r660447 - in /directory/sandbox/pamarcelot/studio-apacheds-plugin/studio-apacheds-experimentations: ./ src/main/java/org/apache/directory/studio/apacheds/experimentations/ src/main/java/org/apache/directory/studio/apacheds/experimentations/... Date: Tue, 27 May 2008 09:29:35 -0000 To: commits@directory.apache.org From: pamarcelot@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080527092936.555702388A33@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pamarcelot Date: Tue May 27 02:29:35 2008 New Revision: 660447 URL: http://svn.apache.org/viewvc?rev=660447&view=rev Log: o Removed the Main class. o Removed the use of the studio-apacheds-launcher jar (using the standard apacheds-noarch-installer jar instead). o Fixed a bug when the instance name contained a space. Removed: directory/sandbox/pamarcelot/studio-apacheds-plugin/studio-apacheds-experimentations/src/main/java/org/apache/directory/studio/apacheds/experimentations/Main.java Modified: directory/sandbox/pamarcelot/studio-apacheds-plugin/studio-apacheds-experimentations/pom.xml directory/sandbox/pamarcelot/studio-apacheds-plugin/studio-apacheds-experimentations/src/main/java/org/apache/directory/studio/apacheds/experimentations/ApacheDsPluginUtils.java directory/sandbox/pamarcelot/studio-apacheds-plugin/studio-apacheds-experimentations/src/main/java/org/apache/directory/studio/apacheds/experimentations/jobs/LaunchServerInstanceJob.java Modified: directory/sandbox/pamarcelot/studio-apacheds-plugin/studio-apacheds-experimentations/pom.xml URL: http://svn.apache.org/viewvc/directory/sandbox/pamarcelot/studio-apacheds-plugin/studio-apacheds-experimentations/pom.xml?rev=660447&r1=660446&r2=660447&view=diff ============================================================================== --- directory/sandbox/pamarcelot/studio-apacheds-plugin/studio-apacheds-experimentations/pom.xml (original) +++ directory/sandbox/pamarcelot/studio-apacheds-plugin/studio-apacheds-experimentations/pom.xml Tue May 27 02:29:35 2008 @@ -305,9 +305,9 @@ 3.3 - org.apache.directory.studio - studio-apacheds-launcher - 0.0.1 + org.apache.directory.installers + apacheds-noarch-installer + 1.5.2 org.slf4j @@ -637,9 +637,9 @@ provided - org.apache.directory.studio - studio-apacheds-launcher - 0.0.1 + org.apache.directory.installers + apacheds-noarch-installer + 1.5.2 provided Modified: directory/sandbox/pamarcelot/studio-apacheds-plugin/studio-apacheds-experimentations/src/main/java/org/apache/directory/studio/apacheds/experimentations/ApacheDsPluginUtils.java URL: http://svn.apache.org/viewvc/directory/sandbox/pamarcelot/studio-apacheds-plugin/studio-apacheds-experimentations/src/main/java/org/apache/directory/studio/apacheds/experimentations/ApacheDsPluginUtils.java?rev=660447&r1=660446&r2=660447&view=diff ============================================================================== --- directory/sandbox/pamarcelot/studio-apacheds-plugin/studio-apacheds-experimentations/src/main/java/org/apache/directory/studio/apacheds/experimentations/ApacheDsPluginUtils.java (original) +++ directory/sandbox/pamarcelot/studio-apacheds-plugin/studio-apacheds-experimentations/src/main/java/org/apache/directory/studio/apacheds/experimentations/ApacheDsPluginUtils.java Tue May 27 02:29:35 2008 @@ -57,19 +57,19 @@ { "antlr-2.7.7.jar", "apacheds-bootstrap-extract-1.5.2.jar", "apacheds-bootstrap-partition-1.5.2.jar", "apacheds-btree-base-1.5.2.jar", "apacheds-core-1.5.2.jar", "apacheds-core-constants-1.5.2.jar", "apacheds-core-entry-1.5.2.jar", "apacheds-core-shared-1.5.2.jar", "apacheds-jdbm-store-1.5.2.jar", - "apacheds-kerberos-shared-1.5.2.jar", "apacheds-protocol-changepw-1.5.2.jar", - "apacheds-protocol-dns-1.5.2.jar", "apacheds-protocol-kerberos-1.5.2.jar", - "apacheds-protocol-ldap-1.5.2.jar", "apacheds-protocol-ntp-1.5.2.jar", - "apacheds-protocol-shared-1.5.2.jar", "apacheds-schema-bootstrap-1.5.2.jar", - "apacheds-schema-extras-1.5.2.jar", "apacheds-schema-registries-1.5.2.jar", - "apacheds-server-jndi-1.5.2.jar", "apacheds-server-xml-1.5.2.jar", "apacheds-utils-1.5.2.jar", - "apacheds-xbean-spring-1.5.2.jar", "commons-cli-1.1.jar", "commons-collections-3.2.jar", - "commons-daemon-1.0.1.jar", "commons-lang-2.3.jar", "daemon-bootstrappers-1.1.3.jar", - "jcl104-over-slf4j-1.4.3.jar", "jdbm-1.0.jar", "log4j-1.2.14.jar", "mina-core-1.1.2.jar", - "mina-filter-ssl-1.1.2.jar", "shared-asn1-0.9.10.jar", "shared-asn1-codec-0.9.10.jar", - "shared-bouncycastle-reduced-0.9.10.jar", "shared-ldap-0.9.10.jar", "shared-ldap-constants-0.9.10.jar", - "slf4j-api-1.4.3.jar", "slf4j-log4j12-1.4.3.jar", "spring-beans-2.0.6.jar", "spring-context-2.0.6.jar", - "spring-core-2.0.6.jar", "studio-apacheds-launcher-0.0.1.jar", "xbean-spring-3.3.jar" }; + "apacheds-kerberos-shared-1.5.2.jar", "apacheds-noarch-installer-1.5.2.jar", + "apacheds-protocol-changepw-1.5.2.jar", "apacheds-protocol-dns-1.5.2.jar", + "apacheds-protocol-kerberos-1.5.2.jar", "apacheds-protocol-ldap-1.5.2.jar", + "apacheds-protocol-ntp-1.5.2.jar", "apacheds-protocol-shared-1.5.2.jar", + "apacheds-schema-bootstrap-1.5.2.jar", "apacheds-schema-extras-1.5.2.jar", + "apacheds-schema-registries-1.5.2.jar", "apacheds-server-jndi-1.5.2.jar", "apacheds-server-xml-1.5.2.jar", + "apacheds-utils-1.5.2.jar", "apacheds-xbean-spring-1.5.2.jar", "commons-cli-1.1.jar", + "commons-collections-3.2.jar", "commons-daemon-1.0.1.jar", "commons-lang-2.3.jar", + "daemon-bootstrappers-1.1.3.jar", "jcl104-over-slf4j-1.4.3.jar", "jdbm-1.0.jar", "log4j-1.2.14.jar", + "mina-core-1.1.2.jar", "mina-filter-ssl-1.1.2.jar", "shared-asn1-0.9.10.jar", + "shared-asn1-codec-0.9.10.jar", "shared-bouncycastle-reduced-0.9.10.jar", "shared-ldap-0.9.10.jar", + "shared-ldap-constants-0.9.10.jar", "slf4j-api-1.4.3.jar", "slf4j-log4j12-1.4.3.jar", + "spring-beans-2.0.6.jar", "spring-context-2.0.6.jar", "spring-core-2.0.6.jar", "xbean-spring-3.3.jar" }; /** Modified: directory/sandbox/pamarcelot/studio-apacheds-plugin/studio-apacheds-experimentations/src/main/java/org/apache/directory/studio/apacheds/experimentations/jobs/LaunchServerInstanceJob.java URL: http://svn.apache.org/viewvc/directory/sandbox/pamarcelot/studio-apacheds-plugin/studio-apacheds-experimentations/src/main/java/org/apache/directory/studio/apacheds/experimentations/jobs/LaunchServerInstanceJob.java?rev=660447&r1=660446&r2=660447&view=diff ============================================================================== --- directory/sandbox/pamarcelot/studio-apacheds-plugin/studio-apacheds-experimentations/src/main/java/org/apache/directory/studio/apacheds/experimentations/jobs/LaunchServerInstanceJob.java (original) +++ directory/sandbox/pamarcelot/studio-apacheds-plugin/studio-apacheds-experimentations/src/main/java/org/apache/directory/studio/apacheds/experimentations/jobs/LaunchServerInstanceJob.java Tue May 27 02:29:35 2008 @@ -62,8 +62,6 @@ import org.eclipse.jdt.launching.JavaRuntime; import org.eclipse.swt.widgets.Display; -import sun.security.action.GetLongAction; - /** * This class implements a {@link Job} that is used to launch a server instance. @@ -379,7 +377,7 @@ // Setting the main type attribute workingCopy.setAttribute( IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, - "org.apache.directory.studio.apacheds.Launcher" ); + "org.apache.directory.server.UberjarMain" ); // Creating the classpath list List classpath = new ArrayList(); @@ -420,14 +418,13 @@ vmArguments.append( "-Dlog4j.configuration=file:" + instanceFolderPath.append( "conf" ).append( "log4j.properties" ).toOSString() ); vmArguments.append( " " ); - vmArguments.append( "-Dapacheds.var.dir=" + instanceFolderPath.toOSString() ); + vmArguments.append( "-Dapacheds.var.dir=\"" + instanceFolderPath.toOSString() + "\"" ); vmArguments.append( " " ); - vmArguments.append( "-Dapacheds.log.dir=" + instanceFolderPath.append( "log" ).toOSString() ); + vmArguments.append( "-Dapacheds.log.dir=\"" + instanceFolderPath.append( "log" ).toOSString() + "\"" ); vmArguments.append( " " ); - vmArguments.append( "-Dapacheds.run.dir=" + instanceFolderPath.append( "run" ).toOSString() ); + vmArguments.append( "-Dapacheds.run.dir=\"" + instanceFolderPath.append( "run" ).toOSString() + "\"" ); vmArguments.append( " " ); - vmArguments.append( "-Dapacheds.instance=" + server.getName() ); - // vmArguments.append( "-Dorg.eclipse.debug.core.capture_output=false" ); + vmArguments.append( "-Dapacheds.instance=\"" + server.getName() + "\"" ); // Setting the VM arguments attribute workingCopy.setAttribute( IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, vmArguments.toString() );