xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'development' into development_on_RHEL6

Browse source 
Former-commit-id: c4467e5121 [formerly 361df767a8] [formerly 77ea1782c3] [formerly 77ea1782c3 [formerly 473488f5b8]] [formerly 4d25eb11c8 [formerly 77ea1782c3 [formerly 473488f5b8] [formerly 4d25eb11c8 [formerly 2117af3beb252132a10f44aab162a1ca17ef3abd]]]]
Former-commit-id: 4d25eb11c8
Former-commit-id: 1d8dcaa2f6eca2d264ef913be1385d78b44ae159 [formerly 282970560ec2ee6eee13b9272e753fbb7d551416] [formerly a75acc5499 [formerly ef852ac125]]
Former-commit-id: a75acc5499
Former-commit-id: d6ef4ae259
This commit is contained in:
Steve Harris 2013-11-13 23:20:18 -06:00
commit cea2321c16
2 changed files with 28 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/query/plugins/GetAuditTrailByTimeInterval.java
View file

@ -22,6 +22,8 @@ package com.raytheon.uf.edex.registry.ebxml.services.query.plugins;
import javax.jws.WebMethod;
import javax.jws.WebParam;
import javax.jws.WebResult;
import javax.xml.datatype.DatatypeConfigurationException;
import javax.xml.datatype.DatatypeFactory;
import javax.xml.datatype.XMLGregorianCalendar;
import oasis.names.tc.ebxml.regrep.wsdl.registry.services.v4.MsgRegistryException;
@ -71,6 +73,7 @@ import com.raytheon.uf.edex.registry.ebxml.util.EbxmlObjectUtil;
* 3/18/2013 1802 bphillip Modified to use transaction boundaries and spring dao injection
* 4/9/2013 1802 bphillip Changed abstract method signature, modified return processing, and changed static variables
* 10/8/2013 1682 bphillip Refactored querying
* 11/13/2013 1686 bphillip Fixed the arguments of this query
*
* </pre>
*
@ -99,10 +102,24 @@ public class GetAuditTrailByTimeInterval extends RegistryQueryPlugin {
@WebParam(name = "QueryRequest", targetNamespace = EbxmlNamespaces.QUERY_URI, partName = "partQueryRequest") QueryRequest queryRequest)
throws MsgRegistryException {
QueryType queryType = queryRequest.getQuery();
XMLGregorianCalendar startTime = queryType
.getSlotValue(QueryConstants.START_TIME);
XMLGregorianCalendar endTime = queryType
.getSlotValue(QueryConstants.END_TIME);
XMLGregorianCalendar startTime = null;
XMLGregorianCalendar endTime = null;
try {
startTime = DatatypeFactory.newInstance().newXMLGregorianCalendar(
(String) queryType.getSlotValue(QueryConstants.START_TIME));
} catch (DatatypeConfigurationException e) {
throw EbxmlExceptionUtil.createMsgRegistryException(
"Error parsing start time", e);
}
try {
endTime = DatatypeFactory.newInstance().newXMLGregorianCalendar(
(String) queryType.getSlotValue(QueryConstants.END_TIME));
} catch (DatatypeConfigurationException e) {
throw EbxmlExceptionUtil.createMsgRegistryException(
"Error parsing end time", e);
}
// Start time defaults to current Time
long currentTime = TimeUtil.currentTimeMillis();

9
edexOsgi/com.raytheon.uf.edex.wfs/src/com/raytheon/uf/edex/wfs/v2_0_0/Wfs2_0_0Provider.java
View file

@ -839,7 +839,10 @@ public class Wfs2_0_0Provider extends AbstractWfsProvider implements
DescribeStoredQueriesResponseType descriptions = describeQueries(
request, serviceInfo);
try {
marshalResponse(descriptions, GML_MIME, response);
marshalResponse(
wfsFactory
.createDescribeStoredQueriesResponse(descriptions),
GML_MIME, response);
} catch (Exception e) {
log.error("Unable to marshal response", e);
throw new WfsException(Code.OperationProcessingFailed);
@ -917,7 +920,9 @@ public class Wfs2_0_0Provider extends AbstractWfsProvider implements
try {
ListStoredQueriesResponseType queries = listQueries(serviceInfo);
try {
marshalResponse(queries, GML_MIME, response);
marshalResponse(
wfsFactory.createListStoredQueriesResponse(queries),
GML_MIME, response);
} catch (Exception e) {
log.error("Unable to marshal response", e);
throw new WfsException(Code.OperationProcessingFailed);