From: <st...@us...> - 2008-09-17 13:19:52
|
Revision: 7060 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7060&view=rev Author: steve_l Date: 2008-09-17 20:19:48 +0000 (Wed, 17 Sep 2008) Log Message: ----------- SFOS-852 Write a redistributable build file to sign the JARs and create custom RPMs with these signed artifacts Modified Paths: -------------- trunk/core/release/doc/creating_release_artifacts.sxw trunk/core/release/metadata/rpm/rpm.properties trunk/core/release/metadata/rpm/smartfrog.spec trunk/core/release/src/ant/build.xml Modified: trunk/core/release/metadata/rpm/rpm.properties =================================================================== --- trunk/core/release/metadata/rpm/rpm.properties 2008-09-17 16:51:05 UTC (rev 7059) +++ trunk/core/release/metadata/rpm/rpm.properties 2008-09-17 20:19:48 UTC (rev 7060) @@ -44,3 +44,4 @@ rpm.daemon.start.number=80 rpm.daemon.stop.number=20 + Modified: trunk/core/release/metadata/rpm/smartfrog.spec =================================================================== --- trunk/core/release/metadata/rpm/smartfrog.spec 2008-09-17 16:51:05 UTC (rev 7059) +++ trunk/core/release/metadata/rpm/smartfrog.spec 2008-09-17 20:19:48 UTC (rev 7060) @@ -28,6 +28,21 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # +# set the attribute _private_rpm to build a private RPM + +# one thing to be aware of is the order that scripts are executed +# -Run %pre of new package +# -Install new files +# -%post of new package +# -%preun of old package +# -Delete any old files not overwritten by newer ones +# -%postun of old package +# what that means is that your %post code runs before the old version is +# uninstalled, and before its %postun runs. So you are in trouble if you need +# to run anything after the old version has uninstalled. + + + # TODO: menu entries # if menu entries are created, define Summary here, and use it in the summary @@ -41,7 +56,7 @@ %define bindir %{basedir}/bin %define binsecurity %{bindir}/security %define libdir %{basedir}/lib -%define signedlib %{basedir}/signedLib +%define signedlib %{basedir}/signedLib %define docs %{basedir}/docs %define jdocs ${rpm.javadocs.path} %define srcdir %{basedir}/src @@ -50,7 +65,9 @@ %define rcd /etc/rc.d %define smartfrogd %{rcd}/init.d/${rpm.daemon.name} %define logdir ${rpm.log.dir} +%define privatedir %{basedir}/private + #some shortcuts %define smartfrog.jar smartfrog-${smartfrog.version}.jar %define sfExamples.jar sfExamples-${smartfrog.version}.jar @@ -543,8 +560,36 @@ %{docs} %doc %{basedir}/src.zip +# ----------------------------------------------------------------------------- +# this is the private dir unless the build says otherwise +%{!?_private_rpm:%{privatedir}} +# ----------------------------------------------------------------------------- +# the security keys file only has content in it when the build property says so +%files private-security-keys +%{?_private_rpm:%{privatedir}} +# ----------------------------------------------------------------------------- +# After installing, set up a symlink from signedLib to lib. This is +# done as a script to deal with upgrade problems. Any existing directory +# is blown away by this operation, as is a symlink. +%post +if [ -x %{signedlib} ] ; then +rm -rf %{signedlib} +fi +ln -s %{libdir} %{signedlib} + + +# the symlink is only deleted if there is none left; this avoids +# stamping on any newly created links. +%postun +if [ "$1" = "0" ] ; then + if [ -x %{signedlib} ] ; then + rm -rf %{signedlib} + fi +fi + + %files demo %defattr(0644,${rpm.username},${rpm.username},0755) %{srcdir} @@ -588,6 +633,11 @@ fi fi + + + + + %files daemon #and the etc stuff %defattr(0644,root,root,0755) @@ -753,55 +803,12 @@ %{linkdir}/sf-xmpp.jar %{linkdir}/smack.jar -%files private-security-keys -%{basedir}/private - -#%files -#%{libdir}/sf--${smartfrog.version}.jar -#%{libdir}/-${.version}.jar -#%{linkdir}/sf-.jar -#%{linkdir}/.jar - # ----------------------------------------------------------------------------- -# this section declares support for signed artifacts of the different components. -#%package smartfrog-signed -#Group: ${rpm.framework} -#Summary: Signed SmartFrog artifacts -#Requires: %{name} = %{version}-%{release} -#%description smartfrog-signed -#Contains JAR files signed by a private CA. -#%files smartfrog-signed -##security -#%{signedlib}/smartfrog-${smartfrog.version}.jar -#%{signedlib}/sfExamples-${smartfrog.version}.jar -#%{signedlib}/sfServices-${smartfrog.version}.jar -# -#%package anubis-signed -#Group: ${rpm.framework} -#Summary: Signed Anubis artifacts -#Requires: %{name}-anubis = %{version}-%{release} , smartfrog-signed = %{version}-%{release} -#%description anubis-signed -#Contains JAR files signed by a private CA. -#%files anubis-signed -#%{signedlib}/sf-anubis-${smartfrog.version}.jar -# -#%package logging-signed -#Group: ${rpm.framework} -#Summary: Signed logging artifacts -#Requires: %{name}-logging = %{version}-%{release} , smartfrog-signed = %{version}-%{release} -#%description logging-signed -#Contains JAR files signed by a private CA. -#%files logging-signed -#%{signedlib}/sf-loggingservices-${smartfrog.version}.jar -#%{signedlib}/commons-logging-${commons-logging.version}.jar -#%{signedlib}/log4j-${log4j.version}.jar - -# ----------------------------------------------------------------------------- - # to get the date, run: date +"%a %b %d %Y" %changelog +* Tue Sep 16 2008 Steve Loughran <sma...@hp...> 3.12.0042-2.el4 changes to the security model so that signedLib is a symlink. * Mon May 12 2008 Steve Loughran <sma...@hp...> 3.12.0027-2.el4 - add velocity template * Thu Jan 24 2008 Steve Loughran <sma...@hp...> 3.12.0018-2.el4 Modified: trunk/core/release/src/ant/build.xml =================================================================== --- trunk/core/release/src/ant/build.xml 2008-09-17 16:51:05 UTC (rev 7059) +++ trunk/core/release/src/ant/build.xml 2008-09-17 20:19:48 UTC (rev 7060) @@ -42,6 +42,8 @@ <!--Load the properties files, fail if missing--> <loadproperties srcFile="rpmbuild.properties" /> + + <!--these are the RPM properties --> <loadproperties srcFile="rpm.properties"/> <property environment="env" /> @@ -71,7 +73,6 @@ <mkdir dir="${dist.signed.rpm.dir}" /> <mkdir dir="${upload.dir}" /> - <!--the root of the filesystem--> <property name="rpm.root.dir" location="${build.rpm.dir}/root/"/> @@ -149,6 +150,7 @@ specFile="smartfrog.spec" topDir="${rpm.image.dir}" cleanBuildDir="true" + command="-bb --with=_private_rpm" failOnError="true"/> </target> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2008-09-26 16:01:36
|
Revision: 7090 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7090&view=rev Author: steve_l Date: 2008-09-26 16:00:37 +0000 (Fri, 26 Sep 2008) Log Message: ----------- SFOS-879 Security: remove signedLib; all the JARs in lib/ are to be signed instead. -this is in secure mode only SFOS-852 Write a redistributable build file to sign the JARs and create custom RPMs with these signed artifacts Modified Paths: -------------- trunk/core/release/build.xml trunk/core/release/metadata/rpm/rpm.properties trunk/core/release/metadata/rpm/smartfrog.spec trunk/core/release/src/ant/build.xml Modified: trunk/core/release/build.xml =================================================================== --- trunk/core/release/build.xml 2008-09-24 16:09:27 UTC (rev 7089) +++ trunk/core/release/build.xml 2008-09-26 16:00:37 UTC (rev 7090) @@ -569,7 +569,8 @@ </exec> </target> - <target name="maybe-sign-rpm-jars" depends="copy-rpm-specs,create-link-dir,init-security,symlink-signed-lib" + <!--we've cut ,symlink-signed-lib from the depends list here--> + <target name="maybe-sign-rpm-jars" depends="copy-rpm-specs,create-link-dir,init-security" xmlns:sec="http://security.smartfrog.org/"> </target> @@ -1226,6 +1227,11 @@ todir="${build.dir}"/> <!--commandResource="${build.dir}/rpm-queries.txt"--> + <!-- this sets a property to the query string to check the signedlib if the + security.enabled flag is set. + Checking this has been disabled while we experiment with not setting the symlink + up except in custom signed RPMs. + --> <condition property="secureLibs" value="rpm -qf ${rpm.install.dir}/signedLib/smartfrog-${smartfrog.version}.jar; rpm -qf ${rpm.install.dir}/signedLib/sfServices-${smartfrog.version}.jar; @@ -1266,9 +1272,9 @@ rpm -qf ${rpm.install.dir}/lib/sf-csvfiles-${smartfrog.version}.jar; rpm -qf ${rpm.install.dir}/lib/opencsv-${opencsv.version}.jar; rpm -qf ${rpm.install.dir}/links/sf-csvfiles.jar; -rpm -qf ${rpm.install.dir}/links/opencsv.jar; -${secureLibs}" +rpm -qf ${rpm.install.dir}/links/opencsv.jar;" outputProperty="rpm.queries.results"/> + <!--${secureLibs}"--> <fail> <condition> Modified: trunk/core/release/metadata/rpm/rpm.properties =================================================================== --- trunk/core/release/metadata/rpm/rpm.properties 2008-09-24 16:09:27 UTC (rev 7089) +++ trunk/core/release/metadata/rpm/rpm.properties 2008-09-26 16:00:37 UTC (rev 7090) @@ -2,7 +2,7 @@ #by the user at build time. #release counter -rpm.release.counter=2 +rpm.release.counter=1 #platform this RPM targets rpm.distribution=el4 #the full release version combines the counter and target platform Modified: trunk/core/release/metadata/rpm/smartfrog.spec =================================================================== --- trunk/core/release/metadata/rpm/smartfrog.spec 2008-09-24 16:09:27 UTC (rev 7089) +++ trunk/core/release/metadata/rpm/smartfrog.spec 2008-09-26 16:00:37 UTC (rev 7090) @@ -73,6 +73,17 @@ %define sfExamples.jar sfExamples-${smartfrog.version}.jar %define sfServices.jar sfServices-${smartfrog.version}.jar +#choose the package name based on the operational mode +%{!?_private_rpm:%define package_name smartfrog} +%{?_private_rpm:%define package_name smartfrog-secure} +%{!?_private_rpm:%define security_text This is an unsigned distribution} +%{?_private_rpm:%define security_text This is a signed distribution with private information in the smartfrog-private rpm} + +%{?_private_rpm:%{error: this is a private rpm}} +%{!?_private_rpm:%{error: this is not a private rpm}} + + + # ----------------------------------------------------------------------------- Summary: SmartFrog Deployment Framework @@ -87,11 +98,9 @@ Packager: ${rpm.packager} BuildArch: noarch #%{name}-%{version}.tar.gz in the SOURCES dir -Source0: %{name}-%{version}.tar.gz -# add patches, if any, here +Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -#BuildRoot: %{basedir} -Prefix: ${rpm.prefix} +Prefix: ${rpm.prefix} #Provides: SmartFrog #Icon: docs/images/frog.gif # build and runtime requirements here @@ -107,7 +116,9 @@ activates and manages the components to deliver and maintain running systems. SmartFrog and its components are implemented in Java. -This RPM installs smartfrog into +%{security_text} + +The RPM installs smartfrog into %{basedir} It also adds scripts to /etc/profile.d and /etc/sysconfig so that SmartFrog is available on the command line. @@ -271,7 +282,7 @@ %package quartz Group: ${rpm.framework} Summary: Work scheduling with Quartz -Requires: %{name} = %{version}-%{release} , smartfrog-logging +Requires: %{name} = %{version}-%{release} , %{name}-logging # %description quartz Work scheduling. These components can be used to schedule work to a pool of machines, @@ -295,7 +306,7 @@ %package xunit Group: ${rpm.framework} Summary: Testing under SmartFrog -Requires: %{name} = %{version}-%{release} , smartfrog-logging +Requires: %{name} = %{version}-%{release} , %{name}-logging # %description xunit The base testing components. This contains the sfunit test components @@ -306,7 +317,7 @@ %package junit Group: ${rpm.framework} Summary: JUnit testing -Requires: %{name} = %{version}-%{release} , smartfrog-xunit +Requires: %{name} = %{version}-%{release} , %{name}-xunit # %description junit This contains the components for running JUnit ${junit.version} tests, and the @@ -317,7 +328,7 @@ %package velocity Group: ${rpm.framework} Summary: Velocity template engine -Requires: %{name} = %{version}-%{release} , smartfrog-logging +Requires: %{name} = %{version}-%{release} , %{name}-logging # %description velocity @@ -337,7 +348,7 @@ %package www Group: ${rpm.framework} Summary: WWW components -Requires: %{name} = %{version}-%{release} , smartfrog-logging +Requires: %{name} = %{version}-%{release} , %{name}-logging # %description www This package contains components to deploy web applications on different @@ -394,8 +405,8 @@ Do not install a private keys package except within your own organisation; do not make a privately generated key package publicly available. +%{security_text} - # ----------------------------------------------------------------------------- %prep @@ -541,10 +552,8 @@ %{basedir}/testCA -#the signedLib which used to be a directory, but which in the RPMs is a symbolic link -#%dir %{basedir}/signedLib -%{basedir}/signedLib + #the log output directory #this is no longer world writeable, as the logging can fall back gracefully now %attr(755, ${rpm.username},${rpm.groupname}) ${rpm.log.dir} @@ -559,7 +568,19 @@ %docdir %{docs} %{docs} %doc %{basedir}/src.zip +# ----------------------------------------------------------------------------- +# RPM Security section. +# When secure RPMs are created. then signedLib is a symlink and not a directory +# ----------------------------------------------------------------------------- +#the signedLib which used to be a directory, but which in the RPMs is a symbolic link +# +%{basedir}/signedLib + +# some switches; still experimenting with those +#%{!?_private_rpm:%dir %{signedlib}} +#%{?_private_rpm:%{signedlib}} + # ----------------------------------------------------------------------------- # this is the private dir unless the build says otherwise %{!?_private_rpm:%{privatedir}} @@ -574,20 +595,20 @@ # done as a script to deal with upgrade problems. Any existing directory # is blown away by this operation, as is a symlink. %post -if [ -x %{signedlib} ] ; then -rm -rf %{signedlib} -fi -ln -s %{libdir} %{signedlib} +#if [ -x %{signedlib} ] ; then +#rm -rf %{signedlib} +#fi +#ln -s %{libdir} %{signedlib} # the symlink is only deleted if there is none left; this avoids # stamping on any newly created links. %postun -if [ "$1" = "0" ] ; then - if [ -x %{signedlib} ] ; then - rm -rf %{signedlib} - fi -fi +#if [ "$1" = "0" ] ; then +# if [ -x %{signedlib} ] ; then +# rm -rf %{signedlib} +# fi +#fi %files demo @@ -642,7 +663,7 @@ #and the etc stuff %defattr(0644,root,root,0755) %attr(755, root,root) /etc/rc.d/init.d/${rpm.daemon.name} -%(0644,root,root) /etc/sysconfig/smartfrog +%attr(0644,root,root) /etc/sysconfig/smartfrog %files ant @@ -808,15 +829,16 @@ # to get the date, run: date +"%a %b %d %Y" %changelog -* Tue Sep 16 2008 Steve Loughran <sma...@hp...> 3.12.0042-2.el4 changes to the security model so that signedLib is a symlink. -* Mon May 12 2008 Steve Loughran <sma...@hp...> 3.12.0027-2.el4 +* Fri Sep 26 2008 Steve Loughran <sma...@hp...> 3.12.043-1.el4 changes to the security model so that signedLib is a symlink. +* Tue Sep 16 2008 Steve Loughran <sma...@hp...> 3.12.042-2.el4 changes to the security model so that signedLib is a symlink. +* Mon May 12 2008 Steve Loughran <sma...@hp...> 3.12.027-2.el4 - add velocity template -* Thu Jan 24 2008 Steve Loughran <sma...@hp...> 3.12.0018-2.el4 +* Thu Jan 24 2008 Steve Loughran <sma...@hp...> 3.12.018-2.el4 - add ability to generate signed RPM files -* Mon Dec 03 2007 Steve Loughran <sma...@hp...> 3.12.0013-1.el4 +* Mon Dec 03 2007 Steve Loughran <sma...@hp...> 3.12.013-1.el4 - add the javadocs RPM - remove og-w permissions from the log directory -* Wed Nov 21 2007 Steve Loughran <sma...@hp...> 3.12.0011-1.el4 +* Wed Nov 21 2007 Steve Loughran <sma...@hp...> 3.12.011-1.el4 - add the ant, database, jmx, junit,networking, quartz, scrpting, www, xml, xmpp, xunit RPMs. * Wed Oct 24 2007 Steve Loughran <sma...@hp...> 3.12.008-1.el4 Modified: trunk/core/release/src/ant/build.xml =================================================================== --- trunk/core/release/src/ant/build.xml 2008-09-24 16:09:27 UTC (rev 7089) +++ trunk/core/release/src/ant/build.xml 2008-09-26 16:00:37 UTC (rev 7090) @@ -29,8 +29,8 @@ See http://wiki.smartfrog.org/wiki/display/sf/Signing+RPMs+for+secure+installations + To use it. you must have - </description> <!--load an override file before anything else--> @@ -39,9 +39,10 @@ <!--this is our parent directory--> <property name="parent.project.dir" location="../.."/> <property file="${parent.project.dir}/build.properties"/> + <property name="rpmbuild.properties.file" location="rpmbuild.properties" /> <!--Load the properties files, fail if missing--> - <loadproperties srcFile="rpmbuild.properties" /> + <loadproperties srcfile="${rpmbuild.properties.file}" /> <!--these are the RPM properties --> <loadproperties srcFile="rpm.properties"/> @@ -141,17 +142,18 @@ <target name="ready-to-prepare-binary-rpm" - depends="rpmmacros,signjars"/> + depends="rpmmacros,signjars,symlink-signed-lib"/> - <target name="build-rpm" depends="ready-to-rpm" description="create an RPM file of the core smartfrog libraries"> <rpm specFile="smartfrog.spec" topDir="${rpm.image.dir}" cleanBuildDir="true" - command="-bb --with=_private_rpm" - failOnError="true"/> + command='-bb --define "_private_rpm _private_rpm"' + failOnError="true"> +<!-- <define key="_private_rpm" value="_private_rpm" /> --> + </rpm> </target> <target name="prepare-binary-rpm" @@ -292,7 +294,7 @@ </dist> </target> - <target name="ready-to-sign" depends="init,init-security" if="sign.jars"/> + <target name="ready-to-sign" depends="init,init-security" /> <target name="signjars" depends="ready-to-sign"> @@ -312,4 +314,15 @@ </sec:signjar2> </target> + <!--For the secure RPMs, we create symbolic links instead of a separate directory--> + <target name="symlink-signed-lib" depends="ready-to-sign" + > + <delete dir="${rpm.signed.lib.dir}" /> + <exec executable="ln" failonerror="true"> + <arg value="-sf"/> + <arg value="${rpm.install.dir}/lib"/> + <arg value="${rpm.signed.lib.dir}"/> + </exec> + </target> + </project> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2008-10-03 15:36:33
|
Revision: 7101 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7101&view=rev Author: steve_l Date: 2008-10-03 15:35:39 +0000 (Fri, 03 Oct 2008) Log Message: ----------- SFOS-976 Release SmartFrog 3.12.044 Modified Paths: -------------- trunk/core/release/doc/announcements/release_3.12.044.html trunk/core/release/doc/announcements/release_3.12.044.txt trunk/core/release/doc/creating_release_artifacts.sxw trunk/core/release/metadata/servers/chamonix.properties Modified: trunk/core/release/doc/announcements/release_3.12.044.html =================================================================== --- trunk/core/release/doc/announcements/release_3.12.044.html 2008-10-03 14:33:38 UTC (rev 7100) +++ trunk/core/release/doc/announcements/release_3.12.044.html 2008-10-03 15:35:39 UTC (rev 7101) @@ -246,6 +246,90 @@ <h3>Changes since last release</h3> + +<h3> Bug +</h3> +<ul> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-849'>SFOS-849</a>] - Cannot start http server in junit outside the IDE +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-872'>SFOS-872</a>] - Hudson fails during Ivy Tests +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-881'>SFOS-881</a>] - redistributable RPM file copies the artifacts into release/dist/rpm, so confusing signed and unsigned artifacts +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-910'>SFOS-910</a>] - the private RPMs .gz doesnt include the .gz that it needs +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-922'>SFOS-922</a>] - Merge constraints logic from core-branch-constraints branch +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-928'>SFOS-928</a>] - The fileList attribute of the Files component is a String, not a Vector as the documentation says +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-929'>SFOS-929</a>] - NPE in FilesImpl +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-932'>SFOS-932</a>] - SSH Bulk upload tests are failing +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-956'>SFOS-956</a>] - some subclasses of ChildMinder don't have a fully typed Enumeration<> on their sfChildren() method +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-959'>SFOS-959</a>] - make WaitForImpl easier to subclass +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-980'>SFOS-980</a>] - testharness failing in parse +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-988'>SFOS-988</a>] - security exception when starting RPM installation with security turned on +</li> +</ul> + +<h3> Improvement +</h3> +<ul> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-562'>SFOS-562</a>] - provide better error messages when CONSTANT fails; add tests +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-840'>SFOS-840</a>] - add commons-logging.properties file (with a priority) to automatically switch logging apps to SmartFrog logging +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-933'>SFOS-933</a>] - Improve fileset diagnostics +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-936'>SFOS-936</a>] - The AntWorkflowRun component doesn't report errors or fail as it should +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-937'>SFOS-937</a>] - ListUtils tuple methods shoud use <?> as a type instead of <Object> +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-965'>SFOS-965</a>] - need to set timeout values for java.net.URL connections in system properties. +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-990'>SFOS-990</a>] - in EvaluateConditionImpl, resolve the message only when about to fail +</li> +</ul> + +<h3> New Feature +</h3> +<ul> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-744'>SFOS-744</a>] - Add component to deploy/terminate EC2 VMs +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-852'>SFOS-852</a>] - Write a redistributable build file to sign the JARs and create custom RPMs with these signed artifacts +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-957'>SFOS-957</a>] - add a PingTarget component +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-963'>SFOS-963</a>] - add a SecurityProperties component to set JVM security properties +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-985'>SFOS-985</a>] - Add an inline CSV/tuple source +</li> +</ul> + +<h3> Task +</h3> +<ul> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-977'>SFOS-977</a>] - Move all classes with a dependency on eclipse jar to their own package +</li> +</ul> + +<h3> Sub-task +</h3> +<ul> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-851'>SFOS-851</a>] - write component to check disk space in java6+ JVM +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-981'>SFOS-981</a>] - move eclipse classes to their own package +</li> +<li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-983'>SFOS-983</a>] - Add tests that try and create solvers, triggering different failure modes +</li> +</ul> + + + </body> </html> Modified: trunk/core/release/doc/announcements/release_3.12.044.txt =================================================================== --- trunk/core/release/doc/announcements/release_3.12.044.txt 2008-10-03 14:33:38 UTC (rev 7100) +++ trunk/core/release/doc/announcements/release_3.12.044.txt 2008-10-03 15:35:39 UTC (rev 7101) @@ -131,6 +131,60 @@ Changes since last release ========================== +** Bug + * [SFOS-849] - Cannot start http server in junit outside the IDE + * [SFOS-872] - Hudson fails during Ivy Tests + * [SFOS-881] - redistributable RPM file copies the artifacts into + release/dist/rpm, so confusing signed and unsigned artifacts + * [SFOS-910] - the private RPMs .gz doesnt include the .gz that it needs + * [SFOS-922] - Merge constraints logic from core-branch-constraints branch + * [SFOS-928] - The fileList attribute of the Files component is a + String, not a Vector as the documentation says + * [SFOS-929] - NPE in FilesImpl + * [SFOS-932] - SSH Bulk upload tests are failing + * [SFOS-956] - some subclasses of ChildMinder don't have a fully + typed Enumeration<> on their sfChildren() method + * [SFOS-959] - make WaitForImpl easier to subclass + * [SFOS-980] - testharness failing in parse + * [SFOS-988] - security exception when starting RPM installation + with security turned on +** Improvement + * [SFOS-562] - provide better error messages when CONSTANT fails; + add tests + * [SFOS-840] - add commons-logging.properties file (with a priority) + to automatically switch logging apps to SmartFrog logging + * [SFOS-933] - Improve fileset diagnostics + * [SFOS-936] - The AntWorkflowRun component doesn't report errors or + fail as it should + * [SFOS-937] - ListUtils tuple methods shoud use <?> as a type + instead of <Object> + * [SFOS-965] - need to set timeout values for java.net.URL connections + in system properties. + * [SFOS-990] - in EvaluateConditionImpl, resolve the message only + when about to fail + +** New Feature + * [SFOS-744] - Add component to deploy/terminate EC2 VMs + * [SFOS-852] - Write a redistributable build file to sign the JARs + and create custom RPMs with these signed artifacts + * [SFOS-957] - add a PingTarget component + * [SFOS-963] - add a SecurityProperties component to set JVM + security properties + * [SFOS-985] - Add an inline CSV/tuple source + + +** Task + * [SFOS-977] - Move all classes with a dependency on eclipse jar to + their own package + +** Sub-task + * [SFOS-851] - write component to check disk space in java6+ JVM + * [SFOS-981] - move eclipse classes to their own package + * [SFOS-983] - Add tests that try and create solvers, triggering + different failure modes + + + Modified: trunk/core/release/metadata/servers/chamonix.properties =================================================================== --- trunk/core/release/metadata/servers/chamonix.properties 2008-10-03 14:33:38 UTC (rev 7100) +++ trunk/core/release/metadata/servers/chamonix.properties 2008-10-03 15:35:39 UTC (rev 7101) @@ -1,7 +1,7 @@ #property settings to upload to chamonix.hpl.hp.com; steve's desktop ssh.enabled=true ssh.server=chamonix.hpl.hp.com -ssh.user=slo +ssh.user=smartfrog ssh.dir=public_html ssh.keyfile=${user.home}/.ssh/chamonix.private ssh.passphrase= This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2008-11-26 16:50:11
|
Revision: 7185 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7185&view=rev Author: steve_l Date: 2008-11-26 16:50:09 +0000 (Wed, 26 Nov 2008) Log Message: ----------- SFOS-1033 Move to Jetty 6.1.14 SFOS-474 add SLF4J support to logging services Modified Paths: -------------- trunk/core/release/build.xml trunk/core/release/metadata/rpm/smartfrog.spec Modified: trunk/core/release/build.xml =================================================================== --- trunk/core/release/build.xml 2008-11-26 16:48:29 UTC (rev 7184) +++ trunk/core/release/build.xml 2008-11-26 16:50:09 UTC (rev 7185) @@ -485,7 +485,7 @@ <ln artifact="jasper-compiler" version="${hadoop.jasper.version}"/> <ln artifact="jasper-runtime" version="${hadoop.jasper.version}"/> <ln artifact="xmlenc" version="${xmlenc.version}"/> - <ln artifact="org.mortbay.jetty" version="${hadoop.jetty.version}"/> +<!-- <ln artifact="org.mortbay.jetty" version="${hadoop.jetty.version}"/>--> <!--<ln artifact="servlet-api" version="${hadoop.servletapi.version}"/>--> <!-- jmx --> @@ -501,6 +501,8 @@ <ln artifact="sf-loggingservices" version="${smartfrog.version}"/> <ln artifact="commons-logging" version="${commons-logging.version}"/> <ln artifact="log4j" version="${log4j.version}"/> + <ln artifact="slf4j-jcl" version="${slf4j.version}"/> + <ln artifact="slf4j-api" version="${slf4j.version}"/> <!-- networking --> <rpmpackage package="networking"/> Modified: trunk/core/release/metadata/rpm/smartfrog.spec =================================================================== --- trunk/core/release/metadata/rpm/smartfrog.spec 2008-11-26 16:48:29 UTC (rev 7184) +++ trunk/core/release/metadata/rpm/smartfrog.spec 2008-11-26 16:50:09 UTC (rev 7185) @@ -237,13 +237,10 @@ %package hadoop Group: ${rpm.framework} Summary: Hadoop integration -Requires: %{name} = %{version}-%{release} , %{name}-logging , %{name}-www, %{name}-jasper -Conflicts: %{name}-jetty +Requires: %{name} = %{version}-%{release} , %{name}-logging , %{name}-www, %{name}-jasper, %{name}-jetty %description hadoop This includes all the artifacts needed for Apache Hadoop. -DO NOT INSTALL THIS WITH smartfrog-jetty. Until Hadoop uses -Jetty 6, this RPM includes jetty-5 JAR files which are incompatible. # ----------------------------------------------------------------------------- @@ -298,7 +295,10 @@ # %description logging This package integrates SmartFrog with Apache Log4j. It includes the Apache -commons-logging-${commons-logging.version} and log4j-${log4j.version} libraries +commons-logging-${commons-logging.version} and log4j-${log4j.version} libraries, +and the slf4j-${slf4j.version} libraries to bind to commons-logging. +SmartFrog Logging can fit in behind commons-logging, so that it can handle +all the output. Log4J can be used as a back end for SmartFrog itself. # ----------------------------------------------------------------------------- @@ -391,7 +391,7 @@ Group: ${rpm.framework} Summary: WWW components Requires: %{name} = %{version}-%{release} , %{name}-logging -# + %description www This package contains components to deploy web applications on different Java web servers, from Jetty ${jetty.version} to JBoss. It also contains a LivenessPage @@ -400,8 +400,6 @@ The bundled libraries are commons-httpclient-${commons-httpclient.version}.jar commons-codec-${commons-codec.version}.jar -servlet-api-${servletapi.version}.jar -jetty-${jetty.version}.jar # ----------------------------------------------------------------------------- @@ -735,14 +733,14 @@ #Jetty, tomcat and servlet artifacts which can cause trouble %{libdir}/jsp-api-${hadoop.jsp-api.version}.jar -%{libdir}/jasper-compiler-${hadoop.jasper.version}.jar -%{libdir}/jasper-runtime-${hadoop.jasper.version}.jar +#%{libdir}/jasper-compiler-${hadoop.jasper.version}.jar +#%{libdir}/jasper-runtime-${hadoop.jasper.version}.jar %{linkdir}/jsp-api.jar -%{linkdir}/jasper-compiler.jar -%{linkdir}/jasper-runtime.jar -%{libdir}/org.mortbay.jetty-${hadoop.jetty.version}.jar -%{linkdir}/org.mortbay.jetty.jar -%{libdir}/servlet-api-${hadoop.servlet-api.version}.jar +#%{linkdir}/jasper-compiler.jar +#%{linkdir}/jasper-runtime.jar +#%{libdir}/org.mortbay.jetty-${hadoop.jetty.version}.jar +#%{linkdir}/org.mortbay.jetty.jar +#%{libdir}/servlet-api-${hadoop.servlet-api.version}.jar #%{linkdir}/servlet-api.jar %{libdir}/commons-cli-${commons-cli.version}.jar @@ -785,9 +783,13 @@ %{libdir}/sf-loggingservices-${smartfrog.version}.jar %{libdir}/commons-logging-${commons-logging.version}.jar %{libdir}/log4j-${log4j.version}.jar +%{libdir}/slf4j-api-${slf4j.version}.jar +%{libdir}/slf4j-jcl-${slf4j.version}.jar %{linkdir}/sf-loggingservices.jar %{linkdir}/commons-logging.jar %{linkdir}/log4j.jar +%{linkdir}/slf4j-api.jar +%{linkdir}/slf4j-jcl.jar @@ -895,6 +897,9 @@ # to get the date, run: date +"%a %b %d %Y" %changelog +* Wed Nov 26 2008 Steve Loughran <sma...@hp...> 3.15.001-1.el4 +- Jetty and Hadoop RPMs +- slf4j libraries in the loggingservices RPM * Fri Sep 26 2008 Steve Loughran <sma...@hp...> 3.12.043-1.el4 changes to the security model so that signedLib is a symlink. * Tue Sep 16 2008 Steve Loughran <sma...@hp...> 3.12.042-2.el4 changes to the security model so that signedLib is a symlink. * Mon May 12 2008 Steve Loughran <sma...@hp...> 3.12.027-2.el4 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2008-12-04 13:09:22
|
Revision: 7213 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7213&view=rev Author: steve_l Date: 2008-12-04 13:08:39 +0000 (Thu, 04 Dec 2008) Log Message: ----------- update release docs and some better diags for version mismatch Modified Paths: -------------- trunk/core/release/build.xml trunk/core/release/doc/creating_release_artifacts.sxw Modified: trunk/core/release/build.xml =================================================================== --- trunk/core/release/build.xml 2008-12-04 11:28:11 UTC (rev 7212) +++ trunk/core/release/build.xml 2008-12-04 13:08:39 UTC (rev 7213) @@ -256,6 +256,8 @@ symlinks in a <tar> file. --> <target name="check-source-artifacts" depends="prepare-executables"> + <fileset id="sf-core-install-artifacts" + dir="${ivy.lib.dir}/package-core-install/" includes="*"/> <fail> <condition > <not> @@ -266,6 +268,8 @@ There is probably a mismatch between the version of SmartFrog that Ivy retrieved and the version that the build file is expecting, which is ${smartfrog.version}, and which is calculated by getting the SmartFrog version off the classpath. + + ${toString:sf-core-install-artifacts} </fail> </target> Modified: trunk/core/release/doc/creating_release_artifacts.sxw =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2008-12-11 15:04:26
|
Revision: 7232 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7232&view=rev Author: steve_l Date: 2008-12-11 15:04:17 +0000 (Thu, 11 Dec 2008) Log Message: ----------- SFOS-1047 add rpmtools RPM Modified Paths: -------------- 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/release/build.xml =================================================================== --- trunk/core/release/build.xml 2008-12-11 15:03:32 UTC (rev 7231) +++ trunk/core/release/build.xml 2008-12-11 15:04:17 UTC (rev 7232) @@ -521,6 +521,9 @@ <rpmpackage package="quartz"/> <ln artifact="sf-quartz" version="${smartfrog.version}"/> <ln artifact="quartz" version="${quartz.version}"/> + <!-- quartz --> + <rpmpackage package="rpmtools"/> + <ln artifact="sf-rpmtools" version="${smartfrog.version}"/> <!-- scripting --> <rpmpackage package="scripting"/> @@ -814,8 +817,9 @@ <include name="sf-hadoop/${smartfrog.version}/*"/> <include name="sf-jmx/${smartfrog.version}/*"/> <include name="sf-loggingservices/${smartfrog.version}/*"/> + <include name="sf-net/${smartfrog.version}/*"/> <include name="sf-quartz/${smartfrog.version}/*"/> - <include name="sf-net/${smartfrog.version}/*"/> + <include name="sf-rpmtools/${smartfrog.version}/*"/> <include name="sf-scripting/${smartfrog.version}/*"/> <include name="sf-ssh/${smartfrog.version}/*"/> <include name="sf-velocity/${smartfrog.version}/*"/> @@ -1123,17 +1127,32 @@ value="/home/${rpm.ssh.user}/${rpm.ssh.dir}"/> <!--list of rpms--> + + <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"/> + <property name="rpms.www.list" + value="smartfrog-www smartfrog-jetty smartfrog-xunit "/> + <property name="rpms.testing.list" + value="smartfrog-junit "/> + <property name="rpms.core.list" - value="smartfrog smartfrog-daemon smartfrog-demo smartfrog-javadocs smartfrog-ant smartfrog-anubis smartfrog-csvfiles smartfrog-database smartfrog-jmx smartfrog-junit smartfrog-logging smartfrog-networking smartfrog-quartz smartfrog-scripting smartfrog-www smartfrog-xml smartfrog-xmpp smartfrog-xunit smartfrog-velocity"/> - <property name="rpms.jetty.list" - value="smartfrog-jetty"/> - <property name="rpms.hadoop.list" - value="smartfrog-hadoop"/> + value="${rpm.base.list} ${rpms.components.list} ${rpms.www.list} ${rpms.testing.list} "/> +<!-- + <property name="rpms.cloud.list" + value="smartfrog-hadoop smartfrog-ec2"/> +--> + + <property name="rpms.cloud.list" + value="smartfrog-hadoop smartfrog-ec2"/> <property name="rpms.private.list" value=" smartfrog-private-security-keys"/> + <property name="rpms.list" - value="${rpms.core.list} ${rpms.private.list} ${rpms.jetty.list} ${rpms.hadoop.list}"/> + value="${rpms.core.list} ${rpms.private.list} ${rpms.cloud.list}"/> + <!--here are all the signed RPMs that are generated--> Modified: trunk/core/release/ivy.xml =================================================================== --- trunk/core/release/ivy.xml 2008-12-11 15:03:32 UTC (rev 7231) +++ trunk/core/release/ivy.xml 2008-12-11 15:04:17 UTC (rev 7232) @@ -62,6 +62,8 @@ description="networking components"/> <conf name="package-quartz" description="scheduling components"/> + <conf name="package-rpmtools" + description="rpm components"/> <conf name="package-scripting" description="scripting components"/> <conf name="package-testing" @@ -142,9 +144,18 @@ changing="true" rev="${ivy.smartfrog.version}" conf="package-networking->master,redist,documentation"/> - + <!--email --> +<!-- <dependency org="org.smartfrog" + name="sf-ec2" + changing="true" + rev="${ivy.smartfrog.version}" + conf="package-networking->master,redist,documentation"/> +--> + + <!--email --> + <dependency org="org.smartfrog" name="sf-emailer" changing="true" rev="${ivy.smartfrog.version}" @@ -186,7 +197,20 @@ changing="true" rev="${ivy.smartfrog.version}" conf="package-logging->master,redist,documentation"/> + <!--scheduling--> + <dependency org="org.smartfrog" + name="sf-quartz" + changing="true" + rev="${ivy.smartfrog.version}" + conf="package-quartz->master,redist,documentation"/> + <!--rpmtools--> + <dependency org="org.smartfrog" + name="sf-rpmtools" + changing="true" + rev="${ivy.smartfrog.version}" + conf="package-rpmtools->master,redist,documentation"/> + <!--scripting --> <dependency org="org.smartfrog" name="sf-scripting" @@ -195,14 +219,8 @@ conf="package-scripting->master,redist,documentation"/> - <!--scheduling--> - <dependency org="org.smartfrog" - name="sf-quartz" - changing="true" - rev="${ivy.smartfrog.version}" - conf="package-quartz->master,redist,documentation"/> - <!--,documentation --> + <!--SLP--> <!-- <dependency org="org.smartfrog" Modified: trunk/core/release/izpack/smartfrog-install.xml =================================================================== --- trunk/core/release/izpack/smartfrog-install.xml 2008-12-11 15:03:32 UTC (rev 7231) +++ trunk/core/release/izpack/smartfrog-install.xml 2008-12-11 15:04:17 UTC (rev 7232) @@ -587,6 +587,26 @@ <depends packname="Logging"/> </pack> + + <pack name="Rpmtools" required="no" preselected="no"> + <description> + RPM tools. + + This package contains RPM support. It depends upon the Networking package. + + </description> + <file src="ivy/lib/package-rpmtools/sf-rpmtools-${smartfrog.version}.jar" + targetdir="$INSTALL_PATH/lib" + /> + <file src="ivy/lib/package-rpmtools/sf-rpmtools-javadocs-${smartfrog.version}.zip" + targetdir="$INSTALL_PATH" + unpack="true"/> + <file src="ivy/lib/package-rpmtools/sf-rpmtools-documentation-${smartfrog.version}.zip" + targetdir="$INSTALL_PATH" + unpack="true"/> + <depends packname="Networking"/> + </pack> + <pack name="Scripting" required="no" preselected="no"> <description> Scripting support. Modified: trunk/core/release/metadata/rpm/smartfrog.spec =================================================================== --- trunk/core/release/metadata/rpm/smartfrog.spec 2008-12-11 15:03:32 UTC (rev 7231) +++ trunk/core/release/metadata/rpm/smartfrog.spec 2008-12-11 15:04:17 UTC (rev 7232) @@ -335,6 +335,20 @@ # ----------------------------------------------------------------------------- +%package rpmtools +Group: ${rpm.framework} +Summary: Components to aid RPM generation and deployment +Requires: %{name} = %{version}-%{release}, %{name}-networking, + +# +%description rpmtools +This RPM contains components to work with RPMs. + +There are no explicit dependencies, but any remote installation services +will require the SSH package to be installed + +# ----------------------------------------------------------------------------- + %package scripting Group: ${rpm.framework} Summary: Scripting support @@ -822,7 +836,11 @@ %{linkdir}/sf-quartz.jar %{linkdir}/quartz.jar +%files rpmtools +%{libdir}/sf-rpmtools-${smartfrog.version}.jar +%{linkdir}/sf-rpmtools.jar + %files scripting %{libdir}/sf-scripting-${smartfrog.version}.jar %{libdir}/bsh-${bsh.version}.jar This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2009-03-11 14:22:05
|
Revision: 7462 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7462&view=rev Author: steve_l Date: 2009-03-11 14:21:01 +0000 (Wed, 11 Mar 2009) Log Message: ----------- track license dependencies Modified Paths: -------------- trunk/core/release/ivy.xml trunk/core/release/src/res/license.html Modified: trunk/core/release/ivy.xml =================================================================== --- trunk/core/release/ivy.xml 2009-03-11 14:20:38 UTC (rev 7461) +++ trunk/core/release/ivy.xml 2009-03-11 14:21:01 UTC (rev 7462) @@ -85,7 +85,11 @@ <conf name="package-testharness" description="testharness"/> + <conf name="everything" + extends="default,package-core,package-ant,package-anubis,package-csvfiles,package-database,package-jmx,package-hadoop,package-logging,package-networking,package-quartz,package-rpmtools,package-scripting,package-testing,package-velocity,package-www,package-xml,package-xmpp,package-extras,package-gui,package-testharness" + description="all our dependencies in one place"/> + </configurations> <publications> Modified: trunk/core/release/src/res/license.html =================================================================== --- trunk/core/release/src/res/license.html 2009-03-11 14:20:38 UTC (rev 7461) +++ trunk/core/release/src/res/license.html 2009-03-11 14:21:01 UTC (rev 7462) @@ -34,7 +34,7 @@ <p> Some of the optional packages which can be installed include third-party libraries. -Some of these are] +Some of these are: </p> <ul> <li>Sun libraries redistributed under their terms and conditions (mail.jar, activation.jar)</li> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2009-04-01 17:07:52
|
Revision: 7549 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7549&view=rev Author: steve_l Date: 2009-04-01 17:07:42 +0000 (Wed, 01 Apr 2009) Log Message: ----------- SFOS-1165 Package the tests so that they can be run against an RPM installation Modified Paths: -------------- trunk/core/release/build.xml trunk/core/release/ivy.xml Modified: trunk/core/release/build.xml =================================================================== --- trunk/core/release/build.xml 2009-04-01 17:02:13 UTC (rev 7548) +++ trunk/core/release/build.xml 2009-04-01 17:07:42 UTC (rev 7549) @@ -1508,4 +1508,111 @@ </echo> </target> + + <!-- Junit testing against a remote installation --> + + <target name="init-tests" + description="Run the functional tests against the remote RPM installation. + This does not install the RPMs; they must be already deployed" + depends="ready-to-compile-tests"> + <echo level="verbose"> + system.tests.enabled=${system.tests.enabled} + run.failing.tests=${run.failing.tests} + testcase=${testcase} + </echo> + <property name="services" value="org/smartfrog/services/"/> + <property name="unittests" value="org/smartfrog/test/unit/"/> + <property name="systemtests" value="org/smartfrog/test/system/"/> + <property name="processtests" value="org/smartfrog/test/process/"/> + <property name="componenttests" value="${systemtests}components/"/> + <patternset id="teststhatfail"> + <!--SFOS-403--> + <!--<exclude name="${systemtests}/workflow/conditional/FailingConditionTest.*" + unless="run.failing.tests"/>--> + <!-- SFOS-154; test failing on VMWare and CruiseControl (sometimes). Possible race condition--> + <exclude name="${systemtests}/workflow/parallel/ParallelAsyncTest.*" + unless="run.failing.tests"/> + <!--SFOS-202 test case tcn1 is being skipped (failing) --> + <exclude name="${systemtests}/deploy/DeployTCN1Test.*" + unless="run.failing.tests"/> + <!-- SFOS-563 Constant tests are failing --> + <exclude name="${systemtests}/reference/constant/ConstantReferenceTest.*" + unless="run.failing.tests"/> + + <!-- SFOS-890 Chmod "failing" tests are failing and marked as skipped --> + <exclude name="${systemtests}/filesystem/ChmodFailureTest.*" + unless="run.failing.tests"/> + <exclude name="${systemtests}/filesystem/ChmodTest.*" + unless="run.failing.tests"/> + + <!-- SFOS-886 DetachingCompoundTest is failing and being skipped--> + <exclude name="${systemtests}/**/DetachingCompoundTest.*" + unless="run.failing.tests"/> + + + <!-- SFOS-761 TestCompound doesnt terminate correctly in all circumstances when the action terminates normally (as expected) --> + <exclude name="${systemtests}/workflow/thread/WorkflowThreadTest.*" + unless="run.failing.tests"/> + + + <!-- SFOS-565 cyclic reference test tcn19.sf is now spinning instead of detecting a cyclic reference + (this is a JRockit problem) + --> + <exclude name="${systemtests}/reference/CyclicReferenceTest.*" + unless="run.failing.tests"/> + </patternset> + + </target> + + + <!-- refactoring of test run process--> + <target name="init-system-test-run" depends="init-tests,declare-system-test-tasks"> + <pathconvert pathsep="${line.separator}| |-- " + property="echo.testharness.daemon.classpath" + refid="testharness.daemon.classpath"> + </pathconvert> + <echo message=" --------------------------------------------------------"/> + <echo message=" Class Path= ${line.separator}| |-- ${echo.testharness.daemon.classpath}"/> + <echo message=" --------------------------------------------------------"/> + + <presetdef name="junit-system-test-run"> + + <sf-junit + errorProperty="system.test.failed" + failureProperty="system.test.failed" + > + <sysproperty key="emma.coverage.out.file" file="${coverage.dir}/coverage.emma"/> + <sysproperty key="emma.coverage.out.merge" value="true"/> + <sysproperty key="emma.verbosity.level" value="verbose"/> + <!-- + <syspropertyset> + <propertyref prefix="emma."/> + </syspropertyset> + --> + <syspropertyset> + <propertyref prefix="runtime"/> + </syspropertyset> + <syspropertyset> + <propertyref prefix="test."/> + </syspropertyset> + <classpath refid="testharness.daemon.classpath"/> + <!-- #Test case isolation technique --> + <test todir="${test.data.dir}" name="${testcase}" if="testcase"/> + <batchtest todir="${test.data.dir}" unless="testcase"> + <!-- bulk test case --> + <fileset dir="${test.classes.dir}"> + <!-- pull in everything --> + <include name="org/smartfrog/test/system/**/*Test.class"/> + + <!-- failing tests excluded unless run.failing.tests is set --> + <patternset refid="teststhatfail"/> + + <exclude name="${componenttests}utils/**/*Test.class" + unless="installer.present"/> + + </fileset> + </batchtest> + </sf-junit> + </presetdef> + </target> </project> \ No newline at end of file Modified: trunk/core/release/ivy.xml =================================================================== --- trunk/core/release/ivy.xml 2009-04-01 17:02:13 UTC (rev 7548) +++ trunk/core/release/ivy.xml 2009-04-01 17:07:42 UTC (rev 7549) @@ -22,7 +22,7 @@ description="artifacts needed to compile the application"/> <conf name="daemon" visibility="private" description="the classpath needed to run smartfrog daemons"/> - <conf name="test" extends="default" + <conf name="test" extends="default, package-all" description="the classpath needed to run tests"/> <conf name="master" description="contains the artifact but no dependencies"/> <conf name="redist" description="redistributals excluding smartfrog artifacts"/> @@ -30,6 +30,8 @@ extends="redist"/> <!-- <conf name="izpack" visibility="private" description="izpack libraries"/>--> + <conf name="package-all" description="all the packages in one big dependency" + extends="package-core,package-examples,package-ant,package-anubis,package-csvfiles,package-database,package-jmx,package-hadoop,package-logging,package-networking,package-quartz,package-rpmtools,package-scripting,package-testing,package-velocity,package-www,package-xml,package-xmpp"/> <!-- From here on, every Package we bundle in Ivy contains its own configuration --> <conf name="package-core-install" description="The .zip file containing the complete base distribution of SmartFrog"/> @@ -106,9 +108,20 @@ <dependency org="org.smartfrog" name="sf-tasks" changing="true" rev="${ivy.smartfrog.version}" - conf="redist->redist;package-core->master"/> + conf="redist->redist;package-core->master;build->default"/> + + <!-- the testharness. This is not redistributed, it is used to test the RPMs--> + <dependency org="org.smartfrog" + name="sf-testharness" + changing="true" + rev="latest.integration" + conf="test->default,testjar"/> + + <!-- the ant build, which contains the zipped/tarred directory tree--> + + <dependency org="org.smartfrog" name="sf-antbuild" changing="true" rev="${ivy.smartfrog.version}" conf="package-antbuild-minimal->minimal;package-antbuild-full->full;package-antbuild-source->source"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2009-06-12 16:45:18
|
Revision: 7662 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7662&view=rev Author: steve_l Date: 2009-06-12 16:43:33 +0000 (Fri, 12 Jun 2009) Log Message: ----------- SFOS-1224 relase SF3.17.012 Modified Paths: -------------- trunk/core/release/build.xml trunk/core/release/doc/announcements/release_3.17.012.html trunk/core/release/doc/creating_release_artifacts.sxw Modified: trunk/core/release/build.xml =================================================================== --- trunk/core/release/build.xml 2009-06-12 16:43:03 UTC (rev 7661) +++ trunk/core/release/build.xml 2009-06-12 16:43:33 UTC (rev 7662) @@ -393,6 +393,11 @@ cleanBuildDir="true" failOnError="true"/> </target> + + <target name="dont-build-rpm" depends="package-private-rpm,ready-to-rpm" + unless="has.rpm.tools"> + <echo>No rpm-build package installed here, or its a windows machine</echo> + </target> <target name="expand-core" depends="init-rpm,prepare-executables"> <unzip src="${sf-core-install.zip}" Modified: trunk/core/release/doc/announcements/release_3.17.012.html =================================================================== --- trunk/core/release/doc/announcements/release_3.17.012.html 2009-06-12 16:43:03 UTC (rev 7661) +++ trunk/core/release/doc/announcements/release_3.17.012.html 2009-06-12 16:43:33 UTC (rev 7662) @@ -49,7 +49,7 @@ </li> <li> Hadoop: a version of Apache Hadoop with SmartFrog management, and support components to interact with Hadoop: filesystem operations and - Job submission. This is still experimental and must be considered unstable. + Job submission. This is still experimental and must be considered unstable. </li> <li> JMX: the ability to configure and manage JMX components, and to manage SmartFrog components over JMX. Modified: trunk/core/release/doc/creating_release_artifacts.sxw =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2009-09-23 10:54:35
|
Revision: 7878 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7878&view=rev Author: steve_l Date: 2009-09-23 10:54:29 +0000 (Wed, 23 Sep 2009) Log Message: ----------- SFOS-1129 add sf-groovy RPM -also, fix the smartfrog-install.xml to handle all the new hadoop files Modified Paths: -------------- 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/release/build.xml =================================================================== --- trunk/core/release/build.xml 2009-09-23 10:51:24 UTC (rev 7877) +++ trunk/core/release/build.xml 2009-09-23 10:54:29 UTC (rev 7878) @@ -488,6 +488,12 @@ <ln artifact="commons-pool" version="${commons-pool.version}"/> <ln artifact="commons-dbutils" version="${commons-dbutils.version}"/> + <!-- groovy --> + <rpmpackage package="groovy"/> + <ln artifact="sf-groovy" version="${smartfrog.version}"/> + <ln artifact="groovy-all-minimal" version="${groovy.version}"/> + <ln artifact="groovy-engine" version="${groovy-engine.version}"/> + <!-- hadoop --> <rpmpackage package="hadoop"/> <ln artifact="sf-hadoop" version="${smartfrog.version}"/> Modified: trunk/core/release/ivy.xml =================================================================== --- trunk/core/release/ivy.xml 2009-09-23 10:51:24 UTC (rev 7877) +++ trunk/core/release/ivy.xml 2009-09-23 10:54:29 UTC (rev 7878) @@ -54,10 +54,14 @@ description="CSV File components"/> <conf name="package-database" description="database components"/> + <conf name="package-ec2" + description="EC2 components"/> + <conf name="package-groovy" + description="Groovy components"/> + <conf name="package-hadoop" + description="hadoop components"/> <conf name="package-jmx" description="jmx components"/> - <conf name="package-hadoop" - description="hadoop components"/> <conf name="package-logging" description="logging components"/> <conf name="package-networking" @@ -88,7 +92,7 @@ description="testharness"/> <conf name="everything" - extends="default,package-core,package-ant,package-anubis,package-csvfiles,package-database,package-jmx,package-hadoop,package-logging,package-networking,package-quartz,package-rpmtools,package-scripting,package-testing,package-velocity,package-www,package-xml,package-xmpp,package-extras,package-gui,package-testharness" + extends="default,package-core,package-ant,package-anubis,package-csvfiles,package-database,package-ec2,package-groovy,package-hadoop,package-jmx,package-logging,package-networking,package-quartz,package-rpmtools,package-scripting,package-testing,package-velocity,package-www,package-xml,package-xmpp,package-extras,package-gui,package-testharness" description="all our dependencies in one place"/> @@ -162,14 +166,6 @@ rev="${ivy.smartfrog.version}" conf="package-networking->master,redist,documentation"/> - <!--email --> -<!-- - <dependency org="org.smartfrog" - name="sf-ec2" - changing="true" - rev="${ivy.smartfrog.version}" - conf="package-networking->master,redist,documentation"/> ---> <!--email --> <dependency org="org.smartfrog" @@ -193,13 +189,20 @@ conf="package-networking->master,redist,documentation"/> - <!--JMX --> + <!--ec2 --> <dependency org="org.smartfrog" - name="sf-jmx" + name="sf-ec2" changing="true" rev="${ivy.smartfrog.version}" - conf="package-jmx->master,redist,documentation"/> + conf="package-ec2->master,redist"/> + <!--ec2 --> + <dependency org="org.smartfrog" + name="sf-groovy" + changing="true" + rev="${ivy.smartfrog.version}" + conf="package-groovy->master,redist,documentation"/> + <!--hadoop--> <dependency org="org.smartfrog" name="sf-hadoop" @@ -207,6 +210,12 @@ rev="${ivy.smartfrog.version}" conf="package-hadoop->master,redist,documentation,s3-server"/> + <!--JMX --> + <dependency org="org.smartfrog" + name="sf-jmx" + changing="true" + rev="${ivy.smartfrog.version}" + conf="package-jmx->master,redist,documentation"/> <!--logging--> <dependency org="org.smartfrog" Modified: trunk/core/release/izpack/smartfrog-install.xml =================================================================== --- trunk/core/release/izpack/smartfrog-install.xml 2009-09-23 10:51:24 UTC (rev 7877) +++ trunk/core/release/izpack/smartfrog-install.xml 2009-09-23 10:54:29 UTC (rev 7878) @@ -434,6 +434,29 @@ /> </pack> + + <pack name="Groovy" required="no" preselected="no"> + <description> + Groovy scripting support + </description> + <file src="ivy/lib/package-groovy/sf-groovy-${smartfrog.version}.jar" + targetdir="$INSTALL_PATH/lib" + /> + <file src="ivy/lib/package-groovy/sf-groovy-javadocs-${smartfrog.version}.zip" + targetdir="$INSTALL_PATH" + unpack="true"/> + <file src="ivy/lib/package-groovy/sf-groovy-documentation-${smartfrog.version}.zip" + targetdir="$INSTALL_PATH" + unpack="true"/> + + <file src="ivy/lib/package-groovy/groovy-all-minimal-${groovy.version}.jar" + targetdir="$INSTALL_PATH/lib" + /> + <file src="ivy/lib/package-groovy/groovy-engine-${groovy-engine.version}.jar" + targetdir="$INSTALL_PATH/lib" + /> + </pack> + <pack name="Hadoop" required="no" preselected="no"> <description> The sf-hadoop package contains the components needed to deploy a Hadoop filesystem @@ -460,9 +483,15 @@ targetdir="$INSTALL_PATH" unpack="true"/> - <file src="ivy/lib/package-hadoop/hadoop-core-${hadoop.version}.jar" + <file src="ivy/lib/package-hadoop/hadoop-common-${hadoop.version}.jar" targetdir="$INSTALL_PATH/lib" /> + <file src="ivy/lib/package-hadoop/hadoop-hdfs-${hadoop.version}.jar" + targetdir="$INSTALL_PATH/lib" + /> + <file src="ivy/lib/package-hadoop/hadoop-mapred-${hadoop.version}.jar" + targetdir="$INSTALL_PATH/lib" + /> <file src="ivy/lib/package-hadoop/commons-cli-${commons-cli.version}.jar" targetdir="$INSTALL_PATH/lib" /> @@ -472,11 +501,25 @@ <file src="ivy/lib/package-hadoop/xmlenc-${xmlenc.version}.jar" targetdir="$INSTALL_PATH/lib" /> + <file src="ivy/lib/package-hadoop/avro-${avro.version}.jar" + targetdir="$INSTALL_PATH/lib" + /> + <file src="ivy/lib/package-hadoop/jackson-core-asl-${jackson-asl.version}.jar" + targetdir="$INSTALL_PATH/lib" + /> + <file src="ivy/lib/package-hadoop/jackson-mapper-asl-${jackson-asl.version}.jar" + targetdir="$INSTALL_PATH/lib" + /> + <file src="ivy/lib/package-hadoop/paranamer-${paranamer.version}.jar" + targetdir="$INSTALL_PATH/lib" + /> + <depends packname="Jetty"/> <depends packname="Logging"/> <depends packname="Ant"/> <depends packname="WWW"/> </pack> + <pack name="JMX" required="no" preselected="no"> <description> The sf-jmx package can integrate JMX MBeans with SmartFrog, and Modified: trunk/core/release/metadata/rpm/smartfrog.spec =================================================================== --- trunk/core/release/metadata/rpm/smartfrog.spec 2009-09-23 10:51:24 UTC (rev 7877) +++ trunk/core/release/metadata/rpm/smartfrog.spec 2009-09-23 10:54:29 UTC (rev 7878) @@ -232,12 +232,34 @@ commons-pool-${commons-pool.version}.jar commons-dbcp-${commons-dbcp.version}.jar + # ----------------------------------------------------------------------------- +%package ec2 +Group: ${rpm.framework} +Summary: Amazon EC2 support +Requires: %{name} = %{version}-%{release} , %{name}-logging , %{name}-www, + +%description ec2 +Components for working with S3 files and EC2 instances. +Includes Restlet libraries (CDDL and GPL licensed) + +# ----------------------------------------------------------------------------- + +%package groovy +Group: ${rpm.framework} +Summary: Groovy Script Support +Requires: %{name} = %{version}-%{release} + +%description groovy +This includes Groovy and the components needed to embed Groovy scripts inside .sf files + +# ----------------------------------------------------------------------------- + %package hadoop Group: ${rpm.framework} Summary: Hadoop integration -Requires: %{name} = %{version}-%{release} , %{name}-logging , %{name}-www, %{name}-jetty +Requires: %{name} = %{version}-%{release} , %{name}-logging , %{name}-www, %{name}-jetty, %{name}-jasper %description hadoop This includes all the artifacts needed to bring up a Apache Hadoop cluster with SmartFrog. @@ -748,6 +770,15 @@ %{libdir}/commons-dbutils-${commons-dbutils.version}.jar %{linkdir}/commons-dbutils.jar + +%files groovy +%{linkdir}/sf-groovy.jar +%{libdir}/sf-groovy-${smartfrog.version}.jar +%{linkdir}/groovy-all-minimal.jar +%{libdir}/groovy-all-minimal-${groovy.version}.jar +%{linkdir}/groovy-engine.jar +%{libdir}/groovy-engine-${groovy-engine.version}.jar + %files hadoop %{linkdir}/sf-hadoop.jar %{libdir}/sf-hadoop-${smartfrog.version}.jar This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2009-09-23 11:27:06
|
Revision: 7879 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7879&view=rev Author: steve_l Date: 2009-09-23 11:26:56 +0000 (Wed, 23 Sep 2009) Log Message: ----------- SFOS-1048 add smartfrog-ec2 RPM 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 2009-09-23 10:54:29 UTC (rev 7878) +++ trunk/core/release/build.xml 2009-09-23 11:26:56 UTC (rev 7879) @@ -488,6 +488,17 @@ <ln artifact="commons-pool" version="${commons-pool.version}"/> <ln artifact="commons-dbutils" version="${commons-dbutils.version}"/> + <!-- EC2 --> + <rpmpackage package="ec2"/> + <ln artifact="sf-ec2" version="${smartfrog.version}"/> + <ln artifact="typica" version="${typica.version}"/> + <ln artifact="org.restlet" version="${restlet.version}"/> + <ln artifact="org.restlet.ext.fileupload" version="${restlet.version}"/> + <ln artifact="com.noelios.restlet" version="${restlet.version}"/> + <ln artifact="com.noelios.restlet.ext.httpclient" version="${restlet.version}"/> + <ln artifact="com.noelios.restlet.ext.net" version="${restlet.version}"/> + <ln artifact="commons-fileupload" version="${commons-fileupload.version}"/> + <!-- groovy --> <rpmpackage package="groovy"/> <ln artifact="sf-groovy" version="${smartfrog.version}"/> Modified: trunk/core/release/izpack/smartfrog-install.xml =================================================================== --- trunk/core/release/izpack/smartfrog-install.xml 2009-09-23 10:54:29 UTC (rev 7878) +++ trunk/core/release/izpack/smartfrog-install.xml 2009-09-23 11:26:56 UTC (rev 7879) @@ -434,7 +434,41 @@ /> </pack> + <pack name="EC2" required="no" preselected="no"> + <description> + Amazon EC2 support. + Contains components for working with S3 files and EC2 instances. + Includes Restlet libraries (CDDL and GPL licensed) + </description> + <file src="ivy/lib/package-ec2/sf-ec2-${smartfrog.version}.jar" + targetdir="$INSTALL_PATH/lib" + /> + <file src="ivy/lib/package-ec2/typica-${typica.version}.jar" + targetdir="$INSTALL_PATH/lib" + /> + <file src="ivy/lib/package-ec2/commons-fileupload-${commons-fileupload.version}.jar" + targetdir="$INSTALL_PATH/lib" + /> + <file src="ivy/lib/package-ec2/org.restlet-${restlet.version}.jar" + targetdir="$INSTALL_PATH/lib" + /> + <file src="ivy/lib/package-ec2/org.restlet.ext.fileupload-${restlet.version}.jar" + targetdir="$INSTALL_PATH/lib" + /> + <file src="ivy/lib/package-ec2/com.noelios.restlet-${restlet.version}.jar" + targetdir="$INSTALL_PATH/lib" + /> + <file src="ivy/lib/package-ec2/com.noelios.restlet.ext.httpclient-${restlet.version}.jar" + targetdir="$INSTALL_PATH/lib" + /> + <file src="ivy/lib/package-ec2/com.noelios.restlet.ext.net-${restlet.version}.jar" + targetdir="$INSTALL_PATH/lib" + /> + <depends packname="Logging"/> + <depends packname="WWW"/> + </pack> + <pack name="Groovy" required="no" preselected="no"> <description> Groovy scripting support Modified: trunk/core/release/metadata/rpm/smartfrog.spec =================================================================== --- trunk/core/release/metadata/rpm/smartfrog.spec 2009-09-23 10:54:29 UTC (rev 7878) +++ trunk/core/release/metadata/rpm/smartfrog.spec 2009-09-23 11:26:56 UTC (rev 7879) @@ -262,6 +262,7 @@ Requires: %{name} = %{version}-%{release} , %{name}-logging , %{name}-www, %{name}-jetty, %{name}-jasper %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 @@ -771,6 +772,25 @@ %{linkdir}/commons-dbutils.jar +%files ec2 +%{linkdir}/sf-ec2.jar +%{libdir}/sf-ec2-${smartfrog.version}.jar +%{linkdir}/typica.jar +%{libdir}/typica-${typica.version}.jar +%{linkdir}/org.restlet.jar +%{libdir}/org.restlet-${restlet.version}.jar +%{linkdir}/org.restlet.ext.fileupload.jar +%{libdir}/org.restlet.ext.fileupload-${restlet.version}.jar +%{linkdir}/com.noelios.restlet.jar +%{libdir}/com.noelios.restlet-${restlet.version}.jar +%{linkdir}/com.noelios.restlet.ext.httpclient.jar +%{libdir}/com.noelios.restlet.ext.httpclient-${restlet.version}.jar +%{linkdir}/com.noelios.restlet.ext.net.jar +%{libdir}/com.noelios.restlet.ext.net-${restlet.version}.jar +%{linkdir}/commons-fileupload.jar +%{libdir}/commons-fileupload-${commons-fileupload.version}.jar + + %files groovy %{linkdir}/sf-groovy.jar %{libdir}/sf-groovy-${smartfrog.version}.jar This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2009-10-20 16:01:16
|
Revision: 7979 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7979&view=rev Author: steve_l Date: 2009-10-20 16:00:19 +0000 (Tue, 20 Oct 2009) Log Message: ----------- SFOS-1335 remove dependencies on portlet-api from RPMs and installer too. 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 2009-10-20 11:08:00 UTC (rev 7978) +++ trunk/core/release/build.xml 2009-10-20 16:00:19 UTC (rev 7979) @@ -483,11 +483,9 @@ <ln artifact="commons-chain" version="${commons-chain.version}"/> <ln artifact="commons-digester" version="${commons-digester.version}"/> <ln artifact="commons-validator" version="${commons-validator.version}"/> - <ln artifact="antlr" version="${antlr.version}"/> <ln artifact="struts-core" version="${struts.version}"/> <ln artifact="struts-taglib" version="${struts.version}"/> <ln artifact="struts-tiles" version="${struts.version}"/> - <ln artifact="portlet-api" version="${portlet-api.version}"/> <!-- csvfiles --> Modified: trunk/core/release/izpack/smartfrog-install.xml =================================================================== --- trunk/core/release/izpack/smartfrog-install.xml 2009-10-20 11:08:00 UTC (rev 7978) +++ trunk/core/release/izpack/smartfrog-install.xml 2009-10-20 16:00:19 UTC (rev 7979) @@ -396,10 +396,6 @@ <file src="ivy/lib/package-cloudfarmer/commons-validator-${commons-validator.version}.jar" targetdir="$INSTALL_PATH/lib"/> - <file src="ivy/lib/package-cloudfarmer/antlr-${antlr.version}.jar" - targetdir="$INSTALL_PATH/lib"/> - <file src="ivy/lib/package-cloudfarmer/portlet-api-${portlet-api.version}.jar" - targetdir="$INSTALL_PATH/lib"/> <file src="ivy/lib/package-cloudfarmer/struts-core-${struts.version}.jar" targetdir="$INSTALL_PATH/lib"/> <file src="ivy/lib/package-cloudfarmer/struts-taglib-${struts.version}.jar" Modified: trunk/core/release/metadata/rpm/smartfrog.spec =================================================================== --- trunk/core/release/metadata/rpm/smartfrog.spec 2009-10-20 11:08:00 UTC (rev 7978) +++ trunk/core/release/metadata/rpm/smartfrog.spec 2009-10-20 16:00:19 UTC (rev 7979) @@ -786,13 +786,7 @@ %{linkdir}/struts-taglib.jar %{libdir}/struts-taglib-${struts.version}.jar %{linkdir}/struts-taglib.jar -%{libdir}/antlr-${antlr.version}.jar -%{linkdir}/antlr.jar -%{libdir}/portlet-api-${portlet-api.version}.jar -%{linkdir}/portlet-api.jar - - %files csvfiles %{libdir}/sf-csvfiles-${smartfrog.version}.jar This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2010-01-22 17:12:02
|
Revision: 8159 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=8159&view=rev Author: steve_l Date: 2010-01-22 17:11:15 +0000 (Fri, 22 Jan 2010) Log Message: ----------- SFOS-1418 Automate rollout of RPMs to mountable Volume Modified Paths: -------------- trunk/core/release/build.xml Added Paths: ----------- trunk/core/release/scripts/auto/ trunk/core/release/scripts/auto/scripts/ trunk/core/release/scripts/auto/scripts/install.sh Modified: trunk/core/release/build.xml =================================================================== --- trunk/core/release/build.xml 2010-01-21 14:40:12 UTC (rev 8158) +++ trunk/core/release/build.xml 2010-01-22 17:11:15 UTC (rev 8159) @@ -405,9 +405,6 @@ </target> <target name="copy-scripts" depends="init-rpm"> - <expandingcopy todir="${rpm.root.dir}"> - <fileset dir="scripts" includes="etc/**/*"/> - </expandingcopy> <property name="profile.d" location="${rpm.root.dir}/etc/profile.d"/> <property name="init.d" location="${rpm.root.dir}/etc/init.d"/> </target> @@ -647,7 +644,7 @@ <target name="copy-and-patch-rpm-scripts" depends="copy-scripts"> <expandingcopy todir="${build.rpm.dir}/root/"> - <fileset dir="scripts" includes="**/*"/> + <fileset dir="scripts" includes="etc/**/*"/> </expandingcopy> </target> @@ -1221,7 +1218,7 @@ </target> - <target name="rpm-upload" depends="rpm-upload-init"> + <target name="rpm-upload-check-files-present" depends="rpm-upload-init"> <fail> <condition> <resourcecount count="0" refid="rpm.upload.fileset"/> @@ -1229,6 +1226,9 @@ There are no RPMs to upload in the directory ${upload.dir} </fail> + </target> + + <target name="rpm-upload" depends="rpm-upload-check-files-present"> <rpmssh command="rm -rf ${rpm.full.ssh.dir}/" failonerror="false"/> <rpmssh command="mkdir -p ${rpm.full.ssh.dir}"/> <property name="rpm.ssh.path" @@ -1552,103 +1552,133 @@ </echo> </target> + <!-- + Autorun deployment currently uses NFS, so is LAN-local only. + --> + <target name="autorun-init" depends="init-rpm" > + <newdir name="build.autorun.dir" location="${build.dir}/autorun"/> + <newdir name="build.autorun.script.dir" location="${build.autorun.dir}/scripts"/> + <!-- dest dir must exist--> + <property name="autorun.remote.user" value="root" /> + <property name="autorun.dest.subdir" value="slo" /> + <property name="autorun.remote.mountpoint" value="/mnt/sfcluster" /> + <property name="autorun.local.mountpoint" value="${autorun.remote.mountpoint}" /> + <property name="autorun.dest.dir" location="${autorun.local.mountpoint}/${autorun.dest.subdir}" /> + <property name="autorun.remote.dir" value="${autorun.local.mountpoint}/${autorun.dest.subdir}" /> + <property name="autorun.auto.dest.dir" location="${autorun.dest.dir}/auto" /> + <property name="autorun.rpm.dest.dir" location="${autorun.dest.dir}/auto/rpms" /> + <property name="autorun.script.dest.dir" location="${autorun.dest.dir}/auto/scripts" /> + + <property name="autorun.remote.dest.dir" value="${autorun.remote.dir}/auto" /> + <property name="autorun.remote.rpm.dir" value="${autorun.remote.dest.dir}/rpms" /> + <property name="autorun.remote.script.dir" value="${autorun.remote.dest.dir}/scripts" /> + <property name="autorun.mount.path" value="/mnt/auto" /> + </target> - <!-- Junit testing against a remote installation --> + <target name="autorun-copy-scripts" + depends="autorun-init"> + <expandingcopy todir="${build.autorun.script.dir}"> + <fileset dir="scripts" includes="auto/scripts/*"/> + </expandingcopy> + </target> + <target name="autorun-copy" depends="autorun-copy-scripts" /> - <target name="init-tests" - description="Run the functional tests against the remote RPM installation. - This does not install the RPMs; they must be already deployed" - depends="ready-to-compile-tests"> - <echo level="verbose"> - system.tests.enabled=${system.tests.enabled} - run.failing.tests=${run.failing.tests} - testcase=${testcase} + <target name="autorun-upload-nfs" depends="autorun-copy-scripts, copy-rpms, check-scp" + description="Copy the (existing) RPM files and the scripts to to the remote install dir"> + <delete dir="${autorun.auto.dest.dir}" /> + <mkdir dir="${autorun.auto.dest.dir}" /> + <copy todir="${autorun.auto.dest.dir}" > + <fileset dir="${build.autorun.dir}" includes="**/*" /> + <fileset dir="${dist.rpm.dir}" includes="*.rpm" /> + </copy> + </target> + + <target name="autorun-check-properties" depends="autorun-init"> + <fail unless="autorun.remote.server">Not defined: autorun.remote.server</fail> + <fail unless="autorun.remote.user">Not defined: autorun.remote.user</fail> + <fail unless="autorun.remote.password">Not defined: autorun.remote.password</fail> + <fail unless="autorun.mount.volume">Not defined: autorun.mount.volume + This is the volume name like /dev/something/vol-1</fail> + <fail unless="autorun.mount.command">Not defined: autorun.mount.command + This is the platform-specific command to mount a volume as a device (not the unix mount) + </fail> + <echo> + autorun.remote.dest.dir=${autorun.remote.dest.dir} + autorun.remote.rpm.dir=${autorun.remote.rpm.dir} + autorun.remote.script.dir=${autorun.remote.script.dir} + </echo> - <property name="services" value="org/smartfrog/services/"/> - <property name="unittests" value="org/smartfrog/test/unit/"/> - <property name="systemtests" value="org/smartfrog/test/system/"/> - <property name="processtests" value="org/smartfrog/test/process/"/> - <property name="componenttests" value="${systemtests}components/"/> - <patternset id="teststhatfail"> - <!--SFOS-403--> - <!--<exclude name="${systemtests}/workflow/conditional/FailingConditionTest.*" - unless="run.failing.tests"/>--> - <!-- SFOS-154; test failing on VMWare and CruiseControl (sometimes). Possible race condition--> - <exclude name="${systemtests}/workflow/parallel/ParallelAsyncTest.*" - unless="run.failing.tests"/> - <!--SFOS-202 test case tcn1 is being skipped (failing) --> - <exclude name="${systemtests}/deploy/DeployTCN1Test.*" - unless="run.failing.tests"/> - <!-- SFOS-563 Constant tests are failing --> - <exclude name="${systemtests}/reference/constant/ConstantReferenceTest.*" - unless="run.failing.tests"/> + </target> + + <target name="autorun.macros" depends="autorun-check-properties"> + <presetdef name="autorun.ssh"> + <sshexec host="${autorun.remote.server}" + username="${autorun.remote.user}" + password="${autorun.remote.password}" + trust="${rpm.ssh.trust}" + timeout="${ssh.command.timeout}" + /> + </presetdef> + <presetdef name="autorun.scp"> + <scp + username="${autorun.remote.user}" + password="${autorun.remote.password}" + trust="${rpm.ssh.trust}" + verbose="${rpm.ssh.verbose}"> + </scp> + </presetdef> + </target> + + <target name="autorun-remote-install" depends="autorun-copy" + description="ssh to the autorun.remote.server and have it prepare the volume"> + </target> - <!-- SFOS-890 Chmod "failing" tests are failing and marked as skipped --> - <exclude name="${systemtests}/filesystem/ChmodFailureTest.*" - unless="run.failing.tests"/> - <exclude name="${systemtests}/filesystem/ChmodTest.*" - unless="run.failing.tests"/> + <target name="autorun-upload-scripts" depends="autorun-ready-to-upload"> + <autorun.ssh command="mkdir -p ${autorun.remote.script.dir}"/> + <property name="autorun.script.path" + value="${autorun.remote.user}@${autorun.remote.server}:${autorun.remote.script.dir}/"/> + <autorun.scp remoteToDir="${autorun.script.path}"> + <fileset dir="${build.autorun.script.dir}/auto/scripts" includes="*"/> + </autorun.scp> + </target> - <!-- SFOS-886 DetachingCompoundTest is failing and being skipped--> - <exclude name="${systemtests}/**/DetachingCompoundTest.*" - unless="run.failing.tests"/> + <target name="autorun-upload-rpm" depends="autorun-ready-to-upload"> + <autorun.ssh command="rm -rf ${autorun.remote.rpm.dir}/" failonerror="false"/> + <autorun.ssh command="mkdir -p ${autorun.rpm.dest.dir}"/> + <property name="autorun.rpm.path" + value="${autorun.remote.user}@${autorun.remote.server}:${autorun.remote.rpm.dir}/"/> + <autorun.scp remoteToDir="${autorun.rpm.path}"> + <fileset refid="rpm.upload.fileset"/> + </autorun.scp> + </target> - <!-- SFOS-761 TestCompound doesnt terminate correctly in all circumstances when the action terminates normally (as expected) --> - <exclude name="${systemtests}/workflow/thread/WorkflowThreadTest.*" - unless="run.failing.tests"/> + <target name="autorun-ready-to-upload" depends="autorun-check-properties,autorun.macros,rpm-upload-init,autorun-copy"/> + + <target name="autorun-upload" depends="autorun-upload-scripts, autorun-upload-rpm"/> + + <target name="autorun-install" depends="autorun-upload" > + <!-- make a volume accessible --> + <autorun.ssh command="${autorun.mount.command} ${autorun.mount.volume}" /> + <autorun.ssh command="mount" /> + <autorun.ssh command="mount ${autorun.mount.volume} ${autorun.mount.path}" /> + <autorun.ssh command="mount" /> + <autorun.ssh command="rm -rf ${autorun.mount.path}/rpms/*.rpm" /> + <autorun.ssh command="rm -rf ${autorun.mount.path}/scripts/*.sh" /> + <autorun.ssh command="cp -r ${autorun.remote.dest.dir}/* ${autorun.mount.path}" /> + <autorun.ssh command="chmod a+rx ${autorun.mount.path}/scripts/*.sh" /> + <autorun.ssh command="ls ${autorun.mount.path}/rpms" /> + <autorun.ssh command="ls -l ${autorun.mount.path}/scripts" /> + <autorun.ssh command="cat ${autorun.mount.path}/scripts/install.sh" /> + <autorun.ssh command="umount ${autorun.mount.path}" /> + </target> - - <!-- SFOS-565 cyclic reference test tcn19.sf is now spinning instead of detecting a cyclic reference - (this is a JRockit problem) - --> - <exclude name="${systemtests}/reference/CyclicReferenceTest.*" - unless="run.failing.tests"/> - </patternset> - + <target name="autorun-umount" depends="autorun-ready-to-upload" + description="Unmount the volume"> + <!-- make a volume accessible --> + <autorun.ssh command="mount" /> + <autorun.ssh command="umount ${autorun.mount.path}" /> + <autorun.ssh command="mount" /> </target> - - <!-- refactoring of test run process--> - <target name="init-system-test-run" depends="init-tests,declare-system-test-tasks"> - <pathconvert pathsep="${line.separator}| |-- " - property="echo.testharness.daemon.classpath" - refid="testharness.daemon.classpath"> - </pathconvert> - <echo message=" --------------------------------------------------------"/> - <echo message=" Class Path= ${line.separator}| |-- ${echo.testharness.daemon.classpath}"/> - <echo message=" --------------------------------------------------------"/> - - <presetdef name="junit-remote-test-run"> - - <sf-junit - errorProperty="system.test.failed" - failureProperty="system.test.failed" - > - <syspropertyset> - <propertyref prefix="runtime"/> - </syspropertyset> - <syspropertyset> - <propertyref prefix="test."/> - </syspropertyset> - <classpath refid="testharness.daemon.classpath"/> - <!-- #Test case isolation technique --> - <test todir="${test.data.dir}" name="${testcase}" if="testcase"/> - <batchtest todir="${test.data.dir}" unless="testcase"> - <!-- bulk test case --> - <fileset dir="${test.classes.dir}"> - <!-- pull in everything --> - <include name="org/smartfrog/test/system/**/*Test.class"/> - - <!-- failing tests excluded unless run.failing.tests is set --> - <patternset refid="teststhatfail"/> - - <exclude name="${componenttests}utils/**/*Test.class" - unless="installer.present"/> - - </fileset> - </batchtest> - </sf-junit> - </presetdef> - </target> </project> \ No newline at end of file Added: trunk/core/release/scripts/auto/scripts/install.sh =================================================================== --- trunk/core/release/scripts/auto/scripts/install.sh (rev 0) +++ trunk/core/release/scripts/auto/scripts/install.sh 2010-01-22 17:11:15 UTC (rev 8159) @@ -0,0 +1,51 @@ +#!/bin/bash + +# This is an autorun script to install RPMs on newly instantiated VMs. +# After installing the RPMs, it will start SmartFrog. + +#(C) Copyright 2009 Hewlett-Packard Development Company, LP +# +# Disclaimer of Warranty +# +# The Software is provided "AS IS," without a warranty of any kind. ALL +# EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, +# INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A +# PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE HEREBY +# EXCLUDED. SmartFrog is not a Hewlett-Packard Product. The Software has +# not undergone complete testing and may contain errors and defects. It +# may not function properly and is subject to change or withdrawal at +# any time. The user must assume the entire risk of using the +# Software. No support or maintenance is provided with the Software by +# Hewlett-Packard. Do not install the Software if you are not accustomed +# to using experimental software. +# +# Limitation of Liability +# +# TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL HEWLETT-PACKARD +# OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR +# FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, +# HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF +# OR RELATED TO THE FURNISHING, PERFORMANCE, OR USE OF THE SOFTWARE, OR +# THE INABILITY TO USE THE SOFTWARE, EVEN IF HEWLETT-PACKARD HAS BEEN +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. FURTHERMORE, SINCE THE +# SOFTWARE IS PROVIDED WITHOUT CHARGE, YOU AGREE THAT THERE HAS BEEN NO +# BARGAIN MADE FOR ANY ASSUMPTIONS OF LIABILITY OR DAMAGES BY +# HEWLETT-PACKARD FOR ANY REASON WHATSOEVER, RELATING TO THE SOFTWARE OR +# ITS MEDIA, AND YOU HEREBY WAIVE ANY CLAIM IN THIS REGARD. + +# This script is copied with property expansion at build time, which can be +# used to force in dynamic values. Because of this, use $ and braced {} strings +# carefully + +rpmdir=/auto/rpms +initd=/etc/init.d + +cd $rpmdir +rpm --upgrade --force *.rpm >/tmp/install_rpms 2>&1 +cd $initd +$initd/smartfrogd start >/tmp/install_smartfrog 2>&1 + + + + + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2010-02-01 16:40:21
|
Revision: 8175 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=8175&view=rev Author: steve_l Date: 2010-02-01 16:40:15 +0000 (Mon, 01 Feb 2010) Log Message: ----------- SFOS-1425 create separate jdom and restlet components Modified Paths: -------------- trunk/core/release/build.xml trunk/core/release/ivy.xml trunk/core/release/metadata/rpm/smartfrog.spec Modified: trunk/core/release/build.xml =================================================================== --- trunk/core/release/build.xml 2010-02-01 16:38:55 UTC (rev 8174) +++ trunk/core/release/build.xml 2010-02-01 16:40:15 UTC (rev 8175) @@ -530,6 +530,11 @@ <ln artifact="mx4j-jmx" version="${mx4j.version}"/> <ln artifact="mx4j-tools" version="${mx4j.version}"/> + <!-- json--> + <rpmpackage package="json"/> + <ln artifact="sf-json" version="${smartfrog.version}"/> + <ln artifact="json-lib" version="${json-lib.version}"/> + <!--logging--> <rpmpackage package="logging"/> <ln artifact="sf-loggingservices" version="${smartfrog.version}"/> Modified: trunk/core/release/ivy.xml =================================================================== --- trunk/core/release/ivy.xml 2010-02-01 16:38:55 UTC (rev 8174) +++ trunk/core/release/ivy.xml 2010-02-01 16:40:15 UTC (rev 8175) @@ -31,7 +31,7 @@ <!-- <conf name="izpack" visibility="private" description="izpack libraries"/>--> <conf name="package-all" description="all the packages in one big dependency" - extends="package-core,package-examples,package-ant,package-anubis,package-csvfiles,package-database,package-jmx,package-hadoop,package-logging,package-networking,package-quartz,package-rpmtools,package-scripting,package-testing,package-velocity,package-www,package-xml,package-xmpp,package-restlet"/> + extends="package-core,package-examples,package-ant,package-anubis,package-csvfiles,package-database,package-jmx,package-hadoop,package-logging,package-networking,package-quartz,package-rpmtools,package-scripting,package-testing,package-velocity,package-www,package-xml,package-xmpp,package-restlet,package-json"/> <!-- From here on, every Package we bundle in Ivy contains its own configuration --> <conf name="package-core-install" description="The .zip file containing the complete base distribution of SmartFrog"/> @@ -64,6 +64,8 @@ description="hadoop components"/> <conf name="package-jmx" description="jmx components"/> + <conf name="package-json" + description="json components"/> <conf name="package-logging" description="logging components"/> <conf name="package-networking" @@ -215,6 +217,13 @@ rev="${ivy.smartfrog.version}" conf="package-jmx->master,redist,documentation"/> + <!--JSON --> + <dependency org="org.smartfrog" + name="sf-json" + changing="true" + rev="${ivy.smartfrog.version}" + conf="package-json->master,redist,documentation"/> + <!--logging--> <dependency org="org.smartfrog" name="sf-loggingservices" Modified: trunk/core/release/metadata/rpm/smartfrog.spec =================================================================== --- trunk/core/release/metadata/rpm/smartfrog.spec 2010-02-01 16:38:55 UTC (rev 8174) +++ trunk/core/release/metadata/rpm/smartfrog.spec 2010-02-01 16:40:15 UTC (rev 8175) @@ -321,7 +321,16 @@ mx4j-tools-${mx4j.version}.jar +# ----------------------------------------------------------------------------- +%package json +Group: ${rpm.framework} +Summary: JUnit testing +Requires: %{name} = %{version}-%{release} +# +%description json +This contains the components for working with JSON files + # ----------------------------------------------------------------------------- %package logging @@ -427,6 +436,7 @@ This contains the components for running JUnit ${junit.version} tests, and the junit-${junit.version}.jar. Prerequisite packages: xunit, Logging. + # ----------------------------------------------------------------------------- %package velocity @@ -893,7 +903,13 @@ %{linkdir}/mx4j-jmx.jar %{linkdir}/mx4j-tools.jar +%files json +%{libdir}/sf-json-${smartfrog.version}.jar +%{libdir}/json-lib-${json-lib.version}.jar +%{linkdir}/sf-json.jar +%{linkdir}/json-lib.jar + %files logging %{libdir}/sf-loggingservices-${smartfrog.version}.jar This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2010-02-04 14:08:16
|
Revision: 8180 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=8180&view=rev Author: steve_l Date: 2010-02-04 14:08:09 +0000 (Thu, 04 Feb 2010) Log Message: ----------- SFOS-1430 automount setup script to allow /etc/sysconfig/smartfrog to be overwritten Modified Paths: -------------- trunk/core/release/build.xml trunk/core/release/scripts/auto/scripts/install.sh Modified: trunk/core/release/build.xml =================================================================== --- trunk/core/release/build.xml 2010-02-03 17:01:06 UTC (rev 8179) +++ trunk/core/release/build.xml 2010-02-04 14:08:09 UTC (rev 8180) @@ -653,9 +653,18 @@ <target name="copy-and-patch-rpm-scripts" depends="copy-scripts"> + <property name="rpm.scripts.dir" location="scripts" /> <expandingcopy todir="${build.rpm.dir}/root/"> - <fileset dir="scripts" includes="etc/**/*"/> + <fileset dir="${rpm.scripts.dir}" includes="etc/rc.d/**/*"/> + <fileset dir="${rpm.scripts.dir}" includes="etc/profile.d/**/*"/> </expandingcopy> + + <!--copy the sysconfig file with an override point allowed--> + <property name="sysconfig.path" value="etc/sysconfig/smartfrog"/> + <property name="sysconfig.file" location="${rpm.scripts.dir}/${sysconfig.path}"/> + <expandingcopy tofile="${build.rpm.dir}/root/${sysconfig.path}" + file="${sysconfig.file}"/> + </target> <target name="prepare-other-root-dirs" depends="create-link-dir,symlink-signed-lib,create-link-dir,copy-and-patch-rpm-scripts,rpm-components"> Modified: trunk/core/release/scripts/auto/scripts/install.sh =================================================================== --- trunk/core/release/scripts/auto/scripts/install.sh 2010-02-03 17:01:06 UTC (rev 8179) +++ trunk/core/release/scripts/auto/scripts/install.sh 2010-02-04 14:08:09 UTC (rev 8180) @@ -40,12 +40,23 @@ rpmdir=/auto/rpms initd=/etc/init.d +# First install all the RPMs cd $rpmdir -rpm --upgrade --force *.rpm >/tmp/install_rpms 2>&1 +rpm --upgrade --force *.rpm >/tmp/install_rpms 2>&1 + +#Now support an optional sysconfig script to set up the env variables +if [ -f sysconfig ]; then + cp sysconfig /etc/sysconfig/smartfrog +fi + + +# run the script cd $initd -$initd/smartfrogd start >/tmp/install_smartfrog 2>&1 +$initd/smartfrogd start >/tmp/install_smartfrog 2>&1 + + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2010-02-12 14:31:04
|
Revision: 8194 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=8194&view=rev Author: steve_l Date: 2010-02-12 14:30:54 +0000 (Fri, 12 Feb 2010) Log Message: ----------- SFOS-1438 json-lib depends on other things that the RPM doesn't expect Modified Paths: -------------- trunk/core/release/build.xml trunk/core/release/metadata/rpm/smartfrog.spec Modified: trunk/core/release/build.xml =================================================================== --- trunk/core/release/build.xml 2010-02-12 14:29:44 UTC (rev 8193) +++ trunk/core/release/build.xml 2010-02-12 14:30:54 UTC (rev 8194) @@ -534,7 +534,10 @@ <rpmpackage package="json"/> <ln artifact="sf-json" version="${smartfrog.version}"/> <ln artifact="json-lib" version="${json-lib.version}"/> - + <ln artifact="commons-collections" version="${commons-collections.version}"/> + <ln artifact="commons-lang" version="${commons-lang.version}"/> + <ln artifact="ezmorph" version="${ezmorph.version}"/> + <!--logging--> <rpmpackage package="logging"/> <ln artifact="sf-loggingservices" version="${smartfrog.version}"/> @@ -593,8 +596,6 @@ <ln artifact="sf-velocity" version="${smartfrog.version}"/> <ln artifact="velocity" version="${velocity.version}"/> <ln artifact="velocity-dep" version="${velocity.version}"/> - <ln artifact="commons-collections" version="${commons-collections.version}"/> - <ln artifact="commons-lang" version="${commons-lang.version}"/> <!-- WWW --> <rpmpackage package="www"/> @@ -1701,4 +1702,4 @@ <autorun.ssh command="mount" /> </target> -</project> \ No newline at end of file +</project> Modified: trunk/core/release/metadata/rpm/smartfrog.spec =================================================================== --- trunk/core/release/metadata/rpm/smartfrog.spec 2010-02-12 14:29:44 UTC (rev 8193) +++ trunk/core/release/metadata/rpm/smartfrog.spec 2010-02-12 14:30:54 UTC (rev 8194) @@ -926,6 +926,8 @@ %{linkdir}/commons-collections.jar %{libdir}/commons-lang-${commons-lang.version}.jar %{linkdir}/commons-lang.jar +%{libdir}/ezmorph-${ezmorph.version}.jar +%{linkdir}/ezmorph.jar # ----------------------------------------------------------------------------- %files logging This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2010-02-18 16:07:00
|
Revision: 8209 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=8209&view=rev Author: steve_l Date: 2010-02-18 16:06:10 +0000 (Thu, 18 Feb 2010) Log Message: ----------- SFOS-1445 Release 3.16.008 Modified Paths: -------------- trunk/core/release/build.xml trunk/core/release/doc/creating_release_artifacts.odt Removed Paths: ------------- trunk/core/release/doc/creating_release_artifacts.sxw Modified: trunk/core/release/build.xml =================================================================== --- trunk/core/release/build.xml 2010-02-18 14:54:55 UTC (rev 8208) +++ trunk/core/release/build.xml 2010-02-18 16:06:10 UTC (rev 8209) @@ -1056,7 +1056,8 @@ <target name="ssh.live" depends="ssh-test"> </target> - <target name="scp-upload" depends="upload-init" if="ssh.enabled"> + <target name="scp-upload" depends="upload-init" if="ssh.enabled" + description="Upload the artifacts to a destination SSH server and directory, and make world readable"> <ssh-remote command="mkdir -p ${ssh.dir}"/> <property name="ssh.path" @@ -1073,7 +1074,8 @@ <ssh-remote failonerror="false" command="chmod a+r ${ssh.dir}/*.gz"/> </target> - <target name="ftp-upload" depends="upload-init" if="ftp.enabled"> + <target name="ftp-upload" depends="upload-init" if="ftp.enabled" + description="Upload the artifacts to an FTP server"> <echo>FTP target is ${ftp.server}</echo> <ftp server="${ftp.server}" userid="${ftp.user}" @@ -1091,7 +1093,8 @@ </target> - <target name="sftp-upload" depends="upload-init" if="sftp.enabled"> + <target name="sftp-upload" depends="upload-init" if="sftp.enabled" + description="Upload the artifacts to a secure sftp server"> <property name="sftp.server" value="frs.sourceforge.net"/> <property name="sftp.user" value="${ssh.user}"/> <property name="sftp.group" value="smartfrog"/> @@ -1102,6 +1105,11 @@ <property name="sftp.path" value="${sftp.user}@${sftp.server}:${sftp.dir}"/> <echo>SFTP target is ${sftp.server}</echo> + <echo level="verbose"> + echo uploading to "${sftp.path}" + files + ${toString:upload.fileset} + </echo> <scp remoteToDir="${sftp.path}" sftp="true" password="${sftp.password}" Modified: trunk/core/release/doc/creating_release_artifacts.odt =================================================================== (Binary files differ) Deleted: trunk/core/release/doc/creating_release_artifacts.sxw =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2010-04-21 15:45:52
|
Revision: 8264 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=8264&view=rev Author: steve_l Date: 2010-04-21 15:45:46 +0000 (Wed, 21 Apr 2010) Log Message: ----------- SFOS-1130 Prototype JAX-RS front-end for a long-haul API and client to go with. This adds the jersey RPM Modified Paths: -------------- trunk/core/release/build.xml trunk/core/release/ivy.xml trunk/core/release/metadata/rpm/smartfrog.spec Modified: trunk/core/release/build.xml =================================================================== --- trunk/core/release/build.xml 2010-04-21 15:43:06 UTC (rev 8263) +++ trunk/core/release/build.xml 2010-04-21 15:45:46 UTC (rev 8264) @@ -527,6 +527,12 @@ <ln artifact="paranamer" version="${paranamer.version}"/> <ln artifact="xmlenc" version="${xmlenc.version}"/> + <!-- jersey --> + <rpmpackage package="jersey"/> + <ln artifact="sf-jersey" version="${smartfrog.version}"/> + <ln artifact="jersey-core" version="${jersey.version}"/> + <ln artifact="jsr311-api" version="${jsr311-api.version}"/> + <!-- jmx --> <rpmpackage package="jmx"/> <ln artifact="sf-jmx" version="${smartfrog.version}"/> @@ -884,6 +890,7 @@ <include name="sf-emailer/${smartfrog.version}/*"/> <include name="sf-groovy/${smartfrog.version}/*"/> <include name="sf-hadoop/${smartfrog.version}/*"/> + <include name="sf-jersey/${smartfrog.version}/*"/> <include name="sf-jmx/${smartfrog.version}/*"/> <include name="sf-loggingservices/${smartfrog.version}/*"/> <include name="sf-net/${smartfrog.version}/*"/> @@ -1222,7 +1229,7 @@ <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-groovy"/> <property name="rpms.www.list" - value="smartfrog-www smartfrog-jetty smartfrog-xunit "/> + value="smartfrog-www smartfrog-jetty smartfrog-xunit smartfrog-jersey"/> <property name="rpms.testing.list" value="smartfrog-junit "/> Modified: trunk/core/release/ivy.xml =================================================================== --- trunk/core/release/ivy.xml 2010-04-21 15:43:06 UTC (rev 8263) +++ trunk/core/release/ivy.xml 2010-04-21 15:45:46 UTC (rev 8264) @@ -64,6 +64,8 @@ description="hadoop components"/> <conf name="package-jmx" description="jmx components"/> + <conf name="package-jersey" + description="jersey components"/> <conf name="package-json" description="json components"/> <conf name="package-logging" @@ -217,6 +219,14 @@ rev="${ivy.smartfrog.version}" conf="package-jmx->master,redist,documentation"/> + + <!--Jersey --> + <dependency org="org.smartfrog" + name="sf-jersey" + changing="true" + rev="${ivy.smartfrog.version}" + conf="package-jersey->master,redist,documentation"/> + <!--JSON --> <dependency org="org.smartfrog" name="sf-json" Modified: trunk/core/release/metadata/rpm/smartfrog.spec =================================================================== --- trunk/core/release/metadata/rpm/smartfrog.spec 2010-04-21 15:43:06 UTC (rev 8263) +++ trunk/core/release/metadata/rpm/smartfrog.spec 2010-04-21 15:45:46 UTC (rev 8264) @@ -289,7 +289,17 @@ #This includes all the artifacts needed to host JSP pages under a SmartFrog-hosted #application server, such as Jetty. +# ----------------------------------------------------------------------------- +%package jersey +Group: ${rpm.framework} +Summary: Jersey JAX-WS-Support integration +Requires: %{name} = %{version}-%{release} + +%description jersey +This contains the artifacts needed to deploy the Jersey ${jersey.version} version of +the JAX-WS-RS API. + # ----------------------------------------------------------------------------- %package jetty @@ -903,7 +913,16 @@ %{libdir}/core-${org.eclipse.jdt.core.version}.jar %{linkdir}/core.jar +# ----------------------------------------------------------------------------- +%files jersey +%{libdir}/sf-jersey-${smartfrog.version}.jar +%{libdir}/jersey-core-${jersey.version}.jar +%{libdir}/jsr311-api-${jsr311-api.version}.jar +%{linkdir}/sf-jersey.jar +%{linkdir}/jersey-core.jar +%{linkdir}/jsr311-api.jar + # ----------------------------------------------------------------------------- %files jmx This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2010-12-03 11:51:40
|
Revision: 8431 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=8431&view=rev Author: steve_l Date: 2010-12-03 11:51:34 +0000 (Fri, 03 Dec 2010) Log Message: ----------- SFOS-1544 SFOS-1513 add sf-testharness to the redistributables Modified Paths: -------------- 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/release/build.xml =================================================================== --- trunk/core/release/build.xml 2010-11-02 17:06:55 UTC (rev 8430) +++ trunk/core/release/build.xml 2010-12-03 11:51:34 UTC (rev 8431) @@ -608,6 +608,7 @@ <rpmpackage package="testing"/> <ln artifact="sf-xunit" version="${smartfrog.version}"/> <ln artifact="sf-junit" version="${smartfrog.version}"/> + <ln artifact="sf-testharness" version="${smartfrog.version}"/> <ln artifact="junit" version="${junit.version}"/> <!--velocity--> Modified: trunk/core/release/ivy.xml =================================================================== --- trunk/core/release/ivy.xml 2010-11-02 17:06:55 UTC (rev 8430) +++ trunk/core/release/ivy.xml 2010-12-03 11:51:34 UTC (rev 8431) @@ -5,7 +5,7 @@ <license name="LGPL"/> <ivyauthor name="Hewlett-Packard" url="http://www.smartfrog.org"/> <description> - Rerelease the artifacts + Release the artifacts Created 23-Nov-2006 by slo </description> </info> @@ -123,14 +123,14 @@ conf="redist->redist;package-core->master,documentation;build->default"/> - <!-- the testharness. This is not redistributed, it is used to test the RPMs--> + <!-- the testharness. --> <dependency org="org.smartfrog" name="sf-testharness" changing="true" rev="latest.integration" - conf="test->default,testjar"/> - + conf="test->default,testjar;package-testing,package-testharness->master"/> + <!-- the ant build, which contains the zipped/tarred directory tree--> <dependency org="org.smartfrog" @@ -353,11 +353,6 @@ rev="${ivy.smartfrog.version}" conf="package-xmpp->master,redist,documentation"/> - <dependency org="org.smartfrog" - name="sf-testharness" - changing="true" - rev="${ivy.smartfrog.version}" - conf="package-testharness->master"/> <!-- <dependency org="izpack" Modified: trunk/core/release/izpack/smartfrog-install.xml =================================================================== --- trunk/core/release/izpack/smartfrog-install.xml 2010-11-02 17:06:55 UTC (rev 8430) +++ trunk/core/release/izpack/smartfrog-install.xml 2010-12-03 11:51:34 UTC (rev 8431) @@ -273,6 +273,9 @@ <file src="ivy/lib/package-core/sf-core-install-${smartfrog.version}.zip" targetdir="$INSTALL_PATH" unpack="true"/> + <file src="ivy/lib/package-core/sf-tasks-${smartfrog.version}.jar" + targetdir="$INSTALL_PATH/lib" + /> <!--these are all the executables that should be marked as +x in unix. --> <executable stage="never" targetfile="$INSTALL_PATH/bin/setSFDefaultProperties" failure="warn"/> <executable stage="never" targetfile="$INSTALL_PATH/bin/setSFSecurityProperties" failure="warn"/> @@ -379,7 +382,6 @@ targetdir="$INSTALL_PATH" unpack="true"/> </pack> - <pack name="CloudFarmer" required="no" preselected="no"> <description> The cloudfarmer package contains components and client code to assist in @@ -411,7 +413,6 @@ <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 @@ -906,9 +907,13 @@ <pack name="JUnit" required="no" preselected="no"> <description> This contains the components for running JUnit ${junit.version} tests, and the - junit-${junit.version}.jar. + junit-${junit.version}.jar. It also includes the sf-testharness JAR containing + the JUnit classes that SmartFrog uses to test itself. Prerequisite packages: xunit, Logging. </description> + <file src="ivy/lib/package-testing/sf-testharness-${smartfrog.version}.jar" + targetdir="$INSTALL_PATH/lib" + /> <file src="ivy/lib/package-testing/sf-junit-${smartfrog.version}.jar" targetdir="$INSTALL_PATH/lib" /> Modified: trunk/core/release/metadata/rpm/smartfrog.spec =================================================================== --- trunk/core/release/metadata/rpm/smartfrog.spec 2010-11-02 17:06:55 UTC (rev 8430) +++ trunk/core/release/metadata/rpm/smartfrog.spec 2010-12-03 11:51:34 UTC (rev 8431) @@ -450,7 +450,9 @@ # %description junit This contains the components for running JUnit ${junit.version} tests, and the -junit-${junit.version}.jar. +junit-${junit.version}.jar. It also includes the /sf-testharness.jar for testing +SmartFrog deployments from inside JUnit tests. + Prerequisite packages: xunit, logging. # ----------------------------------------------------------------------------- @@ -1052,10 +1054,12 @@ # ----------------------------------------------------------------------------- %files xunit + %{libdir}/sf-xunit-${smartfrog.version}.jar - %{linkdir}/sf-xunit.jar + + # ----------------------------------------------------------------------------- %files junit %{libdir}/sf-junit-${smartfrog.version}.jar @@ -1064,6 +1068,8 @@ %{linkdir}/sf-junit.jar %{linkdir}/junit.jar +%{libdir}/sf-testharness-${smartfrog.version}.jar +%{linkdir}/sf-testharness.jar # ----------------------------------------------------------------------------- %files velocity This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2010-12-06 15:59:12
|
Revision: 8439 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=8439&view=rev Author: steve_l Date: 2010-12-06 15:59:06 +0000 (Mon, 06 Dec 2010) Log Message: ----------- SFOS-1547 move sf-net to commons-net 2.2 -and purge all oro references in the release process 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 2010-12-06 12:43:53 UTC (rev 8438) +++ trunk/core/release/build.xml 2010-12-06 15:59:06 UTC (rev 8439) @@ -85,6 +85,7 @@ </target> <target name="release" depends="published"/> + <target name="published" depends="ivy-report,common.published"/> <!-- @@ -576,7 +577,6 @@ <ln artifact="mail" version="${mail.version}"/> <ln artifact="activation" version="${activation.version}"/> <ln artifact="commons-net" version="${commons-net.version}"/> - <ln artifact="oro" version="${oro.version}"/> <ln artifact="jsch" version="${jsch.version}"/> <!-- quartz --> Modified: trunk/core/release/izpack/smartfrog-install.xml =================================================================== --- trunk/core/release/izpack/smartfrog-install.xml 2010-12-06 12:43:53 UTC (rev 8438) +++ trunk/core/release/izpack/smartfrog-install.xml 2010-12-06 15:59:06 UTC (rev 8439) @@ -732,7 +732,6 @@ dnsjava-${dnsjava.version}.jar jsch-${jsch.version}.jar mail-${mail.version}.jar - oro-${oro.version}.jar </description> <description>SmartFrog Networking services</description> @@ -762,9 +761,6 @@ <file src="ivy/lib/package-networking/commons-net-${commons-net.version}.jar" targetdir="$INSTALL_PATH/lib" /> - <file src="ivy/lib/package-networking/oro-${oro.version}.jar" - targetdir="$INSTALL_PATH/lib" - /> <file src="ivy/lib/package-networking/sf-emailer-${smartfrog.version}.jar" targetdir="$INSTALL_PATH/lib" Modified: trunk/core/release/metadata/rpm/smartfrog.spec =================================================================== --- trunk/core/release/metadata/rpm/smartfrog.spec 2010-12-06 12:43:53 UTC (rev 8438) +++ trunk/core/release/metadata/rpm/smartfrog.spec 2010-12-06 15:59:06 UTC (rev 8439) @@ -376,7 +376,6 @@ dnsjava-${dnsjava.version}.jar jsch-${jsch.version}.jar mail-${mail.version}.jar -oro-${oro.version}.jar # ----------------------------------------------------------------------------- @@ -997,7 +996,6 @@ %{libdir}/mail-${mail.version}.jar %{libdir}/activation-${activation.version}.jar %{libdir}/commons-net-${commons-net.version}.jar -%{libdir}/oro-${oro.version}.jar %{libdir}/jsch-${jsch.version}.jar @@ -1009,7 +1007,6 @@ %{linkdir}/mail.jar %{linkdir}/activation.jar %{linkdir}/commons-net.jar -%{linkdir}/oro.jar %{linkdir}/jsch.jar # ----------------------------------------------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
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. |
From: <st...@us...> - 2011-02-03 16:18:02
|
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. |
From: <st...@us...> - 2011-09-29 15:33:29
|
Revision: 8755 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=8755&view=rev Author: steve_l Date: 2011-09-29 15:33:21 +0000 (Thu, 29 Sep 2011) Log Message: ----------- SFOS-1665 release 3.18.012 Modified Paths: -------------- trunk/core/release/build.xml trunk/core/release/doc/announcements/release-template.html trunk/core/release/doc/announcements/release-template.txt Added Paths: ----------- trunk/core/release/doc/announcements/release_3.18.012.html trunk/core/release/doc/announcements/release_3.18.012.txt Modified: trunk/core/release/build.xml =================================================================== --- trunk/core/release/build.xml 2011-09-29 14:13:27 UTC (rev 8754) +++ trunk/core/release/build.xml 2011-09-29 15:33:21 UTC (rev 8755) @@ -1167,19 +1167,35 @@ Pass = "${sftp.password}" Upload source dir = ${upload.dir} </echo> + <presetdef name="sftp"> + <scp + sftp="true" + password="${sftp.password}" + trust="${ssh.trust}" + verbose="${sftp.verbose}"> + </scp> + </presetdef> </target> <target name="sftp-upload" depends="sftp-ready-to-upload" if="sftp.enabled" description="Upload the artifacts to a secure sftp server"> - <scp remoteToDir="${sftp.path}" - sftp="true" - password="${sftp.password}" - trust="${ssh.trust}" - verbose="${sftp.verbose}"> + <sftp remoteToDir="${sftp.path}"> <fileset refid="upload.fileset"/> - </scp> + </sftp> </target> + <target name="upload-release-notes" depends="sftp-ready-to-upload, release-notes-setup" if="sftp.enabled" + description="Upload the release notes to a secure sftp server"> + <property name="README.TXT" location="${dist.dir}/readme.txt" /> + <copy file="${target.announcement}" tofile="${README.TXT}" /> + <property name="README.HTML" location="${dist.dir}/readme.html"/> + <copy file="${target.announcement.html}" tofile="${README.HTML}"/> + <sftp remoteToDir="${sftp.path}" + file="${README.TXT}" /> + <sftp remoteToDir="${sftp.path}" + file="${README.HTML}"/> + </target> + <target name="can-upload" depends="load-server-settings,check-scp"/> @@ -1620,7 +1636,15 @@ <!-- Create the release notes for this release --> - <target name="create-release-notes" depends="svn-revision-check" + <target name="release-notes-setup" depends="init"> + <property name="announcements.dir" location="doc/announcements"/> + <property name="target.announcement" + location="${announcements.dir}/release_${smartfrog.version}.txt"/> + <property name="target.announcement.html" + location="${announcements.dir}/release_${smartfrog.version}.html"/> + </target> + + <target name="create-release-notes" depends="svn-revision-check, release-notes-setup" description=" Create the release notes for this release. Requires: @@ -1628,12 +1652,6 @@ * smartfrog.version set for the release version " > - <property name="announcements.dir" location="doc/announcements"/> - <property name="target.announcement" - location="${announcements.dir}/release_${smartfrog.version}.txt"/> - <property name="target.announcement.html" - location="${announcements.dir}/release_${smartfrog.version}.html"/> - <expandingcopy tofile="${target.announcement}"> <fileset file="${announcements.dir}/release-template.txt"/> </expandingcopy> Modified: trunk/core/release/doc/announcements/release-template.html =================================================================== --- trunk/core/release/doc/announcements/release-template.html 2011-09-29 14:13:27 UTC (rev 8754) +++ trunk/core/release/doc/announcements/release-template.html 2011-09-29 15:33:21 UTC (rev 8755) @@ -16,12 +16,15 @@ <p> The release artifacts are available at - <a - href="https://sourceforge.net/projects/smartfrog/files/"> - https://sourceforge.net/projects/smartfrog/files/</a> + <a href="https://sourceforge.net/projects/smartfrog/files/development/smartfrog-${smartfrog.version}/"> + https://sourceforge.net/projects/smartfrog/files/development/smartfrog-${smartfrog.version}</a> </p> <p> + Artifacts for use by Ivy and Maven are available under + <a href="http://smartfrog.sourceforge.net/repository/">http://smartfrog.sourceforge.net/repository/</a> +</p> +<p> This release is ${smartfrog.version}; built from revision ${svn.revision} of the SVN repository. </p><p> @@ -30,8 +33,8 @@ </p><p> This release includes the following items: </p> + <ul> - <li> Core smartfrog daemon, including services to manage files, start and stop Java and native programs. </li> @@ -47,6 +50,9 @@ <li> Database: components to issue database commands, and deploy HSLDB and MySQL databases. </li> + <li>Groovy: the ability to write SmartFrog components using the + Groovy language. + </li> <li> JMX: the ability to configure and manage JMX components, and to manage SmartFrog components over JMX. </li> @@ -83,6 +89,7 @@ <p> This release is available as: </p> + <ol> <li> RPM files inside a .tar.gz file. @@ -95,7 +102,7 @@ containing JAR files signed by a private Certification Authority. </li> <li> - The original smartfrog distribution as .zip and .tar.gz (deprecated) + The original smartfrog distribution as .zip and .tar.gz </li> </ol> @@ -135,6 +142,10 @@ <td>Database access</td> </tr> <tr> + <td><code>smartfrog-groovy</code></td> + <td>Groovy support</td> + </tr> + <tr> <td><code>smartfrog-jetty</code></td> <td>Jetty support</td> </tr> Modified: trunk/core/release/doc/announcements/release-template.txt =================================================================== --- trunk/core/release/doc/announcements/release-template.txt 2011-09-29 14:13:27 UTC (rev 8754) +++ trunk/core/release/doc/announcements/release-template.txt 2011-09-29 15:33:21 UTC (rev 8755) @@ -13,8 +13,11 @@ The project's home page is http://smartfrog.org/ The release artifacts are available at - https://sourceforge.net/projects/smartfrog/files/ + https://sourceforge.net/projects/smartfrog/files/development/smartfrog-${smartfrog.version}/ +Artifacts for use by Ivy and Maven are available under +http://smartfrog.sourceforge.net/repository/ + This release is ${smartfrog.version}; built from revision ${svn.revision} of the SVN repository. @@ -32,6 +35,8 @@ fault tolerant systems. * Database: components to issue database commands, and deploy HSLDB and MySQL databases. +* Groovy: the ability to write SmartFrog components using the + Groovy language. * JMX: the ability to configure and manage JMX components, and to manage SmartFrog components over JMX. * Logging: integration with Apache commons-logging and Log4J, and the @@ -66,28 +71,29 @@ The RPM installation is for RPM-based Linux systems. The archive contains the following RPM files: -smartfrog: The core SmartFrog distribution. -smartfrog-daemon: The shell scripts to add the SmartFrog distribution - to the path, and to run the daemon on start-up. -smartfrog-demo: Example code and documentation. -smartfrog-javadocs: Javadocs for the project -smartfrog-ant: Ant task and build file execution -smartfrog-anubis: Distributed partition-aware tuple space -smartfrog-csvfiles: Support for reading/writing CSV Files. -smartfrog-database: Database access -smartfrog-jetty: Jetty support -smartfrog-jmx: JMX integration though MX4J -smartfrog-junit: Junit 3.8.2 test execution -smartfrog-logging: Logging through Log4J and commons-logging +smartfrog: The core SmartFrog distribution. +smartfrog-daemon: The shell scripts to add the SmartFrog distribution + to the path, and to run the daemon on start-up. +smartfrog-demo: Example code and documentation. +smartfrog-javadocs: Javadocs for the project +smartfrog-ant: Ant task and build file execution +smartfrog-anubis: Distributed partition-aware tuple space +smartfrog-csvfiles: Support for reading/writing CSV Files. +smartfrog-database: Database access +smartfrog-groovy: Groovy Support +smartfrog-jetty: Jetty support +smartfrog-jmx: JMX integration though MX4J +smartfrog-junit: Junit 3.8.2 test execution +smartfrog-logging: Logging through Log4J and commons-logging smartfrog-networking: SSH, SCP, FTP and email -smartfrog-quartz: Scheduled operations -smartfrog-rpmtools: RPM support tools -smartfrog-scripting: Scripted components -smartfrog-velocity: Velocity template processing -smartfrog-www: Web support: Deployment and liveness pages -smartfrog-xml: XML Support -smartfrog-xmpp: XMPP/Jabber communications -smartfrog-xunit: Distributed testing and reporting +smartfrog-quartz: Scheduled operations +smartfrog-rpmtools: RPM support tools +smartfrog-scripting: Scripted components +smartfrog-velocity: Velocity template processing +smartfrog-www: Web support: Deployment and liveness pages +smartfrog-xml: XML Support +smartfrog-xmpp: XMPP/Jabber communications +smartfrog-xunit: Distributed testing and reporting All the JAR files are also published to a repository that is compatible with Apache Maven and Ivy. Add @@ -144,7 +150,3 @@ Changes since last release ========================== - - - - Added: trunk/core/release/doc/announcements/release_3.18.012.html =================================================================== --- trunk/core/release/doc/announcements/release_3.18.012.html (rev 0) +++ trunk/core/release/doc/announcements/release_3.18.012.html 2011-09-29 15:33:21 UTC (rev 8755) @@ -0,0 +1,478 @@ +<html> +<head> + <title>SmartFrog 3.18.012</title> +</head> +<body> +<h1>SmartFrog 3.18.012</h1> + +<p> + This is a new release of SmartFrog, the Java-based, LPGL-licensed distributed + deployment framework developed by HP Laboratories. SmartFrog enables + applications to be deployed across multiple machines, configuring different + aspects of the system so that they are all consistently configured, and managing + the life-cycle of the application as a whole. The project's home page is + <a href="http://smartfrog.org/">http://smartfrog.org/</a> +</p> + +<p> + The release artifacts are available at + <a href="https://sourceforge.net/projects/smartfrog/files/development/smartfrog-3.18.012/"> + https://sourceforge.net/projects/smartfrog/files/development/smartfrog-3.18.012/ + </a> +</p> + +<p> +Artifacts for use by Ivy and Maven are available under +<a href="http://smartfrog.sourceforge.net/repository/">http://smartfrog.sourceforge.net/repository/</a> +</p> + +<p> + This release is 3.18.012; built from revision 8753 + of the SVN repository. +</p><p> + It was compiled with the Java version set to Java 6 + -it will not work on Java1.5 JVMs. +</p><p> + This release includes the following items: +</p> +<ul> + + <li> Core smartfrog daemon, including services to manage files, start and stop + Java and native programs. + </li> + <li> Example components and applications. + </li> + <li> Ant support: ant tasks to deploy and terminate applications from a build. + </li> + <li> Ant components: the ability to execute ant tasks in a deployment. + </li> + <li> Anubis: a partition aware tuple-space that can be used to implement fault + tolerant systems. + </li> + <li> Database: components to issue database commands, and deploy HSLDB and MySQL + databases. + </li> + <li>Groovy: the ability to write SmartFrog components using the + Groovy language. + </li> + <li> JMX: the ability to configure and manage JMX components, and to manage + SmartFrog components over JMX. + </li> + <li> Logging: integration with Apache commons-logging and Log4J, and the + SLF4J framework. + </li> + <li> Networking: email, FTP, SSH, DNS support. + </li> + <li> Quartz: scheduled operations using Quartz libraries. + </li> + <li> RpmTools: components for working with or deploying with RPMs</li> + <li> Scripting: support for BSF-hosted scripting languages + </li> + <li> Testing: Distributed JUnit and component testing with SFUnit. + </li> + <li> + Velocity: generation/transformation of text files during deployment + </li> + <li> WWW: deployment of WAR and EAR files to application servers. deploy-by-copy + is provided for all application servers that support, and a tomcat-specific + component can communicate with Apache Tomcat.</li> + <li>Jetty: The Jetty component can + configure and deploy individual servlets, eliminating much of the need for WAR + files themselves. + </li> + <li> XML: XML support with XOM. + </li> + <li> XMPP: Presence and messaging over Jabber. + </li> +</ul> + +<h3>Packaging</h3> + +<p> + This release is available as: +</p> +<ol> + <li> + RPM files inside a .tar.gz file. + </li> + <li> + A JAR installer. + </li> + <li> + A .tar.gz file containing everything needed to create a private set of RPM files + containing JAR files signed by a private Certification Authority. + </li> + <li> + The original smartfrog distribution as .zip and .tar.gz + </li> +</ol> + +<p> + The RPM installation is for RPM-based Linux systems. It comprises the following RPMs: +</p> + +<table> + <tr> + <td><code>smartfrog</code></td> + <td>The core SmartFrog distribution.</td> + </tr> + <tr> + <td><code>smartfrog-daemon</code></td> + <td>The shell scripts to add the smartfrog distribution to the + path, and to run the daemon on start-up. + </td> + </tr> + <tr> + <td><code>smartfrog-javadoc</code></td> + <td>javadocs for the project</td> + </tr> + <tr> + <td><code>smartfrog-ant</code></td> + <td>Ant task and build file execution</td> + </tr> + <tr> + <td><code>smartfrog-anubis</code></td> + <td>Distributed partition-aware tuple space</td> + </tr> + <tr> + <td><code>smartfrog-csvfiles</code></td> + <td>CSV file support</td> + </tr> + <tr> + <td><code>smartfrog-database</code></td> + <td>Database access</td> + </tr> + <tr> + <td><code>smartfrog-groovy</code></td> + <td>Groovy support</td> + </tr> + <tr> + <td><code>smartfrog-jetty</code></td> + <td>Jetty support</td> + </tr> + <tr> + <td><code>smartfrog-jmx</code></td> + <td>JMX integration though MX4J</td> + </tr> + <tr> + <td><code>smartfrog-junit</code></td> + <td>Junit 3.8.2 test execution</td> + </tr> + <tr> + <td><code>smartfrog-logging</code></td> + <td>Logging through Log4J and commons-logging</td> + </tr> + <tr> + <td><code>smartfrog-networking</code></td> + <td>SSH, SCP, FTP and email</td> + </tr> + <tr> + <td><code>smartfrog-quartz</code></td> + <td>Scheduled operations</td> + </tr> + <tr> + <td><code>smartfrog-rpmtools</code></td> + <td>RPM support tools</td> + </tr> + <tr> + <td><code>smartfrog-scripting</code></td> + <td>Scripted components</td> + </tr> + <tr> + <td><code>smartfrog-velocity</code></td> + <td>Velocity template processing</td> + </tr> + <tr> + <td><code>smartfrog-www</code></td> + <td>Web support: Deployment and liveness pages</td> + </tr> + <tr> + <td><code>smartfrog-xml</code></td> + <td>XML Support</td> + </tr> + <tr> + <td><code>smartfrog-xmpp</code></td> + <td>XMPP/Jabber communications</td> + </tr> + <tr> + <td><code>smartfrog-xunit</code></td> + <td>Distributed testing and reporting</td> + </tr> +</table> +<p> + All the JAR files are also published to a repository that is compatible with + Apache Maven and Ivy. Add + <a href="http://smartfrog.sourceforge.net/repository">http://smartfrog.sourceforge.net/repository</a> + to your repository list to pull SmartFrog artifacts into your Ivy- or Maven- based build. +</p> + +<p> + There are also SmartFrog components to retrieve artifacts from such a repository + (the Library components under /org/smartfrog/services/os/java/library.sf ), + which can be used for dynamic download of SmartFrog and other artifacts. +</p> + +<h3>Security warning</h3> + +<p> + Unless SmartFrog is configured with security, a running daemon + will listen on its configured port for incoming deployment requests, and deploy + the applications with the rights of the user running the daemon. When the + smartfrog-daemon RPM is installed, that means that a process running as root + will be listening on an open port for incoming deployment requests. + Do not deploy SmartFrog this way on any untrusted + network, not without turning security on. +</p> +<p> + There is a special distribution .tar.gz file that can be used to generate + a private set of secure RPM files. +</p> + +<h3>Building SmartFrog</h3> + +<p> + SmartFrog requires Java 1.6+ and Ant 1.7+ to build. +</p> + +<p> + + The distribution does not include a source tree adequate to build the entire + system. Please follow the instructions at + <a href="http://sourceforge.net/svn/?group_id=87384">http://sourceforge.net/svn/?group_id=87384 + </a> + and check out smartfrog/trunk/core from our repository. +</p> + +<p> + + This release was built with revision 8753 of the repository, which + is available under the SVN branch + <a href="https://smartfrog.svn.sourceforge.net/svnroot/smartfrog/tags/release3.18.012">https://smartfrog.svn.sourceforge.net/svnroot/smartfrog/tags/release3.18.012</a> +</p> + +<p> + We strongly encourage anyone interested in building or extending smartfrog to + get involved in the smartfrog developer mailing list, which can be found from + the sourceforge project page + <a href="http://sourceforge.net/projects/smartfrog/"> + http://sourceforge.net/projects/smartfrog/</a> +</p> + + +<h3>Reporting Bugs</h3> + +<p> + Please file all bug reports at <a + href="http://jira.smartfrog.org/">http://jira.smartfrog.org/</a> +</p> + +<p> + The SmartFrog Team +</p> + + +<h3>Changes since last release</h3> + + +Release Notes - SmartFrog - Version 3.18.012 + +<h3> Bug +</h3> +<ul> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-205'>SFOS-205</a>] - Logging services tests are failing + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-676'>SFOS-676</a>] - Jetty component should not block in + sfStart/sfDeploy + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1358'>SFOS-1358</a>] - binding to commons logging appears to not work + in sub-processes + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1570'>SFOS-1570</a>] - NPE when parsing an SF file outside of an SF + daemon + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1571'>SFOS-1571</a>] - testrun failing in release build. Dependencies? + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1576'>SFOS-1576</a>] - ec2 RPM has a dependency on cloudfarmer RPM that + can't be satisfied + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1582'>SFOS-1582</a>] - -port option isn't being picked up + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1601'>SFOS-1601</a>] - RMI is trying to use IPv6 on Linux + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1604'>SFOS-1604</a>] - xunit/junit component tests failing: race + conditions? + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1613'>SFOS-1613</a>] - <sfrun> not working as expected + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1635'>SFOS-1635</a>] - Bug: case insensitive string comparison broken + in Assert component + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1651'>SFOS-1651</a>] - sfCompleteNameSafe can NPE if there is no + process compound (yet?) + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1654'>SFOS-1654</a>] - + org.smartfrog.services.ant.test.system.AntComplexPropertiesTest failing: no sfhome + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1655'>SFOS-1655</a>] - Two TestRunner container tests are failing -but + only as part of a larger build- + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1660'>SFOS-1660</a>] - TestCompound conditions are evaluated too early + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1661'>SFOS-1661</a>] - Restlet tests won't compile (and then are + timing out) + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1662'>SFOS-1662</a>] - Jetty testWar test failing; startup too long + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1663'>SFOS-1663</a>] - grinstall test failing as the remote file being + downloaded is gone + </li> +</ul> + +<h3> Improvement +</h3> +<ul> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1423'>SFOS-1423</a>] - Move Hadoop branch to github, merge in important + bugs and then bring components/hadoop up to speed with it + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1503'>SFOS-1503</a>] - Move up to Ant 1.8.1 + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1561'>SFOS-1561</a>] - Move up to Jetty 6.1.26 + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1569'>SFOS-1569</a>] - Move up to JUnit 4.8.2 + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1573'>SFOS-1573</a>] - Move SF orch dependencies logic to separate + "dependencies" component + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1575'>SFOS-1575</a>] - fix formatting in SfComponentDescriptionImpl + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1578'>SFOS-1578</a>] - replace uses of *copy* with a constant + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1580'>SFOS-1580</a>] - review all code in org.smartfrog.services, clean + it up + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1581'>SFOS-1581</a>] - Include port number when sfPing fails + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1583'>SFOS-1583</a>] - Re-organise Hadoop components + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1592'>SFOS-1592</a>] - clean up anubis build files + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1593'>SFOS-1593</a>] - Move up to Jetty 6.1.26 + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1595'>SFOS-1595</a>] - Review Logging source and docs + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1596'>SFOS-1596</a>] - CompoundImpl.sfCreateNewChild can't assume + that every Exception has a non-null message + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1599'>SFOS-1599</a>] - move up to httpclient 4.1.1 + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1600'>SFOS-1600</a>] - include connect time when a test times out + connecting to a port + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1602'>SFOS-1602</a>] - replace tabs with spaces in the shell scripts + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1603'>SFOS-1603</a>] - in logging docs, show how to set log levels on + the command line + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1609'>SFOS-1609</a>] - make SFGeneralSecurityException part of the + SmartFrogException tree + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1610'>SFOS-1610</a>] - review logging component code and docs + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1611'>SFOS-1611</a>] - clean up SmartFrogLifecycleException source + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1616'>SFOS-1616</a>] - Move JarUtil to Java 5 generics + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1617'>SFOS-1617</a>] - Review and clean up some of the display code + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1618'>SFOS-1618</a>] - Make it possible for Groovy test cases to deploy + SmartFrog test runs and work with them + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1619'>SFOS-1619</a>] - Make it possible to log files that are + #included, so as to detect loops + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1626'>SFOS-1626</a>] - stop sfDaemon complaing about duplicate entries + in CP when they are the same file + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1629'>SFOS-1629</a>] - sf-jetty ivy.xml to drop commons-logging as a + dependency of commons-el + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1634'>SFOS-1634</a>] - clean up SFSetPropertyImpl + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1636'>SFOS-1636</a>] - CompoundImpl to make childCap and childInc + static variables final + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1637'>SFOS-1637</a>] - make the default sfLivenessFactor and + sfLivenessDelay values constants + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1647'>SFOS-1647</a>] - review sf-xml source and reformat + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1648'>SFOS-1648</a>] - Move to Ant 1.8.2 + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1649'>SFOS-1649</a>] - Move to Jackson 1.8.5 + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1650'>SFOS-1650</a>] - stop looking for junit.jar when ivy.enabled is + not set + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1652'>SFOS-1652</a>] - "Try" workflow component to ignore + situations where there isn't a child of the specific action to deploy + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1653'>SFOS-1653</a>] - Add new deployment operation DEPLOY_WAIT for + sfRun.sh to wait for changes + </li> +</ul> + +<h3> New Feature +</h3> +<ul> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1542'>SFOS-1542</a>] - add rmdir component to delete a directory or + files on deployment + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1598'>SFOS-1598</a>] - Create grinstall Groovy Installer component + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1642'>SFOS-1642</a>] - allow Spinner operation field to be set + dynamically + </li> +</ul> + +<h3> Task +</h3> +<ul> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1612'>SFOS-1612</a>] - move testharness/testcases to testharness/test + </li> +</ul> + +<h3> Sub-task +</h3> +<ul> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1584'>SFOS-1584</a>] - hadoop refactor: move all the components under + the hadoop-components tree + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1585'>SFOS-1585</a>] - move hadoop-lifecycle work into its own + component, and stop it building + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1587'>SFOS-1587</a>] - change release build to include the new hadoop + component + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1588'>SFOS-1588</a>] - move up to Hadoop 0.21 + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1589'>SFOS-1589</a>] - Add Hadoop 0.21 artifacts to the repository + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1621'>SFOS-1621</a>] - move grinstall slow operations (download, + lifecycle phases) to an async thread + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1622'>SFOS-1622</a>] - Groovy Component to add ping task + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1623'>SFOS-1623</a>] - Groovy Component to add terminate task + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1628'>SFOS-1628</a>] - move log4j-less hadoop-core JAR to a new version + to avoid clashes with m2 repo version + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1632'>SFOS-1632</a>] - move the HDFS tasks from h-lifecycle to h-ops + </li> + <li>[<a href='http://jira.smartfrog.org/jira/browse/SFOS-1633'>SFOS-1633</a>] - add sf component to bring up MiniDFS cluster + </li> +</ul> + +</body> +</html> + Added: trunk/core/release/doc/announcements/release_3.18.012.txt =================================================================== --- trunk/core/release/doc/announcements/release_3.18.012.txt (rev 0) +++ trunk/core/release/doc/announcements/release_3.18.012.txt 2011-09-29 15:33:21 UTC (rev 8755) @@ -0,0 +1,235 @@ +SmartFrog 3.18.012 +================== + +This is a new release of SmartFrog, the Java-based, LPGL-licensed +distributed deployment framework developed by HP Laboratories. + +SmartFrog enables applications to be deployed across multiple machines, +configuring different aspects of the system so that they are all +consistently configured, and managing the life-cycle of the application +as a whole. + + +The project's home page is + http://smartfrog.org/ +The release artifacts are available at + https://sourceforge.net/projects/smartfrog/files/development/smartfrog-3.18.012/ + +Artifacts for use by Ivy and Maven are available under +http://smartfrog.sourceforge.net/repository/ + +This release is 3.18.012; built from revision 8753 +of the SVN repository. + +It was compiled with the Java version set to Java 6 -it will not work +on Java1.5 JVMs. + +This release includes the following items: + +* The core SmartFrog daemon, including services to manage files, + start and stop Java and native programs. +* Example components and applications. +* Ant support: ant tasks to deploy and terminate applications. +* Ant components: the ability to execute ant tasks in a deployment. +* Anubis: a partition aware tuple-space that can be used to implement + fault tolerant systems. +* Database: components to issue database commands, and deploy HSLDB + and MySQL databases. +* Groovy: the ability to write SmartFrog components using the + Groovy language. +* JMX: the ability to configure and manage JMX components, and to + manage SmartFrog components over JMX. +* Logging: integration with Apache commons-logging and Log4J, and the + SLF4J framework. +* Networking: email, FTP, SSH, DNS support. +* Quartz: scheduled operations using Quartz libraries. +* RpmTools: components for working with or deploying with RPMs +* Scripting: support for BSF-hosted scripting languages +* Testing: Distributed JUnit and component testing with SFUnit. +* Velocity: generation/transformation of text files during deployment +* WWW: deployment of WAR and EAR files to application servers. +* Jetty: The Jetty components can configure and deploy individual + servlets, eliminating much of the need for WAR files and + application servers. +* XML: XML support with XOM. +* XMPP: Presence and messaging over Jabber. + +Packaging +========= + +This release is available as: + +* RPM files inside a .tar.gz file. +* A JAR installer. +* The original core smartfrog distribution as .zip and .tar.gz +* A .tar.gz file containing everything needed to create a private set + of RPM files containing JAR files signed by a private Certification + Authority. + + +The RPM installation is for RPM-based Linux systems. The archive +contains the following RPM files: + +smartfrog: The core SmartFrog distribution. +smartfrog-daemon: The shell scripts to add the SmartFrog distribution + to the path, and to run the daemon on start-up. +smartfrog-demo: Example code and documentation. +smartfrog-javadocs: Javadocs for the project +smartfrog-ant: Ant task and build file execution +smartfrog-anubis: Distributed partition-aware tuple space +smartfrog-csvfiles: Support for reading/writing CSV Files. +smartfrog-database: Database access +smartfrog-groovy: Groovy Support +smartfrog-jetty: Jetty support +smartfrog-jmx: JMX integration though MX4J +smartfrog-junit: Junit 3.8.2 test execution +smartfrog-logging: Logging through Log4J and commons-logging +smartfrog-networking: SSH, SCP, FTP and email +smartfrog-quartz: Scheduled operations +smartfrog-rpmtools: RPM support tools +smartfrog-scripting: Scripted components +smartfrog-velocity: Velocity template processing +smartfrog-www: Web support: Deployment and liveness pages +smartfrog-xml: XML Support +smartfrog-xmpp: XMPP/Jabber communications +smartfrog-xunit: Distributed testing and reporting + +All the JAR files are also published to a repository that is +compatible with Apache Maven and Ivy. Add + http://smartfrog.sourceforge.net/repository/ +to your repository list to pull SmartFrog artifacts into your Ivy- or +Maven- based build. + +There are also SmartFrog components to retrieve artifacts from such a +repository which can be used for dynamic download of SmartFrog and +other artifacts, in /org/smartfrog/services/os/java/library.sf + + +Security warning +================ + +Unless SmartFrog is configured with security, a running daemon will +listen on its configured port for incoming deployment requests, and +deploy the applications with the rights of the user running the daemon. +When the smartfrog-daemon RPM is installed, that means that a process +running as root will be listening on an open port for incoming +deployment requests. Do not deploy SmartFrog this way on any untrusted +network, not without turning security on. + +There is a special distribution .tar.gz file that can be used to +generate a private set of secure RPM files. + +Building SmartFrog +================== + +SmartFrog requires Java 1.6+ and Ant 1.8+ to build. The izpack and +source .zip and .tar.gz distributions include a source tree sufficient +to build the entire system. To build a later release, please follow +the instructions at + http://sourceforge.net/svn/?group_id=87384 +to check out smartfrog/trunk/core from our repository. + +This release was built with revision 8753 of the repository, which +is available under the SVN branch +https://smartfrog.svn.sourceforge.net/svnroot/smartfrog/tags/release3.18.012 + +We strongly encourage anyone interested in building or extending +SmartFrog to get involved in the SmartFrog developer mailing list, +which can be found from the sourceforge project page +http://sourceforge.net/projects/smartfrog/ + +Reporting Bugs +============== + +Please file all bug reports at http://jira.smartfrog.org/ + +Thank you! + +The SmartFrog Team http://smartfrog.org/ + +Changes since last release +========================== + + +Release Notes - SmartFrog - Version 3.18.012 + +** Bug + * [SFOS-205] - Logging services tests are failing + * [SFOS-676] - Jetty component should not block in sfStart/sfDeploy + * [SFOS-1358] - binding to commons logging appears to not work in sub-processes + * [SFOS-1570] - NPE when parsing an SF file outside of an SF daemon + * [SFOS-1571] - testrun failing in release build. Dependencies? + * [SFOS-1576] - ec2 RPM has a dependency on cloudfarmer RPM that can't be satisfied + * [SFOS-1582] - -port option isn't being picked up + * [SFOS-1601] - RMI is trying to use IPv6 on Linux + * [SFOS-1604] - xunit/junit component tests failing: race conditions? + * [SFOS-1613] - <sfrun> not working as expected + * [SFOS-1635] - Bug: case insensitive string comparison broken in Assert component + * [SFOS-1651] - sfCompleteNameSafe can NPE if there is no process compound (yet?) + * [SFOS-1654] - org.smartfrog.services.ant.test.system.AntComplexPropertiesTest failing: no sfhome + * [SFOS-1655] - Two TestRunner container tests are failing -but only as part of a larger build- + * [SFOS-1660] - TestCompound conditions are evaluated too early + * [SFOS-1661] - Restlet tests won't compile (and then are timing out) + * [SFOS-1662] - Jetty testWar test failing; startup too long + * [SFOS-1663] - grinstall test failing as the remote file being downloaded is gone + + +** Improvement + * [SFOS-1423] - Move Hadoop branch to github, merge in important bugs and then bring components/hadoop up to speed with it + * [SFOS-1503] - Move up to Ant 1.8.1 + * [SFOS-1561] - Move up to Jetty 6.1.26 + * [SFOS-1569] - Move up to JUnit 4.8.2 + * [SFOS-1573] - Move SF orch dependencies logic to separate "dependencies" component + * [SFOS-1575] - fix formatting in SfComponentDescriptionImpl + * [SFOS-1578] - replace uses of *copy* with a constant + * [SFOS-1580] - review all code in org.smartfrog.services, clean it up + * [SFOS-1581] - Include port number when sfPing fails + * [SFOS-1583] - Re-organise Hadoop components + * [SFOS-1592] - clean up anubis build files + * [SFOS-1593] - Move up to Jetty 6.1.26 + * [SFOS-1595] - Review Logging source and docs + * [SFOS-1596] - CompoundImpl.sfCreateNewChild can't assume that every Exception has a non-null message + * [SFOS-1599] - move up to httpclient 4.1.1 + * [SFOS-1600] - include connect time when a test times out connecting to a port + * [SFOS-1602] - replace tabs with spaces in the shell scripts + * [SFOS-1603] - in logging docs, show how to set log levels on the command line + * [SFOS-1609] - make SFGeneralSecurityException part of the SmartFrogException tree + * [SFOS-1610] - review logging component code and docs + * [SFOS-1611] - clean up SmartFrogLifecycleException source + * [SFOS-1616] - Move JarUtil to Java 5 generics + * [SFOS-1617] - Review and clean up some of the display code + * [SFOS-1618] - Make it possible for Groovy test cases to deploy SmartFrog test runs and work with them + * [SFOS-1619] - Make it possible to log files that are #included, so as to detect loops + * [SFOS-1626] - stop sfDaemon complaing about duplicate entries in CP when they are the same file + * [SFOS-1629] - sf-jetty ivy.xml to drop commons-logging as a dependency of commons-el + * [SFOS-1634] - clean up SFSetPropertyImpl + * [SFOS-1636] - CompoundImpl to make childCap and childInc static variables final + * [SFOS-1637] - make the default sfLivenessFactor and sfLivenessDelay values constants + * [SFOS-1647] - review sf-xml source and reformat + * [SFOS-1648] - Move to Ant 1.8.2 + * [SFOS-1649] - Move to Jackson 1.8.5 + * [SFOS-1650] - stop looking for junit.jar when ivy.enabled is not set + * [SFOS-1652] - "Try" workflow component to ignore situations where there isn't a child of the specific action to deploy + * [SFOS-1653] - Add new deployment operation DEPLOY_WAIT for sfRun.sh to wait for changes + +** New Feature + * [SFOS-1542] - add rmdir component to delete a directory or files on deployment + * [SFOS-1598] - Create grinstall Groovy Installer component + * [SFOS-1642] - allow Spinner operation field to be set dynamically + + +** Task + * [SFOS-1612] - move testharness/testcases to testharness/test + +** Sub-task + * [SFOS-1584] - hadoop refactor: move all the components under the hadoop-components tree + * [SFOS-1585] - move hadoop-lifecycle work into its own component, and stop it building + * [SFOS-1587] - change release build to include the new hadoop component + * [SFOS-1588] - move up to Hadoop 0.21 + * [SFOS-1589] - Add Hadoop 0.21 artifacts to the repository + * [SFOS-1621] - move grinstall slow operations (download, lifecycle phases) to an async thread + * [SFOS-1622] - Groovy Component to add ping task + * [SFOS-1623] - Groovy Component to add terminate task + * [SFOS-1628] - move log4j-less hadoop-core JAR to a new version to avoid clashes with m2 repo version + * [SFOS-1632] - move the HDFS tasks from h-lifecycle to h-ops + * [SFOS-1633] - add sf component to bring up MiniDFS cluster This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2012-03-13 11:31:09
|
Revision: 8869 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=8869&view=rev Author: steve_l Date: 2012-03-13 11:30:59 +0000 (Tue, 13 Mar 2012) Log Message: ----------- SFOS-1705 change SFTP path for new sourceforge process Modified Paths: -------------- trunk/core/release/build.xml trunk/core/release/doc/creating_release_artifacts.odt Modified: trunk/core/release/build.xml =================================================================== --- trunk/core/release/build.xml 2012-03-12 17:34:12 UTC (rev 8868) +++ trunk/core/release/build.xml 2012-03-13 11:30:59 UTC (rev 8869) @@ -1155,7 +1155,7 @@ <property name="sftp.server" value="frs.sourceforge.net"/> <property name="sftp.user" value="${ssh.user}"/> <property name="sftp.group" value="smartfrog"/> - <property name="sftp.project.dir" value="/home/frs/project/s/sm/smartfrog/"/> + <property name="sftp.project.dir" value="/home/frs/project/smartfrog/"/> <property name="sftp.branch.dir" value="development/"/> <property name="sftp.release.dir" value="smartfrog-${smartfrog.version}"/> <property name="sftp.dir" value="${sftp.project.dir}${sftp.branch.dir}${sftp.release.dir}"/> @@ -1168,6 +1168,7 @@ ${toString:upload.fileset} Trust = "${ssh.trust}" Verbose = "${sftp.verbose} + user = "${sftp.user}" Pass = "${sftp.password}" Upload source dir = ${upload.dir} </echo> Modified: trunk/core/release/doc/creating_release_artifacts.odt =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |