Author: solomax
Date: Thu Oct 25 11:52:49 2012
New Revision: 1402109
URL: http://svn.apache.org/viewvc?rev=1402109&view=rev
Log:
DummyServletContext is fixed to return correct context path
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cli/Admin.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cli/DummyServletContext.java
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cli/Admin.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cli/Admin.java?rev=1402109&r1=1402108&r2=1402109&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cli/Admin.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cli/Admin.java
Thu Oct 25 11:52:49 2012
@@ -156,7 +156,7 @@ public class Admin {
private ClassPathXmlApplicationContext getApplicationContext(final
String ctxName) {
if (ctx == null) {
OMContextListener omcl = new OMContextListener();
- omcl.contextInitialized(new ServletContextEvent(new
DummyServletContext()));
+ omcl.contextInitialized(new ServletContextEvent(new
DummyServletContext(ctxName)));
try {
ctx = new
ClassPathXmlApplicationContext("openmeetings-applicationContext.xml");
} catch (Exception e) {
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cli/DummyServletContext.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cli/DummyServletContext.java?rev=1402109&r1=1402108&r2=1402109&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cli/DummyServletContext.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cli/DummyServletContext.java
Thu Oct 25 11:52:49 2012
@@ -39,14 +39,19 @@ import javax.servlet.ServletRegistration
import javax.servlet.descriptor.JspConfigDescriptor;
public class DummyServletContext implements ServletContext {
+ private String ctx;
+
+ public DummyServletContext(String ctx) {
+ this.ctx = ctx;
+ }
+
public ServletContext getContext(String uripath) {
// stab
return null;
}
public String getContextPath() {
- // stab
- return null;
+ return ctx;
}
public int getMajorVersion() {
