[wsas-java-dev] svn commit r2143 - in trunk/wsas/java/modules:
admin/src/org/wso2/wsas/admin/service
admin/src/org/wso2/wsas/admin/service/util
core/src/org/wso2/wsas/deployment core/src/org/wso2/wsas/feed
core/src/org/wso2/wsas/transport core/src/org/wso2/wsas/util
www/extensions/core
svn at wso2.org
svn at wso2.org
Wed May 2 07:50:11 PDT 2007
Author: azeez
Date: Wed May 2 07:45:03 2007
New Revision: 2143
Modified:
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/OperationAdmin.java
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceGroupAdmin.java
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/ServerStatus.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/deployment/DeploymentInterceptor.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/feed/FeedListener.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/ServerInfo.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/WSASServlet.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/util/AdminFilter.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/util/TraceFilterImpl.java
trunk/wsas/java/modules/www/extensions/core/js.html
Log:
Code review and improvements
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/OperationAdmin.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/OperationAdmin.java (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/OperationAdmin.java Wed May 2 07:45:03 2007
@@ -260,9 +260,6 @@
// Persist the parameter
PersistenceManager pm = new PersistenceManager();
Parameter p = axisOp.getParameter(parameter.getName());
- OperationDO opDO = pm.getOperation(serviceId,
- ServiceIdentifierDO.EMPTY_SERVICE_VERSION,
- operationId);
if (p != null) {
if (!p.isLocked()) {
@@ -273,24 +270,8 @@
ServiceIdentifierDO.EMPTY_SERVICE_VERSION,
operationId,
parameter.getName());
- // AxisOperation.getParameter() will find the param searching the entire description
- // hierarchy up.
- if (paramDO == null) {
- OperationParameterDO oDO = new OperationParameterDO();
- oDO.setName(parameter.getName());
- oDO.setValue(parameterElement.toString());
- oDO.setOperation(opDO);
-
- try {
- pm.addEntity(oDO);
- } catch (DuplicateEntityException e) {
- log.error("Operation Parameter already exists", e);
- }
-
- } else {
- paramDO.setValue(parameterElement.toString());
- pm.updateEntity(paramDO);
- }
+ paramDO.setValue(parameterElement.toString());
+ pm.updateEntity(paramDO);
}
} else {
axisOp.addParameter(parameter);
@@ -298,6 +279,10 @@
OperationParameterDO paramDO = new OperationParameterDO();
paramDO.setName(parameter.getName());
paramDO.setValue(parameterElement.toString());
+
+ OperationDO opDO = pm.getOperation(serviceId,
+ ServiceIdentifierDO.EMPTY_SERVICE_VERSION,
+ operationId);
paramDO.setOperation(opDO);
try {
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java Wed May 2 07:45:03 2007
@@ -468,23 +468,10 @@
if (!p.isLocked()) {
axisService.addParameter(parameter);
- ServiceParameterDO paramDO = pm.getServiceParameter(serviceDO, parameter.getName());
- // The given operation could exists in any palce in the description hierarchy.Thus,
- // if present, to sync with AxisService, ServiceDO should be filled with ServiceParameterDO.
- if (paramDO == null) {
- ServiceParameterDO pDO = new ServiceParameterDO();
- pDO.setName(parameter.getName());
- pDO.setValue(paramterElement.toString());
- pDO.setService(serviceDO);
- try {
- pm.addEntity(pDO);
- } catch (DuplicateEntityException e) {
- log.error("Service Parameter already exists", e);
- }
- } else {
- paramDO.setValue(paramterElement.toString());
- pm.updateEntity(paramDO);
- }
+ ServiceParameterDO paramDO = pm.getServiceParameter(serviceDO,
+ parameter.getName());
+ paramDO.setValue(paramterElement.toString());
+ pm.updateEntity(paramDO);
}
} else {
axisService.addParameter(parameter);
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceGroupAdmin.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceGroupAdmin.java (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceGroupAdmin.java Wed May 2 07:45:03 2007
@@ -23,7 +23,7 @@
import org.apache.axis2.description.PolicyInclude;
import org.apache.neethi.Policy;
import org.wso2.wsas.admin.service.util.ServiceGroupMetaData;
-import org.wso2.wsas.admin.service.util.CreateArchive;
+import org.wso2.wsas.admin.service.util.ServiceArchiveCreator;
import org.wso2.wsas.persistence.PersistenceManager;
import org.wso2.wsas.persistence.dataobject.ServiceGroupDO;
import org.wso2.wsas.persistence.dataobject.ServiceGroupParameterDO;
@@ -56,7 +56,7 @@
AxisServiceGroup axisServiceGroup = (AxisServiceGroup) sgs.next();
String sgName = axisServiceGroup.getServiceGroupName();
- if (AdminFilter.isFilteredOutServices(sgName)) {
+ if (AdminFilter.isFilteredOutService(sgName)) {
// No need to display Admin Service Groups
continue;
@@ -237,9 +237,8 @@
* @throws AxisFault
*/
public String dumpAAR(String serviceGroupName) throws AxisFault {
- CreateArchive createArchive = CreateArchive.getInstance();
-
- return createArchive.createArchive(configCtx, serviceGroupName);
+ return new ServiceArchiveCreator().createArchive(configCtx,
+ serviceGroupName);
}
}
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/ServerStatus.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/ServerStatus.java (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/ServerStatus.java Wed May 2 07:45:03 2007
@@ -89,8 +89,9 @@
for (Iterator services = axisConfig.getServices().values().iterator();
services.hasNext();) {
AxisService axisService = (AxisService) services.next();
+ AxisServiceGroup asGroup = (AxisServiceGroup) axisService.getParent();
if (!axisService.isActive() || axisService.isClientSide() ||
- AdminFilter.isFilteredOutServices((AxisServiceGroup) axisService.getParent())) {
+ AdminFilter.isFilteredOutService(asGroup.getServiceGroupName())) {
continue;
}
activeServices++;
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/deployment/DeploymentInterceptor.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/deployment/DeploymentInterceptor.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/deployment/DeploymentInterceptor.java Wed May 2 07:45:03 2007
@@ -59,7 +59,7 @@
public void serviceGroupUpdate(AxisEvent axisEvent, AxisServiceGroup axisServiceGroup) {
// We do not persist Admin service events
- if (AdminFilter.isFilteredOutServices(axisServiceGroup.getServiceGroupName())) {
+ if (AdminFilter.isFilteredOutService(axisServiceGroup.getServiceGroupName())) {
return;
}
@@ -93,7 +93,7 @@
// We do not persist Admin service events
if (AdminFilter.
- isFilteredOutServices(((AxisServiceGroup)axisService.getParent()).getServiceGroupName())) {
+ isFilteredOutService(((AxisServiceGroup)axisService.getParent()).getServiceGroupName())) {
return;
}
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/feed/FeedListener.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/feed/FeedListener.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/feed/FeedListener.java Wed May 2 07:45:03 2007
@@ -50,7 +50,7 @@
if (getParameter(FeedConstants.ITEM_URL_KEY) != null) {
itemHome = getParameter(FeedConstants.ITEM_URL_KEY).getValue().toString();
}
- if (AdminFilter.isFilteredOutServices(axisServiceGroup.getServiceGroupName())) {
+ if (AdminFilter.isFilteredOutService(axisServiceGroup.getServiceGroupName())) {
return;
}
if (services.contains(service)) {
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/ServerInfo.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/ServerInfo.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/ServerInfo.java Wed May 2 07:45:03 2007
@@ -19,7 +19,7 @@
/**
* Interface used by WSO2 WSAS to interact/interface with the container in which
- * a given WSO2 WSAS instance in deplyed in.
+ * a given WSO2 WSAS instance is deployed in.
*
*/
public interface ServerInfo {
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/WSASServlet.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/WSASServlet.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/WSASServlet.java Wed May 2 07:45:03 2007
@@ -120,7 +120,10 @@
if (queryString != null) {
for (Iterator iter = getRequestProcessors.keySet().iterator(); iter.hasNext();) {
String item = (String) iter.next();
- if (queryString.indexOf(item) == 0) {
+ if (queryString.indexOf(item) == 0 &&
+ (queryString.equals(item) ||
+ queryString.indexOf("&") == item.length() ||
+ queryString.indexOf("=") == item.length())) {
((HttpGetRequestProcessor) getRequestProcessors.get(item)).process(request,
response,
configContext);
@@ -130,7 +133,7 @@
}
}
if (!isRequestHandled) {
- handleRestRequest(request, response);
+ handleRestRequest(request, response); // Assume that this is a REST request
}
} catch (Exception e) {
throw AxisFault.makeFault(e);
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/util/AdminFilter.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/util/AdminFilter.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/util/AdminFilter.java Wed May 2 07:45:03 2007
@@ -15,7 +15,6 @@
*/
package org.wso2.wsas.util;
-import org.apache.axis2.description.AxisServiceGroup;
import org.wso2.wsas.ServerConstants;
/**
@@ -23,11 +22,7 @@
*/
public class AdminFilter {
- public static boolean isFilteredOutServices(AxisServiceGroup axisServiceGroup) {
- return isFilteredOutServices(axisServiceGroup.getServiceGroupName());
- }
-
- public static boolean isFilteredOutServices(String serviceGroupName) {
+ public static boolean isFilteredOutService(String serviceGroupName) {
return ServerConstants.ADMIN_SERVICE_GROUP.equals(serviceGroupName) ||
serviceGroupName.endsWith(ServerConstants.STATISTICS_SERVICE_GROUP) ||
serviceGroupName.endsWith(ServerConstants.TRACER_SERVICE_GROUP) ||
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/util/TraceFilterImpl.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/util/TraceFilterImpl.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/util/TraceFilterImpl.java Wed May 2 07:45:03 2007
@@ -38,7 +38,7 @@
}
String serviceGroupName =
((AxisServiceGroup) msgContext.getAxisService().getParent()).getServiceGroupName();
- if(AdminFilter.isFilteredOutServices(serviceGroupName)){
+ if(AdminFilter.isFilteredOutService(serviceGroupName)){
return true;
}
Modified: trunk/wsas/java/modules/www/extensions/core/js.html
==============================================================================
--- trunk/wsas/java/modules/www/extensions/core/js.html (original)
+++ trunk/wsas/java/modules/www/extensions/core/js.html Wed May 2 07:45:03 2007
@@ -17,5 +17,4 @@
<script language="javascript" src="extensions/core/js/xmlTree.js"></script>
<script language="javascript" src="extensions/core/js/security.js"></script>
<script language="javascript" src="extensions/core/js/msgflows.js"></script>
-<script language="javascript" src="extensions/core/js/graphs.js"></script>
-<script language="javascript" src="extensions/core/js/data_service.js"></script>
+<script language="javascript" src="extensions/core/js/graphs.js"></script>
\ No newline at end of file
More information about the Wsas-java-dev
mailing list