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

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

Revision: 8484
          http://smartfrog.svn.sourceforge.net/smartfrog/?rev=8484&view=rev
Author:   steve_l
Date:     2011-02-03 16:17:55 +0000 (Thu, 03 Feb 2011)

Log Message:
-----------
SFOS-1562 and the cloudfarmer component

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

Modified: trunk/core/release/build.xml
===================================================================
--- trunk/core/release/build.xml	2011-02-02 15:58:54 UTC (rev 8483)
+++ trunk/core/release/build.xml	2011-02-03 16:17:55 UTC (rev 8484)
@@ -481,6 +481,7 @@
     <ln artifact="sf-anubis" version="${smartfrog.version}"/>
     
     <!-- cloudfarmer -->
+<!-- SFOS-1562
     <rpmpackage package="cloudfarmer"/>
     <ln artifact="sf-cloudfarmer" version="${smartfrog.version}"/>
     <ln artifact="commons-chain" version="${commons-chain.version}"/>
@@ -489,6 +490,7 @@
     <ln artifact="struts-core" version="${struts.version}"/>
     <ln artifact="struts-taglib" version="${struts.version}"/>
     <ln artifact="struts-tiles" version="${struts.version}"/>
+-->
 
     
     <!-- csvfiles -->
@@ -897,7 +899,9 @@
         <!--components-->
         <include name="sf-ant/${smartfrog.version}/*"/>
         <include name="sf-anubis/${smartfrog.version}/*"/>
+<!-- SFOS-1562
         <include name="sf-cloudfarmer/${smartfrog.version}/*"/>
+-->
         <include name="sf-csvfiles/${smartfrog.version}/*"/>
         <include name="sf-database/${smartfrog.version}/*"/>
         <include name="sf-dns/${smartfrog.version}/*"/>
@@ -1256,8 +1260,13 @@
     <property name="rpms.core.list"
         value="${rpm.base.list} ${rpms.components.list} ${rpms.www.list} ${rpms.testing.list} "/>
 
+<!-- SFOS-1562
     <property name="rpms.cloud.list"
         value="smartfrog-hadoop smartfrog-cloudfarmer smartfrog-ec2"/>
+-->
+    <property name="rpms.cloud.list"
+      value="smartfrog-ec2"/>
+
     <property name="rpms.private.list"
         value=" smartfrog-private-security-keys"/>
     

Modified: trunk/core/release/izpack/smartfrog-install.xml
===================================================================
--- trunk/core/release/izpack/smartfrog-install.xml	2011-02-02 15:58:54 UTC (rev 8483)
+++ trunk/core/release/izpack/smartfrog-install.xml	2011-02-03 16:17:55 UTC (rev 8484)
@@ -382,6 +382,7 @@
           targetdir="$INSTALL_PATH"
           unpack="true"/>
     </pack>
+ <!-- SFOS-1562
     <pack name="CloudFarmer" required="no" preselected="no">
       <description>
         The cloudfarmer package contains components and client code to assist in 
@@ -413,6 +414,7 @@
       <depends packname="Jetty"/>
       <depends packname="JSON"/>
     </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	2011-02-02 15:58:54 UTC (rev 8483)
+++ trunk/core/release/metadata/rpm/smartfrog.spec	2011-02-03 16:17:55 UTC (rev 8484)
@@ -193,17 +193,17 @@
 
 # -----------------------------------------------------------------------------
 
-%package cloudfarmer
-
-Group:         ${rpm.framework}
-Summary:        Cloud Infrastructure Management
-Requires:       %{name} = %{version}-%{release}, %{name}-jetty,  %{name}-json
+#%package cloudfarmer
 #
-%description cloudfarmer 
-Components and tools to deal with different cloud infrastructures.
+#Group:         ${rpm.framework}
+#Summary:        Cloud Infrastructure Management
+#Requires:       %{name} = %{version}-%{release}, %{name}-jetty,  %{name}-json
+##
+#%description cloudfarmer
+#Components and tools to deal with different cloud infrastructures.
+#
+#This RPM includes everything needed to host struts 1.x under Jetty.
 
-This RPM includes everything needed to host struts 1.x under Jetty.
-
 # -----------------------------------------------------------------------------
 
 %package csvfiles
@@ -809,23 +809,23 @@
 
 
 # -----------------------------------------------------------------------------
-%files cloudfarmer
+#%files cloudfarmer
+#
+#%{libdir}/sf-cloudfarmer-${smartfrog.version}.jar
+#%{linkdir}/sf-cloudfarmer.jar
+#%{libdir}/commons-chain-${commons-chain.version}.jar
+#%{linkdir}/commons-chain.jar
+#%{libdir}/commons-digester-${commons-digester.version}.jar
+#%{linkdir}/commons-digester.jar
+#%{libdir}/commons-validator-${commons-validator.version}.jar
+#%{linkdir}/commons-validator.jar
+#%{libdir}/struts-core-${struts.version}.jar
+#%{linkdir}/struts-core.jar
+#%{libdir}/struts-taglib-${struts.version}.jar
+#%{linkdir}/struts-taglib.jar
+#%{libdir}/struts-tiles-${struts.version}.jar
+#%{linkdir}/struts-tiles.jar
 
-%{libdir}/sf-cloudfarmer-${smartfrog.version}.jar
-%{linkdir}/sf-cloudfarmer.jar
-%{libdir}/commons-chain-${commons-chain.version}.jar
-%{linkdir}/commons-chain.jar
-%{libdir}/commons-digester-${commons-digester.version}.jar
-%{linkdir}/commons-digester.jar
-%{libdir}/commons-validator-${commons-validator.version}.jar
-%{linkdir}/commons-validator.jar
-%{libdir}/struts-core-${struts.version}.jar
-%{linkdir}/struts-core.jar
-%{libdir}/struts-taglib-${struts.version}.jar
-%{linkdir}/struts-taglib.jar
-%{libdir}/struts-tiles-${struts.version}.jar
-%{linkdir}/struts-tiles.jar
-
 # -----------------------------------------------------------------------------
 %files csvfiles
 


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