Skip to Content.
Sympa Menu

perfsonar-dev - [pS-dev] [GEANT/SA2/ps-java-services] r6381 - in trunk: . perfsonar-java-rrd-ma-SQL_backend perfso nar-java-rrd-ma-SQL_backend/src/deb/control perfsonar-ja va-rrd-ma-SQL_backend/src/main perfsonar-java-rrd-ma-SQL _backend/src/rpm perfsonar-java-web-admin/perfsonar-java -web-admin-component/src/main/java/org/perfsonar/webadmin/ util

Subject: perfsonar development work

List archive

[pS-dev] [GEANT/SA2/ps-java-services] r6381 - in trunk: . perfsonar-java-rrd-ma-SQL_backend perfso nar-java-rrd-ma-SQL_backend/src/deb/control perfsonar-ja va-rrd-ma-SQL_backend/src/main perfsonar-java-rrd-ma-SQL _backend/src/rpm perfsonar-java-web-admin/perfsonar-java -web-admin-component/src/main/java/org/perfsonar/webadmin/ util


Chronological Thread 
  • From:
  • To:
  • Subject: [pS-dev] [GEANT/SA2/ps-java-services] r6381 - in trunk: . perfsonar-java-rrd-ma-SQL_backend perfso nar-java-rrd-ma-SQL_backend/src/deb/control perfsonar-ja va-rrd-ma-SQL_backend/src/main perfsonar-java-rrd-ma-SQL _backend/src/rpm perfsonar-java-web-admin/perfsonar-java -web-admin-component/src/main/java/org/perfsonar/webadmin/ util
  • Date: Tue, 14 May 2013 22:29:06 +0100 (BST)
  • Authentication-results: sfpop-ironport01.merit.edu; dkim=neutral (message not signed) header.i=none
Author: dante.delvaux
Date: 2013-05-14 22:29:06 +0100 (Tue, 14 May 2013)
New Revision: 6381

Added:
trunk/test.txt
Removed:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/assembly/
Modified:
trunk/perfsonar-java-rrd-ma-SQL_backend/
trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml
trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/changelog
trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/conffiles
trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/control
trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/postinst
trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/postrm
trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/preinst
trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/prerm
trunk/perfsonar-java-rrd-ma-SQL_backend/src/rpm/changelog
trunk/perfsonar-java-rrd-ma-SQL_backend/src/rpm/post
trunk/perfsonar-java-rrd-ma-SQL_backend/src/rpm/preun

trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/util/HTMLUtil.java
Log:
RRD MA: improving the Debian and RPM packages.


Property changes on: trunk/perfsonar-java-rrd-ma-SQL_backend
___________________________________________________________________
Modified: svn:ignore
- .settings

.classpath

.project

build

target

logs

.ruleset

.pmd

.checkstyle

reports

+ .settings

.classpath

.project

build

target

logs

.ruleset

.pmd

.checkstyle

reports

.pmdruleset


Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml 2013-05-14 13:45:19
UTC (rev 6380)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml 2013-05-14 21:29:06
UTC (rev 6381)
@@ -42,6 +42,9 @@
<!-- The webAdminConfig.xml must be filtered to have the
name and version filled in -->
<directory>src/main/resources</directory>
<filtering>true</filtering>
+ <excludes>
+
<exclude>perfsonar/conf/configuration.xml.template</exclude>
+ </excludes>
</resource>
</resources>

@@ -73,30 +76,6 @@
</plugin>

<plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
-
<descriptor>src/main/assembly/packaging.xml</descriptor>
- </descriptors>
- <formats>
- <format>dir</format>
- </formats>
- <finalName>packaging</finalName>
- <appendAssemblyId>false</appendAssemblyId>
- <attach>false</attach>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
@@ -269,6 +248,15 @@
<verbose>false</verbose>
<dataSet>
<data>
+ <!-- Configuration files need to
be in /etc We'll make a symlink to it in postinst. -->
+
<src>${project.build.directory}/${project.build.finalName}/WEB-INF/classes/perfsonar/conf</src>
+ <type>directory</type>
+ <mapper>
+ <type>perm</type>
+
<prefix>/etc/${installName}</prefix>
+ </mapper>
+ </data>
+ <data>

<src>${project.build.directory}/${project.build.finalName}</src>
<type>directory</type>
<mapper>
@@ -313,10 +301,13 @@
<data>
<type>template</type>
<paths>
-
<path>/var/log/${installName}</path>
+
<path>var/log/${installName}</path>
</paths>
<mapper>
<type>perm</type>
+ <!-- FIXME: This doesn't
seem to work, we need to do it in th postinst script too! -->
+ <user>tomcat6</user>
+ <group>tomcat6</group>
</mapper>
</data>
</dataSet>
@@ -430,7 +421,7 @@
</sources>
</mapping>
<mapping>
-
<directory>${installPath}/WEB-INF/log</directory>
+
<directory>/var/log/${installName}</directory>
<username>tomcat</username>
<groupname>tomcat</groupname>
<filemode>755</filemode>

Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/changelog
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/changelog
2013-05-14 13:45:19 UTC (rev 6380)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/changelog
2013-05-14 21:29:06 UTC (rev 6381)
@@ -4,7 +4,7 @@
* WebAdmin: added a page to empty the metadata DB
* Updated project documentation

- -- Antoine Delvaux
<>
Fri, 10 May 2013 14:02:00 +0000
+ -- Antoine Delvaux
<>
Tue, 14 May 2013 21:22:00 +0000

perfsonar-java-rrd-ma (3.4-7) testing; urgency=low


Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/conffiles
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/conffiles
2013-05-14 13:45:19 UTC (rev 6380)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/conffiles
2013-05-14 21:29:06 UTC (rev 6381)
@@ -1,8 +1,8 @@
-/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/classes/perfsonar/conf/configuration.xml
-/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/classes/perfsonar/conf/webAdminConfig.xml
+/etc/perfsonar-java-rrd-ma/configuration.xml
+/etc/perfsonar-java-rrd-ma/webAdminConfig.xml
+/etc/perfsonar-java-rrd-ma/rrdma_db.sql
+/etc/perfsonar-java-rrd-ma/test_rrdma_db.sql

/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/classes/log4j.properties
-/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/classes/perfsonar/conf/rrdma_db.sql
-/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/classes/perfsonar/conf/test_rrdma_db.sql
/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/conf/axis2.xml
/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/web.xml
/etc/tomcat6/Catalina/localhost/geant2-java-rrd-ma.xml

Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/control
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/control
2013-05-14 13:45:19 UTC (rev 6380)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/control
2013-05-14 21:29:06 UTC (rev 6381)
@@ -8,4 +8,4 @@
Architecture: all
Depends: mysql-server, java6-runtime, tomcat6, librrd4
Description: perfSONAR Round Robin Database Measurement Archive
-Distribution: testing
+Distribution: unstable

Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/postinst
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/postinst
2013-05-14 13:45:19 UTC (rev 6380)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/postinst
2013-05-14 21:29:06 UTC (rev 6381)
@@ -1,5 +1,5 @@
#!/bin/sh
-# postinst script for ps-mdm-rrd-ma
+# postinst script for perfsonar-java-rrd-ma
#
# see: dh_installdeb(1)

@@ -21,56 +21,37 @@
SERVICEPATH="/usr/lib/perfsonar/services"


-
case "$1" in
configure)
-
-
- #Bug fix for a previous package version,
- #where symbolic links where not removed on package removal
+ service tomcat6 stop
+
+ #Bug fix for a previous package version, where symbolic links where not
removed on package removal
OLD_SERVICE_NAME=geant2-java-rrd-ma
if [ -e /var/lib/tomcat5.5/webapps/$OLD_SERVICE_NAME ]; then
rm -rf /var/lib/tomcat5.5/webapps/$OLD_SERVICE_NAME
fi
-
if [ -e /etc/$OLD_SERVICE_NAME ]; then
rm -rf /etc/$OLD_SERVICE_NAME/*
+ rm -rf /etc/$OLD_SERVICE_NAME
fi
-
if [ -e /var/log/$OLD_SERVICE_NAME ]; then
rm -rf /var/log/$OLD_SERVICE_NAME
fi
-
if [ -e /usr/share/doc/$OLD_SERVICE_NAME ]; then
rm -rf /usr/share/doc/$OLD_SERVICE_NAME
fi

- #Installing new service
- if [ -h /etc/$SERVICENAME ]
- then
- rm /etc/$SERVICENAME
+ # We create the link to the configuration files and set correct
permissions
+ CONFDIR=${SERVICEPATH}/${SERVICENAME}/WEB-INF/classes/perfsonar/conf
+ if [ -d ${CONFDIR} ] || [ -h ${CONFDIR} ]; then
+ rm -rf ${CONFDIR}
fi
- ln -sf $SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf
/etc/$SERVICENAME || true
-
- if [ -h /var/log/$SERVICENAME ]
- then
- rm /var/log/$SERVICENAME
- fi
- mkdir -p $SERVICEPATH/$SERVICENAME/WEB-INF/log
- ln -sf $SERVICEPATH/$SERVICENAME/WEB-INF/log /var/log/$SERVICENAME ||
true
-
- if [ -h /usr/share/doc/$SERVICENAME/spec ]
- then
- rm /usr/share/doc/$SERVICENAME/spec
- fi
- ln -sf $SERVICEPATH/$SERVICENAME/WEB-INF/doc
/usr/share/doc/$SERVICENAME/spec || true
-
- chown -R tomcat6 $SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf
- chown tomcat6 $SERVICEPATH/$SERVICENAME/WEB-INF/log
- chown tomcat6 /var/run/$SERVICENAME
-
- service tomcat6 restart
-
+ ln -s /etc/${SERVICENAME}/*.xml ${CONFDIR}/
+ ln -s /etc/${SERVICENAME}/*.sql ${CONFDIR}/
+ chown tomcat6:tomcat6 /etc/${SERVICENAME}/*
+ chown tomcat6:tomcat6 /var/log/${SERVICENAME}/*
+
+ service tomcat6 start
;;

abort-upgrade|abort-remove|abort-deconfigure)
@@ -88,5 +69,3 @@
#DEBHELPER#

exit 0
-
-

Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/postrm
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/postrm
2013-05-14 13:45:19 UTC (rev 6380)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/postrm
2013-05-14 21:29:06 UTC (rev 6381)
@@ -1,5 +1,5 @@
#!/bin/sh
-# postrm script for ps-mdm-rrd-ma
+# postrm script for perfsonar-java-rrd-ma
#
# see: dh_installdeb(1)

@@ -25,32 +25,11 @@

case "$1" in
purge)
-
- if [ -h /etc/$SERVICENAME ]
- then
- rm -rf /etc/$SERVICENAME
- fi
-
- if [ -h /var/log/$SERVICENAME ]
- then
- rm -rf /var/log/$SERVICENAME
- fi
- rm -fr $SERVICEPATH/$SERVICENAME/WEB-INF/log
-
- if [ -h /usr/share/doc/$SERVICENAME/spec ]
- then
- rm -rf /usr/share/doc/$SERVICENAME/spec
- fi
-
- rm -rf $SERVICEPATH/$SERVICENAME
-
+ #TODO: Do we need to remove some symlinks?
service tomcat6 restart
;;

-
-
remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-
service tomcat6 restart
;;

@@ -66,5 +45,3 @@
#DEBHELPER#

exit 0
-
-

Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/preinst
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/preinst
2013-05-14 13:45:19 UTC (rev 6380)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/preinst
2013-05-14 21:29:06 UTC (rev 6381)
@@ -1,5 +1,5 @@
#!/bin/sh
-# preinst script for ps-mdm-rrd-ma
+# preinst script for perfsonar-java-rrd-ma
#
# see: dh_installdeb(1)

@@ -15,15 +15,9 @@

SERVICEPATH="/usr/lib/perfsonar/services"
SERVICENAME="perfsonar-java-rrd-ma"
+
case "$1" in
install|upgrade)
- #Temporary solution to make conffiles updatetable - renaming
configuration.xml to confguration.xml.old
- if [ -e
$SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf/configuration.xml ];
then
- cp
$SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf/configuration.xml
$SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf/configuration.xml.old
- fi
-
-
-
;;

abort-upgrade)
@@ -41,5 +35,3 @@
#DEBHELPER#

exit 0
-
-

Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/prerm
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/prerm
2013-05-14 13:45:19 UTC (rev 6380)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/prerm
2013-05-14 21:29:06 UTC (rev 6381)
@@ -1,5 +1,5 @@
#!/bin/sh
-# prerm script for ps-mdm-rrd-ma
+# prerm script for perfsonar-java-rrd-ma
#
# see: dh_installdeb(1)

@@ -16,7 +16,6 @@
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package

-
case "$1" in
remove|upgrade|deconfigure)
;;
@@ -36,5 +35,3 @@
#DEBHELPER#

exit 0
-
-

Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/src/rpm/changelog
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/src/rpm/changelog 2013-05-14
13:45:19 UTC (rev 6380)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/src/rpm/changelog 2013-05-14
21:29:06 UTC (rev 6381)
@@ -1,4 +1,4 @@
-* Fri 10 May 2013 Antoine Delvaux
<>
3.4.2-1
+* Tue May 14 2013 Antoine Delvaux
<>
3.4.2-1
- WebAdmin restored and updated
- WebAdmin: added a page to empty the metadata DB
- Updated project documentation

Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/src/rpm/post
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/src/rpm/post 2013-05-14
13:45:19 UTC (rev 6380)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/src/rpm/post 2013-05-14
21:29:06 UTC (rev 6381)
@@ -1,8 +1,6 @@
## make symlink for easy access to conf
%{__ln_s} -f %{prefix}/WEB-INF/classes/perfsonar/conf/*.xml
%{_sysconfdir}/%{name}
%{__ln_s} -f %{prefix}/WEB-INF/classes/perfsonar/conf/*.sql
%{_sysconfdir}/%{name}
-%{__ln_s} -f %{prefix}/WEB-INF/log %{_var}/log/%{name}
-%{__ln_s} -f %{prefix} %{_var}/lib/tomcat6/webapps/%{name}
rm -rf /var/lib/tomcat6/webapps/geant2-java-rrd-ma || true
rm -rf %{_sysconfdir}/geant2-java-rrd-ma || true
rm -rf /usr/share/doc/geant2-java-rrd-ma || true

Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/src/rpm/preun
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/src/rpm/preun 2013-05-14
13:45:19 UTC (rev 6380)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/src/rpm/preun 2013-05-14
21:29:06 UTC (rev 6381)
@@ -1,5 +1,4 @@
## remove symlink
+rm -rf %{_sysconfdir}/%{name}/*.sql || true
rm -rf %{_sysconfdir}/%{name}/*.xml || true
-rm -rf %{prefix}/WEB-INF/log ||true
rm -rf /var/log/%{name} || true
-rm -rf /var/lib/tomcat6/webapps/%{name} || true

Modified:
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/util/HTMLUtil.java
===================================================================
---
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/util/HTMLUtil.java
2013-05-14 13:45:19 UTC (rev 6380)
+++
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/util/HTMLUtil.java
2013-05-14 21:29:06 UTC (rev 6381)
@@ -149,7 +149,7 @@
}

private static final String ON_CLICK_ATTRIBUTE = "
onclick=\"checkIt(this);\" ";
- private static final String NBSP = "&NBSP;";
+ private static final String NBSP = "&nbsp;";
private static final String CHECKED_ATTR = " checked =\"true\" "; //
private static final String BLOCKED_ATTR = " style=\"display:block;\" ";
private static final String UNBLOCKED_ATTR = " style=\"display:none;\" ";

Added: trunk/test.txt
===================================================================
--- trunk/test.txt (rev 0)
+++ trunk/test.txt 2013-05-14 21:29:06 UTC (rev 6381)
@@ -0,0 +1,14 @@
+ private PerfSONAR service = new PerfSONAR() {
+
+ @Override
+ public ServiceType getServiceType() {
+ return ServiceType.MP;
+ }
+
+ @Override
+ public String getServiceName() {
+ return "SSHTELNET";
+ }
+ };
+
+


Property changes on: trunk/test.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain


  • [pS-dev] [GEANT/SA2/ps-java-services] r6381 - in trunk: . perfsonar-java-rrd-ma-SQL_backend perfso nar-java-rrd-ma-SQL_backend/src/deb/control perfsonar-ja va-rrd-ma-SQL_backend/src/main perfsonar-java-rrd-ma-SQL _backend/src/rpm perfsonar-java-web-admin/perfsonar-java -web-admin-component/src/main/java/org/perfsonar/webadmin/ util, svn-noreply, 05/14/2013

Archive powered by MHonArc 2.6.16.

Top of Page