Changeset 1610
- Timestamp:
- 03/11/10 08:19:11 (2 years ago)
- Location:
- trunk
- Files:
-
- 3 modified
-
src/xml/xsl/generate-log-message-info.xsl (modified) (21 diffs)
-
test/java/org/jcoderz/commons/LogFormatterOutputTest.java (modified) (2 diffs)
-
test/xml/app-info-test.xml (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/xml/xsl/generate-log-message-info.xsl
r1292 r1610 214 214 </xsl:call-template> 215 215 </xsl:variable> 216 <xsl:variable name="has-expicit-parameters"><xsl:call-template name="has-expicit-parameters"> 217 <xsl:with-param name="tokens" select="$tokens"/> 218 </xsl:call-template> 219 </xsl:variable> 216 220 package <xsl:value-of select="$package"/>; 217 221 … … 234 238 static final long serialVersionUID = 1L; 235 239 236 <xsl:if test=" normalize-space($tokens)"><xsl:call-template240 <xsl:if test="$has-expicit-parameters != 'false'"><xsl:call-template 237 241 name="exception-clazz-member-list"> 238 242 <xsl:with-param name="tokens" select="$tokens"/></xsl:call-template></xsl:if> … … 245 249 * @param cause the cause of this exception. 246 250 */ 247 public <xsl:value-of select="$classname"/> (<xsl:if 248 test="normalize-space($tokens)"><xsl:call-template name="inner-clazz-log-parameter-list"> 249 <xsl:with-param name="tokens" select="$tokens"/> 250 </xsl:call-template> 251 ,</xsl:if> Throwable cause) 251 public <xsl:value-of select="$classname"/> (<xsl:call-template name="inner-clazz-log-parameter-list"> 252 <xsl:with-param name="tokens" select="concat($tokens, $DEFAULT_STRING_SEPARATOR, 'Throwable:cause')"/> 253 </xsl:call-template>) 252 254 { 253 255 super(<xsl:value-of select="$group-classname"/>.<xsl:value-of select="$constant-name"/>, cause); 254 <xsl:if test=" normalize-space($tokens)">256 <xsl:if test="$has-expicit-parameters != 'false'"> 255 257 <xsl:call-template name="exception-clazz-member-init"> 256 258 <xsl:with-param name="tokens" select="$tokens"/> … … 276 278 { 277 279 super(<xsl:value-of select="$group-classname"/>.<xsl:value-of select="$constant-name"/>); 278 <xsl:if test=" normalize-space($tokens)">280 <xsl:if test="$has-expicit-parameters != 'false'"> 279 281 <xsl:call-template name="exception-clazz-member-init"> 280 282 <xsl:with-param name="tokens" select="$tokens"/> … … 667 669 select="$groupNameAbbr"/>_<xsl:value-of 668 670 select="$message/@name"/></xsl:variable> 671 <xsl:variable name="has-expicit-parameters"><xsl:call-template name="has-expicit-parameters"> 672 <xsl:with-param name="tokens" select="$tokens"/> 673 </xsl:call-template></xsl:variable> 674 669 675 /** 670 676 * The unique symbolic String of the log message … … 753 759 <xsl:when test="normalize-space($tokens)"> 754 760 addParameters(new <xsl:value-of select="$log-event-class"/>(<xsl:value-of 755 select="$constant"/><xsl:if test="$isAudit">, auditPrincipal</xsl:if>) ,761 select="$constant"/><xsl:if test="$isAudit">, auditPrincipal</xsl:if>) 756 762 <xsl:call-template 757 763 name="inner-clazz-log-parameter-call"> 758 764 <xsl:with-param name="tokens" select="$tokens"/> 759 <xsl:with-param name="is Audit" select="$isAudit"/>765 <xsl:with-param name="isFirst" select="false()"/> 760 766 </xsl:call-template>).log();</xsl:when> 761 767 <xsl:otherwise> … … 776 782 public static void log (<xsl:call-template 777 783 name="inner-clazz-log-parameter-list"> 778 <xsl:with-param name="tokens" select="$tokens"/> 779 <xsl:with-param name="isAudit" select="$isAudit"/> 780 </xsl:call-template><xsl:if test="$isAudit or normalize-space($tokens)">,</xsl:if> 781 Throwable cause 784 <xsl:with-param name="tokens" select="concat($tokens, $DEFAULT_STRING_SEPARATOR, 'Throwable:cause')"/> 785 <xsl:with-param name="isAudit" select="$isAudit"/></xsl:call-template> 782 786 ) 783 787 {<xsl:choose> 784 788 <xsl:when test="normalize-space($tokens)"> 785 addParameters(new <xsl:value-of select="$log-event-class"/>(<xsl:value-of select="$constant"/><xsl:if test="$isAudit">, auditPrincipal</xsl:if>, cause),786 <xsl:call-template789 addParameters(new <xsl:value-of select="$log-event-class"/>(<xsl:value-of 790 select="$constant"/><xsl:if test="$isAudit">, auditPrincipal</xsl:if>, cause)<xsl:call-template 787 791 name="inner-clazz-log-parameter-call"> 788 792 <xsl:with-param name="tokens" select="$tokens"/> 789 <xsl:with-param name="is Audit" select="$isAudit"/>793 <xsl:with-param name="isFirst" select="false()"/> 790 794 </xsl:call-template>).log();</xsl:when> 791 795 <xsl:otherwise> … … 806 810 </xsl:call-template> 807 811 */ 808 public static void log (<xsl:value-of select="$custom-logger-class"/> logger<xsl:if 809 test="$isAudit or normalize-space($tokens)">, <xsl:call-template 812 public static void log (<xsl:value-of select="$custom-logger-class"/> logger<xsl:call-template 810 813 name="inner-clazz-log-parameter-list"> 811 814 <xsl:with-param name="tokens" select="$tokens"/> 812 815 <xsl:with-param name="isAudit" select="$isAudit"/> 813 </xsl:call-template></xsl:if>) 816 <xsl:with-param name="isFirst" select="false()"/> 817 </xsl:call-template>) 814 818 { 815 819 final <xsl:value-of select="$log-event-class"/> logEvent 816 820 = new <xsl:value-of select="$log-event-class"/>(<xsl:value-of 817 821 select="$constant"/><xsl:if test="$isAudit">, auditPrincipal</xsl:if>); 818 <xsl:if test="normalize-space($tokens)"> 822 <xsl:if test="$has-expicit-parameters != 'false'"> 823 addParameters(logEvent 824 <xsl:call-template 825 name="inner-clazz-log-parameter-call"> 826 <xsl:with-param name="tokens" select="$tokens"/> 827 <xsl:with-param name="isFirst" select="false()"/> 828 </xsl:call-template>); 829 </xsl:if> 830 831 logger.logp(<xsl:value-of select="$constant"/>.getLogLevel(), 832 <xsl:if test="$custom-logger-class != 'java.util.logging.Logger'"> 833 <xsl:value-of select="$constant"/>.getSymbol(),</xsl:if> 834 logEvent.getSourceClass(), 835 logEvent.getSourceMethod(), <xsl:if test="$custom-logger-class = 'java.util.logging.Logger'"> 836 <xsl:value-of select="$constant"/>.getSymbol() + "|" + </xsl:if> 837 logEvent.getTrackingNumber() + "|" + logEvent.getMessage(), 838 (Object) logEvent); 839 } 840 841 /** 842 * Logs the message 843 * <tt>"<xsl:value-of select="normalize-space($message/text)"/>"</tt> 844 * with the given parameters to the custom logger. 845 * @param logger the custom logger to log to.<xsl:call-template 846 name="inner-clazz-log-parameter-javadoc"> 847 <xsl:with-param name="tokens" select="$tokens"/> 848 <xsl:with-param name="isAudit" select="$isAudit"/> 849 </xsl:call-template> 850 * @param cause the Throwable that causes this message to be logged. 851 */ 852 public static void log (<xsl:value-of select="$custom-logger-class"/> logger<xsl:call-template 853 name="inner-clazz-log-parameter-list"> 854 <xsl:with-param name="tokens" select="concat($tokens, $DEFAULT_STRING_SEPARATOR, 'Throwable:cause')"/> 855 <xsl:with-param name="isAudit" select="$isAudit"/> 856 <xsl:with-param name="isFirst" select="false()"/> 857 </xsl:call-template> 858 ) 859 { 860 final <xsl:value-of select="$log-event-class"/> logEvent 861 = new <xsl:value-of select="$log-event-class"/>(<xsl:value-of 862 select="$constant"/><xsl:if test="$isAudit">, auditPrincipal</xsl:if>, 863 cause); 864 <xsl:if test="$has-expicit-parameters != 'false'"> 819 865 addParameters(logEvent, 820 866 <xsl:call-template … … 835 881 } 836 882 837 /**838 * Logs the message839 * <tt>"<xsl:value-of select="normalize-space($message/text)"/>"</tt>840 * with the given parameters to the custom logger.841 * @param logger the custom logger to log to.<xsl:call-template842 name="inner-clazz-log-parameter-javadoc">843 <xsl:with-param name="tokens" select="$tokens"/>844 <xsl:with-param name="isAudit" select="$isAudit"/>845 </xsl:call-template>846 * @param cause the Throwable that causes this message to be logged.847 */848 public static void log (<xsl:value-of select="$custom-logger-class"/> logger<xsl:if849 test="$isAudit or normalize-space($tokens)">, <xsl:call-template850 name="inner-clazz-log-parameter-list">851 <xsl:with-param name="tokens" select="$tokens"/>852 <xsl:with-param name="isAudit" select="$isAudit"/>853 </xsl:call-template></xsl:if>,854 Throwable cause855 )856 {857 final <xsl:value-of select="$log-event-class"/> logEvent858 = new <xsl:value-of select="$log-event-class"/>(<xsl:value-of859 select="$constant"/><xsl:if test="$isAudit">, auditPrincipal</xsl:if>,860 cause);861 <xsl:if test="normalize-space($tokens)">862 addParameters(logEvent,863 <xsl:call-template864 name="inner-clazz-log-parameter-call">865 <xsl:with-param name="tokens" select="$tokens"/>866 <xsl:with-param name="isAudit" select="$isAudit"/>867 </xsl:call-template>);868 </xsl:if>869 870 logger.logp(<xsl:value-of select="$constant"/>.getLogLevel(),871 <xsl:if test="$custom-logger-class != 'java.util.logging.Logger'">872 <xsl:value-of select="$constant"/>.getSymbol(),</xsl:if>873 logEvent.getSourceClass(),874 logEvent.getSourceMethod(), <xsl:if test="$custom-logger-class = 'java.util.logging.Logger'">875 <xsl:value-of select="$constant"/>.getSymbol() + "|" + </xsl:if>876 logEvent.getTrackingNumber() + "|" + logEvent.getMessage(),877 (Object) logEvent);878 }879 880 883 </xsl:if> 881 884 … … 952 955 * @return the given initialized <tt>loggable</tt>. 953 956 */ 954 public static Loggable addParameters (Loggable loggable<xsl: if955 test="normalize-space($tokens)">,</xsl:if> <xsl:call-template956 name="inner-clazz-log-parameter-list">957 <xsl:with-param name=" tokens" select="$tokens"/>957 public static Loggable addParameters (Loggable loggable<xsl:call-template 958 name="inner-clazz-log-parameter-list-sub"> 959 <xsl:with-param name="tokens" select="$tokens"/> 960 <xsl:with-param name="isFirst" select="false()"/> 958 961 </xsl:call-template>) 959 962 {<xsl:call-template … … 1022 1025 <xsl:param name="tokens" select="''"/> 1023 1026 <xsl:param name="isAudit" select="false()"/> 1027 <xsl:param name="isFirst" select="true()"/> 1028 1029 <xsl:if test="$isAudit"><xsl:if test="not($isFirst)">, </xsl:if> 1030 AuditPrincipal auditPrincipal</xsl:if> 1031 <xsl:call-template name="inner-clazz-log-parameter-list-sub"> 1032 <xsl:with-param name="tokens" select="$tokens"/> 1033 <xsl:with-param name="isFirst" select="not($isAudit) and $isFirst"/> 1034 </xsl:call-template> 1035 </xsl:template> 1036 <xsl:template name="inner-clazz-log-parameter-list-sub"> 1037 <xsl:param name="tokens" select="''"/> 1038 <xsl:param name="isFirst"/> 1024 1039 <xsl:variable name="type-token"> 1025 1040 <xsl:call-template name="string-set-next-token"> … … 1034 1049 </xsl:variable> 1035 1050 <xsl:variable name="type" select="substring-before($type-token, ':')"/> 1036 <xsl:if test="$isAudit"> 1037 AuditPrincipal auditPrincipal</xsl:if> 1038 <xsl:if test="normalize-space($token)"> 1039 <xsl:if test="$isAudit"><xsl:text>,</xsl:text></xsl:if> <!-- comma for AuditPrincipal --> 1040 <xsl:value-of select="$type"/><xsl:text> </xsl:text><xsl:value-of select="$display_token"/><xsl:if 1041 test="contains($tokens, $DEFAULT_STRING_SEPARATOR)"> 1042 <xsl:text>,</xsl:text> 1043 </xsl:if> 1044 <xsl:call-template name="inner-clazz-log-parameter-list"> 1045 <xsl:with-param name="tokens" 1046 select="substring-after($tokens, $DEFAULT_STRING_SEPARATOR)"/> 1047 </xsl:call-template> 1048 </xsl:if> 1051 <xsl:choose> 1052 <xsl:when test="normalize-space($token) and normalize-space($type)"> 1053 <xsl:if test="not($isFirst)"><xsl:text>, </xsl:text></xsl:if> 1054 <xsl:value-of select="$type"/><xsl:text> </xsl:text><xsl:value-of select="$display_token"/> 1055 <xsl:call-template name="inner-clazz-log-parameter-list-sub"> 1056 <xsl:with-param name="tokens" 1057 select="substring-after($tokens, $DEFAULT_STRING_SEPARATOR)"/> 1058 <xsl:with-param name="isFirst" select="false()"/> 1059 </xsl:call-template> 1060 </xsl:when> 1061 <xsl:otherwise> 1062 <xsl:if test="normalize-space($tokens)"> 1063 <xsl:call-template name="inner-clazz-log-parameter-list-sub"> 1064 <xsl:with-param name="tokens" 1065 select="substring-after($tokens, $DEFAULT_STRING_SEPARATOR)"/> 1066 <xsl:with-param name="isFirst" select="$isFirst"/> 1067 </xsl:call-template> 1068 </xsl:if> 1069 </xsl:otherwise> 1070 </xsl:choose> 1071 </xsl:template> 1072 1073 <xsl:template name="has-expicit-parameters"> 1074 <xsl:param name="tokens" select="''"/> 1075 <xsl:variable name="type-token"> 1076 <xsl:call-template name="string-set-next-token"> 1077 <xsl:with-param name="s" select="$tokens"/> 1078 </xsl:call-template> 1079 </xsl:variable> 1080 <xsl:variable name="token" select="substring-after($type-token, ':')"/> 1081 <xsl:variable name="type" select="substring-before($type-token, ':')"/> 1082 <xsl:choose> 1083 <xsl:when test="normalize-space($token) and normalize-space($type)">true</xsl:when> 1084 <xsl:when test="normalize-space($tokens)"> 1085 <xsl:call-template name="has-expicit-parameters"> 1086 <xsl:with-param name="tokens" 1087 select="substring-after($tokens, $DEFAULT_STRING_SEPARATOR)"/> 1088 </xsl:call-template> 1089 </xsl:when> 1090 <xsl:otherwise>false</xsl:otherwise> 1091 </xsl:choose> 1049 1092 </xsl:template> 1050 1093 … … 1064 1107 </xsl:variable> 1065 1108 <xsl:variable name="type" select="substring-before($type-token, ':')"/> 1066 <xsl:if test="normalize-space($token) ">1109 <xsl:if test="normalize-space($token) and normalize-space($type)"> 1067 1110 private final <xsl:value-of select="$type"/><xsl:text> </xsl:text><xsl:value-of select="$display_token"/>; 1068 1111 <xsl:call-template name="exception-clazz-member-list"> … … 1094 1137 </xsl:variable> 1095 1138 <xsl:variable name="type" select="substring-before($type-token, ':')"/> 1096 <xsl:if test="normalize-space($token) ">1139 <xsl:if test="normalize-space($token) and normalize-space($type)"> 1097 1140 <xsl:value-of select="$member_token"/> = <xsl:choose><xsl:when 1098 1141 test="$with = 'param'"><xsl:value-of select="$display_token"/></xsl:when> … … 1131 1174 </xsl:variable> 1132 1175 <xsl:variable name="type" select="substring-before($type-token, ':')"/> 1133 <xsl:if test="normalize-space($token) ">1176 <xsl:if test="normalize-space($token) and normalize-space($type)"> 1134 1177 /** 1135 1178 * Returns the value of the parameter <tt><xsl:value-of select="$display_token"/></tt>. … … 1158 1201 </xsl:variable> 1159 1202 <xsl:variable name="token" select="substring-after($type-token, ':')"/> 1203 <xsl:variable name="type" select="substring-before($type-token, ':')"/> 1160 1204 <xsl:variable name="display_token"> 1161 1205 <xsl:call-template name="asJavaParameter"> … … 1172 1216 * log event. 1173 1217 </xsl:if> 1174 <xsl:if test="normalize-space($token) ">1218 <xsl:if test="normalize-space($token) and normalize-space($type)"> 1175 1219 * @param <xsl:value-of select="$display_token"/> The <xsl:value-of 1176 1220 select="$display_text"/> used in the message.<xsl:call-template … … 1185 1229 <xsl:template name="inner-clazz-log-parameter-call"> 1186 1230 <xsl:param name="tokens" select="''"/> 1231 <xsl:param name="isFirst" select="true()"/> 1187 1232 <xsl:variable name="type-token"> 1188 1233 <xsl:call-template name="string-set-next-token"> … … 1191 1236 </xsl:variable> 1192 1237 <xsl:variable name="token" select="substring-after($type-token, ':')"/> 1238 <xsl:variable name="type" select="substring-before($type-token, ':')"/> 1193 1239 <xsl:variable name="display_token"> 1194 1240 <xsl:call-template name="asJavaParameter"> … … 1196 1242 </xsl:call-template> 1197 1243 </xsl:variable> 1198 <xsl:if test="normalize-space($token)"> 1199 <xsl:value-of select="$display_token"/><xsl:if 1200 test="contains($tokens, $DEFAULT_STRING_SEPARATOR)"> 1201 <xsl:text>, </xsl:text> 1202 </xsl:if> 1203 <xsl:call-template name="inner-clazz-log-parameter-call"> 1204 <xsl:with-param name="tokens" 1205 select="substring-after($tokens, $DEFAULT_STRING_SEPARATOR)"/> 1206 </xsl:call-template> 1207 </xsl:if> 1244 <xsl:choose> 1245 <xsl:when test="normalize-space($token) and normalize-space($type)"> 1246 <xsl:if test="not($isFirst)"><xsl:text>, </xsl:text> 1247 </xsl:if><xsl:value-of select="$display_token"/> 1248 <xsl:call-template name="inner-clazz-log-parameter-call"> 1249 <xsl:with-param name="tokens" 1250 select="substring-after($tokens, $DEFAULT_STRING_SEPARATOR)"/> 1251 <xsl:with-param name="isFirst" select="false()"/> 1252 </xsl:call-template> 1253 </xsl:when> 1254 <xsl:otherwise> 1255 <xsl:if test="$tokens"> 1256 <xsl:call-template name="inner-clazz-log-parameter-call"> 1257 <xsl:with-param name="tokens" 1258 select="substring-after($tokens, $DEFAULT_STRING_SEPARATOR)"/> 1259 <xsl:with-param name="isFirst" select="$isFirst"/> 1260 </xsl:call-template> 1261 </xsl:if> 1262 </xsl:otherwise> 1263 </xsl:choose> 1208 1264 </xsl:template> 1209 1265 … … 1216 1272 </xsl:variable> 1217 1273 <xsl:variable name="token" select="substring-after($type-token, ':')"/> 1218 <xsl:if test="normalize-space($token)"> 1274 <xsl:variable name="type" select="substring-before($type-token, ':')"/> 1275 <xsl:if test="normalize-space($token) and normalize-space($type)"> 1219 1276 <xsl:variable name="display_token"> 1220 1277 <xsl:call-template name="asJavaParameter"> -
trunk/test/java/org/jcoderz/commons/LogFormatterOutputTest.java
r1011 r1610 36 36 import java.util.logging.Logger; 37 37 import junit.framework.TestCase; 38 39 import org.jcoderz.commons.test.TssLogMessage; 38 40 import org.jcoderz.commons.types.Date; 39 41 import org.xml.sax.SAXException; … … 60 62 { 61 63 TstLogMessage.TestMessage.log("foo", Date.now().toUtilDate()); 64 } 65 66 /** 67 * Produces a log message from an exception w/ two parameters. 68 */ 69 public void testLogEventWithImpliedParams () 70 { 71 TssLogMessage.ImpliedParametersLog.log(new RuntimeException("Foo!")); 62 72 } 63 73 -
trunk/test/xml/app-info-test.xml
r1011 r1610 23 23 </description> 24 24 </message> 25 <message id="4" name="IMPLIED_PARAMETERS" 26 level="INFO" 27 base-exception="org.jcoderz.commons.test.TestServiceRuntimeException"> 28 <text>This error has the id {:_TRACKING_NUMBER} occured on 29 Thread {:_THREAD_ID} named {:_THREAD_NAME}. Please note that the 30 nested exception was {:_CAUSE}.</text> 31 <description> 32 Not real fun! 33 </description> 34 </message> 35 <message id="5" name="IMPLIED_PARAMETERS_LOG" 36 level="INFO"> 37 <text>This error has the id {:_TRACKING_NUMBER} occured on 38 Thread {:_THREAD_ID} named {:_THREAD_NAME}. Please note that the 39 nested exception was {:_CAUSE}.</text> 40 <description> 41 Not real fun! 42 </description> 43 </message> 44 <message id="6" name="IMPLIED_PARAMETERS2" 45 level="INFO" 46 base-exception="org.jcoderz.commons.test.TestServiceRuntimeException"> 47 <text>{TEST} This error has the id {:_TRACKING_NUMBER} occured on 48 Thread {:_THREAD_ID} named {:_THREAD_NAME}. Please note that the 49 nested exception was {:_CAUSE}.</text> 50 <description> 51 Not real fun! 52 </description> 53 </message> 54 <message id="7" name="IMPLIED_PARAMETERS_LOG2" 55 level="INFO"> 56 <text>{TEST} This error has the id {:_TRACKING_NUMBER} occured on 57 Thread {:_THREAD_ID} named {:_THREAD_NAME}. Please note that the 58 nested exception was {:_CAUSE}.</text> 59 <description> 60 Not real fun! 61 </description> 62 </message> 63 <message id="8" name="IMPLIED_PARAMETERS3" 64 level="INFO" 65 base-exception="org.jcoderz.commons.test.TestServiceRuntimeException"> 66 <text>This error has the id {:_TRACKING_NUMBER} occured on 67 Thread {:_THREAD_ID} named {:_THREAD_NAME}. Please note that the 68 nested exception was {:_CAUSE}. {TEST}</text> 69 <description> 70 Not real fun! 71 </description> 72 </message> 73 <message id="9" name="IMPLIED_PARAMETERS_LOG3" 74 level="INFO"> 75 <text>This error has the id {:_TRACKING_NUMBER} occured on 76 Thread {:_THREAD_ID} named {:_THREAD_NAME}. Please note that the 77 nested exception was {:_CAUSE}.{TEST}</text> 78 <description> 79 Not real fun! 80 </description> 81 </message> 25 82 </group> 26 83 </application>
