Bug 480068 - [otdre] make otequinoxAgent.jar available for launching
Eclipse
- polish in build.properties
- let OTDRE use the new agent for redefining
- another attempt in p2.inf syntax
diff --git a/plugins/org.eclipse.objectteams.otequinox/META-INF/p2.inf b/plugins/org.eclipse.objectteams.otequinox/META-INF/p2.inf
index e52f87b..a7698f8 100644
--- a/plugins/org.eclipse.objectteams.otequinox/META-INF/p2.inf
+++ b/plugins/org.eclipse.objectteams.otequinox/META-INF/p2.inf
@@ -41,8 +41,8 @@
instructions.install = \
addJvmArg(jvmArg:-Dot.weaving=otdre); \
- addJvmArg(jvmArg:-javaagent:${installFolder}/plugins/org.eclipse.objectteams.otequinox_${version}/otequinoxAgent.jar);
+ addJvmArg(jvmArg:-javaagent:@artifact/otequinoxAgent.jar);
instructions.uninstall = \
removeJvmArg(jvmArg:-Dot.weaving=otdre); \
- removeJvmArg(jvmArg:-javaagent:${installFolder}/plugins/org.eclipse.objectteams.otequinox_${version}/otequinoxAgent.jar);
+ removeJvmArg(jvmArg:-javaagent:@artifact/otequinoxAgent.jar);
\ No newline at end of file
diff --git a/plugins/org.eclipse.objectteams.otequinox/build.properties b/plugins/org.eclipse.objectteams.otequinox/build.properties
index 4ba7196..e5ea4de 100644
--- a/plugins/org.eclipse.objectteams.otequinox/build.properties
+++ b/plugins/org.eclipse.objectteams.otequinox/build.properties
@@ -11,7 +11,8 @@
bcelpatch/,\
otequinoxAgent.jar
src.includes = schema/,\
- about.ini
+ about.ini,\
+ agentSrc/
javacProjectSettings=true
compilerArg = -annotationpath ${buildDirectory}/plugins/${bundleId}/annotations/plugins${path.separator}\
@@ -23,4 +24,4 @@
output.agent = agent/
customBuildCallbacks=customBuildCallbacks.xml
-customBuildCallbacks.inheritall=true
\ No newline at end of file
+customBuildCallbacks.inheritall=true
diff --git a/plugins/org.eclipse.objectteams.otequinox/src/org/eclipse/objectteams/internal/osgi/weaving/DelegatingTransformer.java b/plugins/org.eclipse.objectteams.otequinox/src/org/eclipse/objectteams/internal/osgi/weaving/DelegatingTransformer.java
index 9996724..0f34637 100644
--- a/plugins/org.eclipse.objectteams.otequinox/src/org/eclipse/objectteams/internal/osgi/weaving/DelegatingTransformer.java
+++ b/plugins/org.eclipse.objectteams.otequinox/src/org/eclipse/objectteams/internal/osgi/weaving/DelegatingTransformer.java
@@ -84,7 +84,7 @@
/** Enable OTDRE to use the OTEquinoxDebugAgent, if present, for class redefinition. */
private static class OTEquinoxRedefineStrategy implements IRedefineStrategy {
- private static final String OT_EQUINOX_DEBUG_AGENT = "org.eclipse.objectteams.otdt.internal.debug.adaptor.launching.OTEquinoxDebugAgent";
+ private static final String OT_EQUINOX_DEBUG_AGENT = "org.eclipse.objectteams.otequinox.OTEquinoxAgent";
public void redefine(Class<?> clazz, byte[] bytecode) throws ClassNotFoundException, UnmodifiableClassException {
ClassDefinition arr_cd[] = { new ClassDefinition(clazz, bytecode) };