diff --git a/doc/sphinx/source/conf.py b/doc/sphinx/source/conf.py index 93fe78a24ff8f4d6b3294fc390a7e33adb4454b2..00c8360c20ebce1f5eefede7951b4f56b45d874b 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.0.0" # The full version, including alpha/beta/rc tags. -release = "dev" +release = "3.0.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 bc57fe63ff26e23f75118d42a5617ed49e5b1694..f59fc7355ae06dc5f334549aadbd105ea64aa5b1 100644 --- a/etc/dm.deploy.conf +++ b/etc/dm.deploy.conf @@ -14,5 +14,5 @@ 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.0.0 diff --git a/src/java/DmWebPortal/nbproject/private/private.xml b/src/java/DmWebPortal/nbproject/private/private.xml index 6807a2ba1902a255b464065dd83188d73fbe6d01..e4ed63dea783aff72aa81718fb38a0066423fe4b 100644 --- a/src/java/DmWebPortal/nbproject/private/private.xml +++ b/src/java/DmWebPortal/nbproject/private/private.xml @@ -2,6 +2,11 @@ <project-private xmlns="http://www.netbeans.org/ns/project-private/1"> <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/> <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2"> - <group/> + <group> + <file>file:/local/sveseli/DM/dm-sv/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/ExperimentStationController.java</file> + <file>file:/local/sveseli/DM/dm-sv/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/StorageController.java</file> + <file>file:/local/sveseli/DM/dm-sv/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/DmEntityController.java</file> + <file>file:/local/sveseli/DM/dm-sv/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/ExperimentTypeController.java</file> + </group> </open-files> </project-private> diff --git a/src/python/dm/__init__.py b/src/python/dm/__init__.py index db502d91775bd8a2868615eccf1f97565b922382..48f377b19c03ca0cfb7badb2956d5a509b2c179d 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.0.0"