August 2009 - jbossnative-commits

JBoss Native SVN: r2546 - trunk/utils/windows/native/service/jbosssvc.

by jbossnative-commits＠lists.jboss.org

Author: mladen.turk(a)jboss.com Date: 2009-08-18 09:51:51 -0400 (Tue, 18 Aug 2009) New Revision: 2546 Modified: trunk/utils/windows/native/service/jbosssvc/jboss.c Log: Remove extra message Modified: trunk/utils/windows/native/service/jbosssvc/jboss.c =================================================================== --- trunk/utils/windows/native/service/jbosssvc/jboss.c 2009-08-18 13:50:58 UTC (rev 2545) +++ trunk/utils/windows/native/service/jbosssvc/jboss.c 2009-08-18 13:51:51 UTC (rev 2546) @@ -1130,6 +1130,5 @@ cleanup: if (_service_run_event != NULL) CloseHandle(_service_run_event); - AddToMessageLog(FALSE, "JBosssvc finished"); ExitProcess(rv); }

15 years, 4 months

1
0
0 / 0

JBoss Native SVN: r2545 - tags/jbosssvc/2.0.7/jbosssvc.

by jbossnative-commits＠lists.jboss.org

Author: mladen.turk(a)jboss.com Date: 2009-08-18 09:50:58 -0400 (Tue, 18 Aug 2009) New Revision: 2545 Modified: tags/jbosssvc/2.0.7/jbosssvc/jboss.c Log: Remove extra message Modified: tags/jbosssvc/2.0.7/jbosssvc/jboss.c =================================================================== --- tags/jbosssvc/2.0.7/jbosssvc/jboss.c 2009-08-18 13:39:16 UTC (rev 2544) +++ tags/jbosssvc/2.0.7/jbosssvc/jboss.c 2009-08-18 13:50:58 UTC (rev 2545) @@ -1130,6 +1130,5 @@ cleanup: if (_service_run_event != NULL) CloseHandle(_service_run_event); - AddToMessageLog(FALSE, "JBosssvc finished"); ExitProcess(rv); }

15 years, 4 months

1
0
0 / 0

JBoss Native SVN: r2544 - tags/jbosssvc.

by jbossnative-commits＠lists.jboss.org

Author: mladen.turk(a)jboss.com Date: 2009-08-18 09:39:16 -0400 (Tue, 18 Aug 2009) New Revision: 2544 Added: tags/jbosssvc/2.0.7/ Log: New jbosssvc tag Copied: tags/jbosssvc/2.0.7 (from rev 2543, trunk/utils/windows/native/service)

15 years, 4 months

1
0
0 / 0

JBoss Native SVN: r2543 - trunk/utils/windows/native/service/jbosssvc.

by jbossnative-commits＠lists.jboss.org

Author: mladen.turk(a)jboss.com Date: 2009-08-18 09:36:15 -0400 (Tue, 18 Aug 2009) New Revision: 2543 Added: trunk/utils/windows/native/service/jbosssvc/redhat.ico Modified: trunk/utils/windows/native/service/jbosssvc/jboss.c trunk/utils/windows/native/service/jbosssvc/jboss.rc Log: Be verbose on service install Modified: trunk/utils/windows/native/service/jbosssvc/jboss.c =================================================================== --- trunk/utils/windows/native/service/jbosssvc/jboss.c 2009-08-12 09:55:59 UTC (rev 2542) +++ trunk/utils/windows/native/service/jbosssvc/jboss.c 2009-08-18 13:36:15 UTC (rev 2543) @@ -116,6 +116,7 @@ static char _service_bat[MAX_PATH + 1]; static char _cmd_exe[MAX_PATH + 1]; static BOOL _service_log = FALSE; +static BOOL _verbose_log = TRUE; static DWORD _service_auto = SERVICE_AUTO_START; enum _service_mode_e { @@ -250,11 +251,6 @@ WORD nStr; va_list args; - if (!_service_log && !isError) { - /* Nothing to log */ - return; - } - va_start(args, szFormat); vsprintf(szMsg, szFormat, args); va_end(args); @@ -263,12 +259,12 @@ nStr = 2; wErrType = EVENTLOG_ERROR_TYPE; dwErrId = MSG_ERROR; - FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | - FORMAT_MESSAGE_FROM_SYSTEM | - FORMAT_MESSAGE_IGNORE_INSERTS, - NULL, GetLastError(), - MAKELANGID(LANG_NEUTRAL, LANG_NEUTRAL), - (LPSTR) &lpMsgBuf, 0, NULL); + FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, GetLastError(), + MAKELANGID(LANG_NEUTRAL, LANG_NEUTRAL), + (LPSTR) &lpMsgBuf, 0, NULL); lpszStrings[0] = lpMsgBuf; lpszStrings[1] = szMsg; } @@ -278,22 +274,36 @@ nStr = 1; lpszStrings[0] = szMsg; } - /* Use event logging to log the error. - */ - hEventSource = RegisterEventSource(NULL, _service_name); + if (_service_log) { + /* Use event logging to log the error. + */ + hEventSource = RegisterEventSource(NULL, _service_name); - if (hEventSource != NULL) { - ReportEvent(hEventSource, // handle of event source - wErrType, // event type - 0, // event category - dwErrId, // event ID - NULL, // current user's SID - nStr, // strings in lpszStrings - 0, // no bytes of raw data - lpszStrings, // array of error strings - NULL); // no raw data - DeregisterEventSource(hEventSource); + if (hEventSource != NULL) { + ReportEvent(hEventSource, // handle of event source + wErrType, // event type + 0, // event category + dwErrId, // event ID + NULL, // current user's SID + nStr, // strings in lpszStrings + 0, // no bytes of raw data + lpszStrings, // array of error strings + NULL); // no raw data + DeregisterEventSource(hEventSource); + } } + else if (_service_mode != mode_run && _verbose_log) { + /* Use consle as output + */ + if (isError) { + fprintf(stderr, "%s\n%s\n", lpszStrings[1], lpszStrings[0]); + fflush(stderr); + } + else { + fprintf(stdout, "%s\n", lpszStrings[0]); + fflush(stdout); + } + } if (lpMsgBuf) LocalFree(lpMsgBuf); } @@ -1032,6 +1042,9 @@ case 'm': _service_auto = SERVICE_DEMAND_START; break; + case 'q': + _verbose_log = FALSE; + break; default: ErrorUsage(); break; Modified: trunk/utils/windows/native/service/jbosssvc/jboss.rc =================================================================== --- trunk/utils/windows/native/service/jbosssvc/jboss.rc 2009-08-12 09:55:59 UTC (rev 2542) +++ trunk/utils/windows/native/service/jbosssvc/jboss.rc 2009-08-18 13:36:15 UTC (rev 2543) @@ -25,7 +25,7 @@ */ #include <windows.h> -#define STR_COPYRIGHT "Copyright � 2007 Red Hat Middleware, LLC. " \ +#define STR_COPYRIGHT "Copyright � 2009 Red Hat Middleware, LLC. " \ "or its licensors, as applicable." #define STR_LICENSE "Distributable under LGPL license. " \ @@ -34,8 +34,8 @@ #define STR_COMPANY "Red Hat�, Inc." #define STR_TRADEMARK "� Red Hat Inc." #define STR_PRODUCT "JBoss Service wrapper" -#define STR_VERISON "1.2.3.0" -#define CSV_VERISON 1,2,3,0 +#define STR_VERISON "1.2.4.0" +#define CSV_VERISON 1,2,4,0 #define PRIVATE_BUILD 0 #define PRERELEASE_BUILD 0 Added: trunk/utils/windows/native/service/jbosssvc/redhat.ico =================================================================== (Binary files differ) Property changes on: trunk/utils/windows/native/service/jbosssvc/redhat.ico ___________________________________________________________________ Name: svn:mime-type + image/x-icon

15 years, 4 months

1
0
0 / 0

JBoss Native SVN: r2542 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

15 years, 4 months

1
0
0 / 0

JBoss Native SVN: r2541 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-08-12 05:48:06 -0400 (Wed, 12 Aug 2009) New Revision: 2541 Modified: trunk/build/unix/buildsrc.cluster.sh Log: Allow branches to be built. Modified: trunk/build/unix/buildsrc.cluster.sh =================================================================== --- trunk/build/unix/buildsrc.cluster.sh 2009-08-12 08:15:42 UTC (rev 2540) +++ trunk/build/unix/buildsrc.cluster.sh 2009-08-12 09:48:06 UTC (rev 2541) @@ -40,11 +40,17 @@ # we need something like: # http://anonsvn.jboss.org/repos/mod_cluster/trunk/ -if [ "$tag" = "trunk" ]; then - URLBASE=http://anonsvn.jboss.org/repos/mod_cluster/trunk/ -else - URLBASE=http://anonsvn.jboss.org/repos/mod_cluster/tags/${tag} -fi +case $tag in + trunk) + URLBASE=http://anonsvn.jboss.org/repos/mod_cluster/trunk/ + ;; + branches/*) + URLBASE=http://anonsvn.jboss.org/repos/mod_cluster/${tag}/ + ;; + *) + URLBASE=http://anonsvn.jboss.org/repos/mod_cluster/tags/${tag} + ;; +esac (cd $package_src_dir/srclib svn export ${URLBASE} mod_cluster @@ -53,6 +59,11 @@ echo "svn co ${URLBASE} mod_cluster FAILED" exit 1 fi +if [ ! -d $package_src_dir/srclib/mod_cluster ]; then + echo "$package_src_dir/srclib/mod_cluster not found!" + echo "svn co ${URLBASE} mod_cluster FAILED" + exit 1 +fi # # Copy the files to httpd src.

15 years, 4 months

1
0
0 / 0

JBoss Native SVN: r2540 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

15 years, 4 months

1
0
0 / 0

JBoss Native SVN: r2539 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-08-11 02:45:31 -0400 (Tue, 11 Aug 2009) New Revision: 2539 Modified: trunk/build/unix/buildsrc.jboss-native.sh Log: Arrange traces and test. Modified: trunk/build/unix/buildsrc.jboss-native.sh =================================================================== --- trunk/build/unix/buildsrc.jboss-native.sh 2009-08-11 06:30:47 UTC (rev 2538) +++ trunk/build/unix/buildsrc.jboss-native.sh 2009-08-11 06:45:31 UTC (rev 2539) @@ -51,8 +51,8 @@ echo "svn export ${native_tag_opt} failed" exit 1 fi -if [ -d ${native_dist}/srclib/tomcat-native-${native_ext} ]; then - echo "${native_svn}/native ${native_dist}/srclib/tomcat-native-${native_ext} not found" +if [ ! -d ${native_dist}/srclib/tomcat-native-${native_ext} ]; then + echo "${native_dist}/srclib/tomcat-native-${native_ext} not found" echo "svn export ${native_tag_opt} ${native_svn}/native failed" exit 1 fi

15 years, 4 months

1
0
0 / 0

JBoss Native SVN: r2538 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-08-11 02:30:47 -0400 (Tue, 11 Aug 2009) New Revision: 2538 Modified: trunk/build/unix/buildsrc.jboss-native.sh Log: Arrange traces... Modified: trunk/build/unix/buildsrc.jboss-native.sh =================================================================== --- trunk/build/unix/buildsrc.jboss-native.sh 2009-08-10 08:21:18 UTC (rev 2537) +++ trunk/build/unix/buildsrc.jboss-native.sh 2009-08-11 06:30:47 UTC (rev 2538) @@ -52,7 +52,8 @@ exit 1 fi if [ -d ${native_dist}/srclib/tomcat-native-${native_ext} ]; then - echo "svn export ${native_tag_opt} failed not found???" + echo "${native_svn}/native ${native_dist}/srclib/tomcat-native-${native_ext} not found" + echo "svn export ${native_tag_opt} ${native_svn}/native failed" exit 1 fi

15 years, 4 months

1
0
0 / 0

JBoss Native SVN: r2537 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-08-10 04:21:18 -0400 (Mon, 10 Aug 2009) New Revision: 2537 Modified: trunk/build/unix/buildsrc.jboss-native.sh Log: Ajust the location. Modified: trunk/build/unix/buildsrc.jboss-native.sh =================================================================== --- trunk/build/unix/buildsrc.jboss-native.sh 2009-08-07 15:44:40 UTC (rev 2536) +++ trunk/build/unix/buildsrc.jboss-native.sh 2009-08-10 08:21:18 UTC (rev 2537) @@ -38,19 +38,23 @@ native_dist=$2 if [ $native_tag = "trunk" ]; then - native_svn=http://svn.apache.org/repos/asf/tomcat/connectors/trunk + native_svn=http://svn.apache.org/repos/asf/tomcat/native/trunk native_tag_opt="-r HEAD" native_ext=current else # here we convert something like TOMCAT_NATIVE_1_1_11 to 1.1.11 native_ext=`echo ${native_tag} | awk -F _ '{ print $3 "." $4 "." $5 }'` - native_svn=http://svn.apache.org/repos/asf/tomcat/connectors/tags/other/$... + native_svn=http://svn.apache.org/repos/asf/tomcat/native/tags/${native_ta... fi -svn export --native-eol=${NATIVEEOL} ${native_tag_opt} ${native_svn}/jni/native ${native_dist}/srclib/tomcat-native-${native_ext} +svn export --native-eol=${NATIVEEOL} ${native_tag_opt} ${native_svn}/native ${native_dist}/srclib/tomcat-native-${native_ext} if [ $? -ne 0 ]; then echo "svn export ${native_tag_opt} failed" exit 1 fi +if [ -d ${native_dist}/srclib/tomcat-native-${native_ext} ]; then + echo "svn export ${native_tag_opt} failed not found???" + exit 1 +fi # Apply patches $build_top/util/applypatch.sh $build_top ${native_dist}/srclib/tomcat-native-${native_ext} false

15 years, 4 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbossnative-commits August 2009