[wsas-java-dev] svn commit r468 - in wsas/java/trunk: .
modules/admin/src/org/wso2/wsas/admin/service/META-INF
modules/core/src/org/wso2/wsas/transport/jetty
modules/distribution/common modules/distribution/common/src/assemble
modules/distribution/webapp modules/distribution/webapp/src/assemble
svn at wso2.com
svn at wso2.com
Wed Jan 17 05:32:11 PST 2007
Author: saminda
Date: Wed Jan 17 05:31:44 2007
New Revision: 468
Modified:
wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/META-INF/services.xml
wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/jetty/Axis2Handler.java
wsas/java/trunk/modules/distribution/common/pom.xml
wsas/java/trunk/modules/distribution/common/src/assemble/dist-common-assembly.xml
wsas/java/trunk/modules/distribution/webapp/pom.xml
wsas/java/trunk/modules/distribution/webapp/src/assemble/dist-webapp-assembly.xml
wsas/java/trunk/pom.xml
Log:
1. wso2-adminui changed to wso2adminui and wso2-adminui-zip changed to wso2adminui {type:zip}
2. Partially implemented transport session management. Admin services scopes change soapsession to transportsession.
Modified: wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/META-INF/services.xml
==============================================================================
--- wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/META-INF/services.xml (original)
+++ wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/META-INF/services.xml Wed Jan 17 05:31:44 2007
@@ -1,10 +1,11 @@
<serviceGroup>
<!--
Engage Admin module to all Admin Services
+ //TODO Chaning the scope to "transportsession"
-->
<module ref="wso2wsas-admin"/>
- <service name="ServerAdmin" scope="soapsession">
+ <service name="ServerAdmin" scope="transportsession">
<schema schemaNamespace="http://org.apache.axis2/xsd" elementFormDefaultQualified="false"/>
<transports>
<transport>https</transport>
@@ -22,7 +23,7 @@
org.wso2.wsas.admin.service.ServerAdmin</parameter>
</service>
- <service name="LoggingAdmin" scope="soapsession">
+ <service name="LoggingAdmin" scope="transportsession">
<schema schemaNamespace="http://org.apache.axis2/xsd" elementFormDefaultQualified="false"/>
<transports>
<transport>https</transport>
@@ -39,7 +40,7 @@
<parameter name="ServiceClass">org.wso2.wsas.admin.service.logging.LoggingAdmin</parameter>
</service>
- <service name="UserAdmin" scope="soapsession">
+ <service name="UserAdmin" scope="transportsession">
<schema schemaNamespace="http://org.apache.axis2/xsd" elementFormDefaultQualified="false"/>
<transports>
<transport>https</transport>
@@ -57,7 +58,7 @@
org.wso2.wsas.admin.service.UserAdmin</parameter>
</service>
- <service name="GlobalAdmin" scope="soapsession">
+ <service name="GlobalAdmin" scope="transportsession">
<schema schemaNamespace="http://org.apache.axis2/xsd" elementFormDefaultQualified="false"/>
<transports>
<transport>https</transport>
@@ -75,7 +76,7 @@
org.wso2.wsas.admin.service.GlobalAdmin</parameter>
</service>
- <service name="ServiceGroupAdmin" scope="soapsession">
+ <service name="ServiceGroupAdmin" scope="transportsession">
<schema schemaNamespace="http://org.apache.axis2/xsd" elementFormDefaultQualified="false"/>
<transports>
<transport>https</transport>
@@ -92,7 +93,7 @@
<parameter name="ServiceClass">org.wso2.wsas.admin.service.ServiceGroupAdmin</parameter>
</service>
- <service name="ServiceAdmin" scope="soapsession">
+ <service name="ServiceAdmin" scope="transportsession">
<schema schemaNamespace="http://org.apache.axis2/xsd" elementFormDefaultQualified="false"/>
<transports>
<transport>https</transport>
@@ -109,7 +110,7 @@
<parameter name="ServiceClass">org.wso2.wsas.admin.service.ServiceAdmin</parameter>
</service>
- <service name="OperationAdmin" scope="soapsession">
+ <service name="OperationAdmin" scope="transportsession">
<schema schemaNamespace="http://org.apache.axis2/xsd" elementFormDefaultQualified="false"/>
<transports>
<transport>https</transport>
@@ -126,7 +127,7 @@
<parameter name="ServiceClass">org.wso2.wsas.admin.service.OperationAdmin</parameter>
</service>
- <service name="ModuleAdmin" scope="soapsession">
+ <service name="ModuleAdmin" scope="transportsession">
<schema schemaNamespace="http://org.apache.axis2/xsd" elementFormDefaultQualified="false"/>
<transports>
<transport>https</transport>
@@ -143,7 +144,7 @@
<parameter name="ServiceClass">org.wso2.wsas.admin.service.ModuleAdmin</parameter>
</service>
- <service name="LoggingService" scope="soapsession">
+ <service name="LoggingService" scope="transportsession">
<transports>
<transport>https</transport>
</transports>
@@ -159,7 +160,7 @@
</operation>
</service>
- <service name="TransportAdmin" scope="soapsession">
+ <service name="TransportAdmin" scope="transportsession">
<schema schemaNamespace="http://org.apache.axis2/xsd" elementFormDefaultQualified="false"/>
<transports>
<transport>https</transport>
@@ -176,7 +177,7 @@
<parameter name="ServiceClass">org.wso2.wsas.admin.service.TransportAdmin</parameter>
</service>
- <service name="CryptoAdmin" scope="soapsession">
+ <service name="CryptoAdmin" scope="transportsession">
<schema schemaNamespace="http://org.apache.axis2/xsd" elementFormDefaultQualified="false"/>
<transports>
<transport>https</transport>
@@ -193,7 +194,7 @@
<parameter name="ServiceClass">org.wso2.wsas.admin.service.CryptoAdmin</parameter>
</service>
- <service name="AxisConfigAdmin" scope="soapsession">
+ <service name="AxisConfigAdmin" scope="transportsession">
<schema schemaNamespace="http://org.apache.axis2/xsd" elementFormDefaultQualified="false"/>
<transports>
<transport>https</transport>
@@ -210,7 +211,7 @@
<parameter name="ServiceClass">org.wso2.wsas.admin.service.AxisConfigAdmin</parameter>
</service>
- <service name="SecurityScenarioConfigAdmin" scope="soapsession">
+ <service name="SecurityScenarioConfigAdmin" scope="transportsession">
<schema schemaNamespace="http://org.apache.axis2/xsd" elementFormDefaultQualified="false"/>
<transports>
<transport>https</transport>
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/jetty/Axis2Handler.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/jetty/Axis2Handler.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/jetty/Axis2Handler.java Wed Jan 17 05:31:44 2007
@@ -21,6 +21,7 @@
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.context.SessionContext;
import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.engine.AxisEngine;
import org.apache.axis2.i18n.Messages;
@@ -39,6 +40,7 @@
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
import javax.xml.namespace.QName;
import java.io.IOException;
import java.io.OutputStream;
@@ -141,6 +143,13 @@
msgContext.setFrom(new EndpointReference(request.getRemoteAddr()));
+ //TODO Session management for admin services.
+ //TODO if needed use a switch here
+ Object sessionObject = manageSessionContext(request);
+ msgContext.setSessionContext((SessionContext)sessionObject);
+ msgContext.setProperty("SessionId",request.getSession().getId());
+
+
String method = request.getMethod();
try {
if (org.wso2.wsas.ServerConstants.HTTPConstants.HTTP_METHOD_GET.equals(method))
@@ -227,6 +236,17 @@
}
}
+ protected Object manageSessionContext(HttpServletRequest request) {
+ HttpSession httpSession = request.getSession(true);
+ Object sessionContext = httpSession.getAttribute(Constants.SESSION_CONTEXT_PROPERTY);
+ if (sessionContext == null) {
+ sessionContext = new SessionContext(null);
+ httpSession.setAttribute(Constants.SESSION_CONTEXT_PROPERTY,sessionContext);
+ }
+ return sessionContext;
+
+ }
+
protected abstract boolean processPostRequest(MessageContext msgContext,
HttpServletRequest request,
HttpServletResponse response)
Modified: wsas/java/trunk/modules/distribution/common/pom.xml
==============================================================================
--- wsas/java/trunk/modules/distribution/common/pom.xml (original)
+++ wsas/java/trunk/modules/distribution/common/pom.xml Wed Jan 17 05:31:44 2007
@@ -63,7 +63,7 @@
<!-- Adminui related zips -->
<artifactItem>
<groupId>org.wso2.adminui</groupId>
- <artifactId>wso2-adminui-zip</artifactId>
+ <artifactId>wso2adminui</artifactId>
<version>${wso2.adminui.version}</version>
<type>zip</type>
<overWrite>true</overWrite>
@@ -389,7 +389,7 @@
</fileset>
</copy>
- <unzip src="target/zips/wso2-adminui-zip-${wso2.adminui.version}.zip"
+ <unzip src="target/zips/wso2adminui-${wso2.adminui.version}.zip"
dest="${dist.dir.temp.www}"/>
<!-- unzip javascript related to Plotkit graphs -->
<unzip src="target/zips/wso2-adminui-graphs-zip-${wso2.adminui.version}.zip"
Modified: wsas/java/trunk/modules/distribution/common/src/assemble/dist-common-assembly.xml
==============================================================================
--- wsas/java/trunk/modules/distribution/common/src/assemble/dist-common-assembly.xml (original)
+++ wsas/java/trunk/modules/distribution/common/src/assemble/dist-common-assembly.xml Wed Jan 17 05:31:44 2007
@@ -42,7 +42,7 @@
<exclude>org.apache.axis2:rampart:mar</exclude>
<exclude>org.apache.axis2:rahas:mar</exclude>
<exclude>org.apache.sandesha2:sandesha2:mar</exclude>
- <exclude>org.wso2.adminui:wso2-adminui-zip:zip</exclude>
+ <exclude>org.wso2.adminui:wso2adminui:zip</exclude>
<exclude>org.wso2.adminui:wso2-adminui-graphs-zip:zip</exclude>
</excludes>
</dependencySet>
Modified: wsas/java/trunk/modules/distribution/webapp/pom.xml
==============================================================================
--- wsas/java/trunk/modules/distribution/webapp/pom.xml (original)
+++ wsas/java/trunk/modules/distribution/webapp/pom.xml Wed Jan 17 05:31:44 2007
@@ -62,7 +62,7 @@
<!-- Adminui related zips -->
<artifactItem>
<groupId>org.wso2.adminui</groupId>
- <artifactId>wso2-adminui-zip</artifactId>
+ <artifactId>wso2adminui</artifactId>
<version>${wso2.adminui.version}</version>
<type>zip</type>
<overWrite>true</overWrite>
@@ -131,7 +131,7 @@
<configuration>
<tasks>
<mkdir dir="${dist.dir.temp.war.www}"/>
- <unzip src="target/zips/wso2-adminui-zip-${wso2.adminui.version}.zip"
+ <unzip src="target/zips/wso2adminui-${wso2.adminui.version}.zip"
dest="${dist.dir.temp.war.www}"/>
<unzip src="target/zips/wso2-adminui-graphs-zip-${wso2.adminui.version}.zip"
Modified: wsas/java/trunk/modules/distribution/webapp/src/assemble/dist-webapp-assembly.xml
==============================================================================
--- wsas/java/trunk/modules/distribution/webapp/src/assemble/dist-webapp-assembly.xml (original)
+++ wsas/java/trunk/modules/distribution/webapp/src/assemble/dist-webapp-assembly.xml Wed Jan 17 05:31:44 2007
@@ -76,7 +76,7 @@
<exclude>org.apache.axis2:rampart:mar</exclude>
<exclude>org.apache.axis2:rahas:mar</exclude>
<exclude>org.apache.sandesha2:sandesha2:mar</exclude>
- <exclude>org.wso2.adminui:wso2-adminui-zip:zip</exclude>
+ <exclude>org.wso2.adminui:wso2adminui:zip</exclude>
<exclude>org.wso2.adminui:wso2-adminui-graphs-zip:zip</exclude>
<exclude>javax.servlet:servlet-api:jar</exclude>
<exclude>jetty:jetty:jar</exclude>
Modified: wsas/java/trunk/pom.xml
==============================================================================
--- wsas/java/trunk/pom.xml (original)
+++ wsas/java/trunk/pom.xml Wed Jan 17 05:31:44 2007
@@ -665,20 +665,20 @@
</dependency>
<dependency>
<groupId>org.wso2.adminui</groupId>
- <artifactId>wso2-adminui</artifactId>
+ <artifactId>wso2adminui</artifactId>
<version>${wso2.adminui.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.wso2.adminui</groupId>
- <artifactId>wso2-adminui-zip</artifactId>
+ <artifactId>wso2adminui</artifactId>
<version>${wso2.adminui.version}</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.wso2.adminui</groupId>
<artifactId>wso2-adminui-graphs-zip</artifactId>
- <version>${wso2.adminui.version}</version>
+ <version>${wso2.adminui.version.graphs}</version>
<type>zip</type>
</dependency>
<dependency>
@@ -946,7 +946,8 @@
<rhino.js.version>1_6R2</rhino.js.version>
- <wso2.adminui.version>1.1</wso2.adminui.version>
+ <wso2.adminui.version>1.2-SNAPSHOT</wso2.adminui.version>
+ <wso2.adminui.version.graphs>1.1</wso2.adminui.version.graphs>
<server.short.name>WSO2 WSAS</server.short.name>
<server.name>WSO2 Web Services Application Server</server.name>
More information about the Wsas-java-dev
mailing list