Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Frost2012-07-12 10:06:32 -0400
committerChristopher Frost2012-07-12 10:06:32 -0400
commit41192d13df6c1ab6d223d7d703132bda27108382 (patch)
tree3a296fb2d7cd855f51c77649359593a879bae4e2 /org.eclipse.virgo.management.console
parent557711b67158e398351aac3c992e899750dedb65 (diff)
downloadorg.eclipse.virgo.kernel-41192d13df6c1ab6d223d7d703132bda27108382.tar.gz
org.eclipse.virgo.kernel-41192d13df6c1ab6d223d7d703132bda27108382.tar.xz
org.eclipse.virgo.kernel-41192d13df6c1ab6d223d7d703132bda27108382.zip
wip
Diffstat (limited to 'org.eclipse.virgo.management.console')
-rw-r--r--org.eclipse.virgo.management.console/.classpath20
-rw-r--r--org.eclipse.virgo.management.console/src/main/java/org/eclipse/virgo/management/console/Activator.java2
-rw-r--r--org.eclipse.virgo.management.console/src/main/java/org/eclipse/virgo/management/console/UploadServlet.java2
-rw-r--r--org.eclipse.virgo.management.console/src/main/webapp/js/common.js2
-rw-r--r--org.eclipse.virgo.management.console/src/main/webapp/js/overview.js3
-rw-r--r--org.eclipse.virgo.management.console/template.mf2
6 files changed, 8 insertions, 23 deletions
diff --git a/org.eclipse.virgo.management.console/.classpath b/org.eclipse.virgo.management.console/.classpath
index 01a9efb6..48e93a91 100644
--- a/org.eclipse.virgo.management.console/.classpath
+++ b/org.eclipse.virgo.management.console/.classpath
@@ -15,26 +15,14 @@
<attribute name="com.springsource.server.ide.jdt.core.test.classpathentry" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="var" path="APPS_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/APPS_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar">
- <attributes>
- <attribute name="org.eclipse.jst.component.nondependency" value=""/>
- </attributes>
- </classpathentry>
- <classpathentry kind="var" path="APPS_IVY_CACHE/javax.servlet/javax.servlet/3.0.0.v201103241009/javax.servlet-3.0.0.v201103241009.jar" sourcepath="/APPS_IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-sources-2.5.0.jar">
- <attributes>
- <attribute name="org.eclipse.jst.component.nondependency" value=""/>
- </attributes>
- </classpathentry>
- <classpathentry kind="var" path="APPS_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-1.6.1.jar">
- <attributes>
- <attribute name="org.eclipse.jst.component.nondependency" value=""/>
- </attributes>
- </classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-3.7.1.R37x_v20110808-1106.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20110613/org.eclipse.osgi-sources-3.7.0.v20110613.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20110513/org.eclipse.osgi.services-3.3.0.v20110513.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20110110/org.eclipse.osgi.services-sources-3.3.0.v20110110.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.fileupload/1.2.0.v20110525/com.springsource.org.apache.commons.fileupload-1.2.0.v20110525.jar" sourcepath="/KERNEL_IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.fileupload/1.2.1/com.springsource.org.apache.commons.fileupload-sources-1.2.1.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.jolokia/org.jolokia.osgi/1.0.2/org.jolokia.osgi-1.0.2.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.D-20120703101157/org.eclipse.virgo.util.io-3.5.0.D-20120703101157.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/2.1.0.D-20100218173020/org.eclipse.virgo.util.io-sources-2.1.0.D-20100218173020.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/javax.servlet/3.0.0.v201112011016/javax.servlet-3.0.0.v201112011016.jar" sourcepath="/APPS_IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-sources-2.5.0.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.6.4.v20120130-2120/org.slf4j.api-1.6.4.v20120130-2120.jar" sourcepath="/KERNEL_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-sources-1.6.1.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120711093140/org.eclipse.virgo.util.io-3.6.0.D-20120711093140.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/2.1.0.D-20100218173020/org.eclipse.virgo.util.io-sources-2.1.0.D-20100218173020.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/KERNEL_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.virgo.management.console/src/main/java/org/eclipse/virgo/management/console/Activator.java b/org.eclipse.virgo.management.console/src/main/java/org/eclipse/virgo/management/console/Activator.java
index f42b70f2..0925b6e5 100644
--- a/org.eclipse.virgo.management.console/src/main/java/org/eclipse/virgo/management/console/Activator.java
+++ b/org.eclipse.virgo.management.console/src/main/java/org/eclipse/virgo/management/console/Activator.java
@@ -93,7 +93,7 @@ public class Activator implements BundleActivator {
this.registeredHttpService.registerServlet(Activator.contextPath + CONTENT_CONTEXT_PATH, contentServlet, contentServletInitParams, adminHttpContext);
this.registeredHttpService.registerServlet(Activator.contextPath + RESOURCES_CONTEXT_PATH, new ResourceServlet(), null, adminHttpContext);
this.registeredHttpService.registerServlet(Activator.contextPath + UPLOAD_CONTEXT_PATH, new UploadServlet(this.bundleContext), null, adminHttpContext);
- this.registeredHttpService.registerServlet(Activator.contextPath + JOLOKIA_CONTEXT_PATH, new JolokiaServlet(this.bundleContext), null, adminHttpContext);
+ this.registeredHttpService.registerServlet(Activator.contextPath + JOLOKIA_CONTEXT_PATH, new JolokiaServlet(this.bundleContext), null, null);
this.isRegisteredWithHttpService = true;
log.info("Admin console registered to HttpService: " + Activator.contextPath);
} catch (Exception e) {
diff --git a/org.eclipse.virgo.management.console/src/main/java/org/eclipse/virgo/management/console/UploadServlet.java b/org.eclipse.virgo.management.console/src/main/java/org/eclipse/virgo/management/console/UploadServlet.java
index 9513ef63..edf07752 100644
--- a/org.eclipse.virgo.management.console/src/main/java/org/eclipse/virgo/management/console/UploadServlet.java
+++ b/org.eclipse.virgo.management.console/src/main/java/org/eclipse/virgo/management/console/UploadServlet.java
@@ -58,7 +58,7 @@ public class UploadServlet extends HttpServlet {
}
/**
- * Do not use this method with the HTTPService.
+ * Do not use this method with the HTTPService unless the BundleContext has already been set.
*/
public void init(ServletConfig config) throws ServletException {
super.init(config);
diff --git a/org.eclipse.virgo.management.console/src/main/webapp/js/common.js b/org.eclipse.virgo.management.console/src/main/webapp/js/common.js
index f8b87cb6..79bf1f38 100644
--- a/org.eclipse.virgo.management.console/src/main/webapp/js/common.js
+++ b/org.eclipse.virgo.management.console/src/main/webapp/js/common.js
@@ -128,11 +128,11 @@ var Util = function(){
* @param callback
*/
self.doBulkQuery = function(query, successCallback, errorCallback){
- console.log(JSON.stringify(query));
$.ajax({
type: 'POST',
url: self.getCurrentHost() + '/jolokia',
dataType: 'json',
+ contentType: 'application/json',
data: JSON.stringify(query),
success: function (response) {
successCallback(response);
diff --git a/org.eclipse.virgo.management.console/src/main/webapp/js/overview.js b/org.eclipse.virgo.management.console/src/main/webapp/js/overview.js
index 3e99e4de..7dd4574e 100644
--- a/org.eclipse.virgo.management.console/src/main/webapp/js/overview.js
+++ b/org.eclipse.virgo.management.console/src/main/webapp/js/overview.js
@@ -15,14 +15,11 @@
function pageinit() {
var renderOverviewTable = function(rows) {
-
$('#server-overview').replaceWith(util.makeTable({
headers: ['Name', 'Value'],
rows: rows
}));
-
util.pageReady();
-
};
new Server().getServerOverview(renderOverviewTable);
diff --git a/org.eclipse.virgo.management.console/template.mf b/org.eclipse.virgo.management.console/template.mf
index 8faa33d8..68ed02a8 100644
--- a/org.eclipse.virgo.management.console/template.mf
+++ b/org.eclipse.virgo.management.console/template.mf
@@ -7,7 +7,7 @@ Bundle-ClassPath: WEB-INF/classes
Web-ContextPath: /admin
Bundle-Activator: org.eclipse.virgo.management.console.Activator
Import-Template:
- javax.servlet.*;version="${javax.servlet:[-1.5.=,=.+1)}",
+ javax.servlet.*;version="${javax.servlet:[-1.6.=,=.+1)}",
org.eclipse.virgo.util.*;version="${org.eclipse.virgo.util:[=.=.=, +1)}",
org.jolokia.osgi.servlet;version="${org.jolokia.osgi:[=.=,+1.=)}",
org.slf4j;version="${org.slf4j:[=.=.=,+1)}",

Back to the top