Skip to Content.
Sympa Menu

perfsonar-dev - [pS-dev] [GEANT/SA2/ps-java-services] r6452 - in trunk: . packaging perfsonar-java-sql-ma/src/main/j ava/org/perfsonar/service/measurementArchive/sqlType

Subject: perfsonar development work

List archive

[pS-dev] [GEANT/SA2/ps-java-services] r6452 - in trunk: . packaging perfsonar-java-sql-ma/src/main/j ava/org/perfsonar/service/measurementArchive/sqlType


Chronological Thread 
  • From:
  • To:
  • Subject: [pS-dev] [GEANT/SA2/ps-java-services] r6452 - in trunk: . packaging perfsonar-java-sql-ma/src/main/j ava/org/perfsonar/service/measurementArchive/sqlType
  • Date: Fri, 8 Nov 2013 14:22:40 +0000 (GMT)
Author: dante.delvaux
Date: 2013-11-08 14:22:40 +0000 (Fri, 08 Nov 2013)
New Revision: 6452

Removed:

trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/

trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/nmwg/

trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/
Modified:
trunk/packaging/arti2unstable.sh

trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/FlywayCommandLine.java

trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/JdbcStorageManager.java

trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/NMWGInterfaceBaseChaining.java

trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
trunk/pom.xml
Log:
SQLMA: correcting a few PMD warnings.

Modified: trunk/packaging/arti2unstable.sh
===================================================================
--- trunk/packaging/arti2unstable.sh 2013-11-07 22:15:08 UTC (rev 6451)
+++ trunk/packaging/arti2unstable.sh 2013-11-08 14:22:40 UTC (rev 6452)
@@ -7,6 +7,8 @@
# both arch (Debian) or the noarch (RPM) section of the repository.
#
# This script is supposed to be called by cron every night.
+# For example like this:
+# 13 3 * * * /root/arti2unstable.sh >> /var/log/psrepo.log
#
# © 2013 -


@@ -70,5 +72,5 @@
fi
done
echo "We now push the local RPM repository to the public server."
-/usr/bin/rsync -rl --delay-updates --delete -e "ssh -4 -i ${SSHKEY}"
--delete-excluded --exclude-from /srv/repos/rpm/rpm/exclude-list
${RPMPATH}/${RPMDISTRO} ${RSYNCURL}/rpm/${RPMDISTRO}
+/usr/bin/rsync -rl --delay-updates --delete -e "ssh -4 -i ${SSHKEY}"
--delete-excluded --exclude-from /srv/repos/rpm/rpm/exclude-list
${RPMPATH}/${RPMDISTRO}/ ${RSYNCURL}/rpm/${RPMDISTRO}/
echo
"---------------------------------------------------------------------------------"

Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/FlywayCommandLine.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/FlywayCommandLine.java
2013-11-07 22:15:08 UTC (rev 6451)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/FlywayCommandLine.java
2013-11-08 14:22:40 UTC (rev 6452)
@@ -211,7 +211,7 @@
{
int index = arg.indexOf("=");

- if ((index < 0) || (index == arg.length())) {
+ if (index < 0 || index == arg.length()) {
return "";
}


Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/JdbcStorageManager.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/JdbcStorageManager.java
2013-11-07 22:15:08 UTC (rev 6451)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/JdbcStorageManager.java
2013-11-08 14:22:40 UTC (rev 6452)
@@ -39,11 +39,6 @@
*/
public final class JdbcStorageManager implements NMWGStorageManager
{
- private static final String SERVICE_MA_JDBC_DRIVER =
"service.ma.jdbc.driver";
- private static final String SERVICE_MA_JDBC_URL = "service.ma.jdbc.url";
- private static final String SERVICE_MA_JDBC_USERNAME =
"service.ma.jdbc.username";
- private static final String SERVICE_MA_JDBC_PASSWORD =
"service.ma.jdbc.password";
-
private static final ServiceLoader<DaoProvider> PROVIDERS =
ServiceLoader.load(DaoProvider.class);

private final LoggerComponent logger;

Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/NMWGInterfaceBaseChaining.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/NMWGInterfaceBaseChaining.java
2013-11-07 22:15:08 UTC (rev 6451)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/NMWGInterfaceBaseChaining.java
2013-11-08 14:22:40 UTC (rev 6452)
@@ -202,7 +202,6 @@
(org.ggf.ns.nmwg.ops.select.v2_0.Subject) metadata2.getSubject();
EventType m2EventType = metadata2.getEventType();

-
if ((m1Subject != null || m2Subject != null) &&
newMetadata.getSubject() == null) {
newMetadata.setSubject(new
org.ggf.ns.nmwg.ops.select.v2_0.Subject());
}
@@ -227,27 +226,29 @@

newMetadata.getEventType().setEventType(m2EventType.getEventType());
}

+ // Merge the parameters
Parameters m1Parameters = metadata1.getParameters();
Parameters m2Parameters = metadata2.getParameters();
- org.ggf.ns.nmwg.ops.select.v2_0.Parameters newParameters = null;
if (m1Parameters != null || m2Parameters != null) {
- newParameters = new org.ggf.ns.nmwg.ops.select.v2_0.Parameters();
- }
- Iterator pIt = m1Parameters.getParameterIterator();
- while (pIt.hasNext()) {
- Parameter param = (Parameter) pIt.next();
- newParameters.addParameter(param);
- }
- pIt = m2Parameters.getParameterIterator();
- while (pIt.hasNext()) {
- Parameter param = (Parameter) pIt.next();
- newParameters.addParameter(param);
- }
- if (newParameters != null) {
+ Iterator pIt;
+ org.ggf.ns.nmwg.ops.select.v2_0.Parameters newParameters = new
org.ggf.ns.nmwg.ops.select.v2_0.Parameters();
+ if (m1Parameters != null) {
+ pIt = m1Parameters.getParameterIterator();
+ while (pIt.hasNext()) {
+ Parameter param = (Parameter) pIt.next();
+ newParameters.addParameter(param);
+ }
+ }
+ if (m2Parameters != null) {
+ pIt = m2Parameters.getParameterIterator();
+ while (pIt.hasNext()) {
+ Parameter param = (Parameter) pIt.next();
+ newParameters.addParameter(param);
+ }
+ }
newMetadata.setParameters(newParameters);
}

-
}



Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
2013-11-07 22:15:08 UTC (rev 6451)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
2013-11-08 14:22:40 UTC (rev 6452)
@@ -218,7 +218,7 @@
if (!resp.getDataMap().isEmpty()) {
// metadata already exists in xmldb

- Data data = (resp.getDataArray())[0];
+ Data data = resp.getDataArray()[0];
key = data.getKey();

if (key.getParameterByName("eventType") == null) {

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2013-11-07 22:15:08 UTC (rev 6451)
+++ trunk/pom.xml 2013-11-08 14:22:40 UTC (rev 6452)
@@ -3,7 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<prerequisites>
- <maven>2.2.1</maven>
+ <maven>3.0.0</maven>
</prerequisites>

<groupId>net.geant.perfsonar</groupId>
@@ -24,6 +24,11 @@
<url>http://www.geant.net</url>
</organization>

+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ </properties>
+
<modules>
<module>parent</module>
<module>perfsonar-base/base</module>


  • [pS-dev] [GEANT/SA2/ps-java-services] r6452 - in trunk: . packaging perfsonar-java-sql-ma/src/main/j ava/org/perfsonar/service/measurementArchive/sqlType, svn-noreply, 11/08/2013

Archive powered by MHonArc 2.6.16.

Top of Page