Modified: karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ObrCommandSupport.java URL: http://svn.apache.org/viewvc/karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ObrCommandSupport.java?rev=1291178&r1=1291177&r2=1291178&view=diff ============================================================================== --- karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ObrCommandSupport.java (original) +++ karaf/trunk/shell/obr/src/main/java/org/apache/karaf/shell/obr/ObrCommandSupport.java Mon Feb 20 10:14:50 2012 @@ -43,7 +43,7 @@ public abstract class ObrCommandSupport protected static final char VERSION_DELIM = ','; protected Object doExecute() throws Exception { - // Get repository admin service. + // Get repository instance service. ServiceReference ref = getBundleContext().getServiceReference(RepositoryAdmin.class.getName()); if (ref == null) { System.out.println("RepositoryAdmin service is unavailable.");
Modified: karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/NativeKarafFrameworkTest.java URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/NativeKarafFrameworkTest.java?rev=1291178&r1=1291177&r2=1291178&view=diff ============================================================================== --- karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/NativeKarafFrameworkTest.java (original) +++ karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/NativeKarafFrameworkTest.java Mon Feb 20 10:14:50 2012 @@ -39,10 +39,10 @@ public class NativeKarafFrameworkTest { return new Option[]{ new KarafDistributionKitConfigurationOption(maven().groupId("org.apache.karaf") .artifactId("apache-karaf").type("zip").versionAsInProject(), Platform.WINDOWS).executable( - "bin\\karaf.bat").filesToMakeExecutable("bin\\admin.bat"), + "bin\\karaf.bat").filesToMakeExecutable("bin\\instance.bat"), new KarafDistributionKitConfigurationOption(maven().groupId("org.apache.karaf") .artifactId("apache-karaf").type("zip").versionAsInProject(), Platform.NIX).executable("bin/karaf") - .filesToMakeExecutable("bin/admin") }; + .filesToMakeExecutable("bin/instance") }; } @Test Copied: karaf/trunk/webconsole/instance/NOTICE (from r1291022, karaf/trunk/webconsole/admin/NOTICE) URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/instance/NOTICE?p2=karaf/trunk/webconsole/instance/NOTICE&p1=karaf/trunk/webconsole/admin/NOTICE&r1=1291022&r2=1291178&rev=1291178&view=diff ============================================================================== (empty) Copied: karaf/trunk/webconsole/instance/pom.xml (from r1291022, karaf/trunk/webconsole/admin/pom.xml) URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/instance/pom.xml?p2=karaf/trunk/webconsole/instance/pom.xml&p1=karaf/trunk/webconsole/admin/pom.xml&r1=1291022&r2=1291178&rev=1291178&view=diff ============================================================================== --- karaf/trunk/webconsole/admin/pom.xml (original) +++ karaf/trunk/webconsole/instance/pom.xml Mon Feb 20 10:14:50 2012 @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <!-- Licensed to the Apache Software Foundation (ASF) under one or more + <!-- + Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the "License"); you @@ -11,7 +11,8 @@ required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for - the specific language governing permissions and limitations under the License. --> + the specific language governing permissions and limitations under the License. + --> <modelVersion>4.0.0</modelVersion> @@ -22,10 +23,10 @@ <relativePath>../pom.xml</relativePath> </parent> - <artifactId>org.apache.karaf.webconsole.admin</artifactId> + <artifactId>org.apache.karaf.webconsole.instance</artifactId> <packaging>bundle</packaging> - <name>Apache Karaf :: Web Console :: Admin Plugin</name> - <description>This bundle provides Karaf admin support in the Web Console.</description> + <name>Apache Karaf :: Web Console :: Instance Plugin</name> + <description>This bundle provides Karaf instance support in the Web Console.</description> <properties> <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory> @@ -63,8 +64,8 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.apache.karaf.admin</groupId> - <artifactId>org.apache.karaf.admin.core</artifactId> + <groupId>org.apache.karaf.instance</groupId> + <artifactId>org.apache.karaf.instance.core</artifactId> <scope>provided</scope> </dependency> <dependency> Copied: karaf/trunk/webconsole/instance/src/main/java/org/apache/karaf/webconsole/instance/InstancePlugin.java (from r1291022, karaf/trunk/webconsole/admin/src/main/java/org/apache/karaf/webconsole/admin/AdminPlugin.java) URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/instance/src/main/java/org/apache/karaf/webconsole/instance/InstancePlugin.java?p2=karaf/trunk/webconsole/instance/src/main/java/org/apache/karaf/webconsole/instance/InstancePlugin.java&p1=karaf/trunk/webconsole/admin/src/main/java/org/apache/karaf/webconsole/admin/AdminPlugin.java&r1=1291022&r2=1291178&rev=1291178&view=diff ============================================================================== --- karaf/trunk/webconsole/admin/src/main/java/org/apache/karaf/webconsole/admin/AdminPlugin.java (original) +++ karaf/trunk/webconsole/instance/src/main/java/org/apache/karaf/webconsole/instance/InstancePlugin.java Mon Feb 20 10:14:50 2012 @@ -14,7 +14,7 @@ * limitations under the License. * under the License. */ -package org.apache.karaf.webconsole.admin; +package org.apache.karaf.webconsole.instance; import java.io.IOException; import java.io.InputStream; @@ -29,9 +29,9 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.karaf.admin.AdminService; -import org.apache.karaf.admin.Instance; -import org.apache.karaf.admin.InstanceSettings; +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.json.JSONException; import org.json.JSONWriter; @@ -39,17 +39,17 @@ import org.osgi.framework.BundleContext; import org.slf4j.LoggerFactory; /** - * Felix Web Console plugin for interacting with the {@link AdminService} + * Felix Web Console plugin for interacting with the {@link InstanceService} */ -public class AdminPlugin extends AbstractWebConsolePlugin { +public class InstancePlugin extends AbstractWebConsolePlugin { - private final org.slf4j.Logger logger = LoggerFactory.getLogger(AdminPlugin.class); + private final org.slf4j.Logger logger = LoggerFactory.getLogger(InstancePlugin.class); - public static final String NAME = "admin"; - public static final String LABEL = "Admin"; - private String adminJs = "/admin/res/ui/admin.js"; + public static final String NAME = "instance"; + public static final String LABEL = "Instance"; + private String instanceJs = "/instance/res/ui/instance.js"; private BundleContext bundleContext; - private AdminService adminService; + private InstanceService instanceService; private ClassLoader classLoader; /** @@ -81,8 +81,8 @@ public class AdminPlugin extends Abstrac final PrintWriter pw = res.getWriter(); String appRoot = (String) req.getAttribute("org.apache.felix.webconsole.wrapper.servlet.OsgiManager.appRoot"); - final String adminScriptTag = "<script src='" + appRoot + this.adminJs + "' language='JavaScript'></script>"; - pw.println(adminScriptTag); + final String instanceScriptTag = "<script src='" + appRoot + this.instanceJs + "' language='JavaScript'></script>"; + pw.println(instanceScriptTag); pw.println("<script type='text/javascript'>"); pw.println("// <![CDATA["); @@ -94,7 +94,7 @@ public class AdminPlugin extends Abstrac pw.println("<script type='text/javascript'>"); pw.println("// <![CDATA["); - pw.print("renderAdmin( "); + pw.print("renderInstance( "); writeJSON(pw); pw.println(" )"); pw.println("// ]]>"); @@ -212,7 +212,7 @@ public class AdminPlugin extends Abstrac private void writeJSON(final PrintWriter pw) { final JSONWriter jw = new JSONWriter(pw); - final Instance[] instances = adminService.getInstances(); + final Instance[] instances = instanceService.getInstances(); try { jw.object(); jw.key("status"); @@ -227,9 +227,9 @@ public class AdminPlugin extends Abstrac jw.endArray(); jw.endObject(); } catch (JSONException ex) { - Logger.getLogger(AdminPlugin.class.getName()).log(Level.SEVERE, null, ex); + Logger.getLogger(InstancePlugin.class.getName()).log(Level.SEVERE, null, ex); } catch (Exception ex) { - Logger.getLogger(AdminPlugin.class.getName()).log(Level.SEVERE, null, ex); + Logger.getLogger(InstancePlugin.class.getName()).log(Level.SEVERE, null, ex); } } @@ -274,7 +274,7 @@ public class AdminPlugin extends Abstrac } private String getStatusLine() { - final Instance[] instances = adminService.getInstances(); + final Instance[] instances = instanceService.getInstances(); int started = 0, starting = 0, stopped = 0; for (Instance instance : instances) { try { @@ -286,7 +286,7 @@ public class AdminPlugin extends Abstrac stopped++; } } catch (Exception ex) { - Logger.getLogger(AdminPlugin.class.getName()).log(Level.SEVERE, null, ex); + Logger.getLogger(InstancePlugin.class.getName()).log(Level.SEVERE, null, ex); } } final StringBuffer buffer = new StringBuffer(); @@ -317,58 +317,58 @@ public class AdminPlugin extends Abstrac private boolean createInstance(String name, InstanceSettings settings) { try { - adminService.createInstance(name, settings); + instanceService.createInstance(name, settings); return true; } catch (Exception ex) { - Logger.getLogger(AdminPlugin.class.getName()).log(Level.SEVERE, null, ex); + Logger.getLogger(InstancePlugin.class.getName()).log(Level.SEVERE, null, ex); } return false; } private boolean destroyInstance(String name) { try { - Instance instance = adminService.getInstance(name); + Instance instance = instanceService.getInstance(name); if (instance != null) { instance.destroy(); return true; } } catch (Exception ex) { - Logger.getLogger(AdminPlugin.class.getName()).log(Level.SEVERE, null, ex); + Logger.getLogger(InstancePlugin.class.getName()).log(Level.SEVERE, null, ex); } return false; } private boolean startInstance(String name, String javaOpts) { try { - Instance instance = adminService.getInstance(name); + Instance instance = instanceService.getInstance(name); if (instance != null) { instance.start(javaOpts); return true; } } catch (Exception ex) { - Logger.getLogger(AdminPlugin.class.getName()).log(Level.SEVERE, null, ex); + Logger.getLogger(InstancePlugin.class.getName()).log(Level.SEVERE, null, ex); } return false; } private boolean stopInstance(String name) { try { - Instance instance = adminService.getInstance(name); + Instance instance = instanceService.getInstance(name); if (instance != null) { instance.stop(); return true; } } catch (Exception ex) { - Logger.getLogger(AdminPlugin.class.getName()).log(Level.SEVERE, null, ex); + Logger.getLogger(InstancePlugin.class.getName()).log(Level.SEVERE, null, ex); } return false; } /** - * @param adminService the adminService to set + * @param instanceService the instanceService to set */ - public void setAdminService(AdminService adminService) { - this.adminService = adminService; + public void setInstanceService(InstanceService instanceService) { + this.instanceService = instanceService; } /** @@ -377,4 +377,5 @@ public class AdminPlugin extends Abstrac public void setBundleContext(BundleContext bundleContext) { this.bundleContext = bundleContext; } + } Copied: karaf/trunk/webconsole/instance/src/main/resources/OSGI-INF/blueprint/webconsole-instance.xml (from r1291022, karaf/trunk/webconsole/admin/src/main/resources/OSGI-INF/blueprint/webconsole-admin.xml) URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/instance/src/main/resources/OSGI-INF/blueprint/webconsole-instance.xml?p2=karaf/trunk/webconsole/instance/src/main/resources/OSGI-INF/blueprint/webconsole-instance.xml&p1=karaf/trunk/webconsole/admin/src/main/resources/OSGI-INF/blueprint/webconsole-admin.xml&r1=1291022&r2=1291178&rev=1291178&view=diff ============================================================================== --- karaf/trunk/webconsole/admin/src/main/resources/OSGI-INF/blueprint/webconsole-admin.xml (original) +++ karaf/trunk/webconsole/instance/src/main/resources/OSGI-INF/blueprint/webconsole-instance.xml Mon Feb 20 10:14:50 2012 @@ -19,16 +19,16 @@ --> <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"; default-activation="lazy"> - <reference id="adminService" interface="org.apache.karaf.admin.AdminService" /> + <reference id="instanceService" interface="org.apache.karaf.instance.InstanceService" /> - <bean id="adminPlugin" class="org.apache.karaf.webconsole.admin.AdminPlugin" init-method="start" destroy-method="stop"> - <property name="adminService" ref="adminService" /> + <bean id="instancePlugin" class="org.apache.karaf.webconsole.instance.InstancePlugin" init-method="start" destroy-method="stop"> + <property name="instanceService" ref="instanceService" /> <property name="bundleContext" ref="blueprintBundleContext" /> </bean> - <service ref="adminPlugin" interface="javax.servlet.Servlet" > + <service ref="instancePlugin" interface="javax.servlet.Servlet" > <service-properties> - <entry key="felix.webconsole.label" value="admin"/> + <entry key="felix.webconsole.label" value="instance"/> </service-properties> </service> Copied: karaf/trunk/webconsole/instance/src/main/resources/OSGI-INF/bundle.info (from r1291022, karaf/trunk/webconsole/admin/src/main/resources/OSGI-INF/bundle.info) URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/instance/src/main/resources/OSGI-INF/bundle.info?p2=karaf/trunk/webconsole/instance/src/main/resources/OSGI-INF/bundle.info&p1=karaf/trunk/webconsole/admin/src/main/resources/OSGI-INF/bundle.info&r1=1291022&r2=1291178&rev=1291178&view=diff ============================================================================== --- karaf/trunk/webconsole/admin/src/main/resources/OSGI-INF/bundle.info (original) +++ karaf/trunk/webconsole/instance/src/main/resources/OSGI-INF/bundle.info Mon Feb 20 10:14:50 2012 @@ -9,7 +9,7 @@ Maven URL: h1. Description -This bundle provides usage of admin commands (to manipulate Karaf instances) in the +This bundle provides usage of instance commands (to manipulate Karaf instances) in the Karaf Web Console. h1. See also Copied: karaf/trunk/webconsole/instance/src/main/resources/res/ui/instance.js (from r1291022, karaf/trunk/webconsole/admin/src/main/resources/res/ui/admin.js) URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/instance/src/main/resources/res/ui/instance.js?p2=karaf/trunk/webconsole/instance/src/main/resources/res/ui/instance.js&p1=karaf/trunk/webconsole/admin/src/main/resources/res/ui/admin.js&r1=1291022&r2=1291178&rev=1291178&view=diff ============================================================================== --- karaf/trunk/webconsole/admin/src/main/resources/res/ui/admin.js (original) +++ karaf/trunk/webconsole/instance/src/main/resources/res/ui/instance.js Mon Feb 20 10:14:50 2012 @@ -15,7 +15,7 @@ * limitations under the License. */ -function renderAdmin( data ) { +function renderInstance( data ) { $(document).ready( function() { renderView(); renderData( data ); Copied: karaf/trunk/webconsole/instance/src/test/java/org/apache/karaf/webconsole/instance/InstancePluginTest.java (from r1291022, karaf/trunk/webconsole/admin/src/test/java/org/apache/karaf/webconsole/admin/AdminPluginTest.java) URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/instance/src/test/java/org/apache/karaf/webconsole/instance/InstancePluginTest.java?p2=karaf/trunk/webconsole/instance/src/test/java/org/apache/karaf/webconsole/instance/InstancePluginTest.java&p1=karaf/trunk/webconsole/admin/src/test/java/org/apache/karaf/webconsole/admin/AdminPluginTest.java&r1=1291022&r2=1291178&rev=1291178&view=diff ============================================================================== --- karaf/trunk/webconsole/admin/src/test/java/org/apache/karaf/webconsole/admin/AdminPluginTest.java (original) +++ karaf/trunk/webconsole/instance/src/test/java/org/apache/karaf/webconsole/instance/InstancePluginTest.java Mon Feb 20 10:14:50 2012 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.karaf.webconsole.admin; +package org.apache.karaf.webconsole.instance; import java.io.ByteArrayOutputStream; import java.io.PrintWriter; @@ -30,13 +30,13 @@ import javax.servlet.http.HttpServletRes import junit.framework.TestCase; -import org.apache.karaf.admin.AdminService; -import org.apache.karaf.admin.Instance; -import org.apache.karaf.admin.InstanceSettings; +import org.apache.karaf.instance.InstanceService; +import org.apache.karaf.instance.Instance; +import org.apache.karaf.instance.InstanceSettings; import org.easymock.EasyMock; import org.easymock.IAnswer; -public class AdminPluginTest extends TestCase { +public class InstancePluginTest extends TestCase { public void testParseStringList() throws Exception { assertEquals(Arrays.asList("a", "b"), testParseStringList(" a ,b")); assertEquals(Collections.emptyList(), testParseStringList(null)); @@ -46,22 +46,22 @@ public class AdminPluginTest extends Tes @SuppressWarnings("unchecked") private List<String> testParseStringList(String s) throws Exception { - AdminPlugin ap = new AdminPlugin(); + InstancePlugin ap = new InstancePlugin(); Method m = ap.getClass().getDeclaredMethod("parseStringList", new Class [] {String.class}); m.setAccessible(true); return (List<String>) m.invoke(ap, s); } public void testDoPostCreate() throws Exception { - InstanceSettings is = + InstanceSettings instanceSettings = new InstanceSettings(123, 456, 789, null, null, Collections.singletonList("http://someURL";), Arrays.asList("abc", "def")); - AdminService adminService = EasyMock.createMock(AdminService.class); - EasyMock.expect(adminService.createInstance("instance1", is)).andReturn(null); - EasyMock.expect(adminService.getInstances()).andReturn(new Instance[] {}).anyTimes(); - EasyMock.replay(adminService); + InstanceService instanceService = EasyMock.createMock(InstanceService.class); + EasyMock.expect(instanceService.createInstance("instance1", instanceSettings)).andReturn(null); + EasyMock.expect(instanceService.getInstances()).andReturn(new Instance[]{}).anyTimes(); + EasyMock.replay(instanceService); - AdminPlugin ap = new AdminPlugin(); - ap.setAdminService(adminService); + InstancePlugin ap = new InstancePlugin(); + ap.setInstanceService(instanceService); final Map<String, String> params = new HashMap<String, String>(); params.put("action", "create"); @@ -86,7 +86,7 @@ public class AdminPluginTest extends Tes EasyMock.replay(req); EasyMock.replay(res); ap.doPost(req, res); - EasyMock.verify(adminService); + EasyMock.verify(instanceService); // Check that the operation has succeeded. This will cause some information to be written to // the outputstream... Modified: karaf/trunk/webconsole/pom.xml URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/pom.xml?rev=1291178&r1=1291177&r2=1291178&view=diff ============================================================================== --- karaf/trunk/webconsole/pom.xml (original) +++ karaf/trunk/webconsole/pom.xml Mon Feb 20 10:14:50 2012 @@ -40,7 +40,7 @@ <module>features</module> <module>gogo</module> <module>http</module> - <module>admin</module> + <module>instance</module> </modules> </project>
