Author: jbonofre
Date: Fri Apr 5 11:46:29 2013
New Revision: 1464932
URL: http://svn.apache.org/r1464932
Log:
[KARAF-2229] Use dynamic import in webconsole
Modified:
karaf/branches/karaf-2.x/webconsole/console/pom.xml
Modified: karaf/branches/karaf-2.x/webconsole/console/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/webconsole/console/pom.xml?rev=1464932&r1=1464931&r2=1464932&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/webconsole/console/pom.xml (original)
+++ karaf/branches/karaf-2.x/webconsole/console/pom.xml Fri Apr 5 11:46:29 2013
@@ -122,16 +122,7 @@
org.apache.felix.webconsole.internal.KarafOsgiManagerActivator
</Bundle-Activator>
<Export-Package>
- org.apache.felix.webconsole,
- org.apache.commons.fileupload,
- org.apache.commons.fileupload.disk,
- org.apache.commons.fileupload.servlet,
- org.apache.commons.fileupload.util,
- org.apache.commons.io,
- org.apache.commons.io.filefilter,
- org.apache.commons.io.input,
- org.apache.commons.io.output,
- org.json;version=${org.json.version.osgi}
+ org.apache.felix.webconsole
</Export-Package>
<Private-Package>
!org.apache.felix.webconsole,
@@ -140,18 +131,19 @@
<Import-Package>
org.osgi.service.metatype;resolution:=optional,
org.osgi.service.prefs;resolution:=optional,
+ javax.portlet;resolution:=optional,
javax.servlet.*,
*
</Import-Package>
<DynamicImport-Package>
-
org.apache.felix.bundlerepository;version="[2.0,3)",
- org.osgi.service.obr;version="[1.0,2)",
- org.osgi.service.cm;version="[1.2,2)",
- org.osgi.service.condpermadmin;version="[1.0,2)",
- org.osgi.service.log;version="[1.3,2)",
- org.osgi.service.metatype;version="[1.1,2)",
- org.osgi.service.permissionadmin;version="[1.2,2)",
- org.osgi.service.wireadmin;version="[1.0,2)"
+ org.apache.felix.bundlerepository,
+ org.osgi.service.obr,
+ org.osgi.service.cm,
+ org.osgi.service.condpermadmin,
+ org.osgi.service.log,
+ org.osgi.service.metatype,
+ org.osgi.service.permissionadmin,
+ org.osgi.service.wireadmin
</DynamicImport-Package>
<Embed-Dependency>
<!-- Webconsole -->
@@ -165,8 +157,14 @@
org.osgi.compendium;
inline=org/osgi/util/tracker/*,
- <!-- Metatype -->
-
org.osgi.compendium;inline=org/osgi/service/metatype/**
+ <!-- Required for JSON data transfer -->
+ json,
+
+ <!-- File Upload functionality -->
+ commons-fileupload,
+
+ <!-- Required by FileUpload and Util -->
+ commons-io
</Embed-Dependency>
<_removeheaders>
