diff --git a/doc/sphinx/source/conf.py b/doc/sphinx/source/conf.py index 93fe78a24ff8f4d6b3294fc390a7e33adb4454b2..131923a057ba7882afff40d6647f16e0c66f38ca 100644 --- a/doc/sphinx/source/conf.py +++ b/doc/sphinx/source/conf.py @@ -57,9 +57,9 @@ author = u'APS/SDM' # built documents. # # The short X.Y version. -version = "dev" +version = "3.1.0" # The full version, including alpha/beta/rc tags. -release = "dev" +release = "3.1.0" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/etc/dm.deploy.conf b/etc/dm.deploy.conf index c751829d9e961f90218d93b70375f3ad063b45f7..3b99421ef688553e2904afd364e6a86e6e4d3ee1 100644 --- a/etc/dm.deploy.conf +++ b/etc/dm.deploy.conf @@ -14,7 +14,7 @@ DM_DAQ_WEB_SERVICE_URL=https://DM_HOSTNAME:33336 DM_CAT_WEB_SERVICE_URL=https://DM_HOSTNAME:44436 DM_PROC_WEB_SERVICE_URL=https://DM_HOSTNAME:55536 DM_APS_DB_WEB_SERVICE_URL=https://DM_HOSTNAME:11236 -DM_SOFTWARE_VERSION=dev +DM_SOFTWARE_VERSION=3.1.0 LDAP_SERVER_URL='ldaps://dmid-vm.xray.aps.anl.gov:636' LDAP_DN_FORMAT='uid=%%s,ou=people,o=aps.anl.gov,dc=aps,dc=anl,dc=gov' LDAP_UTIL_ADMIN_DN='uid=DM_SYSTEM_UNIX_ACCOUNT,ou=People,o=aps.anl.gov,dc=aps,dc=anl,dc=gov' diff --git a/src/java/DmWebPortal/nbproject/private/private.properties b/src/java/DmWebPortal/nbproject/private/private.properties index 1501f22e2fd36a8536d26a4e15c3b449ea5576f4..d90194a6ce7e2779d196e4ae1c1d4676e811bea2 100644 --- a/src/java/DmWebPortal/nbproject/private/private.properties +++ b/src/java/DmWebPortal/nbproject/private/private.properties @@ -1,7 +1,2 @@ -deploy.ant.properties.file=/home/oxygen/SVESELI/.netbeans/8.2/config/GlassFishEE6/Properties/gfv3700118484.properties -j2ee.platform.is.jsr109=true -j2ee.server.domain=/local/sveseli/DM/git-support/opt/netbeans/glassfish-4.1.1/glassfish/domains/domain1 -j2ee.server.home=/local/sveseli/DM/git-support/opt/netbeans/glassfish-4.1.1/glassfish -j2ee.server.instance=[/local/sveseli/DM/git-support/opt/netbeans/glassfish-4.1.1/glassfish:/local/sveseli/DM/git-support/opt/netbeans/glassfish-4.1.1/glassfish/domains/domain1]deployer:gfv3ee6wc:localhost:4848 -j2ee.server.middleware=/local/sveseli/DM/git-support/opt/netbeans/glassfish-4.1.1 -user.properties.file=/home/oxygen/SVESELI/.netbeans/8.2/build.properties +j2ee.server.home=/local/sveseli/DM/support/opt/payara/glassfish +j2ee.server.middleware=/local/sveseli/DM/support/opt/payara diff --git a/src/python/dm/__init__.py b/src/python/dm/__init__.py index db502d91775bd8a2868615eccf1f97565b922382..444161a32986b7b3166ddf8eff712a773ac66a5e 100644 --- a/src/python/dm/__init__.py +++ b/src/python/dm/__init__.py @@ -40,5 +40,5 @@ from dm.aps_db_web_service.api.bssApsDbApi import BssApsDbApi from dm.aps_db_web_service.api.esafApsDbApi import EsafApsDbApi from dm.aps_db_web_service.api.serviceMonitorApsDbApi import ServiceMonitorApsDbApi -__version__ = "dev" +__version__ = "3.1.0"