directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r373966 - in /directory/trunks: apacheds/simple/installers/ apacheds/simple/installers/src/main/installers/ daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/ daemon/installers-plugin/src/main/java/org/apache/dir...
Date Wed, 01 Feb 2006 02:28:03 GMT
Author: akarasulu
Date: Tue Jan 31 18:27:53 2006
New Revision: 373966

URL: http://svn.apache.org/viewcvs?rev=373966&view=rev
Log:
HACK - need to fix this for long term for DIREVE-333

Added:
    directory/trunks/apacheds/simple/installers/src/main/installers/apacheds-tools.sh
Modified:
    directory/trunks/apacheds/simple/installers/pom.xml
    directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java
    directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/ServiceInstallersMojo.java
    directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/izpack/IzPackInstallerCommand.java
    directory/trunks/daemon/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/inno/install.iss
    directory/trunks/daemon/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/izpack/install_unix.xml
    directory/trunks/daemon/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/template.init

Modified: directory/trunks/apacheds/simple/installers/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/simple/installers/pom.xml?rev=373966&r1=373965&r2=373966&view=diff
==============================================================================
--- directory/trunks/apacheds/simple/installers/pom.xml (original)
+++ directory/trunks/apacheds/simple/installers/pom.xml Tue Jan 31 18:27:53 2006
@@ -30,6 +30,11 @@
       <scope>provided</scope>
     </dependency>  
     <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-tools</artifactId>
+      <version>0.9.4-SNAPSHOT</version>
+    </dependency>  
+    <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
       <version>1.2.19</version>

Added: directory/trunks/apacheds/simple/installers/src/main/installers/apacheds-tools.sh
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/simple/installers/src/main/installers/apacheds-tools.sh?rev=373966&view=auto
==============================================================================
--- directory/trunks/apacheds/simple/installers/src/main/installers/apacheds-tools.sh (added)
+++ directory/trunks/apacheds/simple/installers/src/main/installers/apacheds-tools.sh Tue
Jan 31 18:27:53 2006
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+$APACHEDS_HOME=%INSTALL_PATH
+$JAVA_HOME/bin/java -jar $APACHEDS_HOME/bin/tools.jar $@

Modified: directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java
URL: http://svn.apache.org/viewcvs/directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java?rev=373966&r1=373965&r2=373966&view=diff
==============================================================================
--- directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java
(original)
+++ directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java
Tue Jan 31 18:27:53 2006
@@ -151,6 +151,22 @@
             }
         }
         
+        // copy over the REQUIRED tools.jar file 
+        /** HACK!
+         * @todo clean me up
+         * @see http://issues.apache.org/jira/browse/DIREVE-333 
+         */
+        File tools = new File( layout.getBinDirectory(), "tools.jar" );
+        try
+        {
+            FileUtils.copyFile( mymojo.getTools().getFile(), tools );
+        }
+        catch ( IOException e )
+        {
+            throw new MojoFailureException( "Failed to copy tools.jar " + mymojo.getTools().getFile()
+                + " into position " + tools );
+        }
+        
         // copy over the REQUIRED bootstrapper.jar file 
         try
         {

Modified: directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/ServiceInstallersMojo.java
URL: http://svn.apache.org/viewcvs/directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/ServiceInstallersMojo.java?rev=373966&r1=373965&r2=373966&view=diff
==============================================================================
--- directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/ServiceInstallersMojo.java
(original)
+++ directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/ServiceInstallersMojo.java
Tue Jan 31 18:27:53 2006
@@ -52,6 +52,14 @@
 {
     static final String BOOTSTRAPPER_ARTIFACT_ID = "daemon-bootstrappers";
     static final String BOOTSTRAPPER_GROUP_ID = "org.apache.directory.daemon";
+    
+    /** HACK!
+     * @todo clean me up
+     * @see http://issues.apache.org/jira/browse/DIREVE-333 
+     */
+    static final String TOOLS_ARTIFACT_ID = "apacheds-tools";
+    static final String TOOLS_GROUP_ID = "org.apache.directory.server";
+    
     static final String LOGGER_ARTIFACT_ID = "nlog4j";
     static final String LOGGER_GROUP_ID = "org.slf4j";
     static final String DAEMON_ARTIFACT_ID = "commons-daemon";
@@ -131,6 +139,13 @@
     private Artifact logger;
     /** commons-daemon dependency needed by native daemon */
     private Artifact daemon;
+
+    /** HACK!
+     * @todo clean me up
+     * @see http://issues.apache.org/jira/browse/DIREVE-333 
+     */
+    private Artifact tools;
+    
     private List allTargets;
     
     
@@ -362,16 +377,26 @@
                 getLog().info( "Found bootstrapper dependency with version: " + artifact.getVersion()
);
                 bootstrapper = artifact;
             }
-            if ( artifact.getArtifactId().equals( LOGGER_ARTIFACT_ID ) || artifact.getGroupId().equals(
LOGGER_GROUP_ID ) )
+            else if ( artifact.getArtifactId().equals( LOGGER_ARTIFACT_ID ) || artifact.getGroupId().equals(
LOGGER_GROUP_ID ) )
             {
                 getLog().info( "Found logger dependency with version: " + artifact.getVersion()
);
                 logger = artifact;
             }
-            if ( artifact.getArtifactId().equals( DAEMON_ARTIFACT_ID ) || artifact.getGroupId().equals(
DAEMON_GROUP_ID ) )
+            else if ( artifact.getArtifactId().equals( DAEMON_ARTIFACT_ID ) || artifact.getGroupId().equals(
DAEMON_GROUP_ID ) )
             {
                 getLog().info( "Found daemon dependency with version: " + artifact.getVersion()
);
                 daemon = artifact;
             }
+            
+            /** HACK!
+             * @todo clean me up
+             * @see http://issues.apache.org/jira/browse/DIREVE-333 
+             */
+            else if ( artifact.getArtifactId().equals( TOOLS_ARTIFACT_ID ) || artifact.getGroupId().equals(
TOOLS_GROUP_ID ) )
+            {
+                getLog().info( "Found tools dependency with version: " + artifact.getVersion()
);
+                tools = artifact;
+            }
         }
 
         if ( bootstrapper == null )
@@ -449,6 +474,11 @@
     public Artifact getLogger()
     {
         return logger;
+    }
+
+    public Artifact getTools()
+    {
+        return tools;
     }
 
     public String getEncoding()

Modified: directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/izpack/IzPackInstallerCommand.java
URL: http://svn.apache.org/viewcvs/directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/izpack/IzPackInstallerCommand.java?rev=373966&r1=373965&r2=373966&view=diff
==============================================================================
--- directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/izpack/IzPackInstallerCommand.java
(original)
+++ directory/trunks/daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/izpack/IzPackInstallerCommand.java
Tue Jan 31 18:27:53 2006
@@ -210,6 +210,24 @@
         }
         else if ( target.getOsFamily().equals( "unix" ) || target.getOsFamily().equals( "mac"
) )
         {
+            /** HACK!
+             * @todo clean me up
+             * @see http://issues.apache.org/jira/browse/DIREVE-333 
+             */
+            File toolsSource = new File( "src/main/installers/apacheds-tools.sh" );
+            File toolsTarget = new File( layout.getBinDirectory(), "apacheds-tools.sh" );
+            try
+            {
+                MojoHelperUtils.copyAsciiFile( mymojo, filterProperties, 
+                    toolsSource, toolsTarget, true );
+            }
+            catch ( IOException e )
+            {
+                mymojo.getLog().error( "Failed to apacheds-tools.sh file "  
+                    + toolsSource
+                    + " into position " + toolsTarget, e );
+            }
+            
             if ( target.getIzPackInstallFile() != null && target.getIzPackInstallFile().exists()
)
             {
                 try

Modified: directory/trunks/daemon/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/inno/install.iss
URL: http://svn.apache.org/viewcvs/directory/trunks/daemon/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/inno/install.iss?rev=373966&r1=373965&r2=373966&view=diff
==============================================================================
--- directory/trunks/daemon/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/inno/install.iss
(original)
+++ directory/trunks/daemon/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/inno/install.iss
Tue Jan 31 18:27:53 2006
@@ -47,6 +47,8 @@
 Source: {#SourceBase}\bin\${app}.exe; DestDir: {app}\bin
 Source: {#SourceBase}\bin\bootstrapper.jar; DestDir: {app}\bin; DestName: bootstrapper.jar
 Source: {#SourceBase}\bin\logger.jar; DestDir: {app}\bin; DestName: logger.jar
+; tools.jar is a HACK SEE DIREVE-333
+Source: {#SourceBase}\bin\tools.jar; DestDir: {app}\bin; DestName: tools.jar
 Source: {#SourceBase}\bin\daemon.jar; DestDir: {app}\bin; DestName: daemon.jar
 ; conf directory targets
 Source: {#SourceBase}\conf\log4j.properties; DestDir: {app}\conf; DestName: log4j.properties

Modified: directory/trunks/daemon/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/izpack/install_unix.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/daemon/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/izpack/install_unix.xml?rev=373966&r1=373965&r2=373966&view=diff
==============================================================================
--- directory/trunks/daemon/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/izpack/install_unix.xml
(original)
+++ directory/trunks/daemon/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/izpack/install_unix.xml
Tue Jan 31 18:27:53 2006
@@ -82,6 +82,12 @@
       <parsable os="unix" targetfile="/etc/init.d/${app}" type="shell" />
       <executable os="unix" targetfile="/etc/init.d/${app}" stage="never" keep="true"
/>
       <executable os="unix" targetfile="$INSTALL_PATH/bin/${server.init}" stage="never"
keep="true" />
+      <!-- 
+      HACK BELOW!
+            todo clean me up
+            see DIREVE-333
+       -->
+      <executable os="unix" targetfile="$INSTALL_PATH/bin/apacheds-tools.sh" stage="never"
keep="true" />
     </pack>
   </packs>
 </installation>

Modified: directory/trunks/daemon/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/template.init
URL: http://svn.apache.org/viewcvs/directory/trunks/daemon/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/template.init?rev=373966&r1=373965&r2=373966&view=diff
==============================================================================
--- directory/trunks/daemon/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/template.init
(original)
+++ directory/trunks/daemon/installers-plugin/src/main/resources/org/apache/directory/daemon/installers/template.init
Tue Jan 31 18:27:53 2006
@@ -7,8 +7,8 @@
 # If you want to change ${app} service settings please modify the server.xml
 # file.
 
-# DISPLAY=:0.0
-# export DISPLAY
+DISPLAY=:0.0
+export DISPLAY
 
 # Source function library.
 if [ -f /etc/init.d/functions ] ; then



Mime
View raw message