From: <st...@us...> - 2011-02-02 14:15:39
|
Revision: 8480 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=8480&view=rev Author: steve_l Date: 2011-02-02 14:15:32 +0000 (Wed, 02 Feb 2011) Log Message: ----------- SFOS-1562 comment out Hadoop JARs and RPM from SF release 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 14:14:31 UTC (rev 8479) +++ trunk/core/release/build.xml 2011-02-02 14:15:32 UTC (rev 8480) @@ -515,6 +515,7 @@ <ln artifact="groovy-engine" version="${groovy-engine.version}"/> <!-- hadoop --> +<!-- Commented out as part of SFOS-1562 <rpmpackage package="hadoop"/> <ln artifact="sf-hadoop" version="${smartfrog.version}"/> <ln artifact="hadoop-core" version="${hadoop.version}"/> @@ -529,6 +530,7 @@ <ln artifact="jets3t" version="${jets3t.version}"/> <ln artifact="paranamer" version="${paranamer.version}"/> <ln artifact="xmlenc" version="${xmlenc.version}"/> +--> <!-- jersey --> <rpmpackage package="jersey"/> @@ -902,7 +904,11 @@ <include name="sf-ec2/${smartfrog.version}/*"/> <include name="sf-emailer/${smartfrog.version}/*"/> <include name="sf-groovy/${smartfrog.version}/*"/> +<!-- SFOS-1562 + <include name="sf-hadoop/${smartfrog.version}/*"/> + +--> <include name="sf-jersey/${smartfrog.version}/*"/> <include name="sf-jmx/${smartfrog.version}/*"/> <include name="sf-loggingservices/${smartfrog.version}/*"/> Modified: trunk/core/release/izpack/smartfrog-install.xml =================================================================== --- trunk/core/release/izpack/smartfrog-install.xml 2011-02-02 14:14:31 UTC (rev 8479) +++ trunk/core/release/izpack/smartfrog-install.xml 2011-02-02 14:15:32 UTC (rev 8480) @@ -518,6 +518,7 @@ /> </pack> +<!-- SFOS-1562 <pack name="Hadoop" required="no" preselected="no"> <description> The sf-hadoop package contains the components needed to deploy a Hadoop filesystem @@ -586,6 +587,8 @@ <depends packname="Ant"/> <depends packname="WWW"/> </pack> + --> + <pack name="Jersey" required="no" preselected="no"> <description> The sf-jersey package adds Jersey and hence JAX-RS support Modified: trunk/core/release/metadata/rpm/smartfrog.spec =================================================================== --- trunk/core/release/metadata/rpm/smartfrog.spec 2011-02-02 14:14:31 UTC (rev 8479) +++ trunk/core/release/metadata/rpm/smartfrog.spec 2011-02-02 14:15:32 UTC (rev 8480) @@ -268,16 +268,16 @@ # ----------------------------------------------------------------------------- -%package hadoop -Group: ${rpm.framework} -Summary: Hadoop integration -Requires: %{name} = %{version}-%{release}, %{name}-jetty +#%package hadoop +#Group: ${rpm.framework} +#Summary: Hadoop integration +#Requires: %{name} = %{version}-%{release}, %{name}-jetty +# +#%description hadoop +# +#This includes all the artifacts needed to bring up a Apache Hadoop cluster with SmartFrog. +#It does not contain the Apache Hadoop shell scripts -%description hadoop - -This includes all the artifacts needed to bring up a Apache Hadoop cluster with SmartFrog. -It does not contain the Apache Hadoop shell scripts - # ----------------------------------------------------------------------------- #%package jasper @@ -866,36 +866,36 @@ %{libdir}/groovy-engine-${groovy-engine.version}.jar # ----------------------------------------------------------------------------- -%files hadoop -%{linkdir}/sf-hadoop.jar -%{libdir}/sf-hadoop-${smartfrog.version}.jar -%{libdir}/hadoop-core-${hadoop.version}.jar -%{linkdir}/hadoop-core.jar -%{libdir}/hadoop-hdfs-${hadoop.version}.jar -%{linkdir}/hadoop-hdfs.jar -%{libdir}/hadoop-mapred-${hadoop.version}.jar -%{linkdir}/hadoop-mapred.jar -%{libdir}/hadoop-mapred-tools-${hadoop.version}.jar -%{linkdir}/hadoop-mapred-tools.jar -%{libdir}/hadoop-mapred-examples-${hadoop.version}.jar -%{linkdir}/hadoop-mapred-examples.jar +#%files hadoop +#%{linkdir}/sf-hadoop.jar +#%{libdir}/sf-hadoop-${smartfrog.version}.jar +#%{libdir}/hadoop-core-${hadoop.version}.jar +#%{linkdir}/hadoop-core.jar +#%{libdir}/hadoop-hdfs-${hadoop.version}.jar +#%{linkdir}/hadoop-hdfs.jar +#%{libdir}/hadoop-mapred-${hadoop.version}.jar +#%{linkdir}/hadoop-mapred.jar +#%{libdir}/hadoop-mapred-tools-${hadoop.version}.jar +#%{linkdir}/hadoop-mapred-tools.jar +#%{libdir}/hadoop-mapred-examples-${hadoop.version}.jar +#%{linkdir}/hadoop-mapred-examples.jar +# +# +#%{libdir}/avro-${avro.version}.jar +#%{linkdir}/avro.jar +#%{libdir}/commons-cli-${commons-cli.version}.jar +#%{linkdir}/commons-cli.jar +#%{libdir}/jackson-core-asl-${jackson-asl.version}.jar +#%{linkdir}/jackson-core-asl.jar +#%{libdir}/jackson-mapper-asl-${jackson-asl.version}.jar +#%{linkdir}/jackson-mapper-asl.jar +#%{libdir}/jets3t-${jets3t.version}.jar +#%{linkdir}/jets3t.jar +#%{libdir}/paranamer-${paranamer.version}.jar +#%{linkdir}/paranamer.jar +#%{libdir}/xmlenc-${xmlenc.version}.jar +#%{linkdir}/xmlenc.jar - -%{libdir}/avro-${avro.version}.jar -%{linkdir}/avro.jar -%{libdir}/commons-cli-${commons-cli.version}.jar -%{linkdir}/commons-cli.jar -%{libdir}/jackson-core-asl-${jackson-asl.version}.jar -%{linkdir}/jackson-core-asl.jar -%{libdir}/jackson-mapper-asl-${jackson-asl.version}.jar -%{linkdir}/jackson-mapper-asl.jar -%{libdir}/jets3t-${jets3t.version}.jar -%{linkdir}/jets3t.jar -%{libdir}/paranamer-${paranamer.version}.jar -%{linkdir}/paranamer.jar -%{libdir}/xmlenc-${xmlenc.version}.jar -%{linkdir}/xmlenc.jar - # ----------------------------------------------------------------------------- %files jersey This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |