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

Merge branch 'omaha_14.4.1' into omaha_15.1.1

Browse source 
Former-commit-id: dcab227f00 [formerly e7de4b7130] [formerly 9886a6aa5f] [formerly dcab227f00 [formerly e7de4b7130] [formerly 9886a6aa5f] [formerly 77259e5c18 [formerly 9886a6aa5f [formerly cdc44956b4cd8ee3415ffb83d0d652d7162541d5]]]]
Former-commit-id: 77259e5c18
Former-commit-id: 1ddd3ce18e [formerly 7071f50293] [formerly 0282927e9761c001518fd37ae7dca095a5771b52 [formerly 853d803527]]
Former-commit-id: 908caef3650c7941147cde54a61c024687571647 [formerly 9ef301c4b3]
Former-commit-id: 6aa24992e2
This commit is contained in:
Steve Harris 2014-07-07 08:35:33 -05:00
commit 5aaf5bf454
12 changed files with 238 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cave/build/p2-build.xml
View file

@ -279,14 +279,18 @@
<param name="feature"
value="com.raytheon.uf.viz.thinclient.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.useradmin.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.datadelivery.feature" />
value="com.raytheon.uf.viz.registry.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.useradmin.feature" />
</antcall>
value="com.raytheon.uf.viz.datadelivery.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.npp.feature" />

31
cave/build/static/linux/cave/caveUtil.sh
View file

@ -33,6 +33,7 @@
#
# Mar 13 2014 #15348 kjohnson added function to remove logs
# Jun 20, 2014 #3245 bclement forEachRunningCave now accounts for child processes
# Jul 02, 2014 #3245 bclement account for memory override in vm arguments
source /awips2/cave/iniLookup.sh
@ -145,11 +146,11 @@ function forEachRunningCave()
if [[ -z $children ]]
then
# no children, assume that this is a main cave process
"$@" $(ps --no-header -fp $parent)
"$@" "$(ps --no-header -fp $parent)"
else
for child in $children
do
"$@" $(ps --no-header -fp $child)
"$@" "$(ps --no-header -fp $child)"
done
fi
done
@ -186,6 +187,14 @@ function readMemFromIni()
break
fi
done < "$inifile"
convertMemToBytes $mem $unit
}
# takes in integer amount and string units (K|M|G), echos the amount converted to bytes
function convertMemToBytes()
{
local mem=$1
local unit=$2
# convert to bytes
case "$unit" in
[kK])
@ -213,14 +222,22 @@ function addMemOfCave()
{
local inifile
# get ini file from process string
local regex='--launcher.ini\s(.+\.ini)'
if [[ $1 =~ $regex ]]
local iniRegex='--launcher.ini\s(.+\.ini)'
local xmxRegex='-Xmx([0-9]*)([^\s]*)'
if [[ $1 =~ $xmxRegex ]]
then
inifile="${BASH_REMATCH[1]}"
local mem="${BASH_REMATCH[1]}"
local unit="${BASH_REMATCH[2]}"
let "_totalRunningMem+=$(convertMemToBytes $mem $unit)"
else
inifile="/awips2/cave/cave.ini"
if [[ $1 =~ $iniRegex ]]
then
inifile="${BASH_REMATCH[1]}"
else
inifile="/awips2/cave/cave.ini"
fi
let "_totalRunningMem+=$(readMemFromIni "$inifile")"
fi
let "_totalRunningMem+=$(readMemFromIni "$inifile")"
}
# finds total max memory of running caves in bytes and places it in _totalRunningMem

54
cave/com.raytheon.uf.viz.collaboration.display/config.xml Normal file
View file

@ -0,0 +1,54 @@
<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
<!--
This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
This_software_product_contains_export-restricted_data_whose
export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
an_export_license_or_other_authorization.
Contractor_Name:________Raytheon_Company
Contractor_Address:_____6825_Pine_Street,_Suite_340
________________________Mail_Stop_B8
________________________Omaha,_NE_68106
________________________402.291.0100
See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
further_licensing_information.
-->
<configuration>
<collaborationParticipantColor>DeepSkyBlue3</collaborationParticipantColor>
<collaborationParticipantColor>DarkOrange3</collaborationParticipantColor>
<collaborationParticipantColor>ForestGreen</collaborationParticipantColor>
<collaborationParticipantColor>firebrick3</collaborationParticipantColor>
<collaborationParticipantColor>MediumPurple3</collaborationParticipantColor>
<collaborationParticipantColor>DarkGoldenrod3</collaborationParticipantColor>
<collaborationParticipantColor>HotPink3</collaborationParticipantColor>
<collaborationParticipantColor>burlywood4</collaborationParticipantColor>
<collaborationParticipantColor>CornflowerBlue</collaborationParticipantColor>
<collaborationParticipantColor>OrangeRed2</collaborationParticipantColor>
<collaborationParticipantColor>DarkOliveGreen4</collaborationParticipantColor>
<collaborationParticipantColor>BlueViolet</collaborationParticipantColor>
<collaborationParticipantColor>SkyBlue3</collaborationParticipantColor>
<collaborationParticipantColor>orange3</collaborationParticipantColor>
<collaborationParticipantColor>chartreuse4</collaborationParticipantColor>
<collaborationParticipantColor>brown2</collaborationParticipantColor>
<collaborationParticipantColor>gold4</collaborationParticipantColor>
<collaborationParticipantColor>magenta3</collaborationParticipantColor>
<collaborationParticipantColor>CadetBlue4</collaborationParticipantColor>
<collaborationParticipantColor>green3</collaborationParticipantColor>
<collaborationParticipantColor>coral3</collaborationParticipantColor>
<collaborationParticipantColor>khaki4</collaborationParticipantColor>
<collaborationParticipantColor>DarkOrchid3</collaborationParticipantColor>
<collaborationParticipantColor>chocolate3</collaborationParticipantColor>
<collaborationParticipantColor>DodgerBlue2</collaborationParticipantColor>
<collaborationParticipantColor>OliveDrab4</collaborationParticipantColor>
<collaborationParticipantColor>DarkRed</collaborationParticipantColor>
<collaborationParticipantColor>tan3</collaborationParticipantColor>
<collaborationParticipantColor>DeepPink3</collaborationParticipantColor>
<collaborationParticipantColor>SeaGreen</collaborationParticipantColor>
<collaborationParticipantColor>DarkViolet</collaborationParticipantColor>
<collaborationParticipantColor>DarkTurquoise</collaborationParticipantColor>
</configuration>

63
cave/com.raytheon.uf.viz.collaboration.display/src/com/raytheon/uf/viz/collaboration/display/Activator.java
View file

@ -1,12 +1,51 @@
/**
* This software was developed and / or modified by Raytheon Company,
* pursuant to Contract DG133W-05-CQ-1067 with the US Government.
*
* U.S. EXPORT CONTROLLED TECHNICAL DATA
* This software product contains export-restricted data whose
* export/transfer/disclosure is restricted by U.S. law. Dissemination
* to non-U.S. persons whether in the United States or abroad requires
* an export license or other authorization.
*
* Contractor Name: Raytheon Company
* Contractor Address: 6825 Pine Street, Suite 340
* Mail Stop B8
* Omaha, NE 68106
* 402.291.0100
*
* See the AWIPS II Master Rights File ("Master Rights File.pdf") for
* further licensing information.
**/
package com.raytheon.uf.viz.collaboration.display;
import org.eclipse.jface.preference.IPersistentPreferenceStore;
import org.eclipse.jface.preference.IPreferenceStore;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.viz.core.jobs.StatsJob;
import com.raytheon.uf.viz.core.localization.HierarchicalPreferenceStore;
/**
* Activator for Collaboration Display bundle
*
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* 2012 ? ? Initial creation
* Jul 02, 2014 1255 bclement added prefs store
*
* </pre>
*
* @author bclement
* @version 1.0
*/
public class Activator implements BundleActivator {
public static final IUFStatusHandler statusHandler = UFStatus
@ -14,6 +53,11 @@ public class Activator implements BundleActivator {
private static BundleContext context;
// The shared instance
private static Activator plugin;
private IPersistentPreferenceStore prefs;
private StatsJob statsJob = new StatsJob(
"Collaboration Network Statistics",
com.raytheon.uf.viz.collaboration.comm.Activator.getDefault()
@ -33,6 +77,7 @@ public class Activator implements BundleActivator {
public void start(BundleContext bundleContext) throws Exception {
Activator.context = bundleContext;
statsJob.schedule();
plugin = this;
}
/*
@ -46,4 +91,22 @@ public class Activator implements BundleActivator {
statsJob.shutdown();
}
/**
* @return the shared instance
*/
public static Activator getDefault() {
return plugin;
}
/**
* @return the preference store
*/
public IPreferenceStore getPreferenceStore() {
if (prefs == null) {
prefs = new HierarchicalPreferenceStore(context
.getBundle().getSymbolicName());
}
return prefs;
}
}

20
cave/com.raytheon.uf.viz.collaboration.display/src/com/raytheon/uf/viz/collaboration/display/data/SessionColorManager.java
View file

@ -25,7 +25,9 @@ import java.util.Map;
import org.eclipse.swt.graphics.RGB;
import com.raytheon.uf.viz.collaboration.comm.provider.user.VenueParticipant;
import com.raytheon.viz.core.ColorUtil;
import com.raytheon.uf.viz.collaboration.display.Activator;
import com.raytheon.uf.viz.core.RGBColors;
import com.raytheon.uf.viz.core.localization.HierarchicalPreferenceStore;
/**
*
@ -41,6 +43,7 @@ import com.raytheon.viz.core.ColorUtil;
* Apr 03, 2012 mnash Initial creation
* Jan 30, 2014 2698 bclement changed UserId to VenueParticipant
* Mar 06, 2014 2848 bclement synchronized color access
* Jul 02, 2014 1255 bclement collaboration specific RGB presets
*
* </pre>
*
@ -50,9 +53,22 @@ import com.raytheon.viz.core.ColorUtil;
public class SessionColorManager {
public static final String SESSION_COLOR_PREFERENCE_KEY = "collaborationParticipantColor";
private final Map<VenueParticipant, RGB> colors = new HashMap<VenueParticipant, RGB>();
private static final RGB[] rgbPresets = ColorUtil.getResourceColorPresets();
private static final RGB[] rgbPresets;
static {
HierarchicalPreferenceStore prefs = (HierarchicalPreferenceStore) Activator
.getDefault().getPreferenceStore();
String[] names = prefs.getStringArray(SESSION_COLOR_PREFERENCE_KEY);
rgbPresets = new RGB[names.length];
int i = 0;
for (String name : names) {
rgbPresets[i++] = RGBColors.getRGBColor(name);
}
}
/**
* Get a map of venue participants to their assigned colors used for

2
cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/session/SessionView.java
View file

@ -114,6 +114,7 @@ import com.raytheon.uf.viz.core.sounds.SoundUtil;
* Mar 28, 2014 #2960 lvenable Added check to make sure the SashForm is not getting
* negative weights - set to zero if negative.
* Jun 17, 2014 3078 bclement added private chat to menu and double click
* Jul 03, 2014 3342 bclement added count to participants label
*
* </pre>
*
@ -681,6 +682,7 @@ public class SessionView extends AbstractSessionView<VenueParticipant>
}
usersTable.setInput(participants);
usersTable.refresh();
participantsLabel.setText("Participants (" + participants.size() + ")");
}
@Subscribe

17
cave/com.raytheon.uf.viz.registry.feature/.project Normal file
View file

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>com.raytheon.uf.viz.registry.feature</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.pde.FeatureBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.FeatureNature</nature>
</natures>
</projectDescription>

1
cave/com.raytheon.uf.viz.registry.feature/build.properties Normal file
View file

@ -0,0 +1 @@
bin.includes = feature.xml

46
cave/com.raytheon.uf.viz.registry.feature/feature.xml Normal file
View file

@ -0,0 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="com.raytheon.uf.viz.registry.feature"
label="Registry Feature"
version="1.0.0.qualifier"
provider-name="RAYTHEON">
<description url="http://www.example.com/description">
[Enter Feature Description here.]
</description>
<copyright url="http://www.example.com/copyright">
[Enter Copyright Description here.]
</copyright>
<license url="http://www.example.com/license">
[Enter License Description here.]
</license>
<plugin
id="com.raytheon.uf.common.registry.ebxml"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="com.raytheon.uf.common.registry.event"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.raytheon.uf.common.registry.schemas.ebxml"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.sun.xml.bind"
download-size="0"
install-size="0"
version="0.0.0"/>
</feature>

4
cave/com.raytheon.viz.feature.awips.developer/feature.xml
View file

@ -176,6 +176,10 @@
<includes
id="com.raytheon.uf.viz.d2d.ui.awips.feature"
version="0.0.0"/>
<includes
id="com.raytheon.uf.viz.registry.feature"
version="0.0.0"/>
<requires>
<import feature="com.raytheon.uf.viz.application.feature" version="1.0.0.qualifier"/>

7
edexOsgi/com.raytheon.edex.plugin.grib/.settings/org.eclipse.jdt.core.prefs
View file

@ -1,7 +0,0 @@
#Thu Mar 26 10:20:38 CDT 2009
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.6

4
edexOsgi/com.raytheon.edex.plugin.grib/META-INF/MANIFEST.MF
View file

@ -17,7 +17,6 @@ Require-Bundle: com.raytheon.edex.common;bundle-version="1.14.0",
com.raytheon.uf.edex.python.decoder,
org.apache.camel;bundle-version="2.12.3",
org.apache.commons.lang;bundle-version="2.3.0",
org.apache.commons.logging;bundle-version="1.0.4",
javax.measure,
ucar.nc2
Export-Package: com.raytheon.edex.plugin.grib,
@ -25,4 +24,5 @@ Export-Package: com.raytheon.edex.plugin.grib,
com.raytheon.edex.plugin.grib.spatial,
com.raytheon.edex.plugin.grib.util,
com.raytheon.edex.util.grib
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Import-Package: org.apache.commons.logging