Author: cschneider Date: Wed Apr 11 08:14:52 2012 New Revision: 1324622 URL: http://svn.apache.org/viewvc?rev=1324622&view=rev Log: KARAF-1302 Use aries jmx for instance module, refactor package names to instance.core for core packages
Modified: karaf/trunk/webconsole/instance/src/main/java/org/apache/karaf/webconsole/instance/InstancePlugin.java karaf/trunk/webconsole/instance/src/main/resources/OSGI-INF/blueprint/webconsole-instance.xml karaf/trunk/webconsole/instance/src/test/java/org/apache/karaf/webconsole/instance/InstancePluginTest.java Modified: karaf/trunk/webconsole/instance/src/main/java/org/apache/karaf/webconsole/instance/InstancePlugin.java URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/instance/src/main/java/org/apache/karaf/webconsole/instance/InstancePlugin.java?rev=1324622&r1=1324621&r2=1324622&view=diff ============================================================================== --- karaf/trunk/webconsole/instance/src/main/java/org/apache/karaf/webconsole/instance/InstancePlugin.java (original) +++ karaf/trunk/webconsole/instance/src/main/java/org/apache/karaf/webconsole/instance/InstancePlugin.java Wed Apr 11 08:14:52 2012 @@ -29,10 +29,10 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.karaf.instance.InstanceService; -import org.apache.karaf.instance.Instance; -import org.apache.karaf.instance.InstanceSettings; import org.apache.felix.webconsole.AbstractWebConsolePlugin; +import org.apache.karaf.instance.core.Instance; +import org.apache.karaf.instance.core.InstanceService; +import org.apache.karaf.instance.core.InstanceSettings; import org.json.JSONException; import org.json.JSONWriter; import org.osgi.framework.BundleContext; Modified: karaf/trunk/webconsole/instance/src/main/resources/OSGI-INF/blueprint/webconsole-instance.xml URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/instance/src/main/resources/OSGI-INF/blueprint/webconsole-instance.xml?rev=1324622&r1=1324621&r2=1324622&view=diff ============================================================================== --- karaf/trunk/webconsole/instance/src/main/resources/OSGI-INF/blueprint/webconsole-instance.xml (original) +++ karaf/trunk/webconsole/instance/src/main/resources/OSGI-INF/blueprint/webconsole-instance.xml Wed Apr 11 08:14:52 2012 @@ -19,7 +19,7 @@ --> <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" default-activation="lazy"> - <reference id="instanceService" interface="org.apache.karaf.instance.InstanceService" /> + <reference id="instanceService" interface="org.apache.karaf.instance.core.InstanceService" /> <bean id="instancePlugin" class="org.apache.karaf.webconsole.instance.InstancePlugin" init-method="start" destroy-method="stop"> <property name="instanceService" ref="instanceService" /> Modified: karaf/trunk/webconsole/instance/src/test/java/org/apache/karaf/webconsole/instance/InstancePluginTest.java URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/instance/src/test/java/org/apache/karaf/webconsole/instance/InstancePluginTest.java?rev=1324622&r1=1324621&r2=1324622&view=diff ============================================================================== --- karaf/trunk/webconsole/instance/src/test/java/org/apache/karaf/webconsole/instance/InstancePluginTest.java (original) +++ karaf/trunk/webconsole/instance/src/test/java/org/apache/karaf/webconsole/instance/InstancePluginTest.java Wed Apr 11 08:14:52 2012 @@ -30,9 +30,9 @@ import javax.servlet.http.HttpServletRes import junit.framework.TestCase; -import org.apache.karaf.instance.InstanceService; -import org.apache.karaf.instance.Instance; -import org.apache.karaf.instance.InstanceSettings; +import org.apache.karaf.instance.core.Instance; +import org.apache.karaf.instance.core.InstanceService; +import org.apache.karaf.instance.core.InstanceSettings; import org.easymock.EasyMock; import org.easymock.IAnswer;