Merge remote-tracking branch 'unidata/unidata_18.1.1' into unidata_18.1.1-osx
This commit is contained in:
Michael James
commit
ab481799dc
18 changed files with 59 additions and 433 deletions
|
|
@ -1,5 +0,0 @@
|
|||
source.. = src/
|
||||
output.. = bin/
|
||||
bin.includes = META-INF/,\
|
||||
.,\
|
||||
plugin.xml
|
||||
|
|
@ -1,252 +0,0 @@
|
|||
|
||||
PDA: ESPDS Product Distribution & Access
|
||||
ESPDS: NOAA/NESDIS Environmental Satellite Processing and Distribution System
|
||||
DPA: Data Provider Agent
|
||||
|
||||
|
||||
* need to run keygenutil once and then copy keystore files to edex src directories for deployment
|
||||
* "securityConfiguration" is so ingrained into data delivery that you cannot harvest from open servers (GRADS, THREDDS) without having a security config (which is only used to connect to ESPDS PDA server).
|
||||
* need to specify opendap/grads server in existing file, and add TDS file for the same with a catalog DOD URL:
|
||||
|
||||
<constant name="SUBSET_REQUEST_URL" value="https://pda.espds.com" />
|
||||
|
||||
<mode name="centralRegistry">
|
||||
<!-- Central Registry production mode -->
|
||||
<includeMode>dataDeliveryTemplate</includeMode>
|
||||
<includeMode>ebxmlRegistry</includeMode>
|
||||
<include>bandwidth-datadelivery-.*-ncf.xml</include>
|
||||
<!--<exclude>.*datadelivery.*-wfo.*</exclude>-->
|
||||
<!--<exclude>.*edex-security.*</exclude> -->
|
||||
<exclude>.*datadelivery.*-monolithic.*</exclude>
|
||||
</mode>
|
||||
|
||||
Spring-enabled Plugins:
|
||||
-----------------------
|
||||
bandwidth-datadelivery,
|
||||
bandwidth-datadelivery-daos,
|
||||
bandwidth-datadelivery-edex-impl,
|
||||
bandwidth-datadelivery-edex-impl-wfo,
|
||||
bandwidth-datadelivery-eventbus,
|
||||
bandwidth-datadelivery-schedule-route,
|
||||
bandwidth-datadelivery-wfo,
|
||||
bandwidth-datadelivery-wfo-router,
|
||||
bandwidth-graph-datadelivery,
|
||||
crawler-datadelivery,
|
||||
dataaccess-common,
|
||||
database-common,
|
||||
datadelivery-common,
|
||||
datadelivery-cron,
|
||||
datadelivery-handlers,
|
||||
datadelivery-handlers-impl,
|
||||
datadelivery-router,
|
||||
datadelivery-service,
|
||||
datadelivery-service-handlers,
|
||||
datadelivery-subscription-verification,
|
||||
datadelivery-wfo-cron,
|
||||
datadelivery-wfo-retrieval-process,
|
||||
ebxml,
|
||||
ebxml-constants,
|
||||
ebxml-eventbus,
|
||||
ebxml-federation-monitors,
|
||||
ebxml-garbagecollector-edex-impl,
|
||||
ebxml-impl,
|
||||
ebxml-jaxb,
|
||||
ebxml-querytypes,
|
||||
ebxml-registry-common,
|
||||
ebxml-registry-dao,
|
||||
ebxml-registry-init,
|
||||
ebxml-request-router,
|
||||
ebxml-subscription,
|
||||
ebxml-thrift-client,
|
||||
ebxml-validator-plugins,
|
||||
ebxml-webserver,
|
||||
ebxml-webservices,
|
||||
ebxml-xacml,
|
||||
edex-security,
|
||||
event-common,
|
||||
event-datadelivery,
|
||||
event-datadelivery-common,
|
||||
event-datadelivery-ingest,
|
||||
eventbus-common,
|
||||
fssobs-common,
|
||||
geo-common,
|
||||
goessounding-common,
|
||||
grid-common,
|
||||
grid-metadata,
|
||||
gridcoverage-common,
|
||||
harvester-datadelivery,
|
||||
harvester-datadelivery-registry,
|
||||
jaxb-datadelivery-registry,
|
||||
level-common,
|
||||
levelhandler-common,
|
||||
nwsauth-request,
|
||||
obs-common,
|
||||
parameter-common,
|
||||
persist-ingest,
|
||||
pointdata-common,
|
||||
purge-logs,
|
||||
registry-federation-datadelivery,
|
||||
request-service,
|
||||
request-service-common,
|
||||
retrieval-datadelivery,
|
||||
retrieval-datadelivery-daos,
|
||||
retrieval-datadelivery-ncf,
|
||||
retrieval-datadelivery-wfo,
|
||||
satellite-common,
|
||||
satellite-dataplugin-common,
|
||||
sfcobs-common, stats-common,
|
||||
system-status-datadelivery,
|
||||
thrift-bandwidth,
|
||||
time-common,
|
||||
topo-dataaccess-common,
|
||||
utility-common,
|
||||
utility-request
|
||||
|
||||
|
||||
|
||||
acars-common, acars-common-dataaccess, acarssounding-common, activetable-common, activetable-request, airep-common, airep-common-dataaccess, airmet-common, alertviz-request, archiveadmim-request, atcf-common, auth-request, awipstools-request, aww-common, binlightning-common, binlightning-common-dataaccess, bufrascat-common, bufrhdw-common, bufrmos-common, bufrmos-common-dataaccess, bufrmthdw-common, bufrncwf-common, bufrsigwx-common, bufrssmi-common, bufrua-common, bufrua-common-dataaccess, bufrua-request, ccfp-common, climate-common-dataaccess, climate-hmdb-common, convectprob-common, convsigmet-common, cwa-common, cwat-common, dat-request, dataaccess-common, dataaccess-request, database-common, database-request, datadelivery-common, dd-request-router, dissemination-request, dmw-common, ebxml-registry-common, ebxml-request-router, edex-message-common, edex-request, event-common, event-datadelivery-common, eventbus-common, ffg-common, ffmp-common, ffmp-dataplugin-common, fog-common, fssobs-common, gempak-common, gempak-request, geo-common, geomag-common, geomag-request, gfe-common, gfe-dataplugin-common, gfe-request, ghcd-common, ghcd-request, goessounding-common, gpd-common, gpd-request, grid-common, grid-dataplugin-common, grid-request, gridcoverage-common, hpe-request, hydro-common, idft-common, intlsigmet-common, level-common, levelhandler-common, localization-http-request, lsr-common, manualIngest-common, manualIngest-request, maps-dataplugin-common, mcidas-common, menus-request, message-common, modelsounding-common, modelsounding-common-dataaccess, modis-common, mosaic-common, mping-common, ncep-common, ncgrib-request, ncpafm-common, ncscat-common, nctext-common, ncuair-common, nonconvsigmet-common, ntrans-common, nucaps-common, obs-common, obs-common-dataaccess, obs-message-common, obstation-dataplugin-common, ohd-common, ohd-common-database, ohd-request, parameter-common, persist-request, pgen-common, pgen-request, pirep-common, pirep-common-dataaccess, poessounding-common, pointdata-common, pointdata-request, pointset-common, preciprate-common, profiler-common, profiler-common-dataaccess, qc-common, qpf-common, radar-common, radar-dataplugin-common, radar-request, redbook-common, remotescript-request, request-service, request-service-common, rpgenvdata-request, satellite-common, satellite-dataplugin-common, satellite-request, scan-common, sfcobs-common, sfcobs-common-dataaccess, sgwh-common, sgwhv-common, shef-common, site-common, site-request, solarimage-common, soundingrequest-request, ssha-common, stats-common, stats-request, stormtrack-common, stq-common, svrwx-common, taf-common, tcg-common, tcm-common, tcs-common, text-common, text-dbsrv-common, text-dbsrv-request, text-request, text-subscription-common, text-subscription-request, time-common, topo-dataaccess-common, uengine-request, units-common, useradmin-common, useradmin-request, utility-common, utility-request, vaa-common, viirs-common, vil-common, warning-common, warning-common-dataaccess, warning-request, wcp-common
|
||||
|
||||
|
||||
|
||||
|
||||
diff request.sh centralRegistry.sh
|
||||
21,25d20
|
||||
< export INIT_MEM=128 # in Meg
|
||||
< export MAX_MEM=2048 # in Meg
|
||||
< export SERIALIZE_POOL_MAX_SIZE=48
|
||||
< export SERIALIZE_STREAM_INIT_SIZE_MB=2
|
||||
< export SERIALIZE_STREAM_MAX_SIZE_MB=8
|
||||
26a22,27
|
||||
> export MAX_MEM=3072
|
||||
> export MAX_PERM_SIZE=192m
|
||||
> export EDEX_DEBUG_PORT=5011
|
||||
> export EDEX_JMX_PORT=1622
|
||||
> export LOG_CONF=logback-registry.xml
|
||||
> export MGMT_PORT=9607
|
||||
28,32c29,32
|
||||
< export EDEX_DEBUG_PORT=5005
|
||||
< export EDEX_JMX_PORT=1616
|
||||
< export LOG_CONF=logback-request.xml
|
||||
< export MGMT_PORT=9601
|
||||
< export HTTP_PORT=9581
|
||||
---
|
||||
> export METADATA_POOL_TIMEOUT=60
|
||||
> export CLUSTER_ID=NCF
|
||||
>
|
||||
> export SOFT_REF_LRU_POLICY_MS_PER_MB=50
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
* can not run centralRegistry and request JVM, Address already in use java.net.BindException: Address already in use ( 9581 ?)
|
||||
|
||||
|
||||
[edex status]
|
||||
EDEXregistry :: running :: pid 13445 17181
|
||||
|
||||
[awips@senne awips2-data-delivery]$ netstat -l -p|grep 13445
|
||||
tcp 0 0 *:telelpathattack *:* LISTEN 13445/java
|
||||
tcp 0 0 *:us-cli *:* LISTEN 13445/java
|
||||
tcp 0 0 *:9581 *:* LISTEN 13445/java
|
||||
|
||||
|
||||
awips 13410 0.0 0.0 106100 1212 pts/8 S+ 10:18 0:00 /bin/bash ./dev centralRegistry
|
||||
awips 13411 0.0 0.0 106104 1312 pts/8 S+ 10:18 0:00 /bin/bash /awips2/edex/bin/start.sh -b centralRegistry
|
||||
awips 13445 7.3 2.5 8121576 821904 ? SNsl 10:18 1:59 /awips2/java/bin/java -Dedex.run.mode=centralRegistry -Daw.site.identifier=OAX -Dedex.home=/awips2/edex -XX:
|
||||
|
||||
awips 19546 0.0 0.0 106100 1212 pts/8 S+ 10:58 0:00 /bin/bash ./dev centralRegistry
|
||||
awips 19547 0.0 0.0 106104 1312 pts/8 S+ 10:58 0:00 /bin/bash /awips2/edex/bin/start.sh -b centralRegistry
|
||||
|
||||
[awips@senne awips2-data-delivery]$ netstat -l -p|grep 19580
|
||||
(Not all processes could be identified, non-owned process info
|
||||
will not be shown, you would have to be root to see it all.)
|
||||
tcp 0 0 *:telelpathattack *:* LISTEN 19580/java
|
||||
tcp 0 0 *:us-cli *:* LISTEN 19580/java
|
||||
tcp 0 0 *:9581 *:* LISTEN 19580/java
|
||||
|
||||
|
||||
# NCF registry (havester/crawler)
|
||||
|
||||
the Harvester only runs at the Central Registry. As a
|
||||
result, the WFO's no longer need to be concerned with the configuration of the Harvester.
|
||||
The NCF (Central Registry) handles the maintenance of the Crawler.
|
||||
|
||||
|
||||
/etc/init.d/edex_camel start centralRegistry
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
# Site (subscribe)
|
||||
|
||||
/etc/init.d/edex_camel start registry
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Data Delivery has been implemented into the AWIPS(II) baseline to provide access to data that is not resident locally at a Weather Forecast Office, River Forecast Center, or National Center. Data Delivery gives users the ability to create queries (One Time Requests) and
|
||||
subscriptions to data sets (provided by the NOAA Operational Model Archive and Distribution System (NOMADS) data provider).
|
||||
|
||||
## Start and Stop
|
||||
|
||||
There are two different scripts to start the registry, and the script that gets executed depends on whether or not you are at the NCF (Central Registry), which runs the Crawler/Harvester, or an intermediary or node registry.
|
||||
|
||||
Start the registry for site:
|
||||
|
||||
/etc/init.d/edex_camel start registry
|
||||
|
||||
Start the registry for the NCF along with the Crawler/Harvester:
|
||||
|
||||
/etc/init.d/edex_camel start centralRegistry
|
||||
|
||||
## Registry Configuration
|
||||
|
||||
In operational use by the NWS, the Data Delivery federation Harvester is only run at the Central Registry. As a result, WFO's no longer need to configure the Harvester, and the NCF (Central Registry) handles the maintenance of the Crawler.
|
||||
|
||||
Data Delivery employs HTTPS secure transfers for registry-to-registry and some provider-to-registry communications. This means that Certificates for each registry node that directly connects to another registry node must be loaded into the trust store of each connecting node. This can be accomplished using a new utility located in the `/awips2/edex/conf/security` directory. The tool is called the `keystoreUtil.sh`.
|
||||
|
||||
Another configuration file of note new (starting 14.4.1) is the “security.properties”. It is
|
||||
also located in the “/awips2/edex/conf/resources” directory but under the further
|
||||
directories of “/site/${SITE}”
|
||||
Where, ${SITE} is your local WFO/ClusterID. It is written by the “keystoreUtil.sh” and
|
||||
is read by the running system to gather each federation nodes SSL credentials for
|
||||
communicating with other nodes. Manual editing of this file should be unnecessary.
|
||||
Example...
|
||||
|
||||
#The following configuration items are used with the wss4j in/out interceptors
|
||||
org.apache.ws.security.crypto.merlin.keystore.file=security/keystore.jks
|
||||
org.apache.ws.security.crypto.merlin.keystore.password=
|
||||
org.apache.ws.security.crypto.merlin.keystore.type=JKS
|
||||
org.apache.ws.security.crypto.merlin.keystore.alias=OAX
|
||||
|
||||
## Registry Federation Configuration
|
||||
|
||||
The following files must be present for a NCF registry to participate in the federation and receive replicated objects:
|
||||
|
||||
federationConfig.xml Located at: /awips2/edex/data/utility/edex_static/ebxml/federation/federationConfig.xml
|
||||
|
||||
A sample of this file is provided:
|
||||
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||
<federationProperties>
|
||||
<conformanceProfile>RegistryFull</conformanceProfile>
|
||||
<specificationVersion>4.0</specificationVersion>
|
||||
<catalogingLatency>PT0.000S</catalogingLatency>
|
||||
<replicationSyncLatency>PT0.000S</replicationSyncLatency>
|
||||
<siteIdentifier>NCF</siteIdentifier>
|
||||
<siteDescription>AWIPS Network Control Facility</siteDescription>
|
||||
<sitePrimaryContactFirstName>National</sitePrimaryContactFirstName>
|
||||
<sitePrimaryContactMiddleName>Weather</sitePrimaryContactMiddleName>
|
||||
<sitePrimaryContactLastName>Service</sitePrimaryContactLastName>
|
||||
<siteAddressStreetNumber>1325</siteAddressStreetNumber>
|
||||
<siteAddressStreet>East West Highway</siteAddressStreet>
|
||||
<siteAddressCity>Silver Spring</siteAddressCity>
|
||||
<siteAddressState>MD</siteAddressState>
|
||||
<siteAddressCountry>USA</siteAddressCountry>
|
||||
<siteAddressPostalCode>20910</siteAddressPostalCode>
|
||||
</federationProperties>
|
||||
|
||||
|
|
@ -67,6 +67,7 @@ In the [Azure portal](https://portal.azure.com):
|
|||
-A INPUT -m state --state NEW -m tcp -p tcp --dport 5672 -j ACCEPT
|
||||
-A INPUT -m state --state NEW -m tcp -p tcp --dport 9581 -j ACCEPT
|
||||
-A INPUT -m state --state NEW -m tcp -p tcp --dport 9582 -j ACCEPT
|
||||
# -A INPUT -m state --state NEW -m tcp -p tcp --dport 9588 -j ACCEPT # registry/dd
|
||||
-A INPUT -j REJECT --reject-with icmp-host-prohibited
|
||||
-A FORWARD -j REJECT --reject-with icmp-host-prohibited
|
||||
COMMIT
|
||||
|
|
|
|||
|
|
@ -63,6 +63,8 @@ All of these command should be run as **root**
|
|||
### 4. Configure iptables
|
||||
>
|
||||
>Configure iptables to allow TCP connections on ports 9581 and 9582 if you want to serve data to CAVE clients and the Python API.
|
||||
>
|
||||
>If you are running a Registry (Data Delivery) server, you will also want to open port **9588**.
|
||||
>
|
||||
>- **To open ports to all connections**
|
||||
>
|
||||
|
|
@ -78,6 +80,7 @@ All of these command should be run as **root**
|
|||
> -A INPUT -m state --state NEW -m tcp -p tcp --dport 22 -j ACCEPT
|
||||
> -A INPUT -m state --state NEW -m tcp -p tcp --dport 9581 -j ACCEPT
|
||||
> -A INPUT -m state --state NEW -m tcp -p tcp --dport 9582 -j ACCEPT
|
||||
> #-A INPUT -m state --state NEW -m tcp -p tcp --dport 9588 -j ACCEPT # for registry/dd
|
||||
> -A INPUT -j REJECT --reject-with icmp-host-prohibited
|
||||
> -A FORWARD -j REJECT --reject-with icmp-host-prohibited
|
||||
> COMMIT
|
||||
|
|
@ -104,6 +107,7 @@ All of these command should be run as **root**
|
|||
> -A EDEX -m state --state NEW -p tcp --dport 22 -j ACCEPT
|
||||
> -A EDEX -m state --state NEW -p tcp --dport 9581 -j ACCEPT
|
||||
> -A EDEX -m state --state NEW -p tcp --dport 9582 -j ACCEPT
|
||||
> #-A EDEX -m state --state NEW -p tcp --dport 9588 -j ACCEPT # for registry/dd
|
||||
> -A EDEX -j REJECT
|
||||
> COMMIT
|
||||
>
|
||||
|
|
|
|||
|
|
@ -51,7 +51,6 @@ import com.raytheon.uf.common.registry.ebxml.slots.SlotConverter;
|
|||
import com.raytheon.uf.common.registry.ebxml.slots.StringSlotConverter;
|
||||
import com.raytheon.uf.common.serialization.SerializationException;
|
||||
import com.raytheon.uf.common.time.util.ImmutableDate;
|
||||
import com.raytheon.uf.common.util.ClusterIdUtil;
|
||||
import com.raytheon.uf.common.util.CollectionUtil;
|
||||
import com.raytheon.uf.common.util.ReflectionException;
|
||||
import com.raytheon.uf.common.util.ReflectionUtil;
|
||||
|
|
@ -87,6 +86,7 @@ import com.raytheon.uf.common.util.ReflectionUtil;
|
|||
* Jul 10, 2014 1717 bphillip Changed default user
|
||||
* Jul 28, 2014 3474 dhladky Fixed bad default user settings.
|
||||
* Aug 25, 2016 5846 rjpeter Remove InternationalString from DB
|
||||
* Aug 08, 2018 mjames Standalone Registry Configuration
|
||||
*
|
||||
* </pre>
|
||||
*
|
||||
|
|
@ -123,7 +123,8 @@ public final class RegistryUtil {
|
|||
/**
|
||||
* The default internal owner is the local registry ID
|
||||
*/
|
||||
public static final String registryUser = ClusterIdUtil.getId();
|
||||
|
||||
public static final String registryUser = System.getenv("AW_SITE_IDENTIFIER");
|
||||
|
||||
// A private mapping of attribute types to slot types, used when storing an
|
||||
// object to the registry to map QueryableAttributes to SlotConverters.
|
||||
|
|
|
|||
|
|
@ -1,41 +1,11 @@
|
|||
#!/bin/bash
|
||||
##
|
||||
# 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.
|
||||
##
|
||||
|
||||
##
|
||||
# The centralRegistry mode was designed to be an ebXML registry plus all the
|
||||
ntralRegistry mode was designed to be an ebXML registry plus all the
|
||||
# components necessary to harvest data from a data provider and manage
|
||||
# SBN/Shared Subscriptions. Anything registry-related that is meant to run
|
||||
# only once for all of the NWS would run in this mode.
|
||||
##
|
||||
|
||||
export MAX_MEM=2048 # in Meg
|
||||
|
||||
if [ $HIGH_MEM == "on" ]; then
|
||||
export MAX_MEM=3072
|
||||
fi
|
||||
|
||||
export MAX_MEM=3072
|
||||
export HTTP_PORT=9588
|
||||
export EDEX_DEBUG_PORT=5011
|
||||
|
||||
export METADATA_POOL_TIMEOUT=60
|
||||
export CLUSTER_ID=NCF
|
||||
|
||||
export CLUSTER_ID=OAX
|
||||
export SOFT_REF_LRU_POLICY_MS_PER_MB=50
|
||||
|
|
|
|||
|
|
@ -24,9 +24,9 @@ ebxml.registry.webserver.port=8082
|
|||
# ebxml thrift service port
|
||||
ebxml.thrift.service.port=9588
|
||||
# EBXML registry host
|
||||
ebxml.registry.host=localhost
|
||||
ebxml.registry.host=external
|
||||
# NCF HOST
|
||||
ncf.host=165.92.30.69
|
||||
ncf.host=external
|
||||
# EBXML federation enable flag
|
||||
ebxml.registry.federation.enabled=false
|
||||
# EBXML registry webserver home
|
||||
|
|
|
|||
|
|
@ -78,7 +78,6 @@ import com.raytheon.uf.common.serialization.SerializationException;
|
|||
import com.raytheon.uf.common.status.IUFStatusHandler;
|
||||
import com.raytheon.uf.common.status.UFStatus;
|
||||
import com.raytheon.uf.common.time.util.TimeUtil;
|
||||
import com.raytheon.uf.common.util.ClusterIdUtil;
|
||||
import com.raytheon.uf.common.util.StringUtil;
|
||||
import com.raytheon.uf.edex.core.EDEXUtil;
|
||||
import com.raytheon.uf.edex.database.DataAccessLayerException;
|
||||
|
|
@ -202,6 +201,7 @@ import oasis.names.tc.ebxml.regrep.xsd.rs.v4.RegistryRequestType;
|
|||
* Sep 01, 2016 5810 tjensen Added improved logging messages
|
||||
* Sep 22, 2016 5762 tjensen Harden replication code
|
||||
* Oct 04, 2016 5762 tjensen Fix connection check
|
||||
* Aug 08, 2018 mjames Standalone Registry Configuration
|
||||
*
|
||||
* </pre>
|
||||
*
|
||||
|
|
@ -850,7 +850,7 @@ public class RegistryFederationManager
|
|||
* duplicate data is not sent again
|
||||
*/
|
||||
restClient.getRegistryFederationManager(remoteRegistryUrl)
|
||||
.updateRegistryEvents(ClusterIdUtil.getId(),
|
||||
.updateRegistryEvents(RegistryIdUtil.getId(),
|
||||
String.valueOf(start));
|
||||
|
||||
syncMsg.append("Registry synchronization using [")
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ package com.raytheon.uf.edex.registry.ebxml.util;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
import com.raytheon.uf.common.util.ClusterIdUtil;
|
||||
import com.raytheon.uf.edex.core.EDEXUtil;
|
||||
import com.raytheon.uf.edex.registry.ebxml.dao.RegistryObjectDao;
|
||||
|
||||
/**
|
||||
|
|
@ -36,6 +36,7 @@ import com.raytheon.uf.edex.registry.ebxml.dao.RegistryObjectDao;
|
|||
* ------------ ---------- ----------- --------------------------
|
||||
* Feb 06, 2014 2771 bgonzale Initial creation
|
||||
* Apr 23, 2014 2992 dhladky General way to get all registries.
|
||||
* Aug 08, 2018 mjames Standalone Registry Configuration
|
||||
*
|
||||
* </pre>
|
||||
*
|
||||
|
|
@ -63,7 +64,7 @@ public class RegistryIdUtil {
|
|||
* @return Registry ID.
|
||||
*/
|
||||
public static String getId() {
|
||||
return ClusterIdUtil.getId();
|
||||
return EDEXUtil.getEdexSite();
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -38,9 +38,6 @@ export JMS_QUEUE_URL=http://${BROKER_HOST}:${BROKER_HTTP}/api/latest/queue/${JMS
|
|||
export JMS_SSL_ENABLED=false
|
||||
export QPID_SSL_CERT_DB=/awips2/edex/conf/jms/auth
|
||||
export QPID_SSL_CERT_NAME=guest
|
||||
export RADAR_HOST=localhost
|
||||
export RADAR_PORT=8813
|
||||
export RADAR_SERVER=tcp://${RADAR_HOST}:${RADAR_PORT}
|
||||
|
||||
# set the AWIPS II shared directory
|
||||
export SHARE_DIR=/awips2/edex/data/share
|
||||
|
|
@ -52,12 +49,4 @@ export TEMP_DIR=/awips2/edex/data/tmp
|
|||
export apps_dir=${SHARE_DIR}/hydroapps
|
||||
# site identifier for hydroapps
|
||||
export SITE_IDENTIFIER=${AW_SITE_IDENTIFIER}
|
||||
|
||||
export AWIPS2_TEMP=/awips2/tmp
|
||||
|
||||
# data delivery config
|
||||
#export CLUSTER_ID=NCF
|
||||
#export DATADELIVERY_HOST=thredds.ucar.edu
|
||||
#export EBXML_REGISTRY_FEDERATION_ENABLED=true
|
||||
#export EBXML_REGISTRY_WEBSERVER_PORT=80
|
||||
#export EBXML_THRIFT_SERVICE_PORT=9588
|
||||
|
|
|
|||
15
install.sh
15
install.sh
|
|
@ -2,15 +2,16 @@
|
|||
# about: AWIPS install manager
|
||||
# devorg: Unidata Program Center
|
||||
# author: <mjames@ucar.edu>
|
||||
# use: ./install.sh (--cave|--edex|--ingest|--help)
|
||||
# use: ./install.sh (--cave|--edex|--database|--ingest|--help)
|
||||
|
||||
dir="$( cd "$(dirname "$0")" ; pwd -P )"
|
||||
|
||||
usage="$(basename "$0") [-h] (--cave|--edex|--ingest) #script to install Unidata AWIPS components.\n
|
||||
usage="$(basename "$0") [-h] (--cave|--edex|--database|--ingest) #script to install Unidata AWIPS components.\n
|
||||
-h, --help show this help text\n
|
||||
--cave install CAVE for x86_64 Linux\n
|
||||
--edex, --server install EDEX Standaone Server for x86_64 Linux\n
|
||||
--ingest install EDEX Ingest Node Server for x86_64 Linux\n"
|
||||
--edex, --server install EDEX Standaone Server x86_64 Linux\n
|
||||
--database install EDEX Request/Database x86_64 Linux\n
|
||||
--ingest install EDEX Ingest Node Server x86_64 Linux\n"
|
||||
|
||||
function stop_edex_services {
|
||||
for srvc in edex_ldm edex_camel qpidd httpd-pypies edex_postgres ; do
|
||||
|
|
@ -64,7 +65,7 @@ function check_edex {
|
|||
rm -rf /awips2/database/data/
|
||||
fi
|
||||
fi
|
||||
for dir in /awips2/tmp /awips2/data_store ; do
|
||||
for dir in /awips2/tmp /awips2/data_store /awips2/crawl; do
|
||||
if [ ! -d $dir ]; then
|
||||
echo "creating $dir"
|
||||
mkdir -p $dir
|
||||
|
|
@ -116,6 +117,10 @@ case $key in
|
|||
server_prep
|
||||
yum groupinstall awips2-server -y 2>&1 | tee -a /tmp/awips-install.log
|
||||
;;
|
||||
--database)
|
||||
server_prep
|
||||
yum groupinstall awips2-database -y 2>&1 | tee -a /tmp/awips-install.log
|
||||
;;
|
||||
--ingest)
|
||||
server_prep
|
||||
yum groupinstall awips2-ingest -y 2>&1 | tee -a /tmp/awips-install.log
|
||||
|
|
|
|||
|
|
@ -27,7 +27,20 @@ prog="start.sh"
|
|||
MEM=( `free -g | grep "Mem:"` )
|
||||
TOTAL_MEM=${MEM[1]}
|
||||
|
||||
SERVICES=( 'request' 'ingest' 'ingestGrib' )
|
||||
if [ -f /etc/rc.d/init.d/edexServiceList ]; then
|
||||
. /etc/rc.d/init.d/edexServiceList
|
||||
else
|
||||
SERVICES=( 'request' 'ingest' 'ingestGrib')
|
||||
fi
|
||||
|
||||
# Available Service Modes
|
||||
# ingest
|
||||
# ingestGrib
|
||||
# ingestDat
|
||||
# request
|
||||
# centralRegistry
|
||||
# ingestHydro
|
||||
# requestHydro
|
||||
|
||||
# Who to run EDEX server as, usually "awips". (NOT "root")
|
||||
export EDEXUSER=awips
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
# qpidd #
|
||||
# edex_ldm #
|
||||
# #
|
||||
# edex log [ingest|request|grib|text|satellite|radar|ldm] #
|
||||
# edex log [ingest|request|grib|text|satellite|radar|ldm|registry] #
|
||||
# Monitors the current day's requested log. Defaults to ingest. #
|
||||
# #
|
||||
# edex setup #
|
||||
|
|
@ -31,6 +31,7 @@
|
|||
# 09/2017 M.James/Unidata Rudimentary remote db password control, #
|
||||
# remove pg_hba.conf edits #
|
||||
# 01/2018 M.James/Unidata Added qpid-stat wrapper as edex qpid #
|
||||
# 08/2018 M.James/Unidata Registry logging #
|
||||
#-----------------------------------------------------------------------#
|
||||
. /etc/profile.d/awips2.sh
|
||||
# directories definitions
|
||||
|
|
@ -115,6 +116,13 @@ edex_status() { # report back edex server on/off status
|
|||
edex_request_pid=`ps aux | grep edex.run.mode=request | awk '{ print $2 }'`
|
||||
echo ' EDEXrequest :: running :: pid '$edex_request_pid''
|
||||
fi
|
||||
edex_reg_ps=`ps aux | grep edex.run.mode=centralRegistry | awk '{ print $15 }'`
|
||||
if [ -z $edex_reg_ps ]; then
|
||||
echo ' EDEXregistry :: not running'
|
||||
else
|
||||
edex_reg_pid=`ps aux | grep edex.run.mode=centralRegistry | awk '{ print $2 }'`
|
||||
echo ' EDEXregistry :: running :: pid '$edex_reg_pid''
|
||||
fi
|
||||
|
||||
if [ -d "/awips2/ldm" ]; then
|
||||
ldmd_ps=`ps aux | grep ldmd | grep -v "grep ldmd" | head -1 | awk '{ print $2 }'`
|
||||
|
|
@ -183,6 +191,13 @@ edex_log() { # display todays log, default to ingest
|
|||
tail_log
|
||||
exit;
|
||||
fi
|
||||
# Registry
|
||||
if [ "${args[1]}" == 'registry' ]; then
|
||||
YMD=`date -u '+%Y%m%d'`
|
||||
LOG_FILE=${LOG_PATH}/edex-centralRegistry-${YMD}.log
|
||||
tail_log
|
||||
exit;
|
||||
fi
|
||||
# OHD
|
||||
if [ "${args[1]}" == 'ohd' ]; then
|
||||
YMD=`date -u '+%Y%m%d'`
|
||||
|
|
@ -212,6 +227,7 @@ edit_setup() {
|
|||
sed -i.setup_$YMD 's/external/'$HOSTNAME'/g' $EDEX_ENV_FILE
|
||||
echo '[edit] '$HOSTNAME' added to '$EDEX_ENV_FILE
|
||||
echo ' File backed up to '$EDEX_ENV_FILE'.setup_'$YMD
|
||||
sed -i 's/external/'$HOSTNAME'/g' /awips2/edex/conf/resources/*
|
||||
}
|
||||
|
||||
edex_edits() {
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@
|
|||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.raytheon.uf.common.status"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.raytheon.uf.viz.core"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.raytheon.uf.common.auth"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.raytheon.uf.common.plugin.nwsauth"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.raytheon.uf.edex.auth"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.raytheon.uf.common.registry.ebxml"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.raytheon.uf.edex.registry.ebxml"/>
|
||||
|
|
@ -55,8 +54,6 @@
|
|||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.raytheon.uf.common.registry.event"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.raytheon.uf.common.stats"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.raytheon.uf.edex.stats"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.raytheon.uf.viz.plugin.nwsauth"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.raytheon.uf.edex.plugin.nwsauth"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/com.raytheon.uf.common.units"/>
|
||||
<classpathentry exported="true" kind="src" path="/com.raytheon.uf.viz.stats"/>
|
||||
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/org.dom4j"/>
|
||||
|
|
|
|||
|
|
@ -1,114 +0,0 @@
|
|||
/**
|
||||
* 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.core.auth;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
import com.raytheon.uf.common.auth.user.IAuthenticationData;
|
||||
import com.raytheon.uf.common.auth.user.IPermission;
|
||||
import com.raytheon.uf.common.auth.user.IRole;
|
||||
import com.raytheon.uf.common.auth.user.IUser;
|
||||
import com.raytheon.uf.common.plugin.nwsauth.user.User;
|
||||
import com.raytheon.uf.viz.core.requests.INotAuthHandler;
|
||||
import com.raytheon.uf.viz.plugin.nwsauth.NwsNotAuthHandler;
|
||||
|
||||
/**
|
||||
* An {@link IUserManagerLoader} that can be used in tests.
|
||||
*
|
||||
* <pre>
|
||||
*
|
||||
* SOFTWARE HISTORY
|
||||
*
|
||||
* Date Ticket# Engineer Description
|
||||
* ------------ ---------- ----------- --------------------------
|
||||
* Jan 04, 2013 1441 djohnson Initial creation
|
||||
*
|
||||
* </pre>
|
||||
*
|
||||
* @author djohnson
|
||||
* @version 1.0
|
||||
*/
|
||||
|
||||
public class TestUserManagerLoader implements IUserManagerLoader {
|
||||
|
||||
public static class TestUserManager implements IUserManager {
|
||||
|
||||
private static final User USER = new User("testuser");
|
||||
|
||||
private static final INotAuthHandler NOT_AUTH_HANDLER = new NwsNotAuthHandler();
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public IUser getUserObject() {
|
||||
return USER;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public void updateUserObject(IUser user, IAuthenticationData authData) {
|
||||
// Currently unused
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public INotAuthHandler getNotAuthHandler() {
|
||||
return NOT_AUTH_HANDLER;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public List<IPermission> getPermissions(String application) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public List<IRole> getRoles(String application) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateUserObject(String userId, IAuthenticationData authData) {
|
||||
// Currently unused
|
||||
}
|
||||
}
|
||||
|
||||
private static final TestUserManager USER_MANAGER = new TestUserManager();
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public IUserManager getUserManager() {
|
||||
return USER_MANAGER;
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Add table
Reference in a new issue