Author: mturk
Date: Sat Jan 8 10:18:38 2011
New Revision: 1056683
URL: http://svn.apache.org/viewvc?rev=1056683&view=rev
Log:
Update version to 1.0.6-dev
Modified:
commons/proper/daemon/trunk/RELEASE-NOTES.txt
commons/proper/daemon/trunk/build.xml
commons/proper/daemon/trunk/pom.xml
commons/proper/daemon/trunk/src/native/unix/CHANGES.txt
commons/proper/daemon/trunk/src/native/unix/native/version.h
commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.h
commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.rc
commons/proper/daemon/trunk/src/native/windows/apps/prunsrv/prunsrv.h
commons/proper/daemon/trunk/src/native/windows/apps/prunsrv/prunsrv.rc
commons/proper/daemon/trunk/src/site/xdoc/download_daemon.xml
Modified: commons/proper/daemon/trunk/RELEASE-NOTES.txt
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/RELEASE-NOTES.txt?rev=1056683&r1=1056682&r2=1056683&view=diff
==============================================================================
--- commons/proper/daemon/trunk/RELEASE-NOTES.txt (original)
+++ commons/proper/daemon/trunk/RELEASE-NOTES.txt Sat Jan 8 10:18:38 2011
@@ -1,7 +1,7 @@
$Id$
Commons Daemon Package
- Version 1.0.5
+ Version 1.0.6
Release Notes
@@ -70,6 +70,8 @@ NEW FEATURES:
BUG FIXES:
+1.0.6:
+
1.0.5: DAEMON-158, DAEMON-187, DAEMON-188, DAEMON-190
1.0.4: DAEMON-95, DAEMON-171, DAEMON-100, DAEMON-164, DAEMON-165, DAEMON-175,
Modified: commons/proper/daemon/trunk/build.xml
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/build.xml?rev=1056683&r1=1056682&r2=1056683&view=diff
==============================================================================
--- commons/proper/daemon/trunk/build.xml (original)
+++ commons/proper/daemon/trunk/build.xml Sat Jan 8 10:18:38 2011
@@ -59,7 +59,7 @@
<property name="component.title" value="Java Daemons"/>
<!-- The current version number of this component -->
- <property name="component.version" value="1.0.5"/>
+ <property name="component.version" value="1.0.6-dev"/>
<!-- The base directory for compilation targets -->
<property name="build.home" value="target"/>
Modified: commons/proper/daemon/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/pom.xml?rev=1056683&r1=1056682&r2=1056683&view=diff
==============================================================================
--- commons/proper/daemon/trunk/pom.xml (original)
+++ commons/proper/daemon/trunk/pom.xml Sat Jan 8 10:18:38 2011
@@ -27,7 +27,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>commons-daemon</groupId>
<artifactId>commons-daemon</artifactId>
- <version>1.0.5</version>
+ <version>1.0.6-dev</version>
<name>Commons Daemon</name>
<!-- Daemon started in Commons in 2002 with an import of code from Tomcat,
which is why the NOTICE file has an earlier date than the inceptionYear
-->
@@ -92,7 +92,7 @@
<maven.compile.source>1.3</maven.compile.source>
<maven.compile.target>1.3</maven.compile.target>
<commons.componentid>daemon</commons.componentid>
- <commons.release.version>1.0.5</commons.release.version>
+ <commons.release.version>1.0.6-dev</commons.release.version>
<commons.jira.id>DAEMON</commons.jira.id>
<commons.jira.pid>12310468</commons.jira.pid>
</properties>
Modified: commons/proper/daemon/trunk/src/native/unix/CHANGES.txt
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/unix/CHANGES.txt?rev=1056683&r1=1056682&r2=1056683&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/unix/CHANGES.txt (original)
+++ commons/proper/daemon/trunk/src/native/unix/CHANGES.txt Sat Jan 8 10:18:38
2011
@@ -1,6 +1,9 @@
APACHE COMMONS DAEMON (UNIX) CHANGELOG:
Last modified at [$Date$]
+Changes with 1.0.6
+
+
Changes with 1.0.5
Modified: commons/proper/daemon/trunk/src/native/unix/native/version.h
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/unix/native/version.h?rev=1056683&r1=1056682&r2=1056683&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/unix/native/version.h (original)
+++ commons/proper/daemon/trunk/src/native/unix/native/version.h Sat Jan 8
10:18:38 2011
@@ -31,13 +31,13 @@
#define JSVC_MINOR_VERSION 0
/** patch level */
-#define JSVC_PATCH_VERSION 5
+#define JSVC_PATCH_VERSION 6
/**
* This symbol is defined for internal, "development" copies of JSVC.
* This symbol will be #undef'd for releases.
*/
-#define JSVC_IS_DEV_VERSION 0
+#define JSVC_IS_DEV_VERSION 1
/** Properly quote a value as a string in the C preprocessor */
#define JSVC_STRINGIFY(n) JSVC_STRINGIFY_HELPER(n)
Modified: commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.h
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.h?rev=1056683&r1=1056682&r2=1056683&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.h
(original)
+++ commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.h Sat
Jan 8 10:18:38 2011
@@ -24,7 +24,7 @@
#define _PRUNMGR_H
#undef PRG_VERSION
-#define PRG_VERSION "1.0.5.0"
+#define PRG_VERSION "1.0.6.0"
#define PRG_REGROOT L"Apache Software Foundation\\Procrun 2.0"
#define IDM_TM_EXIT 2000
Modified: commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.rc
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.rc?rev=1056683&r1=1056682&r2=1056683&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.rc
(original)
+++ commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/prunmgr.rc Sat
Jan 8 10:18:38 2011
@@ -228,7 +228,7 @@ END
STRINGTABLE
BEGIN
IDS_APPLICATION RSTR_PSM
- IDS_APPVERSION "Version 1.0.5"
+ IDS_APPVERSION "Version 1.0.6-dev"
IDS_APPFULLNAME RSTR_PSM " Version " PRG_VERSION
IDS_APPCOPYRIGHT "Copyright (c) 2000-2011 The Apache Software
Foundation"
IDS_APPDESCRIPTION "Apache Commons Daemon Service Management Tool"
@@ -259,8 +259,8 @@ BEGIN
END
1 VERSIONINFO
- FILEVERSION 1,0,5,0
- PRODUCTVERSION 1,0,5,0
+ FILEVERSION 1,0,6,0
+ PRODUCTVERSION 1,0,6,0
FILEFLAGSMASK 0x3fL
#if defined(_DEBUG)
FILEFLAGS 0x03L
Modified: commons/proper/daemon/trunk/src/native/windows/apps/prunsrv/prunsrv.h
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/apps/prunsrv/prunsrv.h?rev=1056683&r1=1056682&r2=1056683&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/windows/apps/prunsrv/prunsrv.h
(original)
+++ commons/proper/daemon/trunk/src/native/windows/apps/prunsrv/prunsrv.h Sat
Jan 8 10:18:38 2011
@@ -25,7 +25,7 @@
#define _PRUNSRV_H
#undef PRG_VERSION
-#define PRG_VERSION "1.0.5.0"
+#define PRG_VERSION "1.0.6.0"
#define PRG_REGROOT L"Apache Software Foundation\\Procrun 2.0"
#endif /* _PRUNSRV_H */
Modified: commons/proper/daemon/trunk/src/native/windows/apps/prunsrv/prunsrv.rc
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/apps/prunsrv/prunsrv.rc?rev=1056683&r1=1056682&r2=1056683&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/windows/apps/prunsrv/prunsrv.rc
(original)
+++ commons/proper/daemon/trunk/src/native/windows/apps/prunsrv/prunsrv.rc Sat
Jan 8 10:18:38 2011
@@ -22,8 +22,8 @@
IDI_MAINICON ICON "../../resources/procrunw.ico"
1 VERSIONINFO
- FILEVERSION 1,0,5,0
- PRODUCTVERSION 1,0,5,0
+ FILEVERSION 1,0,6,0
+ PRODUCTVERSION 1,0,6,0
FILEFLAGSMASK 0x3fL
#if defined(_DEBUG)
FILEFLAGS 0x03L
Modified: commons/proper/daemon/trunk/src/site/xdoc/download_daemon.xml
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/site/xdoc/download_daemon.xml?rev=1056683&r1=1056682&r2=1056683&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/site/xdoc/download_daemon.xml (original)
+++ commons/proper/daemon/trunk/src/site/xdoc/download_daemon.xml Sat Jan 8
10:18:38 2011
@@ -95,21 +95,21 @@ limitations under the License.
</p>
</subsection>
</section>
- <section name="Commons Daemon 1.0.5 ">
+ <section name="Commons Daemon 1.0.6 ">
<subsection name="Binaries">
<table>
<tr>
- <td><a
href="[preferred]/commons/daemon/binaries/commons-daemon-1.0.5-bin.tar.gz">commons-daemon-1.0.5-bin.tar.gz</a></td>
- <td><a
href="http://www.apache.org/dist/commons/daemon/binaries/commons-daemon-1.0.5-bin.tar.gz.md5">md5</a></td>
- <td><a
href="http://www.apache.org/dist/commons/daemon/binaries/commons-daemon-1.0.5-bin.tar.gz.asc">pgp</a></td>
+ <td><a
href="[preferred]/commons/daemon/binaries/commons-daemon-1.0.6-bin.tar.gz">commons-daemon-1.0.6-bin.tar.gz</a></td>
+ <td><a
href="http://www.apache.org/dist/commons/daemon/binaries/commons-daemon-1.0.6-bin.tar.gz.md5">md5</a></td>
+ <td><a
href="http://www.apache.org/dist/commons/daemon/binaries/commons-daemon-1.0.6-bin.tar.gz.asc">pgp</a></td>
</tr>
<tr>
- <td><a
href="[preferred]/commons/daemon/binaries/commons-daemon-1.0.5-bin.zip">commons-daemon-1.0.5-bin.zip</a></td>
- <td><a
href="http://www.apache.org/dist/commons/daemon/binaries/commons-daemon-1.0.5-bin.zip.md5">md5</a></td>
- <td><a
href="http://www.apache.org/dist/commons/daemon/binaries/commons-daemon-1.0.5-bin.zip.asc">pgp</a></td>
+ <td><a
href="[preferred]/commons/daemon/binaries/commons-daemon-1.0.6-bin.zip">commons-daemon-1.0.6-bin.zip</a></td>
+ <td><a
href="http://www.apache.org/dist/commons/daemon/binaries/commons-daemon-1.0.6-bin.zip.md5">md5</a></td>
+ <td><a
href="http://www.apache.org/dist/commons/daemon/binaries/commons-daemon-1.0.6-bin.zip.asc">pgp</a></td>
</tr>
<tr>
- <td><a href="[preferred]/commons/daemon/binaries/1.0.5/">Browse
native binaries download area...</a></td>
+ <td><a href="[preferred]/commons/daemon/binaries/1.0.6/">Browse
native binaries download area...</a></td>
<td></td>
<td></td>
</tr>
@@ -118,24 +118,24 @@ limitations under the License.
<subsection name="Source">
<table>
<tr>
- <td><a
href="[preferred]/commons/daemon/source/commons-daemon-1.0.5-src.tar.gz">commons-daemon-1.0.5-src.tar.gz</a></td>
- <td><a
href="http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.0.5-src.tar.gz.md5">md5</a></td>
- <td><a
href="http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.0.5-src.tar.gz.asc">pgp</a></td>
+ <td><a
href="[preferred]/commons/daemon/source/commons-daemon-1.0.6-src.tar.gz">commons-daemon-1.0.6-src.tar.gz</a></td>
+ <td><a
href="http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.0.6-src.tar.gz.md5">md5</a></td>
+ <td><a
href="http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.0.6-src.tar.gz.asc">pgp</a></td>
</tr>
<tr>
- <td><a
href="[preferred]/commons/daemon/source/commons-daemon-1.0.5-src.zip">commons-daemon-1.0.5-src.zip</a></td>
- <td><a
href="http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.0.5-src.zip.md5">md5</a></td>
- <td><a
href="http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.0.5-src.zip.asc">pgp</a></td>
+ <td><a
href="[preferred]/commons/daemon/source/commons-daemon-1.0.6-src.zip">commons-daemon-1.0.6-src.zip</a></td>
+ <td><a
href="http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.0.6-src.zip.md5">md5</a></td>
+ <td><a
href="http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.0.6-src.zip.asc">pgp</a></td>
</tr>
<tr>
- <td><a
href="[preferred]/commons/daemon/source/commons-daemon-1.0.5-native-src.tar.gz">commons-daemon-1.0.5-native-src.tar.gz</a></td>
- <td><a
href="http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.0.5-native-src.tar.gz.md5">md5</a></td>
- <td><a
href="http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.0.5-native-src.tar.gz.asc">pgp</a></td>
+ <td><a
href="[preferred]/commons/daemon/source/commons-daemon-1.0.6-native-src.tar.gz">commons-daemon-1.0.6-native-src.tar.gz</a></td>
+ <td><a
href="http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.0.6-native-src.tar.gz.md5">md5</a></td>
+ <td><a
href="http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.0.6-native-src.tar.gz.asc">pgp</a></td>
</tr>
<tr>
- <td><a
href="[preferred]/commons/daemon/source/commons-daemon-1.0.5-native-src.zip">commons-daemon-1.0.5-native-src.zip</a></td>
- <td><a
href="http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.0.5-native-src.zip.md5">md5</a></td>
- <td><a
href="http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.0.5-native-src.zip.asc">pgp</a></td>
+ <td><a
href="[preferred]/commons/daemon/source/commons-daemon-1.0.6-native-src.zip">commons-daemon-1.0.6-native-src.zip</a></td>
+ <td><a
href="http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.0.6-native-src.zip.md5">md5</a></td>
+ <td><a
href="http://www.apache.org/dist/commons/daemon/source/commons-daemon-1.0.6-native-src.zip.asc">pgp</a></td>
</tr>
</table>
</subsection>