Chronological Thread 

< Chronological >      < Thread >

---

Author: dante.delvaux
Date: 2013-04-11 18:08:09 +0100 (Thu, 11 Apr 2013)
New Revision: 6248

Added:
trunk/perfsonar-java-rrd-ma-SQL_backend/doc/Collaboration.txt
trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/changelog
trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/copyright

trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/servlets/

trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/servlets/DbInitializerServlet.java
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/log4j.xml
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/

trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/configuration.xml

trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/configuration.xml.template

trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/rrdma_db.sql

trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/test_rrdma_db.sql

trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/webAdminConfig.xml
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/webapp/WEB-INF/
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/webapp/WEB-INF/conf/

trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/webapp/WEB-INF/conf/axis2.xml
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/webapp/WEB-INF/modules/

trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/webapp/WEB-INF/modules/addressing-1.41.mar

trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/webapp/WEB-INF/modules/mex-1.41.mar

trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/webapp/WEB-INF/modules/modules.list

trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/webapp/WEB-INF/modules/ping-1.41.mar

trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/webapp/WEB-INF/modules/scripting-1.41.mar

trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/webapp/WEB-INF/modules/smtpfault.mar

trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/webapp/WEB-INF/modules/soapmonitor-1.41.mar
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/webapp/WEB-INF/services/

trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/webapp/WEB-INF/services/MeasurementArchiveService/

trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/webapp/WEB-INF/services/MeasurementArchiveService/META-INF/

trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/webapp/WEB-INF/services/MeasurementArchiveService/META-INF/services.xml
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/webapp/WEB-INF/web.xml
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/webapp/views/
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/webapp/views/dbInit.jsp
trunk/perfsonar-java-rrd-ma-SQL_backend/src/test/java/org/perfsonar/tests/

trunk/perfsonar-java-rrd-ma-SQL_backend/src/test/java/org/perfsonar/tests/measurementArchive/

trunk/perfsonar-java-rrd-ma-SQL_backend/src/test/java/org/perfsonar/tests/measurementArchive/rrdType/

trunk/perfsonar-java-rrd-ma-SQL_backend/src/test/java/org/perfsonar/tests/measurementArchive/rrdType/storage/

trunk/perfsonar-java-rrd-ma-SQL_backend/src/test/java/org/perfsonar/tests/measurementArchive/rrdType/storage/sql/

trunk/perfsonar-java-rrd-ma-SQL_backend/src/test/java/org/perfsonar/tests/measurementArchive/rrdType/storage/sql/MysqlMetadataStorageDAOImplTest.java
trunk/perfsonar-java-rrd-ma-SQL_backend/src/test/resources/
trunk/perfsonar-java-rrd-ma-SQL_backend/src/test/resources/META-INF/

trunk/perfsonar-java-rrd-ma-SQL_backend/src/test/resources/META-INF/persistence.xml
trunk/perfsonar-java-rrd-ma-SQL_backend/src/test/resources/log4j.xml
trunk/perfsonar-java-rrd-ma-SQL_backend/src/test/resources/perfsonar/
trunk/perfsonar-java-rrd-ma-SQL_backend/src/test/resources/perfsonar/conf/

trunk/perfsonar-java-rrd-ma-SQL_backend/src/test/resources/perfsonar/conf/configuration.xml
Removed:
trunk/perfsonar-java-rrd-ma-SQL_backend/conf/
trunk/perfsonar-java-rrd-ma-SQL_backend/packaging/
trunk/perfsonar-java-rrd-ma-SQL_backend/resources/
Modified:
trunk/
trunk/parent/pom.xml
trunk/perfsonar-java-rrd-ma-SQL_backend/
trunk/perfsonar-java-rrd-ma-SQL_backend/doc/License.txt
trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml
trunk/perfsonar-java-rrd-ma-SQL_backend/src/checkstyle/checkstyle.xml
trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/control

trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/MetadataStorageDAO.java

trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/exist/ExistMetadataStorageDAOImpl.java

trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/persistence/entity/Interfaces.java

trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/rrd/RRDDataStorageDAOImpl.java

trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/sql/MysqlMetadataStorageDAOImpl.java

trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/META-INF/persistence.xml
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/pom.xml

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/util/ConfigurationServletHelper.java

trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/webapp/views/selfTest.jsp
trunk/perfsonar-java-web-admin/pom.xml

trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/servlets/ExistDbInitializerServlet.java
Log:
perfsonar-java-rrd-ma with SQL backend:
- re-organising project structure for easier build and packaging,
- adding a new webadmin page to reset metadata DB,
- jdbc: adding pool auto reconnect parameters,
- adding tomcat-maven-plugin to do integration tests,
- correcting some log messages.
Web Admin:
- correcting WEB-INF path to load config files,
- improving self-test servlet error reporting.



Property changes on: trunk
___________________________________________________________________
Modified: svn:ignore
- .settings

.project

+ .settings

.project

logs


Modified: trunk/parent/pom.xml
===================================================================
--- trunk/parent/pom.xml 2013-03-25 12:39:38 UTC (rev 6247)
+++ trunk/parent/pom.xml 2013-04-11 17:08:09 UTC (rev 6248)
@@ -287,6 +287,22 @@
<extensions>true</extensions>
</plugin>

+ <plugin>
+
<groupId>org.apache.tomcat.maven</groupId>
+
<artifactId>tomcat6-maven-plugin</artifactId>
+ <version>2.1</version>
+ <executions>
+ <execution>
+ <id>run-war</id>
+ <!-- We link this plugin to
some non default phase so that we can disable it in some modules. -->
+ <phase>integration-test</phase>
+ <goals>
+ <goal>run-war</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
</pluginManagement>
</build>


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

.classpath

.project

build

target

+ .settings

.classpath

.project

build

target

logs


Added: trunk/perfsonar-java-rrd-ma-SQL_backend/doc/Collaboration.txt
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/doc/Collaboration.txt
(rev 0)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/doc/Collaboration.txt
2013-04-11 17:08:09 UTC (rev 6248)
@@ -0,0 +1,27 @@
+
+This software is the result of join efforts of the following perfSONAR
project participants:
+
+- Arnes
+- CARnet
+- Cesnet
+- Dante
+- Belnet
+- Das Deutsche Forschungsnetz (DFN)
+- Energy Sciences Network (ESnet)
+- FCCN
+- GARR
+- GRnet
+- Internet2
+- IST
+- Poznan Supercomputing and Networking Center (PSNC)
+- Rede Nacional de Ensino e Pesquisa (RNP)
+- RedIRIS
+- Renater
+- SURFnet
+- SWITCH
+- Uninett
+- University of Delaware
+
+
+
+ -- Roman Lapacz
<>
Mon, 05 Jan 2009 12:00:00 +0200


Property changes on:
trunk/perfsonar-java-rrd-ma-SQL_backend/doc/Collaboration.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain

Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/doc/License.txt
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/doc/License.txt 2013-03-25
12:39:38 UTC (rev 6247)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/doc/License.txt 2013-04-11
17:08:09 UTC (rev 6248)
@@ -1,24 +1,207 @@
-* Copyright (c) 2008, DANTE on behalf of the GEANT2 NRENs
-* All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-* * Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-* * Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in the
-* documentation and/or other materials provided with the distribution.
-* * Neither the name of the DANTE or GEANT2 nor the
-* names of its contributors may be used to endorse or promote products
-* derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY DANTE ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL DANTE or the GEANT2 NRENS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ Copyright (c) 2008-2012, DANTE on behalf of the GEANT NRENs
+ All rights reserved
+
+ GÉANT Standard Open Source Software Outward Licence
+ ===================================================
+
+A.1 Grant of Copyright Licence
+A.1.1 Licensor hereby grants You a world-wide, royalty-free,
non-exclusive,
+perpetual, sub-licensable licence to:
+A.1.1.1 Reproduce the Original Work in copies.
+A.1.1.2 Prepare Derivative Works.
+A.1.1.3 Distribute copies of the Original Work and Derivative Works to
the
+public, with the proviso that copies of Original Work or Derivative Works
that
+You distribute shall be Licensed under the terms of this Licence.
+A.1.1.4 Display the Original Work publicly.
+
+A.2 Grant of Patent Licence
+Licensor hereby grants You a world-wide, royalty-free,
non-exclusive,
+perpetual, sub-licensable licence, under patent claims owned or controlled
by
+the Licensor that are embodied in the Original Work as furnished by
the
+Licensor to use and modify the Original Work and Derivative Works.
+
+A.3 Grant of Licence
+A.3.1 Licensor hereby agrees to provide a machine-readable copy of the
Source
+Code of the Original Work along with each copy of the Original Work
that
+Licensor distributes.
+A.3.2 Licensor reserves the right to satisfy this obligation by placing
a
+machine-readable copy of the Source Code in an information
repository
+reasonably calculated to permit inexpensive and convenient access by You for
as
+long as Licensor continues to distribute the Original Work, and by
publishing
+the address of that information repository in a notice immediately
following
+the copyright notice that applies to the Original Work.
+
+A.4 Exclusions from Licence Grant
+A.4.1 Neither the names of Licensor, nor the names of any contributors to
the
+Original Work, nor any of their trade marks or service marks, may be used
to
+endorse or promote products derived from this Original Work without
express
+prior written permission of the Licensor.
+A.4.2 Nothing in this Licence shall be deemed to grant any rights to
trade
+marks, copyrights, patents, trade secrets or any other intellectual property
of
+Licensor except as expressly stated herein.
+A.4.3 No patent licence is granted to make, use, sell or offer to
sell
+embodiments of any patent claims other than the Licensed claims defined
in
+clause A.2.
+A.4.4 Nothing in this Licence shall be interpreted to prohibit Licensor
from
+licensing under different terms from this Licence any Original Work
that
+Licensor otherwise would have a right to license.
+
+A.5 Other Terms
+To the extent that the Original Work contains any work which is subject
to
+licence terms which conflict with these terms, the terms of the other
licence
+shall take precedence over the terms of this Licence, to the extent required
to
+give effect to them.
+
+A.6 Third Party Provision
+As an express condition for the grants of licence hereunder, You agree that
any
+Third Party Provision by You of a Derivative Work shall be deemed
a
+distribution and shall be Licensed to all under the terms of this Licence,
as
+prescribed in clause A.1.1.3 herein.
+
+A.7 Attribution Rights
+A.7.1 You must retain, in the Source Code of any Derivative Works that
You
+create, all copyright, patent or trade mark notices from the Source Code of
the
+Original Work, as well as any notices of licensing and any descriptive
text
+identified therein as an “Attribution Notice”, including the following
notice:
+
+ “on behalf of the GÉANT project, DANTE is the holder of the
copyright
+ in all material which was developed by a member of the
GÉANT
+ project. DANTE is Delivery of Advanced Network Technology
to
+ Europe Limited (also known as DANTE), a not-for-profit
limited
+ liability company registered in England and Wales (company
number
+ 02806796) and with its registered company address at 9400
Garsington
+ Road, Oxford Business Park, Oxford, OX42HN” The research leading
to
+ these results has received funding from the European
Community’s
+ Seventh Framework Programme (FP7/2007-2013) under grant agreement
nº
+ 238875 (GÉANT).
+
+A.7.2 You must cause the Source Code for any Derivative Works that You
create
+to carry a prominent Attribution Notice reasonably calculated to
inform
+recipients that You have modified the Original Work.
+
+A.8 Warranty of Provenance and Disclaimer of Warranty
+A.8.1 The Licensor warrants that the copyright in and to the Original
Work
+and the patent rights granted herein by Licensor are held by the Licensor
or
+are sublicensed to You under the terms of this Licence with the permission
of
+the contributor(s) of those copyrights and patent rights.
+A.8.2 Except as expressly stated in clause A.8.1, the Original Work
is
+provided under this Licence on an “as is” basis and this Licence
expressly
+excludes all implied terms, conditions and warranties to the maximum
limit
+permitted by the applicable law. The entire risk as to the quality of
the
+Original Work is with you. This disclaimer of warranty constitutes an
essential
+part of this Licence. No licence to Original Work is granted hereunder
except
+under this disclaimer.
+
+A.9 Limitation of Liability
+A.9.1 This limitation of liability shall not apply to liability for death
or
+personal injury resulting from Licensor’s negligence to the extent
applicable
+law prohibits such limitation.
+A.9.2 Subject to clause A.9.1 and any applicable law, under no
circumstances
+and under no legal theory, whether in tort (including negligence), contract,
or
+otherwise, shall the Licensor be liable to any person for any direct,
indirect,
+special, incidental, or consequential damages of any character arising
as a
+result of this Licence or the use of the Original Work including,
without
+limitation, damages for loss of goodwill, work stoppage, computer failure
or
+malfunction, or any and all other commercial damages or losses.
+
+A.10 Acceptance and Termination
+A.10.1 If You distribute copies of the Original Work or a Derivative Work,
You
+must make a reasonable effort under the circumstances to obtain the
express
+consent (which, for the avoidance of doubt, need not be in writing)
of
+recipients to the terms of this Licence.
+A.10.2 Nothing else but this Licence (or another written agreement
between
+Licensor and You) grants You permission to create Derivative Works or
to
+exercise any of the rights granted in clause A.1, and any attempt to do
so
+except under the terms of this Licence (or another written agreement
between
+Licensor and You) is expressly prohibited by English copyright law,
the
+equivalent laws of other countries, and by international treaty. Therefore,
by
+exercising any of the rights granted to You in clause A.1, You
irrevocably
+indicate Your acceptance of this Licence and all of its terms and conditions.
+A.10.3 Any failure by you to comply with your obligations under clause
A.1.1.3
+shall automatically terminate this Licence as well as any rights granted to
You
+under this Licence.
+
+A.11 Legal Fees
+A.11.1 In any action to enforce the terms of this Licence or seeking
damages
+relating thereto, the prevailing party shall be entitled to recover its
costs
+and expenses, including, without limitation, reasonable attorneys’ fees
and
+costs incurred in connection with such action, including any appeal of
such
+action.
+A.11.2 This clause shall survive the termination of this Licence.
+
+A.12 Termination for Patent Action
+A.12.1 This Licence shall terminate automatically and You may no
longer
+exercise any of the rights granted to You by this Licence as of the date
You
+commence an action, including a cross-claim or counterclaim, against
Licensor
+or any Licensee alleging that the Original Work infringes a patent.
+A.12.2 This termination provision shall not apply for an action
alleging
+patent infringement by combinations of the Original Work with other software
or
+hardware.
+
+A.13 Jurisdiction, Venue and Governing Law
+A.13.1 Any action or suit relating to this Licence may be brought only in
the
+courts of a jurisdiction wherein the Licensor resides or in which
Licensor
+conducts its primary business, and under the laws of that
jurisdiction
+excluding its conflict-of-law provisions.
+A.13.2 Any use of the Original Work outside the scope of this Licence or
after
+its termination shall be subject to the requirements and penalties of
English
+copyright law, the equivalent laws of other countries and international
treaty.
+A.13.3 This clause shall survive the termination of this Licence.
+
+A.14 Miscellaneous
+A.14.1 This Licence represents the entire agreement concerning the
subject
+matter hereof and the parties have not relied on any representations
not
+included in this Licence when entering into it.
+A.14.2 If any provision of this Licence is held to be unenforceable,
such
+provision shall be reformed only to the extent necessary to make
it
+enforceable.
+
+A.15 Right to Use
+You may use the Original Work in all ways not otherwise restricted
or
+conditioned by this Licence or by law, and Licensor promises not to
interfere
+with or be responsible for such uses by You.
+
+A.16 Definitions
+A.16.1 Derivative Works means any work, whether in Source Code or Object
Code,
+that is based on (or derived from) the Original Work and for which
the
+editorial revisions, annotations, elaborations, or other
modifications
+represent, as a whole, an original work of authorship. For the purposes of
this
+Licence, Derivative Works shall not include works that remain separable
from,
+or merely link (or bind by name) to the interfaces of, the Work and
Derivative
+Works thereof.
+A.16.2 Licensor means the individual, individuals, entity or entities
that
+offer(s) the Original Work under the terms of this Licence.
+A.16.3 Object Code means the form of the Original Work resulting
from
+mechanical transformation or translation of a Source form, including but
not
+limited to compiled object code, generated documentation, and conversions
to
+other media types.
+A.16.4 Original Work means the work of authorship, whether in Source or
Object
+form, made available under the Licence, as indicated by an Attribution
Notice
+that is included in or attached to the work.
+A.16.5 Source Code means the preferred form of the Original Work for
making
+modifications to it and all available documentation describing how to
modify
+the Original Work.
+A.16.6 Third Party Provision means the use or distribution of the
Original
+Work or Derivative Works in any way such that the Original Work or
Derivative
+Works may be used by anyone other than You, whether the Original Work
or
+Derivative Works are distributed to those persons or made available as
an
+application intended for use over a computer network.
+A.16.7 You means an individual or entity exercising rights under this
Licence
+who has not previously violated the terms of this Licence with respect to
the
+Work, or who has received express permission from the Licensor to
exercise
+rights under this Licence despite a previous violation. For legal
entities,
+“You” includes any entity that controls, is controlled by, or is under
common
+control with you.
+
+For purposes of this definition “control” means (i) the power, direct
or
+indirect, to cause the direction or management of such entity, whether
by
+contract or otherwise; or (ii) ownership of fifty percent (50%) or more of
the
+outstanding shares; or (iii) beneficial ownership of such entity.
+
+
+eXist DB
+Part of this software comes from the eXist DB (Open Source Native XML
Database)
+project. The eXist DB software library provided here is unmodified.
Source
+code for the eXist DB software can be downloaded at the following
link:
+http://exist.svn.sourceforge.net/viewvc/exist/
+

Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml 2013-03-25 12:39:38
UTC (rev 6247)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/pom.xml 2013-04-11 17:08:09
UTC (rev 6248)
@@ -29,63 +29,6 @@
<finalName>${project.artifactId}</finalName>

<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>create-configuration</id>
- <phase>process-resources</phase>
- <configuration>
- <tasks>
- <!--
- <copy
file="${project.basedir}/conf/base2/configuration-rules.xml"
-
todir="${project.build.directory}/conf"/>
- -->
- <copy
file="${project.basedir}/conf/${configurationFile}"
-
todir="${project.build.directory}/conf" />
- <!-- <copy
file="${project.basedir}/conf/webAdminConfig.xml"
todir="${project.build.directory}/conf" />
- -->
- <copy
file="${project.basedir}/conf/configuration.xml.template"
-
todir="${project.build.directory}/conf" />
- <copy
file="${project.basedir}/conf/rrdma_db.sql"
-
todir="${project.build.directory}/conf" />
- <copy
file="${project.basedir}/conf/test_rrdma_db.sql"
-
todir="${project.build.directory}/conf" />
- <move
file="${project.build.directory}/conf/${configurationFile}"
-
tofile="${project.build.directory}/conf/configuration.xml" />
- <copy
file="${project.basedir}/conf/webAdminConfig.xml"
-
todir="${project.build.directory}/conf"/>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>create-aar</id>
- <phase>compile</phase>
- <configuration>
- <tasks>
- <copy
toDir="${project.build.outputDirectory}" failonerror="false">
- <fileset
dir="${project.basedir}/conf/axis2">
- <include name="**/*.xml" />
- </fileset>
- </copy>
- <mkdir dir="${project.build.directory}" />
- <jar
destfile="${project.build.directory}/${aar.name}.aar">
- <fileset
includes="**/Axis2PerfsonarServiceConnPoint.class **/*.xml"
-
dir="${project.build.outputDirectory}" />
- </jar>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
<plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>
@@ -97,50 +40,13 @@
</overlays>
<webResources>
<resource>
-
<directory>${project.build.directory}/conf</directory>
+ <directory>${basedir}/doc</directory>
<includes>
- <include>**/*</include>
+ <include>*.txt</include>
</includes>
-
<targetPath>WEB-INF/classes/perfsonar/conf</targetPath>
+ <targetPath>doc</targetPath>
</resource>
- <resource>
- <directory>${project.build.directory}</directory>
- <includes>
- <include>**/*.aar</include>
- </includes>
- <targetPath>WEB-INF/services</targetPath>
- </resource>
- <resource>
-
<directory>${project.basedir}/resources/${axis2Id}/webapp/axis2-web</directory>
- <includes>
- <include>**/*</include>
- </includes>
- <targetPath>axis2-web</targetPath>
- </resource>
- <resource>
-
<directory>${project.basedir}/resources/${axis2Id}/repository/modules</directory>
- <includes>
- <include>**/*</include>
- </includes>
- <targetPath>WEB-INF/modules</targetPath>
- </resource>
- <resource>
-
<directory>${project.basedir}/resources/${axis2Id}/conf</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- <targetPath>WEB-INF/conf</targetPath>
- </resource>
- <resource>
- <directory>${project.basedir}/conf</directory>
- <includes>
- <!-- <include>log4j.xml</include> -->
- <include>log4j.properties</include>
- </includes>
- <targetPath>WEB-INF/classes</targetPath>
- </resource>
</webResources>
-
<webXml>${project.basedir}/resources/${axis2Id}/webapp/WEB-INF/web.xml</webXml>
</configuration>
</plugin>

@@ -173,21 +79,26 @@
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>

- <!-- execution: mvn -Djetty.port=9999 jetty:run-war -->
<plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <configuration>
-
<webApp>${project.build.directory}/${project.artifactId}</webApp>
- </configuration>
- <version>6.1.26</version>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
</plugin>

+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ </plugin>
+
+ <!-- execution: mvn -P development -DskipDebProfile -pl
perfsonar-java-rrd-ma clean integration-test -->
+ <plugin>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat6-maven-plugin</artifactId>
+ </plugin>
+
</plugins>
</build>

<dependencyManagement>
-
<dependencies>
<dependency>
<groupId>org.opensaml</groupId>
@@ -284,6 +195,30 @@

<profiles>
<profile>
+ <id>development</id>
+ <!-- Activate the development profile and disable the deb
profile with
+ mvn -P development -DskipDebProfile -pl perfsonar-java-rrd-ma
+ -->
+ <build>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/test/resources</directory>
+ <includes>
+ <include>*.xml</include>
+ <include>**/*.xml</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}/src/main/resources</directory>
+ <includes>
+
<include>perfsonar/conf/webAdminConfig.xml</include>
+ <include>**/*.sql</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+ </profile>
+ <profile>
<id>deb</id>
<activation>
<!-- Activate this profile by default unless explicitly
disabled. See

Modified:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/checkstyle/checkstyle.xml
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/src/checkstyle/checkstyle.xml
2013-03-25 12:39:38 UTC (rev 6247)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/src/checkstyle/checkstyle.xml
2013-04-11 17:08:09 UTC (rev 6248)
@@ -68,7 +68,8 @@
<!-- Miscellaneous other checks. -->
<!-- See http://checkstyle.sf.net/config_misc.html -->
<module name="RegexpSingleline">
- <property name="format" value="\s+$"/>
+ <!-- I only want lines with *code* reported with trailing spaces, not
for empty ones or empty comment lines -->
+ <property name="format" value="[^[:space:]\*]+\s+$"/>
<property name="minimum" value="0"/>
<property name="maximum" value="0"/>
<property name="message" value="Line has trailing spaces."/>
@@ -88,9 +89,10 @@
<!--module name="JavadocMethod"/>
<module name="JavadocType"/>
<module name="JavadocVariable"/-->
- <module name="JavadocStyle"/>
+ <module name="JavadocStyle">
+ <property name="checkFirstSentence" value="false"/>
+ </module>

-
<!-- Checks for Naming Conventions. -->
<!-- See http://checkstyle.sf.net/config_naming.html -->
<module name="ConstantName"/>
@@ -109,16 +111,19 @@
<module name="AvoidStarImport"/>
<module name="IllegalImport"/> <!-- defaults to sun.* packages -->
<module name="RedundantImport"/>
- <module name="UnusedImports"/>
+ <module name="UnusedImports">
+ <property name="severity" value="warning"/>
+ </module>


<!-- Checks for Size Violations. -->
<!-- See http://checkstyle.sf.net/config_sizes.html -->
<module name="LineLength">
- <property name="max" value="120"/>
+ <property name="max" value="150"/>
</module>
<module name="MethodLength">
<property name="severity" value="warning"/>
+ <property name="max" value="190"/>
</module>
<module name="ParameterNumber">
<property name="severity" value="warning"/>
@@ -152,10 +157,6 @@
<property name="tokens"

value="LITERAL_DO,LITERAL_FINALLY,LITERAL_ELSE,LITERAL_FOR,LITERAL_TRY,LITERAL_WHILE,INSTANCE_INIT,STATIC_INIT"/>
</module>
- <module name="LeftCurly">
- <property name="option" value="nl"/>
- <property name="tokens"
value="CLASS_DEF,INTERFACE_DEF,METHOD_DEF"/>
- </module>
<module name="NeedBraces"/>
<module name="RightCurly"/>

@@ -194,9 +195,8 @@
<!-- See http://checkstyle.sf.net/config_misc.html -->
<module name="ArrayTypeStyle"/>
<!--module name="FinalParameters"/-->
- <module name="TodoComment">
- <property name="severity" value="warning"/>
- </module>
+ <!-- I don't want the TODO comments being reported by CheckStyle -->
+ <!--<module name="TodoComment"/>-->
<module name="UpperEll"/>

<module name="FileContentsHolder"/>

Added: trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/changelog
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/changelog
(rev 0)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/changelog
2013-04-11 17:08:09 UTC (rev 6248)
@@ -0,0 +1,196 @@
+perfsonar-java-rrd-ma (3.4-7) testing; urgency=low
+
+ * Updated external dependencies to newer versions
+ * Dropped perfsonar base 3
+ * Added automatic table creation during intial start
+ * Changed default configuration to assume Tomcat port 8080
+ * Changed default configuration to assume perfsonar_rrdma schema name
+ * Added nmwg-sql-converter utility
+
+ -- Gerd Behrmann
<>
Wed, 29 Aug 2012 14:51:00 +0200
+
+perfsonar-java-rrd-ma (3.4-6) testing; urgency=low
+
+ * Replaced rrdjtool with JNA wrapper of librrd
+
+ -- Gerd Behrmann
<>
Tue, 21 Aug 2012 11:06:00 +0200
+
+perfsonar-java-rrd-ma (3.4-5) testing; urgency=low
+
+ * Changed Hibernate config to not recreate schema on restart
+ * Changed SQL meta data backend to not hardcode interface name
+ * Reduced logging overhead of large response messages
+
+ -- Gerd Behrmann
<>
Mon, 20 Aug 2012 11:30:00 +0200
+
+perfsonar-java-rrd-ma (3.4-4) stable; urgency=low
+
+ * Moved to Tomcat 6
+ * Set explicit table name for interfaces table
+
+ -- Gerd Behrmann
<>
Fri, 17 Aug 2012 10:00:00 +0200
+
+perfsonar-java-rrd-ma (3.4-3) stable; urgency=low
+
+ * Empty message error reported by tester fixed.
+
+ -- Piotr Pikusa
<>
Fri, 12 May 2012 08:00:00 +0200
+
+
+perfsonar-java-rrd-ma (3.4-2) stable; urgency=low
+
+ * All errors reported by tester fixed
+
+ -- Piotr Pikusa
<>
Fri, 12 Mar 2012 08:00:00 +0200
+
+
+perfsonar-java-rrd-ma (3.4-1) stable; urgency=low
+
+ * Transition to SQL db
+
+ -- Piotr Pikusa
<>
Fri, 09 Mar 2012 08:00:00 +0200
+
+perfsonar-java-rrd-ma (3.3-1) stable; urgency=low
+
+ * New Web admin implemented
+ * Old configuration.xml file replaced with new. The old file renamed to
'configuration.xml.old'. This is temporary solution until new idea about conf
files replecament system is invent.
+ -- Piotr Pikusa
<>
Wed, 22 Mar 2010 16:00:00 +0200
+
+perfsonar-java-rrd-ma (3.3-0) stable; urgency=low
+
+ * 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:8180/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
+
+ -- Piotr Pikusa
<>
Wed, 25 Feb 2010 16:00:00 +0200
+
+perfsonar-java-rrd-ma (3.2) stable; urgency=low
+
+ * 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
+
+ -- Piotr Pikusa
<>
Wed, 08 Jul 2009 13:00:00 +0200
+
+geant2-java-rrd-ma (3.1.2-1) stable; urgency=low
+
+ * Dummy package to rename service from geant2-java-rrd-ma to
perfsonar-java-rrd-ma
+
+ -- Piotr Pikusa
<>
Wed, 08 Jul 2009 13:00:00 +0200
+
+geant2-java-rrd-ma (3.1.1-1) stable; urgency=low
+
+ * Fixed Bug #724: wrong paths of log files
+
+ -- Roman Lapacz
<>
Wed, 04 Mar 2009 12:00:00 +0200
+
+geant2-java-rrd-ma (3.1-1) stable; urgency=low
+
+ * New: EchoRequest message allows now checking: if eXist database is
running and the count the content of metadata configuration file; access data
from random RRD file. It is also possible to request a self-test including
all above.
+ * New: parameter keyword introduced in metadata block to indicate
project/organisation name
+ * New: new request MeasurementArchiveStoreRequest switched off by default
+ * New: performance improvements for MetadataKeyRequest message which
fetches all metadata elements
+ * Change: new service path /usr/lib/perfsonar/services/geant2-java-rrd-ma/
+ * Change: format of log messages changed
+ * Change: use of pSbase v1.0.20080902
+ * Change: use of web admin library v0.9.3c
+ * Change: eXist default port is 8180
+ * Change: obsolete authRealm removed from metadata configuration file
+ * Fixed Bug #497: default value of service.r.access_point property
+ * Fixed Bug #405: request for ability to define which domain is the
interface (solved via keyword)
+
+ -- Roman Lapacz
<>
Wed, 01 Oct 2008 12:00:00 +0200
+
+geant2-java-rrd-ma (3.0-1) stable; urgency=low
+
+ * New: support of ErrorResponse message type (use of perfsonar-base
library version 1.0.20080310)
+ * New: netutil namespace of datum element in the response containing
utilization value is used.
+ * New: WebAdmin administration (set of servlets) added
+ * New: RPM is used as the installation package
+ * New: support of AuthN functionality
+ * Change: supportedEventTypes parameter in metadata element (in metadata
cofiguration file) replaced with eventType element (the parameter is still
supported)
+ * Change: LS register component can now take metadata elements from xml
database directly (not only from XML metadata config file)
+ * Change: LS register interval time updated (now it's 12 hours)
+ * Change: service name has changed (now it is geant2-java-rrd-ma)
+
+ -- Roman Lapacz
<>
Mon, 10 Mar 2008 12:00:00 +0200
+
+geant2-java-rrd-ma (2.3.2-1) stable; urgency=low
+
+ * New: the dump of rrd test file added
+ * Fixed Bug #264: bulding the rrdjtool library for 64 bit arch fixed
+
+ -- Roman Lapacz
<>
Fri, 23 Nov 2007 12:00:00 +0200
+
+geant2-java-rrd-ma (2.3.1-1) stable; urgency=low
+
+ * Fixed Bug #243: problem with static default context name of eXist in URL
address fixed
+
+ -- Roman Lapacz
<>
Fri, 26 Oct 2007 12:00:00 +0200
+
+geant2-java-rrd-ma (2.3-1) stable; urgency=low
+
+ * New: support for two additional characteristics: ifErrors and ifDiscards
+ * New: new RRD test file to reflect new characteristics
+ * New: eventType paremeter added to the key
+ * Change: nmwg namespace for utilization datum element
+ * Change: defaultly all log messages are collected in one log file
+ * Change: defaultly debug log level is switched off
+ * Change: base chanining switched on, propert in service.properties exist
to switch it off
+ * Change: eventType URL-based only
+ * Change: service moved to new SVN structure
+ * Change: ant scripts improved
+ * Change: namespace of datum elements in SetupDataResponse message tied to
eventType value
+ * Change: supportedEventType parameter replaced by eventType element in
metadata config file (excluding utilization). But service supports both
+ * Change: use of new versions of base and NMWG libraries
+ * Change: if 'jar' target is called and const.properties file does not
exist then const.properties.template is renamed into const.properties before
compilation
+ * Change: new parameters set in data element in SetupDataResponse message
containing general parameters used to create rrd file
+ * Change: updated support for LookupInfoRequest to include all service
properties
+ * Change: service can generate keys with parameters elements of different
namespaces
+ * Fixed Bug #102: missing data in response
+ * Fixed Bug #103: missing data in response
+ * Fixed Bug #150: time interval shifted
+ * Fixed Bug #157: namespace declaration
+ * Fixed Bug #195: directories structure
+ * Fixed Bug #198: exist database installation and initialisation
limitations
+ * Fixed Bug #221: supportedEventType vs eventType compatibility issue
+
+ -- Roman Lapacz
<>
Wed, 24 Oct 2007 12:00:00 +0200
+
+geant2-java-rrd-ma (2.2-1) stable; urgency=low
+
+ * Change: default log4j parameters updated; can generate 11 archive log
files for each log level (500KB each)
+ * Change: bug of wrong Context of exist war file fixed
+ * Change: bug of wrong data source name when writing data into new RRD
file fixed. Using new eventType was causing a problem while storing new data
in RRD MA
+
+ -- Roman Lapacz
<>
Tue, 22 May 2007 12:00:00 +0200
+
+geant2-java-rrd-ma (2.1-1) stable; urgency=low
+
+ * New: Support for LookupInfoRequest for getting general information about
the service
+ * New: Key contains optional parameters describing RRD file: step, data
type, heartbeat, min and max value
+ * New: Configure script asks for service description, contact email and
organization name
+ * New: Iso time type support
+ * Change: using only one exception class
+
+ -- Roman Lapacz
<>
Tue, 15 May 2007 12:00:00 +0200
+
+geant2-java-rrd-ma (2.0-1) stable; urgency=low
+
+ * New: Lookup Service registration
+ * New: pre-install, configure, deploy, test steps in installation process
+ * New: echoRequest functionality
+ * New: 64-bit Linux support for building the rrdjtool library
+ * New: result codes
+ * New: support for mulitple service in one Tomcat instance
+ * New: removing whitespaces such as newline, tabs, etc that are present in
the request messages
+ * Change: support for new utilization evenType value naming scheme
+ * Change: log4J configuration in log4j.properties
+ * Fixed Bug #108: installation process
+ * Fixed Bug #109: installation process
+
+ -- Roman Lapacz
<>
Wed, 21 Mar 2007 12:00:00 +0200
+

Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/control
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/control
2013-03-25 12:39:38 UTC (rev 6247)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/control/control
2013-04-11 17:08:09 UTC (rev 6248)
@@ -1,6 +1,6 @@
Section: web
Priority: extra
-Maintainer: Gerd Behrmann
<>
+Maintainer: Antoine Delvaux
<>
Build-Depends: debhelper (>= 5), maven | maven2
Standards-Version: 3.7.2
Package: perfsonar-java-rrd-ma

Added: trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/copyright
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/copyright
(rev 0)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/src/deb/copyright 2013-04-11
17:08:09 UTC (rev 6248)
@@ -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/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/MetadataStorageDAO.java
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/MetadataStorageDAO.java
2013-03-25 12:39:38 UTC (rev 6247)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/MetadataStorageDAO.java
2013-04-11 17:08:09 UTC (rev 6248)
@@ -7,6 +7,19 @@

public interface MetadataStorageDAO
{
+ /**
+ * Test if we can establish a connection to the DB.
+ * This should test both connectivity and user rights.
+ * @return
+ */
+ boolean testConnectivity();
+
+ /**
+ * Delete all elements existing in the DB.
+ * @return
+ */
+ boolean deleteAll();
+
Collection<Element> fetch(Element request) throws PerfSONARException;

String rawFetch(Element request) throws PerfSONARException;

Modified:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/exist/ExistMetadataStorageDAOImpl.java
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/exist/ExistMetadataStorageDAOImpl.java
2013-03-25 12:39:38 UTC (rev 6247)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/exist/ExistMetadataStorageDAOImpl.java
2013-04-11 17:08:09 UTC (rev 6248)
@@ -143,7 +143,16 @@
throw new PerfSONARException("removing_not_supported", "Can not
remove metadata elements.");
}

+ public boolean deleteAll() {
+ // Not implemented
+ return false;
+ }

+ public boolean testConnectivity() {
+ // Not implemented
+ return true;
+ }
+
// -------------------------------------------------------------
protected methods



Modified:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/persistence/entity/Interfaces.java
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/persistence/entity/Interfaces.java
2013-03-25 12:39:38 UTC (rev 6247)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/persistence/entity/Interfaces.java
2013-04-11 17:08:09 UTC (rev 6248)
@@ -10,7 +10,7 @@

@Entity
@Table(name = "interfaces")
-@NamedNativeQuery(name
= Interfaces.ALL, query = "select * from interfaces m", resultClass =
Interfaces.class)
+@NamedNativeQuery(name
= Interfaces.ALL, query = "SELECT * FROM interfaces m", resultClass =
Interfaces.class)
public class Interfaces
{
public static final String ALL = "allInterfaces";
@@ -126,219 +126,134 @@
}


- public String getKeyword()
- {
+ public String getKeyword() {
return keyword;
}
-
- public void setKeyword(String keyword)
- {
+ public void setKeyword(String keyword) {
this.keyword = keyword;
}

- public String getCapacity()
- {
+ public String getCapacity() {
return capacity;
}
-
-
- public void setCapacity(String capacity)
- {
+ public void setCapacity(String capacity) {
this.capacity = capacity;
}

-
- public String getDataSource()
- {
+ public String getDataSource() {
return dataSource;
}
-
-
- public void setDataSource(String dataSource)
- {
+ public void setDataSource(String dataSource) {
this.dataSource = dataSource;
}

-
- public String getDataSourceMaxValue()
- {
+ public String getDataSourceMaxValue() {
return dataSourceMaxValue;
}
-
-
- public void setDataSourceMaxValue(String dataSourceMaxValue)
- {
+ public void setDataSourceMaxValue(String dataSourceMaxValue) {
this.dataSourceMaxValue = dataSourceMaxValue;
}

-
- public String getDataSourceMinValue()
- {
+ public String getDataSourceMinValue() {
return dataSourceMinValue;
}
+ public void setDataSourceMinValue(String dataSourceMinValue) {
+ this.dataSourceMinValue = dataSourceMinValue;
+ }

- public String getDataSourceHeartbeat()
- {
+ public String getDataSourceHeartbeat() {
return dataSourceHeartbeat;
}
-
- public void setDataSourceHeartbeat(String dataSourceHeartbeat)
- {
+ public void setDataSourceHeartbeat(String dataSourceHeartbeat) {
this.dataSourceHeartbeat = dataSourceHeartbeat;
}

- public void setHostName(String hostName)
- {
- this.hostName = hostName;
- }
-
-
- public void setDataSourceMinValue(String dataSourceMinValue)
- {
- this.dataSourceMinValue = dataSourceMinValue;
- }
-
-
- public String getDataSourceStep()
- {
+ public String getDataSourceStep() {
return dataSourceStep;
}
-
-
- public void setDataSourceStep(String dataSourceStep)
- {
+ public void setDataSourceStep(String dataSourceStep) {
this.dataSourceStep = dataSourceStep;
}

-
- public String getDataSourceType()
- {
+ public String getDataSourceType() {
return dataSourceType;
}
-
-
- public void setDataSourceType(String dataSourceType)
- {
+ public void setDataSourceType(String dataSourceType) {
this.dataSourceType = dataSourceType;
}

-
- public String getDirection()
- {
+ public String getDirection() {
return direction;
}
-
-
- public void setDirection(String direction)
- {
+ public void setDirection(String direction) {
this.direction = direction;
}

-
- public String getEventType()
- {
+ public String getEventType() {
return eventType;
}
-
-
- public void setEventType(String eventType)
- {
+ public void setEventType(String eventType) {
this.eventType = eventType;
}
-
-
- public String getFile()
- {
+
+ public String getFile() {
return file;
}
-
-
- public void setFile(String file)
- {
+ public void setFile(String file) {
this.file = file;
}

-
- public String getHostName()
- {
+ public String getHostName() {
return hostName;
}
-
-
- public void setHostNam(String hostName)
- {
+ public void setHostName(String hostName) {
this.hostName = hostName;
}

- public String getIfName()
- {
+ public String getIfName() {
return ifName;
}
-
- public void setIfName(String ifName)
- {
+ public void setIfName(String ifName) {
this.ifName = ifName;
}

-
- public String getIfAddress()
- {
+ public String getIfAddress() {
return ifAddress;
}
-
- public String getIfAddressType()
- {
- return ifAddressType;
- }
-
- public void setIfAddress(String ifAddress)
- {
+ public void setIfAddress(String ifAddress) {
this.ifAddress = ifAddress;
}

-
- public void setIfAddressType(String ifAddressType)
- {
+ public String getIfAddressType() {
+ return ifAddressType;
+ }
+ public void setIfAddressType(String ifAddressType) {
this.ifAddressType = ifAddressType;
}

- public String getIfDescription()
- {
+ public String getIfDescription() {
return ifDescription;
}
-
-
- public void setIfDescription(String ifDescription)
- {
+ public void setIfDescription(String ifDescription) {
this.ifDescription = ifDescription;
}

-
- public int getMetadataId()
- {
+ public int getMetadataId() {
return metadataId;
}
+ // metadataId is an AUTOINCREMENT field, it cannot be set directly

- public String getSubjId()
- {
+ public String getSubjId() {
return subjId;
}
-
-
- public void setSubjId(String subjId)
- {
+ public void setSubjId(String subjId) {
this.subjId = subjId;
}

-
- public String getValueUnits()
- {
+ public String getValueUnits() {
return valueUnits;
}
-
-
- public void setValueUnits(String valueUnits)
- {
+ public void setValueUnits(String valueUnits) {
this.valueUnits = valueUnits;
}


Modified:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/rrd/RRDDataStorageDAOImpl.java
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/rrd/RRDDataStorageDAOImpl.java
2013-03-25 12:39:38 UTC (rev 6247)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/rrd/RRDDataStorageDAOImpl.java
2013-04-11 17:08:09 UTC (rev 6248)
@@ -11,16 +11,18 @@
import org.perfsonar.base2.xml.nmwg.Parameter;

import
org.perfsonar.service.measurementArchive.rrdType.storage.DataStorageDAO;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

import static
org.perfsonar.service.measurementArchive.rrdType.storage.rrd.Rrd.FetchData;

public class RRDDataStorageDAOImpl extends Component implements
DataStorageDAO
{

+ protected Logger logger = LoggerFactory.getLogger(getClass());

// -------------------------------------------------------------

-
public static final String CONSOLIDATION_AVERAGE = "AVERAGE";

public static final String CONSOLIDATION_MIN = "MIN";

Modified:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/sql/MysqlMetadataStorageDAOImpl.java
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/sql/MysqlMetadataStorageDAOImpl.java
2013-03-25 12:39:38 UTC (rev 6247)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/sql/MysqlMetadataStorageDAOImpl.java
2013-04-11 17:08:09 UTC (rev 6248)
@@ -9,6 +9,7 @@
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
import javax.persistence.Persistence;
+import javax.persistence.PersistenceException;
import javax.persistence.Query;

import org.perfsonar.base2.service.configuration.Component;
@@ -24,23 +25,26 @@
import
org.perfsonar.service.measurementArchive.rrdType.storage.persistence.entity.Interfaces;
import
org.perfsonar.service.measurementArchive.rrdType.storage.sql.query.QueryGenerator;

+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
public class MysqlMetadataStorageDAOImpl extends Component implements
MetadataStorageDAO
{
+ protected Logger logger = LoggerFactory.getLogger(getClass());
+
public static final String PERSISTENCE_UNIT_NAME =
"org.perfsonar.service.measurementArchive.rrdType.storage.sql";
protected EntityManager em;
protected final QueryGenerator qg = new QueryGenerator();
private EntityManagerFactory entityManagerFactory;

@Override
- public void destroy() throws PerfSONARException
- {
+ public void destroy() throws PerfSONARException {
em.close();
entityManagerFactory.close();
}

@Override
- public void init() throws PerfSONARException
- {
+ public void init() throws PerfSONARException {
Component configuration =
ConfigurationManager.getInstance().getConfiguration().getAuxiliaryComponent(
MetadataStorageDAOFactory.METADATA_STORAGE_DAO_NAME);
String dbUri = configuration.getOption("uri").getValue();
@@ -55,9 +59,7 @@
try {
Map<String, Object> jpaConfig = new HashMap<String, Object>();
jpaConfig.put("javax.persistence.jdbc.driver",
"com.mysql.jdbc.Driver");
- //FIXME: check if we need '&' or '&amp;'
- jpaConfig.put("javax.persistence.jdbc.url", dbUri + schema
- +
"?autoReconnectForPools=true&autoReconnectForPools=true");
+ jpaConfig.put("javax.persistence.jdbc.url", dbUri + schema);
jpaConfig.put("javax.persistence.jdbc.user", username);
jpaConfig.put("javax.persistence.jdbc.password", password);
entityManagerFactory =
Persistence.createEntityManagerFactory(PERSISTENCE_UNIT_NAME, jpaConfig);
@@ -66,25 +68,56 @@
throw new PerfSONARException("Persistence initialization failed:
" + e.getMessage(), e);
}
}
+
+ @Override
+ public boolean testConnectivity() {
+ try {
+ logger.debug("Testing MySQL connectivity");
+ Query q = em.createNamedQuery(Interfaces.ALL);
+ q.getResultList();
+ } catch (PersistenceException e) {
+ logger.info("There is an issue with the BD, but connectivity
seems OK! {}", e.getMessage());
+ return false;
+ } catch (Exception e) {
+ logger.warn("Connectivity to the DB cannot be asserted: {}",
e.getMessage());
+ return false;
+ }
+ logger.debug("BD with schema and connectivity OK!");
+ return true;
+ }

@Override
- public void run() throws PerfSONARException
- {
+ public boolean deleteAll() {
+ try {
+ logger.info("Deleting all Metadata existing in the DB");
+ // A DELETE query must be enclosed inside a transaction
+ em.getTransaction().begin();
+ Query q = em.createNativeQuery("DELETE FROM interfaces;");
+ int n = q.executeUpdate();
+ em.getTransaction().commit();
+ logger.debug("{} interfaces metadata deleted.", n);
+ } catch (Exception e) {
+ logger.warn("There was a DB problem deleting metadata: {} {}",
e.getClass(), e.getMessage());
+ return false;
+ }
+ return true;
+ }
+
+ @Override
+ public void run() throws PerfSONARException {
// TODO Auto-generated method stub

}

@Override
- public Collection<Element> fetch(Element request) throws
PerfSONARException
- {
- // TODO Auto-generated method stub
+ public Collection<Element> fetch(Element request) throws
PerfSONARException {
long t1 = System.currentTimeMillis();
checkMetadataCorectness((Message) request);

if (!(request instanceof Message)) {
throw new PerfSONARException("parse",
- "Object [" + request.getClass() +
"] is not a valid Message [" + Message.class
- + "] element.");
+ "Object [" + request.getClass() + "] is not a valid
Message [" + Message.class
+ + "] element.");
}

Message message = (Message) request;
@@ -97,7 +130,7 @@
}

long t2 = System.currentTimeMillis();
- logger.info("TIME of Fetch: " + (t2 - t1));
+ logger.info("TIME of Fetch: {}", t2 - t1);

return result;
}
@@ -106,10 +139,7 @@
* @return String with the response message (in NMWG format) of
MetadataKeyRequest
* @throws PerfSONARException
*/
- public String rawFetch() throws PerfSONARException
- {
-
-
+ public String rawFetch() throws PerfSONARException {
List<Interfaces> resultList = (List<Interfaces>)
em.createNamedQuery(Interfaces.ALL).getResultList();
MetadaKeyResponse mKRR = new MetadaKeyResponse();

@@ -117,9 +147,7 @@
}

@Override
- public String rawFetch(Element request) throws PerfSONARException
- {
-
+ public String rawFetch(Element request) throws PerfSONARException {
long t1 = System.currentTimeMillis();
checkMetadataCorectness((Message) request);
Metadata metadata = ((Message)
request).getMetadataCollection().iterator().next();
@@ -130,66 +158,58 @@
String result =
mKRR.fetchMetadataMessage(query.getResultList().iterator());

long t2 = System.currentTimeMillis();
- logger.info("TIME of rawFetch: " + (t2 - t1));
+ logger.info("TIME of rawFetch: {}", t2 - t1);

return result;
-
}

@Override
- public void remove(Element request) throws PerfSONARException
- {
+ public void remove(Element request) throws PerfSONARException {
// TODO Auto-generated method stub

}

@Override
- public void store(Element request) throws PerfSONARException
- {
+ public void store(Element request) throws PerfSONARException {
// TODO Auto-generated method stub

}

@Override
- public void update(Element request) throws PerfSONARException
- {
+ public void update(Element request) throws PerfSONARException {
// TODO Auto-generated method stub

}

+

- private void checkMetadataCorectness(Message request) throws
PerfSONARException
- {
-
+ private void checkMetadataCorectness(Message request) throws
PerfSONARException {
if (request.getMetadataCollection().isEmpty()) {
- logger.warn("can not find any metadatas with a valid content");
- throw new PerfSONARException("query_exception", "can not find
any metadatas with a valid content");
+ String msg = "Cannot find any metadata with a valid content";
+ logger.warn(msg);
+ throw new PerfSONARException("query_exception", msg);
}

String eventType = null;
for (Metadata m : request.getMetadataCollection()) {
-
try {
eventType = m.getFirstEventType().getEventType().trim();
} catch (Exception ex) {
-
- logger.warn("can not find correct eventType in metadata
element");
- throw new PerfSONARException("query_exception", "can not
find correct eventType in metadata element");
+ String msg = "Cannot find correct eventType in metadata
element";
+ logger.warn(msg);
+ throw new PerfSONARException("query_exception", msg);
}
if (eventType != null) {
break;
}
-
}

-
if (eventType == null || eventType.isEmpty()) {
- logger.warn("can not find correct eventType in metadata
element");
- throw new PerfSONARException("query_exception", "can not find
eventType in metadata element");
+ String msg = "Cannot find correct eventType in metadata element";
+ logger.warn(msg);
+ throw new PerfSONARException("query_exception", msg);
}

-
}

-
}

Added:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/servlets/DbInitializerServlet.java
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/servlets/DbInitializerServlet.java
(rev 0)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/servlets/DbInitializerServlet.java
2013-04-11 17:08:09 UTC (rev 6248)
@@ -0,0 +1,66 @@
+package org.perfsonar.service.measurementArchive.servlets;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.perfsonar.base2.service.configuration.ConfigurationManager;
+import org.perfsonar.base2.service.exceptions.PerfSONARException;
+
+import org.perfsonar.webadmin.servlet.BasicServlet;
+
+import
org.perfsonar.service.measurementArchive.rrdType.storage.sql.MysqlMetadataStorageDAOImpl;
+
+/**
+ * This servlet initialise the SQL database used to store metadata.
+ *
+ * @author Antoine Delvaux -

+ *
+ */
+@SuppressWarnings("serial")
+public class DbInitializerServlet extends BasicServlet {
+
+ private ConfigurationManager configManager;
+ private MysqlMetadataStorageDAOImpl dao;
+
+ @Override
+ protected void doGet(HttpServletRequest request, HttpServletResponse
response)
+ throws ServletException, IOException {
+ String result = "ko";
+
+ try {
+ configManager = ConfigurationManager.getInstance();
+ dao = (MysqlMetadataStorageDAOImpl) configManager
+
.getConfiguration().getAuxiliaryComponent("metadataStorageDAO2");
+
+ String action = request.getParameter("action");
+ logger.debug("We're asked to \"{}\"", action);
+
+ // First check if the DB exist (and we have access)
+ if (dao.testConnectivity()) {
+ if ("emptyDB".equals(action)) {
+ if (dao.deleteAll()) {
+ logger.debug("We successfuly emptied the DB.");
+ result = "ok=yes";
+ } else {
+ logger.warn("There was a problem trying to empty the
DB.");
+ }
+ } else {
+ logger.debug("We'll first ask for confirmation");
+ result = "ok=askConfirm";
+ }
+ } else {
+ logger.warn("Connection to the DB cannot be established!");
+ }
+
+ } catch (PerfSONARException e) {
+ logger.warn("DB initialization failed: " + e.getMessage());
+ }
+
+ getServletConfig().getServletContext().getRequestDispatcher(
+ "/index.jsp?page=dbInit&" + result).forward(request,
response);
+ }
+
+}


Property changes on:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service/measurementArchive/servlets/DbInitializerServlet.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain

Modified:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/META-INF/persistence.xml
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/META-INF/persistence.xml
2013-03-25 12:39:38 UTC (rev 6247)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/META-INF/persistence.xml
2013-04-11 17:08:09 UTC (rev 6248)
@@ -11,6 +11,7 @@

<class>org.perfsonar.service.measurementArchive.rrdType.storage.persistence.entity.Interfaces</class>

<properties>
+ <!-- We want to automatically update the DB schema -->
<property name="hibernate.hbm2ddl.auto" value="update"/>
<property name="hibernate.c3p0.min_size" value="1"/>
<property name="hibernate.c3p0.max_size" value="30"/>
@@ -19,6 +20,8 @@
<property name="hibernate.c3p0.acquireRetryDelay" value="0"/>
<property name="hibernate.c3p0.breakAfterAcquireFailure"
value="true"/>
<property name="hibernate.c3p0.testConnectionOnCheckout"
value="true"/>
+ <property name="hibernate.connection.autoReconnect"
value="true"/>
+ <property name="hibernate.connection.autoReconnectForPools"
value="true"/>
<property name="javax.persistence.transaction"
value="RESOURCE_LOCAL"/>
</properties>
</persistence-unit>

Added: trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/log4j.xml
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/log4j.xml
(rev 0)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/log4j.xml
2013-04-11 17:08:09 UTC (rev 6248)
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM
"http://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/xml/doc-files/log4j.dtd";>
+
+<!-- This is the LOG4J configuration for perfSONAR production sites -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";>
+
+ <!-- Section: APPENDERS -->
+
+ <!--
+ writes log messages to the console. It outputs file name,
+ method name and line number of the caller. This is slow,
+ so just use it for debugging.
+ -->
+ <appender name="console" class="org.apache.log4j.ConsoleAppender">
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d - [%p] %c{1}[%M]:%L -
%m %n"/>
+ </layout>
+ </appender>
+
+ <!-- We have a log file for perfSONAR -->
+ <appender name="perfsonar" class="org.apache.log4j.RollingFileAppender">
+ <param name="File"
value="/var/log/perfsonar-java-rrd-ma/perfsonar.log"/>
+ <param name="MaxFileSize" value="10MB"/>
+ <param name="MaxBackupIndex" value="7"/>
+ <param name="Encoding" value="UTF-8"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d [%t] %-5p (%F [%M]:%L)
- %m %n"/>
+ </layout>
+ </appender>
+
+ <!-- We have a log file for the WebAdmin -->
+ <appender name="webadmin" class="org.apache.log4j.RollingFileAppender">
+ <param name="File"
value="/var/log/perfsonar-java-rrd-ma/webadmin.log"/>
+ <param name="MaxFileSize" value="10MB"/>
+ <param name="MaxBackupIndex" value="7"/>
+ <param name="Encoding" value="UTF-8"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d [%t] %-5p (%F [%M]:%L)
- %m %n"/>
+ </layout>
+ </appender>
+
+ <!-- Some general exceptions -->
+ <!-- Axis produces a large amount of debugging output if priority is
set to debug -->
+ <!--
+ <category name="org.apache" additivity="false">
+ <priority value="off"/>
+ <appender-ref ref="console"/>
+ </category>
+ -->
+
+ <!-- perfSONAR WebAdmin -->
+ <category name="org.perfsonar.webadmin" additivity="false">
+ <level value="warn"/>
+ <appender-ref ref="webadmin"/>
+ </category>
+
+ <!-- perfSONAR XML LS -->
+ <category name="org.perfsonar" additivity="false">
+ <level value="warn"/>
+ <appender-ref ref="perfsonar"/>
+ </category>
+
+ <!-- All other messages are going to the perfsonar log (root logger) -->
+ <root>
+ <priority value="warn"/>
+ <appender-ref ref="perfsonar"/>
+ <appender-ref ref="console"/>
+ </root>
+
+</log4j:configuration>


Property changes on:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/log4j.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain

Added:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/configuration.xml
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/configuration.xml
(rev 0)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/configuration.xml
2013-04-11 17:08:09 UTC (rev 6248)
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- $Id: configuration-ma.xml 4915M
2010-03-18 12:05:18Z (local) $ --><configuration
xmlns="http://service.perfsonar.org/ns/config/base/0.9/";>
+
+
+ <service name="PerfsonarService">
+
+
+ <!--
....................................................................................
-->
+
+ <!-- Lookup Info of the LS instance -->
+
+ <lookupInformation>
+
+ <option name="accessPoint"
value="http://localhost:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService"/>
+ <!-- If you have a production service in the GEANT domain, you might
want to use the following address for registration -->
+ <!--
http://ls.geant.net:8080/perfsonar-java-xml-ls/services/LookupService -->
+ <option name="serviceName" value="perfsonar-java-rrd-ma"/>
+ <option name="serviceType" value="RRD_MA"/>
+
+ </lookupInformation>
+
+ <!--
....................................................................................
-->
+
+ <!-- Message Handlers - message types and service engines -->
+
+ <messageHandler>
+
+ <message
handler="org.perfsonar.base2.service.messages.GenericMessageHandler"
type="EchoRequest">
+ <option name="ServiceEngine"
value="org.perfsonar.service.measurementArchive.rrdType.EchoServiceEngine"/>
+ <option name="authN" value="no"/>
+ </message>
+
+ <message
handler="org.perfsonar.service.measurementArchive.rrdType.MetadataKeyMessageHandler"
type="MetadataKeyRequest">
+ <option name="ServiceEngine"
value="org.perfsonar.service.measurementArchive.rrdType.MetadataKeyServiceEngine"/>
+ <option name="authN" value="no"/>
+ </message>
+
+ <message
handler="org.perfsonar.base2.service.messages.GenericMessageHandler"
type="SetupDataRequest">
+ <option name="ServiceEngine"
value="org.perfsonar.service.measurementArchive.rrdType.SetupDataServiceEngine"/>
+ <option name="authN" value="no"/>
+ </message>
+
+ </messageHandler>
+
+ <!--
....................................................................................
-->
+
+ <!-- Additional auxiliary components -->
+
+ <auxiliaryComponents>
+
+ <component
className="org.perfsonar.base2.service.storage.xml.XMLDBComponent"
name="exist">
+ <option name="dataStorageClassName"
value="org.perfsonar.base2.service.storage.xml.exist.ExistHTTPDataStorage"/>
+ <option name="uri"
value="http://localhost:8080/exist/rest/db/rrdmaconfig"/>
+ <option name="username" value="rrdmaservice"/>
+ <option name="password" value="rrdmaservice"/>
+ </component>
+
+ <component
className="org.perfsonar.service.measurementArchive.rrdType.storage.exist.QueryGeneratorManager"
name="queryGeneratorManager">
+
+ <option name="http://ggf.org/ns/nmwg/characteristic/utilization/2.0";
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.UtilizationQueryGenerator"/>
+
+ <option name="http://ggf.org/ns/nmwg/characteristic/errors/2.0";
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.ErrorsQueryGenerator"/>
+
+ <option name="http://ggf.org/ns/nmwg/characteristic/discards/2.0";
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.DiscardsQueryGenerator"/>
+
+ <option name="http://ggf.org/ns/nmwg/tools/snmp/2.0";
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.SNMPQueryGenerator"/>
+
+ <option
name="http://schemas.perfsonar.net/tools/admin/selftest/1.0/random-fetch-test";

value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.RandomFetchTestQueryGenerator"/>
+
+ <option
name="http://schemas.perfsonar.net/tools/admin/selftest/1.0/xmldb-access-test";

value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.XmlDbAccessTestQueryGenerator"/>
+
+ <option
name="http://schemas.perfsonar.net/tools/admin/selftest/1.0/xmldb-content-test";

value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.XmlDbContentTestQueryGenerator"/>
+
+ </component>
+
+ <component
className="org.perfsonar.service.measurementArchive.rrdType.storage.exist.ExistMetadataStorageDAOImpl"
name="metadataStorageDAO">
+ <option name="exist-config" value="exist"/> <!-- reference to eXist
DB XML component config-->
+ <option name="queryGeneratorManager-config"
value="queryGeneratorManager"/> <!-- reference to queryGeneratorManager
component config-->
+ </component>
+
+ <component
className="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.RRDDataStorageDAOImpl"
name="dataStorageDAO">
+ <option
name="eventType::http://ggf.org/ns/nmwg/characteristic/utilization/2.0";
value="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.UtilizationResponseGenerator"/>
+ <option
name="eventType::http://ggf.org/ns/nmwg/characteristic/discards/2.0";
value="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.DiscardsResponseGenerator"/>
+ <option
name="eventType::http://ggf.org/ns/nmwg/characteristic/errors/2.0";
value="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.ErrorsResponseGenerator"/>
+ </component>
+
+ <component name="migrator"
className="org.perfsonar.base2.service.configuration.migration.MigratorComponent">
+ <option name ="config-directory"
value="/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf"/>

+ </component>
+
+ <component
className="org.perfsonar.service.measurementArchive.rrdType.storage.sql.MysqlMetadataStorageDAOImpl"
name="metadataStorageDAO2">
+ <option name="uri" value="jdbc:mysql://localhost:3306/"/>
+ <option name="schema" value ="perfsonar_rrdma"/>
+ <option name="username" value="perfsonar_rrdma"/>
+ <option name="password" value="testpass"/>
+ </component>
+
+ <!-- Scheduler -->
+ <component
className="org.perfsonar.base2.service.scheduler.SchedulingComponent"
name="scheduling">
+
+ <option name="schedulerClassName"
value="org.perfsonar.base2.service.scheduler.SimpleScheduler"/>
+ <option name="interval" value="1800"/> <!-- sec -->
+
+ <actions>
+
+ <action
className="org.perfsonar.base2.service.registration.LSRegistrationAction"
name="registration">
+
+ <option name="status" value="on"/>
+ <option name="interval" value="3500"/> <!-- sec -->
+ <option name="registerDataSource"
value="org.perfsonar.base2.service.registration.MetadataExistDBRegisterDataSource"/>

+ <option name="registerEventType"
value="http://ogf.org/ns/nmwg/tools/org/perfsonar/service/lookup/registration/summary/2.0"/>
+ <option name="registrator"
value="org.perfsonar.base2.service.registration.GenericLSRegistrator"/>
+ <option name="lsAddress-1"
value="http://localhost:8080/perfsonar-java-xml-ls/services/LookupService"/>
+ <!--
+ <option name ="lsAddress-2"></option>
+ <option name ="lsAddress-3"></option>
+ <option name ="lsAddress-4"></option>
+ <option name ="lsAddress-5"></option>
+ -->
+
+ </action>
+
+ </actions>
+ </component>
+
+
+ <!-- auth configuration -->
+ <component
className="org.perfsonar.base2.service.authn.component.wssec.WSSecAuthNComponent"
name="auth">
+ <option name="as_endpoint"
value="http://homer.rediris.es:8080/geant2-java-as-1.2/services/SimpleService"/>
+ <option name="comp_id" value="urn:compId"/>
+ </component>
+
+ </auxiliaryComponents>
+
+
+
+ <extension name="registerExtension-registerDataSource">
+ <option name="exist-config" value="exist"/>
+ </extension>
+
+
+
+ <!--
....................................................................................
-->
+
+
+ <!-- Protocol mappings, XML elements and their bingings -->
+
+ <protocolMappings>
+
+ <!-- default mapping -->
+ <element mapping="org.perfsonar.base2.xml.Element" name="*"/>
+
+ <!-- general mappings -->
+ <element mapping="org.perfsonar.base2.xml.nmwg.Message"
name="{http://ggf.org/ns/nmwg/base/2.0/}message"/>
+ <element mapping="org.perfsonar.base2.xml.nmwg.Metadata"
name="{http://ggf.org/ns/nmwg/base/2.0/}metadata"/>
+ <element mapping="org.perfsonar.base2.xml.nmwg.EventType"
name="{http://ggf.org/ns/nmwg/base/2.0/}eventType"/>
+ <element mapping="org.perfsonar.base2.xml.nmwg.Data"
name="{http://ggf.org/ns/nmwg/base/2.0/}data"/>
+ <element mapping="org.perfsonar.base2.xml.nmwg.Parameters"
name="{http://ggf.org/ns/nmwg/base/2.0/}parameters"/>
+ <element mapping="org.perfsonar.base2.xml.nmwg.Parameter"
name="{http://ggf.org/ns/nmwg/base/2.0/}parameter"/>
+ <element mapping="org.perfsonar.base2.xml.nmwg.Key"
name="{http://ggf.org/ns/nmwg/base/2.0/}key"/>
+
+ <element mapping="org.perfsonar.base2.xml.nmwg.Subject"
name="{http://ggf.org/ns/nmwg/base/2.0/}subject"/>
+ <element mapping="org.perfsonar.base2.xml.nmwg.Subject"
name="{http://ggf.org/ns/nmwg/characteristic/utilization/2.0/}subject"/>
+ <element mapping="org.perfsonar.base2.xml.nmwg.Subject"
name="{http://ggf.org/ns/nmwg/characteristic/errors/2.0/}subject"/>
+ <element mapping="org.perfsonar.base2.xml.nmwg.Subject"
name="{http://ggf.org/ns/nmwg/characteristic/discards/2.0/}subject"/>
+ <element mapping="org.perfsonar.base2.xml.nmwg.Subject"
name="{http://ggf.org/ns/nmwg/ops/select/2.0/}subject"/>
+ <element mapping="org.perfsonar.base2.xml.nmwg.Parameters"
name="{http://ggf.org/ns/nmwg/ops/select/2.0/}parameters"/>
+ <element mapping="org.perfsonar.base2.xml.Element"
name="{http://ggf.org/ns/nmwg/time/2.0/}time"/>
+
+ </protocolMappings>
+
+ <!--
....................................................................................
-->
+
+
+ </service>
+
+
+</configuration>


Property changes on:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/configuration.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain

Added:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/configuration.xml.template
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/configuration.xml.template
(rev 0)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/configuration.xml.template
2013-04-11 17:08:09 UTC (rev 6248)
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- $Id: configuration-ma.xml 4915M
2010-03-18 12:05:18Z (local) $ --><configuration
xmlns="http://service.perfsonar.org/ns/config/base/0.9/";>
+
+
+ <service name="PerfsonarService">
+
+
+ <!--
....................................................................................
-->
+
+ <!-- Lookup Info of the LS instance -->
+
+ <lookupInformation>
+
+ <option name="accessPoint" value="${service.r.access_point}"/>
+ <option name="serviceName" value="perfsonar-java-rrd-ma"/>
+ <option name="serviceType" value="${service.r.service_name}"/>
+
+ </lookupInformation>
+
+ <!--
....................................................................................
-->
+
+ <!-- Message Handlers - message types and service engines -->
+
+ <messageHandler>
+
+ <message
handler="org.perfsonar.base2.service.messages.GenericMessageHandler"
type="EchoRequest">
+ <option name="ServiceEngine"
value="org.perfsonar.service.measurementArchive.rrdType.EchoServiceEngine"/>
+ <option name="authN" value="no"/>
+ </message>
+
+ <message
handler="org.perfsonar.service.measurementArchive.rrdType.MetadataKeyMessageHandler"
type="MetadataKeyRequest">
+ <option name="ServiceEngine"
value="org.perfsonar.service.measurementArchive.rrdType.MetadataKeyServiceEngine"/>
+ <option name="authN" value="no"/>
+ </message>
+
+ <message
handler="org.perfsonar.base2.service.messages.GenericMessageHandler"
type="SetupDataRequest">
+ <option name="ServiceEngine"
value="org.perfsonar.service.measurementArchive.rrdType.SetupDataServiceEngine"/>
+ <option name="authN" value="no"/>
+ </message>
+
+ </messageHandler>
+
+ <!--
....................................................................................
-->
+
+ <!-- Additional auxiliary components -->
+
+ <auxiliaryComponents>
+
+ <component
className="org.perfsonar.base2.service.storage.xml.XMLDBComponent"
name="exist">
+ <option name="dataStorageClassName"
value="org.perfsonar.base2.service.storage.xml.exist.ExistHTTPDataStorage"/>
+ <option name="uri" value="#replace(string
"${component.ma.xmldb.db_uri}" regexp
"xmldb:exist://(.+)/exist/xmlrpc/db/(.*)" with
"http://$1/exist/rest/db/$2";)"/>
+ <option name="username" value="${component.ma.xmldb.db_username}"/>
+ <option name="password" value="${component.ma.xmldb.db_password}"/>
+ </component>
+
+ <component
className="org.perfsonar.service.measurementArchive.rrdType.storage.exist.QueryGeneratorManager"
name="queryGeneratorManager">
+
+ <option name="http://ggf.org/ns/nmwg/characteristic/utilization/2.0";
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.UtilizationQueryGenerator"/>
+
+ <option name="http://ggf.org/ns/nmwg/characteristic/errors/2.0";
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.ErrorsQueryGenerator"/>
+
+ <option name="http://ggf.org/ns/nmwg/characteristic/discards/2.0";
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.DiscardsQueryGenerator"/>
+
+ <option name="http://ggf.org/ns/nmwg/tools/snmp/2.0";
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.SNMPQueryGenerator"/>
+
+ <option
name="http://schemas.perfsonar.net/tools/admin/selftest/1.0/random-fetch-test";

value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.RandomFetchTestQueryGenerator"/>
+
+ <option
name="http://schemas.perfsonar.net/tools/admin/selftest/1.0/xmldb-access-test";

value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.XmlDbAccessTestQueryGenerator"/>
+
+ <option
name="http://schemas.perfsonar.net/tools/admin/selftest/1.0/xmldb-content-test";

value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.XmlDbContentTestQueryGenerator"/>
+
+ </component>
+
+ <component
className="org.perfsonar.service.measurementArchive.rrdType.storage.exist.ExistMetadataStorageDAOImpl"
name="metadataStorageDAO">
+ <option name="exist-config" value="exist"/> <!-- reference to eXist
DB XML component config-->
+ <option name="queryGeneratorManager-config"
value="queryGeneratorManager"/> <!-- reference to queryGeneratorManager
component config-->
+ </component>
+
+ <component
className="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.RRDDataStorageDAOImpl"
name="dataStorageDAO">
+ <option
name="eventType::http://ggf.org/ns/nmwg/characteristic/utilization/2.0";
value="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.UtilizationResponseGenerator"/>
+ <option
name="eventType::http://ggf.org/ns/nmwg/characteristic/discards/2.0";
value="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.DiscardsResponseGenerator"/>
+ <option
name="eventType::http://ggf.org/ns/nmwg/characteristic/errors/2.0";
value="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.ErrorsResponseGenerator"/>
+ </component>
+
+
+ <!-- Scheduler -->
+ <component
className="org.perfsonar.base2.service.scheduler.SchedulingComponent"
name="scheduling">
+
+ <option name="schedulerClassName"
value="org.perfsonar.base2.service.scheduler.SimpleScheduler"/>
+ <option name="interval" value="1800"/> <!-- sec -->
+
+ <actions>
+
+ <action
className="org.perfsonar.base2.service.registration.LSRegistrationAction"
name="registration">
+
+ <option name="status" value="on"/>
+ <option name="interval" value="3500"/> <!-- sec -->
+ <option name="registerDataSource"
value="org.perfsonar.base2.service.registration.MetadataExistDBRegisterDataSource"/>

+ <option name="registerEventType"
value="http://ogf.org/ns/nmwg/tools/org/perfsonar/service/lookup/registration/summary/2.0"/>
+ <option name="registrator"
value="org.perfsonar.base2.service.registration.GenericLSRegistrator"/>
+ <option name="lsAddress-1" value="${service.r.ls_url}"/>
+ <!--
+ <option name ="lsAddress-2"></option>
+ <option name ="lsAddress-3"></option>
+ <option name ="lsAddress-4"></option>
+ <option name ="lsAddress-5"></option>
+ -->
+
+ </action>
+
+ </actions>
+ </component>
+
+
+ <!-- auth configuration -->
+ <component
className="org.perfsonar.base2.service.authn.component.wssec.WSSecAuthNComponent"
name="auth">
+ <option name="as_endpoint"
value="http://homer.rediris.es:8080/geant2-java-as-1.2/services/SimpleService"/>
+ <option name="comp_id" value="urn:compId"/>
+ </component>
+
+ </auxiliaryComponents>
+
+
+
+ <extension name="registerExtension-registerDataSource">
+ <option name="exist-config" value="exist"/>
+ </extension>
+
+
+
+ <!--
....................................................................................
-->
+
+
+ <!-- Protocol mappings, XML elements and their bingings -->
+
+ <protocolMappings>
+
+ <!-- default mapping -->
+ <element mapping="org.perfsonar.base2.xml.Element" name="*"/>
+
+ <!-- general mappings -->
+ <element mapping="org.perfsonar.base2.xml.nmwg.Message"
name="{http://ggf.org/ns/nmwg/base/2.0/}message"/>
+ <element mapping="org.perfsonar.base2.xml.nmwg.Metadata"
name="{http://ggf.org/ns/nmwg/base/2.0/}metadata"/>
+ <element mapping="org.perfsonar.base2.xml.nmwg.EventType"
name="{http://ggf.org/ns/nmwg/base/2.0/}eventType"/>
+ <element mapping="org.perfsonar.base2.xml.nmwg.Data"
name="{http://ggf.org/ns/nmwg/base/2.0/}data"/>
+ <element mapping="org.perfsonar.base2.xml.nmwg.Parameters"
name="{http://ggf.org/ns/nmwg/base/2.0/}parameters"/>
+ <element mapping="org.perfsonar.base2.xml.nmwg.Parameter"
name="{http://ggf.org/ns/nmwg/base/2.0/}parameter"/>
+ <element mapping="org.perfsonar.base2.xml.nmwg.Key"
name="{http://ggf.org/ns/nmwg/base/2.0/}key"/>
+
+ <element mapping="org.perfsonar.base2.xml.nmwg.Subject"
name="{http://ggf.org/ns/nmwg/base/2.0/}subject"/>
+ <element mapping="org.perfsonar.base2.xml.nmwg.Subject"
name="{http://ggf.org/ns/nmwg/characteristic/utilization/2.0/}subject"/>
+ <element mapping="org.perfsonar.base2.xml.nmwg.Subject"
name="{http://ggf.org/ns/nmwg/characteristic/errors/2.0/}subject"/>
+ <element mapping="org.perfsonar.base2.xml.nmwg.Subject"
name="{http://ggf.org/ns/nmwg/characteristic/discards/2.0/}subject"/>
+ <element mapping="org.perfsonar.base2.xml.nmwg.Subject"
name="{http://ggf.org/ns/nmwg/ops/select/2.0/}subject"/>
+ <element mapping="org.perfsonar.base2.xml.nmwg.Parameters"
name="{http://ggf.org/ns/nmwg/ops/select/2.0/}parameters"/>
+ <element mapping="org.perfsonar.base2.xml.Element"
name="{http://ggf.org/ns/nmwg/time/2.0/}time"/>
+
+ </protocolMappings>
+
+ <!--
....................................................................................
-->
+
+
+ </service>
+
+
+</configuration>

Added:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/rrdma_db.sql
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/rrdma_db.sql
(rev 0)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/rrdma_db.sql
2013-04-11 17:08:09 UTC (rev 6248)
@@ -0,0 +1,41 @@
+# running:
+# mysql -u root -p < rrdma_db.sql
+
+CREATE DATABASE IF NOT EXISTS
+ perfsonar_rrdma;
+
+USE perfsonar_rrdma
+
+
+#CREATE USER IF NOT EXISTS
+# perfsonar_rrdma;
+
+
+GRANT ALL ON
+ perfsonar_rrdma.* TO 'perfsonar_rrdma'@'localhost'
+ IDENTIFIED BY 'testpass';
+
+
+CREATE TABLE IF NOT EXISTS
+ interfaces
+ (metadataId INT NOT NULL AUTO_INCREMENT,
+ subjId VARCHAR(20) NOT NULL,
+ hostName VARCHAR(20) NOT NULL,
+ ifAddress VARCHAR(20) NOT NULL,
+ ifAddressType VARCHAR(4) NOT NULL,
+ ifName VARCHAR(100) NOT NULL,
+ ifDescription VARCHAR(255) NOT NULL,
+ direction VARCHAR(20) NOT NULL,
+ capacity VARCHAR(20) NOT NULL,
+ keyword VARCHAR(100),
+ eventType VARCHAR(100) NOT NULL,
+ file VARCHAR(100) NOT NULL,
+ dataSource VARCHAR(20) NOT NULL,
+ valueUnits VARCHAR(20) NOT NULL,
+ dataSourceStep VARCHAR(20),
+ dataSourceType VARCHAR(20),
+ dataSourceHeartbeat VARCHAR(20),
+ dataSourceMinValue VARCHAR(20),
+ dataSourceMaxValue VARCHAR(20),
+ PRIMARY KEY (metadataId));
+

Added:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/test_rrdma_db.sql
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/test_rrdma_db.sql
(rev 0)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/test_rrdma_db.sql
2013-04-11 17:08:09 UTC (rev 6248)
@@ -0,0 +1,51 @@
+# running:
+# mysql -u root -p < test_rrdma_db.sql
+
+USE perfsonar_rrdma
+
+
+INSERT
+ INTO interfaces
+ VALUES (NULL, 'subj1', 'test-hostName1', '10.1.2.1', 'ipv4',
'TenGigabitEthernet1/1', 'test1', 'in',
+'1000000000', 'project:geant',
'http://ggf.org/ns/nmwg/characteristic/utilization/2.0',
+
'/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/samples/rrd/test.rrd',
+'inoctets', 'Bps', '300', 'ABSOLUTE', '100', '0', '10000000');
+
+
+INSERT
+ INTO interfaces
+ VALUES (NULL, 'subj1', 'test-hostName1', '10.1.2.1', 'ipv4',
'TenGigabitEthernet1/1', 'test1', 'out',
+'1000000000', 'project:geant',
'http://ggf.org/ns/nmwg/characteristic/utilization/2.0',
+
'/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/samples/rrd/test.rrd',
+'inoctets', 'Bps', '300', 'ABSOLUTE', '100', '0', '10000000');
+
+INSERT
+ INTO interfaces
+ VALUES (NULL, 'subj1', 'test-hostName1', '10.1.2.1', 'ipv4',
'TenGigabitEthernet1/1', 'test1', 'in',
+'1000000000', 'project:geant',
'http://ggf.org/ns/nmwg/characteristic/errors/2.0',
+
'/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/samples/rrd/test.rrd',
+'inerrors', 'Eps', '300', 'ABSOLUTE', '100', '0', '10000000');
+
+INSERT
+ INTO interfaces
+ VALUES (NULL, 'subj1', 'test-hostName1', '10.1.2.1', 'ipv4',
'TenGigabitEthernet1/1', 'test1', 'in',
+'1000000000', 'project:geant',
'http://ggf.org/ns/nmwg/characteristic/discards/2.0',
+
'/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/samples/rrd/test.rrd',
+'indiscards', 'Dps', '300', 'ABSOLUTE', '100', '0', '10000000');
+
+INSERT
+ INTO interfaces
+ VALUES (NULL, 'subj1', 'test-hostName2', '10.1.2.2', 'ipv4',
'TenGigabitEthernet1/1', 'test1', 'in',
+'1000000000', 'project:geant2',
'http://ggf.org/ns/nmwg/characteristic/utilization/2.0',
+
'/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/samples/rrd/test.rrd',
+'inoctets', 'Bps', '300', 'ABSOLUTE', '100', '0', '10000000');
+
+
+INSERT
+ INTO interfaces
+ VALUES (NULL, 'subj1', 'test-hostName2', '10.1.2.2', 'ipv4',
'TenGigabitEthernet1/1', 'test1', 'out',
+'1000000000', 'project:geant',
'http://ggf.org/ns/nmwg/characteristic/utilization/2.0',
+
'/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/samples/rrd/test.rrd',
+'inoctets', 'Bps', '300', 'ABSOLUTE', '100', '0', '10000000');
+
+

Added:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/webAdminConfig.xml
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/webAdminConfig.xml
(rev 0)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/webAdminConfig.xml
2013-04-11 17:08:09 UTC (rev 6248)
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wa:WebAdminInterface
xmlns:wa="http://webadmin.perfsonar.org/waschema/v20130205";>
+
+ <!-- service information consists of name, version (only for
displaying purpose) and accessPoint -->
+ <wa:serviceInformation>
+
<wa:accessPoint>http://localhost:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService</wa:accessPoint>
+ <wa:serviceName>perfSONAR RRD MA</wa:serviceName>
+ <wa:version>to be filled in auto?</wa:version>
+ </wa:serviceInformation>
+
+ <!-- credential for WA -->
+ <wa:credential>
+ <wa:username>perfsonaruser</wa:username>
+ <wa:password>perfsonarpass</wa:password>
+ </wa:credential>
+
+ <wa:basiclink>
+ <wa:pageId>basic</wa:pageId> <!-- page identifier -->
+ <wa:title>Service Settings</wa:title>
+ </wa:basiclink>
+
+ <wa:basiclink>
+ <wa:pageId>changePassword</wa:pageId> <!-- page identifier -->
+ <wa:title>WebAdmin Settings</wa:title>
+ </wa:basiclink>
+
+ <wa:basiclink>
+ <wa:servletId>initDb</wa:servletId>
+ <wa:title>Empty Database</wa:title>
+ </wa:basiclink>
+
+ <wa:advancedlink>
+ <wa:pageId>advanced</wa:pageId> <!-- page identifier -->
+ <wa:title>Advanced Service Settings</wa:title>
+ </wa:advancedlink>
+
+ <wa:map>
+
<wa:url>http://service.perfsonar.org/ns/config/base/0.9/</wa:url>
+ <wa:ns>ns1</wa:ns>
+ </wa:map>
+
+ <wa:map>
+
<wa:url>http://webadmin.perfsonar.org/waschema/v20130205</wa:url>
+ <wa:ns>webAdmin</wa:ns>
+ </wa:map>
+
+ <wa:page>
+ <wa:pageId><wa:text>changePassword</wa:text></wa:pageId>
+ <wa:title><wa:text>Change Password</wa:text></wa:title>
+ <wa:plain><wa:textbox>
+ <wa:title><wa:text>Username</wa:text></wa:title>
+ <wa:default><wa:xpath>
+
doc("classes/perfsonar/conf/webAdminConfig.xml")//webAdmin:WebAdminInterface/webAdmin:credential/webAdmin:username
+ </wa:xpath></wa:default>
+ </wa:textbox></wa:plain>
+ <wa:plain><wa:password>
+ <wa:title><wa:text>Password</wa:text></wa:title>
+ <wa:default><wa:xpath>
+
doc("classes/perfsonar/conf/webAdminConfig.xml")//webAdmin:WebAdminInterface/webAdmin:credential/webAdmin:password
+ </wa:xpath></wa:default>
+ </wa:password></wa:plain>
+ </wa:page>
+
+ <wa:page>
+ <wa:pageId><wa:text>basic</wa:text></wa:pageId>
+ <wa:title><wa:text>Basic configuration</wa:text></wa:title>
+
+ <!-- General service configuration -->
+ <wa:plain><wa:textbox>
+ <wa:title><wa:text>Access point</wa:text></wa:title>
+ <wa:default><wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:lookupInformation/ns1:option[@name="accessPoint"]/@value
+ </wa:xpath></wa:default>
+ </wa:textbox></wa:plain>
+ <wa:plain><wa:textbox>
+ <wa:title><wa:text>Service name</wa:text></wa:title>
+ <wa:default><wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:lookupInformation/ns1:option[@name="serviceName"]/@value
+ </wa:xpath></wa:default>
+ </wa:textbox></wa:plain>
+ <wa:plain><wa:textbox>
+ <wa:title><wa:text>Service type</wa:text></wa:title>
+ <wa:default><wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:lookupInformation/ns1:option[@name="serviceType"]/@value
+ </wa:xpath></wa:default>
+ </wa:textbox></wa:plain>
+
+ <!-- MySQL configuration -->
+ <wa:plain><wa:textbox>
+ <wa:title><wa:text>MySQL server address</wa:text></wa:title>
+ <wa:default><wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="metadataStorageDAO2"]/ns1:option[@name="uri"]/@value
+ </wa:xpath></wa:default>
+ </wa:textbox>
+ </wa:plain>
+ <wa:plain><wa:textbox>
+ <wa:title><wa:text>MySQL username</wa:text></wa:title>
+ <wa:default><wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="metadataStorageDAO2"]/ns1:option[@name="username"]/@value
+ </wa:xpath></wa:default>
+ </wa:textbox>
+ </wa:plain>
+ <wa:plain><wa:textbox>
+ <wa:title><wa:text>MySQL password</wa:text></wa:title>
+ <wa:default><wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="metadataStorageDAO2"]/ns1:option[@name="password"]/@value
+ </wa:xpath></wa:default>
+ </wa:textbox>
+ </wa:plain>
+ <wa:plain><wa:textbox>
+ <wa:title><wa:text>MySQL schema name</wa:text></wa:title>
+ <wa:default><wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="metadataStorageDAO2"]/ns1:option[@name="schema"]/@value
+ </wa:xpath></wa:default>
+ </wa:textbox>
+ </wa:plain>
+
+ <!--LS configuration -->
+ <wa:plain><wa:radio>
+ <wa:title><wa:text>Lookup Service registration:
</wa:text></wa:title>
+ <wa:default>
+
<wa:xpath>doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="registration"]/ns1:option[@name="status"]/@value</wa:xpath>
+ </wa:default>
+ <wa:values><wa:text>on,off</wa:text></wa:values>
+ </wa:radio></wa:plain>
+ <wa:plain><wa:textbox>
+ <wa:title><wa:text>Lookup Service URL</wa:text></wa:title>
+ <wa:default><wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="registration"]/ns1:option[@name="lsAddress-1"]/@value
+ </wa:xpath></wa:default>
+ </wa:textbox></wa:plain>
+ <wa:plain><wa:textbox>
+ <wa:title><wa:text>Lookup Service registration interval
(seconds)</wa:text></wa:title>
+ <wa:default><wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="scheduling"]/ns1:actions/ns1:action[@name="registration"]/ns1:option[@name="interval"]/@value
+ </wa:xpath></wa:default>
+ </wa:textbox></wa:plain>
+ </wa:page>
+
+ <wa:page>
+ <wa:pageId><wa:text>advanced</wa:text></wa:pageId>
+ <wa:title><wa:text>Advanced configuration</wa:text></wa:title>
+
+ <!-- auth configuration -->
+ <wa:plain><wa:textbox>
+ <wa:title><wa:text>Authorization endpoint
URL</wa:text></wa:title>
+ <wa:default><wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:auxiliaryComponents/ns1:component[@name="auth"]/ns1:option[@name="as_endpoint"]/@value
+ </wa:xpath></wa:default>
+ </wa:textbox></wa:plain>
+<!-- authorization of requests -->
+ <wa:plain><wa:radio>
+ <wa:title><wa:text>Echo Request
authorization</wa:text></wa:title>
+ <wa:default><wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:messageHandler/ns1:message[@type="EchoRequest"]/ns1:option[@name="authN"]/@value
+ </wa:xpath></wa:default>
+ <wa:values><wa:text>no,yes</wa:text></wa:values>
+ </wa:radio></wa:plain>
+
+ <wa:plain><wa:radio>
+ <wa:title><wa:text>Metadata Key Request
authorization</wa:text></wa:title>
+ <wa:default><wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:messageHandler/ns1:message[@type="MetadataKeyRequest"]/ns1:option[@name="authN"]/@value
+ </wa:xpath></wa:default>
+ <wa:values><wa:text>no,yes</wa:text></wa:values>
+ </wa:radio></wa:plain>
+
+ <wa:plain><wa:radio>
+ <wa:title><wa:text>Setup Data Request
authorization</wa:text></wa:title>
+ <wa:default><wa:xpath>
+
doc("classes/perfsonar/conf/configuration.xml")//ns1:configuration/ns1:service[@name="PerfsonarService"]/ns1:messageHandler/ns1:message[@type="SetupDataRequest"]/ns1:option[@name="authN"]/@value
+ </wa:xpath></wa:default>
+ <wa:values><wa:text>no,yes</wa:text></wa:values>
+ </wa:radio></wa:plain>
+ </wa:page>
+</wa:WebAdminInterface>


Property changes on:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/resources/perfsonar/conf/webAdminConfig.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain

Added:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/webapp/WEB-INF/conf/axis2.xml
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/webapp/WEB-INF/conf/axis2.xml
(rev 0)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/webapp/WEB-INF/conf/axis2.xml
2013-04-11 17:08:09 UTC (rev 6248)
@@ -0,0 +1,477 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<axisconfig name="AxisJava2.0">
+ <!-- ================================================= -->
+ <!-- Parameters -->
+ <!-- ================================================= -->
+ <parameter name="hotdeployment">true</parameter>
+ <parameter name="hotupdate">false</parameter>
+ <parameter name="enableMTOM">false</parameter>
+ <parameter name="enableSwA">false</parameter>
+
+ <!--Uncomment if you want to enable file caching for attachments -->
+ <!--parameter name="cacheAttachments">true</parameter>
+ <parameter name="attachmentDIR"></parameter>
+ <parameter name="sizeThreshold">4000</parameter-->
+
+ <!--Uncomment if you want to plugin your own attachments lifecycle
implementation -->
+ <!--<attachmentsLifecycleManager
class="org.apache.axiom.attachments.lifecycle.impl.LifecycleManagerImpl"/>-->
+
+
+ <!--Uncomment if you want to enable the reduction of the in-memory cache
of WSDL definitions -->
+ <!--In some server environments, the available memory heap is limited
and can fill up under load -->
+ <!--Since in-memory copies of WSDL definitions can be large, some steps
can be taken-->
+ <!--to reduce the memory needed for the cached WSDL definitions. -->
+ <!--parameter name="reduceWSDLMemoryCache">true</parameter-->
+
+ <!--This will give out the timout of the configuration contexts, in
milliseconds-->
+ <parameter name="ConfigContextTimeoutInterval">30000</parameter>
+
+ <!--During a fault, stack trace can be sent with the fault message. The
following flag will control -->
+ <!--that behavior.-->
+ <parameter name="sendStacktraceDetailsWithFaults">false</parameter>
+
+ <!--If there aren't any information available to find out the fault
reason, we set the message of the exception-->
+ <!--as the faultreason/Reason. But when a fault is thrown from a service
or some where, it will be -->
+ <!--wrapped by different levels. Due to this the initial exception
message can be lost. If this flag-->
+ <!--is set, then Axis2 tries to get the first exception and set its
message as the faultreason/Reason.-->
+ <parameter name="DrillDownToRootCauseForFaultReason">false</parameter>
+
+ <parameter name="userName">admin</parameter>
+ <parameter name="password">axis2</parameter>
+
+ <!--To override repository/services you need to uncomment following
parameter and value SHOULD be absolute file path.-->
+ <!--ServicesDirectory only works on the following cases-->
+ <!---File based configurator and in that case the value should be a file
URL (http:// not allowed)-->
+ <!---When creating URL Based configurator with URL file:// -->
+ <!--- War based configurator with expanded case , -->
+
+ <!--All the other scenarios it will be ignored.-->
+ <!--<parameter name="ServicesDirectory">service</parameter>-->
+ <!--To override repository/modules you need to uncomment following
parameter and value SHOULD be absolute file path-->
+ <!--<parameter name="ModulesDirectory">modules</parameter>-->
+
+
+
+ <!--Following params will set the proper context paths for invocations.
All the endpoints will have a commons context-->
+ <!--root which can configured using the following contextRoot
parameter-->
+ <!--<parameter name="contextRoot">axis2</parameter>-->
+
+ <!--Our HTTP endpoints can handle both REST and SOAP. Following
parameters can be used to distinguiush those endpoints-->
+ <!--In case of a servlet, if you change this you have to manually change
the settings of your servlet container to map this -->
+ <!--context path to proper Axis2 servlets-->
+ <!--<parameter name="servicePath">services</parameter>-->
+ <!--<parameter name="restPath">rest</parameter>-->
+
+ <!-- Following parameter will completely disable REST handling in
Axis2-->
+ <parameter name="disableREST" locked="false">false</parameter>
+
+ <!-- Following parameter will suppress generation of SOAP 1.2 bindings
in auto-generated WSDL files -->
+ <parameter name="disableSOAP12" locked="true">false</parameter>
+
+ <!--POJO deployer , this will alow users to drop .class file and make
that into a service-->
+ <deployer extension=".class" directory="pojo"
class="org.apache.axis2.deployment.POJODeployer"/>
+ <deployer extension=".jar" directory="servicejars"
class="org.apache.axis2.jaxws.framework.JAXWSDeployer"/>
+
+ <!--<deployer extension=".jsa" directory="rmiservices"
class="org.apache.axis2.rmi.deploy.RMIServiceDeployer"/>-->
+
+
+ <!-- Following parameter will set the host name for the epr-->
+ <!--<parameter name="hostname" locked="true">myhost.com</parameter>-->
+
+ <!-- If you have a front end host which exposes this webservice using a
different public URL -->
+ <!-- use this parameter to override autodetected url -->
+ <!--<parameter
name="httpFrontendHostUrl">https://someotherhost/context</parameter>-->
+
+
+ <!-- The way of adding listener to the system-->
+ <!-- <listener class="org.apache.axis2.ObserverIMPL">-->
+ <!-- <parameter name="RSS_URL">http://127.0.0.1/rss</parameter>-->
+ <!-- </listener>-->
+
+ <threadContextMigrators>
+ <threadContextMigrator listId="JAXWS-ThreadContextMigrator-List"
class="org.apache.axis2.jaxws.addressing.migrator.EndpointContextMapMigrator"/>
+ </threadContextMigrators>
+
+ <!-- ================================================= -->
+ <!-- Message Receivers -->
+ <!-- ================================================= -->
+ <!--This is the deafult MessageReceiver for the system , if you want to
have MessageReceivers for -->
+ <!--all the other MEP implement it and add the correct entry to here ,
so that you can refer from-->
+ <!--any operation -->
+ <!--Note : You can ovrride this for a particular service by adding the
same element with your requirement-->
+ <messageReceivers>
+ <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-only";
+
class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver"/>
+ <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out";
+
class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
+ <messageReceiver mep="http://www.w3.org/2006/01/wsdl/in-only";
+
class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver"/>
+ <messageReceiver mep="http://www.w3.org/2006/01/wsdl/in-out";
+
class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
+ </messageReceivers>
+
+ <!-- ================================================= -->
+ <!-- Message Formatter -->
+ <!-- ================================================= -->
+ <!--Following content type to message formatter mapping can be used to
implement support for different message -->
+ <!--format serialization in Axis2. These message formats are expected
to be resolved based on the content type. -->
+ <messageFormatters>
+ <messageFormatter contentType="application/x-www-form-urlencoded"
+
class="org.apache.axis2.transport.http.XFormURLEncodedFormatter"/>
+ <messageFormatter contentType="multipart/form-data"
+
class="org.apache.axis2.transport.http.MultipartFormDataFormatter"/>
+ <messageFormatter contentType="application/xml"
+
class="org.apache.axis2.transport.http.ApplicationXMLFormatter"/>
+ <messageFormatter contentType="text/xml"
+
class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
+ <messageFormatter contentType="application/soap+xml"
+
class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
+ </messageFormatters>
+
+ <!-- ================================================= -->
+ <!-- Message Builders -->
+ <!-- ================================================= -->
+ <!--Following content type to builder mapping can be used to implement
support for different message -->
+ <!--formats in Axis2. These message formats are expected to be resolved
based on the content type. -->
+ <messageBuilders>
+ <messageBuilder contentType="application/xml"
+
class="org.apache.axis2.builder.ApplicationXMLBuilder"/>
+ <messageBuilder contentType="application/xml"
+
class="org.apache.axis2.builder.ApplicationXMLBuilder"/>
+ <messageBuilder contentType="application/x-www-form-urlencoded"
+
class="org.apache.axis2.builder.XFormURLEncodedBuilder"/>
+ <messageBuilder contentType="multipart/form-data"
+
class="org.apache.axis2.builder.MultipartFormDataBuilder"/>
+ </messageBuilders>
+
+ <!-- ================================================= -->
+ <!-- Transport Ins -->
+ <!-- ================================================= -->
+ <transportReceiver name="http"
+
class="org.apache.axis2.transport.http.SimpleHTTPServer">
+ <parameter name="port">8080</parameter>
+ <!-- Here is the complete list of supported parameters (see example
settings further below):
+ port: the port to listen on (default 6060)
+ hostname: if non-null, url prefix used in reply-to endpoint
references (default null)
+ originServer: value of http Server header in outgoing messages
(default "Simple-Server/1.1")
+ requestTimeout: value in millis of time that requests can wait
for data (default 20000)
+ requestTcpNoDelay: true to maximize performance and minimize
latency (default true)
+ false to minimize bandwidth consumption by
combining segments
+ requestCoreThreadPoolSize: number of threads available for
request processing (unless queue fills up) (default 25)
+ requestMaxThreadPoolSize: number of threads available for
request processing if queue fills up (default 150)
+ note that default queue never fills
up: see HttpFactory
+ threadKeepAliveTime: time to keep threads in excess of core
size alive while inactive (default 180)
+ note that no such threads can exist with
default unbounded request queue
+ threadKeepAliveTimeUnit: TimeUnit of value in
threadKeepAliveTime (default SECONDS) (default SECONDS)
+ -->
+ <!-- <parameter name="hostname">http://www.myApp.com/ws</parameter>
-->
+ <!-- <parameter name="originServer">My-Server/1.1</parameter>
-->
+ <!-- <parameter name="requestTimeout">10000</parameter>
-->
+ <!-- <parameter name="requestTcpNoDelay">false</parameter>
-->
+ <!-- <parameter name="requestCoreThreadPoolSize">50</parameter>
-->
+ <!-- <parameter name="requestMaxThreadPoolSize">100</parameter>
-->
+ <!-- <parameter name="threadKeepAliveTime">240000</parameter>
-->
+ <!-- <parameter
name="threadKeepAliveTimeUnit">MILLISECONDS</parameter> -->
+ </transportReceiver>
+
+ <!--Uncomment this and configure as appropriate for JMS transport
support, after setting up your JMS environment (e.g. ActiveMQ)
+ <transportReceiver name="jms"
class="org.apache.axis2.transport.jms.JMSListener">
+ <parameter name="myTopicConnectionFactory">
+ <parameter
name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+ <parameter
name="java.naming.provider.url">tcp://localhost:61616</parameter>
+ <parameter
name="transport.jms.ConnectionFactoryJNDIName">TopicConnectionFactory</parameter>
+ </parameter>
+
+ <parameter name="myQueueConnectionFactory">
+ <parameter
name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+ <parameter
name="java.naming.provider.url">tcp://localhost:61616</parameter>
+ <parameter
name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter>
+ </parameter>
+
+ <parameter name="default">
+ <parameter
name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+ <parameter
name="java.naming.provider.url">tcp://localhost:61616</parameter>
+ <parameter
name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter>
+ </parameter>
+ </transportReceiver>-->
+
+ <!-- ================================================= -->
+ <!-- Non-blocking http/s Transport Listener -->
+
+ <!-- the non blocking http transport based on HttpCore + NIO extensions
+ <transportReceiver name="http"
class="org.apache.axis2.transport.nhttp.HttpCoreNIOListener">
+ <parameter name="port" locked="false">9000</parameter>
+ <parameter name="non-blocking" locked="false">true</parameter>
+ </transportReceiver>-->
+
+ <!-- the non blocking https transport based on HttpCore + SSL-NIO
extensions
+ <transportReceiver name="https"
class="org.apache.axis2.transport.nhttp.HttpCoreNIOSSLListener">
+ <parameter name="port" locked="false">9002</parameter>
+ <parameter name="non-blocking" locked="false">true</parameter>
+ <parameter name="keystore" locked="false">
+ <KeyStore>
+ <Location>identity.jks</Location>
+ <Type>JKS</Type>
+ <Password>password</Password>
+ <KeyPassword>password</KeyPassword>
+ </KeyStore>
+ </parameter>
+ <parameter name="truststore" locked="false">
+ <TrustStore>
+ <Location>trust.jks</Location>
+ <Type>JKS</Type>
+ <Password>password</Password>
+ </TrustStore>
+ </parameter>-->
+ <!--<parameter name="SSLVerifyClient">require</parameter>
+ supports optional|require or defaults to none -->
+ <!--</transportReceiver>-->
+
+ <!-- ================================================= -->
+ <!-- Mail Transport Listener -->
+ <!-- This is a sample configuration. It assumes a mail server running in
localhost.
+ Listener pops messages that comes to the email address
red@localhost.
Users
+ password is red. Listener connect to the server every 3000
milliseconds.
+ Parameters with "transport." prefix is Axis2 specific. Others are
all from Java Mail API.
+ http://people.apache.org/~pzf/SMTPBase64Binding-0.2.html
+ -->
+ <!-- ================================================= -->
+ <!--<transportReceiver name="mailto"
class="org.apache.axis2.transport.mail.SimpleMailListener">
+ <parameter name="mail.pop3.host">localhost</parameter>
+ <parameter name="mail.pop3.user">red</parameter>
+ <parameter name="mail.store.protocol">pop3</parameter>
+ <parameter name="transport.mail.pop3.password">red</parameter>
+ <parameter
name="transport.mail.replyToAddress">red@localhost</parameter>
+ <parameter name="transport.listener.interval">3000</parameter>
+ </transportReceiver>-->
+
+ <!--Uncomment if you want to have TCP transport support-->
+ <!--transportReceiver name="tcp"
+ class="org.apache.axis2.transport.tcp.TCPServer">
+ <parameter name="port">6060</parameter-->>
+ <!--If you want to give your own host address for EPR generation-->
+ <!--uncomment the following paramter , and set it as you required.-->
+ <!--<parameter name="hostname">tcp://myApp.com/ws</parameter>-->
+ <!-- /transportReceiver -->
+
+ <!-- ================================================= -->
+ <!-- Transport Outs -->
+ <!-- ================================================= -->
+
+ <transportSender name="tcp"
+
class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
+ <transportSender name="local"
+
class="org.apache.axis2.transport.local.LocalTransportSender"/>
+ <transportSender name="http"
+
class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+ <parameter name="PROTOCOL">HTTP/1.1</parameter>
+ <parameter name="Transfer-Encoding">chunked</parameter>
+
+ <!-- If following is set to 'true', optional action part of the
Content-Type will not be added to the SOAP 1.2 messages -->
+ <!-- <parameter name="OmitSOAP12Action">true</parameter> -->
+ </transportSender>
+
+ <transportSender name="https"
+
class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+ <parameter name="PROTOCOL">HTTP/1.1</parameter>
+ <parameter name="Transfer-Encoding">chunked</parameter>
+ </transportSender>
+
+ <!-- Please enable this if you need the java transport -->
+ <!-- <transportSender name="java"
+
class="org.apache.axis2.transport.java.JavaTransportSender"/> -->
+
+ <!--<transportSender name="jms"-->
+
<!--class="org.apache.axis2.transport.jms.JMSSender"/>-->
+
+ <!-- ================================================= -->
+ <!-- Non-blocking http/s Transport Sender -->
+
+ <!-- the non-blocking http transport sender based on HttpCore + NIO
extensions
+ <transportSender name="http"
class="org.apache.axis2.transport.nhttp.HttpCoreNIOSender">
+ <parameter name="non-blocking" locked="false">true</parameter>
+ </transportSender>-->
+
+ <!-- the non-blocking https transport sender based on HttpCore + NIO SSL
extensions
+ <transportSender name="https"
class="org.apache.axis2.transport.nhttp.HttpCoreNIOSSLSender">
+ <parameter name="non-blocking" locked="false">true</parameter>
+ <parameter name="keystore" locked="false">
+ <KeyStore>
+ <Location>identity.jks</Location>
+ <Type>JKS</Type>
+ <Password>password</Password>
+ <KeyPassword>password</KeyPassword>
+ </KeyStore>
+ </parameter>
+ <parameter name="truststore" locked="false">
+ <TrustStore>
+ <Location>trust.jks</Location>
+ <Type>JKS</Type>
+ <Password>password</Password>
+ </TrustStore>
+ </parameter>-->
+ <!--<parameter
name="HostnameVerifier">DefaultAndLocalhost</parameter>
+ supports Strict|AllowAll|DefaultAndLocalhost or the default if
none specified -->
+ <!--</transportSender>-->
+
+ <!-- ================================================= -->
+ <!-- Mail Transport Sender -->
+ <!--Only need to uncomment the sender. Configuration is achieved with
every client.
+ At any instant mail host should be given. Sample configuration has
been given.
+ http://people.apache.org/~pzf/SMTPBase64Binding-0.2.html
+ -->
+ <!-- ================================================= -->
+ <!--<transportSender name="mailto"
class="org.apache.axis2.transport.mail.MailTransportSender">
+ <parameter name="mail.smtp.host">localhost</parameter>
+ </transportSender>-->
+
+ <!-- ================================================= -->
+ <!-- Global Modules -->
+ <!-- ================================================= -->
+ <!-- Comment this to disable Addressing -->
+ <module ref="addressing"/>
+
+ <!--Configuring module , providing parameters for modules whether they
refer or not-->
+ <!--<moduleConfig name="addressing">-->
+ <!--<parameter name="addressingPara">N/A</parameter>-->
+ <!--</moduleConfig>-->
+
+ <!-- ================================================= -->
+ <!-- Clustering -->
+ <!-- ================================================= -->
+ <!-- Configure and uncomment following for preparing Axis2 to a
clustered environment -->
+ <!--
+ <cluster class="org.apache.axis2.cluster.tribes.TribesClusterManager">
+ <parameter name="param1">value1</parameter>
+ <parameter name="domain">apache.axis2.domain</parameter>
+ <parameter name="synchronizeAll">true</parameter>
+ <parameter name="maxRetries">10</parameter>
+ <configurationManager
class="org.apache.axis2.cluster.configuration.TribesConfigurationManager">
+ <listener
class="org.apache.axis2.cluster.configuration.DefaultConfigurationManagerListener"/>
+ </configurationManager>
+ <contextManager
class="org.apache.axis2.cluster.context.TribesContextManager">
+ <listener
class="org.apache.axis2.cluster.context.DefaultContextManagerListener"/>
+ </contextManager>
+ </cluster>
+ -->
+
+ <!-- ================================================= -->
+ <!-- Phases -->
+ <!-- ================================================= -->
+ <phaseOrder type="InFlow">
+ <!-- System predefined phases -->
+ <phase name="Transport">
+ <handler name="RequestURIBasedDispatcher"
+
class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
+ <order phase="Transport"/>
+ </handler>
+ <handler name="SOAPActionBasedDispatcher"
+
class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
+ <order phase="Transport"/>
+ </handler>
+ </phase>
+ <phase name="Addressing">
+ <handler name="AddressingBasedDispatcher"
+
class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
+ <order phase="Addressing"/>
+ </handler>
+ </phase>
+ <phase name="Security"/>
+ <phase name="PreDispatch"/>
+ <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+ <handler name="RequestURIBasedDispatcher"
+
class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
+ <handler name="SOAPActionBasedDispatcher"
+
class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
+ <handler name="RequestURIOperationDispatcher"
+
class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
+ <handler name="SOAPMessageBodyBasedDispatcher"
+
class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
+ <handler name="HTTPLocationBasedDispatcher"
+
class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
+ <handler name="GenericProviderDispatcher"
+
class="org.apache.axis2.jaxws.dispatchers.GenericProviderDispatcher"/>
+ <handler name="MustUnderstandValidationDispatcher"
+
class="org.apache.axis2.jaxws.dispatchers.MustUnderstandValidationDispatcher"/>
+ </phase>
+ <phase name="RMPhase"/>
+ <!-- System predefined phases -->
+ <!-- After Postdispatch phase module author or service author can
add any phase he want -->
+ <phase name="OperationInPhase">
+ <handler name="MustUnderstandChecker"
+
class="org.apache.axis2.jaxws.dispatchers.MustUnderstandChecker">
+ <order phase="OperationInPhase"/>
+ </handler>
+ </phase>
+ <phase name="soapmonitorPhase"/>
+ </phaseOrder>
+ <phaseOrder type="OutFlow">
+ <!-- user can add his own phases to this area -->
+ <phase name="soapmonitorPhase"/>
+ <phase name="OperationOutPhase"/>
+ <!--system predefined phase-->
+ <!--these phase will run irrespective of the service-->
+ <phase name="RMPhase"/>
+ <phase name="PolicyDetermination"/>
+ <phase name="MessageOut"/>
+ <phase name="Security"/>
+ </phaseOrder>
+ <phaseOrder type="InFaultFlow">
+ <phase name="Addressing">
+ <handler name="AddressingBasedDispatcher"
+
class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
+ <order phase="Addressing"/>
+ </handler>
+ </phase>
+ <phase name="Security"/>
+ <phase name="PreDispatch"/>
+ <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+ <handler name="RequestURIBasedDispatcher"
+
class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
+ <handler name="SOAPActionBasedDispatcher"
+
class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
+ <handler name="RequestURIOperationDispatcher"
+
class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
+ <handler name="SOAPMessageBodyBasedDispatcher"
+
class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
+ <handler name="HTTPLocationBasedDispatcher"
+
class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
+ <handler name="GenericProviderDispatcher"
+
class="org.apache.axis2.jaxws.dispatchers.GenericProviderDispatcher"/>
+ <handler name="MustUnderstandValidationDispatcher"
+
class="org.apache.axis2.jaxws.dispatchers.MustUnderstandValidationDispatcher"/>
+ </phase>
+ <phase name="RMPhase"/>
+ <!-- user can add his own phases to this area -->
+ <phase name="OperationInFaultPhase"/>
+ <phase name="soapmonitorPhase"/>
+ </phaseOrder>
+ <phaseOrder type="OutFaultFlow">
+ <!-- user can add his own phases to this area -->
+ <phase name="soapmonitorPhase"/>
+ <phase name="OperationOutFaultPhase"/>
+ <phase name="RMPhase"/>
+ <phase name="PolicyDetermination"/>
+ <phase name="MessageOut"/>
+ <phase name="Security"/>
+ </phaseOrder>
+</axisconfig>
+


Property changes on:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/webapp/WEB-INF/conf/axis2.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain

Added:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/webapp/WEB-INF/modules/addressing-1.41.mar
===================================================================
(Binary files differ)


Property changes on:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/webapp/WEB-INF/modules/addressing-1.41.mar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream

Added:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/webapp/WEB-INF/modules/mex-1.41.mar
===================================================================
(Binary files differ)


Property changes on:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/webapp/WEB-INF/modules/mex-1.41.mar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream

Added:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/webapp/WEB-INF/modules/modules.list
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/webapp/WEB-INF/modules/modules.list
(rev 0)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/webapp/WEB-INF/modules/modules.list
2013-04-11 17:08:09 UTC (rev 6248)
@@ -0,0 +1,23 @@
+#
+ # Licensed to the Apache Software
Foundation (ASF) under one
+ # or more contributor license
agreements. See the NOTICE file
+ # distributed with this work for
additional information
+ # regarding copyright ownership. The ASF
licenses this file
+ # to you under the Apache License,
Version 2.0 (the
+ # "License"); you may not use this file
except in compliance
+ # with the License. You may obtain a
copy of the License at
+ #
+ #
http://www.apache.org/licenses/LICENSE-2.0
+ #
+ # Unless required by applicable law or
agreed to in writing,
+ # software distributed under the License
is distributed on an
+ # "AS IS" BASIS, WITHOUT WARRANTIES OR
CONDITIONS OF ANY
+ # KIND, either express or implied. See
the License for the
+ # specific language governing
permissions and limitations
+ # under the License.
+ #
+ soapmonitor-1.41.mar
+ addressing-1.41.mar
+ ping-1.41.mar
+ mex-1.41.mar
+ scripting-1.41.mar
\ No newline at end of file

Added:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/webapp/WEB-INF/modules/ping-1.41.mar
===================================================================
(Binary files differ)


Property changes on:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/webapp/WEB-INF/modules/ping-1.41.mar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream

Added:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/webapp/WEB-INF/modules/scripting-1.41.mar
===================================================================
(Binary files differ)


Property changes on:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/webapp/WEB-INF/modules/scripting-1.41.mar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream

Added:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/webapp/WEB-INF/modules/smtpfault.mar
===================================================================
(Binary files differ)


Property changes on:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/webapp/WEB-INF/modules/smtpfault.mar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream

Added:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/webapp/WEB-INF/modules/soapmonitor-1.41.mar
===================================================================
(Binary files differ)


Property changes on:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/webapp/WEB-INF/modules/soapmonitor-1.41.mar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream

Added:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/webapp/WEB-INF/services/MeasurementArchiveService/META-INF/services.xml
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/webapp/WEB-INF/services/MeasurementArchiveService/META-INF/services.xml
(rev 0)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/webapp/WEB-INF/services/MeasurementArchiveService/META-INF/services.xml
2013-04-11 17:08:09 UTC (rev 6248)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN"
"http://www.springframework.org/dtd/spring-beans.dtd";>
+
+<service name="MeasurementArchiveService" scope="application">
+ <description>
+ perfSONAR RRD Measurement Archive Service
+ </description>
+ <operation name="message">
+ <messageReceiver
class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
+ </operation>
+ <parameter
name="ServiceClass">org.perfsonar.service.Axis2PerfsonarServiceConnPoint</parameter>
+</service>


Property changes on:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/webapp/WEB-INF/services/MeasurementArchiveService/META-INF/services.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain

Added: trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/webapp/WEB-INF/web.xml
(rev 0)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/webapp/WEB-INF/web.xml
2013-04-11 17:08:09 UTC (rev 6248)
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd";
+ version="2.5">
+
+ <display-name>GEANT RRD MA</display-name>
+
+ <session-config>
+ <!-- Default to 60 minute session timeouts -->
+ <session-timeout>60</session-timeout>
+ </session-config>
+
+ <servlet>
+ <servlet-name>AxisServlet</servlet-name>
+
<servlet-class>org.apache.axis2.transport.http.AxisServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>AxisServlet</servlet-name>
+ <url-pattern>/services/*</url-pattern>
+ </servlet-mapping>
+
+ <!-- Authentication checks are done through a filter -->
+ <filter>
+ <filter-name>authFilter</filter-name>
+
<filter-class>org.perfsonar.webadmin.filters.AuthFilter</filter-class>
+ </filter>
+ <filter-mapping>
+ <filter-name>authFilter</filter-name>
+ <url-pattern>/config</url-pattern>
+ <url-pattern>/initDb</url-pattern>
+ </filter-mapping>
+
+ <!-- Login Servlet -->
+ <servlet>
+ <servlet-name>Authentification</servlet-name>
+
<servlet-class>org.perfsonar.webadmin.servlet.LoginServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>Authentification</servlet-name>
+ <url-pattern>/login</url-pattern>
+ </servlet-mapping>
+
+ <!-- pS Config Servlet Admin -->
+ <servlet>
+ <servlet-name>BasicConfiguration</servlet-name>
+ <servlet-class>
+ org.perfsonar.webadmin.servlet.ConfigurationServlet
+ </servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>BasicConfiguration</servlet-name>
+ <url-pattern>
+ /config
+ </url-pattern>
+ </servlet-mapping>
+
+ <!-- SelfTest servlet -->
+ <servlet>
+ <servlet-name>SelfTestServlet</servlet-name>
+ <servlet-class>
+ org.perfsonar.webadmin.servlet.SelfTestServlet
+ </servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>SelfTestServlet</servlet-name>
+ <url-pattern>
+ /selfTest
+ </url-pattern>
+ </servlet-mapping>
+
+ <!-- DB initializer Servlet -->
+ <servlet>
+ <servlet-name>DbInitializer</servlet-name>
+
<servlet-class>org.perfsonar.service.measurementArchive.servlets.DbInitializerServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>DbInitializer</servlet-name>
+ <url-pattern>/initDb</url-pattern>
+ </servlet-mapping>
+
+ <!-- Welcome page -->
+ <welcome-file-list>
+ <welcome-file>index.jsp</welcome-file>
+ </welcome-file-list>
+
+</web-app>


Property changes on:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/webapp/WEB-INF/web.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain

Added:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/webapp/views/dbInit.jsp
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/webapp/views/dbInit.jsp
(rev 0)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/webapp/views/dbInit.jsp
2013-04-11 17:08:09 UTC (rev 6248)
@@ -0,0 +1,33 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
pageEncoding="UTF-8"%>
+
+<div class="centerWindow">
+
+<p class="heading1">RRD MA Metadata Database Initialisation</p>
+
+<% if ("yes".equals(request.getParameter("ok"))) { %>
+
+ <div class="succeed">
+ <p>The RRD MA Metadata Database has been fully emptied.</p>
+ </div>
+
+<% } else if (request.getParameter("ok") != null) { %>
+
+ <div class="properties">
+ <form method="GET" action="initDb">
+ <p>Do you really want to empty the Metadata Database?</p>
+ <br/>
+ <input type="hidden" name="action" value="emptyDB" />
+ <input class="button2_small" type="submit" name="submit" value="Yes" />
+ </form>
+ </div>
+
+<% } else { %>
+
+ <div class="failed">
+ <p>We failed to connect to the RRD MA Database.</p>
+ <p>Please check Tomcat log files for further information.</p>
+ </div>
+
+<% } %>
+
+</div>


Property changes on:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/main/webapp/views/dbInit.jsp
___________________________________________________________________
Added: svn:mime-type
+ text/plain

Added:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/test/java/org/perfsonar/tests/measurementArchive/rrdType/storage/sql/MysqlMetadataStorageDAOImplTest.java
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/src/test/java/org/perfsonar/tests/measurementArchive/rrdType/storage/sql/MysqlMetadataStorageDAOImplTest.java
(rev 0)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/src/test/java/org/perfsonar/tests/measurementArchive/rrdType/storage/sql/MysqlMetadataStorageDAOImplTest.java
2013-04-11 17:08:09 UTC (rev 6248)
@@ -0,0 +1,42 @@
+package org.perfsonar.tests.measurementArchive.rrdType.storage.sql;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import org.perfsonar.base2.service.exceptions.PerfSONARException;
+import
org.perfsonar.service.measurementArchive.rrdType.storage.sql.MysqlMetadataStorageDAOImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author Antoine Delvaux -

+ *
+ */
+@Ignore
+public class MysqlMetadataStorageDAOImplTest {
+
+ protected Logger logger = LoggerFactory.getLogger(getClass());
+ private MysqlMetadataStorageDAOImpl dao = new
MysqlMetadataStorageDAOImpl();
+
+ @Before
+ public void init() throws PerfSONARException {
+ logger.info("•••• Before tests");
+ dao.init();
+ }
+
+ /**
+ * This test connectivity to the MySQL DB, it should only be enabled
+ * if you actually have a MySQL DB available and want to test it.
+ * @throws PerfSONARException
+ */
+ @Ignore
+ @Test
+ public void testConnectivityTest() throws PerfSONARException {
+ logger.info("•••• Testing MySQL DAO connectivity");
+ assertTrue(dao.testConnectivity());
+ }
+}


Property changes on:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/test/java/org/perfsonar/tests/measurementArchive/rrdType/storage/sql/MysqlMetadataStorageDAOImplTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain

Added:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/test/resources/META-INF/persistence.xml
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/src/test/resources/META-INF/persistence.xml
(rev 0)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/src/test/resources/META-INF/persistence.xml
2013-04-11 17:08:09 UTC (rev 6248)
@@ -0,0 +1,28 @@
+<persistence xmlns="http://java.sun.com/xml/ns/persistence";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd";
+ version="2.0">
+ <persistence-unit
name="org.perfsonar.service.measurementArchive.rrdType.storage.sql">
+ <description>
+ Persistence unit for meta data store of RRD MA
+ </description>
+
+ <provider>org.hibernate.ejb.HibernatePersistence</provider>
+
<class>org.perfsonar.service.measurementArchive.rrdType.storage.persistence.entity.Interfaces</class>
+
+ <properties>
+ <!-- We want to automatically update the DB schema -->
+ <property name="hibernate.hbm2ddl.auto" value="update"/>
+ <property name="hibernate.c3p0.min_size" value="1"/>
+ <property name="hibernate.c3p0.max_size" value="30"/>
+ <property name="hibernate.c3p0.timeout" value="5000"/>
+ <property name="hibernate.c3p0.acquireRetryAttempts" value="1"/>
+ <property name="hibernate.c3p0.acquireRetryDelay" value="0"/>
+ <property name="hibernate.c3p0.breakAfterAcquireFailure"
value="true"/>
+ <property name="hibernate.c3p0.testConnectionOnCheckout"
value="true"/>
+ <property name="hibernate.connection.autoReconnect"
value="true"/>
+ <property name="hibernate.connection.autoReconnectForPools"
value="true"/>
+ <property name="javax.persistence.transaction"
value="RESOURCE_LOCAL"/>
+ </properties>
+ </persistence-unit>
+</persistence>
\ No newline at end of file


Property changes on:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/test/resources/META-INF/persistence.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain

Added: trunk/perfsonar-java-rrd-ma-SQL_backend/src/test/resources/log4j.xml
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/src/test/resources/log4j.xml
(rev 0)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/src/test/resources/log4j.xml
2013-04-11 17:08:09 UTC (rev 6248)
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM
"http://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/xml/doc-files/log4j.dtd";>
+
+<!-- This is the configuration for LOG4J for perfSONAR development purposes
-->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";>
+
+ <!-- Section: APPENDERS -->
+
+ <!--
+ writes log messages to the console. It outputs file name,
+ method name and line number of the caller. This is slow,
+ so just use it for debugging.
+ -->
+ <appender name="console" class="org.apache.log4j.ConsoleAppender">
+ <param name="Encoding" value="UTF-8"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d - [%p] %c{1}[%M]:%L -
%m %n"/>
+ </layout>
+ </appender>
+
+ <!-- We have a log file for eXist -->
+ <appender name="exist" class="org.apache.log4j.RollingFileAppender">
+ <param name="File" value="logs/exist.log"/>
+ <param name="MaxFileSize" value="10MB"/>
+ <param name="MaxBackupIndex" value="7"/>
+ <param name="Encoding" value="UTF-8"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d [%t] %-5p (%F [%M]:%L)
- %m %n"/>
+ </layout>
+ </appender>
+
+ <!-- We have a log file for perfSONAR -->
+ <appender name="perfsonar" class="org.apache.log4j.RollingFileAppender">
+ <param name="File" value="logs/perfsonar.log"/>
+ <param name="MaxFileSize" value="10MB"/>
+ <param name="MaxBackupIndex" value="7"/>
+ <param name="Encoding" value="UTF-8"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d [%t] %-5p (%F [%M]:%L)
- %m %n"/>
+ </layout>
+ </appender>
+
+ <!-- We have a log file for the WebAdmin -->
+ <appender name="webadmin" class="org.apache.log4j.RollingFileAppender">
+ <param name="File" value="logs/webadmin.log"/>
+ <param name="MaxFileSize" value="10MB"/>
+ <param name="MaxBackupIndex" value="7"/>
+ <param name="Encoding" value="UTF-8"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d [%t] %-5p (%F [%M]:%L)
- %m %n"/>
+ </layout>
+ </appender>
+
+ <!-- We have a log file for pSbase -->
+ <appender name="perfsonar-base2"
class="org.apache.log4j.RollingFileAppender">
+ <param name="File" value="logs/psbase2.log"/>
+ <param name="MaxFileSize" value="10MB"/>
+ <param name="MaxBackupIndex" value="7"/>
+ <param name="Encoding" value="UTF-8"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d [%t] %-5p (%F [%M]:%L)
- %m %n"/>
+ </layout>
+ </appender>
+
+ <!-- Some general exceptions -->
+ <!-- Axis produces a large amount of debugging output if priority is
set to debug -->
+ <!--
+ <category name="org.apache" additivity="false">
+ <priority value="off"/>
+ <appender-ref ref="console"/>
+ </category>
+ -->
+
+ <!-- perfSONAR WebAdmin -->
+ <category name="org.perfsonar.webadmin" additivity="false">
+ <level value="debug"/>
+ <appender-ref ref="webadmin"/>
+ </category>
+
+ <!-- perfSONAR RRD MA -->
+ <category name="org.perfsonar.service" additivity="false">
+ <level value="info"/>
+ <appender-ref ref="perfsonar"/>
+ </category>
+
+ <category name="org.perfsonar.service.measurementArchive"
additivity="false">
+ <level value="debug"/>
+ <appender-ref ref="perfsonar"/>
+ <appender-ref ref="console"/>
+ </category>
+
+ <category name="org.perfsonar.base2" additivity="false">
+ <priority value="debug"/>
+ <appender-ref ref="perfsonar-base2"/>
+ </category>
+
+ <category name="org.perfsonar.base2.service.scheduler">
+ <priority value="info"/>
+ <appender-ref ref="perfsonar-base2"/>
+ </category>
+
+ <!--
+ <category name="org.perfsonar.service.lookupservice.components"
additivity="false">
+ <level value="trace"/>
+ <appender-ref ref="console"/>
+ </category>
+ -->
+
+ <!-- perfSONAR Unit tests -->
+ <category name="org.perfsonar.tests" additivity="false">
+ <priority value="info"/>
+ <appender-ref ref="console"/>
+ </category>
+
+ <!-- All other messages are going to the perfsonar log (root logger) -->
+ <root>
+ <priority value="warn"/>
+ <appender-ref ref="perfsonar"/>
+ <appender-ref ref="console"/>
+ </root>
+
+</log4j:configuration>


Property changes on:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/test/resources/log4j.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain

Added:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/test/resources/perfsonar/conf/configuration.xml
===================================================================
---
trunk/perfsonar-java-rrd-ma-SQL_backend/src/test/resources/perfsonar/conf/configuration.xml
(rev 0)
+++
trunk/perfsonar-java-rrd-ma-SQL_backend/src/test/resources/perfsonar/conf/configuration.xml
2013-04-11 17:08:09 UTC (rev 6248)
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- $Id: configuration-ma.xml 4915M
2010-03-18 12:05:18Z (local) $ --><configuration
xmlns="http://service.perfsonar.org/ns/config/base/0.9/";>
+
+
+ <service name="PerfsonarService">
+
+
+ <!--
....................................................................................
-->
+
+ <!-- Lookup Info of the LS instance -->
+
+ <lookupInformation>
+
+ <option name="accessPoint"
value="http://localhost:8080/perfsonar-java-rrd-ma/services/MeasurementArchiveService"/>
+ <!-- If you have a production service in the GEANT domain, you might
want to use the following address for registration -->
+ <!--
http://ls.geant.net:8080/perfsonar-java-xml-ls/services/LookupService -->
+ <option name="serviceName" value="perfsonar-java-rrd-ma"/>
+ <option name="serviceType" value="RRD_MA"/>
+
+ </lookupInformation>
+
+ <!--
....................................................................................
-->
+
+ <!-- Message Handlers - message types and service engines -->
+
+ <messageHandler>
+
+ <message
handler="org.perfsonar.base2.service.messages.GenericMessageHandler"
type="EchoRequest">
+ <option name="ServiceEngine"
value="org.perfsonar.service.measurementArchive.rrdType.EchoServiceEngine"/>
+ <option name="authN" value="no"/>
+ </message>
+
+ <message
handler="org.perfsonar.service.measurementArchive.rrdType.MetadataKeyMessageHandler"
type="MetadataKeyRequest">
+ <option name="ServiceEngine"
value="org.perfsonar.service.measurementArchive.rrdType.MetadataKeyServiceEngine"/>
+ <option name="authN" value="no"/>
+ </message>
+
+ <message
handler="org.perfsonar.base2.service.messages.GenericMessageHandler"
type="SetupDataRequest">
+ <option name="ServiceEngine"
value="org.perfsonar.service.measurementArchive.rrdType.SetupDataServiceEngine"/>
+ <option name="authN" value="no"/>
+ </message>
+
+ </messageHandler>
+
+ <!--
....................................................................................
-->
+
+ <!-- Additional auxiliary components -->
+
+ <auxiliaryComponents>
+
+ <component
className="org.perfsonar.base2.service.storage.xml.XMLDBComponent"
name="exist">
+ <option name="dataStorageClassName"
value="org.perfsonar.base2.service.storage.xml.exist.ExistHTTPDataStorage"/>
+ <option name="uri"
value="http://localhost:8080/exist/rest/db/rrdmaconfig"/>
+ <option name="username" value="rrdmaservice"/>
+ <option name="password" value="rrdmaservice"/>
+ </component>
+
+ <component
className="org.perfsonar.service.measurementArchive.rrdType.storage.exist.QueryGeneratorManager"
name="queryGeneratorManager">
+
+ <option name="http://ggf.org/ns/nmwg/characteristic/utilization/2.0";
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.UtilizationQueryGenerator"/>
+
+ <option name="http://ggf.org/ns/nmwg/characteristic/errors/2.0";
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.ErrorsQueryGenerator"/>
+
+ <option name="http://ggf.org/ns/nmwg/characteristic/discards/2.0";
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.DiscardsQueryGenerator"/>
+
+ <option name="http://ggf.org/ns/nmwg/tools/snmp/2.0";
value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.SNMPQueryGenerator"/>
+
+ <option
name="http://schemas.perfsonar.net/tools/admin/selftest/1.0/random-fetch-test";

value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.RandomFetchTestQueryGenerator"/>
+
+ <option
name="http://schemas.perfsonar.net/tools/admin/selftest/1.0/xmldb-access-test";

value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.XmlDbAccessTestQueryGenerator"/>
+
+ <option
name="http://schemas.perfsonar.net/tools/admin/selftest/1.0/xmldb-content-test";

value="org.perfsonar.service.measurementArchive.rrdType.storage.exist.query.XmlDbContentTestQueryGenerator"/>
+
+ </component>
+
+ <component
className="org.perfsonar.service.measurementArchive.rrdType.storage.exist.ExistMetadataStorageDAOImpl"
name="metadataStorageDAO">
+ <option name="exist-config" value="exist"/> <!-- reference to eXist
DB XML component config-->
+ <option name="queryGeneratorManager-config"
value="queryGeneratorManager"/> <!-- reference to queryGeneratorManager
component config-->
+ </component>
+
+ <component
className="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.RRDDataStorageDAOImpl"
name="dataStorageDAO">
+ <option
name="eventType::http://ggf.org/ns/nmwg/characteristic/utilization/2.0";
value="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.UtilizationResponseGenerator"/>
+ <option
name="eventType::http://ggf.org/ns/nmwg/characteristic/discards/2.0";
value="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.DiscardsResponseGenerator"/>
+ <option
name="eventType::http://ggf.org/ns/nmwg/characteristic/errors/2.0";
value="org.perfsonar.service.measurementArchive.rrdType.storage.rrd.ErrorsResponseGenerator"/>
+ </component>
+
+ <component name="migrator"
className="org.perfsonar.base2.service.configuration.migration.MigratorComponent">
+ <option name ="config-directory"
value="/usr/lib/perfsonar/services/geant2-java-rrd-ma/WEB-INF/classes/perfsonar/conf"/>

+ </component>
+
+ <component
className="org.perfsonar.service.measurementArchive.rrdType.storage.sql.MysqlMetadataStorageDAOImpl"
name="metadataStorageDAO2">
+ <option name="uri" value="jdbc:mysql://rrdma:3306/"/>
+ <option name="schema" value ="perfsonar_rrdma"/>
+ <option name="username" value="perfsonar_rrdma"/>
+ <option name="password" value="testpass"/>
+ </component>
+
+ <!-- Scheduler -->
+ <component
className="org.perfsonar.base2.service.scheduler.SchedulingComponent"
name="scheduling">
+
+ <option name="schedulerClassName"
value="org.perfsonar.base2.service.scheduler.SimpleScheduler"/>
+ <option name="interval" value="1800"/> <!-- sec -->
+
+ <actions>
+
+ <action
className="org.perfsonar.base2.service.registration.LSRegistrationAction"
name="registration">
+
+ <option name="status" value="on"/>
+ <option name="interval" value="3500"/> <!-- sec -->
+ <option name="registerDataSource"
value="org.perfsonar.base2.service.registration.MetadataExistDBRegisterDataSource"/>

+ <option name="registerEventType"
value="http://ogf.org/ns/nmwg/tools/org/perfsonar/service/lookup/registration/summary/2.0"/>
+ <option name="registrator"
value="org.perfsonar.base2.service.registration.GenericLSRegistrator"/>
+ <option name="lsAddress-1"
value="http://localhost:8080/perfsonar-java-xml-ls/services/LookupService"/>
+ <!--
+ <option name ="lsAddress-2"></option>
+ <option name ="lsAddress-3"></option>
+ <option name ="lsAddress-4"></option>
+ <option name ="lsAddress-5"></option>
+ -->
+
+ </action>
+
+ </actions>
+ </component>
+
+
+ <!-- auth configuration -->
+ <component
className="org.perfsonar.base2.service.authn.component.wssec.WSSecAuthNComponent"
name="auth">
+ <option name="as_endpoint"
value="http://homer.rediris.es:8080/geant2-java-as-1.2/services/SimpleService"/>
+ <option name="comp_id" value="urn:compId"/>
+ </component>
+
+ </auxiliaryComponents>
+
+
+
+ <extension name="registerExtension-registerDataSource">
+ <option name="exist-config" value="exist"/>
+ </extension>
+
+
+
+ <!--
....................................................................................
-->
+
+
+ <!-- Protocol mappings, XML elements and their bingings -->
+
+ <protocolMappings>
+
+ <!-- default mapping -->
+ <element mapping="org.perfsonar.base2.xml.Element" name="*"/>
+
+ <!-- general mappings -->
+ <element mapping="org.perfsonar.base2.xml.nmwg.Message"
name="{http://ggf.org/ns/nmwg/base/2.0/}message"/>
+ <element mapping="org.perfsonar.base2.xml.nmwg.Metadata"
name="{http://ggf.org/ns/nmwg/base/2.0/}metadata"/>
+ <element mapping="org.perfsonar.base2.xml.nmwg.EventType"
name="{http://ggf.org/ns/nmwg/base/2.0/}eventType"/>
+ <element mapping="org.perfsonar.base2.xml.nmwg.Data"
name="{http://ggf.org/ns/nmwg/base/2.0/}data"/>
+ <element mapping="org.perfsonar.base2.xml.nmwg.Parameters"
name="{http://ggf.org/ns/nmwg/base/2.0/}parameters"/>
+ <element mapping="org.perfsonar.base2.xml.nmwg.Parameter"
name="{http://ggf.org/ns/nmwg/base/2.0/}parameter"/>
+ <element mapping="org.perfsonar.base2.xml.nmwg.Key"
name="{http://ggf.org/ns/nmwg/base/2.0/}key"/>
+
+ <element mapping="org.perfsonar.base2.xml.nmwg.Subject"
name="{http://ggf.org/ns/nmwg/base/2.0/}subject"/>
+ <element mapping="org.perfsonar.base2.xml.nmwg.Subject"
name="{http://ggf.org/ns/nmwg/characteristic/utilization/2.0/}subject"/>
+ <element mapping="org.perfsonar.base2.xml.nmwg.Subject"
name="{http://ggf.org/ns/nmwg/characteristic/errors/2.0/}subject"/>
+ <element mapping="org.perfsonar.base2.xml.nmwg.Subject"
name="{http://ggf.org/ns/nmwg/characteristic/discards/2.0/}subject"/>
+ <element mapping="org.perfsonar.base2.xml.nmwg.Subject"
name="{http://ggf.org/ns/nmwg/ops/select/2.0/}subject"/>
+ <element mapping="org.perfsonar.base2.xml.nmwg.Parameters"
name="{http://ggf.org/ns/nmwg/ops/select/2.0/}parameters"/>
+ <element mapping="org.perfsonar.base2.xml.Element"
name="{http://ggf.org/ns/nmwg/time/2.0/}time"/>
+
+ </protocolMappings>
+
+ <!--
....................................................................................
-->
+
+
+ </service>
+
+
+</configuration>


Property changes on:
trunk/perfsonar-java-rrd-ma-SQL_backend/src/test/resources/perfsonar/conf/configuration.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain

Modified:
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/pom.xml
===================================================================
--- trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/pom.xml
2013-03-25 12:39:38 UTC (rev 6247)
+++ trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/pom.xml
2013-04-11 17:08:09 UTC (rev 6248)
@@ -79,6 +79,19 @@
<attachClasses>true</attachClasses>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat6-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>run-war</id>
+ <!-- We don't want this plugin to be called from
another module build -->
+ <phase/>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>

</build>

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-03-25 12:39:38 UTC (rev 6247)
+++
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/servlet/SelfTestServlet.java
2013-04-11 17:08:09 UTC (rev 6248)
@@ -47,12 +47,12 @@
redirectURL = redirectURL +
"&ok";
} else {
logger.warn("Result of
selfTest is neither error nor success: " + result);
-
request.setAttribute("errorMessage", "Unknown response from service.");
+
request.setAttribute("errorMessage", "Unknown response from service. Look
for more information in the logs.");
}

} else {
logger.info("Self test was returned
an empty result.");
- request.setAttribute("errorMessage",
"Result is null");
+ request.setAttribute("errorMessage",
"Result is empty (null).");
}
} catch (SOAPClientException e) {

getServletContext().setAttribute("errorMessage", e.getMessage());

Modified:
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/servlet/util/ConfigurationServletHelper.java
===================================================================
---
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/servlet/util/ConfigurationServletHelper.java
2013-03-25 12:39:38 UTC (rev 6247)
+++
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/java/org/perfsonar/webadmin/servlet/util/ConfigurationServletHelper.java
2013-04-11 17:08:09 UTC (rev 6248)
@@ -46,7 +46,7 @@
return map;
}
// We don't have it, so let's build it and store it in the
servlet context
- String basePath = servletContext.getRealPath("/") + "WEB-INF";
+ String basePath = servletContext.getRealPath("/") +
"/WEB-INF";
map = new ObjectMap(basePath, WA_CONFIG_PATH, WA_FILE_NAME);
servletContext.setAttribute("ObjectMap", map);
return map;

Modified:
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/webapp/views/selfTest.jsp
===================================================================
---
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/webapp/views/selfTest.jsp
2013-03-25 12:39:38 UTC (rev 6247)
+++
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/webapp/views/selfTest.jsp
2013-04-11 17:08:09 UTC (rev 6248)
@@ -22,7 +22,7 @@
if (error != null) {
out.println(error);
} else {
-
out.println(application.getAttribute("errorMessage"));
+
out.println(request.getAttribute("errorMessage"));
}
}
%>

Modified: trunk/perfsonar-java-web-admin/pom.xml
===================================================================
--- trunk/perfsonar-java-web-admin/pom.xml 2013-03-25 12:39:38 UTC (rev
6247)
+++ trunk/perfsonar-java-web-admin/pom.xml 2013-04-11 17:08:09 UTC (rev
6248)
@@ -51,24 +51,4 @@
</developer>
</developers>

- <build>
- <pluginManagement>
- <plugins>
- <plugin>
-
<groupId>org.apache.maven.plugins</groupId>
-
<artifactId>maven-resources-plugin</artifactId>
- </plugin>
- <plugin>
-
<groupId>org.apache.maven.plugins</groupId>
-
<artifactId>maven-war-plugin</artifactId>
- </plugin>
- <plugin>
-
<groupId>org.apache.tomcat.maven</groupId>
-
<artifactId>tomcat6-maven-plugin</artifactId>
- <version>2.0-beta-1</version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
</project>

Modified:
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/servlets/ExistDbInitializerServlet.java
===================================================================
---
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/servlets/ExistDbInitializerServlet.java
2013-03-25 12:39:38 UTC (rev 6247)
+++
trunk/perfsonar-java-xml-ls/src/main/java/org/perfsonar/service/lookupservice/servlets/ExistDbInitializerServlet.java
2013-04-11 17:08:09 UTC (rev 6248)
@@ -167,7 +167,6 @@
}

/**
- *
* upload file to eXistDatabase
*
* @param fileName

---

• [pS-dev] [GEANT/SA2/ps-java-services] r6248 - in trunk: . parent perfsonar-java-rrd-ma-SQL_backend perfsonar-java-rrd-ma-SQL_backend/doc perfsonar-java-rr d-ma-SQL_backend/src/checkstyle perfsonar-java-rrd-ma-SQ L_backend/src/deb perfsonar-java-rrd-ma-SQL_backend/sr c/deb/control perfsonar-java-rrd-ma-SQL_backend/src/main /java/org/perfsonar/service/measurementArchive perfsonar-j ava-rrd-ma-SQL_backend/src/main/java/org/perfsonar/servi ce/measurementArchive/rrdType/storage perfsonar-java-rrd-m a-SQL_backend/src/main/java/org/perfsonar/service/measur ementArchive/rrdType/storage/exist perfsonar-java-rrd-ma-S QL_backend/src/main/java/org/perfsonar/service/measureme ntArchive/rrdType/storage/persistence/entity perfsonar-jav a-rrd-ma-SQL_backend/src/main/java/org/perfsonar/service /measurementArchive/rrdType/storage/rrd perfsonar-java-rrd -ma-SQL_backend/src/main/java/org/perfsonar/service/meas urementArchive/rrdType/storage/sql perfsonar-java-rrd-ma-S QL_backend/src/main/java/org/perfsonar/ser vice/measurem entArchive/servlets perfsonar-java-rrd-ma-SQL_backend/sr c/main/resources perfsonar-java-rrd-ma-SQL_backend/src/m ain/resources/META-INF perfsonar-java-rrd-ma-SQL_backend /src/main/resources/perfsonar perfsonar-java-rrd-ma-SQL_ backend/src/main/resources/perfsonar/conf perfsonar-java-r rd-ma-SQL_backend/src/main/webapp perfsonar-java-rrd-ma- SQL_backend/src/main/webapp/WEB-INF perfsonar-java-rrd-m a-SQL_backend/src/main/webapp/WEB-INF/conf perfsonar-jav a-rrd-ma-SQL_backend/src/main/webapp/WEB-INF/modules per fsonar-java-rrd-ma-SQL_backend/src/main/webapp/WEB-INF/s ervices perfsonar-java-rrd-ma-SQL_backend/src/main/webap p/WEB-INF/services/MeasurementArchiveService perfsonar-jav a-rrd-ma-SQL_backend/src/main/webapp/WEB-INF/services/Me asurementArchiveService/META-INF perfsonar-java-rrd-ma-SQL _backend/src/main/webapp/views perfsonar-java-rrd-ma-SQL _backend/src/test perfsonar-java-rrd-ma-SQL_backend/sr c/test/java/org/perfsonar perfsonar-java-rrd-ma-SQL_back end/src/test/java/or g/perfsonar/tests perfsonar-java-rrd- ma-SQL_backend/src/test/java/org/perfsonar/tests/measure mentArchive perfsonar-java-rrd-ma-SQL_backend/src/test/j ava/org/perfsonar/tests/measurementArchive/rrdType perfson ar-java-rrd-ma-SQL_backend/src/test/java/org/perfsonar/t ests/measurementArchive/rrdType/storage perfsonar-java-rrd -ma-SQL_backend/src/test/java/org/perfsonar/tests/measur ementArchive/rrdType/storage/sql perfsonar-java-rrd-ma-SQL _backend/src/test/resources perfsonar-java-rrd-ma-SQL_ backend/src/test/resources/META-INF perfsonar-java-rrd-ma- SQL_backend/src/test/resources/perfsonar perfsonar-java- rrd-ma-SQL_backend/src/test/resources/perfsonar/conf per fsonar-java-web-admin perfsonar-java-web-admin/perfsonar-j ava-web-admin-component perfsonar-java-web-admin/perfsonar -java-web-admin-component/src/main/java/org/perfsonar/weba dmin/servlet perfsonar-java-web-admin/perfsonar-java-web-a dmin-component/src/main/java/org/perfsonar/webadmin/servle t/util perfsonar-java-web-admin/perfsona r-java-web-admin- component/src/main/webapp/views perfsonar-java-xml-ls/src/ main/java/org/perfsonar/service/lookupservice/servlets, svn-noreply, 04/11/2013

---

Archive powered by MHonArc 2.6.16.