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

Merge "Omaha #4216 Fixed broken multi WA build, DD request router issue, sbnSIm and request sharing same debug port. Change-Id: Ic35786fbd7205e6f90225a046b2c4226f7c15a59" into omaha_16.2.2

Browse source 
Former-commit-id: a2c36c5200bb8eab848948ee0b20de4d0ce38617
This commit is contained in:
Richard Peter 2015-12-10 12:41:03 -06:00 • committed by Gerrit Code Review
commit 59076ed2d8
6 changed files with 13 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
build/deploy.edex.awips2/esb/etc/registry.sh
View file

@ -30,6 +30,7 @@ export EDEX_DEBUG_PORT=5012
export EDEX_JMX_PORT=1620 export EDEX_JMX_PORT=1620
export LOG_CONF=logback-registry.xml export LOG_CONF=logback-registry.xml
export MGMT_PORT=9605 export MGMT_PORT=9605
export HTTP_PORT=9588
export METADATA_POOL_MAX=20 export METADATA_POOL_MAX=20
export METADATA_POOL_TIMEOUT=60 export METADATA_POOL_TIMEOUT=60

1
build/deploy.edex.awips2/esb/etc/request.sh
View file

@ -33,3 +33,4 @@ export EDEX_DEBUG_PORT=5005
export EDEX_JMX_PORT=1616 export EDEX_JMX_PORT=1616
export LOG_CONF=logback-request.xml export LOG_CONF=logback-request.xml
export MGMT_PORT=9601 export MGMT_PORT=9601
export HTTP_PORT=9581

10
build/deploy.edex.awips2/esb/etc/ebxmlRegistry.sh → build/deploy.edex.awips2/esb/etc/sbnSimulator.sh
View file

@ -22,15 +22,13 @@
export MAX_MEM=1536 # in Meg export MAX_MEM=1536 # in Meg
if [ $HIGH_MEM == "on" ]; then if [ $HIGH_MEM == "on" ]; then
export MAX_MEM=2048 export MAX_MEM=2560
fi fi
export MAX_PERM_SIZE=192m export MAX_PERM_SIZE=192m
export EDEX_DEBUG_PORT=5012 export EDEX_DEBUG_PORT=5013
export EDEX_JMX_PORT=1620 export LOG_CONF=logback-registry.xml
export LOG_CONF=logback-ebxmlRegistry.xml export MGMT_PORT=9606
export MGMT_PORT=9605
export HTTP_PORT=9588
export METADATA_POOL_MAX=20 export METADATA_POOL_MAX=20
export METADATA_POOL_TIMEOUT=60 export METADATA_POOL_TIMEOUT=60

16
build/deploy.edex/DeployESB.groovy
View file

@ -30,6 +30,7 @@ import groovy.util.logging.*
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* Dec 4, 2014 3836 bkowal Initial Commit * Dec 4, 2014 3836 bkowal Initial Commit
* Dec 9, 2015 4216 dhladky Fix multi WA deploys
* *
* </pre> * </pre>
* *
@ -85,22 +86,7 @@ class DeployESB
architecture = architecture =
(System.getProperty("os.arch") == "amd64") ? "x86_64" : "x86" (System.getProperty("os.arch") == "amd64") ? "x86_64" : "x86"
} }
String esbLibIllusionPath = esbDirectory + File.separator + "lib" + File.separator +
"lib_illusion" + File.separator + architecture
if (new File(esbLibIllusionPath).exists() == false)
{
log.log(java.util.logging.Level.SEVERE,
"Unable to find the illusion lib associated with architecture - " + architecture)
System.exit(-1)
}
String libIllusionDestination = edexRootDirectory + File.separator +
"lib" + File.separator + "lib_illusion"
new File(libIllusionDestination).mkdirs()
ant.copy( todir : libIllusionDestination, overwrite : true )
{
fileset( dir : esbLibIllusionPath )
}
} }
public static void deployEdexConfiguration(String edexRootDirectory, String esbDirectory) public static void deployEdexConfiguration(String edexRootDirectory, String esbDirectory)

3
build/deploy.edex/RunDeployInstall.groovy
View file

@ -44,6 +44,7 @@ import IPluginCustomDeployer
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* Dec 4, 2014 3836 bkowal Initial Commit * Dec 4, 2014 3836 bkowal Initial Commit
* Dec 9, 2015 4216 dhladky Fix multi WA deploy
* *
* </pre> * </pre>
* *
@ -124,7 +125,7 @@ class DeployInstall
// complete the esb deployment // complete the esb deployment
// we need to determine the location of the build.edex project // we need to determine the location of the build.edex project
ProjectInformation projectInformation = this.projectInformationMap["build.edex"] ProjectInformation projectInformation = this.projectInformationMap["deploy.edex.awips2"]
if (projectInformation == null) if (projectInformation == null)
{ {
log.log(java.util.logging.Level.SEVERE, log.log(java.util.logging.Level.SEVERE,

2
edexOsgi/com.raytheon.uf.edex.registry.ebxml/resources/com.raytheon.uf.edex.registry.ebxml.properties
View file

@ -20,6 +20,8 @@ ebxml-notification-batch-size=50
ebxml-webserver-max-threads=20 ebxml-webserver-max-threads=20
# EBXML webserver port # EBXML webserver port
ebxml.registry.webserver.port=8082 ebxml.registry.webserver.port=8082
# ebxml thrift service port
ebxml.thrift.service.port=9588
# EBXML registry host # EBXML registry host
ebxml.registry.host=localhost ebxml.registry.host=localhost
# NCF HOST # NCF HOST