You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2011/06/21 18:31:12 UTC

svn commit: r1138080 - in /directory/apacheds/trunk: installers-maven-plugin/src/main/java/org/apache/directory/server/installers/ installers-maven-plugin/src/main/java/org/apache/directory/server/installers/solarispkg/ installers-maven-plugin/src/main...

Author: pamarcelot
Date: Tue Jun 21 16:31:11 2011
New Revision: 1138080

URL: http://svn.apache.org/viewvc?rev=1138080&view=rev
Log:
Deleted remains of a no longer maintained solaris pkg installer (Bin installer is here for our Solaris users).

Removed:
    directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/solarispkg/
    directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/solarispkg/
Modified:
    directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/GenerateMojo.java
    directory/apacheds/trunk/installers/pom.xml

Modified: directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/GenerateMojo.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/GenerateMojo.java?rev=1138080&r1=1138079&r2=1138080&view=diff
==============================================================================
--- directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/GenerateMojo.java (original)
+++ directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/GenerateMojo.java Tue Jun 21 16:31:11 2011
@@ -38,8 +38,6 @@ import org.apache.directory.server.insta
 import org.apache.directory.server.installers.nsis.NsisTarget;
 import org.apache.directory.server.installers.rpm.RpmInstallerCommand;
 import org.apache.directory.server.installers.rpm.RpmTarget;
-import org.apache.directory.server.installers.solarispkg.SolarisPkgInstallerCommand;
-import org.apache.directory.server.installers.solarispkg.SolarisPkgTarget;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
@@ -89,13 +87,6 @@ public class GenerateMojo extends Abstra
     private MacOsXPkgTarget[] macOsXPkgTargets;
 
     /**
-     * The Solaris PKG installers targets.
-     * 
-     * @parameter
-     */
-    private SolarisPkgTarget[] solarisPkgTargets;
-
-    /**
      * The NSIS installer targets.
      * 
      * @parameter
@@ -241,13 +232,6 @@ public class GenerateMojo extends Abstra
                 rpmCmd.execute();
             }
 
-            // Solaris PKG target
-            if ( target instanceof SolarisPkgTarget )
-            {
-                SolarisPkgInstallerCommand pkgCmd = new SolarisPkgInstallerCommand( this, ( SolarisPkgTarget ) target );
-                pkgCmd.execute();
-            }
-
             getLog().info( "-------------------------------------------------------" );
         }
     }
@@ -262,7 +246,6 @@ public class GenerateMojo extends Abstra
         addAllTargets( allTargets, rpmTargets );
         addAllTargets( allTargets, debTargets );
         addAllTargets( allTargets, macOsXPkgTargets );
-        addAllTargets( allTargets, solarisPkgTargets );
         addAllTargets( allTargets, binTargets );
         addAllTargets( allTargets, archiveTargets );
     }

Modified: directory/apacheds/trunk/installers/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/installers/pom.xml?rev=1138080&r1=1138079&r2=1138080&view=diff
==============================================================================
--- directory/apacheds/trunk/installers/pom.xml (original)
+++ directory/apacheds/trunk/installers/pom.xml Tue Jun 21 16:31:11 2011
@@ -145,22 +145,6 @@
               <osArch>x86_64</osArch>
             </rpmTarget>
           </rpmTargets>
-
-          <!-- Targets for Solaris .pkg installer package -->
-          <!-- <solarisPkgTargets>
-            <solarisPkgTarget>
-              <id>apacheds-solaris-x86</id>
-              <finalName>apacheds-${project.version}-solaris-x86.pkg</finalName>
-              <osName>solaris</osName>
-              <osArch>x86</osArch>
-            </solarisPkgTarget>
-            <solarisPkgTarget>
-              <id>apacheds-solaris-sparc</id>
-              <finalName>apacheds-${project.version}-solaris-sparc.pkg</finalName>
-              <osName>solaris</osName>
-              <osArch>sparc</osArch>
-            </solarisPkgTarget>
-          </solarisPkgTargets> -->
           
         </configuration>
         <executions>