[Smartfrog-checkins] SF.net SVN: smartfrog:[7908] trunk/core

[<st...@us...>]

Revision: 7908
          http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7908&view=rev
Author:   steve_l
Date:     2009-10-02 13:08:40 +0000 (Fri, 02 Oct 2009)

Log Message:
-----------
SFOS-1303 	 SFOS-1300
Patch the release RPM process to include sf-cloudfarmer

Modified Paths:
--------------
    trunk/core/components/cloudfarmer/ivy.xml
    trunk/core/components/ec2/ivy.xml
    trunk/core/release/build.xml
    trunk/core/release/ivy.xml
    trunk/core/release/izpack/smartfrog-install.xml
    trunk/core/release/metadata/rpm/smartfrog.spec

Modified: trunk/core/components/cloudfarmer/ivy.xml
===================================================================
--- trunk/core/components/cloudfarmer/ivy.xml	2009-10-01 16:17:11 UTC (rev 7907)
+++ trunk/core/components/cloudfarmer/ivy.xml	2009-10-02 13:08:40 UTC (rev 7908)
@@ -15,6 +15,8 @@
   -->
   <configurations defaultconfmapping="default">
     <conf name="default" extends="master,runtime"/>
+    <conf name="documentation"
+        description="all documentation artifacts"/>
     <conf name="build" visibility="private"
           description="artifacts needed to build the application"/>
     <conf name="compile" visibility="private"
@@ -36,6 +38,9 @@
   <publications>
     <!--get the artifact from our module name-->
     <artifact conf="master"/>
+    <artifact name="sf-cloudfarmer-javadocs" conf="documentation" ext="zip"/>
+    <artifact name="sf-cloudfarmer-documentation" conf="documentation" ext="zip"/>
+
   </publications>
   <dependencies>
     <dependency org="org.smartfrog"

Modified: trunk/core/components/ec2/ivy.xml
===================================================================
--- trunk/core/components/ec2/ivy.xml	2009-10-01 16:17:11 UTC (rev 7907)
+++ trunk/core/components/ec2/ivy.xml	2009-10-02 13:08:40 UTC (rev 7908)
@@ -16,6 +16,8 @@
   -->
   <configurations defaultconfmapping="default">
     <conf name="default" extends="master,runtime"/>
+    <conf name="documentation"
+        description="all documentation artifacts"/>
     <conf name="build" visibility="private"
           description="artifacts needed to build the application"/>
     <conf name="compile" visibility="private"
@@ -39,6 +41,8 @@
   <publications>
     <!--get the artifact from our module name-->
     <artifact conf="master"/>
+    <artifact name="sf-ec2-javadocs" conf="documentation" ext="zip"/>
+    <artifact name="sf-ec2-documentation" conf="documentation" ext="zip"/>
   </publications>
   <dependencies>
     <dependency org="org.smartfrog"

Modified: trunk/core/release/build.xml
===================================================================
--- trunk/core/release/build.xml	2009-10-01 16:17:11 UTC (rev 7907)
+++ trunk/core/release/build.xml	2009-10-02 13:08:40 UTC (rev 7908)
@@ -475,8 +475,12 @@
     <!-- anubis -->
     <rpmpackage package="anubis"/>
     <ln artifact="sf-anubis" version="${smartfrog.version}"/>
-
+    
     <!-- csvfiles -->
+    <rpmpackage package="cloudfarmer"/>
+    <ln artifact="sf-cloudfarmer" version="${smartfrog.version}"/>
+    
+    <!-- csvfiles -->
     <rpmpackage package="csvfiles"/>
     <ln artifact="sf-csvfiles" version="${smartfrog.version}"/>
     <ln artifact="opencsv" version="${opencsv.version}"/>
@@ -842,10 +846,12 @@
         <!--components-->
         <include name="sf-ant/${smartfrog.version}/*"/>
         <include name="sf-anubis/${smartfrog.version}/*"/>
+        <include name="sf-cloudfarmer/${smartfrog.version}/*"/>
         <include name="sf-csvfiles/${smartfrog.version}/*"/>
         <include name="sf-database/${smartfrog.version}/*"/>
         <include name="sf-dns/${smartfrog.version}/*"/>
         <include name="sf-emailer/${smartfrog.version}/*"/>
+        <include name="sf-groovy/${smartfrog.version}/*"/>
         <include name="sf-hadoop/${smartfrog.version}/*"/>
         <include name="sf-jmx/${smartfrog.version}/*"/>
         <include name="sf-loggingservices/${smartfrog.version}/*"/>
@@ -1176,7 +1182,7 @@
     <property name="rpm.base.list"
         value="smartfrog smartfrog-daemon smartfrog-demo smartfrog-javadocs smartfrog-ant smartfrog-logging "/>
     <property name="rpms.components.list"
-        value="smartfrog-anubis smartfrog-csvfiles smartfrog-database smartfrog-jmx smartfrog-networking smartfrog-quartz smartfrog-scripting smartfrog-xml smartfrog-xmpp smartfrog-velocity smartfrog-rpmtools smartfrog-ec2 smartfrog-groovy"/>
+        value="smartfrog-anubis smartfrog-csvfiles smartfrog-database smartfrog-jmx smartfrog-networking smartfrog-quartz smartfrog-scripting smartfrog-xml smartfrog-xmpp smartfrog-velocity smartfrog-rpmtools smartfrog-groovy"/>
     <property name="rpms.www.list"
         value="smartfrog-www smartfrog-jetty smartfrog-xunit "/>
     <property name="rpms.testing.list"
@@ -1186,7 +1192,7 @@
         value="${rpm.base.list} ${rpms.components.list} ${rpms.www.list} ${rpms.testing.list} "/>
 
     <property name="rpms.cloud.list"
-        value="smartfrog-hadoop"/>
+        value="smartfrog-hadoop smartfrog-cloudfarmer smartfrog-ec2"/>
     <property name="rpms.private.list"
         value=" smartfrog-private-security-keys"/>
     

Modified: trunk/core/release/ivy.xml
===================================================================
--- trunk/core/release/ivy.xml	2009-10-01 16:17:11 UTC (rev 7907)
+++ trunk/core/release/ivy.xml	2009-10-02 13:08:40 UTC (rev 7908)
@@ -50,6 +50,8 @@
         description="ant components"/>
     <conf name="package-anubis"
         description="anubis components"/>
+    <conf name="package-cloudfarmer"
+        description="Cloud management tools"/>
     <conf name="package-csvfiles"
         description="CSV File components"/>
     <conf name="package-database"
@@ -144,6 +146,14 @@
         rev="${ivy.smartfrog.version}"
         conf="package-anubis->master,redist,documentation"/>
 
+
+    <!--cloudfarmer-->
+    <dependency org="org.smartfrog"
+        name="sf-cloudfarmer"
+        changing="true"
+        rev="${ivy.smartfrog.version}"
+        conf="package-cloudfarmer->master,redist,documentation"/>
+
     <!--csvfiles-->
     <dependency org="org.smartfrog"
         name="sf-csvfiles"
@@ -159,7 +169,7 @@
 
         conf="package-database->master,redist,documentation"/>
 
-    <!--dns-->
+    <!--dns in networking-->
     <dependency org="org.smartfrog"
         name="sf-dns"
         changing="true"
@@ -167,36 +177,22 @@
         conf="package-networking->master,redist,documentation"/>
 
 
-    <!--email -->
+    <!--email in networking -->
     <dependency org="org.smartfrog"
         name="sf-emailer"
         changing="true"
         rev="${ivy.smartfrog.version}"
         conf="package-networking->master,redist,documentation"/>
 
-    <!--net-->
-    <dependency org="org.smartfrog"
-        name="sf-net"
-        changing="true"
-        rev="${ivy.smartfrog.version}"
-        conf="package-networking->master,redist,documentation"/>
 
-    <!--ssh-->
-    <dependency org="org.smartfrog"
-        name="sf-ssh"
-        changing="true"
-        rev="${ivy.smartfrog.version}"
-        conf="package-networking->master,redist,documentation"/>
-
-
     <!--ec2 -->
     <dependency org="org.smartfrog"
         name="sf-ec2"
         changing="true"
         rev="${ivy.smartfrog.version}"
-        conf="package-ec2->master,redist"/>
+        conf="package-ec2->master,redist,documentation"/>
 
-    <!--ec2 -->
+    <!--groovy -->
     <dependency org="org.smartfrog"
         name="sf-groovy"
         changing="true"
@@ -223,8 +219,16 @@
         changing="true"
         rev="${ivy.smartfrog.version}"
         conf="package-logging->master,redist,documentation"/>
-    <!--scheduling-->
+
+    <!--net-->
     <dependency org="org.smartfrog"
+        name="sf-net"
+        changing="true"
+        rev="${ivy.smartfrog.version}"
+        conf="package-networking->master,redist,documentation"/>
+    
+    <!--quartz scheduling-->
+    <dependency org="org.smartfrog"
         name="sf-quartz"
         changing="true"
         rev="${ivy.smartfrog.version}"
@@ -244,9 +248,14 @@
         rev="${ivy.smartfrog.version}"
         conf="package-scripting->master,redist,documentation"/>
 
+    <!--ssh-->
+    <dependency org="org.smartfrog"
+        name="sf-ssh"
+        changing="true"
+        rev="${ivy.smartfrog.version}"
+        conf="package-networking->master,redist,documentation"/>
 
 
-
     <!--SLP-->
     <!--
         <dependency org="org.smartfrog"

Modified: trunk/core/release/izpack/smartfrog-install.xml
===================================================================
--- trunk/core/release/izpack/smartfrog-install.xml	2009-10-01 16:17:11 UTC (rev 7907)
+++ trunk/core/release/izpack/smartfrog-install.xml	2009-10-02 13:08:40 UTC (rev 7908)
@@ -370,7 +370,29 @@
           unpack="true"/>
     </pack>
 
+    <pack name="CloudFarmer" required="no" preselected="no">
+      <description>
+        The cloudfarmer package contains components and client code to assist in 
+        deploying to cloud infrastructure.
 
+        To work with Amazon EC2, the EC2 package must be installed 
+
+        Includes opencsv-${opencsv.version}.jar
+      </description>
+      <file src="ivy/lib/package-csvfiles/sf-cloudfarmer-${smartfrog.version}.jar"
+          targetdir="$INSTALL_PATH/lib"
+          />
+      <file src="ivy/lib/package-csvfiles/sf-csvfiles-javadocs-${smartfrog.version}.zip"
+          targetdir="$INSTALL_PATH"
+          unpack="true"/>
+      <file src="ivy/lib/package-csvfiles/sf-csvfiles-documentation-${smartfrog.version}.zip"
+          targetdir="$INSTALL_PATH"
+          unpack="true"/>
+      <file src="ivy/lib/package-csvfiles/opencsv-${opencsv.version}.jar"
+          targetdir="$INSTALL_PATH/lib"
+          />
+    </pack>
+
     <pack name="CSVfiles" required="no" preselected="no">
       <description>
         The csvfiles package contains components that can work with CSV files, turning the data

Modified: trunk/core/release/metadata/rpm/smartfrog.spec
===================================================================
--- trunk/core/release/metadata/rpm/smartfrog.spec	2009-10-01 16:17:11 UTC (rev 7907)
+++ trunk/core/release/metadata/rpm/smartfrog.spec	2009-10-02 13:08:40 UTC (rev 7908)
@@ -193,6 +193,20 @@
 
 # -----------------------------------------------------------------------------
 
+%package cloudfarmer
+
+Group:         ${rpm.framework}
+Summary:        Cloud Infrastructure Management
+Requires:       %{name} = %{version}-%{release}
+#
+%description cloudfarmer 
+Components and tools to deal with different cloud infrastructures.
+
+This RPM does not depend on the smartfrog-ec2 RPM, as that is not required for other infrastuctures, 
+but to manage Amazon EC2 systems, smartfrog-ec2 RPM must be installed
+
+# -----------------------------------------------------------------------------
+
 %package csvfiles
 Group:         ${rpm.framework}
 Summary:        Components to work with CSV files
@@ -747,12 +761,16 @@
 %{linkdir}/ant.jar
 %{linkdir}/ant-launcher.jar
 
-
 %files anubis
 
 %{libdir}/sf-anubis-${smartfrog.version}.jar
 %{linkdir}/sf-anubis.jar
 
+%files cloudfarmer
+
+%{libdir}/sf-cloudfarmer-${smartfrog.version}.jar
+%{linkdir}/sf-cloudfarmer.jar
+
 %files csvfiles
 
 %{libdir}/sf-csvfiles-${smartfrog.version}.jar
@@ -835,7 +853,7 @@
 %{linkdir}/jetty.jar
 %{linkdir}/jetty-util.jar
 
-
+# these are the Jasper components
 %{libdir}/jsp-2.1-${jetty.version}.jar
 %{linkdir}/jsp-2.1.jar
 %{libdir}/jsp-api-2.1-${jetty.version}.jar
@@ -983,6 +1001,10 @@
 
 # to get the date, run:   date +"%a %b %d %Y"
 %changelog
+* Fri Oct 02 2009 Steve Loughran <sma...@hp...> 3.17.015-1.el5
+- Groovy RPM, does not depend on scripting
+- cloudfarmer RPM
+
 * Fri Jul 24 2009 Steve Loughran <sma...@hp...> 3.17.013-1.el5
 - Move up to the RHEL5 RPMs. 
 * Fri Jun 12 2009 Steve Loughran <sma...@hp...> 3.17.011-1.el4


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.