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

Issue #1302 Fix spring/project errors pointed out by CAVE spring changes

Browse source 
Change-Id: I2b39071348bea5394c4f275051f19a2853f61f1c

Former-commit-id: 1220f5167e [formerly ddaa681d8a] [formerly 9784b563cf [formerly 217a17fe79d9156f03597d72e51ab47325b00991]]
Former-commit-id: 9784b563cf
Former-commit-id: 9bb53555a9
This commit is contained in:
Dustin Johnson 2012-11-08 12:00:15 -06:00
parent 1e61d4bd08
commit d0867fedef
15 changed files with 39 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
edexOsgi/com.raytheon.uf.edex.spatial/.classpath → edexOsgi/com.raytheon.uf.common.spatial/.classpath
View file

0
edexOsgi/com.raytheon.uf.edex.spatial/.project → edexOsgi/com.raytheon.uf.common.spatial/.project
View file

0
edexOsgi/com.raytheon.uf.edex.spatial/.settings/org.eclipse.jdt.core.prefs → edexOsgi/com.raytheon.uf.common.spatial/.settings/org.eclipse.jdt.core.prefs
View file

4
edexOsgi/com.raytheon.uf.edex.spatial/META-INF/MANIFEST.MF → edexOsgi/com.raytheon.uf.common.spatial/META-INF/MANIFEST.MF
View file

@ -1,11 +1,11 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Database
Bundle-Name: com.raytheon.uf.common.spatial
Bundle-SymbolicName: com.raytheon.uf.common.spatial
Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: RAYTHEON
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: com.raytheon.uf.common.spatial.repojection
Export-Package: com.raytheon.uf.common.spatial.reprojection
Require-Bundle: org.apache.commons.lang;bundle-version="2.3.0",
org.apache.commons.logging;bundle-version="1.1.1",
org.geotools;bundle-version="2.6.4",

3
edexOsgi/com.raytheon.uf.edex.spatial/build.properties → edexOsgi/com.raytheon.uf.common.spatial/build.properties
View file

@ -1,5 +1,4 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.,\
res/
.

2
edexOsgi/com.raytheon.uf.edex.spatial/src/com/raytheon/uf/common/spatial/repojection/AbstractDataReprojector.java → edexOsgi/com.raytheon.uf.common.spatial/src/com/raytheon/uf/common/spatial/reprojection/AbstractDataReprojector.java
View file

@ -28,7 +28,7 @@
* Jun 15, 2011 bclement Initial creation
*
*/
package com.raytheon.uf.common.spatial.repojection;
package com.raytheon.uf.common.spatial.reprojection;
import java.awt.image.DataBuffer;
import java.awt.image.WritableRaster;

14
edexOsgi/com.raytheon.uf.edex.spatial/src/com/raytheon/uf/common/spatial/repojection/ByteDataReprojector.java → edexOsgi/com.raytheon.uf.common.spatial/src/com/raytheon/uf/common/spatial/reprojection/ByteDataReprojector.java
View file

@ -28,7 +28,7 @@
* May 18, 2011 bclement Initial creation
*
*/
package com.raytheon.uf.common.spatial.repojection;
package com.raytheon.uf.common.spatial.reprojection;
import java.awt.Point;
import java.awt.image.DataBufferByte;
@ -60,7 +60,7 @@ public class ByteDataReprojector extends
* (non-Javadoc)
*
* @see
* com.raytheon.uf.common.spatial.repojection.DataReprojector#getGridCoverage
* com.raytheon.uf.common.spatial.reprojection.DataReprojector#getGridCoverage
* (com.raytheon.uf.common.datastorage.records.IDataRecord,
* org.opengis.referencing.crs.CoordinateReferenceSystem,
* org.opengis.geometry.Envelope)
@ -82,7 +82,7 @@ public class ByteDataReprojector extends
* (non-Javadoc)
*
* @see
* com.raytheon.uf.common.spatial.repojection.DataReprojector#getMaskCoverage
* com.raytheon.uf.common.spatial.reprojection.DataReprojector#getMaskCoverage
* (com.raytheon.uf.common.datastorage.records.IDataRecord,
* org.opengis.referencing.crs.CoordinateReferenceSystem,
* org.opengis.geometry.Envelope)
@ -103,7 +103,7 @@ public class ByteDataReprojector extends
* (non-Javadoc)
*
* @see
* com.raytheon.uf.common.spatial.repojection.DataReprojector#extractData(org
* com.raytheon.uf.common.spatial.reprojection.DataReprojector#extractData(org
* .geotools.coverage.grid.GridCoverage2D)
*/
@Override
@ -128,7 +128,7 @@ public class ByteDataReprojector extends
* (non-Javadoc)
*
* @see
* com.raytheon.uf.common.spatial.repojection.DataReprojector#extractData(org
* com.raytheon.uf.common.spatial.reprojection.DataReprojector#extractData(org
* .geotools.coverage.grid.GridCoverage2D,
* org.geotools.coverage.grid.GridCoverage2D)
*/
@ -176,7 +176,7 @@ public class ByteDataReprojector extends
* (non-Javadoc)
*
* @see
* com.raytheon.uf.common.spatial.repojection.DataReprojector#getDataSlice(com
* com.raytheon.uf.common.spatial.reprojection.DataReprojector#getDataSlice(com
* .raytheon.uf.common.datastorage.records.IDataRecord,
* com.raytheon.uf.common.datastorage.Request)
*/
@ -213,7 +213,7 @@ public class ByteDataReprojector extends
* (non-Javadoc)
*
* @see
* com.raytheon.uf.common.spatial.repojection.AbstractDataReprojector#compatible
* com.raytheon.uf.common.spatial.reprojection.AbstractDataReprojector#compatible
* (com.raytheon.uf.common.datastorage.records.IDataRecord)
*/
@Override

6
edexOsgi/com.raytheon.uf.edex.spatial/src/com/raytheon/uf/common/spatial/repojection/DataReprojector.java → edexOsgi/com.raytheon.uf.common.spatial/src/com/raytheon/uf/common/spatial/reprojection/DataReprojector.java
View file

@ -28,7 +28,7 @@
* May 18, 2011 bclement Initial creation
*
*/
package com.raytheon.uf.common.spatial.repojection;
package com.raytheon.uf.common.spatial.reprojection;
import java.awt.Point;
import java.io.FileNotFoundException;
@ -68,8 +68,8 @@ import com.raytheon.uf.common.datastorage.records.IntegerDataRecord;
import com.raytheon.uf.common.datastorage.records.ShortDataRecord;
import com.raytheon.uf.common.geospatial.ISpatialObject;
import com.raytheon.uf.common.geospatial.MapUtil;
import com.raytheon.uf.common.spatial.repojection.AbstractDataReprojector.RequestWrapper;
import com.raytheon.uf.common.spatial.repojection.KeyLocker.KeyLock;
import com.raytheon.uf.common.spatial.reprojection.AbstractDataReprojector.RequestWrapper;
import com.raytheon.uf.common.spatial.reprojection.KeyLocker.KeyLock;
import com.vividsolutions.jts.geom.Coordinate;
import com.vividsolutions.jts.geom.Envelope;

14
edexOsgi/com.raytheon.uf.edex.spatial/src/com/raytheon/uf/common/spatial/repojection/FloatDataReprojector.java → edexOsgi/com.raytheon.uf.common.spatial/src/com/raytheon/uf/common/spatial/reprojection/FloatDataReprojector.java
View file

@ -28,7 +28,7 @@
* Jun 13, 2011 bclement Initial creation
*
*/
package com.raytheon.uf.common.spatial.repojection;
package com.raytheon.uf.common.spatial.reprojection;
import java.awt.Point;
import java.awt.image.DataBufferFloat;
@ -60,7 +60,7 @@ public class FloatDataReprojector extends
* (non-Javadoc)
*
* @see
* com.raytheon.uf.common.spatial.repojection.DataReprojector#getGridCoverage
* com.raytheon.uf.common.spatial.reprojection.DataReprojector#getGridCoverage
* (com.raytheon.uf.common.datastorage.records.IDataRecord,
* org.opengis.referencing.crs.CoordinateReferenceSystem,
* org.opengis.geometry.Envelope)
@ -81,7 +81,7 @@ public class FloatDataReprojector extends
* (non-Javadoc)
*
* @see
* com.raytheon.uf.common.spatial.repojection.DataReprojector#getMaskCoverage
* com.raytheon.uf.common.spatial.reprojection.DataReprojector#getMaskCoverage
* (com.raytheon.uf.common.datastorage.records.IDataRecord,
* org.opengis.referencing.crs.CoordinateReferenceSystem,
* org.opengis.geometry.Envelope)
@ -102,7 +102,7 @@ public class FloatDataReprojector extends
* (non-Javadoc)
*
* @see
* com.raytheon.uf.common.spatial.repojection.DataReprojector#extractData(org
* com.raytheon.uf.common.spatial.reprojection.DataReprojector#extractData(org
* .geotools.coverage.grid.GridCoverage2D)
*/
@Override
@ -128,7 +128,7 @@ public class FloatDataReprojector extends
* (non-Javadoc)
*
* @see
* com.raytheon.uf.common.spatial.repojection.DataReprojector#extractData(org
* com.raytheon.uf.common.spatial.reprojection.DataReprojector#extractData(org
* .geotools.coverage.grid.GridCoverage2D,
* org.geotools.coverage.grid.GridCoverage2D)
*/
@ -177,7 +177,7 @@ public class FloatDataReprojector extends
* (non-Javadoc)
*
* @see
* com.raytheon.uf.common.spatial.repojection.DataReprojector#getDataSlice(com
* com.raytheon.uf.common.spatial.reprojection.DataReprojector#getDataSlice(com
* .raytheon.uf.common.datastorage.records.IDataRecord,
* com.raytheon.uf.common.datastorage.Request)
*/
@ -221,7 +221,7 @@ public class FloatDataReprojector extends
* (non-Javadoc)
*
* @see
* com.raytheon.uf.common.spatial.repojection.AbstractDataReprojector#compatible
* com.raytheon.uf.common.spatial.reprojection.AbstractDataReprojector#compatible
* (com.raytheon.uf.common.datastorage.records.IDataRecord)
*/
@Override

14
edexOsgi/com.raytheon.uf.edex.spatial/src/com/raytheon/uf/common/spatial/repojection/IntDataReprojector.java → edexOsgi/com.raytheon.uf.common.spatial/src/com/raytheon/uf/common/spatial/reprojection/IntDataReprojector.java
View file

@ -28,7 +28,7 @@
* Jun 13, 2011 bclement Initial creation
*
*/
package com.raytheon.uf.common.spatial.repojection;
package com.raytheon.uf.common.spatial.reprojection;
import java.awt.Point;
import java.awt.image.DataBuffer;
@ -61,7 +61,7 @@ public class IntDataReprojector extends
* (non-Javadoc)
*
* @see
* com.raytheon.uf.common.spatial.repojection.DataReprojector#getGridCoverage
* com.raytheon.uf.common.spatial.reprojection.DataReprojector#getGridCoverage
* (com.raytheon.uf.common.datastorage.records.IDataRecord,
* org.opengis.referencing.crs.CoordinateReferenceSystem,
* org.opengis.geometry.Envelope)
@ -82,7 +82,7 @@ public class IntDataReprojector extends
* (non-Javadoc)
*
* @see
* com.raytheon.uf.common.spatial.repojection.DataReprojector#getMaskCoverage
* com.raytheon.uf.common.spatial.reprojection.DataReprojector#getMaskCoverage
* (com.raytheon.uf.common.datastorage.records.IDataRecord,
* org.opengis.referencing.crs.CoordinateReferenceSystem,
* org.opengis.geometry.Envelope)
@ -103,7 +103,7 @@ public class IntDataReprojector extends
* (non-Javadoc)
*
* @see
* com.raytheon.uf.common.spatial.repojection.DataReprojector#extractData(org
* com.raytheon.uf.common.spatial.reprojection.DataReprojector#extractData(org
* .geotools.coverage.grid.GridCoverage2D)
*/
@Override
@ -129,7 +129,7 @@ public class IntDataReprojector extends
* (non-Javadoc)
*
* @see
* com.raytheon.uf.common.spatial.repojection.DataReprojector#extractData(org
* com.raytheon.uf.common.spatial.reprojection.DataReprojector#extractData(org
* .geotools.coverage.grid.GridCoverage2D,
* org.geotools.coverage.grid.GridCoverage2D)
*/
@ -178,7 +178,7 @@ public class IntDataReprojector extends
* (non-Javadoc)
*
* @see
* com.raytheon.uf.common.spatial.repojection.DataReprojector#getDataSlice(com
* com.raytheon.uf.common.spatial.reprojection.DataReprojector#getDataSlice(com
* .raytheon.uf.common.datastorage.records.IDataRecord,
* com.raytheon.uf.common.datastorage.Request)
*/
@ -222,7 +222,7 @@ public class IntDataReprojector extends
* (non-Javadoc)
*
* @see
* com.raytheon.uf.common.spatial.repojection.AbstractDataReprojector#compatible
* com.raytheon.uf.common.spatial.reprojection.AbstractDataReprojector#compatible
* (com.raytheon.uf.common.datastorage.records.IDataRecord)
*/
@Override

2
edexOsgi/com.raytheon.uf.edex.spatial/src/com/raytheon/uf/common/spatial/repojection/KeyLocker.java → edexOsgi/com.raytheon.uf.common.spatial/src/com/raytheon/uf/common/spatial/reprojection/KeyLocker.java
View file

@ -21,7 +21,7 @@
* 402.291.0100
*
*/
package com.raytheon.uf.common.spatial.repojection;
package com.raytheon.uf.common.spatial.reprojection;
import java.util.HashMap;
import java.util.Map;

2
edexOsgi/com.raytheon.uf.edex.spatial/src/com/raytheon/uf/common/spatial/repojection/ReferencedDataRecord.java → edexOsgi/com.raytheon.uf.common.spatial/src/com/raytheon/uf/common/spatial/reprojection/ReferencedDataRecord.java
View file

@ -28,7 +28,7 @@
* May 18, 2011 bclement Initial creation
*
*/
package com.raytheon.uf.common.spatial.repojection;
package com.raytheon.uf.common.spatial.reprojection;
import org.geotools.geometry.jts.ReferencedEnvelope;

14
edexOsgi/com.raytheon.uf.edex.spatial/src/com/raytheon/uf/common/spatial/repojection/ShortDataReprojector.java → edexOsgi/com.raytheon.uf.common.spatial/src/com/raytheon/uf/common/spatial/reprojection/ShortDataReprojector.java
View file

@ -28,7 +28,7 @@
* Jun 13, 2011 bclement Initial creation
*
*/
package com.raytheon.uf.common.spatial.repojection;
package com.raytheon.uf.common.spatial.reprojection;
import java.awt.Point;
import java.awt.image.DataBuffer;
@ -62,7 +62,7 @@ public class ShortDataReprojector extends
* (non-Javadoc)
*
* @see
* com.raytheon.uf.common.spatial.repojection.DataReprojector#getGridCoverage
* com.raytheon.uf.common.spatial.reprojection.DataReprojector#getGridCoverage
* (com.raytheon.uf.common.datastorage.records.IDataRecord,
* org.opengis.referencing.crs.CoordinateReferenceSystem,
* org.opengis.geometry.Envelope)
@ -83,7 +83,7 @@ public class ShortDataReprojector extends
* (non-Javadoc)
*
* @see
* com.raytheon.uf.common.spatial.repojection.DataReprojector#getMaskCoverage
* com.raytheon.uf.common.spatial.reprojection.DataReprojector#getMaskCoverage
* (com.raytheon.uf.common.datastorage.records.IDataRecord,
* org.opengis.referencing.crs.CoordinateReferenceSystem,
* org.opengis.geometry.Envelope)
@ -104,7 +104,7 @@ public class ShortDataReprojector extends
* (non-Javadoc)
*
* @see
* com.raytheon.uf.common.spatial.repojection.DataReprojector#extractData(org
* com.raytheon.uf.common.spatial.reprojection.DataReprojector#extractData(org
* .geotools.coverage.grid.GridCoverage2D)
*/
@Override
@ -130,7 +130,7 @@ public class ShortDataReprojector extends
* (non-Javadoc)
*
* @see
* com.raytheon.uf.common.spatial.repojection.DataReprojector#extractData(org
* com.raytheon.uf.common.spatial.reprojection.DataReprojector#extractData(org
* .geotools.coverage.grid.GridCoverage2D,
* org.geotools.coverage.grid.GridCoverage2D)
*/
@ -179,7 +179,7 @@ public class ShortDataReprojector extends
* (non-Javadoc)
*
* @see
* com.raytheon.uf.common.spatial.repojection.DataReprojector#getDataSlice(com
* com.raytheon.uf.common.spatial.reprojection.DataReprojector#getDataSlice(com
* .raytheon.uf.common.datastorage.records.IDataRecord,
* com.raytheon.uf.common.datastorage.Request)
*/
@ -223,7 +223,7 @@ public class ShortDataReprojector extends
* (non-Javadoc)
*
* @see
* com.raytheon.uf.common.spatial.repojection.AbstractDataReprojector#compatible
* com.raytheon.uf.common.spatial.reprojection.AbstractDataReprojector#compatible
* (com.raytheon.uf.common.datastorage.records.IDataRecord)
*/
@Override

4
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
View file

@ -70,8 +70,8 @@ import com.raytheon.uf.common.localization.LocalizationFile;
import com.raytheon.uf.common.localization.PathManagerFactory;
import com.raytheon.uf.common.serialization.SerializationException;
import com.raytheon.uf.common.serialization.SerializationUtil;
import com.raytheon.uf.common.spatial.repojection.DataReprojector;
import com.raytheon.uf.common.spatial.repojection.ReferencedDataRecord;
import com.raytheon.uf.common.spatial.reprojection.DataReprojector;
import com.raytheon.uf.common.spatial.reprojection.ReferencedDataRecord;
import com.raytheon.uf.common.time.util.TimeUtil;
import com.raytheon.uf.common.util.FileUtil;
import com.raytheon.uf.edex.core.EdexException;

43
edexOsgi/com.raytheon.uf.edex.spatial/res/spring/database-common.xml
View file

@ -1,43 +0,0 @@
<beans
xmlns="http://www.springframework.org/schema/beans"
xmlns:amq="http://activemq.apache.org/schema/core"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
<bean id="queryData" class="com.raytheon.uf.edex.database.handlers.DbQueryHandler"/>
<bean id="querySpatialData" class="com.raytheon.uf.edex.database.handlers.SpatialDbQueryHandler"/>
<bean id="queryDataSet" class="com.raytheon.uf.edex.database.handlers.DbQueryHandlerSet"/>
<bean factory-bean="handlerRegistry" factory-method="register">
<constructor-arg value="com.raytheon.uf.common.geospatial.request.SpatialDbQueryRequest"/>
<constructor-arg ref="querySpatialData"/>
</bean>
<bean id="queryDataRegistered" factory-bean="handlerRegistry" factory-method="register">
<constructor-arg value="com.raytheon.uf.common.dataquery.requests.DbQueryRequest"/>
<constructor-arg ref="queryData"/>
</bean>
<bean factory-bean="handlerRegistry" factory-method="register">
<constructor-arg value="com.raytheon.uf.common.dataquery.requests.DbQueryRequestSet"/>
<constructor-arg ref="queryDataSet"/>
</bean>
<bean id="qlServerRequestHandler" class="com.raytheon.uf.edex.database.QlServerRequestHandler" />
<bean factory-bean="handlerRegistry" factory-method="register">
<constructor-arg value="com.raytheon.uf.common.dataquery.requests.QlServerRequest"/>
<constructor-arg ref="qlServerRequestHandler"/>
</bean>
<bean id="timeQueryHandler" class="com.raytheon.uf.edex.database.handlers.TimeQueryHandler" />
<bean id="timeQueryHandlerSet" class="com.raytheon.uf.edex.database.handlers.TimeQueryHandlerSet" />
<bean factory-bean="handlerRegistry" factory-method="register">
<constructor-arg value="com.raytheon.uf.common.dataquery.requests.TimeQueryRequest"/>
<constructor-arg ref="timeQueryHandler"/>
</bean>
<bean factory-bean="handlerRegistry" factory-method="register">
<constructor-arg value="com.raytheon.uf.common.dataquery.requests.TimeQueryRequestSet"/>
<constructor-arg ref="timeQueryHandlerSet"/>
</bean>
</beans>