BUG#: 7818

TITLE: Set version status for 2.9.0 development

DESCRIPTION: With the branching of CVS for OpenPegasus 2.8, the version status in the main trunk needs to be changed to reflect 2.9 development.

diff --git a/env_var_HPUX.status b/env_var_HPUX.status
index 1f9480d14a4eac76f42971c9234dbfb9bec26cfe..e71600e2db71deb65f60649c9a0c7a075aef1f8b 100644 (file)
--- a/env_var_HPUX.status
+++ b/env_var_HPUX.status
@@ -9,8 +9,8 @@ PEGASUS_ENABLE_MAKE_INSTALL = yes
 
 #PEGASUS_OVERRIDE_PRODUCT_ID=yes
 #PEGASUS_PRODUCT_NAME="OpenPegasus"
-#PEGASUS_PRODUCT_VERSION="2.8.0"
-#PEGASUS_PRODUCT_STATUS=""
+#PEGASUS_PRODUCT_VERSION="2.9.0"
+#PEGASUS_PRODUCT_STATUS="Development"
 
 PEGASUS_STAGING_DIR = $(PEGASUS_HOME)/stagingDir
 

diff --git a/env_var_Linux.status b/env_var_Linux.status
index 9fc97f13be0ccd62f216d7892b6a02525ab9186c..16d02cf4f96a3cf966ba454b35403e7029e3a6c4 100644 (file)
--- a/env_var_Linux.status
+++ b/env_var_Linux.status
@@ -9,9 +9,9 @@ PEGASUS_ENABLE_MAKE_INSTALL = yes
 PEGASUS_OVERRIDE_PRODUCT_ID=yes
 PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS=yes
 PEGASUS_PRODUCT_NAME="OpenPegasus"
-PEGASUS_PRODUCT_VERSION="2.8.0"
+PEGASUS_PRODUCT_VERSION="2.9.0"
 PEGASUS_PACKAGE_VERSION=1
-PEGASUS_PRODUCT_STATUS=""
+PEGASUS_PRODUCT_STATUS="Development"
 
 PAM_CONFIG_DIR=/etc/pam.d
 
@@ -48,7 +48,7 @@ PEGASUS_PROVIDER_LIB_DIR_2 = $(PEGASUS_PROVIDER_DIR_2)/providers
 PEGASUS_PROVIDER_MANAGER_LIB_DIR = $(PEGASUS_PROVIDER_DIR)/providerManagers
 PEGASUS_PROVIDER_MANAGER_LIB_DIR_2 = $(PEGASUS_PROVIDER_DIR_2)/providerManagers
 
-PEGASUS_DOC_DIR = /usr/share/doc/tog-pegasus-2.8
+PEGASUS_DOC_DIR = /usr/share/doc/tog-pegasus-2.9
 PEGASUS_MAN_DIR = /usr/share/man
 PEGASUS_MANUSER_DIR = $(PEGASUS_MAN_DIR)/man1
 PEGASUS_MANADMIN_DIR = $(PEGASUS_MAN_DIR)/man8

diff --git a/rpm/tog-pegasus.spec b/rpm/tog-pegasus.spec
index f3f12ddda5cc3a644b82c17d867bef8d672dbd99..380b8b53d278cb250f34ba0eade224afbf50c428 100644 (file)
--- a/rpm/tog-pegasus.spec
+++ b/rpm/tog-pegasus.spec
@@ -42,7 +42,7 @@
 #
 
 %define packageVersion 1
-Version: 2.8.0
+Version: 2.9.0
 Release: %{packageVersion}%{?LINUX_VERSION:.%{LINUX_VERSION}}
 Epoch:   1
 
@@ -159,7 +159,7 @@ sources.
 %global PEGASUS_REPOSITORY_PARENT_DIR /var/lib/Pegasus
 %global PEGASUS_PREV_REPOSITORY_DIR /var/lib/Pegasus/prev_repository
 %global PEGASUS_SBIN_DIR /usr/sbin
-%global PEGASUS_DOC_DIR /usr/share/doc/tog-pegasus-2.8
+%global PEGASUS_DOC_DIR /usr/share/doc/tog-pegasus-2.9
 
 %global PEGASUS_RPM_ROOT  $RPM_BUILD_DIR/$RPM_PACKAGE_NAME-$RPM_PACKAGE_VERSION
 %global PEGASUS_RPM_HOME %PEGASUS_RPM_ROOT/build
@@ -452,7 +452,7 @@ fi
 /usr/share/Pegasus/mof
 
 %defattr(600,root,pegasus,755)
-%dir /usr/share/doc/tog-pegasus-2.8
+%dir /usr/share/doc/tog-pegasus-2.9
 %dir /usr/share/Pegasus
 %dir /usr/share/Pegasus/scripts
 %dir /var/lib/Pegasus
@@ -488,9 +488,9 @@ fi
 %attr(644,root,pegasus) /usr/share/man/man1/*
 %attr(644,root,pegasus) /usr/share/man/man8/*
 
-%doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.8/Admin_Guide_Release.pdf
-%doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.8/PegasusSSLGuidelines.htm
-%doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.8/license.txt
+%doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.9/Admin_Guide_Release.pdf
+%doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.9/PegasusSSLGuidelines.htm
+%doc %attr(444,root,pegasus) /usr/share/doc/tog-pegasus-2.9/license.txt
 /usr/%PEGASUS_ARCH_LIB/libpegclient.so
 /usr/%PEGASUS_ARCH_LIB/libpegcommon.so
 /usr/%PEGASUS_ARCH_LIB/libpegprovider.so
@@ -506,7 +506,7 @@ fi
 %defattr(644,root,pegasus,755)
 /usr/share/Pegasus/samples
 /usr/include/Pegasus
-/usr/share/doc/tog-pegasus-2.8/*
+/usr/share/doc/tog-pegasus-2.9/*
 /usr/share/Pegasus/html
 
 %if %{PEGASUS_BUILD_TEST_RPM}

diff --git a/src/Clients/cimreparchive/tests/result.master b/src/Clients/cimreparchive/tests/result.master
index e8ba9ae5a463bc328e66e5988112095774c09cb2..a10504436282c01e74c05a0b7a5219792bd23a62 100644 (file)
--- a/src/Clients/cimreparchive/tests/result.master
+++ b/src/Clients/cimreparchive/tests/result.master
@@ -28,6 +28,6 @@ Options:
     --version  - Display CIM Server version number
 
 Show version
-Version 2.8.0
+Version 2.9.0
 Invalid archive file
 Success

diff --git a/src/Clients/cimsub/tests/testscript/result.master b/src/Clients/cimsub/tests/testscript/result.master
index 5f8287f54425e6e0f4b32e3db9fa1fc8b0b8f8ca..be4973e374b193ab9419b48d105c15b0f957d86f 100644 (file)
--- a/src/Clients/cimsub/tests/testscript/result.master
+++ b/src/Clients/cimsub/tests/testscript/result.master
@@ -162,7 +162,7 @@ cimsub: option "-n" was unexpected
 cimsub: Use '--help' to obtain command syntax.
 
 Display version.
-Version 2.8.0
+Version 2.9.0
 
 Unexpected option, combine enable and disable.
 cimsub: option "-e" was unexpected

diff --git a/src/Clients/cimsub/tests/testscript/result.master.nocql b/src/Clients/cimsub/tests/testscript/result.master.nocql
index 9d6b691d3ac401de7489b903778ba06949d9196b..c528d3073757bed6f9479f9db260c2b8a7650296 100644 (file)
--- a/src/Clients/cimsub/tests/testscript/result.master.nocql
+++ b/src/Clients/cimsub/tests/testscript/result.master.nocql
@@ -162,7 +162,7 @@ cimsub: option "-n" was unexpected
 cimsub: Use '--help' to obtain command syntax.
 
 Display version.
-Version 2.8.0
+Version 2.9.0
 
 Unexpected option, combine enable and disable.
 cimsub: option "-e" was unexpected

diff --git a/src/Clients/wbemexec/tests/result.master b/src/Clients/wbemexec/tests/result.master
index 82ed7d4ef0292cbf69a75331413d511885e84f79..fe56370ba1fd87af366cee0ce745c563e55b12cb 100644 (file)
--- a/src/Clients/wbemexec/tests/result.master
+++ b/src/Clients/wbemexec/tests/result.master
@@ -39,7 +39,7 @@ Options :
 Usage note: The wbemexec command requires that the CIM Server is running.
 
  
-Version 2.8.0
+Version 2.9.0
   
 All options specified except hostname
 wbemexec -p5988 -v1.1 -mM-POST -t10000 -u(PEGASUS_TEST_USER_ID) -w(PEGASUS_TEST_USER_PASS) ./cimrequest.xml

diff --git a/src/Clients/wbemexec/tests/result.master.nossl b/src/Clients/wbemexec/tests/result.master.nossl
index a127db9a9a5533bf8fa0f435b77360cc47535c0c..f1de98ce915c433e7c4b422534ddb0cbc1a44655 100644 (file)
--- a/src/Clients/wbemexec/tests/result.master.nossl
+++ b/src/Clients/wbemexec/tests/result.master.nossl
@@ -38,7 +38,7 @@ Options :
 Usage note: The wbemexec command requires that the CIM Server is running.
 
  
-Version 2.8.0
+Version 2.9.0
   
 All options specified except hostname
 wbemexec -p5988 -v1.1 -mM-POST -t10000 -u(PEGASUS_TEST_USER_ID) -w(PEGASUS_TEST_USER_PASS) ./cimrequest.xml

diff --git a/src/Pegasus/Common/PegasusVersion.h b/src/Pegasus/Common/PegasusVersion.h
index c5a2bdbaed534368583b6562382f7dffabc1b96a..c9bdbf40c2604b5d412ddae6f5184753a162699f 100644 (file)
--- a/src/Pegasus/Common/PegasusVersion.h
+++ b/src/Pegasus/Common/PegasusVersion.h
@@ -74,8 +74,8 @@
 
 # define PEGASUS_PRODUCT_NAME    "CIM Server"
 
-# define PEGASUS_PRODUCT_STATUS  ""
-# define PEGASUS_PRODUCT_VERSION "2.8.0"
+# define PEGASUS_PRODUCT_STATUS  "Development"
+# define PEGASUS_PRODUCT_VERSION "2.9.0"
 
 # define PEGASUS_CIMOM_GENERIC_NAME "Pegasus"
 // If the following is non-zero length it becomes SLP description.
@@ -149,6 +149,6 @@ static const char *PLATFORM_EMBEDDED_IDENTIFICATION_STRING =
 // CAUTION: always check whether PEGASUS_VERSION_NUMBER is defined when
 // integrating with versions prior to 2.5.1.
 //
-#define PEGASUS_VERSION_NUMBER 0x02080000
+#define PEGASUS_VERSION_NUMBER 0x02090000
 
 #endif /* Pegasus_Version_h */