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 2008/05/30 14:51:30 UTC
svn commit: r661695 - in /directory/studio/branches/apacheds-plugin-branch/apacheds: pom.xml src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginUtils.java src/main/java/org/apache/directory/studio/apacheds/jobs/LaunchServerJob.java

Author: pamarcelot
Date: Fri May 30 05:51:29 2008
New Revision: 661695

URL: http://svn.apache.org/viewvc?rev=661695&view=rev
Log:
Using the Studio Apache DS Launcher instead of the NoArch Installer jar.

Modified:
    directory/studio/branches/apacheds-plugin-branch/apacheds/pom.xml
    directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginUtils.java
    directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/jobs/LaunchServerJob.java

Modified: directory/studio/branches/apacheds-plugin-branch/apacheds/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/apacheds-plugin-branch/apacheds/pom.xml?rev=661695&r1=661694&r2=661695&view=diff
==============================================================================
--- directory/studio/branches/apacheds-plugin-branch/apacheds/pom.xml (original)
+++ directory/studio/branches/apacheds-plugin-branch/apacheds/pom.xml Fri May 30 05:51:29 2008
@@ -144,8 +144,8 @@
                   <artifactId>apacheds-kerberos-shared</artifactId>
                 </artifactItem>
                 <artifactItem>
-                  <groupId>org.apache.directory.installers</groupId>
-                  <artifactId>apacheds-noarch-installer</artifactId>
+                  <groupId>org.apache.directory.studio</groupId>
+                  <artifactId>apacheds-launcher</artifactId>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.apache.directory.server</groupId>

Modified: directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginUtils.java?rev=661695&r1=661694&r2=661695&view=diff
==============================================================================
--- directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginUtils.java (original)
+++ directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginUtils.java Fri May 30 05:51:29 2008
@@ -57,7 +57,7 @@
         { "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-noarch-installer-1.5.2.jar",
+            "apacheds-kerberos-shared-1.5.2.jar", "apacheds-launcher-1.2.0.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",

Modified: directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/jobs/LaunchServerJob.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/jobs/LaunchServerJob.java?rev=661695&r1=661694&r2=661695&view=diff
==============================================================================
--- directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/jobs/LaunchServerJob.java (original)
+++ directory/studio/branches/apacheds-plugin-branch/apacheds/src/main/java/org/apache/directory/studio/apacheds/jobs/LaunchServerJob.java Fri May 30 05:51:29 2008
@@ -392,7 +392,7 @@
 
         // Setting the main type attribute
         workingCopy.setAttribute( IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME,
-            "org.apache.directory.server.UberjarMain" );
+            "org.apache.directory.studio.apacheds.Launcher" );
 
         // Creating the classpath list
         List classpath = new ArrayList();
@@ -425,8 +425,8 @@
         IPath serverFolderPath = serversFolderPath.append( server.getId() );
 
         // Setting the program arguments attribute
-        workingCopy.setAttribute( IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, serverFolderPath.append(
-            "conf" ).append( "server.xml" ).toOSString() );
+        workingCopy.setAttribute( IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, serverFolderPath
+            .toOSString() );
 
         // Creating the VM arguments string
         StringBuffer vmArguments = new StringBuffer();