Author: indika Date: Fri Jun 20 07:31:34 2008 New Revision: 18532 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=18532
Log: fix websphre deployment issue Modified: trunk/esb/java/modules/core/src/main/java/org/wso2/esb/transport/tomcat/StartUpServlet.java trunk/esb/java/pom.xml Modified: trunk/esb/java/modules/core/src/main/java/org/wso2/esb/transport/tomcat/StartUpServlet.java URL: http://wso2.org/svn/browse/wso2/trunk/esb/java/modules/core/src/main/java/org/wso2/esb/transport/tomcat/StartUpServlet.java?rev=18532&r1=18531&r2=18532&view=diff ============================================================================== --- trunk/esb/java/modules/core/src/main/java/org/wso2/esb/transport/tomcat/StartUpServlet.java (original) +++ trunk/esb/java/modules/core/src/main/java/org/wso2/esb/transport/tomcat/StartUpServlet.java Fri Jun 20 07:31:34 2008 @@ -23,6 +23,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.adminui.AdminUIServletFilter; +import org.wso2.adminui.AdminUIConstants; import org.wso2.esb.ServiceBusManager; import org.wso2.esb.ServiceBusConfiguration; import org.wso2.esb.ServiceBusConstants; @@ -79,18 +80,13 @@ Map fileContents = (Map) configctx.getProperty(org.wso2.esb.ServiceBusConstants.GENERATED_PAGES); if (fileContents != null) { - AdminUIServletFilter adminUIServletFilter = - (AdminUIServletFilter) servletContext.getAttribute(AdminUIServletFilter.class.getName()); - - if (adminUIServletFilter != null) { - adminUIServletFilter.init(fileContents, - true, - sbc.getConsolePort(), - sbc.getHttpPort(), - configctx.getServiceContextPath()); - } + servletContext.setAttribute(AdminUIConstants.GENERATED_PAGES, fileContents); + servletContext.setAttribute(AdminUIConstants.ENABLE_CONSOLE, true); + servletContext.setAttribute(AdminUIConstants.HTTP_PORT, sbc.getHttpsPort() + ""); + servletContext.setAttribute(AdminUIConstants.HTTPS_PORT, sbc.getConsolePort() + ""); + servletContext.setAttribute(AdminUIConstants.SERVICE_CONTEXT_PATH, + configctx.getServiceContextPath()); } - // we only want to initialize the ServiceBusManager only once through this startup // servlet. Stopping and [re]starting thereafter is only via JMX servletContext.setAttribute(INITIALIZED, Boolean.TRUE); Modified: trunk/esb/java/pom.xml URL: http://wso2.org/svn/browse/wso2/trunk/esb/java/pom.xml?rev=18532&r1=18531&r2=18532&view=diff ============================================================================== --- trunk/esb/java/pom.xml (original) +++ trunk/esb/java/pom.xml Fri Jun 20 07:31:34 2008 @@ -491,7 +491,7 @@ <dependency> <groupId>org.wso2.adminui</groupId> <artifactId>wso2adminui</artifactId> - <version>${wso2.adminui.version}</version> + <version>${wso2.adminui.core.version}</version> <type>jar</type> <exclusions> <exclusion> @@ -856,6 +856,7 @@ <wso2commons.statistics.version>2.2.1</wso2commons.statistics.version> <wso2commons.utils.version>2.2.1</wso2commons.utils.version> <wso2.adminui.version>1.2</wso2.adminui.version> + <wso2.adminui.core.version>2.3</wso2.adminui.core.version> <wso2.adminui.version.graphs>1.1</wso2.adminui.version.graphs> <wso2registry.core.version>1.1</wso2registry.core.version> <hsqldb.version>1.8.0</hsqldb.version> _______________________________________________ Esb-java-dev mailing list [email protected] http://wso2.org/cgi-bin/mailman/listinfo/esb-java-dev
