[wsas-java-dev] svn commit r402 - in wsas/java/trunk: .
modules/admin modules/admin/src/org/wso2/wsas/admin/service
modules/admin/src/org/wso2/wsas/admin/service/logging
modules/admin/src/org/wso2/wsas/admin/service/util
modules/admin/test-resources/repository/modules/throttle/META-INF
modules/admin/test-resources/repository/services/ThrottleTestService/META-INF
modules/admin/test-resources/repository/services/ThrottleTestService2/META-INF
modules/admin/test/org/wso2/wsas/admin/service/logging
modules/core modules/core/conf modules/core/src/org/wso2/wsas
modules/core/src/org/wso2/wsas/deployment
modules/core/src/org/wso2/wsas/feed
modules/core/src/org/wso2/wsas/feed/atom
modules/core/src/org/wso2/wsas/feed/rss
modules/core/src/org/wso2/wsas/security
modules/core/src/org/wso2/wsas/security/util
modules/core/src/org/wso2/wsas/services/version
modules/core/src/org/wso2/wsas/transport/fileupload
modules/core/src/org/wso2/wsas/transport/jetty
modules/core/src/org/wso2/wsas/transport/util
modules/core/src/org/wso2/wsas/util modules/core/test/org/wso2/wsas
modules/core/test/org/wso2/wsas/core
modules/core/test/org/wso2/wsas/security
modules/core/test/org/wso2/wsas/util
modules/distribution/common/src/assemble
modules/distribution/webapp/src/assemble modules/integration
modules/integration/test/org/wso2/codegen
modules/integration/test/org/wso2/codegen/service
modules/integration/test/org/wso2/codegen/service/ajax
modules/integration/test/org/wso2/codegen/service/java
modules/integration/test/org/wso2/tracer
modules/integration/test/org/wso2/tracer/service
modules/integration/test/org/wso2/wsas/rest
modules/integration/test/org/wso2/wsas/sample/commodityquote
modules/integration/test/org/wso2/wsas/sample/trader
modules/integration/test/org/wso2/wsf modules/samples
modules/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/client
modules/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/services
modules/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/services/util
modules/samples/JavascriptService/src/org/wso2/wsas/sample/javascript
modules/samples/Trader/src/org/wso2/wsas/sample/trader
modules/servlet-edition modules/servlet-edition/bin
modules/servlet-edition/conf
modules/servlet-edition/src/org/wso2/wsas
modules/servlet-edition/src/org/wso2/wsas/installer
modules/wsf-common-core modules/wsf-common-tools
svn at wso2.com
svn at wso2.com
Thu Jan 11 22:21:44 PST 2007
Author: azeez
Date: Thu Jan 11 22:17:40 2007
New Revision: 402
Added:
wsas/java/trunk/modules/integration/test/org/wso2/codegen/
wsas/java/trunk/modules/integration/test/org/wso2/codegen/service/
wsas/java/trunk/modules/integration/test/org/wso2/codegen/service/WSDLInfoServiceTest.java
- copied, changed from r370, wsas/java/trunk/modules/integration/test/org/wso2/wsf/common/codegen/service/WSDLInfoServiceTest.java
wsas/java/trunk/modules/integration/test/org/wso2/codegen/service/ajax/
wsas/java/trunk/modules/integration/test/org/wso2/codegen/service/ajax/AjaxClientGeneratorServiceTest.java
- copied, changed from r370, wsas/java/trunk/modules/integration/test/org/wso2/wsf/common/codegen/service/ajax/AjaxClientGeneratorServiceTest.java
wsas/java/trunk/modules/integration/test/org/wso2/codegen/service/java/
wsas/java/trunk/modules/integration/test/org/wso2/codegen/service/java/JavaClientGeneratorServiceTest.java
- copied, changed from r370, wsas/java/trunk/modules/integration/test/org/wso2/wsf/common/codegen/service/java/JavaClientGeneratorServiceTest.java
wsas/java/trunk/modules/integration/test/org/wso2/tracer/
wsas/java/trunk/modules/integration/test/org/wso2/tracer/service/
wsas/java/trunk/modules/integration/test/org/wso2/tracer/service/TracerServiceIntegrationTest.java
- copied, changed from r370, wsas/java/trunk/modules/integration/test/org/wso2/wsf/common/tracer/service/TracerServiceIntegrationTest.java
Removed:
wsas/java/trunk/maven.xml
wsas/java/trunk/modules/admin/maven.xml
wsas/java/trunk/modules/admin/project.properties
wsas/java/trunk/modules/admin/project.xml
wsas/java/trunk/modules/core/maven.xml
wsas/java/trunk/modules/core/project.properties
wsas/java/trunk/modules/core/project.xml
wsas/java/trunk/modules/integration/maven.xml
wsas/java/trunk/modules/integration/project.properties
wsas/java/trunk/modules/integration/project.xml
wsas/java/trunk/modules/integration/test/org/wso2/wsf/
wsas/java/trunk/modules/samples/maven.xml
wsas/java/trunk/modules/samples/project.properties
wsas/java/trunk/modules/samples/project.xml
wsas/java/trunk/modules/servlet-edition/maven.xml
wsas/java/trunk/modules/servlet-edition/project.properties
wsas/java/trunk/modules/servlet-edition/project.xml
wsas/java/trunk/modules/wsf-common-core/
wsas/java/trunk/modules/wsf-common-tools/
wsas/java/trunk/project.properties
wsas/java/trunk/project.xml
Modified:
wsas/java/trunk/modules/admin/pom.xml
wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/AbstractAdmin.java
wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/CryptoAdmin.java
wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/ModuleAdmin.java
wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/OperationAdmin.java
wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/ServerAdmin.java
wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java
wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/ServiceGroupAdmin.java
wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/UserAdmin.java
wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/logging/LoggingService.java
wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/util/AdminDatabaseAuthenticator.java
wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/util/ServerData.java
wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/util/ServerStatus.java
wsas/java/trunk/modules/admin/test-resources/repository/modules/throttle/META-INF/module.xml
wsas/java/trunk/modules/admin/test-resources/repository/services/ThrottleTestService/META-INF/services.xml
wsas/java/trunk/modules/admin/test-resources/repository/services/ThrottleTestService2/META-INF/services.xml
wsas/java/trunk/modules/admin/test/org/wso2/wsas/admin/service/logging/LoggingServiceIntegrationTest.java
wsas/java/trunk/modules/admin/test/org/wso2/wsas/admin/service/logging/LoggingServiceTest.java
wsas/java/trunk/modules/core/conf/axis2.xml
wsas/java/trunk/modules/core/conf/log4j.properties
wsas/java/trunk/modules/core/src/org/wso2/wsas/Main.java
wsas/java/trunk/modules/core/src/org/wso2/wsas/ServerConstants.java
wsas/java/trunk/modules/core/src/org/wso2/wsas/ServerManager.java
wsas/java/trunk/modules/core/src/org/wso2/wsas/deployment/ServerConfigurator.java
wsas/java/trunk/modules/core/src/org/wso2/wsas/feed/AbstractFeed.java
wsas/java/trunk/modules/core/src/org/wso2/wsas/feed/atom/AtomElement.java
wsas/java/trunk/modules/core/src/org/wso2/wsas/feed/rss/RSSElement.java
wsas/java/trunk/modules/core/src/org/wso2/wsas/security/RahasUtil.java
wsas/java/trunk/modules/core/src/org/wso2/wsas/security/ServerCrypto.java
wsas/java/trunk/modules/core/src/org/wso2/wsas/security/ServicePasswordCallbackHandler.java
wsas/java/trunk/modules/core/src/org/wso2/wsas/security/WSS4JUtil.java
wsas/java/trunk/modules/core/src/org/wso2/wsas/security/util/RampartConfigUtil.java
wsas/java/trunk/modules/core/src/org/wso2/wsas/services/version/Version.java
wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/fileupload/AbstractFileUploadExecutor.java
wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/fileupload/AnyFileUploadExecutor.java
wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/fileupload/FileUploadExecutor.java
wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/fileupload/FileUploadExecutorManager.java
wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/fileupload/KeyStoreFileUploadExecutor.java
wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/fileupload/ModuleFileUploadExecutor.java
wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/fileupload/ServiceFileUploadExecutor.java
wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/fileupload/SpringFileUploadExecutor.java
wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/jetty/Axis2FileDownloadHandler.java
wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/jetty/Axis2FileUploadHandler.java
wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/jetty/Axis2Handler.java
wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/jetty/Axis2SOAPHandler.java
wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/jetty/HttpTransportListener.java
wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/jetty/HttpsTransportListener.java
wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/jetty/JettyServer.java
wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/jetty/ManagementConsoleRequestHandler.java
wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/jetty/ServerDefaultHandler.java
wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/jetty/ServerHandler.java
wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/util/Restartable.java
wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/util/SystemRestarter.java
wsas/java/trunk/modules/core/src/org/wso2/wsas/util/FileDownloadUtil.java
wsas/java/trunk/modules/core/src/org/wso2/wsas/util/HouseKeepingTask.java
wsas/java/trunk/modules/core/src/org/wso2/wsas/util/HttpGetRequestProcessor.java
wsas/java/trunk/modules/core/src/org/wso2/wsas/util/KeyStoreUtil.java
wsas/java/trunk/modules/core/src/org/wso2/wsas/util/LoggingUtil.java
wsas/java/trunk/modules/core/src/org/wso2/wsas/util/Monitor.java
wsas/java/trunk/modules/core/src/org/wso2/wsas/util/PasswordUpdater.java
wsas/java/trunk/modules/core/src/org/wso2/wsas/util/SchemaUtil.java
wsas/java/trunk/modules/core/src/org/wso2/wsas/util/ServerController.java
wsas/java/trunk/modules/core/src/org/wso2/wsas/util/TraceFilterImpl.java
wsas/java/trunk/modules/core/src/org/wso2/wsas/util/TracePersisterImpl.java
wsas/java/trunk/modules/core/src/org/wso2/wsas/util/XmlConfiguration.java
wsas/java/trunk/modules/core/src/org/wso2/wsas/util/XmlConfigurationFactory.java
wsas/java/trunk/modules/core/test/org/wso2/wsas/JettyServerTest.java
wsas/java/trunk/modules/core/test/org/wso2/wsas/core/EchoTest.java
wsas/java/trunk/modules/core/test/org/wso2/wsas/security/CryptoUtilTest.java
wsas/java/trunk/modules/core/test/org/wso2/wsas/security/WSS4JUtilTest.java
wsas/java/trunk/modules/core/test/org/wso2/wsas/util/ServerUtils.java
wsas/java/trunk/modules/distribution/common/src/assemble/dist-common-assembly.xml
wsas/java/trunk/modules/distribution/webapp/src/assemble/dist-webapp-assembly.xml
wsas/java/trunk/modules/integration/test/org/wso2/wsas/rest/RestSupportTest.java
wsas/java/trunk/modules/integration/test/org/wso2/wsas/rest/RestWithSchemasTest.java
wsas/java/trunk/modules/integration/test/org/wso2/wsas/sample/commodityquote/CommodityQuoteCallbackHandlerTestImpl.java
wsas/java/trunk/modules/integration/test/org/wso2/wsas/sample/commodityquote/CommodityQuoteServiceIntegrationTest.java
wsas/java/trunk/modules/integration/test/org/wso2/wsas/sample/trader/TraderServiceIntegrationTest.java
wsas/java/trunk/modules/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/client/Client.java
wsas/java/trunk/modules/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/client/CommodityQuoteCallbackHandlerExt.java
wsas/java/trunk/modules/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/services/CommodityQuoteService.java
wsas/java/trunk/modules/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/services/CommodityQuoteUtil.java
wsas/java/trunk/modules/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/services/util/Utils.java
wsas/java/trunk/modules/samples/JavascriptService/src/org/wso2/wsas/sample/javascript/Client.java
wsas/java/trunk/modules/samples/Trader/src/org/wso2/wsas/sample/trader/Client.java
wsas/java/trunk/modules/samples/Trader/src/org/wso2/wsas/sample/trader/Trader.java
wsas/java/trunk/modules/samples/pom.xml
wsas/java/trunk/modules/servlet-edition/bin/install.bat
wsas/java/trunk/modules/servlet-edition/bin/install.sh
wsas/java/trunk/modules/servlet-edition/conf/axis2.xml
wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/FileDownloadServlet.java
wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/FileUploadServlet.java
wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/GenericServerInfo.java
wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/JBossServerInfo.java
wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/MainServlet.java
wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/RequestRedirectionFilter.java
wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/Tomcat41xServerInfo.java
wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/Tomcat5xServerInfo.java
wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/installer/AbstractAppServerInstaller.java
wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/installer/AbstractInstaller.java
wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/installer/GenericInstaller.java
wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/installer/GeronimoInstaller.java
wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/installer/InstallationManager.java
wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/installer/JBossInstaller.java
wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/installer/TomcatInstaller.java
wsas/java/trunk/pom.xml
Log:
Updates corresponding tomoving code from WSF to commons projects
Modified: wsas/java/trunk/modules/admin/pom.xml
==============================================================================
--- wsas/java/trunk/modules/admin/pom.xml (original)
+++ wsas/java/trunk/modules/admin/pom.xml Thu Jan 11 22:17:40 2007
@@ -124,7 +124,7 @@
<configuration>
<tasks>
<echo>Generating skeletons for Generic Services</echo>
- <java classname="org.wso2.wsf.common.tools.codegen.CodegenHelper"
+ <java classname="org.wso2.utils.codegen.CodegenHelper"
fork="true">
<arg value="./src/org/wso2/wsas/admin/wsas-admin-codegen.xml"/>
<classpath refid="maven.dependency.classpath"/>
Modified: wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/AbstractAdmin.java
==============================================================================
--- wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/AbstractAdmin.java (original)
+++ wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/AbstractAdmin.java Thu Jan 11 22:17:40 2007
@@ -18,7 +18,7 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.engine.AxisConfiguration;
-import org.wso2.wsf.common.tools.i18n.Messages;
+import org.wso2.utils.i18n.Messages;
/**
Modified: wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/CryptoAdmin.java
==============================================================================
--- wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/CryptoAdmin.java (original)
+++ wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/CryptoAdmin.java Thu Jan 11 22:17:40 2007
@@ -31,9 +31,9 @@
import org.wso2.wsas.persistence.exception.KeyStoreAlreadyExistsException;
import org.wso2.wsas.util.HibernateConfigFactory;
import org.wso2.wsas.util.KeyStoreUtil;
-import org.wso2.wsf.common.ServerException;
-import org.wso2.wsf.common.util.ServerConfiguration;
-import org.wso2.wsf.common.tools.security.CryptoUtil;
+import org.wso2.utils.ServerException;
+import org.wso2.utils.ServerConfiguration;
+import org.wso2.utils.security.CryptoUtil;
import java.io.*;
import java.security.KeyStore;
Modified: wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/ModuleAdmin.java
==============================================================================
--- wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/ModuleAdmin.java (original)
+++ wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/ModuleAdmin.java Thu Jan 11 22:17:40 2007
@@ -28,8 +28,8 @@
import org.wso2.wsas.util.HibernateConfigFactory;
import org.wso2.wsas.util.ParameterUtil;
import org.wso2.wsas.util.ModuleIdUtil;
-import org.wso2.wsf.common.tools.FileManipulator;
-import org.wso2.wsf.common.ServerException;
+import org.wso2.utils.FileManipulator;
+import org.wso2.utils.ServerException;
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
@@ -332,7 +332,7 @@
}
// We should not engage the throttle module to the wso2wsas-administration service group
- if (moduleId.equals("throttle")) {
+ if (moduleId.equals("wso2throttle")) {
axisConfig.getServiceGroup(ServerConstants.ADMINISTRATION_SERVICE_GROUP).
disengageModule(axisModule);
}
Modified: wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/OperationAdmin.java
==============================================================================
--- wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/OperationAdmin.java (original)
+++ wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/OperationAdmin.java Thu Jan 11 22:17:40 2007
@@ -32,7 +32,7 @@
import org.wso2.wsas.persistence.exception.DuplicateEntityException;
import org.wso2.wsas.util.HibernateConfigFactory;
import org.wso2.wsas.util.ParameterUtil;
-import org.wso2.wsf.common.statistics.service.StatisticsService;
+import org.wso2.statistics.service.StatisticsStub;
import javax.xml.namespace.QName;
import java.util.ArrayList;
@@ -81,7 +81,7 @@
operations.hasNext();) {
AxisOperation axisOperation = (AxisOperation) operations.next();
opMetaDataList.add(getOperationMetaData(serviceName,
- axisOperation.getName().getLocalPart()));
+ axisOperation.getName().getLocalPart()));
}
return (OperationMetaData[]) opMetaDataList.
toArray(new OperationMetaData[opMetaDataList.size()]);
@@ -230,11 +230,11 @@
}
public void setOperationParameters(String serviceId,
- String operationId,
- String groupVersion,
- OMElement[] parameterElements) throws AxisFault {
- for (int i = 0 ; i < parameterElements.length ; i++) {
- setOperationParameter(serviceId,operationId,groupVersion,parameterElements[i]);
+ String operationId,
+ String groupVersion,
+ OMElement[] parameterElements) throws AxisFault {
+ for (int i = 0; i < parameterElements.length; i++) {
+ setOperationParameter(serviceId, operationId, groupVersion, parameterElements[i]);
}
}
@@ -547,20 +547,29 @@
opMetaData.setName(axisOperation.getName().getLocalPart());
opMetaData.setControlOperation(axisOperation.isControlOperation());
- StatisticsService statService = new StatisticsService();
-
- opMetaData.setOpRequestCount(statService.getOperationRequestCount(serviceName,
- operationName));
- opMetaData.setOpResponseCount(statService.getOperationResponseCount(serviceName,
- operationName));
- opMetaData.setOpFaultCount(statService.getOperationFaultCount(serviceName,
- operationName));
- opMetaData.setMaxResponseTime(statService.getMaxOperationResponseTime(serviceName,
- operationName));
- opMetaData.setMinResponseTime(statService.getMinOperationResponseTime(serviceName,
- operationName));
- opMetaData.setAvgResponseTime(statService.getAvgOperationResponseTime(serviceName,
- operationName));
+ try {
+ StatisticsStub statService = new StatisticsStub();
+ opMetaData.setOpRequestCount(statService.
+ getOperationRequestCount(serviceName,
+ operationName).get_return());
+ opMetaData.setOpResponseCount(statService.
+ getOperationResponseCount(serviceName,
+ operationName).get_return());
+ opMetaData.setOpFaultCount(statService.
+ getOperationFaultCount(serviceName,
+ operationName).get_return());
+ opMetaData.setMaxResponseTime(statService.
+ getMaxOperationResponseTime(serviceName,
+ operationName).get_return());
+ opMetaData.setMinResponseTime(statService.
+ getMinOperationResponseTime(serviceName,
+ operationName).get_return());
+ opMetaData.setAvgResponseTime(statService.
+ getAvgOperationResponseTime(serviceName,
+ operationName).get_return());
+ } catch (Exception e) {
+ throw new AxisFault(e);
+ }
return opMetaData;
}
}
Modified: wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/ServerAdmin.java
==============================================================================
--- wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/ServerAdmin.java (original)
+++ wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/ServerAdmin.java Thu Jan 11 22:17:40 2007
@@ -20,7 +20,7 @@
import org.apache.axis2.context.MessageContext;
import org.apache.log4j.*;
import org.wso2.wsas.ServerConstants;
-import org.wso2.wsf.common.ServerException;
+import org.wso2.utils.ServerException;
import org.wso2.wsas.ServerManager;
import org.wso2.wsas.admin.service.util.*;
import org.wso2.wsas.persistence.FileBasedConfigSerializer;
Modified: wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java
==============================================================================
--- wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java (original)
+++ wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java Thu Jan 11 22:17:40 2007
@@ -29,6 +29,10 @@
import org.apache.neethi.PolicyReference;
import org.apache.neethi.PolicyRegistry;
import org.springframework.context.ApplicationContext;
+import org.wso2.statistics.service.StatisticsStub;
+import org.wso2.utils.ArchiveManipulator;
+import org.wso2.utils.FileManipulator;
+import org.wso2.utils.ServerConfiguration;
import org.wso2.wsas.admin.service.spring.GenericApplicationContextSupplier;
import org.wso2.wsas.admin.service.util.*;
import org.wso2.wsas.persistence.PersistenceManager;
@@ -38,13 +42,8 @@
import org.wso2.wsas.persistence.exception.ServicePolicyAlreadyExistsException;
import org.wso2.wsas.persistence.exception.ServicePolicyNotFoundException;
import org.wso2.wsas.transport.util.TransportSummary;
-import org.wso2.wsas.util.*;
-import org.wso2.wsf.common.statistics.StatisticsConstants;
-import org.wso2.wsf.common.statistics.module.ResponseTimeProcessor;
-import org.wso2.wsf.common.statistics.service.StatisticsService;
-import org.wso2.wsf.common.tools.ArchiveManipulator;
-import org.wso2.wsf.common.tools.FileManipulator;
-import org.wso2.wsf.common.util.ServerConfiguration;
+import org.wso2.wsas.util.HibernateConfigFactory;
+import org.wso2.wsas.util.ParameterUtil;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLInputFactory;
@@ -295,13 +294,24 @@
}
ServiceMetaData smd = new ServiceMetaData();
- StatisticsService statService = new StatisticsService();
- smd.setServiceRequestCount(statService.getServiceRequestCount(serviceName));
- smd.setServiceResponseCount(statService.getServiceResponseCount(serviceName));
- smd.setServiceFaultCount(statService.getServiceFaultCount(serviceName));
- smd.setMaxResponseTime(statService.getMaxServiceResponseTime(serviceName));
- smd.setMinResponseTime(statService.getMinServiceResponseTime(serviceName));
- smd.setAvgResponseTime(statService.getAvgServiceResponseTime(serviceName));
+
+ try {
+ StatisticsStub statService = new StatisticsStub();
+ smd.setServiceRequestCount(statService.
+ getServiceRequestCount(serviceName).get_return());
+ smd.setServiceResponseCount(statService.
+ getServiceResponseCount(serviceName).get_return());
+ smd.setServiceFaultCount(statService.
+ getServiceFaultCount(serviceName).get_return());
+ smd.setMaxResponseTime(statService.
+ getMaxServiceResponseTime(serviceName).get_return());
+ smd.setMinResponseTime(statService.
+ getMinServiceResponseTime(serviceName).get_return());
+ smd.setAvgResponseTime(statService.
+ getAvgServiceResponseTime(serviceName).get_return());
+ } catch (Exception e) {
+ throw new AxisFault(e);
+ }
smd.setOperations((String[]) ops.toArray(new String[ops.size()]));
smd.setName(serviceName);
@@ -344,17 +354,22 @@
ServiceMetaData smd = new ServiceMetaData();
String serviceName = axisService.getName();
- StatisticsService statService = new StatisticsService();
- smd.setServiceRequestCount(statService.getServiceRequestCount(serviceName));
- smd.setServiceResponseCount(statService.getServiceResponseCount(serviceName));
- smd.setServiceFaultCount(statService.getServiceFaultCount(serviceName));
- Parameter parameter =
- axisService.getParameter(StatisticsConstants.SERVICE_RESPONSE_TIME_PROCESSOR);
- if (parameter != null) {
- ResponseTimeProcessor proc = (ResponseTimeProcessor) parameter.getValue();
- smd.setMaxResponseTime(proc.getMaxResponseTime());
- smd.setMinResponseTime(proc.getMinResponseTime());
- smd.setAvgResponseTime(proc.getAvgResponseTime());
+ try {
+ StatisticsStub statService = new StatisticsStub();
+ smd.setServiceRequestCount(statService.
+ getServiceRequestCount(serviceName).get_return());
+ smd.setServiceResponseCount(statService.
+ getServiceResponseCount(serviceName).get_return());
+ smd.setServiceFaultCount(statService.
+ getServiceFaultCount(serviceName).get_return());
+ smd.setMaxResponseTime(statService.
+ getMaxServiceResponseTime(serviceName).get_return());
+ smd.setMinResponseTime(statService.
+ getMinServiceResponseTime(serviceName).get_return());
+ smd.setAvgResponseTime(statService.
+ getAvgServiceResponseTime(serviceName).get_return());
+ } catch (Exception e) {
+ throw new AxisFault(e);
}
smd.setOperations((String[]) ops.toArray(new String[ops.size()]));
smd.setName(serviceName);
Modified: wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/ServiceGroupAdmin.java
==============================================================================
--- wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/ServiceGroupAdmin.java (original)
+++ wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/ServiceGroupAdmin.java Thu Jan 11 22:17:40 2007
@@ -59,8 +59,10 @@
clientsideService = false;
AxisServiceGroup axisServiceGroup = (AxisServiceGroup) sgs.next();
- if (ServerConstants.ADMINISTRATION_SERVICE_GROUP.
- equals(axisServiceGroup.getServiceGroupName())) {
+ String sgName = axisServiceGroup.getServiceGroupName();
+ if (ServerConstants.ADMINISTRATION_SERVICE_GROUP.equals(sgName) ||
+ sgName.endsWith(ServerConstants.STATISTICS_SERVICE_GROUP) ||
+ sgName.endsWith(ServerConstants.TRACER_SERVICE_GROUP) ) {
// NO need to display Admin Service Groups
continue;
}
@@ -77,8 +79,8 @@
}
sgMetaData.setServices((String[]) services.toArray(new String[services.size()]));
- sgMetaData.setGroup_id(axisServiceGroup.getServiceGroupName());
- sgMetaData.setGroup_name(axisServiceGroup.getServiceGroupName());
+ sgMetaData.setGroup_id(sgName);
+ sgMetaData.setGroup_name(sgName);
sgMetaData.setGroup_version("-");
if (!clientsideService) {
Modified: wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/UserAdmin.java
==============================================================================
--- wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/UserAdmin.java (original)
+++ wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/UserAdmin.java Thu Jan 11 22:17:40 2007
@@ -26,10 +26,10 @@
import org.wso2.wsas.persistence.exception.ServiceUserNotFoundException;
import org.wso2.wsas.persistence.exception.UserRoleAlreadyExistsException;
import org.wso2.wsas.util.HibernateConfigFactory;
-import org.wso2.wsf.common.util.ServerConfiguration;
-import org.wso2.wsf.common.ServerException;
-import org.wso2.wsf.common.tools.security.CryptoUtil;
-import org.wso2.wsf.common.tools.security.CryptoException;
+import org.wso2.utils.ServerConfiguration;
+import org.wso2.utils.ServerException;
+import org.wso2.utils.security.CryptoUtil;
+import org.wso2.utils.security.CryptoException;
import java.io.File;
Modified: wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/logging/LoggingService.java
==============================================================================
--- wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/logging/LoggingService.java (original)
+++ wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/logging/LoggingService.java Thu Jan 11 22:17:40 2007
@@ -16,7 +16,7 @@
package org.wso2.wsas.admin.service.logging;
import org.wso2.wsas.ServerConstants;
-import org.wso2.wsf.common.util.MemoryAppender;
+import org.wso2.utils.MemoryAppender;
import org.apache.axis2.context.MessageContext;
import org.apache.log4j.Layout;
import org.apache.log4j.PatternLayout;
Modified: wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/util/AdminDatabaseAuthenticator.java
==============================================================================
--- wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/util/AdminDatabaseAuthenticator.java (original)
+++ wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/util/AdminDatabaseAuthenticator.java Thu Jan 11 22:17:40 2007
@@ -21,8 +21,8 @@
import org.wso2.wsas.persistence.dataobject.ServiceUserDO;
import org.wso2.wsas.persistence.dataobject.ServiceUserRoleDO;
import org.wso2.wsas.util.HibernateConfigFactory;
-import org.wso2.wsf.common.util.ServerConfiguration;
-import org.wso2.wsf.common.tools.security.CryptoUtil;
+import org.wso2.utils.ServerConfiguration;
+import org.wso2.utils.security.CryptoUtil;
import org.apache.axis2.context.ConfigurationContext;
Modified: wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/util/ServerData.java
==============================================================================
--- wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/util/ServerData.java (original)
+++ wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/util/ServerData.java Thu Jan 11 22:17:40 2007
@@ -15,7 +15,7 @@
*/
package org.wso2.wsas.admin.service.util;
-import org.wso2.wsf.common.util.ServerConfiguration;
+import org.wso2.utils.ServerConfiguration;
public class ServerData {
private String javaRuntimeName;
Modified: wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/util/ServerStatus.java
==============================================================================
--- wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/util/ServerStatus.java (original)
+++ wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/util/ServerStatus.java Thu Jan 11 22:17:40 2007
@@ -15,21 +15,19 @@
*/
package org.wso2.wsas.admin.service.util;
+import org.apache.axis2.AxisFault;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.AxisServiceGroup;
import org.apache.axis2.description.Parameter;
import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.AxisFault;
+import org.wso2.statistics.service.StatisticsStub;
+import org.wso2.utils.ServerConfiguration;
import org.wso2.wsas.ServerConstants;
-import org.wso2.wsf.common.util.ServerConfiguration;
-import org.wso2.wsf.common.statistics.StatisticsConstants;
-import org.wso2.wsf.common.statistics.service.StatisticsService;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Iterator;
-
public class ServerStatus {
private String serverName;
private String serverStartTime;
@@ -53,16 +51,23 @@
public void update(AxisConfiguration axisConfig) throws AxisFault {
Parameter systemStartTime =
- axisConfig.getParameter(StatisticsConstants.SERVER_START_TIME);
+ axisConfig.getParameter("wso2statistics.server.start.time");
long startTime = ((Long) systemStartTime.getValue()).longValue();
Date stTime = new Date(startTime);
serverStartTime = dateFormatter.format(stTime);
systemUpTime = (getTime((System.currentTimeMillis() - startTime) / 1000));
- StatisticsService statisticsService = new StatisticsService();
- requestCount = statisticsService.getSystemRequestCount();
- responseCount = statisticsService.getSystemResponseCount();
- faultCount = statisticsService.getSystemFaultCount();
+ try {
+ StatisticsStub statisticsService = new StatisticsStub();
+ requestCount = statisticsService.getSystemRequestCount().get_return();
+ responseCount = statisticsService.getSystemResponseCount().get_return();
+ faultCount = statisticsService.getSystemFaultCount().get_return();
+ avgResponseTime = statisticsService.getAvgSystemResponseTime().get_return();
+ maxResponseTime = statisticsService.getMaxSystemResponseTime().get_return();
+ minResponseTime = statisticsService.getMinSystemResponseTime().get_return();
+ } catch (Exception e) {
+ throw new AxisFault(e);
+ }
Runtime runtime = Runtime.getRuntime();
usedMemory = formatMemoryValue(runtime.totalMemory() - runtime.freeMemory());
@@ -74,7 +79,7 @@
axisConfig.getServiceGroup(org.wso2.wsas.ServerConstants.ADMINISTRATION_SERVICE_GROUP);
int adminServiceCount = 0;
- for (Iterator serviceIter = asg.getServices();serviceIter.hasNext();) {
+ for (Iterator serviceIter = asg.getServices(); serviceIter.hasNext();) {
serviceIter.next();
adminServiceCount++;
}
@@ -94,10 +99,6 @@
this.services = activeServices - adminServiceCount;
serverName = ServerConstants.WSO2WSAS_INSTANCE;
-
- avgResponseTime = statisticsService.getAvgSystemResponseTime();
- maxResponseTime = statisticsService.getMaxSystemResponseTime();
- minResponseTime = statisticsService.getMinSystemResponseTime();
}
public String getSystemUpTime() {
@@ -175,7 +176,7 @@
timeInSeconds = timeInSeconds - (minutes * 60);
seconds = timeInSeconds;
- return days + " day(s) "+ hours + " hr(s) " + minutes + " min(s) " + seconds + " sec(s)";
+ return days + " day(s) " + hours + " hr(s) " + minutes + " min(s) " + seconds + " sec(s)";
}
public double getAvgResponseTime() {
Modified: wsas/java/trunk/modules/admin/test-resources/repository/modules/throttle/META-INF/module.xml
==============================================================================
--- wsas/java/trunk/modules/admin/test-resources/repository/modules/throttle/META-INF/module.xml (original)
+++ wsas/java/trunk/modules/admin/test-resources/repository/modules/throttle/META-INF/module.xml Thu Jan 11 22:17:40 2007
@@ -1,17 +1,17 @@
-<module name="throttle" class="org.wso2.wsf.common.throttle.module.ThrottleModule">
+<module name="wso2throttle" class="org.wso2.throttle.module.ThrottleModule">
<Description>Module for controlling client access to web service engine. Access can limit on
global level ,service level and operation level</Description>
<InFlow>
<handler name="GlobalThrottleHandler"
- class="org.wso2.wsf.common.throttle.module.handler.GlobalThrottleHandler">
+ class="org.wso2.throttle.module.handler.GlobalThrottleHandler">
<order phase="PreDispatch"/>
</handler>
<handler name="ServiceLevelThrottleHandler"
- class="org.wso2.wsf.common.throttle.module.handler.ServiceLevelThrottleHandler">
+ class="org.wso2.throttle.module.handler.ServiceLevelThrottleHandler">
<order phase="OperationInPhase"/>
</handler>
<handler name="OperationLevelThrottleHandler"
- class="org.wso2.wsf.common.throttle.module.handler.OperationLevelThrottleHandler">
+ class="org.wso2.throttle.module.handler.OperationLevelThrottleHandler">
<order phase="OperationInPhase"/>
</handler>
</InFlow>
Modified: wsas/java/trunk/modules/admin/test-resources/repository/services/ThrottleTestService/META-INF/services.xml
==============================================================================
--- wsas/java/trunk/modules/admin/test-resources/repository/services/ThrottleTestService/META-INF/services.xml (original)
+++ wsas/java/trunk/modules/admin/test-resources/repository/services/ThrottleTestService/META-INF/services.xml Thu Jan 11 22:17:40 2007
@@ -2,13 +2,13 @@
<description>
ThrottleTestService
</description>
- <module ref="throttle"/>
+ <module ref="wso2throttle"/>
<parameter name="ServiceClass" locked="false">org.wso2.wsas.admin.throttle.service.ThrottleTestService</parameter>
<operation name="test">
<messageReceiver class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
<actionMapping>urn:test</actionMapping>
<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
- xmlns:throttle="http://wsf/throttle"
+ xmlns:throttle="http://wso2throttle"
xmlns:Id="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
Id:Id="urn:uuid:2A4962FF30A0AEAF6411627200415151">
<throttle:ThrottleAssertion>
@@ -60,7 +60,7 @@
</wsp:Policy>
</operation>
<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
- xmlns:throttle="http://wsf/throttle"
+ xmlns:throttle="http://wso2throttle"
xmlns:Id="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
Id:Id="urn:uuid:2A4962FF30A0AEAF6411627200415151">
<throttle:ThrottleAssertion>
Modified: wsas/java/trunk/modules/admin/test-resources/repository/services/ThrottleTestService2/META-INF/services.xml
==============================================================================
--- wsas/java/trunk/modules/admin/test-resources/repository/services/ThrottleTestService2/META-INF/services.xml (original)
+++ wsas/java/trunk/modules/admin/test-resources/repository/services/ThrottleTestService2/META-INF/services.xml Thu Jan 11 22:17:40 2007
@@ -2,13 +2,13 @@
<description>
ThrottleTestService2
</description>
- <module ref="throttle"/>
+ <module ref="wso2throttle"/>
<parameter name="ServiceClass" locked="false">org.wso2.wsas.admin.throttle.service.ThrottleTestService2</parameter>
<operation name="test">
<messageReceiver class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
<actionMapping>urn:test</actionMapping>
<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
- xmlns:throttle="http://wsf/throttle"
+ xmlns:throttle="http://wso2throttle"
xmlns:Id="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
Id:Id="urn:uuid:2A4962FF30A0AEAF6411627200415151">
<throttle:ThrottleAssertion>
@@ -60,7 +60,7 @@
</wsp:Policy>
</operation>
<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
- xmlns:throttle="http://wsf/throttle"
+ xmlns:throttle="http://wso2throttle"
xmlns:Id="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
Id:Id="urn:uuid:2A4962FF30A0AEAF6411627200415151">
<throttle:ThrottleAssertion>
Modified: wsas/java/trunk/modules/admin/test/org/wso2/wsas/admin/service/logging/LoggingServiceIntegrationTest.java
==============================================================================
--- wsas/java/trunk/modules/admin/test/org/wso2/wsas/admin/service/logging/LoggingServiceIntegrationTest.java (original)
+++ wsas/java/trunk/modules/admin/test/org/wso2/wsas/admin/service/logging/LoggingServiceIntegrationTest.java Thu Jan 11 22:17:40 2007
@@ -18,8 +18,8 @@
import org.wso2.wsas.AbstractTestCase;
import org.wso2.wsas.TestConstants;
import org.wso2.wsas.util.ServerUtils;
-import org.wso2.wsf.common.util.ServerConfiguration;
-import org.wso2.wsf.common.util.NetworkUtils;
+import org.wso2.utils.ServerConfiguration;
+import org.wso2.utils.NetworkUtils;
import org.apache.axis2.engine.AxisConfiguration;
Modified: wsas/java/trunk/modules/admin/test/org/wso2/wsas/admin/service/logging/LoggingServiceTest.java
==============================================================================
--- wsas/java/trunk/modules/admin/test/org/wso2/wsas/admin/service/logging/LoggingServiceTest.java (original)
+++ wsas/java/trunk/modules/admin/test/org/wso2/wsas/admin/service/logging/LoggingServiceTest.java Thu Jan 11 22:17:40 2007
@@ -27,8 +27,8 @@
import org.apache.log4j.PatternLayout;
import org.apache.log4j.spi.LoggingEvent;
import org.wso2.wsas.ServerConstants;
-import org.wso2.wsf.common.util.CircularBuffer;
-import org.wso2.wsf.common.util.MemoryAppender;
+import org.wso2.utils.CircularBuffer;
+import org.wso2.utils.MemoryAppender;
/**
Modified: wsas/java/trunk/modules/core/conf/axis2.xml
==============================================================================
--- wsas/java/trunk/modules/core/conf/axis2.xml (original)
+++ wsas/java/trunk/modules/core/conf/axis2.xml Thu Jan 11 22:17:40 2007
@@ -106,7 +106,7 @@
in this case.
-->
<!--transportReceiver name="mod_proxy/http"
- class="org.wso2.wsf.common.transport.http.GenericHttpTransportListener">
+ class="org.wso2.utils.transport.http.GenericHttpTransportListener">
<parameter name="port" locked="false">80</parameter>
</transportReceiver-->
Modified: wsas/java/trunk/modules/core/conf/log4j.properties
==============================================================================
--- wsas/java/trunk/modules/core/conf/log4j.properties (original)
+++ wsas/java/trunk/modules/core/conf/log4j.properties Thu Jan 11 22:17:40 2007
@@ -43,7 +43,7 @@
log4j.appender.WSO2WSAS_CONSOLE.layout.ConversionPattern=%5p [%d] %x %m%n
# WSO2WSAS_MEMORY is set to be a MemoryAppender using a PatternLayout.
-log4j.appender.WSO2WSAS_MEMORY=org.wso2.wsf.common.util.MemoryAppender
+log4j.appender.WSO2WSAS_MEMORY=org.wso2.utils.MemoryAppender
log4j.appender.WSO2WSAS_MEMORY.layout=org.apache.log4j.PatternLayout
# ConversionPattern will be overridden by the configuration setting in the DB
log4j.appender.WSO2WSAS_MEMORY.layout.ConversionPattern=%5p [%d] %x %m%n
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/Main.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/Main.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/Main.java Thu Jan 11 22:17:40 2007
@@ -16,13 +16,13 @@
package org.wso2.wsas;
import org.wso2.wsas.transport.jetty.JettyServer;
-import org.wso2.wsf.common.transport.http.HttpServerManager;
+import org.wso2.utils.transport.http.HttpServerManager;
import org.wso2.wsas.transport.util.Restartable;
import org.wso2.wsas.transport.util.SystemRestarter;
import org.wso2.wsas.util.*;
-import org.wso2.wsf.common.tools.FileManipulator;
-import org.wso2.wsf.common.ServerException;
-import org.wso2.wsf.common.util.ServerConfiguration;
+import org.wso2.utils.FileManipulator;
+import org.wso2.utils.ServerException;
+import org.wso2.utils.ServerConfiguration;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.log4j.Logger;
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/ServerConstants.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/ServerConstants.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/ServerConstants.java Thu Jan 11 22:17:40 2007
@@ -48,6 +48,8 @@
// Admin Constants
//=============================================
public static final String ADMINISTRATION_SERVICE_GROUP = "wso2wsas-administration";
+ public static final String STATISTICS_SERVICE_GROUP = "wso2wsf-statistics";
+ public static final String TRACER_SERVICE_GROUP = "wso2wsf-tracer";
public static final String LOGGED_IN = "logged.in";
public static final String SERVER_REGISTERED = "wso2wsas.server.registered";
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 Jan 11 22:17:40 2007
@@ -39,13 +39,13 @@
import org.wso2.wsas.persistence.exception.ServiceUserAlreadyExistsException;
import org.wso2.wsas.persistence.exception.UserRoleAlreadyExistsException;
import org.wso2.wsas.util.*;
-import org.wso2.wsf.common.tools.security.CryptoException;
-import org.wso2.wsf.common.tools.security.CryptoUtil;
-import org.wso2.wsf.common.tracer.TracerConstants;
-import org.wso2.wsf.common.util.NetworkUtils;
-import org.wso2.wsf.common.util.RESTEndpointReferenceUtil;
-import org.wso2.wsf.common.util.ServerConfiguration;
-import org.wso2.wsf.common.ServerException;
+import org.wso2.utils.security.CryptoException;
+import org.wso2.utils.security.CryptoUtil;
+import org.wso2.tracer.TracerConstants;
+import org.wso2.utils.NetworkUtils;
+import org.wso2.utils.RESTEndpointReferenceUtil;
+import org.wso2.utils.ServerConfiguration;
+import org.wso2.utils.ServerException;
import javax.xml.namespace.QName;
import java.io.File;
@@ -416,7 +416,7 @@
}
// We should not engage the throttle module to the wso2wsas-administration service group
- if (moduleId.equals("throttle")) {
+ if (moduleId.equals("wso2throttle")) {
axisConfig.getServiceGroup(ServerConstants.ADMINISTRATION_SERVICE_GROUP).
disengageModule(axisConfig.getModule(moduleIdQName));
}
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/deployment/ServerConfigurator.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/deployment/ServerConfigurator.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/deployment/ServerConfigurator.java Thu Jan 11 22:17:40 2007
@@ -34,8 +34,8 @@
import org.wso2.wsas.persistence.PersistenceManager;
import org.wso2.wsas.persistence.dataobject.TransportDO;
import org.wso2.wsas.persistence.exception.TransportAlreadyExistsException;
-import org.wso2.wsf.common.transport.http.GenericHttpTransportListener;
-import org.wso2.wsf.common.transport.http.GenericHttpsTransportListener;
+import org.wso2.utils.transport.http.GenericHttpTransportListener;
+import org.wso2.utils.transport.http.GenericHttpsTransportListener;
import org.wso2.wsas.util.HibernateConfigFactory;
import javax.xml.namespace.QName;
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/feed/AbstractFeed.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/feed/AbstractFeed.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/feed/AbstractFeed.java Thu Jan 11 22:17:40 2007
@@ -19,7 +19,7 @@
import org.apache.axis2.engine.AxisConfiguration;
import org.wso2.wsas.ServerConstants;
import org.wso2.wsas.ServerManager;
-import org.wso2.wsf.common.util.NetworkUtils;
+import org.wso2.utils.NetworkUtils;
import java.net.SocketException;
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/feed/atom/AtomElement.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/feed/atom/AtomElement.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/feed/atom/AtomElement.java Thu Jan 11 22:17:40 2007
@@ -21,7 +21,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wso2.wsas.ServerManager;
-import org.wso2.wsf.common.util.NetworkUtils;
+import org.wso2.utils.NetworkUtils;
import java.net.SocketException;
import java.text.SimpleDateFormat;
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/feed/rss/RSSElement.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/feed/rss/RSSElement.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/feed/rss/RSSElement.java Thu Jan 11 22:17:40 2007
@@ -20,7 +20,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wso2.wsas.ServerManager;
-import org.wso2.wsf.common.util.NetworkUtils;
+import org.wso2.utils.NetworkUtils;
import java.net.SocketException;
import java.text.SimpleDateFormat;
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/security/RahasUtil.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/security/RahasUtil.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/security/RahasUtil.java Thu Jan 11 22:17:40 2007
@@ -24,7 +24,7 @@
import org.apache.rahas.impl.SCTIssuerConfig;
import org.apache.rahas.impl.TokenCancelerConfig;
import org.apache.rahas.impl.TokenIssuerUtil;
-import org.wso2.wsf.common.ServerException;
+import org.wso2.utils.ServerException;
import javax.xml.namespace.QName;
import java.util.Enumeration;
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/security/ServerCrypto.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/security/ServerCrypto.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/security/ServerCrypto.java Thu Jan 11 22:17:40 2007
@@ -17,13 +17,13 @@
package org.wso2.wsas.security;
import org.wso2.wsas.ServerConstants;
-import org.wso2.wsf.common.ServerException;
+import org.wso2.utils.ServerException;
import org.wso2.wsas.persistence.PersistenceManager;
import org.wso2.wsas.persistence.dataobject.KeyStoreDO;
import org.wso2.wsas.util.HibernateConfigFactory;
-import org.wso2.wsf.common.util.ServerConfiguration;
-import org.wso2.wsf.common.tools.security.CryptoUtil;
-import org.wso2.wsf.common.tools.security.CryptoException;
+import org.wso2.utils.ServerConfiguration;
+import org.wso2.utils.security.CryptoUtil;
+import org.wso2.utils.security.CryptoException;
import org.apache.commons.discovery.Resource;
import org.apache.commons.discovery.ResourceIterator;
import org.apache.commons.discovery.jdk.JDKHooks;
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/security/ServicePasswordCallbackHandler.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/security/ServicePasswordCallbackHandler.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/security/ServicePasswordCallbackHandler.java Thu Jan 11 22:17:40 2007
@@ -21,9 +21,9 @@
import org.wso2.wsas.persistence.PersistenceManager;
import org.wso2.wsas.persistence.dataobject.*;
import org.wso2.wsas.util.HibernateConfigFactory;
-import org.wso2.wsf.common.util.ServerConfiguration;
-import org.wso2.wsf.common.tools.security.CryptoUtil;
-import org.wso2.wsf.common.tools.security.CryptoException;
+import org.wso2.utils.ServerConfiguration;
+import org.wso2.utils.security.CryptoUtil;
+import org.wso2.utils.security.CryptoException;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/security/WSS4JUtil.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/security/WSS4JUtil.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/security/WSS4JUtil.java Thu Jan 11 22:17:40 2007
@@ -22,7 +22,7 @@
import org.apache.ws.security.WSUsernameTokenPrincipal;
import org.apache.ws.security.handler.WSHandlerConstants;
import org.apache.ws.security.handler.WSHandlerResult;
-import org.wso2.wsf.common.ServerException;
+import org.wso2.utils.ServerException;
import java.util.Vector;
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/security/util/RampartConfigUtil.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/security/util/RampartConfigUtil.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/security/util/RampartConfigUtil.java Thu Jan 11 22:17:40 2007
@@ -20,8 +20,8 @@
import org.apache.axis2.description.AxisDescription;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.engine.AxisConfiguration;
-import org.wso2.wsf.common.ServerException;
-import org.wso2.wsf.common.tools.i18n.Messages;
+import org.wso2.utils.ServerException;
+import org.wso2.utils.i18n.Messages;
/**
* Utility methods to compute Rampart configuration
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/services/version/Version.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/services/version/Version.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/services/version/Version.java Thu Jan 11 22:17:40 2007
@@ -15,7 +15,7 @@
*/
package org.wso2.wsas.services.version;
-import org.wso2.wsf.common.util.ServerConfiguration;
+import org.wso2.utils.ServerConfiguration;
/**
* The WSO2 WSAS Version service
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/fileupload/AbstractFileUploadExecutor.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/fileupload/AbstractFileUploadExecutor.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/fileupload/AbstractFileUploadExecutor.java Thu Jan 11 22:17:40 2007
@@ -16,7 +16,7 @@
package org.wso2.wsas.transport.fileupload;
import org.wso2.wsas.ServerConstants;
-import org.wso2.wsf.common.ServerException;
+import org.wso2.utils.ServerException;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.commons.collections.bidimap.TreeBidiMap;
import org.apache.commons.fileupload.FileItem;
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/fileupload/AnyFileUploadExecutor.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/fileupload/AnyFileUploadExecutor.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/fileupload/AnyFileUploadExecutor.java Thu Jan 11 22:17:40 2007
@@ -15,7 +15,7 @@
*/
package org.wso2.wsas.transport.fileupload;
-import org.wso2.wsf.common.ServerException;
+import org.wso2.utils.ServerException;
import org.apache.axis2.context.ConfigurationContext;
import javax.servlet.http.HttpServletRequest;
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/fileupload/FileUploadExecutor.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/fileupload/FileUploadExecutor.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/fileupload/FileUploadExecutor.java Thu Jan 11 22:17:40 2007
@@ -15,7 +15,7 @@
*/
package org.wso2.wsas.transport.fileupload;
-import org.wso2.wsf.common.ServerException;
+import org.wso2.utils.ServerException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/fileupload/FileUploadExecutorManager.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/fileupload/FileUploadExecutorManager.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/fileupload/FileUploadExecutorManager.java Thu Jan 11 22:17:40 2007
@@ -15,8 +15,8 @@
*/
package org.wso2.wsas.transport.fileupload;
-import org.wso2.wsf.common.ServerException;
-import org.wso2.wsf.common.util.ServerConfiguration;
+import org.wso2.utils.ServerException;
+import org.wso2.utils.ServerConfiguration;
import org.apache.axiom.om.OMElement;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.commons.logging.Log;
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/fileupload/KeyStoreFileUploadExecutor.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/fileupload/KeyStoreFileUploadExecutor.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/fileupload/KeyStoreFileUploadExecutor.java Thu Jan 11 22:17:40 2007
@@ -16,7 +16,7 @@
package org.wso2.wsas.transport.fileupload;
import org.wso2.wsas.ServerConstants;
-import org.wso2.wsf.common.ServerException;
+import org.wso2.utils.ServerException;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.commons.collections.bidimap.TreeBidiMap;
import org.apache.commons.fileupload.FileItem;
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/fileupload/ModuleFileUploadExecutor.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/fileupload/ModuleFileUploadExecutor.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/fileupload/ModuleFileUploadExecutor.java Thu Jan 11 22:17:40 2007
@@ -15,7 +15,7 @@
*/
package org.wso2.wsas.transport.fileupload;
-import org.wso2.wsf.common.ServerException;
+import org.wso2.utils.ServerException;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.deployment.DeploymentEngine;
import org.apache.axis2.description.AxisModule;
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/fileupload/ServiceFileUploadExecutor.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/fileupload/ServiceFileUploadExecutor.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/fileupload/ServiceFileUploadExecutor.java Thu Jan 11 22:17:40 2007
@@ -16,7 +16,7 @@
package org.wso2.wsas.transport.fileupload;
import org.wso2.wsas.ServerConstants;
-import org.wso2.wsf.common.ServerException;
+import org.wso2.utils.ServerException;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.commons.collections.bidimap.TreeBidiMap;
import org.apache.commons.fileupload.FileItem;
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/fileupload/SpringFileUploadExecutor.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/fileupload/SpringFileUploadExecutor.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/fileupload/SpringFileUploadExecutor.java Thu Jan 11 22:17:40 2007
@@ -16,7 +16,7 @@
package org.wso2.wsas.transport.fileupload;
import org.wso2.wsas.ServerConstants;
-import org.wso2.wsf.common.ServerException;
+import org.wso2.utils.ServerException;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.commons.collections.bidimap.TreeBidiMap;
import org.apache.commons.fileupload.FileItem;
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/jetty/Axis2FileDownloadHandler.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/jetty/Axis2FileDownloadHandler.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/jetty/Axis2FileDownloadHandler.java Thu Jan 11 22:17:40 2007
@@ -15,7 +15,7 @@
*/
package org.wso2.wsas.transport.jetty;
-import org.wso2.wsf.common.ServerException;
+import org.wso2.utils.ServerException;
import org.wso2.wsas.util.FileDownloadUtil;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/jetty/Axis2FileUploadHandler.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/jetty/Axis2FileUploadHandler.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/jetty/Axis2FileUploadHandler.java Thu Jan 11 22:17:40 2007
@@ -17,7 +17,7 @@
*/
package org.wso2.wsas.transport.jetty;
-import org.wso2.wsf.common.ServerException;
+import org.wso2.utils.ServerException;
import org.wso2.wsas.transport.fileupload.FileUploadExecutorManager;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
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 Thu Jan 11 22:17:40 2007
@@ -15,7 +15,7 @@
*/
package org.wso2.wsas.transport.jetty;
-import org.wso2.wsf.common.util.ServerConfiguration;
+import org.wso2.utils.ServerConfiguration;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.addressing.EndpointReference;
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/jetty/Axis2SOAPHandler.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/jetty/Axis2SOAPHandler.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/jetty/Axis2SOAPHandler.java Thu Jan 11 22:17:40 2007
@@ -15,7 +15,7 @@
*/
package org.wso2.wsas.transport.jetty;
-import org.wso2.wsf.common.ServerException;
+import org.wso2.utils.ServerException;
import org.wso2.wsas.util.HttpGetRequestProcessor;
import org.apache.axis2.AxisFault;
import org.apache.axis2.transport.http.util.SOAPUtil;
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/jetty/HttpTransportListener.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/jetty/HttpTransportListener.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/jetty/HttpTransportListener.java Thu Jan 11 22:17:40 2007
@@ -18,10 +18,10 @@
import org.wso2.wsas.ServerConstants;
import org.wso2.wsas.ServerManager;
-import org.wso2.wsf.common.util.NetworkUtils;
-import org.wso2.wsf.common.util.RESTEndpointReferenceUtil;
-import org.wso2.wsf.common.transport.AbstractTransportListener;
-import org.wso2.wsf.common.transport.http.HttpServerManager;
+import org.wso2.utils.NetworkUtils;
+import org.wso2.utils.RESTEndpointReferenceUtil;
+import org.wso2.utils.transport.AbstractTransportListener;
+import org.wso2.utils.transport.http.HttpServerManager;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.commons.logging.Log;
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/jetty/HttpsTransportListener.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/jetty/HttpsTransportListener.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/jetty/HttpsTransportListener.java Thu Jan 11 22:17:40 2007
@@ -28,11 +28,11 @@
import org.wso2.wsas.ServerManager;
import org.wso2.wsas.persistence.exception.KeyStoreAlreadyExistsException;
import org.wso2.wsas.util.KeyStoreUtil;
-import org.wso2.wsf.common.ServerException;
-import org.wso2.wsf.common.transport.AbstractTransportListener;
-import org.wso2.wsf.common.transport.http.HttpServerManager;
-import org.wso2.wsf.common.util.NetworkUtils;
-import org.wso2.wsf.common.util.RESTEndpointReferenceUtil;
+import org.wso2.utils.ServerException;
+import org.wso2.utils.transport.AbstractTransportListener;
+import org.wso2.utils.transport.http.HttpServerManager;
+import org.wso2.utils.NetworkUtils;
+import org.wso2.utils.RESTEndpointReferenceUtil;
import javax.xml.namespace.QName;
import java.net.SocketException;
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/jetty/JettyServer.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/jetty/JettyServer.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/jetty/JettyServer.java Thu Jan 11 22:17:40 2007
@@ -17,7 +17,7 @@
import org.wso2.wsas.ServerConstants;
import org.wso2.wsas.util.JettyWebConfiguration;
-import org.wso2.wsf.common.transport.http.HttpServerManager;
+import org.wso2.utils.transport.http.HttpServerManager;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.commons.logging.Log;
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/jetty/ManagementConsoleRequestHandler.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/jetty/ManagementConsoleRequestHandler.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/jetty/ManagementConsoleRequestHandler.java Thu Jan 11 22:17:40 2007
@@ -24,8 +24,8 @@
import org.wso2.wsas.ServerManager;
import org.wso2.wsas.util.JettyWebConfiguration;
import org.wso2.wsas.util.MIMEType2FileExtensionMap;
-import org.wso2.wsf.common.transport.http.FaviconProvider;
-import org.wso2.wsf.common.util.NetworkUtils;
+import org.wso2.utils.transport.http.FaviconProvider;
+import org.wso2.utils.NetworkUtils;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/jetty/ServerDefaultHandler.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/jetty/ServerDefaultHandler.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/jetty/ServerDefaultHandler.java Thu Jan 11 22:17:40 2007
@@ -21,8 +21,8 @@
import org.mortbay.log.Log;
import org.wso2.wsas.ServerManager;
import org.wso2.wsas.util.JettyWebConfiguration;
-import org.wso2.wsf.common.transport.http.FaviconProvider;
-import org.wso2.wsf.common.util.NetworkUtils;
+import org.wso2.utils.transport.http.FaviconProvider;
+import org.wso2.utils.NetworkUtils;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/jetty/ServerHandler.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/jetty/ServerHandler.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/jetty/ServerHandler.java Thu Jan 11 22:17:40 2007
@@ -18,7 +18,7 @@
import org.wso2.wsas.ServerConstants;
import org.wso2.wsas.Main;
-import org.wso2.wsf.common.ServerException;
+import org.wso2.utils.ServerException;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.AxisFault;
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/util/Restartable.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/util/Restartable.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/util/Restartable.java Thu Jan 11 22:17:40 2007
@@ -15,7 +15,7 @@
*/
package org.wso2.wsas.transport.util;
-import org.wso2.wsf.common.ServerException;
+import org.wso2.utils.ServerException;
import org.wso2.wsas.util.Monitor;
/**
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/util/SystemRestarter.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/util/SystemRestarter.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/transport/util/SystemRestarter.java Thu Jan 11 22:17:40 2007
@@ -18,7 +18,7 @@
package org.wso2.wsas.transport.util;
-import org.wso2.wsf.common.ServerException;
+import org.wso2.utils.ServerException;
import org.wso2.wsas.util.Monitor;
import org.apache.log4j.Logger;
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/util/FileDownloadUtil.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/util/FileDownloadUtil.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/util/FileDownloadUtil.java Thu Jan 11 22:17:40 2007
@@ -16,7 +16,7 @@
package org.wso2.wsas.util;
import org.wso2.wsas.ServerConstants;
-import org.wso2.wsf.common.ServerException;
+import org.wso2.utils.ServerException;
import org.apache.axis2.context.MessageContext;
import javax.servlet.http.HttpServletRequest;
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/util/HouseKeepingTask.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/util/HouseKeepingTask.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/util/HouseKeepingTask.java Thu Jan 11 22:17:40 2007
@@ -18,8 +18,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.collections.BidiMap;
-import org.wso2.wsf.common.tools.FileManipulator;
-import org.wso2.wsf.common.util.ServerConfiguration;
+import org.wso2.utils.FileManipulator;
+import org.wso2.utils.ServerConfiguration;
import java.util.*;
import java.io.File;
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/util/HttpGetRequestProcessor.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/util/HttpGetRequestProcessor.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/util/HttpGetRequestProcessor.java Thu Jan 11 22:17:40 2007
@@ -42,9 +42,9 @@
import org.wso2.wsas.persistence.dataobject.KeyStoreDO;
import org.wso2.wsas.persistence.dataobject.ServiceDO;
import org.wso2.wsas.transport.jetty.ServiceHTMLProcessor;
-import org.wso2.wsf.common.util.NetworkUtils;
-import org.wso2.wsf.common.util.ServerConfiguration;
-import org.wso2.wsf.common.ServerException;
+import org.wso2.utils.NetworkUtils;
+import org.wso2.utils.ServerConfiguration;
+import org.wso2.utils.ServerException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/util/KeyStoreUtil.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/util/KeyStoreUtil.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/util/KeyStoreUtil.java Thu Jan 11 22:17:40 2007
@@ -19,10 +19,10 @@
import org.wso2.wsas.persistence.dataobject.KeyStoreDO;
import org.wso2.wsas.persistence.PersistenceManager;
import org.wso2.wsas.ServerConstants;
-import org.wso2.wsf.common.tools.security.CryptoUtil;
-import org.wso2.wsf.common.tools.security.CryptoException;
-import org.wso2.wsf.common.ServerException;
-import org.wso2.wsf.common.util.ServerConfiguration;
+import org.wso2.utils.security.CryptoUtil;
+import org.wso2.utils.security.CryptoException;
+import org.wso2.utils.ServerException;
+import org.wso2.utils.ServerConfiguration;
import org.apache.axis2.AxisFault;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/util/LoggingUtil.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/util/LoggingUtil.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/util/LoggingUtil.java Thu Jan 11 22:17:40 2007
@@ -21,8 +21,8 @@
import org.wso2.wsas.persistence.dataobject.AppenderDO;
import org.wso2.wsas.persistence.PersistenceManager;
import org.wso2.wsas.ServerConstants;
-import org.wso2.wsf.common.util.CircularBuffer;
-import org.wso2.wsf.common.util.MemoryAppender;
+import org.wso2.utils.CircularBuffer;
+import org.wso2.utils.MemoryAppender;
import java.util.Set;
import java.util.HashSet;
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/util/Monitor.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/util/Monitor.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/util/Monitor.java Thu Jan 11 22:17:40 2007
@@ -15,7 +15,7 @@
*/
package org.wso2.wsas.util;
-import org.wso2.wsf.common.tools.i18n.Messages;
+import org.wso2.utils.i18n.Messages;
import java.io.InputStreamReader;
import java.io.LineNumberReader;
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/util/PasswordUpdater.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/util/PasswordUpdater.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/util/PasswordUpdater.java Thu Jan 11 22:17:40 2007
@@ -16,10 +16,10 @@
package org.wso2.wsas.util;
import org.wso2.wsas.ServerConstants;
-import org.wso2.wsf.common.tools.InputReader;
-import org.wso2.wsf.common.tools.security.CryptoUtil;
-import org.wso2.wsf.common.tools.security.CryptoException;
-import org.wso2.wsf.common.util.ServerConfiguration;
+import org.wso2.utils.InputReader;
+import org.wso2.utils.security.CryptoUtil;
+import org.wso2.utils.security.CryptoException;
+import org.wso2.utils.ServerConfiguration;
import java.io.IOException;
import java.io.File;
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/util/SchemaUtil.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/util/SchemaUtil.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/util/SchemaUtil.java Thu Jan 11 22:17:40 2007
@@ -16,7 +16,7 @@
package org.wso2.wsas.util;
import org.wso2.wsas.ServerConstants;
-import org.wso2.wsf.common.ServerException;
+import org.wso2.utils.ServerException;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
@@ -48,7 +48,10 @@
* @return
* @throws ServerException
*/
- public static SOAPEnvelope handleMediaTypeURLEncoded(MessageContext msgCtxt, HttpServletRequest request, XmlSchemaElement xmlSchemaElement, SOAPFactory soapFactory) throws ServerException {
+ public static SOAPEnvelope handleMediaTypeURLEncoded(MessageContext msgCtxt,
+ HttpServletRequest request,
+ XmlSchemaElement xmlSchemaElement,
+ SOAPFactory soapFactory) throws ServerException {
Map requestParameterMap = request.getParameterMap();
SOAPEnvelope soapEnvelope = soapFactory.getDefaultEnvelope();
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/util/ServerController.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/util/ServerController.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/util/ServerController.java Thu Jan 11 22:17:40 2007
@@ -16,7 +16,7 @@
package org.wso2.wsas.util;
import org.wso2.wsas.Main;
-import org.wso2.wsf.common.ServerException;
+import org.wso2.utils.ServerException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/util/TraceFilterImpl.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/util/TraceFilterImpl.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/util/TraceFilterImpl.java Thu Jan 11 22:17:40 2007
@@ -18,7 +18,7 @@
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.AxisServiceGroup;
-import org.wso2.wsf.common.tracer.module.TraceFilter;
+import org.wso2.tracer.module.TraceFilter;
import org.wso2.wsas.ServerConstants;
/**
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/util/TracePersisterImpl.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/util/TracePersisterImpl.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/util/TracePersisterImpl.java Thu Jan 11 22:17:40 2007
@@ -24,8 +24,8 @@
import org.wso2.wsas.persistence.PersistenceManager;
import org.wso2.wsas.persistence.dataobject.MessageDO;
import org.wso2.wsas.persistence.dataobject.ServiceIdentifierDO;
-import org.wso2.wsf.common.tracer.TracerConstants;
-import org.wso2.wsf.common.tracer.module.TracePersister;
+import org.wso2.tracer.TracerConstants;
+import org.wso2.tracer.module.TracePersister;
import javax.xml.transform.*;
import javax.xml.transform.stream.StreamResult;
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/util/XmlConfiguration.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/util/XmlConfiguration.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/util/XmlConfiguration.java Thu Jan 11 22:17:40 2007
@@ -16,7 +16,7 @@
package org.wso2.wsas.util;
import org.wso2.wsas.ServerConstants;
-import org.wso2.wsf.common.ServerException;
+import org.wso2.utils.ServerException;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.axiom.om.xpath.AXIOMXPath;
Modified: wsas/java/trunk/modules/core/src/org/wso2/wsas/util/XmlConfigurationFactory.java
==============================================================================
--- wsas/java/trunk/modules/core/src/org/wso2/wsas/util/XmlConfigurationFactory.java (original)
+++ wsas/java/trunk/modules/core/src/org/wso2/wsas/util/XmlConfigurationFactory.java Thu Jan 11 22:17:40 2007
@@ -15,7 +15,7 @@
*/
package org.wso2.wsas.util;
-import org.wso2.wsf.common.ServerException;
+import org.wso2.utils.ServerException;
import java.util.Map;
import java.util.HashMap;
Modified: wsas/java/trunk/modules/core/test/org/wso2/wsas/JettyServerTest.java
==============================================================================
--- wsas/java/trunk/modules/core/test/org/wso2/wsas/JettyServerTest.java (original)
+++ wsas/java/trunk/modules/core/test/org/wso2/wsas/JettyServerTest.java Thu Jan 11 22:17:40 2007
@@ -16,8 +16,8 @@
package org.wso2.wsas;
import org.wso2.wsas.util.ServerUtils;
-import org.wso2.wsf.common.util.NetworkUtils;
-import org.wso2.wsf.common.util.ServerConfiguration;
+import org.wso2.utils.NetworkUtils;
+import org.wso2.utils.ServerConfiguration;
import junit.framework.TestCase;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
Modified: wsas/java/trunk/modules/core/test/org/wso2/wsas/core/EchoTest.java
==============================================================================
--- wsas/java/trunk/modules/core/test/org/wso2/wsas/core/EchoTest.java (original)
+++ wsas/java/trunk/modules/core/test/org/wso2/wsas/core/EchoTest.java Thu Jan 11 22:17:40 2007
@@ -18,7 +18,7 @@
import org.wso2.wsas.AbstractTestCase;
import org.wso2.wsas.TestConstants;
import org.wso2.wsas.util.Echo;
-import org.wso2.wsf.common.util.NetworkUtils;
+import org.wso2.utils.NetworkUtils;
import org.apache.axiom.om.OMElement;
import org.apache.axis2.Constants;
import org.apache.axis2.addressing.EndpointReference;
Modified: wsas/java/trunk/modules/core/test/org/wso2/wsas/security/CryptoUtilTest.java
==============================================================================
--- wsas/java/trunk/modules/core/test/org/wso2/wsas/security/CryptoUtilTest.java (original)
+++ wsas/java/trunk/modules/core/test/org/wso2/wsas/security/CryptoUtilTest.java Thu Jan 11 22:17:40 2007
@@ -16,9 +16,9 @@
package org.wso2.wsas.security;
-import org.wso2.wsf.common.tools.security.CryptoUtil;
-import org.wso2.wsf.common.tools.security.CryptoException;
-import org.wso2.wsf.common.util.ServerConfiguration;
+import org.wso2.utils.security.CryptoUtil;
+import org.wso2.utils.security.CryptoException;
+import org.wso2.utils.ServerConfiguration;
import org.wso2.wsas.ServerConstants;
import junit.framework.TestCase;
Modified: wsas/java/trunk/modules/core/test/org/wso2/wsas/security/WSS4JUtilTest.java
==============================================================================
--- wsas/java/trunk/modules/core/test/org/wso2/wsas/security/WSS4JUtilTest.java (original)
+++ wsas/java/trunk/modules/core/test/org/wso2/wsas/security/WSS4JUtilTest.java Thu Jan 11 22:17:40 2007
@@ -15,7 +15,7 @@
*/
package org.wso2.wsas.security;
-import org.wso2.wsf.common.ServerException;
+import org.wso2.utils.ServerException;
import org.wso2.wsas.ServerConstants;
import junit.framework.TestCase;
import org.apache.axis2.context.MessageContext;
Modified: wsas/java/trunk/modules/core/test/org/wso2/wsas/util/ServerUtils.java
==============================================================================
--- wsas/java/trunk/modules/core/test/org/wso2/wsas/util/ServerUtils.java (original)
+++ wsas/java/trunk/modules/core/test/org/wso2/wsas/util/ServerUtils.java Thu Jan 11 22:17:40 2007
@@ -17,8 +17,8 @@
import org.wso2.wsas.TestConstants;
import org.wso2.wsas.Main;
-import org.wso2.wsf.common.ServerException;
-import org.wso2.wsf.common.util.ServerConfiguration;
+import org.wso2.utils.ServerException;
+import org.wso2.utils.ServerConfiguration;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.description.AxisService;
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 Thu Jan 11 22:17:40 2007
@@ -32,11 +32,12 @@
<exclude>xerces:resolver:jar</exclude>
<exclude>bouncycastle:bcprov-jdk13:jar</exclude>
<exclude>bouncycastle:bcprov-jdk15:jar</exclude>
- <exclude>org.wso2.wsf:wso2wsf-mex:mar</exclude>
- <exclude>org.wso2.wsf:wso2wsf-statistics:mar</exclude>
- <exclude>org.wso2.wsf:wso2wsf-throttle:mar</exclude>
- <exclude>org.wso2.wsf:wso2wsf-tracer:mar</exclude>
- <exclude>org.wso2.wsf:wso2wsf-codegen:aar</exclude>
+ <exclude>org.wso2.mex:wso2mex:mar</exclude>
+ <exclude>org.wso2.xfer:wso2xfer:mar</exclude>
+ <exclude>org.wso2.statistics:wso2statistics:mar</exclude>
+ <exclude>org.wso2.throttle:wso2throttle:mar</exclude>
+ <exclude>org.wso2.tracer:wso2tracer:mar</exclude>
+ <exclude>org.wso2.codegen:wso2codegen:aar</exclude>
<exclude>org.apache.axis2:addressing:mar</exclude>
<exclude>org.apache.axis2:rampart:mar</exclude>
<exclude>org.apache.axis2:rahas:mar</exclude>
@@ -48,10 +49,11 @@
<dependencySet>
<outputDirectory>${dist.temp.assembly.bin.dir}/repository/modules</outputDirectory>
<includes>
- <include>org.wso2.wsf:wso2wsf-mex:mar</include>
- <include>org.wso2.wsf:wso2wsf-statistics:mar</include>
- <include>org.wso2.wsf:wso2wsf-throttle:mar</include>
- <include>org.wso2.wsf:wso2wsf-tracer:mar</include>
+ <include>org.wso2.mex:wso2mex:mar</include>
+ <include>org.wso2.xfer:wso2xfer:mar</include>
+ <include>org.wso2.statistics:wso2statistics:mar</include>
+ <include>org.wso2.throttle:wso2throttle:mar</include>
+ <include>org.wso2.tracer:wso2tracer:mar</include>
<include>org.apache.axis2:addressing:mar</include>
<include>org.apache.axis2:rampart:mar</include>
<include>org.apache.axis2:rahas:mar</include>
@@ -61,7 +63,7 @@
<dependencySet>
<outputDirectory>${dist.temp.assembly.bin.dir}/repository/services</outputDirectory>
<includes>
- <include>org.wso2.wsf:wso2wsf-codegen:aar</include>
+ <include>org.wso2.codegen:wso2codegen:aar</include>
</includes>
</dependencySet>
<dependencySet>
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 Thu Jan 11 22:17:40 2007
@@ -66,11 +66,12 @@
<exclude>xerces:resolver:jar</exclude>
<exclude>bouncycastle:bcprov-jdk13:jar</exclude>
<exclude>bouncycastle:bcprov-jdk15:jar</exclude>
- <exclude>org.wso2.wsf:wso2wsf-mex:mar</exclude>
- <exclude>org.wso2.wsf:wso2wsf-statistics:mar</exclude>
- <exclude>org.wso2.wsf:wso2wsf-throttle:mar</exclude>
- <exclude>org.wso2.wsf:wso2wsf-tracer:mar</exclude>
- <exclude>org.wso2.wsf:wso2wsf-codegen:aar</exclude>
+ <exclude>org.wso2.mex:wso2mex:mar</exclude>
+ <exclude>org.wso2.xfer:wso2xfer:mar</exclude>
+ <exclude>org.wso2.statistics:wso2statistics:mar</exclude>
+ <exclude>org.wso2.throttle:wso2throttle:mar</exclude>
+ <exclude>org.wso2.tracer:wso2tracer:mar</exclude>
+ <exclude>org.wso2.codegen:wso2codegen:aar</exclude>
<exclude>org.apache.axis2:addressing:mar</exclude>
<exclude>org.apache.axis2:rampart:mar</exclude>
<exclude>org.apache.axis2:rahas:mar</exclude>
Copied: wsas/java/trunk/modules/integration/test/org/wso2/codegen/service/WSDLInfoServiceTest.java (from r370, wsas/java/trunk/modules/integration/test/org/wso2/wsf/common/codegen/service/WSDLInfoServiceTest.java)
==============================================================================
--- wsas/java/trunk/modules/integration/test/org/wso2/wsf/common/codegen/service/WSDLInfoServiceTest.java (original)
+++ wsas/java/trunk/modules/integration/test/org/wso2/codegen/service/WSDLInfoServiceTest.java Thu Jan 11 22:17:40 2007
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.wso2.wsf.common.codegen.service;
+package org.wso2.codegen.service;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.rpc.receivers.RPCMessageReceiver;
@@ -21,7 +21,7 @@
import org.wso2.wsas.ServerConstants;
import org.wso2.wsas.TestConstants;
import org.wso2.wsas.util.ServerUtils;
-import org.wso2.wsf.common.util.NetworkUtils;
+import org.wso2.utils.NetworkUtils;
import java.util.Hashtable;
Copied: wsas/java/trunk/modules/integration/test/org/wso2/codegen/service/ajax/AjaxClientGeneratorServiceTest.java (from r370, wsas/java/trunk/modules/integration/test/org/wso2/wsf/common/codegen/service/ajax/AjaxClientGeneratorServiceTest.java)
==============================================================================
--- wsas/java/trunk/modules/integration/test/org/wso2/wsf/common/codegen/service/ajax/AjaxClientGeneratorServiceTest.java (original)
+++ wsas/java/trunk/modules/integration/test/org/wso2/codegen/service/ajax/AjaxClientGeneratorServiceTest.java Thu Jan 11 22:17:40 2007
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.wso2.wsf.common.codegen.service.ajax;
+package org.wso2.codegen.service.ajax;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.engine.AxisConfiguration;
@@ -23,9 +23,9 @@
import org.wso2.wsas.ServerConstants;
import org.wso2.wsas.TestConstants;
import org.wso2.wsas.services.version.Version;
-import org.wso2.wsf.common.util.ServerConfiguration;
+import org.wso2.utils.ServerConfiguration;
import org.wso2.wsas.util.ServerUtils;
-import org.wso2.wsf.common.util.NetworkUtils;
+import org.wso2.utils.NetworkUtils;
import java.io.File;
import java.util.Hashtable;
Copied: wsas/java/trunk/modules/integration/test/org/wso2/codegen/service/java/JavaClientGeneratorServiceTest.java (from r370, wsas/java/trunk/modules/integration/test/org/wso2/wsf/common/codegen/service/java/JavaClientGeneratorServiceTest.java)
==============================================================================
--- wsas/java/trunk/modules/integration/test/org/wso2/wsf/common/codegen/service/java/JavaClientGeneratorServiceTest.java (original)
+++ wsas/java/trunk/modules/integration/test/org/wso2/codegen/service/java/JavaClientGeneratorServiceTest.java Thu Jan 11 22:17:40 2007
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.wso2.wsf.common.codegen.service.java;
+package org.wso2.codegen.service.java;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.rpc.receivers.RPCMessageReceiver;
@@ -21,9 +21,9 @@
import org.wso2.wsas.ServerConstants;
import org.wso2.wsas.TestConstants;
import org.wso2.wsas.services.version.Version;
-import org.wso2.wsf.common.util.ServerConfiguration;
+import org.wso2.utils.ServerConfiguration;
import org.wso2.wsas.util.ServerUtils;
-import org.wso2.wsf.common.util.NetworkUtils;
+import org.wso2.utils.NetworkUtils;
import javax.xml.namespace.QName;
import java.io.File;
Copied: wsas/java/trunk/modules/integration/test/org/wso2/tracer/service/TracerServiceIntegrationTest.java (from r370, wsas/java/trunk/modules/integration/test/org/wso2/wsf/common/tracer/service/TracerServiceIntegrationTest.java)
==============================================================================
--- wsas/java/trunk/modules/integration/test/org/wso2/wsf/common/tracer/service/TracerServiceIntegrationTest.java (original)
+++ wsas/java/trunk/modules/integration/test/org/wso2/tracer/service/TracerServiceIntegrationTest.java Thu Jan 11 22:17:40 2007
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.wso2.wsf.common.tracer.service;
+package org.wso2.tracer.service;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
@@ -25,11 +25,11 @@
import org.wso2.wsas.persistence.exception.ServiceAlreadyExistsException;
import org.wso2.wsas.util.HibernateConfig;
import org.wso2.wsas.util.HibernateConfigFactory;
-import org.wso2.wsf.common.util.ServerConfiguration;
+import org.wso2.utils.ServerConfiguration;
import org.wso2.wsas.util.ServerUtils;
import org.wso2.wsf.common.tracer.TracerConstants;
-import org.wso2.wsf.common.util.CircularBuffer;
-import org.wso2.wsf.common.util.NetworkUtils;
+import org.wso2.utils.CircularBuffer;
+import org.wso2.utils.NetworkUtils;
import javax.xml.namespace.QName;
import java.util.Date;
Modified: wsas/java/trunk/modules/integration/test/org/wso2/wsas/rest/RestSupportTest.java
==============================================================================
--- wsas/java/trunk/modules/integration/test/org/wso2/wsas/rest/RestSupportTest.java (original)
+++ wsas/java/trunk/modules/integration/test/org/wso2/wsas/rest/RestSupportTest.java Thu Jan 11 22:17:40 2007
@@ -31,7 +31,7 @@
import org.wso2.wsas.TestConstants;
import org.wso2.wsas.util.MessageExposeHandler;
import org.wso2.wsas.util.ServerUtils;
-import org.wso2.wsf.common.util.NetworkUtils;
+import org.wso2.utils.NetworkUtils;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLInputFactory;
Modified: wsas/java/trunk/modules/integration/test/org/wso2/wsas/rest/RestWithSchemasTest.java
==============================================================================
--- wsas/java/trunk/modules/integration/test/org/wso2/wsas/rest/RestWithSchemasTest.java (original)
+++ wsas/java/trunk/modules/integration/test/org/wso2/wsas/rest/RestWithSchemasTest.java Thu Jan 11 22:17:40 2007
@@ -20,7 +20,7 @@
import org.wso2.wsas.ServerConstants;
import org.wso2.wsas.TestConstants;
import org.wso2.wsas.util.MessageExposeHandler;
-import org.wso2.wsf.common.util.NetworkUtils;
+import org.wso2.utils.NetworkUtils;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMOutputFormat;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
Modified: wsas/java/trunk/modules/integration/test/org/wso2/wsas/sample/commodityquote/CommodityQuoteCallbackHandlerTestImpl.java
==============================================================================
--- wsas/java/trunk/modules/integration/test/org/wso2/wsas/sample/commodityquote/CommodityQuoteCallbackHandlerTestImpl.java (original)
+++ wsas/java/trunk/modules/integration/test/org/wso2/wsas/sample/commodityquote/CommodityQuoteCallbackHandlerTestImpl.java Thu Jan 11 22:17:40 2007
@@ -18,10 +18,6 @@
import junit.framework.Assert;
import junit.framework.TestCase;
import org.wso2.wsas.sample.commodityquote.client.CommodityQuoteCallbackHandler;
-import org.wso2.www.types.client.GetQuoteResponse;
-import org.wso2.www.types.client.StockQuote;
-import org.wso2.www.types.client.GetSymbolsResponse;
-import org.wso2.www.types.client.ArrayOfString;
/*
*
*/
Modified: wsas/java/trunk/modules/integration/test/org/wso2/wsas/sample/commodityquote/CommodityQuoteServiceIntegrationTest.java
==============================================================================
--- wsas/java/trunk/modules/integration/test/org/wso2/wsas/sample/commodityquote/CommodityQuoteServiceIntegrationTest.java (original)
+++ wsas/java/trunk/modules/integration/test/org/wso2/wsas/sample/commodityquote/CommodityQuoteServiceIntegrationTest.java Thu Jan 11 22:17:40 2007
@@ -31,14 +31,11 @@
import org.apache.sandesha2.client.SandeshaClientConstants;
import org.apache.sandesha2.client.SandeshaListener;
import org.apache.sandesha2.client.SequenceReport;
-import org.wso2.wsas.sample.commodityquote.client.CommodityQuoteCallbackHandler;
import org.wso2.wsas.sample.commodityquote.client.CommodityQuoteStub;
-import org.wso2.wsas.sample.commodityquote.services.CommodityQuoteMessageReceiverInOut;
import org.wso2.wsas.sample.commodityquote.services.CommodityQuoteService;
import org.wso2.wsas.util.ServerUtils;
import org.wso2.wsas.ServerConstants;
-import org.wso2.wsf.common.util.ServerConfiguration;
-import org.wso2.www.types.client.*;
+import org.wso2.utils.ServerConfiguration;
import javax.xml.namespace.QName;
import java.io.File;
Modified: wsas/java/trunk/modules/integration/test/org/wso2/wsas/sample/trader/TraderServiceIntegrationTest.java
==============================================================================
--- wsas/java/trunk/modules/integration/test/org/wso2/wsas/sample/trader/TraderServiceIntegrationTest.java (original)
+++ wsas/java/trunk/modules/integration/test/org/wso2/wsas/sample/trader/TraderServiceIntegrationTest.java Thu Jan 11 22:17:40 2007
@@ -23,17 +23,12 @@
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ConfigurationContextFactory;
-import org.wso2.wsas.sample.exchange.client.ExchangeClientMessageReceiverInOut;
import org.wso2.wsas.sample.exchange.client.ExchangeClientSkeleton;
-import org.wso2.wsas.sample.exchange.client.ExchangeClientStub;
-import org.wso2.wsas.sample.exchange.trader.ExchangeTraderMessageReceiverInOut;
import org.wso2.wsas.sample.exchange.trader.ExchangeTraderSkeleton;
-import org.wso2.wsas.sample.trader.client.TraderClientMessageReceiverInOut;
import org.wso2.wsas.sample.trader.client.TraderClientSkeleton;
-import org.wso2.wsas.sample.trader.client.TraderClientStub;
import org.wso2.wsas.util.ServerUtils;
import org.wso2.wsas.ServerConstants;
-import org.wso2.wsf.common.util.ServerConfiguration;
+import org.wso2.utils.ServerConfiguration;
import org.wso2.www.types.exchange.client.GetInfoRequest;
import org.wso2.www.types.exchange.client.GetInfoResponse;
import org.wso2.www.types.exchange.client.MarketInfo;
Modified: wsas/java/trunk/modules/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/client/Client.java
==============================================================================
--- wsas/java/trunk/modules/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/client/Client.java (original)
+++ wsas/java/trunk/modules/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/client/Client.java Thu Jan 11 22:17:40 2007
@@ -22,8 +22,7 @@
import org.apache.sandesha2.client.SandeshaListener;
import org.apache.sandesha2.client.SequenceReport;
import org.wso2.wsas.security.WSS4JUtil;
-import org.wso2.wsf.common.util.NetworkUtils;
-import org.wso2.www.types.client.*;
+import org.wso2.utils.NetworkUtils;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
Modified: wsas/java/trunk/modules/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/client/CommodityQuoteCallbackHandlerExt.java
==============================================================================
--- wsas/java/trunk/modules/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/client/CommodityQuoteCallbackHandlerExt.java (original)
+++ wsas/java/trunk/modules/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/client/CommodityQuoteCallbackHandlerExt.java Thu Jan 11 22:17:40 2007
@@ -15,11 +15,6 @@
*/
package org.wso2.wsas.sample.commodityquote.client;
-import org.wso2.www.types.client.ArrayOfString;
-import org.wso2.www.types.client.GetQuoteResponse;
-import org.wso2.www.types.client.GetSymbolsResponse;
-import org.wso2.www.types.client.StockQuote;
-
public class CommodityQuoteCallbackHandlerExt
extends CommodityQuoteCallbackHandler {
Modified: wsas/java/trunk/modules/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/services/CommodityQuoteService.java
==============================================================================
--- wsas/java/trunk/modules/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/services/CommodityQuoteService.java (original)
+++ wsas/java/trunk/modules/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/services/CommodityQuoteService.java Thu Jan 11 22:17:40 2007
@@ -4,10 +4,6 @@
*/
package org.wso2.wsas.sample.commodityquote.services;
-import org.wso2.www.types.services.ArrayOfString;
-import org.wso2.www.types.services.GetQuoteResponse;
-import org.wso2.www.types.services.GetSymbolsResponse;
-
/**
* CommodityQuoteService
Modified: wsas/java/trunk/modules/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/services/CommodityQuoteUtil.java
==============================================================================
--- wsas/java/trunk/modules/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/services/CommodityQuoteUtil.java (original)
+++ wsas/java/trunk/modules/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/services/CommodityQuoteUtil.java Thu Jan 11 22:17:40 2007
@@ -18,8 +18,6 @@
import org.wso2.wsas.sample.commodityquote.services.util.SymbolTable;
import org.wso2.wsas.sample.commodityquote.services.util.Utils;
-import org.wso2.www.types.services.StockQuote;
-
import java.util.Iterator;
import java.util.Map;
Modified: wsas/java/trunk/modules/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/services/util/Utils.java
==============================================================================
--- wsas/java/trunk/modules/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/services/util/Utils.java (original)
+++ wsas/java/trunk/modules/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/services/util/Utils.java Thu Jan 11 22:17:40 2007
@@ -16,7 +16,6 @@
*/
package org.wso2.wsas.sample.commodityquote.services.util;
-import org.wso2.www.types.services.StockQuote;
import org.wso2.wsas.sample.commodityquote.services.util.SymbolTable;
import java.util.Iterator;
Modified: wsas/java/trunk/modules/samples/JavascriptService/src/org/wso2/wsas/sample/javascript/Client.java
==============================================================================
--- wsas/java/trunk/modules/samples/JavascriptService/src/org/wso2/wsas/sample/javascript/Client.java (original)
+++ wsas/java/trunk/modules/samples/JavascriptService/src/org/wso2/wsas/sample/javascript/Client.java Thu Jan 11 22:17:40 2007
@@ -24,7 +24,7 @@
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
-import org.wso2.wsf.common.util.NetworkUtils;
+import org.wso2.utils.NetworkUtils;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLOutputFactory;
Modified: wsas/java/trunk/modules/samples/Trader/src/org/wso2/wsas/sample/trader/Client.java
==============================================================================
--- wsas/java/trunk/modules/samples/Trader/src/org/wso2/wsas/sample/trader/Client.java (original)
+++ wsas/java/trunk/modules/samples/Trader/src/org/wso2/wsas/sample/trader/Client.java Thu Jan 11 22:17:40 2007
@@ -34,15 +34,13 @@
import org.apache.sandesha2.client.SandeshaListener;
import org.apache.sandesha2.client.SequenceReport;
import org.wso2.wsas.sample.exchange.client.ExchangeClientCallbackHandlerExt;
-import org.wso2.wsas.sample.exchange.client.ExchangeClientStub;
import org.wso2.wsas.sample.trader.client.TraderClientCallbackHandlerExt;
-import org.wso2.wsas.sample.trader.client.TraderClientStub;
import org.wso2.wsas.security.WSS4JUtil;
import org.wso2.www.types.exchange.client.GetInfoRequest;
import org.wso2.www.types.exchange.client.GetInfoResponse;
import org.wso2.www.types.exchange.client.MarketInfo;
import org.wso2.www.types.trader.client.*;
-import org.wso2.wsf.common.util.NetworkUtils;
+import org.wso2.utils.NetworkUtils;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
Modified: wsas/java/trunk/modules/samples/Trader/src/org/wso2/wsas/sample/trader/Trader.java
==============================================================================
--- wsas/java/trunk/modules/samples/Trader/src/org/wso2/wsas/sample/trader/Trader.java (original)
+++ wsas/java/trunk/modules/samples/Trader/src/org/wso2/wsas/sample/trader/Trader.java Thu Jan 11 22:17:40 2007
@@ -18,9 +18,8 @@
import org.apache.axis2.Constants;
import org.apache.sandesha2.client.SandeshaClientConstants;
import org.wso2.wsas.ServerManager;
-import org.wso2.wsas.sample.exchange.trader.ExchangeTraderStub;
import org.wso2.wsas.sample.utils.Utils;
-import org.wso2.wsf.common.util.NetworkUtils;
+import org.wso2.utils.NetworkUtils;
import org.wso2.www.types.exchange.trader.*;
import org.wso2.www.types.trader.client.service.StockQuote;
Modified: wsas/java/trunk/modules/samples/pom.xml
==============================================================================
--- wsas/java/trunk/modules/samples/pom.xml (original)
+++ wsas/java/trunk/modules/samples/pom.xml Thu Jan 11 22:17:40 2007
@@ -48,11 +48,11 @@
<executions>
<execution>
<id>generate-code</id>
- <phase>initialize</phase>
+ <phase>generate-source</phase>
<configuration>
<tasks>
- <echo>Generating skeletons for Generic Services</echo>
- <java classname="org.wso2.wsf.common.tools.codegen.CodegenHelper"
+ <echo>Generating skeletons for sample services</echo>
+ <java classname="org.wso2.utils.codegen.CodegenHelper"
fork="true">
<arg value="./conf/wsas-samples-codegen.xml"/>
<classpath refid="maven.dependency.classpath"/>
Modified: wsas/java/trunk/modules/servlet-edition/bin/install.bat
==============================================================================
--- wsas/java/trunk/modules/servlet-edition/bin/install.bat (original)
+++ wsas/java/trunk/modules/servlet-edition/bin/install.bat Thu Jan 11 22:17:40 2007
@@ -59,7 +59,7 @@
FOR %%C in (.\lib\*.jar) DO set WSO2WSAS_CLASSPATH=!WSO2WSAS_CLASSPATH!;.\lib\%%~nC%%~xC
echo Running WSO2 Web Services Application Server Servlet Edition 1.1 installer...
-"%JAVA_HOME%\bin\java.exe" -Djava.ext.dirs=.\lib -cp %WSO2WSAS_CLASSPATH% org.wso2.wsf.common.tools.LibExtractor
+"%JAVA_HOME%\bin\java.exe" -Djava.ext.dirs=.\lib -cp %WSO2WSAS_CLASSPATH% org.wso2.utils.LibExtractor
if "%CATALINA_HOME%" == "" set CATALINA_HOME="INVALID"
if "%JBOSS_HOME%" == "" set JBOSS_HOME="INVALID"
Modified: wsas/java/trunk/modules/servlet-edition/bin/install.sh
==============================================================================
--- wsas/java/trunk/modules/servlet-edition/bin/install.sh (original)
+++ wsas/java/trunk/modules/servlet-edition/bin/install.sh Thu Jan 11 22:17:40 2007
@@ -79,7 +79,7 @@
fi
cd $WSO2WSAS_HOME
-$JAVA_HOME/bin/java -cp "$WSO2WSAS_CLASSPATH" org.wso2.wsf.common.tools.LibExtractor
+$JAVA_HOME/bin/java -cp "$WSO2WSAS_CLASSPATH" org.wso2.utils.LibExtractor
# update classpath
WSO2WSAS_CLASSPATH=""
for f in "$WSO2WSAS_HOME"/lib/*.jar
Modified: wsas/java/trunk/modules/servlet-edition/conf/axis2.xml
==============================================================================
--- wsas/java/trunk/modules/servlet-edition/conf/axis2.xml (original)
+++ wsas/java/trunk/modules/servlet-edition/conf/axis2.xml Thu Jan 11 22:17:40 2007
@@ -84,7 +84,7 @@
in this case.
-->
<!--transportReceiver name="mod_proxy/http"
- class="org.wso2.wsf.common.transport.http.GenericHttpTransportListener">
+ class="org.wso2.utils.transport.http.GenericHttpTransportListener">
<parameter name="port" locked="false">80</parameter>
</transportReceiver-->
Modified: wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/FileDownloadServlet.java
==============================================================================
--- wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/FileDownloadServlet.java (original)
+++ wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/FileDownloadServlet.java Thu Jan 11 22:17:40 2007
@@ -30,7 +30,7 @@
import java.io.IOException;
import org.wso2.wsas.util.FileDownloadUtil;
-import org.wso2.wsf.common.ServerException;
+import org.wso2.utils.ServerException;
public class FileDownloadServlet extends AxisServlet {
Modified: wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/FileUploadServlet.java
==============================================================================
--- wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/FileUploadServlet.java (original)
+++ wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/FileUploadServlet.java Thu Jan 11 22:17:40 2007
@@ -16,7 +16,7 @@
package org.wso2.wsas;
import org.wso2.wsas.transport.fileupload.FileUploadExecutorManager;
-import org.wso2.wsf.common.ServerException;
+import org.wso2.utils.ServerException;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
Modified: wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/GenericServerInfo.java
==============================================================================
--- wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/GenericServerInfo.java (original)
+++ wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/GenericServerInfo.java Thu Jan 11 22:17:40 2007
@@ -15,7 +15,7 @@
*/
package org.wso2.wsas;
-import org.wso2.wsf.common.util.ServerConfiguration;
+import org.wso2.utils.ServerConfiguration;
import java.util.Properties;
Modified: wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/JBossServerInfo.java
==============================================================================
--- wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/JBossServerInfo.java (original)
+++ wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/JBossServerInfo.java Thu Jan 11 22:17:40 2007
@@ -29,7 +29,7 @@
import java.util.Iterator;
import java.util.Properties;
-import org.wso2.wsf.common.util.ServerConfiguration;
+import org.wso2.utils.ServerConfiguration;
/**
*
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 Jan 11 22:17:40 2007
@@ -21,9 +21,9 @@
import org.wso2.wsas.transport.util.Restartable;
import org.wso2.wsas.transport.util.SystemRestarter;
import org.wso2.wsas.util.*;
-import org.wso2.wsf.common.tools.FileManipulator;
-import org.wso2.wsf.common.ServerException;
-import org.wso2.wsf.common.util.ServerConfiguration;
+import org.wso2.utils.FileManipulator;
+import org.wso2.utils.ServerException;
+import org.wso2.utils.ServerConfiguration;
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
Modified: wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/RequestRedirectionFilter.java
==============================================================================
--- wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/RequestRedirectionFilter.java (original)
+++ wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/RequestRedirectionFilter.java Thu Jan 11 22:17:40 2007
@@ -15,7 +15,7 @@
*/
package org.wso2.wsas;
-import org.wso2.wsf.common.util.NetworkUtils;
+import org.wso2.utils.NetworkUtils;
import javax.servlet.*;
import javax.servlet.http.HttpServletRequest;
Modified: wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/Tomcat41xServerInfo.java
==============================================================================
--- wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/Tomcat41xServerInfo.java (original)
+++ wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/Tomcat41xServerInfo.java Thu Jan 11 22:17:40 2007
@@ -29,7 +29,7 @@
import java.util.Iterator;
import java.util.Properties;
-import org.wso2.wsf.common.util.ServerConfiguration;
+import org.wso2.utils.ServerConfiguration;
/**
*
Modified: wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/Tomcat5xServerInfo.java
==============================================================================
--- wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/Tomcat5xServerInfo.java (original)
+++ wsas/java/trunk/modules/servlet-edition/src/org/wso2/wsas/Tomcat5xServerInfo.java Thu Jan 11 22:17:40 2007
@@ -31,7 +31,7 @@
import java.util.Iterator;
import java.util.Properti