directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ccust...@apache.org
Subject svn commit: r570508 - in /directory: apacheds/trunk/server-installers/ daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/ daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/rpm/
Date Tue, 28 Aug 2007 18:01:59 GMT
Author: ccustine
Date: Tue Aug 28 11:01:59 2007
New Revision: 570508

URL: http://svn.apache.org/viewvc?rev=570508&view=rev
Log:
- DIRSERVER-1038 Removed Tanuki jar install from within maven build
- DIRSERVER-1037 Added 64 bit rpm with 64 bit daemon wrapper

Modified:
    directory/apacheds/trunk/server-installers/pom.xml
    directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java
    directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/ServiceInstallersMojo.java
    directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java

Modified: directory/apacheds/trunk/server-installers/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-installers/pom.xml?rev=570508&r1=570507&r2=570508&view=diff
==============================================================================
--- directory/apacheds/trunk/server-installers/pom.xml (original)
+++ directory/apacheds/trunk/server-installers/pom.xml Tue Aug 28 11:01:59 2007
@@ -91,14 +91,15 @@
     </dependency>
 
     <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
+      <groupId>tanukisoft</groupId>
+      <artifactId>wrapper</artifactId>
       <scope>runtime</scope>
     </dependency>
 
     <dependency>
-      <groupId>commons-daemon</groupId>
-      <artifactId>commons-daemon</artifactId>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <scope>runtime</scope>
     </dependency>
 
     <dependency>
@@ -268,7 +269,7 @@
                     <filtered>false</filtered>
                   </packagedFile>
                 </packagedFiles>
-                <id>apacheds-rpm</id>
+                <id>apacheds-i386-rpm</id>
                 <rpmSpecificationFile>src/main/installers/apacheds-rpm.spec</rpmSpecificationFile>
                 <!--<rpmTopDir>${user.home}/rpmbuild</rpmTopDir>-->
                 <finalName>
@@ -281,8 +282,56 @@
                 <scriptFile>src/main/installers/apacheds-init</scriptFile>
                 <!--<bootstrapperConfigurationFile>../../daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/wrapper/conf/apacheds.conf</bootstrapperConfigurationFile>-->
               </rpmTarget>
+              <rpmTarget>
+                <packagedFiles>
+                  <packagedFile>
+                    <source>rpm-apacheds-tools.sh</source>
+                    <destinationPath>bin/apacheds-tools.sh</destinationPath>
+                    <installationBundleId>Binaries</installationBundleId>
+                    <executable>true</executable>
+                    <filtered>true</filtered>
+                  </packagedFile>
+                  <packagedFile>
+                    <source>apacheds-fhs.conf</source>
+                    <destinationPath>conf/apacheds.conf</destinationPath>
+                    <executable>false</executable>
+                    <filtered>true</filtered>
+                  </packagedFile>
+                  <packagedFile>
+                    <source>apacheds-sysconfig.conf</source>
+                    <destinationPath>conf/apacheds-sysconfig.conf</destinationPath>
+                    <executable>false</executable>
+                    <filtered>true</filtered>
+                  </packagedFile>
+                  <packagedFile>
+                    <source>apacheds-default.conf</source>
+                    <destinationPath>conf/apacheds-default.conf</destinationPath>
+                    <executable>false</executable>
+                    <filtered>false</filtered>
+                  </packagedFile>
+                  <packagedFile>
+                    <source>../resources/adstree.ico</source>
+                    <destinationPath>logo.ico</destinationPath>
+                    <executable>false</executable>
+                    <filtered>false</filtered>
+                  </packagedFile>
+                </packagedFiles>
+                <id>apacheds-x86_64-rpm</id>
+                <rpmSpecificationFile>src/main/installers/apacheds-rpm.spec</rpmSpecificationFile>
+                <!--<rpmTopDir>${user.home}/rpmbuild</rpmTopDir>-->
+                <finalName>
+                  apacheds-server-${pom.version}-x86_64.rpm
+                </finalName>
+                <osName>Linux</osName>
+                <osFamily>unix</osFamily>
+                <osArch>x86_64</osArch>
+                <daemonFramework>tanuki</daemonFramework>
+                <scriptFile>src/main/installers/apacheds-init</scriptFile>
+                <!--<bootstrapperConfigurationFile>../../daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/wrapper/conf/apacheds.conf</bootstrapperConfigurationFile>-->
+              </rpmTarget>
           </rpmTargets>
 
+<!--
           <nsisTargets>
             <nsisTarget>
               <packagedFiles>
@@ -318,6 +367,7 @@
               <osArch>x86</osArch>
               <daemonFramework>tanuki</daemonFramework>
             </nsisTarget>
+-->
 <!--
             <nsisTarget>
               <packagedFiles>
@@ -354,7 +404,7 @@
               <daemonFramework>tanuki</daemonFramework>
             </nsisTarget>
 -->
-          </nsisTargets>
+          <!--</nsisTargets>-->
 
         </configuration>
         <executions>

Modified: directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java
URL: http://svn.apache.org/viewvc/directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java?rev=570508&r1=570507&r2=570508&view=diff
==============================================================================
--- directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java
(original)
+++ directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java
Tue Aug 28 11:01:59 2007
@@ -21,12 +21,9 @@
 
 
 import java.io.File;
-import java.io.FileWriter;
 import java.io.IOException;
-import java.io.PrintWriter;
 import java.util.Properties;
 
-import org.apache.directory.daemon.Bootstrapper;
 import org.apache.directory.daemon.InstallationLayout;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
@@ -185,9 +182,7 @@
         // copy over the REQUIRED daemon.jar file 
         try
         {
-            MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream( "wrapper/lib/wrapper.jar"
),
-                    new File( layout.getLibDirectory(), "wrapper.jar" ) );
-
+            FileUtils.copyFile( mymojo.getDaemon().getFile(), new File( layout.getLibDirectory(),
"wrapper.jar" ) );
         }
         catch ( IOException e )
         {
@@ -251,8 +246,6 @@
                         new File( layout.getBinDirectory(), target.getApplication().getName()
) );
                 MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream( "wrapper/lib/libwrapper-linux-x86-32.so"
),
                         new File( layout.getLibDirectory(), "libwrapper.so" ) );
-                MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream( "wrapper/lib/wrapper.jar"
),
-                        new File( layout.getLibDirectory(), "wrapper.jar" ) );
             }
             catch ( IOException e )
             {
@@ -261,18 +254,18 @@
         }
 
 
-        // now copy over the jsvc executable renaming it to the applicationName 
-        if ( target.getOsName().equals( "linux" ) && target.getOsArch().equals( "x86_64"
) )
+        if ( target.getOsName().equals( "linux" ) && target.getOsArch().equals( "x86_64"
) && target.getDaemonFramework().equals("tanuki"))
         {
-            File executable = new File( layout.getBinDirectory(), target.getApplication().getName()
);
             try
             {
-                MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream( "jsvc_linux_x86_64"
), executable );
+                MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream( "wrapper/bin/wrapper-linux-x86-64"
),
+                        new File( layout.getBinDirectory(), target.getApplication().getName()
) );
+                MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream( "wrapper/lib/libwrapper-linux-x86-64.so"
),
+                        new File( layout.getLibDirectory(), "libwrapper.so" ) );
             }
             catch ( IOException e )
             {
-                throw new MojoFailureException( "Failed to copy jsvc executable file "
-                    + getClass().getResource( "jsvc_linux_x86_64" ) + " into position " +
executable.getAbsolutePath() );
+                throw new MojoFailureException( "Failed to copy Tanuki binary files to lib
and bin directories");
             }
         }
 

Modified: directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/ServiceInstallersMojo.java
URL: http://svn.apache.org/viewvc/directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/ServiceInstallersMojo.java?rev=570508&r1=570507&r2=570508&view=diff
==============================================================================
--- directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/ServiceInstallersMojo.java
(original)
+++ directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/ServiceInstallersMojo.java
Tue Aug 28 11:01:59 2007
@@ -64,8 +64,8 @@
     static final String BOOTSTRAPPER_GROUP_ID = "org.apache.directory.daemon";
     static final String LOGGER_ARTIFACT_ID = "slf4j-api";
     static final String LOGGER_GROUP_ID = "org.slf4j";
-    static final String DAEMON_ARTIFACT_ID = "commons-daemon";
-    static final String DAEMON_GROUP_ID = "commons-daemon";
+    static final String DAEMON_ARTIFACT_ID = "wrapper";
+    static final String DAEMON_GROUP_ID = "tanukisoft";
 
     /**
      * The target directory into which the mojo creates os and platform 

Modified: directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java?rev=570508&r1=570507&r2=570508&view=diff
==============================================================================
--- directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java
(original)
+++ directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java
Tue Aug 28 11:01:59 2007
@@ -310,7 +310,7 @@
         else
         {
             String finalName = target.getApplication().getName() + "-" + target.getApplication().getVersion()
-                + "-linux-i386.rpm";
+                + "-linux-" + target.getOsArch() + ".rpm";
             filterProperties.put( "app.final.name", finalName );
         }
 



Mime
View raw message