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

Merge "Issue #2122 Cleaned up dependencies for satellite" into development

Browse source 
Former-commit-id: e2577f5b9c5bd3d518dbaeb8f3a38ef57f3a8966
This commit is contained in:
Nate Jensen 2013-06-24 09:12:12 -05:00 • committed by Gerrit Code Review
commit 6541a89bf5
14 changed files with 90 additions and 136 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cave/com.raytheon.uf.viz.ui.menus/META-INF/MANIFEST.MF
View file

@ -11,10 +11,8 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.core.expressions,
com.raytheon.viz.ui,
org.geotools,
com.raytheon.uf.viz.core,
com.raytheon.uf.common.menus;bundle-version="1.0.0",
com.raytheon.uf.common.serialization.comm;bundle-version="1.12.1174"
com.raytheon.uf.common.menus;bundle-version="1.0.0";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Import-Package: com.raytheon.uf.common.localization,

4
cave/com.raytheon.uf.viz.ui.menus/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -1,4 +0,0 @@
com.raytheon.uf.viz.ui.menus.xml.IncludeMenuItem
com.raytheon.uf.viz.ui.menus.xml.MenuContributionFile
com.raytheon.uf.viz.ui.menus.xml.PlaceholderMenuContribution
com.raytheon.uf.viz.ui.menus.xml.SeparatorMenuContribution

61
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/DiscoverMenuContributions.java
View file

@ -191,42 +191,41 @@ public class DiscoverMenuContributions {
public void createContributionItems(
IServiceLocator serviceLocator,
IContributionRoot additions) {
IContributionItem[] items = null;
try {
items = imc.getContributionItems(null,
new VariableSubstitution[0],
new HashSet<String>());
IContributionItem[] items = imc
.getContributionItems(
null,
new VariableSubstitution[0],
new HashSet<String>());
Expression exp = null;
if (imc.visibleOnActionSet != null) {
org.eclipse.core.internal.expressions.WithExpression we = new org.eclipse.core.internal.expressions.WithExpression(
"activeContexts");
org.eclipse.core.internal.expressions.IterateExpression oe = null;
try {
oe = new org.eclipse.core.internal.expressions.IterateExpression(
"or");
} catch (CoreException e) {
// ignore, since this is hardcoded
}
for (String str : imc.visibleOnActionSet) {
org.eclipse.core.internal.expressions.EqualsExpression ee = new org.eclipse.core.internal.expressions.EqualsExpression(
str);
oe.add(ee);
}
we.add(oe);
exp = we;
}
for (IContributionItem item : items) {
additions
.addContributionItem(item, exp);
}
} catch (VizException e) {
statusHandler.handle(Priority.SIGNIFICANT,
"Error setting up menus", e);
}
Expression exp = null;
if (imc.visibleOnActionSet != null) {
org.eclipse.core.internal.expressions.WithExpression we = new org.eclipse.core.internal.expressions.WithExpression(
"activeContexts");
org.eclipse.core.internal.expressions.IterateExpression oe = null;
try {
oe = new org.eclipse.core.internal.expressions.IterateExpression(
"or");
} catch (CoreException e) {
// ignore, since this is hardcoded
}
for (String str : imc.visibleOnActionSet) {
org.eclipse.core.internal.expressions.EqualsExpression ee = new org.eclipse.core.internal.expressions.EqualsExpression(
str);
oe.add(ee);
}
we.add(oe);
exp = we;
}
for (IContributionItem item : items) {
additions.addContributionItem(item, exp);
}
}
};
menuService.addContributionFactory(viewMenuAddition);

4
cave/com.raytheon.viz.pointdata/META-INF/MANIFEST.MF
View file

@ -14,12 +14,12 @@ Require-Bundle: org.apache.batik,
com.raytheon.viz.ui,
org.apache.commons.lang,
javax.measure,
com.raytheon.edex.common,
com.raytheon.uf.viz.localization;bundle-version="1.12.1174",
org.jep;bundle-version="1.0.0",
com.raytheon.uf.common.python;bundle-version="1.12.1161",
com.raytheon.uf.common.pointdata;bundle-version="1.12.1174",
com.raytheon.uf.common.dataplugin.level;bundle-version="1.12.1174"
com.raytheon.uf.common.dataplugin.level;bundle-version="1.12.1174",
com.raytheon.uf.common.colormap;bundle-version="1.12.1174"
Bundle-ActivationPolicy: lazy
Export-Package: com.raytheon.viz.pointdata,
com.raytheon.viz.pointdata.drawables,

30
cave/com.raytheon.viz.satellite/META-INF/MANIFEST.MF
View file

@ -9,26 +9,22 @@ Eclipse-RegisterBuddy: com.raytheon.viz.core, com.raytheon.uf.viz.core, com.rayt
Eclipse-BuddyPolicy: ext, global
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
com.raytheon.viz.core,
org.geotools,
com.raytheon.viz.ui,
javax.measure,
com.raytheon.edex.common,
com.raytheon.uf.common.message,
com.raytheon.uf.viz.core,
com.raytheon.uf.viz.d2d.ui;bundle-version="1.11.17",
com.raytheon.uf.common.util;bundle-version="1.0.0",
com.raytheon.uf.viz.productbrowser;bundle-version="1.11.31",
com.raytheon.uf.common.dataplugin;bundle-version="1.12.1174",
com.raytheon.uf.common.dataplugin.satellite;bundle-version="1.0.0",
com.raytheon.uf.common.serialization.comm;bundle-version="1.12.1174"
com.raytheon.uf.common.datastorage;bundle-version="1.12.1174",
com.raytheon.uf.common.serialization.comm;bundle-version="1.12.1174",
com.raytheon.uf.common.geospatial;bundle-version="1.12.1174",
com.raytheon.uf.common.colormap;bundle-version="1.12.1174",
com.raytheon.uf.common.pointdata;bundle-version="1.12.1174",
com.raytheon.uf.common.message;bundle-version="1.12.1174",
com.raytheon.uf.viz.productbrowser;bundle-version="1.11.31",
com.raytheon.uf.viz.derivparam;bundle-version="1.12.1174",
com.raytheon.uf.viz.ui.menus;bundle-version="1.12.1174",
com.raytheon.viz.ui;bundle-version="1.12.1174",
com.raytheon.viz.core;bundle-version="1.12.1174",
javax.measure
Bundle-ActivationPolicy: lazy
Import-Package: com.raytheon.uf.common.colormap,
com.raytheon.uf.common.menus,
com.raytheon.uf.common.menus.xml,
com.raytheon.uf.common.pointdata,
com.raytheon.uf.viz.derivparam.library,
com.raytheon.uf.viz.ui.menus.widgets,
com.raytheon.uf.viz.ui.menus.xml
Export-Package: com.raytheon.viz.satellite,
com.raytheon.viz.satellite.rsc
Bundle-RequiredExecutionEnvironment: JavaSE-1.6

67
edexOsgi/com.raytheon.edex.uengine/META-INF/MANIFEST.MF
View file

@ -5,21 +5,6 @@ Bundle-SymbolicName: com.raytheon.edex.uengine
Bundle-Version: 1.12.1174.qualifier
Bundle-Activator: com.raytheon.edex.uengine.Activator
Bundle-Vendor: RAYTHEON
Require-Bundle: org.apache.activemq,
javax.servlet,
org.apache.commons.logging,
org.apache.commons.configuration,
org.geotools,
org.jep,
org.apache.commons.pool,
org.apache.commons.lang,
com.raytheon.uf.common.localization,
com.raytheon.uf.common.status,
javax.measure;bundle-version="1.0.0",
javax.jms;bundle-version="1.0.0",
org.apache.http;bundle-version="4.1.1",
com.raytheon.uf.common.util;bundle-version="1.12.1174",
org.apache.velocity;bundle-version="1.7.0"
Bundle-ActivationPolicy: lazy
Export-Package: com.raytheon.edex.uengine,
com.raytheon.edex.uengine.exception,
@ -29,34 +14,34 @@ Export-Package: com.raytheon.edex.uengine,
com.raytheon.edex.uengine.tasks,
com.raytheon.edex.uengine.tasks.query,
com.raytheon.edex.uengine.util
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: com.raytheon.edex.colormap,
com.raytheon.edex.exception,
com.raytheon.edex.msg,
com.raytheon.edex.uengine.exception,
com.raytheon.edex.util,
com.raytheon.edex.utility,
com.raytheon.uf.common.colormap,
com.raytheon.uf.common.dataplugin,
com.raytheon.uf.common.dataplugin.persist,
com.raytheon.uf.common.dataquery.db,
com.raytheon.uf.common.dataquery.requests,
com.raytheon.uf.common.datastorage.records,
com.raytheon.uf.common.geospatial,
com.raytheon.uf.common.message,
com.raytheon.uf.common.message.response,
com.raytheon.uf.common.python,
com.raytheon.uf.common.serialization,
com.raytheon.uf.common.time,
com.raytheon.uf.common.util,
com.raytheon.uf.common.velocity,
com.raytheon.uf.edex.core,
com.raytheon.uf.edex.core.props,
com.raytheon.uf.edex.database,
com.raytheon.uf.edex.database.dao,
com.raytheon.uf.edex.database.plugin,
com.raytheon.uf.edex.database.query,
com.raytheon.uf.edex.site,
org.hibernate,
org.hibernate.metadata,
org.springframework.orm.hibernate3.support
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
javax.servlet,
javax.servlet.http
Require-Bundle: com.raytheon.uf.edex.core;bundle-version="1.12.1174",
com.raytheon.uf.edex.database;bundle-version="1.0.0",
com.raytheon.uf.common.dataquery;bundle-version="1.0.0",
com.raytheon.uf.common.datastorage;bundle-version="1.12.1174",
com.raytheon.uf.common.dataplugin;bundle-version="1.12.1174",
com.raytheon.uf.common.message;bundle-version="1.12.1174",
com.raytheon.uf.common.serialization;bundle-version="1.12.1174",
com.raytheon.uf.common.localization;bundle-version="1.12.1174",
com.raytheon.uf.common.velocity;bundle-version="1.0.0",
com.raytheon.uf.common.status;bundle-version="1.12.1174",
com.raytheon.uf.common.geospatial;bundle-version="1.12.1174",
com.raytheon.uf.common.colormap;bundle-version="1.12.1174",
com.raytheon.uf.common.python;bundle-version="1.12.1174",
com.raytheon.uf.common.util;bundle-version="1.12.1174",
org.apache.commons.configuration;bundle-version="1.6.0",
org.apache.commons.logging;bundle-version="1.1.2",
org.apache.commons.lang;bundle-version="2.3.0",
org.apache.commons.pool;bundle-version="1.3.0",
org.apache.activemq;bundle-version="5.2.0",
org.apache.http;bundle-version="4.1.2",
org.springframework;bundle-version="3.1.4",
javax.jms;bundle-version="1.0.0",
org.hibernate;bundle-version="1.0.0"

7
edexOsgi/com.raytheon.edex.uengine/component-deploy.xml
View file

@ -1,7 +0,0 @@
<project basedir="." default="deploy" name="com.raytheon.edex.uengine">
<available file="../build.edex" property="build.dir.location" value="../build.edex"/>
<available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
</project>

6
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/META-INF/MANIFEST.MF
View file

@ -8,13 +8,15 @@ Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serializ
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: com.raytheon.uf.common.dataplugin;bundle-version="1.12.1174",
com.raytheon.uf.common.serialization;bundle-version="1.12.1174",
com.raytheon.edex.common;bundle-version="1.12.1174",
javax.persistence;bundle-version="1.0.0",
org.geotools;bundle-version="2.6.4",
org.apache.commons.lang;bundle-version="2.3.0",
javax.measure;bundle-version="1.0.0",
com.raytheon.uf.common.dataaccess;bundle-version="1.0.0",
com.raytheon.uf.common.serialization.comm;bundle-version="1.12.1174"
com.raytheon.uf.common.serialization.comm;bundle-version="1.12.1174",
com.raytheon.uf.common.dataquery;bundle-version="1.0.0",
com.raytheon.uf.common.datastorage;bundle-version="1.12.1174",
org.hibernate;bundle-version="1.0.0"
Export-Package: com.raytheon.uf.common.dataplugin.satellite,
com.raytheon.uf.common.dataplugin.satellite.units,
com.raytheon.uf.common.dataplugin.satellite.units.counts,

5
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/component-deploy.xml
View file

@ -1,5 +0,0 @@
<project basedir="." default="deploy" name="com.raytheon.uf.common.dataplugin.satellite">
<available file="../build.edex" property="build.dir.location" value="../build.edex" />
<available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex" />
<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
</project>

18
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/SatelliteRecord.java
View file

@ -84,17 +84,15 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
* Both refTime and forecastTime are included in the refTimeIndex since
* forecastTime is unlikely to be used.
*/
@org.hibernate.annotations.Table(
appliesTo = "satellite",
indexes = {
@Index(name = "satellite_refTimeIndex", columnNames = { "refTime", "forecastTime" } )
}
)
@org.hibernate.annotations.Table(appliesTo = "satellite", indexes = { @Index(name = "satellite_refTimeIndex", columnNames = {
"refTime", "forecastTime" }) })
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
@DynamicSerialize
public class SatelliteRecord extends PersistablePluginDataObject
implements ISpatialEnabled {
public class SatelliteRecord extends PersistablePluginDataObject implements
ISpatialEnabled {
public static final String PLUGIN_ID = "satellite";
private static final long serialVersionUID = 1L;
@ -260,7 +258,7 @@ public class SatelliteRecord extends PersistablePluginDataObject
* No-arg constructor.
*/
public SatelliteRecord() {
setPluginName(PLUGIN_ID);
}
/**
@ -272,7 +270,7 @@ public class SatelliteRecord extends PersistablePluginDataObject
* The table definition associated with this class
*/
public SatelliteRecord(String uri) {
super(uri.replace('_', ' '));
super(uri);
}
public Integer getNumRecords() {

5
edexOsgi/com.raytheon.uf.common.dataplugin/META-INF/MANIFEST.MF
View file

@ -6,9 +6,7 @@ Bundle-Version: 1.12.1174.qualifier
Bundle-Vendor: RAYTHEON
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization
Import-Package: com.raytheon.uf.common.time,
com.raytheon.uf.common.time.util,
javax.measure.unit,
Import-Package: javax.measure.unit,
javax.persistence,
org.apache.commons.beanutils,
org.hibernate.annotations
@ -20,6 +18,7 @@ Export-Package: com.raytheon.uf.common.dataplugin,
com.raytheon.uf.common.dataplugin.request
Require-Bundle: com.raytheon.uf.common.localization;bundle-version="1.12.1174",
com.raytheon.uf.common.status,
com.raytheon.uf.common.time;bundle-version="1.12.1174";visibility:=reexport,
com.raytheon.uf.common.serialization,
com.raytheon.uf.common.serialization.comm,
com.raytheon.uf.common.util;bundle-version="1.12.1174"

2
edexOsgi/com.raytheon.uf.common.python/META-INF/MANIFEST.MF
View file

@ -5,7 +5,7 @@ Bundle-SymbolicName: com.raytheon.uf.common.python
Bundle-Version: 1.12.1174.qualifier
Bundle-Vendor: RAYTHEON
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.jep;bundle-version="1.0.0",
Require-Bundle: org.jep;bundle-version="1.0.0";visibility:=reexport,
com.raytheon.uf.common.status;bundle-version="1.12.1174",
com.raytheon.uf.common.localization;bundle-version="1.12.1174"
Export-Package: com.raytheon.uf.common.python,

7
edexOsgi/com.raytheon.uf.common.python/component-deploy.xml
View file

@ -1,7 +0,0 @@
<project basedir="." default="deploy" name="com.raytheon.uf.common.python">
<available file="../build.edex" property="build.dir.location" value="../build.edex"/>
<available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
</project>

6
edexOsgi/com.raytheon.uf.common.velocity/META-INF/MANIFEST.MF
View file

@ -5,7 +5,7 @@ Bundle-SymbolicName: com.raytheon.uf.common.velocity
Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: RAYTHEON
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.apache.velocity;bundle-version="1.7.0",
com.raytheon.uf.common.util
Import-Package: org.apache.commons.collections
Require-Bundle: org.apache.velocity;bundle-version="1.7.0";visibility:=reexport,
com.raytheon.uf.common.util,
org.apache.commons.collections;bundle-version="3.2.0"
Export-Package: com.raytheon.uf.common.velocity