Skip to Content.
Sympa Menu

perfsonar-dev - [GEANT/SA2/ps-java-services] r5525 - in branches/new-structure-with-base2/ps-mdm-rrd-ma: conf packaging packaging/rpm

Subject: perfsonar development work

List archive

[GEANT/SA2/ps-java-services] r5525 - in branches/new-structure-with-base2/ps-mdm-rrd-ma: conf packaging packaging/rpm


Chronological Thread 
  • From:
  • To:
  • Subject: [GEANT/SA2/ps-java-services] r5525 - in branches/new-structure-with-base2/ps-mdm-rrd-ma: conf packaging packaging/rpm
  • Date: Thu, 4 Mar 2010 16:11:25 GMT
Author: psnc.pikusa
Date: 2010-03-04 16:11:25 +0000 (Thu, 04 Mar 2010)
New Revision: 5525

Modified:
branches/new-structure-with-base2/ps-mdm-rrd-ma/conf/configuration-ma.xml
branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/package.conf
branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/package.sh
branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/package.sh~

branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/rpm/ps-mdm-rrd-ma.specs
Log:
RPM building package script update

Modified:
branches/new-structure-with-base2/ps-mdm-rrd-ma/conf/configuration-ma.xml
===================================================================
--- branches/new-structure-with-base2/ps-mdm-rrd-ma/conf/configuration-ma.xml
2010-03-04 10:45:22 UTC (rev 5524)
+++ branches/new-structure-with-base2/ps-mdm-rrd-ma/conf/configuration-ma.xml
2010-03-04 16:11:25 UTC (rev 5525)
@@ -64,7 +64,7 @@

className="org.perfsonar.base2.service.storage.xml.XMLDBComponent">
<option name="dataStorageClassName"

value="org.perfsonar.base2.service.storage.xml.exist.ExistHTTPDataStorage"/>
- <option name="uri"
value="http://localhost:8180/exist/rest/db/rrdmaconfig"/>
+ <option name="uri"
value="http://localhost:8080/exist/rest/db/rrdmaconfig"/>
<option name="username" value="rrdmaservice"/>
<option name="password" value="rrdmaservice"/>
</component>

Modified:
branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/package.conf
===================================================================
--- branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/package.conf
2010-03-04 10:45:22 UTC (rev 5524)
+++ branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/package.conf
2010-03-04 16:11:25 UTC (rev 5525)
@@ -8,7 +8,7 @@

CURR_DIR=$(pwd)
RPM_VERSION="3.3"
-RPM_SPEC_NAME="perfsonar-java-rrd-ma.specs"
+RPM_SPEC_NAME="ps-mdm-rrd-ma.specs"

SERVICE_NAME="perfsonar-java-rrd-ma"


Modified: branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/package.sh
===================================================================
--- branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/package.sh
2010-03-04 10:45:22 UTC (rev 5524)
+++ branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/package.sh
2010-03-04 16:11:25 UTC (rev 5525)
@@ -27,9 +27,9 @@
cd $CURR_DIR
rm -rfv temp
mkdir temp
- #mkdir temp/webapps
+ mkdir temp/webapps
pwd
- #unzip ../build/$SERVICE_NAME.war -d temp/webapps/$SERVICE_NAME
+ unzip ../build/$SERVICE_NAME.war -d temp/webapps/$SERVICE_NAME
echo "war unziped"

echo "done !"
@@ -110,18 +110,27 @@
rm -rfv temp/rpm
mkdir temp/rpm
mkdir -pv temp/rpm/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS,TMP}
- echo "[ ] Create symbolic link and create tar archive"
- cd temp/webapps
- LSVER=$(ls | grep $SERVICE_NAME)
- ln -sv $LSVER $SERVICE_NAME-$RPM_VERSION
+ echo "[ ] Create temp structure for tgz source file"
+ mkdir temp/$SERVICE_NAME-$RPM_VERSION
+ mkdir temp/$SERVICE_NAME-$RPM_VERSION/build
+ mkdir temp/$SERVICE_NAME-$RPM_VERSION/doc
+ mkdir temp/$SERVICE_NAME-$RPM_VERSION/samples
+ cp -vr ../build/* temp/$SERVICE_NAME-$RPM_VERSION/build
+ cp -vr ../doc/* temp/$SERVICE_NAME-$RPM_VERSION/doc
+ cp -vr ../samples/* temp/$SERVICE_NAME-$RPM_VERSION/samples
+
echo "[ ] TAR"
+ cd temp
tar -czhf $SERVICE_NAME-$RPM_VERSION.tar.gz $SERVICE_NAME-$RPM_VERSION
- cd ..
+ cd ..
echo "[ ] Copy tarball into SOURCES"
pwd
- mv -v webapps/$SERVICE_NAME-$RPM_VERSION.tar.gz rpm/rpmbuild/SOURCES
+ mv -v temp/$SERVICE_NAME-$RPM_VERSION.tar.gz temp/rpm/rpmbuild/SOURCES
+ rm -rf temp/$SERVICE_NAME-$RPM_VERSION
+ rm -rf temp/$SERVICE_NAME-$RPM_VERSION.tar.gz
+
echo "[ ] Copy RPM .specs file"
- cp -v ../rpm/$RPM_SPEC_NAME rpm/rpmbuild
+ cp -v rpm/$RPM_SPEC_NAME temp/rpm/rpmbuild/
echo
echo
}
@@ -133,8 +142,8 @@

echo " CREATE RPM PACKAGE"
cd $CURR_DIR
- cd temp/rpm
- rpmbuild -bb rpmbuild/$RPM_SPEC_NAME
+ cd temp/rpm/rpmbuild
+ rpmbuild -bb $RPM_SPEC_NAME
echo
echo


Modified:
branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/package.sh~
===================================================================
--- branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/package.sh~
2010-03-04 10:45:22 UTC (rev 5524)
+++ branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/package.sh~
2010-03-04 16:11:25 UTC (rev 5525)
@@ -27,9 +27,9 @@
cd $CURR_DIR
rm -rfv temp
mkdir temp
- #mkdir temp/webapps
+ mkdir temp/webapps
pwd
- #unzip ../build/$SERVICE_NAME.war -d temp/webapps/$SERVICE_NAME
+ unzip ../build/$SERVICE_NAME.war -d temp/webapps/$SERVICE_NAME
echo "war unziped"

echo "done !"
@@ -110,18 +110,27 @@
rm -rfv temp/rpm
mkdir temp/rpm
mkdir -pv temp/rpm/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS,TMP}
- echo "[ ] Create symbolic link and create tar archive"
- cd temp/webapps
- LSVER=$(ls | grep $SERVICE_NAME)
- ln -sv $LSVER $SERVICE_NAME-$RPM_VERSION
+ echo "[ ] Create temp structure for tgz source file"
+ mkdir temp/$SERVICE_NAME-$RPM_VERSION
+ mkdir temp/$SERVICE_NAME-$RPM_VERSION/build
+ mkdir temp/$SERVICE_NAME-$RPM_VERSION/doc
+ mkdir temp/$SERVICE_NAME-$RPM_VERSION/samples
+ cp -vr ../build/* temp/$SERVICE_NAME-$RPM_VERSION/build
+ cp -vr ../doc/* temp/$SERVICE_NAME-$RPM_VERSION/doc
+ cp -vr ../samples/* temp/$SERVICE_NAME-$RPM_VERSION/samples
+
echo "[ ] TAR"
+ cd temp
tar -czhf $SERVICE_NAME-$RPM_VERSION.tar.gz $SERVICE_NAME-$RPM_VERSION
- cd ..
+ cd ..
echo "[ ] Copy tarball into SOURCES"
pwd
- mv -v webapps/$SERVICE_NAME-$RPM_VERSION.tar.gz rpm/rpmbuild/SOURCES
+ mv -v temp/$SERVICE_NAME-$RPM_VERSION.tar.gz temp/rpm/rpmbuild/SOURCES
+ rm -rf temp/$SERVICE_NAME-$RPM_VERSION
+ rm -rf temp/$SERVICE_NAME-$RPM_VERSION.tar.gz
+
echo "[ ] Copy RPM .specs file"
- cp -v ../rpm/$RPM_SPEC_NAME rpm/rpmbuild
+ cp -v rpm/$RPM_SPEC_NAME temp/rpm/rpmbuild/
echo
echo
}
@@ -133,8 +142,8 @@

echo " CREATE RPM PACKAGE"
cd $CURR_DIR
- cd temp/rpm
- rpmbuild -bb rpmbuild/$RPM_SPEC_NAME
+ cd temp/rpm/rpmbuild
+ rpmbuild -bb $RPM_SPEC_NAME
echo
echo

@@ -169,14 +178,14 @@
do_structure
do_deb_struct
build_deb_package
- #cleanup_after_deb_packaging
+ cleanup_after_deb_packaging
;;
rpm)
do_clean_up
do_structure
do_rpm_struct
build_rpm_package
- cleanup_after_rpm_packaging
+ #cleanup_after_rpm_packaging
;;
*)
echo "Usage: $0 clean|deb|rpm" >&2

Modified:
branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/rpm/ps-mdm-rrd-ma.specs
===================================================================
---
branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/rpm/ps-mdm-rrd-ma.specs
2010-03-04 10:45:22 UTC (rev 5524)
+++
branches/new-structure-with-base2/ps-mdm-rrd-ma/packaging/rpm/ps-mdm-rrd-ma.specs
2010-03-04 16:11:25 UTC (rev 5525)
@@ -1,19 +1,20 @@
%define prefix /usr/lib/perfsonar/services/%{name}
+%define oldname geant2-java-rrd-ma

-Name: ps-mdm-rrd-ma
-Version: 4.0
+Name: perfsonar-java-rrd-ma
+Version: 3.3
License: Modified BSD
Release: 1
Summary: perfSONAR Round Robin Database
Source0: %{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
Group: Network/Web service
-packager: Roman Lapacz
<>
+packager: Piotr Pikusa
<>
URL: http://www.perfsonar.org
Requires: tomcat5-exist
Requires: rrdjtool
BuildArch: noarch
-BuildRequires: maven2
+#BuildRequires: maven2



@@ -23,6 +24,7 @@


%prep
+echo ${RPM_BUILD_DIR}
%{__rm} -rf ${RPM_BUILD_DIR}/%{name}-%{version}
%setup -q

@@ -30,7 +32,7 @@

%build
pushd ${RPM_BUILD_DIR}/%{name}-%{version}
- mvn package
+
popd


@@ -78,6 +80,9 @@
%{__ln_s} -f %{prefix}/WEB-INF/classes/perfsonar/conf/*.xml
%{_sysconfdir}/%{name}
%{__ln_s} -f %{prefix}/WEB-INF/log %{_var}/log/%{name}
%{__ln_s} -f %{prefix} %{_var}/lib/tomcat5/webapps/%{name}
+rm -rf %{_var}/lib/tomcat5/webapps/%{oldname}
+rm -rf %{_sysconfdir}/%{oldname}
+rm -rf /usr/share/doc/%{oldname}

## restart tomcat
/sbin/service tomcat5 restart
@@ -120,9 +125,22 @@


%changelog
-* Mon Mar 09 2009 Roman Lapacz
<>
4.0-1
-- use of new base library (base2)
+* Thu Feb 25 2010 Piotr Pikusa
<>
3.3-1
+- New: Use of new base library (base2)
+- Change: Removed WebAdmin. New WebAdmin will be available in the next rc
+- Change: Renamed service. Now the name of the service is:
perfsonar-java-rrd-ma
+- Change: Directory structure changed - now the main service directory is:
/usr/lib/perfsonar/services/perfsonar-java-rrd-ma
+- Change: Url changed. Now the service url is:
http://localhost:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService
+- Change: Configuration files changed. Now the main conf file is:
configuration.xml
+- Change: SVN migration. Now the SVN adress is:
http://svn.geant.net/GEANT/SA2/ps-java-services/trunk/perfsonar-java-rrd-ma

+* Wed Jul 08 2009 Piotr Pikusa
<>
3.2
+- Change: Removed Admin Guide from doc directory. Up-to-date Admin Guide is
now available only on svn
+- Change: Rename package from geant2-java-sql-ma to perfsonar-java-sql-ma
+
+* Wed Jul 08 2009 Piotr Pikusa
<>
3.1.2-1
+- Dummy package to rename service from geant2-java-rrd-ma to
perfsonar-java-rrd-ma
+
* Wed Mar 04 2009 Roman Lapacz
<>
3.1.1-1
- Fixed Bug #724: wrong paths of log files



  • [GEANT/SA2/ps-java-services] r5525 - in branches/new-structure-with-base2/ps-mdm-rrd-ma: conf packaging packaging/rpm, svn-noreply, 03/04/2010

Archive powered by MHonArc 2.6.16.

Top of Page