Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlyn Normington2012-09-19 15:58:52 +0000
committerGlyn Normington2012-09-19 15:58:52 +0000
commit16da9e2a879daaa063a6c9b3f99bd524938d41b4 (patch)
tree002b1ccb9861cff9e7c4865a1e2d2fbf30f9cd3f
parent79b2a602b46fa96c7c83055ebfc85814614414c3 (diff)
parent3da5fb47c20aa86a7ef7eb10185bf370ce2af00d (diff)
downloadorg.eclipse.virgo.kernel-16da9e2a879daaa063a6c9b3f99bd524938d41b4.tar.gz
org.eclipse.virgo.kernel-16da9e2a879daaa063a6c9b3f99bd524938d41b4.tar.xz
org.eclipse.virgo.kernel-16da9e2a879daaa063a6c9b3f99bd524938d41b4.zip
Merge branch 'master' of ssh://git.eclipse.org/gitroot/virgo/org.eclipse.virgo.kernel
-rw-r--r--org.eclipse.virgo.kernel/ivy.xml1
-rw-r--r--org.eclipse.virgo.management.console/.classpath2
-rw-r--r--org.eclipse.virgo.management.console/src/main/java/org/eclipse/virgo/management/console/internal/AdminHttpContext.java4
3 files changed, 3 insertions, 4 deletions
diff --git a/org.eclipse.virgo.kernel/ivy.xml b/org.eclipse.virgo.kernel/ivy.xml
index 88ab919c..ded8a8f9 100644
--- a/org.eclipse.virgo.kernel/ivy.xml
+++ b/org.eclipse.virgo.kernel/ivy.xml
@@ -20,7 +20,6 @@
<dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.model" rev="latest.integration"/>
<dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.services" rev="latest.integration"/>
<dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.userregionfactory" rev="latest.integration"/>
- <dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.equinox.extensions" rev="latest.integration"/>
</dependencies>
</ivy-module>
diff --git a/org.eclipse.virgo.management.console/.classpath b/org.eclipse.virgo.management.console/.classpath
index 1f64a1a0..56bad194 100644
--- a/org.eclipse.virgo.management.console/.classpath
+++ b/org.eclipse.virgo.management.console/.classpath
@@ -20,7 +20,7 @@
<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.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/javax.servlet/3.0.0.v201112011016/javax.servlet-3.0.0.v201112011016.jar" sourcepath="/KERNEL_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.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"/>
diff --git a/org.eclipse.virgo.management.console/src/main/java/org/eclipse/virgo/management/console/internal/AdminHttpContext.java b/org.eclipse.virgo.management.console/src/main/java/org/eclipse/virgo/management/console/internal/AdminHttpContext.java
index 000ab1ec..9054289d 100644
--- a/org.eclipse.virgo.management.console/src/main/java/org/eclipse/virgo/management/console/internal/AdminHttpContext.java
+++ b/org.eclipse.virgo.management.console/src/main/java/org/eclipse/virgo/management/console/internal/AdminHttpContext.java
@@ -62,9 +62,9 @@ public class AdminHttpContext implements HttpContext {
int colon = credentials.indexOf(':');
String userid = credentials.substring(0, colon);
String password = credentials.substring(colon + 1);
-
+
try {
- Subject subject = login(request.getSession(false), userid, password);
+ Subject subject = login(request.getSession(true), userid, password);
if(subject == null){
return reject(request, response);
}

Back to the top