directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r648925 - in /directory/sandbox/akarasulu/bigbang/daemon: ./ bootstrappers/ plugin/ plugin/src/main/java/org/apache/directory/daemon/installers/ plugin/src/main/java/org/apache/directory/daemon/installers/bin/ plugin/src/main/java/org/apach...
Date Thu, 17 Apr 2008 02:30:39 GMT
Author: akarasulu
Date: Wed Apr 16 19:30:25 2008
New Revision: 648925

URL: http://svn.apache.org/viewvc?rev=648925&view=rev
Log:
[MERGE] bringing in changes from daemon bigbang branch

Added:
    directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/bin/
      - copied from r648922, directory/daemon/branches/bigbang/plugin/src/main/java/org/apache/directory/daemon/installers/bin/
    directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/bin/BinInstallerCommand.java
      - copied unchanged from r648922, directory/daemon/branches/bigbang/plugin/src/main/java/org/apache/directory/daemon/installers/bin/BinInstallerCommand.java
    directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/bin/BinTarget.java
      - copied unchanged from r648922, directory/daemon/branches/bigbang/plugin/src/main/java/org/apache/directory/daemon/installers/bin/BinTarget.java
    directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/deb/
      - copied from r648922, directory/daemon/branches/bigbang/plugin/src/main/java/org/apache/directory/daemon/installers/deb/
    directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/deb/DebInstallerCommand.java
      - copied unchanged from r648922, directory/daemon/branches/bigbang/plugin/src/main/java/org/apache/directory/daemon/installers/deb/DebInstallerCommand.java
    directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/deb/DebTarget.java
      - copied unchanged from r648922, directory/daemon/branches/bigbang/plugin/src/main/java/org/apache/directory/daemon/installers/deb/DebTarget.java
    directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/pkg/
      - copied from r648922, directory/daemon/branches/bigbang/plugin/src/main/java/org/apache/directory/daemon/installers/pkg/
    directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/pkg/PkgInstallerCommand.java
      - copied unchanged from r648922, directory/daemon/branches/bigbang/plugin/src/main/java/org/apache/directory/daemon/installers/pkg/PkgInstallerCommand.java
    directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/pkg/PkgTarget.java
      - copied unchanged from r648922, directory/daemon/branches/bigbang/plugin/src/main/java/org/apache/directory/daemon/installers/pkg/PkgTarget.java
    directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/bin/
      - copied from r648922, directory/daemon/branches/bigbang/plugin/src/main/resources/org/apache/directory/daemon/installers/bin/
    directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/bin/apacheds-default.conf
      - copied unchanged from r648922, directory/daemon/branches/bigbang/plugin/src/main/resources/org/apache/directory/daemon/installers/bin/apacheds-default.conf
    directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/bin/apacheds-init
      - copied unchanged from r648922, directory/daemon/branches/bigbang/plugin/src/main/resources/org/apache/directory/daemon/installers/bin/apacheds-init
    directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/bin/apacheds.conf
      - copied unchanged from r648922, directory/daemon/branches/bigbang/plugin/src/main/resources/org/apache/directory/daemon/installers/bin/apacheds.conf
    directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/bin/bootstrap.sh
      - copied unchanged from r648922, directory/daemon/branches/bigbang/plugin/src/main/resources/org/apache/directory/daemon/installers/bin/bootstrap.sh
    directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/bin/createInstaller.sh
      - copied unchanged from r648922, directory/daemon/branches/bigbang/plugin/src/main/resources/org/apache/directory/daemon/installers/bin/createInstaller.sh
    directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/bin/functions.sh
      - copied unchanged from r648922, directory/daemon/branches/bigbang/plugin/src/main/resources/org/apache/directory/daemon/installers/bin/functions.sh
    directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/bin/install.sh
      - copied unchanged from r648922, directory/daemon/branches/bigbang/plugin/src/main/resources/org/apache/directory/daemon/installers/bin/install.sh
    directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/bin/variables.sh
      - copied unchanged from r648922, directory/daemon/branches/bigbang/plugin/src/main/resources/org/apache/directory/daemon/installers/bin/variables.sh
    directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/
      - copied from r648922, directory/daemon/branches/bigbang/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/
    directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/apacheds-default.conf
      - copied unchanged from r648922, directory/daemon/branches/bigbang/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/apacheds-default.conf
    directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/apacheds-init
      - copied unchanged from r648922, directory/daemon/branches/bigbang/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/apacheds-init
    directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/apacheds.conf
      - copied unchanged from r648922, directory/daemon/branches/bigbang/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/apacheds.conf
    directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/control
      - copied unchanged from r648922, directory/daemon/branches/bigbang/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/control
    directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/postinst
      - copied unchanged from r648922, directory/daemon/branches/bigbang/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/postinst
    directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/prerm
      - copied unchanged from r648922, directory/daemon/branches/bigbang/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/prerm
    directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/pkg/
      - copied from r648922, directory/daemon/branches/bigbang/plugin/src/main/resources/org/apache/directory/daemon/installers/pkg/
    directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/pkg/DS_Store
      - copied unchanged from r648922, directory/daemon/branches/bigbang/plugin/src/main/resources/org/apache/directory/daemon/installers/pkg/DS_Store
    directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/pkg/Info.plist
      - copied unchanged from r648922, directory/daemon/branches/bigbang/plugin/src/main/resources/org/apache/directory/daemon/installers/pkg/Info.plist
    directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/pkg/License.rtf
      - copied unchanged from r648922, directory/daemon/branches/bigbang/plugin/src/main/resources/org/apache/directory/daemon/installers/pkg/License.rtf
    directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/pkg/apacheds-default.conf
      - copied unchanged from r648922, directory/daemon/branches/bigbang/plugin/src/main/resources/org/apache/directory/daemon/installers/pkg/apacheds-default.conf
    directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/pkg/apacheds-usr-bin.sh
      - copied unchanged from r648922, directory/daemon/branches/bigbang/plugin/src/main/resources/org/apache/directory/daemon/installers/pkg/apacheds-usr-bin.sh
    directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/pkg/apacheds.conf
      - copied unchanged from r648922, directory/daemon/branches/bigbang/plugin/src/main/resources/org/apache/directory/daemon/installers/pkg/apacheds.conf
    directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/pkg/apacheds.init
      - copied unchanged from r648922, directory/daemon/branches/bigbang/plugin/src/main/resources/org/apache/directory/daemon/installers/pkg/apacheds.init
    directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/pkg/dmg-background.png
      - copied unchanged from r648922, directory/daemon/branches/bigbang/plugin/src/main/resources/org/apache/directory/daemon/installers/pkg/dmg-background.png
    directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/pkg/org.apache.directory.server.plist
      - copied unchanged from r648922, directory/daemon/branches/bigbang/plugin/src/main/resources/org/apache/directory/daemon/installers/pkg/org.apache.directory.server.plist
    directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/pkg/pkg-background.tiff
      - copied unchanged from r648922, directory/daemon/branches/bigbang/plugin/src/main/resources/org/apache/directory/daemon/installers/pkg/pkg-background.tiff
    directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/pkg/postflight
      - copied unchanged from r648922, directory/daemon/branches/bigbang/plugin/src/main/resources/org/apache/directory/daemon/installers/pkg/postflight
Removed:
    directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/DebTarget.java
    directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/PkgTarget.java
Modified:
    directory/sandbox/akarasulu/bigbang/daemon/LAST_BIG_BANG_MERGE
    directory/sandbox/akarasulu/bigbang/daemon/bootstrappers/pom.xml
    directory/sandbox/akarasulu/bigbang/daemon/plugin/pom.xml
    directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java
    directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/MojoHelperUtils.java
    directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/ServiceInstallersMojo.java
    directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java
    directory/sandbox/akarasulu/bigbang/daemon/pom.xml

Modified: directory/sandbox/akarasulu/bigbang/daemon/LAST_BIG_BANG_MERGE
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/daemon/LAST_BIG_BANG_MERGE?rev=648925&r1=648924&r2=648925&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/daemon/LAST_BIG_BANG_MERGE (original)
+++ directory/sandbox/akarasulu/bigbang/daemon/LAST_BIG_BANG_MERGE Wed Apr 16 19:30:25 2008
@@ -1,3 +1,6 @@
+$Rev$
+$Date$
+
 This file shows the last time I merged from the big bang branch here as a commit
 number:
 
@@ -12,8 +15,13 @@
 Tue Mar 18 00:47:53 EDT 2008
 ----------------------------
 svn merge -r 613581:638212 https://svn.apache.org/repos/asf/directory/daemon/branches/bigbang
.
-Committed revision 638214.
 
 Fri Mar 28 22:56:07 EDT 2008
 ----------------------------
 svn merge -r 638212:642492 https://svn.apache.org/repos/asf/directory/daemon/branches/bigbang
.
+
+Wed Apr 16 22:35:35 EDT 2008
+----------------------------
+svn merge -r 642492:648922 https://svn.apache.org/repos/asf/directory/daemon/branches/bigbang
.
+
+

Modified: directory/sandbox/akarasulu/bigbang/daemon/bootstrappers/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/daemon/bootstrappers/pom.xml?rev=648925&r1=648924&r2=648925&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/daemon/bootstrappers/pom.xml (original)
+++ directory/sandbox/akarasulu/bigbang/daemon/bootstrappers/pom.xml Wed Apr 16 19:30:25 2008
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.daemon</groupId>
     <artifactId>daemon-parent</artifactId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.1.4-SNAPSHOT</version>
   </parent>
   <artifactId>daemon-bootstrappers</artifactId>
   <name>Apache Directory Daemon Bootstrappers</name>

Modified: directory/sandbox/akarasulu/bigbang/daemon/plugin/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/daemon/plugin/pom.xml?rev=648925&r1=648924&r2=648925&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/daemon/plugin/pom.xml (original)
+++ directory/sandbox/akarasulu/bigbang/daemon/plugin/pom.xml Wed Apr 16 19:30:25 2008
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.daemon</groupId>
     <artifactId>daemon-parent</artifactId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.1.4-SNAPSHOT</version>
   </parent>
   <artifactId>daemon-plugin</artifactId>
   <name>Apache Directory Daemon Plugin (Maven 2)</name>

Modified: directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java?rev=648925&r1=648924&r2=648925&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java
(original)
+++ directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/CreateImageCommand.java
Wed Apr 16 19:30:25 2008
@@ -238,153 +238,99 @@
         // Copy Wrapper Files
         // -------------------------------------------------------------------
 
-        // TODO I really wonder if wrapper bin, lib for macosx and solaris don't need to
be
-        // copied in case if os?
-        if ( target.getDaemonFramework().equalsIgnoreCase( "tanuki" ) )
+        if ( target.getOsName().equals( "linux" ) && target.getOsArch().equals( "i386"
)
+            && target.getDaemonFramework().equals( "tanuki" ) )
         {
-            if ( target.getOsName().equalsIgnoreCase( "linux" ) )
+            try
             {
-                if ( target.getOsArch().equals( "i386" ) )
-                {
-                    try
-                    {
-                        MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream(
-                            "wrapper/bin/wrapper-linux-x86-32" ), new File( layout.getBinDirectory(),
target
-                            .getApplication().getName() ) );
-                        MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream(
-                            "wrapper/lib/libwrapper-linux-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" );
-                    }
-                }
-                else
-                {
-                    if ( target.getOsArch().equals( "x86_64" ) )
-                    {
-                        try
-                        {
-                            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 Tanuki binary files to lib and bin directories"
);
-                        }
-                    }
-                    else
-                    {
-                        throw new MojoFailureException( "OsName='linux' supports only OsArc='[i386|x86_64]'"
);
-                    }
-                }
-            }
-            else
-            {
-                if ( target.getOsFamily().equalsIgnoreCase( "windows" ) )
-                {
-                    try
-                    {
-                        MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream(
-                            "wrapper/bin/wrapper-windows-x86-32.exe" ), new File( layout.getBinDirectory(),
target
-                            .getApplication().getName() ) );
-                        MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream(
-                            "wrapper/lib/wrapper-windows-x86-32.dll" ), new File( layout.getLibDirectory(),
-                            "libwrapper.so" ) );
-                    }
-                    catch ( IOException e )
-                    {
-                        throw new MojoFailureException( "Failed to copy Tanuki binary files
to lib and bin directories" );
-                    }
-                }
-                else
-                {
-                    throw new MojoFailureException(
-                        "Not supported for configured daemon framework. OsName=" + target.getOsName()
+ " OsFamily=" + target.getOsFamily());
-                }
+                MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream( "wrapper/bin/wrapper-linux-x86-32"
),
+                    new File( layout.getBinDirectory(), target.getApplication().getName()
) );
+                MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream(
+                    "wrapper/lib/libwrapper-linux-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" );
+            }
+        }
+
+        if ( target.getOsName().equals( "linux" )
+            && ( target.getOsArch().equals( "x86_64" ) || target.getOsArch().equals(
"amd64" ) )
+            && target.getDaemonFramework().equals( "tanuki" ) )
+        {
+            try
+            {
+                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 Tanuki binary files to lib
and bin directories" );
+            }
+        }
+
+        if ( target.getOsName().equalsIgnoreCase( "mac os x" ) && target.getDaemonFramework().equals(
"tanuki" ) )
+        {
+            try
+            {
+                MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream(
+                    "wrapper/bin/wrapper-macosx-universal-32" ), new File( layout.getBinDirectory(),
target
+                    .getApplication().getName() ) );
+                MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream(
+                    "wrapper/lib/libwrapper-macosx-universal-32.jnilib" ), new File( layout.getLibDirectory(),
+                    "libwrapper.jnilib" ) );
+            }
+            catch ( IOException e )
+            {
+                throw new MojoFailureException( "Failed to copy Tanuki binary files to lib
and bin directories" );
             }
         }
-        else
+
+        // now copy over the jsvc executable renaming it to the mymojo.getApplicationName()

+        if ( target.getOsName().equals( "sunos" ) && target.getOsArch().equals( "sparc"
) )
         {
-            // now copy over the jsvc executable renaming it to the mymojo.getApplicationName()

-            if ( target.getOsName().equalsIgnoreCase( "sunos" ) )
+            File executable = new File( layout.getBinDirectory(), target.getApplication().getName()
);
+            try
+            {
+                MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream( "jsvc_solaris_sparc"
), executable );
+            }
+            catch ( IOException e )
+            {
+                throw new MojoFailureException( "Failed to copy jsvc executable file "
+                    + getClass().getResource( "jsvc_solaris_sparc" ) + " into position "
+ executable.getAbsolutePath() );
+            }
+        }
+
+        if ( target.getOsName().equals( "sunos" ) && target.getOsArch().equals( "i386"
) )
+        {
+            File executable = new File( layout.getBinDirectory(), target.getApplication().getName()
);
+            try
+            {
+                MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream( "jsvc_solaris_i386"
), executable );
+            }
+            catch ( IOException e )
             {
-                if ( target.getOsArch().equalsIgnoreCase( "sparc" ) )
-                {
-                    File executable = new File( layout.getBinDirectory(), target.getApplication().getName()
);
-                    try
-                    {
-                        MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream( "jsvc_solaris_sparc"
),
-                            executable );
-                    }
-                    catch ( IOException e )
-                    {
-                        throw new MojoFailureException( "Failed to copy jsvc executable file
"
-                            + getClass().getResource( "jsvc_solaris_sparc" ) + " into position
"
-                            + executable.getAbsolutePath() );
-                    }
-                }
-                else
-                {
-                    if ( target.getOsArch().equals( "i386" ) )
-                    {
-                        File executable = new File( layout.getBinDirectory(), target.getApplication().getName()
);
-                        try
-                        {
-                            MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream(
"jsvc_solaris_i386" ),
-                                executable );
-                        }
-                        catch ( IOException e )
-                        {
-                            throw new MojoFailureException( "Failed to copy jsvc executable
file "
-                                + getClass().getResource( "jsvc_solaris_i386" ) + " into
position "
-                                + executable.getAbsolutePath() );
-                        }
-                    }
-                    else
-                    {
-                        throw new MojoFailureException( "OsName='sunos' supports only OsArc='[sparc|i386]'"
);
-                    }
-                }
-            }
-            else
-            {
-                // now copy over the jsvc executable renaming it to the mymojo.getApplicationName()
-                if ( target.getOsName().equalsIgnoreCase( "macosx" ) )
-                {
-                    if ( target.getOsArch().equalsIgnoreCase( "ppc" ) )
-                    {
-                        File executable = new File( layout.getBinDirectory(), target.getApplication().getName()
);
-                        try
-                        {
-                            MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream(
"jsvc_macosx_ppc" ),
-                                executable );
-                        }
-                        catch ( IOException e )
-                        {
-                            throw new MojoFailureException( "Failed to copy jsvc executable
file "
-                                + getClass().getResource( "jsvc_macosx_ppc" ) + " into position
"
-                                + executable.getAbsolutePath() );
-                        }
-                    }
-                    else
-                    {
-                        throw new MojoFailureException( "OsName='macosx' supports only OsArch='[ppc]'"
);
-                    }
-                }
-                else
-                {
-                    throw new MojoFailureException( "OsName='" + target.getOsName()
-                        + "' is not supported for build process." );
-                }
+                throw new MojoFailureException( "Failed to copy jsvc executable file "
+                    + getClass().getResource( "jsvc_solaris_i386" ) + " into position " +
executable.getAbsolutePath() );
             }
         }
+
+        // now copy over the jsvc executable renaming it to the mymojo.getApplicationName()

+        //        if ( target.getOsName().equals( "macosx" ) && target.getOsArch().equals(
"ppc" ) )
+        //        {
+        //            File executable = new File( layout.getBinDirectory(), target.getApplication().getName()
);
+        //            try
+        //            {
+        //                MojoHelperUtils.copyBinaryFile( getClass().getResourceAsStream(
"jsvc_macosx_ppc" ), executable );
+        //            }
+        //            catch ( IOException e )
+        //            {
+        //                throw new MojoFailureException( "Failed to copy jsvc executable
file "
+        //                    + getClass().getResource( "jsvc_macosx_ppc" ) + " into position
" + executable.getAbsolutePath() );
+        //            }
+        //        }
 
         target.setLibArtifacts( MojoHelperUtils.copyDependencies( mymojo, layout ) );
 

Modified: directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/MojoHelperUtils.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/MojoHelperUtils.java?rev=648925&r1=648924&r2=648925&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/MojoHelperUtils.java
(original)
+++ directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/MojoHelperUtils.java
Wed Apr 16 19:30:25 2008
@@ -139,7 +139,7 @@
         mymojo.getLog().info( "    Including artifacts: " );
         mymojo.getLog().info( "    -------------------" );
         Iterator artifacts = mymojo.getProject().getRuntimeArtifacts().iterator();
-        
+
         while ( artifacts.hasNext() )
         {
             artifact = ( Artifact ) artifacts.next();
@@ -237,6 +237,34 @@
         {
             throw new MojoFailureException( "Execution of '" + cmdString + "' resulted in
a non-zero exit value: "
                 + task.getExitValue() );
+        }
+    }
+
+
+    /**
+     * Recursively copy files from the given source to the given destination.
+     *
+     * @param src
+     *      the source
+     * @param dest
+     *      the destination
+     * @throws IOException
+     *      If an error occurs when copying a file
+     */
+    public static void copyFiles( File src, File dest ) throws IOException
+    {
+        if ( src.isDirectory() )
+        {
+            dest.mkdirs();
+
+            for ( File file : src.listFiles() )
+            {
+                copyFiles( file, new File( dest, file.getName() ) );
+            }
+        }
+        else
+        {
+            FileUtils.copyFile( src, dest );
         }
     }
 }

Modified: directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/ServiceInstallersMojo.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/ServiceInstallersMojo.java?rev=648925&r1=648924&r2=648925&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/ServiceInstallersMojo.java
(original)
+++ directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/ServiceInstallersMojo.java
Wed Apr 16 19:30:25 2008
@@ -28,15 +28,20 @@
 import java.util.List;
 import java.util.Set;
 
+import org.apache.directory.daemon.installers.bin.BinInstallerCommand;
+import org.apache.directory.daemon.installers.bin.BinTarget;
+import org.apache.directory.daemon.installers.deb.DebInstallerCommand;
+import org.apache.directory.daemon.installers.deb.DebTarget;
 import org.apache.directory.daemon.installers.inno.InnoInstallerCommand;
 import org.apache.directory.daemon.installers.inno.InnoTarget;
 import org.apache.directory.daemon.installers.izpack.IzPackInstallerCommand;
 import org.apache.directory.daemon.installers.izpack.IzPackTarget;
+import org.apache.directory.daemon.installers.nsis.NsisInstallerCommand;
+import org.apache.directory.daemon.installers.nsis.NsisTarget;
+import org.apache.directory.daemon.installers.pkg.PkgInstallerCommand;
+import org.apache.directory.daemon.installers.pkg.PkgTarget;
 import org.apache.directory.daemon.installers.rpm.RpmInstallerCommand;
 import org.apache.directory.daemon.installers.rpm.RpmTarget;
-import org.apache.directory.daemon.installers.nsis.NsisTarget;
-import org.apache.directory.daemon.installers.nsis.NsisInstallerCommand;
-
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.model.Developer;
 import org.apache.maven.model.MailingList;
@@ -118,6 +123,11 @@
      * @parameter
      */
     private DebTarget[] debTargets;
+    
+    /**
+     * @parameter
+     */
+    private BinTarget[] binTargets;
 
     /**
      * @parameter 
@@ -250,6 +260,27 @@
                 rpmCmd = new RpmInstallerCommand( this, ( RpmTarget ) target );
                 rpmCmd.execute();
             }
+            
+            if ( target instanceof PkgTarget )
+            {
+                PkgInstallerCommand pkgCmd = null;
+                pkgCmd = new PkgInstallerCommand( this, ( PkgTarget ) target );
+                pkgCmd.execute();
+            }
+            
+            if ( target instanceof DebTarget )
+            {
+                DebInstallerCommand debCmd = null;
+                debCmd = new DebInstallerCommand( this, ( DebTarget ) target );
+                debCmd.execute();
+            }
+            
+            if ( target instanceof BinTarget )
+            {
+                BinInstallerCommand binCmd = null;
+                binCmd = new BinInstallerCommand( this, ( BinTarget ) target );
+                binCmd.execute();
+            }
         }
     }
 
@@ -263,6 +294,7 @@
         addAll( allTargets, rpmTargets );
         addAll( allTargets, debTargets );
         addAll( allTargets, pkgTargets );
+        addAll( allTargets, binTargets );
     }
 
 
@@ -538,7 +570,7 @@
                 getLog().info( "daemonFramework: " + target.getDaemonFramework() );
                 getLog().info( "loggerConfigurationFile: " + target.getLoggerConfigurationFile()
);
                 getLog().info( "bootstrapperConfigurationFiles: " + target.getBootstrapperConfigurationFile()
);
-                getLog().info( "serverConfigurationFil: " + target.getServerConfigurationFile()
);
+                getLog().info( "serverConfigurationFile: " + target.getServerConfigurationFile()
);
             }
         }
 

Modified: directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java?rev=648925&r1=648924&r2=648925&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java
(original)
+++ directory/sandbox/akarasulu/bigbang/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java
Wed Apr 16 19:30:25 2008
@@ -138,7 +138,10 @@
         // because the compiler may be installed in different places and is specific
         if ( !target.getRpmBuilder().exists() )
         {
-            throw new MojoFailureException( "Cannot find rpmbuild: " + target.getRpmBuilder()
);
+            log.warn( "Cannot find rpmbuild utility at this location: " + target.getRpmBuilder()
);
+            log.warn( "The build will continue, but please check the location of your rpmbuild
" );
+            log.warn( "utility." );
+            return;
         }
         else
         {

Modified: directory/sandbox/akarasulu/bigbang/daemon/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/daemon/pom.xml?rev=648925&r1=648924&r2=648925&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/daemon/pom.xml (original)
+++ directory/sandbox/akarasulu/bigbang/daemon/pom.xml Wed Apr 16 19:30:25 2008
@@ -24,14 +24,14 @@
   <parent>
     <groupId>org.apache.directory.project</groupId>
     <artifactId>project</artifactId>
-    <version>10-SNAPSHOT</version>
+    <version>10</version>
   </parent>
   <groupId>org.apache.directory.daemon</groupId>
   <artifactId>daemon-parent</artifactId>
   <name>Apache Directory Daemon</name>
   <packaging>pom</packaging>
   <!-- note that this skipped a RC in being bumped up -->
-  <version>1.1.2-SNAPSHOT</version>
+  <version>1.1.4-SNAPSHOT</version>
   <description>
     Reusable framework for daemon applications based on Commons Daemon
     Jsvc and Procrun. A small installation layout pattern combined with
@@ -115,24 +115,10 @@
 
   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/directory/daemon/branches/bigbang</connection>
-    <developerConnection>scm:svn:http://svn.apache.org/repos/asf/directory/daemon/branches/bigbang</developerConnection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/directory/daemon/branches/bigbang</developerConnection>
     <url>http://svn.apache.org/viewvc/directory/project/releases/8/daemon-parent</url>
   </scm>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-release-plugin</artifactId>
-        <configuration>
-          <tagBase>
-            https://svn.apache.org/repos/asf/directory/daemon/releases
-          </tagBase>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
   <distributionManagement>
     <site>
       <id>apache.directory.daemon</id>
@@ -217,52 +203,6 @@
       </plugin>
     </plugins>
   </reporting>
-
-  <profiles>
-    <profile>
-      <id>release</id>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-gpg-plugin</artifactId>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>sign</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-source-plugin</artifactId>
-            <!-- TODO delete version tag after upgrading to TLP pom 9 -->
-            <version>2.0.3</version>
-            <executions>
-              <execution>
-                <id>attach-sources</id>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>attach-javadocs</id>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
 
   <repositories>
     <repository>



Mime
View raw message