directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r373974 - in /directory/trunks: apacheds/simple/installers/ apacheds/simple/installers/src/main/installers/ apacheds/tools/ daemon/installers-plugin/src/main/java/org/apache/directory/daemon/installers/izpack/ daemon/installers-plugin/src/m...
Date Wed, 01 Feb 2006 03:20:36 GMT
Author: akarasulu
Date: Tue Jan 31 19:20:30 2006
New Revision: 373974

URL: http://svn.apache.org/viewcvs?rev=373974&view=rev
Log:
hack noted in DIREVE-333 for dealing with specific apacheds tools jar

Modified:
    directory/trunks/apacheds/simple/installers/pom.xml
    directory/trunks/apacheds/simple/installers/src/main/installers/apacheds-tools.sh
    directory/trunks/apacheds/tools/pom.xml
    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/izpack/install_unix.xml

Modified: directory/trunks/apacheds/simple/installers/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/simple/installers/pom.xml?rev=373974&r1=373973&r2=373974&view=diff
==============================================================================
--- directory/trunks/apacheds/simple/installers/pom.xml (original)
+++ directory/trunks/apacheds/simple/installers/pom.xml Tue Jan 31 19:20:30 2006
@@ -45,6 +45,11 @@
       <version>1.0.1</version>
     </dependency>
     <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>2.0</version>
+    </dependency>
+    <dependency>
       <groupId>commons-cli</groupId>
       <artifactId>commons-cli</artifactId>
       <version>1.0</version>

Modified: 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=373974&r1=373973&r2=373974&view=diff
==============================================================================
--- directory/trunks/apacheds/simple/installers/src/main/installers/apacheds-tools.sh (original)
+++ directory/trunks/apacheds/simple/installers/src/main/installers/apacheds-tools.sh Tue
Jan 31 19:20:30 2006
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-$APACHEDS_HOME=%INSTALL_PATH
+APACHEDS_HOME=%INSTALL_PATH
 $JAVA_HOME/bin/java -jar $APACHEDS_HOME/bin/tools.jar $@

Modified: directory/trunks/apacheds/tools/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/tools/pom.xml?rev=373974&r1=373973&r2=373974&view=diff
==============================================================================
--- directory/trunks/apacheds/tools/pom.xml (original)
+++ directory/trunks/apacheds/tools/pom.xml Tue Jan 31 19:20:30 2006
@@ -32,7 +32,7 @@
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
-      <version>2.1</version>
+      <version>2.0</version>
     </dependency>
   </dependencies>
   <build>

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=373974&r1=373973&r2=373974&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 19:20:30 2006
@@ -214,7 +214,7 @@
              * @todo clean me up
              * @see http://issues.apache.org/jira/browse/DIREVE-333 
              */
-            File toolsSource = new File( "src/main/installers/apacheds-tools.sh" );
+            File toolsSource = new File( this.mymojo.getSourceDirectory(), "apacheds-tools.sh"
);
             File toolsTarget = new File( layout.getBinDirectory(), "apacheds-tools.sh" );
             try
             {
@@ -223,7 +223,7 @@
             }
             catch ( IOException e )
             {
-                mymojo.getLog().error( "Failed to apacheds-tools.sh file "  
+                mymojo.getLog().error( "Failed to copy apacheds-tools.sh file "  
                     + toolsSource
                     + " into position " + toolsTarget, e );
             }

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=373974&r1=373973&r2=373974&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 19:20:30 2006
@@ -79,6 +79,7 @@
       <executable os="unix" targetfile="$INSTALL_PATH/bin/${app}" stage="never" keep="true"
/>
       <singlefile os="unix" src="bin/${server.init}" target="/etc/init.d/${app}" />
       <parsable os="unix" targetfile="$INSTALL_PATH/bin/${server.init}" type="shell" />
+      <parsable os="unix" targetfile="$INSTALL_PATH/bin/apacheds-tools.sh" type="shell"
/>
       <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" />



Mime
View raw message