Author: rickhall
Date: Fri Aug 1 12:32:10 2008
New Revision: 681794
URL: http://svn.apache.org/viewvc?rev=681794&view=rev
Log:
Add necessary stub methods to implement new R4.1 methods. (FELIX-595)
Modified:
felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleImpl.java
felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java
felix/trunk/framework/src/main/java/org/apache/felix/framework/ServiceReferenceImpl.java
felix/trunk/framework/src/main/java/org/apache/felix/framework/StartLevelImpl.java
Modified:
felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleImpl.java
URL:
http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleImpl.java?rev=681794&r1=681793&r2=681794&view=diff
==============================================================================
---
felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleImpl.java
(original)
+++
felix/trunk/framework/src/main/java/org/apache/felix/framework/BundleImpl.java
Fri Aug 1 12:32:10 2008
@@ -371,6 +371,11 @@
m_felix.startBundle(this, true);
}
+ public void start(int options) throws BundleException
+ {
+ throw new UnsupportedOperationException("This feature has not yet been
implemented.");
+ }
+
public void update() throws BundleException
{
update(null);
@@ -402,6 +407,11 @@
m_felix.stopBundle(this, true);
}
+ public void stop(int options) throws BundleException
+ {
+ throw new UnsupportedOperationException("This feature has not yet been
implemented.");
+ }
+
public void uninstall() throws BundleException
{
Object sm = System.getSecurityManager();
Modified:
felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java
URL:
http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java?rev=681794&r1=681793&r2=681794&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java
(original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java
Fri Aug 1 12:32:10 2008
@@ -893,6 +893,11 @@
fireFrameworkEvent(FrameworkEvent.STARTED, this, null);
}
+ public void start(int options) throws BundleException
+ {
+ throw new UnsupportedOperationException("This feature has not yet been
implemented.");
+ }
+
/**
* This method cleanly shuts down the framework, it must be called at the
* end of a session in order to shutdown all active bundles.
@@ -910,6 +915,11 @@
stopBundle(this, true);
}
+ public void stop(int options) throws BundleException
+ {
+ throw new UnsupportedOperationException("This feature has not yet been
implemented.");
+ }
+
public void stopAndWait()
{
// Shut the framework down by calling stop() on the system bundle.
Modified:
felix/trunk/framework/src/main/java/org/apache/felix/framework/ServiceReferenceImpl.java
URL:
http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/ServiceReferenceImpl.java?rev=681794&r1=681793&r2=681794&view=diff
==============================================================================
---
felix/trunk/framework/src/main/java/org/apache/felix/framework/ServiceReferenceImpl.java
(original)
+++
felix/trunk/framework/src/main/java/org/apache/felix/framework/ServiceReferenceImpl.java
Fri Aug 1 12:32:10 2008
@@ -192,4 +192,9 @@
return allow;
}
+
+ public int compareTo(Object reference)
+ {
+ throw new UnsupportedOperationException("This feature has not yet been
implemented.");
+ }
}
\ No newline at end of file
Modified:
felix/trunk/framework/src/main/java/org/apache/felix/framework/StartLevelImpl.java
URL:
http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/StartLevelImpl.java?rev=681794&r1=681793&r2=681794&view=diff
==============================================================================
---
felix/trunk/framework/src/main/java/org/apache/felix/framework/StartLevelImpl.java
(original)
+++
felix/trunk/framework/src/main/java/org/apache/felix/framework/StartLevelImpl.java
Fri Aug 1 12:32:10 2008
@@ -21,6 +21,7 @@
import java.util.ArrayList;
import java.util.List;
+import javax.naming.OperationNotSupportedException;
import org.osgi.framework.AdminPermission;
import org.osgi.framework.Bundle;
import org.osgi.service.startlevel.StartLevel;
@@ -215,6 +216,14 @@
return m_felix.isBundlePersistentlyStarted(bundle);
}
+ /* (non-Javadoc)
+ * @see
org.osgi.service.startlevel.StartLevel#isBundleActivationPolicyUsed(org.osgi.framework.Bundle)
+ **/
+ public boolean isBundleActivationPolicyUsed(Bundle bundle)
+ {
+ throw new UnsupportedOperationException("This feature has not yet been
implemented.");
+ }
+
public void run()
{
Object request = null;