Chronological Thread 

< Chronological >      < Thread >

---

Author: nordunet.behrmann
Date: 2012-10-05 10:22:37 +0100 (Fri, 05 Oct 2012)
New Revision: 6007

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/SQLStorageManager.java

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/fetch/BwctlResponseGenerator.java

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/authn/DynamicCrypto.java

trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/authn/wssec/WSSecAuthNComponent.java

trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/configuration/properties/PropertiesConfigurationComponent.java

trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/context/inMemory/InMemoryContext.java

trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/logger/log4j/Log4jLoggerComponent.java

trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/mapping/ExpressionMapping.java

trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/scheduler/Scheduler.java

trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/scheduler/actions/SchedulerAction.java

trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/simplescheduler/Scheduler.java

trunk/perfsonar_base/src/main/java/org/perfsonar/base/nmwg/owamp/Parameters.java

trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/StringBufferOutputStream.java

trunk/perfsonar_base/src/main/java/org/perfsonar/client/axis/AxisClient.java

trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/WSSAuthNSAMLData.java

trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/WSSAuthNX509Data.java

trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/saslca/UserID.java

trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/saslca/UserIDCallbackHandler.java

trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/authService/AttrEERequestGenerator.java

trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/authService/AuthNEERequestGenerator.java

trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/authService/AuthREERequestGenerator.java

trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/lookupService/EchoRequestGenerator.java

trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/lookupService/LSDeregisterRequestGenerator.java

trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/lookupService/LSKeepaliveRequestGenerator.java

trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/lookupService/LSQueryRequestGenerator.java

trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/lookupService/LSRegisterRequestGenerator.java

trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/xquery/lookupService/GenericXQueryExpression.java

trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/SOAPClientMulti.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/AADispatchSOAPProtocol.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/AttrResponse.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/tokens/SecTokenSOAPManager.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/container/listeners/StartupInitializer.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/CompleteMetadataStoreRequest.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/EchoRequest.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/LSQueryRequest.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/LSRegisterRequest.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/LSRequest.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/LinkRequest.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/LookupInfoRequest.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/MeasurementArchiveStoreKeyRequest.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/MeasurementArchiveStoreRequest.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/MeasurementRequest.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/MetadataKeyRequest.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/Request.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/SetupDataRequest.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/TOPSRequest.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/GenericServiceLSRegistrator.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/InformationContextServiceContent.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/InformationExistDbXmlrpcServiceContent.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/InformationXMLFileServiceContent.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSRegistrationComponent.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSSummaryServiceContent.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/PropertiesServiceDescription.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/GenericXmlStorageManager.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/ExistDbGenericStorageManager.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/rest/ExistDbHttpXmlDataRepository.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/rest/ExistDbHttpXmlStorageManager.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/xmlrpc/ExistDbXmlrpcXmlDataRepository.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/xmlrpc/ExistDbXmlrpcXmlStorageManager.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmlfile/XmlFileDataRepository.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmlfile/XmlFileStorageManager.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/transport/SSHFileTransport.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/eventTypeConfig/EventTypeConfigurationComponent.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/MetadataConfigurationStorageManager.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/SimpleMetadataConfigurationStorageManager.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/keyGenerator/L2PathStatusKeyGenerator.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/BwctlQueryGenerator.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/DiscardsQueryGenerator.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/ErrorsQueryGenerator.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/IperfQueryGenerator.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGenerator.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGeneratorTMP.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/OwampQueryGenerator.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/PingQueryGenerator.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/RandomFetchTestQueryGenerator.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/UtilizationQueryGenerator.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/XmlDbAccessTestQueryGenerator.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/XmlDbContentTestQueryGenerator.java

trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/register/LSRegistrationComponent.java
Log:
Add @Override annotations

Issue: PSSERVICES-597

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
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/NMWGInterfaceBaseChaining.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -56,6 +56,7 @@



+ @Override
public void merge(Metadata metadata1, Metadata metadata2, Metadata
newMetadata) {



Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLStorageManager.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLStorageManager.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLStorageManager.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -83,6 +83,7 @@
// ---------------------------------- methods


+ @Override
public void initStorage(Key dataRepository)
throws PerfSONARException {

@@ -91,6 +92,7 @@
}


+ @Override
public Message fetch(Message dataQuery)
throws PerfSONARException {

@@ -225,6 +227,7 @@
}


+ @Override
public Message store(Message dataSet)
throws PerfSONARException {

@@ -302,15 +305,18 @@
}


+ @Override
public Message remove(Message dataSet) throws PerfSONARException {
return null;
}


+ @Override
public void removeAll() throws PerfSONARException {
}


+ @Override
public Message update(Message dataSet) throws PerfSONARException {
return null;
}

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
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLTypeMAServiceEngine.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -465,6 +465,7 @@
*
* @see org.perfsonar.service.base.engine.ServiceEngine#getType()
*/
+ @Override
public String getType() {
return this.serviceEngineType;
}
@@ -489,6 +490,7 @@
*
* @see org.perfsonar.service.base.engine.ServiceEngine
*/
+ @Override
public Message takeAction(String actionType, Message request)
throws PerfSONARException {


Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/BwctlResponseGenerator.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/BwctlResponseGenerator.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/BwctlResponseGenerator.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -36,6 +36,7 @@



+ @Override
public Data getResponse(List resultList) throws Exception {



Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/DiscardsResponseGenerator.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/DiscardsResponseGenerator.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/DiscardsResponseGenerator.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -40,6 +40,7 @@



+ @Override
public Data getResponse(List resultList) throws Exception {



Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/ErrorsResponseGenerator.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/ErrorsResponseGenerator.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/ErrorsResponseGenerator.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -40,6 +40,7 @@



+ @Override
public Data getResponse(List resultList) throws Exception {



Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/GenericResponseGenerator.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/GenericResponseGenerator.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/GenericResponseGenerator.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -40,6 +40,7 @@



+ @Override
public Data getResponse(List resultList) throws Exception {



Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/IperfResponseGenerator.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/IperfResponseGenerator.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/IperfResponseGenerator.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -40,6 +40,7 @@



+ @Override
public Data getResponse(List resultList) throws Exception {



Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/L2PathStatusResponseGenerator.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/L2PathStatusResponseGenerator.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/L2PathStatusResponseGenerator.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -44,6 +44,7 @@



+ @Override
public Data getResponse(List resultList) throws Exception {



Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/OwampResponseGenerator.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/OwampResponseGenerator.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/OwampResponseGenerator.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -40,7 +40,8 @@

// -------------------------------------- public methods

- public Data getResponse(List resultList) throws Exception {
+ @Override
+ public Data getResponse(List resultList) throws Exception {

Data data = new Data();


Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/PingResponseGenerator.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/PingResponseGenerator.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/PingResponseGenerator.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -36,6 +36,7 @@



+ @Override
public Data getResponse(List resultList) throws Exception {



Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/UtilizationResponseGenerator.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/UtilizationResponseGenerator.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/UtilizationResponseGenerator.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -40,6 +40,7 @@



+ @Override
public Data getResponse(List resultList) throws Exception {



Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/nmwg/OwampAggregationDatum.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/nmwg/OwampAggregationDatum.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/nmwg/OwampAggregationDatum.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -221,7 +221,8 @@
fileName =
"org/perfsonar/service/measurementArchive/sqlType/nmwg/OwampAggregationDatum.java";
}

- public boolean addAttr(String attr, String value, NamespaceSupport
nss) {
+ @Override
+ public boolean addAttr(String attr, String value, NamespaceSupport nss) {


if (attr.equals("value")) {
@@ -320,7 +321,8 @@
/**
* The only allowable child for a datum element is the time.
*/
- public boolean addChild(Element newChild) {
+ @Override
+ public boolean addChild(Element newChild) {
if (newChild.getLocalName().equals("time")) {
setTime((Time) newChild);
} else {
@@ -334,7 +336,8 @@
/**
* Converts the contents of this object into an xml tag.
*/
- public ContentHandler toXML(ContentHandler handler, NamespaceSupport
nss)
+ @Override
+ public ContentHandler toXML(ContentHandler handler, NamespaceSupport nss)
throws Exception {
try {
handler.startElement(getUri(), getLocalName(),
getQName(),
@@ -358,7 +361,8 @@
/**
* Converts items into attributes for an xml tag.
*/
- public AttributesImpl getAttributes(NamespaceSupport nss) {
+ @Override
+ public AttributesImpl getAttributes(NamespaceSupport nss) {
AttributesImpl atts = new AttributesImpl();

//SUMMARY DAT
@@ -503,7 +507,8 @@
/**
* Chases children references down to print out all related xml tags.
*/
- public ContentHandler getChildren(ContentHandler handler,
+ @Override
+ public ContentHandler getChildren(ContentHandler handler,
NamespaceSupport nss) throws Exception {
if (getTime() != null) {
handler = getTime().toXML(handler, nss);
@@ -514,7 +519,8 @@
/**
* Given a DOM element (a parent), construct the children elements.
*/
- public void getDOM(org.w3c.dom.Element parent) {
+ @Override
+ public void getDOM(org.w3c.dom.Element parent) {
org.w3c.dom.Document doc = parent.getOwnerDocument();
org.w3c.dom.Element datum = doc.createElementNS(getUri(),
getQName());
parent.appendChild(datum);

Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/BwctlStoreRequestProcess.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/BwctlStoreRequestProcess.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/BwctlStoreRequestProcess.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -36,6 +36,7 @@



+ @Override
public Map prepareStoreParameters(Element datum, Map ibatisParams) {



Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/DiscardsStoreRequestProcess.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/DiscardsStoreRequestProcess.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/DiscardsStoreRequestProcess.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -37,6 +37,7 @@



+ @Override
public Map prepareStoreParameters(Element datum, Map ibatisParams) {

String strValue = ((Datum)datum).getValue();

Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/ErrorsStoreRequestProcess.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/ErrorsStoreRequestProcess.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/ErrorsStoreRequestProcess.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -37,6 +37,7 @@



+ @Override
public Map prepareStoreParameters(Element datum, Map ibatisParams) {

String strValue = ((Datum)datum).getValue();

Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/IperfStoreRequestProcess.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/IperfStoreRequestProcess.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/IperfStoreRequestProcess.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -37,6 +37,7 @@



+ @Override
public Map prepareStoreParameters(Element datum, Map ibatisParams) {

String strValue = ((Datum)datum).getValue();

Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/L2PathStatusStoreRequestProcess.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/L2PathStatusStoreRequestProcess.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/L2PathStatusStoreRequestProcess.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -39,6 +39,7 @@



+ @Override
public Map prepareStoreParameters(Element datum, Map ibatisParams) {

String timeType = ((Datum)datum).getTimeType();

Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/OwampStoreRequestProcess.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/OwampStoreRequestProcess.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/OwampStoreRequestProcess.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -39,7 +39,8 @@

// -------------------------------------- public methods

- public Map<String, Object> prepareStoreParameters(Element datum,
+ @Override
+ public Map<String, Object> prepareStoreParameters(Element datum,
Map<String, Object> ibatisParams) {

String seqNum = ((OwampAggregationDatum) datum).getSeqNum();

Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/PingStoreRequestProcess.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/PingStoreRequestProcess.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/PingStoreRequestProcess.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -36,6 +36,7 @@



+ @Override
public Map prepareStoreParameters(Element datum, Map ibatisParams) {



Modified:
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/UtilizationStoreRequestProcess.java
===================================================================
---
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/UtilizationStoreRequestProcess.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/UtilizationStoreRequestProcess.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -37,6 +37,7 @@



+ @Override
public Map prepareStoreParameters(Element datum, Map ibatisParams) {

String strValue = ((Datum)datum).getValue();

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/authn/DynamicCrypto.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/authn/DynamicCrypto.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/authn/DynamicCrypto.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -58,7 +58,8 @@
this.keystore=ks;
}

- public String getAliasForX509Cert(Certificate cert)
+ @Override
+ public String getAliasForX509Cert(Certificate cert)
throws WSSecurityException {
try {
String alias = keystore.getCertificateAlias(cert);
@@ -80,11 +81,13 @@
return null;
}

- public String getAliasForX509Cert(String issuer) throws
WSSecurityException {
+ @Override
+ public String getAliasForX509Cert(String issuer) throws
WSSecurityException {
return getAliasForX509Cert(issuer, null, false);
}

- public String getAliasForX509Cert(byte[] skiBytes) throws
WSSecurityException {
+ @Override
+ public String getAliasForX509Cert(byte[] skiBytes) throws
WSSecurityException {
Certificate cert;

try {
@@ -118,7 +121,8 @@
return null;
}

- public String getAliasForX509Cert(String issuer, BigInteger
serialNumber)
+ @Override
+ public String getAliasForX509Cert(String issuer, BigInteger serialNumber)
throws WSSecurityException {
return getAliasForX509Cert(issuer, serialNumber, true);
}
@@ -171,7 +175,8 @@
return null;
}

- public String getAliasForX509CertThumb(byte[] thumb)
+ @Override
+ public String getAliasForX509CertThumb(byte[] thumb)
throws WSSecurityException {
Certificate cert;
MessageDigest sha;
@@ -231,7 +236,8 @@
return vr;
}

- public String[] getAliasesForDN(String subjectDN) throws
WSSecurityException {
+ @Override
+ public String[] getAliasesForDN(String subjectDN) throws
WSSecurityException {

// Store the aliases found
Vector<String> aliases = new Vector<String>();
@@ -277,7 +283,8 @@
return result;
}

- public byte[] getCertificateData(boolean reverse, X509Certificate[]
certs)
+ @Override
+ public byte[] getCertificateData(boolean reverse, X509Certificate[]
certs)
throws WSSecurityException {
Vector<X509Certificate> list = new Vector<X509Certificate>();
for (X509Certificate cert : certs) {
@@ -299,7 +306,8 @@
}
}

- public synchronized CertificateFactory getCertificateFactory()
+ @Override
+ public synchronized CertificateFactory getCertificateFactory()
throws WSSecurityException {
if (certFact == null) {
try {
@@ -320,7 +328,8 @@
return certFact;
}

- public X509Certificate[] getCertificates(String alias)
+ @Override
+ public X509Certificate[] getCertificates(String alias)
throws WSSecurityException {
Certificate[] certs;
try {
@@ -344,18 +353,21 @@
return x509certs;
}

- public String getDefaultX509Alias() {
+ @Override
+ public String getDefaultX509Alias() {
if (properties == null) {
return null;
}
return
properties.getProperty("org.apache.ws.security.crypto.merlin.keystore.alias");
}

- public KeyStore getKeyStore() {
+ @Override
+ public KeyStore getKeyStore() {
return this.keystore;
}

- public PrivateKey getPrivateKey(String alias, String password) throws
Exception {
+ @Override
+ public PrivateKey getPrivateKey(String alias, String password) throws
Exception {
if (alias == null) {
throw new Exception("alias is null");
}
@@ -371,7 +383,8 @@
return (PrivateKey) keyTmp;
}

- public byte[] getSKIBytesFromCert(X509Certificate cert)
+ @Override
+ public byte[] getSKIBytesFromCert(X509Certificate cert)
throws WSSecurityException {
/*
* Gets the DER-encoded OCTET string for the extension value
(extnValue)
@@ -416,7 +429,8 @@
return abyte0;
}

- @SuppressWarnings("unchecked") // the data must only contain
X509Certificates
+ @Override
+ @SuppressWarnings("unchecked") // the data must only contain
X509Certificates
public X509Certificate[] getX509Certificates(byte[] data, boolean
reverse)
throws WSSecurityException {
InputStream in = new ByteArrayInputStream(data);
@@ -436,7 +450,8 @@
return certs;
}

- public X509Certificate loadCertificate(InputStream in)
+ @Override
+ public X509Certificate loadCertificate(InputStream in)
throws WSSecurityException {
X509Certificate cert;
try {
@@ -449,7 +464,8 @@
return cert;
}

- public boolean validateCertPath(X509Certificate[] certs)
+ @Override
+ public boolean validateCertPath(X509Certificate[] certs)
throws WSSecurityException {
try {
// Generate cert path

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/authn/wssec/WSSecAuthNComponent.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/authn/wssec/WSSecAuthNComponent.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/authn/wssec/WSSecAuthNComponent.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -43,11 +43,13 @@
messageTypesAuthR = new HashSet<String>();
}

- public String getComponentName() {
+ @Override
+ public String getComponentName() {
return componentName;
}

- public void initComponent() throws PerfSONARException {
+ @Override
+ public void initComponent() throws PerfSONARException {
try {
logger = (LoggerComponent)
AuxiliaryComponentManager.getInstance()
.getComponent(ComponentNames.LOGGER);
@@ -98,7 +100,8 @@
}
}

- public void setComponentName(String name) {
+ @Override
+ public void setComponentName(String name) {
componentName = name;
}

@@ -110,7 +113,8 @@
return checkAuthR;
}

- public void requestAuthN(String messageType) throws
PerfSONARException {
+ @Override
+ public void requestAuthN(String messageType) throws PerfSONARException {
if (isRequiredAuthN()) {
if (messageTypesAuthN.contains(messageType)) {
SecurityToken st=new
SecurityToken(SecTokenManagerFactory.getDefaultSecTokenManager());
@@ -137,7 +141,8 @@
return res;
}

- public void requestAuthR(String messageType,String eventType) throws
PerfSONARException {
+ @Override
+ public void requestAuthR(String messageType,String eventType) throws
PerfSONARException {
boolean authr=false;
if (isRequiredAuthR()) {
if (messageTypesAuthR.contains(messageType)) {

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/configuration/properties/PropertiesConfigurationComponent.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/configuration/properties/PropertiesConfigurationComponent.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/configuration/properties/PropertiesConfigurationComponent.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -40,6 +40,7 @@
private File file = null;

// ---------------------------------- constructor
+ @Override
public void initComponent() throws PerfSONARException {
// bootstrapped absolute file location in catalina.properties file
file =
AuxiliaryComponentManager.lookupFile("/perfsonar/conf/service.properties");
@@ -68,6 +69,7 @@
*
* @throws PerfSONARException when properties couldn't be read
*/
+ @Override
public Properties getProperties() throws PerfSONARException {
return properties;
}
@@ -81,6 +83,7 @@
* @return String containing value/s for the parameter
* @throws PerfSONARException when property couldn't be read
*/
+ @Override
public String getProperty(String name) throws PerfSONARException {
if(getProperties()==null) {
throw new PerfSONARException(
@@ -100,12 +103,14 @@
}


+ @Override
public String getComponentName() {

return componentName;

}

+ @Override
public void setComponentName(String componentName) {
this.componentName = componentName;
}

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/context/inMemory/InMemoryContext.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/context/inMemory/InMemoryContext.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/context/inMemory/InMemoryContext.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -18,21 +18,26 @@
private ConcurrentMap<Object, Object> backingMap = new
ConcurrentHashMap<Object, Object>();
private String componentName;

- public Object get(Object key) {
+ @Override
+ public Object get(Object key) {
return backingMap.get(key);
}

- public void put(Object key, Object value) {
+ @Override
+ public void put(Object key, Object value) {
backingMap.put(key, value);
}

- public String getComponentName() {
+ @Override
+ public String getComponentName() {
return componentName;
}

- public void initComponent() throws PerfSONARException {}
+ @Override
+ public void initComponent() throws PerfSONARException {}

- public void setComponentName(String componentName) {
+ @Override
+ public void setComponentName(String componentName) {
this.componentName = componentName;
}


Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/logger/log4j/Log4jLoggerComponent.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/logger/log4j/Log4jLoggerComponent.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/logger/log4j/Log4jLoggerComponent.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -47,6 +47,7 @@


// ---------------------------------- public methods
+ @Override
public void initComponent() throws PerfSONARException {
try {
debugLog = Logger.getLogger("sonar-debug");
@@ -88,6 +89,7 @@
/* (non-Javadoc)
* @see
org.perfsonar.commons.auxiliary.components.logger.log4j.LoggerComponent#debug(java.lang.String)
*/
+ @Override
public void debug(String message) {
debugLog.log(CALLER_FQCN, Level.DEBUG, message, null);
}
@@ -95,6 +97,7 @@
/* (non-Javadoc)
* @see
org.perfsonar.commons.auxiliary.components.logger.log4j.LoggerComponent#info(java.lang.String)
*/
+ @Override
public void info(String message) {
infoLog.log(CALLER_FQCN, Level.INFO, message, null);
}
@@ -102,6 +105,7 @@
/* (non-Javadoc)
* @see
org.perfsonar.commons.auxiliary.components.logger.log4j.LoggerComponent#warn(java.lang.String)
*/
+ @Override
public void warn(String message) {
warnLog.log(CALLER_FQCN, Level.WARN, message, null);
}
@@ -109,6 +113,7 @@
/* (non-Javadoc)
* @see
org.perfsonar.commons.auxiliary.components.logger.log4j.LoggerComponent#error(java.lang.String)
*/
+ @Override
public void error(String message) {
errorLog.log(CALLER_FQCN, Level.ERROR, message, null);
}
@@ -116,14 +121,17 @@
/* (non-Javadoc)
* @see
org.perfsonar.commons.auxiliary.components.logger.log4j.LoggerComponent#fatal(java.lang.String)
*/
+ @Override
public void fatal(String message) {
fatalLog.log(CALLER_FQCN, Level.FATAL, message, null);
}

+ @Override
public String getComponentName() {
return componentName;
}

+ @Override
public void setComponentName(String componentName) {
this.componentName = componentName;
}

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/mapping/ExpressionMapping.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/mapping/ExpressionMapping.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/mapping/ExpressionMapping.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -44,6 +44,7 @@
* Reads configuration mapping from file given as
* component.ComponentName.mapping_file property
*/
+ @Override
public void initComponent() throws PerfSONARException {

LoggerComponent logger = ((LoggerComponent)
@@ -76,6 +77,7 @@
}


+ @Override
public String getComponentName() {

return componentName;
@@ -83,6 +85,7 @@
}


+ @Override
public void setComponentName(String name) {

componentName = name;

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/scheduler/Scheduler.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/scheduler/Scheduler.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/scheduler/Scheduler.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -45,6 +45,7 @@

// ----------------------------Constructor

+ @Override
public void initComponent() throws PerfSONARException {

try {
@@ -73,6 +74,7 @@
}


+ @Override
public String getComponentName() {

return componentName;
@@ -80,6 +82,7 @@
}


+ @Override
public void setComponentName(String componentName) {

this.componentName = componentName;
@@ -101,6 +104,7 @@
}


+ @Override
public void run() {

while (working) { //infinite loop

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/scheduler/actions/SchedulerAction.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/scheduler/actions/SchedulerAction.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/scheduler/actions/SchedulerAction.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -81,6 +81,7 @@
* Implemented interface method which calls on the performAction method
* @see java.lang.Runnable#run()
*/
+ @Override
public void run() {

System.out.println("SchedulerAction: SchedulerAction has been
invoked");

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/simplescheduler/Scheduler.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/simplescheduler/Scheduler.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/simplescheduler/Scheduler.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -59,6 +59,7 @@
// ------------------------------------------------- Public methods


+ @Override
public void initComponent() throws PerfSONARException {

try {
@@ -108,6 +109,7 @@
}


+ @Override
public void run() {

paused = false;
@@ -159,6 +161,7 @@
}


+ @Override
public String getComponentName() {

return componentName;
@@ -166,6 +169,7 @@
}


+ @Override
public void setComponentName(String name) {
componentName = name;
}
@@ -232,6 +236,7 @@
/**
* Stop the thread by calling stopScheduler
*/
+ @Override
public void stopThread() {

stopScheduler();

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/base/nmwg/owamp/Parameters.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/base/nmwg/owamp/Parameters.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/base/nmwg/owamp/Parameters.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -34,7 +34,8 @@
/**
* Return parameter by name.
*/
- public Parameter getParameterByName(String name) {
+ @Override
+ public Parameter getParameterByName(String name) {
if(!(name.isEmpty())) {
if(name.equals("count") ||
name.equals("dscp") ||
@@ -67,7 +68,8 @@
/**
* Adds a parameter to the map
*/
- public void addParameter(Parameter newParameter) {
+ @Override
+ public void addParameter(Parameter newParameter) {
if(newParameter != null) {
if(newParameter.getParameterName().equals("count") ||

newParameter.getParameterName().equals("dscp") ||
@@ -103,7 +105,8 @@
}
}

- public void addParameter(String name, String value) {
+ @Override
+ public void addParameter(String name, String value) {
if(!(name.isEmpty()) && !(value.isEmpty())) {
if(name.equals("count") ||
name.equals("dscp") ||

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/StringBufferOutputStream.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/StringBufferOutputStream.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/StringBufferOutputStream.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -27,6 +27,7 @@
}


+ @Override
public void write(int b) throws IOException {

sb.append((char)b);

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/client/axis/AxisClient.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/client/axis/AxisClient.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/client/axis/AxisClient.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -26,7 +26,8 @@
/* (non-Javadoc)
* @see org.perfsonar.client.axis.Client#sendRequest(java.lang.String,
org.w3c.dom.Document)
*/
- public Document sendRequest(String endPoint, Document requestDocument)
+ @Override
+ public Document sendRequest(String endPoint, Document requestDocument)
throws Exception {

// build a SOAPBodyElement from the document

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/WSSAuthNSAMLData.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/WSSAuthNSAMLData.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/WSSAuthNSAMLData.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -57,14 +57,16 @@
private String sigalg = XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA1;
private String digalg = MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA1;

- public Object addSAMLSTInMessage(Object message,
+ @Override
+ public Object addSAMLSTInMessage(Object message,
SAMLAssertion authAssertion, PrivateKey key,
Collection<Certificate> certchain,
String cidPerfsonarResource, String
cidPerfsonarClient)
throws PerfSONARException {
return addSAMLSTInMessage(message, authAssertion, key,
certchain, cidPerfsonarResource, cidPerfsonarClient, defaultTtl);
}

- public Object addSAMLSTInMessage(Object message,
+ @Override
+ public Object addSAMLSTInMessage(Object message,
SAMLAssertion authAssertion, PrivateKey key,
Collection<Certificate> certchain,
String cidPerfsonarResource, String
cidPerfsonarClient, int ttl)
throws PerfSONARException {

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/WSSAuthNX509Data.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/WSSAuthNX509Data.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/WSSAuthNX509Data.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -46,11 +46,13 @@
public class WSSAuthNX509Data implements AuthNX509Data {
private static int defaultTtl=900;

- public Object addX509STInMessage(Object message,String
privKeyFile,String certFile) throws PerfSONARException {
+ @Override
+ public Object addX509STInMessage(Object message,String
privKeyFile,String certFile) throws PerfSONARException {
return
addX509STInMessage(message,privKeyFile,certFile,defaultTtl);
}

- public Object addX509STInMessage(Object message,String
privKeyFile,String certFile,int ttl) throws PerfSONARException {
+ @Override
+ public Object addX509STInMessage(Object message,String
privKeyFile,String certFile,int ttl) throws PerfSONARException {
if (!(message instanceof SOAPBodyElement)) {
throw new
PerfSONARException("error.as.body","WSSAuthNData: the method
addX509STInMessage requires a SOAPBodyElement object");
}
@@ -73,7 +75,8 @@
return addX509STInMessage(message, privateKey, cert, ttl);
}

- public Object addX509STInMessage(Object message,PrivateKey
privateKey,X509Certificate cert, int ttl) throws PerfSONARException {
+ @Override
+ public Object addX509STInMessage(Object message,PrivateKey
privateKey,X509Certificate cert, int ttl) throws PerfSONARException {
if (!(message instanceof SOAPBodyElement)) {
throw new
PerfSONARException("error.as.body","WSSAuthNData: the method
addX509STInMessage requires a SOAPBodyElement object");
}
@@ -143,7 +146,8 @@
return envelope;
}

- public Object addX509STInMessage(Object message,PrivateKey
privateKey,X509Certificate cert) throws PerfSONARException {
+ @Override
+ public Object addX509STInMessage(Object message,PrivateKey
privateKey,X509Certificate cert) throws PerfSONARException {
return addX509STInMessage(message,privateKey,cert,defaultTtl);
}


Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/saslca/UserID.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/saslca/UserID.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/saslca/UserID.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -11,7 +11,8 @@
this.password=password;
}

- public String getName() {
+ @Override
+ public String getName() {
return name;
}


Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/saslca/UserIDCallbackHandler.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/saslca/UserIDCallbackHandler.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/saslca/UserIDCallbackHandler.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -15,7 +15,8 @@
this.userId=userId;
}

- public void handle(Callback[] callbacks) throws IOException,
+ @Override
+ public void handle(Callback[] callbacks) throws IOException,
UnsupportedCallbackException {
for (Callback callback : callbacks) {
if (callback instanceof NameCallback) {

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/authService/AttrEERequestGenerator.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/authService/AttrEERequestGenerator.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/authService/AttrEERequestGenerator.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -25,7 +25,8 @@
private static String
WSS_X509="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-x509-token-profile-1.0#X509v3";;
private static String messageType = "AttrEERequest";

- public Message generateRequestMessage() throws PerfSONARException {
+ @Override
+ public Message generateRequestMessage() throws PerfSONARException {
Metadata meta = new Metadata();
meta.setId(metaId);


Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/authService/AuthNEERequestGenerator.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/authService/AuthNEERequestGenerator.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/authService/AuthNEERequestGenerator.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -15,7 +15,8 @@
private static String
WSS_X509="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-x509-token-profile-1.0#X509v3";;
private static String messageType = "AuthNEERequest";

- public Message generateRequestMessage() throws PerfSONARException {
+ @Override
+ public Message generateRequestMessage() throws PerfSONARException {
Metadata meta = new Metadata();
meta.setId(metaId);


Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/authService/AuthREERequestGenerator.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/authService/AuthREERequestGenerator.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/authService/AuthREERequestGenerator.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -15,7 +15,8 @@
private static String
WSS_X509="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-x509-token-profile-1.0#X509v3";;
private static String messageType = "AuthREERequest";

- public Message generateRequestMessage() throws PerfSONARException {
+ @Override
+ public Message generateRequestMessage() throws PerfSONARException {
Metadata meta = new Metadata();
meta.setId(metaId);


Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/lookupService/EchoRequestGenerator.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/lookupService/EchoRequestGenerator.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/lookupService/EchoRequestGenerator.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -63,7 +63,8 @@
/**
* generates Request as Message
*/
- public Message generateRequestMessage() throws PerfSONARException {
+ @Override
+ public Message generateRequestMessage() throws PerfSONARException {

Metadata meta = new Metadata();
meta.setId(metaId);

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/lookupService/LSDeregisterRequestGenerator.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/lookupService/LSDeregisterRequestGenerator.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/lookupService/LSDeregisterRequestGenerator.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -68,7 +68,8 @@
/**
* generates Request as Message
*/
- public Message generateRequestMessage() throws PerfSONARException {
+ @Override
+ public Message generateRequestMessage() throws PerfSONARException {

Message message = new Message();
message.setType(MESSAGE_TYPE);

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/lookupService/LSKeepaliveRequestGenerator.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/lookupService/LSKeepaliveRequestGenerator.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/lookupService/LSKeepaliveRequestGenerator.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -67,7 +67,8 @@
/**
* generates Request as Message
*/
- public Message generateRequestMessage() throws PerfSONARException {
+ @Override
+ public Message generateRequestMessage() throws PerfSONARException {

Message message = new Message();
message.setType(MESSAGE_TYPE);

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/lookupService/LSQueryRequestGenerator.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/lookupService/LSQueryRequestGenerator.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/lookupService/LSQueryRequestGenerator.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -86,7 +86,8 @@
/**
* generates Request as Message
*/
- public Message generateRequestMessage() throws PerfSONARException {
+ @Override
+ public Message generateRequestMessage() throws PerfSONARException {

Message message = new Message();
message.setType(MESSAGE_TYPE);

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/lookupService/LSRegisterRequestGenerator.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/lookupService/LSRegisterRequestGenerator.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/requests/lookupService/LSRegisterRequestGenerator.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -59,6 +59,7 @@
// --------------------------------------------------------- Public
Methods


+ @Override
public Message generateRequestMessage() throws PerfSONARException {

//System.out.println("LSRegisterRequestGenerator: generateRequest");

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/xquery/lookupService/GenericXQueryExpression.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/xquery/lookupService/GenericXQueryExpression.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/xquery/lookupService/GenericXQueryExpression.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -43,6 +43,7 @@
// --------------------------------------------------------- public
methods


+ @Override
public String generateExpression() {

StringBuffer xq = new StringBuffer();

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/SOAPClientMulti.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/SOAPClientMulti.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/SOAPClientMulti.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -101,6 +101,7 @@
}
}

+ @Override
public void run() {
try {
synchronized (parent) {

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/AADispatchSOAPProtocol.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/AADispatchSOAPProtocol.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/AADispatchSOAPProtocol.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -192,7 +192,8 @@
return responseNmwg;
}

- public AuthNResponse getAuthentication(AuthNRequest req) throws
PerfSONARException {
+ @Override
+ public AuthNResponse getAuthentication(AuthNRequest req) throws
PerfSONARException {
AuthNResponse resp;
// prepare to call - set service elements
try {
@@ -218,7 +219,8 @@
return resp;
}

- public AuthRResponse getAuthorization(AuthRRequest req) throws
PerfSONARException {
+ @Override
+ public AuthRResponse getAuthorization(AuthRRequest req) throws
PerfSONARException {
// prepare to call - set service elements
try {

@@ -263,7 +265,8 @@

}

- public AttrResponse getAttributes(AttrRequest req) throws
PerfSONARException {
+ @Override
+ public AttrResponse getAttributes(AttrRequest req) throws
PerfSONARException {
// prepare to call - set service elements
try {


Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/AttrResponse.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/AttrResponse.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/AttrResponse.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -38,7 +38,8 @@
XPathFactory xfactory = XPathFactory.newInstance();
xpath = xfactory.newXPath();
NamespaceContext ctx = new NamespaceContext() {
- public String getNamespaceURI(String prefix) {
+ @Override
+ public String getNamespaceURI(String prefix) {
String uri;
if (prefix.equals("samlp"))
uri =
"urn:oasis:names:tc:SAML:2.0:protocol";
@@ -50,12 +51,14 @@
}

// Dummy implementation - not used!
- public Iterator<?> getPrefixes(String val) {
+ @Override
+ public Iterator<?> getPrefixes(String val) {
return null;
}

// Dummy implemenation - not used!
- public String getPrefix(String uri) {
+ @Override
+ public String getPrefix(String uri) {
return null;
}
};

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/tokens/SecTokenSOAPManager.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/tokens/SecTokenSOAPManager.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/tokens/SecTokenSOAPManager.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -58,7 +58,8 @@
}
}

- public Object getSTFromRequest() throws PerfSONARException {
+ @Override
+ public Object getSTFromRequest() throws PerfSONARException {
if (!hasSTInRequest())
return null;
MessageContext mc=MessageContext.getCurrentContext();
@@ -73,7 +74,8 @@
}
}

- public boolean hasSTInRequest() throws PerfSONARException {
+ @Override
+ public boolean hasSTInRequest() throws PerfSONARException {
MessageContext mc=MessageContext.getCurrentContext();
try {
SOAPHeader
sh=(SOAPHeader)mc.getCurrentMessage().getSOAPHeader();
@@ -86,7 +88,8 @@
}
}

- public Object getSTValue() throws PerfSONARException {
+ @Override
+ public Object getSTValue() throws PerfSONARException {
if (!hasSTInRequest())
return null;
Object res=null;
@@ -205,17 +208,20 @@

class WSSENamespaceContext implements NamespaceContext {

- public String getNamespaceURI(String prefix) {
+ @Override
+ public String getNamespaceURI(String prefix) {
return
"http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd";;
}

// This method isn't necessary for XPath processing either.
- public String getPrefix(String uri) {
+ @Override
+ public String getPrefix(String uri) {
throw new UnsupportedOperationException();
}

// This method isn't necessary for XPath processing either.
- public Iterator<?> getPrefixes(String uri) {
+ @Override
+ public Iterator<?> getPrefixes(String uri) {
throw new UnsupportedOperationException();
}
}

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/container/listeners/StartupInitializer.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/container/listeners/StartupInitializer.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/container/listeners/StartupInitializer.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -28,6 +28,7 @@
*
* @param sce servlet context event
*/
+ @Override
public void contextInitialized(ServletContextEvent sce) {
String location = sce.getServletContext().getRealPath("/WEB-INF/");
AuxiliaryComponentManager.setWebInfLocation(location);
@@ -48,7 +49,8 @@
*
* @param sce servlet context event
*/
- public void contextDestroyed(ServletContextEvent sce) {
+ @Override
+ public void contextDestroyed(ServletContextEvent sce) {
// Stop all the component threads (running in a separate thread).
// They should implement AuxiliaryThreadedComponent instead of
// AuxiliaryComponent

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/CompleteMetadataStoreRequest.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/CompleteMetadataStoreRequest.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/CompleteMetadataStoreRequest.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -39,6 +39,7 @@



+ @Override
public Map<String,Metadata> mergeAllMetadata(Map<String,Metadata>
metadatas) {
return metadatas;
}

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/EchoRequest.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/EchoRequest.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/EchoRequest.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -52,12 +52,14 @@



+ @Override
public Map<String,Metadata> mergeAllMetadata(Map<String,Metadata>
metadatas) {

return metadatas;
}


+ @Override
public Message execute(Message reqMessage) {

ArrayList<Message> output = new ArrayList<Message>();

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/LSQueryRequest.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/LSQueryRequest.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/LSQueryRequest.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -26,6 +26,7 @@
setType(ActionType.LS_LOOKUP);
}

+ @Override
public Map<String,Metadata> mergeAllMetadata(Map<String,Metadata>
metadatas) {

return metadatas;

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/LSRegisterRequest.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/LSRegisterRequest.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/LSRegisterRequest.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -42,6 +42,7 @@

}

+ @Override
protected List<Message> extractMultipleRequests(Message reqMessage) {

ArrayList<Message> messagesList = new ArrayList<Message>();

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/LSRequest.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/LSRequest.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/LSRequest.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -32,6 +32,7 @@
* @param metadatas map of metadata elements
* @return metadatas map of merged metadata elements
*/
+ @Override
public Map<String,Metadata> mergeAllMetadata(Map<String,Metadata>
metadatas) {

return metadatas;

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/LinkRequest.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/LinkRequest.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/LinkRequest.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -40,6 +40,7 @@
// ---------------------------------- methods


+ @Override
protected Map<String,Metadata> getChaining(
Message inputMessage, String metadataId, Map<String,Metadata>
metadatas)
throws NoSuchMetadataException {

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/LookupInfoRequest.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/LookupInfoRequest.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/LookupInfoRequest.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -63,6 +63,7 @@



+ @Override
public Map<String,Metadata> mergeAllMetadata(Map<String,Metadata>
metadatas) {

return metadatas;
@@ -70,6 +71,7 @@
}


+ @Override
public Message execute(Message reqMessage) {

ArrayList<Message> output = new ArrayList<Message>();

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/MeasurementArchiveStoreKeyRequest.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/MeasurementArchiveStoreKeyRequest.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/MeasurementArchiveStoreKeyRequest.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -38,6 +38,7 @@



+ @Override
public Map<String,Metadata> mergeAllMetadata(Map<String,Metadata>
metadatas) {

return metadatas;

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/MeasurementArchiveStoreRequest.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/MeasurementArchiveStoreRequest.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/MeasurementArchiveStoreRequest.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -38,6 +38,7 @@



+ @Override
public Map<String,Metadata> mergeAllMetadata(Map<String,Metadata>
metadatas) {

return metadatas;

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/MeasurementRequest.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/MeasurementRequest.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/MeasurementRequest.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -36,6 +36,7 @@
// ---------------------------------- public methods


+ @Override
public Map<String,Metadata> mergeAllMetadata(Map<String,Metadata>
metadatas) {

return metadatas;

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/MetadataKeyRequest.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/MetadataKeyRequest.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/MetadataKeyRequest.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -40,6 +40,7 @@



+ @Override
public Map<String,Metadata> mergeAllMetadata(Map<String,Metadata>
metadatas) {

return metadatas;

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/Request.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/Request.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/Request.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -82,6 +82,7 @@



+ @Override
public String getType() {

return type;
@@ -99,6 +100,7 @@
/* (non-Javadoc)
* @see
org.perfsonar.commons.messages.MessageHandler#execute(org.ggf.ns.nmwg.base.Message)
*/
+ @Override
public Message execute(Message reqMessage) {

logger.debug("Request: MessageHandler.execute()");

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/SetupDataRequest.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/SetupDataRequest.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/SetupDataRequest.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -41,6 +41,7 @@



+ @Override
public Map<String,Metadata> mergeAllMetadata(Map<String,Metadata>
metadatas) {

return metadatas;

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/TOPSRequest.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/TOPSRequest.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/TOPSRequest.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -33,6 +33,7 @@
* @param metadatas map of metadata elements
* @return metadatas map of merged metadata elements
*/
+ @Override
public Map<String,Metadata> mergeAllMetadata(Map<String,Metadata>
metadatas) {

return metadatas;

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/GenericServiceLSRegistrator.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/GenericServiceLSRegistrator.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/GenericServiceLSRegistrator.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -48,6 +48,7 @@
/**
* Initializes Registrator
*/
+ @Override
public void initRegistrator() throws PerfSONARException {

logger = (LoggerComponent)AuxiliaryComponentManager.
@@ -71,6 +72,7 @@

}

+ @Override
public Message register(String lsUrl) throws PerfSONARException {
if (lsUrl==null) {
throw new PerfSONARException(
@@ -114,16 +116,19 @@
}


+ @Override
public Message deregister(String lsUrl, String key) throws
PerfSONARException {
throw new PerfSONARException("error.common.action_not_implemented",
"Action not implemented");
}


+ @Override
public Message update(String lsUrl, String key) throws
PerfSONARException {
throw new PerfSONARException("error.common.action_not_implemented",
"Action not implemented");
}


+ @Override
public Message keepalive(String lsUrl, String key) throws
PerfSONARException {
throw new PerfSONARException("error.common.action_not_implemented",
"Action not implemented");
}

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/InformationContextServiceContent.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/InformationContextServiceContent.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/InformationContextServiceContent.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -35,7 +35,8 @@
return context;
}

- public String[] getServiceContent() throws PerfSONARException {
+ @Override
+ public String[] getServiceContent() throws PerfSONARException {
context = getContext();
if(context==null) {
logger.warn("context is null");

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/InformationExistDbXmlrpcServiceContent.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/InformationExistDbXmlrpcServiceContent.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/InformationExistDbXmlrpcServiceContent.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -37,6 +37,7 @@
*
* @return array of Strings
*/
+ @Override
public String[] getServiceContent() throws PerfSONARException {



Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/InformationXMLFileServiceContent.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/InformationXMLFileServiceContent.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/InformationXMLFileServiceContent.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -41,7 +41,8 @@
return results;
}

- public String[] getServiceContent() throws PerfSONARException {
+ @Override
+ public String[] getServiceContent() throws PerfSONARException {
return getServiceContent(xmlInformationFilename);
}


Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSRegistrationComponent.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSRegistrationComponent.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSRegistrationComponent.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -116,6 +116,7 @@
/**
* Scheduler action
*/
+ @Override
public void runAction() {

try {
@@ -291,6 +292,7 @@
* Inits compontnt
* Takes interval in seconds from config file
*/
+ @Override
public void initComponent() throws PerfSONARException {

// Get configuration
@@ -346,12 +348,14 @@
}


+ @Override
public String getComponentName() {

return componentName;
}


+ @Override
public void setComponentName(String name) {

componentName = name;

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSSummaryServiceContent.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSSummaryServiceContent.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSSummaryServiceContent.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -184,6 +184,7 @@
/**
* Method that is executed by Registration component, MAIN method of the
class
*/
+ @Override
public String[] getServiceContent() throws PerfSONARException {

//initialize

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/PropertiesServiceDescription.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/PropertiesServiceDescription.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/PropertiesServiceDescription.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -34,6 +34,7 @@

// ------------------------------------------------ Public methods

+ @Override
public Map<String,String> getServiceDescription() throws
PerfSONARException{

ConfigurationComponent configuration = (ConfigurationComponent)

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/GenericXmlStorageManager.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/GenericXmlStorageManager.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/GenericXmlStorageManager.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -23,14 +23,16 @@
/**
* Fetches data from a data repository.
*/
- public Object fetch(Object dataQuery)
+ @Override
+ public Object fetch(Object dataQuery)
throws PerfSONARException;


/**
* Stores data in a data repository.
*/
- public Object store(Object dataSet)
+ @Override
+ public Object store(Object dataSet)
throws PerfSONARException;



Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/ExistDbGenericStorageManager.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/ExistDbGenericStorageManager.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/ExistDbGenericStorageManager.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -43,6 +43,7 @@

// ------------------------------------------------ Public methods

+ @Override
public String getComponentName() {

return componentName;
@@ -50,6 +51,7 @@
}


+ @Override
public void setComponentName(String componentName) {

this.componentName = componentName;
@@ -57,6 +59,7 @@
}


+ @Override
public void setResultType(String type) {

if (STRING_ARRAY_TYPE.equals(type)) {

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/rest/ExistDbHttpXmlDataRepository.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/rest/ExistDbHttpXmlDataRepository.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/rest/ExistDbHttpXmlDataRepository.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -5,9 +5,11 @@

public class ExistDbHttpXmlDataRepository extends XmlDbDataRepository {

+ @Override
public void setType(String type) {}

- public String getType() {
+ @Override
+ public String getType() {
return "http://exist-db.org/rest";;

}
@@ -24,8 +26,10 @@
}


+ @Override
public void open() throws PerfSONARException {}

+ @Override
public void close() throws PerfSONARException {}

}

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/rest/ExistDbHttpXmlStorageManager.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/rest/ExistDbHttpXmlStorageManager.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/rest/ExistDbHttpXmlStorageManager.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -64,6 +64,7 @@
* Important note: DataRepository MUST be XmlDbDataRepository. Otherwise,
* a PerfSONARException will be thrown!
*/
+ @Override
public void initStorage(DataRepository dataRepository)
throws PerfSONARException {

@@ -84,6 +85,7 @@
}


+ @Override
public void initComponent() throws PerfSONARException {

dataRepository = ExistDbFactory.getDataRepositoryByProperties(
@@ -105,6 +107,7 @@
* @param dataQuery Must be String that contain XPath/XQuery expression
* @return depends on getResultType()
*/
+ @Override
public Object fetch(Object dataQuery)
throws PerfSONARException {

@@ -119,6 +122,7 @@
* @param dataSet Must be String, contains XUpdate string
* @return depends on getResultType()
*/
+ @Override
public Object store(Object dataSet)
throws PerfSONARException {


Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/xmlrpc/ExistDbXmlrpcXmlDataRepository.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/xmlrpc/ExistDbXmlrpcXmlDataRepository.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/xmlrpc/ExistDbXmlrpcXmlDataRepository.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -122,12 +122,14 @@
// ------------------------------------- Methods implementing
DataRepository interface


+ @Override
public String getType() {

return DB_TYPE;

}

+ @Override
public void setType(String type) {
// ??
// Nothing to do here. What is this method for?
@@ -135,6 +137,7 @@
}


+ @Override
public void open() throws PerfSONARException {

logger.debug("ExistDbXmlrpcXmlDataRepository: connect");
@@ -185,6 +188,7 @@
}


+ @Override
public void close() throws PerfSONARException {

if (existDatabase!=null) {

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/xmlrpc/ExistDbXmlrpcXmlStorageManager.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/xmlrpc/ExistDbXmlrpcXmlStorageManager.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/xmlrpc/ExistDbXmlrpcXmlStorageManager.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -71,6 +71,7 @@
* Important note: DataRepository MUST be
ExistDbXmlrpcXmlDataRepository. Otherwise,
* a PerfSONARException will be thrown!
*/
+ @Override
public void initStorage(DataRepository dataRepository) throws
PerfSONARException {

getLogger().debug("ExistDbXmlrpcXmlStorageManager: initStorage with
data repository");
@@ -90,6 +91,7 @@
}


+ @Override
public void initComponent() throws PerfSONARException {

getLogger().debug("ExistDbXmlrpcXmlStorageManager: initComponent");
@@ -117,6 +119,7 @@
* @param dataQuery Must be String that contain XPath/XQuery expression
* @return always StringArrayDataSet object
*/
+ @Override
public Object fetch(Object dataQuery) throws PerfSONARException {

getLogger().debug("ExistXMLDatabaseAccess: perform XQuery");
@@ -199,6 +202,7 @@
* @param dataSet Must be String, contains XUpdate string
* @return null
*/
+ @Override
public Object store(Object dataSet) throws PerfSONARException {



Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmlfile/XmlFileDataRepository.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmlfile/XmlFileDataRepository.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmlfile/XmlFileDataRepository.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -14,16 +14,20 @@
this.path = path;
}

+ @Override
public void setType(String type) {
}

+ @Override
public String getType() {
return XML_FILE_TYPE;
}

+ @Override
public void open() throws PerfSONARException {
}

+ @Override
public void close() throws PerfSONARException {
}


Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmlfile/XmlFileStorageManager.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmlfile/XmlFileStorageManager.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmlfile/XmlFileStorageManager.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -41,6 +41,7 @@
/**
* Accepts XmlFileDataRepository
*/
+ @Override
public void initStorage(DataRepository dataRepository)
throws PerfSONARException {

@@ -59,7 +60,8 @@
* @param XPath expression as String
* @return String[] XML results
*/
- public Object fetch(Object dataQuery)
+ @Override
+ public Object fetch(Object dataQuery)
throws PerfSONARException {

//check if string
@@ -150,6 +152,7 @@
/**
* UNIMPLEMENTED
*/
+ @Override
public Object store(Object dataSet) throws PerfSONARException {

throw new PerfSONARException("not implemented");

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/transport/SSHFileTransport.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/transport/SSHFileTransport.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/transport/SSHFileTransport.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -58,6 +58,7 @@
* @param dst destination location
* @throws Exception in case of error
*/
+ @Override
public void copy(String file, Location src, Location dst)
throws Exception {

@@ -212,6 +213,7 @@
* @param loc location
* @throws Exception in case of error
*/
+ @Override
public void delete(String file, Location loc)
throws Exception {

@@ -274,6 +276,7 @@
* @return true if file exists, false otherwise
* @throws Exception in case of error
*/
+ @Override
public boolean exists(String file, Location loc)
throws Exception {


Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/eventTypeConfig/EventTypeConfigurationComponent.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/eventTypeConfig/EventTypeConfigurationComponent.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/eventTypeConfig/EventTypeConfigurationComponent.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -79,6 +79,7 @@



+ @Override
public void initComponent() throws PerfSONARException {


@@ -145,6 +146,7 @@
}


+ @Override
public String getComponentName() {

return componentName;
@@ -152,6 +154,7 @@
}


+ @Override
public void setComponentName(String name) {

componentName = name;

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/MetadataConfigurationStorageManager.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/MetadataConfigurationStorageManager.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/MetadataConfigurationStorageManager.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -68,12 +68,14 @@
// --- methods from NMWGStorageManager interface


+ @Override
public void initStorage(Key dataRepository) throws PerfSONARException {

this.existDbXmlStorageManager = getStorageManager();
}


+ @Override
public Message fetch(Message dataQuery)
throws PerfSONARException {

@@ -160,6 +162,7 @@
}


+ @Override
public Message store(Message dataSet) throws PerfSONARException {

if (dataSet.getMetadataMap().size() > 1)
@@ -348,12 +351,14 @@
}


+ @Override
public Message remove(Message dataSet) throws PerfSONARException {
// not supported
return null;
}


+ @Override
public void removeAll() throws PerfSONARException {

String query = "for $elem in //*:store/* return update delete $elem";
@@ -363,6 +368,7 @@
}


+ @Override
public Message update(Message dataSet) throws PerfSONARException {
// not supported
return null;

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/SimpleMetadataConfigurationStorageManager.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/SimpleMetadataConfigurationStorageManager.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/SimpleMetadataConfigurationStorageManager.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -81,6 +81,7 @@
// --- methods from NMWGStorageManager interface


+ @Override
public void initStorage(Key dataRepository) throws PerfSONARException {

if (dataRepository == null)
@@ -95,6 +96,7 @@
}


+ @Override
public Message fetch(Message dataQuery)
throws PerfSONARException {

@@ -187,6 +189,7 @@
}


+ @Override
public Message store(Message dataSet)
throws PerfSONARException {

@@ -204,17 +207,20 @@
}


+ @Override
public Message remove(Message dataSet) throws PerfSONARException {
// not supported
return null;
}


+ @Override
public void removeAll() throws PerfSONARException {
// not supported
}


+ @Override
public Message update(Message dataSet) throws PerfSONARException {
// not supported
return null;
@@ -308,6 +314,7 @@
this.sb = sb;
}

+ @Override
public void write(int b) throws IOException {
sb.append((char)b);
}

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/keyGenerator/L2PathStatusKeyGenerator.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/keyGenerator/L2PathStatusKeyGenerator.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/keyGenerator/L2PathStatusKeyGenerator.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -23,6 +23,7 @@



+ @Override
public Key getKey(Metadata metadata, Data data) throws
PerfSONARException {

if (metadata.getSubject() != null &&

Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/BwctlQueryGenerator.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/BwctlQueryGenerator.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/BwctlQueryGenerator.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -71,6 +71,7 @@
* Returns xpath query created using the information
* stored in Message object.
*/
+ @Override
public String getMetadataQuery(Message query)
throws PerfSONARException {


Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/DiscardsQueryGenerator.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/DiscardsQueryGenerator.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/DiscardsQueryGenerator.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -67,6 +67,7 @@
* Returns xpath query created using the information
* stored in Message object.
*/
+ @Override
public String getMetadataQuery(Message query)
throws PerfSONARException {


Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/ErrorsQueryGenerator.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/ErrorsQueryGenerator.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/ErrorsQueryGenerator.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -67,6 +67,7 @@
* Returns xpath query created using the information
* stored in Message object.
*/
+ @Override
public String getMetadataQuery(Message query)
throws PerfSONARException {


Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/IperfQueryGenerator.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/IperfQueryGenerator.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/IperfQueryGenerator.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -76,6 +76,7 @@
* Returns xpath query created using the information
* stored in Message object.
*/
+ @Override
public String getMetadataQuery(Message query)
throws PerfSONARException {


Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGenerator.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGenerator.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGenerator.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -69,6 +69,7 @@
* Returns xpath query created using the information
* stored in Message object.
*/
+ @Override
public String getMetadataQuery(Message query)
throws PerfSONARException {


Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGeneratorTMP.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGeneratorTMP.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGeneratorTMP.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -72,6 +72,7 @@
* Returns xpath query created using the information
* stored in Message object.
*/
+ @Override
public String getMetadataQuery(Message query)
throws PerfSONARException{


Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/OwampQueryGenerator.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/OwampQueryGenerator.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/OwampQueryGenerator.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -70,6 +70,7 @@
* Returns xpath query created using the information
* stored in Message object.
*/
+ @Override
public String getMetadataQuery(Message query)
throws PerfSONARException {


Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/PingQueryGenerator.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/PingQueryGenerator.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/PingQueryGenerator.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -71,6 +71,7 @@
* Returns xpath query created using the information
* stored in Message object.
*/
+ @Override
public String getMetadataQuery(Message query)
throws PerfSONARException {


Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/RandomFetchTestQueryGenerator.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/RandomFetchTestQueryGenerator.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/RandomFetchTestQueryGenerator.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -62,6 +62,7 @@
* Returns xpath query created using the information
* stored in Message object.
*/
+ @Override
public String getMetadataQuery(Message query)
throws PerfSONARException {


Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/UtilizationQueryGenerator.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/UtilizationQueryGenerator.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/UtilizationQueryGenerator.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -67,6 +67,7 @@
* Returns xpath query created using the information
* stored in Message object.
*/
+ @Override
public String getMetadataQuery(Message query)
throws PerfSONARException {


Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/XmlDbAccessTestQueryGenerator.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/XmlDbAccessTestQueryGenerator.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/XmlDbAccessTestQueryGenerator.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -62,6 +62,7 @@
* Returns xpath query created using the information
* stored in Message object.
*/
+ @Override
public String getMetadataQuery(Message query)
throws PerfSONARException {


Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/XmlDbContentTestQueryGenerator.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/XmlDbContentTestQueryGenerator.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/XmlDbContentTestQueryGenerator.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -62,6 +62,7 @@
* Returns xpath query created using the information
* stored in Message object.
*/
+ @Override
public String getMetadataQuery(Message query)
throws PerfSONARException {


Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/register/LSRegistrationComponent.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/register/LSRegistrationComponent.java
2012-09-11 07:41:49 UTC (rev 6006)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/register/LSRegistrationComponent.java
2012-10-05 09:22:37 UTC (rev 6007)
@@ -80,7 +80,8 @@
/**
* Scheduler action
*/
- public void runAction() {
+ @Override
+ public void runAction() {

try {
//String lsURL = configuration.getProperty("service.r.ls_url");
@@ -154,6 +155,7 @@

// ---------------------- component that loads action to scheduler

+ @Override
public void initComponent() throws PerfSONARException {

// Get configuration
@@ -216,10 +218,12 @@
scheduler.addSchedulerTask(interval*1000, this); // seconds
converted into milliseconds
}

+ @Override
public String getComponentName() {
return componentName;
}

+ @Override
public void setComponentName(String name) {
componentName = name;
}

---

• [pS-dev] [GEANT/SA2/ps-java-services] r6007 - in trunk: perfsonar-java-sql-ma/src/main/java/org/perfso nar/service/measurementArchive/sqlType perfsonar-java-sql- ma/src/main/java/org/perfsonar/service/measurementArchive/ sqlType/fetch perfsonar-java-sql-ma/src/main/java/org/perf sonar/service/measurementArchive/sqlType/nmwg perfsonar-ja va-sql-ma/src/main/java/org/perfsonar/service/measurementA rchive/sqlType/store perfsonar_base/src/main/java/org/pe rfsonar/base/auxiliary/components/authn perfsonar_base/s rc/main/java/org/perfsonar/base/auxiliary/components/authn /wssec perfsonar_base/src/main/java/org/perfsonar/base/a uxiliary/components/configuration/properties perfsonar_b ase/src/main/java/org/perfsonar/base/auxiliary/components/ context/inMemory perfsonar_base/src/main/java/org/perfso nar/base/auxiliary/components/logger/log4j perfsonar_bas e/src/main/java/org/perfsonar/base/auxiliary/components/ma pping perfsonar_base/src/main/java/org/perfsonar/base/au xiliary/components/scheduler per fsonar_base/src/main/ja va/org/perfsonar/base/auxiliary/components/scheduler/actio ns perfsonar_base/src/main/java/org/perfsonar/base/auxil iary/components/simplescheduler perfsonar_base/src/main/ java/org/perfsonar/base/nmwg/owamp perfsonar_base/src/ma in/java/org/perfsonar/base/util perfsonar_base/src/main/ java/org/perfsonar/client/axis perfsonar_base/src/main/j ava/org/perfsonar/client/base/authn perfsonar_base/src/m ain/java/org/perfsonar/client/base/authn/saslca perfsonar _base/src/main/java/org/perfsonar/client/base/requests/a uthService perfsonar_base/src/main/java/org/perfsonar/cl ient/base/requests/lookupService perfsonar_base/src/main /java/org/perfsonar/client/base/xquery/lookupService perfs onar_base/src/main/java/org/perfsonar/client/testHarness perfsonar_base/src/main/java/org/perfsonar/service/base /authn perfsonar_base/src/main/java/org/perfsonar/servic e/base/authn/tokens perfsonar_base/src/main/java/org/per fsonar/service/base/container/listeners perfsonar_base/s rc/main/j ava/org/perfsonar/service/base/messages perfsona r_base/src/main/java/org/perfsonar/service/base/registra tion perfsonar_base/src/main/java/org/perfsonar/service/ base/storage perfsonar_base/src/main/java/org/perfsonar/ service/base/storage/xmldb/exist perfsonar_base/src/main /java/org/perfsonar/service/base/storage/xmldb/exist/rest perfsonar_base/src/main/java/org/perfsonar/service/base/ storage/xmldb/exist/xmlrpc perfsonar_base/src/main/java/ org/perfsonar/service/base/storage/xmlfile perfsonar_bas e/src/main/java/org/perfsonar/service/base/transport perfs onar_base/src/main/java/org/perfsonar/service/measuremen tArchive/eventTypeConfig perfsonar_base/src/main/java/or g/perfsonar/service/measurementArchive/metadataConfig perf sonar_base/src/main/java/org/perfsonar/service/measureme ntArchive/metadataConfig/keyGenerator perfsonar_base/src /main/java/org/perfsonar/service/measurementArchive/metada taConfig/queryGenerator perfsonar_base/src/main/java/org /perfsonar/service/measurementArchive /register, svn-noreply, 10/05/2012

---

Archive powered by MHonArc 2.6.16.