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:50:25 UTC
svn commit: r661694 - in /directory/studio/branches/apacheds-plugin-branch/apacheds-launcher: ./ src/main/java/org/apache/directory/studio/apacheds/

Author: pamarcelot
Date: Fri May 30 05:50:25 2008
New Revision: 661694

URL: http://svn.apache.org/viewvc?rev=661694&view=rev
Log:
o Fixed version in pom.xml
o Renamed ServerInstance class as Service.

Added:
    directory/studio/branches/apacheds-plugin-branch/apacheds-launcher/src/main/java/org/apache/directory/studio/apacheds/Service.java
      - copied, changed from r661675, directory/studio/branches/apacheds-plugin-branch/apacheds-launcher/src/main/java/org/apache/directory/studio/apacheds/ServerInstance.java
Removed:
    directory/studio/branches/apacheds-plugin-branch/apacheds-launcher/src/main/java/org/apache/directory/studio/apacheds/ServerInstance.java
Modified:
    directory/studio/branches/apacheds-plugin-branch/apacheds-launcher/pom.xml
    directory/studio/branches/apacheds-plugin-branch/apacheds-launcher/src/main/java/org/apache/directory/studio/apacheds/Launcher.java

Modified: directory/studio/branches/apacheds-plugin-branch/apacheds-launcher/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/apacheds-plugin-branch/apacheds-launcher/pom.xml?rev=661694&r1=661693&r2=661694&view=diff
==============================================================================
--- directory/studio/branches/apacheds-plugin-branch/apacheds-launcher/pom.xml (original)
+++ directory/studio/branches/apacheds-plugin-branch/apacheds-launcher/pom.xml Fri May 30 05:50:25 2008
@@ -27,7 +27,7 @@
     <version>1.2.0.SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-launcher</artifactId>
-  <version>0.0.1</version>
+  <version>${apacheds.launcher.version}</version>
   <name>Apache Directory Studio Apache DS Launcher</name>
   <packaging>jar</packaging>
 

Modified: directory/studio/branches/apacheds-plugin-branch/apacheds-launcher/src/main/java/org/apache/directory/studio/apacheds/Launcher.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/apacheds-plugin-branch/apacheds-launcher/src/main/java/org/apache/directory/studio/apacheds/Launcher.java?rev=661694&r1=661693&r2=661694&view=diff
==============================================================================
--- directory/studio/branches/apacheds-plugin-branch/apacheds-launcher/src/main/java/org/apache/directory/studio/apacheds/Launcher.java (original)
+++ directory/studio/branches/apacheds-plugin-branch/apacheds-launcher/src/main/java/org/apache/directory/studio/apacheds/Launcher.java Fri May 30 05:50:25 2008
@@ -42,12 +42,12 @@
      */
     public static void main( String[] args ) throws Exception
     {
-        ServerInstance server = new ServerInstance();
+        Service server = new Service();
 
         if ( args.length > 0 && new File( args[0] ).isDirectory() )
         {
             InstallationLayout layout = new InstallationLayout( args[0] );
-            String confFile = layout.getConfigurationFile().toURI().toURL().toString();
+            String confFile = layout.getConfigurationFile().getAbsolutePath();
             server.init( layout, new String[]
                 { confFile } );
             server.start();

Copied: directory/studio/branches/apacheds-plugin-branch/apacheds-launcher/src/main/java/org/apache/directory/studio/apacheds/Service.java (from r661675, directory/studio/branches/apacheds-plugin-branch/apacheds-launcher/src/main/java/org/apache/directory/studio/apacheds/ServerInstance.java)
URL: http://svn.apache.org/viewvc/directory/studio/branches/apacheds-plugin-branch/apacheds-launcher/src/main/java/org/apache/directory/studio/apacheds/Service.java?p2=directory/studio/branches/apacheds-plugin-branch/apacheds-launcher/src/main/java/org/apache/directory/studio/apacheds/Service.java&p1=directory/studio/branches/apacheds-plugin-branch/apacheds-launcher/src/main/java/org/apache/directory/studio/apacheds/ServerInstance.java&r1=661675&r2=661694&rev=661694&view=diff
==============================================================================
--- directory/studio/branches/apacheds-plugin-branch/apacheds-launcher/src/main/java/org/apache/directory/studio/apacheds/ServerInstance.java (original)
+++ directory/studio/branches/apacheds-plugin-branch/apacheds-launcher/src/main/java/org/apache/directory/studio/apacheds/Service.java Fri May 30 05:50:25 2008
@@ -40,9 +40,9 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev: 596797 $
  */
-public class ServerInstance implements DaemonApplication
+public class Service implements DaemonApplication
 {
-    private static final Logger LOG = LoggerFactory.getLogger( ServerInstance.class );
+    private static final Logger LOG = LoggerFactory.getLogger( Service.class );
     private Thread workerThread;
     private SynchWorker worker = new SynchWorker();
     private ApacheDS apacheDS;