Modified the pom files to remove the bundle activator and the import package
header, since the new OSGi maven plugin will automatically generate them.
git-svn-id: https://svn.apache.org/repos/asf/incubator/felix/trunk@409087 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/org.apache.felix.bundlerepository/pom.xml b/org.apache.felix.bundlerepository/pom.xml
index 9d62c0a..b79ca2f 100644
--- a/org.apache.felix.bundlerepository/pom.xml
+++ b/org.apache.felix.bundlerepository/pom.xml
@@ -38,12 +38,10 @@
<osgiManifest>
<bundleName>BundleRepository</bundleName>
<bundleDescription>Bundle repository service.</bundleDescription>
- <bundleActivator>${pom.artifactId}.Activator</bundleActivator>
<bundleDocUrl>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/</bundleDocUrl>
<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.framework,org.xml.sax,javax.xml.parsers</importPackage>
<dynamicImportPackage>org.apache.felix.shell</dynamicImportPackage>
<exportPackage>org.osgi.service.obr</exportPackage>
<exportService>org.osgi.service.obr.RepositoryAdmin</exportService>
diff --git a/org.apache.felix.http.jetty/pom.xml b/org.apache.felix.http.jetty/pom.xml
index 105a9e7..e139ea6 100644
--- a/org.apache.felix.http.jetty/pom.xml
+++ b/org.apache.felix.http.jetty/pom.xml
@@ -43,12 +43,10 @@
<osgiManifest>
<bundleName>HTTP Service</bundleName>
<bundleDescription>An implementation of the OSGi HTTP Service using Jetty.</bundleDescription>
- <bundleActivator>${pom.artifactId}.Activator</bundleActivator>
<bundleDocUrl>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/</bundleDocUrl>
<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.framework</importPackage>
<dynamicImportPackage>javax.net.ssl</dynamicImportPackage>
<exportPackage>org.osgi.service.http; version=1.1,javax.servlet;javax.servlet.http;version=2.3.0</exportPackage>
<exportService>org.osgi.service.http.HttpService</exportService>
diff --git a/org.apache.felix.shell.gui.plugin/pom.xml b/org.apache.felix.shell.gui.plugin/pom.xml
index 04374b1..6aeba953 100644
--- a/org.apache.felix.shell.gui.plugin/pom.xml
+++ b/org.apache.felix.shell.gui.plugin/pom.xml
@@ -45,12 +45,10 @@
<osgiManifest>
<bundleName>ShellGUIPlugin</bundleName>
<bundleDescription>A simple set of plugins for the ShellGUI bundle.</bundleDescription>
- <bundleActivator>${pom.artifactId}.Activator</bundleActivator>
<bundleDocUrl>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/</bundleDocUrl>
<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.framework,javax.swing,javax.swing.event,javax.swing.table,javax.swing.tree,javax.swing.border,javax.swing.text,org.apache.felix.shell,org.apache.felix.shell.gui,org.osgi.service.obr</importPackage>
<exportService>org.apache.felix.shell.gui.Plugin</exportService>
<importService>org.apache.felix.shell.ShellService,org.apache.felix.bundlerepository.RepostioryAdmin</importService>
</osgiManifest>
diff --git a/org.apache.felix.shell.gui/pom.xml b/org.apache.felix.shell.gui/pom.xml
index 05d6530..acfeae7 100644
--- a/org.apache.felix.shell.gui/pom.xml
+++ b/org.apache.felix.shell.gui/pom.xml
@@ -27,12 +27,10 @@
<osgiManifest>
<bundleName>ShellGUI</bundleName>
<bundleDescription>A simple plugin-oriented GUI shell.</bundleDescription>
- <bundleActivator>${pom.artifactId}.impl.Activator</bundleActivator>
<bundleDocUrl>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/</bundleDocUrl>
<bundleUrl>http://oscar-osgi.sf.net/obr2/shellgui/${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.framework,javax.swing,javax.swing.event</importPackage>
<exportPackage>${pom.artifactId}; specification-version="1.0.0"</exportPackage>
</osgiManifest>
</configuration>
diff --git a/org.apache.felix.shell.tui/pom.xml b/org.apache.felix.shell.tui/pom.xml
index 284034d..ea45d98 100644
--- a/org.apache.felix.shell.tui/pom.xml
+++ b/org.apache.felix.shell.tui/pom.xml
@@ -33,12 +33,10 @@
<osgiManifest>
<bundleName>ShellTUI</bundleName>
<bundleDescription>A simple textual user interface for Felix' shell service.</bundleDescription>
- <bundleActivator>${pom.artifactId}.Activator</bundleActivator>
<bundleDocUrl>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/</bundleDocUrl>
<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.framework, org.apache.felix.shell</importPackage>
<importService>org.apache.felix.shell.ShellService</importService>
</osgiManifest>
</configuration>
diff --git a/org.apache.felix.shell/pom.xml b/org.apache.felix.shell/pom.xml
index e6786d9..5e54af1 100644
--- a/org.apache.felix.shell/pom.xml
+++ b/org.apache.felix.shell/pom.xml
@@ -27,12 +27,10 @@
<osgiManifest>
<bundleName>ShellService</bundleName>
<bundleDescription>A simple OSGi command shell service.</bundleDescription>
- <bundleActivator>${pom.artifactId}.impl.Activator</bundleActivator>
<bundleDocUrl>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/</bundleDocUrl>
<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.framework, org.osgi.service.startlevel, org.osgi.service.packageadmin</importPackage>
<exportPackage>${pom.artifactId}; specification-version="1.0.0", org.ungoverned.osgi.service.shell; specification-version="1.0.0"</exportPackage>
<exportService>${pom.artifactId}.ShellService, org.ungoverned.osgi.service.shell.ShellService</exportService>
<importService>org.osgi.service.startlevel.StartLevel, org.osgi.service.packageadmin.PackageAdmin</importService>