recompile gluonj for Java 8 support

original gluonj 1.5beta used old javassist that did not support Java 8
wocommunity · May 26, 2015 · 4a0d599 · 4a0d599
1 parent 7774de1
commit 4a0d599
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 6 deletions.
diff --git a/Frameworks/Misc/ERProfiling/.classpath b/Frameworks/Misc/ERProfiling/.classpath
@@ -8,9 +8,9 @@
 	<classpathentry kind="con" path="WOFramework/JavaWebObjects"/>
 	<classpathentry kind="con" path="WOFramework/JavaXML"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="Libraries/gluonj-1.5beta.jar"/>
-	<classpathentry kind="lib" path="Libraries/javassist-3.16.1-GA.jar"/>
 	<classpathentry kind="con" path="WOFramework/ERExtensions"/>
 	<classpathentry kind="con" path="WOFramework/ERJars"/>
+	<classpathentry kind="lib" path="Libraries/javassist-3.19.0-GA.jar"/>
+	<classpathentry kind="lib" path="Libraries/gluonj-1.5beta-java6.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/Frameworks/Misc/ERProfiling/Libraries/gluonj-1.5beta-java6.jar b/Frameworks/Misc/ERProfiling/Libraries/gluonj-1.5beta-java6.jar
diff --git a/Frameworks/Misc/ERProfiling/Libraries/gluonj-1.5beta.jar b/Frameworks/Misc/ERProfiling/Libraries/gluonj-1.5beta.jar
diff --git a/Frameworks/Misc/ERProfiling/Libraries/javassist-3.16.1-GA.jar b/Frameworks/Misc/ERProfiling/Libraries/javassist-3.16.1-GA.jar
diff --git a/Frameworks/Misc/ERProfiling/Libraries/javassist-3.19.0-GA.jar b/Frameworks/Misc/ERProfiling/Libraries/javassist-3.19.0-GA.jar
diff --git a/Frameworks/Misc/ERProfiling/Sources/er/profiling/classloader/ClassTransformer.java b/Frameworks/Misc/ERProfiling/Sources/er/profiling/classloader/ClassTransformer.java
@@ -6,8 +6,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javassist.gluonj.embedded.ClassPool;
-import javassist.gluonj.embedded.LoaderClassPath;
+import javassist.ClassPool;
+import javassist.LoaderClassPath;
 import javassist.gluonj.weave.Weaver;
 
 /**

diff --git a/Frameworks/Misc/ERProfiling/Sources/er/profiling/package.html b/Frameworks/Misc/ERProfiling/Sources/er/profiling/package.html
@@ -35,8 +35,8 @@ <h2>Quick Start</h2>
 	<li>Add ERProfiling.framework to your app</li>
 	<li>Add the javaagent setting to the VM args section of your launch config.
 		<ul>
-			<li>Wonder source: -javaagent:${workspace_loc:ERProfiling}/Libraries/gluonj-1.5beta.jar=er.profiling.PFProfilerMixin</li>
-			<li>Wonder binaries: -javaagent:/path/to/ERProfiling.framework/Resources/Java/gluonj-1.5beta.jar=er.profiling.PFProfilerMixin</li>
+			<li>Wonder source: -javaagent:${workspace_loc:ERProfiling}/Libraries/gluonj-1.5beta-java6.jar=er.profiling.PFProfilerMixin</li>
+			<li>Wonder binaries: -javaagent:/path/to/ERProfiling.framework/Resources/Java/gluonj-1.5beta-java6.jar=er.profiling.PFProfilerMixin</li>
 		</ul>
 	</li>
 	<li>Run/Debug your app</li>