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

Standalone Registry Configuration

Browse source
This commit is contained in:
mjames-upc 2018-08-08 09:30:44 -06:00
parent 41b58b55b5
commit f2a1429cab
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/ebxml/RegistryUtil.java
View file

@ -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.

4
edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/rest/RegistryFederationManager.java
View file

@ -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 [")

5
edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/util/RegistryIdUtil.java
View file

@ -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();
}
/**