Skip to content

Instantly share code, notes, and snippets.

@jarek-przygodzki
Created December 1, 2012 22:01
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save jarek-przygodzki/4185439 to your computer and use it in GitHub Desktop.
Save jarek-przygodzki/4185439 to your computer and use it in GitHub Desktop.
diff -Naur jetm-src-1.2.3\build.properties jetm-modified-src-1.2.3\build.properties
--- jetm-src-1.2.3\build.properties Tue Mar 10 07:17:18 2009
+++ jetm-modified-src-1.2.3\build.properties Sat Dec 01 23:45:56 2012
@@ -1,4 +1,4 @@
-release.version=1.2.3
+release.version=1.2.3.1
release.name=jetm
diff -Naur jetm-src-1.2.3\etc\build\build-contrib.xml jetm-modified-src-1.2.3\etc\build\build-contrib.xml
--- jetm-src-1.2.3\etc\build\build-contrib.xml Sat Dec 01 21:38:04 2012
+++ jetm-modified-src-1.2.3\etc\build\build-contrib.xml Sat Dec 01 21:38:20 2012
@@ -15,7 +15,7 @@
source="1.3"
excludes="**/rrd4j/**"/>
- <antcall target="compile-jdk15-contrib-sources"/>
+ <antcall target="compile-jdk15-contrib-sources" inheritRefs="true" inheritAll="true"/>
<copy todir="${module.contrib.dest.classes}">
diff -Naur jetm-src-1.2.3\modules\jetm-contrib\src\java\etm\contrib\integration\spring\configuration\RuntimeBeanDefinitionParser.java jetm-modified-src-1.2.3\modules\jetm-contrib\src\java\etm\contrib\integration\spring\configuration\RuntimeBeanDefinitionParser.java
--- jetm-src-1.2.3\modules\jetm-contrib\src\java\etm\contrib\integration\spring\configuration\RuntimeBeanDefinitionParser.java Wed Mar 11 10:42:48 2009
+++ jetm-modified-src-1.2.3\modules\jetm-contrib\src\java\etm\contrib\integration\spring\configuration\RuntimeBeanDefinitionParser.java Sat Dec 01 21:33:27 2012
@@ -389,10 +389,10 @@
}
} else if ("sun".equals(aTimer)) {
try {
- Class clazz = Class.forName("etm.core.timer.SunHighResTimer. Please try 'jdk15' or 'default' instead.");
+ Class clazz = Class.forName("etm.core.timer.SunHighResTimer");
builder.addConstructorArg(clazz.newInstance());
} catch (Exception e) {
- throw new FatalBeanException("SunHighResTimer is not available for this platform.", e);
+ throw new FatalBeanException("SunHighResTimer is not available for this platform. Please try 'jdk15' or 'default' instead.", e);
}
} else if ("default".equals(aTimer)) {
builder.addConstructorArg(new DefaultTimer());
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment