- Added mosgi modules in pom.xml.
- Modification of pom.xml in order to have jdk1.5/1.4 conditional
compilation of modules
- Correcting some import/export bundles properties
git-svn-id: https://svn.apache.org/repos/asf/incubator/felix/trunk@438070 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/mosgi.jmx.agent/pom.xml b/mosgi.jmx.agent/pom.xml
index 6414390..f3c9681 100644
--- a/mosgi.jmx.agent/pom.xml
+++ b/mosgi.jmx.agent/pom.xml
@@ -45,18 +45,16 @@
<bundleSource>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}-src.jar</bundleSource>
<bundleSymbolicName>${pom.artifactId}</bundleSymbolicName>
<exportPackage>
- ${pom.artifactId};specification-version="1.0.0",
- org.apache.felix.mosgi.jmx.agent.mx4j.server;specification-version="1.0.0",
- org.apache.felix.mosgi.jmx.agent.mx4j.server.interceptor;specification-version="1.0.0"
+ ${pom.artifactId};specification-version="1.0.0",
+ org.apache.felix.mosgi.jmx.agent.mx4j.server;specification-version="1.0.0",
+ org.apache.felix.mosgi.jmx.agent.mx4j.server.interceptor;specification-version="1.0.0"
</exportPackage>
- <importPackage>
- org.osgi.service.log;specification-version="1.0.0",
- org.osgi.framework;specification-version="1.0.0",
- org.apache.felix.mosgi.jmx.agent.mx4j.server;specification-version="1.0.0",
- org.apache.felix.mosgi.jmx.agent.mx4j.server.interceptor;specification-version="1.0.0",
- javax.management;specification-version="1.0.0",
- javax.management.loading;specification-version="1.0.0"
- </importPackage>
+ <importPackage>
+ org.osgi.service.log;specification-version="1.0.0",
+ org.osgi.framework;specification-version="1.0.0",
+ javax.management;specification-version="1.0.0",
+ javax.management.loading;specification-version="1.0.0"
+ </importPackage>
</osgiManifest>
</configuration>
</plugin>
diff --git a/mosgi.jmx.httpconnector/pom.xml b/mosgi.jmx.httpconnector/pom.xml
index 68fcf51..7adeac1 100644
--- a/mosgi.jmx.httpconnector/pom.xml
+++ b/mosgi.jmx.httpconnector/pom.xml
@@ -50,16 +50,18 @@
<bundleUrl>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}.jar</bundleUrl>
<bundleSource>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}-src.jar</bundleSource>
<bundleSymbolicName>${pom.artifactId}</bundleSymbolicName>
- <importPackage>
- org.osgi.service.log;specification-version="1.0.0",
- org.osgi.framework;specification-version="1.0.0",
- javax.management;specification-version="1.0.0",
- org.w3c.dom;specification-version="1.0.0",
- javax.xml.parsers;specification-version="1.0.0",
- javax.xml.transform;specification-version="1.0.0",
- javax.xml.transform.stream;specification-version="1.0.0",
- javax.xml.transform.dom;specification-version="1.0.0"
- </importPackage>
+ <importPackage>
+ org.osgi.service.log;specification-version="1.0.0",
+ org.osgi.framework;specification-version="1.0.0",
+ org.apache.felix.mosgi.jmx.agent.mx4j.util;specification-version="1.0.0",
+ javax.management.loading;specification-version="1.0.0",
+ javax.management;specification-version="1.0.0",
+ org.w3c.dom;specification-version="1.0.0",
+ javax.xml.parsers;specification-version="1.0.0",
+ javax.xml.transform;specification-version="1.0.0",
+ javax.xml.transform.stream;specification-version="1.0.0",
+ javax.xml.transform.dom;specification-version="1.0.0"
+ </importPackage>
</osgiManifest>
</configuration>
</plugin>
diff --git a/mosgi.jmx.rmiconnector/pom.xml b/mosgi.jmx.rmiconnector/pom.xml
index f1983d6..23f246c 100644
--- a/mosgi.jmx.rmiconnector/pom.xml
+++ b/mosgi.jmx.rmiconnector/pom.xml
@@ -57,16 +57,20 @@
<bundleSource>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}-src.jar</bundleSource>
<bundleSymbolicName>${pom.artifactId}</bundleSymbolicName>
<exportPackage>
- org.apache.felix.mosgi.jmx.rmiconnector.mx4j.remote.provider.rmi;specification-version="1.0.0"
+ org.apache.felix.mosgi.jmx.rmiconnector.mx4j.remote.provider.rmi;specification-version="1.0.0"
</exportPackage>
- <importPackage>
- org.osgi.service.log;specification-version="1.0.0",
- org.osgi.framework;specification-version="1.0.0",
- org.apache.felix.mosgi.jmx.registry.mx4j.tools.naming;specification-version="1.0.0",
- org.apache.felix.mosgi.jmx.rmiconnector.mx4j.remote.provider.rmi;specification-version="1.0.0",
- javax.management;specification-version="1.0.0",
- javax.management.remote;specification-version="1.0.0"
- </importPackage>
+ <importPackage>
+ org.osgi.service.log;specification-version="1.0.0",
+ org.osgi.framework;specification-version="1.0.0",
+ org.apache.felix.mosgi.jmx.registry.mx4j.tools.naming;specification-version="1.0.0",
+ org.apache.felix.mosgi.jmx.agent.mx4j.util;specification-version="1.0.0",
+ javax.management;specification-version="1.0.0",
+ javax.management.loading;specification-version="1.0.0",
+ javax.management.remote;specification-version="1.0.0",
+ javax.management.remote.rmi;specification-version="1.0.0",
+ javax.naming;specification-version="1.0.0",
+ javax.security.auth;specification-version="1.0.0"
+ </importPackage>
</osgiManifest>
</configuration>
</plugin>
diff --git a/mosgi.managedelements.osgiprobes/pom.xml b/mosgi.managedelements.osgiprobes/pom.xml
index 84cc3f4..4628c64 100644
--- a/mosgi.managedelements.osgiprobes/pom.xml
+++ b/mosgi.managedelements.osgiprobes/pom.xml
@@ -51,14 +51,14 @@
<bundleSource>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}-src.jar</bundleSource>
<bundleSymbolicName>${pom.artifactId}</bundleSymbolicName>
<exportPackage>
- ${pom.artifactId};specification-version="1.0.0"
+ ${pom.artifactId};specification-version="1.0.0"
</exportPackage>
- <importPackage>
- org.osgi.framework;specification-version="1.0.0",
- org.osgi.service.log;specification-version="1.0.0",
- javax.management;specification-version="1.0.0",
- org.apache.felix.mosgi.console.ifc;specification-version="1.0.0",
- </importPackage>
+ <importPackage>
+ org.osgi.framework;specification-version="1.0.0",
+ org.osgi.service.log;specification-version="1.0.0",
+ javax.management;specification-version="1.0.0",
+ org.apache.felix.mosgi.console.ifc;specification-version="1.0.0"
+ </importPackage>
</osgiManifest>
</configuration>
</plugin>
diff --git a/pom.xml b/pom.xml
index f5c9f14..d884574 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,14 +76,50 @@
<module>eventadmin.bridge.configuration</module>
<module>eventadmin.bridge.useradmin</module>
<module>eventadmin.bridge.wireadmin</module>
+
+ <module>tools/mangen</module>
+
<module>ipojo</module>
<module>ipojo.metadata</module>
- <module>ipojo.plugin</module>
- <module>ipojo.arch</module>
-
- <module>tools/mangen</module>
+
</modules>
+ <profiles>
+ <profile>
+ <id>jdk1.5</id>
+ <activation>
+ <jdk>1.5</jdk>
+ </activation>
+ <modules>
+ <module>mosgi.console.ifc</module>
+ <module>mosgi.console.component</module>
+ <module>mosgi.console.gui</module>
+ <module>mosgi.jmx.agent</module>
+ <module>mosgi.jmx.httpconnector</module>
+ <module>mosgi.jmx.registry</module>
+ <module>mosgi.jmx.remotelogger</module>
+ <module>mosgi.jmx.rmiconnector</module>
+ <module>mosgi.managedelements.osgiprobes</module>
+ <module>mosgi.managedelements.osgiprobes.tab</module>
+
+ <module>ipojo.plugin</module>
+ <module>ipojo.arch</module>
+ </modules>
+ </profile>
+
+ <profile>
+ <id>jdk1.4</id>
+ <activation>
+ <jdk>1.4</jdk>
+ </activation>
+ <modules>
+ <module>ipojo.plugin</module>
+ <module>ipojo.arch</module>
+ </modules>
+ </profile>
+
+ </profiles>
+
<repositories>
<!-- For snapshots (no release jars or non-apache jars) -->
<repository>
@@ -158,10 +194,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
- <plugin>
+ <!-- plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- </plugin>
+ </plugin -->
</plugins>
</build>
<reporting>