directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r670487 - in /directory/daemon/trunk/plugin/src/main: java/org/apache/directory/daemon/installers/CreateImageCommand.java resources/org/apache/directory/daemon/installers/solarispkg/Prototype
Date Mon, 23 Jun 2008 09:10:00 GMT
Author: pamarcelot
Date: Mon Jun 23 02:10:00 2008
New Revision: 670487

URL: http://svn.apache.org/viewvc?rev=670487&view=rev
Log:
Copying the correct wrapper libraries for Solaris.

Modified:
    directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java
    directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/Prototype

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=670487&r1=670486&r2=670487&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
Mon Jun 23 02:10:00 2008
@@ -238,6 +238,7 @@
         // Copy Wrapper Files
         // -------------------------------------------------------------------
 
+        // LINUX I386
         if ( target.getOsName().equals( "linux" ) && target.getOsArch().equals( "i386"
)
             && target.getDaemonFramework().equals( "tanuki" ) )
         {
@@ -254,6 +255,7 @@
             }
         }
 
+        // LINUX X86_64 (AMD64)
         if ( target.getOsName().equals( "linux" )
             && ( target.getOsArch().equals( "x86_64" ) || target.getOsArch().equals(
"amd64" ) )
             && target.getDaemonFramework().equals( "tanuki" ) )
@@ -271,6 +273,7 @@
             }
         }
 
+        // MAC OS X
         if ( target.getOsName().equalsIgnoreCase( "mac os x" ) && target.getDaemonFramework().equals(
"tanuki" ) )
         {
             try
@@ -288,6 +291,44 @@
             }
         }
 
+        // SOLARIS X86
+        if ( target.getOsName().equalsIgnoreCase( "solaris" ) && target.getOsArch().equals(
"x86" )
+            && target.getDaemonFramework().equals( "tanuki" ) )
+        {
+            try
+            {
+                MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream(
+                    "wrapper/bin/wrapper-solaris-x86-32" ), new File( layout.getBinDirectory(),
target
+                    .getApplication().getName() ) );
+                MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream(
+                    "wrapper/lib/libwrapper-solaris-x86-32.so" ), new File( layout.getLibDirectory(),
+                    "libwrapper.so" ) );
+            }
+            catch ( IOException e )
+            {
+                throw new MojoFailureException( "Failed to copy Tanuki binary files to lib
and bin directories" );
+            }
+        }
+
+        // SOLARIS SPARC
+        if ( target.getOsName().equalsIgnoreCase( "solaris" ) && target.getOsArch().equals(
"sparc" )
+            && target.getDaemonFramework().equals( "tanuki" ) )
+        {
+            try
+            {
+                MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream(
+                    "wrapper/bin/wrapper-solaris-sparc-32" ), new File( layout.getBinDirectory(),
target
+                    .getApplication().getName() ) );
+                MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream(
+                    "wrapper/lib/libwrapper-solaris-sparc-32.so" ), new File( layout.getLibDirectory(),
+                    "libwrapper.so" ) );
+            }
+            catch ( IOException e )
+            {
+                throw new MojoFailureException( "Failed to copy Tanuki binary files to lib
and bin directories" );
+            }
+        }
+
         // now copy over the jsvc executable renaming it to the mymojo.getApplicationName()

         if ( target.getOsName().equals( "sunos" ) && target.getOsArch().equals( "sparc"
) )
         {

Modified: directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/Prototype
URL: http://svn.apache.org/viewvc/directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/Prototype?rev=670487&r1=670486&r2=670487&view=diff
==============================================================================
--- directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/Prototype
(original)
+++ directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/Prototype
Mon Jun 23 02:10:00 2008
@@ -43,6 +43,7 @@
 d none /opt/apacheds-${version}/lib/ext 0755 root root
 f none /opt/apacheds-${version}/lib/jcl104-over-slf4j-1.4.3.jar 0755 root root
 f none /opt/apacheds-${version}/lib/log4j-1.2.14.jar 0755 root root
+f none /opt/apacheds-${version}/lib/libwrapper.so 0755 root root
 f none /opt/apacheds-${version}/lib/mina-core-1.1.6.jar 0755 root root
 f none /opt/apacheds-${version}/lib/mina-filter-ssl-1.1.6.jar 0755 root root
 f none /opt/apacheds-${version}/lib/shared-asn1-0.9.11-SNAPSHOT.jar 0755 root root



Mime
View raw message