Author: rickhall
Date: Thu Feb 14 22:36:06 2008
New Revision: 627960
URL: http://svn.apache.org/viewvc?rev=627960&view=rev
Log:
Missed some required changes to get the example app working with the latest
version of Felix. (FELIX-453)
Modified:
felix/trunk/examples/extenderbased.host/pom.xml
felix/trunk/examples/servicebased.host/pom.xml
Modified: felix/trunk/examples/extenderbased.host/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/examples/extenderbased.host/pom.xml?rev=627960&r1=627959&r2=627960&view=diff
==============================================================================
--- felix/trunk/examples/extenderbased.host/pom.xml (original)
+++ felix/trunk/examples/extenderbased.host/pom.xml Thu Feb 14 22:36:06 2008
@@ -49,9 +49,9 @@
<configuration>
<instructions>
<Main-Class>org.apache.felix.example.extenderbased.host.Activator</Main-Class>
-
<Import-Package>org.osgi.framework,org.osgi.service.packageadmin,org.osgi.service.url,org.osgi.service.startlevel,org.osgi.util.tracker,*</Import-Package>
+
<Import-Package>!android.dalvik,org.osgi.framework,org.osgi.service.packageadmin,org.osgi.service.url,org.osgi.service.startlevel,org.osgi.util.tracker,*</Import-Package>
<Export-Package>org.apache.felix.example.extenderbased.host.extension.*</Export-Package>
-
<Private-Package>org.apache.felix.example.extenderbased.host.*,org.apache.felix.moduleloader.*,org.apache.felix.framework.*,org.osgi.*</Private-Package>
+
<Private-Package>org.apache.felix.example.extenderbased.host.*,org.apache.felix.moduleloader.*,org.apache.felix.framework.*,org.apache.felix.main,org.osgi.*</Private-Package>
<Bundle-Activator>org.apache.felix.example.extenderbased.host.Activator</Bundle-Activator>
</instructions>
</configuration>
Modified: felix/trunk/examples/servicebased.host/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/examples/servicebased.host/pom.xml?rev=627960&r1=627959&r2=627960&view=diff
==============================================================================
--- felix/trunk/examples/servicebased.host/pom.xml (original)
+++ felix/trunk/examples/servicebased.host/pom.xml Thu Feb 14 22:36:06 2008
@@ -49,9 +49,9 @@
<configuration>
<instructions>
<Main-Class>org.apache.felix.example.servicebased.host.Activator</Main-Class>
- <Import-Package>javax.microedition.io;resolution:=optional,
org.osgi.framework,org.osgi.service.packageadmin,org.osgi.service.url,org.osgi.service.startlevel,org.osgi.util.tracker,*</Import-Package>
+
<Import-Package>!android.dalvik,javax.microedition.io;resolution:=optional,
org.osgi.framework,org.osgi.service.packageadmin,org.osgi.service.url,org.osgi.service.startlevel,org.osgi.util.tracker,*</Import-Package>
<Export-Package>org.apache.felix.example.servicebased.host.service.*</Export-Package>
-
<Private-Package>org.apache.felix.example.servicebased.host.*,org.apache.felix.moduleloader.*,org.apache.felix.framework.*,org.osgi.*</Private-Package>
+
<Private-Package>org.apache.felix.example.servicebased.host.*,org.apache.felix.moduleloader.*,org.apache.felix.framework.*,org.apache.felix.main,org.osgi.*</Private-Package>
<Bundle-Activator>org.apache.felix.example.servicebased.host.Activator</Bundle-Activator>
</instructions>
</configuration>