directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r371482 - in /directory/trunks/apacheds/standalone: daemon/src/main/java/org/apache/directory/server/standalone/daemon/ installers/plugin/ installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/ installers/plugin/...
Date Mon, 23 Jan 2006 07:50:08 GMT
Author: akarasulu
Date: Sun Jan 22 23:49:47 2006
New Revision: 371482

URL: http://svn.apache.org/viewcvs?rev=371482&view=rev
Log:
added all binaries for jsvc and procrun

Added:
    directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/jsvc_linux_i386
  (with props)
    directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/jsvc_macosx_ppc
  (with props)
    directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/jsvc_solaris_sparc
  (with props)
    directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/prunmgr.exe
  (with props)
    directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/prunsrv.exe
  (with props)
Modified:
    directory/trunks/apacheds/standalone/daemon/src/main/java/org/apache/directory/server/standalone/daemon/InstallationLayout.java
    directory/trunks/apacheds/standalone/installers/plugin/pom.xml
    directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/CreateImage.java
    directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/Target.java
    directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/template.init
    directory/trunks/apacheds/standalone/installers/test/pom.xml

Modified: directory/trunks/apacheds/standalone/daemon/src/main/java/org/apache/directory/server/standalone/daemon/InstallationLayout.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/standalone/daemon/src/main/java/org/apache/directory/server/standalone/daemon/InstallationLayout.java?rev=371482&r1=371481&r2=371482&view=diff
==============================================================================
--- directory/trunks/apacheds/standalone/daemon/src/main/java/org/apache/directory/server/standalone/daemon/InstallationLayout.java
(original)
+++ directory/trunks/apacheds/standalone/daemon/src/main/java/org/apache/directory/server/standalone/daemon/InstallationLayout.java
Sun Jan 22 23:49:47 2006
@@ -119,7 +119,13 @@
     
     public File getInitScript()
     {
-        return new File( getBinDirectory(), "server.init" );
+        return getInitScript( "server.init" );
+    }
+    
+    
+    public File getInitScript( String name )
+    {
+        return new File( getBinDirectory(), name );
     }
     
     
@@ -143,13 +149,25 @@
     
     public File getConfigurationFile()
     {
-        return new File( getConfigurationDirectory(), "server.xml" );
+        return getConfigurationFile( "server.xml" );
+    }
+
+    
+    public File getConfigurationFile( String name )
+    {
+        return new File( getConfigurationDirectory(), name );
     }
 
     
     public File getLoggerConfigurationFile()
     {
-        return new File( getConfigurationDirectory(), "log4j.properties" );
+        return getLoggerConfigurationFile( "log4j.properties" );
+    }
+
+    
+    public File getLoggerConfigurationFile( String name )
+    {
+        return new File( getConfigurationDirectory(), name );
     }
 
     

Modified: directory/trunks/apacheds/standalone/installers/plugin/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/standalone/installers/plugin/pom.xml?rev=371482&r1=371481&r2=371482&view=diff
==============================================================================
--- directory/trunks/apacheds/standalone/installers/plugin/pom.xml (original)
+++ directory/trunks/apacheds/standalone/installers/plugin/pom.xml Sun Jan 22 23:49:47 2006
@@ -45,6 +45,11 @@
       <artifactId>plexus-utils</artifactId>
       <version>1.0.2</version>
     </dependency>
+    <dependency>
+      <groupId>izpack</groupId>
+      <artifactId>standalone-compiler</artifactId>
+      <version>3.8.0</version>
+    </dependency>
   </dependencies>
 </project>
 

Modified: directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/CreateImage.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/CreateImage.java?rev=371482&r1=371481&r2=371482&view=diff
==============================================================================
--- directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/CreateImage.java
(original)
+++ directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/CreateImage.java
Sun Jan 22 23:49:47 2006
@@ -1,19 +1,3 @@
-/*
- *   Copyright 2004 The Apache Software Foundation
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- *
- */
 package org.apache.directory.server.standalone.installers;
 
 
@@ -29,8 +13,10 @@
 import java.io.Writer;
 import java.util.Iterator;
 import java.util.Properties;
+import java.util.Set;
 
 import org.apache.directory.server.standalone.daemon.InstallationLayout;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -45,7 +31,7 @@
 /**
  * Maven 2 mojo creating the platform specific installation layout images.
  * 
- * @goal create
+ * @goal generate
  * @description Creates platform specific installation layout images.
  * @phase package
  * @requiresDependencyResolution runtime
@@ -111,6 +97,11 @@
      * @parameter
      */
     private String encoding;
+    
+    /**
+     * @parameter
+     */
+    private Set excludes;
 
 
     private Properties filterProperties;
@@ -195,23 +186,136 @@
             }
             
             // copy over the init script template
-            if ( targets[ii].isFamily( "unix" ) )
+            if ( targets[ii].getOsFamily().equals( "unix" ) )
             {
                 try
                 {
-                    copyFile( getClass().getResourceAsStream( "template.init" ), layout.getInitScript(),
true );
+                    copyAsciiFile( getClass().getResourceAsStream( "template.init" ), layout.getInitScript(),
true );
                 }
                 catch ( IOException e )
                 {
                     getLog().error( "Failed to copy server configuration file "  
                         + targets[ii].getServerConfigurationFile()
-                        + " into position " + layout.getConfigurationFile(), e );
+                        + " into position " + layout.getInitScript(), e );
+                }
+            }
+            
+            // now copy over the jsvc executable renaming it to the applicationName 
+            if ( targets[ii].getOsName().equals( "linux" ) && targets[ii].getOsArch().equals(
"i386" ) )
+            {
+                File executable = new File ( layout.getBinDirectory(), applicationName );
+                try
+                {
+                    copyBinaryFile( getClass().getResourceAsStream( "jsvc_linux_i386" ),
executable );
+                }
+                catch ( IOException e )
+                {
+                    throw new MojoFailureException( "Failed to copy jsvc executable file
"  
+                        + getClass().getResource( "jsvc_linux_i386" )
+                        + " into position " + executable.getAbsolutePath() );
                 }
             }
+            
+            // now copy over the jsvc executable renaming it to the applicationName 
+            if ( targets[ii].getOsName().equals( "sunos" ) && targets[ii].getOsArch().equals(
"sparc" ) )
+            {
+                File executable = new File ( layout.getBinDirectory(), applicationName );
+                try
+                {
+                    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() );
+                }
+            }
+            
+            // now copy over the jsvc executable renaming it to the applicationName 
+            if ( targets[ii].getOsName().equals( "macosx" ) && targets[ii].getOsArch().equals(
"ppc" ) )
+            {
+                File executable = new File ( layout.getBinDirectory(), applicationName );
+                try
+                {
+                    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() );
+                }
+            }
+            
+            // now copy over the Prunsrv and Prunmgr executables renaming them to the applicationName
+ w for mgr
+            if ( targets[ii].getOsFamily().equals( "windows" ) && targets[ii].getOsArch().equals(
"x86" ) )
+            {
+                File executable = new File ( layout.getBinDirectory(), applicationName +
".exe" );
+                try
+                {
+                    copyBinaryFile( getClass().getResourceAsStream( "prunsrv.exe" ), executable
);
+                }
+                catch ( IOException e )
+                {
+                    throw new MojoFailureException( "Failed to copy prunsrv executable file
"  
+                        + getClass().getResource( "prunsrv.exe" )
+                        + " into position " + executable.getAbsolutePath() );
+                }
+
+                executable = new File ( layout.getBinDirectory(), applicationName + "w.exe"
);
+                try
+                {
+                    copyBinaryFile( getClass().getResourceAsStream( "prunmgr.exe" ), executable
);
+                }
+                catch ( IOException e )
+                {
+                    throw new MojoFailureException( "Failed to copy prunmgr executable file
"  
+                        + getClass().getResource( "prunmgr.exe" )
+                        + " into position " + executable.getAbsolutePath() );
+                }
+            }
+            
+            copyDependencies( layout );
         }        
     }
     
     
+    private void copyDependencies( InstallationLayout layout ) throws MojoFailureException
+    {
+        Artifact artifact = null;
+        Iterator artifacts = project.getRuntimeArtifacts().iterator();
+        while ( artifacts.hasNext() )
+        {
+            artifact = ( Artifact ) artifacts.next();
+            if ( artifact.getArtifactId().equals( BOOTSTRAPPER_ARTIFACT_ID ) || artifact.getGroupId().equals(
BOOTSTRAPPER_GROUP_ID ) )
+            {
+                getLog().info( "Not copying bootstrapper " + artifact );
+            }
+            else
+            {
+                String key = artifact.getGroupId() + ":" + artifact.getArtifactId();
+                if ( excludes.contains( key ) )
+                {
+                    getLog().info( "<<<=== excluded <<<=== " + key );
+                    continue;
+                }
+                
+                try
+                {
+                    FileUtils.copyFileToDirectory( artifact.getFile(), layout.getLibDirectory()
);
+                    getLog().info( "===>>> included ===>>> " + key );
+                }
+                catch ( IOException e )
+                {
+                    throw new MojoFailureException( "Failed to copy dependency artifact "
 
+                        + artifact + " into position " + layout.getLibDirectory() );
+                }
+            }
+        }
+    }
+    
+    
     private void setDefaults()
     {
         if ( targets == null )
@@ -235,6 +339,10 @@
             {
                 target.setServerConfigurationFile( new File( sourceDirectory, "server.xml"
) );
             }
+            if ( target.getOsVersion() == null )
+            {
+                target.setOsVersion( "*" );
+            }
         }
     }
     
@@ -289,9 +397,9 @@
                 getLog().info( "osVersion: " + targets[ii].getOsVersion() );
                 getLog().info( "installer: " + targets[ii].getInstaller() );
                 getLog().info( "daemonFramework: " + targets[ii].getDaemonFramework() );
-                getLog().info( "log4jProperties: " + targets[ii].getLoggerConfigurationFile()
);
-                getLog().info( "bootstrapperProperties: " + targets[ii].getBootstrapperConfiguraitonFile()
);
-                getLog().info( "serverXml: " + targets[ii].getServerConfigurationFile() );
+                getLog().info( "loggerConfigurationFile: " + targets[ii].getLoggerConfigurationFile()
);
+                getLog().info( "bootstrapperConfiguraitonFiles: " + targets[ii].getBootstrapperConfiguraitonFile()
);
+                getLog().info( "serverConfigurationFil: " + targets[ii].getServerConfigurationFile()
);
                 
                 if ( ii + 1 < targets.length )
                 {
@@ -325,7 +433,23 @@
     }
 
     
-    private void copyFile( InputStream from, File to, boolean filtering ) throws IOException
+    private void copyBinaryFile( InputStream from, File to ) throws IOException
+    {
+        FileOutputStream out = null;
+        try 
+        {
+            out = new FileOutputStream( to );
+            IOUtil.copy( from, out );
+        }
+        finally
+        {
+            IOUtil.close( from );
+            IOUtil.close( out );
+        }
+    }
+    
+    
+    private void copyAsciiFile( InputStream from, File to, boolean filtering ) throws IOException
     {
         // buffer so it isn't reading a byte at a time!
         Reader fileReader = null;
@@ -347,8 +471,10 @@
             Reader reader = null;
             if ( filtering )
             {
+                // support _${token}
+                reader = new InterpolationFilterReader( fileReader, filterProperties, "_${",
"}" );
                 // support ${token}
-                reader = new InterpolationFilterReader( fileReader, filterProperties, "${",
"}" );
+                reader = new InterpolationFilterReader( reader, filterProperties, "${", "}"
);
                 // support @token@
                 reader = new InterpolationFilterReader( reader, filterProperties, "@", "@"
);
     

Modified: directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/Target.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/Target.java?rev=371482&r1=371481&r2=371482&view=diff
==============================================================================
--- directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/Target.java
(original)
+++ directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/Target.java
Sun Jan 22 23:49:47 2006
@@ -126,6 +126,10 @@
 
     public String getOsVersion()
     {
+        if ( osVersion == null )
+        {
+            return null;
+        }
         return osVersion.toLowerCase( Locale.US );
     }
 
@@ -190,140 +194,140 @@
     }
 
 
-    /**
-     * Determines if the target OS family matches the given OS family.
-     * @param family the family to check for
-     * @return true if the target OS matches
-     */
-    public boolean isFamily( String family )
-    {
-        return isOs( family, null, null, null );
-    }
-
-    
-    /**
-     * Determines if the target OS matches the given OS name.
-     *
-     * @param name the OS name to check for
-     * @return true if the target OS matches
-     */
-    public boolean isName( String name )
-    {
-        return isOs( null, name, null, null );
-    }
-    
-
-    /**
-     * Determines if the target OS matches the given OS architecture.
-     *
-     * @param arch the OS architecture to check for
-     * @return true if the target OS matches
-     */
-    public boolean isArch( String arch )
-    {
-        return isOs( null, null, arch, null );
-    }
-    
-
-    /**
-     * Determines if the target OS matches the given OS version.
-     *
-     * @param version the OS version to check for
-     * @return true if the OS matches
-     */
-    public boolean isVersion( String version )
-    {
-        return isOs( null, null, null, version );
-    }
-
-    
-    /**
-     * Determines if the OS matches the target's OS family, name, architecture and version
-     *
-     * @param family   The OS family
-     * @param name   The OS name
-     * @param arch   The OS architecture
-     * @param version   The OS version
-     * @return true if the OS matches
-     */
-    public boolean isOs( String family, String name, String arch, String version )
-    {
-        boolean retValue = false;
-
-        if ( family != null || name != null || arch != null || version != null )
-        {
-            boolean isFamily = true;
-            boolean isName = true;
-            boolean isArch = true;
-            boolean isVersion = true;
-
-            if ( family != null )
-            {
-                if ( family.equals( "windows" ) )
-                {
-                    isFamily = osName.indexOf( "windows" ) > -1;
-                }
-                else if ( family.equals( "os/2" ) )
-                {
-                    isFamily = osName.indexOf( "os/2" ) > -1;
-                }
-                else if ( family.equals( "netware" ) )
-                {
-                    isFamily = osName.indexOf( "netware" ) > -1;
-                }
-                else if ( family.equals( "dos" ) )
-                {
-                    isFamily = !isFamily( "netware" );
-                }
-                else if ( family.equals( "mac" ) )
-                {
-                    isFamily = osName.indexOf( "mac" ) > -1;
-                }
-                else if ( family.equals( "tandem" ) )
-                {
-                    isFamily = osName.indexOf( "nonstop_kernel" ) > -1;
-                }
-                else if ( family.equals( "unix" ) )
-                {
-                    isFamily = !isFamily( "openvms" )
-                        && ( !isFamily( "mac" ) || osName.endsWith( "x" ) );
-                }
-                else if ( family.equals( "win9x" ) )
-                {
-                    isFamily = isFamily( "windows" )
-                        && ( osName.indexOf( "95" ) >= 0
-                        || osName.indexOf( "98" ) >= 0
-                        || osName.indexOf( "me" ) >= 0
-                        || osName.indexOf( "ce" ) >= 0 );
-                }
-                else if ( family.equals( "z/os" ) )
-                {
-                    isFamily = osName.indexOf( "z/os" ) > -1
-                        || osName.indexOf( "os/390" ) > -1;
-                }
-                else if ( family.equals( "os/400" ) )
-                {
-                    isFamily = osName.indexOf( "os/400" ) > -1;
-                }
-                else if ( family.equals( "openvms" ) )
-                {
-                    isFamily = osName.indexOf( "openvms" ) > -1;
-                }
-            }
-            if ( name != null )
-            {
-                isName = name.equals( osName );
-            }
-            if ( arch != null )
-            {
-                isArch = arch.equals( osName );
-            }
-            if ( version != null )
-            {
-                isVersion = version.equals( osVersion );
-            }
-            retValue = isFamily && isName && isArch && isVersion;
-        }
-        return retValue;
-    }
+//    /**
+//     * Determines if the target OS family matches the given OS family.
+//     * @param family the family to check for
+//     * @return true if the target OS matches
+//     */
+//    public boolean isFamily( String family )
+//    {
+//        return isOs( family, null, null, null );
+//    }
+//
+//    
+//    /**
+//     * Determines if the target OS matches the given OS name.
+//     *
+//     * @param name the OS name to check for
+//     * @return true if the target OS matches
+//     */
+//    public boolean isName( String name )
+//    {
+//        return isOs( null, name, null, null );
+//    }
+//    
+//
+//    /**
+//     * Determines if the target OS matches the given OS architecture.
+//     *
+//     * @param arch the OS architecture to check for
+//     * @return true if the target OS matches
+//     */
+//    public boolean isArch( String arch )
+//    {
+//        return isOs( null, null, arch, null );
+//    }
+//    
+//
+//    /**
+//     * Determines if the target OS matches the given OS version.
+//     *
+//     * @param version the OS version to check for
+//     * @return true if the OS matches
+//     */
+//    public boolean isVersion( String version )
+//    {
+//        return isOs( null, null, null, version );
+//    }
+//
+//    
+//    /**
+//     * Determines if the OS matches the target's OS family, name, architecture and version
+//     *
+//     * @param family   The OS family
+//     * @param name   The OS name
+//     * @param arch   The OS architecture
+//     * @param version   The OS version
+//     * @return true if the OS matches
+//     */
+//    public boolean isOs( String family, String name, String arch, String version )
+//    {
+//        boolean retValue = false;
+//
+//        if ( family != null || name != null || arch != null || version != null )
+//        {
+//            boolean isFamily = true;
+//            boolean isName = true;
+//            boolean isArch = true;
+//            boolean isVersion = true;
+//
+//            if ( family != null )
+//            {
+//                if ( osFamily.equals( family.toLowerCase() ) )
+//                {
+//                    isFamily = osName.indexOf( "windows" ) > -1;
+//                }
+//                else if ( osFamily.equals( "os/2" ) )
+//                {
+//                    isFamily = osName.indexOf( "os/2" ) > -1;
+//                }
+//                else if ( osFamily.equals( "netware" ) )
+//                {
+//                    isFamily = osName.indexOf( "netware" ) > -1;
+//                }
+//                else if ( family.equals( "dos" ) )
+//                {
+//                    isFamily = !isFamily( "netware" );
+//                }
+//                else if ( family.equals( "mac" ) )
+//                {
+//                    isFamily = osName.indexOf( "mac" ) > -1;
+//                }
+//                else if ( family.equals( "tandem" ) )
+//                {
+//                    isFamily = osName.indexOf( "nonstop_kernel" ) > -1;
+//                }
+//                else if ( family.equals( "unix" ) )
+//                {
+//                    isFamily = !isFamily( "openvms" )
+//                        && ( !isFamily( "mac" ) || osName.endsWith( "x" ) );
+//                }
+//                else if ( family.equals( "win9x" ) )
+//                {
+//                    isFamily = isFamily( "windows" )
+//                        && ( osName.indexOf( "95" ) >= 0
+//                        || osName.indexOf( "98" ) >= 0
+//                        || osName.indexOf( "me" ) >= 0
+//                        || osName.indexOf( "ce" ) >= 0 );
+//                }
+//                else if ( family.equals( "z/os" ) )
+//                {
+//                    isFamily = osName.indexOf( "z/os" ) > -1
+//                        || osName.indexOf( "os/390" ) > -1;
+//                }
+//                else if ( family.equals( "os/400" ) )
+//                {
+//                    isFamily = osName.indexOf( "os/400" ) > -1;
+//                }
+//                else if ( family.equals( "openvms" ) )
+//                {
+//                    isFamily = osName.indexOf( "openvms" ) > -1;
+//                }
+//            }
+//            if ( name != null )
+//            {
+//                isName = name.equals( osName );
+//            }
+//            if ( arch != null )
+//            {
+//                isArch = arch.equals( osName );
+//            }
+//            if ( version != null )
+//            {
+//                isVersion = version.equals( osVersion );
+//            }
+//            retValue = isFamily && isName && isArch && isVersion;
+//        }
+//        return retValue;
+//    }
 }

Added: directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/jsvc_linux_i386
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/jsvc_linux_i386?rev=371482&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/jsvc_linux_i386
------------------------------------------------------------------------------
    svn:executable = *

Propchange: directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/jsvc_linux_i386
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/jsvc_macosx_ppc
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/jsvc_macosx_ppc?rev=371482&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/jsvc_macosx_ppc
------------------------------------------------------------------------------
    svn:executable = *

Propchange: directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/jsvc_macosx_ppc
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/jsvc_solaris_sparc
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/jsvc_solaris_sparc?rev=371482&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/jsvc_solaris_sparc
------------------------------------------------------------------------------
    svn:executable = *

Propchange: directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/jsvc_solaris_sparc
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/prunmgr.exe
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/prunmgr.exe?rev=371482&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/prunmgr.exe
------------------------------------------------------------------------------
    svn:executable = *

Propchange: directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/prunmgr.exe
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/prunsrv.exe
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/prunsrv.exe?rev=371482&view=auto
==============================================================================
Binary file - no diff available.

Propchange: directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/prunsrv.exe
------------------------------------------------------------------------------
    svn:executable = *

Propchange: directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/prunsrv.exe
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/template.init
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/template.init?rev=371482&r1=371481&r2=371482&view=diff
==============================================================================
--- directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/template.init
(original)
+++ directory/trunks/apacheds/standalone/installers/plugin/src/main/resources/org/apache/directory/server/standalone/installers/template.init
Sun Jan 22 23:49:47 2006
@@ -67,7 +67,7 @@
 	   ;;
 esac
 
-if [ -z "$${app.caps}_HOME" ] ; then
+if [ -z "$_${app.caps}_HOME" ] ; then
   # try to find install home 
   if [ -d ${app.install.base}/${app}-${version} ] ; then
     ${app.caps}_HOME=${app.install.base}/${app}-${version}
@@ -91,28 +91,28 @@
   echo JAVA_HOME=$JAVA_HOME
 fi
 
-if [ -z "$${app.caps}_HOME" ] ; then
+if [ -z "$_${app.caps}_HOME" ] ; then
   echo "Warning: ${app.caps}_HOME environment variable is not set."
   echo "  If script fails because classes could not be found"
   echo "  you will need to set the ${app.caps}_HOME environment variable"
   echo "  to the installation directory of ${app}."
 else
-  echo ${app.caps}_HOME=$${app.caps}_HOME
+  echo ${app.caps}_HOME=$_${app.caps}_HOME
 fi
 CLASSPATH=$CLASSPATH:$JAVA_HOME/lib/tools.jar
 # For Cygwin, ensure paths are in UNIX format before anything is touched
 if $cygwin ; then
-  [ -n "$${app.caps}_HOME" ] &&
-    ${app.caps}_HOME=`cygpath --unix "$${app.caps}_HOME"`
-  [ -n "$${app.caps}_HOME_LOCAL" ] &&
-    ${app.caps}_HOME_LOCAL=`cygpath --unix "$${app.caps}_HOME_LOCAL"`
+  [ -n "$_${app.caps}_HOME" ] &&
+    ${app.caps}_HOME=`cygpath --unix "$_${app.caps}_HOME"`
+  [ -n "$_${app.caps}_HOME_LOCAL" ] &&
+    ${app.caps}_HOME_LOCAL=`cygpath --unix "$_${app.caps}_HOME_LOCAL"`
   [ -n "$JAVA_HOME" ] &&
     JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
   [ -n "$CLASSPATH" ] &&
     CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
 fi
 
-SERVER_HOME=$${app.caps}_HOME
+SERVER_HOME=$_${app.caps}_HOME
 DAEMON_HOME=$SERVER_HOME/bin
 CLASSPATH=$CLASSPATH:$DAEMON_HOME/bootstrapper.jar
 echo CLASSPATH=$CLASSPATH
@@ -133,7 +133,7 @@
     RETVAL=0
     
     $DAEMON_HOME/${app} \
-    -user $${app.caps}_USER \
+    -user $_${app.caps}_USER \
     -home $JAVA_HOME \
     -Djava.io.tmpdir=$TMP_DIR \
     -Dlog4j.configuration=file://$SERVER_HOME/conf/log4j.properties\
@@ -143,7 +143,7 @@
     -errfile $SERVER_HOME/var/log/${app}-stderr.log \
     -cp $CLASSPATH \
     org.apache.directory.server.standalone.daemon.Bootstrapper \
-    $${app.caps}_HOME start
+    $_${app.caps}_HOME start
 
     #
     # To get a verbose JVM
@@ -207,7 +207,7 @@
     -Xdebug -Xnoagent -Djava.compiler=NONE\
     -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=$DEBUG_PORT\
     -jar $DAEMON_HOME/bootstrapper.jar \
-    $${app.caps}_HOME start
+    $_${app.caps}_HOME start
     ;;
 
   *)

Modified: directory/trunks/apacheds/standalone/installers/test/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/standalone/installers/test/pom.xml?rev=371482&r1=371481&r2=371482&view=diff
==============================================================================
--- directory/trunks/apacheds/standalone/installers/test/pom.xml (original)
+++ directory/trunks/apacheds/standalone/installers/test/pom.xml Sun Jan 22 23:49:47 2006
@@ -63,6 +63,26 @@
         <groupId>org.apache.directory.server.standalone.installers.plugin</groupId>
         <artifactId>plugin</artifactId>
         <configuration>
+          <excludes>
+            <exclude>ant:ant</exclude>
+            <exclude>aopalliance:aopalliance</exclude>
+            <exclude>xerces:xerces</exclude>
+            <exclude>commons-pool:commons-pool</exclude>
+            <exclude>xml-apis:xml-apis</exclude>
+            <exclude>aspectwerkz:aspectwerkz-core</exclude>
+            <exclude>velocity:velocity</exclude>
+            <exclude>org.springframework:spring-aop</exclude>
+            <exclude>qdox:qdox</exclude>
+            <exclude>commons-attributes:commons-attributes-compiler</exclude>
+            <exclude>commons-attributes:commons-attributes-api</exclude>
+            <exclude>cglib:cglib</exclude>
+            <exclude>velocity:velocity-dep</exclude>
+            <exclude>com.jamonapi:jamon</exclude>
+            <exclude>asm:asm</exclude>
+            <exclude>freemarker:freemarker</exclude>
+            <exclude>asm:asm-util</exclude>
+            <exclude>jasperreports:jasperreports</exclude>
+          </excludes>
           <applicationName>test</applicationName>
           <applicationClass>org.apache.ldap.server.DirectoryServer</applicationClass>
           <applicationVersion>${pom.version}</applicationVersion>
@@ -74,6 +94,31 @@
               <osVersion>5.1</osVersion>
               <osArch>x86</osArch>
               <daemonFramework>procrun</daemonFramework>
+              <installer>inno</installer>
+            </target>
+            <target>
+              <id>linux-jsvc-izpack</id>
+              <osName>Linux</osName>
+              <osFamily>unix</osFamily>
+              <osArch>i386</osArch>
+              <daemonFramework>jsvc</daemonFramework>
+              <installer>izpack</installer>
+            </target>
+            <target>
+              <id>macosx-jsvc-izpack</id>
+              <osName>macosx</osName>
+              <osFamily>unix</osFamily>
+              <osArch>ppc</osArch>
+              <daemonFramework>jsvc</daemonFramework>
+              <installer>izpack</installer>
+            </target>
+            <target>
+              <id>solaris-jsvc-izpack</id>
+              <osName>sunos</osName>
+              <osFamily>unix</osFamily>
+              <minVersion>5.6</minVersion>
+              <osArch>sparc</osArch>
+              <daemonFramework>jsvc</daemonFramework>
               <installer>izpack</installer>
             </target>
           </targets>



Mime
View raw message