Skip to Content.
Sympa Menu

perfsonar-dev - [pS-dev] [GEANT/SA2/ps-java-services] r6253 - in trunk: perfsonar-java-rrd-ma-SQL_backend perfsonar- java-rrd-ma-SQL_backend/doc perfsonar-java-rrd-ma-SQL_ backend/src perfsonar-java-rrd-ma-SQL_backend/src/deb pe rfsonar-java-rrd-ma-SQL_backend/src/deb/control perfsona r-java-rrd-ma-SQL_backend/src/tomcat perfsonar-java-web- admin/perfsonar-java-web-admin-component/src/main/java/org /perfsonar/webadmin/servlet

Subject: perfsonar development work

List archive

[pS-dev] [GEANT/SA2/ps-java-services] r6253 - in trunk: perfsonar-java-rrd-ma-SQL_backend perfsonar- java-rrd-ma-SQL_backend/doc perfsonar-java-rrd-ma-SQL_ backend/src perfsonar-java-rrd-ma-SQL_backend/src/deb pe rfsonar-java-rrd-ma-SQL_backend/src/deb/control perfsona r-java-rrd-ma-SQL_backend/src/tomcat perfsonar-java-web- admin/perfsonar-java-web-admin-component/src/main/java/org /perfsonar/webadmin/servlet


Chronological Thread 
  • From:
  • To:
  • Subject: [pS-dev] [GEANT/SA2/ps-java-services] r6253 - in trunk: perfsonar-java-rrd-ma-SQL_backend perfsonar- java-rrd-ma-SQL_backend/doc perfsonar-java-rrd-ma-SQL_ backend/src perfsonar-java-rrd-ma-SQL_backend/src/deb pe rfsonar-java-rrd-ma-SQL_backend/src/deb/control perfsona r-java-rrd-ma-SQL_backend/src/tomcat perfsonar-java-web- admin/perfsonar-java-web-admin-component/src/main/java/org /perfsonar/webadmin/servlet
  • Date: Fri, 19 Apr 2013 21:05:54 +0100 (BST)
  • Authentication-results: sfpop-ironport07.merit.edu; dkim=neutral (message not signed) header.i=none
Author: dante.delvaux
Date: 2013-04-19 21:05:54 +0100 (Fri, 19 Apr 2013)
New Revision: 6253

Added:
trunk/perfsonar-java-rrd-ma-SQL_backend/doc/copyright
trunk/perfsonar-java-rrd-ma-SQL_backend/src/tomcat/
trunk/perfsonar-java-rrd-ma-SQL_backend/src/tomcat/geant2-java-rrd-ma.xml

trunk/perfsonar-java-rrd-ma-SQL_backend/src/tomcat/perfsonar-java-rrd-ma.xml
Removed:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/copyright
trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/doc/
trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/perfsonar-java-rrd-ma.xml
Modified:
trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml
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-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/servlet/SelfTestServlet.java
Log:
RRD MA with SQL backend: slightly improved packaging

Copied: trunk/perfsonar-java-rrd-ma-SQL_backend/doc/copyright (from rev 6249,
trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/copyright)
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/doc/copyright
(rev 0)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/doc/copyright 2013-04-19
20:05:54 UTC (rev 6253)
@@ -0,0 +1,3 @@
+This software is distributed under the GÉANT Standard Open Source Software
+Outward Licence. See enclosed doc/License.txt and doc/Collaboration.txt files
+for copyright notice.
\ No newline at end of file

Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml 2013-04-19 14:56:09
UTC (rev 6252)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml 2013-04-19 20:05:54
UTC (rev 6253)
@@ -261,8 +261,9 @@
</mapper>
</data>
<data>
-
<src>src/deb/perfsonar-java-rrd-ma.xml</src>
- <type>file</type>
+ <!-- Tomcat configuration files
-->
+ <src>src/tomcat</src>
+ <type>directory</type>
<mapper>
<type>perm</type>

<prefix>/etc/tomcat6/Catalina/localhost</prefix>
@@ -287,14 +288,6 @@
</mapper>
</data>
<data>
- <src>src/deb/doc</src>
- <type>directory</type>
- <mapper>
- <type>perm</type>
-
<prefix>/usr/share/doc/${installName}</prefix>
- </mapper>
- </data>
- <data>

<src>src/main/sbin/nmwg-sql-converter</src>
<type>file</type>
<mapper>
@@ -303,15 +296,6 @@
<prefix>/usr/sbin/</prefix>
</mapper>
</data>
- <data>
- <type>template</type>
- <paths>
-
<path>/var/run/${installName}</path>
- </paths>
- <mapper>
- <type>perm</type>
- </mapper>
- </data>
</dataSet>
</configuration>
</execution>
@@ -350,7 +334,7 @@
<defaultFilemode>644</defaultFilemode>
<defaultDirmode>755</defaultDirmode>
<defaultGroupname>tomcat</defaultGroupname>
- <defaultUsername>root</defaultUsername>
+ <defaultUsername>tomcat</defaultUsername>

<mappings>
<mapping>
@@ -402,6 +386,15 @@
</sources>
</mapping>
<mapping>
+
<directory>/etc/tomcat6/Catalina/localhost</directory>
+
<recurseDirectories>false</recurseDirectories>
+ <sources>
+ <source>
+ <location>src/tomcat</location>
+ </source>
+ </sources>
+ </mapping>
+ <mapping>
<directory>/usr/sbin</directory>
<filemode>755</filemode>
<username>root</username>

Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/conffiles
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/conffiles
2013-04-19 14:56:09 UTC (rev 6252)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/conffiles
2013-04-19 20:05:54 UTC (rev 6253)
@@ -5,4 +5,5 @@

/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
+/etc/tomcat6/Catalina/localhost/perfsonar-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-04-19 14:56:09 UTC (rev 6252)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/control
2013-04-19 20:05:54 UTC (rev 6253)
@@ -7,5 +7,5 @@
Version: [[version]]
Architecture: all
Depends: mysql-server, java6-runtime, tomcat6, librrd4
-Description: perfSONAR Round Robin Database
+Description: perfSONAR Round Robin Database Measurement Archive
Distribution: testing

Deleted: trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/copyright
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/copyright 2013-04-19
14:56:09 UTC (rev 6252)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/copyright 2013-04-19
20:05:54 UTC (rev 6253)
@@ -1,3 +0,0 @@
-This software is distributed under the GÉANT Standard Open Source Software
-Outward Licence. See enclosed doc/License.txt and doc/Collaboration.txt files
-for copyright notice.
\ No newline at end of file

Deleted:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/perfsonar-java-rrd-ma.xml
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/perfsonar-java-rrd-ma.xml
2013-04-19 14:56:09 UTC (rev 6252)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/perfsonar-java-rrd-ma.xml
2013-04-19 20:05:54 UTC (rev 6253)
@@ -1 +0,0 @@
-<Context path="/perfsonar-java-rrd-ma"
docBase="/usr/lib/perfsonar/services/perfsonar-java-rrd-ma"/>
\ No newline at end of file

Added:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/tomcat/geant2-java-rrd-ma.xml
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/src/tomcat/geant2-java-rrd-ma.xml
(rev 0)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/src/tomcat/geant2-java-rrd-ma.xml
2013-04-19 20:05:54 UTC (rev 6253)
@@ -0,0 +1 @@
+<Context path="/geant2-java-rrd-ma"
docBase="/usr/lib/perfsonar/services/perfsonar-java-rrd-ma"/>
\ No newline at end of file

Copied:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/tomcat/perfsonar-java-rrd-ma.xml
(from rev 6249,
trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/perfsonar-java-rrd-ma.xml)
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/src/tomcat/perfsonar-java-rrd-ma.xml
(rev 0)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/src/tomcat/perfsonar-java-rrd-ma.xml
2013-04-19 20:05:54 UTC (rev 6253)
@@ -0,0 +1 @@
+<Context path="/perfsonar-java-rrd-ma"
docBase="/usr/lib/perfsonar/services/perfsonar-java-rrd-ma"/>
\ No newline at end of file

Modified:
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/servlet/SelfTestServlet.java
===================================================================
---
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/servlet/SelfTestServlet.java
2013-04-19 14:56:09 UTC (rev 6252)
+++
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/servlet/SelfTestServlet.java
2013-04-19 20:05:54 UTC (rev 6253)
@@ -36,7 +36,7 @@

if (messageContent == null) {
logger.warn("Self test cannot be performed because
the selfTest message is empty. Please check the wa/soapMessages/selfTest.xml
file.");
- request.setAttribute("errorMessage", "Message is
null");
+ request.setAttribute("errorMessage", "Selftest
message is empty (null).");
} else {
try {
String result =
soapClient.sendMessage(messageContent);


  • [pS-dev] [GEANT/SA2/ps-java-services] r6253 - in trunk: perfsonar-java-rrd-ma-SQL_backend perfsonar- java-rrd-ma-SQL_backend/doc perfsonar-java-rrd-ma-SQL_ backend/src perfsonar-java-rrd-ma-SQL_backend/src/deb pe rfsonar-java-rrd-ma-SQL_backend/src/deb/control perfsona r-java-rrd-ma-SQL_backend/src/tomcat perfsonar-java-web- admin/perfsonar-java-web-admin-component/src/main/java/org /perfsonar/webadmin/servlet, svn-noreply, 04/19/2013

Archive powered by MHonArc 2.6.16.

Top of Page