FELIX-307
---------
Modifications to make it work with jdk1.4
We added three dependencies:
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j</artifactId>
<version>3.0.2</version>
<scope>provided</scope>
</dependency>
----
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j-jmx</artifactId>
<version>3.0.1</version>
<scope>provided</scope>
</dependency>
----
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j-remote</artifactId>
<version>3.0.1</version>
<scope>provided</scope>
</dependency>
Also added a line in doc/core.sh for lauchning it with jdk1.4
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@552854 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/mosgi/console.component/pom.xml b/mosgi/console.component/pom.xml
index fa991c8..19880a2 100644
--- a/mosgi/console.component/pom.xml
+++ b/mosgi/console.component/pom.xml
@@ -23,6 +23,13 @@
<artifactId>org.apache.felix.mosgi.console.ifc</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j-jmx</artifactId>
+ <version>3.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+
</dependencies>
<build>
diff --git a/mosgi/console.component/src/main/java/org/apache/felix/mosgi/console/component/RemoteLogger_jtable.java b/mosgi/console.component/src/main/java/org/apache/felix/mosgi/console/component/RemoteLogger_jtable.java
index a0aa432..f95abdc 100644
--- a/mosgi/console.component/src/main/java/org/apache/felix/mosgi/console/component/RemoteLogger_jtable.java
+++ b/mosgi/console.component/src/main/java/org/apache/felix/mosgi/console/component/RemoteLogger_jtable.java
@@ -169,7 +169,7 @@
JFileChooser jfc=new JFileChooser();
if (jfc.showSaveDialog(null)==JFileChooser.APPROVE_OPTION & jfc.getSelectedFile()!=null){
try{
- ps=new PrintStream(jfc.getSelectedFile());
+ ps=new PrintStream(new java.io.FileOutputStream(jfc.getSelectedFile()));
System.out.println("Save remote log into \""+jfc.getSelectedFile().getName()+"\""); }
catch (FileNotFoundException fnfe){
System.out.println("err : "+fnfe); }
diff --git a/mosgi/console.gui/pom.xml b/mosgi/console.gui/pom.xml
index e27e791..d7bc87c 100644
--- a/mosgi/console.gui/pom.xml
+++ b/mosgi/console.gui/pom.xml
@@ -34,6 +34,20 @@
<artifactId>org.apache.felix.mosgi.console.ifc</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j-jmx</artifactId>
+ <version>3.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j-remote</artifactId>
+ <version>3.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+
+
</dependencies>
<build>
diff --git a/mosgi/doc/config.properties.core b/mosgi/doc/config.properties.core
index 8a03f30..e696aea 100644
--- a/mosgi/doc/config.properties.core
+++ b/mosgi/doc/config.properties.core
@@ -105,6 +105,15 @@
version="1.3.0"
jre-1.4= \
+ javax.management; \
+ javax.management.loading; \
+ javax.management.modelmbean; \
+ javax.management.monitor; \
+ javax.management.openmbean; \
+ javax.management.relation; \
+ javax.management.remote; \
+ javax.management.remote.rmi; \
+ javax.management.timer; \
javax.accessibility; \
javax.imageio; \
javax.imageio.event; \
diff --git a/mosgi/doc/config.properties.jmxconsole b/mosgi/doc/config.properties.jmxconsole
index f3a7cfc..524febc 100644
--- a/mosgi/doc/config.properties.jmxconsole
+++ b/mosgi/doc/config.properties.jmxconsole
@@ -92,6 +92,15 @@
version="1.3.0"
jre-1.4= \
+ javax.management; \
+ javax.management.loading; \
+ javax.management.modelmbean; \
+ javax.management.monitor; \
+ javax.management.openmbean; \
+ javax.management.relation; \
+ javax.management.remote; \
+ javax.management.remote.rmi; \
+ javax.management.timer; \
javax.accessibility; \
javax.imageio; \
javax.imageio.event; \
diff --git a/mosgi/doc/core.sh b/mosgi/doc/core.sh
index dcb9660..371e96d 100755
--- a/mosgi/doc/core.sh
+++ b/mosgi/doc/core.sh
@@ -7,3 +7,6 @@
echo "lauching felix with core gateway properties"
java -Dfelix.config.properties=file:../mosgi/doc/config.properties.core -jar bin/felix.jar
+#LAUCHING COMMAND IF UNDER JDK1.4
+
+#java -Djavax.management.builder.initial=org.apache.felix.mosgi.jmx.agent.mx4j.server.MX4JMBeanServerBuilder -Dfelix.config.properties=file:../mosgi/doc/config.properties.core -classpath /home/sfrenot/.m2/repository/mx4j/mx4j/3.0.2/mx4j-3.0.2.jar:/home/sfrenot/.m2/repository/mx4j/mx4j-remote/3.0.1/mx4j-remote-3.0.1.jar:bin/felix.jar org.apache.felix.main.Main
diff --git a/mosgi/doc/jmxconsole.sh b/mosgi/doc/jmxconsole.sh
index 07cfcd5..4f8ca9c 100755
--- a/mosgi/doc/jmxconsole.sh
+++ b/mosgi/doc/jmxconsole.sh
@@ -4,3 +4,6 @@
echo "lauching felix with jmxconsole properties"
java -Dfelix.config.properties=file:../mosgi/doc/config.properties.jmxconsole -jar bin/felix.jar
+
+#LAUCHING COMMAND IF under JDK1.4
+#java -Dfelix.config.properties=file:../mosgi/doc/config.properties.jmxconsole -Dfelix.config.properties=file:../mosgi/doc/config.properties.jmxconsole -classpath /home/sfrenot/.m2/repository/mx4j/mx4j/3.0.2/mx4j-3.0.2.jar:/home/sfrenot/.m2/repository/mx4j/mx4j-remote/3.0.1/mx4j-remote-3.0.1.jar:bin/felix.jar org.apache.felix.main.Main
diff --git a/mosgi/jmx.agent/pom.xml b/mosgi/jmx.agent/pom.xml
index e234cf4..4c883b2 100644
--- a/mosgi/jmx.agent/pom.xml
+++ b/mosgi/jmx.agent/pom.xml
@@ -28,6 +28,14 @@
<artifactId>org.apache.felix.framework</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j</artifactId>
+ <version>3.0.2</version>
+ <scope>provided</scope>
+ </dependency>
+
+
</dependencies>
<build>
diff --git a/mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/AgentActivator.java b/mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/AgentActivator.java
index 2134e74..3bdf8e0 100644
--- a/mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/AgentActivator.java
+++ b/mosgi/jmx.agent/src/main/java/org/apache/felix/mosgi/jmx/agent/AgentActivator.java
@@ -20,7 +20,7 @@
import java.util.StringTokenizer;
-import java.lang.management.ManagementFactory;
+//import java.lang.management.ManagementFactory;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.Constants;
@@ -113,7 +113,8 @@
private void startAgent(String virtual, int minor){
if (virtual==null && minor >=5){
Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader());
- this.server= ManagementFactory.getPlatformMBeanServer();
+ //this.server= ManagementFactory.getPlatformMBeanServer();
+ this.server = MBeanServerFactory.createMBeanServer();
AgentActivator.log(LogService.LOG_DEBUG, "A jdk1.5 agent started "+this.server,null);
}else {
Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader());
diff --git a/mosgi/jmx.httpconnector/pom.xml b/mosgi/jmx.httpconnector/pom.xml
index 224383e..ff2225a 100644
--- a/mosgi/jmx.httpconnector/pom.xml
+++ b/mosgi/jmx.httpconnector/pom.xml
@@ -33,6 +33,13 @@
<artifactId>org.apache.felix.mosgi.jmx.agent</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j-jmx</artifactId>
+ <version>3.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+
</dependencies>
<build>
diff --git a/mosgi/jmx.registry/pom.xml b/mosgi/jmx.registry/pom.xml
index f6bff72..0aea6c4 100644
--- a/mosgi/jmx.registry/pom.xml
+++ b/mosgi/jmx.registry/pom.xml
@@ -28,6 +28,13 @@
<artifactId>org.apache.felix.framework</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j-jmx</artifactId>
+ <version>3.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+
</dependencies>
<build>
diff --git a/mosgi/jmx.remotelogger/pom.xml b/mosgi/jmx.remotelogger/pom.xml
index ba0a59e..cd8ac3d 100644
--- a/mosgi/jmx.remotelogger/pom.xml
+++ b/mosgi/jmx.remotelogger/pom.xml
@@ -23,6 +23,13 @@
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j-jmx</artifactId>
+ <version>3.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+
</dependencies>
<build>
diff --git a/mosgi/jmx.rmiconnector/pom.xml b/mosgi/jmx.rmiconnector/pom.xml
index ca7451e..aa7554d 100644
--- a/mosgi/jmx.rmiconnector/pom.xml
+++ b/mosgi/jmx.rmiconnector/pom.xml
@@ -38,6 +38,20 @@
<artifactId>org.apache.felix.framework</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j-jmx</artifactId>
+ <version>3.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j-remote</artifactId>
+ <version>3.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+
+
</dependencies>
<build>
diff --git a/mosgi/managedelements.bundlesprobes.tab/pom.xml b/mosgi/managedelements.bundlesprobes.tab/pom.xml
index c7f9eb4..c87abf9 100644
--- a/mosgi/managedelements.bundlesprobes.tab/pom.xml
+++ b/mosgi/managedelements.bundlesprobes.tab/pom.xml
@@ -33,6 +33,14 @@
<artifactId>org.apache.felix.framework</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j-jmx</artifactId>
+ <version>3.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+
+
</dependencies>
<build>
diff --git a/mosgi/managedelements.bundlesprobes/pom.xml b/mosgi/managedelements.bundlesprobes/pom.xml
index 9026dd6..ab82674 100644
--- a/mosgi/managedelements.bundlesprobes/pom.xml
+++ b/mosgi/managedelements.bundlesprobes/pom.xml
@@ -33,6 +33,13 @@
<artifactId>org.apache.felix.framework</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j-jmx</artifactId>
+ <version>3.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+
</dependencies>
<build>
diff --git a/mosgi/managedelements.memoryprobe/pom.xml b/mosgi/managedelements.memoryprobe/pom.xml
index c367959..c1140d8 100644
--- a/mosgi/managedelements.memoryprobe/pom.xml
+++ b/mosgi/managedelements.memoryprobe/pom.xml
@@ -38,6 +38,13 @@
<artifactId>org.apache.felix.mosgi.jmx.agent</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j-jmx</artifactId>
+ <version>3.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+
</dependencies>
<build>
diff --git a/mosgi/managedelements.obrprobe.tab/pom.xml b/mosgi/managedelements.obrprobe.tab/pom.xml
index 533f01d..f629516 100644
--- a/mosgi/managedelements.obrprobe.tab/pom.xml
+++ b/mosgi/managedelements.obrprobe.tab/pom.xml
@@ -33,6 +33,13 @@
<artifactId>org.apache.felix.bundlerepository</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j-jmx</artifactId>
+ <version>3.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+
</dependencies>
<build>
diff --git a/mosgi/managedelements.obrprobe/pom.xml b/mosgi/managedelements.obrprobe/pom.xml
index 2f9d790..9b00563 100644
--- a/mosgi/managedelements.obrprobe/pom.xml
+++ b/mosgi/managedelements.obrprobe/pom.xml
@@ -38,6 +38,14 @@
<artifactId>org.apache.felix.bundlerepository</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j-jmx</artifactId>
+ <version>3.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+
+
</dependencies>
<build>
diff --git a/mosgi/managedelements.osgiprobes.tab/pom.xml b/mosgi/managedelements.osgiprobes.tab/pom.xml
index 2d42a02..c7e958b 100644
--- a/mosgi/managedelements.osgiprobes.tab/pom.xml
+++ b/mosgi/managedelements.osgiprobes.tab/pom.xml
@@ -28,6 +28,13 @@
<artifactId>org.apache.felix.mosgi.console.ifc</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j-jmx</artifactId>
+ <version>3.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+
</dependencies>
<build>
diff --git a/mosgi/managedelements.osgiprobes/pom.xml b/mosgi/managedelements.osgiprobes/pom.xml
index d05f41b..b2fdf91 100644
--- a/mosgi/managedelements.osgiprobes/pom.xml
+++ b/mosgi/managedelements.osgiprobes/pom.xml
@@ -33,6 +33,13 @@
<artifactId>org.apache.felix.framework</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j-jmx</artifactId>
+ <version>3.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+
</dependencies>
<build>