[wsas-java-dev] [wsas commit] r11 - in wsas/java/trunk: . etc
modules/core/src/org/wso2/wsas modules/servlet-edition/conf
modules/servlet-edition/src/org/wso2/wsas
modules/www/extensions/core/js
svn at wso2.com
svn at wso2.com
Thu Nov 30 00:18:04 PST 2006
Author: azeez
Date: Thu Nov 30 00:18:03 2006
New Revision: 11
Modified:
wsas/java/trunk/etc/project.properties
wsas/java/trunk/maven.xml
wsas/java/trunk/modules/core/src/org/wso2/wsas/ServerManager.java
wsas/java/trunk/modules/servlet-edition/conf/web.xml
wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/MainServlet.java
wsas/java/trunk/modules/www/extensions/core/js/rampart_specific_transformer.js
wsas/java/trunk/project.properties
wsas/java/trunk/project.xml
Log:
switching to adminui lib
Modified: wsas/java/trunk/etc/project.properties
==============================================================================
--- wsas/java/trunk/etc/project.properties (original)
+++ wsas/java/trunk/etc/project.properties Thu Nov 30 00:18:03 2006
@@ -138,7 +138,7 @@
jdom.version=1.0
jakarta.oro.version=2.0.8
-wso2.mfui.version=1.1
+wso2.adminui.version=1.1
spring.version=1.2.6
Modified: wsas/java/trunk/maven.xml
==============================================================================
--- wsas/java/trunk/maven.xml (original)
+++ wsas/java/trunk/maven.xml Thu Nov 30 00:18:03 2006
@@ -957,15 +957,15 @@
<ant:unzip
- src="${dist.temp.dir}/lib/wso2wsf-mfui-zip-${wso2.mfui.version}.zip"
+ src="${dist.temp.dir}/lib/wso2-adminui-zip-${wso2.adminui.version}.zip"
dest="${dist.dir.temp.www}"/>
<!-- unzip javascript related to Plotkit graphs -->
<ant:unzip
- src="${dist.temp.dir}/lib/wso2wsf-mfui-graphs-zip-${wso2.mfui.version}.zip"
+ src="${dist.temp.dir}/lib/wso2-adminui-graphs-zip-${wso2.adminui.version}.zip"
dest="${dist.dir.temp.www}"/>
- <ant:delete file="${dist.temp.dir}/lib/wso2wsf-mfui-graphs-zip-${wso2.mfui.version}.zip"/>
- <ant:delete file="${dist.temp.dir}/lib/wso2wsf-mfui-zip-${wso2.mfui.version}.zip"/>
+ <ant:delete file="${dist.temp.dir}/lib/wso2-adminui-graphs-zip-${wso2.adminui.version}.zip"/>
+ <ant:delete file="${dist.temp.dir}/lib/wso2-adminui-zip-${wso2.adminui.version}.zip"/>
<!--copy admin web app-->
<ant:copy todir="${dist.temp.dir}/lib/www">
@@ -1040,7 +1040,7 @@
</ant:fileset>
</ant:copy>
- <ant:delete file="${dist.temp.dir}/lib/wso2-mfui-zip-${wso2.mfui.version}.zip"/>
+ <ant:delete file="${dist.temp.dir}/lib/wso2-adminui-zip-${wso2.adminui.version}.zip"/>
<!--Import the cert into a new store as a trusted cert to be used by the Admin Client-->
<java classname="org.wso2.wsas.security.util.ImportKey" fork="true">
@@ -1172,11 +1172,11 @@
</ant:copy>
<ant:unzip
- src="${war.temp.dir}/WEB-INF/lib/wso2wsf-mfui-zip-${wso2.mfui.version}.zip"
+ src="${war.temp.dir}/WEB-INF/lib/wso2-adminui-zip-${wso2.adminui.version}.zip"
dest="${dist.dir.temp.war.www}"/>
<ant:unzip
- src="${war.temp.dir}/WEB-INF/lib/wso2wsf-mfui-graphs-zip-${wso2.mfui.version}.zip"
+ src="${war.temp.dir}/WEB-INF/lib/wso2-adminui-graphs-zip-${wso2.adminui.version}.zip"
dest="${dist.dir.temp.war.www}"/>
<ant:copy todir="${war.temp.dir}">
@@ -1218,7 +1218,7 @@
</ant:fileset>
</ant:copy>
- <ant:delete file="${dist.temp.dir}/lib/wso2-mfui-zip-${wso2.mfui.version}.zip"/>
+ <ant:delete file="${dist.temp.dir}/lib/wso2-adminui-zip-${wso2.adminui.version}.zip"/>
<ant:delete dir="${dist.dir.temp.war.www}"/>
<ant:mkdir dir="${war.temp.dir}/docs"/>
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/ServerManager.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/ServerManager.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/ServerManager.java Thu Nov 30 00:18:03 2006
@@ -26,8 +26,8 @@
import org.apache.commons.collections.BidiMap;
import org.apache.commons.collections.bidimap.TreeBidiMap;
import org.apache.log4j.Logger;
-import org.wso2.mfui.UIProcessingException;
-import org.wso2.mfui.UIProcessor;
+import org.wso2.adminui.UIProcessingException;
+import org.wso2.adminui.UIProcessor;
import org.wso2.wsas.deployment.ServerConfigurator;
import org.wso2.wsas.persistence.PersistenceManager;
import org.wso2.wsas.persistence.dataobject.ModuleDO;
Modified: wsas/java/trunk/modules/servlet-edition/conf/web.xml
==============================================================================
--- wsas/java/trunk/modules/servlet-edition/conf/web.xml (original)
+++ wsas/java/trunk/modules/servlet-edition/conf/web.xml Thu Nov 30 00:18:03 2006
@@ -22,7 +22,7 @@
<display-name>WSO2 WSAS</display-name>
<filter>
<filter-name>AdminFilter</filter-name>
- <filter-class>org.wso2.mfui.MFUIServletFilter</filter-class>
+ <filter-class>org.wso2.adminui.AdminUIServletFilter</filter-class>
</filter>
<filter-mapping>
Modified: wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/MainServlet.java
==============================================================================
--- wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/MainServlet.java (original)
+++ wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/MainServlet.java Thu Nov 30 00:18:03 2006
@@ -17,7 +17,7 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.log4j.Logger;
-import org.wso2.mfui.MFUIServletFilter;
+import org.wso2.adminui.AdminUIServletFilter;
import org.wso2.wsas.transport.util.Restartable;
import org.wso2.wsas.transport.util.SystemRestarter;
import org.wso2.wsas.util.*;
@@ -189,8 +189,8 @@
serverConfig.getFirstProperty("WorkDirectory"));
serverManager.configContext.setProperty(ServerConstants.WSO2WSAS_INSTANCE, this);
- ((MFUIServletFilter) servletContext.
- getAttribute(MFUIServletFilter.class.getName())).
+ ((AdminUIServletFilter) servletContext.
+ getAttribute(AdminUIServletFilter.class.getName())).
init((Map) serverManager.configContext.
getProperty(ServerConstants.GENERATED_PAGES),
serverConfig.getFirstProperty("AdminWeb.ContextPath"));
@@ -251,8 +251,8 @@
Object attrib = servletContext.getAttribute((String) attributeNames.nextElement());
if (attrib instanceof HttpServlet) {
((HttpServlet) attrib).init();
- } else if (attrib instanceof MFUIServletFilter) {
- ((MFUIServletFilter) attrib).
+ } else if (attrib instanceof AdminUIServletFilter) {
+ ((AdminUIServletFilter) attrib).
init((Map) serverManager.configContext.
getProperty(ServerConstants.GENERATED_PAGES),
ServerConfiguration.getInstance().
Modified: wsas/java/trunk/modules/www/extensions/core/js/rampart_specific_transformer.js
==============================================================================
--- wsas/java/trunk/modules/www/extensions/core/js/rampart_specific_transformer.js (original)
+++ wsas/java/trunk/modules/www/extensions/core/js/rampart_specific_transformer.js Thu Nov 30 00:18:03 2006
@@ -35,7 +35,7 @@
}
function mozillaSpecificXSLLoader(xslFileName) {
- /*xslProcessor variable is avaiable from wso2_mgt_mfui */
+ /*xslProcessor variable is avaiable from wso2_adminui */
xsltProcessor = new XSLTProcessor();
var p = createXMLHttpRequest();
var fullPath = URL + "/extensions/core/xslt/" + rampartExtensionPath +"/"+xslFileName;
Modified: wsas/java/trunk/project.properties
==============================================================================
--- wsas/java/trunk/project.properties (original)
+++ wsas/java/trunk/project.properties Thu Nov 30 00:18:03 2006
@@ -138,7 +138,7 @@
jdom.version=1.0
jakarta.oro.version=2.0.8
-wso2.mfui.version=1.1
+wso2.adminui.version=1.1
spring.version=1.2.6
Modified: wsas/java/trunk/project.xml
==============================================================================
--- wsas/java/trunk/project.xml (original)
+++ wsas/java/trunk/project.xml Thu Nov 30 00:18:03 2006
@@ -699,21 +699,21 @@
<version>${jakarta.httpcore.version}</version>
</dependency>
<dependency>
- <groupId>org.wso2.wsf</groupId>
- <artifactId>wso2wsf-mfui</artifactId>
- <version>${wso2.mfui.version}</version>
+ <groupId>org.wso2.adminui</groupId>
+ <artifactId>wso2-adminui</artifactId>
+ <version>${wso2.adminui.version}</version>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.wso2.wsf</groupId>
- <artifactId>wso2wsf-mfui-zip</artifactId>
- <version>${wso2.mfui.version}</version>
+ <groupId>org.wso2.adminui</groupId>
+ <artifactId>wso2-adminui-zip</artifactId>
+ <version>${wso2.adminui.version}</version>
<type>zip</type>
</dependency>
<dependency>
- <groupId>org.wso2.wsf</groupId>
- <artifactId>wso2wsf-mfui-graphs-zip</artifactId>
- <version>${wso2.mfui.version}</version>
+ <groupId>org.wso2.adminui</groupId>
+ <artifactId>wso2-adminui-graphs-zip</artifactId>
+ <version>${wso2.adminui.version}</version>
<type>zip</type>
</dependency>
<dependency>
More information about the Wsas-java-dev
mailing list